diff --git a/.gitattributes b/.gitattributes
index 00934f6efea..0966454ca45 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5,6 +5,7 @@
*.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
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index ff980a1e2dd..f6d7178e461 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -63,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/#step-3-configure-git-to-sync-your-fork-with-the-original-spoon-knife-repository) to your account.
+2. Next, you will need to [fork rAthena](https://help.github.com/articles/fork-a-repo/#fork-an-example-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!
@@ -77,27 +77,31 @@ For the most part you as a user will have no reason to worry about the **Milesto
:bangbang: Users should be aware of the 'Mode' and 'Status' Type **Labels** as these sometimes require feedback! :bangbang:
-#### Bug Type
+#### Component
| Label Name | Search Link | Description |
| --- | --- | --- |
-| `bug:core` | [search][search-rathena-label-bugcore] | A fault that lies within the main framework of rAthena. |
-| `bug:database` | [search][search-rathena-label-bugdatabase] | A fault that lies within the database of rAthena. |
-| `bug:documentation` | [search][search-rathena-label-bugdocumentation] | A fault that lies within the documentation of rAthena. |
-| `bug:forum` | [search][search-rathena-label-bugforum] | A fault that lies within the rAthena forum. |
-| `bug:script` | [search][search-rathena-label-bugscript] | A fault that lies within the scripts of rAthena. |
-| `bug:skill` | [search][search-rathena-label-bugskill] | A fault that deals specifically with a skill. |
-| `bug:tool` | [search][search-rathena-label-bugtool] | A fault that lies within a tool of rAthena. |
-
-#### Mode Type
+| `component:core` | [search][search-rathena-label-componentcore] | A fault that lies within the main framework of rAthena. |
+| `component:database` | [search][search-rathena-label-componentdatabase] | A fault that lies within the database of rAthena. |
+| `component:documentation` | [search][search-rathena-label-componentdocumentation] | A fault that lies within the documentation of rAthena. |
+| `component:script` | [search][search-rathena-label-componentscript] | A fault that lies within the scripts of rAthena. |
+| `component:skill` | [search][search-rathena-label-componentskill] | A fault that deals specifically with a skill. |
+| `component:tool` | [search][search-rathena-label-componenttool] | A fault that lies within a tool of rAthena. |
+
+#### Missing
+| Label Name | Search Link | Description |
+| --- | --- | --- |
+| `missing:clientdate` | [search][search-rathena-label-missingclientdate] | Issue **Title** or **Description** does not state the client date used to create the bug. |
+| `missing:mode` | [search][search-rathena-label-missingmode] | Issue **Title** or **Description** does not state pre-renewal or renewal mode. |
+| `missing:revision` | [search][search-rathena-label-missingrevision] | Issue **Description** does not state the revision of rAthena used when the bug occurred. |
+#### Mode
| Label Name | Search Link | Description |
| --- | --- | --- |
-| `mode:missing` | [search][search-rathena-label-modemissing] | Issue **Title** or **Description** does not state pre-renewal or renewal mode. |
| `mode:prerenewal` | [search][search-rathena-label-modeprerenewal] | A fault that exists within the pre-renewal mode. |
| `mode:renewal` | [search][search-rathena-label-moderenewal] | A fault that exists within the renewal mode. |
-#### Priority Type
+#### Priority
| Label Name | Search Link | Description |
| --- | --- | --- |
@@ -105,64 +109,65 @@ For the most part you as a user will have no reason to worry about the **Milesto
| `priority:medium` | [search][search-rathena-label-prioritymedium] | A fault that makes rAthena have significant repercussions but does not render rAthena unusable. |
| `priority:low` | [search][search-rathena-label-prioritylow] | A fault that affects rAthena in one piece of functionality and is self-contained. |
-#### Server Type
+#### Status
| Label Name | Search Link | Description |
| --- | --- | --- |
-| `server:login` | [search][search-rathena-label-serverlogin] | A fault that lies within the login server of rAthena. |
-| `server:char` | [search][search-rathena-label-serverchar] | A fault that lies within the character server of rAthena. |
-| `server:map` | [search][search-rathena-label-servermap] | A fault that lies within the map server of rAthena. |
-
-#### Status Type
-
-| Label Name | Search Link | Description |
-| --- | --- | --- |
-| `status:client date missing` | [search][search-rathena-label-statusclientdatemissing] | Issue **Title** or **Description** does not state the client date used to create the bug. |
+| `status:code-review` | [search][search-rathena-label-statuscodereview] | Pull Request that requires reviewing from other developers before being pushed to master. |
| `status:confirmed` | [search][search-rathena-label-statusconfirmed] | Issue that has been validated by a developer to affect rAthena. |
| `status:duplicate` | [search][search-rathena-label-statusduplicate] | Issue that has been reported before. |
-| `status:git hash missing` | [search][search-rathena-label-statusgithashmissing] | Issue **Description** does not state the hash of rAthena used when the bug occurred. |
+| `status:inprogress` | [search][search-rathena-label-statusinprogress] | Issue that has begun resolution by a developer. |
| `status:invalid` | [search][search-rathena-label-statusinvalid] | Issue that is either not official or is not related to rAthena. |
-| `status:needs more info` | [search][search-rathena-label-statusneedsmoreinfo] | Issue that needs more information from the issue creator. |
-| `status:needs official info` | [search][search-rathena-label-statusneedsofficialinfo] | Issue that needs more information from a creditable source. |
-| `status:started` | [search][search-rathena-label-statusstarted] | Issue that has begun resolution by a developer. |
+| `status:need more info` | [search][search-rathena-label-statusneedmoreinfo] | Issue that needs more information from a creditable source. |
+| `status:need user input` | [search][search-rathena-label-statusneeduserinput] | Issue that needs more information from the issue creator. |
+| `status:outdated emulator` | [search][search-rathena-label-statusoutdatedemulator] | Issue that requires the creator's local files to be updated to be resolved. |
| `status:unable to reproduce` | [search][search-rathena-label-statusunabletoreproduce] | Issue that was unable to be reproduced on rAthena. |
| `status:wontfix` | [search][search-rathena-label-statuswontfix] | Issue that cannot be fixed through some limitation or is intended behavior. |
-[search-rathena-label-bugcore]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Abug%3Acore
-[search-rathena-label-bugdatabase]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Abug%3Adatabase
-[search-rathena-label-bugdocumentation]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Abug%3Adocumentation
-[search-rathena-label-bugforum]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Abug%3Aforum
-[search-rathena-label-bugscript]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Abug%3Ascript
-[search-rathena-label-bugskill]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Abug%3Askill
-[search-rathena-label-bugtool]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Abug%3Atool
-[search-rathena-label-modemissing]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Amode%3Amissing
+#### Type
+| Label Name | Search Link | Description |
+| --- | --- | --- |
+| `type:bug` | [search][search-rathena-label-typebug] | Issue that is a bug within rAthena. |
+| `type:enhancement` | [search][search-rathena-label-typeenhancement] | Issue that is an enhancement to rAthena. |
+| `type:maintenance` | [search][search-rathena-label-typemaintenance] | Issue for refactoring rAthena. |
+| `type:question` | [search][search-rathena-label-typequestion] | Issue that is a question for rAthena. |
+
+[search-rathena-label-componentcore]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Acomponent%3Acore
+[search-rathena-label-componentdatabase]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Acomponent%3Adatabase
+[search-rathena-label-componentdocumentation]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Acomponent%3Adocumentation
+[search-rathena-label-componentscript]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Acomponent%3Ascript
+[search-rathena-label-componentskill]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Acomponent%3Askill
+[search-rathena-label-componenttool]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Acomponent%3Atool
+[search-rathena-label-missingclientdate]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Amissing%3Aclientdate
+[search-rathena-label-missingmode]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Amissing%3Amode
+[search-rathena-label-missingrevision]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Amissing%3Arevision
[search-rathena-label-modeprerenewal]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Amode%3Aprerenewal
[search-rathena-label-moderenewal]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Amode%3Arenewal
[search-rathena-label-priorityhigh]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Apriority%3Ahigh
[search-rathena-label-prioritymedium]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Apriority%3Amedium
[search-rathena-label-prioritylow]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Apriority%3Alow
-[search-rathena-label-serverchar]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Aserver%3Achar
-[search-rathena-label-serverlogin]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Aserver%3Alogin
-[search-rathena-label-servermap]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Aserver%3Amap
-[search-rathena-label-statusclientdatemissing]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3A"status%3Aclient+date+missing"
+[search-rathena-label-statuscodereview]: https://github.com/rathena/rathena/pulls?q=is%3Apr+is%3Aopen+label%3Astatus%3Acode-review
[search-rathena-label-statusconfirmed]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Astatus%3Aconfirmed
[search-rathena-label-statusduplicate]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Astatus%3Aduplicate
-[search-rathena-label-statusgithashmissing]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3A"status%3Agit+hash+missing"
+[search-rathena-label-statusinprogress]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Astatus%3Ainprogress
[search-rathena-label-statusinvalid]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Astatus%3Ainvalid
-[search-rathena-label-statusneedsmoreinfo]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3A"status%3Aneeds+more+info"
-[search-rathena-label-statusneedsofficialinfo]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3A"status%3Aneeds+official+info"
-[search-rathena-label-statusstarted]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Astatus%3Astarted
+[search-rathena-label-statusneedmoreinfo]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3A"status%3Aneed+more+info"
+[search-rathena-label-statusneeduserinput]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3A"status%3Aneed+user+input"
+[search-rathena-label-statusoutdatedemulator]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3A"status%3Aoutdated+emulator"
[search-rathena-label-statusunabletoreproduce]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3A"status%3Aunable+to+reproduce"
[search-rathena-label-statuswontfix]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Astatus%3Awontfix
+[search-rathena-label-typebug]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Atype%3Abug
+[search-rathena-label-typeenhancement]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Atype%3Aenhancement
+[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
Become a Team Member
--------------------
1. Before you send in a staff application, make sure you have an [rAthena account](https://rathena.org/board/register/).
- * If you are new to the community, go ahead and [introduce yourself](https://rathena.org/board/forum/89-introductions/)!
+ * If you are new to the community, go ahead and [introduce yourself](https://rathena.org/board/forum/89-introductions/)!
2. Please fill out the [Staff Application](https://rathena.org/board/staffapplications/) and you will be notified shortly.
-<br />
The rAthena team is comprised of all volunteers ([AUTHORS](https://github.com/rathena/rathena/blob/master/AUTHORS)). We encourage you to pitch in and submit bug reports or Pull Requests!
Thanks!
diff --git a/.gitignore b/.gitignore
index 80825adbf20..2a3be490db0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -152,6 +152,7 @@ Thumbs.db
/.idea/vcs.xml
/.idea/workspace.xml
/build/
+/cbuild/
# bat tools
/charserv.bat
diff --git a/.travis.yml b/.travis.yml
index 270132a1918..8e68e9f7bb1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,40 +1,165 @@
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"
+# 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 server
+# - ./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
+
+before_install:
+ - eval "${MATRIX_EVAL}"
before_script:
- uname -a
- - 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-4.8 -y
- - sudo apt-get install g++-4.8 -y
+ - ./tools/ci/sql.sh
script:
- ./configure $CONFIGURE_FLAGS
+ - ./tools/ci/npc.sh
- make clean
- make server
- - 'echo packet_db_ver: $PACKETDBVER >> db/import/packet_db.txt'
+ - ./login-server --run-once
+ - ./char-server --run-once
- ./map-server --run-once
env:
@@ -44,12 +169,6 @@ env:
- DB_NAME="ragnarok"
- DB_USER="ragnarok"
- DB_PASS="ragnarok"
- - PACKETDBVER=45
- 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
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
index 3b60b68dc88..4ff5169bb39 100644
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -53,3 +53,4 @@ add_subdirectory( mt19937ar )
add_subdirectory( mysql )
add_subdirectory( pcre )
add_subdirectory( zlib )
+add_subdirectory( yaml-cpp )
diff --git a/3rdparty/cmake/GetGitVersion.cmake b/3rdparty/cmake/GetGitVersion.cmake
new file mode 100644
index 00000000000..a05fe4210b3
--- /dev/null
+++ b/3rdparty/cmake/GetGitVersion.cmake
@@ -0,0 +1,54 @@
+# - Returns a version string from Git tags
+#
+# This function inspects the annotated git tags for the project and returns a string
+# into a CMake variable
+# higly adapted from https://raw.githubusercontent.com/google/benchmark/master/cmake/GetGitVersion.cmake
+# lighta
+#
+# get_git_version()
+#
+# - Example
+#
+# include(GetGitVersion)
+# get_git_version(GIT_VERSION)
+# return
+# - GIT_VERSION : remote tracking sha of master
+# - GIT_HEAD_VERSION : current sha of current branch
+#
+# Requires CMake 2.8.11+
+find_package(Git)
+
+if(__get_git_version)
+ return()
+endif()
+set(__get_git_version INCLUDED)
+
+function(get_git_version)
+ if(GIT_EXECUTABLE)
+ #determine remote tracking master sha
+ execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse origin/master
+ RESULT_VARIABLE status
+ OUTPUT_VARIABLE GIT_VERSION
+ ERROR_QUIET)
+ if(${status})
+ set(GIT_VERSION "unknow")
+ else()
+ string(STRIP ${GIT_VERSION} GIT_VERSION)
+ endif()
+
+ #determine current head sha
+ execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --verify HEAD
+ RESULT_VARIABLE status
+ OUTPUT_VARIABLE GIT_HEAD_VERSION
+ ERROR_QUIET)
+ if(${status})
+ set(GIT_HEAD_VERSION "unknow")
+ else()
+ string(STRIP ${GIT_HEAD_VERSION} GIT_HEAD_VERSION)
+ endif()
+
+ endif()
+ message("-- git Version: ${GIT_VERSION}, ${GIT_HEAD_VERSION}")
+ set(GIT_VERSION ${GIT_VERSION} PARENT_SCOPE)
+ set(GIT_HEAD_VERSION ${GIT_HEAD_VERSION} PARENT_SCOPE)
+endfunction()
diff --git a/3rdparty/cmake/GetSvnVersion.cmake b/3rdparty/cmake/GetSvnVersion.cmake
new file mode 100644
index 00000000000..f8048977e2a
--- /dev/null
+++ b/3rdparty/cmake/GetSvnVersion.cmake
@@ -0,0 +1,44 @@
+#
+# Find svnversion
+#
+function(get_svn_version)
+ message( STATUS "Detecting svnversion" )
+ find_program( SVNVERSION_EXECUTABLE svnversion )
+ mark_as_advanced( SVNVERSION_EXECUTABLE )
+ if( SVNVERSION_EXECUTABLE )
+ message( STATUS "Found svnversion: ${SVNVERSION_EXECUTABLE}" )
+ endif()
+ message( STATUS "Detecting svnversion - done" )
+ #
+ # Find Subversion
+ #
+ message( STATUS "Detecting Subversion" )
+ find_package( Subversion )
+ message( STATUS "Detecting Subversion - done" )
+ #
+ # SVNVERSION
+ #
+ if( SVNVERSION_EXECUTABLE )
+ message( STATUS "Getting svn version" )
+ execute_process( COMMAND ${SVNVERSION_EXECUTABLE} ${PROJECT_SOURCE_DIR}
+ OUTPUT_VARIABLE SVNVERSION
+ OUTPUT_STRIP_TRAILING_WHITESPACE )
+ if( SVNVERSION MATCHES "^Unversioned" )
+ set( SVNVERSION )
+ endif()
+ string( REGEX REPLACE "[^1234567890MSexported]" "_" SVNVERSION "${SVNVERSION}" )
+ message( STATUS "Found SVNversion: ${SVNVERSION}" )
+ message( STATUS "Getting svn version - done" )
+ endif()
+ if( Subversion_FOUND AND SVNVERSION )
+ message( STATUS "Getting svn branch" )
+ Subversion_WC_INFO( ${PROJECT_SOURCE_DIR} rAthena )
+ if( rAthena_WC_URL )
+ string( REGEX MATCH "[^/]+$" BRANCH ${rAthena_WC_URL} )
+ set( SVNVERSION "${BRANCH}-${SVNVERSION}" )
+ message( STATUS "Found branch: ${BRANCH}" )
+ endif()
+ message( STATUS "Getting svn branch - done" )
+ endif()
+ set(SVNVERSION ${SVNVERSION} PARENT_SCOPE)
+endfunction()
diff --git a/3rdparty/cmake/tests/HAVE_TLS.c b/3rdparty/cmake/tests/HAVE_TLS.c
new file mode 100644
index 00000000000..40ce28a717a
--- /dev/null
+++ b/3rdparty/cmake/tests/HAVE_TLS.c
@@ -0,0 +1,6 @@
+__thread int tls;
+
+int main(int argc, char** argv)
+{
+ return 0;
+}
diff --git a/3rdparty/libconfig/grammar.h b/3rdparty/libconfig/grammar.h
index 2ce199ddeb3..4350c4a9069 100644
--- a/3rdparty/libconfig/grammar.h
+++ b/3rdparty/libconfig/grammar.h
@@ -1,4 +1,4 @@
-
+#pragma once
/* A Bison parser, made by GNU Bison 2.4.1. */
/* Skeleton interface for Bison's Yacc-like parsers in C
@@ -32,7 +32,10 @@
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
-
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
/* Tokens. */
#ifndef YYTOKENTYPE
# define YYTOKENTYPE
@@ -109,5 +112,7 @@ typedef union YYSTYPE
#endif
-
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
diff --git a/3rdparty/libconfig/libconfig.h b/3rdparty/libconfig/libconfig.h
index 1774a26d838..f3e4758a688 100644
--- a/3rdparty/libconfig/libconfig.h
+++ b/3rdparty/libconfig/libconfig.h
@@ -20,6 +20,8 @@
----------------------------------------------------------------------------
*/
+#pragma once
+
#ifndef __libconfig_h
#define __libconfig_h
diff --git a/3rdparty/libconfig/libconfig.vcxproj b/3rdparty/libconfig/libconfig.vcxproj
index b4f451bb0a5..e0cbb32ac3b 100644
--- a/3rdparty/libconfig/libconfig.vcxproj
+++ b/3rdparty/libconfig/libconfig.vcxproj
@@ -38,32 +38,31 @@
<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>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
diff --git a/3rdparty/libconfig/parsectx.h b/3rdparty/libconfig/parsectx.h
index af09b56dd56..378567b13c6 100644
--- a/3rdparty/libconfig/parsectx.h
+++ b/3rdparty/libconfig/parsectx.h
@@ -1,3 +1,5 @@
+#pragma once
+
/* ----------------------------------------------------------------------------
libconfig - A library for processing structured configuration files
Copyright (C) 2005-2010 Mark A Lindner
diff --git a/3rdparty/libconfig/scanctx.h b/3rdparty/libconfig/scanctx.h
index 8ff934e7e95..9dcae4c161e 100644
--- a/3rdparty/libconfig/scanctx.h
+++ b/3rdparty/libconfig/scanctx.h
@@ -1,3 +1,5 @@
+#pragma once
+
/* ----------------------------------------------------------------------------
libconfig - A library for processing structured configuration files
Copyright (C) 2005-2010 Mark A Lindner
@@ -31,6 +33,10 @@
#define MAX_INCLUDE_DEPTH 10
+#ifdef __cplusplus
+extern "C" {
+#endif
+
struct scan_context
{
config_t *config;
@@ -59,4 +65,8 @@ extern char *scanctx_take_string(struct scan_context *ctx);
extern const char *scanctx_current_filename(struct scan_context *ctx);
+#ifdef __cplusplus
+}
+#endif
+
#endif /* __libconfig_scanctx_h */
diff --git a/3rdparty/libconfig/scanner.h b/3rdparty/libconfig/scanner.h
index baa6f771fb9..ba7f5a58773 100644
--- a/3rdparty/libconfig/scanner.h
+++ b/3rdparty/libconfig/scanner.h
@@ -1,3 +1,5 @@
+#pragma once
+
#ifndef libconfig_yyHEADER_H
#define libconfig_yyHEADER_H 1
#define libconfig_yyIN_HEADER 1
diff --git a/3rdparty/libconfig/strbuf.h b/3rdparty/libconfig/strbuf.h
index 62cd782eaad..b41e8709796 100644
--- a/3rdparty/libconfig/strbuf.h
+++ b/3rdparty/libconfig/strbuf.h
@@ -1,3 +1,5 @@
+#pragma once
+
/* ----------------------------------------------------------------------------
libconfig - A library for processing structured configuration files
Copyright (C) 2005-2010 Mark A Lindner
@@ -26,6 +28,10 @@
#include <string.h>
#include <sys/types.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
typedef struct
{
char *string;
@@ -37,4 +43,8 @@ char *strbuf_release(strbuf_t *buf);
void strbuf_append(strbuf_t *buf, const char *text);
+#ifdef __cplusplus
+}
+#endif
+
#endif /* __libconfig_strbuf_h */
diff --git a/3rdparty/libconfig/wincompat.h b/3rdparty/libconfig/wincompat.h
index 23d7379e29d..74817191b74 100644
--- a/3rdparty/libconfig/wincompat.h
+++ b/3rdparty/libconfig/wincompat.h
@@ -1,3 +1,5 @@
+#pragma once
+
/* ----------------------------------------------------------------------------
libconfig - A library for processing structured configuration files
Copyright (C) 2005-2010 Mark A Lindner
diff --git a/3rdparty/mt19937ar/mt19937ar.h b/3rdparty/mt19937ar/mt19937ar.h
index 8b98b8a5bdd..1cc2f8d2f1b 100644
--- a/3rdparty/mt19937ar/mt19937ar.h
+++ b/3rdparty/mt19937ar/mt19937ar.h
@@ -1,3 +1,5 @@
+#pragma once
+
/*
A C-program for MT19937, with initialization improved 2002/1/26.
Coded by Takuji Nishimura and Makoto Matsumoto.
@@ -43,6 +45,10 @@
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);
@@ -70,3 +76,7 @@ double genrand_real3(void);
/* generates a random number on [0,1) with 53-bit resolution*/
double genrand_res53(void);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/3rdparty/mt19937ar/mt19937ar.vcxproj b/3rdparty/mt19937ar/mt19937ar.vcxproj
index a94c49d6c79..3c6090c2d32 100644
--- a/3rdparty/mt19937ar/mt19937ar.vcxproj
+++ b/3rdparty/mt19937ar/mt19937ar.vcxproj
@@ -33,26 +33,26 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
diff --git a/3rdparty/yaml-cpp/CMakeLists.txt b/3rdparty/yaml-cpp/CMakeLists.txt
new file mode 100644
index 00000000000..b2821b67f1a
--- /dev/null
+++ b/3rdparty/yaml-cpp/CMakeLists.txt
@@ -0,0 +1,83 @@
+cmake_minimum_required(VERSION 2.8)
+
+## start setting
+SET (this_target yaml-cpp)
+PROJECT(${this_target})
+
+find_path( YAML_INCLUDE_DIRS "yaml-cpp/yaml.h"
+ PATHS "${CMAKE_CURRENT_SOURCE_DIR}/include"
+ NO_DEFAULT_PATH )
+find_path( YAML_SOURCE_DIR "regex_yaml.cpp"
+ PATHS "${CMAKE_CURRENT_SOURCE_DIR}/src"
+ NO_DEFAULT_PATH )
+mark_as_advanced( YAML_INCLUDE_DIRS )
+mark_as_advanced( YAML_SOURCE_DIR )
+
+set( YAML_HEADERS
+ "${YAML_INCLUDE_DIRS}/yaml-cpp/yaml.h"
+ "${YAML_INCLUDE_DIRS}/yaml-cpp/traits.h"
+ "${YAML_INCLUDE_DIRS}/yaml-cpp/stlemitter.h"
+ "${YAML_INCLUDE_DIRS}/yaml-cpp/parser.h"
+ "${YAML_INCLUDE_DIRS}/yaml-cpp/ostream_wrapper.h"
+ "${YAML_INCLUDE_DIRS}/yaml-cpp/null.h"
+ "${YAML_INCLUDE_DIRS}/yaml-cpp/noncopyable.h"
+ "${YAML_INCLUDE_DIRS}/yaml-cpp/mark.h"
+ "${YAML_INCLUDE_DIRS}/yaml-cpp/exceptions.h"
+ "${YAML_INCLUDE_DIRS}/yaml-cpp/eventhandler.h"
+ "${YAML_INCLUDE_DIRS}/yaml-cpp/emitterstyle.h"
+ "${YAML_INCLUDE_DIRS}/yaml-cpp/emittermanip.h"
+ "${YAML_INCLUDE_DIRS}/yaml-cpp/emitter.h"
+ "${YAML_INCLUDE_DIRS}/yaml-cpp/emitterdef.h"
+ "${YAML_INCLUDE_DIRS}/yaml-cpp/emitfromevents.h"
+ "${YAML_INCLUDE_DIRS}/yaml-cpp/dll.h"
+ "${YAML_INCLUDE_DIRS}/yaml-cpp/binary.h"
+ "${YAML_INCLUDE_DIRS}/yaml-cpp/anchor.h"
+ "${YAML_INCLUDE_DIRS}/yaml-cpp/node/type.h"
+ "${YAML_INCLUDE_DIRS}/yaml-cpp/node/ptr.h"
+ "${YAML_INCLUDE_DIRS}/yaml-cpp/node/parse.h"
+ "${YAML_INCLUDE_DIRS}/yaml-cpp/node/node.h"
+ "${YAML_INCLUDE_DIRS}/yaml-cpp/node/iterator.h"
+ "${YAML_INCLUDE_DIRS}/yaml-cpp/node/impl.h"
+ "${YAML_INCLUDE_DIRS}/yaml-cpp/node/emit.h"
+ "${YAML_INCLUDE_DIRS}/yaml-cpp/node/convert.h"
+ "${YAML_INCLUDE_DIRS}/yaml-cpp/contrib/graphbuilder.h"
+ "${YAML_INCLUDE_DIRS}/yaml-cpp/contrib/anchordict.h"
+ CACHE INTERNAL "yaml headers" )
+set( YAML_SOURCES
+ "${YAML_SOURCE_DIR}/binary.cpp"
+ "${YAML_SOURCE_DIR}/convert.cpp"
+ "${YAML_SOURCE_DIR}/directives.cpp"
+ "${YAML_SOURCE_DIR}/emit.cpp"
+ "${YAML_SOURCE_DIR}/emitfromevents.cpp"
+ "${YAML_SOURCE_DIR}/emitter.cpp"
+ "${YAML_SOURCE_DIR}/emitterstate.cpp"
+ "${YAML_SOURCE_DIR}/emitterutils.cpp"
+ "${YAML_SOURCE_DIR}/exceptions.cpp"
+ "${YAML_SOURCE_DIR}/exp.cpp"
+ "${YAML_SOURCE_DIR}/memory.cpp"
+ "${YAML_SOURCE_DIR}/nodebuilder.cpp"
+ "${YAML_SOURCE_DIR}/node.cpp"
+ "${YAML_SOURCE_DIR}/node_data.cpp"
+ "${YAML_SOURCE_DIR}/nodeevents.cpp"
+ "${YAML_SOURCE_DIR}/null.cpp"
+ "${YAML_SOURCE_DIR}/ostream_wrapper.cpp"
+ "${YAML_SOURCE_DIR}/parse.cpp"
+ "${YAML_SOURCE_DIR}/parser.cpp"
+ "${YAML_SOURCE_DIR}/regex_yaml.cpp"
+ "${YAML_SOURCE_DIR}/scanner.cpp"
+ "${YAML_SOURCE_DIR}/scanscalar.cpp"
+ "${YAML_SOURCE_DIR}/scantag.cpp"
+ "${YAML_SOURCE_DIR}/scantoken.cpp"
+ "${YAML_SOURCE_DIR}/simplekey.cpp"
+ "${YAML_SOURCE_DIR}/singledocparser.cpp"
+ "${YAML_SOURCE_DIR}/stream.cpp"
+ "${YAML_SOURCE_DIR}/tag.cpp"
+ "${YAML_SOURCE_DIR}/contrib/graphbuilderadapter.cpp"
+ "${YAML_SOURCE_DIR}/contrib/graphbuilder.cpp"
+ CACHE INTERNAL "yaml sources" )
+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}")
+ADD_LIBRARY(${this_target} STATIC ${YAML_SOURCES} )
diff --git a/3rdparty/yaml-cpp/src/contrib/graphbuilderadapter.h b/3rdparty/yaml-cpp/src/contrib/graphbuilderadapter.h
index 0d1e579208c..726db898970 100644
--- a/3rdparty/yaml-cpp/src/contrib/graphbuilderadapter.h
+++ b/3rdparty/yaml-cpp/src/contrib/graphbuilderadapter.h
@@ -50,8 +50,8 @@ class GraphBuilderAdapter : public EventHandler {
struct ContainerFrame {
ContainerFrame(void* pSequence)
: pContainer(pSequence), pPrevKeyNode(&sequenceMarker) {}
- ContainerFrame(void* pMap, void* pPrevKeyNode)
- : pContainer(pMap), pPrevKeyNode(pPrevKeyNode) {}
+ ContainerFrame(void* pMap, void* pPrevKeyNode_)
+ : pContainer(pMap), pPrevKeyNode(pPrevKeyNode_) {}
void* pContainer;
void* pPrevKeyNode;
diff --git a/3rdparty/yaml-cpp/src/parse.cpp b/3rdparty/yaml-cpp/src/parse.cpp
index 0b2ae4a4f6e..d864907edb4 100644
--- a/3rdparty/yaml-cpp/src/parse.cpp
+++ b/3rdparty/yaml-cpp/src/parse.cpp
@@ -31,7 +31,7 @@ Node Load(std::istream& input) {
Node LoadFile(const std::string& filename) {
std::ifstream fin(filename.c_str());
- if (!fin) {
+ if (!fin || fin.bad()) {
throw BadFile();
}
return Load(fin);
diff --git a/3rdparty/yaml-cpp/src/singledocparser.cpp b/3rdparty/yaml-cpp/src/singledocparser.cpp
index a27c1c3b04d..752835822cd 100644
--- a/3rdparty/yaml-cpp/src/singledocparser.cpp
+++ b/3rdparty/yaml-cpp/src/singledocparser.cpp
@@ -166,10 +166,10 @@ void SingleDocParser::HandleBlockSequence(EventHandler& eventHandler) {
// check for null
if (!m_scanner.empty()) {
- const Token& token = m_scanner.peek();
- if (token.type == Token::BLOCK_ENTRY ||
- token.type == Token::BLOCK_SEQ_END) {
- eventHandler.OnNull(token.mark, NullAnchor);
+ const Token& token_ = m_scanner.peek();
+ if (token_.type == Token::BLOCK_ENTRY ||
+ token_.type == Token::BLOCK_SEQ_END) {
+ eventHandler.OnNull(token_.mark, NullAnchor);
continue;
}
}
diff --git a/3rdparty/yaml-cpp/yaml-cpp.vcxproj b/3rdparty/yaml-cpp/yaml-cpp.vcxproj
index fdf9f0ea1cd..98944cd6401 100644
--- a/3rdparty/yaml-cpp/yaml-cpp.vcxproj
+++ b/3rdparty/yaml-cpp/yaml-cpp.vcxproj
@@ -22,32 +22,31 @@
<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>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
@@ -96,7 +95,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
<AdditionalIncludeDirectories>$(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\yaml-cpp\src\;</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;WIN32;_WINDOWS;WIN32;_WINDOWS;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
</ItemDefinitionGroup>
@@ -108,7 +107,7 @@
</SDLCheck>
<AdditionalIncludeDirectories>$(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\yaml-cpp\src\;</AdditionalIncludeDirectories>
<InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
- <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;WIN32;_WINDOWS;WIN32;_WINDOWS;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
</ItemDefinitionGroup>
@@ -121,7 +120,7 @@
<SDLCheck>
</SDLCheck>
<AdditionalIncludeDirectories>$(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\yaml-cpp\src\;</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;WIN32;_WINDOWS;WIN32;_WINDOWS;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
@@ -138,7 +137,7 @@
<SDLCheck>
</SDLCheck>
<AdditionalIncludeDirectories>$(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\yaml-cpp\src\;</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;WIN32;_WINDOWS;WIN32;_WINDOWS;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ec1d76239f..e6e1bd44cbc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,20 +28,40 @@
# changes to some CPack generators
# CYGWIN no longer defines WIN32
# CMP0017: Prefer files from the CMake module directory when including from there.
+# Update to 3.1 for CMAKE_CXX_STANDARD cross support definition
set( CMAKE_LEGACY_CYGWIN_WIN32 0 )
-cmake_minimum_required( VERSION 2.8.8 )
-project( rAthena C )
+cmake_minimum_required( VERSION 3.1 )
+project( rAthena )
if( CYGWIN )
unset( WIN32 )
endif()
+set(CMAKE_CXX_STANDARD 11) # C++11...
+set(CMAKE_CXX_STANDARD_REQUIRED ON) #...is required...
+#set(CMAKE_CXX_EXTENSIONS OFF) #...without compiler extensions like gnu++11
+#actually this might be misleading for arm...
+if( CMAKE_SIZEOF_VOID_P EQUAL 4 )
+ set(architecture x86)
+elseif( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+ set(architecture x64)
+else()
+ message( FATAL_ERROR "unexpected architecture (CMAKE_SIZEOF_VOID_P is ${CMAKE_SIZEOF_VOID_P})" )
+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_C_CREATE_SHARED_LIBRARY)
+set(CMAKE_CXX_CREATE_SHARED_LIBRARY)
+set(CMAKE_DEBUG_POSTFIX "d")
+set(CMAKE_RELEASE_POSTFIX "r")
#
# Prevent building in the source directory by default
#
+option( ALLOW_SAME_DIRECTORY "Allow CMake to build in the source directory." OFF )
if( ALLOW_SAME_DIRECTORY )
elseif( "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}" )
- option( ALLOW_SAME_DIRECTORY "Allow CMake to build in the source directory." OFF )
message( FATAL_ERROR
"Do not use the source directory to build your files, instead delete CMakeCache.txt, create a separate folder and build there.\n"
"Example: (build in subdir 'build' and install to source dir)\n"
@@ -70,6 +90,10 @@ 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()
#
@@ -83,6 +107,7 @@ include( CheckFunctionExists )
include( FindFunctionLibrary )
include( TestBigEndian )
+
#
# PACKETVER
#
@@ -105,47 +130,12 @@ if(GIT_FOUND)
endif()
endif()
-#
-# Find svnversion
-#
-message( STATUS "Detecting svnversion" )
-find_program( SVNVERSION_EXECUTABLE svnversion )
-mark_as_advanced( SVNVERSION_EXECUTABLE )
-if( SVNVERSION_EXECUTABLE )
- message( STATUS "Found svnversion: ${SVNVERSION_EXECUTABLE}" )
-endif()
-message( STATUS "Detecting svnversion - done" )
-#
-# Find Subversion
-#
-message( STATUS "Detecting Subversion" )
-find_package( Subversion )
-message( STATUS "Detecting Subversion - done" )
-#
-# SVNVERSION
-#
-if( SVNVERSION_EXECUTABLE )
- message( STATUS "Getting svn version" )
- execute_process( COMMAND ${SVNVERSION_EXECUTABLE} ${PROJECT_SOURCE_DIR}
- OUTPUT_VARIABLE SVNVERSION
- OUTPUT_STRIP_TRAILING_WHITESPACE )
- if( SVNVERSION MATCHES "^Unversioned" )
- set( SVNVERSION )
- endif()
- string( REGEX REPLACE "[^1234567890MSexported]" "_" SVNVERSION "${SVNVERSION}" )
- message( STATUS "Found SVNversion: ${SVNVERSION}" )
- message( STATUS "Getting svn version - done" )
-endif()
-if( Subversion_FOUND AND SVNVERSION )
- message( STATUS "Getting svn branch" )
- Subversion_WC_INFO( ${PROJECT_SOURCE_DIR} rAthena )
- if( rAthena_WC_URL )
- string( REGEX MATCH "[^/]+$" BRANCH ${rAthena_WC_URL} )
- set( SVNVERSION "${BRANCH}-${SVNVERSION}" )
- message( STATUS "Found branch: ${BRANCH}" )
- endif()
- message( STATUS "Getting svn branch - done" )
-endif()
+include(GetGitVersion)
+get_git_version()
+
+#include(GetSvnVersion)
+#get_svn_version(SVN_VERSION)
+#message( STATUS "SVN_VERSION: ${SVN_VERSION}" )
#
@@ -160,6 +150,16 @@ if( 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)
@@ -198,12 +198,12 @@ endif()
#
if( NOT MSVC )
message( STATUS "Detecting networking library (socket/nsl/ws2_32)" )
-set( CMAKE_REQUIRED_LIBRARIES ${GLOBAL_LIBRARIES} )
-find_function_library( bind FUNCTION_BIND_LIBRARIES socket ws2_32 )
-if( FUNCTION_BIND_LIBRARIES )
- message( STATUS "Adding global library: ${FUNCTION_BIND_LIBRARIES}" )
- set_property( CACHE GLOBAL_LIBRARIES PROPERTY VALUE ${GLOBAL_LIBRARIES} ${FUNCTION_BIND_LIBRARIES} )
-endif()
+#set( CMAKE_REQUIRED_LIBRARIES ${GLOBAL_LIBRARIES} )
+#find_function_library( bind FUNCTION_BIND_LIBRARIES socket ws2_32 )
+#if( FUNCTION_BIND_LIBRARIES )
+# message( STATUS "Adding global library: ${FUNCTION_BIND_LIBRARIES}" )
+# set_property( CACHE GLOBAL_LIBRARIES PROPERTY VALUE ${GLOBAL_LIBRARIES} ${FUNCTION_BIND_LIBRARIES} )
+#endif()
set( CMAKE_REQUIRED_LIBRARIES ${GLOBAL_LIBRARIES} )
find_function_library( gethostbyname FUNCTION_GETHOSTBYNAME_LIBRARIES nsl )
if( FUNCTION_GETHOSTBYNAME_LIBRARIES )
@@ -590,11 +590,7 @@ add_subdirectory( src )
#####################################################################
# final checks and warnings
#
-if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
- message( WARNING "64bit should work, but is not recommended." )
-elseif( NOT CMAKE_SIZEOF_VOID_P EQUAL 4 )
- message( FATAL_ERROR "unexpected architecture (CMAKE_SIZEOF_VOID_P is ${CMAKE_SIZEOF_VOID_P})" )
-endif()
+
list( LENGTH TARGET_LIST _LEN )
if( _LEN EQUAL 0 )
message( FATAL_ERROR "no targets available" )
diff --git a/Makefile.in b/Makefile.in
index 348034f51d5..05e4d4e81e1 100644
--- 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=mt19937ar libconfig
+ COMMON_DEPENDS=mt19937ar libconfig yaml-cpp
LOGIN_DEPENDS=mt19937ar libconfig common
- CHAR_DEPENDS=mt19937ar libconfig common
- MAP_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
@@ -93,7 +93,7 @@ help:
@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 "'libconfig' - builds object files of yaml-cpp"
+ @echo "'yaml-cpp' - builds object files of yaml-cpp"
@echo "'login' - builds login server"
@echo "'char' - builds char server"
@echo "'map' - builds map server"
diff --git a/README.md b/README.md
index 12b637bb30c..d09a414db46 100644
--- a/README.md
+++ b/README.md
@@ -91,6 +91,9 @@ relevant to your Operation System, please refer to the Wiki (links at the end of
* 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
diff --git a/appveyor.yml b/appveyor.yml
index a70cec5ec3b..c71645d3e0a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -42,26 +42,9 @@ test_script:
set MYSQL="C:\Program Files\MySql\MySQL Server 5.7\bin\mysql.exe"
- rem Setting creation
-
cd C:\projects\rathena
- echo map_server_ip: %DB_HOST%>> conf\import\inter_conf.txt
-
- echo map_server_id: %DB_USER%>> conf\import\inter_conf.txt
-
- echo map_server_pw: %DB_PASS%>> conf\import\inter_conf.txt
-
- echo map_server_db: %DB_NAME%>> conf\import\inter_conf.txt
-
- echo log_db_ip: %DB_HOST%>> conf\import\inter_conf.txt
-
- echo log_db_id: %DB_USER%>> conf\import\inter_conf.txt
-
- echo log_db_pw: %DB_USERPW%>> conf\import\inter_conf.txt
-
- echo log_db_db: %DB_NAME%>> conf\import\inter_conf.txt
-
+ rem TODO should be replace with tools\ci\sql.bat as soon as possible
rem MySQL database setup
%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% -e "CREATE DATABASE %DB_NAME%;"
@@ -100,8 +83,16 @@ test_script:
%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%';"
+ %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% -e "GRANT SELECT,INSERT,UPDATE,DELETE ON %DB_NAME%.* TO '%DB_USER%'@'%DB_HOST%' IDENTIFIED BY '%DB_USERPW%';"
+
+ rem Activate all custom and test scripts
+
+ start /d tools\ci npc.bat
rem Start the map server
+ login-server.exe --run-once
+
+ char-server.exe --run-once
+
map-server.exe --run-once
diff --git a/conf/battle/battle.conf b/conf/battle/battle.conf
index 593d4e92f48..30251a48345 100644
--- a/conf/battle/battle.conf
+++ b/conf/battle/battle.conf
@@ -158,3 +158,9 @@ warg_can_falcon: no
// Should the target be able of dodging damage by snapping away to the edge of the screen?
// Official behavior is "no"
snap_dodge: no
+
+// ****************************************
+// Reserved Costume ID's
+// ****************************************
+// Reserved Char ID for costume converted items.
+reserved_costume_id: 999998
\ No newline at end of file
diff --git a/conf/battle/client.conf b/conf/battle/client.conf
index f2e5e1be518..dee9760e4d2 100644
--- a/conf/battle/client.conf
+++ b/conf/battle/client.conf
@@ -9,58 +9,6 @@
// assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun, 16: Mercenary)
//--------------------------------------------------------------
-// Set here which client version do you accept. Add all values of clients:
-// Clients older than accepted versions, and versions not set to 'accepted'
-// here will be rejected when logging in
-// 0x00000001: Clients older than 2004-09-06aSakray (packet versions 5-9)
-// 0x00000002: 2004-09-06 aSakexe (version 10)
-// 0x00000004: 2004-09-20 aSakexe (version 11)
-// 0x00000008: 2004-10-05 aSakexe (version 12)
-// 0x00000010: 2004-10-25 aSakexe (version 13)
-// 0x00000020: 2004-11-29 aSakexe (version 14)
-// 0x00000040: 2005-01-10 bSakexe (version 15)
-// 0x00000080: 2005-05-09 aSakexe (version 16)
-// 0x00000100: 2005-06-28 aSakexe (version 17)
-// 0x00000200: 2005-07-18 aSakexe (version 18)
-// 0x00000400: 2005-07-19 bSakexe (version 19)
-// 0x00000800: 2006-03-27 aSakexe (version 20)
-// 0x00001000: 2007-01-08 aSakexe (version 21)
-// 0x00002000: 2007-02-12 aSakexe (version 22)
-// 0x00004000: 2008-09-10 aSakexe (version 23)
-// 0x00008000: 2008-08-27 aRagexeRE (version 24)
-// 0x00010000: 2008-09-10 aRagexeRE (version 25)
-// 0x00020000: 2010-11-24 aRagexeRE (version 26)
-// 0x00040000: 2011-10-05 aRagexeRE (version 27)
-// 0x00080000: 2011-11-02 aRagexe (version 28)
-// 0x00100000: 2012-03-07 fRagexeRE (version 29)
-// 0x00200000: 2012-04-10 aRagexeRE (version 30)
-// 0x00400000: 2012-04-18 aRagexeRE (version 31)
-// 0x00800000: 2012-06-18 unknow (version 32)
-// 0x01000000: 2012-07-02 aRagexeRE (version 33)
-// 0x02000000: 2013-03-20 Ragexe (version 34)
-// 0x04000000: 2013-05-15 aRagexe (version 35)
-// 0x08000000: 2013-05-22 Ragexe (version 36)
-// 0x10000000: 2013-05-29 Ragexe (version 37)
-// 0x20000000: 2013-06-05 Ragexe (version 38)
-// 0x40000000: 2013-06-12 Ragexe (version 39)
-// default value: 0x7FFFFFFF (all clients/versions [5;39])
-packet_ver_flag: 0x7FFFFFFF
-
-// 0x00000001: 2013-06-18 Ragexe (version 40)
-// 0x00000002: 2013-06-26 Ragexe (version 41)
-// 0x00000004: 2013-07-03 Ragexe (version 42)
-// 0x00000008: 2013-07-10 Ragexe (version 43)
-// 0x00000010: 2013-07-17 Ragexe (version 44)
-// 0x00000020: 2013-08-07 Ragexe (version 45)
-// 0x00000040: 2013-12-23 Ragexe (version 46)
-// 0x00000080: ????
-// 0x00000100: ????
-// 0x00000200: ????
-// 0x00000400: 2014-10-16 Ragexe (version 50)
-// 0x00000800: 2014-10-22 Ragexe (version 51)
-// default value: 0x7FFFFFFF (all clients/versions [41;72])
-packet_ver_flag2: 0x7FFFFFFF
-
// Minimum delay between whisper/global/party/guild messages (in ms)
// Messages that break this threshold are silently omitted.
min_chat_delay: 0
@@ -123,7 +71,7 @@ wedding_modifydisplay: no
save_clothcolor: yes
// Save body styles. (Note 1)
-// Note: Don't turn this on unless you know what your doing.
+// Note: Don't turn this on unless you know what you are doing.
// Sprites are not released officially.
save_body_style: no
diff --git a/conf/battle/drops.conf b/conf/battle/drops.conf
index 1b50f359e31..e8ae97cb340 100644
--- a/conf/battle/drops.conf
+++ b/conf/battle/drops.conf
@@ -148,3 +148,8 @@ 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
diff --git a/conf/battle/feature.conf b/conf/battle/feature.conf
index a2af2d184e8..cd31321d41e 100644
--- a/conf/battle/feature.conf
+++ b/conf/battle/feature.conf
@@ -63,3 +63,7 @@ feature.autotrade_open_delay: 5000
// Requires: 2014-10-22bRagexe or later
// 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
diff --git a/conf/battle/guild.conf b/conf/battle/guild.conf
index 2ef751b68e5..9a89b03d5b3 100644
--- a/conf/battle/guild.conf
+++ b/conf/battle/guild.conf
@@ -70,3 +70,7 @@ guild_leaderchange_delay: 1440
// Is changing the guild leader allowed during WoE?
// Default: no
guild_leaderchange_woe: no
+
+// Only guild master can accept alliance?
+// Default: no
+guild_alliance_onlygm: no
diff --git a/conf/battle/items.conf b/conf/battle/items.conf
index 735faf1853c..f2118d24ebe 100644
--- a/conf/battle/items.conf
+++ b/conf/battle/items.conf
@@ -19,7 +19,12 @@ 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: 200
+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
// Show the buyer's name when successfully vended an item
buyer_name: yes
@@ -105,3 +110,20 @@ item_flooritem_check: yes
// 3 - Party
// 4 - Character
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 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
+
+// Turn on event refine chance (see db/{pre-}re/refine_db.yml)
+// no = normal refine chances in effect (official/default value)
+// yes = event refine chances in effect
+event_refine_chance: no
+
+// Hide n last characters of player's name with asterisk (*) when the player
+// obtained an item with special broadcast flag.
+// Note: Players with short names can be fully converted to asterisks if this
+// config value is set high.
+broadcast_hide_name: 2
diff --git a/conf/battle/misc.conf b/conf/battle/misc.conf
index 7c085fd414f..de64c0c4588 100644
--- a/conf/battle/misc.conf
+++ b/conf/battle/misc.conf
@@ -18,6 +18,10 @@
// config to adjust how this will affect players)
pk_mode: 0
+// Displays a message when the player enters a pk zone.
+// Only during pk_mode (Note 1)
+pk_mode_mes: yes
+
// Manner/karma system configuration. Specifies how does negative manner
// (red no chat bubble) affects players (add as needed):
// 0: No penalties.
diff --git a/conf/battle/skill.conf b/conf/battle/skill.conf
index d59068e0641..f28e41b6d49 100644
--- a/conf/battle/skill.conf
+++ b/conf/battle/skill.conf
@@ -122,7 +122,8 @@ gvg_traps_target_all: 1
// 0 = Always visible
// 1 = Enable invisibility in versus maps (GVG/PVP/BG)
// 2 = Enable invisibility in all maps
-traps_setting: 0
+// Default on official servers: 0 for Pre-renewal, 2 for Renewal
+//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.
@@ -369,3 +370,8 @@ 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
diff --git a/conf/char_athena.conf b/conf/char_athena.conf
index 2331dbad197..79d037768b9 100644
--- a/conf/char_athena.conf
+++ b/conf/char_athena.conf
@@ -112,7 +112,7 @@ save_log: yes
// 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,97,90:iz_int01,97,90:iz_int02,97,90:iz_int03,97,90:iz_int04,97,90
+start_point: iz_int,18,26:iz_int01,18,26:iz_int02,18,26:iz_int03,18,26:iz_int04,18,26
start_point_pre: new_1-1,53,111:new_2-1,53,111:new_3-1,53,111:new_4-1,53,111:new_5-1,53,111
start_point_doram: lasa_fild01,48,297
diff --git a/conf/help.txt b/conf/help.txt
index 8817223885c..8bcb8e32508 100644
--- a/conf/help.txt
+++ b/conf/help.txt
@@ -42,7 +42,7 @@ go: "Params: <city name|number>\n" "Warps you to a city.\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\n"
+ " 2: geffen 19: einbroch 36: lasagna\n"
" 3: payon 20: lighthalzen\n"
" 4: alberta 21: einbech\n"
" 5: izlude 22: hugel\n"
@@ -310,7 +310,6 @@ reloaditemdb: "Reload item database."
reloadmobdb: "Reload monster database."
reloadmotd: "Reload Message of the Day."
reloadmsgconf: "Reload message configuration."
-reloadpacketdb: "Reload packet database."
reloadpcdb: "Reload player settings."
reloadquestdb: "Reload quest database."
reloadscript: "Reload all scripts."
diff --git a/conf/import-tmpl/inter_server.conf b/conf/import-tmpl/inter_server.conf
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/conf/import-tmpl/inter_server.yml b/conf/import-tmpl/inter_server.yml
new file mode 100644
index 00000000000..85e71fe78e0
--- /dev/null
+++ b/conf/import-tmpl/inter_server.yml
@@ -0,0 +1,17 @@
+# Config for Storages
+#
+# To access the premium storage, use script command 'openstorage2'.
+# If premium storages are added, copy the structure of the storage table and match the table name in this config.
+# The 'max' of premium storages are not adjusted by 'vip_storage_increase' config nor MIN_STORAGE.
+#
+# Structure:
+# - ID: <storage_id> // (int) Storage ID will be used for script command 'openstorage2'.
+# Name: "<storage name>" // (string) Storage name will be sent to the client to display on the title bar.
+# Table: "<storage_table>" // (string) Name of table where storage is saved. The table stucture is the same as the default storage table.
+# Max: <max_amount> // (int) *optional* Maximum number of items in storage. MAX_STORAGE will be used if no value is defined.
+###############################################################################################################################################
+#Storages:
+# - ID: 1
+# Name: "VIP Storage"
+# Table: "vip_storage"
+# Max: 300
diff --git a/conf/inter_athena.conf b/conf/inter_athena.conf
index 8328e5ca507..5938f2e20e9 100644
--- a/conf/inter_athena.conf
+++ b/conf/inter_athena.conf
@@ -153,6 +153,6 @@ roulette_table: db_roulette
// Use SQL item_db, mob_db and mob_skill_db for the map server? (yes/no)
use_sql_db: no
-inter_server_conf: conf/inter_server.conf
+inter_server_conf: inter_server.yml
import: conf/import/inter_conf.txt
diff --git a/conf/inter_server.conf b/conf/inter_server.conf
deleted file mode 100644
index 3f0bc2f852e..00000000000
--- a/conf/inter_server.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Config for Storages
- *
- * To access the premium storage, use script command 'openstorage2'.
- * If premium storages are added, copy the structure of the storage table and match the table name in this config.
- * The 'max' of premium storages are not adjusted by 'vip_storage_increase' config nor MIN_STORAGE.
- *
- * Structure:
-{
- id: <storage_id> // (int) Storage ID will be used for script command 'openstorage2'.
- name: "<storage name>" // (string) Storage name will be sent to the client to display on the title bar.
- table: "<storage_table>" // (string) Name of table where storage is saved. The table stucture is the same as the default storage table.
- max: <max_amount> // (int) *optional* Maximum number of items in storage. MAX_STORAGE will be used if no value is defined.
-}, // Use comma to add more storages
- **/
-
-storages: (
-{
- // Default Storage
- // DO NOT CHANGE THIS UNLESS YOU KNOW WHAT YOU ARE DOING
- id: 0
- name: "Storage"
- table: "storage"
- //max: 600
-}
-)
diff --git a/conf/inter_server.yml b/conf/inter_server.yml
new file mode 100644
index 00000000000..70cd3d09c71
--- /dev/null
+++ b/conf/inter_server.yml
@@ -0,0 +1,34 @@
+# 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/>.
+#
+###########################################################################
+# Config for Storages
+#
+# To access the premium storage, use script command 'openstorage2'.
+# If premium storages are added, copy the structure of the storage table and match the table name in this config.
+# The 'max' of premium storages are not adjusted by 'vip_storage_increase' config nor MIN_STORAGE.
+#
+# Structure:
+# - ID: <storage_id> // (int) Storage ID will be used for script command 'openstorage2'.
+# Name: "<storage name>" // (string) Storage name will be sent to the client to display on the title bar.
+# Table: "<storage_table>" // (string) Name of table where storage is saved. The table stucture is the same as the default storage table.
+# Max: <max_amount> // (int) *optional* Maximum number of items in storage. MAX_STORAGE will be used if no value is defined.
+
+Storages:
+ - ID: 0
+ Name: "Storage"
+ Table: "storage"
diff --git a/conf/login_athena.conf b/conf/login_athena.conf
index 08c7a31d918..ddd5ddd8903 100644
--- a/conf/login_athena.conf
+++ b/conf/login_athena.conf
@@ -106,12 +106,6 @@ vip_char_increase: -1
// 0 or more: new accounts automatically expire after the given value, in seconds
start_limited_time: -1
-// Check the clientversion field set in clientinfo.xml?
-check_client_version: no
-
-// What version is allowed to connect? (if the option above is enabled)
-client_version_to_connect: 20
-
// Store passwords as MD5 hashes instead of plain text?
// NOTE: Will not work with clients that use <passwordencrypt>
use_MD5_passwords: no
diff --git a/conf/msg_conf/char_msg.conf b/conf/msg_conf/char_msg.conf
index 181b29b6a97..b54531edd3f 100644
--- a/conf/msg_conf/char_msg.conf
+++ b/conf/msg_conf/char_msg.conf
@@ -149,11 +149,16 @@
216: No account with ID '%d' was found.
217: -- Account %d --
218: User: %s | GM Group: %d | State: %d
-219: Password: %s (PIN:%s)
-220: ****
+//219: FREE
+//220: FREE
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
224: -- Character Details --
225: [Slot/CID: %d/%d] %s | %s | Level: %d/%d | %s
226: This account doesn't have characters.
+
+// Achievements
+227: GM
+228: Achievement Reward Mail
+229: [%s] Achievement Reward.
diff --git a/conf/msg_conf/map_msg.conf b/conf/msg_conf/map_msg.conf
index 6b7ca3235cf..817250c8685 100644
--- a/conf/msg_conf/map_msg.conf
+++ b/conf/msg_conf/map_msg.conf
@@ -423,7 +423,7 @@
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
+//407: free
//chrif related
408: Need disconnection to perform change-sex request...
409: Your sex has been changed (need disconnection by the server)...
@@ -690,7 +690,7 @@
666: Pets are not allowed in Guild Wars.
667: You're not dead.
668: Your actual memo positions are:
-669: You broke the target's weapon.
+//669 free
670: You can't leave battleground guilds.
671: Friend already exists.
672: Name not found in list.
@@ -753,7 +753,7 @@
719: Personal rate information will be shown.
//Skill messages
-720: %s is required.
+//720: Free
721: [%s] Poison effect was applied to the weapon.
//722: Free
@@ -776,7 +776,7 @@
// @cloneequip/@clonestat
734: Cannot clone your own %s.
-735: Please enter char_id or \"char name\".
+735: Usage: %s <char name/ID>
736: Cannot clone %s from this player.
737: '%s' (%d) cannot be cloned, limit (%d).
738: Clone '%s' is done.
@@ -825,7 +825,13 @@
769: %s %s has been banned.
770: %s %s has been unbanned.
-//771-899 free
+//@reloadachievementdb
+771: Achievement database has been reloaded.
+
+// Achievements
+772: Achievements are disabled.
+
+//773-899 free
//------------------------------------
// More atcommands message
@@ -1140,13 +1146,13 @@
1164: skill %d: %s (%s)
// @useskill
-1165: Usage: @useskill <skill ID> <skill level> <target>
+1165: Usage: @useskill <skill ID> <skill level> <char name>
// @displayskill
1166: Usage: @displayskill <skill ID> {<skill level>}
// @skilltree
-1167: Usage: @skilltree <skill ID> <target>
+1167: Usage: @skilltree <skill ID> <char name>
1168: Player is using %s skill tree (%d basic points).
1169: The player cannot use that skill.
1170: Player requires level %d of skill %s.
@@ -1615,8 +1621,8 @@
1475: ---- My Channels ----
1476: You have not joined any channels.
-// @reloadpacketdb
-1477: Packet database has been reloaded.
+// @effect
+1477: Please enter a valid effect id in the range from %d to %d.
// @partysharelvl
1478: Party share level range has been changed successfully.
@@ -1657,5 +1663,9 @@
1501: Spying on the %s clan.
1502: Incorrect clan name/ID.
+// PK Mode msgs
+1503: You've entered a PK Zone.
+1504: You've entered a PK Zone (safe until level %d).
+
//Custom translations
-//import: conf/msg_conf/import/map_msg_eng_conf.txt
+import: conf/msg_conf/import/map_msg_eng_conf.txt
diff --git a/conf/msg_conf/map_msg_chn.conf b/conf/msg_conf/map_msg_chn.conf
index 0825d8724ef..db259dd8b3b 100644
--- a/conf/msg_conf/map_msg_chn.conf
+++ b/conf/msg_conf/map_msg_chn.conf
@@ -643,7 +643,7 @@
666: 公會戰不允許有寵物
667: 你沒死亡
668: 你實際儲存點是:
-669: 你破壞目標的武器
+//669 free
670: 你無法離開戰場公會
671: 這朋友已存在
672: 該名稱不在清單內
@@ -1469,8 +1469,7 @@
1475: ---- 我的頻道 ----
1476: 你沒有加入任何的頻道
-// @reloadpacketdb
-1477: 完成重載封包數據庫.
+//1477 free
// @partysharelvl
1478: 隊伍經驗均分的等級間距已成功變更。
@@ -1499,4 +1498,4 @@
1498: You cannot create a guild because you are in a clan.
//Custom translations
-//import: conf/msg_conf/import/map_msg_chn_conf.txt
+import: conf/msg_conf/import/map_msg_chn_conf.txt
diff --git a/conf/msg_conf/map_msg_frn.conf b/conf/msg_conf/map_msg_frn.conf
index ef24eaddcae..4279933589c 100644
--- a/conf/msg_conf/map_msg_frn.conf
+++ b/conf/msg_conf/map_msg_frn.conf
@@ -655,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: Vous brisez l'arme de la cible.
+//669 free
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.
@@ -1480,8 +1480,7 @@
1475: ---- Canaux rejoins ----
1476: Vous n'avez rejoins aucun canal.
-// @reloadpacketdb
-1477: Base de donn�e des 'Packets' recharg�e.
+//1477 free
// @partysharelvl
1478: Diff�rence de niveau pour le partage en �quipe chang�.
@@ -1491,4 +1490,4 @@
1498: You cannot create a guild because you are in a clan.
//Custom translations
-//import: conf/msg_conf/import/map_msg_frn_conf.txt
+import: conf/msg_conf/import/map_msg_frn_conf.txt
diff --git a/conf/msg_conf/map_msg_idn.conf b/conf/msg_conf/map_msg_idn.conf
index 3ea211e779c..79bc84e611b 100644
--- a/conf/msg_conf/map_msg_idn.conf
+++ b/conf/msg_conf/map_msg_idn.conf
@@ -689,7 +689,7 @@
666: Peliharaan tidak diperbolehkan di Guild Wars.
667: Kamu tidak mati.
668: Posisi memomu saat ini adalah:
-669: Kamu menghancurkan senajta lawan.
+//669 kosong
670: Kamu tidak dapat meninggalkan guild battleground.
671: Teman sudah ada.
672: Nama tidak ditemukan di daftar.
@@ -1571,8 +1571,7 @@
1475: ---- Channel yang diikuti ----
1476: Kamu tidak bergabung ke channel manapun saat ini.
-// @reloadpacketdb
-1477: Database paket telah dimuat ulang.
+//1477 free
// @partysharelvl
1478: Jarak level dalam party share telah diubah dengan sukses.
@@ -1607,4 +1606,4 @@
1498: You cannot create a guild because you are in a clan.
//Bila ada terjemahan lain
-//import: conf/msg_conf/import/map_msg_idn_conf.txt
+import: conf/msg_conf/import/map_msg_idn_conf.txt
diff --git a/conf/msg_conf/map_msg_mal.conf b/conf/msg_conf/map_msg_mal.conf
new file mode 100644
index 00000000000..4d98c7d9250
--- /dev/null
+++ b/conf/msg_conf/map_msg_mal.conf
@@ -0,0 +1,3 @@
+
+//Custom translations
+import: conf/msg_conf/import/map_msg_mal_conf.txt
diff --git a/conf/msg_conf/map_msg_por.conf b/conf/msg_conf/map_msg_por.conf
index bb533069fac..dddb8543fe7 100644
--- a/conf/msg_conf/map_msg_por.conf
+++ b/conf/msg_conf/map_msg_por.conf
@@ -635,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: Voc� quebrou a arma de seu oponente.
+//669 livre
670: Voc� n�o pode deixar os campos de batalha em uma guerra.
671: Amigo j� existente.
672: Nome n�o encontrado na lista.
@@ -1467,4 +1467,4 @@
1498: You cannot create a guild because you are in a clan.
//Custom translations
-//import: conf/msg_conf/import/map_msg_por_conf.txt
+import: conf/msg_conf/import/map_msg_por_conf.txt
diff --git a/conf/msg_conf/map_msg_rus.conf b/conf/msg_conf/map_msg_rus.conf
index ae78d70d30b..45e85f31892 100644
--- a/conf/msg_conf/map_msg_rus.conf
+++ b/conf/msg_conf/map_msg_rus.conf
@@ -655,7 +655,7 @@
666: ������� ��������� �� ����� ����� �� ��������.
667: �� �� ������.
668: ���� ������� ����� ����������:
-669: �� ������� ������ ����.
+//669 �� ������������
670: �� �� ������ �������� ��.
671: ���� ��� ��������.
672: ��� �� ������� � ������.
@@ -1480,8 +1480,7 @@
1475: ---- ��� ������ ----
1476: �� �� �������������� �� � ������ ������.
-// @reloadpacketdb
-1477: ���� ������ ������� ���� �������������.
+//1477 free
// @partysharelvl
1478: �������� ������� ���������� ����� ����� ����������� ������ ������� �������.
@@ -1491,4 +1490,4 @@
1498: You cannot create a guild because you are in a clan.
// ���������������� �������
-//import: conf/msg_conf/import/map_msg_rus_conf.txt
+import: conf/msg_conf/import/map_msg_rus_conf.txt
diff --git a/conf/msg_conf/map_msg_spn.conf b/conf/msg_conf/map_msg_spn.conf
index b33d445de55..14b7341dcca 100644
--- a/conf/msg_conf/map_msg_spn.conf
+++ b/conf/msg_conf/map_msg_spn.conf
@@ -2,20 +2,16 @@
// 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
-// 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
-
+//
+// Formato:
+// msg_number: mensaje traducido (tama�o m�ximo: 255 caracteres)
+//
// 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)
-// Aqu� empiezan los mensajes relacionados con los comandos de GM
+// Mensajes de comandos de GM
// -----------------------
0: Te has teletransportado.
@@ -90,10 +86,10 @@
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 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.
+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.
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: %d
@@ -131,9 +127,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�%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.
+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.
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.
@@ -158,7 +154,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 cual es prueba a@a.com
+144: La direcci�n de correo electr�nico no es v�lida, si no sabes cu�l 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.
@@ -259,7 +255,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: El servidor lleva en marcha %ld d�as, %ld horas, %ld minutos, %ld segundos.
+245: Tiempo de conexi�n del servidor: D�as: %ld. Horas: %ld. Minutos: %ld. Segundos: %ld.
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.
@@ -310,6 +306,13 @@
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
@@ -352,14 +355,15 @@
//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.
@@ -392,7 +396,15 @@
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-389 vac�os
+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.
//NoAsk (rechazar invitaciones)
390: Rechazas todas las invitaciones de manera autom�tica.
391: Ya no rechazas todas las invitaciones de manera autom�tica.
@@ -406,11 +418,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 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.
+// 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.
//407 free
//Mensajes de chrif
408: Necesitas desconectarte para realizar el cambio de sexo.
@@ -436,15 +448,21 @@
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.
-// Return pet to egg message
-451: No puedes devolver tu pet al huevo porque tu inventario est� lleno.
+// Mensaje al devolver la mascota al huevo
+451: No puedes devolver tu mascota 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.
@@ -458,7 +476,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
@@ -479,35 +497,65 @@
503: Est� activado el modo nocturno.
//Mensajes de los puntos de cash
-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.
+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.
-// 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
+// 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:
// Sistema de correo
-//----------------------
-510: Tienes un total de %d cartas nuevas�(%d sin leer).
+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.
// 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: %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.
@@ -639,22 +687,21 @@
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 del Emperium.
+666: Las mascotas est�n prohibidas en la guerra de clanes.
667: No est�s muerto.
668: Tus puntos de memorizaci�n actuales son los siguientes:
-669: Has roto el arma de tu enemigo.
+//669 vac�o
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 del Emperium.
-677: No se puede romper una alianza durante una Guerra del Emperium.
+676: No se pueden establecer alianzas durante una guerra de clanes.
+677: No se puede romper una alianza durante una guerra de clanes.
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
@@ -676,6 +723,86 @@
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 %hu ha sido eliminado de tu inventario.
+710: El objeto %hu ha sido eliminado de tu carro.
+711: El objeto %hu ha sido eliminado de tu almac�n.
+
+// Item shop
+712: No tienes suficientes %s (%hu).
+713: No tienes suficientes '%s'.
+714: Listado de la tienda de objetos: %s (%hu)
+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: %u!!
+
+// @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
@@ -685,6 +812,27 @@
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
//------------------------------------
@@ -701,13 +849,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)
@@ -720,7 +868,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.
@@ -737,22 +885,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.
@@ -760,22 +908,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
@@ -788,89 +936,92 @@
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
-1021: Introduce el nombre de un jugador (Instrucciones: @charblock/@block <nombre del personaje>)
+// @charblock/@charunblock
+1021: Introduce el nombre de un jugador (instrucciones: @charblock/@block <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>).
+// @ban/@charban
+1022: Introduce�la duraci�n�del bloqueo y el nombre del jugador (instrucciones: %s <tiempo> <nombre del personaje>).
1023: No est�s autorizado para modificar ning�n bloqueo temporal.
-// @charunblock
-1024: Introduce el nombre de un jugador bloqueado (Instrucciones: @charunblock <nombre del personaje>).
+// @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.
// @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: 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 ------
@@ -884,14 +1035,16 @@
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.
@@ -902,34 +1055,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.
@@ -943,32 +1096,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>
@@ -989,7 +1142,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
@@ -1047,7 +1200,7 @@
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.
+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.
@@ -1085,10 +1238,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
@@ -1096,14 +1249,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>
@@ -1112,7 +1265,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>
@@ -1120,7 +1273,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.
@@ -1131,7 +1284,7 @@
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:%u� EXP de oficio:%u� HIT:%d FLEE:%d
@@ -1149,7 +1302,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.
@@ -1158,17 +1311,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:
@@ -1192,7 +1345,7 @@
1275: Has alterado los atributos del hom�nculo.
// @iteminfo
-1276: Introduce el nombre/ID de un objeto (Instrucciones: @ii/@iteminfo <nombre/ID del objeto>).
+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
@@ -1202,13 +1355,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.
@@ -1223,7 +1376,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
@@ -1232,13 +1385,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.
@@ -1315,7 +1468,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.
@@ -1336,21 +1489,23 @@
// @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:%d
-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
-//1376: free
+
+// @cash/@points
+1376: Cierra la tienda de cash antes de ejecutar este comando.
// @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'.
@@ -1364,11 +1519,11 @@
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.
@@ -1387,9 +1542,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.
@@ -1459,15 +1614,58 @@
1468: -- Limpia la lista de accesos prohibidos al canal.
1469: * %s delete <#nombre del canal>
1470: -- Elimina el canal especificado.
-1471: * %s list mine
+1471: * %s listado propio
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: You cannot create a guild because you are in a clan.
+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).
//Traducciones personalizadas
-//import: conf/msg_conf/import/map_msg_spn_conf.txt
+import: conf/msg_conf/import/map_msg_spn_conf.txt
diff --git a/conf/msg_conf/map_msg_tha.conf b/conf/msg_conf/map_msg_tha.conf
index 5b6ce2cbb06..758f03f5758 100644
--- a/conf/msg_conf/map_msg_tha.conf
+++ b/conf/msg_conf/map_msg_tha.conf
@@ -649,7 +649,7 @@
666: �ѵ������§�����١�Ѻحҵ�������㹾�鹷�� Guild Wars.
667: �س�������.
668: ���˹觷��س��ѹ�֡����մѧ���:
-669: �س���������ظ�ͧ�������.
+//669 free
670: �س�������ö�͡�ҡ Guild ��㹢������� battleground.
671: ����������������.
672: ��辺�������¡��.
@@ -1473,8 +1473,7 @@
1475: ---- Channels ���ѹ���� ----
1476: �س���������� channels ����.
-// @reloadpacketdb
-1477: �ҹ������ Packet ��١��Ŵ�������º����.
+//1477 free
// @partysharelvl
1478: �дѺ Level ����Ѻ������ ��١��Ѻ����¹���º��������.
@@ -1510,4 +1509,4 @@
1498: You cannot create a guild because you are in a clan.
//Custom translations
-//import: conf/msg_conf/import/map_msg_tha_conf.txt
+import: conf/msg_conf/import/map_msg_tha_conf.txt
diff --git a/conf/readme.md b/conf/readme.md
new file mode 100644
index 00000000000..3bfa45acd6c
--- /dev/null
+++ b/conf/readme.md
@@ -0,0 +1,118 @@
+# Import Directories
+
+## What is the import directory for?
+
+The `import/` directory provides a way for you to change your config settings without the need to even touch the main `/conf/` and `/db/` files.
+
+By placing your custom entries into the `import/` directory within these two locations, your core files will not need to have any conflicts resolved when you update your server. You store your changes, and the rest is updated with rAthena.
+
+## How does this work?
+
+Think of "import" as in "override". Place only the settings you have changed in the import files, or settings you are "overriding".
+
+For example, when setting up a server there are always a few config settings that users would like to change in order for rAthena to suit their needs. The following example will show you how to use the `/conf/import/` directory correctly. (for `/db/import/` examples, see [/db/readme.md](/db/readme.md))
+
+### Login Server
+---
+We want to use MD5 passwords and disable `_m/f` account creation methods.
+
+#### /conf/import/login_conf.txt
+
+ new_account: no
+ use_MD5_passwords: yes
+
+
+### Char Server
+---
+We want to change the server name to "Odin".
+
+#### /conf/import/char_conf.txt
+
+ server_name: Odin
+
+
+### Map Server
+---
+We want to hide all error messages and add a few custom maps.
+
+#### /conf/import/map_conf.txt
+
+ //Makes server output more silent by omitting certain types of messages:
+ //16: Hide Error and SQL Error messages.
+ console_silent: 16
+ map: 1@toy
+ map: 1@valley
+ map: shops
+
+
+### Inter Server
+---
+We want to use MySQL tables instead of .txt files.
+
+#### /conf/import/inter_conf.txt
+
+ use_sql_db: yes
+
+
+### Logging Settings
+---
+We want to log all items and all chat messages.
+
+#### /conf/import/log_conf.txt
+
+ log_filter: 1
+ // Log CHAT (Global, Whisper, Party, Guild, Main chat, Clan) (Note 3)
+ // log_chat: 63 = logs everything
+ log_chat: 63
+
+
+### Battle Configs
+---
+We want to change the way various mechanics work. For anything that would be configured in the `/conf/battle/` directory, it will go into `import/battle_conf.txt`. To help you find which configs came from where, it's generally a good idea to comment out the name of the file that specific collection of configs came from.
+
+#### /conf/import/battle_conf.txt
+
+ // guild.conf
+ guild_exp_limit: 90
+
+ // items.conf
+ vending_over_max: no
+ vending_tax: 100
+ weapon_produce_rate: 200
+ potion_produce_rate: 200
+ produce_item_name_input: 0x03
+
+ // misc.conf
+ duel_time_interval: 2
+ at_mapflag: yes
+ at_monsterignore: yes
+ cashshop_show_points: yes
+ hide_fav_sell: yes
+ // Whether or not mail box status is displayed upon login.
+ // Default: 0
+ // 0 = No
+ // 1 = Yes
+ // 2 = Yes, when there are unread mails
+ mail_show_status: 2
+
+ // monster.conf
+ show_mob_info: 3
+
+ // party.conf
+ party_hp_mode: 1
+ display_party_name: yes
+
+ // pet.conf
+ pet_rename: yes
+
+ // player.conf
+ max_aspd: 196
+ max_third_aspd: 196
+ max_extended_aspd: 196
+ vip_disp_rate: no
+
+ // status.conf
+ debuff_on_logout: 3
+
+
+We cannot stress enough how helpful this system is for everyone. The majority of git conflicts will simply go away if users make use of the `import/` system.
diff --git a/conf/readme.txt b/conf/readme.txt
deleted file mode 100644
index 7acc986564b..00000000000
--- a/conf/readme.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-What is the import folder for?
--------------------------------------------------------------------------------
-
-The folder provides a way for you to change your config settings without having
-to update the files every time you update your server. You store your changes,
-and the rest is updated with rAthena.
-
-How does this work?
--------------------------------------------------------------------------------
-
-Place only the settings you have changed in the import files.
-For example, if you want to change a value in /battle/exp.conf:
-
- // Rate at which exp. is given. (Note 2)
- base_exp_rate: 700
-
-You could instead copy the setting into /import/battle_conf.txt,
-and you'll eliminate any problems updating in the future.
-
-Neat, isn't it?
-
-- Semi-guide by Ajarn / Euphy
diff --git a/configure b/configure
index ffd6e161eb3..672d3357808 100755
--- a/configure
+++ b/configure
@@ -623,6 +623,7 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS
LIBOBJS
+CXXFLAG_CLEARS
CFLAGS_AR
DLLEXT
PCRE_CFLAGS
@@ -634,27 +635,26 @@ MYSQL_CFLAGS
MYSQL_VERSION
HAVE_MYSQL
MYSQL_CONFIG_HOME
-CXXCPP
WITH_PLUGINS
SOFLAGS
AR
-ac_ct_CXX
-CXXFLAGS
-CXX
+ac_ct_CC
+CFLAGS
+CC
SET_MAKE
OMAP
OCHR
OLOG
EGREP
GREP
-CPP
+CXXCPP
OBJEXT
EXEEXT
-ac_ct_CC
+ac_ct_CXX
CPPFLAGS
LDFLAGS
-CFLAGS
-CC
+CXXFLAGS
+CXX
target_alias
host_alias
build_alias
@@ -674,7 +674,6 @@ infodir
docdir
oldincludedir
includedir
-runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -721,16 +720,15 @@ with_zlib
ac_precious_vars='build_alias
host_alias
target_alias
-CC
-CFLAGS
+CXX
+CXXFLAGS
LDFLAGS
LIBS
CPPFLAGS
-CPP
-CXX
-CXXFLAGS
CCC
-CXXCPP'
+CXXCPP
+CC
+CFLAGS'
# Initialize some variables set by options.
@@ -769,7 +767,6 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE}'
@@ -1022,15 +1019,6 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
- -runstatedir | --runstatedir | --runstatedi | --runstated \
- | --runstate | --runstat | --runsta | --runst | --runs \
- | --run | --ru | --r)
- ac_prev=runstatedir ;;
- -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
- | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
- | --run=* | --ru=* | --r=*)
- runstatedir=$ac_optarg ;;
-
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1168,7 +1156,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir runstatedir
+ libdir localedir mandir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1321,7 +1309,6 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -1401,17 +1388,16 @@ Optional Packages:
the library files are in DIR/lib
Some influential environment variables:
- CC C compiler command
- CFLAGS C compiler flags
+ CXX C++ compiler command
+ CXXFLAGS C++ compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
- CPP C preprocessor
- CXX C++ compiler command
- CXXFLAGS C++ compiler flags
CXXCPP C++ preprocessor
+ CC C compiler command
+ CFLAGS C compiler flags
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -1493,10 +1479,10 @@ fi
## Autoconf initialization. ##
## ------------------------ ##
-# ac_fn_c_try_compile LINENO
-# --------------------------
+# ac_fn_cxx_try_compile LINENO
+# ----------------------------
# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
+ac_fn_cxx_try_compile ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
rm -f conftest.$ac_objext
@@ -1516,7 +1502,7 @@ $as_echo "$ac_try_echo"; } >&5
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } && {
- test -z "$ac_c_werror_flag" ||
+ test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then :
ac_retval=0
@@ -1529,12 +1515,12 @@ fi
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
-} # ac_fn_c_try_compile
+} # ac_fn_cxx_try_compile
-# ac_fn_c_try_cpp LINENO
-# ----------------------
+# ac_fn_cxx_try_cpp LINENO
+# ------------------------
# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
+ac_fn_cxx_try_cpp ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
if { { ac_try="$ac_cpp conftest.$ac_ext"
@@ -1553,7 +1539,7 @@ $as_echo "$ac_try_echo"; } >&5
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } > conftest.i && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
}; then :
ac_retval=0
@@ -1566,14 +1552,14 @@ fi
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
-} # ac_fn_c_try_cpp
+} # ac_fn_cxx_try_cpp
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
+# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
+# ---------------------------------------------------------
# Tests whether HEADER exists, giving a warning if it cannot be compiled using
# the include files in INCLUDES and setting the cache variable VAR
# accordingly.
-ac_fn_c_check_header_mongrel ()
+ac_fn_cxx_check_header_mongrel ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
if eval \${$3+:} false; then :
@@ -1594,7 +1580,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
$4
#include <$2>
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
ac_header_compiler=yes
else
ac_header_compiler=no
@@ -1610,7 +1596,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <$2>
_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_cxx_try_cpp "$LINENO"; then :
ac_header_preproc=yes
else
ac_header_preproc=no
@@ -1620,7 +1606,7 @@ rm -f conftest.err conftest.i conftest.$ac_ext
$as_echo "$ac_header_preproc" >&6; }
# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #((
yes:no: )
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
@@ -1653,13 +1639,13 @@ $as_echo "$ac_res" >&6; }
fi
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-} # ac_fn_c_check_header_mongrel
+} # ac_fn_cxx_check_header_mongrel
-# ac_fn_c_try_run LINENO
-# ----------------------
+# ac_fn_cxx_try_run LINENO
+# ------------------------
# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
# that executables *can* be run.
-ac_fn_c_try_run ()
+ac_fn_cxx_try_run ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
if { { ac_try="$ac_link"
@@ -1695,13 +1681,13 @@ fi
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
-} # ac_fn_c_try_run
+} # ac_fn_cxx_try_run
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
+# ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES
+# ---------------------------------------------------------
# Tests whether HEADER exists and can be compiled using the include files in
# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
+ac_fn_cxx_check_header_compile ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
@@ -1714,7 +1700,7 @@ else
$4
#include <$2>
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
eval "$3=yes"
else
eval "$3=no"
@@ -1726,12 +1712,12 @@ eval ac_res=\$$3
$as_echo "$ac_res" >&6; }
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-} # ac_fn_c_check_header_compile
+} # ac_fn_cxx_check_header_compile
-# ac_fn_cxx_try_compile LINENO
-# ----------------------------
+# ac_fn_c_try_compile LINENO
+# --------------------------
# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_compile ()
+ac_fn_c_try_compile ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
rm -f conftest.$ac_objext
@@ -1751,7 +1737,7 @@ $as_echo "$ac_try_echo"; } >&5
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } && {
- test -z "$ac_cxx_werror_flag" ||
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then :
ac_retval=0
@@ -1764,49 +1750,7 @@ fi
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
-} # ac_fn_cxx_try_compile
-
-# ac_fn_cxx_try_run LINENO
-# ------------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_cxx_try_run ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
- { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then :
- ac_retval=0
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=$ac_status
-fi
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_run
+} # ac_fn_c_try_compile
# ac_fn_cxx_try_link LINENO
# -------------------------
@@ -1920,196 +1864,41 @@ $as_echo "$ac_res" >&6; }
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_cxx_check_func
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
-# ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES
-# ---------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_cxx_check_header_compile ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- eval "$3=yes"
-else
- eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+It was created by $as_me, which was
+generated by GNU Autoconf 2.69. Invocation command line was
-} # ac_fn_cxx_check_header_compile
+ $ $0 $@
-# ac_fn_cxx_try_cpp LINENO
-# ------------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_cpp ()
+_ACEOF
+exec 5>>config.log
{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- grep -v '^ *+' conftest.err >conftest.er1
- cat conftest.er1 >&5
- mv -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } > conftest.i && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- }; then :
- ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
- ac_retval=1
-fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
-} # ac_fn_cxx_try_cpp
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
-# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
-# ---------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_cxx_check_header_mongrel ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if eval \${$3+:} false; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- ac_header_compiler=yes
-else
- ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
+/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
+/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
+/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <$2>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
- ac_header_preproc=yes
-else
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #((
- yes:no: )
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
- ;;
- no:yes:* )
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
- ;;
-esac
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_cxx_check_header_mongrel
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.69. Invocation command line was
-
- $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
-
-/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
-/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
-/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
-
-_ASUNAME
+_ASUNAME
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -2429,223 +2218,33 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+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/mt19937ar/Makefile 3rdparty/libconfig/Makefile 3rdparty/yaml-cpp/Makefile"
-
-ac_config_files="$ac_config_files src/char/Makefile src/login/Makefile"
-
-ac_config_files="$ac_config_files src/map/Makefile src/tool/Makefile"
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_CC="gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_CC" = x; then
- CC=""
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+if test -z "$CXX"; then
+ if test -n "$CCC"; then
+ CXX=$CCC
else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- CC=$ac_ct_CC
- fi
-else
- CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- fi
-fi
-if test -z "$CC"; then
- # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
- ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
- fi
- ac_cv_prog_CC="cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
- # We found a bogon in the path, so make sure we never use it.
- set dummy $ac_cv_prog_CC
- shift
- if test $# != 0; then
- # We chose a different compiler from the bogus one.
- # However, it has the same basename, so the bogon will be chosen
- # first if we set CC to just the basename; use the full file name.
- shift
- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
- fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- for ac_prog in cl.exe
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if ${ac_cv_prog_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
+ if test -n "$CXX"; then
+ ac_cv_prog_CXX="$CXX" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -2654,7 +2253,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -2664,32 +2263,32 @@ IFS=$as_save_IFS
fi
fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- test -n "$CC" && break
+ test -n "$CXX" && break
done
fi
-if test -z "$CC"; then
- ac_ct_CC=$CC
- for ac_prog in cl.exe
+if test -z "$CXX"; then
+ ac_ct_CXX=$CXX
+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+ if test -n "$ac_ct_CXX"; then
+ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -2698,7 +2297,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_CC="$ac_prog"
+ ac_cv_prog_ac_ct_CXX="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -2708,21 +2307,21 @@ IFS=$as_save_IFS
fi
fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- test -n "$ac_ct_CC" && break
+ test -n "$ac_ct_CXX" && break
done
- if test "x$ac_ct_CC" = x; then
- CC=""
+ if test "x$ac_ct_CXX" = x; then
+ CXX="g++"
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2730,20 +2329,14 @@ yes:)
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
- CC=$ac_ct_CC
+ CXX=$ac_ct_CXX
fi
fi
+ fi
fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
-
# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
set X $ac_compile
ac_compiler=$2
for ac_option in --version -v -V -qversion; do
@@ -2783,8 +2376,8 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler works" >&5
+$as_echo_n "checking whether the C++ compiler works... " >&6; }
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
@@ -2854,14 +2447,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
+as_fn_error 77 "C++ compiler cannot create executables
See \`config.log' for more details" "$LINENO" 5; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler default output file name" >&5
+$as_echo_n "checking for C++ compiler default output file name... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
$as_echo "$ac_file" >&6; }
ac_exeext=$ac_cv_exeext
@@ -2955,7 +2548,7 @@ $as_echo "$ac_try_echo"; } >&5
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
+as_fn_error $? "cannot run C++ compiled programs.
If you meant to cross compile, use \`--host'.
See \`config.log' for more details" "$LINENO" 5; }
fi
@@ -3017,9 +2610,9 @@ fi
$as_echo "$ac_cv_objext" >&6; }
OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3036,33 +2629,33 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
ac_compiler_gnu=yes
else
ac_compiler_gnu=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
- GCC=yes
+ GXX=yes
else
- GCC=
+ GXX=
fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if ${ac_cv_prog_cxx_g+:} false; then :
$as_echo_n "(cached) " >&6
else
- ac_save_c_werror_flag=$ac_c_werror_flag
- ac_c_werror_flag=yes
- ac_cv_prog_cc_g=no
- CFLAGS="-g"
+ ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+ ac_cxx_werror_flag=yes
+ ac_cv_prog_cxx_g=no
+ CXXFLAGS="-g"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -3074,10 +2667,10 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_g=yes
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ ac_cv_prog_cxx_g=yes
else
- CFLAGS=""
+ CXXFLAGS=""
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -3089,11 +2682,11 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
else
- ac_c_werror_flag=$ac_save_c_werror_flag
- CFLAGS="-g"
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+ CXXFLAGS="-g"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -3105,150 +2698,67 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_g=yes
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ ac_cv_prog_cxx_g=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_c_werror_flag=$ac_save_c_werror_flag
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
- CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
- CFLAGS="-g -O2"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
+ CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+ if test "$GXX" = yes; then
+ CXXFLAGS="-g -O2"
else
- CFLAGS="-g"
+ CXXFLAGS="-g"
fi
else
- if test "$GCC" = yes; then
- CFLAGS="-O2"
+ if test "$GXX" = yes; then
+ CXXFLAGS="-O2"
else
- CFLAGS=
+ CXXFLAGS=
fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdarg.h>
-#include <stdio.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
- char **p;
- int i;
-{
- return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
- char *s;
- va_list v;
- va_start (v,p);
- s = g (p, va_arg (v,int));
- va_end (v);
- return s;
-}
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
- function prototypes and stuff, but not '\xHH' hex character constants.
- These don't provoke an error unfortunately, instead are silently treated
- as 'x'. The following induces an error, until -std is added to get
- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
- array size at least. It's necessary to write '\x00'==0 to get something
- that's true only with -std. */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
- inside strings and character constants. */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
- ;
- return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
- -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
- CC="$ac_save_CC $ac_arg"
- if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
- test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
+ac_config_files="$ac_config_files Makefile src/common/Makefile"
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
- x)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
- xno)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
- *)
- CC="$CC $ac_cv_prog_cc_c89"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
+ac_config_files="$ac_config_files 3rdparty/mt19937ar/Makefile 3rdparty/libconfig/Makefile 3rdparty/yaml-cpp/Makefile"
-fi
+ac_config_files="$ac_config_files src/char/Makefile src/login/Makefile"
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_config_files="$ac_config_files src/map/Makefile src/tool/Makefile"
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-fi
-if test -z "$CPP"; then
- if ${ac_cv_prog_CPP+:} false; then :
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+if test -z "$CXXCPP"; then
+ if ${ac_cv_prog_CXXCPP+:} false; then :
$as_echo_n "(cached) " >&6
else
- # Double quotes because CPP needs to be expanded
- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+ # Double quotes because CXXCPP needs to be expanded
+ for CXXCPP in "$CXX -E" "/lib/cpp"
do
ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
+for ac_cxx_preproc_warn_flag in '' yes
do
# Use a header file that comes with gcc, so configuring glibc
# with a fresh cross-compiler works.
@@ -3265,7 +2775,7 @@ do
#endif
Syntax error
_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_cxx_try_cpp "$LINENO"; then :
else
# Broken: fails on valid input.
@@ -3279,7 +2789,7 @@ rm -f conftest.err conftest.i conftest.$ac_ext
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_cxx_try_cpp "$LINENO"; then :
# Broken: success on invalid input.
continue
else
@@ -3297,17 +2807,17 @@ if $ac_preproc_ok; then :
fi
done
- ac_cv_prog_CPP=$CPP
+ ac_cv_prog_CXXCPP=$CXXCPP
fi
- CPP=$ac_cv_prog_CPP
+ CXXCPP=$ac_cv_prog_CXXCPP
else
- ac_cv_prog_CPP=$CPP
+ ac_cv_prog_CXXCPP=$CXXCPP
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
+for ac_cxx_preproc_warn_flag in '' yes
do
# Use a header file that comes with gcc, so configuring glibc
# with a fresh cross-compiler works.
@@ -3324,7 +2834,7 @@ do
#endif
Syntax error
_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_cxx_try_cpp "$LINENO"; then :
else
# Broken: fails on valid input.
@@ -3338,7 +2848,7 @@ rm -f conftest.err conftest.i conftest.$ac_ext
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_cxx_try_cpp "$LINENO"; then :
# Broken: success on invalid input.
continue
else
@@ -3356,15 +2866,15 @@ if $ac_preproc_ok; then :
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
See \`config.log' for more details" "$LINENO" 5; }
fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
@@ -3517,7 +3027,7 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
ac_cv_header_stdc=yes
else
ac_cv_header_stdc=no
@@ -3590,7 +3100,7 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_cxx_try_run "$LINENO"; then :
else
ac_cv_header_stdc=no
@@ -3614,7 +3124,7 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
inttypes.h stdint.h unistd.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
"
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
@@ -3627,7 +3137,7 @@ done
- ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
+ ac_fn_cxx_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
if test "x$ac_cv_header_minix_config_h" = xyes; then :
MINIX=yes
else
@@ -3666,7 +3176,7 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
ac_cv_safe_to_define___extensions__=yes
else
ac_cv_safe_to_define___extensions__=no
@@ -4638,11 +4148,11 @@ if test "x$ac_cv_prog_cc_c89" != xno; then :
fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
@@ -4895,11 +4405,11 @@ else
CXXFLAGS=
fi
fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
@@ -4948,11 +4458,11 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex
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; }
@@ -6255,8 +5765,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_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -fno-strict-aliasing"
+OLD_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS -fno-strict-aliasing"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int foo;
@@ -6268,7 +5778,7 @@ else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- CFLAGS="$OLD_CFLAGS"
+ CPPFLAGS="$OLD_CPPFLAGS"
fi
@@ -6363,141 +5873,7 @@ case $enable_manager in
;;
"memwatch")
CPPFLAGS="$CPPFLAGS -DMEMWATCH"
- ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
-if test -z "$CXXCPP"; then
- if ${ac_cv_prog_CXXCPP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- # Double quotes because CXXCPP needs to be expanded
- for CXXCPP in "$CXX -E" "/lib/cpp"
- do
- ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
- Syntax error
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-
-else
- # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
- # Broken: success on invalid input.
-continue
-else
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
- break
-fi
-
- done
- ac_cv_prog_CXXCPP=$CXXCPP
-
-fi
- CXXCPP=$ac_cv_prog_CXXCPP
-else
- ac_cv_prog_CXXCPP=$CXXCPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
-$as_echo "$CXXCPP" >&6; }
-ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
- Syntax error
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-
-else
- # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
- # Broken: success on invalid input.
-continue
-else
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-ac_fn_cxx_check_header_mongrel "$LINENO" "memwatch.h" "ac_cv_header_memwatch_h" "$ac_includes_default"
+ ac_fn_cxx_check_header_mongrel "$LINENO" "memwatch.h" "ac_cv_header_memwatch_h" "$ac_includes_default"
if test "x$ac_cv_header_memwatch_h" = xyes; then :
else
@@ -7643,10 +7019,12 @@ 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
diff --git a/configure.in b/configure.in
index 6d527190afc..2715af85785 100644
--- a/configure.in
+++ b/configure.in
@@ -4,6 +4,8 @@
AC_INIT(rAthena)
AC_REVISION($Revision$)
AC_PREREQ([2.59])
+AC_LANG([C++])
+AC_LANG_COMPILER_REQUIRE
AC_CONFIG_SRCDIR([src/common/cbasetypes.h])
AC_CONFIG_FILES([Makefile src/common/Makefile])
AC_CONFIG_FILES([3rdparty/mt19937ar/Makefile 3rdparty/libconfig/Makefile 3rdparty/yaml-cpp/Makefile])
@@ -437,10 +439,11 @@ AC_PROG_CXX
AC_PATH_PROG(AR, ar)
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]])],
@@ -906,14 +909,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_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -fno-strict-aliasing"
+OLD_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS -fno-strict-aliasing"
AC_COMPILE_IFELSE(
[AC_LANG_SOURCE([int foo;])],
[AC_MSG_RESULT([yes])],
[
AC_MSG_RESULT([no])
- CFLAGS="$OLD_CFLAGS"
+ CPPFLAGS="$OLD_CPPFLAGS"
]
)
@@ -1298,9 +1301,11 @@ 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])
diff --git a/db/const.txt b/db/const.txt
index ad6fb083a26..83a9102b518 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -14,1158 +14,6 @@
// in field Value. Depending on the implementation values assigned by scripts to parameters will affect
// runtime values, such as Zeny, as well (see pc_readparam/pc_setparam).
-EF_NONE -1
-EF_HIT1 0
-EF_HIT2 1
-EF_HIT3 2
-EF_HIT4 3
-EF_HIT5 4
-EF_HIT6 5
-EF_ENTRY 6
-EF_EXIT 7
-EF_WARP 8
-EF_ENHANCE 9
-EF_COIN 10
-EF_ENDURE 11
-EF_BEGINSPELL 12
-EF_GLASSWALL 13
-EF_HEALSP 14
-EF_SOULSTRIKE 15
-EF_BASH 16
-EF_MAGNUMBREAK 17
-EF_STEAL 18
-EF_HIDING 19
-EF_PATTACK 20
-EF_DETOXICATION 21
-EF_SIGHT 22
-EF_STONECURSE 23
-EF_FIREBALL 24
-EF_FIREWALL 25
-EF_ICEARROW 26
-EF_FROSTDIVER 27
-EF_FROSTDIVER2 28
-EF_LIGHTBOLT 29
-EF_THUNDERSTORM 30
-EF_FIREARROW 31
-EF_NAPALMBEAT 32
-EF_RUWACH 33
-EF_TELEPORTATION 34
-EF_READYPORTAL 35
-EF_PORTAL 36
-EF_INCAGILITY 37
-EF_DECAGILITY 38
-EF_AQUA 39
-EF_SIGNUM 40
-EF_ANGELUS 41
-EF_BLESSING 42
-EF_INCAGIDEX 43
-EF_SMOKE 44
-EF_FIREFLY 45
-EF_SANDWIND 46
-EF_TORCH 47
-EF_SPRAYPOND 48
-EF_FIREHIT 49
-EF_FIRESPLASHHIT 50
-EF_COLDHIT 51
-EF_WINDHIT 52
-EF_POISONHIT 53
-EF_BEGINSPELL2 54
-EF_BEGINSPELL3 55
-EF_BEGINSPELL4 56
-EF_BEGINSPELL5 57
-EF_BEGINSPELL6 58
-EF_BEGINSPELL7 59
-EF_LOCKON 60
-EF_WARPZONE 61
-EF_SIGHTRASHER 62
-EF_BARRIER 63
-EF_ARROWSHOT 64
-EF_INVENOM 65
-EF_CURE 66
-EF_PROVOKE 67
-EF_MVP 68
-EF_SKIDTRAP 69
-EF_BRANDISHSPEAR 70
-EF_CONE 71
-EF_SPHERE 72
-EF_BOWLINGBASH 73
-EF_ICEWALL 74
-EF_GLORIA 75
-EF_MAGNIFICAT 76
-EF_RESURRECTION 77
-EF_RECOVERY 78
-EF_EARTHSPIKE 79
-EF_SPEARBMR 80
-EF_PIERCE 81
-EF_TURNUNDEAD 82
-EF_SANCTUARY 83
-EF_IMPOSITIO 84
-EF_LEXAETERNA 85
-EF_ASPERSIO 86
-EF_LEXDIVINA 87
-EF_SUFFRAGIUM 88
-EF_STORMGUST 89
-EF_LORD 90
-EF_BENEDICTIO 91
-EF_METEORSTORM 92
-EF_YUFITEL 93
-EF_YUFITELHIT 94
-EF_QUAGMIRE 95
-EF_FIREPILLAR 96
-EF_FIREPILLARBOMB 97
-EF_HASTEUP 98
-EF_FLASHER 99
-EF_REMOVETRAP 100
-EF_REPAIRWEAPON 101
-EF_CRASHEARTH 102
-EF_PERFECTION 103
-EF_MAXPOWER 104
-EF_BLASTMINE 105
-EF_BLASTMINEBOMB 106
-EF_CLAYMORE 107
-EF_FREEZING 108
-EF_BUBBLE 109
-EF_GASPUSH 110
-EF_SPRINGTRAP 111
-EF_KYRIE 112
-EF_MAGNUS 113
-EF_BOTTOM 114
-EF_BLITZBEAT 115
-EF_WATERBALL 116
-EF_WATERBALL2 117
-EF_FIREIVY 118
-EF_DETECTING 119
-EF_CLOAKING 120
-EF_SONICBLOW 121
-EF_SONICBLOWHIT 122
-EF_GRIMTOOTH 123
-EF_VENOMDUST 124
-EF_ENCHANTPOISON 125
-EF_POISONREACT 126
-EF_POISONREACT2 127
-EF_OVERTHRUST 128
-EF_SPLASHER 129
-EF_TWOHANDQUICKEN 130
-EF_AUTOCOUNTER 131
-EF_GRIMTOOTHATK 132
-EF_FREEZE 133
-EF_FREEZED 134
-EF_ICECRASH 135
-EF_SLOWPOISON 136
-EF_BOTTOM2 137
-EF_FIREPILLARON 138
-EF_SANDMAN 139
-EF_REVIVE 140
-EF_PNEUMA 141
-EF_HEAVENSDRIVE 142
-EF_SONICBLOW2 143
-EF_BRANDISH2 144
-EF_SHOCKWAVE 145
-EF_SHOCKWAVEHIT 146
-EF_EARTHHIT 147
-EF_PIERCESELF 148
-EF_BOWLINGSELF 149
-EF_SPEARSTABSELF 150
-EF_SPEARBMRSELF 151
-EF_HOLYHIT 152
-EF_CONCENTRATION 153
-EF_REFINEOK 154
-EF_REFINEFAIL 155
-EF_JOBCHANGE 156
-EF_LVUP 157
-EF_JOBLVUP 158
-EF_TOPRANK 159
-EF_PARTY 160
-EF_RAIN 161
-EF_SNOW 162
-EF_SAKURA 163
-EF_STATUS_STATE 164
-EF_BANJJAKII 165
-EF_MAKEBLUR 166
-EF_TAMINGSUCCESS 167
-EF_TAMINGFAILED 168
-EF_ENERGYCOAT 169
-EF_CARTREVOLUTION 170
-EF_VENOMDUST2 171
-EF_CHANGEDARK 172
-EF_CHANGEFIRE 173
-EF_CHANGECOLD 174
-EF_CHANGEWIND 175
-EF_CHANGEFLAME 176
-EF_CHANGEEARTH 177
-EF_CHAINGEHOLY 178
-EF_CHANGEPOISON 179
-EF_HITDARK 180
-EF_MENTALBREAK 181
-EF_MAGICALATTHIT 182
-EF_SUI_EXPLOSION 183
-EF_DARKATTACK 184
-EF_SUICIDE 185
-EF_COMBOATTACK1 186
-EF_COMBOATTACK2 187
-EF_COMBOATTACK3 188
-EF_COMBOATTACK4 189
-EF_COMBOATTACK5 190
-EF_GUIDEDATTACK 191
-EF_POISONATTACK 192
-EF_SILENCEATTACK 193
-EF_STUNATTACK 194
-EF_PETRIFYATTACK 195
-EF_CURSEATTACK 196
-EF_SLEEPATTACK 197
-EF_TELEKHIT 198
-EF_PONG 199
-EF_LEVEL99 200
-EF_LEVEL99_2 201
-EF_LEVEL99_3 202
-EF_GUMGANG 203
-EF_POTION1 204
-EF_POTION2 205
-EF_POTION3 206
-EF_POTION4 207
-EF_POTION5 208
-EF_POTION6 209
-EF_POTION7 210
-EF_POTION8 211
-EF_DARKBREATH 212
-EF_DEFFENDER 213
-EF_KEEPING 214
-EF_SUMMONSLAVE 215
-EF_BLOODDRAIN 216
-EF_ENERGYDRAIN 217
-EF_POTION_CON 218
-EF_POTION_ 219
-EF_POTION_BERSERK 220
-EF_POTIONPILLAR 221
-EF_DEFENDER 222
-EF_GANBANTEIN 223
-EF_WIND 224
-EF_VOLCANO 225
-EF_GRANDCROSS 226
-EF_INTIMIDATE 227
-EF_CHOOKGI 228
-EF_CLOUD 229
-EF_CLOUD2 230
-EF_MAPPILLAR 231
-EF_LINELINK 232
-EF_CLOUD3 233
-EF_SPELLBREAKER 234
-EF_DISPELL 235
-EF_DELUGE 236
-EF_VIOLENTGALE 237
-EF_LANDPROTECTOR 238
-EF_BOTTOM_VO 239
-EF_BOTTOM_DE 240
-EF_BOTTOM_VI 241
-EF_BOTTOM_LA 242
-EF_FASTMOVE 243
-EF_MAGICROD 244
-EF_HOLYCROSS 245
-EF_SHIELDCHARGE 246
-EF_MAPPILLAR2 247
-EF_PROVIDENCE 248
-EF_SHIELDBOOMERANG 249
-EF_SPEARQUICKEN 250
-EF_DEVOTION 251
-EF_REFLECTSHIELD 252
-EF_ABSORBSPIRITS 253
-EF_STEELBODY 254
-EF_FLAMELAUNCHER 255
-EF_FROSTWEAPON 256
-EF_LIGHTNINGLOADER 257
-EF_SEISMICWEAPON 258
-EF_MAPPILLAR3 259
-EF_MAPPILLAR4 260
-EF_GUMGANG2 261
-EF_TEIHIT1 262
-EF_GUMGANG3 263
-EF_TEIHIT2 264
-EF_TANJI 265
-EF_TEIHIT1X 266
-EF_CHIMTO 267
-EF_STEALCOIN 268
-EF_STRIPWEAPON 269
-EF_STRIPSHIELD 270
-EF_STRIPARMOR 271
-EF_STRIPHELM 272
-EF_CHAINCOMBO 273
-EF_RG_COIN 274
-EF_BACKSTAP 275
-EF_TEIHIT3 276
-EF_BOTTOM_DISSONANCE 277
-EF_BOTTOM_LULLABY 278
-EF_BOTTOM_RICHMANKIM 279
-EF_BOTTOM_ETERNALCHAOS 280
-EF_BOTTOM_DRUMBATTLEFIELD 281
-EF_BOTTOM_RINGNIBELUNGEN 282
-EF_BOTTOM_ROKISWEIL 283
-EF_BOTTOM_INTOABYSS 284
-EF_BOTTOM_SIEGFRIED 285
-EF_BOTTOM_WHISTLE 286
-EF_BOTTOM_ASSASSINCROSS 287
-EF_BOTTOM_POEMBRAGI 288
-EF_BOTTOM_APPLEIDUN 289
-EF_BOTTOM_UGLYDANCE 290
-EF_BOTTOM_HUMMING 291
-EF_BOTTOM_DONTFORGETME 292
-EF_BOTTOM_FORTUNEKISS 293
-EF_BOTTOM_SERVICEFORYOU 294
-EF_TALK_FROSTJOKE 295
-EF_TALK_SCREAM 296
-EF_POKJUK 297
-EF_THROWITEM 298
-EF_THROWITEM2 299
-EF_CHEMICALPROTECTION 300
-EF_POKJUK_SOUND 301
-EF_DEMONSTRATION 302
-EF_CHEMICAL2 303
-EF_TELEPORTATION2 304
-EF_PHARMACY_OK 305
-EF_PHARMACY_FAIL 306
-EF_FORESTLIGHT 307
-EF_THROWITEM3 308
-EF_FIRSTAID 309
-EF_SPRINKLESAND 310
-EF_LOUD 311
-EF_HEAL 312
-EF_HEAL2 313
-EF_EXIT2 314
-EF_GLASSWALL2 315
-EF_READYPORTAL2 316
-EF_PORTAL2 317
-EF_BOTTOM_MAG 318
-EF_BOTTOM_SANC 319
-EF_HEAL3 320
-EF_WARPZONE2 321
-EF_FORESTLIGHT2 322
-EF_FORESTLIGHT3 323
-EF_FORESTLIGHT4 324
-EF_HEAL4 325
-EF_FOOT 326
-EF_FOOT2 327
-EF_BEGINASURA 328
-EF_TRIPLEATTACK 329
-EF_HITLINE 330
-EF_HPTIME 331
-EF_SPTIME 332
-EF_MAPLE 333
-EF_BLIND 334
-EF_POISON 335
-EF_GUARD 336
-EF_JOBLVUP50 337
-EF_ANGEL2 338
-EF_MAGNUM2 339
-EF_CALLZONE 340
-EF_PORTAL3 341
-EF_COUPLECASTING 342
-EF_HEARTCASTING 343
-EF_ENTRY2 344
-EF_SAINTWING 345
-EF_SPHEREWIND 346
-EF_COLORPAPER 347
-EF_LIGHTSPHERE 348
-EF_WATERFALL 349
-EF_WATERFALL_90 350
-EF_WATERFALL_SMALL 351
-EF_WATERFALL_SMALL_90 352
-EF_WATERFALL_T2 353
-EF_WATERFALL_T2_90 354
-EF_WATERFALL_SMALL_T2 355
-EF_WATERFALL_SMALL_T2_90 356
-EF_MINI_TETRIS 357
-EF_GHOST 358
-EF_BAT 359
-EF_BAT2 360
-EF_SOULBREAKER 361
-EF_LEVEL99_4 362
-EF_VALLENTINE 363
-EF_VALLENTINE2 364
-EF_PRESSURE 365
-EF_BASH3D 366
-EF_AURABLADE 367
-EF_REDBODY 368
-EF_LKCONCENTRATION 369
-EF_BOTTOM_GOSPEL 370
-EF_ANGEL 371
-EF_DEVIL 372
-EF_DRAGONSMOKE 373
-EF_BOTTOM_BASILICA 374
-EF_ASSUMPTIO 375
-EF_HITLINE2 376
-EF_BASH3D2 377
-EF_ENERGYDRAIN2 378
-EF_TRANSBLUEBODY 379
-EF_MAGICCRASHER 380
-EF_LIGHTSPHERE2 381
-EF_LIGHTBLADE 382
-EF_ENERGYDRAIN3 383
-EF_LINELINK2 384
-EF_LINKLIGHT 385
-EF_TRUESIGHT 386
-EF_FALCONASSAULT 387
-EF_TRIPLEATTACK2 388
-EF_PORTAL4 389
-EF_MELTDOWN 390
-EF_CARTBOOST 391
-EF_REJECTSWORD 392
-EF_TRIPLEATTACK3 393
-EF_SPHEREWIND2 394
-EF_LINELINK3 395
-EF_PINKBODY 396
-EF_LEVEL99_5 397
-EF_LEVEL99_6 398
-EF_BASH3D3 399
-EF_BASH3D4 400
-EF_NAPALMVALCAN 401
-EF_PORTAL5 402
-EF_MAGICCRASHER2 403
-EF_BOTTOM_SPIDER 404
-EF_BOTTOM_FOGWALL 405
-EF_SOULBURN 406
-EF_SOULCHANGE 407
-EF_BABY 408
-EF_SOULBREAKER2 409
-EF_RAINBOW 410
-EF_PEONG 411
-EF_TANJI2 412
-EF_PRESSEDBODY 413
-EF_SPINEDBODY 414
-EF_KICKEDBODY 415
-EF_AIRTEXTURE 416
-EF_HITBODY 417
-EF_DOUBLEGUMGANG 418
-EF_REFLECTBODY 419
-EF_BABYBODY 420
-EF_BABYBODY2 421
-EF_GIANTBODY 422
-EF_GIANTBODY2 423
-EF_ASURABODY 424
-EF_4WAYBODY 425
-EF_QUAKEBODY 426
-EF_ASURABODY_MONSTER 427
-EF_HITLINE3 428
-EF_HITLINE4 429
-EF_HITLINE5 430
-EF_HITLINE6 431
-EF_ELECTRIC 432
-EF_ELECTRIC2 433
-EF_HITLINE7 434
-EF_STORMKICK 435
-EF_HALFSPHERE 436
-EF_ATTACKENERGY 437
-EF_ATTACKENERGY2 438
-EF_CHEMICAL3 439
-EF_ASSUMPTIO2 440
-EF_BLUECASTING 441
-EF_RUN 442
-EF_STOPRUN 443
-EF_STOPEFFECT 444
-EF_JUMPBODY 445
-EF_LANDBODY 446
-EF_FOOT3 447
-EF_FOOT4 448
-EF_TAE_READY 449
-EF_GRANDCROSS2 450
-EF_SOULSTRIKE2 451
-EF_YUFITEL2 452
-EF_NPC_STOP 453
-EF_DARKCASTING 454
-EF_GUMGANGNPC 455
-EF_AGIUP 456
-EF_JUMPKICK 457
-EF_QUAKEBODY2 458
-EF_STORMKICK1 459
-EF_STORMKICK2 460
-EF_STORMKICK3 461
-EF_STORMKICK4 462
-EF_STORMKICK5 463
-EF_STORMKICK6 464
-EF_STORMKICK7 465
-EF_SPINEDBODY2 466
-EF_BEGINASURA1 467
-EF_BEGINASURA2 468
-EF_BEGINASURA3 469
-EF_BEGINASURA4 470
-EF_BEGINASURA5 471
-EF_BEGINASURA6 472
-EF_BEGINASURA7 473
-EF_AURABLADE2 474
-EF_DEVIL1 475
-EF_DEVIL2 476
-EF_DEVIL3 477
-EF_DEVIL4 478
-EF_DEVIL5 479
-EF_DEVIL6 480
-EF_DEVIL7 481
-EF_DEVIL8 482
-EF_DEVIL9 483
-EF_DEVIL10 484
-EF_DOUBLEGUMGANG2 485
-EF_DOUBLEGUMGANG3 486
-EF_BLACKDEVIL 487
-EF_FLOWERCAST 488
-EF_FLOWERCAST2 489
-EF_FLOWERCAST3 490
-EF_MOCHI 491
-EF_LAMADAN 492
-EF_EDP 493
-EF_SHIELDBOOMERANG2 494
-EF_RG_COIN2 495
-EF_GUARD2 496
-EF_SLIM 497
-EF_SLIM2 498
-EF_SLIM3 499
-EF_CHEMICALBODY 500
-EF_CASTSPIN 501
-EF_PIERCEBODY 502
-EF_SOULLINK 503
-EF_CHOOKGI2 504
-EF_MEMORIZE 505
-EF_SOULLIGHT 506
-EF_MAPAE 507
-EF_ITEMPOKJUK 508
-EF_05VAL 509
-EF_BEGINASURA11 510
-EF_NIGHT 511
-EF_CHEMICAL2DASH 512
-EF_GROUNDSAMPLE 513
-EF_GI_EXPLOSION 514
-EF_CLOUD4 515
-EF_CLOUD5 516
-EF_BOTTOM_HERMODE 517
-EF_CARTTER 518
-EF_ITEMFAST 519
-EF_SHIELDBOOMERANG3 520
-EF_DOUBLECASTBODY 521
-EF_GRAVITATION 522
-EF_TAROTCARD1 523
-EF_TAROTCARD2 524
-EF_TAROTCARD3 525
-EF_TAROTCARD4 526
-EF_TAROTCARD5 527
-EF_TAROTCARD6 528
-EF_TAROTCARD7 529
-EF_TAROTCARD8 530
-EF_TAROTCARD9 531
-EF_TAROTCARD10 532
-EF_TAROTCARD11 533
-EF_TAROTCARD12 534
-EF_TAROTCARD13 535
-EF_TAROTCARD14 536
-EF_ACIDDEMON 537
-EF_GREENBODY 538
-EF_THROWITEM4 539
-EF_BABYBODY_BACK 540
-EF_THROWITEM5 541
-EF_BLUEBODY 542
-EF_HATED 543
-EF_REDLIGHTBODY 544
-EF_RO2YEAR 545
-EF_SMA_READY 546
-EF_STIN 547
-EF_RED_HIT 548
-EF_BLUE_HIT 549
-EF_QUAKEBODY3 550
-EF_SMA 551
-EF_SMA2 552
-EF_STIN2 553
-EF_HITTEXTURE 554
-EF_STIN3 555
-EF_SMA3 556
-EF_BLUEFALL 557
-EF_BLUEFALL_90 558
-EF_FASTBLUEFALL 559
-EF_FASTBLUEFALL_90 560
-EF_BIG_PORTAL 561
-EF_BIG_PORTAL2 562
-EF_SCREEN_QUAKE 563
-EF_HOMUNCASTING 564
-EF_HFLIMOON1 565
-EF_HFLIMOON2 566
-EF_HFLIMOON3 567
-EF_HO_UP 568
-EF_HAMIDEFENCE 569
-EF_HAMICASTLE 570
-EF_HAMIBLOOD 571
-EF_HATED2 572
-EF_TWILIGHT1 573
-EF_TWILIGHT2 574
-EF_TWILIGHT3 575
-EF_ITEM_THUNDER 576
-EF_ITEM_CLOUD 577
-EF_ITEM_CURSE 578
-EF_ITEM_ZZZ 579
-EF_ITEM_RAIN 580
-EF_ITEM_LIGHT 581
-EF_ANGEL3 582
-EF_M01 583
-EF_M02 584
-EF_M03 585
-EF_M04 586
-EF_M05 587
-EF_M06 588
-EF_M07 589
-EF_KAIZEL 590
-EF_KAAHI 591
-EF_CLOUD6 592
-EF_FOOD01 593
-EF_FOOD02 594
-EF_FOOD03 595
-EF_FOOD04 596
-EF_FOOD05 597
-EF_FOOD06 598
-EF_SHRINK 599
-EF_THROWITEM6 600
-EF_SIGHT2 601
-EF_QUAKEBODY4 602
-EF_FIREHIT2 603
-EF_NPC_STOP2 604
-EF_NPC_STOP2_DEL 605
-EF_FVOICE 606
-EF_WINK 607
-EF_COOKING_OK 608
-EF_COOKING_FAIL 609
-EF_TEMP_OK 610
-EF_TEMP_FAIL 611
-EF_HAPGYEOK 612
-EF_THROWITEM7 613
-EF_THROWITEM8 614
-EF_THROWITEM9 615
-EF_THROWITEM10 616
-EF_BUNSINJYUTSU 617
-EF_KOUENKA 618
-EF_HYOUSENSOU 619
-EF_BOTTOM_SUITON 620
-EF_STIN4 621
-EF_THUNDERSTORM2 622
-EF_CHEMICAL4 623
-EF_STIN5 624
-EF_MADNESS_BLUE 625
-EF_MADNESS_RED 626
-EF_RG_COIN3 627
-EF_BASH3D5 628
-EF_CHOOKGI3 629
-EF_KIRIKAGE 630
-EF_TATAMI 631
-EF_KASUMIKIRI 632
-EF_ISSEN 633
-EF_KAEN 634
-EF_BAKU 635
-EF_HYOUSYOURAKU 636
-EF_DESPERADO 637
-EF_LIGHTNING_S 638
-EF_BLIND_S 639
-EF_POISON_S 640
-EF_FREEZING_S 641
-EF_FLARE_S 642
-EF_RAPIDSHOWER 643
-EF_MAGICALBULLET 644
-EF_SPREADATTACK 645
-EF_TRACKCASTING 646
-EF_TRACKING 647
-EF_TRIPLEACTION 648
-EF_BULLSEYE 649
-EF_MAP_MAGICZONE 650
-EF_MAP_MAGICZONE2 651
-EF_DAMAGE1 652
-EF_DAMAGE1_2 653
-EF_DAMAGE1_3 654
-EF_UNDEADBODY 655
-EF_UNDEADBODY_DEL 656
-EF_GREEN_NUMBER 657
-EF_BLUE_NUMBER 658
-EF_RED_NUMBER 659
-EF_PURPLE_NUMBER 660
-EF_BLACK_NUMBER 661
-EF_WHITE_NUMBER 662
-EF_YELLOW_NUMBER 663
-EF_PINK_NUMBER 664
-EF_BUBBLE_DROP 665
-EF_NPC_EARTHQUAKE 666
-EF_DA_SPACE 667
-EF_DRAGONFEAR 668
-EF_BLEEDING 669
-EF_WIDECONFUSE 670
-EF_BOTTOM_RUNNER 671
-EF_BOTTOM_TRANSFER 672
-EF_CRYSTAL_BLUE 673
-EF_BOTTOM_EVILLAND 674
-EF_GUARD3 675
-EF_NPC_SLOWCAST 676
-EF_CRITICALWOUND 677
-EF_GREEN99_3 678
-EF_GREEN99_5 679
-EF_GREEN99_6 680
-EF_MAPSPHERE 681
-EF_POK_LOVE 682
-EF_POK_WHITE 683
-EF_POK_VALEN 684
-EF_POK_BIRTH 685
-EF_POK_CHRISTMAS 686
-EF_MAP_MAGICZONE3 687
-EF_MAP_MAGICZONE4 688
-EF_DUST 689
-EF_TORCH_RED 690
-EF_TORCH_GREEN 691
-EF_MAP_GHOST 692
-EF_GLOW1 693
-EF_GLOW2 694
-EF_GLOW4 695
-EF_TORCH_PURPLE 696
-EF_CLOUD7 697
-EF_CLOUD8 698
-EF_FLOWERLEAF 699
-EF_MAPSPHERE2 700
-EF_GLOW11 701
-EF_GLOW12 702
-EF_CIRCLELIGHT 703
-EF_ITEM315 704
-EF_ITEM316 705
-EF_ITEM317 706
-EF_ITEM318 707
-EF_STORM_MIN 708
-EF_POK_JAP 709
-EF_MAP_GREENLIGHT 710
-EF_MAP_MAGICWALL 711
-EF_MAP_GREENLIGHT2 712
-EF_YELLOWFLY1 713
-EF_YELLOWFLY2 714
-EF_BOTTOM_BLUE 715
-EF_BOTTOM_BLUE2 716
-EF_WEWISH 717
-EF_FIREPILLARON2 718
-EF_FORESTLIGHT5 719
-EF_SOULBREAKER3 720
-EF_ADO_STR 721
-EF_IGN_STR 722
-EF_CHIMTO2 723
-EF_WINDCUTTER 724
-EF_DETECT2 725
-EF_FROSTMYSTY 726
-EF_CRIMSON_STR 727
-EF_HELL_STR 728
-EF_SPR_MASH 729
-EF_SPR_SOULE 730
-EF_DHOWL_STR 731
-EF_EARTHWALL 732
-EF_SOULBREAKER4 733
-EF_CHAINL_STR 734
-EF_CHOOKGI_FIRE 735
-EF_CHOOKGI_WIND 736
-EF_CHOOKGI_WATER 737
-EF_CHOOKGI_GROUND 738
-EF_MAGENTA_TRAP 739
-EF_COBALT_TRAP 740
-EF_MAIZE_TRAP 741
-EF_VERDURE_TRAP 742
-EF_NORMAL_TRAP 743
-EF_CLOAKING2 744
-EF_AIMED_STR 745
-EF_ARROWSTORM_STR 746
-EF_LAULAMUS_STR 747
-EF_LAUAGNUS_STR 748
-EF_MILSHIELD_STR 749
-EF_CONCENTRATION2 750
-EF_FIREBALL2 751
-EF_BUNSINJYUTSU2 752
-EF_CLEARTIME 753
-EF_GLASSWALL3 754
-EF_ORATIO 755
-EF_POTION_BERSERK2 756
-EF_CIRCLEPOWER 757
-EF_ROLLING1 758
-EF_ROLLING2 759
-EF_ROLLING3 760
-EF_ROLLING4 761
-EF_ROLLING5 762
-EF_ROLLING6 763
-EF_ROLLING7 764
-EF_ROLLING8 765
-EF_ROLLING9 766
-EF_ROLLING10 767
-EF_PURPLEBODY 768
-EF_STIN6 769
-EF_RG_COIN4 770
-EF_POISONWAV 771
-EF_POISONSMOKE 772
-EF_GUMGANG4 773
-EF_SHIELDBOOMERANG4 774
-EF_CASTSPIN2 775
-EF_VULCANWAV 776
-EF_AGIUP2 777
-EF_DETECT3 778
-EF_AGIUP3 779
-EF_DETECT4 780
-EF_ELECTRIC3 781
-EF_GUARD4 782
-EF_BOTTOM_BARRIER 783
-EF_BOTTOM_STEALTH 784
-EF_REPAIRTIME 785
-EF_NC_ANAL 786
-EF_FIRETHROW 787
-EF_VENOMIMPRESS 788
-EF_FROSTMISTY 789
-EF_BURNING 790
-EF_COLDTHROW 791
-EF_MAKEHALLU 792
-EF_HALLUTIME 793
-EF_INFRAREDSCAN 794
-EF_CRASHAXE 795
-EF_GTHUNDER 796
-EF_STONERING 797
-EF_INTIMIDATE2 798
-EF_STASIS 799
-EF_REDLINE 800
-EF_FROSTDIVER3 801
-EF_BOTTOM_BASILICA2 802
-EF_RECOGNIZED 803
-EF_TETRA 804
-EF_TETRACASTING 805
-EF_FIREBALL3 806
-EF_INTIMIDATE3 807
-EF_RECOGNIZED2 808
-EF_CLOAKING3 809
-EF_INTIMIDATE4 810
-EF_STRETCH 811
-EF_BLACKBODY 812
-EF_ENERVATION 813
-EF_ENERVATION2 814
-EF_ENERVATION3 815
-EF_ENERVATION4 816
-EF_ENERVATION5 817
-EF_ENERVATION6 818
-EF_LINELINK4 819
-EF_RG_COIN5 820
-EF_WATERFALL_ANI 821
-EF_BOTTOM_MANHOLE 822
-EF_MANHOLE 823
-EF_MAKEFEINT 824
-EF_FORESTLIGHT6 825
-EF_DARKCASTING2 826
-EF_BOTTOM_ANI 827
-EF_BOTTOM_MAELSTROM 828
-EF_BOTTOM_BLOODYLUST 829
-EF_BEGINSPELL_N1 830
-EF_BEGINSPELL_N2 831
-EF_HEAL_N 832
-EF_CHOOKGI_N 833
-EF_JOBLVUP50_2 834
-EF_CHEMICAL2DASH2 835
-EF_CHEMICAL2DASH3 836
-EF_ROLLINGCAST 837
-EF_WATER_BELOW 838
-EF_WATER_FADE 839
-EF_BEGINSPELL_N3 840
-EF_BEGINSPELL_N4 841
-EF_BEGINSPELL_N5 842
-EF_BEGINSPELL_N6 843
-EF_BEGINSPELL_N7 844
-EF_BEGINSPELL_N8 845
-EF_WATER_SMOKE 846
-EF_DANCE1 847
-EF_DANCE2 848
-EF_LINKPARTICLE 849
-EF_SOULLIGHT2 850
-EF_SPR_PARTICLE 851
-EF_SPR_PARTICLE2 852
-EF_SPR_PLANT 853
-EF_CHEMICAL_V 854
-EF_SHOOTPARTICLE 855
-EF_BOT_REVERB 856
-EF_RAIN_PARTICLE 857
-EF_CHEMICAL_V2 858
-EF_SECRA 859
-EF_BOT_REVERB2 860
-EF_CIRCLEPOWER2 861
-EF_SECRA2 862
-EF_CHEMICAL_V3 863
-EF_ENERVATION7 864
-EF_CIRCLEPOWER3 865
-EF_SPR_PLANT2 866
-EF_CIRCLEPOWER4 867
-EF_SPR_PLANT3 868
-EF_RG_COIN6 869
-EF_SPR_PLANT4 870
-EF_CIRCLEPOWER5 871
-EF_SPR_PLANT5 872
-EF_CIRCLEPOWER6 873
-EF_SPR_PLANT6 874
-EF_CIRCLEPOWER7 875
-EF_SPR_PLANT7 876
-EF_CIRCLEPOWER8 877
-EF_SPR_PLANT8 878
-EF_HEARTASURA 879
-EF_BEGINSPELL_150 880
-EF_LEVEL99_150 881
-EF_PRIMECHARGE 882
-EF_GLASSWALL4 883
-EF_GRADIUS_LASER 884
-EF_BASH3D6 885
-EF_GUMGANG5 886
-EF_HITLINE8 887
-EF_ELECTRIC4 888
-EF_TEIHIT1T 889
-EF_SPINMOVE 890
-EF_FIREBALL4 891
-EF_TRIPLEATTACK4 892
-EF_CHEMICAL3S 893
-EF_GROUNDSHAKE 894
-EF_DQ9_CHARGE 895
-EF_DQ9_CHARGE2 896
-EF_DQ9_CHARGE3 897
-EF_DQ9_CHARGE4 898
-EF_BLUELINE 899
-EF_SELFSCROLL 900
-EF_SPR_LIGHTPRINT 901
-EF_PNG_TEST 902
-EF_BEGINSPELL_YB 903
-EF_CHEMICAL2DASH4 904
-EF_GROUNDSHAKE2 905
-EF_PRESSURE2 906
-EF_RG_COIN7 907
-EF_PRIMECHARGE2 908
-EF_PRIMECHARGE3 909
-EF_PRIMECHARGE4 910
-EF_GREENCASTING 911
-EF_WALLOFTHORN 912
-EF_FIREBALL5 913
-EF_THROWITEM11 914
-EF_SPR_PLANT9 915
-EF_DEMONICFIRE 916
-EF_DEMONICFIRE2 917
-EF_DEMONICFIRE3 918
-EF_HELLSPLANT 919
-EF_FIREWALL2 920
-EF_VACUUM 921
-EF_SPR_PLANT10 922
-EF_SPR_LIGHTPRINT2 923
-EF_POISONSMOKE2 924
-EF_MAKEHALLU2 925
-EF_SHOCKWAVE2 926
-EF_SPR_PLANT11 927
-EF_COLDTHROW2 928
-EF_DEMONICFIRE4 929
-EF_PRESSURE3 930
-EF_LINKPARTICLE2 931
-EF_SOULLIGHT3 932
-EF_CHAREFFECT 933
-EF_GUMGANG6 934
-EF_FIREBALL6 935
-EF_GUMGANG7 936
-EF_GUMGANG8 937
-EF_GUMGANG9 938
-EF_BOTTOM_DE2 939
-EF_COLDSTATUS 940
-EF_SPR_LIGHTPRINT3 941
-EF_WATERBALL3 942
-EF_HEAL_N2 943
-EF_RAIN_PARTICLE2 944
-EF_CLOUD9 945
-EF_YELLOWFLY3 946
-EF_EL_GUST 947
-EF_EL_BLAST 948
-EF_EL_AQUAPLAY 949
-EF_EL_UPHEAVAL 950
-EF_EL_WILD_STORM 951
-EF_EL_CHILLY_AIR 952
-EF_EL_CURSED_SOIL 953
-EF_EL_COOLER 954
-EF_EL_TROPIC 955
-EF_EL_PYROTECHNIC 956
-EF_EL_PETROLOGY 957
-EF_EL_HEATER 958
-EF_POISON_MIST 959
-EF_ERASER_CUTTER 960
-EF_SILENT_BREEZE 961
-EF_MAGMA_FLOW 962
-EF_GRAYBODY 963
-EF_LAVA_SLIDE 964
-EF_SONIC_CLAW 965
-EF_TINDER_BREAKER 966
-EF_MIDNIGHT_FRENZY 967
-EF_MACRO 968
-EF_CHEMICAL_ALLRANGE 969
-EF_TETRA_FIRE 970
-EF_TETRA_WATER 971
-EF_TETRA_WIND 972
-EF_TETRA_GROUND 973
-EF_EMITTER 974
-EF_VOLCANIC_ASH 975
-EF_LEVEL99_ORB1 976
-EF_LEVEL99_ORB2 977
-EF_LEVEL150 978
-EF_LEVEL150_SUB 979
-EF_THROWITEM4_1 980
-EF_THROW_HAPPOKUNAI 981
-EF_THROW_MULTIPLE_COIN 982
-EF_THROW_BAKURETSU 983
-EF_ROTATE_HUUMARANKA 984
-EF_ROTATE_BG 985
-EF_ROTATE_LINE_GRAY 986
-EF_2011RWC 987
-EF_2011RWC2 988
-EF_KAIHOU 989
-EF_GROUND_EXPLOSION 990
-EF_KG_KAGEHUMI 991
-EF_KO_ZENKAI_WATER 992
-EF_KO_ZENKAI_LAND 993
-EF_KO_ZENKAI_FIRE 994
-EF_KO_ZENKAI_WIND 995
-EF_KO_JYUMONJIKIRI 996
-EF_KO_SETSUDAN 997
-EF_RED_CROSS 998
-EF_KO_IZAYOI 999
-EF_ROTATE_LINE_BLUE 1000
-EF_KG_KYOMU 1001
-EF_KO_HUUMARANKA 1002
-EF_BLUELIGHTBODY 1003
-EF_KAGEMUSYA 1004
-EF_OB_GENSOU 1005
-EF_NO100_FIRECRACKER 1006
-EF_KO_MAKIBISHI 1007
-EF_KAIHOU1 1008
-EF_AKAITSUKI 1009
-EF_ZANGETSU 1010
-EF_GENSOU 1011
-EF_HAT_EFFECT 1012
-EF_CHERRYBLOSSOM 1013
-EF_EVENT_CLOUD 1014
-EF_RUN_MAKE_OK 1015
-EF_RUN_MAKE_FAILURE 1016
-EF_MIRESULT_MAKE_OK 1017
-EF_MIRESULT_MAKE_FAIL 1018
-EF_ALL_RAY_OF_PROTECTION 1019
-EF_VENOMFOG 1020
-EF_DUSTSTORM 1021
-EF_LEVEL160 1022
-EF_LEVEL160_SUB 1023
-EF_MAPCHAIN 1024
-EF_MAGIC_FLOOR 1025
-EF_ICEMINE 1026
-EF_FLAMECORSS 1027
-EF_ICEMINE_1 1028
-EF_DANCE_BLADE_ATK 1029
-EF_DARKPIERCING 1030
-EF_INVINCIBLEOFF2 1031
-EF_MAXPAIN 1032
-EF_DEATHSUMMON 1033
-EF_MOONSTAR 1034
-EF_STRANGELIGHTS 1035
-EF_SUPER_STAR 1036
-EF_YELLOBODY 1037
-EF_COLORPAPER2 1038
-EF_EVILS_PAW 1039
-EF_GC_DARKCROW 1040
-EF_RK_DRAGONBREATH_WATER 1041
-EF_ALL_FULL_THROTTLE 1042
-EF_SR_FLASHCOMBO 1043
-EF_RK_LUXANIMA 1044
-EF_CLOUD10 1045
-EF_SO_ELEMENTAL_SHIELD 1046
-EF_AB_OFFERTORIUM 1047
-EF_WL_TELEKINESIS_INTENSE 1048
-EF_GN_ILLUSIONDOPING 1049
-EF_NC_MAGMA_ERUPTION 1050
-EF_LG_KINGS_GRACE 1051
-EF_BLOODDRAIN2 1052
-EF_NPC_WIDEWEB 1053
-EF_NPC_BURNT 1054
-EF_NPC_CHILL 1055
-EF_RA_UNLIMIT 1056
-EF_AB_OFFERTORIUM_RING 1057
-EF_SC_ESCAPE 1058
-EF_WM_FRIGG_SONG 1059
-EF_FLICKER 1060
-EF_C_MAKER 1061
-EF_HAMMER_OF_GOD 1062
-EF_MASS_SPIRAL 1063
-EF_FIRE_RAIN 1064
-EF_WHITEBODY 1065
-EF_BANISHING_BUSTER 1066
-EF_SLUGSHOT 1067
-EF_D_TAIL 1068
-EF_BIND_TRAP1 1069
-EF_BIND_TRAP2 1070
-EF_BIND_TRAP3 1071
-EF_JUMPBODY1 1072
-EF_ANIMATED_EMITTER 1073
-EF_RL_EXPLOSION 1074
-EF_C_MAKER_1 1075
-EF_QD_SHOT 1076
-EF_P_ALTER 1077
-EF_S_STORM 1078
-EF_MUSIC_HAT 1079
-EF_CLOUD_KILL 1080
-EF_ESCAPE 1081
-EF_XENO_SLASHER 1082
-EF_FLOWERSMOKE 1083
-EF_FSTONE 1084
-EF_QSCARABA 1085
-EF_LJOSALFAR 1086
-EF_HAPPINESSSTAR 1087
-EF_POWER_OF_GAIA 1088
-EF_MAPLE_FALLS 1089
-EF_MARKING_USE_CHANGEMONSTER 1090
-EF_MAGICAL_FEATHER 1091
-EF_MERMAID_LONGING 1092
-EF_GIFT_OF_SNOW 1093
-EF_ACH_COMPLETE 1094
-EF_TIME_ACCESSORY 1095
-EF_SPRITEMABLE 1096
-EF_TUNAPARTY 1097
-
-HAT_EF_BLOSSOM_FLUTTERING 1
-HAT_EF_MERMAID_LONGING 2
-HAT_EF_RL_BANISHING_BUSTER 3
-HAT_EF_LJOSALFAR 4
-HAT_EF_CLOCKING 5
-HAT_EF_SNOW 6
-HAT_EF_MAKEBLUR 7
-HAT_EF_SLEEPATTACK 8
-HAT_EF_GUMGANG 9
-HAT_EF_TALK_FROSTJOKE 10
-HAT_EF_DEMONSTRATION 11
-HAT_EF_FLUTTER_BUTTERFLY 12
-HAT_EF_ANGEL_FLUTTERING 13
-HAT_EF_BLESSING_OF_ANGELS 14
-HAT_EF_ELECTRIC 15
-HAT_EF_GREEN_FLOOR 16
-HAT_EF_SHRINK 17
-HAT_EF_VALHALLA_IDOL 18
-HAT_EF_ANGEL_STAIRS 19
-HAT_EF_GLOW_OF_NEW_YEAR 20
-HAT_EF_BOTTOM_FORTUNEKISS 21
-HAT_EF_PINKBODY 22
-HAT_EF_DOUBLEGUMGANG 23
-HAT_EF_GIANTBODY 24
-HAT_EF_GREEN99_6 25
-HAT_EF_CIRCLEPOWER 26
-HAT_EF_BOTTOM_BLOODYLUST 27
-HAT_EF_WATER_BELOW 28
-HAT_EF_LEVEL99_150 29
-HAT_EF_YELLOWFLY3 30
-HAT_EF_KAGEMUSYA 31
-HAT_EF_CHERRYBLOSSOM 32
-HAT_EF_STRANGELIGHTS 33
-HAT_EF_WL_TELEKINESIS_INTENSE 34
-HAT_EF_AB_OFFERTORIUM_RING 35
-HAT_EF_WHITEBODY2 36
-HAT_EF_SAKURA 37
-HAT_EF_CLOUD2 38
-HAT_EF_FEATHER_FLUTTERING 39
-HAT_EF_CAMELLIA_HAIR_PIN 40
-HAT_EF_JP_EV_EFFECT01 41
-HAT_EF_JP_EV_EFFECT02 42
-HAT_EF_JP_EV_EFFECT03 43
-HAT_EF_FLORAL_WALTZ 44
-HAT_EF_MAGICAL_FEATHER 45
-HAT_EF_HAT_EFFECT 46
-HAT_EF_BAKURETSU_HADOU 47
-HAT_EF_GOLD_SHOWER 48
-HAT_EF_WHITEBODY 49
-HAT_EF_WATER_BELOW2 50
-HAT_EF_FIREWORK 51
-
RDMOPT_VAR_MAXHPAMOUNT 1
RDMOPT_VAR_MAXSPAMOUNT 2
RDMOPT_VAR_STRAMOUNT 3
@@ -1360,944 +208,6 @@ RDMOPT_MDAMAGE_SIZE_MIDIUM_USER 191
RDMOPT_MDAMAGE_SIZE_LARGE_USER 192
//RDMOPT_ATTR_TOLERACE_ALL 193
-WARPNPC 45
-1_ETC_01 46
-1_M_01 47
-1_M_02 48
-1_M_03 49
-1_M_04 50
-1_M_BARD 51
-1_M_HOF 52
-1_M_INNKEEPER 53
-1_M_JOBGUIDER 54
-1_M_JOBTESTER 55
-1_M_KNIGHTMASTER 56
-1_M_LIBRARYMASTER 57
-1_M_MERCHANT 58
-1_M_ORIENT01 59
-1_M_PASTOR 60
-1_M_PUBMASTER 61
-1_M_SIZ 62
-1_M_SMITH 63
-1_M_WIZARD 64
-1_M_YOUNGKNIGHT 65
-1_F_01 66
-1_F_02 67
-1_F_03 68
-1_F_04 69
-1_F_GYPSY 70
-1_F_LIBRARYGIRL 71
-1_F_MARIA 72
-1_F_MERCHANT_01 73
-1_F_MERCHANT_02 74
-1_F_ORIENT_01 75
-1_F_ORIENT_02 76
-1_F_ORIENT_03 77
-1_F_ORIENT_04 78
-1_F_PRIEST 79
-1_F_PUBGIRL 80
-4_DOG01 81
-4_KID01 82
-4_M_01 83
-4_M_02 84
-4_M_03 85
-4_M_04 86
-4_M_BARBER 87
-4_M_ORIENT01 88
-4_M_ORIENT02 89
-4_F_01 90
-4_F_02 91
-4_F_03 92
-4_F_04 93
-4_F_MAID 94
-4_F_SISTER 95
-4W_KID 96
-4W_M_01 97
-4W_M_02 98
-4W_M_03 99
-4W_SAILOR 100
-4W_F_01 101
-8_F 102
-8_F_GRANDMOTHER 103
-EFFECTLAUNCHER 104
-8W_SOLDIER 105
-1_M_MOC_LORD 106
-1_M_PAY_ELDER 107
-1_M_PRON_KING 108
-4_M_MANAGER 109
-4_M_MINISTER 110
-HIDDEN_NPC 111
-4_F_KAFRA6 112
-4_F_KAFRA5 113
-4_F_KAFRA4 114
-4_F_KAFRA3 115
-4_F_KAFRA2 116
-4_F_KAFRA1 117
-2_M_THIEFMASTER 118
-2_M_SWORDMASTER 119
-2_M_PHARMACIST 120
-2_M_MOLGENSTEIN 121
-2_M_DYEINGER 122
-2_F_MAGICMASTER 123
-4_F_TELEPORTER 124
-4_M_TELEPORTER 125
-// Free ID's 126 - 138
-HIDDEN_WARP_NPC 139
-// Free ID's 140 - 400
-4_M_MUT2 401
-4_M_SCIENCE 402
-4_F_VALKYRIE2 403
-4_M_UNCLEKNIGHT 404
-4_M_YOUNGKNIGHT 405
-2_MONEMUS 406
-4_M_ATEIL 407
-4_F_ANNIVERSARY 408
-4_M_GREATPO 409
-4_M_NOVELIST 410
-4_M_CHAMPSOUL 411
-4_M_OLDFRIAR 412
-4_M_CRU_SOLD 413
-4_M_CRU_KNT 414
-4_M_CRU_HEAD 415
-4_M_CRU_CRUA 416
-4_M_KY_SOLD 417
-4_M_KY_KNT 418
-4_M_KY_HEAD 419
-4_M_KY_KIYOM 420
-4_M_BOSSCAT 421
-4_M_BABYCAT 422
-4W_F_KAFRA2 423
-4_F_MUNAK 424
-4_M_BONGUN 425
-4_BEAR 426
-4_BLUEWOLF 427
-4_PECOPECO 428
-4_M_JP_MID 429
-4_M_JP_RUN 430
-4_ORCLADY 431
-4_ORCLADY2 432
-4_ORCWARRIOR 433
-4_ORCWARRIOR2 434
-4_F_FAIRY 435
-4_F_FAIRYKID 436
-4_F_FAIRYKID2 437
-4_F_FAIRYKID3 438
-4_F_FAIRYKID4 439
-4_F_FAIRYKID5 440
-4_F_FAIRYKID6 441
-4_M_FAIRYKID 442
-4_M_FAIRYKID2 443
-4_M_FAIRYKID3 444
-4_M_FAIRYKID4 445
-4_M_FAIRYKID5 446
-4_M_FAIRYSOLDIER 447
-4_M_TUFFOLD 448
-4_MAN_BENKUNI 449
-4_MAN_GALTUN 450
-4_MAN_JERUTOO 451
-4_MAN_LAVAIL 452
-4_MAN_NITT 453
-4_MAN_PIOM 454
-4_MAN_PIOM2 455
-4_M_DSTMAN 456
-4_M_DSTMANDEAD 457
-4_BABYLEOPARD 458
-4_M_REDSWORD 459
-4_MAN_PIOM3 460
-4_M_FAIRYSOLDIER2 461
-4_F_FAIRYSOLDIER 462
-4_DRAGON_EGG 463
-4_MIMIC 464
-4_F_FAIRY1 465
-4_F_GUILLOTINE 466
-4_M_GUILLOTINE 467
-4_M_KNIGHT_BLACK 468
-4_M_KNIGHT_GOLD 469
-4_M_KNIGHT_SILVER 470
-4_SKULL_MUD 471
-4_M_BRZ_INDIAN 472
-4_F_BRZ_INDIAN 473
-4_F_BRZ_INDOLD 474
-4_M_BRZ_JACI 475
-4_M_BRZ_MAN1 476
-4_M_BRZ_MAN2 477
-4_F_BRZ_WOMAN 478
-4_M_MINSTREL 479
-4_M_MINSTREL1 480
-4_M_SHADOWCHASER 481
-4_F_SHADOWCHASER 482
-4_M_SURA 483
-4_F_SURA 484
-4_F_WANDERER 485
-4_M_BARD 486
-1_FLAG_NOFEAR 487
-4_M_NOFEARGUY 488
-4_MAN_PIOM6 489
-4_MAN_PIOM4 490
-4_MAN_PIOM5 491
-4_MAN_GALTUN1 492
-4_HUMAN_GERUTOO 493
-4_M_ROKI 494
-4_M_MERCAT1 495
-4_M_MERCAT2 496
-4_M_CATMAN1 497
-4_M_CATMAN2 498
-4_F_BRZ_WOMAN2 499
-4_M_JP_DISH 500
-4_F_JP_NOAH 501
-4_F_JP_OZ 502
-4_F_JP_CHROME 503
-4_F_JP_RINNE 504
-4_WHITETIGER 505
-4_VENDING_MACHINE 506
-4_MISTY 507
-4_NECORING 508
-4_ELEPHANT 509
-4_F_NYDHOG 510
-4_F_NYDHOG2 511
-4_M_ROKI2 512
-4_M_DOGTRAVELER 513
-4_M_DOGTRAVELER2 514
-4_F_DOGTRAVELER 515
-4_M_RAFLE_GR 516
-4_M_RAFLE_OLD 517
-4_F_RAFLE_PK 518
-4_M_LYINGDOG 519
-4_F_MORAFINE1 520
-4_F_MORAFINE2 521
-4_M_RAFLE_OR 522
-4_F_RAFLE_YE 523
-4_M_RAFLE_VI 524
-4_F_RAFLE_VI 525
-4_M_ARDHA 526
-4_CREEPER 527
-JP_RUFAKU 528
-JP_SUPIKA 529
-JP_SABIKU 530
-JP_ARUGORU 531
-JP_ARUNA 532
-JP_AIRI 533
-4_M_DEWOLDMAN 534
-4_M_DEWOLDWOMAN 535
-4_M_DEWMAN 536
-4_M_DEWWOMAN 537
-4_M_DEWBOY 538
-4_M_DEWGIRL 539
-4_M_DEWZATICHIEF 540
-4_M_DEWZATIMAN 541
-4_M_ALCHE_E 542
-4_MASK_SMOKEY 543
-4_CAT_SAILOR1 544
-4_CAT_SAILOR2 545
-4_CAT_SAILOR3 546
-4_CAT_SAILOR4 547
-4_CAT_CHEF 548
-4_CAT_MERMASTER 549
-4_CRACK 550
-4_ASTER 551
-4_F_STARFISHGIRL 552
-4_CAT_DOWN 553
-4_CAT_REST 554
-4_CAT_3COLOR 555
-4_CAT_ADMIRAL 556
-4_SOIL 557
-4_F_ALCHE_A 558
-4_CAT_ADV1 559
-4_CAT_ADV2 560
-4_CAT_SAILOR5 561
-2_DROP_MACHINE 562
-2_SLOT_MACHINE 563
-2_VENDING_MACHINE1 564
-MOB_TOMB 565
-4_MYSTCASE 566
-4_M_SIT_NOVICE 567
-4_OCTOPUS_LEG 568
-4_F_NURSE 569
-4_MAL_SOLDIER 570
-4_MAL_CAPTAIN 571
-4_MAL_BUDIDAI 572
-4_M_MAYOR 573
-4_M_BARYO_OLD 574
-4_F_BARYO_OLD 575
-4_F_BARYO_GIRL 576
-4_M_BARYO_BOY 577
-4_M_BARYO_MAN 578
-4_F_BARYO_WOMAN 579
-4_BARYO_CHIEF 580
-4_MAL_KAFRA 581
-4_M_MALAYA 582
-4_F_MALAYA 583
-4_F_PATIENT 584
-4_M_PATIENT 585
-4_F_KR_TIGER 586
-4_M_KR_BOY 587
-4_M_KAGE_OLD 588
-4_WHIKEBAIN 589
-4_EREND 590
-4_RAWREL 591
-4_ARMAIA 592
-4_KAVAC 593
-4_YGNIZEM 594
-4_EREMES 595
-4_MAGALETA 596
-4_KATRINN 597
-4_SHECIL 598
-4_SEYREN 599
-4_HARWORD 600
-4_F_JP_CYNTHIA 601
-4_M_JP_GUSTON 602
-4_M_JP_BERKUT 603
-4_F_JP_DARK_ADELAIDE 604
-4_M_JP_DARK_DARIUS 605
-4_M_JP_JESTER 606
-XMAS_SMOKEY_B 607
-XMAS_SMOKEY_R 608
-XMAS_SMOKEY_Y 609
-4_F_CLOCKDOLL 610
-4_F_FAIRY2 611
-4_F_PINKWOMAN 612
-4_FAIRYDEADLEAF 613
-4_FROG 614
-4_M_BLACKMAN 615
-4_M_BLUEMAN 616
-4_M_FAIRYANG 617
-4_M_FAIRYAVANT 618
-4_M_FAIRYFREAK 619
-4_M_FAIRYKID6 620
-4_M_FAIRYSCHOLAR 621
-4_M_FAIRYSCHOLAR_DIRTY 622
-4_M_FARIY_HISIE 623
-4_M_FARIYKING 624
-4_M_NEWOZ 625
-4_M_OLIVER 626
-4_M_PROFESSORWORM 627
-4_M_REDMAN 628
-4_F_GELKA 629
-4_M_ROTERT 630
-4_BLACKDRAGON 631
-4_M_GUNSLINGER 632
-4_F_GUNSLINGER 633
-4_M_ARCHER 634
-4_M_SWORDMAN 635
-4_M_NINJA_RED 636
-4_M_NINJA_BLUE 637
-4_M_THIEF_RUMIN 638
-4_M_NOV_RUMIN 639
-4_F_MAYSEL 640
-4_F_ACOLYTE 641
-4_M_NOV_HUNT 642
-4_F_GENETIC 643
-4_F_TAEKWON 644
-4_F_SWORDMAN 645
-4_F_IU 646
-4_M_RAGI 647
-4_M_MELODY 648
-4_TRACE 649
-4_F_HIMEL 650
-4_LEVITATEMAN 651
-4_M_HEINRICH 652
-4_M_ROYALGUARD 653
-4_M_BARMUND 654
-4_F_KHALITZBURG 655
-4_F_HIMEL2 656
-4_WHITEKNIGHT 657
-4_COCO 658
-4_M_ALADDIN 659
-4_M_GENIE 660
-4_F_GENIE 661
-4_JP_MID_SWIM 662
-4_JP_RUNE_SWIM 663
-4_F_FENRIR 664
-4_F_GEFFEN_FAY 665
-4_F_IRIS 666
-4_F_LUCILE 667
-4_F_SARAH_BABY 668
-4_GEFFEN_01 669
-4_GEFFEN_02 670
-4_GEFFEN_03 671
-4_GEFFEN_04 672
-4_GEFFEN_05 673
-4_GEFFEN_06 674
-4_GEFFEN_07 675
-4_GEFFEN_08 676
-4_GEFFEN_09 677
-4_GEFFEN_10 678
-4_GEFFEN_11 679
-4_GEFFEN_12 680
-4_GEFFEN_13 681
-4_GEFFEN_14 682
-4_M_CHAOS 683
-4_M_CHIEF_IRIN 684
-4_M_SAKRAY 685
-4_M_SAKRAYROYAL 686
-4_TOWER_01 687
-4_TOWER_02 688
-4_TOWER_03 689
-4_TOWER_04 690
-4_TOWER_05 691
-4_TOWER_06 692
-4_TOWER_07 693
-4_TOWER_08 694
-4_TOWER_09 695
-4_TOWER_10 696
-4_TOWER_11 697
-4_TOWER_12 698
-4_TOWER_13 699
-8_F_GIRL 700
-4_F_GODEMOM 701
-4_F_GON 702
-4_F_KID2 703
-4_M_BIBI 704
-4_M_GEF_SOLDIER 705
-4_M_KID1 706
-4_M_MOC_SOLDIER 707
-4_M_PAY_SOLDIER 708
-4_M_SEAMAN 709
-4_M_SNOWMAN 710
-4_F_05 711
-4_M_05 712
-4_M_06 713
-4_F_06 714
-4_M_PIERROT 715
-4_M_KID2 716
-4_F_KID3 717
-4_M_SANTA 718
-4_F_NACORURI 719
-4_F_SHAMAN 720
-4_F_KAFRA7 721
-GUILD_FLAG 722
-1_SHADOW_NPC 723
-4_F_07 724
-4_F_JOB_ASSASSIN 725
-4_F_JOB_BLACKSMITH 726
-4_F_JOB_HUNTER 727
-4_F_JOB_KNIGHT 728
-4_F_NOVICE 729
-4_M_JOB_ASSASSIN 730
-4_M_JOB_BLACKSMITH 731
-4_M_JOB_HUNTER 732
-4_M_JOB_KNIGHT1 733
-4_M_JOB_KNIGHT2 734
-4_M_JOB_WIZARD 735
-4_BAPHOMET 736
-4_DARKLORD 737
-4_DEVIRUCHI 738
-8_DOPPEL 739
-2_M_ALCHE 740
-2_M_BARD_ORIENT 741
-2_M_SAGE_B 742
-2_M_SAGE_OLD 743
-4_F_ALCHE 744
-4_F_CRU 745
-4_F_MONK 746
-4_F_ROGUE 747
-4_M_ALCHE_A 748
-4_M_ALCHE_B 749
-4_M_ALCHE_C 750
-4_M_CRU 751
-4_M_CRU_OLD 752
-4_M_MONK 753
-4_M_SAGE_A 754
-4_M_SAGE_C 755
-4_F_SON 756
-4_F_JPN2 757
-4_F_JPN 758
-4_F_JPNCHIBI 759
-4_F_JPNOBA2 760
-4_F_JPNOBA 761
-4_M_JPN2 762
-4_M_JPN 763
-4_M_JPNCHIBI 764
-4_M_JPNOJI2 765
-4_M_JPNOJI 766
-8_M_JPNSOLDIER 767
-8_M_JPNMASTER 768
-4_F_JPNMU 769
-4_F_TWGIRL 770
-4_F_TWGRANDMOM 771
-4_F_TWMASKGIRL 772
-4_F_TWMIDWOMAN 773
-4_M_TWBOY 774
-4_M_TWMASKMAN 775
-4_M_TWMIDMAN 776
-4_M_TWOLDMAN 777
-4_M_TWTEAMAN 778
-4_M_YOYOROGUE 779
-8_M_TWSOLDIER 780
-4_F_UMGIRL 781
-4_F_UMOLDWOMAN 782
-4_F_UMWOMAN 783
-4_M_UMCHIEF 784
-4_M_UMDANCEKID2 785
-4_M_UMDANCEKID 786
-4_M_UMKID 787
-4_M_UMOLDMAN 788
-4_M_UMSOLDIER 789
-4_M_SALVATION 790
-4_F_NFDEADKAFRA 791
-4_F_NFDEADMGCIAN 792
-4_F_NFLOSTGIRL 793
-4_M_NFDEADMAN2 794
-4_M_NFDEADMAN 795
-4_M_NFDEADSWDMAN 796
-4_M_NFLOSTMAN 797
-4_M_NFMAN 798
-4_NFBAT 799
-4_NFCOCK 800
-4_NFCOFFIN 801
-4_NFWISP 802
-1_F_SIGNZISK 803
-1_M_SIGN1 804
-1_M_SIGNALCHE 805
-1_M_SIGNART 806
-1_M_SIGNMCNT 807
-1_M_SIGNMONK2 808
-1_M_SIGNMONK 809
-1_M_SIGNROGUE 810
-4_F_VALKYRIE 811
-TW_TOWER 812
-2_M_OLDBLSMITH 813
-4_F_CHNDOCTOR 814
-4_F_CHNDRESS1 815
-4_F_CHNDRESS2 816
-4_F_CHNDRESS3 817
-4_F_CHNWOMAN 818
-4_M_CHN8GUEK 819
-4_M_CHNCOOK 820
-4_M_CHNGENERL 821
-4_M_CHNMAN 822
-4_M_CHNMONK 823
-4_M_CHNOLD 824
-4_M_CHNSOLDIER 825
-4_M_DWARF 826
-4_M_GRANDMONK 827
-4_M_ROGUE 828
-4_M_DOMINO 829
-4_F_DOMINO 830
-4_F_ZONDAGIRL 831
-4_M_REIDIN_KURS 832
-4_M_ZONDAOYAJI 833
-4_M_BUDDHIST 834
-2_BOARD1 835
-2_BOARD2 836
-2_BULLETIN_BOARD 837
-4_F_THAIAYO 838
-4_F_THAIGIRL 839
-4_F_THAISHAMAN 840
-4_M_THAIAYO 841
-4_M_THAIOLD 842
-4_M_THAIONGBAK 843
-CLEAR_NPC 844
-4_F_RACING 845
-4_F_EINOLD 846
-4_M_EINOLD 847
-4_M_EINMINER 848
-4_M_DIEMAN 849
-4_F_EINWOMAN 850
-4_M_REPAIR 851
-4_M_EIN_SOLDIER 852
-4_M_YURI 853
-4_M_EINMAN2 854
-4_M_EINMAN 855
-2_F_SIGN1 856
-4_BOARD3 857
-4_BULLETIN_BOARD2 858
-4_F_AGENTKAFRA 859
-4_F_KAFRA8 860
-4_F_KAFRA9 861
-4_F_LGTGIRL 862
-4_F_LGTGRAND 863
-4_F_OPERATION 864
-4_LGTSCIENCE 865
-4_M_LGTGRAND 866
-4_M_LGTGUARD2 867
-4_M_LGTGUARD 868
-4_M_LGTMAN 869
-4_M_LGTPOOR 870
-4_M_OPERATION 871
-4_M_PRESIDENT 872
-4_M_REINDEER 873
-4_M_ZONDAMAN 874
-4_M_PECOKNIGHT 875
-4_CAT 876
-4_F_YUNYANG 877
-4_M_OILMAN 878
-4_F_CAPEGIRL 879
-4_M_MASKMAN 880
-4_M_SITDOWN 881
-4_F_SITDOWN 882
-4_M_ALCHE_D 883
-4_M_ACROSS 884
-4_F_ACROSS 885
-4_COOK 886
-4_M_LIEMAN 887
-2_POSTBOX 888
-4_BULL 889
-4_LAM 890
-4_F_HUGIRL 891
-4_F_HUGRANMA 892
-4_F_HUWOMAN 893
-4_F_KHELLISIA 894
-4_F_KHELLY 895
-4_M_HUBOY 896
-4_M_HUGRANFA 897
-4_M_HUMAN_01 898
-4_M_HUMAN_02 899
-4_M_HUMERCHANT 900
-4_M_HUOLDARMY 901
-4_M_KHKIEL 902
-4_M_KHKYEL 903
-4_M_KHMAN 904
-4_F_KHWOMAN 905
-4_F_KHGIRL 906
-4_M_KHBOY 907
-4_M_PHILMAN 908
-4_PORING 909
-2_COLAVEND 910
-4_F_SOCCER 911
-4_M_SOCCER7 912
-4_M_SOCCER9 913
-4_F_CHILD 914
-4_F_MADAME 915
-4_F_MASK1 916
-4_F_MASK 917
-4_F_RACHOLD 918
-4_F_SHABBY 919
-4_F_TRAINEE 920
-4_M_CHILD1 921
-4_M_CHILD 922
-4_M_DOCTOR 923
-4_M_FROZEN1 924
-4_M_FROZEN 925
-4_M_MASK1 926
-4_M_MASK 927
-4_M_MIDDLE1 928
-4_M_MIDDLE 929
-4_M_RACHMAN2 930
-4_M_RACHMAN1 931
-4_M_RACHOLD1 932
-4_M_RACHOLD 933
-4_M_RASWORD 934
-4_M_TRAINEE 935
-4_F_ARUNA_POP 936
-4_M_ARUNA_NFM1 937
-4_DST_CAMEL 938
-4_DST_SOLDIER 939
-4_F_DESERT 940
-4_F_DST_CHILD 941
-4_F_DST_GRAND 942
-4_M_DESERT 943
-4_M_DST_CHILD 944
-4_M_DST_GRAND 945
-4_M_DST_MASTER 946
-4_M_DST_TOUGH 947
-4_ANGELING 948
-4_ARCHANGELING 949
-4_GHOSTRING 950
-4_F_EDEN_MASTER 951
-4_F_EDEN_OFFICER 952
-4_M_EDEN_GUARDER 953
-4_M_PATRICK 954
-4_DONKEY 955
-4_M_TRISTAN 956
-4_WHITE_COW 957
-4_F_RUSCHILD 958
-4_F_RUSWOMAN1 959
-4_F_RUSWOMAN2 960
-4_F_RUSWOMAN3 961
-4_M_RUSCHILD 962
-4_M_GUSLIMAN 963
-4_M_RUSBALD 964
-4_M_RUSKING 965
-4_M_RUSKNIGHT 966
-4_M_RUSMAN1 967
-4_M_RUSMAN2 968
-4_M_DRAKE 969
-4_F_BABAYAGA 970
-4_F_RUSGREEN 971
-4_RUS_DWOLF 972
-1_FLAG_LION 973
-1_FLAG_EAGLE 974
-4_M_MIKID 975
-4_BLUE_FLOWER 976
-4_RED_FLOWER 977
-4_YELL_FLOWER 978
-4_F_CAVE1 979
-4_F_MUT1 980
-4_F_MUT2 981
-4_F_SCIENCE 982
-4_M_1STPRIN1 983
-4_M_1STPRIN2 984
-4_M_2NDPRIN1 985
-4_M_2NDPRIN2 986
-4_M_3RDPRIN1 987
-4_M_3RDPRIN2 988
-4_M_4THPRIN1 989
-4_M_4THPRIN2 990
-4_M_5THPRIN1 991
-4_M_5THPRIN2 992
-4_M_6THPRIN1 993
-4_M_6THPRIN2 994
-4_M_CASMAN1 995
-4_M_CAVE1 996
-4_M_MOCASS1 997
-4_M_MOCASS2 998
-4_M_MUT1 999
-//New NPC ID Range Start
-4_TOWER_14 10001
-4_TOWER_15 10002
-4_TOWER_16 10003
-4_TOWER_17 10004
-4_TREASURE_BOX 10005
-ACADEMY_MASTER 10006
-PORTAL 10007
-THANATOS_BATTLE 10008
-THANATOS_KEEP 10009
-4_F_LYDIA 10010
-4_LUDE 10011
-4_ALIZA 10012
-4_ALICE 10013
-4_ARCHER_SKEL 10014
-4_JACK 10015
-4_SOLDIER_SKEL 10016
-4_LOLI_RURI 10017
-4_M_SAKRAY_TIED 10018
-4_M_ANTONIO 10019
-4_M_COOKIE 10020
-4_M_BELIEVER01 10021
-4_F_BELIEVER01 10022
-4_M_BELIEVER02 10023
-4_ROPEPILE 10024
-4_BRICKPILE 10025
-4_WOODPILE 10026
-4_M_TAMARIN 10027
-4_M_DEATH 10028
-4_GHOST_STAND 10029
-4_GHOST_COLLAPSE 10030
-4_COOKIEHOUSE 10031
-4_F_SKULL06GIRL 10032
-4_NONMYSTCASE 10033
-4_F_KIMI 10034
-4_M_FROZEN_GC 10035
-4_M_FROZEN_KN 10036
-4_SNAKE_LORD 10037
-4_F_MOCBOY 10038
-4_F_RUNAIN 10039
-4_M_ROEL 10040
-4_F_SHALOSH 10041
-4_ENERGY_RED 10042
-4_ENERGY_BLUE 10043
-4_ENERGY_YELLOW 10044
-4_ENERGY_BLACK 10045
-4_ENERGY_WHITE 10046
-4_F_PERE01 10047
-4_JITTERBUG 10048
-4_SEA_OTTER 10049
-4_GALAPAGO 10050
-4_DESERTWOLF_B 10051
-4_BB_PORING 10052
-4_F_CHARLESTON01 10053
-4_F_CHARLESTON02 10054
-4_F_CHARLESTON03 10055
-4_M_IAN 10056
-4_M_OLDSCHOLAR 10057
-4_F_LAPERM 10058
-4_M_DEBON 10059
-4_M_BIRMAN 10060
-4_F_SHAM 10061
-4_M_REBELLION 10062
-4_F_REBELLION 10063
-4_CHN_SHAOTH 10064
-4_SHOAL 10065
-4_F_SARAH 10066
-4_GIGANTES_BIG 10067
-4_GIGANTES 10068
-4_GIGANTES_SMALL 10069
-4_GARGOYLE_STATUE 10070
-4_AIRA 10071
-4_EZELLA 10072
-4_KULUNA 10073
-4_LUNE 10074
-4_MALLINA 10075
-4_MORIN 10076
-4_NASARIN 10077
-4_F_BERRYTEA 10078
-4_F_FRUIT 10079
-4_SCR_MT_ROBOTS 10080
-4_MACHINE_DEVICE 10081
-4_GC109 10082
-4_SYS_MSG 10083
-4_M_TATIO 10084
-4_M_REKENBER 10085
-4_XMAS_CAT1 10086
-4_XMAS_CAT2 10087
-4_XMAS_CAT3 10088
-4_XMAS_CAT4 10089
-4_XMAS_CAT5 10090
-4_XMAS_CAT6 10091
-4_M_DEATH2 10092
-4_S_KADOMATSU 10093
-4_B_KADOMATSU 10094
-4_F_08 10095
-4_F_08_STATUE 10096
-4_M_DARKPRIEST 10097
-4_JP_GARM_H 10098
-4_JP_MEDUSA_H 10099
-4_CHN_GVG_01 10100
-4_SPRING_RABBIT 10101
-4_PD_TYRA 10102
-4_PD_TYRANOS 10103
-4_PD_PLESI 10104
-4_PD_PLESIO 10105
-4_PD_BRACHI 10106
-4_PD_BRACHIOS 10107
-4_PD_GOLDDRAGON 10108
-4_PD_ZAEROG 10109
-4_PD_TAMADORA 10110
-4_JP_EDGA_H 10111
-4_JP_BRAGOLEM_H 10112
-4_EL_AQUA 10113
-4_EP16_NIHIL 10114
-4_EP16_SPICA 10115
-4_EP16_SKIA 10116
-4_EP16_PETER 10117
-4_EP16_CRUX 10118
-4_EP16_GRANZ 10119
-4_EP16_STOLZ 10120
-4_EP16_EGEO 10121
-4_EP16_COOK 10122
-4_EP16_MARK 10123
-4_EP16_TAMARIN 10124
-4_EP16_POE 10125
-4_EP16_ISAAC 10126
-4_EP16_HELMUT 10127
-4_EP16_WOLF 10128
-4_EP16_MEYER 10129
-4_EP16_AGNES 10130
-4_EP16_FOOD 10131
-4_EP16_LOUVIERE 10132
-4_EP16_MAX 10133
-4_EP16_SPIEGEL 10134
-4_MOONLIGHT 10135
-4_MISTRESS 10136
-4_DRACULA 10137
-4_STORMKNIGHT 10138
-4_TATTER 10139
-4_AS_RAGGED_GOLEM 10140
-4_AS_BLOODY_KNIGHT 10141
-4_AS_WIND_GHOST 10142
-4_F_BIJOU 10143
-4_EP16_COOK2 10144
-4_SERVICE_30_M_01 10145
-4_SERVICE_30_F_01 10146
-4_SCR_AT_ROBOTS 10147
-4_F_RANGER 10148
-4_WAG 10149
-4_NPC_TRAP 10150
-4_RAGGLER 10151
-4_DR_PEPE 10152
-4_DR_GAMBERI 10153
-4_DR_AGLIO 10154
-4_DR_OLIO 10155
-4_DR_STELO 10156
-4_DR_TORTEL 10157
-4_BASIL_SLAVE 10158
-4_DOU_JINDO 10159
-4_DOU_SIBA 10160
-4_TARUTUPI 10161
-4_DR_SOLDIER 10162
-4_DR_M_01 10163
-4_DR_M_02 10164
-4_DR_F_01 10165
-4_DR_F_02 10166
-4_DR_KID_01 10167
-4_JP_2015EVT 10168
-4_ALLIGATOR 10169
-4_ANOLIAN 10170
-4_TACNU 10171
-4_CENERE 10172
-4_F_ARUNA_POP2 10173
-4_JACK_HEAD 10174
-4_INJUSTICE 10175
-4_BLOODYMAN 10176
-4_GIBBET 10177
-4_DULLAHAN 10178
-4_M_LAZY 10179
-4_M_GONY 10180
-4_M_ROOKIE 10181
-4_M_PHILOFONTES 10182
-4_F_ESTLOVELOY 10183
-4_F_LEEDSH 10184
-4_F_DIENE 10185
-4_F_COATNEIS 10186
-4_M_RUPERT 10187
-4_M_FALLENGONY 10188
-4_M_EISEN 10189
-4_F_DEADEVIL 10190
-4_F_HUNTER_EVIL 10191
-4_F_ELENA 10192
-4_F_ANYA 10193
-4_M_SEIREN_UC 10194
-4_M_GUNSLINGER2 10195
-4_M_GUNSLINGER3 10196
-4_M_REBELLION2 10197
-4_M_REBELLION3 10198
-4_F_GUNSLINGER2 10199
-4_F_GUNSLINGER3 10200
-4_F_REBELLION2 10201
-4_F_REBELLION3 10202
-4_M_ILYA 10203
-
-4_ELDER 10205
-4_LUNATIC 10206
-4_F_NOVICE2 10207
-4_WICKEDNYMPH 10208
-4_F_PREMI 10209
-4_M_COSTELL 10210
-4_M_YATTWARP 10211
-4_M_EVOKASCUDI 10212
-4_M_JOHNNYJAMES 10213
-4_M_ALBERTFORD 10214
-4_M_SEANMCCURDY 10215
-4_M_KARAMPUCCI 10216
-4_M_CACTUSMAN1 10217
-4_M_CACTUSMAN2 10218
-4_M_CACTUSMAN3 10219
-4_M_CACTUSLADY 10220
-4_M_GAST 10221
-4_M_CACTUSCHILD 10222
-4_KING 10223
-4_F_BOMI 10224
-4_M_CACTUSCHIEF 10225
-4_F_CACTUSCHILD2 10226
-4_F_CACTUSLADY2 10227
-4_F_CACTUSLADY3 10228
-4_M_CACTUS 10229
-4_M_COWRAIDERS1 10230
-4_M_COWRAIDERS2 10231
-4_M_COWRAIDERS3 10232
-4_F_JP14THEVT 10233
-4_M_POORSCHOLAR 10234
-4_M_PEPPERROTI 10235
-JP_NPC01 10236
-4_PURPLE_WARP 10237
-4_F_NARIN 10238
-4_M_URGENT_MAN 10239
-4_M_KEEN_SOLDIER 10240
-4_F_SLOPPY_WOMAN 10241
-4_F_DRKAFRA01 10242
-4_M_DRZONDA01 10243
-4_M_SWD_RENO 10244
-4_M_KNG_RENO 10245
-4_M_AC_RUMIN 10246
-4_M_HIGH_WIZARD 10247
-4_SYSTEM_BOX 10248
-
-4_M_POPFESTA 10251
-4_BONFIRE 10252
-4_PCCOUNT 10253
-4_LAVAGOLEM 10254
-
SWORDCLAN 1
ARCWANDCLAN 2
GOLDENMACECLAN 3
diff --git a/db/import-tmpl/achievement_db.yml b/db/import-tmpl/achievement_db.yml
new file mode 100644
index 00000000000..eb8448ccd6e
--- /dev/null
+++ b/db/import-tmpl/achievement_db.yml
@@ -0,0 +1,80 @@
+# 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/>.
+#
+###########################################################################
+# Custom Achievement Database
+###########################################################################
+#
+# Achievement Settings
+#
+###########################################################################
+# ID - Unique achievement ID.
+###########################################################################
+# Group - Achievement group type. Each achievement type calls a specific
+# objective check.
+# Valid groups:
+# AG_ADD_FRIEND
+# AG_ADVENTURE
+# AG_BABY
+# AG_BATTLE
+# AG_CHATTING
+# AG_CHATTING_COUNT
+# AG_CHATTING_CREATE
+# AG_CHATTING_DYING
+# AG_EAT
+# AG_GET_ITEM
+# AG_GET_ZENY
+# AG_GOAL_ACHIEVE
+# AG_GOAL_LEVEL
+# AG_GOAL_STATUS
+# AG_HEAR
+# AG_JOB_CHANGE
+# AG_MARRY
+# AG_PARTY
+# AG_ENCHANT_FAIL
+# AG_ENCHANT_SUCCESS
+# AG_SEE
+# AG_SPEND_ZENY
+# AG_TAMING
+###########################################################################
+# Name - Achievement name. Used when sending rewards through RODEX.
+###########################################################################
+# Target - A list of monster ID and count values that the achievement
+# requires. The target count can also be used for achievements that keep
+# a counter while not being related to monster kills.
+# Capped at MAX_ACHIEVEMENT_OBJECTIVES.
+###########################################################################
+# Condition - A conditional statement that must be met for the achievement
+# to be considered complete.
+###########################################################################
+# Map - A map name that is used for the AG_CHATTING type which increments
+# the counter based on the player's map.
+###########################################################################
+# Dependent: - A list of achievement IDs that need to be completed before
+# this achievement is considered complete.
+###########################################################################
+# Reward - A list of rewards that are given on completion. All fields are
+# optional.
+# ItemID: Item ID
+# Amount: Amount of Item ID (default 1)
+# Script: Bonus Script
+# TitleID: Title ID
+###########################################################################
+# Score - Achievement points that are given on completion.
+###########################################################################
+
+Achievements:
diff --git a/db/import-tmpl/const.txt b/db/import-tmpl/const.txt
new file mode 100644
index 00000000000..f587b3d04cc
--- /dev/null
+++ b/db/import-tmpl/const.txt
@@ -0,0 +1,15 @@
+// Script Constant Database
+//
+// Structure of Database:
+// Identifier Value[ Type]
+//
+// Alternatively:
+// Identifier,Value[,Type]
+//
+// 01. Identifier Unique name for the constant, must not have same name as script commands, functions or variables.
+// 02. Value Value assigned to the constant. This value cannot be changed during the runtime of the server.
+// 03. Type Specifies whether the identifier is a constant (0) or a parameter (1) (optional, defaults to 0).
+//
+// NOTE: Parameters are special in that they retrieve certain runtime values depending on the specified ID
+// in field Value. Depending on the implementation values assigned by scripts to parameters will affect
+// runtime values, such as Zeny, as well (see pc_readparam/pc_setparam).
diff --git a/db/import-tmpl/item_flag.txt b/db/import-tmpl/item_flag.txt
index a4419df7236..b86479885fe 100644
--- a/db/import-tmpl/item_flag.txt
+++ b/db/import-tmpl/item_flag.txt
@@ -2,8 +2,10 @@
// <ItemID>,<Flag>
//
// <Flag>:
-// 1 - As Dead Branch item (will be logged at `branchlog` table and cannot be used at 'nobranch' mapflag)
-// 2 - As item group container, check player's inventory and weight before consumed
-// 4 - GUID item, cannot be stacked even same or stackable item
-// 8 - Item will be bound item when equipped
+// 1 - As Dead Branch item (will be logged at `branchlog` table and cannot be used at 'nobranch' mapflag)
+// 2 - As item group container, check player's inventory and weight before consumed
+// 4 - GUID item, cannot be stacked even same or stackable item
+// 8 - Item will be bound item when equipped
+// 16 - Special Broadcast: When item dropped by monster and player loot it, will be broadcasted!
+// 32 - Item will not be removed on consumption. Also supports 'itemskill'
// NOTE: For removing flag by import file, use "-" to remove the flag. Example, 604,-1 will removes flag 1 from Branch_Of_Dead_Tree
diff --git a/db/import-tmpl/packet_db.txt b/db/import-tmpl/packet_db.txt
deleted file mode 100644
index de90db50e0c..00000000000
--- a/db/import-tmpl/packet_db.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-// Client<->Map Packet Database
-//
-// Structure of Database:
-// PacketType,PacketLength[,Name,FieldIndex1:FieldIndex2:FieldIndex3:...]
-//
-// 01. PacketType ID of the packet.
-// 02. PacketLength Length of the packet. If 0, packet is disabled in current packet version. If -1, packet has variable size.
-// 03. Name Name of the packet parser function (optional, for incoming packets only).
-// 04. FieldIndex Specifies the offset of a packet field in bytes from the begin of the packet (only specified when Name is given).
-// Can be 0, when the layout is not known.
-// ...
-//
-// NOTE: Up to MAX_PACKET_POS (typically 20) field indexes may be used.
-//
-// The packet database allows you to add support for new clients,
-// because packets change every release.
-//
-// Note: Every packet version needs a wanttoconnection specification, since
-// that is the packet used to identify a client's version.
-// If multiple versions have the same connection packet, the higher version
-// will be used (unless the lower one is specified as the default)
-//
-// Incoming packets have their parser function and layout specified, which enables
-// them for the current and all higher versions, unless explicitely disabled.
-//
-// Outgoing packets must be specified in order to enable them for the current
-// and all higher versions, unless explicitely disabled. Packets that are not
-// enabled for a packet version are silently discarded when sent as multicast.
-//
-// Every packet version inherits packet definitions from the previous (lower)
-// packet version.
-//
-// Main packet version of the DB to use (default = max available version)
-// Client detection is faster when all clients use this version.
-// Version 23 is the latest Sakexe (above versions are for Renewal clients)
diff --git a/db/import-tmpl/refine_db.txt b/db/import-tmpl/refine_db.txt
deleted file mode 100644
index fcc13be56b9..00000000000
--- a/db/import-tmpl/refine_db.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-// Refine Database [Renewal]
-//
-// Structure of Database:
-// Type,Stats per level,Random bonus start level,Random bonus value,Chance+1:Bonus+1,Chance+2:Bonus+2,Chance+3:Bonus+3,...
-//
-// For armors, values of 100 add 1 armor defense.
-// For weapons, values of 100 add 1 ATK&MATK.
-//
-// Type:
-// 0 - Armors
-// 1 - Level 1 weapons
-// 2 - Level 2 weapons
-// 3 - Level 3 weapons
-// 4 - Level 4 weapons
-//
-// Stats per level:
-// This value is applied for every upgrade level.
-//
-// Random bonus start level:
-// This value specifies the start point for those levels that give a random bonus value (usually the first unsafe upgrade).
-//
-// Random bonus value:
-// A random number between 0 and (Random bonus start level - Upgrade level + 1) * this value is applied for all upgrades past
-// Random bonus start level. This is only applied for weapons, and not displayed client-side.
-//
-// Chance:
-// 100 = 100%
-//
-// Notes:
-// Changing the number of upgrade levels requires modifying MAX_REFINE in src/map/status.h.
-// For Renewal Armors, there may or may not be another bonus, according to iRO wiki: Every upgrade gives floor[( 3 + current upgrade ) / 4] equipment DEF)
-
diff --git a/db/import-tmpl/refine_db.yml b/db/import-tmpl/refine_db.yml
new file mode 100644
index 00000000000..fbe8728eecb
--- /dev/null
+++ b/db/import-tmpl/refine_db.yml
@@ -0,0 +1,20 @@
+# 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/>.
+#
+###########################################################################
+# Custom Refine Database
+###########################################################################
diff --git a/db/packet_db.txt b/db/packet_db.txt
deleted file mode 100644
index d79a306ef1b..00000000000
--- a/db/packet_db.txt
+++ /dev/null
@@ -1,2675 +0,0 @@
-// Client<->Map Packet Database
-//
-// Structure of Database:
-// PacketType,PacketLength[,Name,FieldIndex1:FieldIndex2:FieldIndex3:...]
-//
-// 01. PacketType ID of the packet.
-// 02. PacketLength Length of the packet. If 0, packet is disabled in current packet version. If -1, packet has variable size.
-// 03. Name Name of the packet parser function (optional, for incoming packets only).
-// 04. FieldIndex Specifies the offset of a packet field in bytes from the begin of the packet (only specified when Name is given).
-// Can be 0, when the layout is not known.
-// ...
-//
-// NOTE: Up to MAX_PACKET_POS (typically 20) field indexes may be used.
-//
-// The packet database allows you to add support for new clients,
-// because packets change every release.
-//
-// Note: Every packet version needs a wanttoconnection specification, since
-// that is the packet used to identify a client's version.
-// If multiple versions have the same connection packet, the higher version
-// will be used (unless the lower one is specified as the default)
-//
-// Incoming packets have their parser function and layout specified, which enables
-// them for the current and all higher versions, unless explicitely disabled.
-//
-// Outgoing packets must be specified in order to enable them for the current
-// and all higher versions, unless explicitely disabled. Packets that are not
-// enabled for a packet version are silently discarded when sent as multicast.
-//
-// Every packet version inherits packet definitions from the previous (lower)
-// packet version.
-//
-// Main packet version of the DB to use (default = max available version)
-// Client detection is faster when all clients use this version.
-// Version 23 is the latest Sakexe (above versions are for Renewal clients)
-//
-// packet_keys values are default value for each packet version, if no value
-// or value is 'default' in packet_keys_use, server will uses default keys
-// according to used packet_db_ver. packet_keys_use is user-defined keys.
-// Maximum key value is 0x7FFFFFFF.
-// NOTE: Keys won't be reloaded, initialized on first load only.
-//
-//packet_db_ver: 46
-packet_db_ver: default
-packet_keys_use: default
-
-packet_ver: 5
-0x0064,55
-0x0065,17
-0x0066,6
-0x0067,37
-0x0068,46
-0x0069,-1
-0x006a,23
-0x006b,-1
-0x006c,3
-0x006d,108
-0x006e,3
-0x006f,2
-0x0070,6
-0x0071,28
-0x0072,19,wanttoconnection,2:6:10:14:18
-0x0073,11
-0x0074,3
-0x0075,-1
-0x0076,9
-0x0077,5
-0x0078,54
-0x0079,53
-0x007a,58
-0x007b,60
-0x007c,41
-0x007d,2,loadendack,0
-0x007e,6,ticksend,2
-0x007f,6
-0x0080,7
-0x0081,3
-0x0082,2
-0x0083,2
-0x0084,2
-0x0085,5,walktoxy,2
-0x0086,16
-0x0087,12
-0x0088,10
-0x0089,7,actionrequest,2:6
-0x008a,29
-0x008b,2
-0x008c,-1,globalmessage,2:4
-0x008d,-1
-0x008e,-1
-//0x008f,-1
-0x0090,7,npcclicked,2:6
-0x0091,22
-0x0092,28
-0x0093,2
-0x0094,6,getcharnamerequest,2
-0x0095,30
-0x0096,-1,wis,2:4:28
-0x0097,-1
-0x0098,3
-0x0099,-1,broadcast,2:4
-0x009a,-1
-0x009b,5,changedir,2:4
-0x009c,9
-0x009d,17
-0x009e,17
-0x009f,6,takeitem,2
-0x00a0,23
-0x00a1,6
-0x00a2,6,dropitem,2:4
-0x00a3,-1
-0x00a4,-1
-0x00a5,-1
-0x00a6,-1
-0x00a7,8,useitem,2:4
-0x00a8,7
-0x00a9,6,equipitem,2:4
-0x00aa,7,ZC_WEAR_EQUIP_ACK,2:4:6
-0x00ab,4,unequipitem,2
-0x00ac,7
-//0x00ad,-1
-0x00ae,-1
-0x00af,6
-0x00b0,8
-0x00b1,8
-0x00b2,3,restart,2
-0x00b3,3
-0x00b4,-1
-0x00b5,6
-0x00b6,6
-0x00b7,-1
-0x00b8,7,npcselectmenu,2:6
-0x00b9,6,npcnextclicked,2
-0x00ba,2
-0x00bb,5,statusup,2:4
-0x00bc,6
-0x00bd,44
-0x00be,5
-0x00bf,3,emotion,2
-0x00c0,7
-0x00c1,2,howmanyconnections,0
-0x00c2,6
-0x00c3,8
-0x00c4,6
-0x00c5,7,npcbuysellselected,2:6
-0x00c6,-1
-0x00c7,-1
-0x00c8,-1,npcbuylistsend,2:4
-0x00c9,-1,npcselllistsend,2:4
-0x00ca,3
-0x00cb,3
-0x00cc,6,gmkick,2
-0x00cd,3
-0x00ce,2,killall,0
-0x00cf,27,wisexin,2:26
-0x00d0,3,wisall,2
-0x00d1,4
-0x00d2,4
-0x00d3,2,wisexlist,0
-0x00d4,-1
-0x00d5,-1,createchatroom,2:4:6:7:15
-0x00d6,3
-0x00d7,-1
-0x00d8,6
-0x00d9,14,chataddmember,2:6
-0x00da,3
-0x00db,-1
-0x00dc,28
-0x00dd,29
-0x00de,-1,chatroomstatuschange,2:4:6:7:15
-0x00df,-1
-0x00e0,30,changechatowner,2:6
-0x00e1,30
-0x00e2,26,kickfromchat,2
-0x00e3,2,chatleave,0
-0x00e4,6,traderequest,2
-0x00e5,26
-0x00e6,3,tradeack,2
-0x00e7,3
-0x00e8,8,tradeadditem,2:4
-0x00e9,19
-0x00ea,5
-0x00eb,2,tradeok,0
-0x00ec,3
-0x00ed,2,tradecancel,0
-0x00ee,2
-0x00ef,2,tradecommit,0
-0x00f0,3
-0x00f1,2
-0x00f2,6
-0x00f3,8,movetokafra,2:4
-0x00f4,21
-0x00f5,8,movefromkafra,2:4
-0x00f6,8
-0x00f7,2,closekafra,0
-0x00f8,2
-0x00f9,26,createparty,2
-0x00fa,3
-0x00fb,-1
-0x00fc,6,partyinvite,2
-0x00fd,27
-0x00fe,30
-0x00ff,10,replypartyinvite,2:6
-0x0100,2,leaveparty,0
-0x0101,6
-0x0102,6,partychangeoption,2
-0x0103,30,removepartymember,2:6
-0x0104,79
-0x0105,31
-0x0106,10
-0x0107,10
-0x0108,-1,partymessage,2:4
-0x0109,-1
-0x010a,4
-0x010b,6
-0x010c,6
-0x010d,2
-0x010e,11
-0x010f,-1
-0x0110,10
-0x0111,39
-0x0112,4,skillup,2
-0x0113,10,useskilltoid,2:4:6
-0x0114,31
-0x0115,35
-0x0116,10,useskilltopos,2:4:6:8
-0x0117,18
-0x0118,2,stopattack,0
-0x0119,13
-0x011a,15
-0x011b,20,useskillmap,2:4
-0x011c,68
-0x011d,2,requestmemo,0
-0x011e,3
-0x011f,16
-0x0120,6
-0x0121,14
-0x0122,-1
-0x0123,-1
-0x0124,21
-0x0125,8
-0x0126,8,putitemtocart,2:4
-0x0127,8,getitemfromcart,2:4
-0x0128,8,movefromkafratocart,2:4
-0x0129,8,movetokafrafromcart,2:4
-0x012a,2,removeoption,0
-0x012b,2
-0x012c,3
-0x012d,4
-0x012e,2,closevending,0
-0x012f,-1,openvending,2:4:0:84
-0x0130,6,vendinglistreq,2
-0x0131,86
-0x0132,6
-0x0133,-1
-0x0134,-1,purchasereq,2:4:8
-0x0135,7
-0x0136,-1
-0x0137,6
-0x0138,3
-0x0139,16
-0x013a,4
-0x013b,4
-0x013c,4
-0x013d,6
-0x013e,24
-0x013f,26,itemmonster,2
-0x0140,22,mapmove,2:18:20
-0x0141,14
-0x0142,6
-0x0143,10,npcamountinput,2:6
-0x0144,23
-0x0145,19
-0x0146,6,npccloseclicked,2
-0x0147,39
-0x0148,8
-0x0149,9,gmreqnochat,2:6:7
-0x014a,6
-0x014b,27
-0x014c,-1
-0x014d,2,guildcheckmaster,0
-0x014e,6
-0x014f,6,guildrequestinfo,2
-0x0150,110
-0x0151,6,guildrequestemblem,2
-0x0152,-1
-0x0153,-1,guildchangeemblem,2:4
-0x0154,-1
-0x0155,-1,guildchangememberposition,2:4
-0x0156,-1
-0x0157,6
-0x0158,-1
-0x0159,54,guildleave,2:6:10:14
-0x015a,66
-0x015b,54,guildexpulsion,2:6:10:14
-0x015c,90
-0x015d,42,guildbreak,2
-0x015e,6
-0x015f,42
-0x0160,-1
-0x0161,-1,guildchangepositioninfo,2:4
-0x0162,-1
-0x0163,-1
-0x0164,-1
-0x0165,30,createguild,2:6
-0x0166,-1
-0x0167,3
-0x0168,14,guildinvite,2:6:10
-0x0169,3
-0x016a,30
-0x016b,10,guildreplyinvite,2:6
-0x016c,43
-0x016d,14
-0x016e,186,guildchangenotice,2:6:66
-0x016f,182
-0x0170,14,guildrequestalliance,2:6:10
-0x0171,30
-0x0172,10,guildreplyalliance,2:6
-0x0173,3
-0x0174,-1
-0x0175,6
-0x0176,106
-0x0177,-1
-0x0178,4,itemidentify,2
-0x0179,5
-0x017a,4,usecard,2
-0x017b,-1
-0x017c,6,insertcard,2:4
-0x017d,7
-0x017e,-1,guildmessage,2:4
-0x017f,-1
-0x0180,6,guildopposition,2
-0x0181,3
-0x0182,106
-0x0183,10,guilddelalliance,2:6
-0x0184,10
-0x0185,34
-//0x0186,-1
-0x0187,6
-0x0188,8
-0x0189,4
-0x018a,4,quitgame,2
-0x018b,4
-0x018c,29
-0x018d,-1
-0x018e,10,producemix,2:4:6:8
-0x018f,6
-0x0190,90,useskilltoposinfo,2:4:6:8:10
-0x0191,86
-0x0192,24
-0x0193,6,solvecharname,2
-0x0194,30
-0x0195,102
-0x0196,9
-0x0197,4,resetchar,2
-0x0198,8,changemaptype,2:4:6
-0x0199,4
-0x019a,14
-0x019b,10
-0x019c,-1,localbroadcast,2:4
-0x019d,6,gmhide,2
-0x019e,2
-0x019f,6,catchpet,2
-0x01a0,3
-0x01a1,3,petmenu,2
-0x01a2,35
-0x01a3,5
-0x01a4,11
-0x01a5,26,changepetname,2
-0x01a6,-1
-0x01a7,4,selectegg,2
-0x01a8,4
-0x01a9,6,sendemotion,2
-0x01aa,10
-0x01ab,12
-0x01ac,6
-0x01ad,-1
-0x01ae,4,selectarrow,2
-0x01af,4,changecart,2
-0x01b0,11
-0x01b1,7
-0x01b2,-1,openvending,2:4:84:85
-0x01b3,67
-0x01b4,12
-0x01b5,18
-0x01b6,114
-0x01b7,6
-0x01b8,3
-0x01b9,6
-0x01ba,26,remove,2
-0x01bb,26,shift,2
-0x01bc,26,recall,2
-0x01bd,26,summon,2
-0x01be,2
-0x01bf,3
-0x01c0,2
-0x01c1,14
-0x01c2,10
-0x01c3,-1
-0x01c4,22
-0x01c5,22
-0x01c6,4
-0x01c7,2
-0x01c8,13
-0x01c9,97
-//0x01ca,-1
-0x01cb,9
-0x01cc,9
-0x01cd,30
-0x01ce,6,autospell,2
-0x01cf,28
-0x01d0,8
-0x01d1,14
-0x01d2,10
-0x01d3,35
-0x01d4,6
-0x01d5,-1,npcstringinput,2:4:8
-0x01d6,4
-0x01d7,11
-0x01d8,54
-0x01d9,53
-0x01da,60
-0x01db,2
-0x01dc,-1
-0x01dd,47
-0x01de,33
-0x01df,6,gmreqaccname,2
-0x01e0,30
-0x01e1,8
-0x01e2,34
-0x01e3,14
-0x01e4,2
-0x01e5,6
-0x01e6,26
-0x01e7,2,sndoridori,0
-0x01e8,28,createparty2,2:26:27
-0x01e9,81
-0x01ea,6
-0x01eb,10
-0x01ec,26
-0x01ed,2,snexplosionspirits,0
-0x01ee,-1
-0x01ef,-1
-0x01f0,-1
-0x01f1,-1
-0x01f2,20
-0x01f3,10
-0x01f4,32
-0x01f5,9
-0x01f6,34
-0x01f7,14,adoptreply,2:6:10
-0x01f8,2
-0x01f9,6,adoptrequest,2
-0x01fa,48
-0x01fb,56
-0x01fc,-1
-0x01fd,4,repairitem,2
-0x01fe,5
-0x01ff,10
-0x0200,26
-0x0201,-1
-0x0202,26,friendslistadd,2
-0x0203,10,friendslistremove,2:6
-0x0204,18
-0x0205,26
-0x0206,11
-0x0207,34
-0x0208,11,friendslistreply,2:6:10
-0x0209,36
-0x020a,10
-//0x020b,-1
-//0x020c,-1
-0x020d,-1
-0x8b3,-1
-0x8d6,6,ZC_CLEAR_DIALOG,2
-
-//2004-07-05aSakexe
-packet_ver: 6
-0x0072,22,wanttoconnection,5:9:13:17:21
-0x0085,8,walktoxy,5
-0x00a7,13,useitem,5:9
-0x0113,15,useskilltoid,4:9:11
-0x0116,15,useskilltopos,4:9:11:13
-0x0190,95,useskilltoposinfo,4:9:11:13:15
-0x0208,14,friendslistreply,2:6:10
-0x020e,24
-
-//2004-07-13aSakexe
-packet_ver: 7
-0x0072,39,wanttoconnection,12:22:30:34:38
-0x0085,9,walktoxy,6
-0x009b,13,changedir,5:12
-0x009f,10,takeitem,6
-0x00a7,17,useitem,6:13
-0x0113,19,useskilltoid,7:9:15
-0x0116,19,useskilltopos,7:9:15:17
-0x0190,99,useskilltoposinfo,7:9:15:17:19
-
-//2004-07-26aSakexe
-packet_ver: 8
-0x0072,14,dropitem,5:12
-0x007e,33,wanttoconnection,12:18:24:28:32
-0x0085,20,useskilltoid,7:12:16
-0x0089,15,getcharnamerequest,11
-0x008c,23,useskilltopos,3:6:17:21
-0x0094,10,takeitem,6
-0x009b,6,walktoxy,3
-0x009f,13,changedir,5:12
-0x00a2,103,useskilltoposinfo,3:6:17:21:23
-0x00a7,12,solvecharname,8
-0x00f3,-1,globalmessage,2:4
-0x00f5,17,useitem,6:12
-0x00f7,10,ticksend,6
-0x0113,16,movetokafra,5:12
-0x0116,2,closekafra,0
-0x0190,26,movefromkafra,10:22
-0x0193,9,actionrequest,3:8
-
-//2004-08-09aSakexe
-packet_ver: 9
-0x0072,17,dropitem,8:15
-0x007e,37,wanttoconnection,9:21:28:32:36
-0x0085,26,useskilltoid,11:18:22
-0x0089,12,getcharnamerequest,8
-0x008c,40,useskilltopos,5:15:29:38
-0x0094,13,takeitem,9
-0x009b,15,walktoxy,12
-0x009f,12,changedir,7:11
-0x00a2,120,useskilltoposinfo,5:15:29:38:40
-0x00a7,11,solvecharname,7
-0x00f5,24,useitem,9:20
-0x00f7,13,ticksend,9
-0x0113,23,movetokafra,5:19
-0x0190,26,movefromkafra,11:22
-0x0193,18,actionrequest,7:17
-
-//2004-08-16aSakexe
-0x0212,26,rc,2
-0x0213,26,check,2
-0x0214,42
-
-//2004-08-17aSakexe
-0x020f,10,pvpinfo,2:6
-0x0210,22
-
-//2004-09-06aSakexe
-packet_ver: 10
-0x0072,20,useitem,9:20
-0x007e,19,movetokafra,3:15
-0x0085,23,actionrequest,9:22
-0x0089,9,walktoxy,6
-0x008c,105,useskilltoposinfo,10:14:18:23:25
-0x0094,17,dropitem,6:15
-0x009b,14,getcharnamerequest,10
-0x009f,-1,globalmessage,2:4
-0x00a2,14,solvecharname,10
-0x00a7,25,useskilltopos,10:14:18:23
-0x00f3,10,changedir,4:9
-0x00f5,34,wanttoconnection,7:15:25:29:33
-0x00f7,2,closekafra,0
-0x0113,11,takeitem,7
-0x0116,11,ticksend,7
-0x0190,22,useskilltoid,9:15:18
-0x0193,17,movefromkafra,3:13
-
-//2004-09-20aSakexe
-packet_ver: 11
-0x0072,18,useitem,10:14
-0x007e,25,movetokafra,6:21
-0x0085,9,actionrequest,3:8
-0x0089,14,walktoxy,11
-0x008c,109,useskilltoposinfo,16:20:23:27:29
-0x0094,19,dropitem,12:17
-0x009b,10,getcharnamerequest,6
-0x00a2,10,solvecharname,6
-0x00a7,29,useskilltopos,6:20:23:27
-0x00f3,18,changedir,8:17
-0x00f5,32,wanttoconnection,10:17:23:27:31
-0x0113,14,takeitem,10
-0x0116,14,ticksend,10
-0x0190,14,useskilltoid,4:7:10
-0x0193,12,movefromkafra,4:8
-
-//2004-10-05aSakexe
-packet_ver: 12
-0x0072,17,useitem,6:13
-0x007e,16,movetokafra,5:12
-0x0089,6,walktoxy,3
-0x008c,103,useskilltoposinfo,2:6:17:21:23
-0x0094,14,dropitem,5:12
-0x009b,15,getcharnamerequest,11
-0x00a2,12,solvecharname,8
-0x00a7,23,useskilltopos,3:6:17:21
-0x00f3,13,changedir,5:12
-0x00f5,33,wanttoconnection,12:18:24:28:32
-0x0113,10,takeitem,6
-0x0116,10,ticksend,6
-0x0190,20,useskilltoid,7:12:16
-0x0193,26,movefromkafra,10:22
-
-//2004-10-25aSakexe
-packet_ver: 13
-0x0072,13,useitem,5:9
-0x007e,13,movetokafra,6:9
-0x0085,15,actionrequest,4:14
-0x008c,108,useskilltoposinfo,6:9:23:26:28
-0x0094,12,dropitem,6:10
-0x009b,10,getcharnamerequest,6
-0x00a2,16,solvecharname,12
-0x00a7,28,useskilltopos,6:9:23:26
-0x00f3,15,changedir,6:14
-0x00f5,29,wanttoconnection,5:14:20:24:28
-0x0113,9,takeitem,5
-0x0116,9,ticksend,5
-0x0190,26,useskilltoid,4:10:22
-0x0193,22,movefromkafra,12:18
-
-//2004-11-01aSakexe
-0x0084,-1
-0x0215,6
-
-//2004-11-08aSakexe
-0x0084,2
-0x0216,6
-0x0217,2,blacksmith,0
-0x0218,2,alchemist,0
-0x0219,282
-0x021a,282
-0x021b,10
-0x021c,10
-
-//2004-11-15aSakexe
-0x021d,6,lesseffect,2
-
-//2004-11-29aSakexe
-packet_ver: 14
-0x0072,22,useskilltoid,8:12:18
-0x007e,30,useskilltopos,4:9:22:28
-0x0085,-1,globalmessage,2:4
-0x0089,7,ticksend,3
-0x008c,13,getcharnamerequest,9
-0x0094,14,movetokafra,4:10
-0x009b,2,closekafra,0
-0x009f,18,actionrequest,6:17
-0x00a2,7,takeitem,3
-0x00a7,7,walktoxy,4
-0x00f3,8,changedir,3:7
-0x00f5,29,wanttoconnection,3:10:20:24:28
-0x00f7,14,solvecharname,10
-0x0113,110,useskilltoposinfo,4:9:22:28:30
-0x0116,12,dropitem,4:10
-0x0190,15,useitem,3:11
-0x0193,21,movefromkafra,4:17
-0x0221,-1
-0x0222,6,weaponrefine,2
-0x0223,8
-
-//2004-12-13aSakexe
-//skipped: many packets being set to -1
-0x0066,3
-0x0070,3
-0x01ca,3
-0x021e,6
-0x021f,66
-0x0220,10
-
-//2005-01-10bSakexe
-packet_ver: 15
-0x0072,26,useskilltoid,8:16:22
-0x007e,114,useskilltoposinfo,10:18:22:32:34
-0x0085,23,changedir,12:22
-0x0089,9,ticksend,5
-0x008c,8,getcharnamerequest,4
-0x0094,20,movetokafra,10:16
-0x009b,32,wanttoconnection,3:12:23:27:31
-0x009f,17,useitem,5:13
-0x00a2,11,solvecharname,7
-0x00a7,13,walktoxy,10
-0x00f3,-1,globalmessage,2:4
-0x00f5,9,takeitem,5
-0x00f7,21,movefromkafra,11:17
-0x0113,34,useskilltopos,10:18:22:32
-0x0116,20,dropitem,15:18
-0x0190,20,actionrequest,9:19
-0x0193,2,closekafra,0
-
-//2005-03-28aSakexe
-0x0224,10
-0x0225,2,taekwon,0
-0x0226,282
-
-//2005-04-04aSakexe
-0x0227,18
-0x0228,18
-
-//2005-04-11aSakexe
-0x0229,15
-0x022a,58
-0x022b,57
-0x022c,64
-
-//2005-04-25aSakexe
-0x022d,5,hommenu,2:4
-0x0232,9,hommoveto,2:6
-0x0233,11,homattack,2:6:10
-0x0234,6,hommovetomaster,2
-
-//2005-05-09aSakexe
-packet_ver: 16
-0x0072,25,useskilltoid,6:10:21
-0x007e,102,useskilltoposinfo,5:9:12:20:22
-0x0085,11,changedir,7:10
-0x0089,8,ticksend,4
-0x008c,11,getcharnamerequest,7
-0x0094,14,movetokafra,7:10
-0x009b,26,wanttoconnection,4:9:17:21:25
-0x009f,14,useitem,4:10
-0x00a2,15,solvecharname,11
-0x00a7,8,walktoxy,5
-0x00f5,8,takeitem,4
-0x00f7,22,movefromkafra,14:18
-0x0113,22,useskilltopos,5:9:12:20
-0x0116,10,dropitem,5:8
-0x0190,19,actionrequest,5:18
-
-//2005-05-23aSakexe
-0x022e,69
-0x0230,12
-
-//2005-05-30aSakexe
-0x022e,71
-0x0235,-1
-0x0236,10
-0x0237,2,rankingpk,0
-0x0238,282
-
-//2005-05-31aSakexe
-0x0216,2
-0x0239,11
-
-//2005-06-08aSakexe
-0x0216,6
-0x0217,2,blacksmith,0
-0x022f,5
-0x0231,26,changehomunculusname,2
-0x023a,4
-0x023b,36,storagepassword,2:4:20
-0x023c,6
-
-//2005-06-22aSakexe
-0x022e,71
-
-//2005-06-28aSakexe
-packet_ver: 17
-0x0072,34,useskilltoid,6:17:30
-0x007e,113,useskilltoposinfo,12:15:18:31:33
-0x0085,17,changedir,8:16
-0x0089,13,ticksend,9
-0x008c,8,getcharnamerequest,4
-0x0094,31,movetokafra,16:27
-0x009b,32,wanttoconnection,9:15:23:27:31
-0x009f,19,useitem,9:15
-0x00a2,9,solvecharname,5
-0x00a7,11,walktoxy,8
-0x00f5,13,takeitem,9
-0x00f7,18,movefromkafra,11:14
-0x0113,33,useskilltopos,12:15:18:31
-0x0116,12,dropitem,3:10
-0x0190,24,actionrequest,11:23
-0x0216,-1
-0x023d,-1
-0x023e,4
-
-//2005-07-18aSakexe
-packet_ver: 18
-0x0072,19,useskilltoid,5:11:15
-0x007e,110,useskilltoposinfo,9:15:23:28:30
-0x0085,11,changedir,6:10
-0x0089,7,ticksend,3
-0x008c,11,getcharnamerequest,7
-0x0094,21,movetokafra,12:17
-0x009b,31,wanttoconnection,3:13:22:26:30
-0x009f,12,useitem,3:8
-0x00a2,18,solvecharname,14
-0x00a7,15,walktoxy,12
-0x00f5,7,takeitem,3
-0x00f7,13,movefromkafra,5:9
-0x0113,30,useskilltopos,9:15:23:28
-0x0116,12,dropitem,6:10
-0x0190,21,actionrequest,5:20
-0x0216,6
-0x023f,2,mailrefresh,0
-0x0240,8
-0x0241,6,mailread,2
-0x0242,-1
-0x0243,6,maildelete,2
-0x0244,6,mailgetattach,2
-0x0245,7
-0x0246,4,mailwinopen,2
-0x0247,8,mailsetattach,2:4
-0x0248,68
-0x0249,3
-0x024a,70
-0x024b,4,auctioncancelreg,2
-0x024c,8,auctionsetitem,2:4
-0x024d,14
-0x024e,6,auctioncancel,2
-0x024f,10,auctionbid,2:6
-0x0250,3
-0x0251,2
-0x0252,-1
-
-//2005-07-19bSakexe
-packet_ver: 19
-0x0072,34,useskilltoid,6:17:30
-0x007e,113,useskilltoposinfo,12:15:18:31:33
-0x0085,17,changedir,8:16
-0x0089,13,ticksend,9
-0x008c,8,getcharnamerequest,4
-0x0094,31,movetokafra,16:27
-0x009b,32,wanttoconnection,9:15:23:27:31
-0x009f,19,useitem,9:15
-0x00a2,9,solvecharname,5
-0x00a7,11,walktoxy,8
-0x00f5,13,takeitem,9
-0x00f7,18,movefromkafra,11:14
-0x0113,33,useskilltopos,12:15:18:31
-0x0116,12,dropitem,3:10
-0x0190,24,actionrequest,11:23
-
-//2005-08-01aSakexe
-0x0245,3
-0x0251,4
-
-//2005-08-08aSakexe
-0x024d,12,auctionregister,2:6:10
-0x024e,4
-
-//2005-08-17aSakexe
-0x0253,3
-0x0254,3,feelsaveok,2
-
-//2005-08-29aSakexe
-0x0240,-1
-0x0248,-1,mailsend,2:4:28:68:69
-0x0255,5
-0x0256,-1
-0x0257,8
-
-//2005-09-12bSakexe
-0x0256,5
-0x0258,2
-0x0259,3
-
-//2005-10-10aSakexe
-0x020e,32
-0x025a,-1
-0x025b,6,cooking,2:4
-
-//2005-10-13aSakexe
-0x007a,6
-0x0251,32
-0x025c,4,auctionbuysell,2
-
-//2005-10-17aSakexe
-0x007a,58
-0x025d,6,auctionclose,2
-0x025e,4
-
-//2005-10-24aSakexe
-0x025f,6
-0x0260,6
-
-//2005-11-07aSakexe
-0x024e,6,auctioncancel,2
-0x0251,34,auctionsearch,2:4:8:32
-
-//2006-01-09aSakexe
-0x0261,11
-0x0262,11
-0x0263,11
-0x0264,20
-0x0265,20
-0x0266,30
-0x0267,4
-0x0268,4
-0x0269,4
-0x026a,4
-0x026b,4
-0x026c,4
-0x026d,4
-0x026f,2
-0x0270,2
-0x0271,38
-0x0272,44
-
-//2006-01-26aSakexe
-0x0271,40
-
-//2006-03-06aSakexe
-0x0273,6
-0x0274,8
-
-//2006-03-13aSakexe
-0x0273,30,mailreturn,2:6
-
-//2006-03-27aSakexe
-packet_ver: 20
-0x0072,26,useskilltoid,11:18:22
-0x007e,120,useskilltoposinfo,5:15:29:38:40
-0x0085,12,changedir,7:11
-//0x0089,13,ticksend,9
-0x008c,12,getcharnamerequest,8
-0x0094,23,movetokafra,5:19
-0x009b,37,wanttoconnection,9:21:28:32:36
-0x009f,24,useitem,9:20
-0x00a2,11,solvecharname,7
-0x00a7,15,walktoxy,12
-0x00f5,13,takeitem,9
-0x00f7,26,movefromkafra,11:22
-0x0113,40,useskilltopos,5:15:29:38
-0x0116,17,dropitem,8:15
-0x0190,18,actionrequest,7:17
-
-//2006-10-23aSakexe
-0x006d,110
-
-//2006-04-24aSakexe to 2007-01-02aSakexe
-0x023e,8
-0x0277,84
-0x0278,2
-0x0279,2
-0x027a,-1
-0x027b,14
-0x027c,60
-0x027d,62
-0x027e,-1
-0x027f,8
-0x0280,12
-0x0281,4
-0x0282,284
-0x0283,6
-0x0284,14
-0x0285,6
-0x0286,4
-0x0287,-1
-0x0288,6
-0x0289,8
-0x028a,18
-0x028b,-1
-0x028c,46
-0x028d,34
-0x028e,4
-0x028f,6
-0x0290,4
-0x0291,4
-0x0292,2,autorevive,0
-0x0293,70
-0x0294,10
-0x0295,-1
-0x0296,-1
-0x0297,-1
-0x0298,8
-0x0299,6
-0x029a,27
-0x029c,66
-0x029d,-1
-0x029e,11
-0x029f,3,mermenu,2
-0x02a0,-1
-0x02a1,-1
-0x02a2,8
-
-//2007-01-08aSakexe
-packet_ver: 21
-0x0072,30,useskilltoid,10:14:26
-0x007e,120,useskilltoposinfo,10:19:23:38:40
-0x0085,14,changedir,10:13
-0x0089,11,ticksend,7
-0x008c,17,getcharnamerequest,13
-0x0094,17,movetokafra,4:13
-0x009b,35,wanttoconnection,7:21:26:30:34
-0x009f,21,useitem,7:17
-0x00a2,10,solvecharname,6
-0x00a7,8,walktoxy,5
-0x00f5,11,takeitem,7
-0x00f7,15,movefromkafra,3:11
-0x0113,40,useskilltopos,10:19:23:38
-0x0116,19,dropitem,11:17
-0x0190,10,actionrequest,4:9
-
-//2007-01-22aSakexe
-0x02a3,18
-0x02a4,2
-
-//2007-01-29aSakexe
-0x029b,72
-0x02a3,-1
-0x02a4,-1
-0x02a5,8
-
-// 2007-02-05aSakexe
-0x02aa,4
-0x02ab,36
-0x02ac,6
-
-//2007-02-12aSakexe
-packet_ver: 22
-0x0072,25,useskilltoid,6:10:21
-0x007e,102,useskilltoposinfo,5:9:12:20:22
-0x0085,11,changedir,7:10
-0x0089,8,ticksend,4
-0x008c,11,getcharnamerequest,7
-0x0094,14,movetokafra,7:10
-0x009b,26,wanttoconnection,4:9:17:21:25
-0x009f,14,useitem,4:10
-0x00a2,15,solvecharname,11
-//0x00a7,8,walktoxy,5
-0x00f5,8,takeitem,4
-0x00f7,22,movefromkafra,14:18
-0x0113,22,useskilltopos,5:9:12:20
-0x0116,10,dropitem,5:8
-0x0190,19,actionrequest,5:18
-
-//2007-05-07aSakexe
-0x01fd,15,repairitem,2:4:6:7:9:11:13
-
-//2007-02-27aSakexe to 2007-10-02aSakexe
-0x0288,10,cashshopbuy,2:4:6
-0x0289,12
-0x02a6,22
-0x02a7,22
-0x02a8,162
-0x02a9,58
-0x02ad,8
-0x02b0,85
-0x02b1,-1
-0x02b2,-1
-0x02b3,107
-0x02b4,6
-0x02b5,-1
-0x02b6,7,queststate,2:6
-0x02b7,7
-0x02b8,22
-0x02b9,191
-0x02ba,11,hotkey,2:4:5:9
-0x02bb,8
-0x02bc,6
-0x02bf,10
-0x02c0,2
-0x02c1,-1
-0x02c2,-1
-0x02c4,26,partyinvite2,2
-0x02c5,30
-0x02c6,30
-0x02c7,7,replypartyinvite2,2:6
-0x02c8,3,partytick,2
-0x02c9,3
-0x02ca,3
-0x02cb,20
-0x02cc,4
-0x02cd,26
-0x02ce,10
-0x02cf,6
-0x02d0,-1
-0x02d1,-1
-0x02d2,-1
-0x02d3,4,ZC_NOTIFY_BIND_ON_EQUIP,2
-0x02d4,29
-0x02d5,2
-0x02d6,6,viewplayerequip,2
-0x02d7,-1
-0x02d8,10,equiptickbox,2:6
-0x02d9,10
-0x02da,3
-0x02db,-1,battlechat,2:4
-0x02dc,-1
-0x02dd,32
-0x02de,6
-0x02df,36
-0x02e0,34
-
-//2007-10-23aSakexe
-0x02cb,65
-0x02cd,71
-
-//2007-11-06aSakexe
-0x0078,55
-0x007c,42
-0x022c,65
-0x029b,80
-
-//2007-11-13aSakexe
-0x02e1,33
-
-//2007-11-20aSakexe
-//0x01df,10 <- ???
-0x02e2,14
-0x02e3,25
-0x02e4,8
-0x02e5,8
-0x02e6,6
-
-//2007-11-27aSakexe
-0x02e7,-1
-
-//2008-01-02aSakexe
-0x01df,6,gmreqaccname,2
-0x02e8,-1
-0x02e9,-1
-0x02ea,-1
-0x02eb,13
-0x02ec,67
-0x02ed,59
-0x02ee,60
-0x02ef,8
-
-//2008-03-18aSakexe
-0x02bf,-1
-0x02c0,-1
-0x02f0,10
-0x02f1,2,progressbar,0
-0x02f2,2
-
-//2008-03-25bSakexe
-0x02f3,-1
-0x02f4,-1
-0x02f5,-1
-0x02f6,-1
-0x02f7,-1
-0x02f8,-1
-0x02f9,-1
-0x02fa,-1
-0x02fb,-1
-0x02fc,-1
-0x02fd,-1
-0x02fe,-1
-0x02ff,-1
-0x0300,-1
-
-//2008-04-01aSakexe
-0x0301,-1
-0x0302,-1
-0x0303,-1
-0x0304,-1
-0x0305,-1
-0x0306,-1
-0x0307,-1
-0x0308,-1
-0x0309,-1
-0x030a,-1
-0x030b,-1
-0x030c,-1
-0x030d,-1
-0x030e,-1
-0x030f,-1
-0x0310,-1
-0x0311,-1
-0x0312,-1
-0x0313,-1
-0x0314,-1
-0x0315,-1
-0x0316,-1
-0x0317,-1
-0x0318,-1
-0x0319,-1
-0x031a,-1
-0x031b,-1
-0x031c,-1
-0x031d,-1
-0x031e,-1
-0x031f,-1
-0x0320,-1
-0x0321,-1
-0x0322,-1
-0x0323,-1
-0x0324,-1
-0x0325,-1
-0x0326,-1
-0x0327,-1
-0x0328,-1
-0x0329,-1
-0x032a,-1
-0x032b,-1
-0x032c,-1
-0x032d,-1
-0x032e,-1
-0x032f,-1
-0x0330,-1
-0x0331,-1
-0x0332,-1
-0x0333,-1
-0x0334,-1
-0x0335,-1
-0x0336,-1
-0x0337,-1
-0x0338,-1
-0x0339,-1
-0x033a,-1
-0x033b,-1
-0x033c,-1
-0x033d,-1
-0x033e,-1
-0x033f,-1
-0x0340,-1
-0x0341,-1
-0x0342,-1
-0x0343,-1
-0x0344,-1
-0x0345,-1
-0x0346,-1
-0x0347,-1
-0x0348,-1
-0x0349,-1
-0x034a,-1
-0x034b,-1
-0x034c,-1
-0x034d,-1
-0x034e,-1
-0x034f,-1
-0x0350,-1
-0x0351,-1
-0x0352,-1
-0x0353,-1
-0x0354,-1
-0x0355,-1
-0x0356,-1
-0x0357,-1
-0x0358,-1
-0x0359,-1
-0x035a,-1
-
-//2008-05-27aSakexe
-0x035b,-1
-0x035c,2
-0x035d,-1
-0x035e,2
-0x035f,-1
-0x0389,-1
-
-//2008-08-20aSakexe
-0x040c,-1
-0x040d,-1
-0x040e,-1
-0x040f,-1
-0x0410,-1
-0x0411,-1
-0x0412,-1
-0x0413,-1
-0x0414,-1
-0x0415,-1
-0x0416,-1
-0x0417,-1
-0x0418,-1
-0x0419,-1
-0x041a,-1
-0x041b,-1
-0x041c,-1
-0x041d,-1
-0x041e,-1
-0x041f,-1
-0x0420,-1
-0x0421,-1
-0x0422,-1
-0x0423,-1
-0x0424,-1
-0x0425,-1
-0x0426,-1
-0x0427,-1
-0x0428,-1
-0x0429,-1
-0x042a,-1
-0x042b,-1
-0x042c,-1
-0x042d,-1
-0x042e,-1
-0x042f,-1
-0x0430,-1
-0x0431,-1
-0x0432,-1
-0x0433,-1
-0x0434,-1
-0x0435,-1
-
-//2008-09-10aSakexe
-packet_ver: 23
-0x0436,19,wanttoconnection,2:6:10:14:18
-0x0437,7,actionrequest,2:6
-0x0438,10,useskilltoid,2:4:6
-0x0439,8,useitem,2:4
-
-//2008-11-13aSakexe
-0x043d,8
-0x043e,-1
-0x043f,8
-
-//2008-11-26aSakexe
-0x01a2,37
-0x0440,10
-0x0441,4
-
-//2008-12-10aSakexe
-0x0442,-1
-0x0443,8,skillselectmenu,2:6
-
-//2009-01-14aSakexe
-0x043f,25
-0x0444,-1
-0x0445,10
-
-//2009-02-18aSakexe
-0x0446,14
-
-//2009-02-25aSakexe
-0x0448,-1
-
-//2009-03-30aSakexe
-0x0449,4
-
-//2009-04-08aSakexe
-0x02a6,-1
-0x02a7,-1
-0x044a,6,clientversion,2
-
-//Renewal Clients
-//2008-08-27aRagexeRE
-packet_ver: 24
-0x0072,22,useskilltoid,9:15:18
-0x007c,44
-0x007e,105,useskilltoposinfo,10:14:18:23:25
-0x0085,10,changedir,4:9
-0x0089,11,ticksend,7
-0x008c,14,getcharnamerequest,10
-0x0094,19,movetokafra,3:15
-0x009b,34,wanttoconnection,7:15:25:29:33
-0x009f,20,useitem,7:20
-0x00a2,14,solvecharname,10
-0x00a7,9,walktoxy,6
-0x00f5,11,takeitem,7
-0x00f7,17,movefromkafra,3:13
-0x0113,25,useskilltopos,10:14:18:23
-0x0116,17,dropitem,6:15
-0x0190,23,actionrequest,9:22
-0x02e2,20
-0x02e3,22
-0x02e4,11
-0x02e5,9
-
-//2008-09-10aRagexeRE
-packet_ver: 25
-0x0436,19,wanttoconnection,2:6:10:14:18
-0x0437,7,actionrequest,2:6
-0x0438,10,useskilltoid,2:4:6
-0x0439,8,useitem,2:4
-
-//2008-11-12aRagexeRE
-0x043d,8
-//0x043e,-1
-0x043f,8
-
-//2008-12-17aRagexeRE
-0x01a2,37
-//0x0440,10
-//0x0441,4
-//0x0442,8
-//0x0443,8
-
-//2008-12-17bRagexeRE
-0x006d,114
-
-//2009-01-21aRagexeRE
-0x043f,25
-//0x0444,-1
-//0x0445,10
-
-//2009-02-18aRagexeRE
-//0x0446,14
-
-//2009-02-26cRagexeRE
-//0x0448,-1
-
-//2009-04-01aRagexeRE
-//0x0449,4
-
-//2009-05-14aRagexeRE
-//0x044b,2
-
-//2009-05-20aRagexeRE
-//0x07d0,6
-//0x07d1,2
-//0x07d2,-1
-//0x07d3,4
-//0x07d4,4
-//0x07d5,4
-//0x07d6,4
-//0x0447,2
-
-//2009-06-03aRagexeRE
-0x07d7,8,partychangeoption,2:6:7
-0x07d8,8
-0x07d9,254
-0x07da,6,partychangeleader,2
-
-//2009-06-10aRagexeRE
-//0x07db,8
-
-//2009-06-17aRagexeRE
-0x07d9,268
-//0x07dc,6
-//0x07dd,54
-//0x07de,30
-//0x07df,54
-
-//2009-07-01aRagexeRE
-//0x0275,37
-//0x0276,-1
-
-//2009-07-08aRagexeRE
-//0x07e0,58
-
-//2009-07-15aRagexeRE
-0x07e1,15
-
-//2009-08-05aRagexeRE
-0x07e2,8
-
-//2009-08-18aRagexeRE
-0x07e3,6
-0x07e4,-1,itemlistwindowselected,2:4:8:12
-0x07e6,8
-
-//2009-08-25aRagexeRE
-//0x07e6,28
-0x07e7,5
-
-//2009-09-22aRagexeRE
-0x07e5,8
-0x07e6,8
-0x07e7,32
-0x07e8,-1
-0x07e9,5
-
-//2009-09-29aRagexeRE
-//0x07ea,2
-//0x07eb,-1
-//0x07ec,6
-//0x07ed,8
-//0x07ee,6
-//0x07ef,8
-//0x07f0,4
-//0x07f2,4
-//0x07f3,3
-
-//2009-10-06aRagexeRE
-//0x07ec,8
-//0x07ed,10
-//0x07f0,8
-//0x07f1,15
-//0x07f2,6
-//0x07f3,4
-//0x07f4,3
-
-//2009-10-27aRagexeRE
-0x07f5,6,gmfullstrip,2
-0x07f6,14
-
-//2009-11-03aRagexeRE
-0x07f7,-1
-0x07f8,-1
-0x07f9,-1
-
-//2009-11-17aRagexeRE
-0x07fa,8
-
-//2009-11-24aRagexeRE
-0x07fb,25
-
-//2009-12-01aRagexeRE
-0x07fc,10
-0x07fd,-1,ZC_BROADCASTING_SPECIAL_ITEM_OBTAIN,0
-0x07fe,26
-//0x07ff,-1
-
-//2009-12-15aRagexeRE
-0x0800,-1
-//0x0801,-1
-
-//2009-12-22aRagexeRE
-0x0802,18,bookingregreq,2:4:6 // Booking System
-0x0803,4
-0x0804,8 // Booking System
-0x0805,-1
-0x0806,4,bookingdelreq,2 // Booking System
-//0x0807,2
-0x0808,4 // Booking System
-//0x0809,14
-//0x080A,50
-//0x080B,18
-//0x080C,6
-
-//2009-12-29aRagexeRE
-0x0804,14,bookingsearchreq,2:4:6:8:12 // Booking System
-0x0806,2,bookingdelreq,0 // Booking System
-0x0807,4
-0x0808,14,bookingupdatereq,2 // Booking System
-0x0809,50
-0x080A,18
-0x080B,6 // Booking System
-
-//2010-01-05aRagexeRE
-0x0801,-1,purchasereq2,2:4:8:12
-
-//2010-01-26aRagexeRE
-//0x080C,2
-//0x080D,3
-0x080E,14
-
-//2010-02-09aRagexeRE
-//0x07F0,6
-
-//2010-02-23aRagexeRE
-0x080F,20
-
-//2010-03-03aRagexeRE
-0x0810,3
-0x0811,-1,reqopenbuyingstore,2:4:8:9:89
-//0x0812,86
-//0x0813,6
-//0x0814,6
-//0x0815,-1
-//0x0817,-1
-//0x0818,6
-//0x0819,4
-
-//2010-03-09aRagexeRE
-0x0813,-1
-//0x0814,2
-//0x0815,6
-0x0816,6
-0x0818,-1
-//0x0819,10
-//0x081A,4
-//0x081B,4
-//0x081C,6
-0x081d,22
-0x081e,8
-
-//2010-03-23aRagexeRE
-//0x081F,-1
-
-//2010-04-06aRagexeRE
-//0x081A,6
-
-//2010-04-13aRagexeRE
-//0x081A,10
-0x0820,11
-//0x0821,2
-//0x0822,9
-//0x0823,-1
-
-//2010-04-14dRagexeRE
-//0x081B,8
-
-//2010-04-20aRagexeRE
-0x0812,8
-0x0814,86
-0x0815,2,reqclosebuyingstore,0
-0x0817,6,reqclickbuyingstore,2
-0x0819,-1,reqtradebuyingstore,2:4:8:12
-0x081a,4
-0x081b,10
-0x081c,10
-0x0824,6
-
-//2010-06-01aRagexeRE
-//0x0825,-1
-//0x0826,4
-0x0835,-1,searchstoreinfo,2:4:5:9:13:14:15
-0x0836,-1
-0x0837,3
-//0x0838,3
-
-//2010-06-08aRagexeRE
-0x0838,2,searchstoreinfonextpage,0
-0x083A,4 // Search Stalls Feature
-0x083B,2,closesearchstoreinfo,0
-0x083C,12,searchstoreinfolistitemclick,2:6:10
-0x083D,6
-
-//2010-06-15aRagexeRE
-//0x083E,26
-
-//2010-06-22aRagexeRE
-//0x083F,22
-
-//2010-06-29aRagexeRE
-0x00AA,9,ZC_WEAR_EQUIP_ACK,2:4:6:8
-//0x07F1,18
-//0x07F2,8
-//0x07F3,6
-
-//2010-07-01aRagexeRE
-0x083A,5 // Search Stalls Feature
-
-//2010-07-13aRagexeRE
-//0x0827,6
-//0x0828,14
-//0x0829,6
-//0x082A,10
-//0x082B,6
-//0x082C,14
-//0x0840,-1
-//0x0841,19
-
-//2010-07-14aRagexeRE
-//0x0841,4
-
-//2010-08-03aRagexeRE
-0x0839,66
-0x0842,6,recall2,2
-0x0843,6,remove2,2
-
-//2010-11-24aRagexeRE
-packet_ver: 26
-0x0288,-1,cashshopbuy,2:4:8:10
-0x0436,19,wanttoconnection,2:6:10:14:18
-0x035f,5,walktoxy,2
-0x0360,6,ticksend,2
-0x0361,5,changedir,2:4
-0x0362,6,takeitem,2
-0x0363,6,dropitem,2:4
-0x0364,8,movetokafra,2:4
-0x0365,8,movefromkafra,2:4
-0x0366,10,useskilltopos,2:4:6:8
-0x0367,90,useskilltoposinfo,2:4:6:8:10
-0x0368,6,getcharnamerequest,2
-0x0369,6,solvecharname,2
-0x0856,-1
-0x0857,-1
-0x0858,-1
-0x0859,-1
-0x08d0,9,ZC_WEAR_EQUIP_ACK,2:4:6:8
-
-//2011-10-05aRagexeRE
-packet_ver: 27
-packet_keys: 0x291E6762,0x77CD391A,0x60AC2F16 // [Shakto]
-0x0364,5,walktoxy,2
-0x0817,6,ticksend,2
-0x0366,5,changedir,2:4
-0x0815,6,takeitem,2
-0x0885,6,dropitem,2:4
-0x0893,8,movetokafra,2:4
-0x0897,8,movefromkafra,2:4
-0x0369,10,useskilltopos,2:4:6:8
-0x08ad,90,useskilltoposinfo,2:4:6:8:10
-0x088a,6,getcharnamerequest,2
-0x0838,6,solvecharname,2
-0x0439,8,useitem,2:4
-0x08d2,10
-0x08d1,7
-0x0846,4,cashshopreqtab,2 //2011-07-18
-
-// 2011-11-02aRagexe
-packet_ver: 28
-packet_keys: 0x5324329D,0x5D545D52,0x06137269 // [Shakto]
-0x0436,26,friendslistadd,2
-0x0898,5,hommenu,2:4
-0x0281,36,storagepassword,2:4:20
-0x088d,26,partyinvite2,2
-0x083c,19,wanttoconnection,2:6:10:14:18
-0x08aa,7,actionrequest,2:6
-0x02c4,10,useskilltoid,2:4:6
-0x0811,-1,itemlistwindowselected,2:4:8:12
-0x0890,8
-0x08a5,18,bookingregreq,2:4:6
-0x0835,-1,reqopenbuyingstore,2:4:8:9:89
-0x089b,2,reqclosebuyingstore,0
-0x08a1,6,reqclickbuyingstore,2
-0x089e,-1,reqtradebuyingstore,2:4:8:12
-0x08ab,-1,searchstoreinfo,2:4:5:9:13:14:15
-0x088b,2,searchstoreinfonextpage,0
-0x08a2,12,searchstoreinfolistitemclick,2:6:10
-0x08cf,10 //Amulet spirits
-
-//2012-03-07fRagexeRE
-packet_ver:29
-packet_keys: 0x382A6DEF,0x5CBE7202,0x61F46637 // [Shakto]
-0x086A,19,wanttoconnection,2:6:10:14:18
-0x0437,5,walktoxy,2
-0x0887,6,ticksend,2
-0x0890,5,changedir,2:4
-0x0865,6,takeitem,2
-0x02C4,6,dropitem,2:4
-0x093B,8,movetokafra,2:4
-0x0963,8,movefromkafra,2:4
-0x0438,10,useskilltopos,2:4:6:8
-0x0366,90,useskilltoposinfo,2:4:6:8:10
-0x096A,6,getcharnamerequest,2
-0x0368,6,solvecharname,2
-0x0369,26,friendslistadd,2
-0x0863,5,hommenu,2:4
-0x0861,36,storagepassword,2:4:20
-0x0929,26,partyinvite2,2
-0x0885,7,actionrequest,2:6
-0x0889,10,useskilltoid,2:4:6
-0x0870,-1,itemlistwindowselected,2:4:8:12
-//0x0926,41,bookingregreq,2:4:6
-0x0815,-1,reqopenbuyingstore,2:4:8:9:89
-0x0817,2,reqclosebuyingstore,0
-0x0360,6,reqclickbuyingstore,2
-0x0811,-1,reqtradebuyingstore,2:4:8:12
-0x0884,-1,searchstoreinfo,2:4:5:9:13:14:15
-0x0835,2,searchstoreinfonextpage,0
-0x0838,12,searchstoreinfolistitemclick,2:6:10
-0x0439,8,useitem,2:4
-0x0365,41,bookingregreq,2:4:6
-
-// New Packet
-0x090F,-1 // ZC_NOTIFY_NEWENTRY7
-0x0914,-1 // ZC_NOTIFY_MOVEENTRY8
-0x0915,-1 // ZC_NOTIFY_STANDENTRY9
-
-//2012-04-10aRagexeRE
-packet_ver: 30
-packet_keys: 0x01581359,0x452D6FFA,0x6AFB6E2E // [Shakto]
-0x01fd,15,repairitem,2:4:6:7:9:11:13
-0x089c,26,friendslistadd,2
-0x0885,5,hommenu,2:4
-0x0961,36,storagepassword,2:4:20
-0x0288,-1,cashshopbuy,2:4:8:10
-0x091c,26,partyinvite2,2
-0x094b,19,wanttoconnection,2:6:10:14:18
-0x0369,7,actionrequest,2:6
-0x083c,10,useskilltoid,2:4:6
-0x0439,8,useitem,2:4
-0x0945,-1,itemlistwindowselected,2:4:8:12
-0x0815,-1,reqopenbuyingstore,2:4:8:9:89
-0x0817,2,reqclosebuyingstore,0
-0x0360,6,reqclickbuyingstore,2
-0x0811,-1,reqtradebuyingstore,2:4:8:12
-0x0819,-1,searchstoreinfo,2:4:5:9:13:14:15
-0x0835,2,searchstoreinfonextpage,0
-0x0838,12,searchstoreinfolistitemclick,2:6:10
-0x0437,5,walktoxy,2
-0x0886,6,ticksend,2
-0x0871,5,changedir,2:4
-0x0938,6,takeitem,2
-0x0891,6,dropitem,2:4
-0x086c,8,movetokafra,2:4
-0x08a6,8,movefromkafra,2:4
-0x0438,10,useskilltopos,2:4:6:8
-0x0366,90,useskilltoposinfo,2:4:6:8:10
-0x0889,6,getcharnamerequest,2
-0x0884,6,solvecharname,2
-0x08e6,4
-0x08e7,10,bookingsearchreq,2:4:6:8:12
-0x08e8,-1
-0x08e9,2,bookingdelreq,0
-0x08ea,4
-0x08eb,39,bookingupdatereq,2
-0x08ec,73
-0x08ed,43
-0x08ee,6
-0x08ef,6,bookingignorereq,2
-0x08f0,6
-0x08f1,6,bookingjoinpartyreq,2
-0x08f2,36
-0x08f3,-1
-0x08f4,6
-0x08f5,-1,bookingsummonmember,2:4
-0x08f6,22
-0x08f7,3
-0x08f8,7
-0x08f9,6
-0x08fa,6
-0x08fb,6,bookingcanceljoinparty,2
-0x0907,5,moveitem,2:4
-0x0908,5
-0x08d7,28,battlegroundreg,2:4
-0x0977,14 //Monster HP Bar
-0x0916,26,guildinvite2,2
-0x091d,41,bookingregreq,2:4:6
-0x08cb,10,ZC_PERSONAL_INFOMATION,2:4:6:8:10:11:13:15 //Still need further information
-// Merge Item
-0x096D,-1,ZC_MERGE_ITEM_OPEN,2:4 // ZC_MERGE_ITEM_OPEN
-0x096E,-1,mergeitem_req,2:4 // CZ_REQ_MERGE_ITEM
-0x096F,7,ZC_ACK_MERGE_ITEM,2:4:6 // ZC_ACK_MERGE_ITEM
-0x0974,2,mergeitem_cancel,0 // CZ_CANCEL_MERGE_ITEM
-0x0844,2,cashshopopen,0
-0x0849,16 //clif_cashshop_result
-0x0848,-1,cashshopbuy,2:6:4:10
-0x084a,2,cashshopclose,0
-0x08c9,2,cashshopitemlist,0
-
-//2012-04-18aRagexeRE [Special Thanks to Judas!]
-packet_ver: 31
-packet_keys: 0x01540E48,0x13041224,0x31247924 // [Shakto]
-0x023B,26,friendslistadd,2
-0x0361,5,hommenu,2:4
-0x08A8,36,storagepassword,2:4:20
-0x0802,26,partyinvite2,2
-0x022D,19,wanttoconnection,2:6:10:14:18
-0x0281,-1,itemlistwindowselected,2:4:8:12
-0x035F,6,ticksend,2
-0x0202,5,changedir,2:4
-0x07E4,6,takeitem,2
-0x0362,6,dropitem,2:4
-0x07EC,8,movetokafra,2:4
-0x0364,8,movefromkafra,2:4
-0x096A,6,getcharnamerequest,2
-0x0368,6,solvecharname,2
-0x08E5,41,bookingregreq,2:4:6 //Added to prevent disconnections
-0x08d2,10
-
-//2012-06-18
-packet_ver: 32
-packet_keys: 0x261F261F,0x261F261F,0x261F261F // [Shakto]
-0x0983,29 // ZC_MSG_STATE_CHANGE3
-0x0861,41,bookingregreq,2:4:6 //actually 12-05-03
-
-//2012-07-02aRagexeRE (unstable)
-packet_ver: 33
-packet_keys: 0x25733B31,0x53486CFD,0x398649BD // [Shakto]
-0x0363,19,wanttoconnection,2:6:10:14:18
-0x0364,6,ticksend,2
-0x085a,7,actionrequest,2:6
-0x0861,8,movefromkafra,2:4
-0x0862,10,useskilltoid,2:4:6
-0x0863,10,useskilltopos,2:4:6:8
-0x0886,6,solvecharname,2
-0x0889,90,useskilltoposinfo,2:4:6:8:10
-0x089e,6,dropitem,2:4
-0x089f,6,takeitem,2
-0x08a0,8,movetokafra,2:4
-0x094a,6,getcharnamerequest,2
-0x0953,5,walktoxy,2
-0x0960,5,changedir,2:4
-0x0879,41,bookingregreq,2:4:6
-
-//2013-03-20Ragexe (Judas)
-packet_ver: 34
-packet_keys: 0x3F094C49,0x55F86C1E,0x58AA359A // [Shakto]
-0x014f,6,guildrequestinfo,2
-0x01fd,15,repairitem,2:4:6:7:9:11:13
-//0x0281,-1,itemlistwindowselected,2:4:8:12
-0x035f,6,reqclickbuyingstore,2
-0x0363,6,ticksend,2
-0x0365,12,searchstoreinfolistitemclick,2:6:10
-0x0438,6,dropitem,2:4
-0x0447,2,booking_playcancel,0 // CZ_BLOCKING_PLAY_CANCEL
-0x044A,6,clientversion,2
-0x0844,2,cashshopopen,0
-0x0849,16 //clif_cashshop_result
-0x0848,-1,cashshopbuy,2:6:4:10
-0x084a,2,cashshopclose,0
-0x084b,19 //fallitem4
-0x085a,90,useskilltoposinfo,2:4:6:8:10
-0x085d,18,bookingregreq,2:4:6
-0x0868,-1,itemlistwindowselected,2:4:8:12
-0x086d,26,partyinvite2,2
-0x086f,26,friendslistadd,2
-0x0874,8,movefromkafra,2:4
-0x0881,5,walktoxy,2
-0x0886,2,reqclosebuyingstore,0
-0x0888,19,wanttoconnection,2:6:10:14:18
-0x088e,7,actionrequest,2:6
-0x0897,5,changedir,2:4
-0x0898,6,getcharnamerequest,2
-0x089b,10,useskilltoid,2:4:6
-0x08ac,8,movetokafra,2:4
-0x08c9,2,cashshopitemlist,0
-0x08cf,10 //Amulet spirits
-0x08d2,10
-0x0907,5,moveitem,2:4
-0x0908,5
-0x0922,-1,reqtradebuyingstore,2:4:8:12
-//0x092e,2,searchstoreinfonextpage,0
-0x0933,6,takeitem,2
-0x0938,-1,reqopenbuyingstore,2:4:8:9:89
-0x093f,5,hommenu,2:4
-0x0947,36,storagepassword,2:4:20
-0x094c,6,solvecharname,2
-0x094e,-1,searchstoreinfo,2:4:5:9:13:14:15
-0x0959,10,useskilltopos,2:4:6:8
-//0x095a,8,mailsetattach,2:4
-0x0977,14 //Monster HP Bar
-0x0978,6,reqworldinfo,2
-0x0979,50 //ackworldinfo
-0x097b,16,ZC_PERSONAL_INFOMATION,2:4:8:12:16:17:21:25 //Still need further information
-//0x0981,12,ZC_PERSONAL_INFOMATION_CHN,2:4:6:8:12:13:15:17:10 // Disabled until further information is found.
-0x0990,31 //additem
-0x0991,-1 //inv itemlist normal
-0x0992,-1 //inv itemlist equip
-0x0993,-1 //cart itemlist normal
-0x0994,-1 //cart itemlist equip
-0x0995,-1 //store itemlist normal
-0x0996,-1 //store itemlist equip
-0x0997,-1 //ZC_EQUIPWIN_MICROSCOPE_V5
-0x0998,8,equipitem,2:4 // CZ_REQ_WEAR_EQUIP_V5
-0x0999,11,ZC_WEAR_EQUIP_ACK,2:4:8:10 // cz_wear_equipv5
-0x099a,9 // take_off_equipv5
-0x099b,8 //maptypeproperty2
-
-// New Packets
-0x08C8,34 // ZC_NOTIFY_ACT3
-0x08ff,24 // ZC_EFST_SET_ENTER
-0x0984,28 // ZC_EFST_SET_ENTER2
-0x099f,22 // ZC_SKILL_ENTRY4
-
-//2013-05-15aRagexe (Yommy)
-packet_ver: 35
-packet_keys: 0x75794A38,0x58A96BC1,0x296E6FB8 // [Shakto]
-0x0369,7,actionrequest,2:6
-0x083C,10,useskilltoid,2:4:6
-0x0437,5,walktoxy,2
-0x035F,6,ticksend,2
-0x0362,5,changedir,2:4
-0x08A1,6,takeitem,2
-0x0944,6,dropitem,2:4
-0x0887,8,movetokafra,2:4
-0x08AC,8,movefromkafra,2:4
-0x0438,10,useskilltopos,2:4:6:8
-0x0366,90,useskilltoposinfo,2:4:6:8:10
-0x096A,6,getcharnamerequest,2
-0x0368,6,solvecharname,2
-0x0838,12,searchstoreinfolistitemclick,2:6:10
-0x0835,2,searchstoreinfonextpage,0
-0x0819,-1,searchstoreinfo,2:4:5:9:13:14:15
-0x0811,-1,reqtradebuyingstore,2:4:8:12
-0x0360,6,reqclickbuyingstore,2
-0x0817,2,reqclosebuyingstore,0
-0x0815,-1,reqopenbuyingstore,2:4:8:9:89
-0x092D,18,bookingregreq,2:4:6
-//0x08AA,8 CZ_JOIN_BATTLE_FIELD
-0x0963,-1,itemlistwindowselected,2:4:8:12
-0x0943,19,wanttoconnection,2:6:10:14:18
-0x0947,26,partyinvite2,2
-//0x0862,4 CZ_GANGSI_RANK
-0x0962,26,friendslistadd,2
-0x0931,5,hommenu,2:4
-0x093e,36,storagepassword,2:4:20
-
-//2013-05-22Ragexe (Yommy)
-packet_ver: 36
-packet_keys: 0x6948050B,0x06511D9D,0x725D4DF1 // [Shakto]
-0x08A2,7,actionrequest,2:6
-0x095C,10,useskilltoid,2:4:6
-0x0360,5,walktoxy,2
-0x07EC,6,ticksend,2
-0x0925,5,changedir,2:4
-0x095E,6,takeitem,2
-0x089C,6,dropitem,2:4
-0x08a3,8,movetokafra,2:4
-0x087E,8,movefromkafra,2:4
-0x0811,10,useskilltopos,2:4:6:8
-0x0964,90,useskilltoposinfo,2:4:6:8:10
-0x08a6,6,getcharnamerequest,2
-0x0369,6,solvecharname,2
-0x093e,12,searchstoreinfolistitemclick,2:6:10
-0x08aa,2,searchstoreinfonextpage,0
-0x095b,-1,searchstoreinfo,2:4:5:9:13:14:15
-0x0952,-1,reqtradebuyingstore,2:4:8:12
-0x0368,6,reqclickbuyingstore,2
-0x086E,2,reqclosebuyingstore,0
-0x0874,-1,reqopenbuyingstore,2:4:8:9:89
-0x089B,18,bookingregreq,2:4:6
-//0x0965,8 CZ_JOIN_BATTLE_FIELD
-0x086A,-1,itemlistwindowselected,2:4:8:12
-0x08A9,19,wanttoconnection,2:6:10:14:18
-0x0950,26,partyinvite2,2
-//0x08AC,4 CZ_GANGSI_RANK
-0x0362,26,friendslistadd,2
-0x0926,5,hommenu,2:4
-0x088e,36,storagepassword,2:4:20
-
-//2013-05-29Ragexe (Shakto)
-packet_ver: 37
-packet_keys: 0x023A6C87,0x14BF1F1E,0x5CC70CC9 // [Shakto]
-0x0890,7,actionrequest,2:6
-0x0438,10,useskilltoid,2:4:6
-0x0876,5,walktoxy,2
-0x0897,6,ticksend,2
-0x0951,5,changedir,2:4
-0x0895,6,takeitem,2
-0x08A7,6,dropitem,2:4
-0x0938,8,movetokafra,2:4
-0x0957,8,movefromkafra,2:4
-0x0917,10,useskilltopos,2:4:6:8
-0x085E,90,useskilltoposinfo,2:4:6:8:10
-0x0863,6,getcharnamerequest,2
-0x0937,6,solvecharname,2
-0x085A,12,searchstoreinfolistitemclick,2:6:10
-0x0941,2,searchstoreinfonextpage,0
-0x0918,-1,searchstoreinfo,2:4:5:9:13:14:15
-0x0936,-1,reqtradebuyingstore,2:4:8:12
-0x0892,6,reqclickbuyingstore,2
-0x0964,2,reqclosebuyingstore,0
-0x0869,-1,reqopenbuyingstore,2:4:8:9:89
-0x0874,18,bookingregreq,2,4:6
-//0x088E,8 // CZ_JOIN_BATTLE_FIELD
-0x0958,-1,itemlistwindowselected,2:4:8:12
-0x0919,19,wanttoconnection,2:6:10:14:18
-0x08A8,26,partyinvite2,2
-//0x0888,4 // CZ_GANGSI_RANK
-0x0877,26,friendslistadd,2
-0x023B,5,hommenu,2:4
-0x0956,36,storagepassword,2:4:20
-
-//2013-06-05Ragexe (Shakto)
-packet_ver: 38
-packet_keys: 0x646E08D9,0x5F153AB5,0x61B509B5 // [Shakto]
-0x0369,7,actionrequest,2:6
-0x083C,10,useskilltoid,2:4:6
-0x0437,5,walktoxy,2
-0x035F,6,ticksend,2
-0x0202,5,changedir,2:4
-0x07E4,6,takeitem,2
-0x0362,6,dropitem,2:4
-0x07EC,8,movetokafra,2:4
-0x0364,8,movefromkafra,2:4
-0x0438,10,useskilltopos,2:4:6:8
-0x0366,90,useskilltoposinfo,2:4:6:8:10
-0x096A,6,getcharnamerequest,2
-0x0368,6,solvecharname,2
-0x0838,12,searchstoreinfolistitemclick,2:6:10
-0x0835,2,searchstoreinfonextpage,0
-0x0819,-1,searchstoreinfo,2:4:5:9:13:14:15
-0x0811,-1,reqtradebuyingstore,2:4:8:12
-0x0360,6,reqclickbuyingstore,2
-0x0817,2,reqclosebuyingstore,0
-0x0815,-1,reqopenbuyingstore,2:4:8:9:89
-0x0365,18,bookingregreq,2:4:6
-//0x0363,8 // CZ_JOIN_BATTLE_FIELD
-0x0281,-1,itemlistwindowselected,2:4:8:12
-0x022D,19,wanttoconnection,2:6:10:14:18
-0x0802,26,partyinvite2,2
-//0x0436,4 // CZ_GANGSI_RANK
-0x023B,26,friendslistadd,2
-0x0361,5,hommenu,2,4
-0x0883,36,storagepassword,2:4:20
-0x097C,4,ranklist,2
-
-//2013-06-12Ragexe (Shakto)
-packet_ver: 39
-packet_keys: 0x6D166F66,0x3C000FCF,0x295B0FCB // [Shakto]
-0x0369,7,actionrequest,2:6
-0x083C,10,useskilltoid,2:4:6
-0x0437,5,walktoxy,2
-0x035F,6,ticksend,2
-0x087E,5,changedir,2:4
-0x07E4,6,takeitem,2
-0x0362,6,dropitem,2:4
-0x07EC,8,movetokafra,2:4
-0x0364,8,movefromkafra,2:4
-0x0438,10,useskilltopos,2:4:6:8
-0x0366,90,useskilltoposinfo,2:4:6:8:10
-0x096A,6,getcharnamerequest,2
-0x0368,6,solvecharname,2
-0x0838,12,searchstoreinfolistitemclick,2:6:10
-0x0835,2,searchstoreinfonextpage,0
-0x0819,-1,searchstoreinfo,2:4:5:9:13:14:15
-0x0811,-1,reqtradebuyingstore,2:4:8:12
-0x0360,6,reqclickbuyingstore,2
-0x0817,2,reqclosebuyingstore,0
-0x0815,-1,reqopenbuyingstore,2:4:8:9:89
-0x0365,18,bookingregreq,2:4:6
-//0x0363,8 // CZ_JOIN_BATTLE_FIELD
-0x0281,-1,itemlistwindowselected,2:4:8:12
-0x0919,19,wanttoconnection,2:6:10:14:18
-0x0802,26,partyinvite2,2
-//0x0436,4 // CZ_GANGSI_RANK
-0x0940,26,friendslistadd,2
-0x093A,5,hommenu,2:4
-0x0964,36,storagepassword,2:4:20
-
-//2013-06-18Ragexe (Shakto)
-packet_ver: 40
-packet_keys: 0x434115DE,0x34A10FE9,0x6791428E // [Shakto]
-0x0889,7,actionrequest,2:6
-0x0951,10,useskilltoid,2:4:6
-0x088E,5,walktoxy,2
-0x0930,6,ticksend,2
-0x08A6,5,changedir,2:4
-0x0962,6,takeitem,2
-0x0917,6,dropitem,2:4
-0x0885,8,movetokafra,2:4
-0x0936,8,movefromkafra,2:4
-0x096A,10,useskilltopos,2:4:6:8
-0x094F,90,useskilltoposinfo,2:4:6:8:10
-0x0944,6,getcharnamerequest,2
-0x0945,6,solvecharname,2
-0x0890,12,searchstoreinfolistitemclick,2:6:10
-0x0363,2,searchstoreinfonextpage,0
-0x0281,-1,searchstoreinfo,2:4:5:9:13:14:15
-0x0891,-1,reqtradebuyingstore,2:4:8:12
-0x0862,6,reqclickbuyingstore,2
-0x085A,2,reqclosebuyingstore,0
-0x0932,-1,reqopenbuyingstore,2:4:8:9:89
-0x08A7,18,bookingregreq,2:4:6
-//0x087A,8 // CZ_JOIN_BATTLE_FIELD
-0x0942,-1,itemlistwindowselected,2:4:8:12
-0x095B,19,wanttoconnection,2:6:10:14:18
-0x0887,26,partyinvite2,2
-//0x0878,4 // CZ_GANGSI_RANK
-0x0953,26,friendslistadd,2
-0x02C4,5,hommenu,2:4
-0x0864,36,storagepassword,2:4:20
-
-//2013-06-26Ragexe
-packet_ver: 41
-packet_keys: 0x38F453EF,0x6A040FD8,0X65BD6668 // [Shakto]
-0x0369,7,actionrequest,2:6
-0x083C,10,useskilltoid,2:4:6
-0x0437,5,walktoxy,2
-0x035F,6,ticksend,2
-0x094D,5,changedir,2:4
-0x088B,6,takeitem,2
-0x0952,6,dropitem,2:4
-0x0921,8,movetokafra,2:4
-0x0817,8,movefromkafra,2:4
-0x0438,10,useskilltopos,2:4:6:8
-0x0366,90,useskilltoposinfo,2:4:6:8:10
-0x096A,6,getcharnamerequest,2
-0x0368,6,solvecharname,2
-0x0838,12,searchstoreinfolistitemclick,2:6:10
-0x0835,2,searchstoreinfonextpage,0
-0x0819,-1,searchstoreinfo,2:4:5:9:13:14:15
-0x0811,-1,reqtradebuyingstore,2:4:8:12
-0x0360,6,reqclickbuyingstore,2
-0x0365,2,reqclosebuyingstore,0
-0x0815,-1,reqopenbuyingstore,2:4:8:9:89
-0x0894,18,bookingregreq,2:4:6
-//0x0860,8 // CZ_JOIN_BATTLE_FIELD
-0x08A5,-1,itemlistwindowselected,2:4:8:12
-0x088C,19,wanttoconnection,2:6:10:14:18
-0x0895,26,partyinvite2,2
-//0x088F,4 // CZ_GANGSI_RANK
-0x08AB,26,friendslistadd,2
-0x0960,5,hommenu,2:4
-0x0930,36,storagepassword,2:4:20
-
-//2013-07-03Ragexe
-packet_ver: 42
-packet_keys: 0x4FF90E23,0x0F1432F2,0x4CFA1EDA // [Shakto]
-0x0369,7,actionrequest,2:6
-0x083C,10,useskilltoid,2:4:6
-0x0437,5,walktoxy,2
-0x035F,6,ticksend,2
-0x0930,5,changedir,2:4
-0x07E4,6,takeitem,2
-0x0362,6,dropitem,2:4
-0x07EC,8,movetokafra,2:4
-0x0364,8,movefromkafra,2:4
-0x0438,10,useskilltopos,2:4:6:8
-0x0366,90,useskilltoposinfo,2:4:6:8:10
-0x096A,6,getcharnamerequest,2
-0x0368,6,solvecharname,2
-0x0838,12,searchstoreinfolistitemclick,2:6:10
-0x0835,2,searchstoreinfonextpage,0
-0x0819,-1,searchstoreinfo,2:4:5:9:13:14:15
-0x0811,-1,reqtradebuyingstore,2:4:8:12
-0x0202,6,reqclickbuyingstore,2
-0x0817,2,reqclosebuyingstore,0
-0x0815,-1,reqopenbuyingstore,2:4:8:9:89
-0x0365,18,bookingregreq,2:4:6
-//0x0363,8 // CZ_JOIN_BATTLE_FIELD
-0x0281,-1,itemlistwindowselected,2:4:8:12
-0x022D,19,wanttoconnection,2:6:10:14:18
-0x0802,26,partyinvite2,2
-//0x0436,4 // CZ_GANGSI_RANK
-0x0360,26,friendslistadd,2
-0x094A,5,hommenu,2:4
-0x0873,36,storagepassword,2:4:20
-
-//2013-07-10Ragexe
-packet_ver: 43
-packet_keys: 0x458F758F,0x4CCF3F8F,0x4A9C4237
-0x0369,7,actionrequest,2:6
-0x083C,10,useskilltoid,2:4:6
-0x0437,5,walktoxy,2
-0x035F,6,ticksend,2
-0x0202,5,changedir,2:4
-0x07E4,6,takeitem,2
-0x0362,6,dropitem,2:4
-0x07EC,8,movetokafra,2:4
-0x0364,8,movefromkafra,2:4
-0x0438,10,useskilltopos,2:4:6:8
-0x0366,90,useskilltoposinfo,2:4:6:8:10
-0x096A,6,getcharnamerequest,2
-0x0368,6,solvecharname,2
-0x0838,12,searchstoreinfolistitemclick,2:6:10
-0x0835,2,searchstoreinfonextpage,0
-0x0819,-1,searchstoreinfo,2:4:5:9:13:14:15
-0x0811,-1,reqtradebuyingstore,2:4:8:12
-0x0360,6,reqclickbuyingstore,2
-0x0817,2,reqclosebuyingstore,0
-0x0815,-1,reqopenbuyingstore,2:4:8:9:89
-0x0365,18,bookingregreq,2:4:6
-//0x0363,8 // CZ_JOIN_BATTLE_FIELD
-0x0281,-1,itemlistwindowselected,2:4:8:12
-0x022D,19,wanttoconnection,2:6:10:14:18
-0x0802,26,partyinvite2,2
-//0x0436,4 // CZ_GANGSI_RANK
-0x023B,26,friendslistadd,2
-0x0361,5,hommenu,2:4
-0x0880,36,storagepassword,2:4:20
-0x0848,-1,cashshopbuy,2:6:4:10
-0x097D,288 //ZC_ACK_RANKING
-
-//2013-07-17Ragexe
-packet_ver: 44
-packet_keys: 0x2BED4F91,0x5F9E00CF,0x5EE5520C
-0x0918,7,actionrequest,2:6
-0x091E,10,useskilltoid,2:4:6
-0x083C,5,walktoxy,2
-0x02C4,6,ticksend,2
-0x088C,5,changedir,2:4
-0x08A9,6,takeitem,2
-0x0917,6,dropitem,2:4
-0x089B,8,movetokafra,2:4
-0x0956,8,movefromkafra,2:4
-0x0882,10,useskilltopos,2:4:6:8
-0x0952,90,useskilltoposinfo,2:4:6:8:10
-0x0958,6,getcharnamerequest,2
-0x0967,6,solvecharname,2
-0x0960,12,searchstoreinfolistitemclick,2:6:10
-0x0819,2,searchstoreinfonextpage,0
-0x086B,-1,searchstoreinfo,2:4:5:9:13:14:15
-0x093B,-1,reqtradebuyingstore,2:4:8:12
-0x0898,6,reqclickbuyingstore,2
-0x096A,2,reqclosebuyingstore,0
-0x08AA,-1,reqopenbuyingstore,2:4:8:9:89
-0x0862,18,bookingregreq,2:4:6
-//0x08A6,8 // CZ_JOIN_BATTLE_FIELD
-0x0897,-1,itemlistwindowselected,2:4:8:12
-0x091D,19,wanttoconnection,2:6:10:14:18
-0x092F,26,partyinvite2,2
-//0x086C,4 // CZ_GANGSI_RANK
-0x0863,26,friendslistadd,2
-0x088A,5,hommenu,2:4
-0x095B,36,storagepassword,2:4:20
-0x09A6,12,ZC_BANKING_CHECK,2:10
-0x09A7,10,bankdeposit,2:6
-0x09A8,16,ZC_ACK_BANKING_DEPOSIT,2:4:12
-0x09A9,10,bankwithdrawal,2:6
-0x09AA,16,ZC_ACK_BANKING_WITHDRAW,2:4:12
-0x09AB,6,bankcheck,2
-0x09B6,6,bankopen,2
-0x09B7,4,ZC_ACK_OPEN_BANKING,2
-0x09B8,6,bankclose,2
-0x09B9,4,ZC_ACK_CLOSE_BANKING,2
-
-//2013-07-31cRagexe
-0x09ca,23 // ZC_SKILL_ENTRY5
-0x09cb,17 // ZC_USE_SKILL2
-
-//2013-08-07Ragexe
-packet_ver: 45
-packet_keys: 0x7E241DE0,0x5E805580,0x3D807D80 // [Shakto]
-0x0369,7,actionrequest,2:6
-0x083C,10,useskilltoid,2:4:6
-0x0437,5,walktoxy,2
-0x035F,6,ticksend,2
-0x0202,5,changedir,2:4
-0x07E4,6,takeitem,2
-0x0362,6,dropitem,2:4
-0x07EC,8,movetokafra,2:4
-0x0364,8,movefromkafra,2:4
-0x0438,10,useskilltopos,2:4:6:8
-0x0366,90,useskilltoposinfo,2:4:6:8:10
-0x096A,6,getcharnamerequest,2
-0x0368,6,solvecharname,2
-0x0838,12,searchstoreinfolistitemclick,2:6:10
-0x0835,2,searchstoreinfonextpage,0
-0x0819,-1,searchstoreinfo,2:4:5:9:13:14:15
-0x0811,-1,reqtradebuyingstore,2:4:8:12
-0x0360,6,reqclickbuyingstore,2
-0x0817,2,reqclosebuyingstore,0
-0x0815,-1,reqopenbuyingstore,2:4:8:9:89
-0x0365,18,bookingregreq,2:4:6
-//0x363,8 // CZ_JOIN_BATTLE_FIELD
-0x0281,-1,itemlistwindowselected,2:4:8:12
-0x022D,19,wanttoconnection,2:6:10:14:18
-0x0802,26,partyinvite2,2
-//0x436,4 // CZ_GANGSI_RANK
-0x023B,26,friendslistadd,2
-0x0361,5,hommenu,2:4
-0x0887,36,storagepassword,2:4:20
-0x09C1,10,ZC_C_MARKERINFO,2:6:8
-// Merge Item
-0x096D,-1,ZC_MERGE_ITEM_OPEN,2:4 // ZC_MERGE_ITEM_OPEN
-0x096E,-1,mergeitem_req,2:4 // CZ_REQ_MERGE_ITEM
-0x096F,7,ZC_ACK_MERGE_ITEM,2:4:6:7 // ZC_ACK_MERGE_ITEM
-0x0974,2,mergeitem_cancel,0 // CZ_CANCEL_MERGE_ITEM
-
-//2013-12-23Ragexe
-packet_ver: 46
-packet_keys: 0x631C511C,0x111C111C,0x111C111C // [Shakto]
-0x0369,7,actionrequest,2:6
-0x083C,10,useskilltoid,2:4:6
-0x0437,5,walktoxy,2
-0x035F,6,ticksend,2
-0x0202,5,changedir,2:4
-0x07E4,6,takeitem,2
-0x0362,6,dropitem,2:4
-0x07EC,8,movetokafra,2:4
-0x0364,8,movefromkafra,2:4
-0x0438,10,useskilltopos,2:4:6:8
-0x0366,90,useskilltoposinfo,2:4:6:8:10
-0x096A,6,getcharnamerequest,2
-0x0368,6,solvecharname,2
-0x0838,12,searchstoreinfolistitemclick,2:6:10
-0x0835,2,searchstoreinfonextpage,0
-0x0819,-1,searchstoreinfo,2:4:5:9:13:14:15
-0x0811,-1,reqtradebuyingstore,2:4:8:12
-0x0360,6,reqclickbuyingstore,2
-0x0817,2,reqclosebuyingstore,0
-0x0815,-1,reqopenbuyingstore,2:4:8:9:89
-0x0365,18,bookingregreq,2:4:6
-//0x363,8 // CZ_JOIN_BATTLE_FIELD
-0x0281,-1,itemlistwindowselected,2:4:8:12
-0x022D,19,wanttoconnection,2:6:10:14:18
-0x0802,26,partyinvite2,2
-//0x436,4 // CZ_GANGSI_RANK
-0x023B,26,friendslistadd,2
-0x0361,5,hommenu,2:4
-0x08A4,36,storagepassword,2:4:20
-//New Packets
-//0x097E,12 //ZC_UPDATE_RANKING_POINT
-0x09CE,102,itemmonster,2
-0x09D4,2,npcshopclosed,0
-//NPC Market
-0x09D5,-1
-0x09D6,-1,npcmarketpurchase,2:4:6
-0x09D7,-1
-0x09D8,2,npcmarketclosed,0
-// Clan System
-0x0988,6
-0x0989,2
-0x098A,-1
-0x098D,-1,clanchat,2:4
-0x098E,-1
-// Sale
-0x09AC,-1,salesearch,2:4:8
-0x09AD,8
-0x09AE,17,saleadd,2:6:8:12:16
-0x09AF,4
-0x09B0,8,saleremove,2:6
-0x09B1,4
-0x09B2,8
-0x09B3,4
-0x09B4,6,saleopen,2
-0x09BC,6,saleclose,2
-0x09C3,8,salerefresh,2:6
-0x09C4,8
-
-// New Packet
-0x097A,-1 // ZC_ALL_QUEST_LIST2
-0x09DB,-1 // ZC_NOTIFY_MOVEENTRY10
-0x09DC,-1 // ZC_NOTIFY_NEWENTRY10
-0x09DD,-1 // ZC_NOTIFY_STANDENTRY10
-0x09DF,7 // ZC_ACK_WHISPER02
-
-//2014-10-16Ragexe
-packet_ver: 50
-packet_keys: 0x2DFF467C,0x444B37EE,0x2C1B634F // [YomRawr]
-0x0369,7,actionrequest,2:6
-0x083C,10,useskilltoid,2:4:6
-0x0437,5,walktoxy,2
-0x035F,6,ticksend,2
-0x0967,5,changedir,2:4
-0x07E4,6,takeitem,2
-0x0362,6,dropitem,2:4
-0x07EC,8,movetokafra,2:4
-0x022D,8,movefromkafra,2:4
-0x0438,10,useskilltopos,2:4:6:8
-0x0366,90,useskilltoposinfo,2:4:6:8:10
-0x096A,6,getcharnamerequest,2
-0x0368,6,solvecharname,2
-0x0838,12,searchstoreinfolistitemclick,2:6:10
-0x0835,2,searchstoreinfonextpage,0
-0x0819,-1,searchstoreinfo,2:4:5:9:13:14:15
-0x0811,-1,reqtradebuyingstore,2:4:8:12
-0x0360,6,reqclickbuyingstore,2
-0x0817,2,reqclosebuyingstore,0
-0x0815,-1,reqopenbuyingstore,2:4:8:9:89
-0x0365,18,bookingregreq,2:4
-// 0x0363,8 // CZ_JOIN_BATTLE_FIELD
-0x0281,-1,itemlistwindowselected,2:4:8
-0x086E,19,wanttoconnection,2:6:10:14:18
-0x0802,26,partyinvite,2
-// 0x0922,4 // CZ_GANGSI_RANK
-0x094B,26,friendslistadd,2
-0x0364,5,hommenu,2:4
-0x0936,36,storagepassword,0
-0x09DF,7
-
-// New packet
-0x0A00,269 // ZC_SHORTCUT_KEY_LIST_V3
-0x0A01,3,hotkeyrowshift,2 // CZ_SHORTCUTKEYBAR_ROTATE
-0x0A02,4 // ZC_DRESSROOM_OPEN
-0x0A0E,14 // ZC_BATTLEFIELD_NOTIFY_HP2
-0x09F7,75 // ZC_PROPERTY_HOMUN_2
-0x09E5,18 // ZC_DELETEITEM_FROM_MCSTORE2
-0x09E6,22 // ZC_UPDATE_ITEM_FROM_BUYING_STORE2
-
-// Roulette System [Yommy]
-0x0A19,2,rouletteopen,0 // CZ_REQ_OPEN_ROULETTE
-0x0A1A,23 // ZC_ACK_OPEN_ROULETTE
-0x0A1B,2,rouletteinfo,0 // CZ_REQ_ROULETTE_INFO
-0x0A1C,-1 // ZC_ACK_ROULETTE_INFO
-0x0A1D,2,rouletteclose,0 // CZ_REQ_CLOSE_ROULETTE
-0x0A1E,3 // ZC_ACK_CLOSE_ROULETTE
-0x0A1F,2,roulettegenerate,0 // CZ_REQ_GENERATE_ROULETTE
-0x0A20,21 // ZC_ACK_GENERATE_ROULETTE
-0x0A21,3,rouletterecvitem,2 // CZ_RECV_ROULETTE_ITEM
-0x0A22,5 // ZC_RECV_ROULETTE_ITEM
-
-//2014-10-22bRagexe
-packet_ver: 51
-packet_keys: 0x290551EA,0x2B952C75,0x2D67669B // [YomRawr]
-0x006d,149
-0x023b,10,useskilltopos,2:4:6:8
-0x0281,-1,itemlistwindowselected,2:4:8:12
-0x035f,6,ticksend,2
-0x0360,6,reqclickbuyingstore,2
-0x0366,90,useskilltoposinfo,2:4:6:8:10
-0x0368,6,solvecharname,2
-0x0369,7,actionrequest,2:6
-0x0437,5,walktoxy,2
-0x0438,36,storagepassword,2:4:20
-0x0811,-1,reqtradebuyingstore,2:4:8:12
-0x0815,-1,reqopenbuyingstore,2:4:8:9:89
-0x0817,2,reqclosebuyingstore,0
-0x0819,-1,searchstoreinfo,2:4:5:9:13:14:15
-0x0835,12,searchstoreinfolistitemclick,2:6:10
-0x083c,10,useskilltoid,2:4:6
-0x0878,8,movetokafra,2:4
-0x087d,6,dropitem,2:4
-0x0896,26,partyinvite2,2
-0x0899,5,hommenu,2:4
-0x08aa,8,movefromkafra,2:4
-//0x08ab,4 // CZ_GANGSI_RANK
-0x08ad,5,changedir,2:4
-0x08e3,149
-0x091a,26,friendslistadd,2
-//0x092b,8 // CZ_JOIN_BATTLE_FIELD
-0x093b,19,wanttoconnection,2:6:10:14:18
-0x0940,2,searchstoreinfonextpage,0
-0x094e,6,takeitem,2
-0x0955,18,bookingregreq,2:4:6
-0x096a,6,getcharnamerequest,2
-
-// New Packet
-0x0A18,14 // ZC_ACCEPT_ENTER3
-0x0A28,3 // ZC_ACK_OPENSTORE2
-0x09FD,-1 // ZC_NOTIFY_MOVEENTRY11
-0x09FE,-1 // ZC_NOTIFY_NEWENTRY11
-0x09FF,-1 // ZC_NOTIFY_STANDENTRY11
-//0x09F8,-1 // ZC_ALL_QUEST_LIST3
-
-//2015-05-13aRagexe
-packet_ver: 52
-packet_keys: 0x62C86D09,0x75944F17,0x112C133D // [YomRawr]
-0x0369,7,actionrequest,2:6
-0x083C,10,useskilltoid,2:4:6
-0x0437,5,walktoxy,2
-0x035F,6,ticksend,2
-0x0924,5,changedir,2:4
-0x0958,6,takeitem,2
-0x0885,6,dropitem,2:4
-0x0879,8,movetokafra,2:4
-0x0864,8,movefromkafra,2:4
-0x0438,10,useskilltopos,2:4:6:8
-0x0366,90,useskilltoposinfo,2:4:6:8:10
-0x096A,6,getcharnamerequest,2
-0x0368,6,solvecharname,2
-0x0838,12,searchstoreinfolistitemclick,2:6:10
-0x0835,2,searchstoreinfonextpage,0
-0x0819,-1,searchstoreinfo,2:4:5:9:13:14:15
-0x0811,-1,reqtradebuyingstore,2:4:8:12
-0x0360,6,reqclickbuyingstore,2
-0x022D,2,reqclosebuyingstore,0
-0x0815,-1,reqopenbuyingstore,2:4:8:9:89
-0x0883,18,bookingregreq,2:4:6
-// 0x02C4,8 CZ_JOIN_BATTLE_FIELD
-0x0960,-1,itemlistwindowselected,2:4:8:12
-0x0363,19,wanttoconnection,2:6:10:14:18
-0x094A,26,partyinvite2,2
-// 0x0927,4 CZ_GANGSI_RANK
-0x08A8,26,friendslistadd,2
-0x0817,5,hommenu,2:4
-0x0923,36,storagepassword,2:4:20
-
-// New Packets
-0xA3B,-1 // ZC_HAT_EFFECT
-
-// RODEX Mail system
-0x09E7,3 // ZC_NOTIFY_UNREADMAIL
-0x09E8,11,mailrefresh,2:3 // CZ_OPEN_MAILBOX
-0x09E9,2,dull,0 // CZ_CLOSE_MAILBOX
-0x09EA,11,mailread,2:3 // CZ_REQ_READ_MAIL
-0x09EB,-1 // ZC_ACK_READ_MAIL
-0x09EC,-1,mailsend,2:4:28:52:60:62:64 // CZ_REQ_WRITE_MAIL
-0x09ED,3 // ZC_ACK_WRITE_MAIL
-0x09EE,11,mailrefresh,2:3 // CZ_REQ_NEXT_MAIL_LIST
-0x09EF,11,mailrefresh,2:3 // CZ_REQ_REFRESH_MAIL_LIST
-0x09F0,-1 // ZC_ACK_MAIL_LIST
-0x09F1,11,mailgetattach,0 // CZ_REQ_ZENY_FROM_MAIL
-0x09F2,12 // ZC_ACK_ZENY_FROM_MAIL
-0x09F3,11,mailgetattach,0 // CZ_REQ_ITEM_FROM_MAIL
-0x09F4,12 // ZC_ACK_ITEM_FROM_MAIL
-0x09F5,11,maildelete,0 // CZ_REQ_DELETE_MAIL
-0x09F6,11 // ZC_ACK_DELETE_MAIL
-0x0A03,2,mailcancel,0 // CZ_REQ_CANCEL_WRITE_MAIL
-0x0A04,6,mailsetattach,2:4 // CZ_REQ_ADD_ITEM_TO_MAIL
-0x0A05,53 // ZC_ACK_ADD_ITEM_TO_MAIL
-0x0A06,6,mailwinopen,2:4 // CZ_REQ_REMOVE_ITEM_MAIL
-0x0A07,9 // ZC_ACK_REMOVE_ITEM_MAIL
-0x0A08,26,mailbegin,0 // CZ_REQ_OPEN_WRITE_MAIL
-0x0A12,27 // ZC_ACK_OPEN_WRITE_MAIL
-0x0A13,26,mailreceiver,2 // CZ_CHECK_RECEIVE_CHARACTER_NAME
-0x0A14,10 // ZC_CHECK_RECEIVE_CHARACTER_NAME
-0x0A32,2 // ZC_OPEN_RODEX_THROUGH_NPC_ONLY
-
-// New EquipPackets Support
-0x0A09,45 // ZC_ADD_EXCHANGE_ITEM3
-0x0A0A,47 // ZC_ADD_ITEM_TO_STORE3
-0x0A0B,47 // ZC_ADD_ITEM_TO_CART3
-0x0A0C,56 // ZC_ITEM_PICKUP_ACK_V6
-0x0A0D,-1 // ZC_INVENTORY_ITEMLIST_EQUIP_V6
-0x0A0F,-1 // ZC_CART_ITEMLIST_EQUIP_V6
-0x0A10,-1 // ZC_STORE_ITEMLIST_EQUIP_V6
-0x0A2D,-1 // ZC_EQUIPWIN_MICROSCOPE_V6
-
-// OneClick Itemidentify
-0x0A35,4,oneclick_itemidentify,2 // CZ_REQ_ONECLICK_ITEMIDENTIFY
-
-// Achievement System
-0x0A23,-1 // ZC_ALL_ACH_LIST
-0x0A24,66 // ZC_ACH_UPDATE
-0x0A25,6,dull,0 // CZ_REQ_ACH_REWARD
-0x0A26,7 // ZC_REQ_ACH_REWARD_ACK
-
-// Title System
-0x0A2E,6,dull,0 // CZ_REQ_CHANGE_TITLE
-0x0A2F,7 // ZC_ACK_CHANGE_TITLE
-0x0A30,106 // ZC_ACK_REQNAMEALL2
-
-// Pet Evolution System
-0x09FB,-1,dull,0 // CZ_PET_EVOLUTION
-0x09FC,6 // ZC_PET_EVOLUTION_RESULT
-
-//2015-05-20aRagexe
-0x0A3D,18,saleadd,2:6:8:12:16
-
-//2015-09-16Ragexe
-packet_ver: 53
-packet_keys: 0x17F83A19,0x116944F4,0x1CC541E9 // [Napster]
-0x0869,7,actionrequest,2:6
-0x093E,10,useskilltoid,2:4:6
-0x0877,5,walktoxy,2
-0x08AC,6,ticksend,2
-0x0936,5,changedir,2:4
-0x089C,6,takeitem,2
-0x092F,6,dropitem,2:4
-0x0934,8,movetokafra,2:4
-0x085E,8,movefromkafra,2:4
-0x022D,10,useskilltopos,2:4:6:8
-0x0873,90,useskilltoposinfo,2:4:6:8:10
-0x095A,6,getcharnamerequest,2
-0x0942,6,solvecharname,2
-0x087F,12,searchstoreinfolistitemclick,2:6:10
-0x0817,2,searchstoreinfonextpage,0
-0x0920,-1,searchstoreinfo,2:4:5:9:13:14:15
-0x0881,-1,reqtradebuyingstore,2:4:8:12
-0x0835,6,reqclickbuyingstore,2
-0x092E,2,reqclosebuyingstore,0
-0x0948,-1,reqopenbuyingstore,2:4:8:9:89
-0x089B,18,bookingregreq,2:4:6
-// 0x094F,8 CZ_JOIN_BATTLE_FIELD
-0x0961,-1,itemlistwindowselected,2:4:8:12
-0x0969,19,wanttoconnection,2:6:10:14:18
-0x0924,26,partyinvite2,2
-// 0x0938,4 CZ_GANGSI_RANK
-0x089E,26,friendslistadd,2
-0x0960,5,hommenu,2:4
-0x0941,36,storagepassword,2:4:20
-
-// New Packet
-0x097F,-1 // ZC_SELECTCART
-0x0980,7,selectcart,2:6 // CZ_SELECTCART
-
-//2015-10-01bRagexeRE
-packet_ver: 54
-packet_keys: 0x45B945B9,0x45B945B9,0x45B945B9 // [Dastgir]
-0x0369,7,actionrequest,2:6
-0x083c,10,useskilltoid,2:4:6
-0x0437,5,walktoxy,2
-0x035f,6,ticksend,2
-0x0202,5,changedir,2:4
-0x07e4,6,takeitem,2
-0x0362,6,dropitem,2:4
-0x07ec,8,movetokafra,2:4
-0x0364,8,movefromkafra,2:4
-0x0438,10,useskilltopos,2:4:6:8
-0x0366,90,useskilltoposmoreinfo,2:4:6:8:10
-0x096a,6,getcharnamerequest,2
-0x0368,6,solvecharname,2
-0x0838,12,searchstoreinfolistitemclick,2:6:10
-0x0835,2,searchstoreinfonextpage,0
-0x0819,-1,searchstoreinfo,2:4:5:9:13:14:15
-0x0811,-1,reqtradebuyingstore,2:4:8:12
-0x0360,6,reqclickbuyingstore,2
-0x0817,2,reqclosebuyingstore,0
-0x0815,-1,reqopenbuyingstore,2:4:8:9:89
-0x0365,18,partybookingregisterreq,2:4:6
-//0x0363,8 // CZ_JOIN_BATTLE_FIELD
-0x0281,-1,itemlistwindowselected,2:4:8:12
-0x022d,19,wanttoconnection,2:6:10:14:18
-0x0802,26,partyinvite2,2
-//0x0436,4 // CZ_GANGSI_RANK
-0x023b,26,friendslistadd,2
-0x0361,5,hommenu,2:4
-0x0860,36,storagepassword,2:4:20
-
-//2015-11-04aRagexe
-packet_ver: 55
-packet_keys: 0x4C17382A,0x7ED174C9,0x29961E4F // [Winnie]
-0x0369,7,actionrequest,2:6
-0x083C,10,useskilltoid,2:4:6
-0x0363,5,walktoxy,2
-0x0886,6,ticksend,2
-0x0928,5,changedir,2:4
-0x0964,6,takeitem,2
-0x0437,6,dropitem,2:4
-0x088B,8,movetokafra,2:4
-0x0364,8,movefromkafra,2:4
-0x0438,10,useskilltopos,2:4:6:8
-0x0366,90,useskilltoposinfo,2:4:6:8:10
-0x0887,6,getcharnamerequest,2
-0x0368,6,solvecharname,2
-0x0838,12,searchstoreinfolistitemclick,2:6:10
-0x0835,2,searchstoreinfonextpage,0
-0x0819,-1,searchstoreinfo,2:4:5:9:13:14:15
-0x0815,-1,reqtradebuyingstore,2:4:8:12
-0x0436,6,reqclickbuyingstore,2
-0x0817,2,reqclosebuyingstore,0
-0x023B,-1,reqopenbuyingstore,2:4:8:9:89
-0x0811,18,bookingregreq,2:4:6
-//0x0939,8 CZ_JOIN_BATTLE_FIELD
-0x093A,-1,itemlistwindowselected,2:4:8:12
-0x0360,19,wanttoconnection,2:6:10:14:18
-0x08A5,26,partyinvite2,2
-//0x08A3,4 CZ_GANGSI_RANK
-0x07EC,26,friendslistadd,2
-0x088D,5,hommenu,2:4
-0x0940,36,storagepassword,2:4:20
-
-// 2016-03-02bRagexe
-0x0A51,34
-
-// 2016-03-30aRagexe
-0x0A6E,-1,mailsend,2:4:28:52:60:62:64:68 // CZ_REQ_WRITE_MAIL2
-
-// 2016-06-01aRagexe
-0x0A7D,-1
-
-// 2017-05-02dRagexeRE
-0x0A43,85
-0x0A44,-1
-0x0ABD,10
-
-//Add new packets here
-//packet_ver: 56
diff --git a/db/pre-re/achievement_db.yml b/db/pre-re/achievement_db.yml
new file mode 100644
index 00000000000..8ce928a5bfb
--- /dev/null
+++ b/db/pre-re/achievement_db.yml
@@ -0,0 +1,2407 @@
+# 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/>.
+#
+###########################################################################
+# Pre-Renewal Achievement Database
+###########################################################################
+#
+# Achievement Settings
+#
+###########################################################################
+# ID - Unique achievement ID.
+###########################################################################
+# Group - Achievement group type. Each achievement type calls a specific
+# objective check.
+# Valid groups:
+# AG_ADD_FRIEND
+# AG_ADVENTURE
+# AG_BABY
+# AG_BATTLE
+# AG_CHATTING
+# AG_CHATTING_COUNT
+# AG_CHATTING_CREATE
+# AG_CHATTING_DYING
+# AG_EAT
+# AG_GET_ITEM
+# AG_GET_ZENY
+# AG_GOAL_ACHIEVE
+# AG_GOAL_LEVEL
+# AG_GOAL_STATUS
+# AG_HEAR
+# AG_JOB_CHANGE
+# AG_MARRY
+# AG_PARTY
+# AG_ENCHANT_FAIL
+# AG_ENCHANT_SUCCESS
+# AG_SEE
+# AG_SPEND_ZENY
+# AG_TAMING
+###########################################################################
+# Name - Achievement name. Used when sending rewards through RODEX.
+###########################################################################
+# Target - A list of monster ID and count values that the achievement
+# requires. The target count can also be used for achievements that keep
+# a counter while not being related to monster kills.
+# Capped at MAX_ACHIEVEMENT_OBJECTIVES.
+###########################################################################
+# Condition - A conditional statement that must be met for the achievement
+# to be considered complete.
+###########################################################################
+# Map - A map name that is used for the AG_CHATTING type which increments
+# the counter based on the player's map.
+###########################################################################
+# Dependent: - A list of achievement IDs that need to be completed before
+# this achievement is considered complete.
+###########################################################################
+# Reward - A list of rewards that are given on completion. All fields are
+# optional.
+# ItemID: Item ID
+# Amount: Amount of Item ID (default 1)
+# Script: Bonus Script
+# TitleID: Title ID
+###########################################################################
+# Score - Achievement points that are given on completion.
+###########################################################################
+
+Achievements:
+ - ID: 110000
+ Group: "AG_EAT"
+ Name: "At this time I live to eat"
+ Score: 10
+ - ID: 110001
+ Group: "AG_SEE"
+ Name: "A fan of this polarity"
+ Score: 10
+ - ID: 120001
+ Group: "AG_ADVENTURE"
+ Name: "North Prontera Field Exploration(1)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120002
+ Group: "AG_ADVENTURE"
+ Name: "North Prontera Field Exploration(2)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120003
+ Group: "AG_ADVENTURE"
+ Name: "North Prontera Field Exploration(3)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120004
+ Group: "AG_ADVENTURE"
+ Name: "West Prontera Field Exploration(1)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120005
+ Group: "AG_ADVENTURE"
+ Name: "West Prontera Field Exploration(2)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120006
+ Group: "AG_ADVENTURE"
+ Name: "East Prontera Field Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120007
+ Group: "AG_ADVENTURE"
+ Name: "South Prontera Field Exploration(1)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120008
+ Group: "AG_ADVENTURE"
+ Name: "South Prontera Field Exploration(2)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120009
+ Group: "AG_ADVENTURE"
+ Name: "South Prontera Field Exploration(3)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120010
+ Group: "AG_ADVENTURE"
+ Name: "South Prontera Field Exploration(4)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120011
+ Group: "AG_ADVENTURE"
+ Name: "East Geffen Field Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120012
+ Group: "AG_ADVENTURE"
+ Name: "Southeast Geffen Field Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120013
+ Group: "AG_ADVENTURE"
+ Name: "Northwest Geffen Field Exploration(1)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120014
+ Group: "AG_ADVENTURE"
+ Name: "Northwest Geffen Field Exploration(2)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120015
+ Group: "AG_ADVENTURE"
+ Name: "Northwest Geffen Field Exploration(3)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120016
+ Group: "AG_ADVENTURE"
+ Name: "South Geffen Field Exploration(1)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120017
+ Group: "AG_ADVENTURE"
+ Name: "South Geffen Field Exploration(2)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120018
+ Group: "AG_ADVENTURE"
+ Name: "Sograt Desert Field Exploration(1)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120019
+ Group: "AG_ADVENTURE"
+ Name: "Sograt Desert Field Exploration(2)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120020
+ Group: "AG_ADVENTURE"
+ Name: "Sograt Desert Field Exploration(3)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120021
+ Group: "AG_ADVENTURE"
+ Name: "Sograt Desert Field Exploration(4)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120022
+ Group: "AG_ADVENTURE"
+ Name: "Sograt Desert Field Exploration(5)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120023
+ Group: "AG_ADVENTURE"
+ Name: "Sograt Desert Field Exploration(6)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120024
+ Group: "AG_ADVENTURE"
+ Name: "Southwest Payon Field Exploration(1)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120025
+ Group: "AG_ADVENTURE"
+ Name: "Southwest Payon Field Exploration(2)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120026
+ Group: "AG_ADVENTURE"
+ Name: "Southwest Payon Field Exploration(3)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120027
+ Group: "AG_ADVENTURE"
+ Name: "Southwest Payon Field Exploration(4)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120028
+ Group: "AG_ADVENTURE"
+ Name: "East Payon Field Exploration(1)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120029
+ Group: "AG_ADVENTURE"
+ Name: "East Payon Field Exploration(2)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120030
+ Group: "AG_ADVENTURE"
+ Name: "East Payon Field Exploration(3)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120031
+ Group: "AG_ADVENTURE"
+ Name: "East Payon Field Exploration(4)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120032
+ Group: "AG_ADVENTURE"
+ Name: "North Mjolnir Field Exploration(1)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120033
+ Group: "AG_ADVENTURE"
+ Name: "North Mjolnir Field Exploration(2)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120034
+ Group: "AG_ADVENTURE"
+ Name: "North Mjolnir Field Exploration(3)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120035
+ Group: "AG_ADVENTURE"
+ Name: "North Mjolnir Field Exploration(4)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120036
+ Group: "AG_ADVENTURE"
+ Name: "North Mjolnir Field Exploration(5)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120037
+ Group: "AG_ADVENTURE"
+ Name: "South Mjolnir Field Exploration(1)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120038
+ Group: "AG_ADVENTURE"
+ Name: "South Mjolnir Field Exploration(2)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120039
+ Group: "AG_ADVENTURE"
+ Name: "South Mjolnir Field Exploration(3)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120040
+ Group: "AG_ADVENTURE"
+ Name: "South Mjolnir Field Exploration(4)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120041
+ Group: "AG_ADVENTURE"
+ Name: "South Mjolnir Field Exploration(5)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120042
+ Group: "AG_ADVENTURE"
+ Name: "South Mjolnir Field Exploration(6)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120043
+ Group: "AG_ADVENTURE"
+ Name: "South Aldebaran Field Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120044
+ Group: "AG_ADVENTURE"
+ Name: "Comodo Field Exploration(1)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120045
+ Group: "AG_ADVENTURE"
+ Name: "Comodo Field Exploration(2)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120046
+ Group: "AG_ADVENTURE"
+ Name: "Comodo Field Exploration(3)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120047
+ Group: "AG_ADVENTURE"
+ Name: "Comodo Field Exploration(4)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120048
+ Group: "AG_ADVENTURE"
+ Name: "Comodo Field Exploration(5)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120049
+ Group: "AG_ADVENTURE"
+ Name: "Comodo Field Exploration(6)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120050
+ Group: "AG_ADVENTURE"
+ Name: "Comodo Field Exploration(7)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120051
+ Group: "AG_ADVENTURE"
+ Name: "Comodo Field Exploration(8)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120052
+ Group: "AG_ADVENTURE"
+ Name: "Border Checkpoint Field Exploration(1)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120053
+ Group: "AG_ADVENTURE"
+ Name: "Border Checkpoint Field Exploration(2)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120054
+ Group: "AG_ADVENTURE"
+ Name: "Kiel Hyre Mansion Field Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120055
+ Group: "AG_ADVENTURE"
+ Name: "El Mes Plateau Field Exploration(1)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120056
+ Group: "AG_ADVENTURE"
+ Name: "El Mes Plateau Field Exploration(2)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120057
+ Group: "AG_ADVENTURE"
+ Name: "El Mes Plateau Field Exploration(3)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120058
+ Group: "AG_ADVENTURE"
+ Name: "El Mes Gorge Field Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120059
+ Group: "AG_ADVENTURE"
+ Name: "Kiel Hyre Academy Field Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120060
+ Group: "AG_ADVENTURE"
+ Name: "Guard Camp Field Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120061
+ Group: "AG_ADVENTURE"
+ Name: "Yuno Field Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120062
+ Group: "AG_ADVENTURE"
+ Name: "Front of Thanatos Tower Field Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120063
+ Group: "AG_ADVENTURE"
+ Name: "Hugel Field Exploration(1)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120064
+ Group: "AG_ADVENTURE"
+ Name: "Hugel Field Exploration(2)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120065
+ Group: "AG_ADVENTURE"
+ Name: "Hugel Field Exploration(3)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120066
+ Group: "AG_ADVENTURE"
+ Name: "Abyss Lake Field Exploration(1)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120067
+ Group: "AG_ADVENTURE"
+ Name: "Einbroch Field Exploration(1)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120068
+ Group: "AG_ADVENTURE"
+ Name: "Einbroch Field Exploration(2)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120069
+ Group: "AG_ADVENTURE"
+ Name: "Einbroch Field Exploration(3)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120070
+ Group: "AG_ADVENTURE"
+ Name: "Einbroch Field Exploration(4)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120071
+ Group: "AG_ADVENTURE"
+ Name: "Einbroch Field Exploration(5)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120072
+ Group: "AG_ADVENTURE"
+ Name: "Einbroch Field Exploration(6)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120073
+ Group: "AG_ADVENTURE"
+ Name: "Einbroch Field Exploration(7)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120074
+ Group: "AG_ADVENTURE"
+ Name: "Einbroch Field Exploration(8)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120075
+ Group: "AG_ADVENTURE"
+ Name: "Lighthalzen Field Exploration(1)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120076
+ Group: "AG_ADVENTURE"
+ Name: "Lighthalzen Field Exploration(2)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120077
+ Group: "AG_ADVENTURE"
+ Name: "Lighthalzen Field Exploration(3)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120078
+ Group: "AG_ADVENTURE"
+ Name: "Rachel Audhumbla Plains Field Exploration(1)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120079
+ Group: "AG_ADVENTURE"
+ Name: "Rachel Plains Field Exploration(1)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120080
+ Group: "AG_ADVENTURE"
+ Name: "Rachel Plains Field Exploration(2)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120081
+ Group: "AG_ADVENTURE"
+ Name: "Rachel Plains Field Exploration(3)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120082
+ Group: "AG_ADVENTURE"
+ Name: "Rachel Audhumbla Grassland Field Exploration(1)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120083
+ Group: "AG_ADVENTURE"
+ Name: "Rachel Audhumbla Grassland Field Exploration(2)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120084
+ Group: "AG_ADVENTURE"
+ Name: "Portus Luna Field Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120085
+ Group: "AG_ADVENTURE"
+ Name: "Veins Field Exploration(1)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120086
+ Group: "AG_ADVENTURE"
+ Name: "Veins Field Exploration(2)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120087
+ Group: "AG_ADVENTURE"
+ Name: "Veins Field Exploration(3)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120088
+ Group: "AG_ADVENTURE"
+ Name: "Veins Field Exploration(4)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120089
+ Group: "AG_ADVENTURE"
+ Name: "Veins Field Exploration(5)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120090
+ Group: "AG_ADVENTURE"
+ Name: "Eclage Field Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120091
+ Group: "AG_ADVENTURE"
+ Name: "North Bitfrost Field Exploration(1)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120092
+ Group: "AG_ADVENTURE"
+ Name: "South Bitfrost Field Exploration(1)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120093
+ Group: "AG_ADVENTURE"
+ Name: "Splendide Field Exploration(1)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120094
+ Group: "AG_ADVENTURE"
+ Name: "Splendide Field Exploration(2)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120095
+ Group: "AG_ADVENTURE"
+ Name: "Splendide Field Exploration(3)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120096
+ Group: "AG_ADVENTURE"
+ Name: "Manuk Field Exploration(1)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120097
+ Group: "AG_ADVENTURE"
+ Name: "Manuk Field Exploration(2)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120098
+ Group: "AG_ADVENTURE"
+ Name: "Manuk Field Exploration(3)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120099
+ Group: "AG_ADVENTURE"
+ Name: "Outskirts of Kamidal Field Exploration(1)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120100
+ Group: "AG_ADVENTURE"
+ Name: "Outskirts of Kamidal Field Exploration(2)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120101
+ Group: "AG_ADVENTURE"
+ Name: "Amatsu Field Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120102
+ Group: "AG_ADVENTURE"
+ Name: "Kunlun Field Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120103
+ Group: "AG_ADVENTURE"
+ Name: "Gonryun Field Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120104
+ Group: "AG_ADVENTURE"
+ Name: "Ayothaya Field Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120105
+ Group: "AG_ADVENTURE"
+ Name: "Moscovia Field Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120106
+ Group: "AG_ADVENTURE"
+ Name: "Brasilis Field Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120107
+ Group: "AG_ADVENTURE"
+ Name: "Dewata Field Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120108
+ Group: "AG_ADVENTURE"
+ Name: "Malaya Field Exploration(1)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120109
+ Group: "AG_ADVENTURE"
+ Name: "Malaya Field Exploration(2)"
+ #Reward:
+ # ItemID: 22876
+ Score: 10
+ - ID: 120110
+ Group: "AG_ADVENTURE"
+ Name: "Abbey Underground Dungeon Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120111
+ Group: "AG_ADVENTURE"
+ Name: "Abyss Lake Dungeon Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120112
+ Group: "AG_ADVENTURE"
+ Name: "Clock Tower Dungeon Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120113
+ Group: "AG_ADVENTURE"
+ Name: "Amatsu Dungeon Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120114
+ Group: "AG_ADVENTURE"
+ Name: "Ant Hell Dungeon Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120115
+ Group: "AG_ADVENTURE"
+ Name: "Ayothaya Dungeon Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120116
+ Group: "AG_ADVENTURE"
+ Name: "Comodo Dungeon Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120117
+ Group: "AG_ADVENTURE"
+ Name: "Brasilis Dungeon Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120118
+ Group: "AG_ADVENTURE"
+ Name: "Clock Tower Dungeon Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120119
+ Group: "AG_ADVENTURE"
+ Name: "Istana Dungeon Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120120
+ Group: "AG_ADVENTURE"
+ Name: "Scaraba Hole Dungeon Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120121
+ Group: "AG_ADVENTURE"
+ Name: "Bitfrost Dungeon Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120122
+ Group: "AG_ADVENTURE"
+ Name: "Einbroch Dungeon Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120123
+ Group: "AG_ADVENTURE"
+ Name: "Geffen Underground Dungeon Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120124
+ Group: "AG_ADVENTURE"
+ Name: "Glastheim Dungeon Exploration(1)"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120125
+ Group: "AG_ADVENTURE"
+ Name: "Glastheim Dungeon Exploration(2)"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120126
+ Group: "AG_ADVENTURE"
+ Name: "Glastheim Dungeon Exploration(3)"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120127
+ Group: "AG_ADVENTURE"
+ Name: "Glastheim Dungeon Exploration(4)"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120128
+ Group: "AG_ADVENTURE"
+ Name: "Kunlun Dungeon Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120129
+ Group: "AG_ADVENTURE"
+ Name: "Rachel Dungeon Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120130
+ Group: "AG_ADVENTURE"
+ Name: "Sphinx Dungeon Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120131
+ Group: "AG_ADVENTURE"
+ Name: "Izlude Dungeon Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120132
+ Group: "AG_ADVENTURE"
+ Name: "Robot Factory Dungeon Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120133
+ Group: "AG_ADVENTURE"
+ Name: "Bio Lab Dungeon Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120134
+ Group: "AG_ADVENTURE"
+ Name: "Gonryun Dungeon Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120135
+ Group: "AG_ADVENTURE"
+ Name: "Nogg Road Dungeon Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120136
+ Group: "AG_ADVENTURE"
+ Name: "Coal Mine Dungeon Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120137
+ Group: "AG_ADVENTURE"
+ Name: "Pyramid Dungeon Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120138
+ Group: "AG_ADVENTURE"
+ Name: "Orc Dungeon Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120139
+ Group: "AG_ADVENTURE"
+ Name: "Payon Dungeon Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120140
+ Group: "AG_ADVENTURE"
+ Name: "Labyrinth Dungeon Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120141
+ Group: "AG_ADVENTURE"
+ Name: "Undersea Tunnel Dungeon Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120142
+ Group: "AG_ADVENTURE"
+ Name: "Thanatos Tower Dungeon Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120143
+ Group: "AG_ADVENTURE"
+ Name: "Thor Volcano Dungeon Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120144
+ Group: "AG_ADVENTURE"
+ Name: "Sunken Ship Dungeon Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120145
+ Group: "AG_ADVENTURE"
+ Name: "Turtle Dungeon Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 120146
+ Group: "AG_ADVENTURE"
+ Name: "Toy Factory Dungeon Exploration"
+ #Reward:
+ # ItemID: 22876
+ Score: 20
+ - ID: 127001
+ Group: "AG_CHATTING"
+ Name: "Prontera Contribution"
+ Map: "prontera"
+ Target:
+ - Count: 100000
+ Score: 10
+ - ID: 127002
+ Group: "AG_CHATTING"
+ Name: "Geffen Contribution"
+ Map: "geffen"
+ Target:
+ - Count: 100000
+ Score: 10
+ - ID: 127003
+ Group: "AG_CHATTING"
+ Name: "Morocc Contribution"
+ Map: "morocc"
+ Target:
+ - Count: 100000
+ Score: 10
+ - ID: 127004
+ Group: "AG_CHATTING"
+ Name: "Payon Contribution"
+ Map: "payon"
+ Target:
+ - Count: 100000
+ Score: 10
+ - ID: 127005
+ Group: "AG_CHATTING"
+ Name: "Yuno Contribution"
+ Map: "yuno"
+ Target:
+ - Count: 100000
+ Score: 10
+ - ID: 127006
+ Group: "AG_CHATTING"
+ Name: "Lighthalzen Contribution"
+ Map: "lighthalzen"
+ Target:
+ - Count: 100000
+ Score: 10
+ - ID: 127007
+ Group: "AG_CHATTING"
+ Name: "Einbroch Contribution"
+ Map: "einbroch"
+ Target:
+ - Count: 100000
+ Score: 10
+ - ID: 127008
+ Group: "AG_CHATTING"
+ Name: "Rachel Contribution"
+ Map: "rachel"
+ Target:
+ - Count: 100000
+ Score: 10
+ - ID: 127009
+ Group: "AG_CHATTING"
+ Name: "Veins Contribution"
+ Map: "veins"
+ Target:
+ - Count: 100000
+ Score: 10
+ - ID: 128000
+ Group: "AG_BATTLE"
+ Name: "Uninvited Guest"
+ #Target:
+ # - MobID: 2996
+ # Count: 1
+ Score: 10
+ - ID: 128001
+ Group: "AG_BATTLE"
+ Name: "Strange Guest"
+ #Target:
+ # - MobID: 2996
+ # Count: 10
+ Score: 10
+ - ID: 128002
+ Group: "AG_BATTLE"
+ Name: "Get along with map..."
+ #Target:
+ # - MobID: 2996
+ # Count: 25
+ Score: 20
+ - ID: 128003
+ Group: "AG_BATTLE"
+ Name: "Welcomed Guest"
+ #Target:
+ # - MobID: 2996
+ # Count: 50
+ Score: 30
+ - ID: 128004
+ Group: "AG_BATTLE"
+ Name: "Kimmy's best friend"
+ #Target:
+ # - MobID: 2996
+ # Count: 100
+ Score: 50
+ - ID: 128005
+ Group: "AG_BATTLE"
+ Name: "Novice Angler"
+ #Target:
+ # - MobID: 2322
+ # Count: 1
+ Score: 10
+ - ID: 128006
+ Group: "AG_BATTLE"
+ Name: "Juicy Hunter"
+ #Target:
+ # - MobID: 2322
+ # Count: 10
+ Score: 20
+ - ID: 128007
+ Group: "AG_BATTLE"
+ Name: "Rhythm Master"
+ #Target:
+ # - MobID: 2322
+ # Count: 50
+ Score: 50
+ - ID: 128008
+ Group: "AG_BATTLE"
+ Name: "Bold Adventurer"
+ Target:
+ - MobID: 1929
+ Count: 1
+ Score: 10
+ - ID: 128009
+ Group: "AG_BATTLE"
+ Name: "Baphomet Hatred"
+ Target:
+ - MobID: 1929
+ Count: 10
+ Score: 20
+ - ID: 128010
+ Group: "AG_BATTLE"
+ Name: "Goat's Nemesis"
+ Target:
+ - MobID: 1929
+ Count: 50
+ Score: 50
+ - ID: 128011
+ Group: "AG_BATTLE"
+ Name: "Ordinary Tourist"
+ #Target:
+ # - MobID: 3029
+ # Count: 1
+ Score: 10
+ - ID: 128012
+ Group: "AG_BATTLE"
+ Name: "Backcountry Expert"
+ #Target:
+ # - MobID: 3029
+ # Count: 10
+ Score: 20
+ - ID: 128013
+ Group: "AG_BATTLE"
+ Name: "Able to eat more like this"
+ #Target:
+ # - MobID: 3029
+ # Count: 50
+ Score: 50
+ - ID: 128014
+ Group: "AG_BATTLE"
+ Name: "Digest hard meat"
+ #Target:
+ # - MobID: 2319
+ # Count: 1
+ Score: 10
+ - ID: 128015
+ Group: "AG_BATTLE"
+ Name: "Master of Escape"
+ #Target:
+ # - MobID: 2319
+ # Count: 10
+ Score: 20
+ - ID: 128016
+ Group: "AG_BATTLE"
+ Name: "Immortal Hunter"
+ #Target:
+ # - MobID: 2319
+ # Count: 50
+ Score: 50
+ - ID: 128017
+ Group: "AG_BATTLE"
+ Name: "Stood up and overcame despair"
+ #Target:
+ # - MobID: 3097
+ # Count: 1
+ Score: 10
+ - ID: 128018
+ Group: "AG_BATTLE"
+ Name: "Ember of Hope"
+ #Target:
+ # - MobID: 3097
+ # Count: 10
+ Score: 10
+ - ID: 128019
+ Group: "AG_BATTLE"
+ Name: "Pouring Aurora"
+ #Target:
+ # - MobID: 3097
+ # Count: 25
+ Score: 20
+ - ID: 128020
+ Group: "AG_BATTLE"
+ Name: "Who is desperate? I am hopeless!"
+ #Target:
+ # - MobID: 3097
+ # Count: 50
+ Score: 30
+ - ID: 128021
+ Group: "AG_BATTLE"
+ Name: "I know god will save the world"
+ #Target:
+ # - MobID: 3097
+ # Count: 100
+ Score: 50
+ - ID: 128022
+ Group: "AG_BATTLE"
+ Name: "There was mercy in Morocc army"
+ #Target:
+ # - MobID: 3000
+ # Count: 1
+ Score: 10
+ - ID: 128023
+ Group: "AG_BATTLE"
+ Name: "There was fear in Morocc army"
+ #Target:
+ # - MobID: 3000
+ # Count: 10
+ Score: 20
+ - ID: 128024
+ Group: "AG_BATTLE"
+ Name: "Guard of weak army"
+ #Target:
+ # - MobID: 3000
+ # Count: 50
+ Score: 50
+ - ID: 128025
+ Group: "AG_BATTLE"
+ Name: "Audience with the queen"
+ #Target:
+ # - MobID: 2529
+ # Count: 1
+ Score: 10
+ - ID: 128026
+ Group: "AG_BATTLE"
+ Name: "Warm earth"
+ #Target:
+ # - MobID: 2533
+ # Count: 1
+ Score: 10
+ - ID: 128027
+ Group: "AG_BATTLE"
+ Name: "Water is very good exactly"
+ #Target:
+ # - MobID: 2534
+ # Count: 1
+ Score: 10
+ - ID: 128028
+ Group: "AG_BATTLE"
+ Name: "Pleasant breeze"
+ #Target:
+ # - MobID: 2535
+ # Count: 1
+ Score: 10
+ - ID: 128029
+ Group: "AG_BATTLE"
+ Name: "Visitor of old castle"
+ #Target:
+ # - MobID: 2476
+ # Count: 1
+ Score: 10
+ - ID: 128030
+ Group: "AG_BATTLE"
+ Name: "Lord of old castle"
+ #Target:
+ # - MobID: 2476
+ # Count: 10
+ Score: 20
+ - ID: 128031
+ Group: "AG_BATTLE"
+ Name: "Conqueror of old castle"
+ #Target:
+ # - MobID: 2476
+ # Count: 50
+ Score: 50
+ - ID: 128032
+ Group: "AG_BATTLE"
+ Name: "Haggard sucker"
+ #Target:
+ # - MobID: 3150
+ # Count: 1
+ Score: 10
+ - ID: 128033
+ Group: "AG_BATTLE"
+ Name: "Hope of the Knight"
+ #Target:
+ # - MobID: 3150
+ # Count: 10
+ Score: 20
+ - ID: 128034
+ Group: "AG_BATTLE"
+ Name: "Guardian of the Dawn"
+ #Target:
+ # - MobID: 3150
+ # Count: 50
+ Score: 50
+ - ID: 128035
+ Group: "AG_BATTLE"
+ Name: "Time Traveler"
+ #Target:
+ # - MobID: 3190
+ # Count: 1
+ Score: 10
+ - ID: 128036
+ Group: "AG_BATTLE"
+ Name: "Restore ancient relic"
+ #Target:
+ # - MobID: 3190
+ # Count: 10
+ Score: 20
+ - ID: 128037
+ Group: "AG_BATTLE"
+ Name: "Master of relic transport"
+ #Target:
+ # - MobID: 3190
+ # Count: 50
+ Score: 50
+ - ID: 128038
+ Group: "AG_BATTLE"
+ Name: "Show Jailbreak to the captain"
+ #Target:
+ # - MobID: 3181
+ # Count: 1
+ Score: 10
+ - ID: 128039
+ Group: "AG_BATTLE"
+ Name: "Show Jailbreak to the weak captain"
+ #Target:
+ # - MobID: 3188
+ # Count: 1
+ Score: 10
+ - ID: 128040
+ Group: "AG_BATTLE"
+ Name: "Riot on board"
+ #Target:
+ # - MobID: 3181
+ # Count: 1
+ Score: 20
+ - ID: 128041
+ Group: "AG_BATTLE"
+ Name: "Turmoil on board"
+ #Target:
+ # - MobID: 3181
+ # Count: 10
+ Score: 20
+ - ID: 128042
+ Group: "AG_BATTLE"
+ Name: "Rebellion on board"
+ #Target:
+ # - MobID: 3181
+ # Count: 50
+ Score: 50
+ - ID: 128043
+ Group: "AG_BATTLE"
+ Name: "Revolt of Riot"
+ #Target:
+ # - MobID: 3188
+ # Count: 50
+ Score: 50
+ - ID: 128044
+ Group: "AG_BATTLE"
+ Name: "Magic tournament champion"
+ #Target:
+ # - MobID: 2564
+ # Count: 1
+ Score: 10
+ - ID: 128045
+ Group: "AG_BATTLE"
+ Name: "Gladiator of Coliseum"
+ #Target:
+ # - MobID: 2564
+ # Count: 10
+ Score: 20
+ - ID: 128046
+ Group: "AG_BATTLE"
+ Name: "Slayer of Colosseum"
+ #Target:
+ # - MobID: 2564
+ # Count: 50
+ Score: 50
+ - ID: 128047
+ Group: "AG_BATTLE"
+ Name: "Endless Tower challenger"
+ Target:
+ - MobID: 1956
+ Count: 1
+ Score: 10
+ - ID: 128048
+ Group: "AG_BATTLE"
+ Name: "Endless Tower Slayer"
+ Target:
+ - MobID: 1956
+ Count: 10
+ Score: 20
+ - ID: 128049
+ Group: "AG_BATTLE"
+ Name: "Lord of the tower"
+ Target:
+ - MobID: 1956
+ Count: 50
+ Score: 50
+ - ID: 128050
+ Group: "AG_BATTLE"
+ Name: "Novice Exorcist"
+ #Target:
+ # - MobID: 2327
+ # Count: 1
+ Score: 10
+ - ID: 128051
+ Group: "AG_BATTLE"
+ Name: "Experienced Exorcist"
+ #Target:
+ # - MobID: 2327
+ # Count: 10
+ Score: 20
+ - ID: 128052
+ Group: "AG_BATTLE"
+ Name: "Legendary Exorcist"
+ #Target:
+ # - MobID: 2327
+ # Count: 50
+ Score: 50
+ - ID: 129001
+ Group: "AG_ADVENTURE"
+ Name: "Prontera Explorer"
+ Dependent: [120001, 120002, 120003, 120004, 120005, 120006, 120007, 120008, 120009, 120010]
+ Reward:
+ ItemID: 644
+ Score: 20
+ - ID: 129002
+ Group: "AG_ADVENTURE"
+ Name: "Geffen Explorer"
+ Dependent: [120011, 120012, 120013, 120014, 120015, 120016, 120017]
+ Reward:
+ ItemID: 644
+ Score: 20
+ - ID: 129003
+ Group: "AG_ADVENTURE"
+ Name: "Sograt Desert Explorer"
+ Dependent: [120018, 120019, 120020, 120021, 120022, 120023]
+ Reward:
+ ItemID: 644
+ Score: 20
+ - ID: 129004
+ Group: "AG_ADVENTURE"
+ Name: "Payon Explorer"
+ Dependent: [120024, 120025, 120026, 120027, 120028, 120029, 120030, 120031]
+ Reward:
+ ItemID: 644
+ Score: 20
+ - ID: 129005
+ Group: "AG_ADVENTURE"
+ Name: "North Mjolnir Explorer"
+ Dependent: [120032, 120033, 120034, 120035, 120036]
+ Reward:
+ ItemID: 644
+ Score: 20
+ - ID: 129006
+ Group: "AG_ADVENTURE"
+ Name: "South Mjolnir Explorer"
+ Dependent: [120037, 120038, 120039, 120040, 120041, 120042, 120043]
+ Reward:
+ ItemID: 644
+ Score: 20
+ - ID: 129007
+ Group: "AG_ADVENTURE"
+ Name: "Comodo Explorer"
+ Dependent: [120044, 120045, 120046, 120047, 120048, 120049, 120050, 120051]
+ Reward:
+ ItemID: 644
+ Score: 20
+ - ID: 129008
+ Group: "AG_ADVENTURE"
+ Name: "Rune Midgard Explorer"
+ Dependent: [129001, 129002, 129003, 129004, 129005, 129006, 129007]
+ Reward:
+ ItemID: 617
+ Score: 50
+ - ID: 129009
+ Group: "AG_ADVENTURE"
+ Name: "Yuno Explorer"
+ Dependent: [120052, 120053, 120054, 120055, 120056, 120057, 120058, 120059, 120060, 120061]
+ Reward:
+ ItemID: 644
+ Score: 20
+ - ID: 129010
+ Group: "AG_ADVENTURE"
+ Name: "Hugel Explorer"
+ Dependent: [120062, 120063, 120064, 120065, 120066]
+ Reward:
+ ItemID: 644
+ Score: 20
+ - ID: 129011
+ Group: "AG_ADVENTURE"
+ Name: "Einbroch Explorer"
+ Dependent: [120067, 120068, 120069, 120070, 120071, 120072, 120073, 120074]
+ Reward:
+ ItemID: 644
+ Score: 20
+ - ID: 129012
+ Group: "AG_ADVENTURE"
+ Name: "Lighthalzen Explorer"
+ Dependent: [120075, 120076, 120077]
+ Reward:
+ ItemID: 644
+ Score: 20
+ - ID: 129013
+ Group: "AG_ADVENTURE"
+ Name: "Schwarzwald Explorer"
+ Dependent: [129009, 129010, 129011, 129012]
+ Reward:
+ ItemID: 617
+ Score: 50
+ - ID: 129014
+ Group: "AG_ADVENTURE"
+ Name: "Rachel Explorer"
+ Dependent: [120078, 120079, 120080, 120081, 120082, 120083, 120084]
+ Reward:
+ ItemID: 644
+ Score: 20
+ - ID: 129015
+ Group: "AG_ADVENTURE"
+ Name: "Veins Explorer"
+ Dependent: [120085, 120086, 120087, 120088, 120089]
+ Reward:
+ ItemID: 644
+ Score: 20
+ - ID: 129016
+ Group: "AG_ADVENTURE"
+ Name: "Arunafeltz Explorer"
+ Dependent: [129014, 129015]
+ Reward:
+ ItemID: 617
+ Score: 50
+ - ID: 129017
+ Group: "AG_ADVENTURE"
+ Name: "Laphine Explorer"
+ Dependent: [120090, 120091, 120092, 120093, 120094, 120095]
+ Reward:
+ ItemID: 644
+ Score: 20
+ - ID: 129018
+ Group: "AG_ADVENTURE"
+ Name: "Manuk Explorer"
+ Dependent: [120096, 120097, 120098, 120099, 120100]
+ Reward:
+ ItemID: 644
+ Score: 20
+ - ID: 129019
+ Group: "AG_ADVENTURE"
+ Name: "Eclage Explorer"
+ Dependent: [129017, 129018]
+ Reward:
+ ItemID: 617
+ Score: 50
+ - ID: 129020
+ Group: "AG_ADVENTURE"
+ Name: "Localizing fields explorer"
+ Dependent: [120101, 120102, 120103, 120104, 120105, 120106, 120107, 120108, 120109]
+ Reward:
+ ItemID: 617
+ Score: 50
+ - ID: 130000 # Talk to Prince NPC (npc/quests/quests_morocc.txt L5288)
+ Group: "AG_CHATTING"
+ Name: "Socialite debut"
+ Reward:
+ TitleID: 1034
+ Score: 10
+ - ID: 170000
+ Group: "AG_HEAR"
+ Name: "Song chamber is not an accident"
+ Score: 10
+ - ID: 190000
+ Group: "AG_CHATTING"
+ Name: "Alliance workers of merchant city"
+ Score: 50
+ - ID: 200000
+ Group: "AG_GOAL_LEVEL"
+ Name: "Acquire the first aura!"
+ Condition: " BaseLevel >= 99 "
+ Reward:
+ ItemID: 12549
+ Script: " specialeffect2 EF_BLESSING; sc_start SC_BLESSING,30000,10; "
+ TitleID: 1000
+ Score: 50
+ - ID: 200001
+ Group: "AG_GOAL_LEVEL"
+ Name: "Acquire the second aura!"
+ Condition: " BaseLevel >= 150 "
+ Dependent: [200000]
+ Reward:
+ ItemID: 5364
+ Script: " specialeffect2 EF_BLESSING; sc_start SC_BLESSING,30000,10; "
+ TitleID: 1001
+ Score: 60
+ - ID: 200002
+ Group: "AG_GOAL_LEVEL"
+ Name: "Acquire the third aura!"
+ Condition: " BaseLevel >= 175 "
+ Dependent: [200001]
+ Reward:
+ # ItemID: 18880
+ Script: " specialeffect2 EF_BLESSING; sc_start SC_BLESSING,30000,10; "
+ TitleID: 1002
+ Score: 70
+ - ID: 200003
+ Group: "AG_GOAL_LEVEL"
+ Name: "Master Job level!"
+ Condition: " JobLevel >= 50 "
+ Reward:
+ ItemID: 617
+ Script: " specialeffect2 EF_BLESSING; sc_start SC_BLESSING,30000,10; "
+ TitleID: 1003
+ Score: 30
+ - ID: 200004
+ Group: "AG_GOAL_LEVEL"
+ Name: "Grandmaster Job level!"
+ Condition: " JobLevel >= 70 "
+ Dependent: [200003]
+ Reward:
+ # ItemID: 12817
+ Script: " specialeffect2 EF_BLESSING; sc_start SC_BLESSING,30000,10; "
+ TitleID: 1004
+ Score: 50
+ - ID: 200005
+ Group: "AG_JOB_CHANGE"
+ Name: "Official Adventurer"
+ Condition: " Class >= JOB_SWORDMAN && Class <= JOB_THIEF "
+ Reward:
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 200006
+ Group: "AG_JOB_CHANGE"
+ Name: "First step of job change!"
+ Condition: " Class >= JOB_SWORDMAN && Class <= JOB_THIEF "
+ Reward:
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 20
+ - ID: 200007
+ Group: "AG_JOB_CHANGE"
+ Name: "Veteran Adventurer! (1)"
+ Condition: " Class >= JOB_KNIGHT && Class <= JOB_ASSASSIN "
+ Reward:
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 25
+ - ID: 200008
+ Group: "AG_JOB_CHANGE"
+ Name: "Veteran Adventurer! (2)"
+ Condition: " Class >= JOB_CRUSADER && Class <= JOB_DANCER "
+ Reward:
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 25
+ - ID: 200009
+ Group: "AG_JOB_CHANGE"
+ Name: "Warrior (1)"
+ Condition: " Class >= JOB_LORD_KNIGHT && Class <= JOB_ASSASSIN_CROSS "
+ Reward:
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 30
+ - ID: 200010
+ Group: "AG_JOB_CHANGE"
+ Name: "Warrior (2)"
+ Condition: " Class >= JOB_PALADIN && Class <= JOB_GYPSY "
+ Reward:
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 30
+ - ID: 200011
+ Group: "AG_JOB_CHANGE"
+ Name: "Elite Adventurer! (1)"
+ Condition: " Class >= JOB_RUNE_KNIGHT && Class <= JOB_GUILLOTINE_CROSS "
+ Reward:
+ # ItemID: 16483
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 50
+ - ID: 200012
+ Group: "AG_JOB_CHANGE"
+ Name: "Transcendentaler! (1)"
+ Condition: " Class >= JOB_RUNE_KNIGHT_T && Class <= JOB_GUILLOTINE_CROSS_T "
+ Reward:
+ # ItemID: 16483
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 60
+ - ID: 200013
+ Group: "AG_JOB_CHANGE"
+ Name: "Elite Adventurer! (2)"
+ Condition: " Class >= JOB_ROYAL_GUARD && Class <= JOB_SHADOW_CHASER "
+ Reward:
+ # ItemID: 16483
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 50
+ - ID: 200014
+ Group: "AG_JOB_CHANGE"
+ Name: "Transcendentaler! (2)"
+ Condition: " Class >= JOB_ROYAL_GUARD_T && Class <= JOB_SHADOW_CHASER_T "
+ Reward:
+ # ItemID: 16483
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 60
+ - ID: 200015
+ Group: "AG_JOB_CHANGE"
+ Name: "The way of exceptional character"
+ Condition: " Class == JOB_SUPER_NOVICE || Class == JOB_GUNSLINGER || Class == JOB_NINJA || Class == JOB_TAEKWON "
+ Reward:
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 200016
+ Group: "AG_JOB_CHANGE"
+ Name: "This is My way!"
+ Condition: " Class == JOB_STAR_GLADIATOR || Class == JOB_SOUL_LINKER || Class == JOB_KAGEROU || Class == JOB_OBORO || Class == JOB_REBELLION "
+ Reward:
+ # ItemID: 16483
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 20
+ - ID: 200017
+ Group: "AG_GOAL_STATUS"
+ Name: "Bearish Power!"
+ Condition: " bStr >= 90 "
+ Score: 10
+ - ID: 200018
+ Group: "AG_GOAL_STATUS"
+ Name: "Overflowing Magic!"
+ Condition: " bInt >= 90 "
+ Score: 10
+ - ID: 200019
+ Group: "AG_GOAL_STATUS"
+ Name: "Healthy Body and Mental Health!"
+ Condition: " bVit >= 90 "
+ Score: 10
+ - ID: 200020
+ Group: "AG_GOAL_STATUS"
+ Name: "Speed of Light"
+ Condition: " bAgi >= 90 "
+ Score: 10
+ - ID: 200021
+ Group: "AG_GOAL_STATUS"
+ Name: "Hawk Eyes"
+ Condition: " bDex >= 90 "
+ Score: 10
+ - ID: 200022
+ Group: "AG_GOAL_STATUS"
+ Name: "Maximum Luck"
+ Condition: " bLuk >= 90 "
+ Score: 10
+ - ID: 200023
+ Group: "AG_GOAL_STATUS"
+ Name: "Dragonlike Power!"
+ Condition: " bStr >= 125 "
+ Reward:
+ Script: " sc_start SC_GIANTGROWTH,180000,1; "
+ Score: 20
+ - ID: 200024
+ Group: "AG_GOAL_STATUS"
+ Name: "Magic Insanity"
+ Condition: " bInt >= 125 "
+ Reward:
+ Script: " specialeffect2 EF_HASTEUP; bonus_script \"{ bonus2 bHPLossRate,100,10000; bonus bBaseAtk,20; bonus bAspdRate,25; }\",60,0,0,SI_STEAMPACK; "
+ Score: 20
+ - ID: 200025
+ Group: "AG_GOAL_STATUS"
+ Name: "Rock Alloy"
+ Condition: " bVit >= 125 "
+ Reward:
+ Script: " specialeffect2 EF_HEAL3; sc_start2 SC_S_LIFEPOTION,600000,-5,5; "
+ Score: 20
+ - ID: 200026
+ Group: "AG_GOAL_STATUS"
+ Name: "Speed of Light"
+ Condition: " bAgi >= 125 "
+ Reward:
+ Script: " specialeffect2 EF_STEAL; sc_start SC_INCFLEE2,60000,20; "
+ Score: 20
+ - ID: 200027
+ Group: "AG_GOAL_STATUS"
+ Name: "Falcon's Eyes"
+ Condition: " bDex >= 125 "
+ Reward:
+ Script: " specialeffect2 EF_MAGICALATTHIT; sc_start SC_INCCRI,300000,30; "
+ Score: 20
+ - ID: 200028
+ Group: "AG_GOAL_STATUS"
+ Name: "Lucky Fever"
+ Condition: " bLuk >= 125 "
+ Reward:
+ Script: " specialeffect2 EF_GLORIA; sc_start SC_GLORIA,15000,0; "
+ Score: 20
+ - ID: 200029
+ Group: "AG_GOAL_STATUS"
+ Name: "Incarnation of Love and Hate"
+ Condition: " BaseLevel == 99 && Class == JOB_NOVICE "
+ Reward:
+ # ItemID: 16483
+ Script: " specialeffect2 EF_BLESSING; sc_start SC_BLESSING,30000,10; "
+ Score: 30
+ - ID: 200030
+ Group: "AG_GOAL_STATUS"
+ Name: "I really love it!"
+ Condition: " BaseLevel == 99 && (Class >= JOB_SWORDMAN && Class <= JOB_THIEF) "
+ Reward:
+ # ItemID: 16504
+ Script: " specialeffect2 EF_BLESSING; sc_start SC_BLESSING,30000,10; "
+ Score: 30
+ - ID: 200031
+ Group: "AG_JOB_CHANGE"
+ Name: "Reborn in Valhalla!"
+ Condition: " Class == JOB_NOVICE_HIGH "
+ Reward:
+ # ItemID: 22808
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 230100
+ Group: "AG_TAMING"
+ Name: "Poring is Love"
+ Dependent: [230101, 230102, 230103, 230104]
+ Reward:
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ TitleID: 1025
+ Score: 50
+ - ID: 230110
+ Group: "AG_TAMING"
+ Name: "Entomologist"
+ Dependent: [230111, 230112, 230113, 230114, 230115, 230116]
+ Reward:
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ TitleID: 1026
+ Score: 50
+ - ID: 230120
+ Group: "AG_TAMING"
+ Name: "Animals are also our friend"
+ Dependent: [230121, 230122, 230123, 230124, 230125, 230126, 230127, 230128]
+ Reward:
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ TitleID: 1027
+ Score: 50
+ - ID: 230140
+ Group: "AG_TAMING"
+ Name: "Monster Girls Unite!!"
+ Dependent: [230141, 230142, 230143, 230144, 230145, 230146, 230147]
+ Reward:
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ TitleID: 1029
+ Score: 50
+ - ID: 230101
+ Group: "AG_TAMING"
+ Name: "Poring - taming"
+ Target:
+ - MobID: 1002
+ Count: 1
+ Score: 10
+ - ID: 230102
+ Group: "AG_TAMING"
+ Name: "Drops - taming"
+ Target:
+ - MobID: 1113
+ Count: 1
+ Score: 10
+ - ID: 230103
+ Group: "AG_TAMING"
+ Name: "Poporing - taming"
+ Target:
+ - MobID: 1031
+ Count: 1
+ Score: 10
+ - ID: 230104
+ Group: "AG_TAMING"
+ Name: "Novice Poring - taming"
+ #Target:
+ # - MobID: 2398
+ # Count: 1
+ Score: 10
+ - ID: 230111
+ Group: "AG_TAMING"
+ Name: "Chonchon - taming"
+ Target:
+ - MobID: 1011
+ Count: 1
+ Score: 10
+ - ID: 230112
+ Group: "AG_TAMING"
+ Name: "Steel Chonchon - taming"
+ Target:
+ - MobID: 1042
+ Count: 1
+ Score: 10
+ - ID: 230113
+ Group: "AG_TAMING"
+ Name: "Hunter Fly - taming"
+ Target:
+ - MobID: 1035
+ Count: 1
+ Score: 10
+ - ID: 230114
+ Group: "AG_TAMING"
+ Name: "Rocker - taming"
+ Target:
+ - MobID: 1052
+ Count: 1
+ Score: 10
+ - ID: 230115
+ Group: "AG_TAMING"
+ Name: "Spore - taming"
+ Target:
+ - MobID: 1014
+ Count: 1
+ Score: 10
+ - ID: 230116
+ Group: "AG_TAMING"
+ Name: "Poison Spore - taming"
+ Target:
+ - MobID: 1077
+ Count: 1
+ Score: 10
+ - ID: 230121
+ Group: "AG_TAMING"
+ Name: "Lunatic - taming"
+ Target:
+ - MobID: 1063
+ Count: 1
+ Score: 10
+ - ID: 230122
+ Group: "AG_TAMING"
+ Name: "Picky - taming"
+ Target:
+ - MobID: 1049
+ Count: 1
+ Score: 10
+ - ID: 230123
+ Group: "AG_TAMING"
+ Name: "Savage Bebe - taming"
+ Target:
+ - MobID: 1167
+ Count: 1
+ Score: 10
+ - ID: 230124
+ Group: "AG_TAMING"
+ Name: "Baby Desert Wolf - taming"
+ Target:
+ - MobID: 1107
+ Count: 1
+ Score: 10
+ - ID: 230125
+ Group: "AG_TAMING"
+ Name: "Smokie - taming"
+ Target:
+ - MobID: 1056
+ Count: 1
+ Score: 10
+ - ID: 230126
+ Group: "AG_TAMING"
+ Name: "Yoyo - taming"
+ Target:
+ - MobID: 1057
+ Count: 1
+ Score: 10
+ - ID: 230127
+ Group: "AG_TAMING"
+ Name: "Peco Peco - taming"
+ Target:
+ - MobID: 1019
+ Count: 1
+ Score: 10
+ - ID: 230128
+ Group: "AG_TAMING"
+ Name: "Petite - taming"
+ Target:
+ - MobID: 1155
+ Count: 1
+ Score: 10
+ - ID: 230141
+ Group: "AG_TAMING"
+ Name: "Munak - taming"
+ Target:
+ - MobID: 1026
+ Count: 1
+ Score: 10
+ - ID: 230142
+ Group: "AG_TAMING"
+ Name: "Isis - taming"
+ Target:
+ - MobID: 1029
+ Count: 1
+ Score: 10
+ - ID: 230143
+ Group: "AG_TAMING"
+ Name: "Sohee - taming"
+ Target:
+ - MobID: 1170
+ Count: 1
+ Score: 10
+ - ID: 230144
+ Group: "AG_TAMING"
+ Name: "Zherlthsh - taming"
+ Target:
+ - MobID: 1200
+ Count: 1
+ Score: 10
+ - ID: 230145
+ Group: "AG_TAMING"
+ Name: "Alice - taming"
+ Target:
+ - MobID: 1275
+ Count: 1
+ Score: 10
+ - ID: 230146
+ Group: "AG_TAMING"
+ Name: "Succubus - taming"
+ Target:
+ - MobID: 1370
+ Count: 1
+ Score: 10
+ - ID: 230147
+ Group: "AG_TAMING"
+ Name: "Loli Ruri - taming"
+ Target:
+ - MobID: 1505
+ Count: 1
+ Score: 10
+ - ID: 220000
+ Group: "AG_CHATTING_CREATE"
+ Name: "Community begin"
+ Condition: " true "
+ Score: 10
+ - ID: 220001
+ Group: "AG_CHATTING_DYING"
+ Name: "A mouth only moment"
+ Condition: " true "
+ Score: 10
+ - ID: 220002
+ Group: "AG_CHATTING_COUNT"
+ Name: "Admiring the chatter"
+ Condition: " ARG0 == 20 "
+ Score: 10
+ - ID: 220003
+ Group: "AG_ADD_FRIEND"
+ Name: "My friend's friend~"
+ Condition: " ARG0 >= 1 "
+ Score: 10
+ - ID: 220004
+ Group: "AG_ADD_FRIEND"
+ Name: "A competition of popularity"
+ Condition: " ARG0 >= 10 "
+ Score: 10
+ - ID: 220005
+ Group: "AG_PARTY"
+ Name: "Let's Party~"
+ Condition: " true "
+ Score: 10
+ - ID: 220006
+ Group: "AG_MARRY"
+ Name: "Married with who..?"
+ Condition: " true "
+ Reward:
+ TitleID: 1022
+ Score: 20
+ - ID: 220007
+ Group: "AG_BABY"
+ Name: "Can you grow?"
+ Condition: " ARG0 == 1 "
+ Reward:
+ TitleID: 1032
+ Score: 20
+ - ID: 220008
+ Group: "AG_BABY"
+ Name: "Being a parent"
+ Condition: " ARG0 == 2 "
+ Reward:
+ TitleID: 1033
+ Score: 20
+ - ID: 220009
+ Group: "AG_SPEND_ZENY"
+ Name: "Activating the market economy (1)"
+ Condition: " ARG0 >= 10000 "
+ Target:
+ - Count: 10000
+ Score: 10
+ - ID: 220010
+ Group: "AG_SPEND_ZENY"
+ Name: "Activating the market economy (2)"
+ Condition: " ARG0 >= 100000 "
+ Target:
+ - Count: 100000
+ Score: 15
+ - ID: 220011
+ Group: "AG_SPEND_ZENY"
+ Name: "Activating the market economy (3)"
+ Condition: " ARG0 >= 500000 "
+ Target:
+ - Count: 500000
+ Score: 20
+ - ID: 220012
+ Group: "AG_SPEND_ZENY"
+ Name: "Activating the market economy (4)"
+ Condition: " ARG0 >= 1000000 "
+ Target:
+ - Count: 1000000
+ Score: 30
+ - ID: 220013
+ Group: "AG_SPEND_ZENY"
+ Name: "Activating the market economy (5)"
+ Condition: " ARG0 >= 5000000 "
+ Target:
+ - Count: 5000000
+ Score: 50
+ - ID: 220014
+ Group: "AG_ENCHANT_SUCCESS"
+ Name: "I can't quit from refining! (1)"
+ Condition: " ARG0 == 1 && ARG1 >= 7 "
+ Score: 10
+ - ID: 220015
+ Group: "AG_ENCHANT_SUCCESS"
+ Name: "I can't quit from refining! (2)"
+ Condition: " ARG0 == 1 && ARG1 >= 12 "
+ Score: 15
+ - ID: 220016
+ Group: "AG_ENCHANT_SUCCESS"
+ Name: "I can't quit from refining! (3)"
+ Condition: " ARG0 == 2 && ARG1 >= 7 "
+ Score: 10
+ - ID: 220017
+ Group: "AG_ENCHANT_SUCCESS"
+ Name: "I can't quit from refining! (4)"
+ Condition: " ARG0 == 2 && ARG1 >= 12 "
+ Score: 15
+ - ID: 220018
+ Group: "AG_ENCHANT_SUCCESS"
+ Name: "I can't quit from refining! (5)"
+ Condition: " ARG0 == 3 && ARG1 >= 7 "
+ Score: 15
+ - ID: 220019
+ Group: "AG_ENCHANT_SUCCESS"
+ Name: "I can't quit from refining! (6)"
+ Condition: " ARG0 == 3 && ARG1 >= 12 "
+ Score: 20
+ - ID: 220020
+ Group: "AG_ENCHANT_SUCCESS"
+ Name: "I can't quit from refining! (7)"
+ Condition: " ARG0 == 4 && ARG1 >= 7 "
+ Score: 20
+ - ID: 220021
+ Group: "AG_ENCHANT_SUCCESS"
+ Name: "I can't quit from refining! (8)"
+ Condition: " ARG0 == 4 && ARG1 >= 12 "
+ Score: 30
+ - ID: 220022
+ Group: "AG_ENCHANT_FAIL"
+ Name: "Human's greed has no ending.."
+ Condition: " true "
+ Score: 10
+ - ID: 220023
+ Group: "AG_GET_ITEM"
+ Name: "I found it! (1)"
+ Condition: " ARG0 >= 100 "
+ Score: 10
+ - ID: 220024
+ Group: "AG_GET_ITEM"
+ Name: "I found it! (2)"
+ Condition: " ARG0 >= 1000 "
+ Score: 10
+ - ID: 220025
+ Group: "AG_GET_ITEM"
+ Name: "I found it! (3)"
+ Condition: " ARG0 >= 5000 "
+ Score: 15
+ - ID: 220026
+ Group: "AG_GET_ITEM"
+ Name: "I found it! (4)"
+ Condition: " ARG0 >= 10000 "
+ Score: 15
+ - ID: 220027
+ Group: "AG_GET_ITEM"
+ Name: "I found it! (5)"
+ Condition: " ARG0 >= 50000 "
+ Score: 20
+ - ID: 220028
+ Group: "AG_GET_ITEM"
+ Name: "I found it! (6)"
+ Condition: " ARG0 >= 100000 "
+ Score: 20
+ - ID: 220029
+ Group: "AG_GET_ITEM"
+ Name: "I found it! (7)"
+ Condition: " ARG0 >= 150000 "
+ Score: 30
+ - ID: 220030
+ Group: "AG_GET_ZENY"
+ Name: "Rich King (1)"
+ Condition: " ARG0 >= 10000 "
+ Score: 10
+ - ID: 220031
+ Group: "AG_GET_ZENY"
+ Name: "Rich King (2)"
+ Condition: " ARG0 >= 100000 "
+ Score: 15
+ - ID: 220032
+ Group: "AG_GET_ZENY"
+ Name: "Rich King (3)"
+ Condition: " ARG0 >= 1000000 "
+ Score: 20
+ - ID: 220033
+ Group: "AG_GET_ZENY"
+ Name: "Rich King (4)"
+ Condition: " ARG0 >= 10000000 "
+ Score: 25
+ - ID: 220034
+ Group: "AG_GET_ZENY"
+ Name: "Rich King (5)"
+ Condition: " ARG0 >= 100000000 "
+ Score: 30
+ - ID: 220035
+ Group: "AG_GET_ZENY"
+ Name: "Rich King (6)"
+ Condition: " ARG0 >= 1000000000 "
+ Score: 40
+ - ID: 230200
+ Group: "AG_BATTLE"
+ Name: "Poring seeker"
+ Dependent: [230201, 230202, 230203]
+ Score: 10
+ - ID: 230201
+ Group: "AG_BATTLE"
+ Name: "Exploring Poring's life (1)"
+ Target:
+ - MobID: 1002
+ Count: 10
+ # - MobID: 2398
+ # Count: 10
+ - MobID: 1113
+ Count: 10
+ - MobID: 1031
+ Count: 10
+ - MobID: 1242
+ Count: 10
+ Score: 10
+ - ID: 230202
+ Group: "AG_BATTLE"
+ Name: "Exploring Poring's life (2)"
+ Target:
+ - MobID: 1090
+ Count: 1
+ - MobID: 1582
+ Count: 1
+ - MobID: 1096
+ Count: 1
+ - MobID: 1388
+ Count: 1
+ - MobID: 1120
+ Count: 1
+ Score: 15
+ - ID: 230203
+ Group: "AG_BATTLE"
+ Name: "Exploring Poring's life (3)"
+ Target:
+ - MobID: 1613
+ Count: 5
+ - MobID: 1977
+ Count: 5
+ - MobID: 1836
+ Count: 5
+ Score: 20
+ - ID: 240000
+ Group: "AG_GOAL_LEVEL"
+ Name: "Complete challenges after first introduction"
+ Score: 10
+ - ID: 240001
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 1"
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240002
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 2"
+ Dependent: [240001]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240003
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 3"
+ Dependent: [240002]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240004
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 4"
+ Dependent: [240003]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240005
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 5"
+ Dependent: [240004]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240006
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 6"
+ Dependent: [240005]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240007
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 7"
+ Dependent: [240006]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240008
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 8"
+ Dependent: [240007]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240009
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 9"
+ Dependent: [240008]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240010
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 10"
+ Dependent: [240009]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ TitleID: 1023
+ Score: 10
+ - ID: 240011
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 11"
+ Dependent: [240010]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240012
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 12"
+ Dependent: [240011]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240013
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 13"
+ Dependent: [240012]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240014
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 14"
+ Dependent: [240013]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240015
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 15"
+ Dependent: [240014]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240016
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 16"
+ Dependent: [240015]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240017
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 17"
+ Dependent: [240016]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240018
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 18"
+ Dependent: [240017]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240019
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 19"
+ Dependent: [240018]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240020
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 20"
+ Dependent: [240019]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ TitleID: 1024
+ Score: 10
+ - ID: 220036
+ Group: "AG_EAT"
+ Name: "The beginning of outdoor"
+ Score: 20
+ - ID: 220037
+ Group: "AG_EAT"
+ Name: "The first step becoming a chef"
+ Score: 20
diff --git a/db/pre-re/item_combo_db.txt b/db/pre-re/item_combo_db.txt
index 6a70fd851f4..a51d627f279 100644
--- a/db/pre-re/item_combo_db.txt
+++ b/db/pre-re/item_combo_db.txt
@@ -23,7 +23,7 @@
1573:2716:2717,{ bonus bInt,5; bonus bMaxHP,700; bonus bAspdRate,5; }
1615:18539,{ bonus bMatk,10*getequiprefinerycnt(EQI_HAND_R); bonus bCastRate,-10; }
1616:2515,{ bonus bSpeedRate,25; }
-1618:2509,{ bonus bMaxHP,300; bonus bMatkRate,getequiprefinerycnt(EQI_HAND_R)-5; if(getequiprefinerycnt(EQI_GARMENT) > 10) { bonus2 bSubEle,Ele_Neutral,30; } else { bonus2 bSubEle,Ele_Neutral,getequiprefinerycnt(EQI_GARMENT)*3; } }
+1618:2509,{ bonus bMaxHP,300; bonus bMatkRate,min(5, getequiprefinerycnt(EQI_HAND_R)-5); bonus2 bSubEle,Ele_Neutral,min(30, getequiprefinerycnt(EQI_GARMENT)*3); }
1618:2535,{ bonus bMatkRate,5; bonus2 bSubEle,Ele_Neutral,25; }
1620:2509,{ bonus bMaxHP,300; bonus bMatkRate,getequiprefinerycnt(EQI_HAND_R)-5; if(getequiprefinerycnt(EQI_GARMENT) > 10) { bonus2 bSubEle,Ele_Neutral,30; } else { bonus2 bSubEle,Ele_Neutral,getequiprefinerycnt(EQI_GARMENT)*3; } }
1620:2535,{ bonus bMatkRate,5; bonus2 bSubEle,Ele_Neutral,25; }
diff --git a/db/pre-re/item_db.txt b/db/pre-re/item_db.txt
index 2b86be1fc01..48eb9bf647a 100644
--- a/db/pre-re/item_db.txt
+++ b/db/pre-re/item_db.txt
@@ -1526,7 +1526,7 @@
2704,Golden_Accessory,Golden Accessories,4,20,,100,,4,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus bMdef,4; },{},{}
2705,Golden_Accessory2,Golden Accessories,4,20,,100,,4,,0,0xFFFFFFFF,7,2,136,,,,,{ bonus2 bAddMonsterDropItem,12018,500; },{},{}
2706,Handcuff,Arrest Handcuffs,4,0,,0,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{},{},{}
-2707,GUSLI,GUSLI,4,20,,100,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{},{},{}
+2707,Gusli,GUSLI,4,20,,100,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{},{},{}
2708,Chinese_Handicraft,Chinese Handicraft,4,0,,50,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus3 bAutoSpell,"MG_FIREBOLT",5,300; },{},{}
2709,5_Anniversary_Coin,5th Anniversary Coin,4,2,,0,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus bAtkRate,5; bonus bMatkRate,5; },{},{}
2710,Bloody_Iron_Ball_C,Bloody Iron Ball,4,1,,0,,0,,0,0xFFFFFFFE,7,2,136,,0,0,0,{ bonus bBaseAtk,30; },{},{}
@@ -1579,7 +1579,7 @@
2757,Insecticide_Ring,Insecticide Ring,4,0,,0,,0,,0,0xFFFFFFFF,7,2,136,,1,0,0,{ bonus2 bExpAddRace,RC_Insect,15; },{},{}
2758,Fisher_Ring,Fischer Ring,4,0,,0,,0,,0,0xFFFFFFFF,7,2,136,,1,0,0,{ bonus2 bExpAddRace,RC_Fish,15; },{},{}
2759,Decussate_Ring,Decussate Ring,4,0,,0,,0,,0,0xFFFFFFFF,7,2,136,,1,0,0,{ bonus2 bExpAddRace,RC_Demon,15; },{},{}
-2760,Bloody_Ring,Bloody Ring,4,0,,0,,0,,0,0xFFFFFFFF,7,2,136,,1,0,0,{ bonus2 bExpAddRace,RC_DemiHuman,15; bonus2 bExpAddRace,RC_Player,15; },{},{}
+2760,Bloody_Ring,Bloody Ring,4,0,,0,,0,,0,0xFFFFFFFF,7,2,136,,1,0,0,{ bonus2 bExpAddRace,RC_DemiHuman,15; },{},{}
2761,Satanic_Ring,Satanic Ring,4,0,,0,,0,,0,0xFFFFFFFF,7,2,136,,1,0,0,{ bonus2 bExpAddRace,RC_Angel,15; },{},{}
2762,Dragoon_Ring,Dragon Ring,4,0,,0,,0,,0,0xFFFFFFFF,7,2,136,,1,0,0,{ bonus2 bExpAddRace,RC_Dragon,15; },{},{}
2763,Skul_Ring_C,Neo Skull Ring,4,0,,0,,0,,0,0xFFFFFFFE,2,2,136,,95,0,0,{ bonus bAtkRate,5; bonus bMatkrate,5; bonus bMaxHPrate,5; bonus2 bSkillHeal,"AL_HEAL",5; skill "MG_SIGHT",1; },{},{}
@@ -1788,7 +1788,7 @@
4151,Gajomart_Card,Gajomart Card,6,20,,10,,,,,,,,64,,,,,{ bonus2 bSubRace,RC_Plant,-20; bonus2 bExpAddRace,RC_Plant,10; },{},{}
4152,Galapago_Card,Galapago Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddItemGroupHealRate,IG_Juice,50; bonus3 bAddMonsterDropItem,531,RC_Insect,300; bonus3 bAddMonsterDropItem,532,RC_Insect,300; bonus3 bAddMonsterDropItem,534,RC_Insect,300; },{},{}
4153,Crab_Card,Crab Card,6,20,,10,,,,,,,,2,,,,,{ bonus bBaseAtk,5; bonus2 bAddDamageClass,1266,30; },{},{}
-4154,Rice_Cake_Boy_Card,Dumpling Child Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddItemGroupHealRate,IG_Candy,50; bonus3 bAddMonsterDropItem,529,RC_DemiHuman,300; bonus3 bAddMonsterDropItem,529,RC_Player,300; bonus3 bAddMonsterDropItem,530,RC_DemiHuman,100; bonus3 bAddMonsterDropItem,530,RC_Player,100; },{},{}
+4154,Rice_Cake_Boy_Card,Dumpling Child Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddItemGroupHealRate,IG_Candy,50; bonus3 bAddMonsterDropItem,529,RC_DemiHuman,300; bonus3 bAddMonsterDropItem,530,RC_DemiHuman,100; },{},{}
4155,Goblin_Leader_Card,Goblin Leader Card,6,20,,10,,,,,,,,2,,,,,{ bonus2 bAddRace2,RC2_Goblin,30; },{},{}
4156,Steam_Goblin_Card,Goblin Steamrider Card,6,20,,10,,,,,,,,2,,,,,{ bonus bCritAtkRate,10; bonus2 bCriticalAddRace,RC_Formless,7; },{},{}
4157,Goblin_Archer_Card,Goblin Archer Card,6,20,,10,,,,,,,,2,,,,,{ bonus bCritAtkRate,10; bonus2 bCriticalAddRace,RC_Undead,7; },{},{}
@@ -1879,7 +1879,7 @@
4242,Apocalips_Card,Apocalipse Card,6,20,,10,,,,,,,,16,,,,,{ bonus bVit,2; if(getrefine()>8) bonus bMaxHP,800; },{},{}
4243,Antonio_Card,Antonio Card,6,20,,10,,,,,,,,16,,,,,{ bonus3 bAutoSpellWhenHit,"AL_TELEPORT",1,500; },{},{}
4244,Alarm_Card,Alarm Card,6,20,,10,,,,,,,,64,,,,,{ bonus3 bAutoSpellWhenHit,"MG_SIGHT",1,200; bonus bMaxHP,300; bonus bVit,1; },{},{}
-4245,Am_Mut_Card,Am Mut Card,6,20,,10,,,,,,,,64,,,,,{ bonus2 bSubRace,RC_DemiHuman,-20; bonus2 bSubRace,RC_Player,-20; bonus2 bExpAddRace,RC_DemiHuman,10; bonus2 bExpAddRace,RC_Player,10; },{},{}
+4245,Am_Mut_Card,Am Mut Card,6,20,,10,,,,,,,,64,,,,,{ bonus2 bSubRace,RC_DemiHuman,-20; bonus2 bSubRace,RC_Player,-20; bonus2 bExpAddRace,RC_DemiHuman,10; },{},{}
4246,Assulter_Card,Assaulter Card,6,20,,10,,,,,,,,2,,,,,{ bonus bCritAtkRate,10; bonus2 bCriticalAddRace,RC_DemiHuman,7; bonus2 bCriticalAddRace,RC_Player,7; },{},{}
4247,Aster_Card,Aster Card,6,20,,10,,,,,,,,2,,,,,{ bonus bBaseAtk,5; bonus2 bAddDamageClass,1074,30; },{},{}
4248,Ancient_Mummy_Card,Ancient Mummy Card,6,20,,10,,,,,,,,32,,,,,{ bonus3 bAutoSpellWhenHit,"AL_CRUCIS",5,30; },{},{}
@@ -1890,7 +1890,7 @@
4253,Alice_Card,Alice Card,6,20,,10,,,,,,,,32,,,,,{ bonus2 bSubClass,Class_Boss,40; bonus2 bSubClass,Class_Normal,-40; },{},{}
4254,Tirfing_Card,Ogretooth Card,6,20,,10,,,,,,,,32,,,,,{ bonus2 bSubSize,Size_Medium,25; bonus bDef,1; },{},{}
4255,Orc_Lady_Card,Orc Lady Card,6,20,,10,,,,,,,,2,,,,,{ bonus2 bAddRace2,3,30; },{},{}
-4256,Orc_Archer_Card,Orc Archer Card,6,20,,10,,,,,,,,136,,,,,{ bonus3 bAddMonsterDropItem,12034,RC_DemiHuman,100; bonus3 bAddMonsterDropItem,12034,RC_Player,100; },{},{}
+4256,Orc_Archer_Card,Orc Archer Card,6,20,,10,,,,,,,,136,,,,,{ bonus3 bAddMonsterDropItem,12034,RC_DemiHuman,100; },{},{}
4257,Wild_Rose_Card,Wild Rose Card,6,20,,10,,,,,,,,64,,,,,{ bonus bAgi,1; if(BaseClass==Job_Thief) bonus bFlee2,5; },{},{}
4258,Wicked_Nymph_Card,Evil Nymph Card,6,20,,10,,,,,,,,769,,,,,{ bonus bInt,1; bonus bMaxSP,50; },{},{}
4259,Wooden_Golem_Card,Wooden Golem Card,6,20,,10,,,,,,,,16,,,,,{ bonus bDef,1; bonus bHPrecovRate,30; },{},{}
@@ -1943,7 +1943,7 @@
4306,Toad_Card,Toad Card,6,20,,10,,,,,,,,4,,,,,{ bonus bFlee2,1; },{},{}
4307,Kind_Of_Beetle_Card,Beetle King Card,6,20,,10,,,,,,,,2,,,,,{ bonus2 bSPGainRace,RC_Fish,5; },{},{ heal 0,-5; }
4308,Tri_Joint_Card,Tri Joint Card,6,20,,10,,,,,,,,2,,,,,{ bonus2 bSPGainRace,RC_Formless,5; },{},{ heal 0,-5; }
-4309,Parasite_Card,Parasite Card,6,20,,10,,,,,,,,32,,,,,{ bonus bDef,1; bonus2 bSubEle,Ele_Neutral,5; },{},{}
+4309,Parasite_Card,Parasite Card,6,20,,10,,,,,,,,32,,,,,{ bonus bDef,1; bonus2 bSubRace,RC_Formless,5; },{},{}
4310,Panzer_Goblin_Card,Panzer Goblin Card,6,20,,10,,,,,,,,2,,,,,{ bonus bCritAtkRate,10; bonus2 bCriticalAddRace,RC_Demon,7; },{},{}
4311,Permeter_Card,Permeter Card,6,20,,10,,,,,,,,769,,,,,{ bonus2 bSubEle,Ele_Dark,15; bonus2 bSubEle,Ele_Undead,15; },{},{}
4312,Fur_Seal_Card,Seal Card,6,20,,10,,,,,,,,2,,,,,{ bonus bFlee,3; bonus bHit,10; if(BaseClass==Job_Acolyte) { bonus2 bCriticalAddRace,RC_Undead,9; bonus2 bCriticalAddRace,RC_Demon,9; } },{},{}
@@ -2084,7 +2084,7 @@
4448,Cornus_Card,Cornus Card,6,20,,10,,,,,,,,32,,,,,{ bonus2 bSubEle,Ele_Holy,20; bonus2 bAddEle,Ele_Holy,5; },{},{}
4449,Dark_Shadow_Card,Dark Shadow Card,6,20,,10,,,,,,,,32,,,,,{ bonus2 bSubEle,Ele_Dark,20; bonus2 bAddEle,Ele_Dark,5; },{},{}
4450,Banshee_Master_Card,Banshee Master Card,6,20,,10,,,,,,,,16,,,,,{ bonus bInt,1; bonus bMatk,10; },{},{}
-4451,Entweihen_Card,Entweihen Crothen Card,6,20,,10,,,,,,,,16,,,,,{ bonus bMatk,100; },{},{}
+4451,Ant_Buyanne_Card,Entweihen Crothen Card,6,20,,10,,,,,,,,16,,,,,{ bonus bMatk,100; },{},{}
4452,Centipede_Larva_Card,Centipede Larva Card,6,20,,10,,,,,,,,2,,,,,{ bonus bInt,1; bonus bMatk,3; },{},{}
4453,Hilsrion_Card,Hillsrion Card,6,20,,10,,,,,,,,2,,,,,{ bonus bBaseAtk,25; },{},{}
// Armor Enchant System
@@ -2149,8 +2149,8 @@
4757,Luck8,LUK+8,6,20,,10,,,,,,,,,,,,,{ bonus bLuk,8; },{},{}
4758,Luck9,LUK+9,6,20,,10,,,,,,,,,,,,,{ bonus bLuk,9; },{},{}
4759,Luck10,LUK+10,6,20,,10,,,,,,,,,,,,,{ bonus bLuk,10; },{},{}
-4760,Magic_Attack1,MATK+1%,6,20,,10,,,,,,,,,,,,,{ bonus bMatkRate,1; },{},{}
-4761,Magic_Attack2,MATK+2%,6,20,,10,,,,,,,,,,,,,{ bonus bMatkRate,2; },{},{}
+4760,Matk1,MATK+1%,6,20,,10,,,,,,,,,,,,,{ bonus bMatkRate,1; },{},{}
+4761,Matk2,MATK+2%,6,20,,10,,,,,,,,,,,,,{ bonus bMatkRate,2; },{},{}
4762,Evasion6,FLEE+6,6,20,,10,,,,,,,,,,,,,{ bonus bFlee,6; },{},{}
4763,Evasion12,FLEE+12,6,20,,10,,,,,,,,,,,,,{ bonus bFlee,12; },{},{}
4764,Critical5,CRI+5,6,20,,10,,,,,,,,,,,,,{ bonus bCritical,5; },{},{}
@@ -2648,7 +2648,7 @@
//5469,Noble_Hat,Musketeer Hat,4,20,,300,,2,,0,0xFFFFFFFF,7,2,256,,30,1,466,{ bonus bStr,2; bonus3 bAutoSpellWhenHit,"BS_ADRENALINE",1,7; },{},{}
//5470,Eyes_Of_Darkness,Eye Of Darkness,4,20,,100,,1,,0,0xFFFFFFFF,7,2,512,,50,0,467,{ bonus bDex,1; bonus2 bResEff,Eff_Blind,10000; },{},{}
//5471,Hairband_Of_Reginleif,Hairband Of Reginleif,4,20,,800,,1,,0,0xFFFFFFFF,7,2,512,,50,0,468,{ bonus2 bSubEle,Ele_Water,3; bonus2 bSubEle,Ele_Fire,3; bonus2 bSubEle,Ele_Undead,3; bonus2 bSubEle,Ele_Ghost,3; },{},{}
-//5472,Red_White_Hat,Red Hat,4,20,,100,,0,,0,0xFFFFFFFF,7,2,256,,0,1,469,{ bonus3 bAddMonsterDropItem,550,RC_DemiHuman,3; bonus3 bAddMonsterDropItem,550,RC_Player,3; },{},{}
+//5472,Red_White_Hat,Red Hat,4,20,,100,,0,,0,0xFFFFFFFF,7,2,256,,0,1,469,{ bonus3 bAddMonsterDropItem,550,RC_DemiHuman,3; },{},{}
//5473,Forceps_Hairpin,Nipper Crab Hairpin,4,20,,500,,4,,0,0xFFFFFFFF,7,2,256,,30,1,470,{ bonus3 bAutoSpellWhenHit,"MG_COLDBOLT",1,100; bonus3 bAddMonsterDropItem,991,RC_Fish,3; },{},{}
//5474,Notice_Board,AFK Hat,4,20,,700,,2,,0,0xFFFFFFFF,7,2,256,,10,0,471,{},{},{}
//5475,Cube_Mask,Mask Cube,4,20,,100,,1,,0,0xFFFFFFFF,7,2,513,,0,0,472,{},{},{}
@@ -2750,10 +2750,10 @@
//5571,Rasta_Wig,Rasta_Wig,4,20,,100,,1,,0,0xFFFFFFFF,7,2,256,,0,1,552,{ bonus bStr,1; },{},{}
5572,Savage_Baby_Hat,Savage Babe Hat,4,20,,100,,1,,1,0xFFFFFFFF,7,2,256,,1,1,553,{ bonus bVit,2; },{},{}
5573,Bogy_Horn,Dokebi Horn,4,20,,100,,1,,1,0xFFFFFFFF,7,2,256,,0,1,554,{},{},{}
-5574,Pencil_in_Mouth,Well-Chewed Pencil,4,20,,100,,0,,0,0xFFFFFFFF,7,2,1,,10,0,555,{ bonus bdex,2; bonus bHitRate,3; },{},{}
+5574,Pencil_In_Mouth,Well-Chewed Pencil,4,20,,100,,0,,0,0xFFFFFFFF,7,2,1,,10,0,555,{ bonus bdex,2; bonus bHitRate,3; },{},{}
5575,Onigiri_Hat,Rice Ball Hat,4,20,,100,,6,,1,0xFFFFFFFF,7,2,256,,30,0,556,{},{},{}
//5576,Japan_Winecup,Wine Cup,4,20,,100,,1,,0,0xFFFFFFFF,7,2,1,,0,0,557,{},{},{}
-5577,Dark_Knight_Mask_,Dark Knight Mask,4,,,3000,,5,,0,0xFFFFFFFF,7,2,769,,80,1,479,{ bonus bStr,3; },{},{}
+5577,Dark_Knight_MaskB,Dark Knight Mask,4,,,3000,,5,,0,0xFFFFFFFF,7,2,769,,80,1,479,{ bonus bStr,3; },{},{}
5578,Voyage_Hat,Voyage_Hat,4,200,,10,,1,,0,0xFFFFFFFF,7,2,256,,0,1,236,{ bonus bAgi,2; },{},{}
5579,Wanderer's_Sakkat,Wanderer's Sakkat,4,20,,300,,2,,1,0xFFFFFFFF,7,2,768,,70,1,558,{ bonus bAgi,2; },{},{}
//5580,Red_Beret,Red Beret,4,20,,100,,1,,0,0xFFFFFFFF,7,2,256,,0,0,559,{ bonus bAllStats,3; bonus bMdef,3; },{},{}
@@ -2768,8 +2768,8 @@
//5589,Leo_Diadem,Leo Diadem,4,20,,300,,3,,0,0xFFFFFFFF,7,2,256,,70,1,566,{ bonus bDex,2; bonus2 bSubEle,Ele_Fire,5; if(getrefine()>6) { bonus bFlee,10; bonus bAspdRate,3; autobonus "{ bonus bSplashRange,1; }",10,10000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }"; } },{},{}
5590,K_Poring_Cake_Cap,Poring Cake Hat,4,20,,200,,1,,0,0xFFFFFFFF,7,2,256,,0,1,417,{},{},{}
//5591,Desert_Prince,Desert Prince,4,20,,100,,1,,1,0xFFFFFFFF,7,2,256,,30,0,567,{},{},{}
-5592,Sigrun's_Wings,Sigrun's Wings,4,20,,100,,2,,0,0xFFFFFFFF,7,2,512,,80,0,568,{ if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief||(BaseJob==Job_Taekwon&&Class!=Job_Soul_Linker)) bonus bStr,1; else if(BaseClass==Job_Mage||BaseClass==Job_Acolyte||class==Job_Ninja||class==Job_Soul_Linker) bonus bInt,1; else if(BaseClass==Job_Archer||BaseClass==Job_Gunslinger) bonus bDex,1; else if(BaseJob==Job_Novice||BaseJob==Job_SuperNovice) { bonus bMaxHP,80; bonus bMaxSP,30; } },{},{}
-5593,Rabbit_Bonnet_,Rabbit Bonnet,4,20,,200,,1,,1,0xFFFFFFFF,7,2,768,,1,1,549,{},{},{}
+5592,Sigrun's_Wing,Sigrun's Wings,4,20,,100,,2,,0,0xFFFFFFFF,7,2,512,,80,0,568,{ if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief||(BaseJob==Job_Taekwon&&Class!=Job_Soul_Linker)) bonus bStr,1; else if(BaseClass==Job_Mage||BaseClass==Job_Acolyte||class==Job_Ninja||class==Job_Soul_Linker) bonus bInt,1; else if(BaseClass==Job_Archer||BaseClass==Job_Gunslinger) bonus bDex,1; else if(BaseJob==Job_Novice||BaseJob==Job_SuperNovice) { bonus bMaxHP,80; bonus bMaxSP,30; } },{},{}
+5593,K_Rabbit_Bonnet,Rabbit Bonnet,4,20,,200,,1,,1,0xFFFFFFFF,7,2,768,,1,1,549,{},{},{}
5594,Donut_In_Mouth,Donut In Mouth,4,20,,50,,1,,0,0xFFFFFFFF,7,2,1,,1,0,569,{},{},{}
//5595,Eye_Of_Juno,Eye Of Juno,4,20,,400,,2,,1,0xFFFFFFFF,7,2,256,,1,1,570,{ bonus bMdef,2; },{},{}
5596,4Leaf_Clover_In_Mouth,4Leaf Clover In Mouth,4,20,,0,,2,,0,0xFFFFFFFF,7,2,1,,1,0,571,{ bonus bMdef,2; },{},{}
@@ -2835,7 +2835,7 @@
//5656,Scooter_Hat_J,Scooter Helmet,4,20,,1000,,7,,1,0xFFFFFFFF,7,2,256,,50,1,588,{ bonus bUnbreakableHelm,0; },{},{}
//5657,Antique_Pipe_J,Captain's Pipe,4,20,,100,,0,,0,0xFFFFFFFF,7,2,1,,30,0,383,{},{},{}
5658,Imp_Hat,Imp Hat,4,20,,400,,1,,0,0xFFFFFFFF,7,2,256,,1,1,589,{ bonus3 bAutoSpell,"SA_FLAMELAUNCHER",1,5; },{},{}
-5659,Sleeper_Hat,Sleeper Hat,4,20,,400,,1,,0,0xFFFFFFFF,7,2,256,,1,1,590,{ bonus3 bAutoSpell,"SA_SEISMICWEAPON",1,5; },{},{}
+5659,Sleepr_Hat,Sleeper Hat,4,20,,400,,1,,0,0xFFFFFFFF,7,2,256,,1,1,590,{ bonus3 bAutoSpell,"SA_SEISMICWEAPON",1,5; },{},{}
5660,Gryphon_Hat,Gryphon Hat,4,20,,400,,1,,0,0xFFFFFFFF,7,2,256,,1,1,591,{ bonus3 bAutoSpell,"SA_LIGHTNINGLOADER",1,5; },{},{}
//5661,Red_Pirate_Bandana,Red Pirate Banada,4,0,,0,,3,,0,0xFFFFFFFF,7,2,256,,10,1,592,{ bonus bStr,1; bonus bDex,1; bonus bAspdRate,2; bonus bCastRate,-2; bonus3 bAutoSpell,"MO_EXTREMITYFIST",1,30; },{},{}
//5662,Libra_Crown,Libra Crown,4,10,,300,,3,,0,0xFFFFFFFF,7,2,256,,1,1,593,{ bonus bDex,3; },{},{}
@@ -4221,7 +4221,7 @@
7853,Pass_F3,iPod nano Raffle Ticket,3,20,,10,,,,,,,,,,,,,{},{},{}
7854,Pass_CF,Comodo Festival Ticket,3,20,,10,,,,,,,,,,,,,{},{},{}
7855,Heart,Heart,3,20,,10,,,,,,,,,,,,,{},{},{}
-7856,Girl_Bunch_Of_Flower,Girl's Bouquet,3,20,,50,,,,,,,,,,,,,{},{},{}
+7856,Girl_Bunch_Of_Flower_,Girl's Bouquet,3,20,,50,,,,,,,,,,,,,{},{},{}
7857,Handmade_Kitty_Doll,Hand-made Kitty Doll,3,20,,30,,,,,,,,,,,,,{},{},{}
7858,Dragonball_Yellow_,Dragonball Yellow,3,20,,10,,,,,,,,,,,,,{},{},{}
7859,Game_Ticket,Game Ticket,3,20,,100,,,,,,,,,,,,,{},{},{}
@@ -4551,7 +4551,7 @@
11529,MAAMOUL_,Maamoul,0,500,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal 120,60; },{},{}
11530,Jujube,Jujube,0,10,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal 30,0; },{},{}
11531,Coffee,Coffee,0,10,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal 0,10; },{},{}
-11701,Girl_Bunch_Of_Flower_,Girl's Bouquet,0,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(105,145),0; },{},{}
+11701,Girl_Bunch_Of_Flower,Girl's Bouquet,0,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(105,145),0; },{},{}
11702,Moon_Cookie,Moon Cookie,0,0,,300,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
11703,Mysterious_Blood,Mystery Blood,0,0,,30,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal 0,rand(25,35); },{},{}
11704,KETUPAT_F,Ketupat,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(70,90),0; },{},{}
@@ -4953,9 +4953,9 @@
12389,Runstone_Storm,Pertz Runestone For Apprentice,11,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ /* if(strcharinfo(3)=="job3_rune02") { itemskill "RK_STORMBLAST",1; } */ },{},{}
12390,Runstone_Millennium,Verkana Runestone For Apprentice,11,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ /* if(strcharinfo(3)=="job3_rune02") { itemskill "RK_MILLENNIUMSHIELD",1; } */ },{},{}
12391,Lucky_Egg_C,Lucky Egg,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12392,Repair_A,Repair A,2,220,,100,,,,,0x00000400,8,2,,,,,,{ if ( checkmadogear() ) { itemheal rand(200,300),0; } },{},{}
-12393,Repair_B,Repair B,2,500,,140,,,,,0x00000400,8,2,,,,,,{ if ( checkmadogear() ) { itemheal rand(300,400),0; } },{},{}
-12394,Repair_C,Repair C,2,1100,,180,,,,,0x00000400,8,2,,,,,,{ if ( checkmadogear() ) { itemheal rand(400,500),0; } },{},{}
+12392,RepairA,Repair A,2,220,,100,,,,,0x00000400,8,2,,,,,,{ if ( checkmadogear() ) { itemheal rand(200,300),0; } },{},{}
+12393,RepairB,Repair B,2,500,,140,,,,,0x00000400,8,2,,,,,,{ if ( checkmadogear() ) { itemheal rand(300,400),0; } },{},{}
+12394,RepairC,Repair C,2,1100,,180,,,,,0x00000400,8,2,,,,,,{ if ( checkmadogear() ) { itemheal rand(400,500),0; } },{},{}
12395,Tantanmen,Tantan Noodle,2,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1519; },{},{}
12396,Fools_Day_Box,Gift Box?,11,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ .@rnd = rand(1,10); if(.@rnd==1) itemskill "AL_TELEPORT",1; else if(.@rnd==2) itemskill "AL_TELEPORT",3; else if(.@rnd==3) percentheal 50,0; else if(.@rnd==4) percentheal 0,50; else if(.@rnd==5) end; else if(.@rnd==6) getitem 512,1; else if(.@rnd==7) itemskill "ALL_REVERSEORCISH",1; else if(.@rnd==8) specialeffect2 EF_MAPPILLAR2; else if(.@rnd==9) specialeffect2 EF_ANGEL2; else specialeffect2 EF_COIN; },{},{}
12397,Fools_Day_Box2,Gift Box?,11,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ .@rnd = rand(1,10); if(.@rnd==1) itemskill "TF_DETOXIFY",1; else if(.@rnd==2) itemskill "TF_PICKSTONE",1; else if(.@rnd==3) itemskill "BA_FROSTJOKER",1; else if(.@rnd==4) itemskill "DC_SCREAM",1; else if(.@rnd==5) end; else if(.@rnd==6) getitem 909,1; else if(.@rnd==7) itemskill "AL_RUWACH",1; else if(.@rnd==8) specialeffect2 EF_BEGINASURA; else if(.@rnd==9) specialeffect2 EF_MVP; else specialeffect2 EF_CURSEATTACK; },{},{}
@@ -4964,7 +4964,7 @@
12400,Water_Of_Blessing_,Water Of Blessing,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12401,Rune_Kn_Test_Int,Rune Kn Test Int,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCINT,300000,40; },{},{}
12402,29Fruit,29Fruit,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 5,5; },{},{}
-12403,Lucky_Egg2,Lucky Egg2,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+12403,Lucky_Egg_C2,Lucky Egg2,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12404,Acti_Potion,Acti Potion,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12405,Underripe_Yggseed,Underripe Yggseed,2,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 30,30; skilleffect "AL_BLESSING",0; sc_start SC_BLESSING,140000,5; },{},{}
12406,Psychic_ArmorS,Psychic ArmorS,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
@@ -4982,23 +4982,23 @@
12418,Full_SwingK,Full SwingK,2,100,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_FULL_SWING_K,500000,50; },{},{}
12419,Mana_Plus,Mana Plus,2,100,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_MANA_PLUS,500000,50; },{},{}
12420,Stamina_Up_M,Stamina Up M,2,100,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_MUSTLE_M,500000,5; },{},{}
-12421,Falmons_F,Falmons F,2,10,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LIFE_FORCE_F,500000,5; },{},{}
+12421,Digestive_F,Falmons F,2,10,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LIFE_FORCE_F,500000,5; },{},{}
12422,HP_Increase_PotionS,HP Increase Potion (Small),2,100,,20,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start2 SC_PROMOTE_HEALTH_RESERCH,500000,1,1; percentheal 1,0; },{},{}
12423,HP_Increase_PotionM,HP Increase Potion (Medium),2,100,,40,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start2 SC_PROMOTE_HEALTH_RESERCH,500000,1,2; percentheal 2,0; },{},{}
12424,HP_Increase_PotionL,HP Increase Potion (Large),2,100,,80,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start2 SC_PROMOTE_HEALTH_RESERCH,500000,1,3; percentheal 5,0; },{},{}
12425,SP_Increase_PotionS,SP Increase Potion (Small),2,100,,20,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start2 SC_ENERGY_DRINK_RESERCH,500000,1,1; percentheal 0,2; },{},{}
12426,SP_Increase_PotionM,SP Increase Potion (Medium),2,100,,40,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start2 SC_ENERGY_DRINK_RESERCH,500000,1,2; percentheal 0,4; },{},{}
12427,SP_Increase_PotionL,SP Increase Potion (Large),2,100,,80,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start2 SC_ENERGY_DRINK_RESERCH,500000,1,3; percentheal 0,8; },{},{}
-12428,Concentrated_White_Potion_Z,Concentrated White Potion Z,0,10,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_EXTRACT_WHITE_POTION_Z,500000,20; heal 1000,0; },{},{}
-12429,Savage_Full_Roast,Savage Full Roast,2,,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_SAVAGE_STEAK,300000,20; },{},{}
-12430,Cocktail_Warg_Blood,Cocktail Warg Blood,2,,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_COCKTAIL_WARG_BLOOD,300000,20; },{},{}
-12431,Minor_Stew,Minor Stew,2,,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_MINOR_BBQ,300000,20; },{},{}
-12432,Siroma_Iced_Tea,Siroma Iced Tea,2,,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_SIROMA_ICE_TEA,300000,20; },{},{}
-12433,Drosera_Herb_Salad,Drosera Herb Salad,2,,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DROCERA_HERB_STEAMED,300000,20; },{},{}
-12434,Petite_Tail_Noodles,Petite Tail Noodles,2,,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_PUTTI_TAILS_NOODLES,300000,20; },{},{}
-12435,Black_Mass,Black Mass,2,,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STOMACHACHE,60000,rand(5,10); },{},{}
-12436,Vitata_500,Vitata 500,0,10,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITATA_500,500000,0; itemheal 0,200; },{},{}
-12437,Concentrated_Ceromain_Soup,Concentrated Ceromain Soup,2,10,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_EXTRACT_SALAMINE_JUICE,500000,10; },{},{}
+12428,Enrich_White_PotionZ,Concentrated White Potion Z,0,10,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_EXTRACT_WHITE_POTION_Z,500000,20; heal 1000,0; },{},{}
+12429,Savage_BBQ,Savage Full Roast,2,,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_SAVAGE_STEAK,300000,20; },{},{}
+12430,Wug_Blood_Cocktail,Cocktail Warg Blood,2,,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_COCKTAIL_WARG_BLOOD,300000,20; },{},{}
+12431,Minor_Brisket,Minor Stew,2,,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_MINOR_BBQ,300000,20; },{},{}
+12432,Siroma_Icetea,Siroma Iced Tea,2,,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_SIROMA_ICE_TEA,300000,20; },{},{}
+12433,Drocera_Herb_Stew,Drosera Herb Salad,2,,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DROCERA_HERB_STEAMED,300000,20; },{},{}
+12434,Petti_Tail_Noodle,Petite Tail Noodles,2,,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_PUTTI_TAILS_NOODLES,300000,20; },{},{}
+12435,Black_Thing,Black Mass,2,,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STOMACHACHE,60000,rand(5,10); },{},{}
+12436,Vitata500,Vitata 500,0,10,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITATA_500,500000,0; itemheal 0,200; },{},{}
+12437,Enrich_Celermine_Juice,Concentrated Ceromain Soup,2,10,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_EXTRACT_SALAMINE_JUICE,500000,10; },{},{}
12438,F_Giant_Fly_Wing,F Giant Fly Wing,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12439,F_Battle_Manual,F Battle Manual,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12440,F_Insurance,F Insurance,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
@@ -5141,7 +5141,7 @@
12579,Ring_Of_Valkyrie_Box,Ring Of Valkyrie Box,2,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12580,Vending_Search_Scroll,Universal Catalog Silver,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ searchstores 10,0; },{},{}
12581,Vending_Search_Scroll2,Universal Catalog Gold,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ searchstores 10,1; },{},{}
-12591,Vending_Search_Scroll3,Universal Catalog Bronze,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ searchstores 10,1; },{},{}
+12591,Uni_Catalog_Bz,Universal Catalog Bronze,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ searchstores 10,1; },{},{}
12701,Old_Blue_Box_F,Old Blue Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12702,Old_Bleu_Box,Old Navy Box,2,0,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getrandgroupitem(IG_BleuBox),1; getrandgroupitem(IG_BleuBox),1; },{},{}
12703,Holy_Egg_2,Holy Egg,11,0,,50,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
@@ -5162,22 +5162,22 @@
12717,Poison_Paralysis,Paralyze,0,2,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_PARALYSE,300000,0,10,0; },{},{}
12718,Poison_Leech,Leech End,0,2,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LEECHESEND,300000,0,10,0; },{},{}
12719,Poison_Oblivion,Oblivion Curse,0,2,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_OBLIVIONCURSE,300000,0,10,0; },{},{}
-12720,Poison_Disheart,Disheart,0,2,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEATHHURT,300000,0,10,0; },{},{}
+12720,Poison_Contamination,Disheart,0,2,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEATHHURT,300000,0,10,0; },{},{}
12721,Poison_Numb,Toxin,0,2,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_TOXIN,300000,0,10,0; },{},{}
12722,Poison_Fever,Pyrexia,0,2,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_PYREXIA,300000,0,10,0; },{},{}
12723,Poison_Laughing,Magic Mushroom,0,2,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_MAGICMUSHROOM,300000,0,10,0; },{},{}
12724,Poison_Fatigue,Venom Bleed,0,2,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VENOMBLEED,15000,0,10,0; },{},{}
// Rune Knight's Rune Stones
-12725,Runstone_Nosiege,Nauthiz Rune,11,100,,100,,,,,0xFFFFFFFF,8,2,,,,,,{ itemskill "RK_REFRESH",1; },{},{}
-12726,Runstone_Rhydo,Raido Rune,11,100,,100,,,,,0xFFFFFFFF,8,2,,,,,,{ itemskill "RK_CRUSHSTRIKE",1; },{},{}
-12727,Runstone_Verkana,Berkana Rune,11,100,,100,,,,,0xFFFFFFFF,8,2,,,,,,{ itemskill "RK_MILLENNIUMSHIELD",1; },{},{}
-12728,Runstone_Isia,Isa Rune,11,100,,100,,,,,0xFFFFFFFF,8,2,,,,,,{ itemskill "RK_VITALITYACTIVATION",1; },{},{}
-12729,Runstone_Asir,Othila Rune,11,100,,100,,,,,0xFFFFFFFF,8,2,,,,,,{ itemskill "RK_FIGHTINGSPIRIT",1; },{},{}
-12730,Runstone_Urj,Uruz Rune,11,100,,100,,,,,0xFFFFFFFF,8,2,,,,,,{ itemskill "RK_ABUNDANCE",1; },{},{}
-12731,Runstone_Turisus,Thurisaz Rune,11,100,,100,,,,,0xFFFFFFFF,8,2,,,,,,{ itemskill "RK_GIANTGROWTH",1; },{},{}
-12732,Runstone_Pertz,Wyrd Rune,11,100,,100,,,,,0xFFFFFFFF,8,2,,,,,,{ itemskill "RK_STORMBLAST",1; },{},{}
-12733,Runstone_Hagalas,Hagalaz Rune,11,100,,100,,,,,0xFFFFFFFF,8,2,,,,,,{ itemskill "RK_STONEHARDSKIN",1; },{},{}
+12725,Runstone_Nosiege,Nauthiz Rune,2,100,,100,,,,,0xFFFFFFFF,8,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_REFRESH",1; },{},{}
+12726,Runstone_Rhydo,Raido Rune,2,100,,100,,,,,0xFFFFFFFF,8,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_CRUSHSTRIKE",1; },{},{}
+12727,Runstone_Verkana,Berkana Rune,2,100,,100,,,,,0xFFFFFFFF,8,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_MILLENNIUMSHIELD",1; },{},{}
+12728,Runstone_Isia,Isa Rune,2,100,,100,,,,,0xFFFFFFFF,8,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_VITALITYACTIVATION",1; },{},{}
+12729,Runstone_Asir,Othila Rune,2,100,,100,,,,,0xFFFFFFFF,8,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_FIGHTINGSPIRIT",1; },{},{}
+12730,Runstone_Urj,Uruz Rune,2,100,,100,,,,,0xFFFFFFFF,8,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_ABUNDANCE",1; },{},{}
+12731,Runstone_Turisus,Thurisaz Rune,2,100,,100,,,,,0xFFFFFFFF,8,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_GIANTGROWTH",1; },{},{}
+12732,Runstone_Pertz,Wyrd Rune,2,100,,100,,,,,0xFFFFFFFF,8,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_STORMBLAST",1; },{},{}
+12733,Runstone_Hagalas,Hagalaz Rune,2,100,,100,,,,,0xFFFFFFFF,8,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_STONEHARDSKIN",1; },{},{}
// Rune Knight Rune Ores
12734,Runstone_Quality,Luxurious Rune,0,2,,100,,,,,0x00000080,8,2,,,,,,{ makerune 5; },{},{}
@@ -5530,8 +5530,8 @@
13518,Weapon_Card_Scroll_Box,Weapon Card Pet Egg Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13558,1; },{},{}
13519,Armor_Card_Scroll_Box,Armor Card Pet Egg Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13559,1; },{},{}
13520,Helmet_Card_Scroll_Box,Helmet Card Pet Egg Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13560,1; },{},{}
-13521,Garment_Card_Scroll_Box,Garment Card Pet Egg Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13561,1; },{},{}
-13522,Shield_Card_Scroll_Box,Shield Card Pet Egg Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13562,1; },{},{}
+13521,Hood_Card_Scroll_Box,Garment Card Pet Egg Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13561,1; },{},{}
+13522,Hood_Card_Scroll_Box2,Shield Card Pet Egg Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13562,1; },{},{}
13523,Shoes_Card_Scroll_Box,Shoes Card Pet Egg Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13563,1; },{},{}
13524,Accy_Card_Scroll_Box,Accessory Card Pet Egg Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13564,1; },{},{}
13525,Zeny_Scroll_Box,Zeny Pet Egg Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14508,1; },{},{}
@@ -5920,10 +5920,10 @@
13908,Deviruchi_Set_Box,XM Deviruchi Set Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5227,1; getitem 5228,1; getitem 5229,1; },{},{}
13909,MVP_Hunt_Box,MVP Hunting Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7621,1; getitem 12210,1; getitem 12221,1; getitem 12214,3; },{},{}
13910,Brewing_Box,XM Brewing Set Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12204,10; getitem 12205,10; getitem 12206,10; },{},{}
-13911,Christmas_Pet_Scroll,Christmas Pet Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-13912,Pty_Blessing_Box,Party Blessing 10 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14588,10; },{},{}
-13913,Pty_Inc_Agi_Box,Party Increase Agi 10 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14589,10; },{},{}
-13914,Pty_Assumptio_Box,Party Assumptio 5 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14590,10; },{},{}
+13911,Xmas_Pet_Scroll,Christmas Pet Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+13912,Party_Blessing_Box,Party Blessing 10 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14588,10; },{},{}
+13913,Party_Inc_Agi_Box,Party Increase Agi 10 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14589,10; },{},{}
+13914,Party_Assumptio_Box,Party Assumptio 5 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14590,10; },{},{}
13915,Love_Angel_Box,Love Angel Magic Powder Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12287,604800; },{},{}
13916,Squirrel_Box,Squirrel Magic Powder Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12288,604800; },{},{}
13917,Gogo_Box,Gogo Magic Powder Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12289,604800; },{},{}
@@ -5945,21 +5945,21 @@
13933,Undine_Box,Undine Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4350,4; },{},{}
13934,Salamander_Box,Salamander Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4380,4; },{},{}
13935,Soul_Box,Soul Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4388,4; },{},{}
-13936,Noum_Box,Gnome Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4335,4; },{},{}
+13936,Noum_Bpx,Gnome Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4335,4; },{},{}
13937,Robo_Eye_Box,Robo Eye Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5325,1; },{},{}
13938,Twin_Ribbon_Box,Maiden's Twin Ribbon Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5187,1; },{},{}
//13939,Diadem_Box,Diadem Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5313,1; },{},{}
13940,Siege_Tele_Scroll_Box,WoE Teleport Scroll 100 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14591,100; },{},{}
-13941,TW_Valentine_Scroll,Taiwan Valentine Scroll,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+13941,Valentine_Scroll_TW,Taiwan Valentine Scroll,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
13942,Love_Angel_Box_1m,Love Angel Magic Powder Box 30 Days,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14009,1; },{},{}
13943,Squirrel_Box_1m,Squirrel Magic Powder Box 30 Days,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14010,1; },{},{}
13944,Gogo_Box_1m,Gogo Magic Powder Box 30 Days,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14011,1; },{},{}
-13945,BRO_SM_Package,Brazil Swordsman Package,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2317,1; getitem 2106,1; getitem 2406,1; getitem 2506,1; getitem 4003,1; getitem 4133,1; getitem 2607,2; getitem 2229,1; getitem 2266,1; },{},{}
-13946,BRO_MG_Package,Brazil Magician Package,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2322,1; getitem 2102,1; getitem 2104,1; getitem 2504,1; getitem 4003,1; getitem 4077,1; getitem 2607,2; getitem 5027,1; },{},{}
-13947,BRO_AC_Package,Brazil Acolyte Package,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2326,1; getitem 2104,1; getitem 2404,1; getitem 2504,1; getitem 4003,1; getitem 4100,1; getitem 2607,2; getitem 2217,1; },{},{}
-13948,BRO_AR_Package,Brazil Archer package,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2331,1; getitem 1716,1; getitem 2406,1; getitem 2504,1; getitem 4064,1; getitem 4102,1; getitem 2607,2; getitem 2285,1; },{},{}
-13949,BRO_MC_Package,Brazil Merchant Package,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2315,1; getitem 2104,1; getitem 2406,1; getitem 2506,1; getitem 4003,1; getitem 4133,1; getitem 2607,2; getitem 5021,1; },{},{}
-13950,BRO_TF_Package,Brazil Thief Package,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2336,1; getitem 2104,1; getitem 2406,1; getitem 2506,1; getitem 4097,1; getitem 4102,1; getitem 2607,2; getitem 2274,1; },{},{}
+13945,Br_SwordPackage,Brazil Swordsman Package,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2317,1; getitem 2106,1; getitem 2406,1; getitem 2506,1; getitem 4003,1; getitem 4133,1; getitem 2607,2; getitem 2229,1; getitem 2266,1; },{},{}
+13946,Br_MagePackage,Brazil Magician Package,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2322,1; getitem 2102,1; getitem 2104,1; getitem 2504,1; getitem 4003,1; getitem 4077,1; getitem 2607,2; getitem 5027,1; },{},{}
+13947,Br_AcolPackage,Brazil Acolyte Package,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2326,1; getitem 2104,1; getitem 2404,1; getitem 2504,1; getitem 4003,1; getitem 4100,1; getitem 2607,2; getitem 2217,1; },{},{}
+13948,Br_ArcherPackage,Brazil Archer package,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2331,1; getitem 1716,1; getitem 2406,1; getitem 2504,1; getitem 4064,1; getitem 4102,1; getitem 2607,2; getitem 2285,1; },{},{}
+13949,Br_MerPackage,Brazil Merchant Package,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2315,1; getitem 2104,1; getitem 2406,1; getitem 2506,1; getitem 4003,1; getitem 4133,1; getitem 2607,2; getitem 5021,1; },{},{}
+13950,Br_ThiefPackage,Brazil Thief Package,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2336,1; getitem 2104,1; getitem 2406,1; getitem 2506,1; getitem 4097,1; getitem 4102,1; getitem 2607,2; getitem 2274,1; },{},{}
13951,Wasteland_Outlaw_Box,Western Outlaw Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13109,604800; },{},{}
13952,Lever_Action_Rifle_Box,Lever Action Rifle Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13170,604800; },{},{}
13953,All_In_One_Ring_Box,All In One Ring Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2741,604800; },{},{}
@@ -6007,9 +6007,9 @@
13995,Speed_Up_Potion_Box10,Speed Potion 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12016,10; },{},{}
13996,Big_Bun_Box100,Big Bun 100 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14522,100; },{},{}
13997,Big_Bun_Box500,Big Bun 500 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14522,500; },{},{}
-13998,Giant_Flywing_Box500,Giant Fly Wing 500 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12212,500; },{},{}
-13999,Pill_Box100,Pill 100 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14523,100; },{},{}
-14000,Pill_Box500,Pill 500 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14523,500; },{},{}
+13998,Giant_Fly_Wing_Box500,Giant Fly Wing 500 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12212,500; },{},{}
+13999,Pill__Box100,Pill 100 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14523,100; },{},{}
+14000,Pill__Box500,Pill 500 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14523,500; },{},{}
14001,Basic_Siege_Supply_Box,Recruit Siege Supply Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 11503,25; getitem 11504,10; },{},{}
14002,Adv_Siege_Supply_Box,Veteran Siege Supply Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 11503,50; getitem 11504,20; },{},{}
14003,Elite_Siege_Supply_Box,Elite Siege Supply Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 11503,100; getitem 11504,50; },{},{}
@@ -6311,7 +6311,7 @@
14301,Ifrit's_Ear_Box,Ears Of Ifrit Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5421,1; },{},{}
14304,Scuba_Mask_Box,Scuba Mask Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5397,1; },{},{}
14314,Phreeoni_Scroll_Box,Phreeoni Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14597,10; },{},{}
-14315,Ghostring_Scroll_Box,Ghostring Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14598,10; },{},{}
+14315,GhostringS_Box,Ghostring Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14598,10; },{},{}
14316,July7_Scroll,July7 Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
14317,Bacsojin_Scroll,Bacsojin Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
14343,Spiked_Scarf_Box,Spiked Scarf Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5462,1; },{},{}
@@ -6378,7 +6378,7 @@
14545,Battle_Manual_X3,Field Manual 300%,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_EXPBOOST,1800000,300; },{},{}
14546,Fire_Cracker_Love,I Love You Firecracker,2,2,,20,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
14547,Fire_Cracker_Wday,Whiteday Firecracker,2,2,,20,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-14548,Fire_Cracker_Valentine,Valentine's Day Firecracker,2,2,,20,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+14548,Fire_Cracker_Vday,Valentine's Day Firecracker,2,2,,20,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
14549,Fire_Cracker_Bday,Birthday Firecracker,2,2,,20,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
14550,Fire_Cracker_Xmas,Xmas Firecracker,2,2,,20,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
14551,Str_Dish01_,Fried Grasshopper Legs,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFOOD,1200000,1; percentheal 5,0; },{},{}
@@ -6463,10 +6463,10 @@
//16251,Gemini_Diadem_Box
//16252,Gemini_Crown_Box
16257,Buddah_Scroll,Buddah Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-16258,HD_Bradium_5_Box,HD Bradium 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6226,5; },{},{}
-16259,HD_Carnium_5_Box,HD Carnium 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6225,5; },{},{}
-16260,HD_Bradium_10_Box,HD Bradium 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6226,10; },{},{}
-16261,HD_Carnium_10_Box,HD Carnium 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6225,10; },{},{}
+16258,HD_Bradium_Box5,HD Bradium 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6226,5; },{},{}
+16259,HD_Carnium_Box5,HD Carnium 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6225,5; },{},{}
+16260,HD_Bradium_Box10,HD Bradium 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6226,10; },{},{}
+16261,HD_Carnium_Box10,HD Carnium 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6225,10; },{},{}
//16262,HD_Bradium_5_Box,
//16263,HD_Carnium_5_Box,
//16264,HD_Bradium_10_Box,
@@ -6475,7 +6475,7 @@
//16268,HE_Bubble_Gum_Box
//16269,Cancer_Diadem_Box
//16270,Cancer_Crown_Box,
-16304,Evil_Incarnation,Evil Incarnation,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16304,Evil_Incarnation_Disable,Evil Incarnation,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
//16343,Leo_Crown_Box
//16344,Leo_Diadem_Box
//16345,Leo_Crown_Box
@@ -6545,14 +6545,14 @@
18003,Soul_Cannon_Ball,Soul Cannon Ball,10,200,,10,120,,,,0x00040400,8,2,32768,,99,,8,{ bonus bAtkEle,Ele_Ghost; },{},{}
18004,Iron_Cannon_Ball,Iron Cannon Ball,10,500,,10,250,,,,0x00040400,8,2,32768,,99,,8,{},{},{}
// More Bows
-18100,Shooting_Star,Shooting Star,5,20,,0,190,,5,0,0x00080800,7,2,34,4,1,1,11,{ bonus bLongAtkRate,20; },{},{}
+18100,Shooting_Star_C,Shooting Star,5,20,,0,190,,5,0,0x00080800,7,2,34,4,1,1,11,{ bonus bLongAtkRate,20; },{},{}
18101,F_Bow_Of_Rudra_C,Rudra Bow,5,2,,0,185,,5,0,0x000A0848,7,2,34,4,0,0,11,{ bonus bAtkEle,Ele_Holy; bonus bInt,5; skill "AL_CURE",1; skill "AL_HEAL",1; bonus2 bResEff,Eff_Poison,5000; bonus2 bResEff,Eff_Curse,5000; bonus2 bResEff,Eff_Silence,5000; bonus2 bResEff,Eff_Confusion,5000; bonus2 bResEff,Eff_Blind,5000; },{},{}
18102,E_Bow_Of_Rudra_C,Rudra Bow,5,2,,0,185,,5,0,0x000A0848,7,2,34,4,0,0,11,{ bonus bAtkEle,Ele_Holy; bonus bInt,5; skill "AL_CURE",1; skill "AL_HEAL",1; bonus2 bResEff,Eff_Poison,5000; bonus2 bResEff,Eff_Curse,5000; bonus2 bResEff,Eff_Silence,5000; bonus2 bResEff,Eff_Confusion,5000; bonus2 bResEff,Eff_Blind,5000; },{},{}
// More Headgears
18500,Cheer_Scarf6,Cheer Scarf6,4,0,,0,,0,,0,0xFFFFFFFF,7,2,1,,1,0,369,{},{},{}
18501,Cheer_Scarf8,Cheer Scarf8,4,0,,0,,0,,0,0xFFFFFFFF,7,2,1,,1,0,369,{},{},{}
18502,Cheer_Scarf10,Cheer Scarf10,4,0,,0,,0,,0,0xFFFFFFFF,7,2,1,,1,0,369,{},{},{}
-18503,Majestic_Devil,Small Devil Horns,4,20,,100,,2,,0,0xFFFFFFFF,7,2,512,,1,0,562,{ bonus bAtkRate,5; bonus bMatkRate,5; bonus bMaxHPRate,10; bonus bMaxSPRate,10; },{},{}
+18503,Small_Horn_Of_Devil,Small Devil Horns,4,20,,100,,2,,0,0xFFFFFFFF,7,2,512,,1,0,562,{ bonus bAtkRate,5; bonus bMatkRate,5; bonus bMaxHPRate,10; bonus bMaxSPRate,10; },{},{}
18505,Umbala_Spirit,Umbala Spirit,4,0,,200,,1,,1,0xFFFFFFFF,7,2,1,,30,0,675,{ bonus bVit,1; },{},{}
18506,Hattah_Black,Hattah Black,4,12000,,4000,,2,,1,0xFFFFFFFF,7,2,769,,1,1,676,{},{},{}
18507,Elven_Ears_,Elven Ears,4,20,,100,,0,,1,0xFFFFFFFE,7,2,512,,70,0,73,{},{},{}
@@ -6561,16 +6561,16 @@
//
18595,Horn_Of_Ancient,Horn of Ancient,4,40,,200,,8,,1,0xFFFFFFFF,7,2,256,,50,1,757,{ autobonus "{ bonus bBaseAtk,100; }",5,10000,0,"{ specialeffect2 EF_POTION_BERSERK; }"; },{},{}
18596,Sprout_Hat,Sprout Hat,4,20,,200,,4,,0,0xFFFFFFFF,7,2,256,,70,1,758,{ skill "WZ_HEAVENDRIVE",3; },{},{}
-18597,Mercury_Riser,Mercury Riser,4,40,,200,,10,,1,0xFFFFFFFF,7,2,256,,0,1,759,{ bonus bAspdRate,3; bonus bCritical,3; if(getrefine() >= 7) { bonus bAspdRate,2; bonus bCritical,2; } if(getrefine() >= 9) { bonus bAspdRate,2; bonus bCritical,2; }},{},{}
+18597,Mercury_Helm,Mercury Riser,4,40,,200,,10,,1,0xFFFFFFFF,7,2,256,,0,1,759,{ bonus bAspdRate,3; bonus bCritical,3; if(getrefine() >= 7) { bonus bAspdRate,2; bonus bCritical,2; } if(getrefine() >= 9) { bonus bAspdRate,2; bonus bCritical,2; }},{},{}
//
-18600,Cat_Ear_Beret,Cat Ear Beret,4,20,,100,,5,,0,0xFFFFFFFF,7,2,256,,0,1,761,{ bonus bAtkRate,5; if(getrefine() > 5 && getrefine() <= 12) { bonus2 bAddRace,RC_DemiHuman,(getrefine() - 5); bonus2 bSubRace,RC_DemiHuman,(getrefine() - 5); bonus2 bAddRace,RC_Player,(getrefine() - 5); bonus2 bSubRace,RC_Player,(getrefine() - 5); } if(getrefine() > 12) { bonus2 bAddRace,RC_DemiHuman,7; bonus2 bAddRace,RC_Player,7; bonus2 bSubRace,RC_DemiHuman,7; bonus2 bSubRace,RC_Player,7; } },{},{}
+18600,Cat_Ears_Beret,Cat Ear Beret,4,20,,100,,5,,0,0xFFFFFFFF,7,2,256,,0,1,761,{ bonus bAtkRate,5; if(getrefine() > 5 && getrefine() <= 12) { bonus2 bAddRace,RC_DemiHuman,(getrefine() - 5); bonus2 bSubRace,RC_DemiHuman,(getrefine() - 5); bonus2 bAddRace,RC_Player,(getrefine() - 5); bonus2 bSubRace,RC_Player,(getrefine() - 5); } if(getrefine() > 12) { bonus2 bAddRace,RC_DemiHuman,7; bonus2 bAddRace,RC_Player,7; bonus2 bSubRace,RC_DemiHuman,7; bonus2 bSubRace,RC_Player,7; } },{},{}
//
18612,White_Musang_Hat,White Musang Hat,4,40,,200,,3,,1,0xFFFFFFFF,7,2,256,,0,1,770,{ bonus bStr,2; bonus bVit,2; bonus bLuk,1; bonus bUnbreakableHelm,0; },{},{}
18613,Black_Musang_Hat,Black Musang Hat,4,40,,200,,3,,1,0xFFFFFFFF,7,2,256,,0,1,771,{ bonus bInt,2; bonus bDex,2; bonus bAgi,1; bonus bUnbreakableHelm,0; },{},{}
//
-18620,Heart_Eye_Patch,Heart Eyepatch,4,5,,200,,2,,0,0xFFFFFFFF,7,2,512,,20,1,779,{},{},{}
+18620,Heart_Eyepatch,Heart Eyepatch,4,5,,200,,2,,0,0xFFFFFFFF,7,2,512,,20,1,779,{},{},{}
//
-18656,Witch's_Pumpkin_Hat,Witch's Pumpkin Hat,4,20,,300,,10,,0,0xFFFFFFFF,7,2,256,,20,1,717,{ bonus bMdef,10; bonus bStr,2; bonus bInt,2; bonus2 bMagicAddRace,RC_Undead,15; bonus2 bMagicAddRace,RC_Demon,15; },{},{}
+18656,Wit_Pumpkin_Hat,Witch's Pumpkin Hat,4,20,,300,,10,,0,0xFFFFFFFF,7,2,256,,20,1,717,{ bonus bMdef,10; bonus bStr,2; bonus bInt,2; bonus2 bMagicAddRace,RC_Undead,15; bonus2 bMagicAddRace,RC_Demon,15; },{},{}
// Costume System
19500,T_Mr_Smile,T Mr Smile,4,0,,0,,0,,0,0xFFFFFFFF,7,2,6144,,0,0,65,{ bonus bStr,2; },{},{}
@@ -6578,4 +6578,4 @@
19504,T_Sunglasses,T Sunglasses,4,0,,0,,0,,0,0xFFFFFFFF,7,2,2048,,0,0,12,{},{},{}
19505,T_Cigarette,T Cigarette,4,0,,0,,0,,0,0xFFFFFFFF,7,2,4096,,0,0,54,{},{},{}
19506,T_Valkyrie_Feather_Band,T Valkyrie Feather Band,4,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,0,1,300,{},{},{}
-19507,Clear_Sun,Clear Sun,4,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,654,{},{},{}
+19507,Fine_Sun,Clear Sun,4,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,654,{},{},{}
diff --git a/db/pre-re/item_flag.txt b/db/pre-re/item_flag.txt
index 4639dc22f0c..ef9cce5b800 100644
--- a/db/pre-re/item_flag.txt
+++ b/db/pre-re/item_flag.txt
@@ -7,6 +7,7 @@
// 4 - GUID Item: When this item is obtained, will generates GUID that cannot be stacked even same or stackable item
// 8 - Item will be bound item when equipped
// 16 - Special Broadcast: When item dropped by monster and player loot it, will be broadcasted!
+// 32 - Item will not be removed on consumption. Also supports 'itemskill'
// NOTE: For removing flag by import file, use "-" to remove the flag. Example, 604,-1 will removes flag 1 from Branch_Of_Dead_Tree
// Logged as Dead Branch item
diff --git a/db/pre-re/item_misc.txt b/db/pre-re/item_misc.txt
index abccebd1595..5f8f2983a39 100644
--- a/db/pre-re/item_misc.txt
+++ b/db/pre-re/item_misc.txt
@@ -559,16 +559,6 @@ IG_Xmas_Gift,12354,24 // Buche_De_Noel
IG_Xmas_Gift,12702,36 // Old_Bleu_Box
IG_Xmas_Gift,14546,6 // Fire_Cracker_Love
IG_Xmas_Gift,14550,6 // Fire_Cracker_Xmas
-// Runes
-IG_Rune,12725,1 // Runstone_Nosiege
-IG_Rune,12726,1 // Runstone_Rhydo
-IG_Rune,12727,1 // Runstone_Verkana
-IG_Rune,12728,1 // Runstone_Isia
-IG_Rune,12729,1 // Runstone_Asir
-IG_Rune,12730,1 // Runstone_Urj
-IG_Rune,12731,1 // Runstone_Turisus
-IG_Rune,12732,1 // Runstone_Pertz
-IG_Rune,12733,1 // Runstone_Hagalas
// Elemental Points
IG_Element,6360,1 // Scarlet_Pts
IG_Element,6361,1 // Indigo_Pts
diff --git a/db/pre-re/job_db1.txt b/db/pre-re/job_db1.txt
index 720e5a0d43a..e27d87268d3 100644
--- a/db/pre-re/job_db1.txt
+++ b/db/pre-re/job_db1.txt
@@ -280,7 +280,7 @@
// Oboro
4212, 26000,80 , 0 ,540 ,400 ,500 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 , 750 ,2000
// Rebellion
-4215, 28000,89 , 0 ,469 ,500 ,2000, 2000, 2000, 2000, 2000, 2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 , 700 , 750 , 700 ,1500 ,1500 ,2000 ,2000
+4215, 28000,90 ,650 ,469 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,480 ,610 ,540 ,940 ,1040 ,2000 ,2000
// Summoner - Placeholder
4218, 20000,0 ,500 ,100 ,500 ,650 ,700 ,2000 ,2000 ,2000 ,800 ,2000 ,700 ,700 ,650 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 , 650
// Baby Summoner - Placeholder
diff --git a/db/pre-re/refine_db.txt b/db/pre-re/refine_db.txt
deleted file mode 100644
index 1bec859f125..00000000000
--- a/db/pre-re/refine_db.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-// Refine Database [Pre-Renewal]
-//
-// Structure of Database:
-// Type,Stats per level,Random bonus start level,Random bonus value,Chance+1:Bonus+1,Chance+2:Bonus+2,Chance+3:Bonus+3,...
-//
-// For armors, values of 100 add 1 armor defense.
-// For weapons, values of 100 add 1 ATK.
-//
-// Type:
-// 0 - Armors
-// 1 - Level 1 weapons
-// 2 - Level 2 weapons
-// 3 - Level 3 weapons
-// 4 - Level 4 weapons
-//
-// Stats per level:
-// This value is applied for every upgrade level.
-//
-// Random bonus start level:
-// This value specifies the start point for those levels that give a random bonus value.
-//
-// Random bonus value:
-// A random number between 0 and (Random bonus start level - Upgrade level + 1) * this value is applied for all upgrades past
-// Random bonus start level (usually the first unsafe upgrade). This is only applied for weapons, and not displayed client-side.
-//
-// Chance:
-// 100 = 100%
-//
-// Notes:
-// Changing the number of upgrade levels requires modifying MAX_REFINE in src/map/status.h.
-
-// Armors
-0,70,0,0,100:0,100:0,100:0,100:0,60:0,40:0,40:0,20:0,20:0,10:0
-// Level 1 weapons
-1,200,8,300,100:0,100:0,100:0,100:0,100:0,100:0,100:0,60:0,40:0,20:0
-// Level 2 weapons
-2,300,7,500,100:0,100:0,100:0,100:0,100:0,100:0,60:0,40:0,20:0,20:0
-// Level 3 weapons
-3,500,6,800,100:0,100:0,100:0,100:0,100:0,60:0,50:0,20:0,20:0,20:0
-// Level 4 weapons
-4,700,5,1300,100:0,100:0,100:0,100:0,60:0,40:0,40:0,20:0,20:0,10:0
diff --git a/db/pre-re/refine_db.yml b/db/pre-re/refine_db.yml
new file mode 100644
index 00000000000..3602c72b786
--- /dev/null
+++ b/db/pre-re/refine_db.yml
@@ -0,0 +1,235 @@
+# 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/>.
+#
+###########################################################################
+# Pre-Renewal Refine Database
+###########################################################################
+Armor:
+ StatsPerLevel: 66
+ RandomBonusStartLevel: 0
+ RandomBonusValue: 0
+ Costs:
+ - Type: REFINE_COST_NORMAL
+ Price: 2000
+ Material: 985
+ - Type: REFINE_COST_ENRICHED
+ Price: 2000
+ Material: 7619
+ Rates:
+ - Level: 5
+ NormalChance: 60
+ EnrichedChance: 90
+ EventNormalChance: 60
+ EventEnrichedChance: 95
+ - Level: 6
+ NormalChance: 40
+ EnrichedChance: 70
+ EventNormalChance: 40
+ EventEnrichedChance: 80
+ - Level: 7
+ NormalChance: 40
+ EnrichedChance: 70
+ EventNormalChance: 40
+ EventEnrichedChance: 80
+ - Level: 8
+ NormalChance: 20
+ EnrichedChance: 40
+ EventNormalChance: 20
+ EventEnrichedChance: 50
+ - Level: 9
+ NormalChance: 20
+ EnrichedChance: 40
+ EventNormalChance: 20
+ EventEnrichedChance: 50
+ - Level: 10
+ NormalChance: 9
+ EnrichedChance: 20
+ EventNormalChance: 9
+ EventEnrichedChance: 35
+WeaponLv1:
+ StatsPerLevel: 200
+ RandomBonusStartLevel: 8
+ RandomBonusValue: 300
+ Costs:
+ - Type: REFINE_COST_NORMAL
+ Price: 50
+ Material: 1010
+ - Type: REFINE_COST_ENRICHED
+ Price: 2000
+ Material: 7620
+ Rates:
+ - Level: 8
+ NormalChance: 60
+ EnrichedChance: 90
+ EventNormalChance: 60
+ EventEnrichedChance: 95
+ - Level: 9
+ NormalChance: 40
+ EnrichedChance: 70
+ EventNormalChance: 40
+ EventEnrichedChance: 85
+ - Level: 10
+ NormalChance: 19
+ EnrichedChance: 30
+ EventNormalChance: 19
+ EventEnrichedChance: 55
+WeaponLv2:
+ StatsPerLevel: 300
+ RandomBonusStartLevel: 7
+ RandomBonusValue: 500
+ Costs:
+ - Type: REFINE_COST_NORMAL
+ Price: 200
+ Material: 1011
+ - Type: REFINE_COST_ENRICHED
+ Price: 2000
+ Material: 7620
+ Rates:
+ - Level: 7
+ NormalChance: 60
+ EnrichedChance: 90
+ EventNormalChance: 60
+ EventEnrichedChance: 95
+ - Level: 8
+ NormalChance: 40
+ EnrichedChance: 70
+ EventNormalChance: 40
+ EventEnrichedChance: 85
+ - Level: 9
+ NormalChance: 20
+ EnrichedChance: 40
+ EventNormalChance: 20
+ EventEnrichedChance: 60
+ - Level: 10
+ NormalChance: 19
+ EnrichedChance: 30
+ EventNormalChance: 19
+ EventEnrichedChance: 45
+WeaponLv3:
+ StatsPerLevel: 500
+ RandomBonusStartLevel: 6
+ RandomBonusValue: 800
+ Costs:
+ - Type: REFINE_COST_NORMAL
+ Price: 5000
+ Material: 984
+ - Type: REFINE_COST_ENRICHED
+ Price: 2000
+ Material: 7620
+ Rates:
+ - Level: 6
+ NormalChance: 60
+ EnrichedChance: 90
+ EventNormalChance: 60
+ EventEnrichedChance: 95
+ - Level: 7
+ NormalChance: 50
+ EnrichedChance: 80
+ EventNormalChance: 50
+ EventEnrichedChance: 90
+ - Level: 8
+ NormalChance: 20
+ EnrichedChance: 40
+ EventNormalChance: 20
+ EventEnrichedChance: 70
+ - Level: 9
+ NormalChance: 20
+ EnrichedChance: 40
+ EventNormalChance: 20
+ EventEnrichedChance: 60
+ - Level: 10
+ NormalChance: 19
+ EnrichedChance: 30
+ EventNormalChance: 19
+ EventEnrichedChance: 45
+WeaponLv4:
+ StatsPerLevel: 700
+ RandomBonusStartLevel: 5
+ RandomBonusValue: 1300
+ Costs:
+ - Type: REFINE_COST_NORMAL
+ Price: 20000
+ Material: 984
+ - Type: REFINE_COST_ENRICHED
+ Price: 2000
+ Material: 7620
+ Rates:
+ - Level: 5
+ NormalChance: 60
+ EnrichedChance: 90
+ EventNormalChance: 60
+ EventEnrichedChance: 95
+ - Level: 6
+ NormalChance: 40
+ EnrichedChance: 70
+ EventNormalChance: 40
+ EventEnrichedChance: 80
+ - Level: 7
+ NormalChance: 40
+ EnrichedChance: 70
+ EventNormalChance: 40
+ EventEnrichedChance: 80
+ - Level: 8
+ NormalChance: 20
+ EnrichedChance: 40
+ EventNormalChance: 20
+ EventEnrichedChance: 60
+ - Level: 9
+ NormalChance: 20
+ EnrichedChance: 40
+ EventNormalChance: 20
+ EventEnrichedChance: 50
+ - Level: 10
+ NormalChance: 9
+ EnrichedChance: 20
+ EventNormalChance: 9
+ EventEnrichedChance: 35
+Shadow:
+ StatsPerLevel: 0
+ RandomBonusStartLevel: 0
+ RandomBonusValue: 0
+ Rates:
+ - Level: 5
+ NormalChance: 60
+ EnrichedChance: 90
+ EventNormalChance: 60
+ EventEnrichedChance: 95
+ - Level: 6
+ NormalChance: 40
+ EnrichedChance: 70
+ EventNormalChance: 40
+ EventEnrichedChance: 80
+ - Level: 7
+ NormalChance: 40
+ EnrichedChance: 70
+ EventNormalChance: 40
+ EventEnrichedChance: 80
+ - Level: 8
+ NormalChance: 20
+ EnrichedChance: 40
+ EventNormalChance: 20
+ EventEnrichedChance: 50
+ - Level: 9
+ NormalChance: 20
+ EnrichedChance: 40
+ EventNormalChance: 20
+ EventEnrichedChance: 50
+ - Level: 10
+ NormalChance: 9
+ EnrichedChance: 20
+ EventNormalChance: 9
+ EventEnrichedChance: 35
diff --git a/db/pre-re/skill_cast_db.txt b/db/pre-re/skill_cast_db.txt
index b8ca6384f7f..dc5583254d9 100644
--- a/db/pre-re/skill_cast_db.txt
+++ b/db/pre-re/skill_cast_db.txt
@@ -577,7 +577,7 @@
//-- CH_PALMSTRIKE
370,0,300,0,0,0,0
//-- CH_TIGERFIST
-371,0,0,0,0,2000:4000:6000:8000:10000,0
+371,0,0,0,4000:8000:12000:16000:24000,0,0
//==========================================
@@ -1638,43 +1638,43 @@
//-- RL_RICHS_COIN
2552,0,1000,0,600000,0,3000
//-- RL_MASS_SPIRAL
-2553,1000,1000,0,0,30000,10000
+2553,2000,1000,0,0,30000,2000
//-- RL_BANISHING_BUSTER
-2554,3000:2500:2000:1500:1000,0,0,0,0,10000
+2554,3000:2500:2000:1500:1000,2000,0,0,0,10000
//-- RL_B_TRAP
-2555,0,0,0,10000:11000:12000:13000:14000,6000:7000:8000:9000:10000,0
+2555,0,2500:2000:1500:1000:500,0,10000,9000:14000:19000:24000:29000,10000
//-- RL_FLICKER
2556,0,0,0,0,0,10000
//-- RL_S_STORM
-2557,3000:2500:2000:1500:1000,0,0,0,0,2000
+2557,3000:2500:2000:1500:1000,2000,0,0,0,2000
//-- RL_E_CHAIN
-2558,0,1000,0,45000:60000:75000:90000:105000:120000:135000:150000:165000:180000,0,5000
+2558,1000,1000,0,45000:60000:75000:90000:105000:120000:135000:150000:165000:180000,0,0
//-- RL_QD_SHOT
-2559,0,1000,0,1500,0,5000
+2559,0,0,0,1500,0,0
//-- RL_C_MARKER
2560,0,0,0,30000,0,1000
//-- RL_FIREDANCE
-2561,0,2000,0,0,0,5000
+2561,0,500,0,0,0,5000
//-- RL_H_MINE
-2562,1500,0,0,30000,15000,5000:4500:4000:3500:3000
+2562,1000,1000,0,50000,15000,5000:4500:4000:3500:3000
//-- RL_P_ALTER
-2563,0,1000,0,30000:45000:60000:75000:90000,0,5000
+2563,0,0,0,30000:45000:60000:75000:90000,0,0
//-- RL_FALLEN_ANGEL
-2564,500,1500,0,0,0,10000:8000:6000:4000:2000
+2564,0,0,0,2000,0,0
//-- RL_R_TRIP
-2565,0,1000,0,0,0,1000
+2565,0,1000,0,0,0,3000:2500:2000:1500:1000
//-- RL_D_TAIL
-2566,500,2000,0,0,0,5000
+2566,1200:1400:1600:1800:2000,2000,0,0,0,5000
//-- RL_FIRE_RAIN
-2567,1800:1600:1400:1200:1000,2000,0,100,0,5000
+2567,0,1000,0,100,0,5000
//-- RL_HEAT_BARREL
-2568,0,1000,0,60000,10000,10000
+2568,2000,1000,0,60000,0,100000:95000:90000:85000:80000
//-- RL_AM_BLAST
2569,2000,1000,0,0,6000:7000:8000:9000:10000,5000
//-- RL_SLUGSHOT
-2570,5000:6000:7000:8000:9000,1000,0,0,2000,10000
+2570,5000:6000:7000:8000:9000,1000,0,0,2000,5000
//-- RL_HAMMER_OF_GOD
-2571,8000,2000,0,0,3000:3000:4000:4000:5000,30000
+2571,0,2000,0,0,3000:3000:4000:4000:5000,30000
//-- RL_R_TRIP_PLUSATK
//2572,0,0,0,0,0,0
//-- RL_B_FLICKER_ATK
diff --git a/db/pre-re/skill_db.txt b/db/pre-re/skill_db.txt
index 8d2752afb11..a46e688a57c 100644
--- a/db/pre-re/skill_db.txt
+++ b/db/pre-re/skill_db.txt
@@ -581,7 +581,7 @@
//****
// Clown & Gypsy
394,9,8,1,-1,0,0,10,-9,yes,0,0,0,weapon,0,0x0, CG_ARROWVULCAN,Vulcan Arrow
-395,0,0,4,0,0x1,3,1,1,yes,0,0x40,0,misc,2,0x0, CG_MOONLIT,Sheltering Bliss
+395,0,0,4,0,0x1,3,5,1,yes,0,0x40,0,misc,2,0x0, CG_MOONLIT,Sheltering Bliss
396,7,6,16,0,0x1,0,1,1,yes,0,0x600,0,none,0,0x40, CG_MARIONETTE,Marionette Control
//****
@@ -954,7 +954,7 @@
2211,11,8,1,3,0x2,3,5,-7,yes,0,0,0,magic,3,0x400, WL_CRIMSONROCK,Crimson Rock
2212,11,6,1,3,0,0,5,1,yes,0,0,0,magic,0,0x400, WL_HELLINFERNO,Hell Inferno
2213,11,8,2,0,0x2,9,5,-20,yes,0,0,0,magic,2,0x400, WL_COMET,Comet
-2214,11,6,1,0,0x2,3,5,1,yes,0,0,0,magic,0,0x400, WL_CHAINLIGHTNING,Chain Lightning //CHECK Is the splash being used for the target search?
+2214,11,6,1,0,0x1,0,5,1,yes,0,0,0,magic,0,0x400, WL_CHAINLIGHTNING,Chain Lightning
2215,11,6,1,4,0,0,5,1,no,0,0,0,magic,0,0x0, WL_CHAINLIGHTNING_ATK,Chain Lightning Attack
2216,6,8,2,2,0,0,5,-6:-7:-8:-9:-10,yes,0,0,0,magic,0,0x10000, WL_EARTHSTRAIN,Earth Strain
2217,11,6,1,0,0,0,5,1,yes,0,0,0,magic,0,0x400, WL_TETRAVORTEX,Tetra Vortex
@@ -1269,25 +1269,25 @@
// Rebellion
//2551,0,0,0,0,0,0,10,0,no,0,0,0,none,0,0, RL_GLITTERING_GREED,Flip The Coin Greed
2552,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0,0x0, RL_RICHS_COIN,Rich's Coin
-2553,15,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x0, RL_MASS_SPIRAL,Mass Spiral
-2554,9,6,1,-1,0x2,2,5,1,no,0,0,0,weapon,0,0x10020, RL_BANISHING_BUSTER,Banishing Buster
-2555,3,6,2,0,0x1,1,5,1,no,0,0,3,misc,0,0x0, RL_B_TRAP,Bind Trap
+2553,-9,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x0, RL_MASS_SPIRAL,Mass Spiral
+2554,-9,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x10020, RL_BANISHING_BUSTER,Banishing Buster
+2555,3:4:4:5:5,6,2,0,0x1,1,5,1,no,0,0,1,misc,0,0x0, RL_B_TRAP,Bind Trap
2556,0,6,4,0,0x3,-1,1,1,no,0,0,0,none,0,0x0, RL_FLICKER,Flicker
-2557,9,6,1,-1,0x2,2,5,1,no,0,0,0,weapon,0,0x0, RL_S_STORM,Shatter Storm
+2557,-9,6,1,-1,0x2,2:2:2:2:3,5,1,no,0,0,0,weapon,0,0x0, RL_S_STORM,Shatter Storm
2558,0,6,4,0,0x1,0,10,1,no,0,0,0,none,0,0x0, RL_E_CHAIN,Eternal Chain
-2559,-9,6,4,-1,0x3,21,1,1,no,0,0x0,0,weapon,0,0x0, RL_QD_SHOT,Quick Draw Shot
-2560,11,6,1,0,0x1,0,1,1,no,0,0,3,none,0,0x0, RL_C_MARKER,Crimson Marker
-2561,0,6,4,-1,0x2,2,5,1,no,0,0,0,weapon,0,0x0, RL_FIREDANCE,Fire Dance
-2562,7:8:9:10:11,6,1,-1,0x2,2,5,1,no,0,0,0,weapon,0,0x0, RL_H_MINE,Howling Mine
+2559,-9,6,4,-1,0x0,10,1,1,no,0,0x0,0,weapon,0,0x0, RL_QD_SHOT,Quick Draw Shot
+2560,-9,6,1,0,0x1,0,1,1,no,0,0,3,none,0,0x0, RL_C_MARKER,Crimson Marker
+2561,5,6,4,-1,0x2,3,5,1,no,0,0,0,weapon,0,0x0, RL_FIREDANCE,Fire Dance
+2562,-9,6,1,-1,0x0,2,5,1,no,0,0,0,weapon,0,0x0, RL_H_MINE,Howling Mine
2563,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0, RL_P_ALTER,Platinum Alter
-2564,9,6,2,0,0x1,0,5,1,no,0,0,0,none,0,0x0, RL_FALLEN_ANGEL,Fallen Angel
-2565,0,6,4,-1,0x2,3:3:4:5:6,5,1,no,0,0,0,weapon,3,0x0, RL_R_TRIP,Round Trip
-2566,0,6,4,-1,0x3,-1,5,1,no,0,0,0,weapon,0,0x0, RL_D_TAIL,Dragon Tail
-2567,9,6,2,-1,0x2,1,5,1,no,0,0,0,weapon,0,0, RL_FIRE_RAIN,Fire Rain
+2564,-9,6,2,0,0x1,0,5,1,no,0,0,0,none,0,0x0, RL_FALLEN_ANGEL,Fallen Angel
+2565,5,6,4,-1,0x2,3:3:4:5:6,5,1,no,0,0,0,weapon,3,0x0, RL_R_TRIP,Round Trip
+2566,5,6,4,-1,0x3,-1,5,1,no,0,0,0,weapon,0,0x0, RL_D_TAIL,Dragon Tail
+2567,2,6,2,-1,0x2,1,5,1,no,0,0,0,weapon,0,0, RL_FIRE_RAIN,Fire Rain
2568,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0, RL_HEAT_BARREL,Heat Barrel
-2569,9,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x0, RL_AM_BLAST,Anti-Material Blast
-2570,9,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x0, RL_SLUGSHOT,Slug Shot
-2571,7:8:9:10:11,6,2,-1,0x2,2,5,1,no,0,0,0,weapon,0,0x0, RL_HAMMER_OF_GOD,Hammer of God
+2569,-9,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x0, RL_AM_BLAST,Anti-Material Blast
+2570,-9,6,1,-1,0,0,5,1,no,0,0,0,weapon,6,0x0, RL_SLUGSHOT,Slug Shot
+2571,-9,6,1,-1,0x2,2,5,1,no,0,0,0,weapon,0,0x0, RL_HAMMER_OF_GOD,Hammer of God
2572,0,6,1,-1,0x40,0,5,1,no,0,0,0,weapon,0,0, RL_R_TRIP_PLUSATK,Round Trip Plus Attack
//2573,0,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0, RL_B_FLICKER_ATK,Bind Flicker Attack
//2574,0,6,1,-1,0,0,10,1,no,0,0,0,weapon,0,0, RL_GLITTERING_GREED_ATK,Flip The Coin Greed Attack
@@ -1379,6 +1379,29 @@
5040,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, SU_BUNCHOFSHRIMP,Bunch of Shrimp
5041,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, SU_FRESHSHRIMP,Fresh Shrimp
+// Unknown Unconfirmed Summoner Skills - Animations Show On These
+//5042,0,0,0,0,0,0,5,0,yes,0,0,0,none,0,0x0, SU_CN_METEOR_SEC,
+//5043,0,0,0,0,0,0,5,0,yes,0,0,0,none,0,0x0, SU_LUNATICCARROTBEAT_SEC,
+
+5044,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, SU_SOULATTACK,Soul Attack
+5045,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, SU_POWEROFFLOCK,Power of Flock
+5046,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, SU_SVG_SPIRIT,Spirit of Savage
+5047,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, SU_HISS,Hiss
+5048,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, SU_NYANGGRASS,Nyang Grass
+5049,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, SU_GROOMING,Grooming
+5050,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, SU_PURRING,Purring
+5051,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, SU_SHRIMPARTY,Tasty Shrimp Party
+5052,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, SU_SPIRITOFLIFE,Spirit of Life
+5053,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, SU_MEOWMEOW,Meow Meow
+5054,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, SU_SPIRITOFLAND,Spirit of Land
+5055,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, SU_CHATTERING,Chattering
+5056,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, SU_SPIRITOFSEA,Spirit of Sea
+
+// Wedding Skills 3
+5063,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, WE_CALLALLFAMILY,Call All Family
+5064,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, WE_ONEFOREVER,One Forever
+5065,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, WE_CHEERUP,Cheer Up
+
//****
// Homunculus S
8001,9,6,4,0,0x1,0,5,1,no,0,0,0,magic,0,0x0, HLIF_HEAL,Healing Touch
diff --git a/db/pre-re/skill_require_db.txt b/db/pre-re/skill_require_db.txt
index c5d36d6927a..546e1c1181e 100644
--- a/db/pre-re/skill_require_db.txt
+++ b/db/pre-re/skill_require_db.txt
@@ -580,7 +580,7 @@
2025,0,0,10,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GC_CREATENEWPOISON
2026,0,0,10,0,0,0,99,0,0,none,0,0,6128,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GC_ANTIDOTE
-2027,0,0,20:24:28:32:36,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GC_POISONINGWEAPON
+2027,0,0,20:24:28:32:36,0,0,0,1:16,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GC_POISONINGWEAPON
2028,0,0,40:36:32:28:24,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GC_WEAPONBLOCKING
2029,0,0,5:8:11:14:17,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GC_COUNTERSLASH
2030,0,0,20,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GC_WEAPONCRUSH
@@ -701,7 +701,7 @@
2275,0,0,25:30:35:40:45,0,0,0,99,0,0,mado,0,0,12392,1,12392,1,12393,1,12393,1,12394,1,2807,0,0,0,0,0,0,0,6146,1,0 //NC_REPAIR
2278,0,0,20:22:24:26:28,0,0,0,6:7,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_AXEBOOMERANG
-2279,0,0,20:22:24:26:28,0,0,0,6:7,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_POWERSWING
+2279,0,0,20:22:24:26:28,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_POWERSWING
2280,20:40:60:80:100,0,18:20:22:24:26,0,0,0,6:7,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_AXETORNADO
2281,0,0,25:30:35:40:45,0,0,0,99,0,0,none,0,0,612,0,615,0,998,1,999,2,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_SILVERSNIPER
2282,0,0,40:45:50:55:60,0,0,0,99,0,0,none,0,0,612,0,615,0,998,2,7054,1,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_MAGICDECOY
@@ -764,7 +764,7 @@
2332,0,0,150,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_RAMPAGEBLASTER
2333,0,0,80,0,0,0,99,0,0,none,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_CRESCENTELBOW
2334,0,0,40:60:80:100:120,-1:-2:-3:-4:-5,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_CURSEDCIRCLE
-2335,0,0,40,-5:-4:-3:-2:-1,0,0,99,0,0,none,0,1:2:3:4:5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_LIGHTNINGWALK
+2335,0,0,80:70:60:50:40,-5:-4:-3:-2:-1,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_LIGHTNINGWALK
2336,0,0,10:15:20:25:30,0,0,0,99,0,0,none,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_KNUCKLEARROW
2337,0,0,45,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_WINDMILL
2338,0,0,120,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_RAISINGDRAGON
@@ -888,26 +888,26 @@
//****
// Rebellion
//2551,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_GLITTERING_GREED
-2552,0,0,10,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_RICHS_COIN
-2553,0,0,80:84:88:92:96,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_MASS_SPIRAL
-2554,0,0,55:60:65:70:75,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_BANISHING_BUSTER
-2555,0,0,30:32:34:36:38,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_B_TRAP
-2556,0,0,2,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_FLICKER
-2557,0,0,55:60:65:70:75,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_S_STORM
-2558,0,0,45,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_E_CHAIN
-2559,0,0,5,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_QD_SHOT
-2560,0,0,10,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_C_MARKER
-2561,0,0,10:15:20:25:30,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_FIREDANCE
-2562,0,0,45:50:55:60:65,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_H_MINE
-2563,0,0,20:24:28:32:36,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_P_ALTER
-2564,0,0,90,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_FALLEN_ANGEL
-2565,0,0,40:45:50:55:60,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_R_TRIP
-2566,0,0,60:70:80:90:100,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_D_TAIL
-2567,0,0,70,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_FIRE_RAIN
-2568,0,0,30:40:50:60:70,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_HEAT_BARREL
-2569,0,0,80:84:88:92:96,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_AM_BLAST
-2570,0,0,55:60:65:70:75,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_SLUGSHOT
-2571,0,0,70:80:90:100:110,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_HAMMER_OF_GOD
+2552,0,0,10,0,0,100,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_RICHS_COIN
+2553,0,0,40:44:48:52:56,0,0,0,18,3,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_MASS_SPIRAL
+2554,0,0,55:60:65:70:75,0,0,0,20,3,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_BANISHING_BUSTER
+2555,0,0,30:32:34:36:38,0,0,0,17:18:19:20:21,0,0,none,0,1,7940,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_B_TRAP
+2556,0,0,2,0,0,0,99,0,0,none,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_FLICKER
+2557,0,0,50:55:60:65:70,0,0,0,20,3,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_S_STORM
+2558,0,0,45,0,0,0,17:18:19:20:21,0,0,none,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_E_CHAIN
+2559,0,0,5,0,0,0,17:18:19:20:21,3:4:5,1,none,SC_QD_SHOT_READY,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_QD_SHOT
+2560,0,0,10,0,0,0,17:18:19:20:21,0,0,none,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_C_MARKER
+2561,0,0,12:14:16:18:20,0,0,0,17,3,5,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_FIREDANCE
+2562,0,0,45:50:55:60:65,0,0,0,21,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_H_MINE
+2563,0,0,20:24:28:32:36,0,0,0,99,3,1,none,0,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13201 //RL_P_ALTER
+2564,0,0,10,0,0,0,17,0,0,none,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_FALLEN_ANGEL
+2565,0,0,40:45:50:55:60,0,0,0,19,3,5,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_R_TRIP
+2566,0,0,60:70:80:90:100,0,0,0,21,5,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_D_TAIL
+2567,0,0,70,0,0,0,19,3,10,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_FIRE_RAIN
+2568,0,0,30,0,0,0,99,0,0,none,0,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_HEAT_BARREL
+2569,0,0,80:84:88:92:96,0,0,0,18,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_AM_BLAST
+2570,0,0,80:84:88:92:96,0,0,0,20,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_SLUGSHOT
+2571,0,0,35:40:45:50:55,0,0,0,18,0,0,none,0,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_HAMMER_OF_GOD
2572,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_R_TRIP_PLUSATK
//2573,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_B_FLICKER_ATK
//2574,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_GLITTERING_GREED_ATK
diff --git a/db/pre-re/skill_tree.txt b/db/pre-re/skill_tree.txt
index 053cd069e92..88459b282d1 100644
--- a/db/pre-re/skill_tree.txt
+++ b/db/pre-re/skill_tree.txt
@@ -830,7 +830,7 @@
4008,356,10,3,10,6,5,60,3,0,0,0,0 //LK_PARRYING#Parrying#
4008,357,5,4,5,55,5,63,1,0,0,0,0 //LK_CONCENTRATION#Concentration#
4008,358,1,4,10,6,5,8,3,0,0,0,0 //LK_TENSIONRELAX#Relax#
-4008,359,1,50,0,0,0,0,0,0,0,0,0,0 //LK_BERSERK#Frenzy# //It has an extra column after "MaxLevel" for Job Level 50 requirement
+4008,359,1,0,50,0,0,0,0,0,0,0,0,0,0 //LK_BERSERK#Frenzy# //It has 2 extra columns after "MaxLevel" for Job Level 50 requirement
4008,397,5,55,10,56,5,58,5,63,1,0,0 //LK_SPIRALPIERCE#Spiral Pierce#
4008,398,5,55,9,63,1,0,0,0,0,0,0 //LK_HEADCRUSH#Traumatic Blow#
4008,399,10,55,9,64,3,398,3,0,0,0,0 //LK_JOINTBEAT#Vital Strike#
@@ -1057,7 +1057,7 @@
4014,356,10,3,10,6,5,60,3,0,0,0,0 //LK_PARRYING#Parrying#
4014,357,5,4,5,55,5,63,1,0,0,0,0 //LK_CONCENTRATION#Concentration#
4014,358,1,4,10,6,5,8,3,0,0,0,0 //LK_TENSIONRELAX#Relax#
-4014,359,1,50,0,0,0,0,0,0,0,0,0,0 //LK_BERSERK#Frenzy# //It has an extra column after "MaxLevel" for Job Level 50 requirement
+4014,359,1,0,50,0,0,0,0,0,0,0,0,0,0 //LK_BERSERK#Frenzy# //It has 2 extra columns after "MaxLevel" for Job Level 50 requirement
4014,397,5,55,10,56,5,58,5,63,1,0,0 //LK_SPIRALPIERCE#Spiral Pierce#
4014,398,5,55,9,63,1,0,0,0,0,0,0 //LK_HEADCRUSH#Traumatic Blow#
4014,399,10,55,9,64,3,398,3,0,0,0,0 //LK_JOINTBEAT#Vital Strike#
@@ -1302,7 +1302,7 @@
4020,313,5,321,10,0,0,0,0,0,0,0,0 //BD_SIEGFRIED#Acoustic Rhythm#
4020,1010,1,0,0,0,0,0,0,0,0,0,0 //BA_PANGVOICE#Pang Voice#
4020,394,10,47,5,316,1,0,0,0,0,0,0 //CG_ARROWVULCAN#Vulcan Arrow#
-4020,395,1,45,5,315,7,0,0,0,0,0,0 //CG_MOONLIT#Sheltering Bliss#
+4020,395,5,45,5,315,7,0,0,0,0,0,0 //CG_MOONLIT#Sheltering Bliss#
4020,396,1,45,5,315,5,0,0,0,0,0,0 //CG_MARIONETTE#Marionette Control#
4020,487,5,315,10,396,1,0,0,0,0,0,0 //CG_LONGINGFREEDOM#Longing for Freedom#
4020,488,5,45,10,315,10,0,0,0,0,0,0 //CG_HERMODE#Wand of Hermod#
@@ -1338,7 +1338,7 @@
4021,313,5,329,10,0,0,0,0,0,0,0,0 //BD_SIEGFRIED#Acoustic Rhythm#
4021,1011,1,0,0,0,0,0,0,0,0,0,0 //DC_WINKCHARM#Wink of Charm#
4021,394,10,47,5,324,1,0,0,0,0,0,0 //CG_ARROWVULCAN#Vulcan Arrow#
-4021,395,1,45,5,323,7,0,0,0,0,0,0 //CG_MOONLIT#Sheltering Bliss#
+4021,395,5,45,5,323,7,0,0,0,0,0,0 //CG_MOONLIT#Sheltering Bliss#
4021,396,1,45,5,323,5,0,0,0,0,0,0 //CG_MARIONETTE#Marionette Control#
4021,487,5,323,10,396,1,0,0,0,0,0,0 //CG_LONGINGFREEDOM#Longing for Freedom#
4021,488,5,45,10,323,10,0,0,0,0,0,0 //CG_HERMODE#Wand of Hermod#
@@ -2731,7 +2731,7 @@
4060,356,10,3,10,6,5,60,3,0,0,0,0 //LK_PARRYING#Parrying#
4060,357,5,4,5,55,5,63,1,0,0,0,0 //LK_CONCENTRATION#Concentration#
4060,358,1,4,10,6,5,8,3,0,0,0,0 //LK_TENSIONRELAX#Relax#
-4060,359,1,0,0,0,0,0,0,0,0,0,0 //LK_BERSERK#Frenzy# //Extra column removed. Rune Knights dont require job level 50 to use Berserk.
+4060,359,1,0,0,0,0,0,0,0,0,0,0 //LK_BERSERK#Frenzy# //Extra columns removed. Rune Knights dont require job level 50 to use Berserk.
4060,397,5,55,10,56,5,58,5,63,1,0,0 //LK_SPIRALPIERCE#Spiral Pierce#
4060,398,5,55,9,63,1,0,0,0,0,0,0 //LK_HEADCRUSH#Traumatic Blow#
4060,399,10,55,9,64,3,398,3,0,0,0,0 //LK_JOINTBEAT#Vital Strike#
@@ -3639,7 +3639,7 @@
4075,313,5,321,10,0,0,0,0,0,0,0,0 //BD_SIEGFRIED#Acoustic Rhythm#
4075,1010,1,0,0,0,0,0,0,0,0,0,0 //BA_PANGVOICE#Pang Voice#
4075,394,10,47,5,316,1,0,0,0,0,0,0 //CG_ARROWVULCAN#Vulcan Arrow#
-4075,395,1,45,5,315,7,0,0,0,0,0,0 //CG_MOONLIT#Sheltering Bliss#
+4075,395,5,45,5,315,7,0,0,0,0,0,0 //CG_MOONLIT#Sheltering Bliss#
4075,396,1,45,5,315,5,0,0,0,0,0,0 //CG_MARIONETTE#Marionette Control#
4075,487,5,315,10,396,1,0,0,0,0,0,0 //CG_LONGINGFREEDOM#Longing for Freedom#
4075,488,5,45,10,315,10,0,0,0,0,0,0 //CG_HERMODE#Wand of Hermod#
@@ -3701,7 +3701,7 @@
4076,313,5,329,10,0,0,0,0,0,0,0,0 //BD_SIEGFRIED#Acoustic Rhythm#
4076,1011,1,0,0,0,0,0,0,0,0,0,0 //DC_WINKCHARM#Wink of Charm#
4076,394,10,47,5,324,1,0,0,0,0,0,0 //CG_ARROWVULCAN#Vulcan Arrow#
-4076,395,1,45,5,323,7,0,0,0,0,0,0 //CG_MOONLIT#Sheltering Bliss#
+4076,395,5,45,5,323,7,0,0,0,0,0,0 //CG_MOONLIT#Sheltering Bliss#
4076,396,1,45,5,323,5,0,0,0,0,0,0 //CG_MARIONETTE#Marionette Control#
4076,487,5,323,10,396,1,0,0,0,0,0,0 //CG_LONGINGFREEDOM#Longing for Freedom#
4076,488,5,45,10,323,10,0,0,0,0,0,0 //CG_HERMODE#Wand of Hermod#
@@ -3987,7 +3987,7 @@
4081,356,10,3,10,6,5,60,3,0,0,0,0 //LK_PARRYING#Parrying#
4081,357,5,4,5,55,5,63,1,0,0,0,0 //LK_CONCENTRATION#Concentration#
4081,358,1,4,10,6,5,8,3,0,0,0,0 //LK_TENSIONRELAX#Relax#
-4081,359,1,0,0,0,0,0,0,0,0,0,0 //LK_BERSERK#Frenzy# //Extra column removed. Rune Knights dont require job level 50 to use Berserk.
+4081,359,1,0,0,0,0,0,0,0,0,0,0 //LK_BERSERK#Frenzy# //Extra columns removed. Rune Knights dont require job level 50 to use Berserk.
4081,397,5,55,10,56,5,58,5,63,1,0,0 //LK_SPIRALPIERCE#Spiral Pierce#
4081,398,5,55,9,63,1,0,0,0,0,0,0 //LK_HEADCRUSH#Traumatic Blow#
4081,399,10,55,9,64,3,398,3,0,0,0,0 //LK_JOINTBEAT#Vital Strike#
@@ -5627,11 +5627,11 @@
4215,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
4215,500,5,0,0,0,0,0,0,0,0,0,0 //GS_GLITTERING#Flip the Coin#
4215,501,1,500,1,0,0,0,0,0,0,0,0 //GS_FLING#Fling#
-4215,502,1,500,1,511,10,0,0,0,0,0,0 //GS_TRIPLEACTION#Triple Action#
-4215,503,1,500,5,512,10,0,0,0,0,0,0 //GS_BULLSEYE#Bulls Eye#
-4215,504,1,500,4,517,10,0,0,0,0,0,0 //GS_MADNESSCANCEL#Madness Canceler#
-4215,505,1,500,4,513,5,0,0,0,0,0,0 //GS_ADJUSTMENT#AdJustment#
-4215,506,1,500,2,510,10,0,0,0,0,0,0 //GS_INCREASING#Increasing Accuracy#
+4215,502,1,500,1,0,0,0,0,0,0,0,0 //GS_TRIPLEACTION#Triple Action#
+4215,503,1,500,5,0,0,0,0,0,0,0,0 //GS_BULLSEYE#Bulls Eye#
+4215,504,1,500,4,0,0,0,0,0,0,0,0 //GS_MADNESSCANCEL#Madness Canceler#
+4215,505,1,500,4,0,0,0,0,0,0,0,0 //GS_ADJUSTMENT#Adjustment#
+4215,506,1,500,2,0,0,0,0,0,0,0,0 //GS_INCREASING#Increasing Accuracy#
4215,507,1,500,1,0,0,0,0,0,0,0,0 //GS_MAGICALBULLET#Magical Bullet#
4215,508,1,500,1,0,0,0,0,0,0,0,0 //GS_CRACKER#Cracker#
4215,509,10,0,0,0,0,0,0,0,0,0,0 //GS_SINGLEACTION#Single Action#
@@ -5645,26 +5645,26 @@
4215,517,10,515,7,516,5,0,0,0,0,0,0 //GS_GATLINGFEVER#Gatling Fever#
4215,518,10,509,5,0,0,0,0,0,0,0,0 //GS_DUST#Dust#
4215,519,10,518,3,0,0,0,0,0,0,0,0 //GS_FULLBUSTER#Full Buster#
-4215,520,10,519,5,0,0,0,0,0,0,0,0 //GS_SPREADATTACK#Spread Attack#
+4215,520,10,509,5,0,0,0,0,0,0,0,0 //GS_SPREADATTACK#Spread Attack#
4215,521,10,520,7,0,0,0,0,0,0,0,0 //GS_GROUNDDRIFT#Ground Drift#
4215,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby#
4215,2552,1,500,5,0,0,0,0,0,0,0,0 //RL_RICHS_COIN#Rich's Coin#
4215,2553,5,514,1,0,0,0,0,0,0,0,0 //RL_MASS_SPIRAL#Mass Spiral#
4215,2554,5,2557,1,0,0,0,0,0,0,0,0 //RL_BANISHING_BUSTER#Banishing Buster#
-4215,2555,5,0,0,0,0,0,0,0,0,0,0 //RL_B_TRAP#Bind Trap#
-4215,2556,1,501,1,0,0,0,0,0,0,0,0 //RL_FLICKER#Flicker#
+4215,2555,5,2556,1,0,0,0,0,0,0,0,0 //RL_B_TRAP#Bind Trap#
+4215,2556,1,500,1,0,0,0,0,0,0,0,0 //RL_FLICKER#Flicker#
4215,2557,5,513,1,518,1,0,0,0,0,0,0 //RL_S_STORM#Shatter Storm#
-4215,2558,10,511,10,0,0,0,0,0,0,0,0 //RL_E_CHAIN#Eternal Chain#
-4215,2559,1,2558,1,0,0,0,0,0,0,0,0 //RL_QD_SHOT#Quick Draw Shot#
-4215,2560,1,506,1,0,0,0,0,0,0,0,0 //RL_C_MARKER#Crimson Marker#
-4215,2561,5,2564,1,0,0,0,0,0,0,0,0 //RL_FIREDANCE#Fire Dance#
-4215,2562,5,520,1,0,0,0,0,0,0,0,0 //RL_H_MINE#Howling Mine#
-4215,2563,5,0,0,0,0,0,0,0,0,0,0 //RL_P_ALTER#Platinum Alter#
-4215,2564,5,516,10,0,0,0,0,0,0,0,0 //RL_FALLEN_ANGEL#Fallen Angel#
+4215,2558,10,500,1,511,10,0,0,0,0,0,0 //RL_E_CHAIN#Eternal Chain#
+4215,2559,1,511,1,0,0,0,0,0,0,0,0 //RL_QD_SHOT#Quick Draw Shot#
+4215,2560,1,500,1,0,0,0,0,0,0,0,0 //RL_C_MARKER#Crimson Marker#
+4215,2561,5,516,1,0,0,0,0,0,0,0,0 //RL_FIREDANCE#Fire Dance#
+4215,2562,5,521,1,0,0,0,0,0,0,0,0 //RL_H_MINE#Howling Mine#
+4215,2563,5,2552,1,0,0,0,0,0,0,0,0 //RL_P_ALTER#Platinum Alter#
+4215,2564,1,516,10,0,0,0,0,0,0,0,0 //RL_FALLEN_ANGEL#Fallen Angel#
4215,2565,5,2567,1,0,0,0,0,0,0,0,0 //RL_R_TRIP#Round Trip#
4215,2566,5,2560,1,2562,3,0,0,0,0,0,0 //RL_D_TAIL#Dragon Tail#
4215,2567,5,517,1,0,0,0,0,0,0,0,0 //RL_FIRE_RAIN#Fire Rain#
-4215,2568,5,2561,2,0,0,0,0,0,0,0,0 //RL_HEAT_BARREL#Heat Barrel#
+4215,2568,5,2552,1,0,0,0,0,0,0,0,0 //RL_HEAT_BARREL#Heat Barrel#
4215,2569,5,2553,1,0,0,0,0,0,0,0,0 //RL_AM_BLAST#Anti-Material Blast#
4215,2570,5,2554,3,0,0,0,0,0,0,0,0 //RL_SLUGSHOT#Slug Shot#
-4215,2571,5,2569,3,0,0,0,0,0,0,0,0 //RL_HAMMER_OF_GOD#Hammer of God#
+4215,2571,5,2552,1,2569,3,0,0,0,0,0,0 //RL_HAMMER_OF_GOD#Hammer of God#
diff --git a/db/pre-re/skill_unit_db.txt b/db/pre-re/skill_unit_db.txt
index f45c23bdf0e..d264bd21176 100644
--- a/db/pre-re/skill_unit_db.txt
+++ b/db/pre-re/skill_unit_db.txt
@@ -114,7 +114,6 @@
2032,0xe1, , 2, 0,1000,enemy, 0x8018 //GC_POISONSMOKE
2213,0x86, , 0, 9,1000,enemy, 0x018 //WL_COMET
-2214,0x86, , 0, 5, 100,enemy, 0x080 //WL_CHAINLIGHTNING
2216,0xcb, , -1, 2,2000,enemy, 0x018 //WL_EARTHSTRAIN
2238,0xd8, , 0, 1,1000,enemy, 0x9006 //RA_ELECTRICSHOCKER
@@ -150,10 +149,10 @@
2450,0xe0, , 3, 0, -1,enemy, 0xA010 //SO_CLOUD_KILL
2452,0xe4, , 3, 0, -1,all, 0xA010 //SO_WARMER
2453,0xeb, , 0, 1:1:2:2:3,500,enemy,0x8010 //SO_VACUUM_EXTREME
-2465,0xf1, , 0, 1,1000,all, 0x010 //SO_FIRE_INSIGNIA
-2466,0xf2, , 0, 1,1000,all, 0x010 //SO_WATER_INSIGNIA
-2467,0xf3, , 0, 1,1000,all, 0x010 //SO_WIND_INSIGNIA
-2468,0xf4, , 0, 1,1000,all, 0x010 //SO_EARTH_INSIGNIA
+2465,0xf1, , 1, 0, -1,all, 0x2010 //SO_FIRE_INSIGNIA
+2466,0xf2, , 1, 0, -1,all, 0x2010 //SO_WATER_INSIGNIA
+2467,0xf3, , 1, 0, -1,all, 0x2010 //SO_WIND_INSIGNIA
+2468,0xf4, , 1, 0, -1,all, 0x2010 //SO_EARTH_INSIGNIA
2479,0xe5, , 0, 1,1000,enemy, 0x8006 //GN_THORNS_TRAP
2482,0xe6,0x7f, -1, 1, 300,enemy, 0x8000 //GN_WALLOFTHORN
diff --git a/db/re/achievement_db.yml b/db/re/achievement_db.yml
new file mode 100644
index 00000000000..36bf9d514e4
--- /dev/null
+++ b/db/re/achievement_db.yml
@@ -0,0 +1,2407 @@
+# 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/>.
+#
+###########################################################################
+# Renewal Achievement Database
+###########################################################################
+#
+# Achievement Settings
+#
+###########################################################################
+# ID - Unique achievement ID.
+###########################################################################
+# Group - Achievement group type. Each achievement type calls a specific
+# objective check.
+# Valid groups:
+# AG_ADD_FRIEND
+# AG_ADVENTURE
+# AG_BABY
+# AG_BATTLE
+# AG_CHATTING
+# AG_CHATTING_COUNT
+# AG_CHATTING_CREATE
+# AG_CHATTING_DYING
+# AG_EAT
+# AG_GET_ITEM
+# AG_GET_ZENY
+# AG_GOAL_ACHIEVE
+# AG_GOAL_LEVEL
+# AG_GOAL_STATUS
+# AG_HEAR
+# AG_JOB_CHANGE
+# AG_MARRY
+# AG_PARTY
+# AG_ENCHANT_FAIL
+# AG_ENCHANT_SUCCESS
+# AG_SEE
+# AG_SPEND_ZENY
+# AG_TAMING
+###########################################################################
+# Name - Achievement name. Used when sending rewards through RODEX.
+###########################################################################
+# Target - A list of monster ID and count values that the achievement
+# requires. The target count can also be used for achievements that keep
+# a counter while not being related to monster kills.
+# Capped at MAX_ACHIEVEMENT_OBJECTIVES.
+###########################################################################
+# Condition - A conditional statement that must be met for the achievement
+# to be considered complete.
+###########################################################################
+# Map - A map name that is used for the AG_CHATTING type which increments
+# the counter based on the player's map.
+###########################################################################
+# Dependent: - A list of achievement IDs that need to be completed before
+# this achievement is considered complete.
+###########################################################################
+# Reward - A list of rewards that are given on completion. All fields are
+# optional.
+# ItemID: Item ID
+# Amount: Amount of Item ID (default 1)
+# Script: Bonus Script
+# TitleID: Title ID
+###########################################################################
+# Score - Achievement points that are given on completion.
+###########################################################################
+
+Achievements:
+ - ID: 110000
+ Group: "AG_EAT"
+ Name: "At this time I live to eat"
+ Score: 10
+ - ID: 110001
+ Group: "AG_SEE"
+ Name: "A fan of this polarity"
+ Score: 10
+ - ID: 120001
+ Group: "AG_ADVENTURE"
+ Name: "North Prontera Field Exploration(1)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120002
+ Group: "AG_ADVENTURE"
+ Name: "North Prontera Field Exploration(2)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120003
+ Group: "AG_ADVENTURE"
+ Name: "North Prontera Field Exploration(3)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120004
+ Group: "AG_ADVENTURE"
+ Name: "West Prontera Field Exploration(1)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120005
+ Group: "AG_ADVENTURE"
+ Name: "West Prontera Field Exploration(2)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120006
+ Group: "AG_ADVENTURE"
+ Name: "East Prontera Field Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120007
+ Group: "AG_ADVENTURE"
+ Name: "South Prontera Field Exploration(1)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120008
+ Group: "AG_ADVENTURE"
+ Name: "South Prontera Field Exploration(2)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120009
+ Group: "AG_ADVENTURE"
+ Name: "South Prontera Field Exploration(3)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120010
+ Group: "AG_ADVENTURE"
+ Name: "South Prontera Field Exploration(4)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120011
+ Group: "AG_ADVENTURE"
+ Name: "East Geffen Field Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120012
+ Group: "AG_ADVENTURE"
+ Name: "Southeast Geffen Field Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120013
+ Group: "AG_ADVENTURE"
+ Name: "Northwest Geffen Field Exploration(1)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120014
+ Group: "AG_ADVENTURE"
+ Name: "Northwest Geffen Field Exploration(2)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120015
+ Group: "AG_ADVENTURE"
+ Name: "Northwest Geffen Field Exploration(3)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120016
+ Group: "AG_ADVENTURE"
+ Name: "South Geffen Field Exploration(1)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120017
+ Group: "AG_ADVENTURE"
+ Name: "South Geffen Field Exploration(2)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120018
+ Group: "AG_ADVENTURE"
+ Name: "Sograt Desert Field Exploration(1)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120019
+ Group: "AG_ADVENTURE"
+ Name: "Sograt Desert Field Exploration(2)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120020
+ Group: "AG_ADVENTURE"
+ Name: "Sograt Desert Field Exploration(3)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120021
+ Group: "AG_ADVENTURE"
+ Name: "Sograt Desert Field Exploration(4)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120022
+ Group: "AG_ADVENTURE"
+ Name: "Sograt Desert Field Exploration(5)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120023
+ Group: "AG_ADVENTURE"
+ Name: "Sograt Desert Field Exploration(6)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120024
+ Group: "AG_ADVENTURE"
+ Name: "Southwest Payon Field Exploration(1)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120025
+ Group: "AG_ADVENTURE"
+ Name: "Southwest Payon Field Exploration(2)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120026
+ Group: "AG_ADVENTURE"
+ Name: "Southwest Payon Field Exploration(3)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120027
+ Group: "AG_ADVENTURE"
+ Name: "Southwest Payon Field Exploration(4)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120028
+ Group: "AG_ADVENTURE"
+ Name: "East Payon Field Exploration(1)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120029
+ Group: "AG_ADVENTURE"
+ Name: "East Payon Field Exploration(2)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120030
+ Group: "AG_ADVENTURE"
+ Name: "East Payon Field Exploration(3)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120031
+ Group: "AG_ADVENTURE"
+ Name: "East Payon Field Exploration(4)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120032
+ Group: "AG_ADVENTURE"
+ Name: "North Mjolnir Field Exploration(1)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120033
+ Group: "AG_ADVENTURE"
+ Name: "North Mjolnir Field Exploration(2)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120034
+ Group: "AG_ADVENTURE"
+ Name: "North Mjolnir Field Exploration(3)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120035
+ Group: "AG_ADVENTURE"
+ Name: "North Mjolnir Field Exploration(4)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120036
+ Group: "AG_ADVENTURE"
+ Name: "North Mjolnir Field Exploration(5)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120037
+ Group: "AG_ADVENTURE"
+ Name: "South Mjolnir Field Exploration(1)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120038
+ Group: "AG_ADVENTURE"
+ Name: "South Mjolnir Field Exploration(2)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120039
+ Group: "AG_ADVENTURE"
+ Name: "South Mjolnir Field Exploration(3)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120040
+ Group: "AG_ADVENTURE"
+ Name: "South Mjolnir Field Exploration(4)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120041
+ Group: "AG_ADVENTURE"
+ Name: "South Mjolnir Field Exploration(5)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120042
+ Group: "AG_ADVENTURE"
+ Name: "South Mjolnir Field Exploration(6)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120043
+ Group: "AG_ADVENTURE"
+ Name: "South Aldebaran Field Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120044
+ Group: "AG_ADVENTURE"
+ Name: "Comodo Field Exploration(1)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120045
+ Group: "AG_ADVENTURE"
+ Name: "Comodo Field Exploration(2)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120046
+ Group: "AG_ADVENTURE"
+ Name: "Comodo Field Exploration(3)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120047
+ Group: "AG_ADVENTURE"
+ Name: "Comodo Field Exploration(4)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120048
+ Group: "AG_ADVENTURE"
+ Name: "Comodo Field Exploration(5)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120049
+ Group: "AG_ADVENTURE"
+ Name: "Comodo Field Exploration(6)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120050
+ Group: "AG_ADVENTURE"
+ Name: "Comodo Field Exploration(7)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120051
+ Group: "AG_ADVENTURE"
+ Name: "Comodo Field Exploration(8)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120052
+ Group: "AG_ADVENTURE"
+ Name: "Border Checkpoint Field Exploration(1)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120053
+ Group: "AG_ADVENTURE"
+ Name: "Border Checkpoint Field Exploration(2)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120054
+ Group: "AG_ADVENTURE"
+ Name: "Kiel Hyre Mansion Field Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120055
+ Group: "AG_ADVENTURE"
+ Name: "El Mes Plateau Field Exploration(1)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120056
+ Group: "AG_ADVENTURE"
+ Name: "El Mes Plateau Field Exploration(2)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120057
+ Group: "AG_ADVENTURE"
+ Name: "El Mes Plateau Field Exploration(3)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120058
+ Group: "AG_ADVENTURE"
+ Name: "El Mes Gorge Field Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120059
+ Group: "AG_ADVENTURE"
+ Name: "Kiel Hyre Academy Field Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120060
+ Group: "AG_ADVENTURE"
+ Name: "Guard Camp Field Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120061
+ Group: "AG_ADVENTURE"
+ Name: "Yuno Field Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120062
+ Group: "AG_ADVENTURE"
+ Name: "Front of Thanatos Tower Field Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120063
+ Group: "AG_ADVENTURE"
+ Name: "Hugel Field Exploration(1)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120064
+ Group: "AG_ADVENTURE"
+ Name: "Hugel Field Exploration(2)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120065
+ Group: "AG_ADVENTURE"
+ Name: "Hugel Field Exploration(3)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120066
+ Group: "AG_ADVENTURE"
+ Name: "Abyss Lake Field Exploration(1)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120067
+ Group: "AG_ADVENTURE"
+ Name: "Einbroch Field Exploration(1)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120068
+ Group: "AG_ADVENTURE"
+ Name: "Einbroch Field Exploration(2)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120069
+ Group: "AG_ADVENTURE"
+ Name: "Einbroch Field Exploration(3)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120070
+ Group: "AG_ADVENTURE"
+ Name: "Einbroch Field Exploration(4)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120071
+ Group: "AG_ADVENTURE"
+ Name: "Einbroch Field Exploration(5)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120072
+ Group: "AG_ADVENTURE"
+ Name: "Einbroch Field Exploration(6)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120073
+ Group: "AG_ADVENTURE"
+ Name: "Einbroch Field Exploration(7)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120074
+ Group: "AG_ADVENTURE"
+ Name: "Einbroch Field Exploration(8)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120075
+ Group: "AG_ADVENTURE"
+ Name: "Lighthalzen Field Exploration(1)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120076
+ Group: "AG_ADVENTURE"
+ Name: "Lighthalzen Field Exploration(2)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120077
+ Group: "AG_ADVENTURE"
+ Name: "Lighthalzen Field Exploration(3)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120078
+ Group: "AG_ADVENTURE"
+ Name: "Rachel Audhumbla Plains Field Exploration(1)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120079
+ Group: "AG_ADVENTURE"
+ Name: "Rachel Plains Field Exploration(1)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120080
+ Group: "AG_ADVENTURE"
+ Name: "Rachel Plains Field Exploration(2)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120081
+ Group: "AG_ADVENTURE"
+ Name: "Rachel Plains Field Exploration(3)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120082
+ Group: "AG_ADVENTURE"
+ Name: "Rachel Audhumbla Grassland Field Exploration(1)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120083
+ Group: "AG_ADVENTURE"
+ Name: "Rachel Audhumbla Grassland Field Exploration(2)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120084
+ Group: "AG_ADVENTURE"
+ Name: "Portus Luna Field Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120085
+ Group: "AG_ADVENTURE"
+ Name: "Veins Field Exploration(1)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120086
+ Group: "AG_ADVENTURE"
+ Name: "Veins Field Exploration(2)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120087
+ Group: "AG_ADVENTURE"
+ Name: "Veins Field Exploration(3)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120088
+ Group: "AG_ADVENTURE"
+ Name: "Veins Field Exploration(4)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120089
+ Group: "AG_ADVENTURE"
+ Name: "Veins Field Exploration(5)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120090
+ Group: "AG_ADVENTURE"
+ Name: "Eclage Field Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120091
+ Group: "AG_ADVENTURE"
+ Name: "North Bitfrost Field Exploration(1)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120092
+ Group: "AG_ADVENTURE"
+ Name: "South Bitfrost Field Exploration(1)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120093
+ Group: "AG_ADVENTURE"
+ Name: "Splendide Field Exploration(1)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120094
+ Group: "AG_ADVENTURE"
+ Name: "Splendide Field Exploration(2)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120095
+ Group: "AG_ADVENTURE"
+ Name: "Splendide Field Exploration(3)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120096
+ Group: "AG_ADVENTURE"
+ Name: "Manuk Field Exploration(1)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120097
+ Group: "AG_ADVENTURE"
+ Name: "Manuk Field Exploration(2)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120098
+ Group: "AG_ADVENTURE"
+ Name: "Manuk Field Exploration(3)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120099
+ Group: "AG_ADVENTURE"
+ Name: "Outskirts of Kamidal Field Exploration(1)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120100
+ Group: "AG_ADVENTURE"
+ Name: "Outskirts of Kamidal Field Exploration(2)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120101
+ Group: "AG_ADVENTURE"
+ Name: "Amatsu Field Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120102
+ Group: "AG_ADVENTURE"
+ Name: "Kunlun Field Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120103
+ Group: "AG_ADVENTURE"
+ Name: "Gonryun Field Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120104
+ Group: "AG_ADVENTURE"
+ Name: "Ayothaya Field Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120105
+ Group: "AG_ADVENTURE"
+ Name: "Moscovia Field Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120106
+ Group: "AG_ADVENTURE"
+ Name: "Brasilis Field Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120107
+ Group: "AG_ADVENTURE"
+ Name: "Dewata Field Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120108
+ Group: "AG_ADVENTURE"
+ Name: "Malaya Field Exploration(1)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120109
+ Group: "AG_ADVENTURE"
+ Name: "Malaya Field Exploration(2)"
+ Reward:
+ ItemID: 22876
+ Score: 10
+ - ID: 120110
+ Group: "AG_ADVENTURE"
+ Name: "Abbey Underground Dungeon Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120111
+ Group: "AG_ADVENTURE"
+ Name: "Abyss Lake Dungeon Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120112
+ Group: "AG_ADVENTURE"
+ Name: "Clock Tower Dungeon Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120113
+ Group: "AG_ADVENTURE"
+ Name: "Amatsu Dungeon Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120114
+ Group: "AG_ADVENTURE"
+ Name: "Ant Hell Dungeon Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120115
+ Group: "AG_ADVENTURE"
+ Name: "Ayothaya Dungeon Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120116
+ Group: "AG_ADVENTURE"
+ Name: "Comodo Dungeon Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120117
+ Group: "AG_ADVENTURE"
+ Name: "Brasilis Dungeon Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120118
+ Group: "AG_ADVENTURE"
+ Name: "Clock Tower Dungeon Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120119
+ Group: "AG_ADVENTURE"
+ Name: "Istana Dungeon Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120120
+ Group: "AG_ADVENTURE"
+ Name: "Scaraba Hole Dungeon Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120121
+ Group: "AG_ADVENTURE"
+ Name: "Bitfrost Dungeon Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120122
+ Group: "AG_ADVENTURE"
+ Name: "Einbroch Dungeon Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120123
+ Group: "AG_ADVENTURE"
+ Name: "Geffen Underground Dungeon Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120124
+ Group: "AG_ADVENTURE"
+ Name: "Glastheim Dungeon Exploration(1)"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120125
+ Group: "AG_ADVENTURE"
+ Name: "Glastheim Dungeon Exploration(2)"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120126
+ Group: "AG_ADVENTURE"
+ Name: "Glastheim Dungeon Exploration(3)"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120127
+ Group: "AG_ADVENTURE"
+ Name: "Glastheim Dungeon Exploration(4)"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120128
+ Group: "AG_ADVENTURE"
+ Name: "Kunlun Dungeon Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120129
+ Group: "AG_ADVENTURE"
+ Name: "Rachel Dungeon Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120130
+ Group: "AG_ADVENTURE"
+ Name: "Sphinx Dungeon Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120131
+ Group: "AG_ADVENTURE"
+ Name: "Izlude Dungeon Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120132
+ Group: "AG_ADVENTURE"
+ Name: "Robot Factory Dungeon Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120133
+ Group: "AG_ADVENTURE"
+ Name: "Bio Lab Dungeon Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120134
+ Group: "AG_ADVENTURE"
+ Name: "Gonryun Dungeon Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120135
+ Group: "AG_ADVENTURE"
+ Name: "Nogg Road Dungeon Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120136
+ Group: "AG_ADVENTURE"
+ Name: "Coal Mine Dungeon Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120137
+ Group: "AG_ADVENTURE"
+ Name: "Pyramid Dungeon Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120138
+ Group: "AG_ADVENTURE"
+ Name: "Orc Dungeon Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120139
+ Group: "AG_ADVENTURE"
+ Name: "Payon Dungeon Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120140
+ Group: "AG_ADVENTURE"
+ Name: "Labyrinth Dungeon Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120141
+ Group: "AG_ADVENTURE"
+ Name: "Undersea Tunnel Dungeon Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120142
+ Group: "AG_ADVENTURE"
+ Name: "Thanatos Tower Dungeon Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120143
+ Group: "AG_ADVENTURE"
+ Name: "Thor Volcano Dungeon Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120144
+ Group: "AG_ADVENTURE"
+ Name: "Sunken Ship Dungeon Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120145
+ Group: "AG_ADVENTURE"
+ Name: "Turtle Dungeon Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 120146
+ Group: "AG_ADVENTURE"
+ Name: "Toy Factory Dungeon Exploration"
+ Reward:
+ ItemID: 22876
+ Score: 20
+ - ID: 127001
+ Group: "AG_CHATTING"
+ Name: "Prontera Contribution"
+ Map: "prontera"
+ Target:
+ - Count: 100000
+ Score: 10
+ - ID: 127002
+ Group: "AG_CHATTING"
+ Name: "Geffen Contribution"
+ Map: "geffen"
+ Target:
+ - Count: 100000
+ Score: 10
+ - ID: 127003
+ Group: "AG_CHATTING"
+ Name: "Morocc Contribution"
+ Map: "morocc"
+ Target:
+ - Count: 100000
+ Score: 10
+ - ID: 127004
+ Group: "AG_CHATTING"
+ Name: "Payon Contribution"
+ Map: "payon"
+ Target:
+ - Count: 100000
+ Score: 10
+ - ID: 127005
+ Group: "AG_CHATTING"
+ Name: "Yuno Contribution"
+ Map: "yuno"
+ Target:
+ - Count: 100000
+ Score: 10
+ - ID: 127006
+ Group: "AG_CHATTING"
+ Name: "Lighthalzen Contribution"
+ Map: "lighthalzen"
+ Target:
+ - Count: 100000
+ Score: 10
+ - ID: 127007
+ Group: "AG_CHATTING"
+ Name: "Einbroch Contribution"
+ Map: "einbroch"
+ Target:
+ - Count: 100000
+ Score: 10
+ - ID: 127008
+ Group: "AG_CHATTING"
+ Name: "Rachel Contribution"
+ Map: "rachel"
+ Target:
+ - Count: 100000
+ Score: 10
+ - ID: 127009
+ Group: "AG_CHATTING"
+ Name: "Veins Contribution"
+ Map: "veins"
+ Target:
+ - Count: 100000
+ Score: 10
+ - ID: 128000
+ Group: "AG_BATTLE"
+ Name: "Uninvited Guest"
+ Target:
+ - MobID: 2996
+ Count: 1
+ Score: 10
+ - ID: 128001
+ Group: "AG_BATTLE"
+ Name: "Strange Guest"
+ Target:
+ - MobID: 2996
+ Count: 10
+ Score: 10
+ - ID: 128002
+ Group: "AG_BATTLE"
+ Name: "Get along with map..."
+ Target:
+ - MobID: 2996
+ Count: 25
+ Score: 20
+ - ID: 128003
+ Group: "AG_BATTLE"
+ Name: "Welcomed Guest"
+ Target:
+ - MobID: 2996
+ Count: 50
+ Score: 30
+ - ID: 128004
+ Group: "AG_BATTLE"
+ Name: "Kimmy's best friend"
+ Target:
+ - MobID: 2996
+ Count: 100
+ Score: 50
+ - ID: 128005
+ Group: "AG_BATTLE"
+ Name: "Novice Angler"
+ Target:
+ - MobID: 2322
+ Count: 1
+ Score: 10
+ - ID: 128006
+ Group: "AG_BATTLE"
+ Name: "Juicy Hunter"
+ Target:
+ - MobID: 2322
+ Count: 10
+ Score: 20
+ - ID: 128007
+ Group: "AG_BATTLE"
+ Name: "Rhythm Master"
+ Target:
+ - MobID: 2322
+ Count: 50
+ Score: 50
+ - ID: 128008
+ Group: "AG_BATTLE"
+ Name: "Bold Adventurer"
+ Target:
+ - MobID: 1929
+ Count: 1
+ Score: 10
+ - ID: 128009
+ Group: "AG_BATTLE"
+ Name: "Baphomet Hatred"
+ Target:
+ - MobID: 1929
+ Count: 10
+ Score: 20
+ - ID: 128010
+ Group: "AG_BATTLE"
+ Name: "Goat's Nemesis"
+ Target:
+ - MobID: 1929
+ Count: 50
+ Score: 50
+ - ID: 128011
+ Group: "AG_BATTLE"
+ Name: "Ordinary Tourist"
+ #Target:
+ # - MobID: 3029
+ # Count: 1
+ Score: 10
+ - ID: 128012
+ Group: "AG_BATTLE"
+ Name: "Backcountry Expert"
+ #Target:
+ # - MobID: 3029
+ # Count: 10
+ Score: 20
+ - ID: 128013
+ Group: "AG_BATTLE"
+ Name: "Able to eat more like this"
+ #Target:
+ # - MobID: 3029
+ # Count: 50
+ Score: 50
+ - ID: 128014
+ Group: "AG_BATTLE"
+ Name: "Digest hard meat"
+ Target:
+ - MobID: 2319
+ Count: 1
+ Score: 10
+ - ID: 128015
+ Group: "AG_BATTLE"
+ Name: "Master of Escape"
+ Target:
+ - MobID: 2319
+ Count: 10
+ Score: 20
+ - ID: 128016
+ Group: "AG_BATTLE"
+ Name: "Immortal Hunter"
+ Target:
+ - MobID: 2319
+ Count: 50
+ Score: 50
+ - ID: 128017
+ Group: "AG_BATTLE"
+ Name: "Stood up and overcame despair"
+ #Target:
+ # - MobID: 3097
+ # Count: 1
+ Score: 10
+ - ID: 128018
+ Group: "AG_BATTLE"
+ Name: "Ember of Hope"
+ #Target:
+ # - MobID: 3097
+ # Count: 10
+ Score: 10
+ - ID: 128019
+ Group: "AG_BATTLE"
+ Name: "Pouring Aurora"
+ #Target:
+ # - MobID: 3097
+ # Count: 25
+ Score: 20
+ - ID: 128020
+ Group: "AG_BATTLE"
+ Name: "Who is desperate? I am hopeless!"
+ #Target:
+ # - MobID: 3097
+ # Count: 50
+ Score: 30
+ - ID: 128021
+ Group: "AG_BATTLE"
+ Name: "I know god will save the world"
+ #Target:
+ # - MobID: 3097
+ # Count: 100
+ Score: 50
+ - ID: 128022
+ Group: "AG_BATTLE"
+ Name: "There was mercy in Morocc army"
+ #Target:
+ # - MobID: 3000
+ # Count: 1
+ Score: 10
+ - ID: 128023
+ Group: "AG_BATTLE"
+ Name: "There was fear in Morocc army"
+ #Target:
+ # - MobID: 3000
+ # Count: 10
+ Score: 20
+ - ID: 128024
+ Group: "AG_BATTLE"
+ Name: "Guard of weak army"
+ #Target:
+ # - MobID: 3000
+ # Count: 50
+ Score: 50
+ - ID: 128025
+ Group: "AG_BATTLE"
+ Name: "Audience with the queen"
+ #Target:
+ # - MobID: 2529
+ # Count: 1
+ Score: 10
+ - ID: 128026
+ Group: "AG_BATTLE"
+ Name: "Warm earth"
+ #Target:
+ # - MobID: 2533
+ # Count: 1
+ Score: 10
+ - ID: 128027
+ Group: "AG_BATTLE"
+ Name: "Water is very good exactly"
+ #Target:
+ # - MobID: 2534
+ # Count: 1
+ Score: 10
+ - ID: 128028
+ Group: "AG_BATTLE"
+ Name: "Pleasant breeze"
+ #Target:
+ # - MobID: 2535
+ # Count: 1
+ Score: 10
+ - ID: 128029
+ Group: "AG_BATTLE"
+ Name: "Visitor of old castle"
+ Target:
+ - MobID: 2476
+ Count: 1
+ Score: 10
+ - ID: 128030
+ Group: "AG_BATTLE"
+ Name: "Lord of old castle"
+ Target:
+ - MobID: 2476
+ Count: 10
+ Score: 20
+ - ID: 128031
+ Group: "AG_BATTLE"
+ Name: "Conqueror of old castle"
+ Target:
+ - MobID: 2476
+ Count: 50
+ Score: 50
+ - ID: 128032
+ Group: "AG_BATTLE"
+ Name: "Haggard sucker"
+ #Target:
+ # - MobID: 3150
+ # Count: 1
+ Score: 10
+ - ID: 128033
+ Group: "AG_BATTLE"
+ Name: "Hope of the Knight"
+ #Target:
+ # - MobID: 3150
+ # Count: 10
+ Score: 20
+ - ID: 128034
+ Group: "AG_BATTLE"
+ Name: "Guardian of the Dawn"
+ #Target:
+ # - MobID: 3150
+ # Count: 50
+ Score: 50
+ - ID: 128035
+ Group: "AG_BATTLE"
+ Name: "Time Traveler"
+ #Target:
+ # - MobID: 3190
+ # Count: 1
+ Score: 10
+ - ID: 128036
+ Group: "AG_BATTLE"
+ Name: "Restore ancient relic"
+ #Target:
+ # - MobID: 3190
+ # Count: 10
+ Score: 20
+ - ID: 128037
+ Group: "AG_BATTLE"
+ Name: "Master of relic transport"
+ #Target:
+ # - MobID: 3190
+ # Count: 50
+ Score: 50
+ - ID: 128038
+ Group: "AG_BATTLE"
+ Name: "Show Jailbreak to the captain"
+ #Target:
+ # - MobID: 3181
+ # Count: 1
+ Score: 10
+ - ID: 128039
+ Group: "AG_BATTLE"
+ Name: "Show Jailbreak to the weak captain"
+ #Target:
+ # - MobID: 3188
+ # Count: 1
+ Score: 10
+ - ID: 128040
+ Group: "AG_BATTLE"
+ Name: "Riot on board"
+ #Target:
+ # - MobID: 3181
+ # Count: 1
+ Score: 20
+ - ID: 128041
+ Group: "AG_BATTLE"
+ Name: "Turmoil on board"
+ #Target:
+ # - MobID: 3181
+ # Count: 10
+ Score: 20
+ - ID: 128042
+ Group: "AG_BATTLE"
+ Name: "Rebellion on board"
+ #Target:
+ # - MobID: 3181
+ # Count: 50
+ Score: 50
+ - ID: 128043
+ Group: "AG_BATTLE"
+ Name: "Revolt of Riot"
+ #Target:
+ # - MobID: 3188
+ # Count: 50
+ Score: 50
+ - ID: 128044
+ Group: "AG_BATTLE"
+ Name: "Magic tournament champion"
+ Target:
+ - MobID: 2564
+ Count: 1
+ Score: 10
+ - ID: 128045
+ Group: "AG_BATTLE"
+ Name: "Gladiator of Coliseum"
+ Target:
+ - MobID: 2564
+ Count: 10
+ Score: 20
+ - ID: 128046
+ Group: "AG_BATTLE"
+ Name: "Slayer of Colosseum"
+ Target:
+ - MobID: 2564
+ Count: 50
+ Score: 50
+ - ID: 128047
+ Group: "AG_BATTLE"
+ Name: "Endless Tower challenger"
+ Target:
+ - MobID: 1956
+ Count: 1
+ Score: 10
+ - ID: 128048
+ Group: "AG_BATTLE"
+ Name: "Endless Tower Slayer"
+ Target:
+ - MobID: 1956
+ Count: 10
+ Score: 20
+ - ID: 128049
+ Group: "AG_BATTLE"
+ Name: "Lord of the tower"
+ Target:
+ - MobID: 1956
+ Count: 50
+ Score: 50
+ - ID: 128050
+ Group: "AG_BATTLE"
+ Name: "Novice Exorcist"
+ Target:
+ - MobID: 2327
+ Count: 1
+ Score: 10
+ - ID: 128051
+ Group: "AG_BATTLE"
+ Name: "Experienced Exorcist"
+ Target:
+ - MobID: 2327
+ Count: 10
+ Score: 20
+ - ID: 128052
+ Group: "AG_BATTLE"
+ Name: "Legendary Exorcist"
+ Target:
+ - MobID: 2327
+ Count: 50
+ Score: 50
+ - ID: 129001
+ Group: "AG_ADVENTURE"
+ Name: "Prontera Explorer"
+ Dependent: [120001, 120002, 120003, 120004, 120005, 120006, 120007, 120008, 120009, 120010]
+ Reward:
+ ItemID: 644
+ Score: 20
+ - ID: 129002
+ Group: "AG_ADVENTURE"
+ Name: "Geffen Explorer"
+ Dependent: [120011, 120012, 120013, 120014, 120015, 120016, 120017]
+ Reward:
+ ItemID: 644
+ Score: 20
+ - ID: 129003
+ Group: "AG_ADVENTURE"
+ Name: "Sograt Desert Explorer"
+ Dependent: [120018, 120019, 120020, 120021, 120022, 120023]
+ Reward:
+ ItemID: 644
+ Score: 20
+ - ID: 129004
+ Group: "AG_ADVENTURE"
+ Name: "Payon Explorer"
+ Dependent: [120024, 120025, 120026, 120027, 120028, 120029, 120030, 120031]
+ Reward:
+ ItemID: 644
+ Score: 20
+ - ID: 129005
+ Group: "AG_ADVENTURE"
+ Name: "North Mjolnir Explorer"
+ Dependent: [120032, 120033, 120034, 120035, 120036]
+ Reward:
+ ItemID: 644
+ Score: 20
+ - ID: 129006
+ Group: "AG_ADVENTURE"
+ Name: "South Mjolnir Explorer"
+ Dependent: [120037, 120038, 120039, 120040, 120041, 120042, 120043]
+ Reward:
+ ItemID: 644
+ Score: 20
+ - ID: 129007
+ Group: "AG_ADVENTURE"
+ Name: "Comodo Explorer"
+ Dependent: [120044, 120045, 120046, 120047, 120048, 120049, 120050, 120051]
+ Reward:
+ ItemID: 644
+ Score: 20
+ - ID: 129008
+ Group: "AG_ADVENTURE"
+ Name: "Rune Midgard Explorer"
+ Dependent: [129001, 129002, 129003, 129004, 129005, 129006, 129007]
+ Reward:
+ ItemID: 617
+ Score: 50
+ - ID: 129009
+ Group: "AG_ADVENTURE"
+ Name: "Yuno Explorer"
+ Dependent: [120052, 120053, 120054, 120055, 120056, 120057, 120058, 120059, 120060, 120061]
+ Reward:
+ ItemID: 644
+ Score: 20
+ - ID: 129010
+ Group: "AG_ADVENTURE"
+ Name: "Hugel Explorer"
+ Dependent: [120062, 120063, 120064, 120065, 120066]
+ Reward:
+ ItemID: 644
+ Score: 20
+ - ID: 129011
+ Group: "AG_ADVENTURE"
+ Name: "Einbroch Explorer"
+ Dependent: [120067, 120068, 120069, 120070, 120071, 120072, 120073, 120074]
+ Reward:
+ ItemID: 644
+ Score: 20
+ - ID: 129012
+ Group: "AG_ADVENTURE"
+ Name: "Lighthalzen Explorer"
+ Dependent: [120075, 120076, 120077]
+ Reward:
+ ItemID: 644
+ Score: 20
+ - ID: 129013
+ Group: "AG_ADVENTURE"
+ Name: "Schwarzwald Explorer"
+ Dependent: [129009, 129010, 129011, 129012]
+ Reward:
+ ItemID: 617
+ Score: 50
+ - ID: 129014
+ Group: "AG_ADVENTURE"
+ Name: "Rachel Explorer"
+ Dependent: [120078, 120079, 120080, 120081, 120082, 120083, 120084]
+ Reward:
+ ItemID: 644
+ Score: 20
+ - ID: 129015
+ Group: "AG_ADVENTURE"
+ Name: "Veins Explorer"
+ Dependent: [120085, 120086, 120087, 120088, 120089]
+ Reward:
+ ItemID: 644
+ Score: 20
+ - ID: 129016
+ Group: "AG_ADVENTURE"
+ Name: "Arunafeltz Explorer"
+ Dependent: [129014, 129015]
+ Reward:
+ ItemID: 617
+ Score: 50
+ - ID: 129017
+ Group: "AG_ADVENTURE"
+ Name: "Laphine Explorer"
+ Dependent: [120090, 120091, 120092, 120093, 120094, 120095]
+ Reward:
+ ItemID: 644
+ Score: 20
+ - ID: 129018
+ Group: "AG_ADVENTURE"
+ Name: "Manuk Explorer"
+ Dependent: [120096, 120097, 120098, 120099, 120100]
+ Reward:
+ ItemID: 644
+ Score: 20
+ - ID: 129019
+ Group: "AG_ADVENTURE"
+ Name: "Eclage Explorer"
+ Dependent: [129017, 129018]
+ Reward:
+ ItemID: 617
+ Score: 50
+ - ID: 129020
+ Group: "AG_ADVENTURE"
+ Name: "Localizing fields explorer"
+ Dependent: [120101, 120102, 120103, 120104, 120105, 120106, 120107, 120108, 120109]
+ Reward:
+ ItemID: 617
+ Score: 50
+ - ID: 130000 # Talk to Prince NPC (npc/quests/quests_morocc.txt L5288)
+ Group: "AG_CHATTING"
+ Name: "Socialite debut"
+ Reward:
+ TitleID: 1034
+ Score: 10
+ - ID: 170000
+ Group: "AG_HEAR"
+ Name: "Song chamber is not an accident"
+ Score: 10
+ - ID: 190000
+ Group: "AG_CHATTING"
+ Name: "Alliance workers of merchant city"
+ Score: 50
+ - ID: 200000
+ Group: "AG_GOAL_LEVEL"
+ Name: "Acquire the first aura!"
+ Condition: " BaseLevel >= 99 "
+ Reward:
+ ItemID: 12549
+ Script: " specialeffect2 EF_BLESSING; sc_start SC_BLESSING,30000,10; "
+ TitleID: 1000
+ Score: 50
+ - ID: 200001
+ Group: "AG_GOAL_LEVEL"
+ Name: "Acquire the second aura!"
+ Condition: " BaseLevel >= 150 "
+ Dependent: [200000]
+ Reward:
+ ItemID: 5364
+ Script: " specialeffect2 EF_BLESSING; sc_start SC_BLESSING,30000,10; "
+ TitleID: 1001
+ Score: 60
+ - ID: 200002
+ Group: "AG_GOAL_LEVEL"
+ Name: "Acquire the third aura!"
+ Condition: " BaseLevel >= 175 "
+ Dependent: [200001]
+ Reward:
+ ItemID: 18880
+ Script: " specialeffect2 EF_BLESSING; sc_start SC_BLESSING,30000,10; "
+ TitleID: 1002
+ Score: 70
+ - ID: 200003
+ Group: "AG_GOAL_LEVEL"
+ Name: "Master Job level!"
+ Condition: " JobLevel >= 50 "
+ Reward:
+ ItemID: 617
+ Script: " specialeffect2 EF_BLESSING; sc_start SC_BLESSING,30000,10; "
+ TitleID: 1003
+ Score: 30
+ - ID: 200004
+ Group: "AG_GOAL_LEVEL"
+ Name: "Grandmaster Job level!"
+ Condition: " JobLevel >= 70 "
+ Dependent: [200003]
+ Reward:
+ ItemID: 12817
+ Script: " specialeffect2 EF_BLESSING; sc_start SC_BLESSING,30000,10; "
+ TitleID: 1004
+ Score: 50
+ - ID: 200005
+ Group: "AG_JOB_CHANGE"
+ Name: "Official Adventurer"
+ Condition: " Class >= JOB_SWORDMAN && Class <= JOB_THIEF "
+ Reward:
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 200006
+ Group: "AG_JOB_CHANGE"
+ Name: "First step of job change!"
+ Condition: " Class >= JOB_SWORDMAN && Class <= JOB_THIEF "
+ Reward:
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 20
+ - ID: 200007
+ Group: "AG_JOB_CHANGE"
+ Name: "Veteran Adventurer! (1)"
+ Condition: " Class >= JOB_KNIGHT && Class <= JOB_ASSASSIN "
+ Reward:
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 25
+ - ID: 200008
+ Group: "AG_JOB_CHANGE"
+ Name: "Veteran Adventurer! (2)"
+ Condition: " Class >= JOB_CRUSADER && Class <= JOB_DANCER "
+ Reward:
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 25
+ - ID: 200009
+ Group: "AG_JOB_CHANGE"
+ Name: "Warrior (1)"
+ Condition: " Class >= JOB_LORD_KNIGHT && Class <= JOB_ASSASSIN_CROSS "
+ Reward:
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 30
+ - ID: 200010
+ Group: "AG_JOB_CHANGE"
+ Name: "Warrior (2)"
+ Condition: " Class >= JOB_PALADIN && Class <= JOB_GYPSY "
+ Reward:
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 30
+ - ID: 200011
+ Group: "AG_JOB_CHANGE"
+ Name: "Elite Adventurer! (1)"
+ Condition: " Class >= JOB_RUNE_KNIGHT && Class <= JOB_GUILLOTINE_CROSS "
+ Reward:
+ ItemID: 16483
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 50
+ - ID: 200012
+ Group: "AG_JOB_CHANGE"
+ Name: "Transcendentaler! (1)"
+ Condition: " Class >= JOB_RUNE_KNIGHT_T && Class <= JOB_GUILLOTINE_CROSS_T "
+ Reward:
+ ItemID: 16483
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 60
+ - ID: 200013
+ Group: "AG_JOB_CHANGE"
+ Name: "Elite Adventurer! (2)"
+ Condition: " Class >= JOB_ROYAL_GUARD && Class <= JOB_SHADOW_CHASER "
+ Reward:
+ ItemID: 16483
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 50
+ - ID: 200014
+ Group: "AG_JOB_CHANGE"
+ Name: "Transcendentaler! (2)"
+ Condition: " Class >= JOB_ROYAL_GUARD_T && Class <= JOB_SHADOW_CHASER_T "
+ Reward:
+ ItemID: 16483
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 60
+ - ID: 200015
+ Group: "AG_JOB_CHANGE"
+ Name: "The way of exceptional character"
+ Condition: " Class == JOB_SUPER_NOVICE || Class == JOB_GUNSLINGER || Class == JOB_NINJA || Class == JOB_TAEKWON "
+ Reward:
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 200016
+ Group: "AG_JOB_CHANGE"
+ Name: "This is My way!"
+ Condition: " Class == JOB_STAR_GLADIATOR || Class == JOB_SOUL_LINKER || Class == JOB_KAGEROU || Class == JOB_OBORO || Class == JOB_REBELLION "
+ Reward:
+ ItemID: 16483
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 20
+ - ID: 200017
+ Group: "AG_GOAL_STATUS"
+ Name: "Bearish Power!"
+ Condition: " bStr >= 90 "
+ Score: 10
+ - ID: 200018
+ Group: "AG_GOAL_STATUS"
+ Name: "Overflowing Magic!"
+ Condition: " bInt >= 90 "
+ Score: 10
+ - ID: 200019
+ Group: "AG_GOAL_STATUS"
+ Name: "Healthy Body and Mental Health!"
+ Condition: " bVit >= 90 "
+ Score: 10
+ - ID: 200020
+ Group: "AG_GOAL_STATUS"
+ Name: "Speed of Light"
+ Condition: " bAgi >= 90 "
+ Score: 10
+ - ID: 200021
+ Group: "AG_GOAL_STATUS"
+ Name: "Hawk Eyes"
+ Condition: " bDex >= 90 "
+ Score: 10
+ - ID: 200022
+ Group: "AG_GOAL_STATUS"
+ Name: "Maximum Luck"
+ Condition: " bLuk >= 90 "
+ Score: 10
+ - ID: 200023
+ Group: "AG_GOAL_STATUS"
+ Name: "Dragonlike Power!"
+ Condition: " bStr >= 125 "
+ Reward:
+ Script: " sc_start SC_GIANTGROWTH,180000,1; "
+ Score: 20
+ - ID: 200024
+ Group: "AG_GOAL_STATUS"
+ Name: "Magic Insanity"
+ Condition: " bInt >= 125 "
+ Reward:
+ Script: " specialeffect2 EF_HASTEUP; bonus_script \"{ bonus2 bHPLossRate,100,10000; bonus bBaseAtk,20; bonus bAspdRate,25; }\",60,0,0,SI_STEAMPACK; "
+ Score: 20
+ - ID: 200025
+ Group: "AG_GOAL_STATUS"
+ Name: "Rock Alloy"
+ Condition: " bVit >= 125 "
+ Reward:
+ Script: " specialeffect2 EF_HEAL3; sc_start2 SC_S_LIFEPOTION,600000,-5,5; "
+ Score: 20
+ - ID: 200026
+ Group: "AG_GOAL_STATUS"
+ Name: "Speed of Light"
+ Condition: " bAgi >= 125 "
+ Reward:
+ Script: " specialeffect2 EF_STEAL; sc_start SC_INCFLEE2,60000,20; "
+ Score: 20
+ - ID: 200027
+ Group: "AG_GOAL_STATUS"
+ Name: "Falcon's Eyes"
+ Condition: " bDex >= 125 "
+ Reward:
+ Script: " specialeffect2 EF_MAGICALATTHIT; sc_start SC_INCCRI,300000,30; "
+ Score: 20
+ - ID: 200028
+ Group: "AG_GOAL_STATUS"
+ Name: "Lucky Fever"
+ Condition: " bLuk >= 125 "
+ Reward:
+ Script: " specialeffect2 EF_GLORIA; sc_start SC_GLORIA,15000,0; "
+ Score: 20
+ - ID: 200029
+ Group: "AG_GOAL_STATUS"
+ Name: "Incarnation of Love and Hate"
+ Condition: " BaseLevel == 99 && Class == JOB_NOVICE "
+ Reward:
+ ItemID: 16483
+ Script: " specialeffect2 EF_BLESSING; sc_start SC_BLESSING,30000,10; "
+ Score: 30
+ - ID: 200030
+ Group: "AG_GOAL_STATUS"
+ Name: "I really love it!"
+ Condition: " BaseLevel == 99 && (Class >= JOB_SWORDMAN && Class <= JOB_THIEF) "
+ Reward:
+ ItemID: 16504
+ Script: " specialeffect2 EF_BLESSING; sc_start SC_BLESSING,30000,10; "
+ Score: 30
+ - ID: 200031
+ Group: "AG_JOB_CHANGE"
+ Name: "Reborn in Valhalla!"
+ Condition: " Class == JOB_NOVICE_HIGH "
+ Reward:
+ ItemID: 22808
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 230100
+ Group: "AG_TAMING"
+ Name: "Poring is Love"
+ Dependent: [230101, 230102, 230103, 230104]
+ Reward:
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ TitleID: 1025
+ Score: 50
+ - ID: 230110
+ Group: "AG_TAMING"
+ Name: "Entomologist"
+ Dependent: [230111, 230112, 230113, 230114, 230115, 230116]
+ Reward:
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ TitleID: 1026
+ Score: 50
+ - ID: 230120
+ Group: "AG_TAMING"
+ Name: "Animals are also our friend"
+ Dependent: [230121, 230122, 230123, 230124, 230125, 230126, 230127, 230128]
+ Reward:
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ TitleID: 1027
+ Score: 50
+ - ID: 230140
+ Group: "AG_TAMING"
+ Name: "Monster Girls Unite!!"
+ Dependent: [230141, 230142, 230143, 230144, 230145, 230146, 230147]
+ Reward:
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ TitleID: 1029
+ Score: 50
+ - ID: 230101
+ Group: "AG_TAMING"
+ Name: "Poring - taming"
+ Target:
+ - MobID: 1002
+ Count: 1
+ Score: 10
+ - ID: 230102
+ Group: "AG_TAMING"
+ Name: "Drops - taming"
+ Target:
+ - MobID: 1113
+ Count: 1
+ Score: 10
+ - ID: 230103
+ Group: "AG_TAMING"
+ Name: "Poporing - taming"
+ Target:
+ - MobID: 1031
+ Count: 1
+ Score: 10
+ - ID: 230104
+ Group: "AG_TAMING"
+ Name: "Novice Poring - taming"
+ Target:
+ - MobID: 2398
+ Count: 1
+ Score: 10
+ - ID: 230111
+ Group: "AG_TAMING"
+ Name: "Chonchon - taming"
+ Target:
+ - MobID: 1011
+ Count: 1
+ Score: 10
+ - ID: 230112
+ Group: "AG_TAMING"
+ Name: "Steel Chonchon - taming"
+ Target:
+ - MobID: 1042
+ Count: 1
+ Score: 10
+ - ID: 230113
+ Group: "AG_TAMING"
+ Name: "Hunter Fly - taming"
+ Target:
+ - MobID: 1035
+ Count: 1
+ Score: 10
+ - ID: 230114
+ Group: "AG_TAMING"
+ Name: "Rocker - taming"
+ Target:
+ - MobID: 1052
+ Count: 1
+ Score: 10
+ - ID: 230115
+ Group: "AG_TAMING"
+ Name: "Spore - taming"
+ Target:
+ - MobID: 1014
+ Count: 1
+ Score: 10
+ - ID: 230116
+ Group: "AG_TAMING"
+ Name: "Poison Spore - taming"
+ Target:
+ - MobID: 1077
+ Count: 1
+ Score: 10
+ - ID: 230121
+ Group: "AG_TAMING"
+ Name: "Lunatic - taming"
+ Target:
+ - MobID: 1063
+ Count: 1
+ Score: 10
+ - ID: 230122
+ Group: "AG_TAMING"
+ Name: "Picky - taming"
+ Target:
+ - MobID: 1049
+ Count: 1
+ Score: 10
+ - ID: 230123
+ Group: "AG_TAMING"
+ Name: "Savage Bebe - taming"
+ Target:
+ - MobID: 1167
+ Count: 1
+ Score: 10
+ - ID: 230124
+ Group: "AG_TAMING"
+ Name: "Baby Desert Wolf - taming"
+ Target:
+ - MobID: 1107
+ Count: 1
+ Score: 10
+ - ID: 230125
+ Group: "AG_TAMING"
+ Name: "Smokie - taming"
+ Target:
+ - MobID: 1056
+ Count: 1
+ Score: 10
+ - ID: 230126
+ Group: "AG_TAMING"
+ Name: "Yoyo - taming"
+ Target:
+ - MobID: 1057
+ Count: 1
+ Score: 10
+ - ID: 230127
+ Group: "AG_TAMING"
+ Name: "Peco Peco - taming"
+ Target:
+ - MobID: 1019
+ Count: 1
+ Score: 10
+ - ID: 230128
+ Group: "AG_TAMING"
+ Name: "Petite - taming"
+ Target:
+ - MobID: 1155
+ Count: 1
+ Score: 10
+ - ID: 230141
+ Group: "AG_TAMING"
+ Name: "Munak - taming"
+ Target:
+ - MobID: 1026
+ Count: 1
+ Score: 10
+ - ID: 230142
+ Group: "AG_TAMING"
+ Name: "Isis - taming"
+ Target:
+ - MobID: 1029
+ Count: 1
+ Score: 10
+ - ID: 230143
+ Group: "AG_TAMING"
+ Name: "Sohee - taming"
+ Target:
+ - MobID: 1170
+ Count: 1
+ Score: 10
+ - ID: 230144
+ Group: "AG_TAMING"
+ Name: "Zherlthsh - taming"
+ Target:
+ - MobID: 1200
+ Count: 1
+ Score: 10
+ - ID: 230145
+ Group: "AG_TAMING"
+ Name: "Alice - taming"
+ Target:
+ - MobID: 1275
+ Count: 1
+ Score: 10
+ - ID: 230146
+ Group: "AG_TAMING"
+ Name: "Succubus - taming"
+ Target:
+ - MobID: 1370
+ Count: 1
+ Score: 10
+ - ID: 230147
+ Group: "AG_TAMING"
+ Name: "Loli Ruri - taming"
+ Target:
+ - MobID: 1505
+ Count: 1
+ Score: 10
+ - ID: 220000
+ Group: "AG_CHATTING_CREATE"
+ Name: "Community begin"
+ Condition: " true "
+ Score: 10
+ - ID: 220001
+ Group: "AG_CHATTING_DYING"
+ Name: "A mouth only moment"
+ Condition: " true "
+ Score: 10
+ - ID: 220002
+ Group: "AG_CHATTING_COUNT"
+ Name: "Admiring the chatter"
+ Condition: " ARG0 == 20 "
+ Score: 10
+ - ID: 220003
+ Group: "AG_ADD_FRIEND"
+ Name: "My friend's friend~"
+ Condition: " ARG0 >= 1 "
+ Score: 10
+ - ID: 220004
+ Group: "AG_ADD_FRIEND"
+ Name: "A competition of popularity"
+ Condition: " ARG0 >= 10 "
+ Score: 10
+ - ID: 220005
+ Group: "AG_PARTY"
+ Name: "Let's Party~"
+ Condition: " true "
+ Score: 10
+ - ID: 220006
+ Group: "AG_MARRY"
+ Name: "Married with who..?"
+ Condition: " true "
+ Reward:
+ TitleID: 1022
+ Score: 20
+ - ID: 220007
+ Group: "AG_BABY"
+ Name: "Can you grow?"
+ Condition: " ARG0 == 1 "
+ Reward:
+ TitleID: 1032
+ Score: 20
+ - ID: 220008
+ Group: "AG_BABY"
+ Name: "Being a parent"
+ Condition: " ARG0 == 2 "
+ Reward:
+ TitleID: 1033
+ Score: 20
+ - ID: 220009
+ Group: "AG_SPEND_ZENY"
+ Name: "Activating the market economy (1)"
+ Condition: " ARG0 >= 10000 "
+ Target:
+ - Count: 10000
+ Score: 10
+ - ID: 220010
+ Group: "AG_SPEND_ZENY"
+ Name: "Activating the market economy (2)"
+ Condition: " ARG0 >= 100000 "
+ Target:
+ - Count: 100000
+ Score: 15
+ - ID: 220011
+ Group: "AG_SPEND_ZENY"
+ Name: "Activating the market economy (3)"
+ Condition: " ARG0 >= 500000 "
+ Target:
+ - Count: 500000
+ Score: 20
+ - ID: 220012
+ Group: "AG_SPEND_ZENY"
+ Name: "Activating the market economy (4)"
+ Condition: " ARG0 >= 1000000 "
+ Target:
+ - Count: 1000000
+ Score: 30
+ - ID: 220013
+ Group: "AG_SPEND_ZENY"
+ Name: "Activating the market economy (5)"
+ Condition: " ARG0 >= 5000000 "
+ Target:
+ - Count: 5000000
+ Score: 50
+ - ID: 220014
+ Group: "AG_ENCHANT_SUCCESS"
+ Name: "I can't quit from refining! (1)"
+ Condition: " ARG0 == 1 && ARG1 >= 7 "
+ Score: 10
+ - ID: 220015
+ Group: "AG_ENCHANT_SUCCESS"
+ Name: "I can't quit from refining! (2)"
+ Condition: " ARG0 == 1 && ARG1 >= 12 "
+ Score: 15
+ - ID: 220016
+ Group: "AG_ENCHANT_SUCCESS"
+ Name: "I can't quit from refining! (3)"
+ Condition: " ARG0 == 2 && ARG1 >= 7 "
+ Score: 10
+ - ID: 220017
+ Group: "AG_ENCHANT_SUCCESS"
+ Name: "I can't quit from refining! (4)"
+ Condition: " ARG0 == 2 && ARG1 >= 12 "
+ Score: 15
+ - ID: 220018
+ Group: "AG_ENCHANT_SUCCESS"
+ Name: "I can't quit from refining! (5)"
+ Condition: " ARG0 == 3 && ARG1 >= 7 "
+ Score: 15
+ - ID: 220019
+ Group: "AG_ENCHANT_SUCCESS"
+ Name: "I can't quit from refining! (6)"
+ Condition: " ARG0 == 3 && ARG1 >= 12 "
+ Score: 20
+ - ID: 220020
+ Group: "AG_ENCHANT_SUCCESS"
+ Name: "I can't quit from refining! (7)"
+ Condition: " ARG0 == 4 && ARG1 >= 7 "
+ Score: 20
+ - ID: 220021
+ Group: "AG_ENCHANT_SUCCESS"
+ Name: "I can't quit from refining! (8)"
+ Condition: " ARG0 == 4 && ARG1 >= 12 "
+ Score: 30
+ - ID: 220022
+ Group: "AG_ENCHANT_FAIL"
+ Name: "Human's greed has no ending.."
+ Condition: " true "
+ Score: 10
+ - ID: 220023
+ Group: "AG_GET_ITEM"
+ Name: "I found it! (1)"
+ Condition: " ARG0 >= 100 "
+ Score: 10
+ - ID: 220024
+ Group: "AG_GET_ITEM"
+ Name: "I found it! (2)"
+ Condition: " ARG0 >= 1000 "
+ Score: 10
+ - ID: 220025
+ Group: "AG_GET_ITEM"
+ Name: "I found it! (3)"
+ Condition: " ARG0 >= 5000 "
+ Score: 15
+ - ID: 220026
+ Group: "AG_GET_ITEM"
+ Name: "I found it! (4)"
+ Condition: " ARG0 >= 10000 "
+ Score: 15
+ - ID: 220027
+ Group: "AG_GET_ITEM"
+ Name: "I found it! (5)"
+ Condition: " ARG0 >= 50000 "
+ Score: 20
+ - ID: 220028
+ Group: "AG_GET_ITEM"
+ Name: "I found it! (6)"
+ Condition: " ARG0 >= 100000 "
+ Score: 20
+ - ID: 220029
+ Group: "AG_GET_ITEM"
+ Name: "I found it! (7)"
+ Condition: " ARG0 >= 150000 "
+ Score: 30
+ - ID: 220030
+ Group: "AG_GET_ZENY"
+ Name: "Rich King (1)"
+ Condition: " ARG0 >= 10000 "
+ Score: 10
+ - ID: 220031
+ Group: "AG_GET_ZENY"
+ Name: "Rich King (2)"
+ Condition: " ARG0 >= 100000 "
+ Score: 15
+ - ID: 220032
+ Group: "AG_GET_ZENY"
+ Name: "Rich King (3)"
+ Condition: " ARG0 >= 1000000 "
+ Score: 20
+ - ID: 220033
+ Group: "AG_GET_ZENY"
+ Name: "Rich King (4)"
+ Condition: " ARG0 >= 10000000 "
+ Score: 25
+ - ID: 220034
+ Group: "AG_GET_ZENY"
+ Name: "Rich King (5)"
+ Condition: " ARG0 >= 100000000 "
+ Score: 30
+ - ID: 220035
+ Group: "AG_GET_ZENY"
+ Name: "Rich King (6)"
+ Condition: " ARG0 >= 1000000000 "
+ Score: 40
+ - ID: 230200
+ Group: "AG_BATTLE"
+ Name: "Poring seeker"
+ Dependent: [230201, 230202, 230203]
+ Score: 10
+ - ID: 230201
+ Group: "AG_BATTLE"
+ Name: "Exploring Poring's life (1)"
+ Target:
+ - MobID: 1002
+ Count: 10
+ - MobID: 2398
+ Count: 10
+ - MobID: 1113
+ Count: 10
+ - MobID: 1031
+ Count: 10
+ - MobID: 1242
+ Count: 10
+ Score: 10
+ - ID: 230202
+ Group: "AG_BATTLE"
+ Name: "Exploring Poring's life (2)"
+ Target:
+ - MobID: 1090
+ Count: 1
+ - MobID: 1582
+ Count: 1
+ - MobID: 1096
+ Count: 1
+ - MobID: 1388
+ Count: 1
+ - MobID: 1120
+ Count: 1
+ Score: 15
+ - ID: 230203
+ Group: "AG_BATTLE"
+ Name: "Exploring Poring's life (3)"
+ Target:
+ - MobID: 1613
+ Count: 5
+ - MobID: 1977
+ Count: 5
+ - MobID: 1836
+ Count: 5
+ Score: 20
+ - ID: 240000
+ Group: "AG_GOAL_LEVEL"
+ Name: "Complete challenges after first introduction"
+ Score: 10
+ - ID: 240001
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 1"
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240002
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 2"
+ Dependent: [240001]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240003
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 3"
+ Dependent: [240002]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240004
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 4"
+ Dependent: [240003]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240005
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 5"
+ Dependent: [240004]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240006
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 6"
+ Dependent: [240005]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240007
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 7"
+ Dependent: [240006]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240008
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 8"
+ Dependent: [240007]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240009
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 9"
+ Dependent: [240008]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240010
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 10"
+ Dependent: [240009]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ TitleID: 1023
+ Score: 10
+ - ID: 240011
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 11"
+ Dependent: [240010]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240012
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 12"
+ Dependent: [240011]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240013
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 13"
+ Dependent: [240012]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240014
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 14"
+ Dependent: [240013]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240015
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 15"
+ Dependent: [240014]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240016
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 16"
+ Dependent: [240015]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240017
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 17"
+ Dependent: [240016]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240018
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 18"
+ Dependent: [240017]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240019
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 19"
+ Dependent: [240018]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ Score: 10
+ - ID: 240020
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Reaching Level 20"
+ Dependent: [240019]
+ Reward:
+ ItemID: 644
+ Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
+ TitleID: 1024
+ Score: 10
+ - ID: 220036
+ Group: "AG_EAT"
+ Name: "The beginning of outdoor"
+ Score: 20
+ - ID: 220037
+ Group: "AG_EAT"
+ Name: "The first step becoming a chef"
+ Score: 20
diff --git a/db/re/instance_db.txt b/db/re/instance_db.txt
index 9b585d55db2..d6db555fed4 100644
--- a/db/re/instance_db.txt
+++ b/db/re/instance_db.txt
@@ -22,3 +22,7 @@
15,Geffen Magic Tournament,7200,300,1@gef,119,209,1@gef_in,1@ge_st
16,Horror Toy Factory,3600,300,1@xm_d,111,22
17,Faceworm's Nest,3600,300,1@face,112,374
+18,Ghost Palace,3600,300,1@spa,42,196
+21,Fenrir and Sarah,3600,300,1@glast,367,304
+26,Central Laboratory,3600,300,1@lab,120,30
+27,Last room,3600,300,1@uns,142,30
diff --git a/db/re/item_combo_db.txt b/db/re/item_combo_db.txt
index 78872d550c0..2263b58b781 100644
--- a/db/re/item_combo_db.txt
+++ b/db/re/item_combo_db.txt
@@ -7,11 +7,17 @@
1166:2527:5467,{ bonus2 bAddRace,RC_Dragon,25; }
1180:2527,{ bonus2 bAddRace,RC_Dragon,5; }
1180:2527:5467,{ bonus2 bAddRace,RC_Dragon,25; }
+1219:5782,{ bonus2 bAddClass,Class_All,3; }
+1220:5782,{ bonus2 bAddClass,Class_All,3; }
+1221:5782,{ bonus2 bAddClass,Class_All,3; }
1269:5467,{ bonus bAspd,1; bonus bFlee2,3; }
1284:2892,{ bonus2 bSkillAtk,"AS_SONICBLOW",50; bonus bBaseAtk,50; bonus bFlee,-30; }
1285:2892,{ bonus bCritical,4; bonus bCritAtkRate,40; bonus bMaxHPRate,-10; }
1287:15123,{ if (getequiprefinerycnt(EQI_HAND_R) >= 7) { autobonus "{ bonus bIgnoreDefClass,Class_Normal; }",1000,3000,BF_SHORT,BF_NORMAL; } /* Confirm: Success rate */ }
1387:19021,{ bonus2 bSkillAtk,"WS_CARTTERMINATION",15+(getequiprefinerycnt(EQI_HAND_R))*5; }
+1407:5782,{ bonus2 bAddClass,Class_All,3; }
+1408:5782,{ bonus2 bAddClass,Class_All,3; }
+1409:5782,{ bonus2 bAddClass,Class_All,3; }
1420:2115,{ bonus3 bAutoSpellWhenHit,"HP_ASSUMPTIO",2,5; }
1420:2133,{ bonus2 bAddClass,Class_All,4; bonus bDef,2; }
1421:2133,{ bonus2 bAddClass,Class_All,4; bonus bDef,2; }
@@ -44,7 +50,7 @@
1615:18539,{ bonus bMatk,10*getequiprefinerycnt(EQI_HAND_R); bonus bVariableCastrate,-10; }
1616:2515,{ bonus bSpeedRate,25; }
1617:19020,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); bonus bMatk,.@r; if (.@r >= 10) { autobonus "{ bonus bVariableCastrate,-50; }",100,5000,BF_MAGIC; /* Confirm: Success rate? */ } }
-1618:2509,{ bonus bMaxHP,300; bonus bMatkRate,getequiprefinerycnt(EQI_HAND_R)-5; if(getequiprefinerycnt(EQI_GARMENT) > 10) { bonus2 bSubEle,Ele_Neutral,30; } else { bonus2 bSubEle,Ele_Neutral,getequiprefinerycnt(EQI_GARMENT)*3; } }
+1618:2509,{ bonus bMaxHP,300; bonus bMatkRate,min(5, getequiprefinerycnt(EQI_HAND_R)-5); bonus2 bSubEle,Ele_Neutral,min(30, getequiprefinerycnt(EQI_GARMENT)*3); }
1618:2535,{ bonus bMatkRate,5; bonus2 bSubEle,Ele_Neutral,25; }
1618:19020,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); bonus bMatk,.@r; if (.@r >= 10) { autobonus "{ bonus bVariableCastrate,-50; }",100,5000,BF_MAGIC; /* Confirm: Success rate? */ } }
1619:19020,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); bonus bMatk,.@r; if (.@r >= 10) { autobonus "{ bonus bVariableCastrate,-50; }",100,5000,BF_MAGIC; /* Confirm: Success rate? */ } }
@@ -110,6 +116,7 @@
2123:2881,{ bonus bMatkRate,getequiprefinerycnt(EQI_HAND_L)*2; }
2124:2702,{ bonus bAspdRate,10; bonus bShortWeaponDamageReturn,5; }
2124:22064,{ bonus bAspd,getequiprefinerycnt(EQI_HAND_L)/3; }
+2125:5782,{ bonus bDef,2; bonus2 bSubEle,Ele_Neutral,5; bonus2 bSubEle,Ele_Fire,5; bonus2 bSubEle,Ele_Water,5; bonus2 bSubEle,Ele_Wind,5; bonus2 bSubEle,Ele_Earth,5; bonus2 bSubEle,Ele_Dark,5; bonus2 bSubEle,Ele_Holy,5; bonus2 bSubEle,Ele_Ghost,5; }
2135:2426,{ bonus2 bAddEff,Eff_Blind,500; autobonus "{ bonus bFlee,20; }",200,10000,BF_WEAPON,"{ specialeffect2 EF_INCAGILITY; }"; }
2137:2353:5124,{ bonus bDef,2-getequiprefinerycnt(EQI_HAND_L)-getequiprefinerycnt(EQI_HEAD_TOP); bonus bMdef,5+getequiprefinerycnt(EQI_HAND_L)+getequiprefinerycnt(EQI_HEAD_TOP); }
2153:28372,{ .@r = getequiprefinerycnt(EQI_HAND_R)/6*8; bonus2 bSkillAtk,"LG_SHIELDPRESS",.@r; }
@@ -253,6 +260,7 @@
2725:2773,{ bonus2 bAddClass,Class_All,5; bonus bMatkRate,3; bonus bHealPower,5; }
2725:2774,{ bonus2 bAddClass,Class_All,5; bonus bMatkRate,3; bonus bHealPower,5; }
2726:2727,{ bonus bUseSPrate,-25; }
+27264:27265,{ bonus2 bAddEle,Ele_Dark,15; bonus2 bAddEle,Ele_Undead,15; bonus2 bMagicAddEle,Ele_Dark,15; bonus2 bMagicAddEle,Ele_Undead,15; bonus2 bSubEle,Ele_Dark,15; bonus2 bSubEle,Ele_Undead,15; }
2733:2772,{ bonus2 bAddClass,Class_All,5; bonus bMatkRate,3; bonus bHealPower,5; }
2733:2773,{ bonus2 bAddClass,Class_All,5; bonus bMatkRate,3; bonus bHealPower,5; }
2733:2774,{ bonus2 bAddClass,Class_All,5; bonus bMatkRate,3; bonus bHealPower,5; }
@@ -264,6 +272,7 @@
2779:2780:5577,{ bonus bMatkRate,10; bonus bInt,5; bonus2 bSubRace,RC_Angel,10; }
2779:2827:5482,{ autobonus "{ bonus bAspdRate,2; }",50,10000,0,"{ specialeffect2 EF_POTION_BERSERK; }"; bonus bMaxHP,BaseLevel*15; bonus bMaxSP,(BaseLevel*12)/10; bonus2 bAddClass,Class_All,3; }
2780:2826:5577,{ autobonus "{ bonus bAspdRate,2; }",50,10000,0,"{ specialeffect2 EF_POTION_BERSERK; }"; bonus bMaxHP,BaseLevel*15; bonus bMaxSP,(BaseLevel*12)/10; bonus2 bAddClass,Class_All,3; }
+2782:19156,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); if (.@r < 4) { .@a = 4; } else { .@a = min(.@r,10); } bonus3 bAutoSpell,"WZ_WATERBALL",.@a,(.@a*10); }
2826:2827:5577,{ autobonus "{ bonus bAspdRate,2; }",50,10000,0,"{ specialeffect2 EF_POTION_BERSERK; }"; bonus bMaxHP,BaseLevel*15; bonus bMaxSP,(BaseLevel*12)/10; bonus2 bAddClass,Class_All,3; }
2855:5360,{ bonus bCritAtkRate,10; if(getequiprefinerycnt(EQI_HEAD_TOP)>5) bonus bCritical,5; }
2913:2710,{ bonus bBaseAtk,10; }
@@ -296,7 +305,8 @@
2968:18821,{ bonus bMatkRate,getequiprefinerycnt(EQI_HEAD_TOP)/2; }
2969:13092,{ bonus bBaseAtk,getequiprefinerycnt(EQI_HAND_R)*10; }
2969:18821,{ bonus bMatkRate,getequiprefinerycnt(EQI_HEAD_TOP)/2; }
-2979:18852,{ bonus2 bSubEle,Ele_Fire,10; bonus bLongAtkRate,30; }
+2979:18852,{ bonus bMaxHPrate,15; bonus2 bSubEle,Ele_Fire,10; bonus bLongAtkRate,30; }
+2979:18853,{ bonus bMaxHPrate,15; bonus2 bSubEle,Ele_Fire,10; bonus bLongAtkRate,30; }
2983:4218,{ bonus bVit,-3; bonus bHPrecovRate,-20; bonus bMaxHP,1000; }
2983:4218:4269,{ bonus bVit,-3; bonus bHPrecovRate,-20; bonus bMaxHP,1000; bonus bInt,-3; bonus bSPrecovRate,-20; bonus bMaxSP,150; }
2983:4269,{ bonus bInt,-3; bonus bSPrecovRate,-20; bonus bMaxSP,150; }
@@ -329,7 +339,7 @@
4152:5967,{ bonus2 bAddItemGroupHealRate,IG_Juice,1000; }
4153:4247:4273,{ bonus3 bAddMonsterDropItem,544,RC_Fish,3000; bonus2 bAddEle,Ele_Water,30; }
4153:18554,{ bonus2 bAddEle,Ele_Water,10; }
-4163:5967,{ bonus bAspdRate,3; bonus bAspd,1; bonus bNoWeaponDamage,5; if (getequiprefinerycnt(EQI_HAND_R) > 10 && getiteminfo(getequipid(EQI_HAND_R),11) == 11) bonus bAspd,1; }
+4163:5967,{ bonus bAspdRate,3; bonus bAspd,1; bonus2 bAddClass,Class_All,-5; if (getequiprefinerycnt(EQI_HAND_R) >= 10 && getiteminfo(getequipid(EQI_HAND_R),11) == 11) bonus bAspd,1; }
4168:4169,{ bonus bMaxHPrate,20; bonus bMaxSPrate,20; bonus bVariableCastrate,-10; }
4169:4488,{ if(getequiprefinerycnt(EQI_SHOES) >= 15) { bonus bMaxHPrate,15; bonus bMaxSPrate,15; } else { bonus bMaxHPrate,10; bonus bMaxSPrate,10; } }
4169:4488,{ if(getequiprefinerycnt(EQI_SHOES) >= 15) { bonus bMaxHPrate,15; bonus bMaxSPrate,15; } else { bonus bMaxHPrate,10; bonus bMaxSPrate,10; } }
@@ -355,14 +365,20 @@
4311:4319:4331:4371,{ bonus bInt,1; bonus bStr,1; bonus bDef,2; bonus bSPrecovRate,10; bonus2 bSkillAtk,"PA_SHIELDCHAIN",10; bonus2 bSkillAtk,"PA_SACRIFICE",10; bonus bVariableCastrate,-10; if(BaseJob==Job_Crusader) bonus bDefEle,Ele_Holy; }
4323:4324,{ bonus3 bAutoSpell,"MG_FROSTDIVER",3,250; }
4435:4436,{ bonus2 bSPGainRace,RC_DemiHuman,2; bonus2 bSPGainRace,RC_Player,2; }
+4335:19156,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); if (.@r < 4) { .@a = 4; } else { .@a = min(.@r,10); } bonus3 bAutoSpell,"WZ_EARTHSPIKE",.@a,(.@a*10); bonus3 bAutoSpell,"WZ_HEAVENDRIVE",.@a,(.@a*10); }
+4345:19156,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); if (.@r < 4) { .@a = 4; } else { .@a = min(.@r,10); } bonus3 bAutoSpell,"MG_LIGHTNINGBOLT",.@a,(.@a*10); bonus3 bAutoSpell,"MG_THUNDERSTORM",.@a,(.@a*10); }
+4350:19156,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); if (.@r < 4) { .@a = 4; } else { .@a = min(.@r,10); } bonus3 bAutoSpell,"MG_COLDBOLT",.@a,(.@a*10); bonus3 bAutoSpell,"WZ_FROSTNOVA",.@a,(.@a*10); }
+4380:19156,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); if (.@r < 4) { .@a = 4; } else { .@a = min(.@r,10); } bonus3 bAutoSpell,"MG_FIREBOLT",.@a,(.@a*10); bonus3 bAutoSpell,"MG_FIREBALL",.@a,(.@a*10); }
4335:21012,{ bonus5 bAutoSpell,"WZ_EARTHSPIKE",5,10+(getequiprefinerycnt(EQI_HAND_R)*10),BF_NORMAL|BF_WEAPON,1; /* Confirm: Success rate */ }
4345:21012,{ bonus5 bAutoSpell,"MG_LIGHTNINGBOLT",5,10+(getequiprefinerycnt(EQI_HAND_R)*10),BF_NORMAL|BF_WEAPON,1; /* Confirm: Success rate */ }
4350:21012,{ bonus5 bAutoSpell,"MG_COLDBOLT",5,10+(getequiprefinerycnt(EQI_HAND_R)*10),BF_NORMAL|BF_WEAPON,1; /* Confirm: Success rate */ }
4380:21012,{ bonus5 bAutoSpell,"MG_FIREBOLT",5,10+(getequiprefinerycnt(EQI_HAND_R)*10),BF_NORMAL|BF_WEAPON,1; /* Confirm: Success rate */ }
4388:21012,{ bonus5 bAutoSpell,"MG_SOULSTRIKE",5,10+(getequiprefinerycnt(EQI_HAND_R)*10),BF_NORMAL|BF_WEAPON,1; /* Confirm: Success rate */ }
+4517:5967,{ bonus bInt,1; bonus bCritAtkRate,5 + (BaseClass == Job_Archer ? 15 : 0); }
4545:18730,{ bonus bMatk,5; bonus bBaseAtk,5; }
4605:4606,{ bonus2 bSubEle,Ele_Neutral,20; bonus bFlee,20; bonus2 bHPLossRate,100,6000; bonus2 bSPLossRate,6,6000; }
4608:4609,{ bonus2 bAddSize,Size_Medium,15; bonus2 bAddSize,Size_Large,15; bonus2 bSubSize,Size_Medium,5; bonus2 bSubSize,Size_Large,5; }
+4610:27168,{ bonus bAtk,100; autobonus "{ active_transform 3190,6000; }",30,6000,BF_WEAPON; }
4626:4628,{ bonus2 bIgnoreMdefRaceRate,RC_Demon,50; }
4627:4628,{ bonus2 bIgnoreDefRaceRate,RC_Formless,50; bonus2 bIgnoreDefRaceRate,RC_Demon,50;}
4629:4630,{ bonus3 bAutoSpell,"NPC_WIDECURSE",2,2; bonus2 bSubEle,Ele_Neutral,5; }
@@ -388,9 +404,21 @@
4681:4691,{ autobonus "{ active_transform 3241,6000; bonus bAtk,100; }",30,6000,BF_WEAPON; }
4682:4694,{ autobonus "{ active_transform 3244,6000; bonus bAtk,100; }",30,6000,BF_WEAPON; }
4683:4695,{ autobonus "{ active_transform 3246,6000; bonus bAtk,100; }",30,6000,BF_WEAPON; }
-5040:5442,{ bonus bAspdRate,3; bonus bVariableCastrate,3; }
4697:27012,{ bonus bNoMadoFuel,1; }
4699:27012,{ bonus bNoMadoFuel,1; }
+4958:19050,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); if( .@r >= 7 ){ bonus bDelayrate,-1 - ( .@r > 9 ) ? 1 : 0; } }
+4959:19050,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); if( .@r >= 7 ){ bonus bLongAtkRate,2 + ( .@r > 9 ) ? 1 : 0; } }
+4960:19050,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); if( .@r >= 7 ){ bonus bUseSPrate,-2 - ( .@r > 9 ) ? 1 : 0; } }
+4961:19050,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); if( .@r >= 7 ){ bonus bMatk,10 + ( .@r > 9 ) ? 10 : 0; } }
+4962:19050,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); if( .@r >= 7 ){ bonus bAtk,2 + ( .@r > 9 ) ? 5 : 0; } }
+4963:19050,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); if( .@r >= 7 ){ bonus bAtk,4 + ( .@r > 9 ) ? 2 : 0; bonus bHit,3 + ( .@r > 9 ) ? 1 : 0; } }
+4964:19050,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); if( .@r >= 7 ){ bonus2 bMagicAddRace,RC_All,1 + ( .@r > 9 ) ? 1 : 0; } }
+4965:19050,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); if( .@r >= 7 ){ bonus bVariableCastrate,-1 - ( .@r > 9 ) ? 1 : 0; } }
+4966:19050,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); if( .@r >= 7 ){ bonus2 bAddRace,RC_All,1 + ( .@r > 9 ) ? 1 : 0; } }
+4967:19050,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); if( .@r >= 7 ){ bonus bAspdRate,1 + ( .@r > 9 ) ? 1 : 0; } }
+4968:19050,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); if( .@r >= 7 ){ setarray .@skills$, "AL_HEAL", "PR_SANCTUARY", "AM_POTIONPITCHER", "AB_HIGHNESSHEAL", "AB_CHEAL"; for( .@i = 0; .@i < getarraysize(.@skills$); .@i++ ){ bonus2 bSkillHeal,.@skills$[.@i],2 + ( .@r > 9 ) ? 2 : 0; } } }
+4969:19050,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); if( .@r >= 7 ){ setarray .@skills$, "AL_HEAL", "PR_SANCTUARY", "AM_POTIONPITCHER", "AB_HIGHNESSHEAL", "AB_CHEAL"; for( .@i = 0; .@i < getarraysize(.@skills$); .@i++ ){ bonus2 bSkillHeal2,.@skills$[.@i],2 + ( .@r > 9 ) ? 2 : 0; } /* TODO: Depending on some recovery items HP recovery amount + 1% or if refine >= 9 + 2% */ } }
+5040:5442,{ bonus bAspdRate,3; bonus bVariableCastrate,3; }
5040:18673,{ bonus bSPrecovRate,3; }
5041:18538,{ bonus2 bSubRace,RC_Angel,9; }
5043:18656,{ bonus bFlee,10; bonus2 bAddEff,Eff_Stun,1000; }
@@ -418,8 +446,9 @@
5548:5766,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); bonus bBaseAtk,min(.@r,10); bonus bMatk,min(.@r,10); }
5917:1525,{ bonus bLongAtkDef,10; }
5920:18542,{ bonus bHealPower,2*getequiprefinerycnt(EQI_HEAD_TOP); }
+5967:28321,{ bonus2 bSubSkill,"HT_BLITZBEAT",200; }
//9024:18832,{ bonus3 bAutoSpell,"BS_ADRENALINE",2,(GetPetRelationship >= 3)?15:10; }
-13027:15044,{ .@r = max(getequiprefinerycnt(EQI_ARMOR),1); bonus3 bAddMonsterDropItem,929,RC_DemiHuman,70*.@r; bonus3 bAddMonsterDropItem,970,RC_DemiHuman,50*.@r; bonus3 bAddMonsterDropItem,929,RC_Player,70*.@r; bonus3 bAddMonsterDropItem,970,RC_Player,50*.@r; bonus3 bAddMonsterDropItem,929,RC_Brute,70*.@r; bonus3 bAddMonsterDropItem,970,RC_Brute,50*.@r; }
+13027:15044,{ .@r = max(getequiprefinerycnt(EQI_ARMOR),1); bonus3 bAddMonsterDropItem,929,RC_DemiHuman,70*.@r; bonus3 bAddMonsterDropItem,970,RC_DemiHuman,50*.@r; bonus3 bAddMonsterDropItem,929,RC_Brute,70*.@r; bonus3 bAddMonsterDropItem,970,RC_Brute,50*.@r; }
13034:13035,{ bonus bMaxSP,20; bonus bMaxHPRate,5; bonus bHit,10; bonus2 bAddSize,Size_Large,30; autobonus "{ bonus bAspdRate,100; }",1,7000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }"; }
15041:18659,{ bonus bInt,3; bonus bStr,3; bonus bMdef,10; bonus bDefEle,Ele_Fire; bonus2 bAddEle,Ele_Earth,10; }
15068:20710,{ bonus bAgi,5; bonus bFlee,10; }
@@ -482,6 +511,9 @@
18937:28303,{ bonus bInt,8; bonus bBaseAtk,20;}
18937:28304,{ bonus bInt,8; bonus bFlee,15;}
18937:28305,{ bonus bInt,8; bonus bHit,10;}
+18985:28321,{ bonus2 bSkillAtk,"HT_BLITZBEAT",100; }
+18985:28321:28322,{ bonus2 bSkillAtk,"HT_BLITZBEAT",200; }
+18985:28322,{ bonus2 bSkillAtk,"SN_FALCONASSAULT",50; }
18997:28326:28327,{ bonus bSpeedRate,10; bonus bBaseAtk,50; bonus bMatk,50; if(getequiprefinerycnt(EQI_HEAD_TOP)>=9){ bonus bMaxHPrate,10; bonus bMaxSPrate,50; } }
19026:20756,{ .@r = getequiprefinerycnt(EQI_GARMENT); bonus2 bSPGainRace,RC_Fish,10; bonus3 bAddMonsterDropItem,551,RC_Fish,(5+.@r); bonus2 bAddItemHealRate,551,5; bonus bHPrecovRate,(5+.@r); }
19026:22059,{ bonus2 bCriticalAddRace,RC_Fish,(10+getequiprefinerycnt(EQI_SHOES)); }
@@ -513,6 +545,30 @@
20718:22009,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
20718:22010,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
20718:22011,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20717:22107,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20717:22108,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20717:22109,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20717:22110,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20717:22111,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20717:22112,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20717:22113,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20717:22114,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20717:22115,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20717:22116,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20717:22117,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20717:22118,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20718:22107,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20718:22108,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20718:22109,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20718:22110,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20718:22111,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20718:22112,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20718:22113,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20718:22114,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20718:22115,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20718:22116,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20718:22117,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20718:22118,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
20797:2339,{ bonus bInt,15; bonus bMaxHPrate,5; bonus bMaxSPrate,5; if (getequiprefinerycnt(EQI_ARMOR) > 6) bonus bNoCastCancel,1; }
20797:4174,{ bonus2 bSubEle,Ele_All,50; bonus2 bSubEle,Ele_Neutral,-50; }
22069:2195,{ bonus2 bSubEle,Ele_Neutral,5; bonus2 bAddEle,Ele_Neutral,getequiprefinerycnt(EQI_HAND_L); }
@@ -553,7 +609,7 @@
24038:24044,{ bonus bVit,1; }
24039:24045,{ bonus bAgi,1; }
24046:24051,{ bonus2 bSubEle,Ele_Neutral,1; if(getequiprefinerycnt(EQI_SHADOW_ACC_R) + getequiprefinerycnt(EQI_SHADOW_ACC_L) >= 15) { bonus2 bSubEle,Ele_Neutral,1; } }
-24052:24062,{ bonus2 bExpAddRace,RC_DemiHuman,3; bonus2 bExpAddRace,RC_Player,3; }
+24052:24062,{ bonus2 bExpAddRace,RC_DemiHuman,3; }
24053:24063,{ bonus2 bAddRace,10,5; bonus2 bMagicAddRace,10,5; }
24054:24065,{ bonus2 bExpAddRace,RC_Brute,3; }
24055:24066,{ bonus2 bExpAddRace,RC_Insect,3; }
@@ -636,8 +692,12 @@
24249:24254,{ bonus2 bMagicAddRace,RC_All,1; bonus bMaxSPrate,1; if (getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)>=10) { bonus2 bMagicAddRace,RC_All,2; bonus bMaxSPrate,2; } }
24253:28391,{ bonus2 bAddRace,RC_All,1; bonus bMaxHPrate,1; if (getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)>=10) { bonus2 bAddRace,RC_All,2; bonus bMaxHPrate,2; } }
24255:28392,{ bonus2 bAddRace,RC_All,1; bonus bMaxHPrate,1; if (getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)>=10) { bonus2 bAddRace,RC_All,2; bonus bMaxHPrate,2; } }
+27147:27148,{ bonus bDelayrate,-3; }
+27163:27165,{ bonus bDelayrate,-3; bonus bVit,2; bonus bInt,2; bonus bAgi,2; bonus bDex,2; }
+27166:27167,{ bonus2 bSubEle,Ele_Neutral,5; bonus2 bMagicAddSize,Size_All,10; }
28315:28317,{ bonus2 bAddClass,Class_All,4; bonus bMatkRate,4; }
28316:28318,{ bonus2 bAddClass,Class_All,4; bonus bMatkRate,4; }
+28321:28322,{ bonus bUseSPrate,-(getskilllv("HT_BEASTBANE") * 2); }
28326:28327,{ bonus bInt,8; bonus bStr,8; }
28358:18521,{ skill "AS_CLOAKING",1; }
28499:28920,{ bonus bFlee2,10; }
diff --git a/db/re/item_db.txt b/db/re/item_db.txt
index f34c2f1f173..170b5f3ff0c 100644
--- a/db/re/item_db.txt
+++ b/db/re/item_db.txt
@@ -62,7 +62,7 @@
557,Hash_Rice_Cake,Neatly Sliced Rice Cake,0,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(25,30),0; },{},{}
558,Chocolate,Chocolate,0,1,,20,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal 1,1; },{},{}
559,HandMade_Chocolate,Hand-made Chocolate,0,1,,80,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal 50,50; },{},{}
-560,HandMade_White_Chocolate,Handmade White Chocolate,0,5000,,80,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal 50,50; },{},{}
+560,HandMade_Chocolate_,Handmade White Chocolate,0,5000,,80,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal 50,50; },{},{}
561,White_Chocolate,White Chocolate,0,5000,,80,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal 50,50; },{},{}
562,Pizza,Doublecrust Swiss Fondue,0,100,,150,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(70,100),0; },{},{}
563,Pizza_01,Doublecrust Swiss Fondue,0,1200,,150,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(375,445),0; },{},{}
@@ -679,11 +679,11 @@
1314,F_Tomahawk_C,Tomahawk,5,2,,0,200,,1,0,0x000444A2,63,2,34,4,0,0,7,{ bonus bAtkEle,Ele_Wind; },{},{}
1315,F_Right_Epsilon_C,Light Epsilon,5,1,,0,229,,1,0,0x000444A2,63,2,34,4,1,0,7,{ bonus bAtkEle,Ele_Holy; bonus bStr,10; },{},{}
1316,Adventure_Axe,Adventure Axe,5,0,,0,100,,1,0,0x00040420,63,2,2,1,1,0,6,{},{},{}
-1317,Academy_Axe,Academy Axe,5,0,,1600,130,,1,1,0x00040420,63,2,2,1,1,1,6,{},{},{}
+1317,Academy_Axe,Academy Axe,5,0,,1600,130,,1,1,0x00040420,63,2,2,1,30,1,6,{ bonus bUnbreakableWeapon,1; bonus bAspdRate,5-(BaseLevel/10); bonus bMaxHP,200-(40*(BaseLevel/10)); },{},{}
1318,Dofle_Axe,Deflation Axe,5,50000,,1800,180,,1,2,0x000654E2,63,2,2,4,105,1,6,{ bonus bUnbreakableWeapon,1; },{},{}
1319,TE_Woe_Axe,TE Woe Axe,5,0,,0,100,,1,0,0x000654E3,63,2,2,3,40,1,6,{ bonus bUnbreakableWeapon,1; bonus2 bAddRace,RC_Player,40; bonus2 bAddEff,Eff_Freeze,3000; },{},{}
1321,Dofle_Axe_,Deflation Axe,5,50000,,1800,180,,1,3,0x000654E2,63,2,2,4,105,1,6,{ bonus bUnbreakableWeapon,1; },{},{}
-1322,Blue_Axe,Blue Axe,5,10,,1800,180,,1,1,0xFFFFFFFF,63,2,2,1,1,1,6,{ bonus bStr,5; bonus bVit,5; },{},{}
+1322,Ru_Blue_Axe,Blue Axe,5,10,,1800,180,,1,1,0xFFFFFFFF,63,2,2,1,1,1,6,{ bonus bStr,5; bonus bVit,5; },{},{}
1323,Ru_Gold_Axe,Ru Gold Axe,5,0,,1800,180,,1,2,0x00040000,56,2,2,3,120,1,6,{ bonus bStr,8; bonus bInt,8; },{},{}
1324,War_Axe_,War Axe,5,20,,4200,140,,1,3,0x00040400,63,2,2,3,76,1,6,{ bonus bDex,2; bonus bLuk,2; },{},{}
//===================================================================
@@ -775,16 +775,16 @@
1431,F_Pole_Axe_C,Pole Axe,5,1,,4800,195,,3,0,0x00004082,63,2,2,3,1,0,4,{ bonus bStr,1; bonus bInt,2; bonus bDex,1; },{},{}
1432,E_Pole_Axe_C,Pole Axe,5,1,,4800,195,,3,0,0x00004082,63,2,2,3,1,0,4,{ bonus bStr,1; bonus bInt,2; bonus bDex,1; },{},{}
1433,Imperial_Spear,Imperial Spear,5,20,,1800,180:40,,3,1,0x00004082,63,2,2,3,102,1,4,{ .@r = getrefine(); bonus2 bSkillAtk,"LG_CANNONSPEAR",20+(.@r/2); bonus2 bSkillAtk,"LG_BANISHINGPOINT",20+(.@r/2); },{},{}
-1434,P_Spear1,Eden Spear I,5,0,,0,165,,3,0,0x00004082,63,2,2,3,60,0,4,{},{},{}
+1434,P_Sphere1,Eden Spear I,5,0,,0,165,,3,0,0x00004082,63,2,2,3,60,0,4,{},{},{}
1435,Cannon_Spear,Cannon Spear,5,56000,,1600,180,,3,1,0x00004000,63,2,2,4,100,1,4,{ bonus bMaxSP,-100; bonus2 bSkillAtk,"LG_CANNONSPEAR",10; bonus bBaseAtk,(getrefine()/3); },{},{}
1436,Velum_Spear,Vellum Spear,5,20,,850,150,,3,0,0x00004082,63,2,2,4,95,1,4,{ bonus2 bAddRace,RC_Player,60; .@r = getrefine(); if(.@r>=6) { bonus2 bSkillAtk,"RK_HUNDREDSPEAR",80; bonus2 bSkillAtk,"LG_PINPOINTATTACK",80; } if(.@r>=9) { bonus2 bAddRace,RC_Player,30; } },{},{}
1437,TE_Woe_Pike,TE Woe Pike,5,0,,0,100,,3,0,0x00004082,63,2,2,3,40,1,4,{ bonus2 bAddRace,RC_Player,40; bonus2 bAddEff,Eff_Curse,3000; },{},{}
-1438,Thanos_Spear,Thanatos Spear,5,10,,3000,150:100,,3,1,0x00004082,63,2,2,4,120,1,4,{ bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000; },{},{ heal -1000,0; }
+1438,Thanos_Spear,Thanatos Spear,5,10,,3000,150:100,,3,1,0x00004082,56,2,2,4,120,1,4,{ bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000; },{},{ heal -1000,0; }
1439,Half_BF_Spear1,Half BF Spear1,5,20,,0,60,,3,0,0x00004082,63,2,2,3,80,1,4,{ bonus bStr,2; bonus2 bAddRace,RC_DemiHuman,45; bonus2 bAddRace,RC_Player,45; bonus2 bIgnoreDefRaceRate,RC_DemiHuman,10; bonus2 bIgnoreDefRaceRate,RC_Player,10; bonus bUnbreakableWeapon,1; if(BaseJob==Job_Crusader) bonus bAspdRate,20; },{},{}
1440,Battle_Hook_,Battle Hook,5,20,,900,140,,3,3,0x00004082,18,2,2,4,65,1,4,{ bonus2 bAddEff,Eff_Stun,500; bonus2 bAddRace,RC_DemiHuman,20; bonus2 bAddRace,RC_Player,20; skill "KN_PIERCE",3; },{},{}
-1441,Blue_Spear,Blue Spear,5,10,,1200,180:170,,3,1,0x00004000,56,2,2,3,100,1,4,{ bonus bDex,5; bonus bInt,5; },{},{}
+1441,Ru_Blue_Spear,Blue Spear,5,10,,1200,180:170,,3,1,0x00004000,56,2,2,3,100,1,4,{ bonus bDex,5; bonus bInt,5; },{},{}
1442,Ru_Gold_Spear,Ru Gold Spear,5,0,,1200,180,,3,2,0x00004000,56,2,2,3,120,1,4,{ bonus bStr,8; bonus bAgi,8; },{},{}
-1443,Crimson_Spear,Crimson Spear,5,20,,900,90,,3,2,0x00004082,56,2,2,3,70,1,4,{ .@r = getrefine(); bonus bBaseAtk,((BaseLevel/10)*5)+(.@r<=15?pow(.@r,2):225); },{},{}
+1443,Crimson_Spear,Crimson Spear,5,20,,900,90,,3,2,0x00004082,63,2,2,3,70,1,4,{ .@r = getrefine(); bonus bBaseAtk,((BaseLevel/10)*5)+(.@r<=15?pow(.@r,2):225); },{},{}
1446,Requiem_Spear,Requiem Spear,5,20,,1000,130,,3,,0x00004080,63,2,2,4,100,1,4,{ .@r = getrefine(); .@b = 40; bonus bUnbreakableWeapon,1; if(.@r>=5){ .@b += (.@r-5)*15+20; } bonus2 bAddRace2,RC2_BioLab,.@b; },{},{}
//===================================================================
// 2-Handed Spears
@@ -841,7 +841,7 @@
1493,Metal_Lance,Metal Lance,5,20,,0,100,,3,1,0x00004082,63,2,34,3,1,1,5,{ bonus bBaseAtk,(getrefine()*6); .@i = min(BaseLevel/10,12); if(.@i>2) bonus bBaseAtk,((.@i-2)*5); },{},{}
1494,Undine_Spear,Spear Of Odin,5,50000,,3800,190,,3,3,0x00004082,63,2,34,4,105,1,5,{ bonus bAtkEle,Ele_Water; },{},{}
1495,TE_Woe_Lance,TE Woe Lance,5,0,,0,150,,3,0,0x00004082,63,2,34,3,40,1,5,{ bonus2 bAddRace,RC_Player,40; bonus2 bAddEff,Eff_Blind,3000; },{},{}
-1496,Thanos_Long_Spear,Thanatos Long Spear,5,10,,3750,250:50,,3,1,0x00004082,63,2,34,4,120,1,5,{ bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000; },{},{ heal -1000,0; }
+1496,Thanos_Long_Spear,Thanatos Long Spear,5,10,,3750,250:50,,3,1,0x00004082,56,2,34,4,120,1,5,{ bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000; },{},{ heal -1000,0; }
1497,Hell_Fire_,Hellfire,5,20,,3500,200,,3,3,0x00004082,63,2,34,4,48,1,5,{ bonus bAtkEle,Ele_Fire; bonus3 bAutoSpell,"MG_FIREBALL",5,100; bonus bStr,3; },{},{}
1498,Crimson_Lance,Crimson Lance,5,20,,1750,175,,1,2,0x00004082,63,2,34,3,70,1,5,{ .@r = getrefine(); bonus bBaseAtk,((BaseLevel/10)*5)+(.@r<=15?pow(.@r,2):225); },{},{}
1499,Requiem_Lance,Requiem Lance,5,20,,1500,220,,3,,0x00004080,63,2,34,4,100,1,5,{ .@r = getrefine(); .@b = 40; .@c = 5; bonus bUnbreakableWeapon,1; if(.@r>=5){ .@b += (.@r-5)*15+30; .@c += (.@r-5); } bonus2 bAddRace2,RC2_BioLab,.@b; bonus2 bSubRace2,RC2_BioLab,.@c; },{},{}
@@ -931,9 +931,9 @@
1578,Book_Of_Prayer,Book Of Prayer,5,20,,0,140,,1,0,0x00410100,63,2,2,3,0,0,15,{ bonus bVit,2; bonus bMdef,2; bonus bMaxSPrate,10; },{},{}
1579,Death_Note_M,Book of the Dead,5,20,,1000,137,,1,2,0x00410100,63,2,2,4,85,1,15,{ bonus bMatkRate,15; bonus bStr,3; bonus bInt,3; bonus bLuk,-20; bonus2 bComaRace,RC_DemiHuman,10; bonus2 bComaRace,RC_Player,10; bonus bAspdRate,getrefine(); if(BaseJob==Job_Sage) bonus3 bAutoSpell,"NPC_HELLJUDGEMENT",5,20; },{},{}
1580,Encyclopedia_C,Giant Encyclopedia,5,0,,0,145:100,,1,0,0x00410100,63,2,2,3,0,0,15,{ bonus bMatkRate,15; bonus bInt,3; bonus bDex,2; bonus bCritical,20+((readparam(bLuk)*2)/10); bonus2 bAddSize,Size_All,40; },{},{}
-1581,F_Diary_Of_Great_Sage_C,Diary Of Great Sage,5,1,,0,135,,1,2,0x00410100,63,2,2,3,1,0,15,{},{},{}
+1581,F_Diary_Of_Great_Sage_C,Diary Of Great Sage,5,1,,0,135,,1,2,0x00410100,63,2,2,3,1,0,15,{ bonus bMatkRate,20; bonus bAspdRate,5; },{},{}
1582,E_Diary_Of_Great_Sage_C,Diary Of Great Sage,5,1,,0,135,,1,2,0x00410100,63,2,2,3,1,0,15,{},{},{}
-1583,P_Book1,Eden Book I,5,0,,0,135:110,,1,0,0x00410100,63,2,2,3,60,0,15,{},{},{}
+1583,P_Dic1,Eden Book I,5,0,,0,135:110,,1,0,0x00410100,63,2,2,3,60,0,15,{},{},{}
1584,Chilly_Spell_Book,Cold Magic Book,5,56000,,1000,100:160,,1,2,0x00010000,63,2,2,4,100,1,15,{ bonus bAtkEle,Ele_Water; bonus bUnbreakableWeapon,1; bonus bDex,1; .@r = getrefine(); bonus2 bSkillAtk,"MG_COLDBOLT",(.@r*3); bonus2 bSkillAtk,"SO_DIAMONDDUST",(.@r*3); bonus2 bSkillUseSP,"MG_COLDBOLT",-(.@r*5); bonus2 bSkillUseSP,"SO_DIAMONDDUST",-(.@r*5); },{},{}
1585,Upg_Book,Upg Book,5,20,,600,45:20,,1,1,0x00410100,63,2,2,3,1,1,15,{ .@r = getrefine(); bonus bBaseAtk,(.@r*10); bonus bMatk,(.@r*5); if(BaseLevel>70) bonus bMatk,(((BaseLevel-70)/10)*5); },{},{}
1586,Velum_Bible,Vellum Bible,5,20,,600,110:125,,1,0,0x00410100,63,2,2,4,95,1,15,{ if(BaseLevel>104) { bonus bHealPower,(BaseLevel/5)-20; if(getrefine()>=6) { bonus2 bSkillCooldown,"AB_LAUDAAGNUS",-3000; bonus2 bSkillCooldown,"AB_LAUDARAMUS",-3000; bonus2 bSkillCooldown,"AB_CLEARANCE",-10000; bonus2 bSkillUseSP,"AB_LAUDAAGNUS",-60; bonus2 bSkillUseSP,"AB_LAUDARAMUS",-60; bonus2 bSkillUseSP,"AB_CLEARANCE",-60; } } },{},{}
@@ -1002,7 +1002,7 @@
1650,P_Staff1,Eden Staff I,5,0,,0,60:125,,1,0,0x00818314,63,2,2,2,26,0,10,{ bonus bInt,2; },{},{}
1651,P_Staff2,Eden Staff II,5,0,,0,60:150,,1,0,0x00818314,63,2,2,2,40,0,10,{ bonus bInt,3; },{},{}
1652,Tourist_Staff,Tourist Staff,5,0,,500,35:0,,1,0,0x00818315,63,2,2,1,1,0,10,{ bonus bMatkRate,15; bonus bInt,2; bonus bAgi,1; },{},{}
-1653,Staff_Of_Healing_C,Staff of Healing,5,20,,0,10:100,,1,0,0x00008110,63,2,2,3,1,0,10,{ bonus bAtkEle,Ele_Holy; },{},{}
+1653,Staff_Of_Healing_C,Staff of Healing,5,20,,0,10:100,,1,0,0x00008110,63,2,2,3,1,0,10,{ bonus bAtkEle,Ele_Holy; bonus bHealPower,18; },{},{}
1654,Mental_Stick,Mental Stick,5,20,,500,40:170,,1,1,0x00818315,63,2,2,3,102,1,10,{ .@r = getrefine(); if(.@r>5) { bonus2 bSkillAtk,"SO_PSYCHIC_WAVE",(.@r-5)*2; bonus bMaxHPrate,-(.@r-5)*2; } bonus2 bSkillVariableCast,"SO_PSYCHIC_WAVE",-3000; bonus2 bSkillUseSP,"SO_PSYCHIC_WAVE",-60; },{},{ itemheal 0,-100; }
1655,Adventure_Staff,Adventure Staff,5,0,,0,60,,1,0,0x00810204,63,2,2,1,1,0,10,{ bonus bUnbreakableWeapon,1; },{},{}
1656,Academy_Wand,Academy Wand,5,0,,600,60,,1,1,0x00810204,63,2,2,1,1,1,10,{ bonus bUnbreakableWeapon,1; },{},{}
@@ -1013,21 +1013,21 @@
1661,Mental_Destroyer,Mental Destroyer,5,20,,1400,100:50,,1,0,0x00000200,63,2,2,4,95,1,10,{ bonus bInt,10; bonus bUnbreakableWeapon,1; bonus bUseSPrate,100; bonus bMdef,20; bonus2 bSPVanishRate,10000,5; if(getrefine()>5) { bonus2 bSPVanishRate,10000,5; } },{},{}
1662,Bone_Wand_,Evil Bone Wand,5,20,,700,40:110,,1,2,0x00818314,63,2,2,3,24,1,10,{ bonus bInt,4; bonus bAtkEle,Ele_Undead; },{},{}
1663,Staff_Of_Bordeaux_,Staff Of Bordeaux,5,20,,500,30:180,,1,2,0x00010200,18,2,2,4,50,1,10,{ bonus bInt,2; bonus bDex,1; if(getskilllv("SA_DRAGONOLOGY") == 5) { bonus bUseSPrate,-15; bonus bInt,3; } },{},{}
-1664,Thorn_Staff_of_Darkness,Thorn Staff of Darkness,5,10,,700,60:160,,,1,0x14,50,2,2,4,75,1,8,{ bonus bInt,3; bonus bDex,3; bonus bVariableCastrate,-getrefine(); bonus bAtkEle,Ele_Dark; },{},{}
+1664,Thorn_Staff_,Thorn Staff of Darkness,5,10,,700,60:160,,,1,0x14,50,2,2,4,75,1,8,{ bonus bInt,3; bonus bDex,3; bonus bVariableCastrate,-getrefine(); bonus bAtkEle,Ele_Dark; },{},{}
1665,Piercing_Staff_,Piercing Staff,5,20,,500,80:145,,1,2,0x00018314,18,2,2,3,70,1,10,{ .@r = getrefine(); bonus bInt,4; bonus2 bIgnoreMdefClassRate,Class_Normal,10+.@r; bonus2 bIgnoreMdefClassRate,Class_Boss,10+.@r; },{},{}
1666,Healing_Staff_,Healing Staff,5,20,,400,10:105,,1,2,0x00008110,63,2,2,3,55,1,10,{ bonus bAtkEle,Ele_Holy; bonus bHealPower,(getrefine()*3/2); },{},{}
1667,TE_Woe_Staff,TE Woe Staff,5,0,,0,50:100,,1,0,0x00818315,63,2,2,3,40,1,10,{ bonus2 bMagicAddRace,RC_Player,10; bonus3 bAddEff,Eff_Blind,1000,ATF_MAGIC; bonus bHPRecovRate,5; bonus bSPRecovRate,5; },{},{}
1668,Sword_Stick,Sword Stick,5,10,,500,120:150,,,2,0x800200,63,2,2,4,80,1,10,{ bonus bAspdRate,10; },{},{}
-1669,Thanos_Staff,Thanatos Staff,5,10,,1000,100:200,,1,1,0x00018314,63,2,2,4,120,1,10,{ bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus bHealPower,15; bonus bMagicHPGainValue,500; bonus bMagicSPGainValue,50; bonus2 bHPLossRate,100,10000; },{},{ heal -1000,0; }
+1669,Thanos_Staff,Thanatos Staff,5,10,,1000,100:200,,1,1,0x00018314,56,2,2,4,120,1,10,{ bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus bHealPower,15; bonus bMagicHPGainValue,500; bonus bMagicSPGainValue,50; bonus2 bHPLossRate,100,10000; },{},{ heal -1000,0; }
1670,RWC_Memory_Staff,RWC Memory Staff,5,20,,500,25:30,,1,1,0x00818315,63,2,2,3,1,1,10,{ .@r = getrefine(); bonus bMatk,30*(.@r/3); if(.@r>=6) bonus2 bMagicAddClass,Class_All,(.@r>=9?10:5); if(.@r>=9) bonus4 bAutoSpell,"HW_MAGICPOWER",1,10,0; },{},{}
-1671,Devil_Won_Staff,Devil Won Staff,5,10,,800,30:155,,,1,0x00818315,63,2,2,3,100,1,10,{ bonus2 bAddRace,RC_Undead,10; bonus2 bAddRace,RC_Demon,10; bonus bMatkRate,10; },{},{}
+1671,Staff_Of_Evil_Slayer,Devil Won Staff,5,10,,800,30:155,,,1,0x00818315,63,2,2,3,100,1,10,{ bonus2 bAddRace,RC_Undead,10; bonus2 bAddRace,RC_Demon,10; bonus2 bMagicAddRace,RC_Undead,10; bonus2 bMagicAddRace,RC_Demon,10; .@r = getrefine(); if(.@r>=12) bonus bMatkRate,7; else if(.@r>=9) bonus bMatkRate,5; },{},{}
1673,Half_BF_Staff4,Half BF Staff4,5,20,,0,70:125,,1,0,0x00818314,63,2,2,3,80,1,10,{ bonus bInt,3; bonus bDex,2; bonus bDelayRate,-10; bonus2 bSPLossRate,5,12000; bonus bUnbreakableWeapon,1; },{},{}
1674,Half_BF_Staff2,Half BF Staff2,5,20,,0,70:125,,1,0,0x00818314,63,2,2,3,80,1,10,{ bonus bInt,3; bonus bDex,3; bonus2 bMagicAddRace,RC_DemiHuman,10; bonus2 bMagicAddRace,RC_Player,10; bonus3 bAddEff,Eff_Stun,200,ATF_SKILL; bonus bUnbreakableWeapon,1; },{},{}
1675,Walking_Stick_,Gentleman's Staff,5,20,,500,40:125,,1,3,0x00818314,63,2,2,4,50,1,10,{ bonus bDex,1; },{},{}
1676,Baculum_Daemonicum,Baculum Daemonicum,5,20,,1200,60:150,,1,2,0x00818315,63,2,2,4,80,1,10,{ bonus bAtkEle,Ele_Dark; bonus bUnbreakableWeapon,1; bonus bVariableCastrate,-10; if (BaseLevel > 99){ bonus bMatk,30; } if(getrefine() > 8){ bonus2 bResEff,Eff_Blind,3000; bonus bUseSPrate,-10; } },{},{}
-1677,Blue_Wand,Blue Wand,5,10,,0,50,,1,1,0x00000200,56,2,2,3,100,1,10,{ bonus bStr,5; bonus bInt,5; },{},{}
+1677,Ru_Blue_Wand,Blue Wand,5,10,,0,50:200,,1,1,0x00000200,56,2,2,3,100,1,10,{ bonus bDex,5; bonus bInt,5; },{},{}
1678,Ru_Gold_Wand,Ru Gold Wand,5,0,,0,50,,1,2,0x00000200,56,2,2,3,120,1,10,{ bonus bDex,8; bonus bInt,8; },{},{}
-1679,Rafini_Staff_,Laphine Staff,5,20,,500,30:180,,1,2,0x00818315,63,2,2,3,100,1,10,{ bonus bFixedCastRate,-getrefine(); },{},{}
+1679,Rafini_Staff_S,Laphine Staff,5,20,,500,30:180,,1,2,0x00818315,63,2,2,3,100,1,10,{ bonus bFixedCastRate,-getrefine(); },{},{}
1680,Crimson_One-Handed_Staff,Crimson One-Handed Staff,5,10,,600,60:70,,1,2,0x00818315,63,2,2,3,70,1,10,{ .@r = getrefine(); bonus bInt,4; bonus bMatk,((BaseLevel/10)*5)+(.@r<=15?pow(.@r,2):225); bonus bUnbreakableWeapon,1; },{},{}
1681,Short_Foxtail_Staff,Short Foxtail Staff,5,20,,0,30,,1,0,0x80000000,7,2,2,1,1,1,10,{},{},{}
1682,Shadow_Staff,Shadow Staff,5,0,,600,70:130,,1,2,0x00000200,56,2,2,4,90,1,10,{ .@r = getrefine(); bonus2 bSkillAtk,"WL_HELLINFERNO",(getskilllv("WL_HELLINFERNO") >= 5 ? 100 : 0) + (.@r*10); bonus2 bIgnoreMdefRaceRate,RC_All,5; autobonus "{ bonus2 bVariableCastrate,\"WL_HELLINFERNO\",-30; }",.@r*20,5000,BF_MAGIC,"{ specialeffect2 EF_SPELLBREAKER }"; },{},{}
@@ -1165,7 +1165,8 @@
1832,Velum_Claw,Vellum Claw,5,20,,650,160,,1,0,0x00008100,63,2,2,4,95,1,12,{ bonus2 bAddRace,RC_Player,100; .@r = getrefine(); if(.@r>7) { bonus2 bAddRace,RC_Player,20; } if(.@r>9) { bonus2 bVariableCastrate,"MO_EXTREMITYFIST",-100; bonus2 bFixedCastrate,"MO_EXTREMITYFIST",-100; bonus4 bAutoSpellOnSkill,"MO_EXPLOSIONSPIRITS","CH_SOULCOLLECT",1,10000; bonus2 bHPLossRate,500,3000; } },{},{}
1833,Claw_Of_Flash,Claw of Flash,5,60000,,400,140,,1,2,0x00008100,63,2,2,4,105,1,12,{ bonus bAspd,1; bonus bAspdRate,getrefine(); bonus2 bAddSize,Size_Medium,getrefine(); },{},{}
1834,TE_Woe_Fist,TE Woe Fist,5,0,,0,150,,1,0,0x00008100,63,2,2,3,40,1,12,{ bonus2 bAddRace,RC_Player,40; bonus2 bAddEff,Eff_Freeze,3000; },{},{}
-1836,Thanos_Knuckle,Thanatos Knuckle,5,10,,600,160:100,,1,1,0x00008000,63,2,2,4,120,1,12,{ bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000; },{},{ heal -1000,0; }
+1835,Spartacus,Spartacus,5,0,,600,100,,1,2,0x00008100,63,2,2,4,50,1,12,{ bonus bUnbreakableWeapon,1; .@r = getrefine(); bonus2 bAddClass,Class_All,.@r; if(.@r>9) { bonus bNoSizeFix,0; } },{},{}
+1836,Thanos_Knuckle,Thanatos Knuckle,5,10,,600,160:100,,1,1,0x00008000,56,2,2,4,120,1,12,{ bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000; },{},{ heal -1000,0; }
1837,Iron_nail,Iron Nail,5,10,,1500,100,,,1,0x00008100,63,2,2,3,50,1,12,{ bonus bAspdRate,-5; bonus bAspdRate,((getrefine()+1)/2); },{},{}
1838,Half_BF_Knuckle1,Half BF Knuckle1,5,20,,0,30,,1,0,0x00008100,63,2,2,3,80,1,12,{ bonus bStr,2; bonus bAgi,1; bonus2 bAddRace,RC_DemiHuman,30; bonus2 bAddRace,RC_Player,30; bonus2 bIgnoreDefRaceRate,RC_DemiHuman,10; bonus2 bIgnoreDefRaceRate,RC_Player,10; bonus4 bAutoSpell,"CH_SOULCOLLECT",1,5,0; bonus bUnbreakableWeapon,1; },{},{}
1839,Crimson_Knuckles,Crimson Knuckles,5,20,,1000,100,,1,2,0x00008100,63,2,2,3,70,1,12,{ .@r = getrefine(); bonus bBaseAtk,((BaseLevel/10)*5)+(.@r<=15?pow(.@r,2):225); bonus bUnbreakableWeapon,1; },{},{}
@@ -1205,12 +1206,12 @@
1928,Berserk_Guitar_I,Spirited Guitar,5,0,,0,40,,1,0,0x00080000,18,1,2,4,0,0,13,{ bonus bAspdRate,100; bonus bHPrecovRate,-100; bonus2 bHPLossRate,50,5000; bonus bDex,-readparam(bDex); },{},{}
1929,Guitar_C,Guitar,5,0,,0,177,,1,0,0x00080000,63,1,2,3,1,0,13,{ bonus2 bAddSize,Size_All,40; },{},{}
1930,Green_Whistle,Green Whistle,5,20,,800,170:50,,1,1,0x00080000,63,1,2,3,102,1,13,{ .@r = getrefine(); if(.@r>5) { bonus2 bSkillUseSP,"MI_RUSH_WINDMILL",(.@r-5)*4; bonus2 bSkillUseSP,"WM_LULLABY_DEEPSLEEP",(.@r-5)*4; } bonus2 bSkillVariableCast,"MI_RUSH_WINDMILL",-2000; bonus2 bSkillVariableCast,"WM_LULLABY_DEEPSLEEP",-2000; },{},{}
-1931,P_Guitar1,Eden Guitar I,5,0,,0,125,,1,0,0x00080000,63,1,2,3,60,0,13,{},{},{}
+1931,P_String_Inst1,Eden Guitar I,5,0,,0,125,,1,0,0x00080000,63,1,2,3,60,0,13,{},{},{}
1932,TE_Woe_Guitar,TE Woe Guitar,5,0,,0,100,,1,0,0x00080000,63,1,2,3,40,1,13,{ bonus2 bAddRace,RC_Player,40; bonus2 bAddEff,Eff_Poison,3000; },{},{}
-1933,Tanos_Violin,Tanos Violin,5,10,,2000,200:130,,,1,0x00080000,63,1,2,4,120,1,13,{ bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus bLongAtkRate,20; bonus2 bHPLossRate,100,10000; },{},{}
-1934,Contrabass,Contrabass,5,20,,250,180:120,,1,2,0x00080000,63,1,2,3,130,1,13,{ bonus2 bSkillCooldown,"WM_RANDOMIZESPELL",-20; },{},{}
-1935,Ozs_New_Ukulele,Oz's New Ukulele,5,20,,2000,160,,1,2,0x00080000,63,1,2,4,130,1,13,{ bonus2 bSkillUseSP,"MI_RUSH_WINDMILL",-20; },{},{}
-1936,Blue_Violin,Blue Violin,5,10,,1500,180,,2,1,0x00080000,63,1,2,3,100,1,13,{ bonus bDex,5; bonus bVit,5; },{},{}
+1933,Thanos_Violin,Thanatos Violin,5,10,,2000,200:130,,1,1,0x00080000,56,1,2,4,120,1,13,{ bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus bLongAtkRate,20; bonus2 bHPLossRate,100,10000; },{},{ heal -1000,0; }
+1934,Contabass,Contrabass,5,20,,250,180:120,,1,2,0x00080000,63,1,2,3,130,1,13,{ bonus2 bSkillCooldown,"WM_RANDOMIZESPELL",-20; },{},{}
+1935,Ukulele_Of_Newoz,Oz's New Ukulele,5,20,,2000,160,,1,2,0x00080000,63,1,2,4,130,1,13,{ bonus2 bSkillUseSP,"MI_RUSH_WINDMILL",-20; },{},{}
+1936,Ru_Blue_Violin,Blue Violin,5,10,,1500,180,,2,1,0x00080000,63,1,2,3,100,1,13,{ bonus bDex,5; bonus bVit,5; },{},{}
1937,Ru_Gold_Violin,Ru Gold Violin,5,0,,1500,180,,1,2,0x00080000,56,2,2,3,120,1,13,{ bonus bDex,8; bonus bVit,8; },{},{}
1938,Infinity_Violin,Infinity Violin,5,10,,500,150,,2,1,0x00080000,56,1,2,4,100,1,13,{},{},{}
1939,Crimson_Violin,Crimson Violin,5,20,,800,80,,2,2,0x00080000,63,1,2,3,70,1,13,{ .@r = getrefine(); bonus bBaseAtk,((BaseLevel/10)*5)+(.@r<=15?pow(.@r,2):225); },{},{}
@@ -1258,10 +1259,10 @@
1985,Rosebine,Rosebine,5,20,,1000,100:130,,1,0,0x00080000,63,0,2,4,110,1,14,{ bonus bInt,2; bonus bAgi,-2; bonus3 bAutoSpell,"WM_VOICEOFSIREN",1,20; },{},{}
1986,P_Tail1,Eden Tail I,5,0,,0,125,,2,0,0x00080000,63,0,2,3,60,0,14,{},{},{}
1987,TE_Woe_Rope,TE Woe Rope,5,0,,0,100,,2,0,0x00080000,63,0,2,3,40,1,14,{ bonus2 bAddRace,RC_Player,40; bonus2 bAddEff,Eff_Blind,3000; },{},{}
-1988,Tanos_Whip_Sword,Tanos Whip Sword,5,10,,2200,200:130,,,1,0x00080000,63,0,2,4,120,1,14,{ bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus bLongAtkRate,20; bonus2 bHPLossRate,100,10000; },{},{}
-1989,Rhythmic_Gymnastics_Ribbon,Rhythmic Gymnastics Ribbon,5,20,,300,150:120,,2,2,0x00080000,63,0,2,3,130,1,14,{ bonus bAspdRate,20; },{},{}
-1990,Bloody_Floral_Decoration_Microphone,Bloody Floral Decoration Microphone,5,20,,1000,160,,2,2,0x00080000,63,0,2,4,130,1,14,{ bonus2 bSkillUseSP,"CG_MOONLIT",-20; },{},{}
-1991,Blue_Whip,Blue Whip,5,10,,1500,180,,2,1,0x00080000,63,0,2,3,100,1,14,{ bonus bDex,5; bonus bVit,5; },{},{}
+1988,Thanos_Whip,Thanatos Whip,5,10,,2200,200:130,,2,1,0x00080000,56,0,2,4,120,1,14,{ bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus bLongAtkRate,20; bonus2 bHPLossRate,100,10000; },{},{ heal -1000,0; }
+1989,Gymnastics_Ribbon,Rhythmic Gymnastics Ribbon,5,20,,300,150:120,,2,2,0x00080000,63,0,2,3,130,1,14,{ bonus bAspdRate,20; },{},{}
+1990,Floral_Mic_Of_Igu,Bloody Floral Decoration Microphone,5,20,,1000,160,,2,2,0x00080000,63,0,2,4,130,1,14,{ bonus2 bSkillUseSP,"CG_MOONLIT",-20; },{},{}
+1991,Ru_Blue_Whip,Blue Whip,5,10,,1500,180,,2,1,0x00080000,63,0,2,3,100,1,14,{ bonus bDex,5; bonus bVit,5; },{},{}
1992,Ru_Gold_Whip,Ru Gold Whip,5,0,,1500,180,,2,2,0x00080000,56,2,2,3,120,1,14,{ bonus bDex,8; bonus bVit,8; },{},{}
1994,Infinity_Whip,Infinity Whip,5,10,,500,150,,2,1,0x00080000,56,0,2,4,100,1,14,{},{},{}
1995,Crimson_Whip,Crimson Whip,5,20,,800,80,,2,2,0x00080000,63,0,2,3,70,1,14,{ .@r = getrefine(); bonus bBaseAtk,((BaseLevel/10)*5)+(.@r<=15?pow(.@r,2):225); },{},{}
@@ -1292,12 +1293,12 @@
2019,TE_Woe_Two_Hand_Staff,TE Woe Two Hand Staff,5,0,,0,50:130,,1,0,0x00818315,63,2,34,3,40,1,23,{ bonus2 bMagicAddRace,RC_Player,20; bonus3 bAddEff,Eff_Stun,1000,ATF_MAGIC; bonus bHPRecovRate,5; bonus bSPRecovRate,5; },{},{}
2020,Jormungand,Jormungand,5,10,,3000,200:280,,,0,0x810200,63,2,34,4,1,0,23,{ bonus bInt,20; bonus bUnbreakableWeapon,1; },{},{}
2021,Ganbantein,Ganbantein,5,0,,2000,100:320,,1,0,0x00000200,56,2,2,4,100,1,10,{ bonus bInt,25; bonus bDex,25; bonus3 bAddEff,Eff_Poison,1000,ATF_MAGIC; bonus3 bAutoSpell,"AB_SILENTIUM",1,100; bonus bUnbreakableWeapon,1; },{},{}
-2022,Geffen_Staff,Staff of Geffen,5,20,,1000,100:300,,1,1,0x00000200,18,2,34,1,150,1,23,{ bonus bInt,20; },{},{}
-2023,Tanos_Two-handed_Stick,Tanos Two-handed Stick,5,10,,1400,120:250,,,1,0x810200,63,2,34,4,120,1,23,{ bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus bHealPower,18; bonus2 bHPLossRate,100,10000; },{},{}
+2022,Staff_Of_Geffen,Staff of Geffen,5,20,,1000,100:300,,1,1,0x00000200,18,2,34,1,150,1,23,{ bonus bInt,20; },{},{}
+2023,Thanos_Rod,Thanatos Two-Handed Staff,5,10,,1400,120:250,,1,1,0x00018314,56,2,34,4,120,1,23,{ bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus bHealPower,18; bonus bMagicHPGainValue,500; bonus bMagicSPGainValue,50; bonus2 bHPLossRate,100,10000; },{},{ heal -1000,0; }
2024,Infinity_Two-handed_Stick,Infinity Two-handed Stick,5,10,,500,30:170,,,1,0x810200,56,2,34,4,100,1,23,{},{},{}
2025,Crimson_Two-Handed_Staff,Crimson Two-Handed Staff,5,20,,1000,100,,1,2,0x800200,63,2,34,3,70,1,23,{ .@r = getrefine(); bonus bInt,5; bonus bMatk,150+((BaseLevel/10)*5)+(.@r<=15?pow(.@r,2):225); },{},{}
2026,Staff_of_Vicious_Mind,Staff of Vicious Mind,5,20,,1000,100:200,,1,1,0x00810204,63,2,34,4,160,1,23,{ bonus bMatk,pow(min(getrefine(),15),2); bonus bInt,6; bonus bUnbreakableWeapon,1; },{},{}
-2027,Sunflower_Kid,Sunflower Kid,5,10,,1500,150:320,,,2,0x00000200,40,2,34,4,170,1,23,{ bonus bInt,5; .@r = getrefine(); bonus bMatkRate,(.@r/2); bonus bDelayrate,(.@r*-1); bonus bUnbreakableWeapon,1; },{},{}
+2027,Sunflower_Kid,Sunflower Kid,5,10,,1500,150:320,,,2,0x00000200,56,2,34,4,170,1,23,{ bonus bInt,5; .@r = getrefine(); bonus bMatkRate,(.@r/2); bonus bDelayrate,(.@r*-1); bonus bUnbreakableWeapon,1; },{},{}
2030,Unity_Two-Handed_Staff,Unity Two-Handed Staff,5,20,,500,95:135,,1,1,0x800200,63,2,34,3,1,1,23,{ bonus bMatk,pow(getrefine(),2)*125/100; },{},{}
2032,Requiem_Wizardry_Staff,Requiem Wizardry Staff,5,20,,500,100:230,,1,,0xFFFFFFFF,63,2,2,4,100,1,10,{ .@r = getrefine(); .@b = 40; .@c = 5; if(.@r>=5){ .@b += (.@r-5)*15+20; .@c += .@r-5; } bonus2 bMagicAddRace2,RC2_BioLab,.@b; bonus2 bSubRace2,RC2_BioLab,.@c; bonus2 bIgnoreMdefRace2Rate,RC2_BioLab,(.@r-5)*10; },{},{}
//===================================================================
@@ -1379,22 +1380,22 @@
2174,Lumiere_Shield,Lumiere Shield,4,20,,1300,,50,,1,0xFFFFFFFF,63,2,32,,65,1,3,{},{},{}
2175,Esprit_Shield,Spirit Shield,4,20,,1300,,50,,1,0xFFFFFFFF,63,2,32,,65,1,3,{},{},{}
2176,Dark_Book,Black Book,4,20,,500,,80,,1,0xFFFFFFFF,63,2,32,,65,1,5,{ bonus bMdef,5; .@r = getrefine(); bonus3 bAutoSpellWhenHit,"NPC_DRAGONFEAR",1,(.@r<=6)?(10):((.@r<=8)?(20):(30)); },{},{}
-2177,Shield_Of_Death,Shield Of Death,4,20,,2000,,150,,1,0xFFFFFFFF,63,2,32,,90,1,3,{ bonus2 bAddClass,Class_Boss,2; bonus2 bMagicAddClass,Class_Boss,2; bonus2 bAddClass,Class_Normal,10; bonus2 bMagicAddClass,Class_Normal,10; },{},{}
-2178,TE_Woe_Buckler,TE Woe Buckler,4,0,,0,,15,,0,0xFFFFFFFF,63,2,32,1,40,1,2,{ bonus bMdef,15; bonus bMaxHP,100; bonus bMaxSP,100; bonus2 bSubRace,RC_Player,15; },{},{}
-2179,TE_Woe_Shield,TE Woe Shield,4,0,,0,,25,,0,0x000444A2,63,2,32,1,40,1,3,{ bonus bMdef,5; bonus bMaxHP,200; bonus2 bSubRace,RC_Player,20; },{},{}
-2180,TE_Woe_Magic_Guard,TE Woe Magic Guard,4,0,,0,,5,,0,0x00818315,63,2,32,1,40,1,1,{ bonus bMdef,25; bonus bMaxSP,200; bonus2 bSubRace,RC_Player,10; },{},{}
-2181,Hervor,Hervor,4,10,,1500,,100,,0,0xFFFFFFFF,63,2,32,,1,,2,{ bonus bMdef,5; bonus2 bSubRace,RC_All,30; bonus bUnbreakableArmor,1; },{},{}
-2182,Hervor_Alvitr,Hervor Alvitr,4,0,,3000,,150,,0,0x000FDF80,56,2,32,1,100,0,2,{ bonus bMdef,10; bonus bVit,20; bonus2 bSubRace,RC_All,30; bonus bUnbreakableShield,1; autobonus2 "{ sc_end SC_STUN; sc_end SC_SLEEP; sc_end SC_CURSE; sc_end SC_STONE; sc_end SC_POISON; sc_end SC_BLIND; sc_end SC_SILENCE; sc_end SC_BLEEDING; sc_end SC_CONFUSION; sc_end SC_FREEZE; bonus2 bResEff,Eff_Stun,10000; bonus2 bResEff,Eff_Sleep,10000; bonus2 bResEff,Eff_Curse,10000; bonus2 bResEff,Eff_Stone,10000; bonus2 bResEff,Eff_Poison,10000; bonus2 bResEff,Eff_Blind,10000; bonus2 bResEff,Eff_Silence,10000; bonus2 bResEff,Eff_Bleeding,10000; bonus2 bResEff,Eff_Confusion,10000; bonus2 bResEff,Eff_Freeze,10000; }",10,60000,BF_SHORT; },{},{}
+2177,Shield_Of_Death,Shield Of Death,4,20,,2000,,150,,1,0xFFFFFFFF,63,2,32,,90,1,3,{ bonus2 bAddClass,Class_Boss,2; bonus2 bMagicAddClass,Class_Boss,2; bonus2 bSubClass,Class_Normal,-10; },{},{}
+2178,TE_Woe_Buckler,TE Woe Buckler,4,0,,0,,15,,0,0xFFFFFFFF,63,2,32,,40,1,2,{ bonus bMdef,15; bonus bMaxHP,100; bonus bMaxSP,100; bonus2 bSubRace,RC_Player,15; },{},{}
+2179,TE_Woe_Shield,TE Woe Shield,4,0,,0,,25,,0,0x000444A2,63,2,32,,40,1,3,{ bonus bMdef,5; bonus bMaxHP,200; bonus2 bSubRace,RC_Player,20; },{},{}
+2180,TE_Woe_Magic_Guard,TE Woe Magic Guard,4,0,,0,,5,,0,0x00818315,63,2,32,,40,1,1,{ bonus bMdef,25; bonus bMaxSP,200; bonus2 bSubRace,RC_Player,10; },{},{}
+2181,Hervor,Hervor,4,10,,1500,,100,,0,0xFFFFFFFF,63,2,32,,1,,2,{ bonus bMdef,5; bonus2 bSubRace,RC_All,30; bonus bUnbreakableShield,1; },{},{}
+2182,Hervor_Alvitr,Hervor Alvitr,4,0,,3000,,150,,0,0x000FDF80,56,2,32,,100,0,2,{ bonus bMdef,10; bonus bVit,20; bonus2 bSubRace,RC_All,30; bonus bUnbreakableShield,1; autobonus2 "{ sc_end SC_STUN; sc_end SC_SLEEP; sc_end SC_CURSE; sc_end SC_STONE; sc_end SC_POISON; sc_end SC_BLIND; sc_end SC_SILENCE; sc_end SC_BLEEDING; sc_end SC_CONFUSION; sc_end SC_FREEZE; bonus2 bResEff,Eff_Stun,10000; bonus2 bResEff,Eff_Sleep,10000; bonus2 bResEff,Eff_Curse,10000; bonus2 bResEff,Eff_Stone,10000; bonus2 bResEff,Eff_Poison,10000; bonus2 bResEff,Eff_Blind,10000; bonus2 bResEff,Eff_Silence,10000; bonus2 bResEff,Eff_Bleeding,10000; bonus2 bResEff,Eff_Confusion,10000; bonus2 bResEff,Eff_Freeze,10000; }",10,60000,BF_SHORT; },{},{}
2183,Impr_Angel's_Safeguard,Advanced Angelic Guard,4,10000,,400,,30,,1,0x00000001,63,2,32,,99,1,1,{ bonus2 bSubRace,RC_Demon,5; bonus2 bSubEle,Ele_All,5; bonus2 bSubEle,Ele_Neutral,-5; },{},{}
-2185,Magic_Reflect,Magic Reflect,4,10,,1000,,50,,1,0xFFFFFFFF,63,2,32,,99,1,3,{ bonus bMdef,10; bonus bMagicDamageReturn,3+((getrefine()>=9) ? 3 : 0); },{},{}
-2186,Great_Encyclopedia_Revision,Great Encyclopedia Revision,4,10,,200,0:5,50,,1,0x00810100,63,2,32,,99,1,4,{ bonus bInt,3; bonus bDex,2; .@r = getrefine(); bonus bCritical,3+((.@r >= 7) ? 2 : 0); if(.@r >= 9) bonus bMatk,5; },{},{}
-2187,Shield_of_Gray,Shield of Gray,4,10,,2000,,75,,1,0xFFFFFFFF,56,2,32,,120,1,3,{ .@r = getrefine(); bonus2 bSubEle,Ele_Holy,30+.@r; bonus bMdef,9+.@r/3; },{},{}
+2185,Magic_Reflector,Magic Reflect,4,10,,1000,,50,,1,0xFFFFFFFF,63,2,32,,99,1,3,{ bonus bMdef,10; bonus bMagicDamageReturn,3+((getrefine()>=9) ? 3 : 0); },{},{}
+2186,Encyclopedia_Revision,Great Encyclopedia Revision,4,10,,200,0:5,50,,1,0x00810100,63,2,32,,99,1,4,{ bonus bInt,3; bonus bDex,2; .@r = getrefine(); bonus bCritical,3+((.@r >= 7) ? 2 : 0); if(.@r >= 9) bonus bMatk,5; },{},{}
+2187,Shield_Of_Gray,Shield of Gray,4,10,,2000,,75,,1,0xFFFFFFFF,56,2,32,,120,1,3,{ .@r = getrefine(); bonus2 bSubEle,Ele_Holy,30+.@r; bonus bMdef,9+.@r/3; },{},{}
2188,Svalinn_J,Svalinn,4,10,,500,,80,,1,0xFFFFFFFF,63,2,32,,65,1,3,{ .@r = getrefine(); bonus bMaxHP,9+.@r/3; bonus2 bAddEle,Ele_Water,4+.@r/3*5; },{},{}
2189,Mad_Bunny,Mad Bunny Shield,4,10,,100,,40,,1,0xFFFFFFFF,63,2,32,,30,1,6,{ bonus2 bSubEle,Ele_All,5; bonus bMdef,6; bonus bDex,1; },{},{}
2190,Ancient_Shield_Of_Aeon,Ancient Shield Of Aeon,4,0,,200,,5,,0,0x000FDF80,63,2,32,,130,1,2,{ bonus2 bSubEle,Ele_Neutral,10; bonus2 bSubEle,Ele_Fire,10; bonus2 bSubEle,Ele_Water,10; bonus2 bSubEle,Ele_Wind,10; bonus2 bSubEle,Ele_Earth,10; bonus2 bSubEle,Ele_Dark,10; bonus2 bSubEle,Ele_Holy,10; bonus2 bSubEle,Ele_Ghost,10; bonus bMaxHP,500; bonus bMaxSP,50; if(getrefine()>=14) skill "MG_STONECURSE",5; },{},{}
-2195,Lian_Shield,Lian Shield,4,0,,1300,,50,,1,0xFFFFFFFF,63,2,32,1,65,1,,{ bonus2 bSubEle,Ele_Neutral,5; bonus2 bSubRace,RC_Formless,-5; },{},{}
-2196,White_Gold_Shield,White Gold Shield,4,0,,1800,,140,,1,0xFFFFFFFF,63,2,32,,,1,,{ autobonus2 "{ bonus bMagicDamageReturn,20; }",100,2000,BF_MAGIC; /* Confirm: Success rate? */ },{},{}
-2198,Lapine_Shield,Lapine Shield,4,0,,1000,,25,,1,0xFFFFFFFF,63,2,32,,100,1,,{ bonus bMdef,10; if (getrefine() > 7) { bonus bMatk,20; } },{},{}
+2195,Lian_Shield,Lian Shield,4,0,,1300,,50,,1,0xFFFFFFFF,63,2,32,,65,1,3,{ bonus2 bSubEle,Ele_Neutral,5; bonus2 bSubRace,RC_Formless,-5; },{},{}
+2196,White_Gold_Shield,White Gold Shield,4,0,,1800,,140,,1,0xFFFFFFFF,63,2,32,,,1,4,{ autobonus2 "{ bonus bMagicDamageReturn,20; }",100,2000,BF_MAGIC; /* Confirm: Success rate? */ },{},{}
+2198,Lapine_Shield,Lapine Shield,4,0,,1000,,25,,1,0xFFFFFFFF,63,2,32,,100,1,3,{ bonus bMdef,10; if (getrefine() > 7) { bonus bMatk,20; } },{},{}
// GM Shield
2199,Ahura_Mazda,Ahura Mazdah,4,1,,10,,10000,,0,0xFFFFFFFF,63,2,32,,1,1,1,{ bonus bAllStats,50; bonus bMdef,99; bonus bShortWeaponDamageReturn,100; bonus2 bSubRace,RC_DemiHuman,95; bonus2 bSubRace,RC_Player,95; skill "CR_FULLPROTECTION",5; skill "WZ_ESTIMATION",1; skill "ST_FULLSTRIP",5; skill "HW_MAGICPOWER",10; skill "ECL_SNOWFLIP",1; skill "ECL_PEONYMAMY",1; skill "ECL_SADAGUI",1; skill "ECL_SEQUOIADUST",1; bonus bMaxHPrate,200; bonus bNoKnockback,0; bonus bDelayRate,-20; bonus bSpeedRate,25; bonus bIntravision,1; },{ sc_start4 SC_ENDURE,60000,10,0,0,1; },{ sc_end SC_ENDURE; }
//===================================================================
@@ -1698,9 +1699,9 @@
2493,Goibne's_Combat_Boots_,Goibne's Greaves,4,30000,,700,,13,,1,0xFFFFFFFE,63,2,64,,54,1,0,{ bonus bMdef,3; bonus bMaxHPrate,5; bonus bMaxSPrate,5; },{},{}
2494,Chrystal_Pumps_,Crystal Pumps,4,20,,100,,5,,1,0xFFFFFFFE,63,0,64,,0,1,0,{ bonus bMdef,10; bonus bLuk,5; },{},{}
2495,Egir_Shoes,Egir Shoes,4,200000,,300,,13,,1,0xFFFFFFFF,63,2,64,,110,1,0,{ if(BaseClass==Job_Mage||BaseClass==Job_Archer||BaseClass==Job_Acolyte) bonus bMaxHP,BaseLevel*5; else if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief) bonus bMaxSP,JobLevel*2; },{},{}
-2496,TE_Woe_Shoes,TE Woe Shoes,4,0,,0,,5,,0,0xFFFFFFFF,63,2,64,0,40,1,,{ bonus bMdef,5; bonus bMaxHP,150; bonus bMaxSP,150; bonus2 bAddRace,RC_Player,5; bonus2 bMagicAddRace,RC_Player,5; bonus2 bResEff,Eff_Freeze,25; },{},{}
-2497,TE_Woe_Boots,TE Woe Boots,4,0,,0,,10,,0,0x000444A2,63,2,64,0,40,1,,{ bonus bMaxHP,200; bonus bMaxSP,100; bonus2 bAddRace,RC_Player,10; bonus2 bResEff,Eff_Freeze,25; },{},{}
-2498,TE_Woe_Magic_Sandal,TE Woe Magic Sandal,4,0,,0,,5,,0,0x00818315,63,2,64,1,40,1,,{ bonus bMdef,5; bonus bMaxHP,100; bonus bMaxSP,200; bonus2 bMagicAddRace,RC_Player,5; bonus2 bResEff,Eff_Freeze,25; },{},{}
+2496,TE_Woe_Shoes,TE Woe Shoes,4,0,,0,,5,,0,0xFFFFFFFF,63,2,64,,40,1,,{ bonus bMdef,5; bonus bMaxHP,150; bonus bMaxSP,150; bonus2 bAddRace,RC_Player,5; bonus2 bMagicAddRace,RC_Player,5; bonus2 bResEff,Eff_Freeze,25; },{},{}
+2497,TE_Woe_Boots,TE Woe Boots,4,0,,0,,10,,0,0x000444A2,63,2,64,,40,1,,{ bonus bMaxHP,200; bonus bMaxSP,100; bonus2 bAddRace,RC_Player,10; bonus2 bResEff,Eff_Freeze,25; },{},{}
+2498,TE_Woe_Magic_Sandal,TE Woe Magic Sandal,4,0,,0,,5,,0,0x00818315,63,2,64,,40,1,,{ bonus bMdef,5; bonus bMaxHP,100; bonus bMaxSP,200; bonus2 bMagicAddRace,RC_Player,5; bonus2 bResEff,Eff_Freeze,25; },{},{}
2499,Temporal_Boots,Temporal Boots,4,400,,600,,20,,0,0xFFFFFFFF,63,2,64,,10,1,,{ .@r = getrefine(); bonus bMaxHP,300; bonus bMaxSP,30; bonus bMaxHP,100*(.@r/3); bonus bMaxSP,10*(.@r/3); },{},{}
//===================================================================
// Garments
@@ -1764,7 +1765,7 @@
2557,Freyja_SScarf60,Freyja Soul Scarf,4,20,,400,,4,,0,0xFFFFFFFF,63,2,4,,20,0,0,{ bonus bFlee,15; bonus2 bSubEle,Ele_Neutral,15; },{},{}
2558,Freyja_SScarf90,Freyja Soul Scarf,4,20,,400,,4,,0,0xFFFFFFFF,63,2,4,,20,0,0,{ bonus bFlee,15; bonus2 bSubEle,Ele_Neutral,15; },{},{}
2559,Time_Keepr_Manteau,Time Keeper's Manteau,4,30000,,0,,9,,0,0xFFFFFFFF,63,2,4,,1,1,0,{ bonus bMdef,1; bonus bFlee,10; bonus2 bSubEle,Ele_Neutral,10; },{},{}
-2560,Para_Team_Manteau1,Eden Team Manteau I,4,0,,0,,14,,0,0xFFFFFFFF,63,2,4,,12,0,0,{ bonus2 bSubEle,Ele_Neutral,10; },{},{}
+2560,Para_Team_Manteau,Eden Team Manteau I,4,0,,0,,14,,0,0xFFFFFFFF,63,2,4,,12,0,0,{ bonus2 bSubEle,Ele_Neutral,10; },{},{}
2561,Upg_Hood,Upg Hood,4,0,,100,,9,,1,0xFFFFFFFF,63,2,4,,0,1,0,{ bonus bMaxHPrate,3; },{},{}
2562,Upg_Muffler,Upg Muffler,4,20,,200,,13,,1,0xFFFFFFFE,63,2,4,,0,1,0,{ bonus bMaxHPrate,3; },{},{}
2563,Upg_Manteau,Upg Manteau,4,20,,300,,18,,1,0x006654E2,63,2,4,,0,1,0,{ bonus bMaxHPrate,3; },{},{}
@@ -1837,8 +1838,8 @@
2631,First_Age_Ring,Celebration Ring,4,1,,10,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus bAllStats,5; },{},{}
2632,Korean_Trinket,Korean Trinket,4,125000,,100,,1,,0,0xFFFFFFFE,63,2,136,,65,0,0,{ bonus bVit,1; bonus bDex,1; bonus bLuk,1; },{},{}
2633,Jade_Ring,Jade Ring,4,204000,,100,,0,,0,0xFFFFFFFE,63,2,136,,80,0,0,{ bonus bStr,2; bonus bInt,1; },{},{}
-2634,Bridegroom_Ring,Wedding Ring,4,0,,0,,0,,0,0xFFFFFFFF,63,1,136,,0,0,0,{ skill "WE_MALE",1; skill "WE_FEMALE",1; skill "WE_CALLPARTNER",1; },{},{}
-2635,Bride_Ring,Wedding Ring,4,0,,0,,0,,0,0xFFFFFFFF,63,0,136,,0,0,0,{ skill "WE_MALE",1; skill "WE_FEMALE",1; skill "WE_CALLPARTNER",1; },{},{}
+2634,Bridegroom_Ring,Wedding Ring,4,0,,0,,0,,0,0xFFFFFFFF,63,1,136,,0,0,0,{ skill "WE_MALE",1; skill "WE_FEMALE",1; skill "WE_CALLPARTNER",1; skill "WE_CALLALLFAMILY",1; skill "WE_ONEFOREVER",1; },{},{}
+2635,Bride_Ring,Wedding Ring,4,0,,0,,0,,0,0xFFFFFFFF,63,0,136,,0,0,0,{ skill "WE_MALE",1; skill "WE_FEMALE",1; skill "WE_CALLPARTNER",1; skill "WE_CALLALLFAMILY",1; skill "WE_ONEFOREVER",1; },{},{}
2636,Gold_Ring_,Gold Christmas Ring,4,30000,,100,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus bLuk,1; },{},{}
2637,Silver_Ring_,Silver Christmas Ring,4,20000,,100,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus bLuk,1; },{},{}
2638,Exorcize_Sachet,Sacred Incense,4,20000,,100,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus bStr,1; bonus bLuk,1; },{},{}
@@ -1910,7 +1911,7 @@
2704,Golden_Accessory,Golden Accessories,4,20,,100,,4,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus bMdef,4; },{},{}
2705,Golden_Accessory2,Golden Accessories,4,20,,100,,4,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus2 bAddMonsterDropItem,12018,500; },{},{}
2706,Handcuff,Arrest Handcuffs,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{},{},{}
-2707,GUSLI,GUSLI,4,20,,100,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{},{},{}
+2707,Gusli,GUSLI,4,20,,100,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{},{},{}
2708,Chinese_Handicraft,Chinese Handicraft,4,0,,50,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus3 bAutoSpell,"MG_FIREBOLT",5,50; },{},{}
2709,5_Anniversary_Coin,5th Anniversary Coin,4,2,,0,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus2 bAddClass,Class_All,5; bonus bMatkRate,5; },{},{}
2710,Bloody_Iron_Ball_C,Bloody Iron Ball,4,1,,0,,0,,0,0xFFFFFFFE,63,2,136,,0,0,0,{ bonus bBaseAtk,30; },{},{}
@@ -1963,7 +1964,7 @@
2757,Insecticide_Ring,Insecticide Ring,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus2 bExpAddRace,RC_Insect,15; },{},{}
2758,Fisher_Ring,Fischer Ring,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus2 bExpAddRace,RC_Fish,15; },{},{}
2759,Decussate_Ring,Decussate Ring,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus2 bExpAddRace,RC_Demon,15; },{},{}
-2760,Bloody_Ring,Bloody Ring,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus2 bExpAddRace,RC_DemiHuman,15; bonus2 bExpAddRace,RC_Player,15; },{},{}
+2760,Bloody_Ring,Bloody Ring,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus2 bExpAddRace,RC_DemiHuman,15; },{},{}
2761,Satanic_Ring,Satanic Ring,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus2 bExpAddRace,RC_Angel,15; },{},{}
2762,Dragoon_Ring,Dragon Ring,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus2 bExpAddRace,RC_Dragon,15; },{},{}
2763,Skul_Ring_C,Neo Skull Ring,4,0,,0,,0,,0,0xFFFFFFFE,18,2,136,,95,0,0,{ bonus2 bAddClass,Class_All,5; bonus bMatkrate,5; bonus bMaxHPrate,5; skill "MG_SIGHT",1; },{},{}
@@ -2094,7 +2095,7 @@
2888,School_Bag,School Bag,4,20,,1000,,0,,1,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus bAspdRate,3; bonus bVariableCastrate,-3; if(BaseLevel<80){ bonus bMaxHP,200; bonus bMaxSP,100; } },{},{}
2889,Endure_Ring,Endure Ring,4,20,,100,,0,,1,0xFFFFFFFF,63,2,136,,60,0,0,{},{},{}
2890,White_Wing_Brooch,White Wing Brooch,4,20,,100,,0,,0,0x00000800,63,2,136,,100,0,0,{ bonus bDex,2; bonus bLongAtkRate,3; },{},{}
-2891,Black_Wing_Brooch,Black Wing Brooch,4,20,,100,,0,,0,0x00000800,56,2,136,,100,0,0,{ bonus bInt,2; bonus bFlee2,3; },{},{}
+2891,Black_wing_Brooch,Black Wing Brooch,4,20,,100,,0,,0,0x00000800,56,2,136,,100,0,0,{ bonus bInt,2; bonus bFlee2,3; },{},{}
2892,Assassin_Handcuffs,Assassin's Glove,4,56000,,400,,3,,1,0x00001000,63,2,136,,100,0,0,{ bonus bMaxSP,20; bonus bCritical,3; },{},{}
2893,Cursed_Heart,Cursed Heart,4,20,,50,,0,,1,0xFFFFFFFF,63,2,136,,80,0,0,{},{},{}
2894,Glove_Of_Shura,Sura Gauntlet,4,20,,400,,1,,0,0x00008000,63,2,136,,130,0,0,{ bonus bStr,5; bonus bMaxSPrate,6; bonus bMaxHPrate,-6; if(readparam(bStr)>=120){ bonus bBaseAtk,30; } },{},{}
@@ -2110,7 +2111,7 @@
2904,Naqsh,Naqsi,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ skill "BS_MAXIMIZE",5; skill "BS_WEAPONPERFECT",5; skill "WL_RECOGNIZEDSPELL",5; skill "ECL_SNOWFLIP",1; skill "ECL_PEONYMAMY",1; skill "ECL_SADAGUI",1; skill "ECL_SEQUOIADUST",1; bonus2 bSkillCooldown,"WL_RECOGNIZEDSPELL",-180000; bonus bDelayRate,-100; },{},{}
2905,Super_Ora_Ora,Super Ora Ora,4,0,,1000,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{},{},{}
2906,Happy_Gauntlet,Happy Gauntlet,4,20,,1000,,3,,1,0xFFFFFFFF,63,2,136,,70,0,0,{ bonus bMdef,3; },{},{}
-2907,Buwaya_Tattoo,Bawaya Agimat Tattoo,4,20,,100,,0,,0,0xFFFFFFFF,63,2,136,,1,0,0,{ bonus bMatkRate,7; bonus bVariableCastrate,-7; },{},{}
+2907,Buwaya_Tattoo,Bawaya Agimat Tattoo,4,20,,100,,0,,0,0xFFFFFFFF,63,2,136,,1,0,0,{ bonus bMatkRate,7; bonus bFixedCastrate,-7; },{},{}
2908,Light_Ring,Light Ring,4,20,,100,,0,,1,0xFFFFFFFF,63,2,136,,0,0,0,{},{},{}
2909,Darkness_Ring,Darkness Ring,4,20,,100,,0,,1,0xFFFFFFFF,63,2,136,,0,0,0,{},{},{}
2910,Bakonawa_Tattoo,Bakunawa Agimat Tattoo,4,20,,100,,0,,0,0xFFFFFFFF,63,2,136,,1,0,0,{ bonus2 bAddClass,Class_All,7; bonus bAspdRate,10; },{},{}
@@ -2137,15 +2138,15 @@
2941,Gunslinger_Manual,Gunslinger Manual,4,0,,100,,0,,0,0x00000001,63,2,136,,0,0,0,{ bonus bMaxSP,100; skill "GS_GLITTERING",1; skill "GS_ADJUSTMENT",1; skill "GS_MADNESSCANCEL",1; skill "GS_INCREASING",1; },{},{}
2942,Taekwon_Manual,Taekwon Manual,4,0,,100,,0,,0,0x00000001,63,2,136,,0,0,0,{ bonus bMaxSP,100; skill "TK_SEVENWIND",4; skill "TK_JUMPKICK",5; },{},{}
2943,Critical_Ring_,Critical Ring,4,0,,100,,,,1,0xFFFFFFFF,63,2,136,,,0,,{ bonus bCritical,5;},{},{}
-2944,TE_Ring_Of_Protection,TE Ring Of Protection,4,0,,0,,,,0,0xFFFFFFFF,63,2,136,1,40,0,,{ bonus bMaxHP,100; bonus2 bSubRace,RC_Player,5; },{},{}
-2945,TE_Ring_Of_Rage,TE Ring Of Rage,4,0,,0,,,,0,0xFFFFFFFF,63,2,136,1,40,0,,{ bonus2 bAddRace,RC_Player,5; bonus2 bMagicAddRace,RC_Player,5; },{},{}
-2946,TE_Ring_Of_Defiance,TE Ring Of Defiance,4,0,,0,,,,0,0xFFFFFFFF,63,2,136,1,40,0,,{ bonus bMdef,5; bonus2 bSubRace,RC_Player,5; },{},{}
+2944,TE_Ring_Of_Protection,TE Ring Of Protection,4,0,,0,,,,0,0xFFFFFFFF,63,2,136,,40,0,,{ bonus bMaxHP,100; bonus2 bSubRace,RC_Player,5; },{},{}
+2945,TE_Ring_Of_Rage,TE Ring Of Rage,4,0,,0,,,,0,0xFFFFFFFF,63,2,136,,40,0,,{ bonus2 bAddRace,RC_Player,5; bonus2 bMagicAddRace,RC_Player,5; },{},{}
+2946,TE_Ring_Of_Defiance,TE Ring Of Defiance,4,0,,0,,,,0,0xFFFFFFFF,63,2,136,,40,0,,{ bonus bMdef,5; bonus2 bSubRace,RC_Player,5; },{},{}
2948,Demon_Wing,Demon Wing,4,10,,100,,,,1,0xFFFFFFFF,63,2,136,,70,,,{ bonus bFlee,5; },{},{}
2949,Silversmith_Bracelet,Silversmith Bracelet,4,10,,100,,3,,1,0xFFFFFFFF,63,2,136,,60,,,{ bonus bAllStats,1; bonus bMdef,3; skill "SA_SPELLBREAKER",5; },{},{}
-2950,Rune_Ring,Rune Ring,4,0,,0,,,,0,0xFFFFFFFF,63,2,136,1,1,0,,{ bonus2 bExpAddClass,Class_Normal,10; },{},{}
-2951,Kvasir_Ring_Blue,Kvasir Ring Blue,4,0,,100,,,,0,0xFFFFFFFF,63,2,136,1,1,0,,{ bonus bMaxSP,30; skill "ECL_SNOWFLIP",1; },{},{}
-2952,Kvasir_Ring_Red,Kvasir Ring Red,4,0,,100,,,,0,0xFFFFFFFF,63,2,136,1,1,0,,{ bonus bMaxSP,30; skill "ECL_PEONYMAMY",1; },{},{}
-2953,Kvasir_Ring_Green,Kvasir Ring Green,4,0,,100,,,,0,0xFFFFFFFF,63,2,136,1,1,0,,{ bonus bMaxHP,100; skill "ECL_SADAGUI",1; },{},{}
+2950,Rune_Ring,Rune Ring,4,0,,0,,,,0,0xFFFFFFFF,63,2,136,,1,0,,{ bonus2 bExpAddClass,Class_Normal,10; },{},{}
+2951,Kvasir_Ring_Blue,Kvasir Ring Blue,4,0,,100,,,,0,0xFFFFFFFF,63,2,136,,1,0,,{ bonus bMaxSP,30; skill "ECL_SNOWFLIP",1; },{},{}
+2952,Kvasir_Ring_Red,Kvasir Ring Red,4,0,,100,,,,0,0xFFFFFFFF,63,2,136,,1,0,,{ bonus bMaxSP,30; skill "ECL_PEONYMAMY",1; },{},{}
+2953,Kvasir_Ring_Green,Kvasir Ring Green,4,0,,100,,,,0,0xFFFFFFFF,63,2,136,,1,0,,{ bonus bMaxHP,100; skill "ECL_SADAGUI",1; },{},{}
2954,Kvasir_Ring_Brown,Kvasir Ring Brown,4,10,,100,,,,0,0xFFFFFFFF,63,2,136,,1,,,{ bonus bMaxHP,100; },{},{}
2956,Safety_Ring_,Advanced Safety Ring,4,75000,,100,,10,,1,0xFFFFFFFE,63,2,136,,50,0,0,{ bonus bMdef,5; bonus bAllStats,1; },{},{}
2957,Good_Ring_Of_Flame_Lord,Advanced Ring Of Flame Lord,4,20,,100,,0,,0,0x7CCFDF80,63,2,136,,85,0,0,{ bonus bStr,3; bonus bVit,2; bonus bBaseAtk,20; bonus2 bSubEle,Ele_Fire,10; bonus3 bAutoSpell,"CH_SOULCOLLECT",1,30; bonus3 bAutoSpell,"MO_EXPLOSIONSPIRITS",1,10; bonus3 bAutoSpell,"PA_PRESSURE",2,30; bonus3 bAutoSpell,"MG_FIREBALL",1,150; bonus3 bAutoSpell,"KN_BOWLINGBASH",5,20; },{},{}
@@ -2162,23 +2163,23 @@
2976,Red_Lantern,Red Lantern,4,10,,200,,0,,1,0xFFFFFFFF,63,2,136,,100,0,,{ bonus bMaxSP,-300; skill "MG_SIGHT",1; },{},{ sc_end SC_SIGHT; }
2977,Hurt_Mind,Hurt Mind,4,10,,100,,0,,1,0xFFFFFFFF,63,2,136,,110,0,,{ bonus bMaxSP,200; skill "DC_SCREAM",3; },{},{}
2978,KindHeart,Kind Heart,4,10,,100,,0,,1,0xFFFFFFFF,63,2,136,,110,0,,{ bonus bMaxHP,500; bonus2 bHPRegenRate,300,10000; skill "DC_SCREAM",3; },{},{}
-2979,Strawberry_Decoration,Strawberry Decoration,4,0,,500,,1,,1,0xFFFFFFFF,63,2,136,,,0,,{ bonus bAllStats,1; bonus3 bAutoSpellWhenHit,"WZ_FROSTNOVA",3,10; /* Confirm: Frost Nova cast chance */ },{},{}
+2979,Strawberry_Decoration,Strawberry Decoration,4,20,,500,,1,,1,0xFFFFFFFE,63,2,136,,1,,,{ bonus bAllStats,1; bonus3 bAutoSpellWhenHit,"WZ_FROSTNOVA",3,10; /* Confirm: Frost Nova cast chance */ },{},{}
2980,Evilspirit_Gloves,Evilspirit Gloves,4,10,,100,,,,1,0xFFFFFFFF,63,2,136,,110,1,,{ bonus bMaxHP,500; bonus bMaxSP,200; skill "PF_SPIDERWEB",1; },{},{}
-2981,Warrior's_Ring,Warrior's Ring,4,10,,200,,0,,0,0xFFFFFFFF,63,2,136,,160,,,{},{},{}
+2981,RingOfHero,Warrior's Ring,4,10,,200,,0,,0,0xFFFFFFFF,63,2,136,,160,,,{},{},{}
2983,Greed_Brooch,Greed Brooch,4,10,,100,,,,1,0xFFFFFFFF,63,2,136,,50,1,,{ bonus2 bHPLossRate,10,5000; },{},{}
2984,Glove_Save_Rimnil,Glove Save Rimnil,4,10,,100,,,,1,0xFFFFFFFF,63,2,136,,30,1,,{ bonus2 bExpAddRace,RC_All,5; },{},{}
2985,Gyges_Ring,Gyges Ring,4,10,,100,,,,1,0xFFFFFFFF,63,2,136,,50,,,{ bonus bInt,3; bonus bMatk,30; skill "TF_HIDING",1; },{},{ sc_end SC_HIDING; }
2986,Snake_Ring,Snake Ring,4,20,,100,,2,,1,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus bDex,3; bonus bMdef,2; },{},{}
2987,Snake_Pendant,Snake Pendant,4,20,,100,,3,,1,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus bAgi,3; bonus bLuk,2; bonus bMdef,3; },{},{}
-2988,Ozs_New_Wing_Ring,Oz's New Wing Ring,4,20,,100,,0,,1,0x00080000,56,1,136,,130,,,{ bonus bVariableCastrate,-25; },{},{}
-2989,Bloody_Floral_Decoration_Bracelet,Bloody Floral Decoration Bracelet,4,20,,100,,0,,1,0x00080000,56,0,136,,130,,,{ bonus bVariableCastrate,-25; },{},{}
-2990,Pendant_of_Harmony,Pendant of Harmony,4,20,,100,,0,,0,0xFFFFFFFF,63,2,136,,130,,,{ bonus bMatkRate,6; bonus bHPrecovRate,50; bonus bSPrecovRate,50; bonus2 bSubEle,Ele_Holy,5; bonus5 bAutoSpell,"AB_RENOVATIO",1,100,BF_NORMAL,0; bonus4 bAutoSpellWhenHit,"PR_SANCTUARY",3,100,0; bonus bStr,-5; },{},{}
-2991,Pendant_of_Chaos,Pendant of Chaos,4,20,,100,,0,,0,0xFFFFFFFF,63,2,136,,130,,,{ bonus2 bAddClass,Class_All,6; bonus2 bSubEle,Ele_Dark,5; bonus2 bResEff,Eff_Confusion,10000; bonus2 bAddEff,Eff_Confusion,500; bonus3 bAutoSpellWhenHit,"NPC_WIDECONFUSE",2,30; bonus bInt,-5; },{},{}
-2992,Pendant_of_Maelstrom,Pendant of Maelstrom,4,20,,100,,0,,1,0xFFFFFFFF,63,2,136,,130,,,{ bonus2 bAddClass,Class_All,6; bonus bMatkRate,6; bonus bAllStats,1; bonus5 bAutoSpellWhenHit,"SC_MAELSTROM",1,100,BF_MAGIC,0; },{},{}
-2995,Supplement_Part_Dex,Supplement Part Dex,4,25000,,100,,0,,1,0x00000400,56,2,136,,100,0,0,{ bonus bUseSPrate,-10; bonus bDelayrate,-10; bonus bVariableCastrate,-10; bonus2 bSkillVariableCast,"NC_AXEBOOMERANG",-2000; },{},{}
-2996,Reinforced_Parts_Gun_Barrel,Reinforced Parts - Gun Barrel,4,10,,500,,,,1,0xFFFFFFFF,63,2,136,,100,,,{ bonus2 bAddClass,Class_All,4; bonus bHit,10; bonus2 bSkillAtk,"NC_BOOSTKNUCKLE",25; },{},{}
+2988,Winged_Ring_Of_Newoz,Oz's New Wing Ring,4,20,,100,,0,,1,0x00080000,56,1,136,,130,,,{ bonus bVariableCastrate,-25; },{},{}
+2989,Floral_Bracelet_Of_Igu,Bloody Floral Decoration Bracelet,4,20,,100,,0,,1,0x00080000,56,0,136,,130,,,{ bonus bVariableCastrate,-25; },{},{}
+2990,Pendant_Of_Harmony,Pendant of Harmony,4,20,,100,,0,,0,0xFFFFFFFF,63,2,136,,130,,,{ bonus bMatkRate,6; bonus bHPrecovRate,50; bonus bSPrecovRate,50; bonus2 bSubEle,Ele_Holy,5; bonus5 bAutoSpell,"AB_RENOVATIO",1,100,BF_NORMAL,0; bonus4 bAutoSpellWhenHit,"PR_SANCTUARY",3,100,0; bonus bStr,-5; },{},{}
+2991,Pendant_Of_Chaos,Pendant of Chaos,4,20,,100,,0,,0,0xFFFFFFFF,63,2,136,,130,,,{ bonus2 bAddClass,Class_All,6; bonus2 bSubEle,Ele_Dark,5; bonus2 bResEff,Eff_Confusion,10000; bonus2 bAddEff,Eff_Confusion,500; bonus3 bAutoSpellWhenHit,"NPC_WIDECONFUSE",2,30; bonus bInt,-5; },{},{}
+2992,Pendant_Of_Maelstorm,Pendant of Maelstrom,4,20,,100,,0,,1,0xFFFFFFFF,63,2,136,,130,,,{ bonus2 bAddClass,Class_All,6; bonus bMatkRate,6; bonus bAllStats,1; bonus5 bAutoSpellWhenHit,"SC_MAELSTROM",1,100,BF_MAGIC,0; },{},{}
+2995,Supplement_Part_Dex,Supplement Part Dex,4,25000,,100,,0,,1,0x00000400,56,2,136,,100,0,0,{ bonus bUseSPrate,-10; bonus bDelayrate,-10; bonus bVariableCastrate,-10; bonus2 bSkillCooldown,"NC_AXEBOOMERANG",-2000; },{},{}
+2996,Upgrade_Part_Gun_Barrel,Reinforced Parts - Gun Barrel,4,10,,500,,,,1,0xFFFFFFFF,63,2,136,,100,,,{ bonus2 bAddClass,Class_All,4; bonus bHit,10; bonus2 bSkillAtk,"NC_BOOSTKNUCKLE",25; },{},{}
2997,RWC_Gold_Brooch,RWC Gold Brooch,4,10,,200,,0,,1,0xFFFFFFFF,63,2,136,,0,0,,{ bonus bBaseAtk,25; bonus bMatk,20; },{},{}
-2998,Shining_Trapezohedron,Shining Trapezohedron,4,0,,100,,,,1,0xFFFFFFFF,63,2,136,1,90,1,,{ bonus2 bSubEle,Ele_Holy,10; },{},{}
+2998,Shining_Trapezohedron,Shining Trapezohedron,4,0,,100,,,,1,0xFFFFFFFF,63,2,136,,90,1,,{ bonus2 bSubEle,Ele_Holy,10; },{},{}
2999,RWC_Brooch,RWC Brooch,4,10,,200,,0,,0,0xFFFFFFFF,63,2,136,,0,0,,{ bonus bMaxHP,300; bonus bMaxSP,30; },{},{}
//===================================================================
// Cards
@@ -2336,7 +2337,7 @@
4151,Gajomart_Card,Gajomart Card,6,20,,10,,,,,,,,64,,,,,{ bonus2 bSubRace,RC_Plant,-20; bonus2 bExpAddRace,RC_Plant,10; },{},{}
4152,Galapago_Card,Galapago Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddItemGroupHealRate,IG_Juice,50; bonus3 bAddMonsterDropItem,531,RC_Insect,300; bonus3 bAddMonsterDropItem,532,RC_Insect,300; bonus3 bAddMonsterDropItem,534,RC_Insect,300; },{},{}
4153,Crab_Card,Crab Card,6,20,,10,,,,,,,,2,,,,,{ bonus bBaseAtk,5; bonus2 bAddDamageClass,1266,30; },{},{}
-4154,Rice_Cake_Boy_Card,Dumpling Child Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddItemGroupHealRate,IG_Candy,50; bonus3 bAddMonsterDropItem,529,RC_DemiHuman,300; bonus3 bAddMonsterDropItem,530,RC_DemiHuman,100; bonus3 bAddMonsterDropItem,529,RC_Player,300; bonus3 bAddMonsterDropItem,530,RC_Player,100; },{},{}
+4154,Rice_Cake_Boy_Card,Dumpling Child Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddItemGroupHealRate,IG_Candy,50; bonus3 bAddMonsterDropItem,529,RC_DemiHuman,300; bonus3 bAddMonsterDropItem,530,RC_DemiHuman,100; },{},{}
4155,Goblin_Leader_Card,Goblin Leader Card,6,20,,10,,,,,,,,2,,,,,{ bonus2 bAddRace2,RC2_Goblin,30; },{},{}
4156,Steam_Goblin_Card,Goblin Steamrider Card,6,20,,10,,,,,,,,2,,,,,{ bonus bCritAtkRate,10; bonus2 bCriticalAddRace,RC_Formless,7; },{},{}
4157,Goblin_Archer_Card,Goblin Archer Card,6,20,,10,,,,,,,,2,,,,,{ bonus bCritAtkRate,10; bonus2 bCriticalAddRace,RC_Undead,7; },{},{}
@@ -2427,7 +2428,7 @@
4242,Apocalips_Card,Apocalipse Card,6,20,,10,,,,,,,,16,,,,,{ bonus bVit,2; if(getrefine()>8) bonus bMaxHP,800; },{},{}
4243,Antonio_Card,Antonio Card,6,20,,10,,,,,,,,16,,,,,{ bonus3 bAutoSpellWhenHit,"AL_TELEPORT",1,500; },{},{}
4244,Alarm_Card,Alarm Card,6,20,,10,,,,,,,,64,,,,,{ bonus3 bAutoSpellWhenHit,"MG_SIGHT",1,200; bonus bMaxHP,300; bonus bVit,1; },{},{}
-4245,Am_Mut_Card,Am Mut Card,6,20,,10,,,,,,,,64,,,,,{ bonus2 bSubRace,RC_DemiHuman,-20; bonus2 bSubRace,RC_Player,-20; bonus2 bExpAddRace,RC_DemiHuman,10; bonus2 bExpAddRace,RC_Player,10; },{},{}
+4245,Am_Mut_Card,Am Mut Card,6,20,,10,,,,,,,,64,,,,,{ bonus2 bSubRace,RC_DemiHuman,-20; bonus2 bSubRace,RC_Player,-20; bonus2 bExpAddRace,RC_DemiHuman,10; },{},{}
4246,Assulter_Card,Assaulter Card,6,20,,10,,,,,,,,2,,,,,{ bonus bCritAtkRate,10; bonus2 bCriticalAddRace,RC_DemiHuman,7; bonus2 bCriticalAddRace,RC_Player,7; },{},{}
4247,Aster_Card,Aster Card,6,20,,10,,,,,,,,2,,,,,{ bonus bBaseAtk,5; bonus2 bAddDamageClass,1074,30; },{},{}
4248,Ancient_Mummy_Card,Ancient Mummy Card,6,20,,10,,,,,,,,32,,,,,{ bonus3 bAutoSpellWhenHit,"AL_CRUCIS",5,30; },{},{}
@@ -2438,7 +2439,7 @@
4253,Alice_Card,Alice Card,6,20,,10,,,,,,,,32,,,,,{ bonus2 bSubClass,Class_Boss,40; bonus2 bSubClass,Class_Normal,-40; },{},{}
4254,Tirfing_Card,Ogretooth Card,6,20,,10,,,,,,,,32,,,,,{ bonus2 bSubSize,Size_Medium,25; bonus bDef,1; },{},{}
4255,Orc_Lady_Card,Orc Lady Card,6,20,,10,,,,,,,,2,,,,,{ bonus2 bAddRace2,RC2_Orc,30; },{},{}
-4256,Orc_Archer_Card,Orc Archer Card,6,20,,10,,,,,,,,136,,,,,{ bonus3 bAddMonsterDropItem,12034,RC_DemiHuman,100; bonus3 bAddMonsterDropItem,12034,RC_Player,100; },{},{}
+4256,Orc_Archer_Card,Orc Archer Card,6,20,,10,,,,,,,,136,,,,,{ bonus3 bAddMonsterDropItem,12034,RC_DemiHuman,100; },{},{}
4257,Wild_Rose_Card,Wild Rose Card,6,20,,10,,,,,,,,64,,,,,{ bonus bAgi,1; if(BaseClass==Job_Thief) bonus bFlee2,5; },{},{}
4258,Wicked_Nymph_Card,Evil Nymph Card,6,20,,10,,,,,,,,769,,,,,{ bonus bInt,1; bonus bMaxSP,50; },{},{}
4259,Wooden_Golem_Card,Wooden Golem Card,6,20,,10,,,,,,,,16,,,,,{ bonus bDef,1; bonus bHPrecovRate,30; },{},{}
@@ -2491,7 +2492,7 @@
4306,Toad_Card,Toad Card,6,20,,10,,,,,,,,4,,,,,{ bonus bFlee2,1; },{},{}
4307,Kind_Of_Beetle_Card,Beetle King Card,6,20,,10,,,,,,,,2,,,,,{ bonus2 bSPGainRace,RC_Fish,5; },{},{ heal 0,-5; }
4308,Tri_Joint_Card,Tri Joint Card,6,20,,10,,,,,,,,2,,,,,{ bonus2 bSPGainRace,RC_Formless,5; },{},{ heal 0,-5; }
-4309,Parasite_Card,Parasite Card,6,20,,10,,,,,,,,32,,,,,{ bonus bDef,1; bonus2 bSubEle,Ele_Neutral,5; },{},{}
+4309,Parasite_Card,Parasite Card,6,20,,10,,,,,,,,32,,,,,{ bonus bDef,1; bonus2 bSubRace,RC_Formless,5; },{},{}
4310,Panzer_Goblin_Card,Panzer Goblin Card,6,20,,10,,,,,,,,2,,,,,{ bonus bCritAtkRate,10; bonus2 bCriticalAddRace,RC_Demon,7; },{},{}
4311,Permeter_Card,Permeter Card,6,20,,10,,,,,,,,769,,,,,{ bonus2 bSubEle,Ele_Dark,15; bonus2 bSubEle,Ele_Undead,15; },{},{}
4312,Fur_Seal_Card,Seal Card,6,20,,10,,,,,,,,2,,,,,{ bonus bFlee,3; bonus bHit,10; if(BaseClass==Job_Acolyte) { bonus2 bCriticalAddRace,RC_Undead,9; bonus2 bCriticalAddRace,RC_Demon,9; } },{},{}
@@ -2644,8 +2645,8 @@
4459,Lata_Card,Rata Card,6,20,,10,,,,,,,,769,,,,,{ bonus bMatk,10; autobonus "{ bonus bFixedCastrate,-50; }",5,4000,BF_MAGIC,"{ specialeffect2 EF_SUFFRAGIUM; }"; },{},{}
4460,Ringco_Card,Rhyncho Card,6,20,,10,,,,,,,,769,,,,,{ bonus bHealPower,4; bonus2 bSkillUseSP,"AL_HEAL",-15; },{},{}
4461,Pillar_Card,Phylla Card,6,20,,10,,,,,,,,769,,,,,{ bonus bDex,1; bonus bAgi,1; autobonus "{ bonus bCritical,20; }",15,4000,0,"{ specialeffect2 EF_ENHANCE; }"; },{},{}
-4462,Hardrock_Mammos_Card,Hardrock Mammoth Card,6,20,,10,,,,,,,,16,,,,,{ .@r = getrefine(); bonus bDef,5; if(.@r>=12) { bonus bDef,20; bonus bMaxHPrate,10; } if(.@r>=14) { bonus bMaxHPrate,3; } },{},{}
-4463,Tendrilrion_Card,Tendrilrion Card,6,20,,10,,,,,,,,2,,,,,{ bonus bCritical,5; .@r = getrefine(); if(.@r>=12) { bonus bBaseAtk,35; } if(.@r>=14) { bonus bCritical,10; } },{},{}
+4462,Hardrock_Mommos_Card,Hardrock Mammoth Card,6,20,,10,,,,,,,,16,,,,,{ .@r = getrefine(); bonus bDef,5; if(.@r>=12) { bonus bDef,20; bonus bMaxHPrate,10; } if(.@r>=14) { bonus bMaxHPrate,3; } },{},{}
+4463,Tendrilion_Card,Tendrilrion Card,6,20,,10,,,,,,,,2,,,,,{ bonus bCritical,5; .@r = getrefine(); if(.@r>=12) { bonus bBaseAtk,35; } if(.@r>=14) { bonus bCritical,10; } },{},{}
4464,Aunoe_Card,Aunoe Card,6,20,,10,,,,,,,,2,,,,,{ bonus bCritAtkRate,20; },{},{}
4465,Panat_Card,Fanat Card,6,20,,10,,,,,,,,2,,,,,{ bonus bBaseAtk,10; if(getiteminfo(getequipid(EQI_HAND_R),11)==W_2HSWORD) { .@r = getrefine(); if(.@r>=10) { bonus bAspd,1; } if(.@r>=14) { bonus bAspd,1; } } },{},{}
4466,Beholder_Master_Card,Beholder Master Card,6,20,,10,,,,,,,,2,,,,,{ bonus bLongAtkRate,3; if(getiteminfo(getequipid(EQI_HAND_R),11)==W_BOW) { .@r = getrefine(); if(.@r>=10) { bonus bAspd,1; } if(.@r>=14) { bonus bAspd,1; } } },{},{}
@@ -2729,8 +2730,8 @@
4544,SLD_Dark_Snake_Card,Sealed Evil Snake Lord Card,6,20,,10,,,,,,,,769,,,,,{ bonus bInt,3; .@i = (getrefine()>14?7500:5000); bonus2 bResEff,Eff_Blind,.@i; bonus2 bResEff,Eff_Curse,.@i; },{},{}
4545,Novice_Poring_Card,Novice Poring Card,6,20,,10,,,,,,,,769,,,,,{ bonus bLuk,1; },{},{}
4546,Val'khiri_Card,Val'khiri Card,6,20,,10,,,,,,,,2,,,,,{},{},{}
-4547,Enhanced_Byorgue_Card,Enhanced Byorgue Card,6,20,,10,,,,,,,,16,,,,,{ if(BaseJob==Job_Rogue) { bonus bMatkRate,10; bonus2 bAddClass,Class_All,10; bonus bMaxHPrate,getrefine()/2; } /* Adds a chance of inflicting Confuse on target when using Body Paint skill. */ },{},{}
-4548,Enhanced_Salamander_Card,Enhanced Salamander Card,6,20,,10,,,,,,,,4,,,,,{ bonus2 bSkillAtk,"WZ_FIREPILLAR",40; bonus2 bSkillAtk,"WZ_METEOR",40; },{},{}
+4547,Upd_Byorgue_Card,Enhanced Byorgue Card,6,20,,10,,,,,,,,16,,,,,{ if(BaseJob==Job_Rogue) { bonus bMatkRate,10; bonus2 bAddClass,Class_All,10; bonus bMaxHPrate,getrefine()/2; } /* Adds a chance of inflicting Confuse on target when using Body Paint skill. */ },{},{}
+4548,Upd_Salamander_Card,Enhanced Salamander Card,6,20,,10,,,,,,,,4,,,,,{ bonus2 bSkillAtk,"WZ_FIREPILLAR",40; bonus2 bSkillAtk,"WZ_METEOR",40; },{},{}
4549,Upd_Maya_Puple_Card,Upd Maya Puple Card,6,20,,10,,,,,,,,769,,,,,{ bonus bIntravision,1; bonus bAllStats,1; skill "AL_RUWACH",1; },{},{}
4550,Upd_Bow_Guardian_Card,Upd Bow Guardian Card,6,20,,10,,,,,,,,2,,,,,{ if(getiteminfo(getequipid(EQI_HAND_R),11)==W_BOW) { bonus2 bSkillAtk,"RA_ARROWSTORM",50; bonus bCriticalLong,25+10*(getequiprefinerycnt(EQI_HAND_R)/4); bonus bHit,5; bonus3 bAutoSpell,"HT_PHANTASMIC",1,100; } },{},{}
4552,Manny_Card,Manny Card,6,20,,10,,,,,,,,136,,,,,{ bonus bMaxHP,10; },{},{}
@@ -2738,17 +2739,17 @@
4554,Diego_Card,Diego Card,6,20,,10,,,,,,,,4,,,,,{ bonus bMaxHP,100; },{},{}
4555,Scrat_Card,Scrat Card,6,20,,10,,,,,,,,769,,,,,{ bonus bMaxHP,100; },{},{}
4556,Fenrir_Card,Fenrir Card,6,10,,10,,,,,,,,769,,,,,{ bonus bMatk,50+getrefine()*5; bonus bFixedCastrate,-70; },{},{}
-4557,Weakened_Fenrir_Card,Weakened Fenrir Card,6,10,,10,,,,,,,,769,,,,,{ bonus bMatk,25; },{},{}
-4559,Evil_Morocc_Card,Evil Morocc Card,6,20,,100,,,,,,,,64,,,,,{ bonus bAspd,1; bonus bMaxSPrate,-10; },{},{}
-4560,Clown_Alphoccio_Card,Clown Alphoccio Card,6,20,,10,,,,,,,,16,,,,,{ skill "BA_POEMBRAGI",10; bonus bFlee,(readparam(bVit)>=110)?40:20; },{},{}
-4561,Professor_Celia_Card,Professor Celia Card,6,20,,10,,,,,,,,16,,,,,{ bonus bMatkRate,(readparam(bDex)>=110)?14:7; bonus5 bAutoSpellWhenHit,"SA_LANDPROTECTOR",5,70,BF_MAGIC,0; },{},{}
-4562,Champion_Chen_Card,Champion Chen Card,6,20,,10,,,,,,,,16,,,,,{ bonus2 bAddClass,Class_All,(readparam(bAgi)>=110)?14:7; bonus5 bAutoSpellWhenHit,"MO_INVESTIGATE",5,70,BF_WEAPON,1; },{},{}
-4563,Creator_Flamel_Card,Creator Flamel Card,6,20,,10,,,,,,,,16,,,,,{ bonus bCritical,(readparam(bStr)>=110)?40:20; bonus5 bAutoSpellWhenHit,"AM_ACIDTERROR",5,70,BF_WEAPON,1; },{},{}
-4564,Stalker_Gertie_Card,Stalker Gertie Card,6,20,,10,,,,,,,,16,,,,,{ bonus bHit,(readparam(bLuk)>=110)?40:20; bonus5 bAutoSpellWhenHit,"ST_FULLSTRIP",1,70,BF_WEAPON,1; },{},{}
-4565,Paladin_Randel_Card,Paladin Randel Card,6,20,,10,,,,,,,,16,,,,,{ bonus bMaxHPrate,(readparam(bLuk)>=110)?20:10; bonus5 bAutoSpellWhenHit,"CR_GRANDCROSS",10,70,BF_WEAPON,0; },{},{}
-4566,Gypsy_Trentini_Card,Gypsy Trentini Card,6,20,,10,,,,,,,,16,,,,,{ skill "DC_FORTUNEKISS",10; bonus bFlee,(readparam(bVit)>=110)?40:20; },{},{}
+4557,Fenrir_Card_,Weakened Fenrir Card,6,10,,10,,,,,,,,769,,,,,{ bonus bMatk,25; },{},{}
+4559,M_Morocc_Card,Evil Morocc Card,6,20,,100,,,,,,,,64,,,,,{ bonus bAspd,1; bonus bMaxSPrate,-10; },{},{}
+4560,Clown_Card,Clown Alphoccio Card,6,20,,10,,,,,,,,16,,,,,{ skill "BA_POEMBRAGI",10; bonus bFlee,(readparam(bVit)>=110)?40:20; },{},{}
+4561,Professor_Card,Professor Celia Card,6,20,,10,,,,,,,,16,,,,,{ bonus bMatkRate,(readparam(bDex)>=110)?14:7; bonus5 bAutoSpellWhenHit,"SA_LANDPROTECTOR",5,70,BF_MAGIC,0; },{},{}
+4562,Champion_Card,Champion Chen Card,6,20,,10,,,,,,,,16,,,,,{ bonus2 bAddClass,Class_All,(readparam(bAgi)>=110)?14:7; bonus5 bAutoSpellWhenHit,"MO_INVESTIGATE",5,70,BF_WEAPON,1; },{},{}
+4563,Creator_Card,Creator Flamel Card,6,20,,10,,,,,,,,16,,,,,{ bonus bCritical,(readparam(bStr)>=110)?40:20; bonus5 bAutoSpellWhenHit,"AM_ACIDTERROR",5,70,BF_WEAPON,1; },{},{}
+4564,Stalker_Card,Stalker Gertie Card,6,20,,10,,,,,,,,16,,,,,{ bonus bHit,(readparam(bLuk)>=110)?40:20; bonus5 bAutoSpellWhenHit,"ST_FULLSTRIP",1,70,BF_WEAPON,1; },{},{}
+4565,Paladin_Card,Paladin Randel Card,6,20,,10,,,,,,,,16,,,,,{ bonus bMaxHPrate,(readparam(bLuk)>=110)?20:10; bonus5 bAutoSpellWhenHit,"CR_GRANDCROSS",10,70,BF_WEAPON,0; },{},{}
+4566,Gypsy_Card,Gypsy Trentini Card,6,20,,10,,,,,,,,16,,,,,{ skill "DC_FORTUNEKISS",10; bonus bFlee,(readparam(bVit)>=110)?40:20; },{},{}
4567,Alphoccio_Card,Alphoccio Card,6,20,,10,,,,,,,,4,,,,,{ bonus bFlee,10; if(BaseJob==Job_Bard) { bonus bMaxHPrate,10; bonus bMaxSPrate,5;} },{},{}
-4568,Celia_Card,Celia Card,6,20,,10,,,,,,,,4,,,,,{ bonus bFlee,10; skill "SA_ABRACADABRA",1; },{},{}
+4568,Ceila_Card,Celia Card,6,20,,10,,,,,,,,4,,,,,{ bonus bFlee,10; skill "SA_ABRACADABRA",1; },{},{}
4569,Chen_Card,Chen Card,6,20,,10,,,,,,,,4,,,,,{ bonus bFlee,10; skill "MO_CALLSPIRITS",2; },{},{}
4570,Flamel_Card,Flamel Card,6,20,,10,,,,,,,,4,,,,,{ bonus bFlee,10; bonus2 bAddItemGroupHealRate,IG_Flamel_Card,200; },{},{}
4571,Gertie_Card,Gertie Card,6,20,,10,,,,,,,,4,,,,,{ bonus bFlee,10; skill "RG_CLOSECONFINE",1; },{},{}
@@ -2759,9 +2760,9 @@
4576,Gioia_Card,Gioia Card,6,20,,10,,,,,,,,4,,,,,{ bonus2 bMagicAtkEle,Ele_Wind,100; bonus2 bMagicAtkEle,Ele_Ghost,100; bonus2 bSubEle,Ele_All,-30; },{},{}
4577,Elvira_Card,Elvira Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bMagicAtkEle,Ele_Wind,20; bonus2 bMagicAtkEle,Ele_Ghost,20; },{},{}
4578,Pyuriel_Card,Angry Student Pyuriel Card,6,20,,10,,,,,,,,2,,,,,{ bonus bCritAtkRate,30; bonus2 bSubRace,RC_All,-10; bonus2 bSubRace,RC_Player,10; },{},{}
-4579,Lola_Card,Warrior Lola Card,6,20,,10,,,,,,,,2,,,,,{ if(getiteminfo(getequipid(EQI_HAND_R),11) == W_MACE) { bonus bBaseAtk,20; bonus bCritical,10; } .@r = getrefine(); bonus bBaseAtk,.@r; bonus bCritical,.@r; },{},{}
+4579,Lora_Card,Warrior Lola Card,6,20,,10,,,,,,,,2,,,,,{ if(getiteminfo(getequipid(EQI_HAND_R),11) == W_MACE) { bonus bBaseAtk,20; bonus bCritical,10; } .@r = getrefine(); bonus bBaseAtk,.@r; bonus bCritical,.@r; },{},{}
4580,Kades_Card,Dark Guardian Kades Card,6,20,,10,,,,,,,,4,,,,,{ bonus2 bSubEle,Ele_Water,50; bonus2 bSubEle,Ele_Earth,50; bonus2 bSubEle,Ele_Fire,50; bonus2 bSubEle,Ele_Wind,50; bonus2 bSubEle,Ele_Dark,50; bonus2 bSubEle,Ele_Undead,50; bonus2 bSubEle,Ele_Holy,-100; bonus2 bSubEle,Ele_Ghost,-100; },{},{}
-4581,Rudo_Card,Rudo Card,6,20,,10,,,,,,,,64,,,,,{ autobonus "{ sc_start SC_SPEEDUP1,3000,50; bonus bAgi,44; heal 0,-40; }",3,3000,0; },{},{}
+4581,Rudo_Card,Rudo Card,6,20,,10,,,,,,,,64,,,,,{ autobonus "{ bonus bAgi,44; heal 0,-40; }",500,3000,0,"{ sc_start SC_SPEEDUP1,3000,50; }"; },{},{}
4582,Bungisngis_Card,Bungisngis Card,6,20,,10,,,,,,,,769,,,,,{ bonus bMaxHPrate,(getrefine()/2); },{},{}
4583,Engkanto_Card,Engkanto Card,6,20,,10,,,,,,,,769,,,,,{ bonus2 bAddEle,Ele_Poison,30; bonus2 bMagicAddEle,Ele_Poison,30; bonus2 bIgnoreDefRaceRate,RC_Plant,30; },{},{}
4584,Manananggal_Card,Manananggal Card,6,20,,10,,,,,,,,2,,,,,{ bonus bSPDrainValue,1; bonus bMaxSPrate,-1; },{},{}
@@ -2778,13 +2779,13 @@
4595,Cenere_Card,Cenere Card,6,20,,10,,,,,,,,4,,,,,{ bonus bAspdRate,2*(readparam(bAgi)/10); },{},{}
4596,AntiqueBook_Card,Antique Book Card,6,20,,10,,,,,,,,4,,,,,{ bonus bMatk,5*(readparam(bInt)/10); },{},{}
4597,LichternB_Card,Lichtern Blue Card,6,20,,10,,,,,,,,769,,,,,{ bonus bMatk,10; bonus2 bMagicAtkEle,Ele_Water,(getrefine()>=9)?10:5; },{},{}
-4598,LichternG_Card,Lichtern Green Card,6,20,,10,,,,,,,,769,,,,,{ bonus bMatk,10; bonus2 bMagicAtkEle,Ele_Ghost,(getrefine()>=9)?10:5; },{},{}
+4598,LichternY_Card,Lichtern Green Card,6,20,,10,,,,,,,,769,,,,,{ bonus bMatk,10; bonus2 bMagicAtkEle,Ele_Ghost,(getrefine()>=9)?10:5; },{},{}
4599,LichternR_Card,Lichtern Red Card,6,20,,10,,,,,,,,769,,,,,{ bonus bMatk,10; bonus2 bMagicAtkEle,Ele_Fire,(getrefine()>=9)?10:5; },{},{}
-4600,LichternY_Card,Lichtern Yellow Card,6,20,,10,,,,,,,,769,,,,,{ bonus bMatk,10; bonus2 bMagicAtkEle,Ele_Earth,(getrefine()>=9)?10:5; },{},{}
+4600,LichternG_Card,Lichtern Yellow Card,6,20,,10,,,,,,,,769,,,,,{ bonus bMatk,10; bonus2 bMagicAtkEle,Ele_Earth,(getrefine()>=9)?10:5; },{},{}
4601,Amdarais_Card,Amdarais Card,6,20,,10,,,,,,,,16,,,,,{ bonus2 bAddClass,Class_All,15; bonus bMatkRate,15; bonus2 bHPLossRate,666,4000; bonus2 bSPLossRate,66,4000; },{},{ heal -6666,-666; }
4602,AmdaraisH_Card,Realized Amdarais Card,6,20,,10,,,,,,,,16,,,,,{ bonus2 bAddClass,Class_All,20; bonus bMatkRate,20; bonus2 bHPLossRate,666,6000; bonus2 bSPLossRate,66,6000; },{},{ heal -6666,-666; }
-4603,Corruption_Root_Card,Corruption Root Card,6,20,,10,,,,,,,,2,,,,,{ bonus bBaseAtk,20; bonus5 bAutoSpell,"NPC_WIDESTONE",1,70,BF_WEAPON,0; bonus5 bAutoSpell,"NPC_WIDESLEEP",1,70,BF_WEAPON,0; bonus5 bAutoSpell,"NPC_WIDECURSE",1,70,BF_WEAPON,0; },{},{}
-4604,Realized_Corruption_Root_Card,Realized Corruption Root Card,6,20,,10,,,,,,,,2,,,,,{ bonus bBaseAtk,30; bonus5 bAutoSpell,"NPC_WIDESTONE",2,70,BF_WEAPON,0; bonus5 bAutoSpell,"NPC_WIDESLEEP",2,70,BF_WEAPON,0; bonus5 bAutoSpell,"NPC_WIDECURSE",2,70,BF_WEAPON,0; },{},{}
+4603,CorruptionRoot_Card,Corruption Root Card,6,20,,10,,,,,,,,2,,,,,{ bonus bBaseAtk,20; bonus5 bAutoSpell,"NPC_WIDESTONE",1,70,BF_WEAPON,0; bonus5 bAutoSpell,"NPC_WIDESLEEP",1,70,BF_WEAPON,0; bonus5 bAutoSpell,"NPC_WIDECURSE",1,70,BF_WEAPON,0; },{},{}
+4604,CorruptionRootH_Card,Realized Corruption Root Card,6,20,,10,,,,,,,,2,,,,,{ bonus bBaseAtk,30; bonus5 bAutoSpell,"NPC_WIDESTONE",2,70,BF_WEAPON,0; bonus5 bAutoSpell,"NPC_WIDESLEEP",2,70,BF_WEAPON,0; bonus5 bAutoSpell,"NPC_WIDECURSE",2,70,BF_WEAPON,0; },{},{}
4605,UndeadKnightM_Card,Agony Of Royal Knight Card,6,20,,10,,,,,,,,16,,,,,{ bonus bMaxHPrate,-44; bonus bHPGainValue,200+10*getrefine(); },{},{}
4606,UndeadKnightF_Card,Grudge of Royal Knight Card,6,20,,10,,,,,,,,4,,,,,{ bonus bMaxSPrate,-44; bonus bSPGainValue,20+(getrefine()/2); },{},{ heal 0,-444; }
4607,FaithfulManager_Card,Faithful Manager Card,6,20,,10,,,,,,,,2,,,,,{ bonus bBaseAtk,5; bonus bMatk,5; if(getiteminfo(getequipid(EQI_HAND_R),11) == W_BOOK) { .@r = getrefine(); if(.@r>=10) { bonus bBaseAtk,20; bonus bMatk,20; } if(.@r>=14) { bonus bBaseAtk,20; bonus bMatk,20; } } },{},{}
@@ -2855,7 +2856,7 @@
4686,V_B_Katrinn_Card,True Kathryne Keyron Card,6,20,,10,,,,,,,,2,,,,,{ if(getrefine() > 9) .@b+=20; if(getequipweaponlv(-1) == 4) .@b += 20; bonus2 bSkillAtk,"WL_CRIMSONROCK",20+.@b; },{},{}
4687,V_B_Shecil_Card,True Cecil Damon Card,6,20,,10,,,,,,,,2,,,,,{ if(getrefine() > 9) .@b+=20; if(getequipweaponlv(-1) == 4) .@b += 20; bonus2 bSkillAtk,"RA_CLUSTERBOMB",20+.@b; },{},{}
4688,V_B_Harword_Card,True Howard Alt-Eisen Card,6,20,,10,,,,,,,,2,,,,,{ if(getrefine() > 9) .@b+=20; if(getequipweaponlv(-1) == 4) .@b += 20; bonus2 bSkillAtk,"NC_AXETORNADO",20+.@b; },{},{}
-4689,V_B_Seyren_Card,True Seyren Windsor Card,6,20,,10,,,,,,,,2,,,,,{ if(getrefine() > 9) .@b+=20; if(getequipweaponlv(-1) == 4) .@b += 20; bonus2 bSkillAtk,"LK_IGNITIONBREAK",20+.@b; },{},{}
+4689,V_B_Seyren_Card,True Seyren Windsor Card,6,20,,10,,,,,,,,2,,,,,{ if(getrefine() > 9) .@b+=20; if(getequipweaponlv(-1) == 4) .@b += 20; bonus2 bSkillAtk,"RK_IGNITIONBREAK",20+.@b; },{},{}
4690,V_B_Randel_Card,True Randel Lawrence Card,6,20,,10,,,,,,,,2,,,,,{ if(getrefine() > 9) .@b+=20; if(getequipweaponlv(-1) == 4) .@b += 20; bonus2 bSkillAtk,"LG_EARTHDRIVE",20+.@b; },{},{}
4691,V_B_Flamel_Card,True Flamel Emure Card,6,20,,10,,,,,,,,2,,,,,{ if(getrefine() > 9) .@b+=20; if(getequipweaponlv(-1) == 4) .@b += 20; bonus2 bSkillAtk,"GN_CART_TORNADO",20+.@b; },{},{}
4692,V_B_Celia_Card,True Celia Alde Card,6,20,,10,,,,,,,,2,,,,,{ if(getrefine() > 9) .@b+=20; if(getequipweaponlv(-1) == 4) .@b += 20; bonus2 bSkillAtk,"SO_VARETYR_SPEAR",20+.@b; },{},{}
@@ -3045,14 +3046,14 @@
4873,Attack_Delay_3,DelayafterAttack3Lv,6,10,,,,,,,,,,,,,,,{ bonus bAspdRate,8; },{},{}
4875,Bear's_Power,Bear's Power,6,20,,10,,,,,,,,,,,,,{ autobonus2 "{ bonus bStr,200; bonus2 bHPLossRate,500,1000; }",20,5000,BF_WEAPON,"{ active_transform 1060,5000; specialeffect2 EF_POTION_BERSERK; showscript \"Bigfoot Power !\"; }"; },{},{}
4876,Runaway_Magic,Runaway Magic,6,20,,10,,,,,,,,,,,,,{ autobonus "{ bonus bInt,200; bonus2 bSPLossRate,200,1000; }",10,10000,BF_MAGIC,"{ specialeffect2 EF_LAMADAN; }"; },{},{ heal 0,-2000; }
-4877,Speed_of_Light,Speed of Light,6,20,,10,,,,,,,,,,,,,{ /*TODO: Confirm the rate*/ autobonus "{ bonus bAspdRate,100; bonus bFlee,100; bonus2 bHPLossRate,400,1000; bonus2 bSPLossRate,50,1000;}",10,5000,BF_WEAPON,"{ specialeffect2 EF_AGIUP2; }"; },{},{ heal 0,-300; }
+4877,Speed_Of_Light,Speed of Light,6,20,,10,,,,,,,,,,,,,{ /*TODO: Confirm the rate*/ autobonus "{ bonus bAspdRate,100; bonus bFlee,100; bonus2 bHPLossRate,400,1000; bonus2 bSPLossRate,50,1000;}",10,5000,BF_WEAPON,"{ specialeffect2 EF_AGIUP2; }"; },{},{ heal 0,-300; }
4878,Muscle_Fool,Muscle Fool,6,20,,10,,,,,,,,,,,,,{ autobonus2 "{ bonus bDef,1000; bonus2 bAddRace,RC_All,-50; bonus bMatkRate,-50; }",10,5000,BF_WEAPON,"{ specialeffect2 EF_GUARD3; }"; },{},{ heal 0,-300; }
4879,Hawkeye,Hawkeye,6,20,,10,,,,,,,,,,,,,{ autobonus "{ bonus bDex,200; bonus2 bSPLossRate,50,1000; }",10,5000,BF_WEAPON,"{ specialeffect2 EF_BASH3D6; }"; },{},{ heal 0,-300; }
4880,Lucky_Day,Lucky Day,6,20,,10,,,,,,,,,,,,,{ autobonus "{ bonus bLuk,200; }",10,5000,BF_WEAPON|BF_MAGIC,"{ specialeffect2 EF_DANCE_BLADE_ATK; }"; },{},{ heal 0,-300; }
4881,Attack_Delay_4,Attack Delay 4,6,10,,,,,,,,,,,,,,,{ bonus bAspdRate,10; },{},{}
4882,Atk1p,ATK + 1%,6,10,,,,,,,,,,,,,,,{ bonus2 bAddClass,Class_All,1; },{},{}
4883,Matk1p,MATK + 1%,6,10,,,,,,,,,,,,,,,{ bonus bMatkRate,1; },{},{}
-4884,Hit1_,HIT + 1,6,10,,,,,,,,,,,,,,,{ bonus bHit,1; },{},{}
+4884,HIT1,HIT + 1,6,10,,,,,,,,,,,,,,,{ bonus bHit,1; },{},{}
4885,Conjure1,Spell 1,6,10,,,,,,,,,,,,,,,{ bonus bMatk,5; bonus bVariableCastrate,-3; },{},{}
4886,Conjure2,Spell 2,6,10,,,,,,,,,,,,,,,{ bonus bMatk,10; bonus bVariableCastrate,-3; },{},{}
4887,Conjure3,Spell 3,6,10,,,,,,,,,,,,,,,{ bonus bMatk,15; bonus bVariableCastrate,-3; },{},{}
@@ -3093,7 +3094,7 @@
4923,Fortune1,Darklord Essence Luck1,6,20,,10,,,,,0xFFFFFFFF,63,2,1023,,,,,{ bonus bLuk,1; bonus bCritical,1; bonus bDex,-1;},{},{}
4924,Fortune2,Darklord Essence Luck2,6,20,,10,,,,,0xFFFFFFFF,63,2,1023,,,,,{ bonus bLuk,2; bonus bCritical,2; bonus bDex,-2;},{},{}
4925,Fortune3,Darklord Essence Luck3,6,20,,10,,,,,0xFFFFFFFF,63,2,1023,,,,,{ bonus bLuk,4; bonus bCritical,4; bonus bDex,-4;},{},{}
-4926,Critical_Lv1,Cri 1Lv,6,10,,,,,,,,,,,,,,,{ bonus bCritical,1; },{},{}
+4926,Critical1,Cri 1Lv,6,10,,,,,,,,,,,,,,,{ bonus bCritical,1; },{},{}
4927,HP50,MaxHP50,6,10,,,,,,,,,,,,,,,{ bonus bMaxHP,50; },{},{}
4928,SP10,MaxSP+10,6,10,,,,,,,,,,,,,,,{ bonus bMaxSP,10; },{},{}
4929,MSP1,MSP+1%,6,10,,,,,,,,,,,,,,,{ bonus bMaxSPrate,1; },{},{}
@@ -3107,7 +3108,7 @@
4937,ATK_MEDIUM1,Attack mid1,6,20,,10,,,,,,,,,,,,,{ bonus2 bAddSize,Size_Medium,1; },{},{}
4938,ATK_SMALL1,Attack small1,6,20,,10,,,,,,,,,,,,,{ bonus2 bAddSize,Size_Small,1; },{},{}
4939,Critical2,CRI Lv2,6,10,,,,,,,,,,,,,,,{ bonus bCritical,2; },{},{}
-4940,Cricital3,CRI Lv3,6,10,,,,,,,,,,,,,,,{ bonus bCritical,4; },{},{}
+4940,Critical3,CRI Lv3,6,10,,,,,,,,,,,,,,,{ bonus bCritical,4; },{},{}
4941,Critical4,CRI Lv4,6,10,,,,,,,,,,,,,,,{ bonus bCritical,6; },{},{}
4942,Dodge1,Parrying Lv1,6,10,,,,,,,,,,,,,,,{ bonus bFlee2,2; },{},{}
4943,Dodge2,Parrying Lv2,6,10,,,,,,,,,,,,,,,{ bonus bFlee2,4; },{},{}
@@ -3118,6 +3119,55 @@
4948,Skill_Delay1,After Skill Delay Lv1,6,10,,,,,,,,,,,,,,,{ bonus bDelayrate,-2; },{},{}
4949,Skill_Delay2,After Skill Delay Lv2,6,10,,,,,,,,,,,,,,,{ bonus bDelayrate,-4; },{},{}
4950,Skill_Delay3,After Skill Delay Lv3,6,10,,,,,,,,,,,,,,,{ bonus bDelayrate,-6; },{},{}
+4951,Darkness_Drop,Darkness Drop,6,0,,,,,,,,,,,,,,,{ bonus2 bAddEle,Ele_Dark,2; bonus2 bMagicAtkEle,Ele_Dark,2; bonus2 bSubEle,Ele_Dark,1; },{},{}
+4952,Fire_Drop,Fire Drop,6,0,,,,,,,,,,,,,,,{ bonus2 bAddEle,Ele_Fire,2; bonus2 bMagicAtkEle,Ele_Fire,2; bonus2 bSubEle,Ele_Fire,1; },{},{}
+4953,Water_Drop,Water Drop,6,0,,,,,,,,,,,,,,,{ bonus2 bAddEle,Ele_Water,2; bonus2 bMagicAtkEle,Ele_Water,2; bonus2 bSubEle,Ele_Water,1; },{},{}
+4954,Earth_Drop,Earth Drop,6,0,,,,,,,,,,,,,,,{ bonus2 bAddEle,Ele_Earth,2; bonus2 bMagicAtkEle,Ele_Earth,2; bonus2 bSubEle,Ele_Earth,1; },{},{}
+4955,Holy_Drop,Holy Drop,6,0,,,,,,,,,,,,,,,{ bonus2 bAddEle,Ele_Holy,2; bonus2 bMagicAtkEle,Ele_Holy,2; bonus2 bSubEle,Ele_Holy,1; },{},{}
+4956,Recovery_Drop,Recovery Drop,6,0,,,,,,,,,,,,,,,{ setarray .@skills$, "AL_HEAL", "PR_SANCTUARY", "AM_POTIONPITCHER", "AB_HIGHNESSHEAL", "AB_CHEAL"; for( .@i = 0; .@i < getarraysize(.@skills$); .@i++ ){ bonus2 bSkillHeal,.@skills$[.@i],2; bonus2 bSkillHeal2,.@skills$[.@i],2; } /* TODO: Depending on some recovery items HP recovery amount + 2% */ },{},{}
+4957,Famitsus_Power,Famitsu's Power,6,0,,,,,,,,,,,,,,,{ bonus bMaxHP,832; },{},{}
+4958,Gemini,Gemini,6,0,,,,,,,,,,,,,,,{ bonus bDelayrate,-1; },{},{}
+4959,Sagittarius,Sagittarius,6,0,,,,,,,,,,,,,,,{ bonus bLongAtkRate,1; },{},{}
+4960,Aquarius,Aquarius,6,0,,,,,,,,,,,,,,,{ bonus bUseSPrate,-2; },{},{}
+4961,Aries,Aries,6,0,,,,,,,,,,,,,,,{ bonus bMatk,10; },{},{}
+4962,Cancer,Cancer,6,0,,,,,,,,,,,,,,,{ bonus bAtk,3; },{},{}
+4963,Taurus,Taurus,6,0,,,,,,,,,,,,,,,{ bonus bAtk,4; bonus bHit,1; },{},{}
+4964,Capricorn,Capricorn,6,0,,,,,,,,,,,,,,,{ bonus2 bMagicAddRace,RC_All,3; },{},{}
+4965,Pisces,Pisces,6,0,,,,,,,,,,,,,,,{ bonus bVariableCastrate,-2; },{},{}
+4966,Scorpio,Scorpio,6,0,,,,,,,,,,,,,,,{ bonus2 bAddRace,RC_All,1; },{},{}
+4967,Leo,Leo,6,0,,,,,,,,,,,,,,,{ bonus bAspdRate,3; },{},{}
+4968,Virgo,Virgo,6,0,,,,,,,,,,,,,,,{ setarray .@skills$, "AL_HEAL", "PR_SANCTUARY", "AM_POTIONPITCHER", "AB_HIGHNESSHEAL", "AB_CHEAL"; for( .@i = 0; .@i < getarraysize(.@skills$); .@i++ ){ bonus2 bSkillHeal,.@skills$[.@i],1; } },{},{}
+4969,Libra,Libra,6,0,,,,,,,,,,,,,,,{ setarray .@skills$, "AL_HEAL", "PR_SANCTUARY", "AM_POTIONPITCHER", "AB_HIGHNESSHEAL", "AB_CHEAL"; for( .@i = 0; .@i < getarraysize(.@skills$); .@i++ ){ bonus2 bSkillHeal2,.@skills$[.@i],1; } /* TODO: Depending on some recovery items HP recovery amount + 1% */ },{},{}
+4970,Fire_Property_Reactor,Fire Property Reactor,6,0,,,,,,,,,,,,,,,{ bonus bDefEle,Ele_Fire; },{},{}
+4971,Water_Property_Reactor,Water Property Reactor,6,0,,,,,,,,,,,,,,,{ bonus bDefEle,Ele_Water; },{},{}
+4972,Earth_Property_Reactor,Earth Property Reactor,6,0,,,,,,,,,,,,,,,{ bonus bDefEle,Ele_Earth; },{},{}
+4973,Wind_Property_Reactor,Wind Property Reactor,6,0,,,,,,,,,,,,,,,{ bonus bDefEle,Ele_Wind; },{},{}
+4974,Fire_Resistance_Reactor,Fire Resistance Reactor,6,0,,,,,,,,,,,,,,,{ bonus2 bSubEle,Ele_Fire,25; bonus2 bSubEle,Ele_Water,-25; },{},{}
+4975,Water_Resistance_Reactor,Water Resistance Reactor,6,0,,,,,,,,,,,,,,,{ bonus2 bSubEle,Ele_Water,25; bonus2 bSubEle,Ele_Wind,-25; },{},{}
+4976,Earth_Resistance_Reactor,Earth Resistance Reactor,6,0,,,,,,,,,,,,,,,{ bonus2 bSubEle,Ele_Earth,25; bonus2 bSubEle,Ele_Fire,-25; },{},{}
+4977,Wind_Resistance_Reactor,Wind Resistance Reactor,6,0,,,,,,,,,,,,,,,{ bonus2 bSubEle,Ele_Wind,25; bonus2 bSubEle,Ele_Earth,-25; },{},{}
+4978,Recovery_Reactor_101,Recovery Reactor 101,6,0,,,,,,,,,,,,,,,{ if (getrefine()>=7) bonus2 bHPRegenRate,100,5000; else bonus2 bHPRegenRate,50,5000; },{},{}
+4979,Recovery_Reactor_102,Recovery Reactor 102,6,0,,,,,,,,,,,,,,,{ if (getrefine()>=7) bonus2 bSPRegenRate,5,5000; else bonus2 bHPRegenRate,3,5000; },{},{}
+4980,Recovery_Reactor_201,Recovery Reactor 201,6,0,,,,,,,,,,,,,,,{ if (getrefine()>=7) bonus2 bRegenPercentHP,100,5000; else bonus2 bRegenPercentHP,50,5000; },{},{}
+4981,Recovery_Reactor_202,Recovery Reactor 202,6,0,,,,,,,,,,,,,,,{ if (getrefine()>=7) bonus2 bRegenPercentSP,100,5000; else bonus2 bRegenPercentSP,50,5000; },{},{}
+4982,STR_Supplement_Reactor,STR Supplement Reactor,6,0,,,,,,,,,,,,,,,{ if (getrefine()>=7) { .@bonus = 10; } bonus bBaseAtk,.@bonus + 5*(readparam(bStr)/10); },{},{}
+4983,INT_Supplement_Reactor,INT Supplement Reactor,6,0,,,,,,,,,,,,,,,{ if (getrefine()>=7) { .@bonus = 10; } bonus bMatk,.@bonus + 5*(readparam(bInt)/10); },{},{}
+4984,DEF_Supplement_Reactor,DEF SupplementReactor,6,0,,,,,,,,,,,,,,,{ bonus bDef,100; },{},{}
+4985,PD_Supplement_Reactor,PD Supplement Reactor,6,0,,,,,,,,,,,,,,,{ bonus bFlee2,3; },{},{}
+4986,Attack_Supplement_Reactor,Attack Supplement Reactor,6,0,,,,,,,,,,,,,,,{ bonus bBaseAtk,20; },{},{}
+4987,Magic_Supplement_Reactor,Magic Supplement Reactor,6,0,,,,,,,,,,,,,,,{ bonus bMatk,20; },{},{}
+4988,HP_Supplement_Reactor,HP Supplement Reactor,6,0,,,,,,,,,,,,,,,{ bonus bMaxHPrate,5; },{},{}
+4989,SP_Supplement_Reactor,SP Supplement Reactor,6,0,,,,,,,,,,,,,,,{ bonus bMaxSPrate,3; },{},{}
+4990,Frozen_Supplement_Reactor,Frozen Supplement Reactor,6,0,,,,,,,,,,,,,,,{ bonus2 bResEff,Eff_Freeze,10000; },{},{}
+4991,ASPD_Supplement_Reactor,ASPD Supplement Reactor,6,0,,,,,,,,,,,,,,,{ bonus bAspd,1; },{},{}
+4992,HPAbsorb1_Supplement_Reactor,HP Absorb Supplement Reactor,6,0,,,,,,,,,,,,,,,{ bonus2 bHPDrainRate,10,1; },{},{}
+4993,SPAbsorb1_Supplement_Reactor,SP Absorb Supplement Reactor,6,0,,,,,,,,,,,,,,,{ bonus2 bSPDrainRate,10,1; },{},{}
+4994,Rune_of_Strength_Lv_1,Rune of Strength Lv 1,6,20,,,,,,,,,,,,,,,{ .@r = getrefine(); if (.@r>=7) { bonus bStr,5; } if (.@r>=10) { bonus bAtkRate,5; } },{},{}
+4995,Rune_of_Strength_Lv_2,Rune of Strength Lv 2,6,20,,,,,,,,,,,,,,,{ .@r = getrefine(); if (.@r>=7) { bonus bStr,6; } if (.@r>=11) { bonus bStr,1; bonus bAtkRate,7; } },{},{}
+4996,Rune_of_Strength_Lv_3,Rune of Strength_Lv 3,6,20,,,,,,,,,,,,,,,{ .@r = getrefine(); if (.@r>=7) { bonus bStr,7; } if (.@r>=12) { bonus bStr,1; bonus bAtkRate,8; } if (.@r>=13) { bonus bStr,1; bonus bAtkRate,2; } },{},{}
+4997,Rune_of_Agility_Lv_1,Rune of Agility Lv 1,6,20,,,,,,,,,,,,,,,{ .@r = getrefine(); if (.@r>=7) { bonus bAgi,5; } if (.@r>=10) { bonus bFlee2,5; } },{},{}
+4998,Rune_of_Agility_Lv_2,Rune of Agility Lv 2,6,20,,,,,,,,,,,,,,,{ .@r = getrefine(); if (.@r>=7) { bonus bAgi,6; } if (.@r>=11) { bonus bAgi,1; bonus bFlee2,7; } },{},{}
+4999,Rune_of_Agility_Lv_3,Rune of Agility Lv 3,6,20,,,,,,,,,,,,,,,{ .@r = getrefine(); if (.@r>=7) { bonus bAgi,7; } if (.@r>=12) { bonus bAgi,1; bonus bFlee2,5; } if (.@r>=13) { bonus bAgi,1; bonus bFlee2,5; } },{},{}
//===================================================================
// More Headgears
//===================================================================
@@ -3322,7 +3372,7 @@
5199,Baseball_Cap_I,Baseball Cap,4,0,,200,,3,,0,0xFFFFFFFF,63,2,256,,0,1,216,{},{},{}
5200,Coppola,Coppola,4,10,,300,,0,,0,0xFFFFFFFF,63,2,256,,0,1,252,{},{},{}
5201,Party_Hat_B,Party Hat,4,20,,300,,4,,0,0xFFFFFFFF,63,2,256,,0,1,144,{ bonus bAllStats,3; },{},{}
-5202,Pumpkin_Hat_,Fantastic Pumpkin-Head,4,20,,200,,3,,0,0xFFFFFFFF,63,2,256,,0,1,206,{ bonus2 bSubRace,RC_Demon,5; bonus3 bAddMonsterDropItem,529,RC_DemiHuman,1500; bonus3 bAddMonsterDropItem,529,RC_Player,1500; },{},{}
+5202,Pumpkin_Hat_,Fantastic Pumpkin-Head,4,20,,200,,3,,0,0xFFFFFFFF,63,2,256,,0,1,206,{ bonus2 bSubRace,RC_Demon,5; bonus3 bAddMonsterDropItem,529,RC_DemiHuman,1500; },{},{}
5203,Tongue_Mask,Smiling Mask,4,20,,200,,2,,0,0xFFFFFFFF,63,2,513,,0,0,253,{ bonus bSpeedRate,25; },{},{}
5204,Event_Pierrot_Nose,Rudolph's Nose,4,20,,100,,0,,0,0xFFFFFFFF,63,2,1,,0,0,49,{ bonus2 bResEff,Eff_Blind,3000; bonus2 bAddMonsterDropItem,12130,30; },{},{}
5205,Wreath,Emperor's Laurel Crown,4,20,,1000,,3,,0,0xFFFFFFFF,63,2,768,,0,1,261,{ bonus bAllStats,1; bonus bMdef,3; },{},{}
@@ -3480,7 +3530,7 @@
5357,Wings_Of_Victory,Wings Of Victory,4,20,,200,,10,,0,0xFFFFFFFF,63,2,768,,0,0,365,{ bonus bMdef,10; bonus bUnbreakableHelm,1; },{},{}
5358,Pecopeco_Wing_Ears,Peco Ears,4,20,,100,,2,,0,0xFFFFFFFF,63,2,512,,70,0,366,{ bonus bAgi,1; bonus bMdef,2; bonus bUnbreakableHelm,1; },{},{}
5359,J_Captain_Hat,Ship Captain Hat,4,20,,300,,3,,1,0xFFFFFFFF,63,2,256,,60,1,367,{ bonus bDex,1; bonus bMaxHP,100; bonus bLongAtkRate,7; },{},{}
-5360,Whikebain_Ears,Hyuke's Black Cat Ears,4,20,,200,,4,,0,0xFFFFFFFF,63,2,256,,45,1,368,{ bonus bFlee,10; bonus bCritical,3; bonus bCritAtkRate,10; bonus bDefRate,-50; bonus bDef2Rate,-50; },{},{}
+5360,Whikebain_Ears,Hyuke's Black Cat Ears,4,20,,200,,4,,0,0xFFFFFFFE,63,2,256,,45,1,368,{ bonus bFlee,10; bonus bCritAtkRate,10; autobonus "{ bonus2 bIgnoreMdefRaceRate,RC_ALL,25; }",50,5000,BF_MAGIC,"{ specialeffect2 EF_AGIUP; }"; },{},{}
5361,Gang_Scarf,Gangster Scarf,4,20,,100,,0,,0,0xFFFFFFFF,63,2,1,,0,0,369,{ bonus bBaseAtk,5; if(BaseJob==Job_Rogue) skill "RG_GANGSTER",1; },{},{}
5362,Ninja_Scroll,Ninja Scroll,4,20,,200,,0,,0,0xFFFFFFFF,63,2,1,,0,0,370,{ bonus bMatkRate,1; },{},{}
5363,Helm_Of_Abyss,Helm Of Abyss,4,20,,1000,,9,,1,0x000654E2,63,2,256,,70,1,371,{ bonus2 bSubClass,Class_Normal,-5; bonus2 bSubClass,Class_Boss,10; },{},{}
@@ -3584,7 +3634,7 @@
5461,Adv_Whisper_Mask,Evolved Whisper Mask,4,20,,300,,1,,0,0xFFFFFFFF,63,2,769,,50,1,458,{ bonus bDex,3; bonus2 bSubEle,Ele_Ghost,20; },{},{}
5462,Spiked_Scarf,Spiked Scarf,4,20,,100,,1,,0,0xFFFFFFFF,63,2,1,,90,0,459,{ bonus bAtk,30; bonus bMaxHPrate,-2; },{},{}
5463,Rainbow_Scarf,Rainbow Scarf,4,20,,0,,1,,0,0xFFFFFFFF,63,2,1,,90,0,460,{ bonus bMatk,30; bonus bMaxSPrate,-2; },{},{}
-5464,Zaha_Doll_Hat_J,Zaha Doll Hat,4,20,,0,,1,,1,0xFFFFFFFF,63,2,256,,0,0,461,{ bonus bInt,3; bonus bMdef,9; bonus2 bMagicAddRace,Ele_Undead,10; .@r0 = getrefine(); autobonus "{ .@r = getrefine(); bonus2 bSPLossRate,10,1000; bonus bMatk,30*.@r; bonus bFixedCast,-80*.@r; }",3*.@r0,3000,BF_MAGIC,"{ active_transform 1518,3000; specialeffect2 EF_POTION_BERSERK; showscript \"Bacsojin Power !\"; }"; autobonus2 "{ .@r = getrefine(); bonus2 bSPLossRate,10,1000; bonus bMatk,30*.@r; bonus bFixedCast,-80*.@r; }",.@r0,3000,BF_MAGIC,"{ active_transform 1518,3000; specialeffect2 EF_POTION_BERSERK; showscript \"Bacsojin Power !\"; }"; },{},{}
+5464,Zaha_Doll_Hat,Zaha Doll Hat,4,20,,0,,1,,1,0xFFFFFFFF,63,2,256,,0,1,461,{ bonus bInt,3; bonus bMdef,9; bonus2 bMagicAddRace,Ele_Undead,10; .@r0 = getrefine(); autobonus "{ .@r = getrefine(); bonus2 bSPLossRate,10,1000; bonus bMatk,30*.@r; bonus bFixedCast,-80*.@r; }",3*.@r0,3000,BF_MAGIC,"{ active_transform 1518,3000; specialeffect2 EF_POTION_BERSERK; showscript \"Bacsojin Power !\"; }"; autobonus2 "{ .@r = getrefine(); bonus2 bSPLossRate,10,1000; bonus bMatk,30*.@r; bonus bFixedCast,-80*.@r; }",.@r0,3000,BF_MAGIC,"{ active_transform 1518,3000; specialeffect2 EF_POTION_BERSERK; showscript \"Bacsojin Power !\"; }"; },{},{}
5465,Celestial_Hat,Hat Of Fortune,4,20,,500,,3,,1,0xFFFFFFFF,63,2,256,,40,1,462,{ bonus bLuk,2; bonus bMdef,5; .@r = getrefine(); if(.@r>4) bonus bLuk,.@r-4; },{},{}
5466,Wind_Milestone,Wind Milestone,4,20,,100,,2,,1,0xFFFFFFFF,63,2,256,,30,1,463,{ bonus bAgi,2; skill "AL_TELEPORT",1; },{},{}
5467,Helm_Of_Dragoon,Helm Of Dragon,4,20,,1000,,10,,1,0xFFFFFFFF,63,2,256,,1,1,464,{ bonus bStr,2; bonus bInt,2; bonus bDex,2; .@r = getrefine(); if(.@r>=7) bonus2 bExpAddRace,RC_Dragon,3; if(.@r>=9) bonus2 bExpAddRace,RC_Dragon,5; bonus3 bAutoSpell,"NPC_DRAGONFEAR",1,30; },{},{}
@@ -3592,7 +3642,7 @@
5469,Noble_Hat,Musketeer Hat,4,20,,300,,4,,1,0xFFFFFFFF,63,2,256,,60,1,466,{ bonus bDex,3; bonus bFlee,3; .@r = getrefine(); if(.@r>=7){ bonus bFlee,3; bonus bLongAtkRate,3; } if(.@r>=9){ bonus bFlee,4; bonus bLongAtkRate,2; } },{},{}
5470,Eyes_Of_Darkness,Eye Of Darkness,4,20,,100,,1,,0,0xFFFFFFFF,63,2,512,,50,0,467,{ bonus bDex,1; bonus2 bResEff,Eff_Blind,10000; },{},{}
5471,Hairband_Of_Reginleif,Hairband Of Reginleif,4,20,,800,,2,,0,0xFFFFFFFF,63,2,512,,50,0,468,{ bonus2 bSubEle,Ele_Water,3; bonus2 bSubEle,Ele_Fire,3; bonus2 bSubEle,Ele_Undead,3; bonus2 bSubEle,Ele_Ghost,3; },{},{}
-5472,Red_White_Hat,Red Hat,4,20,,100,,0,,0,0xFFFFFFFF,63,2,256,,0,1,469,{ bonus3 bAddMonsterDropItem,554,RC_DemiHuman,200; bonus3 bAddMonsterDropItem,554,RC_Player,200; },{},{}
+5472,Red_White_Hat,Red Hat,4,20,,100,,0,,0,0xFFFFFFFF,63,2,256,,0,1,469,{ bonus3 bAddMonsterDropItem,554,RC_DemiHuman,200; },{},{}
5473,Forceps_Hairpin,Nipper Crab Hairpin,4,20,,500,,8,,0,0xFFFFFFFF,63,2,256,,30,1,470,{ bonus3 bAutoSpellWhenHit,"MG_COLDBOLT",1,30; bonus3 bAddMonsterDropItem,991,RC_Fish,100; },{},{}
5474,Notice_Board,AFK Hat,4,20,,700,,2,,0,0xFFFFFFFF,63,2,256,,10,0,471,{},{},{}
5475,Cube_Mask,Mask Cube,4,20,,100,,1,,0,0xFFFFFFFF,63,2,513,,0,0,472,{ bonus bAllStats,1; },{},{}
@@ -3703,7 +3753,7 @@
5580,Red_Beret,Red Beret,4,20,,100,,3,,0,0xFFFFFFFF,63,2,256,,0,0,559,{ bonus bAllStats,3; bonus bMdef,3; },{},{}
5581,Cancer_Diadem,Cancer Diadem,4,20,,300,,3,,0,0xFFFFFFFF,63,2,256,,70,1,560,{ bonus bInt,2; bonus2 bSubEle,Ele_Water,5; if(getrefine()>6) { bonus bMdef,1; bonus bHealPower,3; bonus bMatkRate,2; } },{},{}
5582,Cancer_Crown,Cancer Crown,4,20,,300,,3,,0,0xFFFFFFFF,63,2,256,,70,1,561,{ bonus bStr,2; bonus2 bSubEle,Ele_Water,5; if(getrefine()>6) { bonus bDef,1; bonus bBaseAtk,15; bonus bFlee,10; } },{},{}
-5583,Para_Team_Hat1,Eden Team Hat I,4,0,,0,,5,,0,0xFFFFFFFF,63,2,256,,12,1,465,{},{},{}
+5583,Para_Team_Hat,Eden Team Hat I,4,0,,0,,5,,0,0xFFFFFFFF,63,2,256,,12,1,465,{},{},{}
5584,Majestic_Evil_Horn,Majestic Evil Horns,4,0,,400,,2,,0,0xFFFFFFFF,63,2,256,,1,1,562,{ bonus2 bSubRace,RC_Demon,3; bonus2 bHPDrainRate,3,15; bonus2 bSPDrainRate,1,7; /*Gold PC Room bonus bSPGainValue,2; bonus bMagicSPGainValue,2; bonus2 bSubRace,RC_Demon,2;*/ },{},{}
5585,Rune_Hairband,Rune Cloth Circlet,4,20,,400,,1,,1,0xFFFFFFFF,63,2,768,,1,1,564,{ bonus2 bSubEle,Ele_Neutral,3; bonus bHit,5; bonus2 bHPDrainRate,30,10; bonus2 bSPDrainRate,10,5; },{},{}
5586,Mosquito_Coil,Mosquito Coil,4,20,,100,,1,,1,0xFFFFFFFF,63,2,256,,1,1,563,{ bonus2 bAddDamageClass,1627,100; bonus2 bAddDamageClass,1095,20; bonus2 bAddDamageClass,1160,20; bonus2 bAddDamageClass,1105,20; bonus2 bAddDamageClass,1097,20; bonus2 bAddDamageClass,1051,20; bonus2 bAddDamageClass,1053,20; bonus2 bAddDamageClass,1054,20; bonus2 bAddDamageClass,1048,20; },{},{}
@@ -3712,8 +3762,8 @@
5589,Leo_Diadem,Leo Diadem,4,20,,300,,3,,0,0xFFFFFFFF,63,2,256,,1,1,566,{ bonus bDex,2; bonus2 bSubEle,Ele_Fire,5; if(getrefine()>6) { bonus bFlee,10; bonus bAspdRate,3; autobonus "{ bonus bSplashRange,1; }",10,10000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }"; } },{},{}
5590,K_Poring_Cake_Cap,Poring Cake Hat,4,20,,200,,1,,0,0xFFFFFFFF,63,2,256,,0,1,417,{ bonus bLuk,3; bonus bMdef,5; bonus bMaxHP,BaseLevel*2; bonus bMaxSP,50; },{},{}
5591,Desert_Prince,Desert Prince,4,20,,100,,3,,1,0xFFFFFFFF,63,2,256,,30,0,567,{ bonus bUnbreakableHelm,0; },{},{}
-5592,Sigrun's_Wings,Sigrun's Wings,4,20,,100,,2,,0,0xFFFFFFFF,63,2,512,,80,0,568,{ if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief||(BaseJob==Job_Taekwon&&Class!=Job_Soul_Linker)) bonus bAspd,1; else if(BaseClass==Job_Mage||BaseClass==Job_Acolyte||Class==Job_Ninja||Class==Job_Soul_Linker){ bonus bMatk,5; bonus bHealPower,2; } else if(BaseClass==Job_Archer||BaseClass==Job_Gunslinger) bonus bLongAtkRate,2; else if(BaseJob==Job_Novice||BaseJob==Job_SuperNovice) { bonus bMaxHP,120; bonus bMaxSP,60; } },{},{}
-5593,Rabbit_Bonnet_,Rabbit Bonnet,4,20,,200,,1,,1,0xFFFFFFFF,63,2,768,,1,1,549,{ bonus bBaseAtk,10; bonus bMatk,10; bonus2 bSubRace,RC_DemiHuman,3; bonus2 bSubRace,RC_Player,3; bonus bDelayRate,-3; if(getrefine()>6) { bonus2 bSubDefEle,Ele_All,5; } },{},{}
+5592,Sigrun's_Wing,Sigrun's Wings,4,20,,100,,2,,0,0xFFFFFFFF,63,2,512,,80,0,568,{ if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief||(BaseJob==Job_Taekwon&&Class!=Job_Soul_Linker)) bonus bAspd,1; else if(BaseClass==Job_Mage||BaseClass==Job_Acolyte||Class==Job_Ninja||Class==Job_Soul_Linker){ bonus bMatk,5; bonus bHealPower,2; } else if(BaseClass==Job_Archer||BaseClass==Job_Gunslinger) bonus bLongAtkRate,2; else if(BaseJob==Job_Novice||BaseJob==Job_SuperNovice) { bonus bMaxHP,120; bonus bMaxSP,60; } },{},{}
+5593,K_Rabbit_Bonnet,Rabbit Bonnet,4,20,,200,,1,,1,0xFFFFFFFF,63,2,768,,1,1,549,{ bonus bBaseAtk,10; bonus bMatk,10; bonus2 bSubRace,RC_DemiHuman,3; bonus2 bSubRace,RC_Player,3; bonus bDelayRate,-3; if(getrefine()>6) { bonus2 bSubDefEle,Ele_All,5; } },{},{}
5594,Donut_In_Mouth,Donut In Mouth,4,20,,50,,1,,0,0xFFFFFFFF,63,2,1,,1,0,569,{ bonus2 bHPRegenRate,1,10000; bonus bMaxHP,100; },{},{}
5595,Eye_Of_Juno,Eye Of Juno,4,20,,400,,2,,1,0xFFFFFFFF,63,2,256,,1,1,570,{ bonus bMdef,2; .@i = JobLevel/14; if(BaseClass==Job_Mage||BaseClass==Job_Archer||BaseClass==Job_Acolyte){ bonus bInt,2; bonus bDex,2; bonus2 bSubEle,Ele_Neutral,.@i; bonus2 bSubEle,Ele_Water,.@i; } else if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief){ bonus bAgi,2; bonus bVit,2; bonus2 bSubEle,Ele_Neutral,.@i; bonus2 bSubEle,Ele_Water,.@i; } },{},{}
5596,4Leaf_Clover_In_Mouth,4Leaf Clover In Mouth,4,20,,0,,2,,0,0xFFFFFFFF,63,2,1,,1,0,571,{ bonus bMdef,2; bonus2 bAddMonsterDropItem,12245,10; },{},{}
@@ -3779,7 +3829,7 @@
5656,Scooter_Hat_J,Scooter Helmet,4,20,,1000,,7,,1,0xFFFFFFFF,63,2,256,,50,1,588,{ bonus bUnbreakableHelm,1; },{},{}
5657,Antique_Pipe_J,Captain's Pipe,4,20,,100,,0,,0,0xFFFFFFFF,63,2,1,,30,0,383,{},{},{}
5658,Imp_Hat,Imp Hat,4,20,,400,,1,,1,0xFFFFFFFF,63,2,256,,1,1,589,{ bonus3 bAutoSpell,"SA_FLAMELAUNCHER",1,5; },{},{}
-5659,Sleeper_Hat,Sleeper Hat,4,20,,400,,1,,0,0xFFFFFFFF,63,2,256,,1,1,590,{ bonus3 bAutoSpell,"SA_SEISMICWEAPON",1,5; },{},{}
+5659,Sleepr_Hat,Sleeper Hat,4,20,,400,,1,,0,0xFFFFFFFF,63,2,256,,1,1,590,{ bonus3 bAutoSpell,"SA_SEISMICWEAPON",1,5; },{},{}
5660,Gryphon_Hat,Gryphon Hat,4,20,,400,,1,,1,0xFFFFFFFF,63,2,256,,1,1,591,{ bonus bAgi,2; if (getrefine() > 6) { bonus bAgi,2; } if (getrefine() > 8) { bonus2 bAddRace,RC_Demon,10; bonus2 bAddRace,RC_Undead,10; } },{},{}
5661,Red_Pirate_Bandana,Red Pirate Bandana,4,0,,0,,3,,0,0xFFFFFFFF,63,2,256,,10,1,592,{ bonus bStr,1; bonus bDex,1; bonus bAspdRate,2; bonus bVariableCastrate,-2; bonus3 bAutoSpell,"MO_EXTREMITYFIST",1,3; },{},{}
5662,Libra_Crown,Libra Crown,4,10,,300,,3,,0,0xFFFFFFFF,63,2,256,,1,1,593,{ bonus bDex,3; bonus2 bSubEle,Ele_Wind,7; if (getrefine()>=7) { bonus bMatkRate,3; } if (getrefine()>=9) { bonus bMatkRate,5; bonus3 bAutoSpellWhenHit,"WZ_FROSTNOVA",5,20;} },{},{}
@@ -3808,7 +3858,7 @@
5685,Prontera_Army_Cap_Repl,Army Cap,4,20,,100,,5,,0,0xFFFFFFFF,63,2,256,,1,1,48,{},{},{}
5686,Feather_Bonnet_Repl,Nice Hat Feather,4,20,,100,,5,,0,0xFFFFFFFF,63,2,256,,1,1,104,{},{},{}
5687,Viking_Helm_Repl,Orc Helm,4,20,,100,,5,,0,0xFFFFFFFF,63,2,256,,1,1,86,{},{},{}
-5688,2009_Love_Dad,2009 Love Dad,4,20,,100,,3,,0,0xFFFFFFFF,63,2,256,,1,1,611,{ bonus bVit,2; },{},{}
+5688,2009Love_Daddy,2009 Love Dad,4,20,,100,,3,,0,0xFFFFFFFF,63,2,256,,1,1,611,{ bonus bVit,2; },{},{}
5689,Queen_Ant_Diadem,Queen Ant Diadem,4,20,,300,,1,,0,0xFFFFFFFF,63,2,256,,75,1,612,{ bonus3 bAutoSpellWhenHit,"MG_SIGHT",1,5; bonus2 bSubRace,RC_Insect,5; },{},{}
5690,Red_Wing_Hat,Red Wing Hat,4,20,,600,,5,,0,0xFFFFFFFF,63,2,256,,1,1,613,{ bonus bHPrecovRate,20; bonus bSPrecovRate,20; },{},{}
5691,Catain_Bandanna,Sailor's Bandana,4,20,,10,,1,,0,0xFFFFFFFF,63,2,256,,1,1,542,{ bonus bDex,1; bonus2 bSubEle,Ele_Poison,20; bonus2 bResEff,Eff_Poison,2000; bonus bUnbreakableHelm,0; },{},{}
@@ -3858,14 +3908,14 @@
5735,E_Ribbon_Green,Green Ribbon,4,800,,100,,1,,0,0xFFFFFFFF,63,0,256,,0,1,244,{ bonus bMdef,3; },{},{}
5736,EF_Whisper_Mask,Whisper Mask,4,20,,0,,0,,0,0xFFFFFFFF,63,2,769,,0,0,321,{ bonus bAgi,3; bonus2 bSubEle,Ele_Ghost,-10; },{},{}
5737,Cactus_Hat,Cactus Hat,4,20,,300,,1,,0,0xFFFFFFFF,63,2,256,,1,0,615,{ bonus3 bAddMonsterDropItem,952,RC_Plant,500; },{},{}
-5738,Snowman_Hat,Snowman Hat,4,20,,300,,4,,1,0xFFFFFFFF,63,2,256,,1,1,616,{ bonus bStr,1; bonus bInt,1; bonus bMdef,3; bonus2 bSubEle,Ele_Water,7; bonus2 bAddMonsterDropItem,530,100; bonus2 bAddMonsterDropItem,12354,300; bonus5 bAutoSpellwhenhit,"BA_FROSTJOKER",(getrefine()>7?5:1),20,BF_WEAPON|BF_MAGIC,0; },{},{}
+5738,Snowman_Hat,Snowman Hat,4,20,,300,,4,,1,0xFFFFFFFF,63,2,256,,1,1,616,{ bonus bStr,1; bonus bInt,1; bonus bMdef,3; bonus2 bSubEle,Ele_Water,7; bonus2 bAddMonsterDropItem,12354,100; bonus2 bAddMonsterDropItem,530,300; bonus5 bAutoSpellwhenhit,"BA_FROSTJOKER",(getrefine()>7?5:1),20,BF_WEAPON|BF_MAGIC,0; },{},{}
5739,Sagittarius_Crown,Sagittarius Crown,4,20,,300,,3,,1,0xFFFFFFFF,63,2,256,,1,1,617,{ bonus bDex,2; bonus2 bSubEle,Ele_Fire,7; .@r = getrefine(); if (.@r>6) { bonus bAspdRate,2; } if (.@r>7) { bonus bAgi,2; } if (.@r>8) { bonus bLongAtkRate,5; } if (.@r>9) { autobonus "{ bonus bAgi,10; bonus bDex,10; }",3,10000,0,"{ specialeffect2 EF_ENHANCE; }"; } },{},{}
5740,Sagittarius_Diadem,Sagittarius Diadem,4,20,,300,,3,,1,0xFFFFFFFF,63,2,256,,1,1,618,{ bonus bDex,2; bonus bMdef,3; bonus2 bSubEle,Ele_Fire,7; .@r = getrefine(); if (.@r>6) { bonus bVariableCastrate,-3; } if (.@r>7) { bonus5 bAutoSpell,"WZ_SIGHTRASHER",10,5,BF_MAGIC,0; } if (.@r>8) { bonus bVariableCastrate,-2; } if (.@r>9) { bonus bMatkRate,4; } },{},{}
5741,Im_Egg_Shell_Hat,Eternal Egg Shell,4,20,,0,,1,,0,0xFFFFFFFF,63,2,256,,10,1,101,{ bonus2 bAddItemGroupHealRate,IG_Potion,10; bonus bHealPower2,10; },{},{}
5742,Rudolf_Santa_Hat,Rudolph Santa Hat,4,20,,400,,5,,0,0xFFFFFFFF,63,2,256,,10,1,619,{ bonus2 bAddMonsterDropItem,538,100; bonus2 bAddMonsterDropItem,539,100; bonus2 bAddItemHealRate,538,100; bonus2 bAddItemHealRate,539,100; },{},{}
5743,Orange_Stem_Hat,Orange Stem Hat,4,20,,100,,0,,0,0x00000000,63,2,256,,1,0,620,{ bonus bLuk,3; },{},{}
-5744,Capricon_Crown,Capricorn Crown,4,20,,300,,3,,1,0xFFFFFFFF,63,2,256,,1,1,621,{ bonus bVit,2; bonus bDex,2; if (getrefine()>6) { bonus3 bAutoSpell,"TK_SEVENWIND",1,500; } },{},{}
-5745,Capricon_Diadem,Capricorn Diadem,4,20,,300,,3,,0,0xFFFFFFFF,63,2,256,,1,1,622,{ bonus bDex,2; bonus bMdef,5; bonus2 bSubEle,Ele_Earth,5; .@r = getrefine(); if (.@r>6) { bonus bInt,2; } if (.@r>7) { bonus bVariableCastrate,-3; } if (.@r>8) { bonus bHealPower2,4; } if (.@r>9) { bonus3 bAutoSpell,"BS_HAMMERFALL",5,5; } },{},{}
+5744,Capricorn_Crown,Capricorn Crown,4,20,,300,,3,,1,0xFFFFFFFF,63,2,256,,1,1,621,{ bonus bVit,2; bonus bDex,2; if (getrefine()>6) { bonus3 bAutoSpell,"TK_SEVENWIND",1,500; } },{},{}
+5745,Capricorn_Diadem,Capricorn Diadem,4,20,,300,,3,,0,0xFFFFFFFF,63,2,256,,1,1,622,{ bonus bDex,2; bonus bMdef,5; bonus2 bSubEle,Ele_Earth,5; .@r = getrefine(); if (.@r>6) { bonus bInt,2; } if (.@r>7) { bonus bVariableCastrate,-3; } if (.@r>8) { bonus bHealPower2,4; } if (.@r>9) { bonus3 bAutoSpell,"BS_HAMMERFALL",5,5; } },{},{}
5746,Rune_Circlet,Rune Circlet,4,20,,100,,12,,1,0x00000080,56,2,256,,100,1,623,{ bonus bStr,1; bonus bInt,1; bonus bMdef,5; if(readparam(bStr)>=120){ bonus bBaseAtk,10; bonus bMatk,5; } },{},{}
5747,Mitra,Mitra,4,20,,100,,12,,1,0x00000100,56,2,256,,100,1,624,{ bonus bVit,1; bonus bInt,1; bonus bMdef,5; bonus bHealPower,5; if(readparam(bInt)>=120){ bonus bMatk,10; } },{},{}
5748,Sniper_Goggle,Sniper Goggles,4,20,,100,,12,,1,0x00000800,56,2,768,,100,1,625,{ bonus bAgi,1; bonus bDex,1; bonus bMdef,5; if(readparam(bAgi)>=120){ bonus bLongAtkRate,4; bonus bAspd,1; } },{},{}
@@ -3890,7 +3940,7 @@
5767,Samurai_Mask,Samurai Mask,4,20,,300,,1,,0,0xFFFFFFFF,63,2,1,,50,0,644,{ bonus2 bAddClass,Class_All,1; },{},{}
5768,Sakura_Coronet,Sakura Coronet,4,20,,800,,1,,1,0xFFFFFFFF,63,2,256,,1,1,645,{ bonus bMdef,3; bonus bMaxSP,25; },{},{}
5769,Gold_Angel_Sculpture,Gold Angel Sculpture,4,100,,0,,2,,0,0xFFFFFFFF,63,2,256,,70,0,646,{ skill "RG_GRAFFITI",1; },{},{}
-5770,Splash_Hat,Splash Hat,4,20,,100,,3,,1,0xFFFFFFFF,63,2,256,,1,1,649,{ autobonus "{ sc_start SC_WINDWEAPON,180000,1; }",3,180000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }"; },{},{}
+5770,Splash_Hat,Splash Hat,4,20,,100,,3,,1,0xFFFFFFFF,63,2,256,,1,1,649,{ autobonus "{}",3,180000,BF_WEAPON,"{ sc_start SC_WINDWEAPON,180000,1; specialeffect2 EF_ENHANCE; }"; },{},{}
5771,Family_Hat,Family Hat,4,20,,100,,3,,1,0xFFFFFFFF,63,2,256,,1,1,650,{ bonus bDex,1; bonus bMdef,1; bonus bMaxHPrate,2; bonus bMaxSPrate,2; skill "PR_MAGNIFICAT",1; },{},{}
5772,Red_Navy_Hat,Red Navy Hat,4,3000,,500,,1,,0,0xFFFFFFFF,63,2,256,,95,1,651,{ bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10; },{},{}
5773,Navy_Beret,Navy Beret,4,3000,,500,,1,,0,0xFFFFFFFF,63,2,256,,95,1,652,{ bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10; },{},{}
@@ -3910,7 +3960,7 @@
5787,Tha_Maero_Mask,Tha Maero Mask,4,20,,100,,0,,0,0xFFFFFFFF,63,2,513,,30,0,666,{ bonus bMdef,2; },{},{}
5788,3D_Glasses,3D Glasses,4,20,,100,,1,,0,0xFFFFFFFF,63,2,512,,1,0,661,{ bonus2 bMagicAddRace,RC_Formless,4; bonus2 bSubEle,Ele_Neutral,5; bonus bUnbreakableHelm,0; },{},{}
5789,Thanatos_Mal_Mask,Thanatos Mal Mask,4,20,,100,,3,,0,0xFFFFFFFF,63,2,513,,30,0,667,{ bonus bVit,1; },{},{}
-5790,Holy_Mom_Love,TM,4,20,,500,,0,,1,0xFFFFFFFF,63,2,768,,45,1,610,{ bonus2 bSubRace,RC_Demon,-5; bonus2 bSubRace,RC_Undead,-5; bonus3 bAutoSpell,"MG_COLDBOLT",1,20; },{},{}
+5790,Holy_Mom_Love,TM,4,20,,500,,0,,1,0xFFFFFFFF,63,2,768,,45,1,610,{ bonus2 bSubRace,RC_Demon,-5; bonus2 bSubRace,RC_Undead,-5; bonus3 bAutoSpell,"AL_BLESSING",1,20; },{},{}
5791,Tenkaippin_Ramen,Tenkaippin Ramen,4,20,,500,,1,,0,0xFFFFFFFF,63,2,256,,30,0,668,{ bonus bInt,-1; bonus bDex,4; },{},{}
5792,Fish_Pin,Fish Pin,4,20,,100,,3,,0,0xFFFFFFFF,63,2,256,,1,1,669,{ bonus2 bSubRace,RC_Fish,1; },{},{}
5793,Ribbon_Of_Life,Ribbon Of Life,4,20,,0,,2,,0,0xFFFFFFFF,63,2,512,,1,0,575,{ bonus bInt,1; bonus bMdef,2; },{},{}
@@ -3946,7 +3996,7 @@
5822,Love_Chick_Hat,Love Chick Hat,4,10000,,100,,4,,0,0xFFFFFFFF,63,2,256,,0,1,500,{ bonus bLuk,4; bonus bMaxHP,100; bonus bMaxSP,100; bonus2 bSubRace,RC_Brute,7; bonus2 bSubRace,RC_DemiHuman,7; bonus2 bSubRace,RC_Player,7; },{},{}
5823,Love_Arrow,Love Arrow,4,5000,,100,,1,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus bDex,5; bonus bAgi,5; },{},{}
5824,Fools_Day_Hat,Fools Day Hat,4,20,,300,,6,,0,0xFFFFFFFF,63,2,256,,30,1,265,{},{},{}
-5825,Badge_Of_Order_Grace,Badge Of Order Grace,4,0,,0,,1,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus bMdef,1; },{},{}
+5825,Badge_Of_Order_Grace,Badge Of Order Grace,4,0,,0,,1,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus bMdef,1; bonus2 bAddClass,Class_All,10; bonus bMatkRate,10; bonus bMaxHP,1500; },{},{}
5826,Valkyrie_Helmet,Valkyrie Helmet,4,0,,0,,10,,0,0xFFFFFFFF,63,2,256,,0,0,225,{ bonus bStr,2; bonus bInt,2; bonus bDex,2; bonus bAgi,2; bonus bMdef,5; },{},{}
5827,Book_File_Hat,Book File Hat,4,20,,100,,1,,0,0xFFFFFFFF,63,2,256,,1,1,423,{},{},{}
5828,Honor_Gold_Ring,Honor Gold Ring,4,0,,50,,0,,0,0xFFFFFFFF,63,2,136,,1,1,0,{ bonus bAllStats,1; bonus bMdef,5; },{},{}
@@ -3968,7 +4018,7 @@
5844,Loyal_Ring3,Loyal Ring3,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,1,1,0,{ bonus bAllStats,3; },{},{}
5845,Buzzy_Ball_Board,Buzzy Ball Board,4,50,,400,,0,,0,0xFFFFFFFF,63,2,256,,1,1,641,{},{},{}
5846,Buzzy_Ball_Gum,Buzzy Ball Gum,4,50,,100,,1,,0,0xFFFFFFFF,63,2,1,,1,0,572,{ bonus bMdef,5; },{},{}
-5847,Fools_Day_Helmet,Fools Day Helmet,4,0,,0,,0,,0,0xFFFFFFFF,63,2,256,,1,0,647,{ bonus bInt,5; bonus bVit,-3; },{},{}
+5847,Fools_Day_hat_,Fools Day Helmet,4,0,,0,,0,,0,0xFFFFFFFF,63,2,256,,1,0,647,{ bonus bInt,5; bonus bVit,-3; },{},{}
5848,Robin_Eyepatch,Robin Eyepatch,4,20,,0,,0,,0,0xFFFFFFFF,63,2,512,,1,0,50,{},{},{}
5849,Doctor_Hairband,Doctor Hairband,4,20,,0,,0,,0,0xFFFFFFFF,63,2,256,,1,0,60,{},{},{}
5850,Golden_Savage_Hat,Golden Savage Hat,4,20,,500,,5,,0,0xFFFFFFFF,63,2,256,,50,1,648,{},{},{}
@@ -4000,23 +4050,23 @@
5894,RCC2013_3RD_CROWN,RCC2013 3RD CROWN,4,20,,2500,,7,,1,0xFFFFFFFF,63,2,256,,1,0,1108,{ bonus bAllStats,3; skill "AL_TELEPORT",1; },{ sc_start SC_SPEEDUP0,-1,25; },{ sc_end SC_SPEEDUP0; }
5895,RCC2013_ANV_Hat,RCC2013 ANV Hat,4,20,,2500,,7,,1,0xFFFFFFFF,63,2,256,,1,0,1109,{ bonus bAllStats,1; bonus2 bAddClass,Class_All,2; bonus bMatkRate,2; },{},{}
5906,Oni_Horns_,Oni Horns,4,0,,20,,10,,1,0x00001000,63,2,256,,100,1,1127,{ bonus2 bSkillAtk,"GC_COUNTERSLASH",(10*getskilllv("GC_WEAPONBLOCKING")); .@r = getrefine(); if(.@r > 6){ bonus bAtk,20; bonus bHit,5; } if(.@r > 9){ bonus3 bAutoSpell,"GC_CROSSIMPACT",1,10; } },{},{}
-5914,C_Flutter_Butterfly,C Flutter Butterfly,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,1,1,0,1378,{ hateffect HAT_EF_FLUTTER_BUTTERFLY,true; },{},{ hateffect HAT_EF_FLUTTER_BUTTERFLY,false; }
-5917,Yellow_Scarf,Yellow Scarf,4,0,,100,,,,0,0xFFFFFFFF,63,2,1,0,90,0,1170,{ bonus bLongAtkDef,3; },{},{}
+5914,Earmuff_Flowerform,C Flutter Butterfly,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,0,1378,{ hateffect HAT_EF_FLUTTER_BUTTERFLY,true; },{},{ hateffect HAT_EF_FLUTTER_BUTTERFLY,false; }
+5917,Yellow_Scarf,Yellow Scarf,4,0,,100,,,,0,0xFFFFFFFF,63,2,1,,90,0,1170,{ bonus bLongAtkDef,3; },{},{}
5918,Gambler_Seal,Gambler Seal,4,0,,500,,,,0,0xFFFFFFFF,63,2,512,,,0,1202,{ bonus bCritical,3; bonus bCritAtkRate,3; bonus2 bSubSkill,"RA_ARROWSTORM",10; bonus2 bSubSkill,"SR_GATEOFHELL",10; .@dex = readparam(bDex); .@luk = readparam(bLuk); bonus bCritAtkRate,-(.@dex/10)*2; bonus bCritical,.@luk/10; bonus bBaseAtk,(.@luk/10)*2; bonus bMatk,(.@luk/10)*2; if (.@luk > 120) { bonus bCritical,10; bonus bCritAtkRate,10; bonus2 bSubSkill,"RA_ARROWSTORM",30; bonus2 bSubSkill,"SR_GATEOFHELL",30; } else if (.@luk > 108) { bonus bCritical,5; bonus bCritAtkRate,10; } },{},{}
-5919,Camellia_Hair_Pin,Camellia Hair Pin,4,0,,1000,,,,1,0xFFFFFFFF,63,2,256,0,50,1,1203,{ bonus bMdef,20; bonus3 bAutoSpell,"AL_PNEUMA",1,30+getrefine()*5; /* CONFIRM The Rate*/ },{},{}
+5919,Camellia_Hair_Pin,Camellia Hair Pin,4,0,,1000,,,,1,0xFFFFFFFF,63,2,256,,50,1,1203,{ bonus bMdef,20; bonus3 bAutoSpell,"AL_PNEUMA",1,30+getrefine()*5; /* CONFIRM The Rate*/ },{},{}
5920,Medical_Boots,Medical Boots,4,0,,300,,10,,0,0xFFFFFFFF,63,2,64,,10,1,,{ .@r = getrefine(); bonus bHealPower,10+((.@r/2) * 2); bonus2 bSkillUseSP,"AB_CHEAL",(.@r * 5); },{},{}
-5943,Owlviscount_Silk_Hat,Owl Viscount Silk Hat,4,0,,500,,15,,1,0xFFFFFFFF,63,2,256,0,70,1,1323,{ bonus bInt,1; bonus bAspdRate,10; .@r = getrefine(); bonus bMatk,7*.@r; autobonus "{ .@r = getrefine(); bonus bAspdRate,(.@r >= 9 ? 40 : ((.@r >= 7) ? 10 : ((.@r >= 5) ? 5 : 1))); }",.@r*20,30000,BF_MAGIC,"{ specialeffect2 EF_SPELLBREAKER }"; },{},{}
-5966,KarduiEar,KarduiEar,4,0,,300,,,,0,0xFFFFFFFF,63,2,512,0,70,0,1357,{ .@dex = readparam(bDex); bonus bMatk,(.@dex > 10) ? .@dex/10*2 : 0; if (.@dex > 107) { bonus bVariableCastrate,-10; bonus bMatk,60; } if (.@dex > 119) { bonus bVariableCastrate,-5; bonus bMatk,100; } },{},{}
-5967,Flying Galapago,Flying Galapago,4,0,,500,,,,0,0xFFFFFFFF,63,2,1,0,110,0,1358,{ bonus bAgi,1; bonus2 bSkillAtk,"HT_BLITZBEAT",getskilllv("HT_STEELCROW")*40; },{},{}
-5968,DVAngelNurseCap,DVAngelNurseCap,4,0,,500,,10,,1,0xFFFFFFFF,63,2,256,0,50,1,1359,{ if (BaseClass == Job_Acolyte) bonus bHealPower,3; bonus bNoCastCancel,1; .@r = getrefine(); bonus bHealPower,(.@r > 8) ? 12 : ((.@r > 6) ? 9 : ((.@r > 4) ? 6 : 0)); },{},{}
-5969,QueenAnzRevenge,QueenAnzRevenge,4,0,,400,,7,,1,0xFFFFFFFF,63,2,256,0,100,1,1360,{ bonus bStr,5; .@r = getrefine(); bonus2 bAddClass,Class_All,7+(.@r > 8 ? 4 : (.@r > 6 ? 3 : (.@r > 4 ? 2 : 0))); bonus bNoSizeFix,1; },{},{}
-5971,Moon_Eyepatch,Moon Eyepatch,4,0,,100,,,,1,0xFFFFFFFF,63,2,512,0,10,0,1370,{ bonus2 bSubEle,Ele_Water,5; },{},{}
-5972,Chatty_Parrot,Chatty Parrot,4,0,,100,,,,0,0xFFFFFFFF,63,2,1,0,80,0,1116,{ bonus bMatkRate,BaseLevel/50; bonus bVariableCast,-readparam(bInt)/30; },{},{}
-5973,Ancient_Elven_Ear_J,Ancient Elven Ear J,4,0,,200,,,,0,0xFFFFFFFF,63,2,512,0,70,0,665,{ bonus bLuk,10; bonus bMdef,10; bonus bFlee2,2; },{},{}
-5978,Syringe_Toy,Toy Syringe,4,0,,100,,3,,0,0xFFFFFFFF,63,2,1,1,70,0,842,{ bonus bMdef,3; bonus2 bAddItemHealRate,545,150; bonus2 bAddItemHealRate,546,150; bonus2 bAddItemHealRate,547,150; },{},{}
-5979,C_Angel_Fluttering,C Angel Fluttering,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,0,1,0,1380,{ hateffect HAT_EF_ANGEL_FLUTTERING,true; },{},{ hateffect HAT_EF_ANGEL_FLUTTERING,false; }
-5980,C_Classical_Fhat,C Classical Fhat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,0,1,0,1381,{},{},{}
-5985,Noble_Mask,Noble Mask,4,0,,200,,,,0,0xFFFFFFFF,63,2,256,0,30,0,1409,{ bonus2 bSkillAtk,"PA_SACRIFICE",BaseLevel*2; bonus2 bSkillVariableCast,"PA_PRESSURE",-2000; bonus2 bSkillVariableCast,"CR_DEVOTION",-2000; if (BaseLevel > 149) { bonus bMaxHPrate,3; bonus bAspdRate,3; } else if (BaseLevel > 99) { bonus bMaxHPrate,2; bonus bAspdRate,2; } else { bonus bMaxHPrate,1; bonus bAspdRate,1; } },{},{}
+5943,Owlviscount_Silk_Hat,Owl Viscount Silk Hat,4,0,,500,,15,,1,0xFFFFFFFF,63,2,256,,70,1,1323,{ bonus bInt,1; bonus bAspdRate,10; .@r = getrefine(); bonus bMatk,7*.@r; autobonus "{ .@r = getrefine(); bonus bAspdRate,(.@r >= 9 ? 40 : ((.@r >= 7) ? 10 : ((.@r >= 5) ? 5 : 1))); }",.@r*20,30000,BF_MAGIC,"{ specialeffect2 EF_SPELLBREAKER }"; },{},{}
+5966,KarduiEar,KarduiEar,4,0,,300,,,,0,0xFFFFFFFF,63,2,512,,70,0,1357,{ .@dex = readparam(bDex); bonus bMatk,(.@dex > 10) ? .@dex/10*2 : 0; if (.@dex > 107) { bonus bVariableCastrate,-10; bonus bMatk,60; } if (.@dex > 119) { bonus bVariableCastrate,-5; bonus bMatk,100; } },{},{}
+5967,FlyingGalapago,Flying Galapago,4,0,,500,,,,0,0xFFFFFFFF,63,2,1,,110,0,1358,{ set .@bblvl,max(getskilllv("HT_BLITZBEAT"),1); set .@luk,min(readparam(bLuk),120); bonus bAgi,1; bonus3 bAutoSpell,"HT_BLITZBEAT",.@bblvl,50 + (.@luk / 3) + (.@bblvl * 2); bonus2 bSkillAtk,"HT_BLITZBEAT",getskilllv("HT_STEELCROW") * 40; },{},{}
+5968,DVAngelNurseCap,DVAngelNurseCap,4,0,,500,,10,,1,0xFFFFFFFF,63,2,256,,50,1,1359,{ if (BaseClass == Job_Acolyte) bonus bHealPower,3; bonus bNoCastCancel,1; .@r = getrefine(); bonus bHealPower,(.@r > 8) ? 12 : ((.@r > 6) ? 9 : ((.@r > 4) ? 6 : 0)); },{},{}
+5969,QueenAnzRevenge,QueenAnzRevenge,4,0,,400,,7,,1,0xFFFFFFFF,63,2,256,,100,1,1360,{ bonus bStr,5; .@r = getrefine(); bonus2 bAddClass,Class_All,7+(.@r > 8 ? 4 : (.@r > 6 ? 3 : (.@r > 4 ? 2 : 0))); bonus bNoSizeFix,1; },{},{}
+5971,Moon_Eyepatch,Moon Eyepatch,4,0,,100,,,,1,0xFFFFFFFF,63,2,512,,10,0,1370,{ bonus2 bSubEle,Ele_Water,5; },{},{}
+5972,Chatty_Parrot,Chatty Parrot,4,0,,100,,,,0,0xFFFFFFFF,63,2,1,,80,0,1116,{ bonus bMatkRate,BaseLevel/50; bonus bVariableCast,-readparam(bInt)/30; },{},{}
+5973,Ancient_Elven_Ear_J,Ancient Elven Ear J,4,0,,200,,,,0,0xFFFFFFFF,63,2,512,,70,0,665,{ bonus bLuk,10; bonus bMdef,10; bonus bFlee2,2; },{},{}
+5978,Syringe_Toy,Toy Syringe,4,0,,100,,3,,0,0xFFFFFFFF,63,2,1,,70,0,842,{ bonus bMdef,3; bonus2 bAddItemHealRate,545,150; bonus2 bAddItemHealRate,546,150; bonus2 bAddItemHealRate,547,150; },{},{}
+5979,C_Angel_Fluttering,C Angel Fluttering,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,0,1380,{ hateffect HAT_EF_ANGEL_FLUTTERING,true; },{},{ hateffect HAT_EF_ANGEL_FLUTTERING,false; }
+5980,C_Classical_Fhat,C Classical Fhat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,1381,{},{},{}
+5985,Noble_Mask,Noble Mask,4,0,,200,,,,0,0xFFFFFFFF,63,2,256,,30,0,1409,{ bonus2 bSkillAtk,"PA_SACRIFICE",BaseLevel*2; bonus2 bSkillVariableCast,"PA_PRESSURE",-2000; bonus2 bSkillVariableCast,"CR_DEVOTION",-2000; if (BaseLevel > 149) { bonus bMaxHPrate,3; bonus bAspdRate,3; } else if (BaseLevel > 99) { bonus bMaxHPrate,2; bonus bAspdRate,2; } else { bonus bMaxHPrate,1; bonus bAspdRate,1; } },{},{}
//===================================================================
// More Etc Items
//===================================================================
@@ -4598,11 +4648,12 @@
6605,Muspellium,Muspellium,3,0,,0,,,,,,,,,,,,,{},{},{}
6606,Cute_Cart_Coupon,Cute Cart Remodel Coupon,3,0,,10,,,,,,,,,,,,,{},{},{}
6607,Temporal_Crystal,Temporal Crystal,3,20,,10,,,,,,,,,,,,,{},{},{}
-6608,Coagulated_Spell,Coagulated Spell,3,0,,0,,,,,,,,,,,,,{},{},{}
-6609,Glast_Decayed_Nail,Glast Decayed Nail,3,82,,10,,,,,,,,,,,,,{},{},{}
-6610,Glast_Horrendous_Mouth,Glast Horrendous Mouth,3,390,,10,,,,,,,,,,,,,{},{},{}
-6612,Gold_Coin_Basket,Gold Coin Basket,3,20,,200,,,,,,,,,,,,,{},{},{}
-6613,Flashy_Brooch,Flashy Brooch,3,20,,10,,,,,,,,,,,,,{},{},{}
+6608,Coagulated_Spell,Coagulated Spell,3,20,,10,,,,,,,,,,,,,{},{},{}
+6609,Glast_Decayed_Nail,Glast Decayed Nail,3,2800,,10,,,,,,,,,,,,,{},{},{}
+6610,Glast_Horrendous_Mouth,Glast Horrendous Mouth,3,3200,,10,,,,,,,,,,,,,{},{},{}
+6611,Colorful_Key,Colorful Key,3,50000,,10,,,,,,,,,,,,,{},{},{}
+6612,Gold_Coin_Basket,Gold Coin Basket,3,300000,,200,,,,,,,,,,,,,{},{},{}
+6613,Colorful_Brooch,Colorful Brooch,3,100000,,10,,,,,,,,,,,,,{},{},{}
6615,Siege_Guild_Coin,Siege Guild Coin,3,0,,10,,,,,,,,,,,,,{},{},{}
6616,Lmtd_Manny_Card,Limited Manny Card,3,20,,10,,,,,,,,,,,,,{},{},{}
6617,Lmtd_Sid_Card,Limited Sid Card,3,20,,10,,,,,,,,,,,,,{},{},{}
@@ -4701,8 +4752,8 @@
6743,HPStone_Middle,HP Stone(Middle),6,10,,100,,,,,,,,,,,,,{ bonus bMaxHPrate,1; },{},{}
6744,SPStone_Middle,SP Stone(Middle),6,10,,100,,,,,,,,,,,,,{ bonus bMaxSPrate,1; },{},{}
6745,HealStone_Bottom,Recovery Stone(Low),6,20,,10,,,,,,,,,,,,,{ bonus bSPGainValue,1; bonus bMagicHPGainValue,1; },{},{}
-6746,Iron_Artifacts,Iron Artifacts,3,10,,0,,,,,,,,,,,,,{},{},{}
-6747,Steel_Workpiece,Steel Workpiece,3,10,,0,,,,,,,,,,,,,{},{},{}
+6746,Iron_Artifacts,Steel Artifact,3,10,,0,,,,,,,,,,,,,{},{},{}
+6747,Iron_Artifacts_,Steel Artifact,3,10,,0,,,,,,,,,,,,,{},{},{}
6748,Daily_Report_He_And_His_Team,Daily Report He And His Team,3,10,,0,,,,,,,,,,,,,{},{},{}
6749,Operation_Control_Device,Operation Control Device,3,10,,0,,,,,,,,,,,,,{},{},{}
6750,Failed_Engine,Failed Engine,3,10,,10,,,,,,,,,,,,,{},{},{}
@@ -4839,7 +4890,8 @@
6915,Captured_Soul,Captured Soul,3,10,,0,,,,,,,,,,,,,{},{},{}
6916,Piece_Of_Soul_Monkey,Piece Of Soul Monkey,3,10,,0,,,,,,,,,,,,,{},{},{}
6917,Piece_Of_Soul_Chicken,Piece Of Soul Chicken,3,10,,0,,,,,,,,,,,,,{},{},{}
-6919,Honor_Proof,Honor Proof,3,10,,10,,,,,,,,,,,,,{},{},{}
+6919,Honor_Proof,Honor Token,3,10,,10,,,,,,,,,,,,,{},{},{}
+6920,Rune_Magic_Powder,Rune Magic Powder,3,10,,10,,,,,,,,,,,,,{},{},{}
6921,Dehumidifiers,Dehumidifiers,3,10,,10,,,,,,,,,,,,,{},{},{}
6922,Sandpaper,Sandpaper,3,10,,10,,,,,,,,,,,,,{},{},{}
6923,Bright_Fire_Lights,Bright Fire Lights,3,10,,10,,,,,,,,,,,,,{},{},{}
@@ -4878,6 +4930,8 @@
6957,Lamb_Fleece,Lamb Fleece,3,10,,0,,,,,,,,,,,,,{},{},{}
6958,Lamb_Horns,Lamb Horns,3,10,,0,,,,,,,,,,,,,{},{},{}
6960,Key_Air_Fortress,Key Air Fortress,3,10,,10,,,,,,,,,,,,,{},{},{}
+6961,Huge_Metal_Scrap,Huge Metal Scrap,3,10,0,1000,,,,,,,,,,,,,{},{},{}
+6962,Old_Fuel,Old Fuel,3,10,0,100,,,,,,,,,,,,,{},{},{}
//
7001,Mould_Powder,Mould Powder,3,466,,10,,,,,,,,,,,,,{},{},{}
7002,Ogre_Tooth,Ogre Tooth,3,658,,10,,,,,,,,,,,,,{},{},{}
@@ -5528,7 +5582,7 @@
7649,Big_Luk_Bookmark,Big Luk Bookmark,3,20,,10,,,,,,,,,,,,,{},{},{}
7651,Mystery_Egg,Mystery Egg,3,10,,10,,,,,,,,,,,,,{},{},{}
7663,Full_Metal_Jacket,Full Metal Jacket,10,200,,2,10,,,,0x41000000,63,2,32768,,1,,3,{},{},{}
-7664,Projection_Landmines,Projection Landmines,10,450,,3,10,,,,0x41000000,63,2,32768,,1,,5,{},{},{}
+7664,Mine_Projectile,Grenade Launcher,10,450,,3,10,,,,0x41000000,63,2,32768,,1,,5,{},{},{}
7665,Dragon_Tail_Missile,Dragon Tail Missile,10,1500,,100,10,,,,0x41000000,63,2,32768,,1,,5,{},{},{}
7666,TimeTravel_Scroll,Time Travel Scroll,3,20,,0,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
7667,Abandoned_Machine,Abandoned Machine,3,20,,0,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
@@ -5700,7 +5754,7 @@
7853,Pass_F3,iPod nano Raffle Ticket,3,20,,10,,,,,,,,,,,,,{},{},{}
7854,Pass_CF,Comodo Festival Ticket,3,20,,10,,,,,,,,,,,,,{},{},{}
7855,Heart,Heart,3,20,,10,,,,,,,,,,,,,{},{},{}
-7856,Girl_Bunch_Of_Flower,Girl's Bouquet,3,20,,50,,,,,,,,,,,,,{},{},{}
+7856,Girl_Bunch_Of_Flower_,Girl's Bouquet,3,20,,50,,,,,,,,,,,,,{},{},{}
7857,Handmade_Kitty_Doll,Hand-made Kitty Doll,3,20,,30,,,,,,,,,,,,,{},{},{}
7858,Dragonball_Yellow_,Dragonball Yellow,3,20,,10,,,,,,,,,,,,,{},{},{}
7859,Game_Ticket,Game Ticket,3,20,,100,,,,,,,,,,,,,{},{},{}
@@ -5903,7 +5957,7 @@
9056,Imp_Egg,Imp Egg,7,20,,0,,,,,,,,,,,,,{},{},{}
9057,Egg_Of_Tiny,Egg Of Tiny,7,20,,0,,,,,,,,,,,,,{},{},{}
9058,Snow_Rabbit_Egg,Christmas Snow Rabbit Egg,7,20,,0,,,,,,,,,,,,,{},{},{}
-9059,Tikbalang_Egg,Tikbalang Egg,7,20,,0,,,,,,,,,,,,,{},{},{}
+9059,Tikbalang_Pet,Tikbalang Egg,7,20,,0,,,,,,,,,,,,,{},{},{}
9060,Brownie_Egg,Brownie Egg,7,20,,0,,,,,,,,,,,,,{},{},{}
9061,Marin_Egg,Marin Egg,7,20,,0,,,,,,,,,,,,,{},{},{}
9062,Novice_Poring_Egg,Novice Poring Egg,7,20,,0,,,,,,,,,,,,,{},{},{}
@@ -6059,8 +6113,8 @@
11534,Coco_Juice,Coconut Juice,0,20,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(17,23),0; },{},{}
11535,Almond_Chocolate,Almond Chocolate,0,190,,200,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal 0,rand(8,16); },{},{}
11536,Cat_Hard_Biscuit,Cat Biscuit,0,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(70,110),0; callfunc "F_Cat_Hard_Biscuit"; },{},{}
-11537,Rice_Weevil_Bug,Rice Weevil Bug,0,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(100,150),0; callfunc "F_Rice_Weevil_Bug"; },{},{}
-11538,Fresh_Octopus_Legs,Fresh Octopus Legs,0,20,,30,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(35,60),rand(5,10); },{},{}
+11537,Rice_weevil_Bug,Rice Weevil Bug,0,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(100,150),0; callfunc "F_Rice_Weevil_Bug"; },{},{}
+11538,Octupus_Leg,Fresh Octopus Legs,0,20,,30,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(35,60),rand(5,10); },{},{}
11539,Athale_Choco,Athale Choco,0,1,,80,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal 50,50; },{},{}
11540,Shyai_Choco,Shyai Choco,0,1,,80,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal 50,50; },{},{}
11541,Mid_Choco,Mid Choco,0,1,,80,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal 50,50; },{},{}
@@ -6082,46 +6136,46 @@
11558,TE_White_Slim_Potion,TE White Slim Potion,0,275,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal 325,0; },{},{}
11563,Hot_Tee,Hot Tea,2,10,,20,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal 0,100; },{},{}
11564,Sweet_Canape,Sweet Canape,2,10,,20,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal 1000,0; },{},{}
-11565,White_Potion_,White Potion,0,10,,150,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(325,405),0; },{},{}
+11565,White_Potion_B,White Potion,0,10,,150,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(325,405),0; },{},{}
11566,Yellow_Potion_,Yellow Potion,0,10,,130,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(175,235),0; },{},{}
-11567,Novice_Potion_,Novice Potion,0,10,,0,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(44,66),0; },{},{}
-11568,Red_Slim_Potion_,Red Slim Potion,0,10,,20,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(45,65),0; },{},{}
+11567,Novice_Potion_B,Novice Potion,0,10,,0,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(44,66),0; },{},{}
+11568,Red_Slim_Potion_B,Red Slim Potion,0,10,,20,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(45,65),0; },{},{}
11569,Orange_Potion_,Orange Potion,0,10,,100,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(105,145),0; },{},{}
11570,Red_Potion_,Red Potion,0,10,,70,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(45,65),0; },{},{}
11571,Green_Potion_,Green Potion,0,10,,70,,,,0,0xFFFFFFFF,63,2,,,,,,{ sc_end SC_POISON; sc_end SC_SILENCE; sc_end SC_BLIND; sc_end SC_CONFUSION; },{},{}
-11572,Blue_Potion_,Blue Potion,0,10,,150,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal 0,rand(40,60); },{},{}
-11573,White_Slim_Potion_,White Slim Potion,0,10,,50,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(325,405),0; },{},{}
+11572,Blue_Potion_B,Blue Potion,0,10,,150,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal 0,rand(40,60); },{},{}
+11573,White_Slim_Potion_B,White Slim Potion,0,10,,50,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(325,405),0; },{},{}
11574,Yellow_Slim_Potion_,Yellow Slim Potion,0,10,,30,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(175,235),0; },{},{}
-11575,Lucky_Cookie_,Lucky Cookie,3,10,,30,,,,,,,,,,,,,{},{},{}
-11576,Lucky_Lollipop,Lucky Lollipop,3,10,,30,,,,,,,,,,,,,{},{},{}
-11577,Rice_Ball_,Rice Ball,0,10,,30,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal 200,0; },{},{}
-11578,Candy_Bar,Candy Bar,0,10,,40,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(105,145),0; },{},{}
-11579,Lucky_Candy_,Lucky Candy,3,10,,30,,,,,,,,,,,,,{},{},{}
-11580,Candy_,Candy,0,10,,30,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(45,65),0; },{},{}
-11581,Piece_of_Cake__,Piece of Cake,0,10,,100,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(270,330),0; },{},{}
-11582,Well-baked_Cookie,Well-baked Cookie,0,10,,30,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(160,200),0; },{},{}
-11583,Chocolate_Drink_,Chocolate Drink,0,10,,150,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(330,410),rand(45,65); sc_end SC_POISON; sc_end SC_SILENCE; sc_end SC_BLIND; sc_end SC_CONFUSION; sc_end SC_CURSE; sc_end SC_Hallucination; },{},{}
-11584,White_Chocolate_,White Chocolate,0,10,,80,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal 50,50; },{},{}
-11585,Hand-made_Chocolate,Hand-made Chocolate,0,10,,80,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal 50,50; },{},{}
-11586,Hand-made_Chocolate_,Hand-made White Chocolate,0,10,,80,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal 50,50; },{},{}
-11587,Chocolate_,Chocolate,0,10,,20,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal 1,1; },{},{}
+11575,Lucky_Cookie_B,Lucky Cookie,3,10,,30,,,,,,,,,,,,,{},{},{}
+11576,Lucky_Candy_Cane_B,Lucky Lollipop,3,10,,30,,,,,,,,,,,,,{},{},{}
+11577,Rice_Ball_B,Rice Ball,0,10,,30,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal 200,0; },{},{}
+11578,Candy_Striper_B,Candy Bar,0,10,,40,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(105,145),0; },{},{}
+11579,Lucky_Candy_B,Lucky Candy,3,10,,30,,,,,,,,,,,,,{},{},{}
+11580,Candy_B,Candy,0,10,,30,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(45,65),0; },{},{}
+11581,Piece_Of_Cake_B,Piece of Cake,0,10,,100,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(270,330),0; },{},{}
+11582,Well_Baked_Cookie_B,Well-baked Cookie,0,10,,30,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(160,200),0; },{},{}
+11583,Chocolate_Drink_B,Chocolate Drink,0,10,,150,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(330,410),rand(45,65); sc_end SC_POISON; sc_end SC_SILENCE; sc_end SC_BLIND; sc_end SC_CONFUSION; sc_end SC_CURSE; sc_end SC_Hallucination; },{},{}
+11584,White_Chocolate_B,White Chocolate,0,10,,80,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal 50,50; },{},{}
+11585,HandMade_Chocolate_B,Hand-made Chocolate,0,10,,80,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal 50,50; },{},{}
+11586,HandMade_Chocolate_B_,Hand-made White Chocolate,0,10,,80,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal 50,50; },{},{}
+11587,Chocolate_B,Chocolate,0,10,,20,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal 1,1; },{},{}
11588,Fresh_Strawberries,Fresh Strawberries,0,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(32,56),rand(16,28); },{},{}
11589,Iceflake,Cold Snow Cone,0,20,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ percentheal 5,5; },{},{}
11590,Meat_Skewer5,Skewer No.5,0,5000,,300,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(760,810),10; },{},{}
-11592,Trans_Candy_Red,Trans Candy Red,0,20,,30,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal 45,0; transform 1507,600000,SC_MTF_MHP,1000; },{},{}
-11593,Trans_Candy_Blue,Trans Candy Blue,0,20,,30,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal 45,0; transform 1102,600000,SC_MTF_MSP,100; },{},{}
-11594,Trans_Candy_Yellow,Trans Candy Yellow,0,20,,30,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal 45,0; transform 1130,600000,SC_MTF_PUMPKIN,2000; },{},{}
-11595,Trans_Candy_Green,Trans Candy Green,0,20,,30,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal 45,0; transform 1508,600000,SC_MTF_HITFLEE,10,20; },{},{}
+11592,Trance_Candy_R,Trans Candy Red,0,20,,30,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal 45,0; transform 1507,600000,SC_MTF_MHP,1000; },{},{}
+11593,Trance_Candy_B,Trans Candy Blue,0,20,,30,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal 45,0; transform 1102,600000,SC_MTF_MSP,100; },{},{}
+11594,Trance_Candy_Y,Trans Candy Yellow,0,20,,30,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal 45,0; transform 1130,600000,SC_MTF_PUMPKIN,2000; },{},{}
+11595,Trance_Candy_G,Trans Candy Green,0,20,,30,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal 45,0; transform 1508,600000,SC_MTF_HITFLEE,10,20; },{},{}
11596,Blood_In_Skull,Blood In Skull,0,20,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(600,800),0; },{},{}
-11597,Iron_Worm,Iron Worm,0,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
+11597,Iron_Bug,Iron Worm,0,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
11598,Bitter_Cacao_Bean,Bitter Cacao Bean,0,10,,0,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
11599,Superstar_Potion,Superstar Potion,0,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
11600,Shining_Holy_Water,Shining Holy Water,0,10,,15,,,,0,0xFFFFFFFF,63,2,,,,,,{ if(strcharinfo(3)=="prt_q") { bonus_script "{ bonus2 bSubSize,Size_All,10; }",600; sc_end SC_SILENCE; sc_end SC_POISON; sc_end SC_CURSE; heal 1000,0; } },{},{}
11602,Catnip_Fruit,Catnip Fruit,0,15,,1,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(10,40),0; },{},{}
11601,Delicious_Anchovy,Delicious Anchovy,0,20,,30,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(30,46),0; },{},{}
-11605,Cookie_Bat,Cookie Bat,0,0,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(50,100),0; /*TODO*/ },{},{}
+11605,Cookies_Bat,Cookie Bat,0,0,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(50,100),0; /*TODO*/ },{},{}
//
-11701,Girl_Bunch_Of_Flower_,Girl's Bouquet,0,20,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(105,145),0; },{},{}
+11701,Girl_Bunch_Of_Flower,Girl's Bouquet,0,20,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(105,145),0; },{},{}
11702,Moon_Cookie,Moon Cookie,0,0,,300,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
11703,Mysterious_Blood,Mystery Blood,0,0,,30,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal 0,rand(25,35); },{},{}
11704,KETUPAT_F,Ketupat,0,2,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(70,90),0; },{},{}
@@ -6335,7 +6389,7 @@
12197,Salty_Rice_Cake,Salty Rice Cake,0,20,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ percentheal 10,10; },{},{}
12198,Lucky_Rice_Cake,Lucky Rice Cake,2,20,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_INCLUK,1200000,21; },{},{}
12199,Rice_Scroll,Scroll of Magic,2,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
-12200,Event_Cake,X-mas Cake,11,20,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ itemskill "PR_MAGNIFICAT",3; },{},{}
+12200,Event_Cake,X-mas Cake,11,20,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ percentheal 5,0; itemskill "PR_MAGNIFICAT",3; },{},{}
12201,Red_Box_C,Commonplace Red Box,2,20,,200,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
//===================================================================
// Cash Shop Usable Items
@@ -6398,7 +6452,7 @@
12260,Cool_Summer_Outfit,Cool Summer Outfit,2,0,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_SUMMER,600000,0; },{},{}
12261,Secret_Medicine,Leap of Fantasy,2,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ getexp2(2000000,1000000); },{},{}
12262,Inspector_Certificate_,Authoritative Badge,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_SPEEDUP0,540000,25; },{},{}
-12263,Comp_Battle_Manual,Field Manual,2,2,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_EXPBOOST,1800000,50; },{},{}
+12263,Comp_Battle_Manual,Field Manual,2,2,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_EXPBOOST,1800000,200; },{},{}
12264,Comp_Bubble_Gum,Bubble Gum,2,2,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_ITEMBOOST,1800000,200; },{},{}
12265,Comp_Insurance,Life Insurrance,2,2,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_LIFEINSURANCE,1800000,0; },{},{}
12266,Sesame_Pastry_,Sesame Pastry,2,2,,70,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_HITFOOD,180000,30; },{},{}
@@ -6527,9 +6581,9 @@
12389,Runstone_Storm,Pertz Runestone For Apprentice,11,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ if(strcharinfo(3)=="job3_rune02") { itemskill "RK_STORMBLAST",1; } },{},{}
12390,Runstone_Millennium,Verkana Runestone For Apprentice,11,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ if(strcharinfo(3)=="job3_rune02") { itemskill "RK_MILLENNIUMSHIELD",1; } },{},{}
12391,Lucky_Egg_C,Lucky Egg C,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Lucky_Egg_C); },{},{}
-12392,Repair_A,Repair A,2,220,,100,,,,,0x00000400,56,2,,,,,,{ if ( checkmadogear() ) { itemheal rand(200,300),0; } },{},{}
-12393,Repair_B,Repair B,2,500,,140,,,,,0x00000400,56,2,,,,,,{ if ( checkmadogear() ) { itemheal rand(300,400),0; } },{},{}
-12394,Repair_C,Repair C,2,1100,,180,,,,,0x00000400,56,2,,,,,,{ if ( checkmadogear() ) { itemheal rand(400,500),0; } },{},{}
+12392,RepairA,Repair A,2,220,,100,,,,,0x00000400,56,2,,,,,,{ if ( checkmadogear() ) { itemheal rand(200,300),0; } },{},{}
+12393,RepairB,Repair B,2,500,,140,,,,,0x00000400,56,2,,,,,,{ if ( checkmadogear() ) { itemheal rand(300,400),0; } },{},{}
+12394,RepairC,Repair C,2,1100,,180,,,,,0x00000400,56,2,,,,,,{ if ( checkmadogear() ) { itemheal rand(400,500),0; } },{},{}
12395,Tantanmen,Tantan Noodle,2,20,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ pet 1519; },{},{}
12396,Fools_Day_Box,Gift Box?,11,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ .@rnd = rand(1,10); if(.@rnd==1) itemskill "AL_TELEPORT",1; else if(.@rnd==2) itemskill "AL_TELEPORT",3; else if(.@rnd==3) percentheal 50,0; else if(.@rnd==4) percentheal 0,50; else if(.@rnd==5) end; else if(.@rnd==6) getitem 512,1; else if(.@rnd==7) itemskill "ALL_REVERSEORCISH",1; else if(.@rnd==8) specialeffect2 EF_MAPPILLAR2; else if(.@rnd==9) specialeffect2 EF_ANGEL2; else specialeffect2 EF_COIN; },{},{}
12397,Fools_Day_Box2,Gift Box?,11,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ .@rnd = rand(1,10); if(.@rnd==1) itemskill "TF_DETOXIFY",1; else if(.@rnd==2) itemskill "TF_PICKSTONE",1; else if(.@rnd==3) itemskill "BA_FROSTJOKER",1; else if(.@rnd==4) itemskill "DC_SCREAM",1; else if(.@rnd==5) end; else if(.@rnd==6) getitem 909,1; else if(.@rnd==7) itemskill "AL_RUWACH",1; else if(.@rnd==8) specialeffect2 EF_BEGINASURA; else if(.@rnd==9) specialeffect2 EF_MVP; else specialeffect2 EF_CURSEATTACK; },{},{}
@@ -6543,7 +6597,7 @@
12405,Underripe_Yggseed,Underripe Yggseed,2,20,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ percentheal 30,30; skilleffect "AL_BLESSING",0; sc_start SC_BLESSING,140000,5; },{},{}
12406,Psychic_ArmorS,Psychic ArmorS,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ specialeffect2 EF_ENERGYCOAT; sc_start4 SC_ELEMENTALCHANGE,10000,1,Ele_Ghost,1,0; },{},{}
12407,PCBang_Coupon_Box,PC Cafe Coupon Box,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
-12408,Hydra_Ball,Hydra Ball,2,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ pet 2081; },{},{}
+12408,Leaf_Cat_Ball,Hydra Ball,2,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ pet 2081; },{},{}
12409,Pork_Belly_H,1st Class Pork Belly,2,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
12410,Spareribs_H,Thick Pork Belly,2,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
12411,HE_Battle_Manual,HE Battle Manual,2,2,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_EXPBOOST,900000,200; },{},{}
@@ -6556,23 +6610,23 @@
12418,Full_SwingK,Full SwingK,2,100,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_FULL_SWING_K,500000,50; },{},{}
12419,Mana_Plus,Mana Plus,2,100,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_MANA_PLUS,500000,50; },{},{}
12420,Stamina_Up_M,Stamina Up M,2,100,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_MUSTLE_M,500000,5; },{},{}
-12421,Falmons_F,Falmons F,2,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_LIFE_FORCE_F,500000,5; },{},{}
+12421,Digestive_F,Falmons F,2,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_LIFE_FORCE_F,500000,5; },{},{}
12422,HP_Increase_PotionS,HP Increase Potion (Small),2,100,,20,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start2 SC_PROMOTE_HEALTH_RESERCH,500000,1,1; percentheal 1,0; },{},{}
12423,HP_Increase_PotionM,HP Increase Potion (Medium),2,100,,40,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start2 SC_PROMOTE_HEALTH_RESERCH,500000,1,2; percentheal 2,0; },{},{}
12424,HP_Increase_PotionL,HP Increase Potion (Large),2,100,,80,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start2 SC_PROMOTE_HEALTH_RESERCH,500000,1,3; percentheal 5,0; },{},{}
12425,SP_Increase_PotionS,SP Increase Potion (Small),2,100,,20,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start2 SC_ENERGY_DRINK_RESERCH,500000,1,1; percentheal 0,2; },{},{}
12426,SP_Increase_PotionM,SP Increase Potion (Medium),2,100,,40,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start2 SC_ENERGY_DRINK_RESERCH,500000,1,2; percentheal 0,4; },{},{}
12427,SP_Increase_PotionL,SP Increase Potion (Large),2,100,,80,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start2 SC_ENERGY_DRINK_RESERCH,500000,1,3; percentheal 0,8; },{},{}
-12428,Concentrated_White_Potion_Z,Concentrated White Potion Z,0,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_EXTRACT_WHITE_POTION_Z,500000,20; heal 1000,0; },{},{}
-12429,Savage_Full_Roast,Savage Full Roast,2,,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_SAVAGE_STEAK,300000,20; },{},{}
-12430,Cocktail_Warg_Blood,Cocktail Warg Blood,2,,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_COCKTAIL_WARG_BLOOD,300000,20; },{},{}
-12431,Minor_Stew,Minor Stew,2,,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_MINOR_BBQ,300000,20; },{},{}
+12428,Enrich_White_PotionZ,Concentrated White Potion Z,0,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_EXTRACT_WHITE_POTION_Z,500000,20; heal 1000,0; },{},{}
+12429,Savage_BBQ,Savage Full Roast,2,,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_SAVAGE_STEAK,300000,20; },{},{}
+12430,Wug_Blood_Cocktail,Cocktail Warg Blood,2,,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_COCKTAIL_WARG_BLOOD,300000,20; },{},{}
+12431,Minor_Brisket,Minor Stew,2,,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_MINOR_BBQ,300000,20; },{},{}
12432,Siroma_Icetea,Siroma Iced Tea,2,,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_SIROMA_ICE_TEA,300000,20; },{},{}
-12433,Drosera_Herb_Salad,Drosera Herb Salad,2,,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_DROCERA_HERB_STEAMED,300000,20; },{},{}
-12434,Petite_Tail_Noodles,Petite Tail Noodles,2,,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_PUTTI_TAILS_NOODLES,300000,20; },{},{}
-12435,Black_Mass,Black Mass,2,,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_STOMACHACHE,60000,rand(5,10); },{},{}
-12436,Vitata_500,Vitata 500,0,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start2 SC_VITATA_500,500000,20,5; itemheal 0,200; },{},{}
-12437,Concentrated_Ceromain_Soup,Concentrated Ceromain Soup,2,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_EXTRACT_SALAMINE_JUICE,500000,10; },{},{}
+12433,Drocera_Herb_Stew,Drosera Herb Salad,2,,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_DROCERA_HERB_STEAMED,300000,20; },{},{}
+12434,Petti_Tail_Noodle,Petite Tail Noodles,2,,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_PUTTI_TAILS_NOODLES,300000,20; },{},{}
+12435,Black_Thing,Black Mass,2,,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_STOMACHACHE,60000,rand(5,10); },{},{}
+12436,Vitata500,Vitata 500,0,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start2 SC_VITATA_500,500000,20,5; itemheal 0,200; },{},{}
+12437,Enrich_Celermine_Juice,Concentrated Ceromain Soup,2,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_EXTRACT_SALAMINE_JUICE,500000,10; },{},{}
12438,F_Giant_Fly_Wing,F Giant Fly Wing,2,2,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
12439,F_Battle_Manual,F Old Battle Manual,2,2,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
12440,F_Insurance,F Insurance,2,2,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
@@ -6580,12 +6634,12 @@
12442,F_Kafra_Card,F Kafra Card,2,2,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
12443,F_Neuralizer,F Neuralizer,2,2,,0,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
12444,F_Dun_Tele_Scroll1,WoE Telport Scroll,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ callfunc "F_CashSiegeTele"; },{},{}
-12445,F_Str_Dish10_,F Str Dish10,2,2,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
-12446,F_Agi_Dish10_,F Agi Dish10,2,2,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
-12447,F_Int_Dish10_,F Int Dish10,2,2,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
-12448,F_Dex_Dish10_,F Dex Dish10,2,2,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
-12449,F_Luk_Dish10_,F Luk Dish10,2,2,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
-12450,F_Vit_Dish10_,F Vit Dish10,2,2,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
+12445,F_Str_Dish10_,F Str Dish10,2,2,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_STRFOOD,1800000,10; },{},{}
+12446,F_Agi_Dish10_,F Agi Dish10,2,2,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_AGIFOOD,1800000,10; },{},{}
+12447,F_Int_Dish10_,F Int Dish10,2,2,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_INTFOOD,1800000,10; },{},{}
+12448,F_Dex_Dish10_,F Dex Dish10,2,2,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_DEXFOOD,1800000,10; },{},{}
+12449,F_Luk_Dish10_,F Luk Dish10,2,2,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_LUKFOOD,1800000,10; },{},{}
+12450,F_Vit_Dish10_,F Vit Dish10,2,2,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_VITFOOD,1800000,10; },{},{}
12451,F_WOB_Rune,F WOB Rune,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
12452,F_WOB_Schwaltz,F WOB Schwaltz,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
12453,F_WOB_Rachel,F WOB Rachel,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
@@ -6733,7 +6787,7 @@
12598,Dendeng_Balado,Dendeng Balado,11,20,,150,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
12599,Kurma,Kurma,11,20,,100,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
12600,Treasure_Box_Scroll,Treasure Chest Summoned,11,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
-12601,Fresh_Watermelon_Juice,Fresh Watermelon Juice,0,20,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ percentheal 5,5; },{},{}
+12601,Cold_Watermelon_Juice,Fresh Watermelon Juice,0,20,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ percentheal 5,5; },{},{}
12602,Special_Box1,Special Box I,11,100,,100,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
12603,Special_Box2,Special Box II,11,100,,100,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
12604,Special_Box3,Special Box III,11,100,,100,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
@@ -6752,7 +6806,7 @@
12619,Cgrade_Pocket,C Grade Coin Bag,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Cgrade_Pocket); },{},{}
12620,Dgrade_Pocket,D Grade Coin Bag,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Dgrade_Pocket); },{},{}
12621,Egrade_Pocket,E Grade Coin Bag,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Egrade_Pocket); },{},{}
-12622,Boarding_Halter,Reins Of Mount,11,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ setmounting(); },{},{ if (ismounting()) setmounting(); }
+12622,Boarding_Halter,Reins Of Mount,2,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ setmounting(); },{},{ if (ismounting()) setmounting(); }
12623,High_Weapon_Box,Advanced Weapons Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getrandgroupitem(IG_Advanced_Weapons_Box,1); },{},{}
12624,Delicious_Jelly,Delicious Jelly,0,20,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ percentheal 3,3; },{},{}
12625,Sapa_Feat_Cert_Pack,Sapa Feat Cert Pack,2,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
@@ -6763,7 +6817,7 @@
12630,Teddy_Bear_Scroll,Teddy Bear Scroll,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ mercenary_create 2217,1800000; },{},{}
12631,Macro_Stone_A,Macro Stone A,2,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
12632,Macro_Stone_B,Macro Stone B,2,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
-12633,Malang_Cat_Can,Malangdo Cat Can,2,20,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ specialeffect2 EF_MAGICALATTHIT; bonus_script "{ bonus2 bExpAddRace,RC_All,10; }",1200; sc_start SC_ITEMBOOST,1200000,20; },{},{}
+12633,Malang_Cat_Can,Malangdo Cat Can,2,20,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ specialeffect2 EF_MAGICALATTHIT; bonus_script "{ bonus2 bExpAddRace,RC_All,10; bonus2 bDropAddRace,RC_All,20; }",1200,1,0,SI_OVERLAPEXPUP; },{},{}
12634,Macro_Stone_A1,Macro Stone A1,2,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
12635,Macro_Stone_A2,Macro Stone A2,2,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
12636,Malang_Sp_Can,Malangdo Canned Specialties,2,20,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ warp "malangdo",140,114; },{},{}
@@ -6807,8 +6861,8 @@
12674,God_Material_Box,God Material Box,2,20,,500,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_God_Material_Box); },{},{}
12675,Sg_Weapon_Supply_Box,WoE Weapon Supply Box,2,20,,500,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Sg_Weapon_Supply_Box); },{},{}
12676,Sg_Violet_Potion_Box,Siege Violet Potion Box,2,20,,500,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 11547,50; },{},{}
-12677,Siege_Arrow_Quiver_S,Siege Arrow Quiver S,2,2,,100,,,,,0xFFFFFFFF,63,2,,,130,,,{ getitem 1776,200; },{},{}
-12678,Siege_Arrow_Quiver_A,Siege Arrow Quiver A,2,2,,100,,,,,0xFFFFFFFF,63,2,,,95,,,{ getitem 1775,200; },{},{}
+12677,Siege_Arrow_Quiver_S,Siege Arrow Quiver S,2,2,,100,,,,,0xFFFFFFFF,63,2,,,130,,,{ getitem 1775,200; },{},{}
+12678,Siege_Arrow_Quiver_A,Siege Arrow Quiver A,2,2,,100,,,,,0xFFFFFFFF,63,2,,,95,,,{ getitem 1776,200; },{},{}
12679,Sg_White_Potion_Box,Siege White Potion Box,2,20,,200,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 11548,30; },{},{}
12680,Sg_Blue_Potion_Box,Siege Blue Potion Box,2,20,,200,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 11549,10; },{},{}
12681,Nestea_Lemon,Nestea Lemon,2,0,,50,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
@@ -6850,26 +6904,26 @@
//===================================================================
// Guillotine Cross Poisons
//===================================================================
-12717,Poison_Paralysis,Paralyze,0,2,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_PARALYSE,300000,0,10,2; },{},{}
-12718,Poison_Leech,Leech End,0,2,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_LEECHESEND,300000,0,10,2; },{},{}
-12719,Poison_Oblivion,Oblivion Curse,0,2,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_OBLIVIONCURSE,300000,0,10,2; },{},{}
-12720,Poison_Disheart,Disheart,0,2,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_DEATHHURT,300000,0,10,2; },{},{}
-12721,Poison_Numb,Toxin,0,2,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_TOXIN,300000,0,10,2; },{},{}
-12722,Poison_Fever,Pyrexia,0,2,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_PYREXIA,300000,0,10,2; },{},{}
-12723,Poison_Laughing,Magic Mushroom,0,2,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_MAGICMUSHROOM,300000,0,10,2; },{},{}
-12724,Poison_Fatigue,Venom Bleed,0,2,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_VENOMBLEED,15000,0,10,2; },{},{}
+12717,Poison_Paralysis,Paralyze,2,2,,100,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
+12718,Poison_Leech,Leech End,2,2,,100,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
+12719,Poison_Oblivion,Oblivion Curse,2,2,,100,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
+12720,Poison_Contamination,Disheart,2,2,,100,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
+12721,Poison_Numb,Toxin,2,2,,100,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
+12722,Poison_Fever,Pyrexia,2,2,,100,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
+12723,Poison_Laughing,Magic Mushroom,2,2,,100,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
+12724,Poison_Fatigue,Venom Bleed,2,2,,100,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
//===================================================================
// Rune Knight's Rune Stones
//===================================================================
-12725,Runstone_Nosiege,Nauthiz Rune,11,100,,100,,,,,0xFFFFFFFF,56,2,,,,,,{ itemskill "RK_REFRESH",1; },{},{}
-12726,Runstone_Rhydo,Raido Rune,11,100,,100,,,,,0xFFFFFFFF,56,2,,,,,,{ itemskill "RK_CRUSHSTRIKE",1; },{},{}
-12727,Runstone_Verkana,Berkana Rune,11,100,,100,,,,,0xFFFFFFFF,56,2,,,,,,{ itemskill "RK_MILLENNIUMSHIELD",1; },{},{}
-12728,Runstone_Isia,Isa Rune,11,100,,100,,,,,0xFFFFFFFF,56,2,,,,,,{ itemskill "RK_VITALITYACTIVATION",1; },{},{}
-12729,Runstone_Asir,Othila Rune,11,100,,100,,,,,0xFFFFFFFF,56,2,,,,,,{ itemskill "RK_FIGHTINGSPIRIT",1; },{},{}
-12730,Runstone_Urj,Uruz Rune,11,100,,100,,,,,0xFFFFFFFF,56,2,,,,,,{ itemskill "RK_ABUNDANCE",1; },{},{}
-12731,Runstone_Turisus,Thurisaz Rune,11,100,,100,,,,,0xFFFFFFFF,56,2,,,,,,{ itemskill "RK_GIANTGROWTH",1; },{},{}
-12732,Runstone_Pertz,Wyrd Rune,11,100,,100,,,,,0xFFFFFFFF,56,2,,,,,,{ itemskill "RK_STORMBLAST",1; },{},{}
-12733,Runstone_Hagalas,Hagalaz Rune,11,100,,100,,,,,0xFFFFFFFF,56,2,,,,,,{ itemskill "RK_STONEHARDSKIN",1; },{},{}
+12725,Runstone_Nosiege,Nauthiz Rune,2,100,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_REFRESH",1; },{},{}
+12726,Runstone_Rhydo,Raido Rune,2,100,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_CRUSHSTRIKE",1; },{},{}
+12727,Runstone_Verkana,Berkana Rune,2,100,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_MILLENNIUMSHIELD",1; },{},{}
+12728,Runstone_Isia,Isa Rune,2,100,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_VITALITYACTIVATION",1; },{},{}
+12729,Runstone_Asir,Othila Rune,2,100,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_FIGHTINGSPIRIT",1; },{},{}
+12730,Runstone_Urj,Uruz Rune,2,100,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_ABUNDANCE",1; },{},{}
+12731,Runstone_Turisus,Thurisaz Rune,2,100,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_GIANTGROWTH",1; },{},{}
+12732,Runstone_Pertz,Wyrd Rune,2,100,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_STORMBLAST",1; },{},{}
+12733,Runstone_Hagalas,Hagalaz Rune,2,100,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_STONEHARDSKIN",1; },{},{}
//===================================================================
// Rune Knight Rune Ores
//===================================================================
@@ -6982,8 +7036,8 @@
12842,Platinum_Treasure_Box,Platinum Treasure Box,2,0,,0,,,,,0xFFFFFFFF,63,2,,,50,,,{},{},{}
12843,Pearl_Treasure_Box,Pearl Treasure Box,2,0,,0,,,,,0xFFFFFFFF,63,2,,,60,,,{},{},{}
12844,Diamond_Treasure_Box,Diamond Treasure Box,2,0,,0,,,,,0xFFFFFFFF,63,2,,,70,,,{},{},{}
-12845,Amatsu_Butterfly_Wing,Amatsu_Butterfly_Wing,2,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
-12846,Little_Unripe_Apple,Little Unripe Apple,2,10,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ pet 2398; },{},{}
+12845,WOB_Amatsu,Amatsu_Butterfly_Wing,2,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
+12846,Unripe_Apple2,Little Unripe Apple,2,10,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ pet 2398; },{},{}
12847,Old_Equipment_Box,Old Equipment Box,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
12848,Falcon_Flute,Falcon Flute,11,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ if(getskilllv("HT_FALCON")) { if(!checkoption(Option_Wug) && !checkoption(Option_Wugrider)) setfalcon (!checkfalcon()); } },{},{}
12849,Combination_Kit,Combination Kit,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ cooking 30; },{},{}
@@ -7007,7 +7061,7 @@
12884,Infinite_Concentration_Potion,Infinite Concentration Potion,11,10,,0,,,,0,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_ASPDPOTION0,1800000,4; },{},{}
12885,Infinite_Awakening_Potion,Infinite Awakening Potion,11,10,,0,,,,0,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_ASPDPOTION1,1800000,6; },{},{}
12886,Infinite_Berserk_Potion,Infinite Berserk Potion,11,10,,0,,,,0,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_ASPDPOTION2,1800000,9; },{},{}
-12887,C_Wing_Of_Fly,Infinite Flywing,11,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ unitskilluseid getcharid(3),"AL_TELEPORT",1; },{},{}
+12887,C_Wing_Of_Fly,Infinite Flywing,2,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ itemskill "AL_TELEPORT",1; },{},{}
12888,Siege_Kit_Box,Siege Kit Box,18,0,,100,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
12889,Weapon_Box_Spear,Weapon Box(Spear),2,10,,200,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
12890,Weapon_Box_Mace,Weapon Box(Mace),2,10,,200,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
@@ -7213,12 +7267,12 @@
13089,FaceWorm_Leg,Faceworm Leg,5,20,,500,110:50,,1,1,0x028F5EEF,63,2,2,3,24,1,1,{ bonus bAtkEle,Ele_Poison; autobonus "{}",30,5000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; active_transform 2528,5000; }"; },{},{}
13090,FaceWormQueen_Leg,Faceworm Queen Leg,5,20,,500,180:120,,1,2,0x028F5EEF,63,2,2,4,100,1,1,{ bonus bInt,3; autobonus "{ bonus3 bAutoSpell,\"NPC_EARTHQUAKE\",1,200; }",8,5000,BF_NORMAL,"{ specialeffect2 EF_POTION_BERSERK; active_transform 2529,5000; }"; },{},{}
13092,RWC_Memory_Knife,RWC Memory Knife,5,1000,500,650,50,0,1,1,0x02800075,63,2,2,3,1,1,1,{ .@r = getrefine(); bonus bBaseAtk,20*(.@r/3); bonus bMatk,20*(.@r/3); if(.@r>=9){ .@i = 1; bonus4 bAutoSpell,"BS_WEAPONPERFECT",1,20,0; } if(.@r>=6){ .@rate = 5*(.@i+1); bonus2 bAddClass,Class_All,.@rate; bonus2 bMagicAddClass,Class_All,.@rate; } },{},{}
-13093,Thanos_Dagger,Thanatos Dagger,5,10,,800,100:130,,1,1,0x000E5CEA,63,2,2,4,120,1,1,{ bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000; },{},{ heal -1000,0; }
+13093,Thanos_Dagger,Thanatos Dagger,5,10,,800,100:130,,1,1,0x000E5CEA,56,2,2,4,120,1,1,{ bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000; },{},{ heal -1000,0; }
13094,Dagger_Of_Evil_Slayer,Evil Slayer Stabber Dagger,5,10,,900,120,,1,1,0x028F5EEF,63,2,2,3,100,1,1,{ bonus2 bAddRace,RC_Undead,10; .@r = getrefine(); bonus2 bAddClass,Class_All,(.@r>=12?12:(.@r>=9?5:0)); },{},{}
13096,Half_BF_Dagger2,Half BF Dagger2,5,20,,0,120:90,,1,0,0x3E9F7EEF,63,2,2,3,80,1,1,{ bonus bStr,1; bonus bAgi,1; bonus2 bAddRace,RC_DemiHuman,35; bonus2 bAddRace,RC_Player,35; bonus2 bIgnoreDefRaceRate,RC_DemiHuman,10; bonus2 bIgnoreDefRaceRate,RC_Player,10; bonus bUnbreakableWeapon,1; autobonus "{ bonus bDefRatioAtkClass,Class_All; }",10,3000,BF_WEAPON,"{ specialeffect2 EF_HASTEUP; }"; if(Class==Job_Ninja||Class==Job_Rogue||Class==Job_Stalker) bonus bMatkRate,45; },{},{}
-13097,Blue_Dagger,Blue Dagger,5,10,,1000,160,,1,1,0x00020000,56,2,2,3,100,1,1,{ bonus bStr,5; bonus bInt,5; },{},{}
-13098,Blue_Ashura,Blue Ashura,5,10,,1000,150:120,,1,1,0x02000000,7,2,2,3,100,1,1,{},{},{}
-13099,Blue_Knife,Blue Knife,5,10,,500,160,,1,1,0x00010000,56,2,2,3,100,1,1,{ bonus bStr,5; bonus bInt,5; },{},{}
+13097,Ru_Blue_Dagger,Blue Dagger,5,10,,1000,160,,1,1,0x00020000,56,2,2,3,100,1,1,{ bonus bStr,5; bonus bInt,5; },{},{}
+13098,Ru_Blue_Ashura,Blue Ashura,5,10,,1000,150:120,,1,1,0x02000000,7,2,2,3,100,1,1,{},{},{}
+13099,Ru_Blue_Knife,Blue Knife,5,10,,500,160,,1,1,0x00010000,56,2,2,3,100,1,1,{ bonus bStr,5; bonus bInt,5; },{},{}
//===================================================================
// Guns
//===================================================================
@@ -7240,8 +7294,8 @@
13115,Upg_Revolver,Upg Revolver,5,20,,500,35,,7,1,0x41000000,63,2,34,3,1,1,17,{ .@r = getrefine(); bonus bBaseAtk,(.@r*5); bonus bLongAtkRate,(.@r*2); if(BaseLevel>70) bonus bBaseAtk,(((BaseLevel-70)/10)*5); },{},{}
13116,Novice_Revolver,Novice Revolver,5,0,,500,20,,7,0,0x41000000,63,2,34,1,1,0,17,{ bonus bHit,-5; },{},{}
13117,TE_Woe_Pistol,TE Woe Pistol,5,0,,0,60,,7,0,0x41000000,63,2,34,3,40,1,17,{ bonus2 bAddRace,RC_Player,40; bonus2 bAddEff,Eff_Curse,3000; },{},{}
-13118,Spark_Light,Spark Light,5,1,,100,0,,9,0,0x41000000,63,2,34,1,1,1,17,{},{},{}
-13119,Spark_Of_Freedom,Spark Of Freedom,5,1,,100,100,,9,2,0x41000000,63,2,34,3,99,1,17,{},{},{}
+13118,Tiny_Flame,Fading Flame,5,1,,100,0,,7,0,0x01000000,63,2,34,1,1,1,17,{},{},{}
+13119,Freedom_Flame,Freedom Flame,5,1,,100,100,,7,2,0x01000000,63,2,34,3,99,1,17,{},{},{}
13120,Heaven's_Feather_and_Hell's_Fire,Heaven's Feather & Hell's Fire,5,1250000,,800,150,,9,1,0x41000000,63,2,34,3,99,1,17,{ bonus2 bSkillAtk,"GS_DESPERADO",20; bonus2 bSkillAtk,"RL_FALLEN_ANGEL",20; },{},{}
13122,Altea_and_Ares,Altea & Ares,5,1450000,,1000,200,,9,0,0x40000000,63,2,34,3,140,1,17,{ bonus bHit,5; bonus bDelayrate,10; bonus bLongAtkRate,30; },{},{}
13124,Altea_and_Ares_,Altea & Ares,5,1450000,,1000,200,,9,1,0x40000000,63,2,34,3,140,1,17,{ bonus bHit,5; bonus bDelayrate,10; bonus bLongAtkRate,30; },{},{}
@@ -7288,16 +7342,16 @@
13185,TE_Woe_Gatling,TE Woe Gatling,5,0,,0,100,,7,0,0x41000000,63,2,34,3,40,1,19,{ bonus2 bAddRace,RC_Player,40; bonus2 bAddEff,Eff_Stun,3000; },{},{}
13186,TE_Woe_Shotgun,TE Woe Shotgun,5,0,,0,100,,7,0,0x41000000,63,2,34,3,40,1,20,{ bonus2 bAddRace,RC_Player,40; bonus2 bAddEff,Eff_Poison,3000; },{},{}
13187,TE_Woe_Grenade,TE Woe Grenade,5,0,,0,100,,9,0,0x41000000,63,2,34,3,40,1,21,{ bonus2 bAddRace,RC_Player,40; bonus2 bAddEff,Eff_Blind,3000; },{},{}
-13189,Color_Scope,Color Scope,5,1350000,,1200,240,,9,2,0x40000000,63,2,34,3,105,1,18,{ bonus bHit,20; bonus bCriticalRate,30; },{},{}
-13190,RAG203,RAG203,5,1800000,,1300,260,,9,1,0x40000000,63,2,34,3,140,1,18,{ bonus bHit,10; bonus bCriticalRate,15; bonus4 bAutoSpell,"AL_DECAGI",1,500,1; },{},{}
-13192,Death_Fire,Death Fire,5,1250000,,2000,400,,9,1,0x40000000,63,2,34,3,108,1,20,{ bonus bLongAtkRate,5; bonus bHit,-50; bonus bDelayrate,-10; },{},{}
-13193,Rolling_Thunder,Rolling Thunder,5,1350000,,1800,280,,9,1,0x40000000,63,2,34,3,120,1,20,{ bonus bHit,-10; bonus bDelayrate,-10; bonus3 bAutoSpell,"MG_THUNDERSTORM",5,500; },{},{}
-13194,Peace_Breaker,Peace Breaker,5,1950000,,1400,250,,9,0,0x41000000,63,2,34,3,140,1,20,{ bonus bHit,-25; bonus bAspdRate,25; },{},{}
-13195,RAG203_,RAG203,5,1800000,,1300,260,,9,0,0x40000000,63,2,34,3,140,1,18,{ bonus bHit,10; bonus bCriticalRate,15; bonus4 bAutoSpell,"AL_DECAGI",1,10,1; },{},{}
-13196,Peace_Breaker_,Peace Breaker,5,1950000,,1400,250,,9,1,0x41000000,63,2,34,3,140,1,20,{ bonus bHit,-25; bonus bAspdRate,25; },{},{}
-13197,Mini_Mei,Mini Mei,5,1600000,,2500,220,,9,2,0x41000000,63,2,34,2,106,1,19,{},{},{}
-13198,Tempest_,Tempest,5,2200000,,2500,250,,9,0,0x41000000,63,2,34,2,140,1,19,{ bonus bHit,-25; bonus bCritical,10; bonus bLongAtkRate,20; },{},{}
-13199,Tempest,Tempest,5,2200000,,2500,250,,9,1,0x41000000,63,2,34,2,140,1,19,{ bonus bHit,-25; bonus bCritical,10; bonus bLongAtkRate,20; },{},{}
+13189,COLORSCOPE,Color Scope,5,1350000,,1200,240,,9,2,0x40000000,63,2,34,3,105,1,18,{ bonus bHit,20; bonus bCriticalRate,30; },{},{}
+13190,RAG203_,RAG203,5,1800000,,1300,260,,9,1,0x40000000,63,2,34,3,140,1,18,{ bonus bHit,10; bonus bCriticalRate,15; bonus4 bAutoSpell,"AL_DECAGI",1,500,1; },{},{}
+13192,DEATHFIRE,Death Fire,5,1250000,,2000,400,,9,1,0x40000000,63,2,34,3,108,1,20,{ bonus bLongAtkRate,5; bonus bHit,-50; bonus bDelayrate,-10; },{},{}
+13193,R_THUNDER,Rolling Thunder,5,1350000,,1800,280,,9,1,0x40000000,63,2,34,3,120,1,20,{ bonus bHit,-10; bonus bDelayrate,-10; bonus3 bAutoSpell,"MG_THUNDERSTORM",5,500; },{},{}
+13194,P_BREAKER,Peace Breaker,5,1950000,,1400,250,,9,0,0x41000000,63,2,34,3,140,1,20,{ bonus bHit,-25; bonus bAspdRate,25; },{},{}
+13195,RAG203,RAG203,5,1800000,,1300,260,,9,0,0x40000000,63,2,34,3,140,1,18,{ bonus bHit,10; bonus bCriticalRate,15; bonus4 bAutoSpell,"AL_DECAGI",1,10,1; },{},{}
+13196,P_BREAKER_,Peace Breaker,5,1950000,,1400,250,,9,1,0x41000000,63,2,34,3,140,1,20,{ bonus bHit,-25; bonus bAspdRate,25; },{},{}
+13197,MINIMAY,Mini Mei,5,1600000,,2500,220,,9,2,0x41000000,63,2,34,2,106,1,19,{},{},{}
+13198,TEMPEST,Tempest,5,2200000,,2500,250,,9,0,0x41000000,63,2,34,4,140,1,19,{ bonus bHit,-25; bonus bCritical,10; bonus bLongAtkRate,20; },{},{}
+13199,TEMPEST_,Tempest,5,2200000,,2500,250,,9,1,0x41000000,63,2,34,4,140,1,19,{ bonus bHit,-25; bonus bCritical,10; bonus bLongAtkRate,20; },{},{}
//===================================================================
// Bullets
//===================================================================
@@ -7310,24 +7364,29 @@
13206,Blind_Sphere,Blind Sphere,10,80,,5,50,,,,0x41000000,63,2,32768,,1,,5,{ bonus bAtkEle,Ele_Dark; bonus2 bAddEff,Eff_Blind,500; },{},{}
13207,Freezing_Sphere,Freezing Sphere,10,80,,5,50,,,,0x41000000,63,2,32768,,1,,5,{ bonus bAtkEle,Ele_Water; },{},{}
13208,Gong_Bug,Sow Bug,10,0,,5,50,,,,0x41000000,63,2,32768,,50,,3,{ bonus2 bAddEff,Eff_Stun,1000; },{},{}
-13210,Slug_Ammunition_L,Slug Ammunition L,10,250,,250,30,,,,0x41000000,63,2,32768,,1,,3,{},{},{}
-13211,Slug_Ammunition_M,Slug Ammunition M,10,500,,500,30,,,,0x41000000,63,2,32768,,1,,3,{},{},{}
-13212,Slug_Ammunition_H,Slug Ammunition H,10,750,,750,30,,,,0x41000000,63,2,32768,,1,,3,{},{},{}
-13213,Slug_Ammunition_SH,Slug Ammunition SH,10,1,,1000,30,,,,0x41000000,63,2,32768,,1,,3,{},{},{}
-13214,Slug_Ammunition_XH,Slug Ammunition XH,10,1,,1200,30,,,,0x41000000,63,2,32768,,1,,3,{},{},{}
-13215,Armor_Burnt,Armor Burnt,10,10,,2,50,,,0,0xFFFFFFFF,63,2,32768,,100,,3,{ bonus bAtkEle,Ele_Neutral; },{},{}
-13216,Incandescence_Shot,Incandescence Shot,10,10,,2,40,,,0,0xFFFFFFFF,63,2,32768,,100,,3,{ bonus bAtkEle,Ele_Fire; },{},{}
-13217,Glaciation_Shot,Glaciation Shot,10,10,,2,40,,,0,0xFFFFFFFF,63,2,32768,,100,,3,{ bonus bAtkEle,Ele_Water; },{},{}
-13218,Dengeki_Shot,Dengeki Shot,10,10,,2,40,,,0,0xFFFFFFFF,63,2,32768,,100,,3,{ bonus bAtkEle,Ele_Wind; },{},{}
-13219,Hearthstone_Shot,Hearthstone Shot,10,10,,2,40,,,0,0xFFFFFFFF,63,2,32768,,100,,3,{ bonus bAtkEle,Ele_Earth; },{},{}
-13220,Purification_Shot,Purification Shot,10,10,,2,40,,,0,0xFFFFFFFF,63,2,32768,,100,,3,{ bonus bAtkEle,Ele_Holy; },{},{}
+13210,Slug_Bullet_1,Slug Ammunition L,10,250,,250,30,,,,0x41000000,63,2,32768,,1,,3,{},{},{}
+13211,Slug_Bullet_2,Slug Ammunition M,10,500,,500,30,,,,0x41000000,63,2,32768,,1,,3,{},{},{}
+13212,Slug_Bullet_3,Slug Ammunition H,10,750,,750,30,,,,0x41000000,63,2,32768,,1,,3,{},{},{}
+13213,Slug_Bullet_4,Slug Ammunition SH,10,1000,,1000,30,,,,0x41000000,63,2,32768,,1,,3,{},{},{}
+13214,Slug_Bullet_5,Slug Ammunition XH,10,1200,,1200,30,,,,0x41000000,63,2,32768,,1,,3,{},{},{}
+13215,AP_Ammo,Armor Burnt,10,10,,2,50,,,0,0xFFFFFFFF,63,2,32768,,100,,3,{ bonus bAtkEle,Ele_Neutral; },{},{}
+13216,Blaze_Bullet,Incandescence Shot,10,10,,2,40,,,0,0xFFFFFFFF,63,2,32768,,100,,3,{ bonus bAtkEle,Ele_Fire; },{},{}
+13217,Freezing_Bullet,Glaciation Shot,10,10,,2,40,,,0,0xFFFFFFFF,63,2,32768,,100,,3,{ bonus bAtkEle,Ele_Water; },{},{}
+13218,Electric_Shock_Bullet,Dengeki Shot,10,10,,2,40,,,0,0xFFFFFFFF,63,2,32768,,100,,3,{ bonus bAtkEle,Ele_Wind; },{},{}
+13219,Magical_Stone_Bullet,Hearthstone Shot,10,10,,2,40,,,0,0xFFFFFFFF,63,2,32768,,100,,3,{ bonus bAtkEle,Ele_Earth; },{},{}
+13220,Sanctified_Bullet,Purification Shot,10,10,,2,40,,,0,0xFFFFFFFF,63,2,32768,,100,,3,{ bonus bAtkEle,Ele_Holy; },{},{}
13221,Silver_Bullet_,Silver Bullet,10,10,,2,15,,,0,0xFFFFFFFF,63,2,32768,,1,,3,{ bonus bAtkEle,Ele_Holy; },{},{}
-13222,Bloody_Shell,Bloody Shell,10,10,,2,30,,,0,0xFFFFFFFF,63,2,32768,,1,,3,{ bonus bAtkEle,Ele_Neutral; },{},{}
+13222,Shell_Of_Blood_,Bloody Shell,10,10,,2,30,,,0,0xFFFFFFFF,63,2,32768,,1,,3,{ bonus bAtkEle,Ele_Neutral; },{},{}
13223,Flare_Sphere_,Flare Sphere,10,10,,5,50,,,0,0xFFFFFFFF,63,2,32768,,1,,5,{ bonus bAtkEle,Ele_Fire; },{},{}
-13224,Lightning_Sphere,Lightning Sphere,10,10,,5,50,,,0,0xFFFFFFFF,63,2,32768,,1,,5,{ bonus bAtkEle,Ele_Wind; },{},{}
+13224,Lighting_Sphere_,Lightning Sphere,10,10,,5,50,,,0,0xFFFFFFFF,63,2,32768,,1,,5,{ bonus bAtkEle,Ele_Wind; },{},{}
13225,Poison_Sphere_,Poison Sphere,10,10,,5,50,,,0,0xFFFFFFFF,63,2,32768,,1,,5,{ bonus bAtkEle,Ele_Poison; },{},{}
13226,Blind_Sphere_,Blind Sphere,10,10,,5,50,,,0,0xFFFFFFFF,63,2,32768,,1,,5,{ bonus bAtkEle,Ele_Dark; },{},{}
13227,Freezing_Sphere_,Freezing Sphere,10,10,,5,50,,,0,0xFFFFFFFF,63,2,32768,,1,,5,{ bonus bAtkEle,Ele_Water; },{},{}
+13228,Flare_Bullet,Flare Bullet,10,1,,2,20,,,,0x41000000,63,2,32768,,1,,3,{ bonus bAtkEle,Ele_Fire; },{},{}
+13229,Lightning_Bullet,Lightning Bullet,10,1,,2,20,,,,0x41000000,63,2,32768,,1,,3,{ bonus bAtkEle,Ele_Wind; },{},{}
+13230,Ice_Bullet,Ice Bullet,10,1,,2,20,,,,0x41000000,63,2,32768,,1,,3,{ bonus bAtkEle,Ele_Water; },{},{}
+13231,Poison_Bullet,Poison Bullet,10,1,,2,20,,,,0x41000000,63,2,32768,,1,,3,{ bonus bAtkEle,Ele_Poison; },{},{}
+13232,Blind_Bullet,Blind Bullet,10,1,,2,20,,,,0x41000000,63,2,32768,,1,,3,{ bonus bAtkEle,Ele_Dark; },{},{}
//===================================================================
// Shurikens & Kunais
//===================================================================
@@ -7396,7 +7455,7 @@
13307,Krieger_Huuma_Shuriken1,Glorious Shuriken,5,20,,0,55:90,,1,0,0x02000000,63,2,34,4,80,1,22,{ bonus2 bAddRace,RC_DemiHuman,95; bonus2 bAddRace,RC_Player,95; bonus2 bIgnoreDefRaceRate,RC_DemiHuman,20; bonus2 bIgnoreDefRaceRate,RC_Player,20; bonus bMatkRate,15; autobonus "{ bonus2 bSkillAtk,\"NJ_HUUMA\",100; bonus2 bSkillAtk,\"NJ_ISSEN\",100; }",50,10000; bonus bUnbreakableWeapon,1; .@r = getrefine(); if(.@r>5) { bonus2 bAddRace,RC_DemiHuman,pow(min(14,.@r)-3,2); bonus2 bAddRace,RC_Player,pow(min(14,.@r)-3,2); bonus2 bIgnoreDefRaceRate,RC_DemiHuman,5; bonus2 bIgnoreDefRaceRate,RC_Player,5; } if(.@r>8) { bonus5 bAutoSpellOnSkill,"NJ_ISSEN","AL_HEAL",10,1000,1; bonus4 bAutoSpellOnSkill,"NJ_HUUMA","NPC_CRITICALWOUND",2,200; } },{},{}
13308,Huuma_Blaze_I,Huuma Blaze Shuriken,5,0,,0,230,,1,0,0x02000000,63,2,34,4,0,0,22,{ bonus bUnbreakableWeapon,1; bonus bAtkEle,Ele_Fire; bonus bDex,2; },{},{}
13309,Huuma_Giant_Wheel_C,Huuma Giant Wheel Shuriken,5,0,,0,99,,1,0,0x02000000,63,2,34,4,1,0,22,{ bonus2 bAddSize,Size_All,80; },{},{}
-13310,P_Huuma_Suriken1,P.Huuma Suriken I,5,0,,0,150:50,,1,0,0x02000000,63,2,34,3,60,0,22,{},{},{}
+13310,P_Huuma_Shuriken1,P.Huuma Suriken I,5,0,,0,150:50,,1,0,0x02000000,63,2,34,3,60,0,22,{},{},{}
13311,Huuma_Shadow,Sword Huuma Shuriken,5,5000,,1500,170,,1,0,0x02000000,63,2,34,3,99,1,22,{ bonus bStr,3; },{},{}
13312,Huuma_Job_Test,Prototype Huuma Shuriken,5,0,,3000,0,,1,0,0x02000000,63,2,34,4,99,1,22,{},{},{}
13313,Huuma_Swirling_Petal,Flower Huuma Shuriken,5,100000,,1500,150:50,,1,2,0x02000000,63,2,34,3,110,1,22,{ bonus2 bSkillAtk,"KO_HUUMARANKA",20; },{},{}
@@ -7451,15 +7510,15 @@
13438,Magical_Blade,Magical Blade,5,60000,,2000,165:110,,1,2,0x000654E3,63,2,2,4,105,1,2,{},{},{}
13439,TE_Woe_Sword,TE Woe Sword,5,0,,0,120:100,,1,0,0x000654E3,63,2,2,3,40,1,2,{ bonus2 bAddRace,RC_Player,40; bonus2 bAddEff,Eff_Poison,3000; },{},{}
13440,Ceremonial_Sword,Ceremonial Sword,5,20,,500,60,,1,0,0x00000063,5,2,2,1,1,1,2,{ bonus bAtkEle,Ele_Holy; },{},{}
-13441,Thanos_Sword,Thanatos Sword,5,10,,700,150:100,,1,1,0x00004082,63,2,2,4,120,1,2,{ bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000; },{},{ heal -1000,0; }
+13441,Thanos_Sword,Thanatos Sword,5,10,,700,150:100,,1,1,0x00004082,56,2,2,4,120,1,2,{ bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000; },{},{ heal -1000,0; }
13442,Old_Parasol,Old Parasol,5,10,,500,120:80,,,3,0x000654E2,63,2,2,3,80,1,2,{ bonus bMatk,getrefine(); skill "MG_SOULSTRIKE",10; },{},{}
13444,Pala,Pala,5,20,,700,190,,0,1,0x000654E2,63,2,2,3,0,1,2,{ bonus bAspdRate,8; },{},{}
13445,Half_BF_Sword1,Half BF Sword1,5,20,,0,115,,1,0,0x000654E3,63,2,2,3,80,1,2,{ bonus bStr,1; bonus bDex,1; bonus2 bAddRace,RC_DemiHuman,35; bonus2 bAddRace,RC_Player,35; bonus2 bIgnoreDefRaceRate,RC_DemiHuman,10; bonus2 bIgnoreDefRaceRate,RC_Player,10; bonus bUnbreakableWeapon,1; },{},{}
13449,Gladius_Daemonicus,Gladius Daemonicus,5,20,,1200,130,,,2,0x000654E2,63,2,2,4,80,1,2,{ bonus bAtkEle,Ele_Dark; },{},{}
13450,Saber__,Saber,5,10,,1000,115,,,2,0x000654E2,63,2,2,3,27,1,0,{},{},{}
-13451,Blue_Sword,Blue Sword,5,10,,1200,190,,1,1,0x00000080,56,2,2,3,100,1,2,{ bonus bStr,5; bonus bAgi,5; },{},{}
+13451,Ru_Blue_Sword,Blue Sword,5,10,,1200,190,,1,1,0x00000080,56,2,2,3,100,1,2,{ bonus bStr,5; bonus bAgi,5; },{},{}
13452,Ru_Gold_Sword,Ru Gold Sword,5,0,,1200,190,,1,2,0x00000080,56,2,2,3,120,1,2,{ bonus bStr,8; bonus bAgi,8; },{},{}
-13454,Crimson_Saber,Crimson Saber,5,20,,850,85,,1,2,0x000654E3,56,2,2,3,70,1,2,{ .@r = getrefine(); bonus bBaseAtk,((BaseLevel/10)*5)+(.@r<=15?pow(.@r,2):225); },{},{}
+13454,Crimson_Saber,Crimson Saber,5,20,,850,85,,1,2,0x000654E3,63,2,2,3,70,1,2,{ .@r = getrefine(); bonus bBaseAtk,((BaseLevel/10)*5)+(.@r<=15?pow(.@r,2):225); },{},{}
13455,Saber_of_Vicious_Mind,Saber of Vicious Mind,5,20,,1350,135,,1,1,0x000654E3,63,2,2,4,160,1,2,{ bonus bAtk,pow(min(getrefine(),15),2); },{},{}
13456,Unity_Sword,Unity Sword,5,20,,420,80,,1,1,0x000654E3,56,2,2,3,1,1,2,{ bonus bBaseAtk,pow(getrefine(),2)*125/100; },{},{}
13457,Unity_Dagger,Unity Dagger,5,20,,270,52,,1,1,0x028F5EEF,63,2,2,3,1,1,1,{ bonus bBaseAtk,pow(getrefine(),2)*125/100; },{},{}
@@ -7487,8 +7546,8 @@
13518,Weapon_Card_Scroll_Box,Weapon Card Pet Egg Scroll Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 13558,1; },{},{}
13519,Armor_Card_Scroll_Box,Armor Card Pet Egg Scroll Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 13559,1; },{},{}
13520,Helmet_Card_Scroll_Box,Helmet Card Pet Egg Scroll Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 13560,1; },{},{}
-13521,Garment_Card_Scroll_Box,Garment Card Pet Egg Scroll Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 13561,1; },{},{}
-13522,Shield_Card_Scroll_Box,Shield Card Pet Egg Scroll Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 13562,1; },{},{}
+13521,Hood_Card_Scroll_Box,Garment Card Pet Egg Scroll Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 13561,1; },{},{}
+13522,Hood_Card_Scroll_Box2,Shield Card Pet Egg Scroll Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 13562,1; },{},{}
13523,Shoes_Card_Scroll_Box,Shoes Card Pet Egg Scroll Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 13563,1; },{},{}
13524,Accy_Card_Scroll_Box,Accessory Card Pet Egg Scroll Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 13564,1; },{},{}
13525,Zeny_Scroll_Box,Zeny Pet Egg Scroll Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 14508,1; },{},{}
@@ -7875,10 +7934,10 @@
13908,Deviruchi_Set_Box,XM Deviruchi Set Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Deviruchi_Set_Box); /*getitem 5227,1; getitem 5228,1; getitem 5229,1;*/ },{},{}
13909,MVP_Hunt_Box,MVP Hunting Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_MVP_Hunt_Box); /*getitem 7621,1; getitem 12210,1; getitem 12221,1; getitem 12214,3;*/ },{},{}
13910,Brewing_Box,XM Brewing Set Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Brewing_Box); /*getitem 12204,10; getitem 12205,10; getitem 12206,10;*/ },{},{}
-13911,Christmas_Pet_Scroll,Christmas Pet Scroll,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Xmas_Pet_Scroll); },{},{}
-13912,Pty_Blessing_Box,Party Blessing 10 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 14588,10; },{},{}
-13913,Pty_Inc_Agi_Box,Party Increase Agi 10 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 14589,10; },{},{}
-13914,Pty_Assumptio_Box,Party Assumptio 5 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 14590,10; },{},{}
+13911,Xmas_Pet_Scroll,Christmas Pet Scroll,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Xmas_Pet_Scroll); },{},{}
+13912,Party_Blessing_Box,Party Blessing 10 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 14588,10; },{},{}
+13913,Party_Inc_Agi_Box,Party Increase Agi 10 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 14589,10; },{},{}
+13914,Party_Assumptio_Box,Party Assumptio 5 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 14590,10; },{},{}
13915,Love_Angel_Box,Love Angel Magic Powder Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ rentitem 12287,604800; },{},{}
13916,Squirrel_Box,Squirrel Magic Powder Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ rentitem 12288,604800; },{},{}
13917,Gogo_Box,Gogo Magic Powder Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ rentitem 12289,604800; },{},{}
@@ -7900,12 +7959,12 @@
13933,Undine_Box,Undine Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 4350,4; },{},{}
13934,Salamander_Box,Salamander Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 4380,4; },{},{}
13935,Soul_Box,Soul Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 4388,4; },{},{}
-13936,Noum_Box,Gnome Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 4335,4; },{},{}
+13936,Noum_Bpx,Gnome Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 4335,4; },{},{}
13937,Robo_Eye_Box,Robo Eye Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 5325,1; },{},{}
13938,Twin_Ribbon_Box,Maiden's Twin Ribbon Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 5187,1; },{},{}
13939,Diadem_Box,Diadem Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 5313,1; },{},{}
13940,Siege_Tele_Scroll_Box,WoE Teleport Scroll 100 Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 14591,100; },{},{}
-13941,TW_Valentine_Scroll,Taiwan Valentine Scroll,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
+13941,Valentine_Scroll_TW,Taiwan Valentine Scroll,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
13942,Love_Angel_Box_1m,Love Angel Magic Powder Box 30 Days,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 14009,1; },{},{}
13943,Squirrel_Box_1m,Squirrel Magic Powder Box 30 Days,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 14010,1; },{},{}
13944,Gogo_Box_1m,Gogo Magic Powder Box 30 Days,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 14011,1; },{},{}
@@ -7962,9 +8021,9 @@
13995,Speed_Up_Potion_Box10,Speed Potion 10 Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 12016,10; },{},{}
13996,Big_Bun_Box100,Big Bun 100 Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 14522,100; },{},{}
13997,Big_Bun_Box500,Big Bun 500 Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 14522,500; },{},{}
-13998,Giant_Flywing_Box500,Giant Fly Wing 500 Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 12212,500; },{},{}
-13999,Pill_Box100,Pill 100 Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 14523,100; },{},{}
-14000,Pill_Box500,Pill 500 Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 14523,500; },{},{}
+13998,Giant_Fly_Wing_Box500,Giant Fly Wing 500 Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 12212,500; },{},{}
+13999,Pill__Box100,Pill 100 Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 14523,100; },{},{}
+14000,Pill__Box500,Pill 500 Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 14523,500; },{},{}
14001,Basic_Siege_Supply_Box,Recruit Siege Supply Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Basic_Siege_Supply_Box); /*getitem 11503,25; getitem 11504,10;*/ },{},{}
14002,Adv_Siege_Supply_Box,Veteran Siege Supply Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Adv_Siege_Supply_Box); /*getitem 11503,50; getitem 11504,20;*/ },{},{}
14003,Elite_Siege_Supply_Box,Elite Siege Supply Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Elite_Siege_Supply_Box); /*getitem 11503,100; getitem 11504,50;*/ },{},{}
@@ -8184,7 +8243,7 @@
14217,F_Megaphone_Box1,Megaphone Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 12221,1; },{},{}
14218,F_Megaphone_Box5,Megaphone 5 Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 12221,5; },{},{}
14219,F_Enriched_Elunium_Box5,Enriched Elunium 5 Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 7619,5; },{},{}
-14220,F_Enriched_Oridecon_Box5,Enriched Oridecon 5 Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 7620,5; },{},{}
+14220,FEnriched_Oridecon_Box5,Enriched Oridecon 5 Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 7620,5; },{},{}
14221,MP_Scroll_Box,Mystical Amplification Scroll 10 Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 14593,10; },{},{}
14222,MP_Scroll_Box30,Mystical Amplification Scroll 30 Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 14593,30; },{},{}
14223,MP_Scroll_Box50,Mystical Amplification Scroll 50 Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 14593,50; },{},{}
@@ -8193,7 +8252,7 @@
14226,Quagmire_Scroll_Box50,Quagmire Scroll 50 Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 14594,50; },{},{}
14227,Healing_Staff_Box,Healing Staff Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ rentitem 1638,604800; },{},{}
14228,Praxinus_Box,Praccsinos Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ rentitem 2752,604800; },{},{}
-14229,Sakura_Scroll,Cherry Blossom Scroll,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Sakura_Scroll); },{},{}
+14229,Cherry_Blossom_Scroll,Cherry Blossom Scroll,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Sakura_Scroll); },{},{}
14230,Note_Headphones_Box,Note Headphones Box,18,,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 5151,1; },{},{}
14231,Novice_Breastplate_Boxes,Novice Breastplate Boxes,18,,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
14232,Yggdrasilberry_Box_,Yggdrasil Berry 10 Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 607,10; },{},{}
@@ -8411,7 +8470,7 @@
14545,Battle_Manual_X3,Field Manual 300%,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_EXPBOOST,1800000,300; },{},{}
14546,Fire_Cracker_Love,I Love You Firecracker,2,2,,20,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
14547,Fire_Cracker_Wday,Whiteday Firecracker,2,2,,20,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
-14548,Fire_Cracker_Valentine,Valentine's Day Firecracker,2,2,,20,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
+14548,Fire_Cracker_Vday,Valentine's Day Firecracker,2,2,,20,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
14549,Fire_Cracker_Bday,Birthday Firecracker,2,2,,20,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
14550,Fire_Cracker_Xmas,Xmas Firecracker,2,2,,20,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
14551,Str_Dish01_,Fried Grasshopper Legs,0,2,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_STRFOOD,1200000,1; percentheal 5,0; },{},{}
@@ -8477,10 +8536,10 @@
14612,M_Mdef_Potion,M Mdef Potion,11,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ specialeffect2 EF_SPELLBREAKER; sc_start SC_MDEF_RATE,120000,3; },{},{}
14613,RWC_Scroll_2012,RWC Scroll 2012,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_RWC_Scroll_2012); },{},{}
14614,Ex_Def_Potion,Ex Def Potion,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ specialeffect2 EF_GUARD; sc_start SC_DEF_RATE,1800000,3; sc_start SC_MDEF_RATE,1800000,3; },{},{}
-14616,STR_Biscuit_Stick,Bar Cookie Of Strength,18,1,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_STRFOOD,1800000,15; sc_start SC_INCATKRATE,600000,rand(11,111); },{},{}
-14617,VIT_Biscuit_Stick,Bar Cookie Of Vitality,18,1,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_VITFOOD,1800000,15; sc_start SC_INCDEFRATE,600000,rand(11,33); },{},{}
+14616,STR_Biscuit_Stick,Bar Cookie Of Strength,18,1,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_STRFOOD,1800000,15; sc_start SC_ATKPOTION,600000,rand(11,111); },{},{}
+14617,VIT_Biscuit_Stick,Bar Cookie Of Vitality,18,1,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_VITFOOD,1800000,15; bonus_script "{ bonus bHPRecovRate,rand(11,33); }",1800,1; },{},{}
14618,AGI_Biscuit_Stick,Bar Cookie Of Agility,18,1,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_AGIFOOD,1800000,15; sc_start SC_FLEEFOOD,600000,rand(11,33); },{},{}
-14619,INT_Biscuit_Stick,Bar Cookie Of Intelligence,18,1,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_INTFOOD,1800000,15; sc_start SC_INCMATKRATE,600000,rand(11,111); },{},{}
+14619,INT_Biscuit_Stick,Bar Cookie Of Intelligence,18,1,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_INTFOOD,1800000,15; sc_start SC_MATKPOTION,600000,rand(11,111); },{},{}
14620,DEX_Biscuit_Stick,Bar Cookie Of Dexterity,18,1,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_DEXFOOD,1800000,15; sc_start SC_HITFOOD,600000,rand(11,33); },{},{}
14621,LUK_Biscuit_Stick,Bar Cookie Of Lucky,18,1,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_LUKFOOD,1800000,15; sc_start SC_CRIFOOD,600000,rand(11,33); },{},{}
14623,Golden_Treasure_Box_,Golden Treasure Box,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ /*getitem callfunc("F_Rand",Devilring card, Angeling card, 11 weapons smelting ticket, armor smelting 11 ticket , horns of the buffalo, ring of recovery, pink bunny costume hair band)*/ },{},{}
@@ -8531,7 +8590,7 @@
14753,Hero_Midgard_Egg,Hero Midgard Egg,18,0,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Hero_Midgard_Egg); },{},{}
14758,Safe_To_Smelting_Scroll,Safe To Smelting Scroll,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem callfunc("F_Rand",6238,6239,6228,6232,24216,17474,969),1; },{},{}
14765,Limited_Edition_JOB_Battle_Manual,Limited Edition JOB Battle Manual,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_JEXPBOOST,3600000,35; },{},{}
-14766,Limited_Power_Booster,Limited Power Booster,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ bonus_script "{ bonus bBaseAtk,30; bonus bMatk,30; bonus bAddClass,Class_All,1; bonus bMatkRate,1; bonus bHit,30; bonus bFlee,30; bonus bAspd,1; bonus bUseSPrate,-5; bonus bFixedCastrate,-30; }",1800,1,1; },{},{}
+14766,Limited_Power_Booster,Limited Power Booster,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ bonus_script "{ bonus bBaseAtk,30; bonus bMatk,30; bonus2 bAddClass,Class_All,1; bonus bMatkRate,1; bonus bHit,30; bonus bFlee,30; bonus bAspd,1; bonus bUseSPrate,-5; bonus bFixedCastrate,-30; }",1800,1,1; },{},{}
14805,July_Lucky_Scroll,Almighty Lucky Egg,18,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_July_Lucky_Scroll); },{},{}
//===================================================================
// More Armors
@@ -8571,7 +8630,7 @@
15032,Tidung,Tidung,4,10,,500,,2,,1,0xFFFFFFFE,63,2,16,,0,1,0,{ bonus bMdef,10; bonus2 bResEff,Eff_Stun,1500; bonus2 bResEff,Eff_Freeze,1500; bonus2 bSubClass,Class_All,5; },{},{}
15033,Tutorial_Mattle,Tutorial Mantle,4,0,,600,,37,,0,0x00000000,63,2,16,,1,0,0,{},{},{}
15034,Tutorial_Mattle_,Tutorial Mantle,4,0,,600,,37,,1,0x00000000,63,2,16,,1,0,0,{},{},{}
-15035,2010_Love_Dad,2010 Love Dad,4,10,,100,,6,,1,0xFFFFFFFF,63,2,16,,0,1,0,{ bonus bAllStats,1; bonus bMaxHP,150; bonus bMaxSP,150; bonus2 bResEff,Eff_Stone,9000; bonus2 bResEff,Eff_Freeze,9000; bonus2 bResEff,Eff_Stun,9000; bonus2 bResEff,Eff_Sleep,9000; bonus2 bResEff,Eff_Silence,9000; bonus2 bResEff,Eff_Curse,9000; bonus2 bResEff,Eff_Confusion,9000; bonus2 bResEff,Eff_Blind,9000; bonus2 bResEff,Eff_Poison,9000; bonus2 bResEff,Eff_Bleeding,9000; },{},{}
+15035,2010_Love_Daddy,2010 Love Dad,4,10,,100,,6,,1,0xFFFFFFFF,63,2,16,,0,1,0,{ bonus bAllStats,1; bonus bMaxHP,150; bonus bMaxSP,150; bonus2 bResEff,Eff_Stone,9000; bonus2 bResEff,Eff_Freeze,9000; bonus2 bResEff,Eff_Stun,9000; bonus2 bResEff,Eff_Sleep,9000; bonus2 bResEff,Eff_Silence,9000; bonus2 bResEff,Eff_Curse,9000; bonus2 bResEff,Eff_Confusion,9000; bonus2 bResEff,Eff_Blind,9000; bonus2 bResEff,Eff_Poison,9000; bonus2 bResEff,Eff_Bleeding,9000; },{},{}
15036,Ur_Plate,Ur's Plate,4,20,,3000,,110,,0,0x00000080,56,2,16,,100,1,0,{ bonus bMdef,10; bonus bMaxHPrate,getrefine(); bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player,5; bonus2 bSubEle,Ele_Neutral,5; },{},{}
15037,Peuz_Plate,Peuz's Plate,4,20,,3000,,110,,0,0x00000080,56,2,16,,100,1,0,{ bonus bMdef,10; bonus bBaseAtk,20; bonus bFlee,17; },{},{}
15038,Sabah_Cloth,Sapha's Cloth,4,20,,100,,45,,1,0x00001000,63,2,16,,100,1,0,{ bonus bLuk,3; bonus3 bAutoSpell,"ASC_METEORASSAULT",max(getskilllv("ASC_METEORASSAULT"),1),20; },{},{}
@@ -8598,39 +8657,39 @@
15059,2011Love_Daddy,2011Love Daddy,4,20,,100,0,80,0,1,0xFFFFFFFF,63,2,16,,0,1,0,{},{},{}
15060,Sky_Blue_Smock,Sky Blue Smock,4,20,,300,0,1,0,1,0xFFFFFFFF,63,2,16,,0,1,0,{},{},{}
15061,Egir_Armor,Egir Armor,4,200000,,2600,,55,,1,0xFFFFFFFF,63,2,16,,110,1,0,{ bonus bAllStats,1; if(BaseClass==Job_Mage||BaseClass==Job_Archer||BaseClass==Job_Acolyte) bonus2 bResEff,Eff_Silence,5000; else if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief) bonus2 bResEff,Eff_Stun,5000; },{},{}
-15062,TE_Woe_Coat,TE Woe Coat,4,0,,0,,15,,0,0xFFFFFFFF,63,2,16,0,40,1,,{ bonus bMdef,15; bonus bMaxHP,250; bonus bMaxSP,250; bonus2 bSubRace,RC_Player,10; bonus2 bResEff,Eff_Freeze,25; },{},{}
-15063,TE_Woe_Chain_Mail,TE Woe Chain Mail,4,0,,0,,25,,0,0x000444A2,63,2,16,0,40,1,,{ bonus bMdef,5; bonus bMaxHP,450; bonus bMaxSP,50; bonus2 bSubRace,RC_Player,15; bonus2 bResEff,Eff_Freeze,25; },{},{}
-15064,TE_Woe_Mage_Coat,TE Woe Mage Coat,4,0,,0,,5,,0,0x00818315,63,2,16,0,40,1,,{ bonus bMdef,25; bonus bMaxHP,200; bonus bMaxSP,200; bonus2 bSubRace,RC_Player,5; bonus2 bResEff,Eff_Freeze,25; },{},{}
-15066,Engraved_Plate_Armor,Engraved Plate Armor,4,100000,,3000,,120,,1,0x00004082,63,2,16,,150,1,,{ bonus bMdef,25; },{},{}
-15067,Rune_Suit,Rune Suit,4,0,,0,,,,0,0xFFFFFFFF,63,2,16,0,1,1,,{ bonus2 bExpAddRace,RC_All,10; },{},{}
+15062,TE_Woe_Coat,TE Woe Coat,4,0,,0,,15,,0,0xFFFFFFFF,63,2,16,,40,1,,{ bonus bMdef,15; bonus bMaxHP,250; bonus bMaxSP,250; bonus2 bSubRace,RC_Player,10; bonus2 bResEff,Eff_Freeze,25; },{},{}
+15063,TE_Woe_Chain_Mail,TE Woe Chain Mail,4,0,,0,,25,,0,0x000444A2,63,2,16,,40,1,,{ bonus bMdef,5; bonus bMaxHP,450; bonus bMaxSP,50; bonus2 bSubRace,RC_Player,15; bonus2 bResEff,Eff_Freeze,25; },{},{}
+15064,TE_Woe_Mage_Coat,TE Woe Mage Coat,4,0,,0,,5,,0,0x00818315,63,2,16,,40,1,,{ bonus bMdef,25; bonus bMaxHP,200; bonus bMaxSP,200; bonus2 bSubRace,RC_Player,5; bonus2 bResEff,Eff_Freeze,25; },{},{}
+15066,Engraved_Armor,Engraved Plate Armor,4,100000,,3000,,120,,1,0x00004082,63,2,16,,150,1,,{ bonus bMdef,25; },{},{}
+15067,Rune_Suit,Rune Suit,4,0,,0,,,,0,0xFFFFFFFF,63,2,16,,1,1,,{ bonus2 bExpAddRace,RC_All,10; },{},{}
15068,Im_Angel's_Protection,Advanced Angelic Protection,4,10000,,600,,40,,1,0x00000001,63,2,16,,99,1,0,{ bonus bMdef,30; },{},{}
15069,Suit_Of_Sid,Suit Of Sid,4,20,,1000,,30,,0,0xFFFFFFFF,63,2,16,,0,1,0,{},{},{}
15070,Clothes_of_Happiness,Clothes of Happiness,4,10,,1000,,5,,1,0xFFFFFFFF,63,2,16,,1,1,,{ bonus bMdef,5; bonus bLuk,getrefine(); },{},{}
-15073,Anti-Magic_Suits,Anti-Magic Suits,4,10,,1500,,50,,1,0xFFFFFFFF,63,2,16,,99,1,0,{ .@r = getrefine(); bonus bMaxHPrate,5+((.@r >= 9) ? 2 : 0); bonus bMdef,10+((.@r >= 7) ? 5 : 0); },{},{}
-15074,Geffen_Magic_Robe,Geffen Magic Robe,4,10,,1000,,40,,1,0xFFFFFFFF,63,2,16,,99,1,0,{ .@r = getrefine(); bonus bUseSPrate,-10-((.@r>=7) ? 5: 0); bonus bVariableCastrate,-15-((.@r>=9) ? 5: 0); bonus bNoCastCancel2,1; },{},{}
+15073,Anti_Magic_Suit,Anti-Magic Suits,4,10,,1500,,50,,1,0xFFFFFFFF,63,2,16,,99,1,0,{ .@r = getrefine(); bonus bMaxHPrate,5+((.@r >= 9) ? 2 : 0); bonus bMdef,10+((.@r >= 7) ? 5 : 0); },{},{}
+15074,Geffen_Mage_Robe,Geffen Magic Robe,4,10,,1000,,40,,1,0xFFFFFFFF,63,2,16,,99,1,0,{ .@r = getrefine(); bonus bUseSPrate,-10-((.@r>=7) ? 5: 0); bonus bVariableCastrate,-15-((.@r>=9) ? 5: 0); bonus bNoCastCancel2,1; },{},{}
15088,School_Uniform,School Uniform,4,20,,500,,25,,1,0xFFFFFFFF,63,2,16,,0,1,0,{ bonus bAgi,1; bonus bLuk,1; bonus bMaxHP,BaseLevel*3; bonus bMaxSP,BaseLevel/2; },{},{}
15089,Menswear,Menswear,4,10,,300,,40,,0,0xFFFFFFFE,63,2,16,,80,1,,{ .@r = getrefine(); bonus bAspdRate,3+((.@r>=7)?2:0); bonus bDelayrate,-3-((.@r>=7)?2:0); bonus bVariableCastrate,-3-((.@r>=7)?2:0); },{},{}
-15090,Armor_of_Gray,Armor of Gray,4,10,,2400,,90,,1,0x000654E2,63,2,16,,120,1,0,{ bonus bMdef,10; bonus2 bSubEle,Ele_Holy,10+getrefine()*2; },{},{}
-15091,Robe_of_Gray,Robe of Gray,4,10,,1300,,55,,1,0x00810100,63,2,16,,120,1,0,{ bonus2 bSubEle,Ele_Holy,10+getrefine()*2; },{},{}
+15090,Armor_Of_Gray,Armor of Gray,4,10,,2400,,90,,1,0x000654E2,56,2,16,,120,1,0,{ bonus bMdef,10; bonus2 bSubEle,Ele_Holy,10+getrefine()*2; },{},{}
+15091,Gray_Robe,Gray Robe,4,20,,1300,,55,,1,0x00018314,56,2,16,,120,1,0,{ bonus2 bSubEle,Ele_Holy,10+getrefine()*2; },{},{}
15093,Hero_Plate,Hero Plate,4,10,,4000,,120,,1,0x00004082,63,2,16,,160,1,,{ bonus bMdef,5; bonus bMaxHPrate,5; bonus bMaxSPrate,5; bonus bMatk,10; bonus bBaseAtk,10; bonus bHit,10; bonus bFlee,10; bonus2 bSkillAtk,"LG_BANISHINGPOINT",10; bonus2 bSkillAtk,"RK_HUNDREDSPEAR",10; .@r = getrefine(); bonus5 bAutoSpell,"AL_HEAL",10,50+.@r,BF_SHORT,0; bonus5 bAutoSpell,"WZ_STORMGUST",10,50+.@r,BF_SHORT,1; },{},{}
15094,Hero_Magic_Coat,Hero Magic Coat,4,10,,800,,50,,1,0x00010204,63,2,16,,160,1,,{ bonus bMatk,10; bonus bMaxHPrate,5; bonus bMaxSPrate,5; bonus bFlee,10; bonus2 bSkillAtk,"WL_CRIMSONROCK",10; bonus2 bSkillAtk,"SO_PSYCHIC_WAVE",10; .@r = getrefine(); if (.@r) { bonus bFixedCastrate,21-.@r/2; bonus bNoCastCancel2,1; bonus bMdef,.@r/2; } },{},{}
15095,Hero_Judgement_Shawl,Hero Judgement Shawl,4,10,,500,,77,,1,0x00008110,63,2,16,,160,1,,{ bonus bMaxHPrate,5; bonus bMaxSPrate,5; bonus bMatk,10; bonus bBaseAtk,10; bonus bHit,10; bonus bFlee,10; bonus2 bSkillAtk,"AB_JUDEX",10; bonus2 bSkillAtk,"AB_ADORAMUS",10; bonus2 bSkillAtk,"SR_DRAGONCOMBO",10; bonus2 bSkillAtk,"SR_SKYNETBLOW",10; bonus2 bSkillAtk,"SR_EARTHSHAKER",10; .@r = getrefine(); bonus5 bAutoSpell,"PR_KYRIE",1,50+.@r,BF_SHORT,0; bonus5 bAutoSpell,"PR_LEXAETERNA",10,50+.@r,BF_MAGIC,1; },{},{}
15096,Hero_Trade_Mail,Hero Trade Mail,4,10,,500,,100,,1,0x00040420,56,2,16,,160,1,,{ bonus bMaxHPrate,5; bonus bMaxSPrate,5; bonus bMatk,10; bonus bBaseAtk,10; .@r = getrefine(); if(readparam(bStr) >= 90) bonus bStr,.@r/2; if(readparam(bInt) >= 90) bonus bInt,.@r/2; if(readparam(bAgi) >= 90) bonus bAgi,.@r/2; if(readparam(bVit) >= 90) bonus bVit,.@r/2; if(readparam(bDex) >= 90) bonus bDex,.@r/2; if(readparam(bLuk) >= 90) bonus bLuk,.@r/2; },{},{}
15097,Hero_Hidden_Cloth,Hero Hidden Cloth,4,10,,200,,70,,1,0x00021040,63,2,16,,160,1,0,{ bonus bMaxHPrate,5; bonus bMaxSPrate,5; bonus2 bSkillAtk,"SC_FATALMENACE",10; bonus2 bSkillAtk,"SC_TRIANGLESHOT",10; bonus2 bSkillAtk,"GC_CROSSIMPACT",10; bonus2 bSkillAtk,"GC_CROSSRIPPERSLASHER",10; autobonus "{ bonus bCritical,20; bonus bFlee,20; bonus2 bAddClass,Class_All,10; bonus bMatkRate,10; }",(5+getrefine())*10,10000,BF_WEAPON; },{},{}
-15098,Hero_Target_Suit,Hero Target Suit,4,10,,200,,60,,1,0x00080808,56,2,16,,160,1,,{ bonus bMaxHPrate,5; bonus bMaxSPrate,5; .@r = getrefine(); bonus bAllStats,1; bonus5 bAutoSpell,"AC_CONCENTRATION",10,(5+.@r)*5,BG_WEAPON,0; bonus5 bAutoSpell,"AC_DOUBLE",10,(5+.@r)*5,BG_WEAPON,1; },{},{}
+15098,Hero_Taget_Suits,Hero Target Suit,4,10,,200,,60,,1,0x00080808,56,2,16,,160,1,,{ bonus bMaxHPrate,5; bonus bMaxSPrate,5; .@r = getrefine(); bonus bAllStats,1; bonus5 bAutoSpell,"AC_CONCENTRATION",10,(5+.@r)*5,BG_WEAPON,0; bonus5 bAutoSpell,"AC_DOUBLE",10,(5+.@r)*5,BG_WEAPON,1; },{},{}
15100,Frozen_Breastplate,Frozen Breastplate,4,20,,1500,,20,,1,0xFFFFFFFF,63,2,16,,130,1,0,{ bonus bDefEle,Ele_Water; },{},{}
-15101,Hardened_Breastplate,Hardened Breastplate,4,20,,1500,,20,,1,0xFFFFFFFF,63,2,16,,130,1,0,{},{},{}
+15101,Harden_Breastplate,Hardened Breastplate,4,20,,1500,,20,,1,0xFFFFFFFF,63,2,16,,130,1,0,{},{},{}
15103,Kirin_Armor,Kirin Armor,4,10,,500,,55,,1,0xFFFFFFFF,63,2,16,,70,,,{ bonus bDefEle,Ele_Holy; },{},{}
15104,FishingMan_Mail,FishingMan Mail,4,10,,500,,30,,1,0xFFFFFFFF,63,2,16,,50,,,{ bonus2 bAddRace,RC_Fish,10; bonus2 bMagicAddRace,RC_Fish,10; .@r = getrefine(); if(.@r>5){ bonus2 bAddRace,RC_All,.@r; bonus2 bMagicAddRace,RC_All,.@r; } },{},{}
15105,Kaftan,Kaftan,4,20,,400,,13,,1,0xFFFFFFFF,63,2,16,,0,1,0,{ bonus bMdef,3; bonus2 bSubRace,RC_Demon,5; bonus2 bSubRace,RC_Undead,5; },{},{}
15110,Supplement_Part_Str,Supplement Part Str,4,25000,,2000,,80,,,0x00000400,56,2,16,,100,1,0,{ bonus2 bAddClass,Class_All,5+getrefine()/4; },{},{}
-15111,Reinforced_Parts_Gloves,Reinforced Parts - Gloves,4,10,,3000,,110,,,0x00000400,56,2,16,,100,1,,{ bonus bUnbreakableArmor,1; bonus2 bSubSize,0,10; bonus2 bSubSize,1,10; .@r = getrefine(); if(.@r>=7){ bonus2 bSubSize,2,10; }; if(.@r>=9){ bonus2 bSubSize,0,5; bonus2 bSubSize,1,5; } },{},{}
-15116,Armor_Of_Airship,Armor Of Airship,4,10,,700,,100,,0,0xFFFFFFFF,63,2,16,,125,1,,{ bonus bMaxHP,1000; bonus bMaxSP,100; bonus bMdef,10; bonus bAllStats,1; },{},{}
-15117,Tarlock's_Armor,Tarlock's Armor,4,10,,750,,70,,0,0xFFFFFFFF,63,2,16,,125,1,,{ bonus bMaxHP,500; bonus bMaxSP,50; bonus bMdef,10; bonus bAllStats,1; .@r = getrefine(); if(.@r>=7) { bonus bMaxHP,500; bonus bMaxSP,50; } if(.@r>=9) { bonus bMaxHP,200; bonus bMaxSP,20; } if(.@r>=12) { bonus bMaxHP,300; bonus bMaxSP,30; } },{},{}
-15121,Sarah_Combat_Robe,Sarah Combat Robe,4,10,,800,,35,,1,0xFFFFFFFF,63,2,16,,145,1,,{ /*TODO: Confirm the real rate and additional MAtk*/ .@r = getrefine(); autobonus "{ bonus bMatk,20; }",100,(10+((.@r) ? .@r*8 : 0))*1000,BF_MAGIC;},{},{}
+15111,Upgrade_Part_Plate,Reinforced Parts - Gloves,4,10,,3000,,110,,,0x00000400,56,2,16,,100,1,,{ bonus bUnbreakableArmor,1; bonus2 bSubSize,0,10; bonus2 bSubSize,1,10; .@r = getrefine(); if(.@r>=7){ bonus2 bSubSize,2,10; }; if(.@r>=9){ bonus2 bSubSize,0,5; bonus2 bSubSize,1,5; } },{},{}
+15116,Airship_Armor,Armor Of Airship,4,10,,700,,100,,0,0xFFFFFFFF,63,2,16,,125,1,,{ bonus bMaxHP,1000; bonus bMaxSP,100; bonus bMdef,10; bonus bAllStats,1; },{},{}
+15117,Felock_Armor,Tarlock's Armor,4,10,,750,,70,,0,0xFFFFFFFF,63,2,16,,125,1,,{ bonus bMaxHP,500; bonus bMaxSP,50; bonus bMdef,10; bonus bAllStats,1; .@r = getrefine(); if(.@r>=7) { bonus bMaxHP,500; bonus bMaxSP,50; } if(.@r>=9) { bonus bMaxHP,200; bonus bMaxSP,20; } if(.@r>=12) { bonus bMaxHP,300; bonus bMaxSP,30; } },{},{}
+15121,Robe_Of_Sarah,Sarah Combat Robe,4,10,,800,,35,,1,0xFFFFFFFF,63,2,16,,145,1,,{ /*TODO: Confirm the real rate and additional MAtk*/ .@r = getrefine(); autobonus "{ bonus bMatk,20; }",100,(10+((.@r) ? .@r*8 : 0))*1000,BF_MAGIC;},{},{}
15123,Whikebain_Suit,Whikebain Suit,4,0,,900,,56,,1,0x00001000,56,2,16,,105,1,,{ .@r = getrefine(); bonus bCritAtkRate,(.@r>=7)?(6):((.@r>=5)?(4):(0)); bonus3 bAutoSpell,"DC_WINKCHARM",1,10; /* Confirm: Success rate */ },{},{}
-15126,Private_Doram_Suits,Private Doram Suits,4,20,,700,,80,,1,0x80000000,7,2,16,,100,1,,{ bonus bMaxHP,500; bonus bMaxSP,100; .@r = getrefine()/3; bonus bDex,.@r; bonus bInt,.@r; },{},{}
-15129,Luxury_Doram_Suit,Luxury Doram Suit,4,20,,800,,100,,1,0x80000000,7,2,16,,140,1,,{ bonus bMaxHPrate,10; bonus bMaxSPrate,10; .@r = getrefine()/2; bonus bDex,.@r; bonus bInt,.@r; },{},{}
+15126,Female_Poring_Balloon,Private Doram Suits,4,20,,700,,80,,1,0x80000000,7,2,16,,100,1,,{ bonus bMaxHP,500; bonus bMaxSP,100; .@r = getrefine()/3; bonus bDex,.@r; bonus bInt,.@r; },{},{}
+15129,Blue_Bellflower_Hat,Luxury Doram Suit,4,20,,800,,100,,1,0x80000000,7,2,16,,140,1,,{ bonus bMaxHPrate,10; bonus bMaxSPrate,10; .@r = getrefine()/2; bonus bDex,.@r; bonus bInt,.@r; },{},{}
15138,Aegir_Armor,Aegir Armor,4,10,,1600,,25,,1,0xFFFFFFFF,63,2,16,,40,1,,{ bonus bMaxHP,500; bonus bMaxSP,50; bonus bUnbreakableArmor,1; },{},{}
15141,Rift_Ancient_Armor,Rift Ancient Armor,4,10,,500,,30,,1,0xFFFFFFFF,63,2,16,,100,1,,{ .@r = getrefine(); bonus bMaxHP,(.@r >= 9 ? 1500 : .@r >= 7 ? 900 : 500); bonus bMaxSP,-100; },{},{}
15145,EvilDragon_Armor,Evil Dragon Armor,4,0,,4000,,60,,1,0xFFFFFFFF,63,2,16,,,1,,{ .@r = getrefine(); bonus2 bHPDrainRate,100,(.@r>=10)?(3):((.@r>=9)?(4):((.@r>=8)?(6):(0))); bonus2 bSPDrainRate,100,(.@r>=10)?(5):((.@r>=9)?(3):((.@r>=8)?(2):(0))); /* Confirm: Success rate and it says no effect if with Rideword, Vanargandr Helm, or Piece Of Angent Skin */ },{},{}
@@ -8685,15 +8744,15 @@
16025,TE_Woe_Mace,TE Woe Mace,5,0,,0,120,,1,0,0x0004C5B3,63,2,2,3,40,1,8,{ bonus bUnbreakableWeapon,1; bonus2 bAddRace,RC_Player,40; bonus2 bAddEff,Eff_Freeze,3000; bonus bHPRecovRate,5; bonus bSPRecovRate,5; },{},{}
16026,RWC_Memory_Mace,RWC Memory Mace,5,20,,800,100,,1,1,0x0004C5B2,63,2,2,3,1,1,8,{ bonus bUnbreakableWeapon,1; .@r = getrefine(); bonus bBaseAtk,(.@r/30)*30; if(.@r>=9){ .@i = 1; bonus3 bAutoSpellWhenHit,"BS_WEAPONPERFECT",1,10; } if(.@r>=6){ .@rate = 5*(.@i+1); bonus2 bAddClass,Class_All,5; } },{},{}
16027,Hammer_Of_Evil_Slayer,Evil Slayer Destroyer Hammer,5,10,,1350,125,,1,1,0x0004C5B3,63,2,2,3,100,1,8,{ bonus2 bAddRace,RC_Demon,10; bonus2 bAddRace,RC_Undead,10; .@r = getrefine(); bonus2 bAddClass,Class_All,(.@r>=12?12:(.@r>=9?5:0)); },{},{}
-16028,Thanos_Hammer,Thanatos Hammer,5,10,,3000,180:120,,1,1,0x0004C5B2,63,2,2,4,120,1,8,{ bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000; },{},{ heal -1000,0; }
+16028,Thanos_Hammer,Thanatos Hammer,5,10,,3000,180:120,,1,1,0x0004C5B2,56,2,2,4,120,1,8,{ bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000; },{},{ heal -1000,0; }
16029,Noble_Cross,Noble Cross,5,10,,1500,195:150,,,1,0x00000010,58,2,2,4,40,1,8,{ bonus3 bAutoSpell,"PR_TURNUNDEAD",6,50; bonus2 bSPDrainValueRace,RC_Undead,1; bonus2 bSPGainRace,RC_Undead,12; },{},{}
-16030,Pile_Bunker_S,Pile Bunker S,5,20,,3000,400,,1,1,0x00000400,56,2,2,4,130,1,8,{ bonus bAspdRate,getrefine()/2; },{},{}
-16031,Pile_Bunker_P,Pile Bunker P,5,20,,4000,450,,1,,0x00000400,56,2,2,4,130,1,8,{ bonus bBaseAtk,getrefine()*5; },{},{}
-16032,Pile_Bunker_T,Pile Bunker T,5,20,,3500,400,,1,1,0x00000400,56,2,2,4,130,1,8,{ bonus bUseSPrate,getrefine()*-1; },{},{}
-16033,Robots_Mechanical_Arm,Robot's Mechanical Arm,5,20,,3000,195,,1,2,0x00000400,56,2,2,4,130,1,8,{ bonus bUnbreakableWeapon,1; bonus bCritical,20; },{},{}
+16030,Pilebuncker_S,Pile Bunker S,5,20,,3000,400,,1,1,0x00000400,56,2,2,4,130,1,8,{ bonus bAspdRate,getrefine()/2; },{},{}
+16031,Pilebuncker_P,Pile Bunker P,5,20,,4000,450,,1,,0x00000400,56,2,2,4,130,1,8,{ bonus bBaseAtk,getrefine()*5; },{},{}
+16032,Pilebuncker_T,Pile Bunker T,5,20,,3500,400,,1,1,0x00000400,56,2,2,4,130,1,8,{ bonus bUseSPrate,getrefine()*-1; },{},{}
+16033,Robot's_Arm,Robot's Mechanical Arm,5,20,,3000,195,,1,2,0x00000400,56,2,2,4,130,1,8,{ bonus bUnbreakableWeapon,1; bonus bCritical,20; },{},{}
16034,Half_Mjolnir,Half Mjolnir,5,20,,6000,350,,1,0,0x000444A2,63,2,2,4,95,0,8,{ bonus bAtkEle,Ele_Wind; bonus bDex,50; bonus bStr,20; bonus bAspdRate,10; bonus3 bAutoSpell,"MG_THUNDERSTORM",10,100; autobonus "{ bonus bSplashRange,1; }",50,10000; },{},{}
16035,Half_BF_Morning_Star1,Half BF Morning Star1,5,20,,0,105,,1,0,0x0004C5B3,63,2,2,3,80,1,8,{ bonus bStr,1; bonus bDex,1; bonus2 bAddRace,RC_DemiHuman,35; bonus2 bAddRace,RC_Player,35; bonus2 bIgnoreDefRaceRate,RC_DemiHuman,10; bonus2 bIgnoreDefRaceRate,RC_Player,10; bonus bUnbreakableWeapon,1; },{},{}
-16036,Blue_Mace,Blue Mace,5,10,,1500,170,,1,1,0x00008000,56,2,2,3,100,1,8,{ bonus bVit,5; bonus bInt,5; },{},{}
+16036,Ru_Blue_Mace,Blue Mace,5,10,,1500,170,,1,1,0x00008000,56,2,2,3,100,1,8,{ bonus bVit,5; bonus bInt,5; },{},{}
16037,Ru_Gold_Mace,Ru Gold Mace,5,0,,1500,170,,1,2,0x00008000,56,2,2,3,120,1,8,{ bonus bVit,8; bonus bInt,8; },{},{}
16038,Infinity_Mace,Infinity Mace,5,10,,500,155,,1,1,0x0004C780,56,2,2,4,100,1,8,{},{},{}
16039,Spoon,Spoon,5,10,,1000,80,,1,1,0x0004C5B3,63,2,2,3,40,1,8,{ bonus bAspd,10; bonus2 bAddEff,Eff_Curse,1000; },{},{}
@@ -8740,12 +8799,12 @@
16253,Rabbit_Scroll,Rabbit Scroll,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
16254,Energizing_Potion_Box,Energizing Potion Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
16257,Buddah_Scroll,Buddah Scroll,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Buddah_Scroll); },{},{}
-16258,HD_Bradium_5_Box,HD Bradium 5 Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 6226,5; },{},{}
-16259,HD_Carnium_5_Box,HD Carnium 5 Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 6225,5; },{},{}
-16260,HD_Bradium_10_Box,HD Bradium 10 Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 6226,10; },{},{}
-16261,HD_Carnium_10_Box,HD Carnium 10 Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 6225,10; },{},{}
-16262,HD_Bradium_5_Box2,HD Bradium 5 Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 6226,5; },{},{}
-16263,HD_Carnium_5_Box2,HD Carnium 5 Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 6225,5; },{},{}
+16258,HD_Bradium_Box5,HD Bradium 5 Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 6226,5; },{},{}
+16259,HD_Carnium_Box5,HD Carnium 5 Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 6225,5; },{},{}
+16260,HD_Bradium_Box10,HD Bradium 10 Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 6226,10; },{},{}
+16261,HD_Carnium_Box10,HD Carnium 10 Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 6225,10; },{},{}
+16262,F_HD_Bradium_Box5,HD Bradium 5 Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 6226,5; },{},{}
+16263,F_HD_Carnium_Box5,HD Carnium 5 Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 6225,5; },{},{}
16264,HD_Bradium_10_Box2,HD Bradium 10 Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 6226,10; },{},{}
16265,HD_Carnium_10_Box2,HD Carnium 10 Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 6225,10; },{},{}
16266,Indonesia_Beret_Box,Indonesia Beret Box,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getitem 5580,1; },{},{}
@@ -8753,7 +8812,7 @@
16268,HE_Bubble_Gum_Box,HE Bubble Gum Box,2,20,10,1,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 12412,10; },{},{}
16269,Cancer_Diadem_Box,Cancer Diadem Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 5581,1; },{},{}
16270,Cancer_Crown_Box,Cancer Crown Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 5582,1; },{},{}
-16304,Evil_Incarnation,Evil Incarnation,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Evil_Incarnation); },{},{}
+16304,Evil_Incarnation_Disable,Evil Incarnation,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Evil_Incarnation); },{},{}
16305,Upg_Guard_Box,Upg Guard Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 2149,1; },{},{}
16306,F_Upg_Guard_Box,F Upg Guard Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 2149,1; },{},{}
16307,Upg_Buckler_Box,Upg Buckler Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 2150,1; },{},{}
@@ -8829,7 +8888,7 @@
16415,FTurtle_Hat_Box,FTurtle Hat Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 5611,1; },{},{}
16418,Giant_Fly_Wing_Box_500,Giant Fly Wing Box 500,2,20,10,1,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 12212,500; },{},{}
16419,Greed_Scroll_Box_30,Greed Scroll Box 30,2,20,10,1,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 14529,30; },{},{}
-16420,Adventurer_Pack,Adventurer Pack,2,20,10,1,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 12208,10; getitem 12210,10; getitem 12216,20; getitem 12215,20; getitem 7621,10; getitem 12209,10; getitem 12211,5; getitem 12450,10; getitem 12448,10; getitem 12446,10; getitem 12206,10; getitem 12445,10; getitem 12447,10; },{},{}
+16420,Adventurer_Pack,Adventurer Pack,2,20,10,1,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 12208,10; getitem 12210,10; getitem 12216,20; getitem 12215,20; getitem 7621,10; getitem 12209,10; getitem 12211,5; getitem 12445,10; getitem 12446,10; getitem 12447,10; getitem 12448,10; getitem 12449,10; getitem 12450,10;},{},{}
16421,Written_Oath_Of_Marriage_Box,Written Oath Of Marriage Box,2,20,10,1,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 6026,1; },{},{}
16422,Magestic_Goat_Box_,Magestic Goat Box,2,20,10,1,,,,,0xFFFFFFFF,63,2,,,,,,{ rentitem 5280,604800; },{},{}
16423,Episode_13.1_Key_Package,Episode 13.1 Key Package,2,20,10,1,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 7782,1; getitem 12208,2; getitem 14582,10; },{},{}
@@ -8880,7 +8939,7 @@
16551,Sagittarius_Diadem_Box_,Sagittarius Diadem Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 5740,1; },{},{}
16554,Elven_Sunglasses_Box,Elven Sunglasses Box,2,20,,1,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 5245,1; },{},{}
16555,Pr_Reset_Stone_Box,Pr Reset Stone Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ /*getgroupitem(IG_Pr_Reset_Stone_Box);*/ getitem 6320,1; },{},{}
-16556,FPr_Reset_Stone_Box,Reset Stone Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ /*getgroupitem(IG_FPr_Reset_Stone_Box);*/ getitem 6320,1; },{},{}
+16556,FPremium_Reset_Stone_Box,Reset Stone Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ /*getgroupitem(IG_FPr_Reset_Stone_Box);*/ getitem 6320,1; },{},{}
16557,CP_Helm_Scroll10,CP Helm Scroll10,18,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 14517,10; },{},{}
16558,CP_Shield_Scroll10,CP Shield Scroll10,18,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 14518,10; },{},{}
16559,CP_Armor_Scroll10,CP Armor Scroll10,18,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 14519,10; },{},{}
@@ -8920,9 +8979,9 @@
16625,Half_Asprika_box7,Half Asprika Box7,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ rentitem 2566,604800; },{},{}
16628,Brynhild_Box,Half Brynhild Box,2,20,,0,,,,,0xFFFFFFFF,63,2,,,47,,,{ rentitem 15023,604800; },{},{}
16631,Aributa_Scroll,Aributa Scroll,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
-16638,Life_Ribbon_Box,Life Ribbon Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Life_Ribbon_Box); },{},{}
-16639,Life_Ribbon_Box2,Life Ribbon Box2,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Life_Ribbon_Box2); },{},{}
-16640,Life_Ribbon_Box3,Life Ribbon Box3,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Life_Ribbon_Box3); },{},{}
+16638,Ribbon_Of_Life_Box,Life Ribbon Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Life_Ribbon_Box); },{},{}
+16639,Ribbon_Of_Life_Box2,Life Ribbon Box2,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Life_Ribbon_Box2); },{},{}
+16640,Ribbon_Of_Life_Box3,Life Ribbon Box3,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Life_Ribbon_Box3); },{},{}
//
16652,Flame_Light,Flame Light,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Flame_Light); },{},{}
16653,BM75_10Box,BM75 10Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 12563,10; },{},{}
@@ -8997,7 +9056,7 @@
16737,Fantastic_Wig_Box_,Fantastic Wig Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 5276,1; },{},{}
16738,Yellow_Mage_Hat_Box,Yellow Mage Hat Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 5242,1; },{},{}
16739,Yellow_Mage_Hat_Box_,Yellow Mage Hat Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 5242,1; },{},{}
-16740,Protection_Seagod_Box,The Sea God's Call 23 Hour Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ rentitem 6436,86400; },{},{}
+16740,Ptotection_Seagod_Box,The Sea God's Call 23 Hour Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ rentitem 6436,86400; },{},{}
16741,Hairtail_Box1,Cutlass 1 Hour Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ /*getgroupitem(IG_Hairtail_Box1);*/ rentitem 1198,3600; },{},{}
16742,Hairtail_Box2,Cutlass 7 Day Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ /*getgroupitem(IG_Hairtail_Box2);*/ rentitem 1198,604800; },{},{}
16743,Spearfish_Box1,Marlin 1 Hour Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ /*getgroupitem(IG_Spearfish_Box1);*/ rentitem 1489,3600; },{},{}
@@ -9094,7 +9153,7 @@
17041,Trans_Box_Banshee,Trans Box Banshee,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 12662,10; },{},{}
17042,Trans_Box_Poring,Trans Box Poring,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 12663,10; },{},{}
17043,Trans_Box_Golem,Trans Box Golem,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 12664,10; },{},{}
-17050,Aries_Scroll,Aries Scroll,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Aries_Scroll); },{},{}
+17050,Aries_Scroll_,Aries Scroll,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Aries_Scroll); },{},{}
17051,Aries_Scroll_Box,Aries Scroll Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Aries_Scroll_Box); },{},{}
17052,Holy_Mom_Blaze_Box,Holy Mom Blaze Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 6472,1; },{},{}
17056,Wiz_Card_Album,Wiz Card Album,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
@@ -9155,7 +9214,7 @@
17114,Horn_Of_Ancient_Box,Horn Of Ancient Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 18595,1; },{},{}
17115,Sprout_Hat_Box,Sprout Hat Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 18596,1; },{},{}
17116,Mercury_Helm_Box,Mercury Helm Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 18597,1; },{},{}
-17117,Aries_Scroll_,Aries Scroll,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
+17117,Aries_Scroll,Aries Scroll,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
17118,ASPD_Potion_Box10,ASPD Enhanced Potion Box,18,20,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 12684,3; },{},{}
17120,Taurus_Scroll,Taurus Scroll,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
17121,Starry_Scroll,Starry Scroll,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
@@ -9178,7 +9237,7 @@
17156,TCG_Card_Scroll,Bossnia Ticket Scroll,2,20,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_TCG_Card_Scroll); },{},{}
17157,Vital_Flower_Box,Vital Flower Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 6113,10; },{},{}
17158,Flame_Gemstone_Box,Flame Gemstone Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 6114,10; },{},{}
-17159,Name_Change_Box,Name Change Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
+17159,Change_Name_Card_Box,Name Change Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
17160,Character_Name_Change_Card_Box,Character Name Change Card Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
17162,Boarding_Halter_Box7,Boarding Halter Box7,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
17165,Challenge_Kit,Challenge Kit,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Challenge_Kit); /*getitem Blessing_10_Scroll,20; getitem Inc_Agi_10_Scroll,20;*/ },{},{}
@@ -9344,9 +9403,9 @@
17499,Three_Master_Package_IV_10,Three Master Package IV(10),2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 14534,200; getitem 14535,200; getitem 12578,200; getitem 22812,11; },{},{}
17501,Support_Package_IV,Support Package IV,2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 12208,2; getitem 12210,2; getitem 12883,2; getitem 14600,2; /*getitem Mysterious Water of Life,6;*/ if(!rand(100)) getitem 22823,1; },{},{}
17502,Support_Package_IV_10,Support Package IV(10),2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 12208,20; getitem 12210,20; getitem 12883,20; getitem 14600,20; /*getitem Mysterious Water of Life,60;*/ if(!rand(100)) getitem 22823,11; },{},{}
-17507,Actinidia_Cat_Fruit_Box_4,Actinidia Cat Fruit Box(4),2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 6909,4; },{},{}
-17508,Actinidia_Cat_Fruit_Box_10,Actinidia Cat Fruit Box(10),2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 6909,10; },{},{}
-17509,Actinidia_Cat_Fruit_Box_40,Actinidia Cat Fruit Box(40),2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 6909,40; },{},{}
+17507,Nyangvine_Box4,Actinidia Cat Fruit Box(4),2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 6909,4; },{},{}
+17508,Nyangvine_Box10,Actinidia Cat Fruit Box(10),2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 6909,10; },{},{}
+17509,Nyangvine_Box40,Actinidia Cat Fruit Box(40),2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 6909,40; },{},{}
17510,Smelting_Ore_Box_VIII,Smelting Ore Box VIII,2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 7619,5; getitem 7620,5; getitem 22828,1; },{},{}
17511,Smelting_Ore_Box_VIII_10,Smelting Ore Box VIII(10),2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 7619,50; getitem 7620,50; getitem 22828,11; },{},{}
17512,Limited_Purified_Eluminium_Box_30,(Limited) Purified Eluminium Box(30),2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 6911,30; getitem 6635,1; },{},{}
@@ -9362,7 +9421,7 @@
17524,Limited_Power_Booster_Box,Limited Power Booster Box,2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 14766,1; getitem 22873,1; },{},{}
17525,Limited_Power_Booster_Box_100,Limited Power Booster Box(100),2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 14766,100; getitem 22873,11; },{},{}
17526,Majestic_Lucky_Scroll,Majestic Lucky Egg,18,0,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Majestic_Lucky_Scroll); },{},{}
-17527,Actinidia_Cat_Fruit_Box_200,Actinidia Cat Fruit Box(200),2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 6909,200; getitem 12636,rand(1,5); /*TODO: Fix the 12636 amount*/},{},{}
+17527,Nyangvine_Box200,Actinidia Cat Fruit Box(200),2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 6909,200; getitem 12636,rand(1,5); /*TODO: Fix the 12636 amount*/},{},{}
17532,Blessing_Lucky_Scroll,Blessing Lucky Egg,18,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Blessing_Lucky_Scroll); },{},{}
17544,Smelting_Ore_Box_IX,Smelting Ore Box IX,2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 7619,5; getitem 7620,5; getitem 22888,1; },{},{}
17545,Smelting_Ore_Box_IX_10,Smelting Ore Box IX(10),2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 7619,50; getitem 7620,50; getitem 22888,11; },{},{}
@@ -9419,14 +9478,14 @@
18116,Metal_Bow,Metal Bow,5,20,,0,50,,5,1,0x00080800,63,2,34,3,1,1,11,{ .@r = getrefine(); if(BaseJob==Job_Hunter && Upper!=2) bonus bBaseAtk,10; bonus bBaseAtk,(.@r*3); bonus bLongAtkRate,.@r; .@i = min(BaseLevel/10,12); if(.@i>2) bonus bBaseAtk,((.@i-2)*5); },{},{}
18117,Royal_Bow,Royal Bow,5,200000,,1500,80,,5,1,0x000A0808,63,2,34,4,105,1,11,{},{},{}
18118,TE_Woe_Bow,TE Woe Bow,5,0,,0,120,,5,0,0x000A0848,63,2,34,3,40,1,11,{ bonus2 bAddRace,RC_Player,40; bonus2 bAddEff,Eff_Curse,3000; },{},{}
-18119,Thanos_Bow,Thanatos Bow,5,10,,1300,180:110,,5,1,0x00080808,63,2,34,4,120,1,11,{ bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000; },{},{ heal -1000,0; }
+18119,Thanos_Bow,Thanatos Bow,5,10,,1300,180:110,,5,1,0x00080808,56,2,34,4,120,1,11,{ bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000; },{},{ heal -1000,0; }
18120,Bow_Of_Evil_Slayer,Evil Slayer Piercer Bow,5,10,,1350,115,,5,1,0x000A0808,63,2,34,3,100,1,11,{ bonus2 bAddRace,RC_Demon,10; bonus2 bAddRace,RC_Undead,10; .@r = getrefine(); bonus2 bAddClass,Class_All,(.@r>=12?12:(.@r>=9?5:0)); },{},{}
18121,Bow_of_Vicious_Mind,Bow of Vicious Mind,5,20,,1700,170,,5,1,0x000A0808,63,2,34,4,160,1,11,{ bonus bAtk,pow(min(getrefine(),15),2); },{},{}
-18122,Giant_Bow,Giant Bow,5,20,,3000,195,,5,1,0x00000800,63,2,34,4,130,1,11,{ bonus bLongAtkRate,40; bonus bAspdRate,-15; bonus bHit,50; },{},{}
-18123,Bow_of_Storms,Bow of Storms,5,20,,1500,160,,5,1,0x00080800,63,2,34,4,130,1,11,{ bonus bLongAtkRate,30; bonus2 bSkillCooldown,"WM_SEVERE_RAINSTORM",-2000; bonus2 bSkillUseSP,"WM_SEVERE_RAINSTORM",15; },{},{}
+18122,Gigantic_Bow,Giant Bow,5,20,,3000,195,,5,1,0x00000800,63,2,34,4,130,1,11,{ bonus bLongAtkRate,40; bonus bAspdRate,-15; bonus bHit,50; },{},{}
+18123,Bow_Of_Storm,Bow of Storms,5,20,,1500,160,,5,1,0x00080800,63,2,34,4,130,1,11,{ bonus bLongAtkRate,30; bonus2 bSkillCooldown,"WM_SEVERE_RAINSTORM",-2000; bonus2 bSkillUseSP,"WM_SEVERE_RAINSTORM",15; },{},{}
18124,Half_BF_Bow1,Half BF Bow1,5,20,,0,100,,5,0,0x000A0848,63,2,34,3,80,1,11,{ bonus bDex,2; bonus2 bAddRace,RC_DemiHuman,30; bonus2 bAddRace,RC_Player,30; bonus2 bIgnoreDefRaceRate,RC_DemiHuman,10; bonus2 bIgnoreDefRaceRate,RC_Player,10; bonus bUnbreakableWeapon,1; },{},{}
18125,Arcus_Daemonicus,Arcus Daemonicus,5,20,,1000,130,,5,2,0x00020008,63,2,34,4,80,1,11,{ /*Fix me: bonus2 bAddClass,Class_All,50; when equipped with shadow arrows*/ if(getrefine()>9){ bonus bAspd,1; bonus bUseSPrate,-20; } },{},{}
-18126,Blue_Bow,Blue Bow,5,10,,1200,150,,5,1,0x00000800,56,2,2,3,100,1,11,{ bonus bAgi,5; bonus bDex,5; },{},{}
+18126,Ru_Blue_Bow,Blue Bow,5,10,,1200,150,,5,1,0x00000800,56,2,2,3,100,1,11,{ bonus bAgi,5; bonus bDex,5; },{},{}
18127,Ru_Gold_Bow,Ru Gold Bow,5,0,,1200,150,,5,2,0x00000800,56,2,34,3,120,1,11,{ bonus bAgi,8; bonus bDex,8; },{},{}
18128,Infinity_Bow,Infinity Bow,5,20,,500,160,,5,1,0x00020800,56,2,34,4,100,1,11,{},{},{}
18130,Crimson_Bow,Crimson Bow,5,20,,1200,120,,5,2,0x000A0848,63,2,34,3,70,1,11,{ .@r = getrefine(); bonus bBaseAtk,((BaseLevel/10)*5)+(.@r<=15?pow(.@r,2):225); },{},{}
@@ -9441,7 +9500,7 @@
18500,Cheer_Scarf6,Cheer Scarf6,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1,,1,0,369,{ bonus2 bExpAddClass,Class_All,60; },{},{}
18501,Cheer_Scarf8,Cheer Scarf8,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1,,1,0,369,{ bonus2 bExpAddClass,Class_All,80; },{},{}
18502,Cheer_Scarf10,Cheer Scarf10,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1,,1,0,369,{ bonus2 bExpAddClass,Class_All,100; },{},{}
-18503,Majestic_Devil,Small Devil Horns,4,20,,100,,2,,0,0xFFFFFFFF,63,2,512,,1,0,562,{ bonus2 bAddClass,Class_All,5; bonus bMatkRate,5; bonus bMaxHPrate,10; bonus bMaxSPrate,10; },{},{}
+18503,Small_Horn_Of_Devil,Small Devil Horns,4,20,,100,,2,,0,0xFFFFFFFF,63,2,512,,1,0,562,{ bonus2 bAddClass,Class_All,5; bonus bMatkRate,5; bonus bMaxHPrate,10; bonus bMaxSPrate,10; },{},{}
18504,Anubis_Helm_J,Anubis Helm J,4,20,,1000,,0,,0,0xFFFFFFFF,63,2,769,,70,0,485,{ bonus bMdefRate,-50; bonus bDefRate,-50; bonus5 bAutoSpellWhenHit,"NPC_WIDESTONE",2,10,BF_WEAPON|BF_MAGIC,0; },{},{}
18505,Umbala_Spirit,Umbala Spirit,4,0,,0,,1,,0,0xFFFFFFFF,63,2,1,,30,0,675,{ bonus bMaxHPrate,1; bonus2 bAddMonsterDropItem,517,500; bonus2 bAddItemHealRate,517,25; /*Gold PC Room: bonus bAllStats,1;*/},{},{}
18506,Hattah_Black,Hattah Black,4,12000,,4000,,2,,1,0xFFFFFFFF,63,2,769,,1,1,676,{ bonus bMaxHPrate,10; bonus bMaxSPrate,10; },{},{}
@@ -9453,14 +9512,14 @@
18512,Juho_Necktie,Juho Necktie,4,0,,0,,1,,1,0xFFFFFFFF,63,2,256,,20,1,443,{},{},{}
18513,Shining_Sunflower,Shining Sunflower,4,20,,300,,0,,0,0xFFFFFFFE,63,2,256,,0,0,681,{ bonus bLuk,2; },{},{}
18514,Para_Team_Hat2,Eden Team Hat II,4,0,,0,,5,,1,0xFFFFFFFF,63,2,256,,60,1,682,{ autobonus "{ bonus bBaseAtk,10; }",70,5000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }"; autobonus "{ bonus bMatk,10; }",50,5000,BF_MAGIC,"{ specialeffect2 EF_SPELLBREAKER; }"; },{},{}
-18515,RTC_Winner_Hat,RTC Winner Hat,4,20,,100,,2,,1,0xFFFFFFFF,63,2,512,,1,0,683,{ bonus bAllStats,5; bonus bIntravision,1; bonus2 bSubRace,RC_DemiHuman,15; bonus2 bSubRace,RC_Player,15; bonus2 bAddEff,Eff_Curse,50; },{},{}
-18516,RTC_2nd_Winner_Hat,RTC 2nd Winner Hat,4,20,,100,,2,,1,0xFFFFFFFF,63,2,512,,1,0,684,{ bonus bAllStats,3; bonus bIntravision,1; bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10; bonus2 bAddEff,Eff_Curse,50; },{},{}
-18517,RTC_3rd_Winner_Hat,RTC 3rd Winner Hat,4,20,,100,,2,,1,0xFFFFFFFF,63,2,512,,1,0,685,{ bonus bAllStats,1; bonus bIntravision,1; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player,5; bonus2 bAddEff,Eff_Curse,50;},{},{}
-18518,Angelwing_Ear_S,Angel Wing Ears,4,20,,100,,3,,1,0xFFFFFFFF,63,2,512,,70,0,158,{ bonus bStr,1; },{},{}
-18519,Devilwing_Ear_S,Evil Wing Ears,4,20,,100,,3,,1,0xFFFFFFFF,63,2,512,,70,0,152,{ bonus bStr,1; },{},{}
+18515,RTC_Winner_Headgear,RTC Winner Hat,4,20,,100,,2,,1,0xFFFFFFFF,63,2,512,,1,0,683,{ bonus bAllStats,5; bonus bIntravision,1; bonus2 bSubRace,RC_DemiHuman,15; bonus2 bSubRace,RC_Player,15; bonus2 bAddEff,Eff_Curse,50; },{},{}
+18516,RTC_2nd_Headgear,RTC 2nd Winner Hat,4,20,,100,,2,,1,0xFFFFFFFF,63,2,512,,1,0,684,{ bonus bAllStats,3; bonus bIntravision,1; bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10; bonus2 bAddEff,Eff_Curse,50; },{},{}
+18517,RTC_3rd_Headgear,RTC 3rd Winner Hat,4,20,,100,,2,,1,0xFFFFFFFF,63,2,512,,1,0,685,{ bonus bAllStats,1; bonus bIntravision,1; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player,5; bonus2 bAddEff,Eff_Curse,50;},{},{}
+18518,Ear_Of_Angel's_Wing_,Angel Wing Ears,4,20,,100,,3,,1,0xFFFFFFFF,63,2,512,,70,0,158,{ bonus bStr,1; },{},{}
+18519,Ear_Of_Devil's_Wing_,Evil Wing Ears,4,20,,100,,3,,1,0xFFFFFFFF,63,2,512,,70,0,152,{ bonus bStr,1; },{},{}
18520,Jaty_C,Jaty Crown,4,20,,100,,1,,0,0xFFFFFFFF,63,2,256,,1,1,686,{ bonus2 bSubRace,RC_Plant,5; bonus2 bSubRace,RC_Brute,5; bonus2 bAddRace,RC_Plant,5; bonus2 bAddRace,RC_Brute,5; },{},{}
18521,Lucky_Clover,Lucky Clover,4,20,,100,,0,,0,0xFFFFFFFF,63,2,1,,50,0,571,{ bonus bLuk,1; bonus bMaxSP,20; },{},{}
-18522,Evil_Marcher_Hat,Evil Marcher Hat,4,20,,500,,10,,1,0xFFFFFFFF,63,2,256,,0,1,687,{ bonus bStr,2; bonus bMdef,1; },{},{}
+18522,Evil_Marcher_Hat,Evil Marcher Hat,4,20,,500,,10,,1,0xFFFFFFFF,63,2,256,,0,1,687,{ bonus bStr,2; bonus bMdef,1; .@r = getrefine(); if(.@r>=7) { bonus bCritAtkRate,10; }; bonus2 bAddClass,Class_All,(.@r>=9?7:2); if(.@r>=9) { bonus bLongAtkRate,5; }; },{},{}
18523,Super_Scell,Thunderstorm Cloud,4,20,,100,,2,,0,0xFFFFFFFF,63,2,256,,1,0,688,{ bonus3 bAutoSpell,"MG_LIGHTNINGBOLT",max(getskilllv("MG_LIGHTNINGBOLT"),5),50+(getskilllv("MG_LIGHTNINGBOLT")*5); bonus3 bAutoSpell,"MG_THUNDERSTORM",max(getskilllv("MG_THUNDERSTORM"),5),50+(getskilllv("MG_THUNDERSTORM")*5); },{},{}
18524,Dokkebi_Mask,Dokkebi Mask,4,20,,700,,1,,0,0xFFFFFFFF,63,2,513,,50,0,689,{ bonus bStr,2; },{},{}
18525,Watermelon_Hat,Watermelon Cap,4,20,,100,,4,,1,0xFFFFFFFF,63,2,256,,30,1,690,{ bonus bVit,1; bonus bLuk,1; bonus bMdef,4; bonus2 bAddEle,Ele_Fire,3; },{},{}
@@ -9487,7 +9546,7 @@
18546,Lover_In_Mouth,Lover In Mouth,4,20,,300,,0,,0,0xFFFFFFFF,63,2,1,,0,0,720,{},{},{}
18547,Campus_Festival,Campus Festival,4,20,,100,,0,,0,0xFFFFFFFF,63,2,256,,0,1,721,{},{},{}
18548,Tiny_Hat,Tiny Hat,4,20,,30,,0,,0,0xFFFFFFFF,63,2,256,,0,1,722,{ bonus bInt,1; bonus bAgi,1; },{},{}
-18549,Butterfly_Hairpin,Butterfly Hairpin,4,20,,200,,3,,1,0xFFFFFFFF,63,2,256,,20,1,723,{ bonus bInt,1; bonus bAgi,1; bonus bMdef,3; bonus2 bAddRace,RC_Plant,5; bonus2 bMagicAddRace,RC_Plant,5; bonus2 bSubRace,RC_Plant,5; bonus3 bAddMonsterDropItem,709,RC_Plant,30; },{},{}
+18549,Nabi_Hair_Pin,Butterfly Hairpin,4,20,,200,,3,,1,0xFFFFFFFF,63,2,256,,20,1,723,{ bonus bInt,1; bonus bAgi,1; bonus bMdef,3; bonus2 bAddRace,RC_Plant,5; bonus2 bMagicAddRace,RC_Plant,5; bonus2 bSubRace,RC_Plant,5; bonus3 bAddMonsterDropItem,709,RC_Plant,30; },{},{}
18550,Asgard_Blessing,Asgard Blessing,4,20,,300,,3,,1,0xFFFFFFFF,63,2,256,,30,1,724,{ bonus bAllStats,2; bonus2 bSubEle,Ele_All,5; bonus2 bHPRegenRate,(MaxHp/100),10000; },{},{}
18551,Galaxy_Circlet,Galaxy Circlet,4,20,,1000,,5,,1,0xFFFFFFFF,63,2,256,,50,1,725,{ .@r = getrefine(); .@a = .@r*10; .@b = .@r/2; bonus bMdef,5; bonus bMaxHP,.@a; bonus bMaxSP,.@a; bonus2 bSubEle,Ele_Earth,.@b; bonus2 bSubEle,Ele_Fire,.@b; bonus2 bSubEle,Ele_Water,.@b; },{},{}
18552,Proba_Angel_Blessing,Proba Angel Blessing,4,20,,1200,,0,,1,0xFFFFFFFF,63,2,256,,10,1,444,{ bonus bLuk,2; },{},{}
@@ -9501,9 +9560,9 @@
18560,Fafnir_Mask,Fafnir Mask,4,20,,300,,2,,0,0xFFFFFFFF,63,2,1,,50,0,180,{ bonus bCritical,2; },{},{}
18561,B_Feather_Beret,B Feather Beret,4,20,,300,,5,,1,0xFFFFFFFF,63,2,256,,40,1,731,{ bonus bVit,2; bonus bMdef,3; bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10; },{},{}
18562,Bone_Hat,Bone Hat,4,20,,200,,3,,1,0xFFFFFFFF,63,2,256,,10,1,732,{ bonus bMdef,3; },{},{}
-18563,Heart_Wing_Hairband,Heart Wing Hairband,4,20,,300,,0,,1,0xFFFFFFFF,63,2,256,,50,1,733,{ bonus bUseSPrate,-10; bonus bDelayrate,-5; .@r = getrefine()/3; if(.@r>0){ bonus bUseSPrate,.@r*3; bonus bDelayrate,.@r*3; } },{},{}
+18563,Heart_Wing_Hairband,Heart Wing Hairband,4,20,,300,,0,,1,0xFFFFFFFF,63,2,256,,50,1,733,{ .@r = getrefine()/3; bonus bUseSPrate,-(10+.@r*3); bonus bDelayrate,-(5+.@r*3); },{},{}
18564,Love_Piece,Love Piece,4,20,,200,,0,,0,0xFFFFFFFF,63,2,1,,50,0,734,{ bonus bNoCastCancel,1; bonus bUseSPrate,15; },{},{}
-18565,Leprechaun_Hat,Leprechaun Hat,4,20,,300,,8,,1,0xFFFFFFFF,63,2,256,,40,0,735,{ bonus bStr,1; bonus bInt,1; bonus bMdef,4; if(getrefine()>6){ bonus2 bAddMonsterDropItem,12135,50; } },{},{}
+18565,Leprechaun_Hat,St Patrick's Hat,4,20,,300,,8,,1,0xFFFFFFFF,63,2,256,,40,1,735,{ bonus bStr,1; bonus bInt,1; bonus bMdef,4; if(getrefine()>7){ bonus2 bAddMonsterDropItem,12135,50; } },{},{}
18566,Nut_Donut_In_Mouth,Nut Donut In Mouth,4,20,,0,,1,,0,0xFFFFFFFF,63,2,1,,0,0,736,{ bonus bBaseAtk,5; bonus bMatk,5; },{},{}
18567,Stretched_Nose,Stretched Nose,4,20,,100,,0,,0,0xFFFFFFFF,63,2,1,,0,0,737,{},{},{}
18568,Humming_Bird,Humming Bird,4,20,,100,,3,,0,0xFFFFFFFF,63,2,256,,10,0,702,{ bonus bMdef,6; },{},{}
@@ -9535,19 +9594,19 @@
18594,Magni_Cap_,Magni Cap,4,30000,,1000,,9,,1,0xFFFFFFFE,63,2,256,,0,1,250,{ bonus bStr,2; },{},{}
18595,Horn_Of_Ancient,Horn of Ancient,4,40,,200,,8,,1,0xFFFFFFFF,63,2,256,,50,1,757,{ bonus2 bSubClass,Class_Boss,10; bonus2 bAddClass,Class_Boss,10; .@r = getrefine(); if (.@r > 6) { autobonus "{ bonus bBaseAtk,100; }",10,10000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }"; } if (.@r > 8) { bonus2 bSubClass,Class_Boss,10; bonus2 bAddClass,Class_Boss,10; } },{},{}
18596,Sprout_Hat,Sprout Hat,4,20,,200,,4,,0,0xFFFFFFFF,63,2,256,,70,1,758,{ skill "WZ_HEAVENDRIVE",3; },{},{}
-18597,Mercury_Riser,Mercury Riser,4,40,,200,,10,,1,0xFFFFFFFF,63,2,256,,0,1,759,{ bonus2 bSubRace,RC_DemiHuman,10; bonus2 bAddRace,RC_DemiHuman,10; bonus bAspdRate,3; bonus bDelayrate,-3; .@r = getrefine(); if(.@r >= 7) { bonus bAspdRate,2; bonus bDelayrate,-2; } if(.@r >= 9) { bonus bAspdRate,2; bonus bDelayrate,-2; }},{},{}
+18597,Mercury_Helm,Mercury Riser,4,40,,200,,10,,1,0xFFFFFFFF,63,2,256,,0,1,759,{ bonus2 bSubRace,RC_DemiHuman,10; bonus2 bAddRace,RC_DemiHuman,10; bonus bAspdRate,3; bonus bDelayrate,-3; .@r = getrefine(); if(.@r >= 7) { bonus bAspdRate,2; bonus bDelayrate,-2; } if(.@r >= 9) { bonus bAspdRate,2; bonus bDelayrate,-2; }},{},{}
18598,Mini_Tree_J,Mini Tree J,4,20,,50,,0,,1,0xFFFFFFFF,63,2,256,,0,0,727,{ bonus bMdef,20; },{},{}
18599,Black_Devil_Mask,Black Devil Mask,4,20,,100,,0,,0,0xFFFFFFFF,63,2,512,,0,0,760,{ bonus bAllStats,2; },{},{}
-18600,Cat_Ear_Beret,Cat Ear Beret,4,20,,100,,5,,1,0xFFFFFFFF,63,2,256,,0,1,761,{ bonus2 bAddClass,Class_All,5; .@r = getrefine(); if(.@r < 5) .@r = 5; bonus2 bSubRace,RC_DemiHuman,(.@r - 5); bonus2 bAddRace,RC_DemiHuman,(.@r - 5); },{},{}
+18600,Cat_Ears_Beret,Cat Ear Beret,4,20,,100,,5,,1,0xFFFFFFFF,63,2,256,,0,1,761,{ bonus2 bAddClass,Class_All,5; .@r = getrefine(); if(.@r < 5) .@r = 5; bonus2 bSubRace,RC_DemiHuman,(.@r - 5); bonus2 bAddRace,RC_DemiHuman,(.@r - 5); },{},{}
18601,Red_Bread_Hat,Red Bread Hat,4,20,,300,,0,,1,0xFFFFFFFF,63,2,256,,0,1,762,{ bonus bMdef,5; .@r = getrefine(); if (.@r < 5) .@r = 5; bonus2 bSubRace,RC_DemiHuman,(.@r - 5); bonus2 bMagicAddRace,RC_DemiHuman,(.@r - 5); },{},{}
-18602,Watermelon_Bite,Watermelon Bite,4,20,,100,,4,,0,0xFFFFFFFF,63,2,1,,30,0,763,{},{},{}
+18602,Watermelon_Slice,Watermelon Bite,4,20,,100,,4,,0,0xFFFFFFFF,63,2,1,,30,0,763,{},{},{}
18603,Black_Devil_Mask_,Black Devil Mask,4,20,,100,,0,,1,0xFFFFFFFF,63,2,512,,0,0,760,{ bonus bAllStats,1; },{},{}
18604,Falcon_Mask,Falcon Mask,4,10,,30,,0,,0,0xFFFFFFFF,63,2,513,,50,0,782,{ bonus2 bAddEle,Ele_Water,5; },{},{}
18605,Dark_Age,Dark Age,4,20,,200,,3,,1,0xFFFFFFFF,63,2,256,,10,1,766,{ bonus bMdef,3; },{},{}
18606,Tear_Drop,Tear Drop,4,20,,100,,1,,0,0xFFFFFFFF,63,2,513,,30,0,767,{},{},{}
-18607,Blush_S,Blush,4,20,,100,,0,,1,0xFFFFFFFF,63,2,512,,0,0,125,{},{},{}
-18608,Pair_Of_Red_Ribbon_S,Small Ribbons,4,20,,100,,2,,1,0xFFFFFFFF,63,2,512,,45,0,169,{},{},{}
-18609,Dark_Blindfold_S,Dark Blinder,4,20,,100,,0,,1,0xFFFFFFFE,63,2,512,,0,0,187,{ bonus2 bResEff,Eff_Blind,10000; bonus2 bResEff,Eff_Stun,200; },{},{}
+18607,Blush_,Blush,4,20,,100,,0,,1,0xFFFFFFFF,63,2,512,,0,0,125,{},{},{}
+18608,Pair_Of_Red_Ribbon2,Small Ribbons,4,20,,100,,2,,1,0xFFFFFFFF,63,2,512,,45,0,169,{},{},{}
+18609,Dark_Blindfold_,Dark Blinder,4,20,,100,,0,,1,0xFFFFFFFE,63,2,512,,0,0,187,{ bonus2 bResEff,Eff_Blind,10000; bonus2 bResEff,Eff_Stun,200; },{},{}
18610,7th_Anni_Hat_B,7th Anni Hat B,4,20,,500,,4,,0,0xFFFFFFFF,63,2,256,,0,1,778,{ bonus bAllStats,5; bonus bMdef,4; },{},{}
18611,Black_Glasses_,Black Glasses,4,20,,200,,2,,1,0xFFFFFFFF,63,2,512,,0,0,404,{ bonus bInt,1; bonus bMdef,2; },{},{}
18612,White_Musang_Hat,White Musang Hat,4,40,,400,,3,,1,0xFFFFFFFF,63,2,256,,0,1,770,{ bonus bStr,2; bonus bVit,2; bonus bLuk,1; bonus bUnbreakableHelm,1; },{},{}
@@ -9558,11 +9617,11 @@
18617,Onigiri_In_Mouth,Onigiri In Mouth,4,20,,200,,0,,0,0xFFFFFFFE,63,2,1,,20,0,774,{},{},{}
18618,Airplane_Hat,Airplane Hat,4,20,,200,,8,,1,0xFFFFFFFE,63,2,256,,20,1,775,{},{},{}
18619,Thief_Bandana,Thief Bandana,4,20,,200,,1,,0,0xFFFFFFFE,63,2,256,,20,1,776,{ bonus3 bAutoSpell,"TF_STEAL",1,20; },{},{}
-18620,Heart_Eye_Patch,Heart Eyepatch,4,5,,50,,2,,0,0xFFFFFFFF,63,2,512,,20,1,779,{},{},{}
+18620,Heart_Eyepatch,Heart Eyepatch,4,5,,50,,2,,0,0xFFFFFFFF,63,2,512,,20,1,779,{},{},{}
18621,Gangster_Mask_A,Gangster Mask A,4,20,,100,,0,,0,0xFFFFFFFF,63,2,1,,0,0,52,{},{},{}
-18622,Rocket_Helm_1,Rocket Helm 1,4,20,,1000,,20,,1,0xFFFFFFFF,63,2,256,,95,1,764,{ bonus bAllStats,5; bonus bMdef,5; bonus bUnbreakableHelm,1; },{},{}
-18623,Rocket_Helm_2,Rocket Helm 2,4,20,,1000,,20,,1,0xFFFFFFFF,63,2,256,,95,1,765,{ bonus bAllStats,4; bonus bMdef,5; bonus bUnbreakableHelm,1; },{},{}
-18624,Rocket_Helm_3,Rocket Helm 3,4,20,,1000,,20,,1,0xFFFFFFFF,63,2,256,,95,1,768,{ bonus bAllStats,3; bonus bMdef,5; bonus bUnbreakableHelm,1; },{},{}
+18622,Rocket_Helm1,Rocket Helm 1,4,20,,1000,,20,,1,0xFFFFFFFF,63,2,256,,95,1,764,{ bonus bAllStats,5; bonus bMdef,5; bonus bUnbreakableHelm,1; },{},{}
+18623,Rocket_Helm2,Rocket Helm 2,4,20,,1000,,20,,1,0xFFFFFFFF,63,2,256,,95,1,765,{ bonus bAllStats,4; bonus bMdef,5; bonus bUnbreakableHelm,1; },{},{}
+18624,Rocket_Helm3,Rocket Helm 3,4,20,,1000,,20,,1,0xFFFFFFFF,63,2,256,,95,1,768,{ bonus bAllStats,3; bonus bMdef,5; bonus bUnbreakableHelm,1; },{},{}
18625,Rocket_Helm_RWC,Rocket Helm RWC,4,10000,,1000,,20,,1,0xFFFFFFFF,63,2,256,,95,1,769,{ bonus bAllStats,2; bonus bMdef,5; bonus bUnbreakableHelm,1; bonus bSpeedRate,25; },{},{}
18626,Gelato_Hat,Gelato Hat,4,20,,200,,2,,0,0xFFFFFFFF,63,2,256,,40,1,777,{},{},{}
18627,Dried_Leaf,Dried Leaf,4,20,,50,,0,,0,0xFFFFFFFF,63,2,1,,10,0,711,{ bonus bUnbreakableHelm,1; },{},{}
@@ -9580,7 +9639,7 @@
18639,Naval_Officer_Hat,Naval Officer Hat,4,20,,200,,2,,1,0xFFFFFFFE,63,2,256,,1,1,792,{ bonus bLuk,3; bonus2 bAddEle,Ele_Water,5; },{},{}
18640,Starfish_Headband,Starfish Headband,4,20,,200,,2,,1,0xFFFFFFFE,63,2,256,,1,1,793,{},{},{}
18641,Ribbon_Magic_Hat,Ribbon Magic Hat,4,20,,200,,2,,1,0xFFFFFFFE,63,2,256,,1,1,794,{ bonus bMaxSP,50; bonus bMatkRate,5; },{},{}
-18642,Scissorhand_Model,Scissorhand Model,4,20,,200,,0,,0,0xFFFFFFFE,63,2,1,,20,0,795,{ bonus bAgi,1; },{},{}
+18642,hand_Scissorhand_Model,Scissorhand Model,4,20,,200,,0,,0,0xFFFFFFFE,63,2,1,,20,0,795,{ bonus bAgi,1; },{},{}
18643,Rockhand_Model,Rockhand Model,4,20,,200,,0,,0,0xFFFFFFFE,63,2,1,,20,0,796,{ bonus bStr,1; },{},{}
18644,Paperhand_Model,Paperhand Model,4,20,,200,,0,,0,0xFFFFFFFE,63,2,1,,20,0,797,{},{},{}
18645,Sailor_Hat,Sailor Hat,4,20,,200,,2,,1,0xFFFFFFFF,63,2,256,,1,1,798,{ bonus bInt,1; bonus2 bAddRace,RC_DemiHuman,5; bonus2 bAddRace,RC_Player,5; },{},{}
@@ -9590,15 +9649,15 @@
18649,Lude_Mask,Lude Mask,4,10,,100,,1,,0,0xFFFFFFFF,63,2,513,,0,1,802,{},{},{}
18650,RWC_Shouting_Mouth,RWC Shouting Mouth,4,20,,50,,0,,0,0xFFFFFFFF,63,2,1,,1,0,194,{ bonus3 bAutoSpellWhenHit,"SM_ENDURE",1,10; bonus3 bAutoSpellWhenHit,"MO_CALLSPIRITS",5,10; bonus3 bAutoSpellWhenHit,"MO_EXPLOSIONSPIRITS",5,10; bonus3 bAutoSpell,"BS_MAXIMIZE",5,10; bonus3 bAutoSpell,"MC_LOUD",1,10; bonus3 bAutoSpell,"AC_CONCENTRATION",5,10; bonus3 bAutoSpell,"PR_GLORIA",3,10; autobonus "{ bonus bStr,3; bonus bAgi,3; }",10,5000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; showscript \"RWC 2011 Fighting!!\"; }"; autobonus "{ bonus bInt,3; bonus bLuk,3; }",5,5000,BF_MAGIC,"{ specialeffect2 EF_ENERGYCOAT; showscript \"RWC 2011 Fighting!!\"; }"; },{},{}
18651,Ignis_Cap,Ignis Cap,4,20,,800,,8,,1,0xFFFFFFFF,63,2,256,,40,1,803,{},{},{}
-18652,Vanargandr_Helm,Vanargandr Helm,4,20,,1500,,10,,1,0xFFFFFFFF,63,2,256,,80,1,804,{ bonus bMdef,5; .@r = getrefine(); if (.@r >= 9 ) { bonus2 bHPDrainRate,60,8; bonus2 bSPDrainRate,20,4; } else if (.@r >= 8 ) { bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,2; } else if (.@r >= 7 ) { bonus2 bHPDrainRate,30,5; bonus2 bSPDrainRate,10,2; } else if (.@r >= 5 ) { bonus2 bHPDrainRate,10,3; bonus2 bSPDrainRate,10,1; } else { bonus2 bHPDrainRate,10,1; bonus2 bSPDrainRate,10,1; } },{},{}
-18653,Deviruchi_Headphone,Deviruchi Headphone,4,20,,200,,8,,1,0xFFFFFFFF,63,2,256,,30,1,805,{ bonus bMdef,4; },{},{}
-18655,Goedo_Monocle,Goedo Monocle,4,20,,100,,0,,0,0xFFFFFFFF,63,2,512,,50,0,807,{ bonus bAgi,2; },{},{}
+18652,Vanargand_Helm,Vanargandr Helm,4,20,,1500,,10,,1,0xFFFFFFFF,63,2,256,,80,1,804,{ bonus bMdef,5; .@r = getrefine(); if (.@r >= 9 ) { bonus2 bHPDrainRate,60,8; bonus2 bSPDrainRate,20,4; } else if (.@r >= 8 ) { bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,2; } else if (.@r >= 7 ) { bonus2 bHPDrainRate,30,5; bonus2 bSPDrainRate,10,2; } else if (.@r >= 5 ) { bonus2 bHPDrainRate,10,3; bonus2 bSPDrainRate,10,1; } else { bonus2 bHPDrainRate,10,1; bonus2 bSPDrainRate,10,1; } },{},{}
+18653,Devi_Headphone,Deviruchi Headphone,4,20,,200,,8,,1,0xFFFFFFFF,63,2,256,,30,1,805,{ bonus bMdef,4; },{},{}
+18655,Lupin_One_Eyed_Glasses,Goedo Monocle,4,20,,100,,0,,0,0xFFFFFFFF,63,2,512,,50,0,807,{ bonus bAgi,2; },{},{}
18656,Wit_Pumpkin_Hat,Witch's Pumpkin Hat,4,20,,300,,10,,0,0xFFFFFFFF,63,2,256,,20,1,717,{ bonus bMdef,10; bonus bStr,2; bonus bInt,2; bonus2 bMagicAddRace,RC_Undead,15; bonus2 bMagicAddRace,RC_Undead,15; bonus2 bMagicAddRace,RC_Demon,15; bonus2 bMagicAddRace,RC_Demon,15; },{},{}
18657,Pegasus_Wing_Ears,Pegasus Wing Ears,4,20,,500,,1,,0,0xFFFFFFFF,63,2,512,,80,0,568,{ bonus bUnbreakableHelm,1; .@i = BaseLevel; bonus bAspdRate,(.@i>=150)?(3):((.@i>=100)?(2):((.@i>=50)?(1):(0))); },{},{}
18658,Holy_Santa_Beard,Holy Santa Beard,4,20,,100,,0,,0,0xFFFFFFFF,63,2,1,,1,0,25,{},{},{}
18659,Boitata_Hat,Boitata Hat,4,20,,0,,5,,1,0xFFFFFFFF,63,2,768,,0,1,808,{ autobonus "{ bonus bAtkEle,Ele_Fire; }",10,180000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }"; bonus3 bAutospell,"AS_SONICBLOW",5,10; },{},{}
18660,Indi_Feather_Band,Indian Feather Headband,4,20,,400,,3,,1,0xFFFFFFFE,63,2,256,,0,1,809,{ bonus bAgi,2; },{},{}
-18661,Trident_Helm,Trident Helm,4,20,,400,,3,,1,0xFFFFFFFE,63,2,256,,20,1,810,{ bonus bStr,2; },{},{}
+18661,Trident_Helmet,Trident Helm,4,20,,400,,3,,1,0xFFFFFFFE,63,2,256,,20,1,810,{ bonus bStr,2; },{},{}
18662,Antler_Fedora,Antler Fedora,4,20,,400,,3,,0,0xFFFFFFFE,63,2,256,,1,1,811,{ bonus bInt,3; },{},{}
18663,Sunglasses_Bball_Hat,Sunglasses Baseball Hat,4,20,,200,,2,,1,0xFFFFFFFE,63,2,256,,20,1,812,{ bonus bInt,3; },{},{}
18664,Blind_Glasses,Blind Glasses,4,20,,400,,3,,0,0xFFFFFFFE,63,2,512,,20,1,813,{},{},{}
@@ -9610,7 +9669,7 @@
18670,Hankie_In_Mouth,Hankie In Mouth,4,20,,100,,1,,0,0xFFFFFFFF,63,2,1,,12,0,818,{ bonus bDex,3; bonus2 bSubRace,RC_DemiHuman,3; bonus2 bSubRace,RC_Player,3; },{},{}
18671,Rudolf_Hairband,Rudolf Hairband,4,20,,200,,5,,0,0xFFFFFFFF,63,2,256,,30,1,836,{},{},{}
18672,Tare_Pope,Drooping Pope,4,20,,300,,0,,0,0xFFFFFFFF,63,2,256,,1,0,817,{ bonus bMdef,1; bonus bSPrecovRate,2; bonus bUnbreakableHelm,1; },{},{}
-18673,Tare_Pope_,Drooping Pope,4,20,,300,,0,,1,0xFFFFFFFF,63,2,256,,1,0,817,{ bonus bMdef,7; bonus bSPrecovRate,2; bonus bUnbreakableHelm,1; .@r = getrefine(); if (.@r >= 7 ) { bonus bHealPower,1; } if (.@r >= 9 ) {bonus bMatkRate,7; } if (.@r >= 12 ) {bonus bMatkRate,5; } },{},{}
+18673,Tare_Pope_,Drooping Pope,4,20,,300,,0,,1,0xFFFFFFFF,63,2,256,,1,1,817,{ bonus bMdef,7; bonus bSPrecovRate,2; bonus bUnbreakableHelm,1; .@r = getrefine(); if (.@r >= 7 ) { bonus bHealPower,1; } if (.@r >= 9 ) {bonus bMatkRate,7; } if (.@r >= 12 ) {bonus bMatkRate,5; } },{},{}
18674,Planewing_Hat,Planewing Hat,4,20,,200,,3,,1,0xFFFFFFFE,63,2,256,,1,1,820,{ bonus bAgi,3; bonus bAspdRate,1; bonus2 bSPLossRate,5,10000; },{},{}
18675,Green_Apple_Hat,Green Apple Hat,4,20,,200,,3,,1,0xFFFFFFFE,63,2,256,,20,1,821,{ bonus bDex,2; bonus bHit,5; },{},{}
18676,Hexagon_Spectacles,Hexagon Spectacles,4,20,,400,,3,,0,0xFFFFFFFE,63,2,512,,20,0,822,{ bonus bFlee,2; },{},{}
@@ -9659,13 +9718,13 @@
18728,Egir_Helm,Egir Helm,4,200000,,800,,10,,1,0xFFFFFFFF,63,2,256,,110,1,870,{ bonus bMdef,5; bonus bUnbreakableHelm,1; },{},{}
18729,MVP_Basketball,MVP Basketball,4,20,,150,,6,,1,0xFFFFFFFF,63,2,256,,1,1,871,{ bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10; bonus2 bAddItemHealRate,522,30; .@r = getrefine(); bonus bVariableCastrate,(.@r>=12)?(-5):((.@r>=10)?(-4):(-3)); },{},{}
18730,Cryptura_Academy_Hat,Cryptura Academy Hat,4,0,,200,,2,,1,0xFFFFFFFF,63,2,256,,0,1,872,{ bonus bMaxHP,15; bonus bMaxSP,5; },{},{}
-18732,TE_Woe_Cap,TE Woe Cap,4,0,,0,,5,,0,0xFFFFFFFF,63,2,256,0,40,1,14,{ bonus bMdef,5; bonus bBaseAtk,5; bonus bMatk,5; bonus2 bAddRace,RC_Player,10; bonus2 bMagicAddRace,RC_Player,10; bonus2 bResEff,Eff_Freeze,25; },{},{}
-18733,TE_Woe_Bone_Helm,TE Woe Bone Helm,4,0,,0,,10,,0,0x000444A2,63,2,256,0,40,1,103,{ bonus bBaseAtk,10; bonus2 bAddRace,RC_Player,20; bonus2 bResEff,Eff_Freeze,25; },{},{}
-18734,TE_Woe_Magic_Eyes,TE Woe Magic Eyes,4,0,,0,,5,,0,0x00818315,63,2,256,0,40,1,209,{ bonus bMdef,5; bonus bMatk,10; bonus2 bMagicAddRace,RC_Player,20; bonus2 bResEff,Eff_Freeze,25; },{},{}
-18736,Censor_Bar_,Censor Bar,4,0,,100,,,,0,0xFFFFFFFF,63,2,512,0,1,0,229,{},{},{}
+18732,TE_Woe_Cap,TE Woe Cap,4,0,,0,,5,,0,0xFFFFFFFF,63,2,256,,40,1,14,{ bonus bMdef,5; bonus bBaseAtk,5; bonus bMatk,5; bonus2 bAddRace,RC_Player,10; bonus2 bMagicAddRace,RC_Player,10; bonus2 bResEff,Eff_Freeze,25; },{},{}
+18733,TE_Woe_Bone_Helm,TE Woe Bone Helm,4,0,,0,,10,,0,0x000444A2,63,2,256,,40,1,103,{ bonus bBaseAtk,10; bonus2 bAddRace,RC_Player,20; bonus2 bResEff,Eff_Freeze,25; },{},{}
+18734,TE_Woe_Magic_Eyes,TE Woe Magic Eyes,4,0,,0,,5,,0,0x00818315,63,2,256,,40,1,209,{ bonus bMdef,5; bonus bMatk,10; bonus2 bMagicAddRace,RC_Player,20; bonus2 bResEff,Eff_Freeze,25; },{},{}
+18736,Censor_Bar_,Censor Bar,4,0,,100,,,,0,0xFFFFFFFF,63,2,512,,1,0,229,{},{},{}
18737,Fortier_Mask,Fortier Masque,4,20,,200,,0,,0,0xFFFFFFFF,63,2,512,,10,0,876,{ bonus bUnbreakableHelm,1; bonus2 bMagicAtkEle,Ele_Fire,4; },{},{}
18739,Carnation_Hairband,Carnation Hairband,4,20,,100,,0,,0,0xFFFFFFFF,63,2,256,,0,1,878,{ bonus bLuk,1; },{},{}
-18740,Hair_Of_The_Strong,RMSC2012 Special Costume,4,20,,0,,0,,0,0xFFFFFFFF,63,2,1024,,0,0,879,{},{},{}
+18740,C_Hair_Of_The_Strong,RMSC2012 Special Costume,4,20,,0,,0,,0,0xFFFFFFFF,63,2,1024,,0,0,879,{},{},{}
18741,C_Will_O_Wisp,Costume Will O Wisp,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,,880,{},{ sc_start SC_STRANGELIGHTS,-1,0; },{ sc_end SC_STRANGELIGHTS; }
18742,C_MoonStar_Accessory,Costume Moon and Stars,4,20,,0,,0,,0,0xFFFFFFFF,63,2,2048,,0,0,881,{},{ sc_start SC_MOONSTAR,-1,0; },{ sc_end SC_MOONSTAR; }
18743,C_Spirit_Of_Chung_E,Costume Spirit Of Chung E,4,20,,0,,0,,0,0xFFFFFFFF,63,2,1024,,0,0,882,{},{},{}
@@ -9679,7 +9738,7 @@
18752,Cursed_Book,Cursed Book,4,20,,300,,3,,1,0xFFFFFFFE,63,2,256,,99,1,890,{ .@r = getrefine(); bonus2 bHPLossRate,.@r,5000; bonus2 bHPDrainRate,40,4+(.@r/2); bonus2 bSPDrainRate,10,1+(.@r/3); },{},{}
18753,Tw_Rice_Ball,Tw Rice Ball,4,20,,100,,6,,0,0xFFFFFFFF,63,2,256,,0,0,892,{ bonus bLuk,1; bonus2 bAddMonsterDropItem,564,100; },{},{}
18754,Blood_Sucker,Blood Sucker,4,20,,300,,0,,0,0xFFFFFFFF,63,2,1,,40,0,893,{ bonus bUnbreakableHelm,1; bonus2 bHPDrainRate,30,5; bonus bHPrecovRate,-100; bonus bSPrecovRate,-100; },{},{}
-18755,Feather_Beret_,Feather Beret,4,0,,600,,1,,1,0xFFFFFFFF,63,2,256,0,1,1,224,{ bonus bMdef,1; bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10; },{},{}
+18755,Feather_Beret_,Feather Beret,4,0,,600,,1,,1,0xFFFFFFFF,63,2,256,,1,1,224,{ bonus bMdef,1; bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10; },{},{}
18756,Black_Shiba_Inu_Hat,Black Shiba Inu Hat,4,20,,400,,6,,1,0xFFFFFFFF,63,2,256,,50,1,894,{ bonus bBaseAtk,30; bonus2 bAddRace,RC_Brute,10; },{},{}
18758,Hat_Of_Scrat,Hat Of Scrat,4,20,,200,,3,,1,0xFFFFFFFF,63,2,256,,0,1,896,{},{},{}
18759,Stretched_Nose_M,Wood Goblin's Nose,4,20,,200,,0,,0,0xFFFFFFFF,63,2,512,,50,0,737,{ bonus bUnbreakableHelm,1; bonus2 bAddMonsterDropItem,1032,400; bonus2 bAddMonsterDropItem,1033,100; bonus3 bAddMonsterDropItem,576,RC_Plant,40; },{},{}
@@ -9700,9 +9759,9 @@
18774,Improved_Assassin_Mask,Advanced Assassin Mask,4,20,,100,,1,,0,0x00001100,63,2,1,,70,0,180,{ bonus bCritical,1; bonus bCritAtkRate,1; },{},{}
18775,Improved_Welding_Mask,Advanced Welding Mask,4,20,,300,,2,,0,0x00040420,63,2,513,,50,0,79,{ bonus2 bSubEle,Ele_Fire,10; bonus bDex,5; bonus bLuk,5; },{},{}
18776,Improved_Kiss_Of_Angel,Advanced Angel's Kiss,4,10000,,300,,6,,1,0x00000001,63,2,256,,99,1,255,{ bonus bSPrecovRate,30; },{},{}
-18779,RWC_Champ_Crown_First_Place,RWC Champ Crown First Place,4,20,,500,,12,,1,0xFFFFFFFF,63,2,256,,1,,902,{ bonus2 bResEff,Eff_Stun,10000; bonus2 bResEff,Eff_Curse,10000; bonus bUnbreakableHelm,1; bonus bAllStats,7; bonus bMdef,5; },{},{}
-18780,RWC_Champ_Crown_Second_Place,RWC Champ Crown Second Place,4,20,,500,,12,,1,0xFFFFFFFF,63,2,256,,1,,903,{ bonus2 bResEff,Eff_Curse,10000; bonus bUnbreakableHelm,1; bonus bAllStats,7; bonus bMdef,5; },{},{}
-18781,RWC_Champ_Crown_Third_Place,RWC Champ Crown Third Place,4,20,,500,,12,,1,0xFFFFFFFF,63,2,256,,1,,904,{ bonus2 bResEff,Eff_Curse,10000; bonus bUnbreakableHelm,1; bonus bAllStats,3; bonus bMdef,1; },{},{}
+18779,RWC_Champ_Crown_Red,RWC Champ Crown First Place,4,20,,500,,12,,1,0xFFFFFFFF,63,2,256,,1,,902,{ bonus2 bResEff,Eff_Stun,10000; bonus2 bResEff,Eff_Curse,10000; bonus bUnbreakableHelm,1; bonus bAllStats,7; bonus bMdef,5; },{},{}
+18780,RWC_Champ_Crown_Blue,RWC Champ Crown Second Place,4,20,,500,,12,,1,0xFFFFFFFF,63,2,256,,1,,903,{ bonus2 bResEff,Eff_Curse,10000; bonus bUnbreakableHelm,1; bonus bAllStats,7; bonus bMdef,5; },{},{}
+18781,RWC_Champ_Crown_Black,RWC Champ Crown Third Place,4,20,,500,,12,,1,0xFFFFFFFF,63,2,256,,1,,904,{ bonus2 bResEff,Eff_Curse,10000; bonus bUnbreakableHelm,1; bonus bAllStats,3; bonus bMdef,1; },{},{}
18782,Butterfly_Wing_Ear_J,Butterfly Wing Ear,4,20,,100,,0,,0,0xFFFFFFFF,63,2,512,,0,0,695,{ bonus bDex,2; bonus bUnbreakableHelm,1; },{},{}
18785,King_Poring_Hat,King Poring Hat,4,20,,600,,10,,1,0xFFFFFFFF,63,2,256,,10,1,905,{ bonus bDex,1; bonus bLuk,1; .@r = getrefine(); if(.@r>=3){ bonus bDex,(.@r-4); bonus bLuk,(.@r-4); } },{},{}
18786,Anemos_Mask,Anemos Mask,4,20,,200,,0,,0,0xFFFFFFFF,63,2,512,,10,0,906,{ bonus bUnbreakableHelm,1; bonus2 bMagicAtkEle,Ele_Wind,4; },{},{}
@@ -9710,7 +9769,7 @@
18791,Shrine_Maiden_Hat,Shrine Maiden Hat,4,20,,200,,30,,1,0xFFFFFFFF,63,2,256,,,,908,{},{},{}
18792,Idn_Sakkat,Indonesian Independence Sakkat,4,10,,400,,,,0,0xFFFFFFFE,63,2,256,,45,1,901,{ bonus bVit,10; bonus2 bAddClass,Class_All,5; bonus bMatkRate,5; bonus2 bSubRace,RC_DemiHuman,10; },{},{}
18793,Sorc_Night_Cap,Sorcerer's Night Cap,4,20,,200,,25,,1,0x00010000,56,2,256,,100,1,911,{ .@r = getrefine(); bonus2 bSkillAtk,"MG_LIGHTNINGBOLT",50; bonus2 bSkillAtk,"MG_FIREBOLT",50; bonus2 bSkillAtk,"MG_COLDBOLT",50; bonus bMdef,10; if(.@r>6) bonus2 bSkillAtk,"SC_SPELLFIST",25; if(.@r>8) bonus bAspd,5; },{},{}
-18796,RWC_Champ_Crown_Fourth_Place,RWC Champ Crown Fourth Place,4,20,,500,,12,,1,0xFFFFFFFF,63,2,256,,1,,914,{ bonus2 bResEff,Eff_Curse,10000; bonus bUnbreakableHelm,1; bonus bAllStats,2; },{},{}
+18796,RWC_Champ_Crown_QF,RWC Champ Crown Fourth Place,4,20,,500,,12,,1,0xFFFFFFFF,63,2,256,,1,,914,{ bonus2 bResEff,Eff_Curse,10000; bonus bUnbreakableHelm,1; bonus bAllStats,2; },{},{}
18803,Rose_Cascade,Rose Cascade,4,0,,500,,,,1,0xFFFFFFFF,63,2,256,,,1,920,{ .@dex = readparam(bDex); bonus bUseSPrate,-5-((.@dex >= 120)?5:0)-((.@dex >= 100)?5:0); },{},{}
18805,Eclipse_Hat,Eclipse Hat,4,20,,300,,2,,0,0xFFFFFFFF,63,2,256,,0,1,922,{ bonus bLuk,3; bonus bMdef,5; },{},{}
18806,Black_Rabbit_Hat,Black Rabbit Hat,4,20,,300,,2,,1,0xFFFFFFFF,63,2,256,,0,1,923,{ bonus bDex,2; bonus bAgi,3; bonus3 bAutoSpellWhenHit,"AL_INCAGI",5,10; },{},{}
@@ -9724,7 +9783,7 @@
18817,Adv_Devil_School_Cap,Evoked Devil School Cap,4,20,,100,,4,,1,0xFFFFFFFE,63,2,256,,0,1,930,{ bonus bStr,2; bonus bVit,2; bonus bLuk,1; },{},{}
18818,Red_Pencil_In_Mouth,Red Pencil In Mouth,4,20,,100,,0,,0,0xFFFFFFFF,63,2,1,,0,0,931,{ bonus bUnbreakableHelm,1; bonus bHit,3; },{},{}
18819,Blue_Pencil_In_Mouth,Blue Pencil In Mouth,4,20,,100,,0,,0,0xFFFFFFFF,63,2,1,,0,0,932,{ bonus bUnbreakableHelm,1; bonus bHit,3; },{},{}
-18820,Helmet_of_Gray,Helmet of Gray,4,10,,450,,35,,1,0xFFFFFFFF,63,2,256,,120,1,941,{ bonus2 bSubEle,Ele_Holy,3+getrefine()*2; },{},{}
+18820,Gray_Helmet,Gray Helmet,4,20,,450,,35,,1,0xFFFFFFFF,56,2,256,,120,1,941,{ bonus2 bSubEle,Ele_Holy,3+getrefine()/2; },{},{}
18821,Rainbow_Feather_Deco,Rainbow Feather Deco,4,20,,300,,5,,1,0xFFFFFFFF,63,2,256,,1,1,934,{ bonus2 bAddClass,Class_All,1; bonus bMatkRate,1; },{},{}
18823,Imperial_Feather,Imperial Feather,4,10,,500,,,,0,0xFFFFFFFF,63,2,512,,70,1,935,{ bonus bAspdRate,1; bonus2 bSubEle,Ele_Wind,5; if(readparam(bAgi)>108){ bonus bAspd,1; bonus bAspdRate,1; } },{},{}
18827,Valkyrie_Circlet,Valkyrie Circlet,4,0,,300,,10,,1,0xFFFFFFFF,63,2,256,,,1,940,{ bonus bStr,3; bonus2 bAddEle,Ele_Dark,10; bonus2 bAddRace,RC_Demon,10; },{},{}
@@ -9745,27 +9804,27 @@
18849,Celines_Ribbon,Celines Ribbon,4,10,,200,,,,1,0xFFFFFFFF,63,2,256,,1,1,967,{ bonus bDex,3; bonus bMatk,40+getrefine(); bonus bMagicHPGainValue,200; bonus2 bHPLossRate,50,5000; },{},{}
18850,Polar_Bear_Cap,Polar Bear Cap,4,20,,300,,7,,0,0xFFFFFFFF,63,2,256,,1,0,966,{ bonus bUnbreakableHelm,1; bonus bDex,1; bonus bAgi,1; bonus bMdef,3; bonus bHPrecovRate,5; bonus bSPrecovRate,3; bonus2 bAddMonsterDropItem,12354,100; },{},{}
//18851,C_Polar_Bear_Cap,Costume Polar Bear Cap,4,20,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,1,966,{ /*Is this correct item?*/ },{},{}
-18851,Valentine_Heart,Valentine Heart,4,20,,0,,,,0,0xFFFFFFFF,63,2,256,,1,1,397,{ bonus bMaxHPrate,5+(getrefine()/2); bonus bAllStats,7; },{},{}
-18852,Tasty_Strawberry_Hat,Tasty Strawberry Hat,4,20,,150,,4,,,0xFFFFFFFF,63,2,256,,30,1,968,{ bonus bAllStats,1; if(getrefine()>11) bonus bAspd,2; },{},{}
-18853,Tasty_Strawberry_Hat_,Tasty Strawberry Hat,4,20,,150,,4,,,0xFFFFFFFF,63,2,256,,30,1,968,{ bonus bAllStats,1; if(getrefine()>11) bonus bAspd,2; },{},{}
-18854,Yellow_Valentine_Heart,Yellow Valentine Heart,4,20,,0,,,,0,0xFFFFFFFF,63,2,256,,1,1,865,{ bonus bMaxSPrate,2+(getrefine()/2); bonus bAllStats,7; },{},{}
+18851,ValentineHeart,Valentine Heart,4,20,,0,,,,0,0xFFFFFFFF,63,2,256,,1,1,397,{ bonus bMaxHPrate,5+(getrefine()/2); bonus bAllStats,7; },{},{}
+18852,Berry_Hat_Decoration,Tasty Strawberry Hat,4,20,,150,,4,,,0xFFFFFFFF,63,2,256,,30,1,968,{ bonus bAllStats,1; if(getrefine()>11) bonus bAspd,2; },{},{}
+18853,Berry_Hat_Decoration_,Tasty Strawberry Hat,4,20,,150,,4,,,0xFFFFFFFF,63,2,256,,30,1,968,{ bonus bAllStats,1; if(getrefine()>11) bonus bAspd,2; },{},{}
+18854,ValentineYellowHeart,Yellow Valentine Heart,4,20,,0,,,,0,0xFFFFFFFF,63,2,256,,1,1,865,{ bonus bMaxSPrate,2+(getrefine()/2); bonus bAllStats,7; },{},{}
18855,Aviator_Hat,Aviator Hat,4,10,,100,,10,,0,0xFFFFFFFF,63,2,256,,1,1,972,{ bonus bAgi,3; bonus bInt,3; autobonus "{ bonus bAtkEle,Ele_Wind; }",500,180,BF_NORMAL; },{},{}
18856,W_King_Tiger_Doll_Hat,W King Tiger Doll Hat,4,10,,0,,10,,0,0xFFFFFFFF,63,2,256,,1,1,973,{ bonus bStr,2; bonus bDex,2; bonus2 bAddRace,RC_Brute,10; .@r = getrefine(); autobonus "{ bonus2 bSPLossRate,5,1000; bonus bBaseAtk,25*getrefine(); }",3*.@r,3000,BF_NORMAL,"{ active_transform 1115,3000; specialeffect2 EF_POTION_BERSERK; showscript \"Traaaansformation-!! Eddga form!!\"; }"; autobonus2 "{ bonus2 bSPLossRate,5,1000; bonus bBaseAtk,25*getrefine(); }",.@r,3000,BF_NORMAL,"{ active_transform 1115,3000; specialeffect2 EF_POTION_BERSERK; showscript \"Traaaansformation-!! Eddga form!!\"; }"; },{},{}
18857,Curupira_Hat,Curupira Hat,4,10,,100,,20,,1,0xFFFFFFFF,63,2,256,,1,1,974,{ bonus bDex,3; bonus2 bAddEffWhenHit,Eff_Confusion,500; },{},{}
18858,Pink_Angeling_Bubble,Pink Angeling Bubble,4,10,,50,,5,,0,0xFFFFFFFF,63,2,1,,1,,975,{ bonus bMaxHP,200; bonus bAspdRate,1; },{},{}
18859,Angeling_Bubble,Angeling Bubble,4,10,,50,,5,,0,0xFFFFFFFF,63,2,1,,1,,976,{ bonus bDex,1; bonus bMatkRate,2; bonus bMaxHP,100; },{},{}
18860,Red_Flower_Hat,Red Flower Hat,4,10,,200,,10,,1,0xFFFFFFFF,63,2,256,,50,1,1033,{ bonus bDex,5; bonus2 bSubDefEle,Ele_Earth,3; bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10; if (getrefine() >= 12) { bonus bShortWeaponDamageReturn,5; } },{},{}
-18861,Zaha_Doll_J_Hat,Zaha Doll J Hat,4,10,,100,,,,1,0xFFFFFFFF,63,2,256,,50,1,461,{ bonus bHealPower,15; bonus bUseSPrate,15; },{},{}
+18861,Zaha_Doll_Hat_J,Zaha Doll J Hat,4,10,,100,,,,1,0xFFFFFFFF,63,2,256,,50,1,461,{ bonus bHealPower,15; bonus bUseSPrate,15; },{},{}
18863,Exorcist_Robe,Exorcist Robe,4,10,,1700,,57,,1,0xFFFFFFFF,63,2,16,,60,1,,{ bonus bMdef,5; .@r = getrefine(); if (.@r >= 3) { bonus2 bAddRace,RC_Undead,.@r/3*5; } if (BaseClass==Job_Acolyte) bonus2 bAddRace,RC_Undead,10; },{},{}
-18864,Earth_Goddess_Flower,Earth Goddess Flower,4,10,,250,,6,,0,0xFFFFFFFF,63,2,256,,1,1,864,{ bonus2 bAddEle,Ele_Earth,15; skill "WZ_EARTHSPIKE",5; },{},{}
+18864,Earth_Goddess_Flower_J,Earth Goddess Flower,4,10,,250,,6,,0,0xFFFFFFFF,63,2,256,,1,1,864,{ bonus2 bAddEle,Ele_Earth,15; skill "WZ_EARTHSPIKE",5; },{},{}
18865,Sword_Master_Crown,Sword Master Crown,4,10,,1000,,30,,1,0xFFFFFFFF,63,2,256,,50,1,981,{ .@i = BaseLevel; bonus bBaseAtk,(.@i>150)?(15):((.@i>100)?(10):((.@i>50)?(5):(0))); if(getskilllv("SM_SWORD")==10) bonus bHit,10; if(getskilllv("SM_TWOHAND")==10) bonus bUseSPrate,-5; if(getskilllv("AM_AXEMASTERY")==10) bonus bVariableCastrate,-5; if(getskilllv("AS_KATAR")==10) bonus bCritAtkRate,20; if(getskilllv("PR_MACEMASTERY")==10) bonus bAspdRate,10; },{},{}
-18867,Vajra,Vajra,4,0,,300,,,,0,0xFFFFFFFF,63,2,1,0,48,0,983,{ bonus bDex,1; bonus bLongAtkRate,2; },{},{}
+18867,Vajra,Vajra,4,0,,300,,,,0,0xFFFFFFFF,63,2,1,,48,0,983,{ bonus bDex,1; bonus bLongAtkRate,2; },{},{}
18868,Assassin_Skull_Mask,Assassin Skull Mask,4,10,,500,,2,,0,0xFFFFFFFF,63,2,513,,70,,984,{ bonus bCritical,5; },{},{}
18870,Very_Sweet_Candy_Bar,Very Sweet Candy Bar,4,10,,10,,,,0,0xFFFFFFFF,63,2,1,,1,1,446,{ bonus bAllStats,2; bonus bBaseAtk,10; bonus bMatk,10; bonus2 bExpAddClass,Class_All,2; },{},{}
18871,Very_Sweet_Candy,Very Sweet Candy,4,10,,10,,,,0,0xFFFFFFFF,63,2,1,,1,1,446,{ bonus bAllStats,1; bonus bBaseAtk,5; bonus bMatk,5; },{},{}
18872,Snake_Hat,Snake Hat,4,20,,100,,5,,1,0xFFFFFFFF,63,2,256,,0,1,986,{ bonus bStr,3; bonus bInt,3; bonus bMdef,5; bonus bUnbreakableHelm,1; },{},{}
18873,Sweet_Valentine_Out,Sweet Valentine Out,4,20,,100,,1,,0,0xFFFFFFFF,63,2,256,,1,1,865,{ bonus bMaxHPrate,7; bonus bMaxSPrate,7; },{},{}
-18874,Cyclops_Glasses,Cyclops Glasses,4,10,,100,,,,1,0xFFFFFFFF,63,2,512,,1,,23,{},{},{}
+18874,One_Eyed_Glass_,Cyclops Glasses,4,10,,100,,,,1,0xFFFFFFFF,63,2,512,,1,,23,{},{},{}
18877,Baron_Evil_Eye,Baron's Evil Eye,4,10,,300,,,,0,0xFFFFFFFF,63,2,512,,30,,989,{ bonus bDelayrate,-5; bonus bUseSPrate,5; },{},{}
18878,Palace_Guard_Cap,Palace Guard Cap,4,10,,1000,,15,,1,0xFFFFFFFF,63,2,256,,50,1,991,{ .@r = getrefine(); bonus2 bAddEle,Ele_Neutral,4+.@r/6; bonus bLongAtkRate,4+.@r; bonus bUnbreakableHelm,1; },{},{}
18879,Angry_Scorpion_Hat,Angry Scorpion Hat,4,10,,100,,5,,0,0xFFFFFFFF,63,2,256,,0,1,995,{ bonus bMdef,5; },{},{}
@@ -9810,25 +9869,26 @@
18970,Magical_Moon_Cat,Magical Moon Cat,4,20,,50,,5,,1,0xFFFFFFFF,63,2,256,,,1,1308,{ /*TODO: Enables use of Level 1 Monster's Cry*/ bonus bAllStats,3; bonus bDelayrate,-5; bonus bVariableCastrate,-5-(getrefine()/2); },{},{}
18971,Old_Rune_Circlet,Old Rune Circlet,4,10,,100,,10,,1,0x00000080,56,2,256,,170,1,623,{ bonus bAllStats,1; bonus bMdef,5; .@r = getrefine(); bonus bBaseAtk,4*.@r; bonus bAspd,.@r/5; bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus2 bSkillAtk,"RK_IGNITIONBREAK",20*.@r/2; bonus2 bSkillAtk,"RK_HUNDREDSPEAR",15*.@r/2; },{},{}
18972,Old_Mitra,Old Mitra,4,10,,100,,10,,1,0x00000100,56,2,256,,170,1,624,{ bonus bAllStats,1; bonus bMdef,5; .@r = getrefine(); bonus bMatk,2*.@r; bonus bBaseAtk,4*.@r; bonus bHealPower,.@r; bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus2 bSkillAtk,"AB_JUDEX",20*.@r/2; bonus2 bSkillAtk,"PR_MAGNUS",10*.@r/2; },{},{}
-18973,Old_Driver_Band,Old Driver Band,4,10,,100,,10,,1,0x00000400,56,2,256,,170,1,626,{ bonus bAllStats,1; .@r = getrefine(); bonus bBaseAtk,4*.@r; bonus bAspd,.@r/5; bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus2 bSkillAtk,"NC_POWERSWING",20*.@r/2; bonus2 bSkillAtk,"NC_AXETORNADO",20*.@r/2; },{},{}
+18973,Old_Driver_Band_R,Old Driver Band,4,10,,100,,10,,1,0x00000400,56,2,256,,170,1,626,{ bonus bAllStats,1; .@r = getrefine(); bonus bBaseAtk,4*.@r; bonus bAspd,.@r/5; bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus2 bSkillAtk,"NC_POWERSWING",20*.@r/2; bonus2 bSkillAtk,"NC_AXETORNADO",20*.@r/2; },{},{}
18974,Old_Driver_Band_Y,Old Driver Band(Yellow),4,10,,100,,10,,1,0x00000400,56,2,256,,170,1,637,{ bonus bAllStats,1; .@r = getrefine(); bonus bBaseAtk,4*.@r; bonus bAspd,.@r/5; bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus2 bSkillAtk,"NC_ARMSCANNON",20*.@r/2; bonus2 bSkillAtk,"NC_SELFDESTRUCTION",20*.@r/4; },{},{}
18975,Old_Shadow_Handicraft,Old Shadow Handicraft,4,10,,100,,10,,1,0x00020000,56,2,256,,170,1,627,{ bonus bAllStats,1; .@r = getrefine(); bonus bBaseAtk,4*.@r; bonus bMatk,4*.@r; bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus2 bSkillAtk,"SC_TRIANGLESHOT",25*.@r/2; if (.@r>=6) { bonus2 bSkillCooldown,"SC_ENERVATION",-1000; bonus2 bSkillCooldown,"SC_UNLUCKY",-1000; } if (.@r>=8) { bonus2 bSkillCooldown,"SC_LAZINESS",-1000; bonus2 bSkillCooldown,"SC_WEAKNESS",-1000; } if (.@r>=10) { bonus2 bSkillCooldown,"SC_IGNORANCE",-1000; bonus2 bSkillCooldown,"SC_GROOMY",-1000; } },{},{}
-18976,Old_Minstrel_Song's_Hat,Old Minstrel Song's Hat,4,10,,100,,10,,1,0x00080000,56,1,256,,170,1,628,{ bonus bAllStats,1; .@r = getrefine(); bonus bLongAtkRate,.@r; bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus2 bSkillAtk,"CG_ARROWVULCAN",20*.@r/2; bonus2 bSkillAtk,"WM_SEVERE_RAINSTORM",5*.@r/2; },{},{}
+18976,Old_Minstrel_Song_Hat,Old Minstrel Song's Hat,4,10,,100,,10,,1,0x00080000,56,1,256,,170,1,628,{ bonus bAllStats,1; .@r = getrefine(); bonus bLongAtkRate,.@r; bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus2 bSkillAtk,"CG_ARROWVULCAN",20*.@r/2; bonus2 bSkillAtk,"WM_SEVERE_RAINSTORM",5*.@r/2; },{},{}
18977,Old_Midas_Whisper,Old Midas Whisper,4,10,,100,,10,,1,0x00040000,56,2,256,,170,1,629,{ bonus bAllStats,1; .@r = getrefine(); bonus bBaseAtk,4*.@r; bonus bLongAtkRate,.@r; bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus2 bSkillAtk,"GN_CARTCANNON",15*.@r/2; },{},{}
18978,Old_Magic_Stone_Hat,Old Magic Stone Hat,4,10,,100,,10,,1,0x00000200,56,2,256,,170,1,630,{ bonus bAllStats,1; .@r = getrefine(); bonus bMdef,5; bonus bMatkRate,.@r; bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus2 bSkillAtk,"WL_SOULEXPANSION",5*.@r/2; bonus2 bSkillCooldown,"WL_CRIMSONROCK",-1000-(.@r*100); },{},{}
18979,Old_Blazing_Soul,Old Blazing Soul,4,10,,100,,10,,1,0x00008000,56,2,256,,170,1,631,{ bonus bAllStats,1; .@r = getrefine(); bonus bBaseAtk,4*.@r; bonus bCritical,2*.@r; bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus2 bSkillAtk,"SR_RAMPAGEBLASTER",15*.@r/2; bonus2 bSkillAtk,"SR_RIDEINLIGHTNING",20*.@r/2; },{},{}
-18980,Old_Wind_Whisper,Old Wind Whisper,4,10,,100,,10,,1,0x10000,56,2,256,,170,1,633,{ bonus bAllStats,1; .@r = getrefine(); bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus bMdef,5; bonus2 bSkillAtk,"SO_POISON_BUSTER",15*.@r/2; bonus2 bSkillAtk,"SO_VARETYR_SPEAR",20*.@r/2; },{},{}
+18980,Old_Wind_Whisper,Old Wind Whisper,4,10,,100,,10,,1,0x10000,56,2,256,,170,1,633,{ bonus bAllStats,1; .@r = getrefine(); bonus bAtk2,4*.@r; bonus bMatkRate,.@r; bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus bMdef,5; bonus2 bSkillAtk,"SO_POISON_BUSTER",15*(.@r/2); bonus2 bSkillAtk,"SO_VARETYR_SPEAR",20*(.@r/2); },{},{}
18981,Old_Dying_Swan,Old Dying Swan,4,10,,100,,10,,1,0x00080000,56,0,256,,170,1,635,{ bonus bAllStats,1; .@r = getrefine(); bonus bLongAtkRate,.@r; bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus2 bSkillAtk,"CG_ARROWVULCAN",20*.@r/2; bonus2 bSkillAtk,"WM_SEVERE_RAINSTORM",5*.@r/2; },{},{}
-18982,Old_Circlet_Of_Bones,Old Circlet Of Bones,4,10,,100,,10,,1,0x00001000,56,2,256,,170,1,1141,{ bonus bAllStats,1; .@r = getrefine(); bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus bCriticalRate,.@r; bonus bAspdRate,1; bonus2 bSkillAtk,"GC_CROSSIMPACT",10*.@r/2; bonus2 bSkillAtk,"GC_CROSSRIPPERSLASHER",20*.@r/2; },{},{}
+18982,Old_Circlet_Of_Bone,Old Circlet Of Bones,4,10,,100,,10,,1,0x00001000,56,2,256,,170,1,1141,{ bonus bAllStats,1; .@r = getrefine(); bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus bCriticalRate,.@r; bonus bAspdRate,1; bonus2 bSkillAtk,"GC_CROSSIMPACT",10*.@r/2; bonus2 bSkillAtk,"GC_CROSSRIPPERSLASHER",20*.@r/2; },{},{}
18983,Old_Protect_Of_Crown,Old Protect Of Crown,4,10,,100,,10,,1,0x00004000,56,2,256,,170,1,1140,{ bonus bAllStats,1; .@r = getrefine(); bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus bMdef,5; bonus bBaseAtk,4*.@r; bonus bAspd,.@r/5; bonus2 bSkillAtk,"LG_CANNONSPEAR",20*.@r/2; bonus2 bSkillAtk,"LG_OVERBRAND",5*.@r/2; },{},{}
-18984,Old_Camouflage_Rabbit_Hood,Old Camouflage Rabbit Hood,4,10,,100,,10,,1,0x0000800,56,2,256,,170,1,1142,{ bonus bAllStats,1; .@r = getrefine(); bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus bLongAtkRate,.@r; bonus bFlee2,.@r/3; bonus2 bSkillAtk,"RA_CLUSTERBOMB",15*.@r/2; bonus2 bSkillAtk,"RA_WUGSTRIKE",10*.@r/2; },{},{}
+18984,Old_Camo_RabbitHood,Old Camouflage Rabbit Hood,4,10,,100,,10,,1,0x0000800,56,2,256,,170,1,1142,{ bonus bAllStats,1; .@r = getrefine(); bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus bLongAtkRate,.@r; bonus bFlee2,.@r/3; bonus2 bSkillAtk,"RA_CLUSTERBOMB",15*.@r/2; bonus2 bSkillAtk,"RA_WUGSTRIKE",10*.@r/2; },{},{}
+18985,Falconer_Flute,Falconer Flute,4,0,,100,,,,0,0x0000800,63,2,1,,75,0,1143,{ set .@bblvl,max(getskilllv("HT_BLITZBEAT"),1); set .@luk,min(readparam(bLuk),120); bonus3 bAutoSpell,"HT_BLITZBEAT",.@i,((.@bblvl / 3) * 10) + (.@luk * 10) + (((.@bblvl / 5) * .@bblvl) * 2); },{},{}
18987,RWC13_Jormungandr_Hat,RWC13 Jormungandr Hat,4,20,,2500,,7,,1,0xFFFFFFFF,63,2,256,,1,0,1149,{ bonus bAllStats,2; bonus bVariableCastrate,-5; bonus bDelayrate,-5; bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10; .@r = getrefine(); if(.@r>6){ bonus2 bAddItemHealRate,11596,20; bonus bAspd,1; } if(.@r>9){ bonus bVariableCastrate,-5; bonus bDelayrate,-5; } bonus2 bAddItemHealRate,11596,150; },{ sc_end SC_SpeedUp0; },{}
-18997,Reckless_Chip,Reckless Chip,4,10,,300,,,,1,0xFFFFFFFF,63,2,256,,100,1,1201,{ bonus bHit,50; bonus bFlee,50; bonus bMaxSPrate,-50; },{},{}
+18997,Riot_Chip,Runaway Chip,4,10,,300,,,,1,0xFFFFFFFF,63,2,256,,100,1,1201,{ bonus bHit,50; bonus bFlee,50; bonus bMaxSPrate,-50; },{},{}
19019,Elemental_Crown,Elemental Crown,4,0,,500,,10,,1,0xFFFFFFFF,63,2,256,,,1,1219,{ .@r = getrefine(); bonus bDex,(3 + (.@r/2)+ (readparam(bDex) > 130 ? .@r : 0)); bonus bLongAtkRate,4; },{},{}
19020,Survive_Circlet,Survive Circlet,4,0,,500,,10,,0,0xFFFFFFFF,63,2,256,,,1,1220,{ .@r = getrefine(); bonus bInt,(3 + (.@r/2)+ (BaseLevel > 130 ? .@r : 0)); bonus bMatkRate,4; },{},{}
19021,Gigant_Helm,Gigant Helm,4,0,,500,,10,,0,0xFFFFFFFF,63,2,256,,,1,1221,{ bonus bStr,3+((BaseLevel > 130) ? getrefine() : 0); bonus2 bAddClass,Class_All,4; },{},{}
-19022,Floating_Stone_Of_Intelligence,Floating Stone Of Intelligence,4,,,,,,,,0xFFFFFFFF,63,2,256,,,,1230,{},{ sc_start SC_FSTONE,-1,0; },{ sc_end SC_FSTONE; } // jRO Item
-19024,Protect_Feathers,Protect Feathers,4,0,,500,,,,0,0xFFFFFFFF,63,2,512,0,70,0,1232,{ bonus2 bSubRace,RC_DemiHuman,2; bonus2 bSubRace,RC_Player,2; bonus bAspdRate,-5; .@vit = readparam(bVit); if (.@vit >= 108) { bonus2 bSubRace,RC_DemiHuman,3; bonus2 bSubRace,RC_Player,3; bonus bAspdRate,-5; } if (.@vit >= 120) { bonus bMaxHPRate,3; bonus bMdef,3; } },{},{}
+19022,Floating_Stone_Of_Int,Floating Stone Of Intelligence,4,,,,,,,,0xFFFFFFFF,63,2,256,,,,1230,{},{ sc_start SC_FSTONE,-1,0; },{ sc_end SC_FSTONE; } // jRO Item
+19024,Protect_Feathers,Protect Feathers,4,0,,500,,,,0,0xFFFFFFFF,63,2,512,,70,0,1232,{ bonus2 bSubRace,RC_DemiHuman,2; bonus2 bSubRace,RC_Player,2; bonus bAspdRate,-5; .@vit = readparam(bVit); if (.@vit >= 108) { bonus2 bSubRace,RC_DemiHuman,3; bonus2 bSubRace,RC_Player,3; bonus bAspdRate,-5; } if (.@vit >= 120) { bonus bMaxHPRate,3; bonus bMdef,3; } },{},{}
19026,Aegir_Helm,Aegir Helm,4,10,,800,,10,,1,0xFFFFFFFF,63,2,256,,40,1,870,{ bonus bVit,3; },{},{}
19030,Pretty_Rabbit_Hood,Pretty Rabbit Hood,4,10,,100,,20,,1,0xFFFFFFFF,63,2,769,,1,1,1085,{ bonus bMaxHP,(15*BaseLevel); },{},{}
19031,Fallen_Angel_Blessing,Fallen Angel Blessing,4,0,,200,,1,,0,0xFFFFFFFF,63,2,512,,,1,1250,{ bonus2 bAddRace,RC_Angel,5; bonus2 bSubRace,RC_Angel,5; },{},{}
@@ -9837,10 +9897,11 @@
19039,12_Anniversary_Elf_Ears,12 Anniversary Elf Ears,4,10,,120,,0,,0,0xFFFFFFFF,63,2,512,,0,1,875,{ bonus2 bSubRace,RC_All,4; bonus2 bSubRace,RC_Player,-4; },{},{}
19047,Angeling_KnitCap,Angeling KnitCap,4,0,,300,,5,,1,0xFFFFFFFF,63,2,256,,20,1,953,{ bonus2 bSPGainRace,RC_Angel,5; bonus bHPGainValue,100; .@r = getrefine(); if (.@r >= 5) { bonus2 bSubRace,RC_Angel,5+((.@r >= 7) ? 5 : 0); } },{},{}
19048,Elemental_Clothe,Elemental Clothes,4,0,,500,,45,,1,0xFFFFFFFF,63,2,16,,80,1,,{ .@r = getrefine(); bonus bLongAtkRate,2+((.@r >= 9) ? 3 : 0)+((.@r >= 7) ? 2 : 0); if (.@r >= 7) bonus bUnbreakableArmor,1; },{},{}
+19050,Loki_Nidhogg_Hat,Loki & Nidhoggur's Hat,4,0,,100,,0,,1,0xFFFFFFFF,63,2,256,,1,1,1304,{},{},{}
19051,Warrior_Moon_Cat,Warrior Moon Cat,4,20,,100,,5,,1,0xFFFFFFFF,63,2,256,,1,1,1308,{ /*Enables use of Level 1 Monster's Cry*/ bonus bAllStats,3; bonus2 bHPDrainRate,40,5; bonus2 bSPDrainRate,10,2; },{},{}
19052,Sigruns_Wing,Rental Sigrun's Wing,4,10,,0,,2,,0,0xFFFFFFFF,63,2,512,,1,0,568,{ if (Class == Job_Swordman || Class == Job_Thief || Class == Job_Merchant || Class == Job_Taekwon || Class == Job_Star_Gladiator || Class == Job_Star_Gladiator2) bonus bAspd,1; else if (Class == Job_Mage || Class == Job_Acolyte || Class == Job_Ninja || Class == Job_Soul_Linker) { bonus bMatk,5; bonus bHealPower,2; } else if (Class == Job_Archer || Class == Job_Gunslinger) bonus bLongAtkRate,2; else if (Class == Job_Novice || Class == Job_SuperNovice) { bonus bMaxHP,120; bonus bMaxSP,60; } },{},{}
19053,Fighter_Moon_Cat,Fighter Moon Cat,4,20,,100,,5,,1,0xFFFFFFFF,63,2,256,,1,1,1308,{ /*Enables use of Level 1 Monster's Cry*/ .@r = getrefine(); bonus bAllStats,3; bonus2 bAddEff,Eff_Stun,500+(.@r*100); },{},{}
-19082,Bio_Protector,Bio Protector,4,0,,500,,3,,0,0xFFFFFFFF,63,2,512,1,50,1,1366,{ bonus bHit,10; bonus bVariableCastrate,-5; bonus bPerfectHitRate,5; },{},{}
+19082,Bio_Protector,Bio Protector,4,0,,500,,3,,0,0xFFFFFFFF,63,2,512,,50,1,1366,{ bonus bHit,10; bonus bVariableCastrate,-5; bonus bPerfectHitRate,5; },{},{}
19083,Mask_of_Hero,Mask of Hero,4,20,,200,,0,,0,0xFFFFFFFF,63,2,512,,70,0,1367,{ bonus bVit,10; bonus bMdef,10; bonus bShortWeaponDamageReturn,1; },{},{}
19084,Parfaille_Vigilante_Hat,Parfaille Vigilante Hat,4,0,,100,,2,,0,0x80000000,63,2,256,,20,1,1368,{ bonus bLuk,1; bonus3 bAutoSpell,"AL_BLESSING",3,100; },{},{}
19085,Sigrun's_Wings_,Sigrun's Wings,4,20,,100,,2,,1,0xFFFFFFFF,63,2,512,,1,0,568,{ if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief||(BaseJob==Job_Taekwon&&Class!=Job_Soul_Linker)) { bonus bAspd,1; bonus bAgi,-2; } else if(BaseClass==Job_Mage||BaseClass==Job_Acolyte||Class==Job_Ninja||Class==Job_Soul_Linker){ bonus bMatk,3; bonus bHealPower,2; } else if(BaseClass==Job_Archer||BaseClass==Job_Gunslinger) bonus bLongAtkRate,1; else if(BaseJob==Job_Novice||BaseJob==Job_SuperNovice) { bonus bMaxHP,60; bonus bMaxSP,30; } },{},{}
@@ -9854,11 +9915,11 @@
19093,Spinning_Eyes_,Geek Glasses,4,20000,,100,,1,,1,0xFFFFFFFF,63,2,512,,0,0,27,{ bonus2 bResEff,Eff_Blind,800; },{},{}
19094,Mr_Smile_,Mr. Smile,4,60,,100,,1,,1,0xFFFFFFFF,63,2,513,,0,0,65,{},{},{}
19095,Happy_Balloon,Happy Balloon,4,0,,10,,0,,0,0xFFFFFFFF,63,2,1,,1,0,1289,{ bonus2 bDropAddRace,RC_All,5; bonus2 bExpAddRace,RC_All,5; },{},{}
-19109,Valhalla_Idol,Valhalla Idol,4,0,,300,,2,,0,0xFFFFFFFF,63,2,512,0,70,0,1423,{ bonus bMaxSP,50; bonus3 bAutoSpell,"MG_SAFETYWALL",10,50; },{},{}
-19111,Laser_Of_Eagle,Laser of Eagle,4,0,,400,,5,,1,0xFFFFFFFF,63,2,256,0,100,1,1424,{ bonus bDex,2; bonus bLongAtkRate,10; bonus4 bAutoSpell,"PR_LEXAETERNA",1,50,BF_LONG; /*TODO: Chance to transform become Shechil while attacking.*/ },{},{}
-19116,Red_Baby_Dragon,Red Baby Dragon,4,0,,700,,,1,1,0xFFFFFFFF,63,2,256,0,90,1,1463,{ .@r=getrefine(); bonus bMaxHPrate,5; bonus bMaxSPrate,5; bonus2 bSkillAtk,"RK_DRAGONBREATH",15; bonus2 bSkillAtk,"RK_DRAGONBREATH_WATER",15; if (.@r>=6) { bonus2 bSkillAtk,"RK_DRAGONBREATH",15; bonus2 bSkillAtk,"RK_DRAGONBREATH_WATER",15; } if (.@r>=8) { bonus2 bSkillAtk,"RK_DRAGONBREATH",15; bonus2 bSkillAtk,"RK_DRAGONBREATH_WATER",15; } },{},{}
-19117,Poring_Sunglasses,Poring Sunglasses,4,0,,10,,0,,0,0xFFFFFFFF,63,2,512,,1,0,954,{ bonus2 bDropAddRace,RC_All,5; bonus2 bExpAddRace,RC_All,5; },{},{}
-19118,Poring_Sunglasses_,Poring Sunglasses,4,0,,10,,0,,1,0xFFFFFFFF,63,2,512,,1,0,954,{ bonus2 bDropAddRace,RC_All,4; bonus2 bExpAddRace,RC_All,4; },{},{}
+19109,Valhalla_Idol,Valhalla Idol,4,0,,300,,2,,0,0xFFFFFFFF,63,2,512,,70,0,1423,{ bonus bMaxSP,50; bonus4 bAutoSpellWhenHit,"MG_SAFETYWALL",10,50,0; },{},{}
+19111,Laser_Of_Eagle,Laser of Eagle,4,0,,400,,5,,1,0xFFFFFFFF,63,2,256,,100,1,1424,{ bonus bDex,2; bonus bLongAtkRate,10; bonus5 bAutoSpell,"PR_LEXAETERNA",1,50,BF_LONG,1; /*TODO: Chance to transform become Shechil while attacking.*/ },{},{}
+19116,Red_Baby_Dragon,Red Baby Dragon,4,0,,700,,,1,1,0xFFFFFFFF,63,2,256,,90,1,1463,{ .@r=getrefine(); bonus bMaxHPrate,5; bonus bMaxSPrate,5; bonus2 bSkillAtk,"RK_DRAGONBREATH",15; bonus2 bSkillAtk,"RK_DRAGONBREATH_WATER",15; if (.@r>=6) { bonus2 bSkillAtk,"RK_DRAGONBREATH",15; bonus2 bSkillAtk,"RK_DRAGONBREATH_WATER",15; } if (.@r>=8) { bonus2 bSkillAtk,"RK_DRAGONBREATH",15; bonus2 bSkillAtk,"RK_DRAGONBREATH_WATER",15; } },{},{}
+19117,Poring_Sunglasses_,Poring Sunglasses,4,0,,10,,0,,0,0xFFFFFFFF,63,2,512,,1,0,954,{ bonus2 bDropAddRace,RC_All,5; bonus2 bExpAddRace,RC_All,5; },{},{}
+19118,Poring_Sunglasses__,Poring Sunglasses,4,0,,10,,0,,1,0xFFFFFFFF,63,2,512,,1,0,954,{ bonus2 bDropAddRace,RC_All,4; bonus2 bExpAddRace,RC_All,4; },{},{}
19126,Shadow_Booster_,Magical Booster,4,10,,300,,,,1,0xFFFFFFFF,63,2,512,,1,1,873,{ bonus bAspd,1; bonus bDelayrate,-1; },{},{}
19128,Ifrit's_Ear_,Ears Of Ifrit,4,20,,300,,0,,1,0xFFFFFFFE,63,2,512,,50,0,422,{ bonus bStr,1; bonus bMdef,3; bonus bInt,1; bonus2 bSkillAtk,"MG_FIREBOLT",3; bonus2 bSkillAtk,"WZ_FIREPILLAR",3; bonus2 bSkillAtk,"WZ_METEOR",3; bonus2 bSkillAtk,"SM_BASH",4; bonus2 bSkillAtk,"SM_MAGNUM",4; bonus2 bSkillAtk,"KN_PIERCE",3; bonus2 bSubEle,Ele_Fire,3; bonus2 bSubEle,Ele_Water,-3; },{},{}
19129,Chick_Hat_,Chick Hat,4,20,,100,,2,,1,0xFFFFFFFF,63,2,256,,10,0,311,{ bonus bLuk,2; bonus bMaxHP,50; bonus bMaxSP,50; skill "TF_DOUBLE",2; bonus bDoubleRate,10; bonus2 bSubRace,RC_DemiHuman,3; bonus2 bSubRace,RC_Player,3; },{},{}
@@ -9866,7 +9927,7 @@
19131,Radio_Antenna_,Radio Antenna,4,0,,1500,,2,,1,0xFFFFFFFF,63,2,256,,1,1,347,{ bonus bMdef,5; bonus bCritical,5; bonus bFlee,5; skill "MG_LIGHTNINGBOLT",1; bonus4 bAutoSpellWhenHit,"MG_THUNDERSTORM",5,30,1; },{},{}
19132,Masquerade_,Masquerade,4,20,,100,,0,,1,0xFFFFFFFE,63,2,512,,0,0,78,{ bonus2 bAddRace,RC_DemiHuman,3; bonus2 bAddRace,RC_Player,3; },{},{}
19133,Odin_Mask_,Odin's Mask,4,20,,100,,1,,1,0xFFFFFFFF,63,2,513,,1,0,480,{ bonus2 bSubClass,Class_Boss,2; },{},{}
-19134,Wickebines_Black_Cat_Ears,Wickebine's Black Cat Ears,4,20,,200,,4,,1,0xFFFFFFFF,63,2,256,,1,1,368,{},{},{}
+19134,Wickebines_Black_Cat_Ears,Wickebine's Black Cat Ears,4,20,,200,,4,,1,0xFFFFFFFE,63,2,256,,45,1,368,{ bonus bFlee,10; bonus bCritAtkRate,10; autobonus "{ bonus2 bIgnoreMdefRaceRate,RC_ALL,25; }",50,5000,BF_MAGIC,"{ specialeffect2 EF_AGIUP; }"; },{},{}
19138,Seraphim_Coronet,Seraphim Coronet,4,20,,300,,0,,0,0xFFFFFFFF,63,2,512,,70,0,1487,{ bonus bStr,2; .@int = readparam(bInt); bonus bBaseAtk,(.@int/8)*5; bonus bHealPower,.@int/8; bonus bVariableCastrate,.@int/8; if ((.@int>108)) { bonus bBaseAtk,50; bonus bHealPower,5; bonus bVariableCastrate,4; } if ((.@int>120)) { bonus bBaseAtk,75; bonus bHealPower,5; bonus bVariableCastrate,2; } },{},{}
19139,SurviveOrb,Survive Orb,4,0,,300,,,,0,0xFFFFFFFF,63,2,1,,50,0,1488,{ skill "TF_HIDING",1; bonus2 bAddClass,Class_All,2; bonus bMatkRate,2; bonus bVariableCastrate,-3; },{},{}
19140,Squirrel_Ear_Hat,Squirrel Ear Hat,4,0,,200,,10,,1,0xFFFFFFFF,63,2,256,,100,1,1486,{ .@r = getrefine(); bonus bAspd,1; bonus bCriticalLong,5; bonus bCritAtkRate,10; bonus2 bIgnoreDefRaceRate,RC_All,10; if (.@r > 4) { bonus bAspd,1; bonus bCriticalLong,10; bonus bCritAtkRate,2; bonus2 bIgnoreDefRaceRate,RC_All,20; } if (.@r > 6) { bonus bAspd,1; bonus bCriticalLong,15; bonus bCritAtkRate,6; bonus2 bIgnoreDefRaceRate,RC_All,30; } if (.@r > 8) { bonus bAspd,1; bonus bCriticalLong,20; bonus bCritAtkRate,12; bonus2 bIgnoreDefRaceRate,RC_All,40; autobonus "{ bonus bCritAtkRate,100; }",70,5000; } },{},{}
@@ -9885,6 +9946,7 @@
19153,Ghostring_Balloon,Ghostring Balloon,4,20,,10,,0,,0,0xFFFFFFFF,63,2,1,,1,0,1436,{ bonus3 bAutoSpell,"MG_SOULSTRIKE",5,10; bonus2 bExpAddRace,RC_All,5; bonus2 bDropAddRace,RC_All,5; },{},{}
19154,Arch_Angelring_Balloon,Arch Angelring Balloon,4,20,,10,,0,,0,0xFFFFFFFF,63,2,1,,1,0,1437,{ skill "ALL_RESURRECTION",1; bonus2 bExpAddRace,RC_All,5; bonus2 bDropAddRace,RC_All,5; },{},{}
19155,Demons_Eyes,Demon's Eyes,4,20,,10,,0,,0,0xFFFFFFFF,63,2,512,,60,0,1490,{ bonus2 bSubRace,RC_Player,3; bonus bFlee2,2; },{},{}
+19156,Lunar_Rainbow,Lunar Rainbow,4,20,,200,,10,,1,0xFFFFFFFF,63,2,256,,80,1,704,{ bonus bAgi,3; bonus bMdef,10; bonus bMatk,(10*getrefine()); },{},{}
19157,Drooping_Rebellion_,Drooping Rebellion,4,20,,200,,1,,1,0xFFFFFFFF,63,2,256,,1,1,1444,{ bonus bAllStats,1; bonus bUseSPrate,-10; .@r = getrefine(); if (.@r >= 9) { bonus bAspd,1; } if (.@r >= 12) { bonus bSpeedRate,25; } bonus2 bExpAddRace,RC_All,5; bonus2 bDropAddRace,RC_All,5; },{},{}
19158,C_GeminiS58_Eyes_Blue,Costume GeminiS58 Eyes Blue,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,0,0,1456,{},{},{}
19159,Barrel_Helm,Barrel Helm,4,20,,420,,59,,1,0xFFFFFFFF,63,2,769,,60,1,1498,{ bonus bVit,5; bonus bHPrecovRate,-10; .@r = getrefine(); if (.@r >= 7) { bonus bDef,100; skill "CR_AUTOGUARD",1; } if (.@r >= 8) { bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10; if(BaseJob==Job_SuperNovice) { skill "CR_AUTOGUARD",5; } } },{},{}
@@ -9893,12 +9955,12 @@
19165,Para_Team_Hat160,Awakened Eden Group Hat II,4,20,,0,,10,,1,0xFFFFFFFF,63,2,256,,160,1,1530,{ autobonus "{ bonus bBaseAtk,30; }",70,5000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }"; autobonus "{ bonus bMatk,30; }",50,5000,BF_MAGIC,"{ specialeffect2 EF_SPELLBREAKER; }"; .@r = getrefine(); if(.@r >= 7){ bonus bAtk,15; bonus bMatk,15; if(.@r >= 9){ bonus bAllStats,2; if(.@r >= 12){ bonus2 bRegenPercentHP,2,10000; bonus2 bRegenPercentSP,1,10000; } } } },{},{}
19166,RO_Celebration_Hat,RO Celebration Hat,4,20,,140,,14,,1,0xFFFFFFFF,63,2,256,,14,1,1541,{ bonus bMaxSP,140; bonus2 bSPRegenRate,6,4000; },{},{}
19168,Band_Of_Kafra_,Kafra Staff Headband,4,20,,500,,0,,1,0xFFFFFFFF,63,2,256,,,1,106,{ bonus2 bSubClass,Class_All,5; .@r = getrefine()*10; bonus2 bAddMonsterDropItem,23177,10+.@r; bonus2 bAddMonsterDropItem,7059,10+.@r; bonus2 bAddMonsterDropItem,7060,10+.@r; },{},{}
-19176,Fallen_Angel_Blessing,Fallen Angel Blessing,4,20,,200,,1,,1,0xFFFFFFFF,63,2,512,,10,0,1250,{ bonus2 bAddRace,RC_Angel,5; bonus2 bSubRace,RC_Angel,5; },{},{}
+19176,Fallen_Angel_Blessing_,Fallen Angel Blessing,4,20,,200,,1,,1,0xFFFFFFFF,63,2,512,,10,0,1250,{ bonus2 bAddRace,RC_Angel,5; bonus2 bSubRace,RC_Angel,5; },{},{}
19177,Elemental_Crown_,Elemental Crown,4,0,,500,,10,,0,0xFFFFFFFF,63,2,256,,50,1,1219,{ .@r = getrefine(); bonus bDex,3 + (.@r/2); bonus bLongAtkRate,4; },{},{}
19178,Elemental_Crown__,Elemental Crown,4,0,,500,,10,,1,0xFFFFFFFF,63,2,256,,50,1,1219,{ .@r = getrefine(); bonus bDex,3 + (.@r/2); bonus bLongAtkRate,4; },{},{}
19179,Rabbit_Magic_Hat_,Magic Rabit Hat,4,0,,800,,4,,1,0xFFFFFFFF,63,2,256,,0,1,497,{ bonus bDex,1; bonus bAgi,1; bonus bMdef,1; bonus bAspdRate,5; bonus bDelayRate,-4; },{},{}
19180,Anubis_Helm_,Anubis Helm,4,20,,0,,8,,1,0xFFFFFFFF,63,2,768,,65,0,485,{ bonus bMdef,5; bonus2 bSubClass,Class_Boss,10; bonus bHealpower2,10; bonus bAddItemHealRate,10; },{},{}
-19181,New_Wave_Sunglasses,New Wave Sunglasses,4,20,,100,,1,,1,0xFFFFFFFF,63,2,512,,30,0,856,{ bonus bDelayRate,-5; },{},{}
+19181,New_Wave_Sunglasses_,New Wave Sunglasses,4,20,,100,,1,,1,0xFFFFFFFF,63,2,512,,30,0,856,{ bonus bDelayRate,-5; },{},{}
//===================================================================
// Costume System
//===================================================================
@@ -9909,9 +9971,9 @@
19504,T_Sunglasses,T Sunglasses,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,0,0,12,{},{},{}
19505,T_Cigarette,T Cigarette,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,0,0,54,{},{},{}
19506,T_Valkyrie_Feather_Band,T Valkyrie Feather Band,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,0,1,300,{},{},{}
-19507,Clear_Sun,Clear Sun,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,654,{ bonus bUnbreakableHelm,1; },{},{}
+19507,Fine_Sun,Clear Sun,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,654,{ bonus bUnbreakableHelm,1; },{},{}
19508,T_Gemmed_Sallet,T Gemmed Sallet,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,0,1,0,{ bonus bUnbreakableHelm,1; },{},{}
-19509,Butterfly_Wing_Ears,Butterfly Wing Ears,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,695,{ bonus bUnbreakableHelm,1; },{},{}
+19509,Butterfly_Wing_Ear,Butterfly Wing Ears,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,695,{ bonus bUnbreakableHelm,1; },{},{}
19510,Nut_On_Head,Screw Stuck in Head,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,696,{ bonus bUnbreakableHelm,1; },{},{}
19511,Heart_Eye_Patch1,Heart Eye Patch 1,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,697,{ bonus bUnbreakableHelm,1; },{},{}
19512,Heart_Eye_Patch2,Heart Eye Patch 2,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,698,{ bonus bUnbreakableHelm,1; },{},{}
@@ -9947,7 +10009,7 @@
19542,C_Devil_Whisper,Costume Devil Whisper,4,20,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,712,{ bonus bUnbreakableHelm,1; bonus2 bSubRace,RC_Angel,1; bonus2 bSubRace,RC_Demon,1; bonus3 bAddMonsterDropItem,12020,RC_Angel,400; bonus3 bAddMonsterDropItem,523,RC_Demon,400; },{},{}
19543,Oliver_Wolf_Hood,Oliver Wolf Hood,4,20,,300,,0,,0,0xFFFFFFFF,63,2,1024,,70,0,849,{ bonus bUnbreakableHelm,1; },{},{}
19544,C_Tare_Neko_Cru,Costume Tare Neko Cru,4,20,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,692,{ bonus bUnbreakableHelm,1; },{},{}
-19545,C_Boy's_Cap,Costume Boy's Cap,4,20,,100,,0,,0,0xFFFFFFFF,63,2,1024,,100,0,102,{ bonus bUnbreakableHelm,1; },{},{}
+19545,C_Boys_Cap,Costume Boy's Cap,4,20,,100,,0,,0,0xFFFFFFFF,63,2,1024,,100,0,102,{ bonus bUnbreakableHelm,1; },{},{}
19546,C_Valkyrie_Helm,Costume Valkyrie Helm,4,20,,100,,0,,0,0xFFFFFFFF,63,2,1024,,100,0,225,{ bonus bUnbreakableHelm,1; },{},{}
19547,C_Deviruchi_Cap,Costume Deviruchi Cap,4,20,,100,,0,,0,0xFFFFFFFF,63,2,1024,,100,0,123,{ bonus bUnbreakableHelm,1; },{},{}
19548,C_Frog_Cap,Costume Frog Cap,4,20,,100,,0,,0,0xFFFFFFFF,63,2,1024,,100,0,448,{},{ bonus bUnbreakableHelm,1; },{}
@@ -9956,7 +10018,7 @@
19551,C_Elven_Ears,Costume Elven Ears,4,20,,100,,0,,0,0xFFFFFFFF,63,2,2048,,100,0,73,{ bonus bUnbreakableHelm,1; },{},{}
19552,C_Centimental_Flower,Costume Centimental Flower,4,20,,100,,0,,0,0xFFFFFFFF,63,2,4096,,100,0,56,{ bonus bUnbreakableHelm,1; },{},{}
19553,C_Assassin_Mask_,Costume Assassin Mask,4,20,,100,,0,,0,0xFFFFFFFF,63,2,4096,,100,0,180,{ bonus bUnbreakableHelm,1; },{},{}
-19554,C_Hahoe_Mask_,Costume Hahoe Mask,4,20,,100,,0,,0,0xFFFFFFFF,63,2,6144,,100,0,230,{ bonus bUnbreakableHelm,1; },{},{}
+19554,C_Hahoe_Mask,Costume Hahoe Mask,4,20,,100,,0,,0,0xFFFFFFFF,63,2,6144,,100,0,230,{ bonus bUnbreakableHelm,1; },{},{}
19555,C_Crescent_Moon_Helm,Costume Crescent Moon Helm,4,0,,0,,0,,0,0xFFFFFFFF,63,2,3072,,1,1,213,{ bonus bVit,1; },{},{}
19556,C_Kabuki_Mask,Costume Kabuki Mask,4,0,,0,,0,,0,0xFFFFFFFF,63,2,7168,,1,1,214,{ bonus bInt,1; },{},{}
19557,C_Ayothaya_Hat,Costume Ayothaya Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,1,334,{ bonus bStr,1; },{},{}
@@ -9980,7 +10042,7 @@
19575,C_Ascension_Black_Dragon,Costume Ascension Black Dragon,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,1,863,{},{},{}
19576,C_Tare_Pope,Costume Tare Pope,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,817,{},{},{}
19577,10th_Anni_Poring_Hat,10th Anni Poring Hat,4,10,,100,,1,,0,0xFFFFFFFF,63,2,1024,,1,1,874,{},{},{}
-19578,C_Googles,Costume Googles,4,0,,0,,0,,0,0xFFFFFFFF,63,2,3072,,1,1,1,{},{},{}
+19578,C_Goggle,Costume Googles,4,0,,0,,0,,0,0xFFFFFFFF,63,2,3072,,1,1,1,{},{},{}
19579,C_Red_Wind_Hat,Costume Red Wind Hat,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,613,{ bonus bHPrecovRate,20; bonus bSPrecovRate,20; },{},{}
19580,C_Sphinx_Helm,Costume Sphinx Helm,4,0,,0,,0,,0,0xFFFFFFFF,63,2,5120,,1,1,137,{},{},{}
19581,C_Adventurers_Hat,Costume Adventurer's Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,1,891,{},{},{}
@@ -9988,39 +10050,39 @@
19583,C_Zorro_Mask,Costume Zorro Mask,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,1,50,{},{},{}
19584,C_Pirate_Dagger,Costume Dagger In Mouth,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,1,327,{},{},{}
19585,C_Feather_Beret,Costume Feather Beret,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,224,{},{},{}
-19586,C_Pink_Bunny_Hair_Band,Costume Pink Bunny Hair Band,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,898,{},{},{}
+19586,C_Pink_Bunny_Band_J,Costume Pink Bunny Hair Band,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,898,{},{},{}
19587,C_King_Poring_Hat,Costume King Poring Hat,4,0,,100,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,905,{ bonus bUnbreakableHelm,1; },{},{}
19588,C_Cat_Hat_J,Costume Cat Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,182,{ bonus bAllStats,3; bonus2 bExpAddClass,Class_All,30; },{},{}
19589,C_Fallen_Angel_Lost_J,Costume Fallen Angel Lost,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,0,0,907,{},{},{}
-19590,C_Twin_Maiden_Ribbon_J,Costume Maiden's Twin Ribbon,4,20,,0,,0,,0,0xFFFFFFFF,63,2,1024,,0,0,239,{},{},{}
+19590,C_Twin_Ribbon_J,Costume Maiden's Twin Ribbon,4,20,,0,,0,,0,0xFFFFFFFF,63,2,1024,,0,0,239,{},{},{}
19591,C_Ribbon_Red,Costume Red Ribbon,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,1,246,{},{},{}
19592,C_Hibiscus,Costume Hibiscus,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,1,210,{},{},{}
19593,C_Laurel_Wreath,Costume Laurel Wreath,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,1,237,{},{},{}
19594,C_Decorative_Geographer,Costume Decorative Geographer,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,1,238,{},{},{}
-19595,C_Aprils_Fool_Day,Costume April's Fool Day,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,1,265,{},{},{}
+19595,C_Dress_Hat_J,Costume April's Fool Day,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,1,265,{},{},{}
19596,C_Flapping_Angel_Wing,Costume Flapping Angel Wing,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,1,264,{},{},{}
19597,C_Magic_Eyes,Costume Magic Eyes,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,1,209,{},{},{}
-19598,C_Wandering_Wolf_Hat,Costume Wandering Wolf Hat,4,20,,0,,0,,0,0xFFFFFFFE,63,2,1024,,0,0,490,{},{},{}
+19598,C_Wondering_Wolf_Helm,Costume Wandering Wolf Hat,4,20,,0,,0,,0,0xFFFFFFFE,63,2,1024,,0,0,490,{},{},{}
19599,C_Imp_Hat,Costume Imp Hat,4,20,,400,,1,,0,0xFFFFFFFF,63,2,1024,,1,1,589,{ bonus3 bAutoSpell,"SA_FLAMELAUNCHER",1,5; },{},{}
-19600,C_Drooping_Kiehl,Costume Drooping Kiehl,4,0,,40,,,,,0xFFFFFFFF,63,2,1024,,30,,909,{},{},{}
-19601,C_Drooping_Aliot,Costume Drooping Aliot,4,0,,10,,,,,0xFFFFFFFF,63,2,1024,,1,,910,{},{},{}
+19600,Drooping_Kiehl,Costume Drooping Kiehl,4,0,,40,,,,,0xFFFFFFFF,63,2,1024,,30,,909,{},{},{}
+19601,Drooping_Aliot,Costume Drooping Aliot,4,0,,10,,,,,0xFFFFFFFF,63,2,1024,,1,,910,{},{},{}
19602,C_Invisible_Cap,Costume Invisible Cap,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,0,{},{},{}
19603,C_Invisible_Sunglasses,Costume Invisible Sunglasses,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,0,{},{},{}
-19604,C_Invisible_Flu_Mask,Costume Invisible Flu Mask,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,0,{},{},{}
+19604,C_Invisible_Mask,Costume Invisible Flu Mask,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,0,{},{},{}
19605,C_Gang_Scarf,Costume Gang Scarf,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,1,369,{},{},{}
19606,C_Ninja_Scroll,Costume Ninja Scroll,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,1,370,{},{},{}
19607,C_Love_Chick_Hat,Costume Love Chick Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,500,{},{},{}
-19608,C_Baby_Chick,Costume Baby Chick,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,311,{},{},{}
+19608,C_Chick_Hat,Costume Baby Chick,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,311,{},{},{}
19609,C_Red_Glasses,Costume Red Glasses,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,1,316,{},{},{}
19610,C_Whisper_Mask,Costume Whisper Mask,4,0,,0,,0,,0,0xFFFFFFFF,63,2,7168,,1,1,321,{},{},{}
19611,C_Peco_Ears,Costume Peco Ears,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,1,366,{},{},{}
19612,C_Note_Headphone,Costume Note Headphone,4,0,,0,,0,,0,0xFFFFFFFF,63,2,3072,,1,1,220,{},{},{}
-19613,C_Valkyrie_Feather_Hat,Costume Valkyrie Feather Hat,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,300,{},{},{}
+19613,C_Valkyrie_Feather_Band,Costume Valkyrie Feather Hat,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,300,{},{},{}
19614,C_Super_Novice_Hat,Costume Super Novice Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,1,193,{},{},{}
19615,C_Loki_Mask,Costume Loki Mask,4,0,,0,,0,,0,0xFFFFFFFF,63,2,6144,,1,1,346,{},{},{}
19616,C_Wickebines_Black_Cat_Ears,Costume Wickebine's Black Cat Ears,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,1,368,{},{},{}
19617,C_Puppy_Headband,Costume Puppy Headband,4,0,,0,,,,,0xFFFFFFFF,63,2,1024,,,,199,{},{},{}
-19618,C_Kitsune_Mask,Costume Kitsune Mask,4,0,,0,,,,,0xFFFFFFFF,63,2,1024,,,,153,{},{},{}
+19618,C_Mask_Of_Fox,Costume Kitsune Mask,4,0,,0,,,,,0xFFFFFFFF,63,2,1024,,,,153,{},{},{}
19619,C_Corsair,Costume Corsair,4,0,,0,,,,,0xFFFFFFFF,63,2,1024,,0,0,105,{ bonus bVit,1; },{},{}
19620,C_Dectective_Hat,Costume Detective Hat,4,0,,0,,,,,0xFFFFFFFF,63,2,1024,,,,189,{},{},{}
19621,C_Ear_Of_Devils_Wing,Costume Evil Wing Ear,4,0,,0,,,,,0xFFFFFFFF,63,2,2048,,,,152,{},{},{}
@@ -10034,13 +10096,13 @@
19630,C_Crown,Costume Crown,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,45,{},{},{}
19631,C_Poring_Fedora_Hat,Costume Poring Fedora Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,1,919,{},{},{}
19632,C_Hat,Costume Hat,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,16,{},{},{}
-19633,C_Flower_Band,Costume Flower Band,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,5,{},{},{}
+19633,C_Flower_Hairband,Costume Flower Band,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,5,{},{},{}
19634,C_Flu_Mask,Costume Flu Mask,4,10,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,8,{},{},{}
19635,C_Mini_Propeller,Costume Mini Propeller,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,46,{},{},{}
-19636,C_Clown_Nose,Costume Clown Nose,4,10,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,49,{},{},{}
+19636,C_Pierrot_Nose,Costume Clown Nose,4,10,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,49,{},{},{}
19637,C_Nurse_Cap,Costume Nurse Cap,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,64,{},{},{}
-19638,C_Mr._Smile,Costume Mr. Smile,4,10,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,65,{},{},{}
-19639,C_Sakkat,Costume Sakkat,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,67,{},{},{}
+19638,C_Mr_Smile,Costume Mr. Smile,4,10,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,65,{},{},{}
+19639,C_Sahkkat,Costume Sakkat,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,67,{},{},{}
19640,C_Charming_Ribbon,Costume Charming Ribbon,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,1,211,{},{},{}
19641,C_Helm_of_Darkness,Costume Helm of Darkness,4,0,,0,,0,,0,0xFFFFFFFF,63,2,3072,,1,1,233,{},{},{}
19642,C_Moonlight_Flower_Hat,Costume Moonlight Flower Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,3072,,1,1,268,{},{},{}
@@ -10055,16 +10117,16 @@
19651,C_RWC_Shouting_Mouth,Costume RWC Shouting Mouth,4,10,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,0,194,{},{},{}
19652,C_Rabbit_Magic_Hat,Costume Rabbit Magic Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,1,497,{},{},{}
19653,C_Marcher_Hat,Costume Marcher Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,1,269,{},{},{}
-19654,C_Ship_Captain_Hat,Costume Ship Captain Hat,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,367,{},{},{}
+19654,C_J_Captain_Hat,Costume Ship Captain Hat,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,367,{},{},{}
19655,C_Tiraya_Bonnet,Costume Tiraya Bonnet,4,20,,0,,0,,0,0xFFFFFFFF,63,2,1024,,0,0,398,{},{},{}
-19656,C_Wandering_Minstrel_Hat,Wandering Minstrel Hat,4,20,,0,,0,,0,0xFFFFFFFF,63,2,1024,,0,0,240,{},{},{}
+19656,C_Minstrel_Hat,Wandering Minstrel Hat,4,20,,0,,0,,0,0xFFFFFFFF,63,2,1024,,0,0,240,{},{},{}
19657,C_Captain_Hat,Costume Captain Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,1,236,{},{},{}
19658,C_Vacation_Hat,Costume Vacation Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,1,315,{},{},{}
19659,C_Brown_Beanie,Costume Brown Beanie,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,1,279,{},{},{}
19660,C_Coppola,Costume Coppola,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,1,252,{},{},{}
19661,C_Sweet_Bonnet,Costume Sweet Bonnet,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,938,{},{},{}
19662,C_Magician_Hat,Costume Magician Hat,4,20,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,130,{},{},{}
-19663,C_Wish_Lamp,Costume Wish Lamp,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,1,947,{},{},{}
+19663,Wishing_Sky_Lantern,Costume Wish Lamp,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,1,947,{},{},{}
19664,C_Campus_Festival,Costume Campus Festival,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,1,721,{},{},{}
19665,C_Poring_Cake_Hat,Costume Poring Cake Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,1,417,{},{},{}
19666,C_Cookie_Hat,Costume Cookie Hat,4,20,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,217,{ bonus2 bAddItemHealRate,513,1100; },{},{}
@@ -10076,17 +10138,17 @@
19676,C_Rainbow_Poring_Hat,Costume Rainbow Poring Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,900,{},{},{}
19677,C_Soulless_Wing,Costume Soulless Wing,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,,301,{},{},{}
19678,C_Bell_Ribbon,Costume Bell Ribbon,4,20,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,388,{},{},{}
-19682,C_SantaPoring_Cap,Costume SantaPoring Cap,4,10,,100,,,,0,0xFFFFFFFF,63,2,1024,,1,1,387,{},{},{}
+19682,C_Santa_Poring_Hat,Costume SantaPoring Cap,4,10,,100,,,,0,0xFFFFFFFF,63,2,1024,,1,1,387,{},{},{}
19685,C_ShineSantaPoring,Costume Shining Santa Poring,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,961,{},{},{}
19686,C_SantaHairband,Costume Santa Hairband,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,964,{},{},{}
19687,C_Lush_Rose,Costume Lush Rose,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,963,{},{},{}
-19689,C_Ati_Atihan,Costume Ati Atihan,4,10,,0,,,,0,0xFFFFFFFF,63,2,7168,,1,0,303,{},{},{}
-19690,C_Dark_Snake_Lord_Hat,Costume Dark Snake Lord Hat,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,372,{},{},{}
+19689,C_Ati_Atihan_Hat,Costume Ati Atihan,4,10,,0,,,,0,0xFFFFFFFF,63,2,7168,,1,0,303,{},{},{}
+19690,C_Dark_Snake_Lord_Hat_J,Costume Dark Snake Lord Hat,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,372,{},{},{}
19695,C_Kettle_Hat,Costume Kettle Hat,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,318,{},{},{}
19696,C_Friend_Mochiring_Hat,Costume Friend Mochiring Hat,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,965,{},{},{}
19697,C_Rudolph_Santa_Hat,Costume Rudolph Santa Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,,1,619,{},{},{}
19701,C_Red_Bonnet,Costume Red Bonnet,4,10,,100,,,,0,0xFFFFFFFF,63,2,1024,,1,1,190,{},{},{}
-19702,C_Twin_Pompom_By_JB,Costume Twin Pompom By JB,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,390,{},{},{}
+19702,C_Santa_Hat_1,Costume Twin Pompom By JB,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,390,{},{},{}
19706,C_Red_Dress_Hat,Costume Red Dress Hat,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,670,{},{},{}
19707,C_Polar_Bear_Cap,Costume Polar Bear Cap,4,20,,0,,0,,0,0xFFFFFFFF,63,2,1024,,0,0,966,{ bonus bUnbreakableHelm,1; },{},{}
19708,C_White_Snake_Hat,Costume White Snake Hat,4,10,,0,,,,0,0xFFFFFFFF,63,2,256,,1,1,413,{},{},{}
@@ -10098,35 +10160,35 @@
19715,C_Scarf,Costume Scarf,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,343,{},{},{}
19716,C_Alice_Doll,Costume Alice Doll,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,208,{},{},{}
19717,C_Pink_Ribbon,Costume Pink Ribbon,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,245,{},{},{}
-19718,C_Gothic_Headdress,Costume Gothic Headdress,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,978,{},{},{}
+19718,C_Gothic_Head_Dress,Costume Gothic Headdress,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,978,{},{},{}
19719,C_Coronet,Costume Coronet,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,33,{},{},{}
19720,C_Romantic_Gent,Costume Romantic Gent,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,31,{},{},{}
19721,C_Darkness_Helm,Costume Darkness Helm,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,586,{},{},{}
19722,C_Black_Glasses,Costume Black Glasses,4,10,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,0,404,{},{},{}
19723,C_Sacred_Torch_Coronet,Costume Sacred Torch Coronet,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,431,{},{},{}
-19724,C_Deprote_Doll_Hat,Costume Deprote Doll Hat,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,354,{},{},{}
+19724,C_Deprotai_Doll_Hat,Costume Deprote Doll Hat,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,354,{},{},{}
19725,C_Bread_Bag,Costume Bread Bag,4,10,,0,,,,0,0xFFFFFFFF,63,2,7168,,1,0,412,{},{},{}
19726,C_Scarlet_Rose,Costume Scarlet Rose,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,534,{},{},{}
19727,C_Devilring_Hat,Costume Devilring Hat,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,298,{},{},{}
19728,C_Tare_Zonda,Costume Tare Zonda,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,985,{},{},{}
19729,C_Neko_Mimi_Kafra,Costume Neko Mimi Kafra,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,392,{},{},{}
19730,C_Snake_Hat,Costume Snake Hat,4,20,,10,,0,,0,0xFFFFFFFF,63,2,1024,,0,0,986,{},{},{}
-19731,C_Evolved_Evil_Wing,Costume Evolved Evil Wing,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,39,{ bonus bStr,1; bonus bAgi,1; bonus bFlee,3; bonus2 bSubRace,RC_Angel,3; },{},{}
-19732,C_Goblin_Leader_Mask,Costume Goblin Leader Mask,4,10,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,174,{},{},{}
+19731,C_Satanic_Chain,Costume Evolved Evil Wing,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,39,{ bonus bStr,1; bonus bAgi,1; bonus bFlee,3; bonus2 bSubRace,RC_Angel,3; },{},{}
+19732,C_Goblin_Mask_04,Costume Goblin Leader Mask,4,10,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,174,{},{},{}
19733,C_Panda_Cap,Costume Panda Cap,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,115,{ bonus bAllStats,1; bonus2 bExpAddClass,Class_All,10; },{},{}
19734,C_Binoculars,Costume Binoculars,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,83,{ bonus bDex,1; },{},{}
19735,C_Fin_Helm,Costume Fin Helm,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,100,{},{},{}
19736,C_Gas_Mask,Costume Gas Mask,4,10,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,91,{ bonus2 bResEff,Eff_Poison,3000; },{},{}
-19737,C_Refined_Corsair,Costume Refined Corsair,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,105,{ bonus bVit,3; bonus bInt,3; },{},{}
-19738,C_Renown_Detective's_Cap,Costume Renown Detective's Cap,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,189,{},{},{}
-19739,C_Sleeping_Kitty_Hat,Costume Sleeping Kitty Hat,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,838,{ bonus2 bAddRace,RC_Brute,2; },{},{}
+19737,C_Corsair_K,Costume Refined Corsair,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,105,{ bonus bVit,3; bonus bInt,3; },{},{}
+19738,C_Detective_Hat_K,Costume Renown Detective's Cap,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,189,{},{},{}
+19739,C_Sleeping_Kitty_Cat,Costume Sleeping Kitty Hat,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,838,{ bonus2 bAddRace,RC_Brute,2; },{},{}
19741,C_Majestic_Devil_Horns,Costume Majestic Devil Horns,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,562,{},{},{}
19742,C_Small_Golden_Wings,Costume Small Golden Wings,4,10,,0,,,,0,0xFFFFFFFF,63,2,2048,,,,724,{ bonus2 bExpAddRace,RC_All,1; },{},{}
19743,C_Anubis_Helm,Costume Anubis Helm,4,10,,0,,,,0,0xFFFFFFFF,63,2,7168,,1,0,485,{},{},{}
19744,C_Black_Tail_Ribbon,Costume Black Tail Ribbon,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,642,{},{},{}
19745,C_Holy_Marching_Hat,Costume Holy Marching Hat,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,587,{},{},{}
-19746,C_Executioner_Hood,Costume Executioner Hood,4,20,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,1,326,{},{},{}
-19747,C_Tha_Despero_Mask,Costume Tha Despero Mask,4,20,,0,,0,,0,0xFFFFFFFF,63,2,6144,,1,1,693,{},{},{}
+19746,C_Cap_Of_Blindness,Costume Executioner Hood,4,20,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,1,326,{},{},{}
+19747,C_Tha_Despero_Mask_,Costume Tha Despero Mask,4,20,,0,,0,,0,0xFFFFFFFF,63,2,6144,,1,1,693,{},{},{}
19748,C_Diadem,Costume Diadem,4,20,,0,,0,,0,0xFFFFFFFF,63,2,3072,,1,1,335,{},{},{}
19749,C_Gold_Spirit_Chain,Costume Gold Spirit Chain,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,260,{},{},{}
19750,C_Saint_Frill_Ribbon,Costume Saint Frill Ribbon,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,987,{},{},{}
@@ -10148,36 +10210,36 @@
19767,C_Home_Cherry_Blossom,Costume Home Cherry Blossom,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,602,{},{},{}
19768,C_Sakura_Coronet,Costume Sakura Coronet,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,645,{},{},{}
19772,C_Honeybee_Hat,Costume Honeybee Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,709,{},{},{}
-19775,C_Dokebi_Hat,Costume Dokebi Hat,4,20,,10,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,307,{},{},{}
-19777,C_Shiny_Small_Star,Costume Shiny Small Star,4,20,,10,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1005,{},{},{}
+19775,C_Marvelous_Wig,Costume Dokebi Hat,4,20,,10,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,307,{},{},{}
+19777,C_Twinkle_Little_Star,Costume Shiny Small Star,4,20,,10,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1005,{},{},{}
19778,C_King_Berry,Costume King Berry,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,968,{},{},{}
19779,C_Persika,Costume Persika,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,659,{ bonus bAllStats,1; bonus2 bExpAddClass,Class_All,10; },{},{}
19780,C_Rabbit_Ear_Knit_Hat,Costume Knit Rabbit Ears,4,20,,10,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,867,{ bonus bMaxHPrate,3; bonus bMaxSPrate,3; },{},{}
-19781,C_Angel_Wing_Ears,Costume Angel Wing Ears,4,10,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,158,{},{},{}
-19782,C_Refined_Drooping_Cat,Costume Refined Drooping Cat,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,142,{},{},{}
-19783,C_Grampa_Beard,Costume Grampa Beard,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,25,{},{},{}
+19781,C_Ear_Of_Angel's_Wing_,Costume Angel Wing Ears,4,10,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,158,{},{},{}
+19782,C_Drooping_Kitty,Costume Refined Drooping Cat,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,142,{},{},{}
+19783,C_Granpa_Beard,Costume Grampa Beard,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,25,{},{},{}
19784,C_Morrigane's_Helm,Costume Morrigane's Helm,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,257,{},{},{}
-19785,C_Crunch_Toast,Costume Crunch Toast,4,10,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,188,{},{},{}
-19786,C_Crown_of_Mistress,Costume Crown of Mistress,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,165,{},{},{}
-19789,C_Sweet_Gent,Costume Sweet Gent,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,29,{},{},{}
+19785,C_Well_Baked_Toast,Costume Crunch Toast,4,10,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,188,{},{},{}
+19786,C_Mistress_Crown,Costume Crown of Mistress,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,165,{},{},{}
+19789,C_Sweet_Gents,Costume Sweet Gent,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,29,{},{},{}
19790,C_Wedding_Veil,Costume Wedding Veil,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,44,{},{},{}
19791,C_Alarm_Mask,Costume Alarm Mask,4,10,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,170,{},{},{}
19792,C_Goblin_Mask_01,Costume Poker Face,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,171,{},{},{}
19793,C_Goblin_Mask_02,Costume Surprised Mask,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,172,{},{},{}
19794,C_Goblin_Mask_03,Costume Annoyed Mask,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,173,{},{},{}
-19795,C_Grand_Circlet,Costume Grand Circlet,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,93,{},{},{}
+19795,C_Lord_Circlet,Costume Grand Circlet,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,93,{},{},{}
19796,C_Bone_Helm,Costume Bone Helm,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,103,{},{},{}
-19797,C_Apple_of_Archer,Costume Apple of Archer,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,72,{},{},{}
+19797,C_Apple_Of_Archer,Costume Apple of Archer,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,72,{},{},{}
19798,C_Angry_Mouth,Costume Angry Snarl,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,194,{},{},{}
19799,C_Golden_Gear,Costume Golden Gear,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,30,{},{},{}
19800,C_Carnation_Hairband,Costume Carnation Headband,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,878,{},{},{}
-19821,C_Hyegun_hat,Costume Yao Jun,4,20,,10,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,375,{},{},{}
+19821,C_Hyegun_Hat,Costume Yao Jun,4,20,,10,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,375,{},{},{}
19823,C_White_Cat_Hood,Costume White Cat Hood,4,20,,10,,0,,0,0xFFFFFFFF,63,2,3072,,1,0,1052,{},{},{}
19824,C_Evil_Druid_Hat,Costume Evil Druid Hat,4,0,,0,,,,,0xFFFFFFFF,63,2,1024,,1,,1053,{},{},{}
19825,C_Vicious_Stop_Bandage,Costume Vicious Stop Bandage,4,0,,0,,,,,0xFFFFFFFF,63,2,1024,,1,,1054,{},{},{}
19826,C_Ice_Wing_Ear,Costume Ice Wing Ear,4,20,,10,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,584,{},{},{}
19827,C_Amistr_Cap,Costume Amistr,4,20,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,643,{},{},{}
-19828,C_Bucket_Hat,Costume Bucket Hat,4,20,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,195,{},{},{}
+19828,C_Fedora,Costume Bucket Hat,4,20,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,195,{},{},{}
19829,C_Straw_Hat,Costume Straw Hat,4,20,,0,,0,,0,0xFFFFFFFF,63,2,1024,,0,0,146,{},{},{}
19830,C_Sunglasses,Costume Sunglasses,4,10,,0,,,,,0xFFFFFFFF,63,2,2048,,1,,12,{},{},{}
19831,C_Filir_Hat,Costume Filir Hat,4,20,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,408,{},{},{}
@@ -10192,8 +10254,8 @@
19843,C_Cat_Hairband,Costume Kitty Band,4,20,,10,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,2,{},{},{}
19844,C_Turban,Costume Turban,4,20,,10,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,7,{},{},{}
19845,C_Hair_Protector,Costume Bao Bao,4,20,,10,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,127,{},{},{}
-19846,C_Phantom_Of_Opera,Costume Opera Masque,4,20,,10,,0,,0,0xFFFFFFFF,63,2,6144,,1,0,128,{},{},{}
-19847,C_Big_Sis'_Ribbon,Costume Big Ribbon,4,20,,10,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,28,{},{},{}
+19846,C_Opera_Ghost_Mask,Costume Opera Masque,4,20,,10,,0,,0,0xFFFFFFFF,63,2,6144,,1,0,128,{},{},{}
+19847,C_Big_Sis_Ribbon,Costume Big Ribbon,4,20,,10,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,28,{},{},{}
19848,C_Angeling_Hat,Costume Angeling Hat,4,20,,10,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,204,{},{},{}
19849,C_Munak_Turban,Costume Munak Hat,4,20,,10,,0,,0,0xFFFFFFFF,63,2,7168,,1,0,51,{},{},{}
19850,C_Bongun_Hat,Costume Bongun Hat,4,20,,10,,0,,0,0xFFFFFFFF,63,2,7168,,1,0,139,{},{},{}
@@ -10203,49 +10265,49 @@
19854,C_Ear_Of_Black_Cat_,Costume Black Cat Ears,4,20,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,141,{},{},{}
19856,C_Iceflake_Hat,Costume Snow Cone Hat,4,10,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1080,{ bonus2 bAddEle,Ele_Fire,5; bonus2 bMagicAddEle,Ele_Fire,5; bonus2 bAddMonsterDropItem,11589,5; },{},{}
19857,C_King_Prawn_Hat,Costume Crayfish Hat,4,10,,10,,0,,,0xFFFFFFFF,63,2,1024,,1,0,728,{},{},{}
-19858,C_Smokie_Leaf,Costume Smokie Leaf,4,20,,,,,,,0xFFFFFFFF,63,2,1024,,1,0,148,{},{},{}
+19858,C_Leaf_Headgear,Costume Smokie Leaf,4,20,,,,,,,0xFFFFFFFF,63,2,1024,,1,0,148,{},{},{}
19859,C_Flying_Angel,Costume Flying Angel,4,20,,0,,0,,0,0xFFFFFFFF,63,2,1024,,0,0,264,{},{},{}
-19860,C_School_Criatura_Hat,Costume School Criatura Hat,4,20,,0,,0,,0,0xFFFFFFFF,63,2,1024,,0,0,872,{},{},{}
-19861,C_Heart_Hairpin,Costume Heart Hairpin,4,20,,0,,0,,0,0xFFFFFFFF,63,2,1024,,0,0,126,{},{},{}
-19862,C_Succubus_Horn,Costume Succubus Horn,4,20,,0,,0,,0,0xFFFFFFFF,63,2,1024,,0,0,150,{},{},{}
-19863,C_Incubus_Horn,Costume Incubus Horn,4,20,,0,,0,,0,0xFFFFFFFF,63,2,1024,,0,0,156,{},{},{}
+19860,C_Cryptura_Hair_Cap,Costume School Criatura Hat,4,20,,0,,0,,0,0xFFFFFFFF,63,2,1024,,0,0,872,{},{},{}
+19861,C_Heart_Hair_Pin,Costume Heart Hairpin,4,20,,0,,0,,0,0xFFFFFFFF,63,2,1024,,0,0,126,{},{},{}
+19862,C_Horn_Of_Succubus,Costume Succubus Horn,4,20,,0,,0,,0,0xFFFFFFFF,63,2,1024,,0,0,150,{},{},{}
+19863,C_Inccubus_Horn,Costume Incubus Horn,4,20,,0,,0,,0,0xFFFFFFFF,63,2,1024,,0,0,156,{},{},{}
19864,C_Dokebi's_Wig,Costume Dokebi's Wig,4,20,,0,,0,,0,0xFFFFFFFF,63,2,3072,,0,0,302,{},{},{}
19865,C_Joker_Jester,Costume Joker Jester,4,20,,0,,0,,0,0xFFFFFFFF,63,2,1024,,0,0,89,{},{},{}
-19871,C_DecorationOfMusic_Accessory,Costume Decoration of Music,4,20,,0,,0,,0,0xFFFFFFFF,63,2,2048,,0,0,1074,{},{ sc_start SC_DECORATION_OF_MUSIC,-1,0; },{ sc_end SC_DECORATION_OF_MUSIC; }
-19876,C_Bunny_Top_Hat,Costume Bunny Top Hat,4,0,,0,,,,,0xFFFFFFFF,63,2,1024,,1,,384,{},{},{}
-19878,C_Evolved_Drooping_Bunny,Costume Evolved Drooping Bunny,4,0,,0,,,,,0xFFFFFFFF,63,2,1024,,1,,249,{},{},{}
+19871,C_Music_Decoration,Costume Decoration of Music,4,20,,0,,0,,0,0xFFFFFFFF,63,2,2048,,0,0,1074,{},{ sc_start SC_DECORATION_OF_MUSIC,-1,0; },{ sc_end SC_DECORATION_OF_MUSIC; }
+19876,C_Rabbit_Ear_Hat,Costume Bunny Top Hat,4,0,,0,,,,,0xFFFFFFFF,63,2,1024,,1,,384,{},{},{}
+19878,C_Drooping_Bunny,Costume Evolved Drooping Bunny,4,0,,0,,,,,0xFFFFFFFF,63,2,1024,,1,,249,{},{},{}
19882,C_Flowerpot_Mask,Costume Flowerpot Mask,4,0,,0,,,,,0xFFFFFFFF,63,2,4096,,1,,1086,{},{},{}
19883,C_Piamette_Hood,Costume Piamette Hood,4,0,,0,,,,,0xFFFFFFFF,63,2,1024,,1,,1087,{},{},{}
19884,C_Vanargandr_Helm,Costume Vanargand Helm,4,10,,0,,,,,0xFFFFFFFF,63,2,1024,,1,,804,{},{},{}
19885,C_Blinker,Costume Blinker,4,10,,0,,,,,0xFFFFFFFF,63,2,2048,,1,,82,{},{},{}
-19886,C_Purple_Glasses,Costume Purple Glasses,4,10,,0,,,,,0xFFFFFFFF,63,2,2048,,1,,26,{},{},{}
-19887,C_Cyclops_Glasses,Costume Cyclops Glasses,4,10,,0,,,,,0xFFFFFFFF,63,2,2048,,1,,23,{},{},{}
+19886,C_Luxury_Sunglasses,Costume Purple Glasses,4,10,,0,,,,,0xFFFFFFFF,63,2,2048,,1,,26,{},{},{}
+19887,C_One_Eyed_Glass,Costume Cyclops Glasses,4,10,,0,,,,,0xFFFFFFFF,63,2,2048,,1,,23,{},{},{}
19888,C_Glasses,Costume Glasses,4,10,,0,,,,,0xFFFFFFFF,63,2,2048,,1,,3,{},{},{}
-19889,C_Small_Ribbons,Costume Small Ribbons,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,,,169,{},{},{}
-19902,C_Cigarette,Costume Cigarette,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,,,54,{},{},{}
+19889,C_Pair_Of_Red_Ribbon,Costume Small Ribbons,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,,,169,{},{},{}
+19902,C_Cigar,Costume Cigarette,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,,,54,{},{},{}
19903,C_Witchs_Hat,Costume Witch's Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,717,{ bonus bVariableCastrate,-10; },{},{}
19910,C_Halloween_Hat,Costume Halloween Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,,1,1098,{},{},{}
19913,C_Poo_Poo_Hat,Costume Poo Poo Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,,1,76,{},{},{}
-19914,C_Tarlock's_Hat,Costume Tarlock's Hat,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1101,{},{},{}
+19914,Felock_Cap,Costume Tarlock's Hat,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1101,{},{},{}
19916,C_Black_Cat_Hat,Costume Black Cat Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1105,{},{},{}
19917,C_Gloomy_Pumpkin_Hat,Costume Pumpkin Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,691,{ bonus bSpeedRate,25; },{},{}
19918,C_Lude_Mask,Costume Lude Mask,4,0,,0,,0,,0,0xFFFFFFFF,63,2,6144,,1,0,802,{ bonus bAddItemHealRate,20; },{},{}
19919,C_Cube_Mask_,Costume Quve Mask,4,0,,0,,0,,0,0xFFFFFFFF,63,2,6144,,1,0,472,{ bonus bAspdRate,10; },{},{}
19920,C_Adv_Whisper_Mask,Costume Evolved Whisper Mask,4,0,,0,,0,,0,0xFFFFFFFF,63,2,7168,,1,0,458,{ bonus bFlee,20; },{},{}
-19922,C_Noah's_Hat,Costume Noah's Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,7168,,1,0,636,{},{},{}
-19925,C_Monocle,Costume Monocle,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,23,{},{},{}
+19922,C_Noah_Hat,Costume Noah's Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,7168,,1,0,636,{},{},{}
+19925,C_One_Eyed_Glasses,Costume Monocle,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,23,{},{},{}
19928,C_Gothic_Heart_Wing,Costume Gothic Heart Wing,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1111,{},{},{}
19929,C_Classical_Ribbon,Costume Classical Ribbon,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,,1,1112,{},{},{}
19930,C_Angel_Mini_Silk_Hat,Costume Angel Mini Silk Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1113,{},{},{}
-19931,C_Lazy_Smokie,Costume Lazy Smokie,4,10,,0,,,,0,0xFFFFFFFF,63,2,4096,,,1,168,{},{},{}
-19932,C_Model_Training_Hat,Costume Model Training Hat,4,10,,0,,,,0,0xFFFFFFFF,63,2,4096,,,1,157,{},{},{}
-19934,C_Lolita_Ten_Gallon_Hat,Costume Alive Ten Gallon Hat Of Flame,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1075,{},{},{}
+19931,C_Lazy_Raccoon,Costume Lazy Smokie,4,10,,0,,,,0,0xFFFFFFFF,63,2,4096,,,1,168,{},{},{}
+19932,C_Cap_Of_Concentration,Costume Model Training Hat,4,10,,0,,,,0,0xFFFFFFFF,63,2,4096,,,1,157,{},{},{}
+19934,C_10Gallon_Hat_Of_Flame,Costume Alive Ten Gallon Hat Of Flame,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1075,{},{},{}
19935,C_Hunting_Cap_Of_Gust,Costume Hunting Cap Of Gust,4,0,,0,,,,,0xFFFFFFFF,63,2,1024,,1,1,1076,{},{},{}
19936,C_Knit_Cap_Of_Water,Costume Knit Cap Of Water,4,0,,0,,,,,0xFFFFFFFF,63,2,1024,,1,1,1077,{},{},{}
-19937,C_Silk_Hat_of_Earth,Costume Silk Hat of Earth,4,0,,0,,,,,0xFFFFFFFF,63,2,1024,,1,1,1078,{},{},{}
+19937,C_Silk_Hat_Of_Earth,Costume Silk Hat of Earth,4,0,,0,,,,,0xFFFFFFFF,63,2,1024,,1,1,1078,{},{},{}
19938,C_Love_Rabbit_Hood,Costume Love Rabbit Hood,4,0,,0,,0,,0,0xFFFFFFFF,63,2,7168,,1,1,549,{},{},{}
-19939,C_Antlers,Costume Antlers,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,71,{},{},{}
-19941,C_Ear_Muffs,Costume Ear Muffs,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,1,70,{},{},{}
+19939,C_Antler,Costume Antlers,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,71,{},{},{}
+19941,C_Ear_Mufs,Costume Ear Muffs,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,1,70,{},{},{}
19949,C_RWC2013_Japan_Hat,Costume RWC2013 Japan Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1136,{},{},{}
19952,C_Bubble_Gum_in_Mouth,Costume Bubble Gum in Mouth,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,572,{},{},{}
19953,C_Parade_Cap,Costume Parade Cap,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,465,{},{},{}
@@ -10261,23 +10323,23 @@
19963,C_Driver_Band_R,Costume Driver Band(Red),4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,626,{},{},{}
19964,C_Driver_Band_Y,Costume Driver Band(Yellow),4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,637,{},{},{}
19965,C_Shadow_Handicraft,Costume Shadow Handicraft,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,627,{},{},{}
-19966,C_Minstrel_Song's_Hat,Costume Minstrel Song's Hat,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,628,{},{},{}
+19966,C_Minstrel_Song_Hat,Costume Minstrel Song's Hat,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,628,{},{},{}
19967,C_Midas_Whisper,Costume Midas Whisper,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,629,{},{},{}
19968,C_Magic_Stone_Hat,Costume Magic Stone Hat,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,630,{},{},{}
19969,C_Blazing_Soul,Costume Blazing Soul,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,631,{},{},{}
19970,C_Wind_Whisper,Costume Wind Whisper,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,633,{},{},{}
19971,C_Dying_Swan,Costume Dying Swan,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,635,{},{},{}
19972,C_Protect_Of_Crown,Costume Protect Of Crown,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1140,{},{},{}
-19973,C_Circlet_Of_Bones,Costume Circlet Of Bones,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1141,{},{},{}
-19974,C_Camouflage_Rabbit_Hood,Costume Camouflage Rabbit Hood,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1142,{},{},{}
+19973,C_Circlet_Of_Bone,Costume Circlet Of Bones,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1141,{},{},{}
+19974,C_Camouflage_RabbitHood,Costume Camouflage Rabbit Hood,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1142,{},{},{}
19976,C_Cat_Santa_Hat,Cat Santa Hat,4,20,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1144,{ bonus bAspdRate,10; bonus bSpeedRate,25; },{},{}
-19977,C_Golden_Exclamation_Mark,Costume Golden Exclamation Mark,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1145,{},{},{}
-19978,C_Silver_Exclamation_Mark,Costume Silver Exclamation Mark,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1146,{},{},{}
-19979,C_Golden_Question_Mark,Costume Golden Question Mark,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1147,{},{},{}
-19980,C_Silver_Question_Mark,Costume Silver Question Mark,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1148,{},{},{}
-19982,C_Santa_Hat,Costume Santa Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,,1,20,{},{},{}
+19977,C_Golden_Exclamation,Costume Golden Exclamation Mark,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1145,{},{},{}
+19978,C_Silver_Exclamation,Costume Silver Exclamation Mark,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1146,{},{},{}
+19979,C_Golden_Question,Costume Golden Question Mark,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1147,{},{},{}
+19980,C_Silver_Question,Costume Silver Question Mark,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1148,{},{},{}
+19982,C_Santa's_Hat,Costume Santa Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,,1,20,{},{},{}
19983,C_Flower_Hairpin,Costume Flower Hairpin,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,145,{},{},{}
-19984,C_Fashion_Winter_Hat,Costume Fashion Winter Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,196,{},{},{}
+19984,C_Winter_Hat,Costume Fashion Winter Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,196,{},{},{}
19985,C_Aura_Quartz_Crown,Costume Aura Quartz,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,866,{},{},{}
19986,C_Lunatic_Hat,Costume Lunatic Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,521,{},{},{}
19987,C_Blue_Fur_Hat,Costume Blue Fur Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,280,{},{},{}
@@ -10305,12 +10367,12 @@
20011,C_Lightning_Speed,Costume Lightning Speed,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1199,{},{},{}
20012,C_Double_Horn_Helm,Costume Double Horn Helm,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1200,{},{},{}
20013,C_Chef_Hat,Costume Chef Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,111,{},{},{}
-20014,C_Lincoln_Hat,Costume Lincoln Hat,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,,1,1204,{},{},{}
-20015,C_Lincoln_Beard,Costume Lincoln Beard,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,,1,1205,{},{},{}
-20016,C_Cool_Dinner_Hat,Costume Cool Dinner Hat,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,,1,1206,{},{},{}
+20014,Lincoln_Hat,Costume Lincoln Hat,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,,1,1204,{},{},{}
+20015,Lincoln_Beard,Costume Lincoln Beard,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,,1,1205,{},{},{}
+20016,Lobster_Hat,Costume Cool Dinner Hat,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,,1,1206,{},{},{}
20017,C_Marionette_Doll,Costume Marionette Doll,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,,1,212,{},{},{}
20018,C_Holo_Ear,Costume Holo Ear,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,,1,1208,{},{},{}
-20019,C_Beret_Of_Artist,Costume Beret Of Artist,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,,1,1209,{},{},{}
+20019,Beret_Of_Artist,Costume Beret Of Artist,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,,1,1209,{},{},{}
20020,C_Zaha_Doll_Hat,Costume Zaha Doll Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,461,{},{},{}
20021,C_Heart_Ribbon_Hairband,Costume Heart Ribbon Hairband,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,708,{},{},{}
20022,C_Love_Fragment,Costume Love Fragment,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,734,{},{},{}
@@ -10322,7 +10384,7 @@
20028,C_Cow_Hat4,Costume Cow Hat 4,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1214,{ bonus bDex,2; bonus2 bAddMonsterDropItem,519,100; },{},{}
20029,C_Donut_in_Mouth,Costume Donut in Mouth,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,569,{},{},{}
20030,C_Choco_Donut_in_Mouth,Costume Choco Donut in Mouth,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,653,{},{},{}
-20031,C_Bunny_Headress,Costume Bunny Headress,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1215,{},{},{}
+20031,C_Bunny_Head_Dress,Costume Bunny Headress,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1215,{},{},{}
20032,C_Firinto_Scarf,Costume Firinto Scarf,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1216,{},{},{}
20033,C_Buddhist_Priest_Crown,Costume Monk Crown,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1217,{},{},{}
20034,C_Jack_Castle_Bat,Costume Jack Castle Bat,4,10,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1041,{},{},{}
@@ -10340,14 +10402,14 @@
20046,C_Decoration_bluerose,Costume Blue Ribbon Band,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1222,{},{},{}
20047,C_Pray_Cherry_Blossom,Costume Prayer Cherry Blossom,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1223,{},{},{}
20048,C_Wind_Of_The_Prairie,Costume Wind Prairie,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1224,{},{},{}
-20049,C_Giant_Band_Aid,Costume Giant Band Aid,4,0,,0,,,,,0xFFFFFFFF,63,2,1024,,1,,147,{},{},{}
+20049,C_Plaster,Costume Giant Band Aid,4,0,,0,,,,,0xFFFFFFFF,63,2,1024,,1,,147,{},{},{}
20050,C_Ph.D_Hat,Costume Ph.D Hat,4,0,,0,,,,,0xFFFFFFFF,63,2,1024,,1,,98,{},{},{}
20051,C_Stop_Post,Costume Stop Post,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,59,{},{},{}
20052,C_AFK_Hat,Costume AFK Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,471,{},{},{}
20053,C_W_King_Tiger_Doll_Hat,Costume White King Tiger Doll Hat,4,10,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,973,{},{},{}
20054,C_Baby_Pacifier,Costume Baby Pacifier,4,0,,0,,,,,0xFFFFFFFF,63,2,4096,,1,,191,{},{},{}
20055,C_Ghost_Bandana,Costume Ghost Bandana,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,61,{},{},{}
-20056,C_Bride's_Corolla,Costume Bride's Corolla,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,437,{},{},{}
+20056,C_Bride_Corolla,Costume Bride's Corolla,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,437,{},{},{}
20057,C_Feather_Bonnet,Costume Feather Bonnet,4,0,,0,,,,,0xFFFFFFFF,63,2,1024,,1,,104,{},{},{}
20058,C_Hot_Blood_Headband,Costume Hot Blood Headband,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,154,{},{},{}
20059,C_Welding_Mask,Costume Welding Mask,4,0,,0,,,,0,0xFFFFFFFF,63,2,6144,,1,1,79,{},{},{}
@@ -10374,22 +10436,22 @@
20081,C_Metal_Dragon_Helm,Costume Metal Dragon Helm,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1242,{},{},{}
20082,C_Metal_Dragon_Hat,Costume Metal Dragon Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1243,{},{},{}
20083,C_Mythlit_Hat,Costume Mythlit Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1244,{},{},{}
-20084,C_Ceremonial_Hat,Costume Ceremonial Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,325,{},{},{}
-20085,C_St_Patrick's_Hat,Costume St Patrick's Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,735,{},{},{}
+20084,C_Clover_Coronet,Costume Ceremonial Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,325,{},{},{}
+20085,C_Clover_Silkhat,Costume St Patrick's Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,735,{},{},{}
20086,C_Dragon_Cintamani_Hat1,Costume Dragon Cintamani Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1245,{},{},{}
20087,C_Dragon_Cintamani_Hat2,Costume Dragon Cintamani Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1246,{},{},{}
20088,C_Dragon_Cintamani_Hat3,Costume Dragon Cintamani Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1247,{},{},{}
20089,C_Dragon_Cintamani_Hat4,Costume Dragon Cintamani Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1248,{},{},{}
20090,C_Egg_Shell,Costume Egg Shell,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,101,{},{},{}
-20091,C_Pipe,Costume Pipe,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,55,{},{},{}
-20092,C_Sales_Banner,Costume Sales Banner,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,183,{},{},{}
-20093,C_Wizard_Hat,Costume Wizard Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,36,{},{},{}
-20094,C_Green_Ribbon,Costume Green Ribbon,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,439,{},{},{}
-20095,C_Red_Ribbon,Costume Red Ribbon,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,440,{},{},{}
-20096,C_Blue_Ribbon,Costume Blue Ribbon,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,441,{},{},{}
-20097,C_White_Ribbon,Costume White Ribbon,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,442,{},{},{}
+20091,C_Smoking_Pipe,Costume Pipe,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,55,{},{},{}
+20092,C_Sales_Signboard,Costume Sales Banner,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,183,{},{},{}
+20093,C_Star_Sparkling,Costume Wizard Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,36,{},{},{}
+20094,C_Fillet_Green,Costume Green Ribbon,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,439,{},{},{}
+20095,C_Fillet_Red,Costume Red Ribbon,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,440,{},{},{}
+20096,C_Fillet_Blue,Costume Blue Ribbon,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,441,{},{},{}
+20097,C_Fillet_White,Costume White Ribbon,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,442,{},{},{}
20098,C_Vampire_Hairband,Costume Vampire Hairband,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1238,{},{},{}
-20099,C_Ljosalfar,Flying Ljosalfar,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,1,1,1,1239,{},{ sc_start SC_LJOSALFAR,-1,0; },{ sc_end SC_LJOSALFAR; }
+20099,C_Ljosalfar,Flying Ljosalfar,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1239,{},{ sc_start SC_LJOSALFAR,-1,0; },{ sc_end SC_LJOSALFAR; }
20100,C_Volume_Fhat,Costume Volume Fhat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1240,{},{},{}
20101,C_Bragi_Wing_Ears,Costume Bragi Wing Ears,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1241,{},{},{}
20102,C_Horse_King_J,Costume Horse King J,4,0,,0,,,,0,0xFFFFFFFF,63,2,7168,,1,1,1189,{},{},{}
@@ -10404,15 +10466,15 @@
20111,C_Coiledup_Snake_Hat2,Costume Coiledup Snake Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1259,{},{},{}
20112,C_Aqua_Ten_Gallon_Hat,Costume Aqua Ten Gallon Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1256,{},{},{}
20113,C_Star_Reading_Hat,Costume Star Reading Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1253,{},{},{}
-20114,C_Funeral_Hat,Costume Funeral Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,77,{},{},{}
-20115,C_Under_Rim_Glasses,Under Rim Glasses,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,1,1,1,1255,{},{},{}
-20116,C_Mermaid_Headphone,Mermaid Headphone,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,1,1,1,1254,{},{},{}
-20117,C_Raspberry_Mousse_Hat,Raspberry Mousse Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,1,1,1,1257,{},{},{}
-20118,C_Cake_Hat,Costume Cake Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,109,{},{},{}
-20119,C_Beanie,Costume Beanie,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,160,{},{},{}
-20120,C_Aerial,Costume Aerial,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,97,{},{},{}
-20121,C_Flower_Lily,Costume Flower Lily,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,324,{},{},{}
-20122,C_Happy_Summer_Ribbon,Costume Happy Summer Ribbon,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1260,{},{},{}
+20114,C_Funeral_Costume,Costume Funeral Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,77,{},{},{}
+20115,C_Under_Rim_Glasses,Under Rim Glasses,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,1255,{},{},{}
+20116,C_Mermaid_Headphone,Mermaid Headphone,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,1254,{},{},{}
+20117,C_Raspberry_Mousse_Hat,Raspberry Mousse Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1257,{},{},{}
+20118,C_Hat_Of_Cake,Costume Cake Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,109,{},{},{}
+20119,C_Fur_Hat,Costume Beanie,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,160,{},{},{}
+20120,C_Antenna,Costume Aerial,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,97,{},{},{}
+20121,C_Lotus_Flower_Hat,Costume Flower Lily,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,324,{},{},{}
+20122,Happy_Summer_Ribbon,Costume Happy Summer Ribbon,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1260,{},{},{}
20123,C_Eagle_Eyes,Costume Eagle Eyes,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,63,{},{},{}
20124,C_Masquerade,Costume Masquerade,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,78,{},{},{}
20125,C_Mini_Glasses,Costume Mini Glasses,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,47,{},{},{}
@@ -10423,8 +10485,8 @@
20130,C_Whisper_Tall_Hat,Costume Whisper Tall Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1265,{},{},{}
20131,C_C_Tower_Manager_Incom,Costume Clock Tower Manager,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,,1,1266,{},{},{}
20132,C_Subject_Aura,Costume Aura Vicious Mind,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1267,{},{},{}
-20133,C_Poring_Mascot,Costume Poring Mascot,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1268,{},{},{}
-20134,C_White_Helm_Of_Abyss,Costume White Helm Of Abyss,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1269,{},{},{}
+20133,C_Poring_Mascot_Costume,Costume Poring Mascot,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1268,{},{},{}
+20134,C_Helm_Of_Abyss_White,Costume White Helm Of Abyss,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1269,{},{},{}
20135,C_12_Anniversary_Crown_Of_Saint,Costume 12 Anniversary Crown of Saint,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1117,{},{},{}
20136,C_12_Anniversary_Elf_Ears,Costume 12 Anniversary Elf Ears,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,875,{},{},{}
20137,C_Bomb_Wick,Costume Bomb Wick,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,66,{},{},{}
@@ -10436,8 +10498,8 @@
20143,C_Candy_Cane_In_Mouth,Costume Candy Cane In Mouth,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,665,{},{},{}
20144,C_Ancient_Elven_Ear,Costume Ancient Elven Ear,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,665,{},{},{}
20145,C_Robo_Eye,Costume Robo Eye,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,345,{},{},{}
-20146,C_Angel_Of_Ghost,Costume Angel of Ghost,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,394,{},{},{}
-20147,C_Bell_Of_Piegon,Costume Bell of Piegon,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,1034,{},{},{}
+20146,C_Angel_Spirit,Costume Angel of Ghost,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,394,{},{},{}
+20147,C_Bell_Pigeon,Costume Bell of Piegon,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,1034,{},{},{}
20148,C_Musketeer_Hat,Costume Musketeer Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,466,{},{},{}
20149,C_Hexagon_Glasses,Costume Hexagon Glasses,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,822,{},{},{}
20150,C_Wind_Fan,Costume Wind Fan,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1051,{},{},{}
@@ -10447,11 +10509,11 @@
20154,C_Maple_Which_Falls,Costume Maple Which Falls,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,,1,1275,{},{ sc_start SC_MAPLE_FALLS,-1,0; },{ sc_end SC_MAPLE_FALLS; }
20155,C_Ladys_Feather_Hat,Costume Lady's Feather Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,,1,1276,{},{},{}
20156,C_Fan_in_Mouth,Costume Fan in Mouth,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,857,{},{},{}
-20157,C_Evolved_Blue_Fish,Costume Evolved Blue Fish,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,149,{},{},{}
+20157,C_Fish_On_Head,Costume Evolved Blue Fish,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,149,{},{},{}
20158,C_Circlet,Costume Circlet,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,18,{},{},{}
-20159,C_Blue_Hairband,Costume Blue Hairband,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,136,{},{},{}
-20160,C_Magnolia_Hat,Costume Magnolia Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,373,{},{},{}
-20161,C_Army_Cap,Costume Army Cap,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,48,{},{},{}
+20159,C_Blue_Hair_Band,Costume Blue Hairband,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,136,{},{},{}
+20160,C_Fried_Egg,Costume Magnolia Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,373,{},{},{}
+20161,C_Prontera_Army_Cap,Costume Army Cap,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,48,{},{},{}
20162,C_Fleece_Hat,Costume Fleece Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,7168,,1,1,1277,{},{},{}
20163,C_Fleece_Hat_,Costume Fleece Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,7168,,1,1,1278,{},{},{}
20164,C_Duneyrr_Hat,Costume Duneyrr Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,639,{},{},{}
@@ -10462,21 +10524,21 @@
20169,C_Long_Tongue,Costume Long Tongue,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,773,{},{},{}
20170,C_Brown_Deviruchi_Cap,Costume Brown Deviruchi Cap,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,273,{},{},{}
20171,C_Sepia_Cap,Costume Sepia Cap,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,,1,1280,{},{},{}
-20172,C_Pumpkin_Hat,Costume Pumpkin Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1281,{},{},{}
+20172,C_Pumpkin_Head,Costume Pumpkin Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1281,{},{},{}
20173,C_Lude_Hood,Costume Lude Hood,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1282,{},{},{}
-20174,C_Orange_Halloween_Hat,Costume Orange Halloween Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1283,{},{},{}
+20174,C_Halloween_Hat_Orange,Costume Orange Halloween Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1283,{},{},{}
20175,C_Diabolic_Headphone,Costume Diabolic Headphone,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1284,{},{},{}
-20176,C_Happy_Pierrot_Mask,Costume Happy Pierrot Mask,4,0,,0,,,,0,0xFFFFFFFF,63,2,6144,,1,1,1288,{},{},{}
+20176,Happy_Pierrot_Mask,Costume Happy Pierrot Mask,4,0,,0,,,,0,0xFFFFFFFF,63,2,6144,,1,1,1288,{},{},{}
20177,C_Drooping_Dorasuke,Costume Drooping Dorasuke,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1290,{},{},{}
20178,C_Puppy_Love,Costume Puppy Love,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,94,{},{},{}
20179,C_Monkey_Coat_Hat,Costume Monkey Coat Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,858,{},{},{}
-20180,C_Western_Grace,Costume Western Grace,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,32,{},{},{}
-20181,C_Mystic_Rose,Costume Mystic Rose,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,198,{},{},{}
-20182,C_Rainbow_Eggshell,Costume Rainbow Eggshell,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,124,{},{},{}
-20183,C_There's..Something..,Costume There's..Something..,4,0,,0,,,,0,0xFFFFFFFF,63,2,3072,,1,1,1091,{},{},{}
+20180,C_Westren_Grace,Costume Western Grace,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,32,{},{},{}
+20181,C_Mistic_Rose,Costume Mystic Rose,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,198,{},{},{}
+20182,C_Mottled_Egg_Shell,Costume Rainbow Eggshell,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,124,{},{},{}
+20183,C_There_Is_Something,Costume There's..Something..,4,0,,0,,,,0,0xFFFFFFFF,63,2,3072,,1,1,1091,{},{},{}
20184,C_Party_Hat,Costume Party Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,144,{},{},{}
20185,C_Fashionable_Glasses,Costume Fashionable Glasses,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,131,{},{},{}
-20186,C_Magni's_Cap,Costume Magni's Cap,4,20,,,,,,,0xFFFFFFFF,63,2,1024,,1,1,250,{},{},{}
+20186,C_Magni_Cap,Costume Magni's Cap,4,20,,,,,,,0xFFFFFFFF,63,2,1024,,1,1,250,{},{},{}
20187,C_Fricca's_Circlet,Costume Fricca's Circlet,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,251,{},{},{}
20188,C_Morpheus's_Hood,Costume Morpheus's Hood,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,256,{},{},{}
20189,C_Goibne's_Helm,Costume Goibne's Helm,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,258,{},{},{}
@@ -10494,42 +10556,42 @@
20201,C_Banshee_Master_Kiss,Costume Banshee Master Kiss,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,959,{},{},{}
20202,C_Deviruchi_Balloon,Costume Deviruchi Balloon,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1082,{},{},{}
20203,C_Bandana,Costume Bandana,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,6,{},{},{}
-20204,C_Hunter_Hat,Costume Hunter Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,389,{},{},{}
+20204,C_Hunting_Cap,Costume Hunter Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,389,{},{},{}
20205,C_Fancy_Flower,Costume Fancy Flower,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,4,{},{},{}
20206,C_Chicken_Hat,Costume Chicken Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,7168,,1,1,1296,{},{},{}
-20207,C_Striped_Hairband,Costume Striped Hairband,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,133,{},{},{}
-20208,C_Neck_Tie,Costume Neck Tie,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,443,{},{},{}
-20209,C_Mermaid_Bubbles,Costume Mermaid Bubbles,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1299,{},{ sc_start SC_MERMAID_LONGING,-1,0; },{ sc_end SC_MERMAID_LONGING; } // jRO Item
+20207,C_Stripe_Band,Costume Striped Hairband,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,133,{},{},{}
+20208,C_Necktie,Costume Neck Tie,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,443,{},{},{}
+20209,C_Mermaid_Longing,Costume Mermaid Bubbles,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1299,{},{ sc_start SC_MERMAID_LONGING,-1,0; },{ sc_end SC_MERMAID_LONGING; } // jRO Item
20210,C_Chicken_Hat_,Costume Chicken Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,7168,,1,1,1297,{},{},{}
20211,C_Chicken_Hat__,Costume Chicken Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,7168,,1,1,1298,{},{},{}
-20212,C_Loki_&_Nidhoggur's_Hat,Costume Loki & Nidhoggur's Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1304,{},{},{}
+20212,C_Loki_Nidhogg_Hat,Costume Loki & Nidhoggur's Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1304,{},{},{}
20213,C_Sirt_Evil_Eye,Costume Robot Eyes,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,345,{},{},{}
20214,C_Evil_Marcher_Hat_J,Costume Evil Marcher Hat J,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1002,{},{},{}
20215,C_Black_Devil_Mask,Costume Black Devil Mask,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,760,{},{},{}
20216,C_Rideword_Hat,Costume Rideword Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,890,{},{},{}
20217,C_Arabian_Veil,Costume Arabian Veil,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1300,{},{},{}
-20218,C_Spell_Circuit,Costume Spell Circuit,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,1,1,1,1301,{},{},{}
+20218,C_Spell_Circuit,Costume Spell Circuit,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1301,{},{},{}
20219,C_Angel_Marcher_Hat,Costume Angel Marcher Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1302,{},{},{}
-20220,C_Dark_Night_Veil,Costume Dark Night Veil,4,0,,0,,,,0,0xFFFFFFFF,63,2,3072,1,1,1,1303,{},{},{}
+20220,C_Dark_Night_Veil,Costume Dark Night Veil,4,0,,0,,,,0,0xFFFFFFFF,63,2,3072,,1,1,1303,{},{},{}
20221,C_Eyes_Of_Ifrit,C Eyes Of Ifrit,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,886,{},{},{}
-20222,C_Blue_Pigtail_Santa_Hat,Costume Blue Pigtail Santa Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,,1,395,{},{},{}
-20223,C_Romantic_Leaf,Costume Romantic Leaf,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,57,{},{},{}
+20222,C_Santa_Hat_2,Costume Blue Pigtail Santa Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,,1,395,{},{},{}
+20223,C_Centimental_Leaf,Costume Romantic Leaf,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,57,{},{},{}
20224,C_Red_Tailed_Ribbon,Costume Red Tailed Ribbon,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,167,{},{},{}
-20225,C_Pumpkin-Head,Costume Pumpkin-Head,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,206,{},{},{}
-20226,C_Red_Comb,Costume Red Comb,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,445,{},{},{}
+20225,C_Pumpkin_Hat,Costume Pumpkin-Head,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,206,{},{},{}
+20226,C_Hair_Brush,Costume Red Comb,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,445,{},{},{}
20227,C_Husky_Hat,Costume Husky Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1016,{},{},{}
20228,C_Pig_MoneyBox,Costume Pig MoneyBox,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,603,{},{},{}
-20230,C_Bankruptcy_Mask,Costume Bankruptcy Mask,4,0,,0,,,,0,0xFFFFFFFF,63,2,6144,,1,1,936,{},{},{}
+20230,C_Mask_Of_Bankrupt,Costume Bankruptcy Mask,4,0,,0,,,,0,0xFFFFFFFF,63,2,6144,,1,1,936,{},{},{}
20231,C_Snowman_Hat,Costume Snowman Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,616,{},{},{}
20232,C_Celines_Ribbon,Costume Celine Ribbon,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,967,{},{},{}
-20233,C_Golden_Angel,Costume Golden Angel,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,646,{},{},{}
+20233,C_Gold_Angel_Sculpture,Costume Golden Angel,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,646,{},{},{}
20234,C_Baphomet_Hat,Costume Baphomet Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,7168,,1,1,1311,{ bonus bMaxHPrate,15; bonus bMaxSPrate,15; bonus2 bAddRace,RC_All,15; bonus2 bMagicAddRace,RC_All,15; bonus2 bAddItemHealRate,519,2015; },{},{}
-20235,C_Frozen_Rose,Costume Frozen Rose,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1025,{},{},{}
-20236,C_Arc_Angeling_Hat,Costume Arc Angeling Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,241,{},{},{}
-20237,C_Pink_Beanie,Costume Pink Beanie,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,281,{},{},{}
-20238,C_Drooping_Blue_Cat,Costume Drooping Blue Cat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,277,{},{},{}
+20235,C_Frozen_Land_Rose,Costume Frozen Rose,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1025,{},{},{}
+20236,C_Hellomother_Hat,Costume Arc Angeling Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,241,{},{},{}
+20237,C_Pink_Fur_Hat,Costume Pink Beanie,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,281,{},{},{}
+20238,C_Blue_Drooping_Kitty,Costume Drooping Blue Cat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,277,{},{},{}
20239,C_Large_Ribbon_Muffler,Costume Large Ribbon Muffler,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1312,{},{},{}
-20240,C_Gift_of_Snow,Costume Gift of Snow,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,,{/*TODO: ViewID*/},{},{}
+20240,C_Gift_Of_Snow,Costume Gift of Snow,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,,{/*TODO: ViewID*/},{},{}
20241,C_Eclipse_Hat,Costume Eclipse Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,922,{},{},{}
20242,C_Snownow_Hat,Costume Snownow Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1313,{},{},{}
20243,C_Choco_Mint_Bonnet,Costume Choco Mint Bonnet,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1314,{},{},{}
@@ -10541,17 +10603,17 @@
20249,C_Red_Strong_Hair,Costume Red Strong Hair,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1316,{},{},{}
20250,C_White_Strong_Hair,Costume White Strong Hair,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1317,{},{},{}
20251,C_Rose_Cascade,Costume Rose Cascade,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,920,{},{},{}
-20252,C_Mage_Decoration,Costume Mage Decoration,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1150,{},{},{}
-20253,C_Drooping_Alicel,Costume Drooping Alicel,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,784,{},{},{}
-20254,C_Yellow_Ribbonn,Costume Yellow Ribbonn,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,243,{},{},{}
-20255,C_Love_Cheeks,Costume Love Cheeks,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,1318,{},{},{}
-20256,C_Honey_Pancake,Costume Honey Pancake,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1319,{},{},{}
+20252,C_Accessory_of_Ascetic,Costume Mage Decoration,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1150,{},{},{}
+20253,C_Droopy_Alice_Doll,Costume Drooping Alicel,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,784,{},{},{}
+20254,C_Ribbon_Yellow,Costume Yellow Ribbonn,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,243,{},{},{}
+20255,C_Love_Cheek,Costume Love Cheeks,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,1318,{},{},{}
+20256,C_Honey_Pancakes,Costume Honey Pancake,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1319,{},{},{}
20257,C_Black_Rabbit_Bonnet,Costume Black Rabbit Bonnet,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1320,{},{},{}
-20258,C_Blue_Headdress,Costume Blue Headdress,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1321,{},{},{}
+20258,C_Blue_Head_Dress,Costume Blue Headdress,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1321,{},{},{}
20259,C_Pink_Clover,Costume Pink Clover,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1322,{},{},{}
20260,C_Stardust,Costume Stardust,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,81,{},{},{}
-20262,C_Fox_Ears_Drop_Ribbon,Costume Fox Ears Drop Ribbon,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1070,{},{},{}
-20263,C_Sleeping_Cat_Hat_J,Costume Sleeping Cat Hat J,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,838,{},{},{}
+20262,C_Fox_Ears_Bell_Ribbon,Costume Fox Ears Drop Ribbon,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1070,{},{},{}
+20263,C_Hat_Of_Drowsy_Cat,Costume Sleeping Cat Hat J,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,838,{},{},{}
20264,C_Blood_Sucker,Costume Blood Sucker,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,893,{},{},{}
20265,C_Bird_Nest_Hat,Costume Bird Nest Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,235,{},{},{}
20266,C_Secret_Zipper,Costume Secret Zipper,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1324,{},{},{}
@@ -10560,7 +10622,7 @@
20269,C_White_Fox_Ear_Ribbon,Costume White Fox Ear Ribbon,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1327,{},{},{}
20270,C_Gryphon_Wing_Ears,Costume Gryphon Wing Ears,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,1328,{},{},{}
20271,C_Sunflower,Costume Sunflower,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,37,{},{},{}
-20272,C_Unicorn_Horn,Costume Unicorn Horn,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,42,{},{},{}
+20272,C_Snowy_Horn,Costume Unicorn Horn,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,42,{},{},{}
20273,C_Soft_Sheep_Hat,Costume Soft Sheep Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,738,{},{},{}
20274,C_Polar_Bear_Cap_J,Costume Polar Bear Cap J,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,966,{},{},{}
20277,C_Balloon_Hat,Costume Balloon Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,385,{},{},{}
@@ -10570,8 +10632,8 @@
20281,C_Kindergarten_Hat,Costume Kindergarten Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,977,{},{},{}
20282,C_White_Student_Cap,Costume White Student Cap,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,877,{},{},{}
20283,C_Over_Protector,Costume Over Protector,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1329,{},{},{}
-20284,C_Sakura_Hat,Costume Sakura Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1330,{},{},{}
-20285,C_Dancing_Fallen_Sakura,Costume Dancing Fallen Sakura,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1331,{ hateffect HAT_EF_BLOSSOM_FLUTTERING,true; },{},{ hateffect HAT_EF_BLOSSOM_FLUTTERING,false; }
+20284,C_Cherry_Blossom_Hat,Costume Sakura Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1330,{},{},{}
+20285,C_Blossom_Fluttering,Costume Dancing Fallen Sakura,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1331,{ hateffect HAT_EF_BLOSSOM_FLUTTERING,true; },{},{ hateffect HAT_EF_BLOSSOM_FLUTTERING,false; }
20286,C_Under_Rim_Glasses_Red,Costume Under Rim Glasses Red,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,1332,{},{},{}
20287,C_Mans_Medal_Gold,Costume Man's Medal(Gold),4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1333,{},{},{}
20288,C_Bijou_Hat,Costume Bijou Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1334,{},{},{}
@@ -10582,7 +10644,7 @@
20295,C_Poring_Sunglasses,Costume Poring Sunglasses,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,954,{},{},{}
20296,C_Yoyo_Hat,Costume Yoyo Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,391,{},{},{}
20297,C_Cactus_Hat,Costume Cactus Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,615,{},{},{}
-20298,C_Happy_Lunatic_Hanging_Ear,Costume Happy Lunatic Hanging Ear,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,1340,{},{},{}
+20298,C_Happy_Lunatic_Ear,Costume Happy Lunatic Hanging Ear,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,1340,{},{},{}
20299,C_Face_Crusher,Costume Face Crusher,4,0,,0,,,,0,0xFFFFFFFF,63,2,6144,,1,1,1341,{},{},{}
20300,C_Hill_Wind_Mask,Costume Hill Wind Mask,4,0,,0,,,,0,0xFFFFFFFF,63,2,7168,,1,1,1342,{},{},{}
20301,C_Golden_Savage_Hat,Costume Golden Savage Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,648,{},{},{}
@@ -10594,8 +10656,8 @@
20312,C_Barons_Evil_Eye,Costume Baron's Evil Eye,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,989,{},{},{}
20313,C_CD_in_Mouth,Costume CD in Mouth,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,815,{},{},{}
20314,C_New_Wave_Sunglasses,Costume New Wave Sunglasses,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,856,{},{},{}
-20315,C_Analyze_Eye,Costume Analyze Eye,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,1,1,1,1351,{},{},{}
-20316,C_Seraph_Wing_Helm,Costume Seraph Wing Helm,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,1,1,1,1352,{},{},{}
+20315,C_Analyze_Eye,Costume Analyze Eye,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1351,{},{},{}
+20316,C_Seraph_Wing_Helm,Costume Seraph Wing Helm,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1352,{},{},{}
20317,C_Nekomimi_Cyber_Headphone,Costume Nekomimi Cyber Headphone,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1353,{},{},{}
20318,C_Charleston_Antenna,Costume Charleston Antenna,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,1354,{},{},{}
20319,C_Crimson_Booster,Costume Crimson Booster,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,1355,{},{},{}
@@ -10603,8 +10665,8 @@
20321,C_Pterios_Fins,Costume Pterios Fins,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,1009,{},{},{}
20322,C_Seal_Hat,Costume Seal Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,540,{},{},{}
20323,C_Sparkling_Sound,Costume Sparkling Sound,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1074,{},{},{}
-20324,C_Pigeon_Hat,Costume Pigeon Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,1,1,1,1362,{},{},{}
-20325,C_Little_Aquarium,Costume Little Aquarium,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,1,1,1,1363,{},{},{}
+20324,C_Pigeon_Hat,Costume Pigeon Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1362,{},{},{}
+20325,C_Little_Aquarium,Costume Little Aquarium,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,1363,{},{},{}
20326,C_Sailor_Collar,Costume Sailor Collar,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1364,{},{},{}
20327,C_Marine_Cap,Costume Marine Cap,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1365,{},{},{}
20328,C_Mackerel_Pike,Costume Mackerel Pike,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1081,{},{},{}
@@ -10652,7 +10714,7 @@
20375,C_Ignis_Cap,Costume Ignis Cap,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,803,{},{},{}
20376,C_Memory_of_Lovers,Costume Memory of Lovers,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,1072,{},{},{}
20377,C_Flight_Cap,Costume Flight Cap,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,820,{},{},{}
-20378,C_Sky_Met,Costume Sky Met,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,868,{},{},{}
+20378,C_Skymet,Costume Sky Met,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,868,{},{},{}
20379,C_Pocketwatch_Hair_Ornament,Costume Pocketwatch Hair Ornament,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1404,{},{},{}
20380,C_Mechanical_Feather_Hairband,Costume Mechanical Feather Hairband,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1405,{},{},{}
20381,C_Steampunk_Hat,Costume Steampunk Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1406,{},{},{}
@@ -10664,7 +10726,7 @@
20393,C_Schmitz_Helm,Costume Schmitz Helm,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,634,{},{},{}
20394,C_Pumpkin_Toque,Costume Pumpkin Toque,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1411,{},{},{}
20396,C_Green_Hat,Costume Green Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,939,{},{},{}
-20397,Jack,Jack,4,0,,0,,,,0,0xFFFFFFFF,63,2,6144,,1,1,1415,{},{},{}
+20397,C_Jakk,Jack,4,0,,0,,,,0,0xFFFFFFFF,63,2,6144,,1,1,1415,{},{},{}
20398,C_Niffleheim_Bunny_Hat,Costume Niffleheim Bunny Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1285,{},{},{}
20399,C_Crow_Tengu_Mask,Costume Crow Tengu Mask,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,1287,{},{},{}
20400,C_Ichthys_Rosario,Costume Ichthys Rosario,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1028,{},{},{}
@@ -10677,19 +10739,19 @@
20407,C_Subject_Aura_Red,Costume Vicious Mind Aura Crimson,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1418,{},{},{}
20408,C_Requiem_Crown_of_Light_and_Dark,Costume Requiem Crown of Light and Dark,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1419,{},{},{}
20409,C_There_is_Something_,Costume There is Something,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1091,{},{},{}
-20416,C_Grade_1_Balloon,Costume Grade 1 Balloon,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1426,{},{},{}
-20417,C_Grade_2_Balloon,Costume Grade 2 Balloon,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1427,{},{},{}
-20418,C_Grade_3_Balloon,Costume Grade 3 Balloon,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1428,{},{},{}
-20419,C_Grade_4_Balloon,Costume Grade 4 Balloon,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1429,{},{},{}
-20420,C_Grade_5_Balloon,Costume Grade 5 Balloon,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1430,{},{},{}
-20421,C_Grade_6_Balloon,Costume Grade 6 Balloon,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1431,{},{},{}
-20422,C_Grade_7_Balloon,Costume Grade 7 Balloon,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1432,{},{},{}
-20423,C_Grade_8_Balloon,Costume Grade 8 Balloon,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1433,{},{},{}
-20424,C_Grade_9_Balloon,Costume Grade 9 Balloon,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1434,{},{},{}
-20425,C_Grade_10_Balloon,Costume Grade 10 Balloon,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1435,{},{},{}
-20426,C_Grade_11_Balloon,Costume Grade 11 Balloon,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1436,{},{},{}
-20427,C_Grade_12_Balloon,Costume Grade 12 Balloon,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1437,{},{},{}
-20428,C_Grade_13_Balloon,Costume Grade 13 Balloon,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1438,{},{},{}
+20416,C_1Grade_Balloon,Costume Grade 1 Balloon,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1426,{},{},{}
+20417,C_2Grade_Balloon,Costume Grade 2 Balloon,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1427,{},{},{}
+20418,C_3Grade_Balloon,Costume Grade 3 Balloon,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1428,{},{},{}
+20419,C_4Grade_Balloon,Costume Grade 4 Balloon,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1429,{},{},{}
+20420,C_5Grade_Balloon,Costume Grade 5 Balloon,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1430,{},{},{}
+20421,C_6Grade_Balloon,Costume Grade 6 Balloon,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1431,{},{},{}
+20422,C_7Grade_Balloon,Costume Grade 7 Balloon,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1432,{},{},{}
+20423,C_8Grade_Balloon,Costume Grade 8 Balloon,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1433,{},{},{}
+20424,C_9Grade_Balloon,Costume Grade 9 Balloon,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1434,{},{},{}
+20425,C_10Grade_Balloon,Costume Grade 10 Balloon,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1435,{},{},{}
+20426,C_11Grade_Balloon,Costume Grade 11 Balloon,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1436,{},{},{}
+20427,C_12Grade_Balloon,Costume Grade 12 Balloon,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1437,{},{},{}
+20428,C_13Grade_Balloon,Costume Grade 13 Balloon,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1438,{},{},{}
20429,C_Piamette_Bowtie,Costume Piamette Bowtie,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,1,1439,{},{},{}
20430,C_Loyal_Servant_of_Devil_Morocc,Costume Loyal Servant of Devil Morocc,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,1,1440,{},{},{}
20431,C_Magician_Headdress,Costume Magician Headdress,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,1,1441,{},{},{}
@@ -10723,8 +10785,8 @@
20465,C_Glasses_Without_Lens,Costume Glasses Without Lens,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,0,1467,{},{},{}
20466,C_Crimson_Ribbon,Costume Crimson Ribbon,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,1468,{},{},{}
20467,C_Elemental_Crown,Costume Elemental Crown,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,1219,{},{},{}
-20468,You_in_ONE,You in ONE,4,0,,0,,,,0,0xFFFFFFFF,63,2,7168,,1,0,1462,{},{},{}
-20470,C_Sweet_Chocolate_Hat,Costume Sweet Chocolate Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,1469,{},{},{}
+20468,C_Youinone_Mask,You in ONE,4,0,,0,,,,0,0xFFFFFFFF,63,2,7168,,1,0,1462,{},{},{}
+20470,C_SweetChocolate_Hat,Costume Sweet Chocolate Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,1469,{},{},{}
20490,C_Full_Blossom_Sakura_Hairpin_Blue,Costume Full Blossom Sakura Hairpin Blue,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,1476,{},{},{}
20491,C_Laser_of_Eagle,Costume Laser of Eagle,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,1424,{},{},{}
20492,C_Unidentified_Flying_Poring,Costume Unidentified Flying Poring,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,1017,{},{},{}
@@ -10744,48 +10806,52 @@
20508,C_Poster_Girl_Hat,Costume Poster Girl Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,1446,{},{},{}
20509,C_Wings_of_Uriel,Costume Wings of Uriel,4,0,,0,,0,,0,0xFFFFFFFF,63,2,8192,,1,0,17,{},{},{}
20510,C_SwordWing,Costume Sword Wing,4,0,,0,,0,,0,0xFFFFFFFF,63,2,8192,,1,0,19,{},{},{}
+20511,C_Blue_Fairy_Wing,Blue Wings of Fairy,4,0,,0,,0,,0,0xFFFFFFFF,63,2,8192,,1,0,21,{},{},{}
+20512,C_Bag_of_Adventurer_j,Costume Adventurer's Backpack,4,0,,0,,0,,0,0xFFFFFFFF,63,2,8192,,1,0,2,{},{},{}
+20514,C_Thanatos_Sword,Costume Thanatos Sword,4,0,,0,,0,,0,0xFFFFFFFF,63,2,8192,,1,0,23,{},{},{}
+20516,C_Wings_of_Michael,Costume Wings of Michael,4,0,,0,,0,,0,0xFFFFFFFF,63,2,8192,,1,0,24,{},{},{}
20600,Fantastic_Aura,Fantastic Aura,4,0,,0,,0,,0,0xFFFFFFFF,63,2,8192,,1,0,0,{ /*TODO: View ID*/ bonus bUnbreakableHelm,1; },{},{}
20700,Egir_Manteau,Egir Manteau,4,200000,,300,,10,,1,0xFFFFFFFF,63,2,4,,110,1,0,{ bonus bUnbreakableGarment,1; .@r = getrefine(); if (.@r > 10) .@r = 10; if (BaseClass == Job_Mage || BaseClass == Job_Archer || BaseClass == Job_Acolyte) { bonus bFlee2,5+(.@r*2); } else if (BaseClass == Job_Swordman || BaseClass == Job_Merchant || BaseClass == Job_Thief) { bonus bShortWeaponDamageReturn,5+(.@r*2); } },{},{}
-20702,TE_Woe_Muffler,TE Woe Muffler,4,0,,0,,5,,0,0xFFFFFFFF,63,2,4,1,40,1,,{ bonus bMdef,5; bonus2 bAddRace,RC_Player,5; bonus2 bMagicAddRace,RC_Player,5; bonus2 bResEff,Eff_Freeze,25; },{},{}
-20703,TE_Woe_Manteau,TE Woe Manteau,4,0,,0,,10,,0,0x000444A2,63,2,4,1,40,1,,{ bonus2 bAddRace,RC_Player,10; bonus2 bResEff,Eff_Freeze,25; },{},{}
-20704,TE_Woe_Magic_Manteau,TE Woe Magic Manteau,4,0,,0,,5,,0,0x00818315,63,2,4,1,40,1,,{ bonus2 bMagicAddRace,RC_Player,10; bonus2 bResEff,Eff_Freeze,25; },{},{}
+20702,TE_Woe_Muffler,TE Woe Muffler,4,0,,0,,5,,0,0xFFFFFFFF,63,2,4,,40,1,,{ bonus bMdef,5; bonus2 bAddRace,RC_Player,5; bonus2 bMagicAddRace,RC_Player,5; bonus2 bResEff,Eff_Freeze,25; },{},{}
+20703,TE_Woe_Manteau,TE Woe Manteau,4,0,,0,,10,,0,0x000444A2,63,2,4,,40,1,,{ bonus2 bAddRace,RC_Player,10; bonus2 bResEff,Eff_Freeze,25; },{},{}
+20704,TE_Woe_Magic_Manteau,TE Woe Magic Manteau,4,0,,0,,5,,0,0x00818315,63,2,4,,40,1,,{ bonus2 bMagicAddRace,RC_Player,10; bonus2 bResEff,Eff_Freeze,25; },{},{}
20706,Amistr_Bag,Amistr Bag,4,10,,500,,18,,0,0xFFFFFFFF,63,2,4,,1,,4,{ bonus bAllStats,1; bonus2 bSubEle,Ele_All,5; },{},{}
20707,Kirin_Wing,Kirin Wing,4,20,,0,,18,,0,0xFFFFFFFF,63,2,4,,0,1,6,{ bonus bAllStats,1; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player,5; },{},{}
-20709,Mana_Manteau,Mana Manteau,4,0,,0,,,,0,0xFFFFFFFF,63,2,4,0,1,1,,{ bonus2 bExpAddRace,RC_All,10; },{},{}
+20709,Mana_Manteau,Mana Manteau,4,0,,0,,,,0,0xFFFFFFFF,63,2,4,,1,1,,{ bonus2 bExpAddRace,RC_All,10; },{},{}
20710,Impr_Angel's_Warmth,Advanced Angelic Cardigan,4,10000,,400,,6,,1,0x00000001,63,2,4,,99,1,0,{ bonus bHPrecovRate,50; },{},{}
20711,Manteau_Of_Diego,Manteau Of Diego,4,20,,600,,15,,1,0xFFFFFFFF,63,2,4,,0,1,0,{ bonus bInt,1; bonus bDex,1; bonus bMdef,3; },{},{}
-20717,Gigant_Snake_Skin,Gigant Snake Skin,4,10,,400,,38,,0,0xFFFFFFFF,63,2,4,,1,1,0,{ bonus bMdef,10; },{},{}
-20718,Gigant_Snake_Skin_,Gigant Snake Skin,4,10,,400,,38,,1,0xFFFFFFFF,63,2,4,,1,1,0,{ bonus bMdef,10; },{},{}
-20721,Manteau_of_Gray,Manteau of Gray,4,10,,600,,45,,1,0xFFFFFFFF,63,2,4,,120,1,0,{ bonus2 bSubEle,Ele_Holy,5+(getrefine()/2); },{},{}
+20717,FaceWorm_Skin,Gigant Snake Skin,4,10,,400,,38,,0,0xFFFFFFFF,63,2,4,,1,1,0,{ bonus bMdef,10; },{},{}
+20718,FaceWorm_Skin_,Gigant Snake Skin,4,10,,400,,38,,1,0xFFFFFFFF,63,2,4,,1,1,0,{ bonus bMdef,10; },{},{}
+20721,Cloak_Of_Gray,Cloak of Gray,4,20,,600,,45,,1,0xFFFFFFFF,56,2,4,,120,1,0,{ bonus2 bSubEle,Ele_Holy,5+getrefine()/2; },{},{}
20724,Love_Dad_Wings_2012,Love Dad Wings 2012,4,0,,100,,15,,1,0xFFFFFFFF,63,2,4,,1,1,5,{ .@r = getrefine(); if ((readparam(bStr)>89)) { bonus bAllStats,1; bonus bStr,.@r; bonus bMaxHPRate,1; bonus bMaxSPRate,1; } if ((readparam(bAgi)>89)) { bonus bAllStats,1; bonus bAgi,.@r; bonus bMaxHPRate,1; bonus bMaxSPRate,1; } if ((readparam(bVit)>89)) { bonus bAllStats,1; bonus bVit,.@r; bonus bMaxHPRate,1; bonus bMaxSPRate,1; } if ((readparam(bInt)>89)) { bonus bAllStats,1; bonus bInt,.@r; bonus bMaxHPRate,1; bonus bMaxSPRate,1; } if ((readparam(bDex)>89)) { bonus bAllStats,1; bonus bDex,.@r; bonus bMaxHPRate,1; bonus bMaxSPRate,1; } if ((readparam(bLuk)>89)) { bonus bAllStats,1; bonus bLuk,.@r; bonus bMaxHPRate,1; bonus bMaxSPRate,1; } },{},{}
20725,Ribbon_Piamat,Ribbon Piamat,4,10,,100,0:10,,,1,0xFFFFFFFF,63,2,4,,30,1,7,{ bonus bInt,1; bonus bDex,1; },{},{}
20727,Brilliant_Golden_Wings,Brilliant Golden Wings,4,10,,0,,,,0,0xFFFFFFFF,63,2,8192,,1,1,5,{},{},{}
20730,Loyalists_Hood,Loyalists Hood,4,10,,200,,30,,1,0xFFFFFFFF,63,2,8192,,80,,,{ bonus bStr,2; bonus bMaxHPrate,10; bonus bNoKnockback,1; bonus2 bSubEle,Ele_All,-20; },{},{}
20732,Supplement_Part_Con,Supplement Part Con,4,25000,,500,,20,,1,0x00000400,56,2,4,,100,1,,{ .@r = getrefine(); bonus bMaxHPrate,6+(.@r/2); if(.@r>=9){bonus bHPrecovRate,50;} },{},{}
-20733,Reinforced_Parts_Engine,Reinforced Parts - Engine,4,10,,1500,,25,,1,0x00000400,56,2,4,,100,1,,{ bonus bDelayrate,-10; .@r = getrefine(); if(.@r>=7) {bonus2 bSubEle,0,10;}; if(.@r>=9) {bonus bDelayrate,-10;} },{},{}
+20733,Upgrade_Part_Engine,Reinforced Parts - Engine,4,10,,1500,,25,,1,0x00000400,56,2,4,,100,1,,{ bonus bDelayrate,-10; .@r = getrefine(); if(.@r>=7) {bonus2 bSubEle,0,10;}; if(.@r>=9) {bonus bDelayrate,-10;} },{},{}
20737,C_Kirin_Wing,Costume Kirin Wing,4,10,,0,,,,0,0xFFFFFFFF,63,2,8192,,1,0,6,{},{},{}
-20743,Cloak_Of_Airship,Cloak Of Airship,4,10,,0,,25,,1,0xFFFFFFFF,63,2,4,,125,0,,{ bonus2 bSubEle,Ele_Neutral,10; bonus bFlee,20; bonus bVariableCastrate,-20; },{},{}
-20744,Tarlock's_Cloak,Tarlock's Cloak,4,10,,400,,12,,1,0xFFFFFFFF,63,2,4,,125,1,,{ bonus2 bSubEle,Ele_Neutral,10; bonus bFlee,20; bonus bVariableCastrate,-10; .@r = getrefine(); if(.@r>=7) { bonus bVariableCastrate,-10; } if(.@r>=9) { bonus bVariableCastrate,-10;} if(.@r>=12) { bonus bVariableCastrate,-5; } },{},{}
-20746,C_Rudra_Wings,Costume Rudra Wings,4,10,,0,,,,0,0xFFFFFFFF,63,2,8192,,1,0,8,{},{},{}
-20748,Cloak_Of_Casualties,Cloak Of Casualties,4,10,,600,,20,,0,0xFFFFFFFF,63,2,4,,120,1,,{ .@r = getrefine(); bonus bAgi,5; bonus bFlee,10; if(readparam(bStr)>=90) bonus bBaseAtk,10+(.@r*2); if(readparam(bInt)>=90) bonus bMatk,20+(.@r*3); if(readparam(bVit)>=90) bonus2 bSubEle,Ele_Neutral,3+((.@r>=8)?3:0)+((.@r>=10)?4:0); if(readparam(bAgi)>=90){ bonus bAspdRate,3+(.@r/2); bonus bAspd,((.@r>=10)?1:0); } if(readparam(bDex)>=90) bonus bLongAtkRate,3+(.@r/2); if(readparam(bLuk)>=90) bonus bCriticalRate,5+.@r; },{},{}
-20749,Cloak_Of_Casualties_,Cloak Of Casualties,4,10,,600,,30,,1,0xFFFFFFFF,63,2,4,,170,1,,{ .@r = getrefine(); bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus bAgi,5; bonus bFlee,10; if(readparam(bStr)>=90) bonus bBaseAtk,10+(.@r*2); if(readparam(bInt)>=90) bonus bMatk,20+(.@r*3); if(readparam(bVit)>=90) bonus2 bSubEle,Ele_Neutral,3+((.@r>=8)?3:0)+((.@r>=10)?4:0); if(readparam(bAgi)>=90){ bonus bAspdRate,3+(.@r/2); bonus bAspd,((.@r>=10)?1:0); } if(readparam(bDex)>=90) bonus bLongAtkRate,3+(.@r/2); if(readparam(bLuk)>=90) bonus bCriticalRate,5+.@r; },{},{}
-20753,Lian_Robe,Lian Robe,4,0,,700,,20,1,1,0xFFFFFFFF,63,2,4,0,65,1,,{ bonus2 bSubEle,Ele_Neutral,5; bonus2 bSubRace,RC_Formless,-5; },{},{}
+20743,Airship_Cape,Cloak Of Airship,4,10,,0,,25,,1,0xFFFFFFFF,63,2,4,,125,0,,{ bonus2 bSubEle,Ele_Neutral,10; bonus bFlee,20; bonus bVariableCastrate,-20; },{},{}
+20744,Felock_Cape,Tarlock's Cloak,4,10,,400,,12,,1,0xFFFFFFFF,63,2,4,,125,1,,{ bonus2 bSubEle,Ele_Neutral,10; bonus bFlee,20; bonus bVariableCastrate,-10; .@r = getrefine(); if(.@r>=7) { bonus bVariableCastrate,-10; } if(.@r>=9) { bonus bVariableCastrate,-10;} if(.@r>=12) { bonus bVariableCastrate,-5; } },{},{}
+20746,C_Rudra_Wing,Costume Rudra Wings,4,10,,0,,,,0,0xFFFFFFFF,63,2,8192,,1,0,8,{},{},{}
+20748,Manteau_Of_Fallen,Cloak Of Casualties,4,10,,600,,20,,0,0xFFFFFFFF,63,2,4,,120,1,,{ .@r = getrefine(); bonus bAgi,5; bonus bFlee,10; if(readparam(bStr)>=90) bonus bBaseAtk,10+(.@r*2); if(readparam(bInt)>=90) bonus bMatk,20+(.@r*3); if(readparam(bVit)>=90) bonus2 bSubEle,Ele_Neutral,3+((.@r>=8)?3:0)+((.@r>=10)?4:0); if(readparam(bAgi)>=90){ bonus bAspdRate,3+(.@r/2); bonus bAspd,((.@r>=10)?1:0); } if(readparam(bDex)>=90) bonus bLongAtkRate,3+(.@r/2); if(readparam(bLuk)>=90) bonus bCriticalRate,5+.@r; },{},{}
+20749,Manteau_Of_Fallen_,Cloak Of Casualties,4,10,,600,,30,,1,0xFFFFFFFF,63,2,4,,170,1,,{ .@r = getrefine(); bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus bAgi,5; bonus bFlee,10; if(readparam(bStr)>=90) bonus bBaseAtk,10+(.@r*2); if(readparam(bInt)>=90) bonus bMatk,20+(.@r*3); if(readparam(bVit)>=90) bonus2 bSubEle,Ele_Neutral,3+((.@r>=8)?3:0)+((.@r>=10)?4:0); if(readparam(bAgi)>=90){ bonus bAspdRate,3+(.@r/2); bonus bAspd,((.@r>=10)?1:0); } if(readparam(bDex)>=90) bonus bLongAtkRate,3+(.@r/2); if(readparam(bLuk)>=90) bonus bCriticalRate,5+.@r; },{},{}
+20753,Lian_Robe,Lian Robe,4,0,,700,,20,1,1,0xFFFFFFFF,63,2,4,,65,1,,{ bonus2 bSubEle,Ele_Neutral,5; bonus2 bSubRace,RC_Formless,-5; },{},{}
20756,Aegir_Cloak,Aegir Cloak,4,10,,300,,10,,1,0xFFFFFFFF,63,2,4,,40,1,,{ bonus bUnbreakableGarment,1; bonus bMaxHP,500; bonus bMaxSP,50; },{},{}
-20761,C_Happiness_Wings,Costume Happiness Wings,4,0,,0,,0,,0,0xFFFFFFFF,63,2,8192,,1,0,9,{},{},{}
-20762,C_Great_Devil_Wings,Costume Great Devil Wings,4,0,,0,,0,,0,0xFFFFFFFF,63,2,8192,,1,0,10,{},{},{}
+20761,C_Wing_Of_Happiness,Costume Happiness Wings,4,0,,0,,0,,0,0xFFFFFFFF,63,2,8192,,1,0,9,{},{},{}
+20762,C_GreatDevilWing,Costume Great Devil Wings,4,0,,0,,0,,0,0xFFFFFFFF,63,2,8192,,1,0,10,{},{},{}
20763,C_Amistr_Bag,Costume Amistr Bag,4,0,,0,,0,,0,0xFFFFFFFF,63,2,8192,,1,0,4,{},{},{}
20764,C_Fallen_Angel_Wing,Costume Fallen Angel Wing,4,0,,0,,0,,0,0xFFFFFFFF,63,2,8192,,1,0,3,{},{},{}
20779,Rift_Manteau,Rift Manteau,4,20,,500,,16,,1,0xFFFFFFFF,63,2,4,,100,1,,{ .@r = getrefine(); bonus bMaxHP,(.@r >= 9 ? 1300 : .@r >= 7 ? 700 : 300); bonus bMaxSP,-50; },{},{}
20780,Unity_STR_Manteau,Unity STR Manteau,4,32000,,300,,20,,1,0xFFFFFFFF,63,2,4,,1,1,0,{ .@r = getrefine(); if(BaseLevel<100) { bonus2 bExpAddRace,RC_All,4; bonus bMaxHPrate,2*(.@r/2); } },{},{}
20781,Unity_AGI_Manteau,Unity AGI Manteau,4,32000,,300,,20,,1,0xFFFFFFFF,63,2,4,,1,1,0,{ .@r = getrefine(); if(BaseLevel<100) { bonus2 bExpAddRace,RC_All,4; bonus bFlee,3*(.@r/2); } },{},{}
20782,Unity_INT_Muffler,Unity INT Muffler,4,32000,,300,,20,,1,0xFFFFFFFF,63,2,4,,1,1,0,{ .@r = getrefine(); if(BaseLevel<100) { bonus2 bExpAddRace,RC_All,4; bonus bUseSPrate,-(.@r/2); } },{},{}
-20783,Hero_Cape,Hero Cape,4,0,,100,,,,1,0xFFFFFFFF,63,2,4,1,10,1,,{ .@r = getrefine(); bonus2 bSubEle,Ele_Neutral,1+(.@r/3); bonus bFlee,1+(.@r/3); if (.@r > 9) { bonus2 bSubEle,Ele_Neutral,20; bonus bFlee,20; } },{},{}
+20783,Hero_Cape,Hero Cape,4,0,,100,,,,1,0xFFFFFFFF,63,2,4,,10,1,,{ .@r = getrefine(); bonus2 bSubEle,Ele_Neutral,1+(.@r/3); bonus bFlee,1+(.@r/3); if (.@r > 9) { bonus2 bSubEle,Ele_Neutral,20; bonus bFlee,20; } },{},{}
20787,Unity_Exquisite_Muffler,Unity Exquisite Muffler,4,32000,,300,,20,,1,0xFFFFFFFF,63,2,4,,1,1,0,{ .@r = getrefine(); if(BaseLevel<100) { bonus2 bExpAddRace,RC_All,4; bonus bCritical,2*(.@r/2); } },{},{}
20788,Private_Doram_Manteau,Private Doram Manteau,4,20,,300,,20,,1,0x80000000,7,2,4,,100,1,,{ bonus bFlee,5; bonus2 bSubEle,Ele_Neutral,2; bonus bFlee2,getrefine()/3; },{},{}
20789,Luxury_Doram_Manteau,Luxury Doram Manteau,4,20,,400,,25,,1,0x80000000,7,2,4,,140,1,,{ bonus bFlee,7; bonus2 bSubEle,Ele_Neutral,3; .@r = getrefine()/3; bonus bFlee2,.@r; bonus bLuk,.@r; },{},{}
20790,Elegant_Doram_Manteau,Elegant Doram Manteau,4,20,,500,,30,,1,0x80000000,7,2,4,,175,1,,{ bonus bFlee,10; bonus2 bSubEle,Ele_Neutral,5; .@r = getrefine()/2; bonus bFlee2,.@r; bonus bInt,.@r; bonus bDex,.@r; bonus bLuk,.@r; },{},{}
-20797,Etran_Shirt,Etran Shirt,4,0,,150,,,,1,0xFFFFFFFF,63,2,4,1,1,1,,{ bonus bMdef,10; bonus bMaxHPrate,2; .@r = getrefine(); if (.@r >= 6) bonus bMaxHPrate,4; if (.@r >= 7) bonus bMaxHPrate,6; if (.@r >= 8) bonus bMaxHPrate,8; if (.@r >= 9) bonus bNoKnockback,1; },{},{}
-20798,C_Grim_Reaper_Protection,Costume Grim Reaper Protection,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,0,1450,{},{},{}
+20797,Etran_Shirt,Etran Shirt,4,0,,150,,,,1,0xFFFFFFFF,63,2,4,,1,1,,{ bonus bMdef,10; bonus bMaxHPrate,2; .@r = getrefine(); if (.@r >= 6) bonus bMaxHPrate,4; if (.@r >= 7) bonus bMaxHPrate,6; if (.@r >= 8) bonus bMaxHPrate,8; if (.@r >= 9) bonus bNoKnockback,1; },{},{}
+20798,GrimReaper_Protection,Costume Grim Reaper Protection,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,0,1450,{},{},{}
20815,SeraphimRobe,Seraphim Robe,4,0,,300,,18,,1,0xFFFFFFFF,63,2,4,,1,1,,{ bonus bMaxHPrate,10; bonus2 bMagicAtkEle,Ele_Neutral,5; .@r = getrefine(); if (.@r > 6) { bonus2 bSubEle,Ele_Dark,20; bonus2 bSubEle,Ele_Holy,20; bonus bMatkRate,10; } if (.@r > 8) { bonus2 bSubEle,Ele_Dark,10; bonus2 bSubEle,Ele_Holy,10; bonus bVariableCastrate,-5; } if (getskilllv("CR_TRUST") > 0) { bonus2 bSubEle,Ele_Holy,.@r*3; } },{},{}
20819,Oxygen_Bottle,Oxygen Bottle,4,0,,500,,0,,1,0xFFFFFFFF,63,2,4,,40,0,0,{ bonus bFlee,12+getrefine(); bonus bHit,getrefine(); },{},{}
20823,Para_Team_Manteau100,Awakened Eden Group Manteau I,4,0,,0,,20,,0,0xFFFFFFFF,63,2,4,,100,1,0,{ bonus2 bSubEle,Ele_Neutral,10; bonus bFlee,12; .@r = getrefine(); if(.@r >= 7){ bonus bMaxHP,500; bonus bFlee2,2; if(.@r >= 9){ bonus bMaxHP,500; bonus2 bSubEle,Ele_All,10; bonus2 bSubEle,Ele_Neutral,-10; } } },{},{}
@@ -10803,11 +10869,11 @@
21004,Alca_Bringer_,Alca Bringer,5,20,,3400,280,,2,2,0x00004082,63,2,34,3,100,1,3,{},{},{}
21005,Metal_Two_Hand_Sword,Metal Two Hand Sword,5,20,,0,95,,1,1,0x00004082,63,2,34,3,1,1,3,{ .@r = getrefine(); bonus bBaseAtk,(.@r*6); bonus bMatk,(.@r*2); .@i = min(BaseLevel/10,12); if(.@i>2) bonus bBaseAtk,((.@i-2)*5); },{},{}
21006,TE_Woe_Two_Hand_Sword,TE Woe Two Hand Sword,5,0,,0,150,,1,0,0x00004082,63,2,34,3,40,1,3,{ bonus2 bAddRace,RC_Player,40; bonus2 bAddEff,Eff_Bleeding,3000; },{},{}
-21007,Heavy_Greatsword,Heavy Greatsword,5,20,,2500,330,,1,1,0x00004082,63,2,34,1,150,1,3,{ bonus bStr,20; },{},{}
+21007,Heavy_Sword,Heavy Greatsword,5,20,,2500,330,,1,1,0x00004082,63,2,34,1,150,1,3,{ bonus bStr,20; },{},{}
21008,Small_Karasuma,Small Karasuma,5,20,,1000,170,,1,2,0x00004082,63,2,34,4,50,1,3,{ bonus bCritAtkRate,getrefine()*2; bonus3 bAutoSpell,"NPC_CRITICALWOUND",1,50; },{},{}
-21009,Thanos_Great_Sword,Thanatos Great Sword,5,10,,1300,280:120,,1,1,0x00004082,63,2,34,4,120,1,3,{ bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000; },{},{ heal -1000,0; }
+21009,Thanos_Great_Sword,Thanatos Great Sword,5,10,,1300,280:120,,1,1,0x00004082,56,2,34,4,120,1,3,{ bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000; },{},{ heal -1000,0; }
21010,Tw_Sword_Of_Evil_Slayer,Evil Slayer Slasher Sword,5,10,,2000,225,,1,1,0x00004082,63,2,34,3,100,1,3,{ bonus2 bAddRace,RC_Demon,10; bonus2 bAddRace,RC_Undead,10; .@r = getrefine(); bonus2 bAddClass,Class_All,(.@r>=12?12:(.@r>=9?5:0)); },{},{}
-21011,Gigantic_Blade,Gigantic Blade,5,10,,5000,300,,1,1,0x00004082,56,2,34,4,130,1,3,{ bonus bUnbreakableWeapon,1; bonus bAspdRate,-5; bonus bCritAtkRate,getrefine(); if(readparam(bStr)<=110){ bonus bAtk,-250; } },{},{}
+21011,Giant_Blade,Gigantic Blade,5,10,,5000,300,,1,1,0x00004082,56,2,34,4,130,1,3,{ bonus bUnbreakableWeapon,1; bonus bAspdRate,-5; bonus bCritAtkRate,getrefine(); if(readparam(bStr)<=110){ bonus bAtk,-250; } },{},{}
21012,Some_Wizard_MagicSword,Some Wizard MagicSword,5,0,,2200,200:150,,1,2,0x00000080,56,2,34,4,110,1,3,{},{},{}
21013,Hetairoi_Sword,Hetairoi Sword,5,0,,2200,210,,1,2,0x00000080,56,2,34,4,110,1,3,{ bonus2 bSkillUseSP,"KN_AUTOCOUNTER",2; bonus2 bSkillUseSP,"LK_PARRYING",25; },{},{}
21014,Infinity_Two-Handed_Sword,Infinity Two-Handed Sword,5,20,,500,230,,1,1,0x00004082,56,2,34,4,100,1,3,{},{},{}
@@ -10818,38 +10884,38 @@
//===================================================================
// New Shoes
//===================================================================
-22000,Temporal_STR_Boots,Temporal Boots Of Strength,4,20,,600,,25,,0,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bAtk,7*(.@r/3); if(readparam(bStr)>=120) bonus bBaseAtk,50; },{},{}
-22001,Temporal_INT_Boots,Temporal Boots Of Intelligence,4,20,,600,,20,,0,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMdef,5; bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bMatk,10*(.@r/3); if(readparam(bInt)>=120) bonus bMatk,60; },{},{}
-22002,Temporal_AGI_Boots,Temporal Boots Of Agility,4,20,,600,,25,,0,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bAspdRate,3*(.@r/3); if(readparam(bAgi)>=120) bonus bAspd,1; },{},{}
-22003,Temporal_VIT_Boots,Temporal Boots Of Vitality,4,20,,600,,25,,0,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(300*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); if(readparam(bVit)>=120) bonus bMaxHPrate,8; },{},{}
-22004,Temporal_DEX_Boots,Temporal Boots Of Dexterity,4,20,,600,,25,,0,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bDex,3*(.@r/3); if(readparam(bDex)>=120){ bonus bLongAtkRate,5; bonus bFixedCast,-500; } },{},{}
-22005,Temporal_LUK_Boots,Temporal Boots Of Luck,4,20,,600,,20,,0,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bMdef,5; bonus bCritAtkRate,2*(.@r/3); if(readparam(bLuk)>=120) bonus bCritAtkRate,30; },{},{}
-22006,Temporal_STR_Boots_,Temporal Boots Of Strength,4,20,,600,,25,,1,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bBaseAtk,7*(.@r/3); if(readparam(bStr)>=120) bonus bBaseAtk,50; },{},{}
-22007,Temporal_VIT_Boots_,Temporal Boots Of Vitality,4,20,,600,,25,,1,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(300*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); if(readparam(bVit)>=120) bonus bMaxHPrate,8; },{},{}
-22008,Temporal_DEX_Boots_,Temporal Boots Of Dexterity,4,20,,600,,25,,1,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bDex,3*(.@r/3); if(readparam(bDex)>=120){ bonus bLongAtkRate,5; bonus bFixedCast,-500; } },{},{}
-22009,Temporal_INT_Boots_,Temporal Boots Of Intelligence,4,20,,600,,20,,1,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMdef,5; bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bMatk,10*(.@r/3); if(readparam(bInt)>=120) bonus bMatk,60; },{},{}
-22010,Temporal_AGI_Boots_,Temporal Boots Of Agility,4,20,,600,,25,,1,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bAspdRate,3*(.@r/3); if(readparam(bAgi)>=120) bonus bAspd,1; },{},{}
-22011,Temporal_LUK_Boots_,Temporal Boots Of Luck,4,20,,600,,20,,1,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bMdef,5; bonus bCritAtkRate,2*(.@r/3); if(readparam(bLuk)>=120) bonus bCritAtkRate,30; },{},{}
-22012,Mana_Boots,Mana Boots,4,0,,0,,,,0,0xFFFFFFFF,63,2,64,0,1,1,,{ bonus2 bExpAddRace,RC_All,10; },{},{}
+22000,Temporal_Str_Boots,Temporal Boots Of Strength,4,20,,600,,25,,0,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bAtk,7*(.@r/3); if(readparam(bStr)>=120) bonus bBaseAtk,50; },{},{}
+22001,Temporal_Int_Boots,Temporal Boots Of Intelligence,4,20,,600,,20,,0,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMdef,5; bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bMatk,10*(.@r/3); if(readparam(bInt)>=120) bonus bMatk,60; },{},{}
+22002,Temporal_Agi_Boots,Temporal Boots Of Agility,4,20,,600,,25,,0,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bAspdRate,3*(.@r/3); if(readparam(bAgi)>=120) bonus bAspd,1; },{},{}
+22003,Temporal_Vit_Boots,Temporal Boots Of Vitality,4,20,,600,,25,,0,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(300*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); if(readparam(bVit)>=120) bonus bMaxHPrate,8; },{},{}
+22004,Temporal_Dex_Boots,Temporal Boots Of Dexterity,4,20,,600,,25,,0,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bDex,3*(.@r/3); if(readparam(bDex)>=120){ bonus bLongAtkRate,5; bonus bFixedCast,-500; } },{},{}
+22005,Temporal_Luk_Boots,Temporal Boots Of Luck,4,20,,600,,20,,0,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bMdef,5; bonus bCritAtkRate,2*(.@r/3); if(readparam(bLuk)>=120) bonus bCritAtkRate,30; },{},{}
+22006,Temporal_Str_Boots_,Temporal Boots Of Strength,4,20,,600,,25,,1,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bBaseAtk,7*(.@r/3); if(readparam(bStr)>=120) bonus bBaseAtk,50; },{},{}
+22007,Temporal_Vit_Boots_,Temporal Boots Of Vitality,4,20,,600,,25,,1,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(300*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); if(readparam(bVit)>=120) bonus bMaxHPrate,8; },{},{}
+22008,Temporal_Dex_Boots_,Temporal Boots Of Dexterity,4,20,,600,,25,,1,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bDex,3*(.@r/3); if(readparam(bDex)>=120){ bonus bLongAtkRate,5; bonus bFixedCast,-500; } },{},{}
+22009,Temporal_Int_Boots_,Temporal Boots Of Intelligence,4,20,,600,,20,,1,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMdef,5; bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bMatk,10*(.@r/3); if(readparam(bInt)>=120) bonus bMatk,60; },{},{}
+22010,Temporal_Agi_Boots_,Temporal Boots Of Agility,4,20,,600,,25,,1,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bAspdRate,3*(.@r/3); if(readparam(bAgi)>=120) bonus bAspd,1; },{},{}
+22011,Temporal_Luk_Boots_,Temporal Boots Of Luck,4,20,,600,,20,,1,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bMdef,5; bonus bCritAtkRate,2*(.@r/3); if(readparam(bLuk)>=120) bonus bCritAtkRate,30; },{},{}
+22012,Mana_Boots,Mana Boots,4,0,,0,,,,0,0xFFFFFFFF,63,2,64,,1,1,,{ bonus2 bExpAddRace,RC_All,10; },{},{}
22014,Enhanced_Variant_Shoes,Enhanced Variant Shoes,4,20,,500,,13,,1,0x7CCFDF80,63,2,64,,85,1,0,{ bonus bMaxHPrate,12; bonus bMaxSPrate,12; .@r = getrefine(); bonus bDef,.@r; bonus bMdef,.@r; },{},{}
22015,Impr_Angel's_Arrival,Advanced Angel's Reincarnation,4,10000,,300,,8,,1,0x00000001,63,2,64,,99,1,0,{ bonus bMaxHP,500; bonus bMaxSP,100; },{},{}
22018,Shoes_Of_Wise_Man,Shoes Of Wise Man,4,10,,300,,15,,1,0xFFFFFFFF,63,2,64,,50,1,,{ .@r = getrefine(); if(.@r>5){ bonus bInt,.@r-5; bonus bMaxHPrate,-(.@r-5); } },{},{}
-22033,Boots_of_Gray,Boots of Gray,4,10,,0,,,,1,0xFFFFFFFF,63,2,64,,120,1,,{ bonus2 bSubEle,Ele_Holy,1+getrefine()/3; },{},{}
+22033,Boots_Of_Gray,Boots of Gray,4,20,,400,,25,,1,0xFFFFFFFF,56,2,64,,120,1,0,{ bonus2 bSubEle,Ele_Holy,2+getrefine()/3; },{},{}
22034,Crimson_Gaiter,Crimson Gaiter,4,0,,500,,10,,0,0xFFFFFFFF,63,2,64,,50,1,,{ bonus bCritical,2; bonus bCritAtkRate,2; if(getrefine()>=7){ bonus bCritical,3; bonus bCritAtkRate,3; } },{},{}
-22035,Heoric_Nepenthes_Shoes,Heoric Nepenthes Shoes,4,10,,300,,10,,1,0xFFFFFFFF,63,2,64,,160,1,,{ .@r = getrefine(); if (.@r>=8 && .@r<=10) .@i=5+.@r; else if (.@r>=11 && .@r<=13) .@i=5+(.@r*3); else if (.@r>13) .@i=42; bonus bVariableCastrate,-10-.@i; },{},{}
-22036,Heroic_Silver_Fox_Leather_Boots,Heroic Silver Fox Leather Boots,4,10,,300,,15,,1,0xFFFFFFFF,63,2,64,,160,1,,{ .@r = getrefine(); if (.@r>=8 && .@r<=13) .@i=.@r; else if (.@r>13) .@i=13; bonus bLongAtkRate,5+.@i; },{},{}
-22037,Heroic_Ungoliant_Upgrade_Boots,Heroic Ungoliant Upgrade Boots,4,10,,300,,10,,1,0xFFFFFFFF,63,2,64,,160,1,,{ .@r = getrefine(); if (.@r>=8 && .@r<=13) .@i=.@r; else if (.@r>13) .@i=13; bonus bUseSPrate,-5-.@i; },{},{}
+22035,Vet_Nepen_Heel,Heoric Nepenthes Shoes,4,10,,300,,10,,1,0xFFFFFFFF,63,2,64,,160,1,,{ .@r = getrefine(); if (.@r>=8 && .@r<=10) .@i=5+.@r; else if (.@r>=11 && .@r<=13) .@i=5+(.@r*3); else if (.@r>13) .@i=42; bonus bVariableCastrate,-10-.@i; },{},{}
+22036,Vet_SliverFox_Boots,Heroic Silver Fox Leather Boots,4,10,,300,,15,,1,0xFFFFFFFF,63,2,64,,160,1,,{ .@r = getrefine(); if (.@r>=8 && .@r<=13) .@i=.@r; else if (.@r>13) .@i=13; bonus bLongAtkRate,5+.@i; },{},{}
+22037,Vet_Ungo_Boots,Heroic Ungoliant Upgrade Boots,4,10,,300,,10,,1,0xFFFFFFFF,63,2,64,,160,1,,{ .@r = getrefine(); if (.@r>=8 && .@r<=13) .@i=.@r; else if (.@r>13) .@i=13; bonus bUseSPrate,-5-.@i; },{},{}
22042,Talaria_Shoes,Talaria Shoes,4,10,,300,,15,,1,0xFFFFFFFF,63,2,64,,50,1,,{ bonus bAgi,2; bonus bAspd,1; bonus bUnbreakableShoes,1; },{},{}
22043,Supplement_Part_Agi,Supplement Part Agi,4,25000,,350,,25,,1,0x00000400,56,2,64,,100,1,,{ bonus bAspdRate,5+(getrefine()/4); },{},{}
-22044,Reinforced_Parts_Booster,Reinforced Parts - Booster,4,10,,1000,,23,,1,0x00000400,56,2,64,,100,1,,{ bonus2 bSkillUseSP,"NC_HOVERING",15; if(getrefine()>=7){bonus2 bSkillUseSP,"NC_HOVERING",-20;} },{},{}
+22044,Upgrade_Part_Booster,Reinforced Parts - Booster,4,10,,1000,,23,,1,0x00000400,56,2,64,,100,1,,{ bonus2 bSkillUseSP,"NC_HOVERING",15; if(getrefine()>=7){bonus2 bSkillUseSP,"NC_HOVERING",-20;} },{},{}
22045,Beach_Sandals,Summer Sandals,4,10,,200,,5,,0,0xFFFFFFFF,63,2,64,,0,1,0,{ bonus bFlee,5; bonus3 bAutoSpellWhenHit,"AL_INCAGI",10,300; },{},{}
-22046,Boots_Of_Airship,Boots Of Airship,4,10,,0,,26,,0,0xFFFFFFFF,63,2,64,,125,1,,{ bonus bAgi,1; bonus bSpeedRate,10; },{},{}
-22047,Tarlock's_Boots,Tarlock's Boots,4,10,,250,,13,,0,0xFFFFFFFF,63,2,64,,125,1,,{ bonus bAgi,1; .@r = getrefine(); bonus bAspdRate,5; if(.@r>=7) { bonus bAgi,1; bonus bAspdRate,5; } if(.@r>=9) { bonus bAgi,1; bonus bAspdRate,5; } if(.@r>=12) { bonus bAspd,1; } },{},{}
+22046,Airship_Boots,Boots Of Airship,4,10,,0,,26,,0,0xFFFFFFFF,63,2,64,,125,1,,{ bonus bAgi,1; bonus bSpeedRate,10; },{},{}
+22047,Felock_Boots,Tarlock's Boots,4,10,,250,,13,,0,0xFFFFFFFF,63,2,64,,125,1,,{ bonus bAgi,1; .@r = getrefine(); bonus bAspdRate,5; if(.@r>=7) { bonus bAgi,1; bonus bAspdRate,5; } if(.@r>=9) { bonus bAgi,1; bonus bAspdRate,5; } if(.@r>=12) { bonus bAspd,1; } },{},{}
22059,Aegir_Shoes,Aegir Shoes,4,10,,300,,13,,1,0xFFFFFFFF,63,2,64,,40,1,,{ bonus bUnbreakableShoes,1; bonus bMaxHP,500; bonus bMaxSP,50; },{},{}
22064,Thorny_Shoes,Thorny Shoes,4,0,,1000,,25,,1,0xFFFFFFFF,63,2,64,,,1,,{ bonus bShortWeaponDamageReturn,getrefine()/2; },{},{}
-22067,Shoe_of_Witch,Shoe of Witch,4,10,,400,,10,,0,0xFFFFFFFE,63,2,64,,1,1,,{ skill "ALL_CATCRY",1; },{},{}
-22069,Lian_Shoes,Lian Shoes,4,0,,250,,12,,1,0xFFFFFFFF,63,2,64,1,90,1,,{ bonus bMdef,3; bonus2 bSubEle,Ele_Neutral,5; .@r = getrefine(); bonus bMaxHPrate,.@r; bonus bMaxSPrate,.@r; },{},{}
-22072,Hikingboots,Hikingboots,4,0,,500,,10,,1,0xFFFFFFFF,63,2,64,0,100,1,,{ .@r = getrefine(); bonus bMaxHPRate,4+(.@r/3); bonus bMaxSPRate,4+(.@r/3); if (.@r > 9) bonus bSpeedRate,25; },{},{}
+22067,Witch_Shoes,Shoe of Witch,4,10,,400,,10,,0,0xFFFFFFFE,63,2,64,,1,1,,{ skill "ALL_CATCRY",1; },{},{}
+22069,Lian_Shoes,Lian Shoes,4,0,,250,,12,,1,0xFFFFFFFF,63,2,64,,90,1,,{ bonus bMdef,3; bonus2 bSubEle,Ele_Neutral,5; .@r = getrefine(); bonus bMaxHPrate,.@r; bonus bMaxSPrate,.@r; },{},{}
+22072,Hikingboots,Hikingboots,4,0,,500,,10,,1,0xFFFFFFFF,63,2,64,,100,1,,{ .@r = getrefine(); bonus bMaxHPRate,4+(.@r/3); bonus bMaxSPRate,4+(.@r/3); if (.@r > 9) bonus bSpeedRate,25; },{},{}
22075,Rift_Shoes,Rift Shoes,4,20,,250,,12,,1,0xFFFFFFFF,63,2,64,,100,1,,{ .@r = getrefine(); bonus bMaxHP,(.@r >= 9 ? 1300 : .@r >= 7 ? 700 : 300); bonus bMaxSP,-50; },{},{}
22076,Wooden_Slipper,Wooden Slipper,4,20,,50,,10,,1,0x80000000,7,2,64,,9,1,,{ bonus2 bHPRegenRate,2,10000; },{},{}
22077,Red_Eco-Friendly_Shoes,Red Eco-Friendly Shoes,4,20,,100,,20,,1,0x80000000,7,2,64,,18,1,,{ bonus bCritical,5; bonus2 bHPRegenRate,4,10000; bonus2 bSPRegenRate,1,10000; },{},{}
@@ -10857,14 +10923,26 @@
22079,Unity_AGI_Boots,Unity AGI Boots,4,10,,300,,20,,1,0xFFFFFFFF,63,2,64,,1,1,,{ .@r = getrefine(); if(BaseLevel<100) { bonus2 bExpAddRace,RC_All,4; bonus bAgi,.@r/2; } },{},{}
22080,Unity_DEX_Boots,Unity DEX Boots,4,10,,300,,20,,1,0xFFFFFFFF,63,2,64,,1,1,,{ .@r = getrefine(); if(BaseLevel<100) { bonus2 bExpAddRace,RC_All,4; bonus bDex,.@r/2; } },{},{}
22081,Unity_INT_Boots,Unity INT Boots,4,10,,300,,20,,1,0xFFFFFFFF,63,2,64,,1,1,,{ .@r = getrefine(); if(BaseLevel<100) { bonus2 bExpAddRace,RC_All,4; bonus bInt,.@r/2; } },{},{}
-22082,Polyhedron_Shoes,Polyhedron Shoes,4,0,,500,,12,,1,0xFFFFFFFF,63,2,64,0,90,1,,{ .@r = getrefine(); bonus2 bSubEle,Ele_Neutral,5; bonus2 bSubEle,Ele_Fire,5; bonus2 bSubEle,Ele_Water,5; bonus2 bSubEle,Ele_Wind,5; if (.@r > 4) { .@b = (.@r > 6) ? 10 : 5; bonus2 bAddEle,Ele_Neutral,.@b; bonus2 bAddEle,Ele_Fire,.@b; bonus2 bAddEle,Ele_Water,.@b; bonus2 bAddEle,Ele_Wind,.@b; } },{},{}
+22082,Polyhedron_Shoes,Polyhedron Shoes,4,0,,500,,12,,1,0xFFFFFFFF,63,2,64,,90,1,,{ .@r = getrefine(); bonus2 bSubEle,Ele_Neutral,5; bonus2 bSubEle,Ele_Fire,5; bonus2 bSubEle,Ele_Water,5; bonus2 bSubEle,Ele_Wind,5; if (.@r > 4) { .@b = (.@r > 6) ? 10 : 5; bonus2 bAddEle,Ele_Neutral,.@b; bonus2 bAddEle,Ele_Fire,.@b; bonus2 bAddEle,Ele_Water,.@b; bonus2 bAddEle,Ele_Wind,.@b; } },{},{}
22083,Private_Doram_Shoes,Private Doram Shoes,4,20,,500,,25,,1,0x80000000,7,2,64,,100,1,,{ bonus bMaxHP,100; bonus bMaxSP,50; .@r = getrefine()/3; bonus bHPrecovRate,.@r*10; bonus bSPrecovRate,.@r*10; },{},{}
22084,Luxury_Doram_Shoes,Luxury Doram Shoes,4,20,,600,,30,,1,0x80000000,7,2,64,,140,1,,{ bonus bMaxHP,300; bonus bMaxSP,100; .@r = getrefine()/3; bonus bHPrecovRate,20*.@r; bonus bSPrecovRate,20*.@r; },{},{}
22085,Elegant_Doram_Shoes,Elegant Doram Shoes,4,20,,700,,35,,1,0x80000000,7,2,64,,175,1,,{ bonus bMaxHPrate,10; bonus bMaxSPrate,5; .@r = getrefine()/2; bonus bMaxHP,100*.@r; bonus bMaxSP,20*.@r; if(.@r >= 4) bonus2 bSkillUseSP,"SU_LOPE",5; },{},{}
22089,Crimson_Gaiter_,Crimson Gaiter,4,0,,500,,10,,1,0xFFFFFFFF,63,2,64,,50,1,,{ bonus bCritical,2; bonus bCritAtkRate,2; if(getrefine()>=7){ bonus bCritical,3; bonus bCritAtkRate,3; } },{},{}
22101,Angel_Poring_Boots,Angel Poring Boots,4,10,,300,,15,,1,0xFFFFFFFF,63,2,64,,1,1,,{ bonus bAllStats,1; skill "AL_HEAL",1; },{},{}
-22103,Excelion_Leg,Excelion Leg,4,0,,500,,13,,0,0xFFFFFFFF,63,2,64,1,100,1,,{ .@r = getrefine(); bonus bMaxHP,5+((BaseLevel > 129) ? 4 : 0)+(.@r/3)*3; bonus bMaxSP,5+((BaseLevel > 129) ? 4 : 0)+(.@r/3)*3; },{},{}
+22103,Excelion_Leg,Excelion Leg,4,0,,500,,13,,0,0xFFFFFFFF,63,2,64,,100,1,,{ .@r = getrefine(); bonus bMaxHP,5+((BaseLevel > 129) ? 4 : 0)+(.@r/3)*3; bonus bMaxSP,5+((BaseLevel > 129) ? 4 : 0)+(.@r/3)*3; },{},{}
22106,Giant_Boots,Giant Boots,4,0,,500,,13,,1,0xFFFFFFFF,63,2,64,,1,1,,{ bonus2 bSubRace,RC_All,1; bonus bMaxHPrate,2; bonus bMaxSPrate,2; .@r = getrefine(); if (.@r > 4) { bonus bDefRate,2; bonus bMaxHPrate,4; bonus bMaxSPrate,4; } if (.@r > 6) { bonus bDefRate,2; bonus bMaxHPrate,4; bonus bMaxSPrate,4; } },{},{}
+22107,Modified_Str_Boots,Modified Str Boots,4,20,,600,,25,,0,0x60000000,63,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bAtk,7*(.@r/3); if(readparam(bStr)>=120) bonus bBaseAtk,50; },{},{}
+22108,Modified_Int_Boots,Modified Int Boots,4,20,,600,,25,,0,0x60000000,63,2,64,,99,1,,{ .@r = getrefine(); bonus bMdef,5; bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bMatk,10*(.@r/3); if(readparam(bInt)>=120) bonus bMatk,60; },{},{}
+22109,Modified_Agi_Boots,Modified Agi Boots,4,20,,600,,25,,0,0x60000000,63,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bAspdRate,3*(.@r/3); if(readparam(bAgi)>=120) bonus bAspd,1; },{},{}
+22110,Modified_Vit_Boots,Modified Vit Boots,4,20,,600,,25,,0,0x60000000,63,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(300*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); if(readparam(bVit)>=120) bonus bMaxHPrate,8; },{},{}
+22111,Modified_Dex_Boots,Modified Dex Boots,4,20,,600,,25,,0,0x60000000,63,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bDex,3*(.@r/3); if(readparam(bDex)>=120){ bonus bLongAtkRate,5; bonus bFixedCast,-500; } },{},{}
+22112,Modified_Luk_Boots,Modified Luk Boots,4,20,,600,,25,,0,0x60000000,63,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bMdef,5; bonus bCritAtkRate,2*(.@r/3); if(readparam(bLuk)>=120) bonus bCritAtkRate,30; },{},{}
+22113,Modified_Str_Boots_,Modified Str Boots,4,20,,600,,25,,1,0x60000000,63,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bAtk,7*(.@r/3); if(readparam(bStr)>=120) bonus bBaseAtk,50; },{},{}
+22114,Modified_Int_Boots_,Modified Int Boots,4,20,,600,,25,,1,0x60000000,63,2,64,,99,1,,{ .@r = getrefine(); bonus bMdef,5; bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bMatk,10*(.@r/3); if(readparam(bInt)>=120) bonus bMatk,60; },{},{}
+22115,Modified_Agi_Boots_,Modified Agi Boots,4,20,,600,,25,,1,0x60000000,63,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bAspdRate,3*(.@r/3); if(readparam(bAgi)>=120) bonus bAspd,1; },{},{}
+22116,Modified_Vit_Boots_,Modified Vit Boots,4,20,,600,,25,,1,0x60000000,63,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(300*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); if(readparam(bVit)>=120) bonus bMaxHPrate,8; },{},{}
+22117,Modified_Dex_Boots_,Modified Dex Boots,4,20,,600,,25,,1,0x60000000,63,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bDex,3*(.@r/3); if(readparam(bDex)>=120){ bonus bLongAtkRate,5; bonus bFixedCast,-500; } },{},{}
+22118,Modified_Luk_Boots_,Modified Luk Boots,4,20,,600,,25,,1,0x60000000,63,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bMdef,5; bonus bCritAtkRate,2*(.@r/3); if(readparam(bLuk)>=120) bonus bCritAtkRate,30; },{},{}
22122,Para_Team_Boots100,Awakened Eden Group Boots I,4,0,,0,,22,,0,0xFFFFFFFF,63,2,64,,100,1,,{ bonus bAllStats,1; bonus bHPrecovRate,30; bonus bSPrecovRate,14; },{},{}
22123,Para_Team_Boots115,Awakened Eden Group Boots II,4,0,,0,,25,,0,0xFFFFFFFF,63,2,64,,115,1,,{ bonus bAllStats,1; bonus bHPrecovRate,36; bonus bSPrecovRate,18; },{},{}
22124,Para_Team_Boots130,Awakened Eden Group Boots III,4,0,,0,,27,,0,0xFFFFFFFF,63,2,64,,130,1,,{ bonus bAllStats,2; bonus bHPrecovRate,36; bonus bSPrecovRate,18; },{},{}
@@ -10873,17 +10951,17 @@
//===================================================================
// New Usable items
//===================================================================
-22508,Para_Team_Mark_,Eden Group Mark,11,0,,0,,,,0,0xFFFFFFFF,63,2,,,,,,{ warp "moc_para01",171,115; },{},{}
+22508,Para_Team_Mark_,Eden Group Mark,2,0,,0,,,,0,0xFFFFFFFF,63,2,,,,,,{ warp "moc_para01",171,115; },{},{}
22507,ShabbyOldScroll,Old Scroll,2,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ callfunc "F_22507"; },{},{}
22510,King_Wolf_Scroll,King Wolf Scroll,2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ /*TODO, confirm the rates*/ getitem callfunc("F_Rand",6635,19598,5658,6238,6239),1; },{},{}
-22511,Fenrirs_Power_Scroll,Fenrir's Power Scroll,2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ bonus_script "bonus bMatk,25; bonus bFixedCastRate,-50;",300,1025; },{},{}
+22511,Fenrir_Card__,Fenrir's Power Scroll,2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ bonus_script "bonus bMatk,25; bonus bFixedCastRate,-50;",300,1025; },{},{}
22513,King_of_Gift_Box,King of Gift Box,2,10,,100,,,,0,0xFFFFFFFF,63,2,,,,,,{ /*TODO, confirm the rates*/ getitem callfunc("F_Rand",12817,4403,14512),1; },{},{}
22514,Candy_Holder,Candy Holder,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getrandgroupitem(IG_Candy_Holder,1); getrandgroupitem(IG_Candy_Holder,1); getrandgroupitem(IG_Candy_Holder,1); },{},{}
22515,Twisted_Key_of_Time,Twisted Key of Time,3,10,,300,,,,,,,,,,,,,{},{},{}
-22516,Black_As_Night_Piece_,Black As Night Piece,3,10,,0,,,,,,,,,,,,,{},{},{}
-22517,Rocker_Summoning_Scroll,Rocker Summoning Scroll,3,10,,0,,,,,,,,,,,,,{},{},{}
+22516,Dark_Red_Clot,Black As Night Piece,3,10,,0,,,,,,,,,,,,,{},{},{}
+22517,Loki_Summon_Scroll,Rocker Summoning Scroll,3,10,,0,,,,,,,,,,,,,{},{},{}
22518,Idn_Wisdom_Egg,Egg Of Wisdom,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getgroupitem(IG_Idn_Wisdom_Egg); },{},{}
-22519,Stops_Buff,Stops Buff,3,10,,0,,,,,,,,,,,,,{},{},{}
+22519,Pc_Stop_Cancel,Stops Buff,3,10,,0,,,,,,,,,,,,,{},{},{}
22520,Stops_Buff_Reset,Stops Buff Reset,3,10,,0,,,,,,,,,,,,,{},{},{}
22521,Level_Up_Box_,Level Up Box,18,10,,0,,,,0,0xFFFFFFFF,63,2,,,80,,,{ /*TODO*/ },{},{}
22522,Level_Up_Box100,Level Up Box(100),18,10,,0,,,,0,0xFFFFFFFF,63,2,,,100,,,{ getgroupitem(IG_Level_Up_Box100); },{},{}
@@ -10901,20 +10979,20 @@
22535,WorkerScroll_A,Scroll Summoning Workers(Male),2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
22536,WorkerScroll_B,Scroll Summoning Workers(Female),2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
22538,Hanbok_bag,Hanbok bag,2,10,,10,,,,0,0xFFFFFFFF,63,2,,,1,,,{},{},{}
-22540,Runstone_Luxanima,Lux Anima Runestone,11,2,,100,,,,,0xFFFFFFFF,56,2,,,,,,{ itemskill "RK_LUXANIMA",1; },{},{}
+22540,Runstone_Lux,Lux Anima Runestone,11,2,,100,,,,,0xFFFFFFFF,56,2,,,,,,{ itemskill "RK_LUXANIMA",1; },{},{}
22541,PC_Room_Coupon_Box_VI,PC Room Coupon Box VI,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
-22542,Concentration_Potion,Concentration Potion,2,10,,100,,,,0,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_ASPDPOTION0,1800000,4; },{},{}
-22543,Berserk_Potion_,Berserk Potion,2,10,,200,,,,0,0x6,63,2,,,,,,{ sc_start SC_ASPDPOTION2,1800000,9; },{},{}
-22544,Awakening_Potion_,Awakening Potion,2,10,,150,,,,0,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_ASPDPOTION1,1800000,6; },{},{}
+22542,Center_Potion_B,Concentration Potion,2,10,,100,,,,0,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_ASPDPOTION0,1800000,4; },{},{}
+22543,Berserk_Potion_B,Berserk Potion,2,10,,200,,,,0,0x6,63,2,,,,,,{ sc_start SC_ASPDPOTION2,1800000,9; },{},{}
+22544,Awakening_Potion_B,Awakening Potion,2,10,,150,,,,0,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_ASPDPOTION1,1800000,6; },{},{}
22545,Speed_Potion,Speed Potion,2,10,,100,,,,0,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_SPEEDUP1,5000,50; },{},{}
22546,Slow_Potion,Slow Potion,2,10,,100,,,,0,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_SLOWDOWN,5000,100; },{},{}
22547,Anti-Payne_Moment,Anti-Payne Moment,2,10,,100,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
22548,Wed_Cursed,Wed Cursed,2,10,,30,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
22549,Poison_Bottle_,Poison Bottle,2,10,,100,,,,0,0xFFFFFFFF,63,2,,,,,,{ if(Class == Job_Assassin_Cross || Class == Job_Guillotine_Cross || Class == Job_Guillotine_Cross_T) { sc_start SC_DPOISON,60000,0; sc_start SC_ASPDPOTION3,60000,9; } else percentheal -100,-100; },{},{}
-22550,Sweets_Pocket,Sweets Pocket,2,10,,70,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
-22551,Teacake,Teacake,2,10,,70,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
-22552,Fried_Pastry,Fried Pastry,2,10,,70,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
-22553,Rainbow_Bread,Rainbow Bread,2,10,,70,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
+22550,Cookie_Bag_B,Sweets Pocket,2,10,,70,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
+22551,Sesame_Pastry_B,Teacake,2,10,,70,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
+22552,Honey_Pastry_B,Fried Pastry,2,10,,70,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
+22553,Rainbow_Cake_B,Rainbow Bread,2,10,,70,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
22554,First_Aid_Box,First Aid Box,18,10,,200,,,,0,0xFFFFFFFF,63,2,,,,,,{ getrandgroupitem(IG_FirstAid,1); getrandgroupitem(IG_FirstAid,1); getrandgroupitem(IG_FirstAid,1); getrandgroupitem(IG_FirstAid,1); getrandgroupitem(IG_FirstAid,1); },{},{}
22555,Gourmet_Chocolate,Gourmet Chocolate,0,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
22556,Luxury_Chocolate,Luxury Chocolate,0,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
@@ -10922,18 +11000,18 @@
22558,Lucky_Bag,Lucky Bag,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getrandgroupitem(IG_Lucky_Bag,1); },{},{}
22559,Mock_Strawberry,Mock Strawberry,11,20,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ percentheal 50,50; itemskill "SM_ENDURE",3; },{},{}
22563,Lucky_Bag_Of_New_Era,Lucky Bag Of New Era,2,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ /* TODO */ },{},{}
-22566,Last_Years_Frost,Last Year's Frost,3,20,,0,,,,,,,,,,,,,{},{},{}
-22567,Expedition_Award_Box,Expedition Award Box,0,20,,100,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
-22568,Nidhoggur_Summon_Scroll,Nidhoggur Summon Scroll,0,20,,100,,,,,0xFFFFFFFF,63,,2,,,,,{},{},{}
+22566,Frost_Crystal,Last Year's Frost,3,20,,0,,,,,,,,,,,,,{},{},{}
+22567,Squad_Prize,Expedition Award Box,0,20,,100,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
+22568,Nyd_Summon_Scroll,Nidhoggur Summon Scroll,0,20,,100,,,,,0xFFFFFFFF,63,,2,,,,,{},{},{}
22569,Gift_New_start,Gift New start,18,10,,100,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
22571,Easter_Egg,Easter Egg,11,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
-22589,Savage_Ora_Ora,Savage Ora Ora,3,10,,0,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
-22590,Grand_Peco_Ora_Ora,Grand Peco Ora Ora,3,10,,0,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
-22591,Desert_Wolf_Ora_Ora,Desert Wolf Ora Ora,3,10,,0,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
+22589,Savage_Ora,Savage Ora Ora,3,10,,0,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
+22590,Grand_Peco_Ora,Grand Peco Ora Ora,3,10,,0,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
+22591,Dest_Wolf_Ora,Desert Wolf Ora Ora,3,10,,0,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
22592,Happy_Call_Box,Happy Call Box,18,10,,0,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
-22605,Ginger_Bread,Ginger Bread,2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
+22605,Gingerbread2,Ginger Bread,2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
22610,New_Beginnings_Box,New Beginnings Box,2,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 12803,1; getitem 12802,1; getitem 12809,1; },{},{}
-22611,Packed_Envelope,Packed Envelope,11,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ /* TODO */ },{},{}
+22611,Packing_Envelope,Packed Envelope,11,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ /* TODO */ },{},{}
22612,Corrupt_Reagents,Corrupt Reagents,11,10,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ /* TODO */ },{},{}
22613,Contaminated_Reagents,Contaminated Reagents,11,10,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ /* TODO */ },{},{}
22614,Premium_Manual,Premium Manual,2,2,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_EXPBOOST,8640000,50; sc_start SC_ITEMBOOST,8640000,200; },{},{}
@@ -10975,15 +11053,15 @@
22674,June_Gift_Box,June Gift Box,2,10,,100,,,,,0xFFFFFFFF,63,2,,,,,,{/*1 Potion Box*/},{},{}
22676,Hangul_Day_Event_Box,Hangul Day Event Box,2,20,,0,,,,,0xFFFFFFFF,63,2,,,0,,,{ getitem 22675,10; getitem 607,9; },{},{}
22675,Mysterious_Scroll,Mysterious Scroll,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_INTFOOD,3600000,30; },{},{}
-22679,Death_Bin,Death Bin,18,10,,0,,,,0,0xFFFFFFFF,63,2,,,170,,,{ /*TODO*/ },{},{}
+22679,Chest_Of_Death,Death Bin,18,10,,0,,,,0,0xFFFFFFFF,63,2,,,170,,,{ /*TODO*/ },{},{}
22685,Solo_Christmas_Gift,Single Union Christmas Gift,2,0,,0,,,,,0xFFFFFFFF,63,2,,,0,,,{ getgroupitem(IG_Solo_Christmas_Gift); },{},{}
22686,Solo_Cookie,Single Cookie,0,0,,50,,,,,0xFFFFFFFF,63,2,,,0,,,{ percentheal 5,5; },{},{}
22687,Fragments_Vicious_Mind,Fragments Vicious Mind,3,10,,1,,,,0,0xFFFFFFFF,63,2,,,,,,{ /*TODO*/ },{},{}
-22691,Record_Fragment1,Record Fragment,3,10,,0,,,,,,,,,,,,,{},{},{}
-22692,Record_Fragment2,Record Fragment,3,10,,0,,,,,,,,,,,,,{},{},{}
-22693,Record_Fragment3,Record Fragment,3,10,,0,,,,,,,,,,,,,{},{},{}
-22694,Record_Fragment4,Record Fragment,3,10,,0,,,,,,,,,,,,,{},{},{}
-22695,Record_Fragment5,Record Fragment,3,10,,0,,,,,,,,,,,,,{},{},{}
+22691,Record_Fragment1,Record Fragment,0,,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ warp "un_bk_q",98,143; if (callfunc("F_time_limit_recorder") == 1) { recorder_quest_type = 1; } },{},{}
+22692,Record_Fragment2,Record Fragment,0,,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ warp "un_bk_q",45,276; if (callfunc("F_time_limit_recorder") == 1) { recorder_quest_type = 2; } },{},{}
+22693,Record_Fragment3,Record Fragment,0,,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ warp "un_bk_q",217,346; if (callfunc("F_time_limit_recorder") == 1) { recorder_quest_type = 3; } },{},{}
+22694,Record_Fragment4,Record Fragment,0,,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ warp "un_bk_q",273,235; if (callfunc("F_time_limit_recorder") == 1) { recorder_quest_type = 4; } },{},{}
+22695,Record_Fragment5,Record Fragment,0,,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ warp "un_bk_q",275,290; if (callfunc("F_time_limit_recorder") == 1) { recorder_quest_type = 5; } },{},{}
22699,Test_Reagent,Test Reagent,3,10,,0,,,,,,,,,,,,,{},{},{}
22700,Jumping_Support_Box,Jumping Support Box,18,10,,0,,,,0,0xFFFFFFFF,63,2,,,,,,{ /*TODO: getitem 12529,1; getitem 12323,200; getitem 12324,50; and 5 boxes that containing quivers + oridecons*/ },{},{}
22702,STR_Soul_Potion,STR Reduction Potion,11,10,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ callfunc "F_CashReduceStat",bStr,-1,22702; },{},{}
@@ -10992,7 +11070,7 @@
22705,INT_Soul_Potion,STR Reduction Potion,11,10,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ callfunc "F_CashReduceStat",bInt,-1,22705; },{},{}
22706,DEX_Soul_Potion,STR Reduction Potion,11,10,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ callfunc "F_CashReduceStat",bDex,-1,22706; },{},{}
22707,LUK_Soul_Potion,STR Reduction Potion,11,10,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ callfunc "F_CashReduceStat",bLuk,-1,22707; },{},{}
-22708,Thrilling_Box,Thrilling Box,2,10,,100,,,,0,0xFFFFFFFF,63,2,,,,,,{ /*No clue the random item yet*/ },{},{}
+22708,Pitapat_Box,Thrilling Box,2,10,,100,,,,0,0xFFFFFFFF,63,2,,,,,,{ /*No clue the random item yet*/ },{},{}
22717,Wanderer_Ball,Wanderer Ball,3,10,,0,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
22718,Lude_Ball,Lude Ball,3,10,,0,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
22719,Tatacho_Ball,Tatacho Ball,3,10,,0,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
@@ -11001,19 +11079,19 @@
22734,Revolution_Quiz_Box,Revolution Quiz Box,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 6635,2; getitem 6423,1; /*1x Enchanted Letter Introduction*/ },{},{}
22735,Sealed_Moonlight_Flower_Scroll,Sealed Moonlight Flower Scroll,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ /*TODO: Confirm the rates*/ getitem callfunc("F_Rand",6228,6232,24150,19934,6635,17474),1; },{},{}
22736,July_Gift_Box,July Gift Box,2,10,,100,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 20212,1; },{},{}
-22737,Bloody_Cartridge,Bloody Cartridge,18,10,,250,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 13222,500; },{},{}
-22738,Silver_Cartridge,Silver Cartridge,18,10,,250,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 13221,500; },{},{}
-22739,Lightning_Sphere_Pack,Lightning Sphere Pack,18,10,,350,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 13224,500; },{},{}
-22740,Blind_Sphere_Pack,Blind Sphere Pack,18,10,,350,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 13226,500; },{},{}
-22741,Poison_Sphere_Pack,Poison Sphere Pack,18,10,,350,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 13225,500; },{},{}
-22742,Freezing_Sphere_Pack,Freezing Sphere Pack,18,10,,350,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 13227,500; },{},{}
-22743,Flare_Sphere_Pack,Flare Sphere Pack,18,10,,350,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 13223,500; },{},{}
-22744,Armor-Piercing_Cartridge,Armor-Piercing Cartridge,18,10,,250,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 13215,500; },{},{}
-22745,Incandescence_Shot_Cartridge,Incandescence Shot Cartridge,18,10,,250,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 13216,500; },{},{}
-22746,Glaciation_Shot_Cartridge,Glaciation Shot Cartridge,18,10,,250,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 13217,500; },{},{}
-22747,Dengeki_Shot_Cartridge,Dengeki Shot Cartridge,18,10,,250,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 13218,500; },{},{}
-22748,Hearthstone_Shot_Cartridge,Hearthstone Shot Cartridge,18,10,,250,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 13219,500; },{},{}
-22749,Purification_Shot_Cartridge,Purification Shot Cartridge,18,10,,250,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 13220,500; },{},{}
+22737,Bullet_Case_Blood_,Bloody Cartridge,18,10,,250,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 13222,500; },{},{}
+22738,Bullet_Case_Silver_,Silver Cartridge,18,10,,250,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 13221,500; },{},{}
+22739,Sphere_Case_Wind_,Lightning Sphere Pack,18,10,,350,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 13224,500; },{},{}
+22740,Sphere_Case_Darkness_,Blind Sphere Pack,18,10,,350,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 13226,500; },{},{}
+22741,Sphere_Case_Poison_,Poison Sphere Pack,18,10,,350,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 13225,500; },{},{}
+22742,Sphere_Case_Water_,Freezing Sphere Pack,18,10,,350,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 13227,500; },{},{}
+22743,Sphere_Case_Fire_,Flare Sphere Pack,18,10,,350,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 13223,500; },{},{}
+22744,Bullet_Case_AP,Armor-Piercing Cartridge,18,10,,250,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 13215,500; },{},{}
+22745,Bullet_Case_Blaze,Incandescence Shot Cartridge,18,10,,250,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 13216,500; },{},{}
+22746,Bullet_Case_Fleeze,Glaciation Shot Cartridge,18,10,,250,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 13217,500; },{},{}
+22747,Bullet_Case_Electric,Dengeki Shot Cartridge,18,10,,250,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 13218,500; },{},{}
+22748,Bullet_Case_Stone,Hearthstone Shot Cartridge,18,10,,250,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 13219,500; },{},{}
+22749,Sanctified_Bullet_Case,Purification Shot Cartridge,18,10,,250,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 13220,500; },{},{}
22750,Trans_Scroll_Horn_Scaraba,Transformation Scroll(Horn Scaraba),2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ transform 2161,1200000,SC_MTF_ASPD2,2,10; },{},{}
22751,Trans_Scroll_Wanderer,Transformation Scroll(Wanderer),2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ transform 1208,1200000,SC_MTF_ASPD2,2,10; },{},{}
22752,Trans_Scroll_Gazeti,Transformation Scroll(Gazeti),2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ transform 1778,1200000,SC_MTF_RANGEATK2,30; },{},{}
@@ -11045,8 +11123,9 @@
22812,Sealed_Dracula_Scroll,Sealed Dracula Scroll,2,10,,10,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getitem callfunc("F_Rand",6228,6232,22813,19937,17314, 6635),1; },{},{}
22813,Bearer's_Shadow_Box,Bearer's Shadow Box,2,10,,10,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getitem callfunc("F_Rand",24180,24181,24182,24183,24184,24185),1; },{},{}
22814,Cat_Hand_Ticket,Cat Hand Ticket,3,10,,0,,,,,,,,,,,,,{},{},{}
+22822,Summer_Vacation_Costumes,Summer Vacation Costumes,2,,,100,,,,0,0xFFFFFFFF,63,2,,,1,,,{ sc_start SC_DRESSUP,600000,1; },{},{}
22823,Sealed_Sniper_Scroll,Sealed Sniper Scroll,2,10,,10,,,,,,,,,,,,,{ /*getitem callfunc("F_Rand",4491,6228,6232,24196, Hasty Shadow Armor, 19882, 17474, 6635),1;*/ },{},{}
-22826,Costume_Enchantment_Stone_Box_4,Costume Enchantment Stone Box 4,2,10,,10,,,,,,,,,,,,,{},{},{}
+22826,Enchant_Stone_Box4,Costume Enchantment Stone Box 4,2,10,,10,,,,,,,,,,,,,{},{},{}
22827,Shadow_Cube,Shadow Cube,2,10,,10,,,,,,,,,,,,,{/*No Info*/},{},{}
22828,Sealed_Album_Scroll,Sealed Album Scroll,2,10,,100,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getitem callfunc("F_Rand",22829,6232,6228,24208,24209,17474/*,Enchanted Letter*/),1; },{},{}
22829,Sealed_Card_Album,Sealed Card Album,2,10,,100,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getitem callfunc("F_Rand",4488,4497,4486,4480,4485,4539,4487,4494,4538,4489,4490,4482,4503,4483,4491),1; },{},{}
@@ -11057,9 +11136,9 @@
22844,Sealed_Dracula_Card_Album,Sealed Dracula Card Album,2,10,,10,,,,,,,,,,,,,{/*No Info*/},{},{}
22845,Sealed_Fortune_Egg,Sealed Fortune Egg,2,10,,10,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getitem callfunc("F_Rand",4488,4497,4486,4480,4485,4539,4487,4494,4538,4489,4490,4482,4503,22846),1; },{},{}
22846,Sealed_Dracula_Card_,Sealed Dracula Card,2,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ bonus_script "{ bonus2 bSPDrainRate,50,5; }",300; },{},{}
-22847,Prontera_Medal,Prontera Medal,2,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ warp "prontera",0,0; /*No coord info*/ },{},{}
+22847,Prontera_Medal,Prontera Medal,2,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ warp "prontera",159,192; /*No coord info*/ },{},{}
22848,Prison_Key,Prison Key,2,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ warp "prt_prison",0,0; /*No coord info*/ },{},{}
-22849,Prontera_Time_Crystal,Prontera Time Crystal,2,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ warp "prt_lib_q",0,0; /*No map+coord info*/ },{},{}
+22849,Prontera_Time_Crystal,Prontera Time Crystal,2,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ warp "prt_q",155,27; },{},{}
22850,January_Gift_Box_,January Gift Box,2,10,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ rentitem 19052,604800; },{},{}
22851,February_Gift_Box_,February Gift Box,2,10,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 12105,2; },{},{}
22852,March_Gift_Box_,March Gift Box,2,10,,100,,,,,0xFFFFFFFF,63,2,,,,,,{/*2 Lucky Eggs*/},{},{}
@@ -11072,15 +11151,15 @@
22859,October_Gift_Box,October Gift Box,2,10,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 12529,5; },{},{}
22860,November_Gift_Box,November Gift Box,2,10,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ rentitem callfunc("F_Rand",2566,2856,2857,15023),1209600; },{},{}
22861,December_Gift_Box,December Gift Box,2,10,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 22869,10; },{},{}
-22868,Costume_Enchantment_Stone_Box_5,Costume Enchantment Stone Box 5,2,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem callfunc("F_Rand",6908,6943,6944,6945,6946,6947,6948,6949,6950,6951),1; },{},{}
+22868,Enchant_Stone_Box5,Costume Enchantment Stone Box 5,2,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem callfunc("F_Rand",6908,6943,6944,6945,6946,6947,6948,6949,6950,6951),1; },{},{}
22869,Lucky_Roulette_Tickets,Lucky Roulette Ticket,2,10,,100,,,,,0xFFFFFFFF,63,2,,,50,,,{ RouletteBronze++; },{},{}
-22870,Christmas_Package,Christmas Package,3,0,,10,,,,0,,,,,,,,,{},{},{}
+22870,Xmas_Package_14,Christmas Package,3,0,,10,,,,0,,,,,,,,,{},{},{}
22873,Sealed_Beelzebub_Scroll_II,Sealed Beelzebub Scroll II,2,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem callfunc("F_Rand",22875,6238,6239,6228,6232,24231,24232,17474,6635),1; },{},{}
22874,Sealed_Beelzebub_Card_Album,Sealed Beelzebub Card Album,2,10,,50,,,,,0xFFFFFFFF,63,2,,,,,,{/*No Info*/},{},{}
22875,Sealed_Beelzebub_Card,Sealed Beelzebub Card,6,20,,10,,,,,,,,769,,,,,{ bonus bVariableCastrate,-15; /*Item removed on 2014-12-17*/ },{},{}
-22876,Old_Money_Pocket,Old Money Pocket,3,0,,0,,,,,,,,,,,,,{},{},{}
-22881,Rope_Gallows,Rope Gallows,2,10,,0,,,,,0xFFFFFFFF,63,2,,,,,,{/*Used to catch a Lost Sheep*/},{},{}
-22882,Chocolate_Rice_Cake_Soup,Chocolate Rice Cake Soup,2,10,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ percentheal 10,10; },{},{}
+22876,Old_Money_Pocket,Old Money Pocket,3,0,,0,,,,,,,,,,,,,{ Zeny += rand(500,550); },{},{}
+22881,Binding_Rope,Rope Gallows,2,10,,0,,,,,0xFFFFFFFF,63,2,,,,,,{/*Used to catch a Lost Sheep*/},{},{}
+22882,Choco_Tteokguk,Chocolate Rice Cake Soup,2,10,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ percentheal 10,10; },{},{}
22883,September_Gift_Box_,September Gift Box,2,10,,100,,,,,0xFFFFFFFF,63,2,,,,,,{/*2 Lucky Eggs*/},{},{}
22884,October_Gift_Box_,October Gift Box,2,10,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 12529,5; },{},{}
22885,November_Gift_Box_,November Gift Box,2,10,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ rentitem callfunc("F_Rand",2566,2856,2857,15023),1209600; },{},{}
@@ -11322,21 +11401,21 @@
24213,S_Rookie_Shield,Rookie Shadow Shield,12,0,,0,,,,0,0xFFFFFFFF,63,2,262144,,50:99,1,,{ bonus2 bExpAddRace,RC_All,(getrefine()/2); },{},{}
24214,S_Advanced_Shoes,Advanced Shadow Shoes,12,20,,0,,,,0,0xFFFFFFFF,63,2,524288,,100:149,1,,{ bonus2 bExpAddRace,RC_All,(getrefine()/3); },{},{}
24215,S_Advanced_Shield,Advanced Shadow Shield,12,0,,0,,,,0,0xFFFFFFFF,63,2,262144,,100:149,1,,{ bonus2 bExpAddRace,RC_All,(getrefine()/3); },{},{}
-24216,Attack_Shadow_Armor,Attack Shadow Armor,12,10,,0,,,,0,0xFFFFFFFF,63,2,65536,,1,1,,{ .@r = getrefine(); autobonus "{ bonus bAtk2,(.@r*5); }",(.@r*20)+100,3000,BF_NORMAL; },{},{}
-24217,Blitz_Shadow_Earring,Blitz Shadow Earring,12,10,,0,,,,0,0xFFFFFFFF,63,2,1048576,,1,1,,{ .@r = getrefine(); bonus bHit,(.@r/2)+5; if(.@r>=7){ bonus bAspd,1; } },{},{}
-24218,Blitz_Shadow_Pendant,Blitz Shadow Pendant,12,10,,0,,,,0,0xFFFFFFFF,63,2,2097152,,1,1,,{ .@r = getrefine(); bonus bAtk2,(.@r/2)+5; if(.@r>=7){ bonus bAspd,1; } },{},{}
-24219,Cold_Bolt_Shadow_Armor,Cold Bolt Shadow Armor,12,10,,0,,,,0,0xFFFFFFFF,63,2,65536,,1,1,,{ .@r = getrefine(); if(.@r>=2) autobonus "{ bonus3 bAutoSpell,\"MG_COLDBOLT\",(.@r/2),1000; }",(.@r*2)+100,100,BF_SHORT; },{},{}
-24220,Fire_Bolt_Shadow_Armor,Fire Bolt Shadow Armor,12,10,,0,,,,0,0xFFFFFFFF,63,2,65536,,1,1,,{ .@r = getrefine(); if(.@r>=2) autobonus "{ bonus3 bAutoSpell,\"MG_FIREBOLT\",(.@r/2),1000; }",(.@r*2)+100,100,BF_SHORT; },{},{}
-24221,Lightning_Bolt_Shadow_Armor,Lightning Bolt Shadow Armor,12,10,,0,,,,0,0xFFFFFFFF,63,2,65536,,1,1,,{ .@r = getrefine(); if(.@r>=2) autobonus "{ bonus3 bAutoSpell,\"MG_LIGHTNINGBOLT\",(.@r/2),1000; }",(.@r*2)+100,100,BF_SHORT; },{},{}
-24222,Earth_Spike_Shadow_Armor,Earth Spike Shadow Armor,12,10,,0,,,,0,0xFFFFFFFF,63,2,65536,,1,1,,{ .@r = getrefine(); if(.@r>=2) autobonus "{ bonus3 bAutoSpell,\"WZ_EARTHSPIKE\",(.@r/2),1000; }",(.@r*2)+100,100,BF_SHORT; },{},{}
-24223,Enhanced_Force_Shadow_Weapon,Enhanced Force Shadow Weapon,12,10,,0,,,,0,0xFFFFFFFF,56,2,131072,,100,1,,{ bonus bAtk2,10; bonus2 bAddClass,Class_All,(getrefine()/2); },{},{}
-24224,Force_Shadow_Weapon,Force Shadow Weapon,12,10,,0,,,,0,0xFFFFFFFF,63,2,131072,,70,1,,{ .@r = getrefine(); bonus2 bAddClass,Class_All,(.@r<7)?1:((.@r<9)?2:3); },{},{}
-24225,Force_Shadow_Earring,Force Shadow Earring,12,10,,0,,,,0,0xFFFFFFFF,63,2,1048576,,70,1,,{ .@r = getrefine(); bonus bAtk2,(5+.@r); if(.@r>=7) bonus bMaxHPrate,1; if(.@r>=9) bonus bMaxSPrate,1; },{},{}
-24226,Force_Shadow_Pendant,Force Shadow Pendant,12,10,,0,,,,0,0xFFFFFFFF,63,2,2097152,,70,1,,{ .@r = getrefine(); bonus bAtk2,(5+.@r); if(.@r>=7) bonus bMaxHPrate,1; if(.@r>=9) bonus bMaxSPrate,1; },{},{}
-24227,Enhanced_Soul_Shadow_Weapon,Enhanced Soul Shadow Weapon,12,10,,0,,,,0,0xFFFFFFFF,56,2,131072,,100,1,,{ bonus bMatk,10; bonus bMatkRate,(getrefine()/2); },{},{}
-24228,Soul_Shadow_Weapon,Soul Shadow Weapon,12,10,,0,,,,0,0xFFFFFFFF,63,2,131072,,70,1,,{ .@r = getrefine(); bonus bMatkRate,(.@r<7)?1:((.@r<9)?2:3); },{},{}
-24229,Soul_Shadow_Earring,Soul Shadow Earring,12,10,,0,,,,0,0xFFFFFFFF,63,2,1048576,,70,1,,{ .@r = getrefine(); bonus bMatk,(5+.@r); if(.@r>=7) bonus bMaxHPrate,1; if(.@r>=9) bonus bMatkRate,1; },{},{}
-24230,Soul_Shadow_Pendant,Soul Shadow Pendant,12,10,,0,,,,0,0xFFFFFFFF,63,2,2097152,,70,1,,{ .@r = getrefine(); bonus bMatk,(5+.@r); if(.@r>=7) bonus bMaxHPrate,1; if(.@r>=9) bonus bMatkRate,1; },{},{}
+24216,S_Attack_Armor,Attack Shadow Armor,12,10,,0,,,,0,0xFFFFFFFF,63,2,65536,,1,1,,{ .@r = getrefine(); autobonus "{ bonus bAtk2,(.@r*5); }",(.@r*20)+100,3000,BF_NORMAL; },{},{}
+24217,S_Blitz_Earring,Blitz Shadow Earring,12,10,,0,,,,0,0xFFFFFFFF,63,2,1048576,,1,1,,{ .@r = getrefine(); bonus bHit,(.@r/2)+5; if(.@r>=7){ bonus bAspd,1; } },{},{}
+24218,S_Blitz_Pendent,Blitz Shadow Pendant,12,10,,0,,,,0,0xFFFFFFFF,63,2,2097152,,1,1,,{ .@r = getrefine(); bonus bAtk2,(.@r/2)+5; if(.@r>=7){ bonus bAspd,1; } },{},{}
+24219,S_ColdBolt_Armor,Cold Bolt Shadow Armor,12,10,,0,,,,0,0xFFFFFFFF,63,2,65536,,1,1,,{ .@r = getrefine(); if(.@r>=2) autobonus "{ bonus3 bAutoSpell,\"MG_COLDBOLT\",(.@r/2),1000; }",(.@r*2)+100,100,BF_SHORT; },{},{}
+24220,S_FireBolt_Armor,Fire Bolt Shadow Armor,12,10,,0,,,,0,0xFFFFFFFF,63,2,65536,,1,1,,{ .@r = getrefine(); if(.@r>=2) autobonus "{ bonus3 bAutoSpell,\"MG_FIREBOLT\",(.@r/2),1000; }",(.@r*2)+100,100,BF_SHORT; },{},{}
+24221,S_LightingBolt_Armor,Lightning Bolt Shadow Armor,12,10,,0,,,,0,0xFFFFFFFF,63,2,65536,,1,1,,{ .@r = getrefine(); if(.@r>=2) autobonus "{ bonus3 bAutoSpell,\"MG_LIGHTNINGBOLT\",(.@r/2),1000; }",(.@r*2)+100,100,BF_SHORT; },{},{}
+24222,S_EarthSpike_Armor,Earth Spike Shadow Armor,12,10,,0,,,,0,0xFFFFFFFF,63,2,65536,,1,1,,{ .@r = getrefine(); if(.@r>=2) autobonus "{ bonus3 bAutoSpell,\"WZ_EARTHSPIKE\",(.@r/2),1000; }",(.@r*2)+100,100,BF_SHORT; },{},{}
+24223,S_Enhance_Force_Weapon,Enhanced Force Shadow Weapon,12,10,,0,,,,0,0xFFFFFFFF,56,2,131072,,100,1,,{ bonus bAtk2,10; bonus2 bAddClass,Class_All,(getrefine()/2); },{},{}
+24224,S_Force_Weapon,Force Shadow Weapon,12,10,,0,,,,0,0xFFFFFFFF,63,2,131072,,70,1,,{ .@r = getrefine(); bonus2 bAddClass,Class_All,(.@r<7)?1:((.@r<9)?2:3); },{},{}
+24225,S_Force_Earring,Force Shadow Earring,12,10,,0,,,,0,0xFFFFFFFF,63,2,1048576,,70,1,,{ .@r = getrefine(); bonus bAtk2,(5+.@r); if(.@r>=7) bonus bMaxHPrate,1; if(.@r>=9) bonus bMaxSPrate,1; },{},{}
+24226,S_Force_Pendant,Force Shadow Pendant,12,10,,0,,,,0,0xFFFFFFFF,63,2,2097152,,70,1,,{ .@r = getrefine(); bonus bAtk2,(5+.@r); if(.@r>=7) bonus bMaxHPrate,1; if(.@r>=9) bonus bMaxSPrate,1; },{},{}
+24227,S_Enhance_Spirit_Weapon,Enhanced Soul Shadow Weapon,12,10,,0,,,,0,0xFFFFFFFF,56,2,131072,,100,1,,{ bonus bMatk,10; bonus bMatkRate,(getrefine()/2); },{},{}
+24228,S_Spirit_Weapon,Soul Shadow Weapon,12,10,,0,,,,0,0xFFFFFFFF,63,2,131072,,70,1,,{ .@r = getrefine(); bonus bMatkRate,(.@r<7)?1:((.@r<9)?2:3); },{},{}
+24229,S_Spirit_Earring,Soul Shadow Earring,12,10,,0,,,,0,0xFFFFFFFF,63,2,1048576,,70,1,,{ .@r = getrefine(); bonus bMatk,(5+.@r); if(.@r>=7) bonus bMaxHPrate,1; if(.@r>=9) bonus bMatkRate,1; },{},{}
+24230,S_Spirit_Pendant,Soul Shadow Pendant,12,10,,0,,,,0,0xFFFFFFFF,63,2,2097152,,70,1,,{ .@r = getrefine(); bonus bMatk,(5+.@r); if(.@r>=7) bonus bMaxHPrate,1; if(.@r>=9) bonus bMatkRate,1; },{},{}
24231,S_Blitz_Shoes,Blitz Shadow Shoes,12,0,,0,,,,0,0xFFFFFFFF,63,2,524288,,1,1,,{ bonus bFlee,5; .@r = getrefine(); if(.@r>=2){ bonus bCritical,2; } if(.@r>=7){ bonus bAspd,1; } if(.@r>=9){ bonus bAspd,1; } },{},{}
24232,S_Blitz_Shield,Blitz Shadow Shield,12,0,,0,,,,0,0xFFFFFFFF,63,2,262144,,1,1,,{ bonus bCritical,5; .@r = getrefine(); if(.@r>=2){ bonus bCritical,2; } if(.@r>=7){ bonus bAspd,1; } if(.@r>=9){ bonus bAspd,1; } },{},{}
24233,S_Exceed_Weapon,Exceeding Shadow Weapon,12,0,,0,,,,0,0xFFFFFFFF,63,2,131072,,100,1,,{ .@r = getrefine()/2; bonus bBaseAtk,5; bonus bMatk,5; bonus2 bAddClass,Class_All,.@r; bonus bMatkRate,.@r; },{},{}
@@ -11411,13 +11490,53 @@
27028,Fire_Frilldora_Card,Fire Frilldora Card,6,20,,10,,,,,0xFFFFFFFF,63,2,2,,,,,{ .@r = getrefine(); bonus2 bMagicAddEle,Ele_Earth,3+((.@r>=7)*5)+((.@r>=9)*7); },{},{}
27029,Fire_Golem_Card,Fire Golem Card,6,20,,10,,,,,0xFFFFFFFF,63,2,32,,,,,{ bonus2 bSubEle,Ele_Fire,20; bonus2 bAddEle,Ele_Fire,5; },{},{}
27030,Fulbuk_Card,Fulbuk Card,6,20,,10,,,,,0xFFFFFFFF,63,2,769,,,,,{ bonus3 bAddEff,Eff_Burning,700,ATF_WEAPON|ATF_MAGIC; },{},{}
+27147,Humanoid_Chimera_Card,Humanoid Chimera Card,6,20,,10,,,,,,,,136,,,,,{ bonus bHit,(BaseLevel >= 90 ? 15 : 5); },{},{}
+27148,Material_Chimera_Card,Material Chimera Card,6,20,,10,,,,,,,,136,,,,,{ bonus bFlee,(BaseLevel >= 90 ? 20 : 10); },{},{}
+27149,Heart_Hunter_Card,Heart Hunter Card,6,20,,10,,,,,,,,2,,,,,{ .@type = getiteminfo(getequipid(EQI_COMPOUND_ON),11); .@r = getrefine(); if(.@type == 17 || .@type == 18 || .@type == 21){ bonus bLongAtkRate,5+.@r+(.@r >= 10 ? 5 : 0); } },{},{}
+27150,Toxic_Enchanted_Chimera_Card,Toxic Enchanted Chimera Card,6,20,,10,,,,,,,,64,,,,,{ bonus bMaxHP,1000; bonus bMaxSP,200; if(getrefine() >= 12){ bonus bMaxHPrate,15; bonus bMaxSPrate,15; } },{},{}
+27151,Heart_Hunter_Evil_Card,Heart Hunter Evil Card,6,20,,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,SC_FREEZING,1000 + (readparam(bInt) >= 110 ? 5 : 0); bonus bMdef,5; },{},{}
+27152,Cutie_Card,Cutie Card,6,20,,10,,,,,,,,64,,,,,{ bonus bMaxHPrate,10; .@r = getrefine()/2; bonus bAgi,.@r; bonus bAspdRate,.@r; },{},{}
+27157,Wood_Goblin_Card,Wood Goblin Card,6,20,,10,,,,,,,,16,,,,,{ .@r = getrefine(); bonus2 bAddEle,Ele_Water,(.@r >= 9 ? 10 : 5); bonus2 bAddEle,Ele_Earth,(.@r >= 9 ? 10 : 5); bonus2 bSubDefEle,Ele_Water,-5; bonus2 bSubDefEle,Ele_Earth,-5; },{},{}
+27158,Les_Card,Les Card,6,20,,10,,,,,,,,32,,,,,{ bonus2 bSubEle,Ele_Wind,30; },{},{}
+27159,Uzhas_Card,Uzhas Card,6,20,,10,,,,,,,,769,,,,,{ bonus2 bMagicAddRace,RC_Demon,(getrefine() >= 9 ? 15 : 10); },{},{}
+27160,Vavayaga_Card,Vavayaga Card,6,20,,10,,,,,,,,64,,,,,{ bonus bFlee,getrefine()*2; },{},{}
+27161,Mavka_Card,Mavka Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bMagicAtkEle,Ele_Fire,20; bonus2 bMagicAtkEle,Ele_Earth,20; },{},{}
+27162,Gopinich_Card,Gopinich Card,6,20,,10,,,,,,,,769,,,,,{ bonus bSPDrainValue,5; bonus bUseSPrate,50; },{},{}
+27163,Faceworm_Card,Faceworm Card,6,20,,10,,,,,,,,136,,,,,{ bonus bAgi,-1; bonus bDex,-1; bonus bAspdRate,3; },{},{}
+27164,Faceworm_Queen_Card,Faceworm Queen Card,6,20,,10,,,,,,,,64,,,,,{ bonus bMaxHPrate,-10; .@r = getrefine(); bonus bCritical,15 + .@r; bonus bCritAtkRate,.@r; },{},{}
+27165,Dark_Faceworm_Card,Dark Faceworm Card,6,20,,10,,,,,,,,136,,,,,{ bonus bVit,-1; bonus bInt,-1; bonus bDelayrate,-3; },{},{}
+27166,Faceworm_Egg_Card,Faceworm Egg Card,6,20,,10,,,,,,,,64,,,,,{ .@r = getrefine(); .@sub = 2+(.@r >= 9 ? 3 : .@r >= 7 ? 1 : 0); bonus bNearAtkDef,.@sub; bonus bMagicAtkDef,.@sub; },{},{}
+27167,Faceworm_Larva_Card,Faceworm Larva Card,6,20,,10,,,,,,,,4,,,,,{ bonus2 bSubEle,Ele_Neutral,15; bonus2 bMagicAddSize,Size_All,getrefine()*3; },{},{}
+27168,Irene_High_Elder_Card,Irene High Elder Card,6,20,,10,,,,,,,,4,,,,,{ bonus bHit,10 + 5 * (getrefine()/3); },{},{}
+27169,Payon_Soldier_Card,Payon Soldier Card,6,20,,10,,,,,,,,2,,,,,{ .@atk = 5; .@r = getrefine(); if(getiteminfo(getequipid(EQI_HAND_R),11) == W_SPEAR && .@r >= 10){ .@atk += 20; if(.@r >= 14){ .@atk += 20; } } bonus bAtk,.@atk; bonus bMatk,.@atk; },{},{}
+27181,Airship_Raid_Card,Airship Raid Card,6,20,,10,,,,,,,,2,,,,,{ .@r = getrefine(); bonus bLongAtkRate,1 + .@r/2; bonus bCritical,.@r/2; },{},{}
+27182,Captain_Felock_Card,Captain Felock Card,6,20,,10,,,,,,,,2,,,,,{ bonus bAtk,30; .@r = getrefine(); bonus2 bSkillAtk,"RL_AM_BLAST",.@r >= 10 ? 60 : 30; bonus2 bSkillAtk,"RL_HAMMER_OF_GOD",.@r >= 10 ? 60 : 30; },{},{}
+27183,Gigantes_Card,Gigantes Card,6,20,,10,,,,,,,,128,,,,,{ bonus bAtk,20; if(readparam(bStr) >= 120) { bonus bAtk,20; bonus bAspdRate,-3; } },{},{}
+27184,Knight_Sakray_Card,Knight Sakray Card,6,20,,10,,,,,,,,2,,,,,{ bonus bAtk,20; bonus2 bAddRace,RC_Demon,30; bonus2 bAddRace,RC_Undead,30; },{},{}
+27249,Arhi_Card,Arhi Card,6,20,,10,,,,,,,,64,,,,,{ bonus bAtk,15; bonus bMatk,15; bonus bMaxHP,500; bonus bHit,15; bonus bFlee,15; },{},{}
+27250,Dio_Anemos_Card,Dio Anemos Card,6,20,,10,,,,,,,,64,,,,,{ bonus bMatkRate,3; bonus2 bMagicAtkEle,Ele_Neutral,5; bonus2 bMagicAtkEle,Ele_Earth,5; },{},{}
+27251,Geffen_Gang_Member_Card,Geffen Gang Member Card,6,20,,10,,,,,,,,64,,,,,{ bonus bCritAtkRate,3; bonus bAspdRate,5; },{},{}
+27252,Geffen_Bully_Card,Geffen Bully Card,6,20,,10,,,,,,,,64,,,,,{ bonus bCritAtkRate,5; bonus bAspdRate,3; },{},{}
+27253,Geffen_Shoplifter_Card,Geffen Shoplifter Card,6,20,,10,,,,,,,,64,,,,,{ bonus bMatkRate,3; bonus2 bMagicAtkEle,Ele_Fire,5; bonus2 bMagicAtkEle,Ele_Holy,5; },{},{}
+27254,Faymont_Card,Faymont Card,6,20,,10,,,,,,,,64,,,,,{ bonus bSPrecovRate,10; bonus3 bAutoSpellWhenHit,"CH_SOULCOLLECT",1,10; },{},{}
+27255,Ordre_Card,Ordre Card,6,20,,10,,,,,,,,64,,,,,{ bonus bMatkRate,3; bonus2 bMagicAtkEle,Ele_Wind,5; bonus2 bMagicAtkEle,Ele_Water,5; },{},{}
+27256,Blut_Hase_Card,Blut Hase Card,6,20,,10,,,,,,,,64,,,,,{ bonus bAtkRate,3; bonus bLongAtkRate,5; },{},{}
+27257,Kuro_Akuma_Card,Kuro Akuma Card,6,20,,10,,,,,,,,64,,,,,{ bonus bCastrate,3; bonus bLongAtkRate,5; bonus2 bSkillAtk,"NJ_HUUJIN",5; bonus2 bSkillAtk,"NJ_HYOUSENSOU",5; bonus2 bSkillAtk,"NJ_KOUENKA",5; },{},{}
+27258,Ifodes_Card,Ifodes Card,6,20,,10,,,,,,,,64,,,,,{ bonus bAtkRate,3; bonus bAspdRate,5; },{},{}
+27259,Licheniyes_Card,Licheniyes Card,6,20,,10,,,,,,,,64,,,,,{ bonus bMatkRate,3; bonus2 bMagicAtkEle,Ele_Holy,5; bonus bHealPower,5; },{},{}
+27260,Odoric_Card,Odoric Card,6,20,,10,,,,,,,,64,,,,,{ bonus bAspdRate,3; bonus bLongAtkRate,5; },{},{}
+27261,Ju_Card,Ju Card,6,20,,10,,,,,,,,2,,,,,{ .@rate = 10 + (getiteminfo(getequipid(EQI_HAND_R),11) == W_BOOK ? 20 : 0) + (getrefine() >= 14 ? 20 : 0); bonus2 bSkillAtk,"MG_FIREBOLT",.@rate; bonus2 bSkillAtk,"MG_COLDBOLT",.@rate; bonus2 bSkillAtk,"MG_LIGHTNINGBOLT",.@rate; },{},{}
+27262,Dwigh_Card,Dwigh Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bMagicAtkEle,Ele_Dark,20; bonus2 bMagicAtkEle,Ele_Neutral,20; },{},{}
+27263,Fay_Kanavian_Card,Fay Kanavian Card,6,20,,10,,,,,,,,64,,,,,{ autobonus "{ bonus bDef,300; }",100,10000,BF_WEAPON|BF_SHORT,"{ active_transform 1040,10000; }"; },{},{}
+27264,Evil_Shadow_Card,Evil Shadow Card,6,20,,10,,,,,,,,32,,,,,{ bonus2 bSubEle,Ele_Dark,30; bonus2 bSubEle,Ele_Undead,30; bonus2 bSubEle,Ele_Holy,-30; bonus2 bSubEle,Ele_Fire,-30; },{},{}
+27265,Evil_Fanatics_Card,Evil Fanatics Card,6,20,,10,,,,,,,,2,,,,,{ bonus2 bAddEle,Ele_Dark,30; bonus2 bAddEle,Ele_Undead,30; bonus2 bMagicAddEle,Ele_Dark,30; bonus2 bMagicAddEle,Ele_Undead,30; bonus2 bAddEle,Ele_Holy,-30; bonus2 bAddEle,Ele_Fire,-30; bonus2 bMagicAddEle,Ele_Holy,-30; bonus2 bMagicAddEle,Ele_Fire,-30; },{},{}
//===================================================================
// New Katars
//===================================================================
-28000,Tanos_Katar,Tanos Katar,5,10,,1800,220:80,,,1,0x00001000,63,2,34,4,120,1,16,{ bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bAddClass,Class_All,5; bonus2 bHPLossRate,100,10000; },{},{}
+28000,Thanos_Katar,Thanatos Katar,5,10,,1800,220:80,,1,1,0x00001000,56,2,34,4,120,1,16,{ bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000; },{},{ heal -1000,0; }
28001,Katar_Of_Evil_Slayer,Katar Of Evil Slayer,5,10,,1200,120,,1,1,0x00001000,63,2,34,3,100,1,16,{ bonus2 bAddRace,RC_Demon,10; bonus2 bAddRace,RC_Undead,10; .@r = getrefine(); if(.@r>=9){ bonus2 bAddClass,Class_All,5; } if(.@r>=12){ bonus2 bAddClass,Class_All,7; } },{},{}
28002,Half_BF_Katar2,Half BF Katar2,5,20,,0,130,,1,0,0x00001000,63,2,34,3,80,1,16,{ bonus bStr,1; bonus bDex,1; bonus bLuk,1; bonus2 bAddRace,RC_DemiHuman,35; bonus2 bAddRace,RC_Player,35; bonus bCritAtkRate,10; bonus bAspdRate,3; bonus bUnbreakableWeapon,1; },{},{}
-28005,Blue_Katar,Blue Katar,5,10,,1200,190,,1,1,0x00001000,56,2,34,3,100,1,16,{ bonus bAgi,5; bonus bStr,5; },{},{}
+28005,Ru_Blue_Katar,Blue Katar,5,10,,1200,190,,1,1,0x00001000,56,2,34,3,100,1,16,{ bonus bAgi,5; bonus bStr,5; },{},{}
28006,Ru_Gold_Katar,Ru Gold Katar,5,0,,1200,190,,1,2,0x00001000,56,2,34,3,120,1,16,{ bonus bAgi,8; bonus bStr,8; },{},{}
28007,Crimson_Katar,Crimson Katar,5,20,,1300,130,,1,2,0x00001000,63,2,34,3,70,1,16,{ .@r = getrefine(); bonus bBaseAtk,((BaseLevel/10)*5)+(.@r<=15?pow(.@r,2):225); },{},{}
28008,Katar_of_Vicious_Mind,Katar of Vicious Mind,5,20,,1800,180,,1,1,0x00001000,63,2,34,4,160,1,16,{ bonus bAtk,pow(min(getrefine(),15),2); },{},{}
@@ -11426,10 +11545,10 @@
//===================================================================
// New Axes
//===================================================================
-28100,Tanos_Axe_,Tanos Axe,5,10,,4000,300:80,,,1,0x00000400,63,2,34,4,120,1,7,{ bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bAddClass,Class_All,5; bonus2 bHPLossRate,100,10000; },{},{}
-28101,Axe_Tornado,Axe Tornado,5,10,,4000,320,,,1,0x00000400,56,2,34,4,130,1,7,{ bonus bAtkEle,Ele_Wind; bonus2 bSkillCooldown,"NC_AXETORNADO",-1000; },{},{}
+28100,Thanos_Axe,Thanatos Axe,5,10,,4000,300:80,,1,1,0x000444A2,56,2,34,4,120,1,7,{ bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000; },{},{ heal -1000,0; }
+28101,Tornado_Axe,Axe Tornado,5,10,,4000,320,,,1,0x00000400,56,2,34,4,130,1,7,{ bonus bAtkEle,Ele_Wind; bonus2 bSkillCooldown,"NC_AXETORNADO",-1000; },{},{}
28102,Half_BF_Two_Handed_Axe1,Half BF Two Handed Axe1,5,20,,0,200,,1,0,0x000444A2,63,2,34,3,80,1,7,{ bonus bStr,3; bonus2 bAddRace,RC_DemiHuman,30; bonus2 bAddRace,RC_Player,30; bonus2 bIgnoreDefRaceRate,RC_DemiHuman,10; bonus2 bIgnoreDefRaceRate,RC_Player,10; bonus bUnbreakableWeapon,1; },{},{}
-28103,Blue_Twohand_Axe,Blue Twohand Axe,5,10,,3000,330,,1,1,0x00000400,56,2,34,3,1,1,7,{ bonus bStr,5; bonus bVit,5; },{},{}
+28103,Ru_Blue_Axe_M,Blue Twohand Axe,5,10,,3000,330,,1,1,0x00000400,56,2,34,3,1,1,7,{ bonus bStr,5; bonus bVit,5; },{},{}
28104,Ru_Gold_Axe_M,Ru Gold Axe M,5,0,,3000,330,,1,2,0x00000400,56,2,34,3,120,1,7,{ bonus bStr,8; bonus bVit,8; },{},{}
28105,Infinity_Axe,Infinity Axe,5,10,,500,265,,1,1,0x000444A2,56,2,34,4,100,1,7,{},{},{}
28106,Crimson_Two-Handed_Axe,Crimson Two-Handed Axe,5,20,,2000,200,,1,2,0x000444A2,63,2,34,3,70,1,7,{ .@r = getrefine(); bonus bBaseAtk,((BaseLevel/10)*5)+(.@r<=15?pow(.@r,2):225); bonus bUnbreakableWeapon,1; },{},{}
@@ -11438,9 +11557,9 @@
//===================================================================
// New Guns
//===================================================================
-28200,End_Of_The_Horizon,End Of The Horizon,5,2700000,,2400,410,,9,1,0x40000000,63,2,34,4,110,1,21,{},{},{}
-28201,Southern_Cross_,Southern Cross,5,2800000,,2000,480,,9,0,0x40000000,63,2,34,4,141,1,21,{ bonus3 bAutoSpell,"GC_CROSSIMPACT",1,50; },{},{}
-28202,Southern_Cross__,Southern Cross,5,2800000,,2000,480,,9,1,0x40000000,63,2,34,4,141,1,21,{ bonus3 bAutoSpell,"GC_CROSSIMPACT",1,50; },{},{}
+28200,END_OF_HORIZO,End Of The Horizon,5,2700000,,2400,410,,9,1,0x40000000,63,2,34,4,110,1,21,{},{},{}
+28201,Southern_Cross_R,Southern Cross,5,2800000,,2000,480,,9,0,0x40000000,63,2,34,4,141,1,21,{ bonus3 bAutoSpell,"GC_CROSSIMPACT",1,50; },{},{}
+28202,Southern_Cross_R_,Southern Cross,5,2800000,,2000,480,,9,1,0x40000000,63,2,34,4,141,1,21,{ bonus3 bAutoSpell,"GC_CROSSIMPACT",1,50; },{},{}
28203,Half_BF_Rifle1,Half BF Rifle1,5,0,,0,50,,9,0,0x41000000,63,2,34,3,80,1,18,{ bonus bDex,2; bonus bHit,8; bonus bCritical,8; bonus2 bAddRace,RC_DemiHuman,30; bonus2 bAddRace,RC_Player,30; bonus2 bVariableCastrate,"GS_TRACKING",-20; bonus2 bIgnoreDefRaceRate,RC_DemiHuman,10; bonus2 bIgnoreDefRaceRate,RC_Player,10; bonus bUnbreakableWeapon,1; },{},{}
28204,Half_BF_Shotgun1,Half BF Shotgun1,5,0,,0,100,,9,0,0x41000000,63,2,34,3,80,1,20,{ bonus bDex,2; bonus bSplashRange,1; bonus2 bAddRace,RC_DemiHuman,30; bonus2 bAddRace,RC_Player,30; bonus2 bIgnoreDefRaceRate,RC_DemiHuman,10; bonus2 bIgnoreDefRaceRate,RC_Player,10; autobonus "{ bonus bBaseAtk,80; bonus2 bHPLossRate,100,1000; }",30,6000,BF_WEAPON,"{ specialeffect2 EF_BASH3D; }"; bonus bUnbreakableWeapon,1; },{},{}
//===================================================================
@@ -11455,27 +11574,30 @@
28316,RCC2013_ARMLET_,RCC2013_ARMLET_,4,200,,200,,,,1,0xFFFFFFFF,63,2,136,,1,0,,{ bonus2 bAddClass,Class_All,1; },{},{}
28317,RCC2013_RING,RCC2013_RING,4,200,,200,,,,0,0xFFFFFFFF,63,2,136,,1,0,,{ bonus2 bAddClass,Class_All,1; },{},{}
28318,RCC2013_RING_,RCC2013_RING_,4,200,,200,,,,1,0xFFFFFFFF,63,2,136,,1,0,,{ bonus2 bAddClass,Class_All,1; },{},{}
-28310,Sarah's_Left_Earring,Sarah's Left Earring,4,10,,100,,,,0,0xFFFFFFFF,63,2,128,,145,0,,{ skill "AL_HEAL",1; },{},{}
-28311,Sarah's_Right_Earring,Sarah's Right Earring,4,10,,100,,,,0,0xFFFFFFFF,63,2,8,,145,0,,{ skill "AL_TELEPORT",1; },{},{}
-28321,Falconer_Claw,Falconer Claw,4,0,,100,,5,,1,0x00000800,63,2,136,0,80,0,,{ bonus bDex,1; bonus2 bSkillAtk,"HT_BLITZBEAT",getskilllv("HT_STEELCROW")*10; },{},{}
-28322,Falconer_Glove,Falconer Glove,4,0,,100,,5,,1,0x00000800,63,2,136,0,80,0,,{ bonus bDex,1; bonus bUseSPrate,-5; },{},{}
-28326,Broken_Chips_01,Broken Chips 01,4,10,,100,,,,1,0xFFFFFFFF,63,2,136,,100,0,,{ bonus bStr,4; },{},{}
-28327,Broken_Chips_02,Broken Chips 02,4,10,,100,,,,1,0xFFFFFFFF,63,2,136,,100,0,,{ bonus bInt,4; },{},{}
-28332,Jewerly_Ring,Jewerly Ring,4,10,,100,,,,0,0xFFFFFFFF,63,2,136,,1,0,,{ bonus bLuk,20; autobonus "{ bonus bAspd,2; }",50,2000,BF_WEAPON|BF_MAGIC; },{},{}
+28310,Earring_Of_Sarah_L,Sarah's Left Earring,4,10,,100,,,,0,0xFFFFFFFF,63,2,136,,145,0,,{ skill "AL_HEAL",1; },{},{}
+28311,Earring_Of_Sarah_R,Sarah's Right Earring,4,10,,100,,,,0,0xFFFFFFFF,63,2,136,,145,0,,{ skill "AL_TELEPORT",1; },{},{}
+28321,Falconer_Claw,Falconer Claw,4,0,,100,,5,,1,0x00000800,63,2,136,,80,0,,{ bonus bDex,1; bonus2 bSkillAtk,"HT_BLITZBEAT",getskilllv("HT_STEELCROW")*10; },{},{}
+28322,Falconer_Glove,Falconer Glove,4,0,,100,,5,,1,0x00000800,63,2,136,,80,0,,{ bonus bDex,1; bonus bUseSPrate,-5; },{},{}
+28326,Broken_Chip_1,Broken Chips 01,4,10,,100,,,,1,0xFFFFFFFF,63,2,136,,100,0,,{ bonus bStr,4; },{},{}
+28327,Broken_Chip_2,Broken Chips 02,4,10,,100,,,,1,0xFFFFFFFF,63,2,136,,100,0,,{ bonus bInt,4; },{},{}
+28332,Jewel_Ring,Jewerly Ring,4,10,,100,,,,0,0xFFFFFFFF,63,2,136,,1,0,,{ bonus bLuk,20; autobonus "{ bonus bAspd,2; }",50,2000,BF_WEAPON|BF_MAGIC; },{},{}
28333,Gold_PC_Room_Ring,Gold PC Room Ring,4,10,,0,,,,1,0xFFFFFFFF,63,2,136,,1,0,,{ bonus bMaxHPrate,3; bonus bMaxSPrate,3; },{},{}
28342,Critical_Anklet,Critical Anklet,4,0,,200,,3,,1,0xFFFFFFFF,63,2,136,,,0,,{ bonus bCritical,5; },{},{}
-28358,Cursed_Lucky_Clover,Cursed Lucky Clover,4,0,,100,,,,1,0xFFFFFFFF,63,2,136,0,100,0,,{ bonus bLuk,2; bonus bFlee,3; bonus2 bAddEff2,Eff_Curse,5; },{},{ sc_end SC_CLOAKING; /*FIXME: Because the combo has Cloaking skill*/ }
-28372,Imperial_Ring,Imperial Ring,4,0,,500,,3,,1,0xFFFFFFFF,63,2,136,0,50,0,,{ bonus bStr,1; bonus bInt,1; bonus bMaxHPRate,3; bonus bMaxSPRate,3; },{},{}
+28354,City_Map,City Map,4,0,,100,,0,,1,0xFFFFFFFF,63,2,136,,1,0,0,{ /* todo */ },{},{}
+28355,Shining_Holy_Water_,Shining Holy Water,4,0,,100,,0,,1,0xFFFFFFFF,63,2,136,,1,0,0,{ /* todo */ },{},{}
+28356,Prontera_Badge,Prontera Badge,4,0,,100,,0,,0,0xFFFFFFFF,63,2,136,,1,0,0,{ /*warp "prontera",159,192; 15 mins cooldown */ },{},{}
+28358,Cursed_Lucky_Clover,Cursed Lucky Clover,4,0,,100,,,,1,0xFFFFFFFF,63,2,136,,100,0,,{ bonus bLuk,2; bonus bFlee,3; bonus2 bAddEff2,Eff_Curse,5; },{},{ sc_end SC_CLOAKING; /*FIXME: Because the combo has Cloaking skill*/ }
+28372,Imperial_Ring,Imperial Ring,4,0,,500,,3,,1,0xFFFFFFFF,63,2,136,,50,0,,{ bonus bStr,1; bonus bInt,1; bonus bMaxHPRate,3; bonus bMaxSPRate,3; },{},{}
28374,Foxtail_Ring,Foxtail Ring,4,20,,100,,0,,0,0x80000000,7,2,136,,1,0,,{ bonus2 bExpAddRace,RC_All,5; .@lvl = min(BaseLevel/5,10); bonus bAtk,2*.@lvl; bonus bMatk,2*.@lvl; bonus bMaxHP,10*.@lvl; bonus bMaxSP,5*.@lvl; },{},{}
-28377,Magical_Ring,Magical Ring,4,0,,100,,,,1,0xFFFFFFFF,63,2,136,0,20,0,,{ bonus2 bMagicAddEle,Ele_Fire,5; bonus2 bMagicAddEle,Ele_Water,5; bonus2 bMagicAddEle,Ele_Earth,5; bonus2 bMagicAddEle,Ele_Wind,5; if (BaseLevel > 4) { bonus2 bSkillAtk,"MG_FIREBOLT",BaseLevel/5; bonus2 bSkillAtk,"MG_COLDBOLT",BaseLevel/5; bonus2 bSkillAtk,"MG_LIGHTNINGBOLT",BaseLevel/5; bonus2 bSkillAtk,"WZ_EARTHSPIKE",BaseLevel/5; } },{},{}
+28377,Magical_Ring,Magical Ring,4,0,,100,,,,1,0xFFFFFFFF,63,2,136,,20,0,,{ bonus2 bMagicAtkEle,Ele_Fire,5; bonus2 bMagicAtkEle,Ele_Water,5; bonus2 bMagicAtkEle,Ele_Earth,5; bonus2 bMagicAtkEle,Ele_Wind,5; if (BaseLevel > 4) { bonus2 bSkillAtk,"MG_FIREBOLT",BaseLevel/5; bonus2 bSkillAtk,"MG_COLDBOLT",BaseLevel/5; bonus2 bSkillAtk,"MG_LIGHTNINGBOLT",BaseLevel/5; bonus2 bSkillAtk,"WZ_EARTHSPIKE",BaseLevel/5; } },{},{}
28380,Fresh_Grass_Necklace,Fresh Grass Necklace,4,20,,100,,0,,1,0x80000000,7,2,136,,100,0,,{ bonus bFlee2,5; bonus2 bSkillCooldown,"SU_SCAROFTAROU",-5000; },{},{}
28381,Cute_Grass_Necklace,Cute Grass Necklace,4,20,,10,,0,,1,0x80000000,7,2,136,,100,0,,{ bonus bHealPower,5; bonus2 bSkillCooldown,"SU_TUNAPARTY",-7000; },{},{}
28382,Charm_Grass_Necklace,Charm Grass Necklace,4,20,,10,,0,,1,0x80000000,7,2,136,,100,0,,{ bonus bMdef,5; bonus2 bVariableCastrate,"SU_CN_METEOR",-1000; },{},{}
-28386,Fallen_Monk_Rosary,Fallen Monk Rosary,4,0,,100,,,,1,0xFFFFFFFF,63,2,136,0,20,0,,{ bonus bAspdRate,5; bonus bCritical,5; bonus2 bSkillUseSP,"CH_SOULCOLLECT",-5; if (BaseLevel > 14) bonus2 bSkillAtk,"SR_DRAGONCOMBO",BaseLevel/15; if (BaseLevel > 19) bonus2 bSkillAtk,"SR_KNUCKLEARROW",BaseLevel/20; if (BaseLevel > 29) bonus2 bSkillAtk,"SR_SKYNETBLOW",BaseLevel/30; },{},{}
+28386,Fallen_Monk_Rosary,Fallen Monk Rosary,4,0,,100,,,,1,0xFFFFFFFF,63,2,136,,20,0,,{ bonus bAspdRate,5; bonus bCritical,5; bonus2 bSkillUseSP,"CH_SOULCOLLECT",-5; if (BaseLevel > 14) bonus2 bSkillAtk,"SR_DRAGONCOMBO",BaseLevel/15; if (BaseLevel > 19) bonus2 bSkillAtk,"SR_KNUCKLEARROW",BaseLevel/20; if (BaseLevel > 29) bonus2 bSkillAtk,"SR_SKYNETBLOW",BaseLevel/30; },{},{}
28391,S_Thief_Earring,Thief Shadow Earring,12,0,,0,,,,0,0xFFFFFFFF,63,2,1048576,,1,1,,{ .@r = getrefine(); autobonus3 "{ bonus bBaseAtk,30+(.@r*10); bonus bFlee,30+(.@r*10); }",200,5000,"TF_THROWSTONE","{ specialeffect2 EF_ENHANCE; }"; },{},{}
28392,S_Archer_Earring,Archer Shadow Earring,12,0,,0,,,,0,0xFFFFFFFF,63,2,1048576,,1,1,,{ .@r = getrefine(); autobonus3 "{ bonus bBaseAtk,30+(.@r*10); bonus bHit,30+(.@r*10); }",200,5000,"AC_DOUBLE","{ specialeffect2 EF_ENHANCE; }"; },{},{}
-28410,Sapphire_Wrist,Sapphire Wrist,4,0,,500,,3,,1,0xFFFFFFFF,63,2,136,0,50,0,,{ bonus bDex,5; bonus bLuk,5; bonus bInt,5; bonus2 bSkillAtk,"GN_SPORE_EXPLOSION",BaseLevel/5; bonus2 bVariableCastrate,"CR_ACIDDEMONSTRATION",-(BaseLevel/4); .@n = getskilllv("CR_SLIMPITCHER"); bonus bDex,.@n/2; bonus bLuk,.@n/2; bonus bInt,.@n/2; bonus bMatk,(.@n/2)*20; },{},{}
-28411,Emerald_Earring,Emerald Earring,4,0,,500,,3,,1,0xFFFFFFFF,63,2,136,0,50,0,,{ bonus bDex,5; bonus bAgi,5; bonus bInt,5; bonus2 bSkillAtk,"CG_ARROWVULCAN",BaseLevel; bonus2 bSkillAtk,"BA_MUSICALSTRIKE",BaseLevel; bonus2 bSkillAtk,"DC_THROWARROW",BaseLevel; bonus2 bSkillAtk,"WM_METALICSOUND",2*(BaseLevel/5); .@n = getskilllv("WM_METALICSOUND"); bonus2 bVariableCastrate,"WM_METALICSOUND",.@n/2; bonus bDex,.@n/2; bonus bAgi,.@n/2; bonus bInt,.@n/2; bonus bMatk,(.@n/2)*20; },{},{}
+28410,Sapphire_Wrist,Sapphire Wrist,4,0,,500,,3,,1,0xFFFFFFFF,63,2,136,,50,0,,{ bonus bDex,5; bonus bLuk,5; bonus bInt,5; bonus2 bSkillAtk,"GN_SPORE_EXPLOSION",BaseLevel/5; bonus2 bVariableCastrate,"CR_ACIDDEMONSTRATION",-(BaseLevel/4); .@n = getskilllv("CR_SLIMPITCHER"); bonus bDex,.@n/2; bonus bLuk,.@n/2; bonus bInt,.@n/2; bonus bMatk,(.@n/2)*20; },{},{}
+28411,Emerald_Earring,Emerald Earring,4,0,,500,,3,,1,0xFFFFFFFF,63,2,136,,50,0,,{ bonus bDex,5; bonus bAgi,5; bonus bInt,5; bonus2 bSkillAtk,"CG_ARROWVULCAN",BaseLevel; bonus2 bSkillAtk,"BA_MUSICALSTRIKE",BaseLevel; bonus2 bSkillAtk,"DC_THROWARROW",BaseLevel; bonus2 bSkillAtk,"WM_METALICSOUND",2*(BaseLevel/5); .@n = getskilllv("WM_METALICSOUND"); bonus2 bVariableCastrate,"WM_METALICSOUND",.@n/2; bonus bDex,.@n/2; bonus bAgi,.@n/2; bonus bInt,.@n/2; bonus bMatk,(.@n/2)*20; },{},{}
28413,Lesser_Mackerel_Talisman,Lesser Mackerel Talisman,4,0,,100,,1,,1,0x80000000,63,2,136,,100,,,{ bonus bVit,1; },{},{}
28414,Intermediate_Mackerel_Talisman,Intermediate Mackerel Talisman,4,0,,100,,1,,1,0x80000000,63,2,136,,140,,,{ bonus bVit,2; },{},{}
28415,Greater_Mackerel_Talisman,Greater Mackerel Talisman,4,0,,100,,1,,1,0x80000000,63,2,136,,175,,,{ bonus bVit,3; },{},{}
@@ -11523,7 +11645,7 @@
//===================================================================
// More books
//===================================================================
-28600,Blue_Book,Blue Book,5,10,,500,160,,1,1,0x00000100,56,2,2,3,100,1,15,{ bonus bAgi,5; bonus bDex,5; },{},{}
+28600,Ru_Blue_Book,Blue Book,5,10,,500,160,,1,1,0x00000100,56,2,2,3,100,1,15,{ bonus bAgi,5; bonus bDex,5; },{},{}
28601,Ru_Gold_Book,Ru Gold Book,5,0,,500,160,,1,2,0x00000008,63,2,2,3,120,1,15,{ bonus bVit,8; bonus bInt,8; },{},{}
28602,Demon_Hunting_Bible,Demon Hunting Bible,5,0,,500,30:170,,1,2,0x00000008,63,2,2,3,110,1,15,{ bonus bInt,2; bonus bDex,2; .@b = readparam(bInt); bonus2 bSkillAtk,"PR_MAGNUS",30+min(.@b,120); },{},{}
28604,Crimson_Bible,Crimson Bible,5,20,,450,45,,1,2,0x00410100,63,2,2,3,70,1,15,{ .@r = getrefine(); bonus bBaseAtk,((BaseLevel/10)*5)+(.@r<=15?pow(.@r,2):225); bonus bMatk,(.@r<=15?(pow(.@r,2)/2):225); },{},{}
@@ -11535,7 +11657,7 @@
28700,Ru_Gold_Dagger,Ru Gold Dagger,5,0,,1000,160,,1,2,0x00020000,56,2,2,3,120,1,1,{ bonus bStr,8; bonus bInt,8; },{},{}
28701,Ru_Gold_Knife,Ru Gold Knife,5,0,,500,160,,1,2,0x00010000,56,2,2,3,120,1,1,{ bonus bVit,8; bonus bInt,8; },{},{}
28702,Ru_Gold_Ashura,Ru Gold Ashura,5,0,,1000,150:150,,1,2,0x2000000,63,2,2,3,120,1,1,{},{},{}
-28703,Infinity_Dagger,Infinity Dagger,5,10,,500,125,,1,1,0x028F5EEF,56,2,2,4,100,1,1,{},{},{}
+28703,Infinity_Dagger,Infinity Dagger,5,10,,500,125:100,,1,1,0x028F5EEF,56,2,2,4,100,1,1,{},{},{}
28705,Crimson_Dagger,Crimson Dagger,5,20,,550,55,,1,2,0x028F5EEF,63,2,2,3,70,1,1,{ .@r = getrefine(); bonus bBaseAtk,((BaseLevel/10)*5)+(.@r<=15?pow(.@r,2):225); bonus bMatk,(.@r<=15?(pow(.@r,2)/2):225); },{},{}
28706,Dagger_of_Vicious_Mind,Dagger of Vicious Mind,5,20,,1050,105:50,,1,1,0x028F5EEF,63,2,2,4,160,1,1,{ bonus bAtk,pow(min(getrefine(),15),2); bonus bMatk,pow(min(getrefine(),15),2)/2; },{},{}
//===================================================================
@@ -11544,13 +11666,13 @@
28900,Guardsmen's_Shield,Guardsmen's Shield,4,20,,3000,,30,,1,0xFFFFFFFF,63,2,32,,100,1,1,{ .@r = getrefine(); skill "LG_SHIELDSPELL",1; bonus3 bAutoSpellWhenHit,"HP_ASSUMPTIO",3,(10+(.@r*10)); bonus bDef,(.@r*10); bonus bMdef,.@r; },{},{}
28901,Cursed_Mad_Bunny,Cursed Mad Bunny,4,20,,100,,0,,0,0xFFFFFFFF,63,2,32,,1,1,1,{ bonus bAspd,3; bonus2 bAddRace,RC_All,5; bonus2 bMagicAddRace,RC_All,5; bonus bShortWeaponDamageReturn,10; autobonus2 "{ bonus bMagicDamageReturn,60; }",10,2000,BF_MAGIC,"{ specialeffect2 EF_WIND; }"; .@r = getrefine(); if(.@r>=7) { bonus bBaseAtk,5; bonus bMatk,5; } if(.@r>=9) { bonus bBaseAtk,15; bonus bMatk,15; } if(.@r>=12) { bonus bCritical,10; bonus bNoCastCancel,0; } },{},{}
28902,Mad_Bunny_,Mad Bunny,4,20,,100,,0,,1,0xFFFFFFFF,63,2,32,,1,1,1,{ bonus2 bAddRace,RC_All,5; bonus2 bMagicAddRace,RC_All,5; bonus bShortWeaponDamageReturn,10; autobonus2 "{ bonus bMagicDamageReturn,60; }",10,2000,BF_MAGIC,"{ specialeffect2 EF_WIND; }"; .@r = getrefine(); if(.@r>=7) { bonus bBaseAtk,5; bonus bMatk,5; } if(.@r>=9) { bonus bBaseAtk,15; bonus bMatk,15; } if(.@r>=12) { bonus bCritical,10; bonus bNoCastCancel,0; } },{},{}
-28903,Scutum,Scutum,4,0,,500,,1,,1,0xFFFFFFFF,63,2,32,1,1,1,,{ .@r = getrefine(); bonus bFlee,5+(.@r*3); bonus bFlee2,1+(.@r*2); if (.@r > 10) { bonus bMaxHPrate,10; bonus bMaxSPrate,10; } },{},{}
+28903,Scutum,Scutum,4,0,,500,,1,,1,0xFFFFFFFF,63,2,32,,1,1,1,{ .@r = getrefine(); bonus bFlee,5+(.@r*3); bonus bFlee2,1+(.@r*2); if (.@r > 10) { bonus bMaxHPrate,10; bonus bMaxSPrate,10; } },{},{}
28904,Unity_Guard,Unity Guard,4,20,,300,,60,,1,0xFFFFFFFF,63,2,32,,100,1,1,{ if(BaseLevel<100) { bonus bDef,12*getrefine(); } },{},{}
28905,Unity_Buckler,Unity Buckler,4,20,,300,,60,,1,0xFFFFFFFF,63,2,32,,100,1,1,{ if(BaseLevel<100) { bonus bMaxSPrate,2*getrefine(); } },{},{}
-28906,Shield_Of_Flame,Shield Of Flame,4,0,,500,,80,,1,0xFFFFFFFF,63,2,32,1,90,1,,{ bonus2 bSubEle,Ele_Fire,25; .@r = getrefine(); if(.@r > 4) { bonus bAspd,1+((.@r > 6) ? 1 : 0); } },{},{}
-28907,Shield_Of_Gust,Shield Of Gust,4,0,,500,,80,,1,0xFFFFFFFF,63,2,32,1,90,1,,{ bonus2 bSubEle,Ele_Wind,25; .@r = getrefine(); if(.@r > 4) { bonus bAspd,1+((.@r > 6) ? 1 : 0); } },{},{}
-28908,Shield_Of_Water,Shield Of Water,4,0,,500,,80,,1,0xFFFFFFFF,63,2,32,1,90,1,,{ bonus2 bSubEle,Ele_Water,25; .@r = getrefine(); if(.@r > 4) { bonus bAspd,1+((.@r > 6) ? 1 : 0); } },{},{}
-28909,Shield_Of_Earth,Shield Of Earth,4,0,,500,,80,,1,0xFFFFFFFF,63,2,32,1,90,1,,{ bonus2 bSubEle,Ele_Earth,25; .@r = getrefine(); if(.@r > 4) { bonus bAspd,1+((.@r > 6) ? 1 : 0); } },{},{}
+28906,Shield_Of_Flame,Shield Of Flame,4,0,,500,,80,,1,0xFFFFFFFF,63,2,32,,90,1,1,{ bonus2 bSubEle,Ele_Fire,25; .@r = getrefine(); if(.@r > 4) { bonus bAspd,1+((.@r > 6) ? 1 : 0); } },{},{}
+28907,Shield_Of_Gust,Shield Of Gust,4,0,,500,,80,,1,0xFFFFFFFF,63,2,32,,90,1,1,{ bonus2 bSubEle,Ele_Wind,25; .@r = getrefine(); if(.@r > 4) { bonus bAspd,1+((.@r > 6) ? 1 : 0); } },{},{}
+28908,Shield_Of_Water,Shield Of Water,4,0,,500,,80,,1,0xFFFFFFFF,63,2,32,,90,1,1,{ bonus2 bSubEle,Ele_Water,25; .@r = getrefine(); if(.@r > 4) { bonus bAspd,1+((.@r > 6) ? 1 : 0); } },{},{}
+28909,Shield_Of_Earth,Shield Of Earth,4,0,,500,,80,,1,0xFFFFFFFF,63,2,32,,90,1,1,{ bonus2 bSubEle,Ele_Earth,25; .@r = getrefine(); if(.@r > 4) { bonus bAspd,1+((.@r > 6) ? 1 : 0); } },{},{}
28910,Rectangular_Large_Sleeve,Rectangular Large Sleeve,4,20,,800,,80,,1,0xFFFFFFFF,63,2,32,,100,1,1,{ bonus bLongAtkDef,5; .@r = getrefine(); if(.@r>=5) { bonus bLongAtkDef,5; } if(.@r>=7) { bonus bLongAtkDef,10; } if(.@r>=9) { bonus bLongAtkDef,15; } },{},{}
28913,Ultralight_Magic_Shield,Ultralight Magic Shield,4,20,,100,,50,,1,0xFFFFFFFF,63,2,32,,100,1,1,{ bonus bAspdRate,5; bonus2 bIgnoreDefClassRate,Class_Normal,10; bonus2 bSubEle,Ele_Neutral,5; .@r = getrefine(); if(.@r>=7) { bonus2 bIgnoreDefClassRate,Class_Normal,2; bonus bAspdRate,2; } if(.@r>=9) { bonus2 bIgnoreDefClassRate,Class_Normal,3; bonus bAspdRate,3; } },{},{}
28915,Bunker_Shield,Bunker Shield,4,20,,3500,,90,,1,0xFFFFFFFF,63,2,32,,50,1,1,{ bonus2 bAddRace,RC_All,4; bonus bAspdRate,5; .@r = getrefine(); if(.@r>=5) { bonus2 bAddRace,RC_All,.@r; } },{},{}
@@ -11559,6 +11681,18 @@
//===================================================================
// Enchantment stones
//===================================================================
+29000,Rune_of_Intellect_Lv_1,Rune of Intellect Lv 1,6,20,,,,,,,,,,,,,,,{ .@r = getrefine(); if (.@r>=7) { bonus bInt,5; } if (.@r>=10) { bonus bMatkRate,5; } },{},{}
+29001,Rune_of_Intellect_Lv_2,Rune of Intellect Lv 2,6,20,,,,,,,,,,,,,,,{ .@r = getrefine(); if (.@r>=7) { bonus bInt,6; } if (.@r>=11) { bonus bInt,1; bonus bMatkRate,7; } },{},{}
+29002,Rune_of_Intellect_Lv_3,Rune of Intellect Lv 3,6,20,,,,,,,,,,,,,,,{ .@r = getrefine(); if (.@r>=7) { bonus bInt,7; } if (.@r>=12) { bonus bInt,1; bonus bMatkRate,8; } if (.@r>=13) { bonus bInt,1; bonus bMatkRate,2; } },{},{}
+29003,Rune_of_Dexterity_Lv_1,Rune of Dexterity Lv 1,6,20,,,,,,,,,,,,,,,{ .@r = getrefine(); if (.@r>=7) { bonus bDex,5; } if (.@r>=10) { bonus bLongAtkRate,5; } },{},{}
+29004,Rune_of_Dexterity_Lv_2,Rune of Dexterity Lv 2,6,20,,,,,,,,,,,,,,,{ .@r = getrefine(); if (.@r>=7) { bonus bDex,6; } if (.@r>=11) { bonus bDex,1; bonus bLongAtkRate,7; } },{},{}
+29005,Rune_of_Dexterity_Lv_3,Rune of Dexterity Lv 3,6,20,,,,,,,,,,,,,,,{ .@r = getrefine(); if (.@r>=7) { bonus bDex,7; } if (.@r>=12) { bonus bDex,1; bonus bLongAtkRate,8; } if (.@r>=13) { bonus bDex,1; bonus bLongAtkRate,2; } },{},{}
+29006,Rune_of_Luck_Lv_1,Rune of Luck Lv 1,6,20,,,,,,,,,,,,,,,{ .@r = getrefine(); if (.@r>=7) { bonus bLuk,5; } if (.@r>=10) { bonus bCritAtkRate,5; } },{},{}
+29007,Rune_of_Luck_Lv_2,Rune of Luck Lv 2,6,20,,,,,,,,,,,,,,,{ .@r = getrefine(); if (.@r>=7) { bonus bLuk,6; } if (.@r>=11) { bonus bLuk,1; bonus bCritAtkRate,7; } },{},{}
+29008,Rune_of_Luck_Lv_3,Rune of Luck Lv 3,6,20,,,,,,,,,,,,,,,{ .@r = getrefine(); if (.@r>=7) { bonus bLuk,7; } if (.@r>=12) { bonus bLuk,1; bonus bCritAtkRate,8; } if (.@r>=13) { bonus bLuk,1; bonus bCritAtkRate,6; } },{},{}
+29009,Rune_of_Vitality_Lv_1,Rune of Vitality Lv 1,6,20,,,,,,,,,,,,,,,{ .@r = getrefine(); if (.@r>=7) { bonus bVit,5; } if (.@r>=10) { bonus bMaxHPrate,5; } },{},{}
+29010,Rune_of_Vitality_Lv_2,Rune of Vitality Lv 2,6,20,,,,,,,,,,,,,,,{ .@r = getrefine(); if (.@r>=7) { bonus bVit,6; } if (.@r>=11) { bonus bVit,1; bonus bMaxHPrate,7; } },{},{}
+29011,Rune_of_Vitality_Lv_3,Rune of Vitality Lv 3,6,20,,,,,,,,,,,,,,,{ .@r = getrefine(); if (.@r>=7) { bonus bVit,7; } if (.@r>=12) { bonus bVit,1; bonus bMaxHPrate,8; } if (.@r>=13) { bonus bVit,1; bonus bMaxHPrate,2; } },{},{}
29061,Ambition1Lv,Ambition1Lv,6,10,,0,,,,,,,,,,,,,{ bonus2 bAddClass,Class_All,3; bonus bHit,3; },{},{}
29062,Ambition2Lv,Ambition2Lv,6,10,,0,,,,,,,,,,,,,{ bonus2 bAddClass,Class_All,6; bonus bHit,6; },{},{}
29063,Ambition3Lv,Ambition3Lv,6,10,,0,,,,,,,,,,,,,{ bonus2 bAddClass,Class_All,9; bonus bHit,9; },{},{}
@@ -11653,7 +11787,7 @@
31020,Malicious_Baby_Ghost_Card,Malicious Baby Ghost Card,6,20,,10,,,,,,,,16,,,,,{ bonus bMaxHPrate,-13; bonus3 bAddEffWhenHit,Eff_Curse,300,ATF_WEAPON; /* unofficial chance [Secret] */ },{},{}
31021,Dancing_Marionette_Card,Dancing Marionette Card,6,20,,10,,,,,,,,2,,,,,{ bonus bAspdRate,10; bonus2 bAddClass,Class_All,-3; },{},{}
31022,Abandoned_Teddy_Bear_Card,Abandoned Teddy Bear Card,6,20,,10,,,,,,,,64,,,,,{ bonus bMaxSPRate,20; bonus2 bAddEff2,Eff_Curse,100; /* unofficial chance [Secret] */ },{},{}
-31023,Celine_Kimi_Card,Celine Kimi Card,6,20,,10,,,,,,,,2,,,,,{ bonus bMatkRate,10; bonus5 bAutoSpell,"NPC_CRITICALWOUND",5,200+(50*getrefine()),BF_MAGIC,0; },{},{}
+31023,Celine_Kimi_Card,Celine Kimi Card,6,20,,10,,,,,,,,2,,,,,{ bonus bMatkRate,10; bonus5 bAutoSpell,"NPC_CRITICALWOUND",3,200+(50*getrefine()),BF_MAGIC,1; },{},{}
//===================================================================
// More Costumes
//===================================================================
@@ -11717,7 +11851,7 @@
31085,C_Long_Pony_Crimson,Costume Long Pony Crimson,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,1525,{},{},{}
31086,C_Long_Pony_Purple,Costume Long Pony Purple,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,1526,{},{},{}
31087,C_Dwarf_Beard,Costume Dwarf Beard,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,0,1349,{},{},{}
-31088,C_Mad_Hatter,Costume Mad Hatter,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,1421,{},{},{}
+31088,C_Mad_Hatter,Costume Mad Hatter,4,0,,0,,,,0,0xFFFFFFFF,63,2,5120,,1,0,1421,{},{},{}
31089,C_Exploding_Crimson_Flame,Costume Exploding Crimson Flame,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,0,0,{},{},{}
31090,C_Angelring_Hat,Costume Angelring Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,348,{},{},{}
31091,C_Show_Me_The_Zeny,Costume Show Me The Zeny,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,0,{},{},{}
@@ -11775,6 +11909,8 @@
31151,C_Chasher_Ear,Costume Cheshire's Cat Ears,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1565,{},{},{}
31152,C_Piamette_BowTie_Red,Costume Piamette's Red Bow Tie,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1566,{},{},{}
31153,C_Aniv_Star_Hat2,Costume Cactus Flower Corsage,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1567,{},{},{}
+31154,C_Cap,C Cap,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,14,{},{},{}
+31158,C_Squirrel_Ear_Hat,Costume Squirrel Ear Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1486,{},{},{}
31160,C_Rune_Helm,Costume Rune Helm,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1361,{},{},{}
31161,C_Tiger_Mask,Costume Tiger Mask,4,0,,0,,0,,0,0xFFFFFFFF,63,2,3072,,1,0,181,{},{},{}
31162,C_Shaving_Foam,Costume Shaving Foam,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1129,{},{},{}
@@ -11788,3 +11924,237 @@
31170,C_Wind_Wings,Costume Wings of Wind,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,493,{},{},{}
31171,C_Nekomimi,Costume Nekomimi,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,182,{},{},{}
31172,C_Roast_Memory,Costume Roast Memory,4,0,,0,,,,0,0xFFFFFFFF,63,2,7168,,1,0,1576,{},{},{}
+31173,C_Oyster_Parakeet,Costume Oyster Parakeet,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,419,{},{},{}
+31174,C_Suspicious_Bread_Bag,C Suspicious Bread Bag,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,429,{},{},{}
+31175,C_Strawberry_Hat,Costume Strawberry Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,755,{},{},{}
+31176,C_Looking,C Looking,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1577,{},{},{}
+31177,C_Tail_Hat,C Tail Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1578,{},{},{}
+31178,C_Fire_Muffler,C Fire Muffler,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1579,{},{},{}
+31179,C_Wolf_Masquerade,C Wolf Masquerade,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1580,{},{},{}
+31180,C_King_Sura_Headband,C King Sura Headband,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1581,{},{},{}
+31181,C_Necklace_Rosary,Costume Necklace Rosary,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1471,{},{},{}
+31182,C_Side_Cap,Costume Side Cap,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,529,{},{},{}
+31183,C_Fallen_Angel_Blessing,Costume Blessing of Fallen Angel,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1250,{},{},{}
+31184,C_Hawkeye,Costume Hawkeye,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,609,{},{},{}
+31185,C_Engineer_Cap,Costume Engineer Cap,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,608,{},{},{}
+31186,C_Black_Cat,Costume Black Cat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1582,{},{},{}
+31187,C_War_Princess_Ribbon,Costume War Princess Ribbon,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1583,{},{},{}
+31188,C_Mono_Gothic_Bonnet,Costume Mono Gothic Bonnet,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1584,{},{},{}
+31189,C_Cat_Ears_Cape_Red,Costume Red Cat Ears Cape,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1591,{},{},{}
+31190,C_Angel_Mini_Silk_Hat_B,Costume Black Angel Mini Silk Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1586,{},{},{}
+31191,C_Whikebain_Ears_Gold,Vibrant Cat Ears,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1588,{},{},{}
+31192,C_Bluecat_Ear,Blue Cat Ears,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1589,{},{},{}
+31193,C_Tare_Ahat,Costume Drooping Ahat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1590,{},{},{}
+31194,C_Spinning_Propeller,Costume Spinning Propeller,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,270,{},{},{}
+31195,C_Choco_Minihat,Costume Mini Chocolate Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1592,{},{},{}
+31196,C_JP_EV12,C Drooping Chuni Penguin,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1596,{},{},{}
+31197,C_Egg_Crispinette,Costume Egg Crispinette,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1598,{},{},{}
+31198,C_Octopus_Hat,C Octopus Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,538,{},{},{}
+31199,C_Weird_Beard,C Weird Beard,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,21,{},{},{}
+31200,C_Wrapping_Ribbon,C Wrapping Ribbon,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1599,{},{},{}
+31201,C_Royal_Rabbit_Crown,C Royal Rabbit Crown,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1600,{},{},{}
+31202,C_Dog_Officer,C Dog Officer,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1601,{},{},{}
+31203,C_Charcoal_Stove,C Charcoal Stove,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1602,{},{},{}
+31204,C_Drooping_White_Cat,C Drooping White Cat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,378,{},{},{}
+31205,C_Large_Orc_Hero_Helm,C Large Orc Hero Helm,4,0,,0,,0,,0,0xFFFFFFFF,63,2,3072,,1,0,381,{},{},{}
+31206,C_Rune_Hairband,C Rune Hairband,4,0,,0,,0,,0,0xFFFFFFFF,63,2,3072,,1,0,564,{},{},{}
+31207,C_Dokkebi_Mask,C Dokkebi Mask,4,0,,0,,0,,0,0xFFFFFFFF,63,2,6144,,1,0,689,{},{},{}
+31208,C_Straight_Long_YL,C Straight_Long Yellow,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1603,{},{},{}
+31209,C_Straight_Long_WH,C Straight Long White,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1604,{},{},{}
+31210,C_Side_Pigtail_BU,C Side Pigtail Blue,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1605,{},{},{}
+31211,C_Side_Pigtail_RD,C Side Pigtail Red,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1606,{},{},{}
+31212,C_Side_Pigtail_YL,C Side Pigtail Yellow,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1607,{},{},{}
+31213,C_Side_Pigtail_GN,C Side Pigtail Green,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1608,{},{},{}
+31214,C_Side_Pigtail_BL,C Side Pigtail Black,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1609,{},{},{}
+31215,C_Side_Pigtail_WH,C Side Pigtail White,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1610,{},{},{}
+31216,C_Side_Pigtail_OM,C Side Pigtail Brown,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1611,{},{},{}
+31217,C_Side_Pigtail_PP,C Side Pigtail Purple,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1612,{},{},{}
+31218,C_Low_Pony_BU,C Low Pony Blue,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1613,{},{},{}
+31219,C_Low_Pony_RD,C Low Pony Red,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1614,{},{},{}
+31220,C_Low_Pony_YL,C Low Pony Yellow,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1615,{},{},{}
+31221,C_Low_Pony_GN,C Low Pony Green,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1616,{},{},{}
+31222,C_Low_Pony_BL,C Low Pony Black,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1617,{},{},{}
+31223,C_Low_Pony_WH,C Low Pony White,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1618,{},{},{}
+31224,C_Low_Pony_OM,C Low Pony Brown,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1619,{},{},{}
+31225,C_Low_Pony_PP,C Low Pony Purple,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1620,{},{},{}
+31226,C_Long_Twin_BU,C Long Twin Blue,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1621,{},{},{}
+31227,C_Long_Twin_RD,C Long Twin Red,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1622,{},{},{}
+31228,C_Long_Twin_YL,C Long Twin Yellow,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1623,{},{},{}
+31229,C_Long_Twin_GN,C Long Twin Yellow,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1624,{},{},{}
+31230,C_Long_Twin_BL,C Long Twin Yellow,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1625,{},{},{}
+31231,C_Long_Twin_WH,C Long Twin Yellow,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1626,{},{},{}
+31232,C_Long_Twin_OM,C Long Twin Yellow,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1627,{},{},{}
+31233,C_Long_Twin_PP,C Long Twin Yellow,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1628,{},{},{}
+31234,C_Persica,C Persica,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,659,{},{},{}
+31235,C_Large_Ribbon_Muffler_Mid,C Large Ribbon Muffler Mid,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1312,{},{},{}
+31236,C_Vicious_Mind_Aura_Mid,C Vicious Mind Aura Mid,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1267,{},{},{}
+31237,C_Pale_Yellow_Ribbon_Lower,C Pale Yellow Ribbon Lower,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1474,{},{},{}
+31238,C_True_Love_Upper,C True Love Upper,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,489,{},{},{}
+31239,C_Love_Rabbit_Hood_Upper,C Love Rabbit Hood Upper,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,549,{},{},{}
+31240,C_Whisper_Mask_,C Whisper Mask Upper,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,321,{},{},{}
+31241,C_Burning_Sun_Lower,C Burning Sun Lower,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,654,{},{},{}
+31242,C_Anubis_Helm_,C Anubis Hat Upper,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,485,{},{},{}
+31243,C_Tongue_Mask_Mid,C Tongue Mask Mid,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,253,{},{},{}
+31244,C_Skymet_,C Skymet Upper,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,868,{},{},{}
+31245,C_Cherry,C Cherry,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,602,{},{},{}
+31246,C_Humming_Bird,C Humming Bird,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,702,{},{},{}
+31247,C_Hippo_Hat,C Hippo Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,859,{},{},{}
+31248,C_Isabella_Red_Ears,C Isabella Red Ears,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1030,{},{},{}
+31249,C_Rabbit_Hopping,C Hopping Rabbit,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1635,{},{},{}
+31250,C_Wonderful_Beast_Ear,C Wonderful Beast Ears,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1636,{},{},{}
+31251,C_Cat_Mouth,C Cats Mouth,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1637,{},{},{}
+31252,C_Cat_Ear_Hat_White,C White Cat Ears Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1638,{},{},{}
+31253,C_Rinzu_Helmet,C Rinzu Helmet,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,548,{},{},{}
+31254,C_Red_Hare_Hat,C Red Hare Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,7168,,1,0,1631,{},{},{}
+31255,C_Sweet_Helmet,C Sweet Helmet,4,0,,0,,0,,0,0xFFFFFFFF,63,2,3072,,1,0,1374,{},{},{}
+31256,C_Jaguar_Mask,C Jaguar Mask,4,0,,0,,0,,0,0xFFFFFFFF,63,2,6144,,1,0,530,{},{},{}
+31260,C_Observer_J,C Observer,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1639,{},{},{}
+31261,C_Soda_in_Mouth,C Soda in Mouth,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1643,{},{},{}
+31262,C_Disposable_3D_Glasses,C Disposable 3D Glasses,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,661,{},{},{}
+31263,C_Disposable_Popcorn_Hat,C Disposable Popcorn Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,415,{},{},{}
+31264,C_Wings_of_Protector_Lower,C Wings of Protector Lower,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,990,{},{},{}
+31265,C_Straight_Pony_Blue_Mid,C Straight Pony Blue Mid,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1394,{},{},{}
+31266,C_Straight_Pony_Red_Mid,C Straight Pony Red Mid,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1392,{},{},{}
+31267,C_Straight_Pony_Yellow_Mid,C Straight Pony Yellow Mid,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1389,{},{},{}
+31268,C_Straight_Pony_Green_Mid,C Straight_Pony Green Mid,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1390,{},{},{}
+31269,C_Straight_Pony_Black_Mid,C Straight Pony Black Mid,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1371,{},{},{}
+31270,C_Straight_Pony_White_Mid,C Straight Pony White Mid,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1395,{},{},{}
+31271,C_Straight_Pony_Crimson_Mid,C Straight Pony Crimson Mid,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1393,{},{},{}
+31272,C_Straight_Pony_Purple_Mid,C Straight Pony Purple Mid,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1391,{},{},{}
+31273,C_Cowlick_Blue_Mid,C Cowlick Blue Mid,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1387,{},{},{}
+31274,C_Cowlick_Red_Mid,C Cowlick Red Mid,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1385,{},{},{}
+31275,C_Cowlick_Yellow_Mid,C Cowlick Yellow Mid,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1382,{},{},{}
+31276,C_Cowlick_Green_Mid,C Cowlick Green Mid,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1383,{},{},{}
+31277,C_Cowlick_Black_Mid,C Cowlick Black Mid,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1372,{},{},{}
+31278,C_Cowlick_White_Mid,C Cowlick White Mid,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1388,{},{},{}
+31279,C_Cowlick_Crimson_Mid,C Cowlick Crimson Mid,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1386,{},{},{}
+31280,C_Cowlick_Purple_Mid,C Cowlick Purple Mid,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1384,{},{},{}
+31281,C_Loose_Wave_Twin_Blue_Mid,C Loose Wave Twin Blue Mid,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1401,{},{},{}
+31282,C_Loose_Wave_Twin_Red_Mid,C Loose Wave Twin Red Mid,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1399,{},{},{}
+31283,C_Loose_Wave_Twin_Yellow_Mid,C Loose Wave Twin Yellow Mid,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1396,{},{},{}
+31284,C_Loose_Wave_Twin_Green_Mid,C Loose Wave Twin Green Mid,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1397,{},{},{}
+31285,C_Loose_Wave_Twin_Black_Mid,C Loose Wave Twin Black Mid,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1373,{},{},{}
+31286,C_Loose_Wave_Twin_White_Mid,C Loose Wave Twin White Mid,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1402,{},{},{}
+31287,C_Loose_Wave_Twin_Crimson_Mid,C Loose Wave Twin Crimson Mid,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1400,{},{},{}
+31288,C_Loose_Wave_Twin_Purple_Mid,C Loose Wave Twin Purple Mid,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1398,{},{},{}
+31289,C_Black_Wing_Ears_Lower,C Black Wing Ears Lower,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1336,{},{},{}
+31290,C_Angels_Feather_Cap,C Angels Feather Cap,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,929,{},{},{}
+31291,C_Devils_Feather_Cap,C Devils Feather Cap,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,930,{},{},{}
+31293,C_Kings_Crown_Purple,C Crown of Ancient King Purple,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1651,{},{},{}
+31294,C_Jirant_Circlet_Red,C Jirant Circlet Red,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1652,{},{},{}
+31295,C_Red_Wing_Hat,C Red Wing Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,613,{},{},{}
+31296,C_Strawberry_in_Mouth,C Strawberry in Mouth,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,861,{},{},{}
+31297,C_Fruit_of_Love,C Fruit of Love,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,140,{},{},{}
+31298,C_Sepia_Parade_Hat,C Sepia Parade Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,682,{},{},{}
+31299,C_White_Rabbit,C White Rabbit,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1656,{},{},{}
+31300,C_Warm_Cat_Muffler,C Warm Cat Muffler,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1657,{},{},{}
+31301,C_Blinking_Eyes,C Blinking Eyes,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1658,{},{},{}
+31302,C_Black_Magenta_Ribbon,C Black Magenta Ribbon,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1659,{},{},{}
+31303,C_Black_Ramen_Hat_,C Black Ramen Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1338,{},{},{}
+31304,C_Summer_Fan,C Summer Fan,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1051,{},{},{}
+31306,C_Toucan_Hat,C Toucan Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,528,{},{},{}
+31307,C_Violet_Macaw,C Violet Macaw,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,656,{},{},{}
+31308,C_Protect_Feathers,C Protect Feathers,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1232,{},{},{}
+31309,C_Pure_White_Marching_Hat,C Pure White Marching Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1470,{},{},{}
+31310,C_666_Black_Elven_Ears,C 666 Black_ Elven Ears,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,498,{},{},{}
+31311,C_Dolor_Thanatos_Mask,C Dolor Thanatos Mask,4,0,,0,,0,,0,0xFFFFFFFF,63,2,6144,,1,0,666,{},{},{}
+31312,C_Hades_Helm,C Hades Helm,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,523,{},{},{}
+31313,C_FallenAngelWingEar,C Fallen Angel Wing Ears,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1662,{},{},{}
+31314,C_Ghost_Holiday,C Ghost Holiday,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1663,{},{},{}
+31315,C_Stall_Of_Angel,C Stall of Angel,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1664,{},{},{}
+31316,C_C_FlutterButterfly_BL,C Black Fluttering Butterfly,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1665,{},{},{}
+31317,C_15th_Anniversary_Wing,C 15th Anniversary Wing,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1660,{},{},{}
+31318,C_Gerhard_Von_Devi,Costume Gerhard Von Devi,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1092,{},{},{}
+31319,C_Summer_Fan_,C Summer Fan,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1051,{},{},{}
+31320,C_Pinwheel_Hat,C Pinwheel Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,456,{},{},{}
+31321,C_Shining_Sunflower,C Shining Sunflower,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,681,{},{},{}
+31322,C_Candy_Hat,C Candy Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,853,{},{},{}
+31323,C_Yellow_Hunting_Cap,C Yellow Hunting Cap,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,484,{},{},{}
+31325,C_Queen_Scarabas_Helmet,C Queen Scarabas Helmet,4,0,,0,,0,,0,0xFFFFFFFF,63,2,5120,,1,0,1231,{},{},{}
+31326,C_Rolf_Von_Ziege_666_II,C Rolf Von Ziege 666 II,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,946,{},{},{}
+31327,C_Wood_Goblins_Nose,C Wood Goblins Nose,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,737,{},{},{}
+31328,C_Faceworm_Eggshell,C Faceworm Eggshell,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1356,{},{},{}
+31329,C_Alice_Wig,Costume Alice Wig,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1673,{},{},{}
+31330,C_Fallen_Angel_Valletta,Costume Fallen Angel Valletta,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1674,{},{},{}
+31331,C_Chung_E_Shinyon_Cap,C Chung e Shinyon Cap,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1675,{},{},{}
+31332,C_Khalitzburg_KN_Helm_BL,C Black Khalitzburg Knight Helm,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1676,{},{},{}
+31368,C_Harvest_Festa_Hat,C Thanksgiving Memorial Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1677,{},{},{}
+31369,C_Straight_Long_WH_,Costume Straight Long White,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1604,{},{},{}
+31370,C_Straight_Long_YL_,Costume Straight Long Yellow,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1603,{},{},{}
+31373,C_Crown_of_Ancient_king,C Crown of Ancient king,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1412,{},{},{}
+31374,C_Explosion_gum,C Explosion gum,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1414,{},{},{}
+31375,C_Mystic_Eye,C Mystic Eye,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1490,{},{},{}
+31376,C_Ancient_Dragon_Coronet_Purple,C Ancient Dragon Coronet Purple,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1680,{},{},{}
+31377,C_Glastheim_Obeserver,C Glastheim Obeserver,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1041,{},{},{}
+31378,C_Catharina_Von_Brad_60th,C Catharina Von Brad 60th,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1527,{},{},{}
+31379,C_Wind-Up_Key,C Wind-Up Key,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1335,{},{},{}
+31380,C_Crow,C Crow,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1035,{},{},{}
+31381,C_Diabolic_Lapel,Costume Diabolic Lapel,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1681,{},{},{}
+31382,C_Cat_Ears_Punkish,Costume Cat Ears Punkish,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1682,{},{},{}
+31383,C_Volume_Low_Twin,Costume Volume Low Twin,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1683,{},{},{}
+31384,C_False_Ears,Costume False Ears,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1684,{},{},{}
+31385,C_Gothic_Pumpkin_Head,Costume Gothic Pumpkin Head,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1685,{},{},{}
+31387,C_Jjakk,C Jjakk,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1687,{},{},{}
+31389,C_White_Bird_Rose,C White Bird Rose,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1688,{},{},{}
+31390,C_Let_It_Snow,C Let It Snow,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1690,{},{},{}
+31391,C_Floating_Stone_of_Sage,C Floating Stone of Sage,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1230,{},{},{}
+31392,C_Radio_Antenna,C Radio Antenna,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,347,{},{},{}
+31393,C_Vajra,C Vajra,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,983,{},{},{}
+31394,C_Magician_White_Hat,C Magician White Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,283,{},{},{}
+31395,C_Book_Of_Magic,C Book of Magic,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1691,{},{},{}
+31396,C_Sorcerer_Hood,C Sorcerer Hood,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1692,{},{},{}
+31397,C_Sitting_Pope,C Sitting Pope,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1553,{},{},{}
+31398,C_Blinking_Thin_Eyes,C Blinking Thin Eyes,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1693,{},{},{}
+31399,C_Darkness_Veil,C Darkness Veil,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1694,{},{},{}
+31400,C_Ribbon,C Ribbon,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,17,{},{},{}
+31401,C_Nuns_Veil,C Nuns Veil,4,0,,0,,0,,0,0xFFFFFFFF,63,2,3072,,1,0,176,{},{},{}
+31402,C_Idun_Green_Apple,C Iduns Green Apple,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1698,{},{},{}
+31403,C_Wall,C Wall,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1699,{},{},{}
+31404,C_Poring_Traffic_Light,C Poring Traffic Light,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1700,{},{},{}
+31405,C_Eleanor_Wig_YL,C Eleanor Wig Yellow,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1701,{},{},{}
+31406,C_Nydhog_Wig_WH,C Nydhoggur Wig White,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1702,{},{},{}
+31407,C_Alice_Wig_PK,C Alice Wig Peach,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1703,{},{},{}
+31408,C_Ragnarok_Rush_Goat,C Ragnarok Rush Goat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,41,{},{},{}
+31409,C_Barrel_Helm,C Barrel Helm,4,0,,0,,0,,0,0xFFFFFFFF,63,2,7168,,1,0,1498,{},{},{}
+31410,C_GodsHelm,Costume God's Helm,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1678,{},{},{}
+31411,C_Leo_Diadem,C Leo Diadem,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,566,{},{},{}
+31412,C_Virgo_Crown,C Virgo Crown,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,573,{},{},{}
+31413,C_Taurus_Crown,C_ Taurus Crown,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,536,{},{},{}
+31414,C_Cancer_Diadem,C Cancer Diadem,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,560,{},{},{}
+31415,C_Wanderers_ Sakkat,Costume Wanderer's Sakkat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,3072,,1,0,558,{},{},{}
+31417,C_Rice_Ball_Hat,C Rice Ball Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,556,{},{},{}
+31418,C_Green_Onion_in_Mouth,C Green Onion in Mouth,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,824,{},{},{}
+31420,C_Shining_Santa_Poring,C Shining Santa Poring,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,961,{},{},{}
+31432,C_Floating_Ice,C Floating Ice,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1562,{},{},{}
+31433,C_Celestial_Circle,C Celestial Circle,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1073,{},{},{}
+31434,C_Cloud_Burst,C Cloud Burst,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,705,{},{},{}
+31435,C_Ghost_Magicians_Knit_Hat,C Ghost Magicians Knit Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,854,{},{},{}
+31436,C_Lazy_Cat,C Lazy Cat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,274,{},{},{}
+31437,C_Baby_Penguin,C Baby Penguin,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1705,{},{},{}
+31438,C_Fluffy_Angel_Cape,C Fluffy Angel Cape,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1706,{},{},{}
+31439,C_Fluffy_Heart_Earmuffs,C Fluffy Heart Earmuffs,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1707,{},{},{}
+31440,C_Snow_Bear_Hood,C Snow Bear Hood,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1708,{},{},{}
+31441,C_Penguin_Cap_BU,C Penguin Cap Blue,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1709,{},{},{}
+31442,C_Smile_Mask_Middle,C Smile Mask Middle,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,65,{},{},{}
+31443,C_Munak_Hat_,C Munak Hat Upper,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,51,{},{},{}
+31444,C_Bongun_Hat_,C Bongun Hat Upper,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,139,{},{},{}
+31446,C_Toy_Syringe,C Toy Syringe,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,842,{},{},{}
+31447,C_Light_Moonlight_Hat,C Light Moonlight_Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,913,{},{},{}
+31448,C_Stings_Silk_Ribbon,C Stings Silk Ribbon,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1457,{},{},{}
+31449,C_Blue_Rose_Eyepatch,C Blue Rose Eyepatch,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1712,{},{},{}
+31450,C_Lolita_Two_Side_Up,C Lolita Two Side Up,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1713,{},{},{}
+31451,C_Blue_Frill_Ribbon,C Blue Frill Ribbon,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1714,{},{},{}
+31452,C_White_Cat,C White Cat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1715,{},{},{}
+31453,C_L_RibbonMuff_Black,C Large Ribbon Muffler Black,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1716,{},{},{}
+31455,C_Enchanted_Dog,C Super Cute Dog,4,0,,0,,0,,0,0xFFFFFFFF,63,2,6144,,1,0,1718,{},{},{}
+31457,C_Laughing_Wonderful_Wolf_Hat,C Laughing Wonderful Wolf Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1016,{},{},{}
+31464,C_Bloom_Afro,C Bloom Afro,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,837,{},{},{}
+31468,C_Stripe_Hat,C Stripe Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1728,{},{},{}
+31470,C_Scroll_of_Tengu,C Scroll of Tengu,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1445,{},{},{}
+31471,C_Celestial_Flower,C Celestial Flower,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,438,{},{},{}
+31472,C_Fairy_Feathers,C Fairy Feathers,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,1,0,1723,{},{},{}
+31473,C_Tipsy,C Tipsy,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1724,{},{},{}
+31474,C_Straight_Long_BL,C Straight Long Black,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1725,{},{},{}
+31475,C_Black_Fox_Ear_Ribbon,C Black Fox Ears Ribbon,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1726,{},{},{}
+31476,C_Cherry_Blossom_Hat_YL,C Yellow Cherry Blossom Hat,4,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,0,1727,{},{},{}
+31478,C_Eleanor_Wig_,C Eleanors Wig Lower,4,0,,0,,0,,0,0xFFFFFFFF,63,2,4096,,1,0,1502,{},{},{}
diff --git a/db/re/item_delay.txt b/db/re/item_delay.txt
index 2c8e6c81eb2..b290a13dad6 100644
--- a/db/re/item_delay.txt
+++ b/db/re/item_delay.txt
@@ -85,6 +85,7 @@
12970,300000,SC_REUSE_LIMIT_RECALL //Emergency_Scroll3
// Misc
+12135,10000 //Green_Ale
//12202,60000 //Str_Dish10_
//12203,60000 //Agi_Dish10_
//12204,60000 //Int_Dish10_
diff --git a/db/re/item_flag.txt b/db/re/item_flag.txt
index 37d081b862a..b68c97c2c0a 100644
--- a/db/re/item_flag.txt
+++ b/db/re/item_flag.txt
@@ -7,6 +7,7 @@
// 4 - GUID Item: When this item is obtained, will generates GUID that cannot be stacked even same or stackable item
// 8 - Item will be bound item when equipped
// 16 - Special Broadcast: When item dropped by monster and player loot it, will be broadcasted!
+// 32 - Item will not be removed on consumption. Also supports 'itemskill'
// NOTE: For removing flag by import file, use "-" to remove the flag. Example, 604,-1 will removes flag 1 from Branch_Of_Dead_Tree
// Logged as Dead Branch item
@@ -1772,3 +1773,8 @@
// Special Broadcast
7782,16 //Gold_Key77
7783,16 //Silver_Key77
+
+// Not removed after consumption
+12622,32 //Boarding_Halter
+12887,32 //C_Wing_Of_Fly
+22508,32 //Para_Team_Mark_
diff --git a/db/re/item_misc.txt b/db/re/item_misc.txt
index fc6fa4b7e28..0e332483fff 100644
--- a/db/re/item_misc.txt
+++ b/db/re/item_misc.txt
@@ -1285,17 +1285,6 @@ IG_God_Material_Box,7089,5 //Indication_Of_Tempest
IG_God_Material_Box,7090,5 //Slilince_Wave
IG_God_Material_Box,7091,5 //Rough_Billows
IG_God_Material_Box,7092,5 //Air_Stream
-// Runes
-IG_Rune,12725,1 // Runstone_Nosiege
-IG_Rune,12726,1 // Runstone_Rhydo
-IG_Rune,12727,1 // Runstone_Verkana
-IG_Rune,12728,1 // Runstone_Isia
-IG_Rune,12729,1 // Runstone_Asir
-IG_Rune,12730,1 // Runstone_Urj
-IG_Rune,12731,1 // Runstone_Turisus
-IG_Rune,12732,1 // Runstone_Pertz
-IG_Rune,12733,1 // Runstone_Hagalas
-IG_Rune,22540,1 // Runstone_Luxanima
// Elemental Points
IG_Element,6360,1 // Scarlet_Pts
IG_Element,6361,1 // Indigo_Pts
diff --git a/db/re/item_trade.txt b/db/re/item_trade.txt
index bb446666545..8b4ee746bc1 100644
--- a/db/re/item_trade.txt
+++ b/db/re/item_trade.txt
@@ -829,6 +829,8 @@
6752,467,100 // Charleston_Parts
6753,507,100 // Token_Of_Destruction
6754,507,100 // Collected_Medicinal_Herbs
+6756,507,100 // Cohesive_Energy
+6757,507,100 // The_Memory_Recorder
6766,499,100 // Ice_World_Ticket
6767,499,100 // Summer_Fes_Coin
6768,499,100 // Red_Beans_Of_Ice
@@ -914,7 +916,7 @@
6916,499,100 // Piece_Of_Soul_Monkey
6917,499,100 // Piece_Of_Soul_Chicken
6919,499,100 // Honor_Proof
-//6920,467,100 //
+6920,499,100 // Rune_Magic_Powder
6923,499,100 // Bright_Fire_Lights
6925,499,100 // Letter_Of_Prisoner
6926,499,100 // Rune-Midgard_History_Book
diff --git a/db/re/job_basehpsp_db.txt b/db/re/job_basehpsp_db.txt
index f0880a44bbc..c2f4a5711f3 100644
--- a/db/re/job_basehpsp_db.txt
+++ b/db/re/job_basehpsp_db.txt
@@ -118,7 +118,7 @@
1,500,24,0,40,47,55,64,74,84,95,107,120,134,149,165,182,200,219,238,258,306,329,354,379,406,433,462,491,521,551,583,615,649,683,719,755,793,831,870,909,950,991,1034,1077,1122,1167,1214,1261,1309,1357,1407,1457,1509,1561,1615,1669,1725,1781,1838,1895,1954,2013,2074,2135,2198,2261,2326,2391,2457,2523,2591,2659,2670,2680,2690,2700,2710,2720,2730,2740,2750,2760,3000,3020,3040,3060,3080,3100,3120,3140,3160,3180,3455,3524,3593,3663,3734,3806,3878,3951,4025,4500,4562,4624,4686,4748,4810,4872,4934,4996,5058,5120,5182,5244,5306,5368,5430,5492,5554,5616,5678,5740,5802,5864,5926,5988,6050,6112,6174,6236,6298,6360,6422,6484,6546,6608,6670,6732,6794,6856,6918,6980,7042,7104,7166,7228,7290,7352,7414,7476,7538,7600,7662,7724,7786,7848,7910,7972,8034,8096,8158,8220,8282,8344,8406,8468,8530,8592,8654,8716,8778,8840,8902,8964,9026,9088,9150,9212,9274,9336,9398,9460,9522,9584,9646,9708,9770,9832,9894,9956,10018,10080,10142,10204,10266,10328,10390,10452,10514,10576,10638,10700,10762,10824,10886,10948,11010,11072,11134,11196,11258,11320,11382,11444,11506,11568,11630,11692,11754,11816,11878,11940,12002,12064,12126,12188,12250,12312,12374,12436,12498,12560,12622,12684,12746,12808,12870,12932,12994,13056,13118,13180,13242,13304,13366,13428,13490,13552,13614,13676,13738,13800,13862,13924,13986,14048,14110,14172,14234,14296,14358,14420,14482,14544,14606,14668,14730,14792,14854,14916,14978,15040,15102,15164,15226,15288,15350,15412,15474,15536,15598,15660,15722,15784,15846,15908,15970,16032,16094,16156,16218,16280,16342,16404,16466,16528,16590,16652,16714,16776,16838,16900,16962,17024,17086,17148,17210,17272,17334,17396,17458,17520,17582,17644,17706,17768,17830,17892,17954,18016,18078,18140,18202,18264,18326,18388,18450,18512,18574,18636,18698,18760,18822,18884,18946,19008,19070,19132,19194,19256,19318,19380,19442,19504,19566,19628,19690,19752,19814,19876,19938,20000,20062,20124,20186,20248,20310,20372,20434,20496,20558,20620,20682,20744,20806,20868,20930,20992,21054,21116,21178,21240,21302,21364,21426,21488,21550,21612,21674,21736,21798,21860,21922,21984,22046,22108,22170,22232,22294,22356,22418,22480,22542,22604,22666,22728,22790,22852,22914,22976,23038,23100,23162,23224,23286,23348,23410,23472,23534,23596,23658,23720,23782,23844,23906,23968,24030,24092,24154,24216,24278,24340,24402,24464,24526,24588,24650,24712,24774,24836,24898,24960,25022,25084,25146,25208,25270,25332,25394,25456,25518,25580,25642,25704,25766,25828,25890,25952,26014,26076,26138,26200,26262,26324,26386,26448,26510,26572,26634,26696,26758,26820,26882,26944,27006,27068,27130,27192,27254,27316,27378,27440,27502,27564,27626,27688,27750,27812,27874,27936,27998,28060,28122,28184,28246,28308,28370,28432,28494,28556,28618,28680,28742,28804,28866,28928,28990,29052,29114,29176,29238,29300,29362
//Rebellion
-1,500,4215,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,4500,4562,4624,4686,4748,4810,4872,4934,4996,5058,5120,5182,5244,5306,5368,5430,5492,5554,5616,5678,5740,5802,5864,5926,5988,6050,6112,6174,6236,6298,6360,6422,6484,6546,6608,6670,6732,6794,6856,6918,6980,7042,7104,7166,7228,7290,7352,7414,7476,7538,7600,7662,7724,7886,7948,8210,8372,8634,8896,9158,9220,9382,9544,9706,9868,10030,10192,10354,10516,10678,10840,11002,11164,11326,11488,11650,11812,11974,12136,12298,12460,12622,12784,12946,13108,13270,13432,13594,13756,13918,14080,14242,14404,14566,14728,14890,15052,15214,15376,15538,15700,15862,16024,16186,16348,16510,16672,16834,16996,17158,17320,17482,17644,17806,17968,18130,18292,18454,18616,18778,18940,19102,19264,19426,19588,19750,19912,20074,20236,20398,20560,20722,20884,21046,21208,21370,21532,21694,21856,22018,22180,22342,22504,22666,22828,22990,23152,23314,23476,23638,23800,23962,24124,24286,24448,24610,24772,24934,25096,25258,25420,25582,25744,25906,26068,26230,26392,26554,26716,26878,27040,27202,27364,27526,27688,27850,28012,28174,28336,28498,28660,28822,28984,29146,29308,29470,29632,29794,29956,30118,30280,30442,30604,30766,30928,31090,31252,31414,31576,31738,31900,32062,32224,32386,32548,32710,32872,33034,33196,33358,33520,33682,33844,34006,34168,34330,34492,34654,34816,34978,35140,35302,35464,35626,35788,35950,36112,36274,36436,36598,36760,36922,37084,37246,37408,37570,37732,37894,38056,38218,38380,38542,38704,38866,39028,39190,39352,39514,39676,39838,40000,40162,40324,40486,40648,40810,40972,41134,41296,41458,41620,41782,41944,42106,42268,42430,42592,42754,42916,43078,43240,43402,43564,43726,43888,44050,44212,44374,44536,44698,44860,45022,45184,45346,45508,45670,45832,45994,46156,46318,46480,46642,46804,46966,47128,47290,47452,47614,47776,47938,48100,48262,48424,48586,48748,48910,49072,49234,49396,49558,49720,49882,50044,50206,50368,50530,50692,50854,51016,51178,51340,51502,51664,51826,51988,52150,52312,52474,52636,52798,52960,53122,53284,53446,53608,53770,53932,54094,54256,54418,54580,54742,54904,55066,55228,55390,55552,55714,55876,56038,56200,56362,56524,56686,56848,57010,57172,57334,57496,57658,57820,57982,58144,58306,58468,58630,58792,58954,59116,59278,59440,59602,59764,59926,60088,60250,60412,60574,60736,60898,61060,61222,61384,61546,61708,61870,62032,62194,62356,62518,62680,62842,63004,63166,63328,63490,63652,63814,63976,64138,64300,64462
+1,500,4215,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,4938,5317,5458,5599,5740,5881,6022,6163,6304,6445,6586,6727,6868,7009,7150,7291,7432,7573,7714,7855,7996,8137,8278,8419,8560,8701,8842,8983,9124,9265,9406,9547,9688,9829,9970,10111,10252,10393,10534,10675,10816,10957,11098,11239,11380,11521,11662,11803,11944,12085,12226,12367,12508,12649,12790,12931,13072,13213,13354,13495,13636,13777,13918,14059,14200,14341,14482,14623,14764,14905,15046,15187,15328,15469,15610,15751,15892,16033,16174,16315,16456,16597,16738,16879,17020,17161,17302,17443,17584,17725,17866,18007,18148,18289,18430,18571,18712,18853,18994,19135,19276,19417,19558,19699,19840,19981,20122,20263,20404,20545,20686,20827,20968,21109,21250,21391,21532,21673,21814,21955,22096,22237,22378,22519,22660,22801,22942,23083,23224,23365,23506,23647,23788,23929,24070,24211,24352,24493,24634,24775,24916,25057,25198,25339,25480,25621,25762,25903,26044,26185,26326,26467,26608,26749,26890,27031,27172,27313,27454,27595,27736,27877,28018,28159,28300,28441,28582,28723,28864,29005,29146,29287,29428,29569,29710,29851,29992,30133,30274,30415,30556,30697,30838,30979,31120,31261,31402,31543,31684,31825,31966,32107,32248,32389,32530,32671,32812,32953,33094,33235,33376,33517,33658,33799,33940,34081,34222,34363,34504,34645,34786,34927,35068,35209,35350,35491,35632,35773,35914,36055,36196,36337,36478,36619,36760,36901,37042,37183,37324,37465,37606,37747,37888,38029,38170,38311,38452,38593,38734,38875,39016,39157,39298,39439,39580,39721,39862,40003,40144,40285,40426,40567,40708,40849,40990,41131,41272,41413,41554,41695,41836,41977,42118,42259,42400,42541,42682,42823,42964,43105,43246,43387,43528,43669,43810,43951,44092,44233,44374,44515,44656,44797,44938,45079,45220,45361,45502,45643,45784,45925,46066,46207,46348,46489,46630,46771,46912,47053,47194,47335,47476,47617,47758,47899,48040,48181,48322,48463,48604,48745,48886,49027,49168,49309,49450,49591,49732,49873,50014,50155,50296,50437,50578,50719,50860,51001,51142,51283,51424,51565,51706,51847,51988,52129,52270,52411,52552,52693,52834,52975,53116,53257,53398,53539,53680,53821,53962,54103,54244,54385,54526,54667,54808,54949,55090,55231,55372,55513,55654,55795,55936,56077,56218,56359,56500,56641,56782,56923,57064,57205,57346,57487,57628,57769,57910,58051,58192,58333,58474,58615,58756,58897,59038,59179,59320,59461,59602,59743,59884,60025,60166,60307,60448,60589,60730,60871,61012,61153,61294,61435,61576,61717
//Ninja
1,500,25,0,40,47,54,62,71,81,91,102,114,127,140,154,169,185,201,218,236,255,274,294,315,337,359,382,406,431,456,482,509,537,565,594,624,655,686,718,751,785,819,854,890,927,964,1002,1041,1081,1121,1162,1204,1247,1290,1334,1379,1425,1471,1518,1566,1615,1664,1714,1765,1817,1869,1922,1976,2031,2086,2142,2199,2257,2275,2294,2314,2335,2356,2378,2401,2425,2449,2874,2890,2907,2924,2942,2971,2991,3011,3032,3054,3567,3590,3614,3649,3675,3701,3728,3756,3800,4250,4305,4360,4415,4470,4525,4580,4635,4690,4745,4800,4855,4910,4965,5020,5075,5130,5185,5240,5295,5350,5405,5460,5515,5570,5625,5680,5735,5790,5845,5900,5955,6010,6065,6120,6175,6230,6285,6340,6395,6450,6505,6560,6615,6670,6725,6780,6835,6890,6945,7000,7055,7110,7165,7220,7275,7330,7385,7440,7495,7550,7605,7660,7715,7770,7825,7880,7935,7990,8045,8100,8155,8210,8265,8320,8375,8430,8485,8540,8595,8650,8705,8760,8815,8870,8925,8980,9035,9090,9145,9200,9255,9310,9365,9420,9475,9530,9585,9640,9695,9750,9805,9860,9915,9970,10025,10080,10135,10190,10245,10300,10355,10410,10465,10520,10575,10630,10685,10740,10795,10850,10905,10960,11015,11070,11125,11180,11235,11290,11345,11400,11455,11510,11565,11620,11675,11730,11785,11840,11895,11950,12005,12060,12115,12170,12225,12280,12335,12390,12445,12500,12555,12610,12665,12720,12775,12830,12885,12940,12995,13050,13105,13160,13215,13270,13325,13380,13435,13490,13545,13600,13655,13710,13765,13820,13875,13930,13985,14040,14095,14150,14205,14260,14315,14370,14425,14480,14535,14590,14645,14700,14755,14810,14865,14920,14975,15030,15085,15140,15195,15250,15305,15360,15415,15470,15525,15580,15635,15690,15745,15800,15855,15910,15965,16020,16075,16130,16185,16240,16295,16350,16405,16460,16515,16570,16625,16680,16735,16790,16845,16900,16955,17010,17065,17120,17175,17230,17285,17340,17395,17450,17505,17560,17615,17670,17725,17780,17835,17890,17945,18000,18055,18110,18165,18220,18275,18330,18385,18440,18495,18550,18605,18660,18715,18770,18825,18880,18935,18990,19045,19100,19155,19210,19265,19320,19375,19430,19485,19540,19595,19650,19705,19760,19815,19870,19925,19980,20035,20090,20145,20200,20255,20310,20365,20420,20475,20530,20585,20640,20695,20750,20805,20860,20915,20970,21025,21080,21135,21190,21245,21300,21355,21410,21465,21520,21575,21630,21685,21740,21795,21850,21905,21960,22015,22070,22125,22180,22235,22290,22345,22400,22455,22510,22565,22620,22675,22730,22785,22840,22895,22950,23005,23060,23115,23170,23225,23280,23335,23390,23445,23500,23555,23610,23665,23720,23775,23830,23885,23940,23995,24050,24105,24160,24215,24270,24325,24380,24435,24490,24545,24600,24655,24710,24765,24820,24875,24930,24985,25040,25095,25150,25205,25260,25315,25370,25425,25480,25535,25590,25645,25700,25755,25810,25865,25920,25975,26030,26085,26140,26195,26250,26305
diff --git a/db/re/job_db1.txt b/db/re/job_db1.txt
index f3a296e0f08..a9abdad6dc4 100644
--- a/db/re/job_db1.txt
+++ b/db/re/job_db1.txt
@@ -4,292 +4,292 @@
// JobID,Weight,HPFactor,HPMultiplicator,SPFactor,Unarmed,Dagger,1HSword,2HSword,1HSpear,2HSpear,1HAxe,2HAxe,1HMace,2HMace(unused),Rod,Bow,Knuckle,Instrument,Whip,Book,Katar,Revolver,Rifle,Gatling Gun,Shotgun,Grenade Launcher,Fuuma Shuriken,2HStaff,Shield
//
// Novice
-0, 20000,0 ,500 ,100 ,440 ,590 ,610 ,2000 ,2000 ,2000 ,540 ,2000 ,540 ,540 ,690 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,690 ,540
+0, 20000,0 ,500 ,100 ,40 ,55 ,57 ,200 ,200 ,200 ,50 ,200 ,50 ,55 ,65 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,65 ,10
// Swordman
-1, 28000,70 ,500 ,200 ,440 ,510 ,510 ,580 ,610 ,690 ,590 ,640 ,540 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+1, 28000,70 ,500 ,200 ,40 ,47 ,47 ,54 ,57 ,65 ,55 ,60 ,50 ,55 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Magician
-2, 22000,30 ,500 ,600 ,540 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,590 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,590 ,640
+2, 22000,30 ,500 ,600 ,50 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,55 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,55 ,10
// Archer
-3, 26000,50 ,500 ,200 ,440 ,590 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,530
+3, 26000,50 ,500 ,200 ,40 ,55 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,9
// Acolyte
-4, 24000,40 ,500 ,500 ,440 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490 ,490 ,640 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,640 ,510
+4, 24000,40 ,500 ,500 ,40 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,45 ,50 ,60 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,60 ,7
// Merchant
-5, 28000,40 ,500 ,300 ,440 ,560 ,560 ,2000 ,2000 ,2000 ,520 ,590 ,540 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+5, 28000,40 ,500 ,300 ,40 ,52 ,52 ,200 ,200 ,200 ,48 ,55 ,50 ,55 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Thief
-6, 24000,50 ,500 ,200 ,440 ,520 ,540 ,2000 ,2000 ,2000 ,640 ,2000 ,2000 ,2000 ,2000 ,570 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,500
+6, 24000,50 ,500 ,200 ,40 ,48 ,50 ,200 ,200 ,200 ,60 ,200 ,200 ,200 ,200 ,53 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,6
// Knight
-7, 28000,150 ,500 ,300 ,440 ,530 ,490 ,560 ,590 ,690 ,540 ,590 ,490 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+7, 28000,150 ,500 ,300 ,40 ,49 ,45 ,52 ,55 ,60 ,50 ,55 ,45 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Priest
-8, 26000,75 ,500 ,800 ,440 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,470 ,470 ,640 ,2000 ,640 ,2000 ,2000 ,480 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,640 ,490
+8, 26000,75 ,500 ,800 ,40 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,43 ,48 ,60 ,200 ,60 ,200 ,200 ,44 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,60 ,5
// Wizard
-9, 24000,55 ,500 ,900 ,540 ,580 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,570 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,570 ,620
+9, 24000,55 ,500 ,900 ,50 ,54 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,53 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,53 ,8
// Blacksmith
-10, 30000,90 ,500 ,400 ,440 ,540 ,540 ,2000 ,2000 ,2000 ,500 ,570 ,520 ,520 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+10, 30000,90 ,500 ,400 ,40 ,50 ,50 ,200 ,200 ,200 ,46 ,53 ,48 ,53 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Hunter
-11, 27000,85 ,500 ,400 ,440 ,570 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,520 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,530
+11, 27000,85 ,500 ,400 ,40 ,53 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,48 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,9
// Assassin
-12, 24000,110 ,500 ,400 ,440 ,460 ,540 ,2000 ,2000 ,2000 ,550 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,460 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,500
+12, 24000,110 ,500 ,400 ,40 ,42 ,50 ,200 ,200 ,200 ,51 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,42 ,200 ,200 ,200 ,200 ,200 ,110 ,200 ,6
// Knight (Peco)
-13, 28000,150 ,500 ,300 ,440 ,530 ,490 ,560 ,590 ,690 ,540 ,590 ,490 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+13, 28000,150 ,500 ,300 ,40 ,49 ,45 ,52 ,55 ,60 ,50 ,55 ,45 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Crusader
-14, 28000,110 ,700 ,470 ,440 ,520 ,470 ,590 ,570 ,560 ,540 ,590 ,490 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+14, 28000,110 ,700 ,470 ,40 ,48 ,43 ,55 ,53 ,52 ,50 ,55 ,45 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Monk
-15, 26000,90 ,650 ,470 ,440 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,470 ,470 ,640 ,2000 ,440 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,620 ,490
+15, 26000,90 ,650 ,470 ,40 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,43 ,48 ,60 ,200 ,40 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,58 ,5
// Sage
-16, 24000,75 ,500 ,700 ,490 ,570 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,590 ,2000 ,2000 ,2000 ,2000 ,470 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,590 ,590
+16, 24000,75 ,500 ,700 ,45 ,53 ,60 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,55 ,200 ,200 ,200 ,200 ,43 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,55 ,5
// Rogue
-17, 24000,85 ,500 ,500 ,440 ,490 ,540 ,2000 ,2000 ,2000 ,2030 ,2000 ,2000 ,2000 ,2000 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+17, 24000,85 ,500 ,500 ,40 ,45 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Alchemist
-18, 30000,90 ,500 ,400 ,440 ,540 ,490 ,2000 ,2000 ,2000 ,490 ,560 ,490 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,480
+18, 30000,90 ,500 ,400 ,40 ,50 ,45 ,200 ,200 ,200 ,45 ,52 ,45 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,4
// Bard
-19, 27000,75 ,300 ,600 ,440 ,570 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,520 ,2000 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,510
+19, 27000,75 ,300 ,600 ,40 ,53 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,48 ,200 ,45 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,7
// Dancer
-20, 27000,75 ,300 ,600 ,400 ,530 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,480 ,2000 ,2000 ,450 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,470
+20, 27000,75 ,300 ,600 ,40 ,53 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,48 ,200 ,200 ,45 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,7
// Crusader (Peco)
-21, 28000,110 ,700 ,470 ,440 ,520 ,470 ,590 ,570 ,560 ,540 ,590 ,490 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+21, 28000,110 ,700 ,470 ,40 ,48 ,43 ,55 ,53 ,52 ,50 ,55 ,45 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Wedding
-22, 20000,0 ,500 ,100 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000
+22, 20000,0 ,500 ,100 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200
// Super Novice
-23, 20000,0 ,500 ,100 ,440 ,590 ,610 ,2000 ,2000 ,2000 ,540 ,2000 ,540 ,540 ,690 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,690 ,540
+23, 20000,0 ,500 ,100 ,40 ,55 ,57 ,200 ,200 ,200 ,50 ,200 ,50 ,55 ,65 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,65 ,10
// Gunslinger
-24, 28000,90 ,650 ,469 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490 ,590 ,540 ,940 ,1040 ,2000 ,2000 ,600
+24, 28000,90 ,650 ,469 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,45 ,55 ,50 ,90 ,100 ,200 ,200 ,6
// Ninja
-25, 26000,75 ,500 ,540 ,440 ,470 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,590 ,2000 ,500
+25, 26000,75 ,500 ,540 ,40 ,43 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,55 ,200 ,6
// Novice High
-4001, 20000,0 ,500 ,100 ,440 ,590 ,610 ,2000 ,2000 ,2000 ,540 ,2000 ,540 ,540 ,690 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,690 ,540
+4001, 20000,0 ,500 ,100 ,40 ,55 ,57 ,200 ,200 ,200 ,50 ,200 ,50 ,55 ,65 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,65 ,10
// Swordman High
-4002, 28000,70 ,500 ,200 ,440 ,510 ,510 ,580 ,610 ,690 ,590 ,640 ,540 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+4002, 28000,70 ,500 ,200 ,40 ,47 ,47 ,54 ,57 ,65 ,55 ,60 ,50 ,55 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Magician High
-4003, 22000,30 ,500 ,600 ,540 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,590 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,590 ,640
+4003, 22000,30 ,500 ,600 ,50 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,55 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,55 ,10
// Archer High
-4004, 26000,50 ,500 ,200 ,440 ,590 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,530
+4004, 26000,50 ,500 ,200 ,40 ,55 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,9
// Acolyte High
-4005, 24000,40 ,500 ,500 ,440 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490 ,490 ,640 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,640 ,510
+4005, 24000,40 ,500 ,500 ,40 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,45 ,50 ,60 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,60 ,7
// Merchant High
-4006, 28000,40 ,500 ,300 ,440 ,560 ,560 ,2000 ,2000 ,2000 ,520 ,590 ,540 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+4006, 28000,40 ,500 ,300 ,40 ,52 ,52 ,200 ,200 ,200 ,48 ,55 ,50 ,55 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Thief High
-4007, 24000,50 ,500 ,200 ,440 ,520 ,540 ,2000 ,2000 ,2000 ,640 ,2000 ,2000 ,2000 ,2000 ,570 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,500
+4007, 24000,50 ,500 ,200 ,40 ,48 ,50 ,200 ,200 ,200 ,60 ,200 ,200 ,200 ,200 ,53 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,6
// Lord Knight
-4008, 28000,150 ,500 ,300 ,440 ,530 ,490 ,560 ,590 ,690 ,540 ,590 ,490 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+4008, 28000,150 ,500 ,300 ,40 ,49 ,45 ,52 ,55 ,60 ,50 ,55 ,45 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// High Priest
-4009, 26000,75 ,500 ,800 ,440 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,470 ,470 ,640 ,2000 ,640 ,2000 ,2000 ,480 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,640 ,490
+4009, 26000,75 ,500 ,800 ,40 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,43 ,48 ,60 ,200 ,60 ,200 ,200 ,44 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,60 ,5
// High Wizard
-4010, 24000,55 ,500 ,900 ,540 ,580 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,570 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,570 ,620
+4010, 24000,55 ,500 ,900 ,50 ,54 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,53 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,53 ,8
// Whitesmith
-4011, 30000,90 ,500 ,400 ,440 ,540 ,540 ,2000 ,2000 ,2000 ,500 ,570 ,520 ,520 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+4011, 30000,90 ,500 ,400 ,40 ,50 ,50 ,200 ,200 ,200 ,46 ,53 ,48 ,53 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Sniper
-4012, 27000,85 ,500 ,400 ,440 ,570 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,520 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,530
+4012, 27000,85 ,500 ,400 ,40 ,53 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,48 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,9
// Assassin Cross
-4013, 24000,110 ,500 ,400 ,440 ,460 ,540 ,2000 ,2000 ,2000 ,550 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,460 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,500
+4013, 24000,110 ,500 ,400 ,40 ,42 ,50 ,200 ,200 ,200 ,51 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,42 ,200 ,200 ,200 ,200 ,200 ,110 ,200 ,6
// Lord Knight (Peco)
-4014, 28000,150 ,500 ,300 ,440 ,530 ,490 ,560 ,590 ,690 ,540 ,590 ,490 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+4014, 28000,150 ,500 ,300 ,40 ,49 ,45 ,52 ,55 ,60 ,50 ,55 ,45 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Paladin
-4015, 28000,110 ,700 ,470 ,440 ,520 ,470 ,590 ,570 ,560 ,540 ,590 ,490 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+4015, 28000,110 ,700 ,470 ,40 ,48 ,43 ,55 ,53 ,52 ,50 ,55 ,45 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Champion
-4016, 26000,90 ,650 ,470 ,440 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,470 ,470 ,640 ,2000 ,440 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,620 ,490
+4016, 26000,90 ,650 ,470 ,40 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,43 ,48 ,60 ,200 ,40 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,58 ,5
// Professor
-4017, 24000,75 ,500 ,700 ,490 ,570 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,590 ,2000 ,2000 ,2000 ,2000 ,470 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,590 ,590
+4017, 24000,75 ,500 ,700 ,45 ,53 ,60 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,55 ,200 ,200 ,200 ,200 ,43 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,55 ,5
// Stalker
-4018, 24000,85 ,500 ,500 ,440 ,490 ,540 ,2000 ,2000 ,2000 ,2030 ,2000 ,2000 ,2000 ,2000 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+4018, 24000,85 ,500 ,500 ,40 ,45 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Creator
-4019, 30000,90 ,500 ,400 ,440 ,540 ,490 ,490 ,2000 ,2000 ,490 ,560 ,490 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,480
+4019, 30000,90 ,500 ,400 ,40 ,50 ,45 ,200 ,200 ,200 ,45 ,52 ,45 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,4
// Clown
-4020, 27000,75 ,300 ,600 ,440 ,570 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,520 ,2000 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,510
+4020, 27000,75 ,300 ,600 ,40 ,53 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,48 ,200 ,45 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,7
// Gypsy
-4021, 27000,75 ,300 ,600 ,440 ,570 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,520 ,2000 ,2000 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,510
+4021, 27000,75 ,300 ,600 ,40 ,53 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,48 ,200 ,200 ,45 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,7
// Paladin (Peco)
-4022, 28000,110 ,700 ,470 ,440 ,520 ,470 ,590 ,570 ,560 ,540 ,590 ,490 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+4022, 28000,110 ,700 ,470 ,40 ,48 ,43 ,55 ,53 ,52 ,50 ,55 ,45 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Baby Novice
-4023, 20000,0 ,500 ,100 ,440 ,590 ,610 ,2000 ,2000 ,2000 ,540 ,2000 ,540 ,540 ,690 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,690 ,540
+4023, 20000,0 ,500 ,100 ,40 ,55 ,57 ,200 ,200 ,200 ,50 ,200 ,50 ,55 ,65 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,65 ,10
// Baby Swordman
-4024, 28000,70 ,500 ,200 ,440 ,510 ,510 ,580 ,610 ,690 ,590 ,640 ,540 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+4024, 28000,70 ,500 ,200 ,40 ,47 ,47 ,54 ,57 ,65 ,55 ,60 ,50 ,55 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Baby Magician
-4025, 22000,30 ,500 ,600 ,540 ,440 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,590 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,590 ,640
+4025, 22000,30 ,500 ,600 ,50 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,55 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,55 ,10
// Baby Archer
-4026, 26000,50 ,500 ,200 ,440 ,590 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,530
+4026, 26000,50 ,500 ,200 ,40 ,55 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,9
// Baby Acolyte
-4027, 24000,40 ,500 ,500 ,440 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490 ,490 ,640 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,640 ,510
+4027, 24000,40 ,500 ,500 ,40 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,45 ,50 ,60 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,60 ,7
// Baby Merchant
-4028, 28000,40 ,500 ,300 ,440 ,560 ,560 ,2000 ,2000 ,2000 ,520 ,590 ,540 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+4028, 28000,40 ,500 ,300 ,40 ,52 ,52 ,200 ,200 ,200 ,48 ,55 ,50 ,55 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Baby Thief
-4029, 24000,50 ,500 ,200 ,440 ,520 ,540 ,2000 ,2000 ,2000 ,640 ,2000 ,2000 ,2000 ,2000 ,570 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,500
+4029, 24000,50 ,500 ,200 ,40 ,48 ,50 ,200 ,200 ,200 ,60 ,200 ,200 ,200 ,200 ,53 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,6
// Baby Knight
-4030, 28000,150 ,500 ,300 ,440 ,530 ,490 ,560 ,590 ,690 ,540 ,590 ,490 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+4030, 28000,150 ,500 ,300 ,40 ,49 ,45 ,52 ,55 ,60 ,50 ,55 ,45 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Baby Priest
-4031, 26000,75 ,500 ,800 ,440 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,470 ,470 ,640 ,2000 ,640 ,2000 ,2000 ,480 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,640 ,490
+4031, 26000,75 ,500 ,800 ,40 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,43 ,48 ,60 ,200 ,60 ,200 ,200 ,44 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,60 ,5
// Baby Wizard
-4032, 24000,55 ,500 ,900 ,540 ,580 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,570 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,570 ,620
+4032, 24000,55 ,500 ,900 ,50 ,54 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,53 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,53 ,8
// Baby Blacksmith
-4033, 30000,90 ,500 ,400 ,440 ,540 ,540 ,2000 ,2000 ,2000 ,500 ,570 ,520 ,520 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+4033, 30000,90 ,500 ,400 ,40 ,50 ,50 ,200 ,200 ,200 ,46 ,53 ,48 ,53 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Baby Hunter
-4034, 27000,85 ,500 ,400 ,440 ,570 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,520 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,530
+4034, 27000,85 ,500 ,400 ,40 ,53 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,48 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,9
// Baby Assassin
-4035, 24000,110 ,500 ,400 ,440 ,460 ,540 ,2000 ,2000 ,2000 ,550 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,460 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,500
+4035, 24000,110 ,500 ,400 ,40 ,42 ,50 ,200 ,200 ,200 ,51 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,42 ,200 ,200 ,200 ,200 ,200 ,110 ,200 ,6
// Baby Knight (Peco)
-4036, 28000,150 ,500 ,300 ,440 ,530 ,490 ,560 ,590 ,690 ,540 ,590 ,490 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+4036, 28000,150 ,500 ,300 ,40 ,49 ,45 ,52 ,55 ,60 ,50 ,55 ,45 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Baby Crusader
-4037, 28000,110 ,700 ,470 ,440 ,520 ,470 ,590 ,570 ,560 ,540 ,590 ,490 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+4037, 28000,110 ,700 ,470 ,40 ,48 ,43 ,55 ,53 ,52 ,50 ,55 ,45 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Baby Monk
-4038, 26000,90 ,650 ,470 ,440 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,470 ,470 ,640 ,2000 ,440 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,620 ,490
+4038, 26000,90 ,650 ,470 ,40 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,43 ,48 ,60 ,200 ,40 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,58 ,5
// Baby Sage
-4039, 24000,75 ,500 ,700 ,490 ,570 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,590 ,2000 ,2000 ,2000 ,2000 ,470 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,590 ,590
+4039, 24000,75 ,500 ,700 ,45 ,53 ,60 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,55 ,200 ,200 ,200 ,200 ,43 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,55 ,5
// Baby Rogue
-4040, 24000,85 ,500 ,500 ,440 ,490 ,540 ,2000 ,2000 ,2000 ,2030 ,2000 ,2000 ,2000 ,2000 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+4040, 24000,85 ,500 ,500 ,40 ,45 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Baby Alchemist
-4041, 30000,90 ,500 ,400 ,440 ,540 ,490 ,2000 ,2000 ,2000 ,490 ,560 ,490 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,480
+4041, 30000,90 ,500 ,400 ,40 ,50 ,45 ,200 ,200 ,200 ,45 ,52 ,45 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,4
// Baby Bard
-4042, 27000,75 ,300 ,600 ,440 ,570 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,520 ,2000 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,510
+4042, 27000,75 ,300 ,600 ,40 ,53 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,48 ,200 ,45 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,7
// Baby Dancer
-4043, 27000,75 ,300 ,600 ,400 ,530 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,480 ,2000 ,2000 ,450 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,470
+4043, 27000,75 ,300 ,600 ,40 ,53 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,48 ,200 ,200 ,45 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,7
// Baby Crusader (Peco)
-4044, 28000,110 ,700 ,470 ,440 ,520 ,470 ,590 ,570 ,560 ,540 ,590 ,490 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+4044, 28000,110 ,700 ,470 ,40 ,48 ,43 ,55 ,53 ,52 ,50 ,55 ,45 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Baby Super Novice
-4045, 20000,0 ,500 ,100 ,440 ,590 ,610 ,2000 ,2000 ,2000 ,540 ,2000 ,540 ,540 ,690 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,690 ,540
+4045, 20000,0 ,500 ,100 ,40 ,55 ,57 ,200 ,200 ,200 ,50 ,200 ,50 ,55 ,65 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,65 ,10
// Taekwon
-4046, 28000,70 ,500 ,200 ,440 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,500
+4046, 28000,70 ,500 ,200 ,40 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,6
// Star Gladiator
-4047, 28000,90 ,650 ,470 ,440 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,500
+4047, 28000,90 ,650 ,470 ,40 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,6
// Star Gladiator (flying)
-4048, 28000,90 ,650 ,470 ,440 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,500
+4048, 28000,90 ,650 ,470 ,40 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,6
// Soul Linker
-4049, 24000,75 ,500 ,900 ,540 ,440 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,570 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,570 ,620
+4049, 24000,75 ,500 ,900 ,50 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,53 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,55 ,8
// Gangsi (Bongun/Munak)
-4050, 24000,65 ,500 ,300 ,400 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,600 ,600 ,600 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,600 ,500
+4050, 24000,65 ,500 ,300 ,40 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,0
// Death Knight
-4051, 28000,150 ,500 ,300 ,400 ,500 ,500 ,550 ,600 ,600 ,700 ,700 ,650 ,700 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,500
+4051, 28000,150 ,500 ,300 ,40 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,0
// Dark Collector
-4052, 24000,75 ,500 ,700 ,450 ,525 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,625 ,2000 ,2000 ,2000 ,2000 ,550 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 , 625, 0
+4052, 24000,75 ,500 ,700 ,40 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,55 ,0
// Rune Knight (Regular)
-4054, 35000,150 ,500 ,300 ,440 ,540 ,560 ,590 ,620 ,560 ,620 ,640 ,490 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+4054, 35000,150 ,500 ,300 ,40 ,50 ,52 ,55 ,60 ,58 ,48 ,52 ,45 ,52 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Warlock (Regular)
-4055, 30000,55 ,500 ,900 ,490 ,560 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,540 ,540
+4055, 30000,55 ,500 ,900 ,45 ,52 ,60 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,56 ,5
// Ranger (Regular)
-4056, 32000,85 ,500 ,400 ,440 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,530 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,520
+4056, 32000,85 ,500 ,400 ,40 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,49 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,8
// Arch Bishop (Regular)
-4057, 30000,75 ,500 ,800 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,440 ,2000 ,640 ,2000 ,540 ,2000 ,2000 ,480 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,590 ,540
+4057, 30000,75 ,500 ,800 ,45 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,45 ,45 ,60 ,200 ,50 ,200 ,200 ,44 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,55 ,5
// Mechanic (Regular)
-4058, 38000,90 ,500 ,400 ,440 ,640 ,690 ,2000 ,2000 ,2000 ,490 ,520 ,520 ,520 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,500
+4058, 38000,90 ,500 ,400 ,40 ,60 ,65 ,200 ,200 ,200 ,45 ,48 ,48 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,6
// Guillotine Cross (Regular)
-4059, 32000,110 ,500 ,400 ,440 ,460 ,690 ,2000 ,2000 ,2000 ,840 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,460 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,530
+4059, 32000,110 ,500 ,400 ,40 ,42 ,65 ,200 ,200 ,200 ,80 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,42 ,200 ,95 ,120 ,90 ,100 ,110 ,200 ,9
// Rune Knight (Trans)
-4060, 35000,150 ,500 ,300 ,440 ,540 ,560 ,590 ,620 ,560 ,620 ,640 ,490 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+4060, 35000,150 ,500 ,300 ,40 ,50 ,52 ,55 ,60 ,58 ,48 ,52 ,45 ,52 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Warlock (Trans)
-4061, 30000,55 ,500 ,900 ,490 ,560 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,540 ,540
+4061, 30000,55 ,500 ,900 ,45 ,52 ,60 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,56 ,5
// Ranger (Trans)
-4062, 32000,85 ,500 ,400 ,440 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,530 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,520
+4062, 32000,85 ,500 ,400 ,40 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,49 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,8
// Arch Bishop (Trans)
-4063, 30000,75 ,500 ,800 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,440 ,2000 ,640 ,2000 ,540 ,2000 ,2000 ,480 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,590 ,540
+4063, 30000,75 ,500 ,800 ,45 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,45 ,45 ,60 ,200 ,50 ,200 ,200 ,44 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,55 ,5
// Mechanic (Trans)
-4064, 38000,90 ,500 ,400 ,440 ,640 ,690 ,2000 ,2000 ,2000 ,490 ,520 ,520 ,520 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,500
+4064, 38000,90 ,500 ,400 ,40 ,60 ,65 ,200 ,200 ,200 ,45 ,48 ,48 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,6
// Guillotine Cross (Trans)
-4065, 32000,110 ,500 ,400 ,440 ,460 ,690 ,2000 ,2000 ,2000 ,840 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,460 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,530
+4065, 32000,110 ,500 ,400 ,40 ,42 ,65 ,200 ,200 ,200 ,80 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,42 ,200 ,95 ,120 ,90 ,100 ,110 ,200 ,9
// Royal Guard (Regular)
-4066, 35000,110 ,700 ,400 ,440 ,510 ,490 ,530 ,540 ,540 ,520 ,560 ,480 ,480 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+4066, 35000,110 ,700 ,400 ,40 ,47 ,45 ,53 ,50 ,50 ,48 ,52 ,44 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Sorcerer (Regular)
-4067, 30000,75 ,500 ,900 ,440 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490 ,2000 ,2000 ,2000 ,2000 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490 ,490
+4067, 30000,75 ,500 ,900 ,40 ,50 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,45 ,200 ,200 ,200 ,200 ,45 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,55 ,5
// Minstrel (Regular)
-4068, 32000,75 ,300 ,400 ,440 ,560 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,540 ,2000 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,510
+4068, 32000,75 ,300 ,400 ,40 ,52 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,49 ,200 ,44 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,7
// Wanderer (Regular)
-4069, 32000,75 ,300 ,400 ,440 ,560 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,540 ,2000 ,2000 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,510
+4069, 32000,75 ,300 ,400 ,40 ,52 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,49 ,200 ,200 ,44 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,7
// Sura (Regular)
-4070, 30000,90 ,650 ,400 ,420 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,470 ,470 ,520 ,2000 ,430 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,540 ,470
+4070, 30000,90 ,650 ,400 ,38 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,43 ,45 ,48 ,200 ,39 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,50 ,5
// Genetic (Regular)
-4071, 32000,90 ,500 ,900 ,440 ,540 ,480 ,2000 ,2000 ,2000 ,550 ,550 ,490 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,480
+4071, 32000,90 ,500 ,900 ,40 ,50 ,44 ,200 ,200 ,200 ,48 ,51 ,44 ,48 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,4
// Shadow Chaser (Regular)
-4072, 28000,85 ,500 ,400 ,440 ,470 ,510 ,2000 ,2000 ,2000 ,2030 ,2000 ,2000 ,2000 ,2000 ,510 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+4072, 28000,85 ,500 ,400 ,40 ,43 ,47 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,47 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,4
// Royal Guard (Trans)
-4073, 35000,110 ,700 ,400 ,440 ,510 ,490 ,530 ,540 ,540 ,520 ,560 ,480 ,480 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+4073, 35000,110 ,700 ,400 ,40 ,47 ,45 ,53 ,50 ,50 ,48 ,52 ,44 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Sorcerer (Trans)
-4074, 30000,75 ,500 ,900 ,440 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490 ,2000 ,2000 ,2000 ,2000 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490 ,490
+4074, 30000,75 ,500 ,900 ,40 ,50 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,45 ,200 ,200 ,200 ,200 ,45 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,55 ,5
// Minstrel (Trans)
-4075, 32000,75 ,300 ,400 ,440 ,560 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,540 ,2000 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,510
+4075, 32000,75 ,300 ,400 ,40 ,52 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,49 ,200 ,44 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,7
// Wanderer (Trans)
-4076, 32000,75 ,300 ,400 ,440 ,560 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,540 ,2000 ,2000 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,510
+4076, 32000,75 ,300 ,400 ,40 ,52 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,49 ,200 ,200 ,44 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,7
// Sura (Trans)
-4077, 30000,90 ,650 ,400 ,420 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,470 ,470 ,520 ,2000 ,430 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,540 ,470
+4077, 30000,90 ,650 ,400 ,38 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,43 ,45 ,48 ,200 ,39 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,50 ,5
// Genetic (Trans)
-4078, 32000,90 ,500 ,900 ,440 ,540 ,480 ,2000 ,2000 ,2000 ,550 ,550 ,490 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,480
+4078, 32000,90 ,500 ,900 ,40 ,50 ,44 ,200 ,200 ,200 ,48 ,51 ,44 ,48 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,4
// Shadow Chaser (Trans)
-4079, 28000,85 ,500 ,400 ,440 ,470 ,510 ,2000 ,2000 ,2000 ,2030 ,2000 ,2000 ,2000 ,2000 ,510 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+4079, 28000,85 ,500 ,400 ,40 ,43 ,47 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,47 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,4
// Rune Knight (Dragon) (Regular)
-4080, 35000,150 ,500 ,300 ,440 ,540 ,560 ,590 ,620 ,560 ,620 ,640 ,490 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+4080, 35000,150 ,500 ,300 ,40 ,50 ,52 ,55 ,60 ,58 ,48 ,52 ,45 ,52 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Rune Knight (Dragon) (Trans)
-4081, 35000,150 ,500 ,300 ,440 ,540 ,560 ,590 ,620 ,560 ,620 ,640 ,490 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+4081, 35000,150 ,500 ,300 ,40 ,50 ,52 ,55 ,60 ,58 ,48 ,52 ,45 ,52 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Royal Guard (Gryphon) (Regular)
-4082, 35000,110 ,700 ,400 ,440 ,510 ,490 ,530 ,540 ,540 ,520 ,560 ,480 ,480 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+4082, 35000,110 ,700 ,400 ,40 ,47 ,45 ,53 ,50 ,50 ,48 ,52 ,44 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Royal Guard (Gryphon) (Trans)
-4083, 35000,110 ,700 ,400 ,440 ,510 ,490 ,530 ,540 ,540 ,520 ,560 ,480 ,480 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+4083, 35000,110 ,700 ,400 ,40 ,47 ,45 ,53 ,50 ,50 ,48 ,52 ,44 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Ranger (Warg) (Regular)
-4084, 32000,85 ,500 ,400 ,440 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,530 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,520
+4084, 32000,85 ,500 ,400 ,40 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,49 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,8
// Ranger (Warg) (Trans)
-4085, 32000,85 ,500 ,400 ,440 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,530 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,520
+4085, 32000,85 ,500 ,400 ,40 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,49 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,8
// Mechanic (Mado) (Regular)
-4086, 38000,90 ,500 ,400 ,440 ,640 ,690 ,2000 ,2000 ,2000 ,490 ,520 ,520 ,520 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,500
+4086, 38000,90 ,500 ,400 ,40 ,60 ,65 ,200 ,200 ,200 ,45 ,48 ,48 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,6
// Mechanic (Mado) (Trans)
-4087, 38000,90 ,500 ,400 ,440 ,640 ,690 ,2000 ,2000 ,2000 ,490 ,520 ,520 ,520 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,500
+4087, 38000,90 ,500 ,400 ,40 ,60 ,65 ,200 ,200 ,200 ,45 ,48 ,48 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,6
// Baby Rune Knight
-4096, 28000,150 ,500 ,300 ,440 ,540 ,560 ,590 ,620 ,560 ,620 ,640 ,490 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+4096, 28000,150 ,500 ,300 ,40 ,50 ,52 ,55 ,60 ,58 ,48 ,52 ,45 ,52 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Baby Warlock
-4097, 24000,55 ,500 ,900 ,490 ,560 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,540 ,540
+4097, 24000,55 ,500 ,900 ,45 ,52 ,60 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,56 ,5
// Baby Ranger
-4098, 27000,85 ,500 ,400 ,440 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,530 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,520
+4098, 27000,85 ,500 ,400 ,40 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,49 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,8
// Baby Arch Bishop
-4099, 26000,75 ,500 ,800 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,440 ,2000 ,640 ,2000 ,540 ,2000 ,2000 ,480 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,590 ,540
+4099, 26000,75 ,500 ,800 ,45 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,45 ,45 ,60 ,200 ,50 ,200 ,200 ,44 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,55 ,5
// Baby Mechanic
-4100, 30000,90 ,500 ,400 ,440 ,640 ,690 ,2000 ,2000 ,2000 ,490 ,520 ,520 ,520 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,500
+4100, 30000,90 ,500 ,400 ,40 ,60 ,65 ,200 ,200 ,200 ,45 ,48 ,48 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,6
// Baby Guillotine Cross
-4101, 24000,110 ,500 ,400 ,440 ,460 ,690 ,2000 ,2000 ,2000 ,840 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,460 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,530
+4101, 24000,110 ,500 ,400 ,40 ,42 ,65 ,200 ,200 ,200 ,80 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,42 ,200 ,95 ,120 ,90 ,100 ,110 ,200 ,9
// Baby Royal Guard
-4102, 28000,110 ,700 ,400 ,440 ,510 ,490 ,530 ,540 ,540 ,520 ,560 ,480 ,480 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+4102, 28000,110 ,700 ,400 ,40 ,47 ,45 ,53 ,50 ,50 ,48 ,52 ,44 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Baby Sorcerer
-4103, 24000,75 ,500 ,900 ,440 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490 ,2000 ,2000 ,2000 ,2000 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490 ,490
+4103, 24000,75 ,500 ,900 ,40 ,50 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,45 ,200 ,200 ,200 ,200 ,45 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,55 ,5
// Baby Minstrel
-4104, 27000,75 ,300 ,400 ,440 ,560 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,540 ,2000 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,510
+4104, 27000,75 ,300 ,400 ,40 ,52 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,49 ,200 ,44 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,7
// Baby Wanderer
-4105, 27000,75 ,300 ,400 ,440 ,560 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,540 ,2000 ,2000 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,510
+4105, 27000,75 ,300 ,400 ,40 ,52 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,49 ,200 ,200 ,44 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,7
// Baby Sura
-4106, 26000,90 ,650 ,400 ,420 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,470 ,470 ,520 ,2000 ,430 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,540 ,470
+4106, 26000,90 ,650 ,400 ,38 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,43 ,45 ,48 ,200 ,39 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,50 ,5
// Baby Genetic
-4107, 30000,90 ,500 ,900 ,440 ,540 ,480 ,2000 ,2000 ,2000 ,550 ,550 ,490 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,480
+4107, 30000,90 ,500 ,900 ,40 ,50 ,44 ,200 ,200 ,200 ,48 ,51 ,44 ,48 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,4
// Baby Shadow Chaser
-4108, 24000,85 ,500 ,400 ,440 ,470 ,510 ,2000 ,2000 ,2000 ,2030 ,2000 ,2000 ,2000 ,2000 ,510 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+4108, 24000,85 ,500 ,400 ,40 ,43 ,47 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,47 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,4
// Baby Rune Knight (Dragon)
-4109, 28000,150 ,500 ,300 ,440 ,540 ,560 ,590 ,620 ,560 ,620 ,640 ,490 ,490 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+4109, 28000,150 ,500 ,300 ,40 ,50 ,52 ,55 ,60 ,58 ,48 ,52 ,45 ,52 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Baby Royal Guard (Gryphon)
-4110, 28000,110 ,700 ,400 ,440 ,510 ,490 ,530 ,540 ,540 ,520 ,560 ,480 ,480 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490
+4110, 28000,110 ,700 ,400 ,40 ,47 ,45 ,53 ,50 ,50 ,48 ,52 ,44 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,5
// Baby Ranger (Warg)
-4111, 27000,85 ,500 ,400 ,440 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,530 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,520
+4111, 27000,85 ,500 ,400 ,40 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,49 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,8
// Baby Mechanic (Mado)
-4112, 30000,90 ,500 ,400 ,440 ,640 ,690 ,2000 ,2000 ,2000 ,490 ,520 ,520 ,520 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,500
+4112, 30000,90 ,500 ,400 ,40 ,60 ,65 ,200 ,200 ,200 ,45 ,48 ,48 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,6
// Super Novice (Expanded)
-4190, 20000,0 ,500 ,100 ,440 ,590 ,610 ,2000 ,2000 ,2000 ,540 ,2000 ,540 ,540 ,690 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,690 ,540
+4190, 20000,0 ,500 ,100 ,40 ,55 ,57 ,200 ,200 ,200 ,50 ,200 ,50 ,55 ,65 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,65 ,10
// Super Baby (Expanded)
-4191, 20000,0 ,500 ,100 ,500 ,650 ,700 ,2000 ,2000 ,2000 ,800 ,2000 ,700 ,700 ,650 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 , 650 ,540
+4191, 20000,0 ,500 ,100 ,40 ,55 ,57 ,200 ,200 ,200 ,50 ,200 ,50 ,55 ,65 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,65 ,10
// Kagerou
-4211, 26000,75 ,500 ,540 ,400 ,500 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 , 750 ,2000 ,500
+4211, 26000,75 ,500 ,540 ,40 ,45 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,50 ,200 ,3
// Oboro
-4212, 26000,75 ,500 ,540 ,400 ,500 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 , 750 ,2000 ,500
+4212, 26000,75 ,500 ,540 ,40 ,45 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,50 ,200 ,3
// Rebellion
-4215, 28000,90 ,650 ,469 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,520 ,620 ,570 ,970 ,1070 ,2000 ,2000 ,600
+4215, 28000,90 ,650 ,469 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,45 ,55 ,50 ,90 ,100 ,200 ,200 ,6
// Summoner
-4218, 20000,70 ,500 ,500 ,490 ,570 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,590 ,2000 ,2000 ,2000 ,2000 ,470 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,590 ,590
+4218, 20000,70 ,500 ,500 ,45 ,55 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,55 ,200 ,200 ,200 ,200 ,43 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,55 ,5
// Baby Summoner
-4220, 20000,100 ,700 ,200 ,450 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,625 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000, 590
+4220, 20000,100 ,700 ,200 ,45 ,55 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,55 ,200 ,200 ,200 ,200 ,43 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,55 ,5
// Baby Ninja
-4222, 26000,75 ,500 ,540 ,440 ,470 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,590 ,2000 ,500
+4222, 26000,75 ,500 ,540 ,40 ,43 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,55 ,200 ,6
// Baby Kagerou
-4223, 26000,75 ,500 ,540 ,400 ,500 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 , 750 ,2000 ,500
+4223, 26000,75 ,500 ,540 ,40 ,45 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,50 ,200 ,3
// Baby Oboro
-4224, 26000,75 ,500 ,540 ,400 ,500 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 , 750 ,2000 ,500
+4224, 26000,75 ,500 ,540 ,40 ,45 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,50 ,200 ,3
// Baby Taekwon
-4225, 28000,70 ,500 ,200 ,440 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,500
+4225, 28000,70 ,500 ,200 ,40 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,6
// Baby Star Gladiator
-4226, 28000,90 ,650 ,470 ,440 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,500
+4226, 28000,90 ,650 ,470 ,40 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,6
// Baby Soul Linker
-4227, 24000,75 ,500 ,900 ,540 ,440 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,570 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,570 ,620
+4227, 24000,75 ,500 ,900 ,50 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,53 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,55 ,8
// Baby Gunslinger
-4228, 28000,90 ,650 ,469 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490 ,590 ,540 ,940 ,1040 ,2000 ,2000 ,600
+4228, 28000,90 ,650 ,469 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,45 ,55 ,50 ,90 ,100 ,200 ,200 ,6
// Baby Rebellion
-4229, 28000,90 ,650 ,469 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,520 ,620 ,570 ,970 ,1070 ,2000 ,2000 ,600
+4229, 28000,90 ,650 ,469 ,50 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,200 ,45 ,55 ,50 ,90 ,100 ,200 ,200 ,6
// Baby Star Gladiator (Union)
-4238, 28000,90 ,650 ,470 ,440 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,540 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,500
\ No newline at end of file
+4238, 28000,90 ,650 ,470 ,40 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,50 ,6
\ No newline at end of file
diff --git a/db/re/job_exp.txt b/db/re/job_exp.txt
index 14d6ce76f3a..190cb430ad7 100644
--- a/db/re/job_exp.txt
+++ b/db/re/job_exp.txt
@@ -13,12 +13,12 @@
//Base - Adv Jobs
99,4001:4002:4003:4004:4005:4006:4007:4008:4009:4010:4011:4012:4013:4014:4015:4016:4017:4018:4019:4020:4021:4022,0,660,1080,1800,2640,3840,4560,5040,5460,6000,6600,7200,7320,7620,8040,8820,9600,10080,10560,11040,12610,13390,14300,15340,16900,18460,19500,20800,22100,23400,24700,26000,27300,28600,30160,31200,33800,35750,37700,39000,44100,46200,47600,50400,52500,53200,56000,58800,62300,65800,68600,71400,74200,77000,79800,82600,86100,88200,91000,93800,103500,105000,109500,115500,120000,126000,132000,136500,142500,165000,192000,210000,232500,244500,255000,270000,282000,292500,300000,345000,416000,480000,560000,640000,768000,880000,960000,1088000,1200000,1440000,1700000,2040000,2550000,3060000,3570000,4080000,4760000,5610000,6800000,99999999
-//Base - 3rd Jobs, Baby 3rds, Summoner
+//Base - 3rd Jobs, Baby 3rds, Oboro/Kagerou, Rebellion, & Summoner
//Note: (First 98 values [Level 1 - 98] are only used by Summoner Class, because 3rd classes start at level 99.)
-175,4054:4055:4056:4057:4058:4059:4060:4061:4062:4063:4064:4065:4066:4067:4068:4069:4070:4071:4072:4073:4074:4075:4076:4077:4078:4079:4080:4081:4082:4083:4084:4085:4086:4087:4096:4097:4098:4099:4100:4101:4102:4103:4104:4105:4106:4107:4108:4109:4110:4111:4112:4218:4220,0,55,90,150,220,320,380,420,455,500,600,700,800,900,1000,1100,1200,1300,1400,1500,1800,2100,2400,2700,3000,3300,3600,3900,4200,4500,5400,6300,7200,8100,9000,9900,10800,11700,12600,13500,16200,18900,21600,24300,27000,29700,32400,35100,37800,40500,43200,45900,48600,51300,54000,56700,59400,62100,64800,67500,75600,83700,91800,99900,108000,116100,124200,132300,140400,165000,192000,210000,232500,244500,255000,270000,282000,292500,300000,345000,416000,480000,560000,640000,768000,880000,960000,1088000,1200000,1440000,1700000,2040000,2550000,3060000,3570000,4080000,4760000,5610000,6800000,7070000,7400000,7770000,8150000,8550000,9100000,9610000,10150000,10570000,11180000,12000000,12200000,12930000,13150000,14030000,14420000,15420000,15670000,16870000,17140000,18720000,19020000,20590000,20930000,22690000,23310000,25290000,26020000,27860000,28535000,30990000,31680000,33560000,34942000,36372000,38350000,39890000,41545000,43330000,45400000,48100000,50410000,53370000,56250000,59230000,62590000,66120000,70200000,75330000,81100000,95000000,98000000,103000000,107000000,112000000,116000000,121000000,125000000,130000000,134000000,139000000,145000000,152200000,160840000,171200000,191930000,202290000,214720000,229640000,247550000,283370000,301280000,322770000,348560000,379500000,441390000,99999999
+175,4054:4055:4056:4057:4058:4059:4060:4061:4062:4063:4064:4065:4066:4067:4068:4069:4070:4071:4072:4073:4074:4075:4076:4077:4078:4079:4080:4081:4082:4083:4084:4085:4086:4087:4096:4097:4098:4099:4100:4101:4102:4103:4104:4105:4106:4107:4108:4109:4110:4111:4112:4211:4212:4215:4218:4220:4223:4224:4229,0,55,90,150,220,320,380,420,455,500,600,700,800,900,1000,1100,1200,1300,1400,1500,1800,2100,2400,2700,3000,3300,3600,3900,4200,4500,5400,6300,7200,8100,9000,9900,10800,11700,12600,13500,16200,18900,21600,24300,27000,29700,32400,35100,37800,40500,43200,45900,48600,51300,54000,56700,59400,62100,64800,67500,75600,83700,91800,99900,108000,116100,124200,132300,140400,165000,192000,210000,232500,244500,255000,270000,282000,292500,300000,345000,416000,480000,560000,640000,768000,880000,960000,1088000,1200000,1440000,1700000,2040000,2550000,3060000,3570000,4080000,4760000,5610000,6800000,7070000,7400000,7770000,8150000,8550000,9100000,9610000,10150000,10570000,11180000,12000000,12200000,12930000,13150000,14030000,14420000,15420000,15670000,16870000,17140000,18720000,19020000,20590000,20930000,22690000,23310000,25290000,26020000,27860000,28535000,30990000,31680000,33560000,34942000,36372000,38350000,39890000,41545000,43330000,45400000,48100000,50410000,53370000,56250000,59230000,62590000,66120000,70200000,75330000,81100000,95000000,98000000,103000000,107000000,112000000,116000000,121000000,125000000,130000000,134000000,139000000,145000000,152200000,160840000,171200000,191930000,202290000,214720000,229640000,247550000,283370000,301280000,322770000,348560000,379500000,441390000,99999999
-//Base - Expanded Super Novice, Expanded Super Baby, Oboro/Kagerou, & Rebellion
-160,4190:4191:4211:4212:4215:4223:4224:4229,0,660,1080,1800,2640,3840,4560,5040,5460,6000,6600,7200,7320,7620,8040,8820,9600,10080,10560,11040,12610,13390,14300,15340,16900,18460,19500,20800,22100,23400,24700,26000,27300,28600,30160,31200,33800,35750,37700,39000,44100,46200,47600,50400,52500,53200,56000,58800,62300,65800,68600,71400,74200,77000,79800,82600,86100,88200,91000,93800,103500,105000,109500,115500,120000,126000,132000,136500,142500,165000,192000,210000,232500,244500,255000,270000,282000,292500,300000,345000,416000,480000,560000,640000,768000,880000,960000,1088000,1200000,1440000,1700000,2040000,2550000,3060000,3570000,4080000,4760000,5610000,6800000,7070000,7400000,7770000,8150000,8550000,9100000,9610000,10150000,10570000,11180000,12000000,12200000,12930000,13150000,14030000,14420000,15420000,15670000,16870000,17140000,18720000,19020000,20590000,20930000,22690000,23310000,25290000,26020000,27860000,28535000,30990000,31680000,33560000,34942000,36372000,38350000,39890000,41545000,43330000,45400000,48100000,50410000,53370000,56250000,59230000,62590000,66120000,70200000,75330000,81100000,95000000,98000000,103000000,107000000,112000000,116000000,121000000,125000000,130000000,134000000,139000000,145000000,152200000,160840000,171200000,191930000,202290000,214720000,229640000,247550000,283370000,301280000,322770000,348560000,379500000,441390000,99999999
+//Base - Expanded Super Novice & Expanded Super Baby
+160,4190:4191,0,660,1080,1800,2640,3840,4560,5040,5460,6000,6600,7200,7320,7620,8040,8820,9600,10080,10560,11040,12610,13390,14300,15340,16900,18460,19500,20800,22100,23400,24700,26000,27300,28600,30160,31200,33800,35750,37700,39000,44100,46200,47600,50400,52500,53200,56000,58800,62300,65800,68600,71400,74200,77000,79800,82600,86100,88200,91000,93800,103500,105000,109500,115500,120000,126000,132000,136500,142500,165000,192000,210000,232500,244500,255000,270000,282000,292500,300000,345000,416000,480000,560000,640000,768000,880000,960000,1088000,1200000,1440000,1700000,2040000,2550000,3060000,3570000,4080000,4760000,5610000,6800000,7070000,7400000,7770000,8150000,8550000,9100000,9610000,10150000,10570000,11180000,12000000,12200000,12930000,13150000,14030000,14420000,15420000,15670000,16870000,17140000,18720000,19020000,20590000,20930000,22690000,23310000,25290000,26020000,27860000,28535000,30990000,31680000,33560000,34942000,36372000,38350000,39890000,41545000,43330000,45400000,48100000,50410000,53370000,56250000,59230000,62590000,66120000,70200000,75330000,81100000,95000000,98000000,103000000,107000000,112000000,116000000,121000000,125000000,130000000,134000000,139000000,145000000,152200000,160840000,171200000,191930000,202290000,214720000,229640000,247550000,283370000,301280000,322770000,348560000,379500000,441390000,99999999
//Job - Novice & Baby Novice
10,0:4023,1,10,18,28,40,91,151,205,268,340,999999999
@@ -38,11 +38,11 @@
//Job - Adv Second Classes
70,4008:4009:4010:4011:4012:4013:4014:4015:4016:4017:4018:4019:4020:4021:4022,1,3800,6200,10400,15200,22900,27100,30000,32500,35700,41300,45000,45800,47600,50300,58700,63900,67100,70300,73500,90600,96200,102700,110200,121400,144700,152900,163100,173300,183500,213500,224700,236000,247200,260700,299800,324800,343600,362300,374800,474400,497000,512100,542200,564800,644300,678200,712100,754500,796900,873100,911900,950600,989400,1028100,1143300,1199900,1233800,1279100,1324300,1486900,1515900,1603000,1719200,1806300,2040300,2244300,2415900,2746000,3326000,999999999
-//Job - 3rd Jobs & Baby 3rds
-60,4054:4055:4056:4057:4058:4059:4060:4061:4062:4063:4064:4065:4066:4067:4068:4069:4070:4071:4072:4073:4074:4075:4076:4077:4078:4079:4080:4081:4082:4083:4084:4085:4086:4087:4096:4097:4098:4099:4100:4101:4102:4103:4104:4105:4106:4107:4108:4109:4110:4111:4112,1,112000,355000,615000,917000,1253000,1595000,2007000,2430000,2868000,3420000,3863000,4504000,4998000,5769000,6321000,7254000,7870000,9015000,9530000,11072000,11848000,13467000,14337000,16243000,17216000,19446000,20781000,23070000,24453000,27568000,29118000,31820000,34125000,37048000,40204000,42972000,45937000,49110000,52696000,57158000,61305000,67167000,72285000,77647000,83624000,91113000,98548000,107630000,119077000,131668000,145518000,160753000,177511000,195944000,216220000,238523000,263056000,290042000,319726000,999999999
+//Job - 3rd Jobs & Baby 3rds, Oboro/Kagerou, & Rebellion
+60,4054:4055:4056:4057:4058:4059:4060:4061:4062:4063:4064:4065:4066:4067:4068:4069:4070:4071:4072:4073:4074:4075:4076:4077:4078:4079:4080:4081:4082:4083:4084:4085:4086:4087:4096:4097:4098:4099:4100:4101:4102:4103:4104:4105:4106:4107:4108:4109:4110:4111:4112:4211:4212:4215:4223:4224:4229,1,112000,355000,615000,917000,1253000,1595000,2007000,2430000,2868000,3420000,3863000,4504000,4998000,5769000,6321000,7254000,7870000,9015000,9530000,11072000,11848000,13467000,14337000,16243000,17216000,19446000,20781000,23070000,24453000,27568000,29118000,31820000,34125000,37048000,40204000,42972000,45937000,49110000,52696000,57158000,61305000,67167000,72285000,77647000,83624000,91113000,98548000,107630000,119077000,131668000,145518000,160753000,177511000,195944000,216220000,238523000,263056000,290042000,319726000,999999999
-//Job - Expanded Super Novice, Expanded Super Baby, Oboro/Kagerou, & Rebellion
-50,4190:4191:4211:4212:4215:4223:4224:4229,1,112000,355000,615000,917000,1253000,1595000,2007000,2430000,2868000,3420000,3863000,4504000,4998000,5769000,6321000,7254000,7870000,9015000,9530000,11072000,11848000,13467000,14337000,16243000,17216000,19446000,20781000,23070000,24453000,27568000,29118000,31820000,34125000,37048000,40204000,42972000,45937000,49110000,52696000,57158000,61305000,67167000,72285000,77647000,83624000,91113000,98548000,107630000,119077000,999999999
+//Job - Expanded Super Novice & Expanded Super Baby
+50,4190:4191,1,112000,355000,615000,917000,1253000,1595000,2007000,2430000,2868000,3420000,3863000,4504000,4998000,5769000,6321000,7254000,7870000,9015000,9530000,11072000,11848000,13467000,14337000,16243000,17216000,19446000,20781000,23070000,24453000,27568000,29118000,31820000,34125000,37048000,40204000,42972000,45937000,49110000,52696000,57158000,61305000,67167000,72285000,77647000,83624000,91113000,98548000,107630000,119077000,999999999
//Job - Ninja/Gunslinger
70,24:25:4222:4228,1,200,300,400,600,700,1000,1200,1400,1700,1900,2400,2700,3200,3600,4200,4900,5500,6100,6900,7700,8400,9300,10100,11100,12100,13000,14600,16100,17500,18600,21500,23300,24700,27000,29000,30000,32400,35000,38100,41100,44000,46700,49600,52500,55600,58900,62700,65500,69200,72300,81200,84100,89300,95500,100900,107800,114900,120700,128600,150500,176900,196100,219600,234200,247900,266400,281300,296600,308000,999999999
diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat
index 212b33238ec..49fe7f2f24b 100644
Binary files a/db/re/map_cache.dat and b/db/re/map_cache.dat differ
diff --git a/db/re/mob_db.txt b/db/re/mob_db.txt
index f88d39a1f8d..f52773927b8 100644
--- a/db/re/mob_db.txt
+++ b/db/re/mob_db.txt
@@ -190,6 +190,7 @@
1184,FABRE_,Fabre,Fabre,1,30,1,1,0,1,4,7,0,0,1,2,1,1,4,5,10,12,0,4,22,0x2003885,400,1672,672,480,0,0,0,0,0,0,0,914,2000,949,250,1502,80,721,2,511,350,705,500,1501,200,0,0,0,0,0,0
1185,WHISPER_,Whisper,Whisper,34,1796,1,483,737,1,198,239,0,45,1,51,14,0,60,0,10,12,0,1,28,0x0,150,1960,960,504,0,0,0,0,0,0,0,1001,10,1059,100,0,0,2333,1,0,0,0,0,0,0,0,0,0,0,0,0
1186,WHISPER_BOSS,Giant Whisper,Giant Whisper,66,2570,0,630,710,1,282,341,94,45,40,79,44,51,67,31,10,12,0,6,48,0x2003695,250,2536,1536,672,0,0,0,0,0,0,0,1001,150,1059,5335,2282,1,2333,10,0,0,0,0,0,0,0,0,0,0,4303,1
+//1187,SWITCH
1188,BON_GUN,Bongun,Bongun,59,2510,1,531,597,1,189,218,88,5,55,24,24,5,34,10,10,12,1,1,29,0x3095,200,1720,500,420,0,0,0,0,0,0,0,1094,5500,7014,40,618,60,5046,1,609,15,508,1000,508,1250,0,0,0,0,4212,1
1189,ORC_ARCHER,Orc Archer,Orc Archer,78,4835,1,922,1161,9,260,303,67,31,55,32,24,30,99,15,10,12,1,7,22,0x3095,300,1960,620,480,0,0,0,0,0,0,0,1063,4656,1753,1000,1756,2500,1755,2500,1734,2,507,1400,509,900,0,0,0,0,4256,1
1190,ORC_LORD,Orc Lord,Orc Lord,55,552000,1,156240,122760,1,780,1428,256,92,95,95,103,96,155,85,10,12,2,7,82,0x6283695,100,1248,500,360,31102,968,5500,617,2000,0,0,1363,400,2621,400,5007,400,1371,400,617,1000,985,4268,16000,100,0,0,0,0,4135,1
@@ -219,6 +220,8 @@
1214,CHOCO,Choco,Choco,48,1080,1,369,414,1,120,167,70,30,40,45,32,19,42,20,10,12,0,2,23,0x3095,150,1028,528,360,0,0,0,0,0,0,0,7011,5335,942,7000,985,53,513,5000,634,20,532,1000,607,25,0,0,0,0,4285,1
1215,STEM_WORM,Stem Worm,Stem Worm,84,4530,1,1080,1215,1,266,307,73,50,55,37,25,47,70,30,10,12,1,3,24,0x3095,300,1956,756,528,0,0,0,0,0,0,0,7012,5335,509,1800,1968,10,756,115,997,5,0,0,608,45,0,0,0,0,4224,1
1216,PENOMENA,Penomena,Penomena,85,4589,1,1116,1556,7,292,333,85,32,76,38,35,35,89,10,10,12,1,5,25,0x3695,400,832,500,600,0,0,0,0,0,0,0,7013,4850,962,8000,938,7000,525,200,719,15,1258,1,716,550,0,0,0,0,4314,1
+//1217,ORC_WARRIOR
+//1218,PECO_EGG
1219,KNIGHT_OF_ABYSS,Knight of Abyss,Abysmal Knight,122,23297,1,4779,4013,1,810,1002,102,50,121,55,68,70,97,37,10,12,2,7,87,0x3695,300,1500,500,1000,0,0,0,0,0,0,0,1064,5335,7023,5,2318,1,1421,25,0,0,985,369,15014,10,0,0,0,0,4140,1
1220,M_DESERT_WOLF,Desert Wolf,Desert Wolf,103,9447,1,349,218,1,254,313,114,47,93,69,63,61,82,42,10,12,1,2,23,0x3695,200,1120,420,288,0,0,0,0,0,0,0,1253,5,7030,5500,2311,1,517,1200,920,2000,756,53,0,0,0,0,0,0,4082,1
1221,M_SAVAGE,Savage,Savage,26,2092,0,321,203,1,146,177,16,5,1,26,54,10,37,10,10,12,2,2,42,0x3695,150,1960,960,384,0,0,0,0,0,0,0,1028,6000,514,150,702,3,2276,2,605,15,757,70,0,0,0,0,0,0,4078,1
@@ -528,7 +531,7 @@
// Event MVP
1502,PORING_V,Pori Pori,Bring it on!,99,95000000,1,78525,25106,1,5000,10000,0,10,100,100,65,100,255,255,10,12,1,3,25,0x6283885,160,1672,672,480,43625,10020,1000,4005,100,2286,200,5035,10000,2344,2500,2346,2500,2350,2500,2348,2500,2655,500,7126,10000,0,0,0,0,2110,4500
-// Nifflheim (7.0)
+// Niflheim (7.0)
1503,GIBBET,Gibbet,Gibbet,105,12999,1,1944,1458,1,536,621,116,45,103,56,62,55,61,37,10,12,2,6,27,0x2003885,180,917,1584,576,0,0,0,0,0,0,0,7212,1800,7218,5335,7222,4074,724,300,716,100,604,10,7939,100,0,0,0,0,4278,1
1504,DULLAHAN,Dullahan,Dullahan,108,18546,1,2509,1977,2,666,741,111,38,121,29,51,43,87,3,10,12,1,1,49,0x3885,155,847,1152,480,0,0,0,0,0,0,0,7209,3200,7210,4850,2614,1,2505,13,2506,1,15039,10,0,0,0,0,0,0,4176,1
1505,LOLI_RURI,Loli Ruri,Loli Ruri,109,15280,1,2790,2093,2,787,1017,53,44,111,50,47,79,79,79,10,12,2,6,87,0x2003885,125,747,1632,576,0,0,0,0,0,0,0,7206,800,7219,3000,7214,5044,985,100,7019,1,2718,5,6246,300,15038,10,0,0,4191,1
@@ -951,12 +954,12 @@
1879,ECLIPSE_P,Eclipse Pet,Eclipse,6,1800,0,0,0,1,20,26,0,40,1,36,6,0,11,80,10,12,1,2,60,0x6203695,200,1456,456,336,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
// Moscovia
-1880,WOOD_GOBLIN,Wood Goblin,Leshij,81,5499,1,1106,1245,1,193,208,144,12,73,19,56,15,56,25,10,12,1,3,62,0x81,320,2304,840,360,0,0,0,0,0,0,0,2719,5,7203,4000,7201,2000,907,2000,916,500,7032,500,574,50,0,0,0,0,0,0
-1881,LES,Les,Lesavka,82,6216,1,1205,1356,1,270,300,123,30,63,20,35,25,52,30,10,12,1,3,82,0x1089,230,1728,720,576,0,0,0,0,0,0,0,7100,2000,511,1000,711,1000,905,2500,2270,1,521,500,510,50,0,0,0,0,0,0
-1882,VAVAYAGA,Baba Yaga,Baba-Yaga,87,6498,1,1188,1337,2,282,353,63,60,69,45,30,60,51,35,10,12,1,7,21,0x3885,270,1536,600,420,0,0,0,0,0,0,0,7099,1000,7762,5000,1630,10,7226,150,539,1500,519,1500,580,1500,0,0,0,0,0,0
-1883,UZHAS,Uzhas,Kikimora,85,7140,1,1294,1455,1,271,306,49,8,69,14,41,30,55,20,10,12,1,7,61,0x3885,200,576,672,384,0,0,0,0,0,0,0,520,900,1573,5,621,100,522,100,918,3500,579,1500,603,3,0,0,0,0,0,0
-1884,MAVKA,Mavka,Mavka,84,5421,1,1253,1530,7,263,323,98,58,65,31,50,35,81,30,10,12,1,3,62,0x3885,170,1536,504,360,0,0,0,0,0,0,0,1572,5,629,300,707,300,710,50,747,1500,748,300,510,3000,0,0,0,0,0,0
-1885,GOPINICH,Gopinich,Gopinich,97,1120500,1,714240,580320,3,1988,3849,355,121,127,102,143,102,152,76,10,12,2,2,62,0x6283695,150,1536,864,432,357120,607,5500,617,5000,617,5000,617,4000,2621,200,12080,1000,1737,100,1417,5,7444,5000,5007,1,0,0,0,0,0,0
+1880,WOOD_GOBLIN,Wood Goblin,Leshij,81,5499,1,1106,1245,1,193,208,144,12,73,19,56,15,56,25,10,12,1,3,62,0x81,320,2304,840,360,0,0,0,0,0,0,0,2719,5,7203,4000,7201,2000,907,2000,916,500,7032,500,574,50,0,0,0,0,27157,1
+1881,LES,Les,Lesavka,82,6216,1,1205,1356,1,270,300,123,30,63,20,35,25,52,30,10,12,1,3,82,0x1089,230,1728,720,576,0,0,0,0,0,0,0,7100,2000,511,1000,711,1000,905,2500,2270,1,521,500,510,50,0,0,0,0,27158,1
+1882,VAVAYAGA,Baba Yaga,Baba-Yaga,87,6498,1,1188,1337,2,282,353,63,60,69,45,30,60,51,35,10,12,1,7,21,0x3885,270,1536,600,420,0,0,0,0,0,0,0,7099,1000,7762,5000,1630,10,7226,150,539,1500,519,1500,580,1500,0,0,0,0,27160,1
+1883,UZHAS,Uzhas,Kikimora,85,7140,1,1294,1455,1,271,306,49,8,69,14,41,30,55,20,10,12,1,7,61,0x3885,200,576,672,384,0,0,0,0,0,0,0,520,900,1573,5,621,100,522,100,918,3500,579,1500,603,3,0,0,0,0,27159,1
+1884,MAVKA,Mavka,Mavka,84,5421,1,1253,1530,7,263,323,98,58,65,31,50,35,81,30,10,12,1,3,62,0x3885,170,1536,504,360,0,0,0,0,0,0,0,1572,5,629,300,707,300,710,50,747,1500,748,300,510,3000,0,0,0,0,27161,1
+1885,GOPINICH,Gopinich,Gopinich,97,1120500,1,714240,580320,3,1988,3849,355,121,127,102,143,102,152,76,10,12,2,2,62,0x6283695,150,1536,864,432,357120,607,5500,617,5000,617,5000,617,4000,2621,200,12080,1000,1737,100,1417,5,7444,5000,5007,1,0,0,0,0,27162,1
1886,G_MAVKA,Mavka,Mavka,84,5421,1,0,0,7,263,323,98,58,65,31,50,35,81,30,10,12,1,3,62,0x3885,170,1536,504,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
// Additional Monsters
@@ -1558,12 +1561,12 @@
2405,WEAK_SKELETON,Weak Skeleton,Weak Skeleton,18,280,1,58,43,1,25,33,12,2,15,5,10,0,12,0,10,12,1,1,29,0x91,200,2228,576,528,0,0,0,0,0,0,0,1010,45,932,800,1505,40,909,1500,507,500,2609,15,0,0,0,0,0,0,0,0
2406,WEAK_SKEL_SOLDIER,Weak Soldier Skeleton,Weak Soldier Skeleton,23,468,1,72,81,1,66,75,28,5,18,9,28,5,43,5,10,12,1,1,29,0x3885,200,2276,432,576,0,0,0,0,0,0,0,932,1300,756,15,1214,3,507,170,934,2,2315,1,1216,10,0,0,0,0,0,0
2407,SAILOR_SKELETON,Sailor Skeleton,Sailor Skeleton,19,310,1,58,43,1,27,35,12,2,15,5,10,0,12,0,10,12,1,1,29,0x3885,200,2228,576,528,0,0,0,0,0,0,0,932,700,2287,4,7477,1,2211,60,1104,60,756,10,628,5,0,0,0,0,0,0
-2408,DUMMY_10,Dummy 10,Dummy 10,10,99999999,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,200,1,0,20,0x200000,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2409,DUMMY_50,Dummy 50,Dummy 50,50,99999999,1,0,0,0,0,0,50,50,0,0,0,0,0,0,0,200,1,0,20,0x200000,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2410,DUMMY_100,Dummy 100,Dummy 100,100,99999999,1,0,0,0,0,0,90,90,0,0,0,0,0,0,0,200,1,0,20,0x200000,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2411,DUMMY_150,Dummy 150,Dummy 150,150,99999999,1,0,0,0,0,0,120,120,0,0,0,0,0,0,0,200,1,0,20,0x200000,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2408,DUMMY_10,Dummy 10,Dummy 10,10,99999999,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,20,0x4680020,200,0,0,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2409,DUMMY_50,Dummy 50,Dummy 50,50,99999999,1,0,0,0,0,0,50,50,0,0,0,0,0,0,0,0,1,0,20,0x4680020,200,0,0,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2410,DUMMY_100,Dummy 100,Dummy 100,100,99999999,1,0,0,0,0,0,90,90,0,0,0,0,0,0,0,0,1,0,20,0x4680020,200,0,0,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2411,DUMMY_150,Dummy 150,Dummy 150,150,99999999,1,0,0,0,0,0,120,120,0,0,0,0,0,0,0,0,1,0,20,0x4680020,200,0,0,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
//2412,E_VALKIWI
-2413,DUMMY_10_FIRE,Dummy 10,Dummy 10,10,99999999,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,200,1,0,23,0x0,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2413,DUMMY_10_FIRE,Dummy 10,Dummy 10,10,99999999,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,23,0x4680020,200,0,0,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
//2414,RUNAWAY_BOOK
2415,L_SEYREN,Knight Seyren,Knight Seyren,98,13260,1,2950,1974,1,827,1112,149,10,127,62,77,44,118,49,10,12,1,7,63,0x3885,150,432,400,288,0,0,0,0,0,0,0,7345,5000,7347,2500,1163,100,1164,5,2314,500,2315,5,603,2,0,0,0,0,0,0
@@ -1616,20 +1619,20 @@
2462,TREASURE_BOX_TE_10,Treasure Chest,Treasure Chest,99,0,1,0,0,0,0,0,0,0,0,0,0,0,1199,0,0,0,0,0,20,0x1000000,0,0,0,0,0,0,0,0,0,0,0,6600,40,658,500,7444,10000,7444,10000,12399,5000,0,0,616,400,12399,500,0,0,0,0
//2463,E_BOMBPORING
-// Old Glast Heim (currently placeholders)
-2464,MG_ZOMBIE,Zombie,Zombie,17,9340,1,117,87,1,38,50,20,3,15,8,17,0,15,0,10,12,1,1,29,0x3885,400,2612,912,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2465,MG_WRAITH,Wraith,Wraith,77,23168,1,1190,1191,1,335,396,80,40,62,26,30,55,76,5,10,12,2,1,89,0x3695,300,1816,576,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2466,MG_GHOUL,Ghoul,Ghoul,61,12614,1,583,656,1,216,245,78,5,56,12,19,11,27,10,10,12,1,1,49,0x3885,250,2456,912,504,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2467,MG_ARCLOUSE,Arclouse,Arclouze,107,14020,1,1844,2607,1,269,309,101,36,60,73,45,35,140,15,10,12,1,4,42,0x2003095,100,960,500,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2468,MG_RAYDRIC,Raydric,Raydric,115,25408,1,20770,2076,1,572,668,89,15,129,87,55,32,76,27,10,12,2,7,47,0x3095,150,824,780,420,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2469,MG_RAYDRIC_ARCHER,Raydric Archer,Raydric Archer,82,30370,1,1049,1332,9,377,395,63,40,53,24,40,15,112,30,10,12,1,6,47,0x2002085,200,1152,1152,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2470,MG_KNIGHT_OF_ABYSS,Knight of Abyss,Abysmal Knight,122,332970,1,4779,4013,1,810,1002,102,50,121,55,68,70,97,37,10,12,2,7,87,0x3695,300,1500,500,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2471,MG_KHALITZBURG,Khalitzburg,Khalitzburg,118,109860,1,2862,2147,1,737,833,125,10,121,48,40,31,89,32,10,12,2,1,29,0x3695,350,528,1000,396,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2472,MG_BLOODY_KNIGHT,Bloody Knight,Bloody Knight,116,285000,1,7348,6511,3,942,1065,122,50,132,59,70,57,98,45,10,12,2,0,87,0x3695,250,828,528,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2473,MG_M_UNDEAD_KNIGHT,Undead Knight,Undead Knight,133,500000,0,4500,3375,2,751,880,122,62,122,87,54,65,103,65,14,16,2,7,80,0x6203695,170,140,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2474,MG_F_UNDEAD_KNIGHT,Undead Knight,Undead Knight,133,500000,0,4500,3375,2,751,880,122,62,122,87,54,65,103,65,14,16,2,7,80,0x6203695,170,140,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2475,MG_CORRUPTION_ROOT,Root of Corruption,Root of Corruption,136,3190000,1,240120,187920,3,710,1762,213,123,86,89,120,131,101,92,14,12,2,7,62,0x6280084,170,854,2016,480,120060,607,5500,608,3500,732,5500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4603,1
-2476,MG_AMDARAIS,Amdarias,Amdarias,143,3283990,1,74288,77950,2,8860,10022,32,66,140,159,30,109,300,90,10,12,2,2,63,0x6283695,200,1152,1152,576,37144,617,5500,617,5000,616,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4601,1
+// Old Glast Heim
+2464,MG_ZOMBIE,Corrupted Steward,Corrupted Steward,130,135600,1,13332,15998,1,2364,2808,15,15,44,22,77,25,88,22,10,12,1,1,29,0x3885,400,2612,912,288,0,0,0,0,0,0,0,6609,1000,6610,1000,6608,10,938,1000,727,500,0,0,0,0,0,0,0,0,0,0
+2465,MG_WRAITH,Corrupted Monk,Corrupted Monk,133,100168,1,13998,16796,1,999,3786,80,200,16,26,30,115,79,5,10,12,2,1,89,0x3695,350,1816,576,240,0,0,0,0,0,0,0,6609,1000,6610,1000,6608,10,2206,100,731,100,747,500,0,0,0,0,0,0,0,0
+2466,MG_GHOUL,Grand Chamberlain in pain,Grand Chamberlain in pain,132,208100,1,14222,17066,1,2965,3631,30,30,88,44,88,21,95,44,10,12,1,1,49,0x3885,300,2456,912,504,0,0,0,0,0,0,0,6609,1000,6610,1000,6608,10,756,100,2609,100,7751,1000,0,0,0,0,0,0,0,0
+2467,MG_ARCLOUSE,Maggot,Maggot,133,80811,1,22,26,1,1246,2503,121,36,60,103,45,35,172,15,10,12,0,4,42,0x2003095,100,960,500,480,0,0,0,0,0,0,0,6609,1000,6610,1000,6608,10,1096,3000,997,100,0,0,0,0,0,0,0,0,0,0
+2468,MG_RAYDRIC,Corrupted Palace Guard,Corrupted Palace Guard,135,184080,1,16306,6944,2,3167,3305,89,15,159,87,66,33,106,27,10,12,1,1,47,0x3095,150,824,780,420,0,0,0,0,0,0,0,6609,1000,6610,1000,6608,10,7054,3000,985,50,2316,200,0,0,0,0,0,0,0,0
+2469,MG_RAYDRIC_ARCHER,Wandering Archer,Wandering Archer,136,144370,1,14248,9378,14,3891,4058,63,40,53,24,40,15,156,30,10,12,1,1,47,0x2002085,200,1152,1152,480,0,0,0,0,0,0,0,6609,1000,6610,1000,6608,10,7054,3000,985,50,2330,200,0,0,0,0,0,0,0,0
+2470,MG_KNIGHT_OF_ABYSS,Corrupted Knight of Abyss,Corrupted Abysmal Knight,142,225789,1,18584,16576,2,3200,3322,102,50,121,55,99,70,126,37,10,12,2,1,87,0x6203695,300,1000,500,1000,0,0,0,0,0,0,0,6609,3000,6610,2000,6608,50,1064,5000,1004,10,2341,200,0,0,0,0,0,0,0,0
+2471,MG_KHALITZBURG,Suffering Khalitzburg,Suffering Khalitzburg,143,236851,1,17542,14662,2,2800,2900,125,10,121,142,55,81,105,32,10,12,2,1,29,0x6203695,350,0,1000,396,0,0,0,0,0,0,0,6609,3000,6610,2000,6608,50,985,50,1004,10,1110,300,0,0,0,0,0,0,0,0
+2472,MG_BLOODY_KNIGHT,Bloody Knight,Bloody Knight,143,246751,1,20448,21882,2,1881,5081,122,300,132,55,89,151,137,45,10,12,2,1,87,0x6203695,250,828,528,192,0,0,0,0,0,0,0,6609,3000,6610,2000,6608,50,7054,5000,1160,100,1157,100,0,0,0,0,0,0,0,0
+2473,MG_M_UNDEAD_KNIGHT,1st Commander of Destruction,1st Commander of Destruction,145,950033,1,160018,135184,2,3321,4330,80,150,165,82,110,122,154,52,10,12,1,1,49,0x6203695,130,350,864,480,0,0,0,0,0,0,0,6609,5000,6610,5000,6608,50,1191,10,1163,100,1463,200,0,0,0,0,0,0,4605,1
+2474,MG_F_UNDEAD_KNIGHT,2nd Commander of Destruction,2nd Commander of Destruction,145,848011,1,159672,120398,2,3090,4578,80,180,155,88,110,135,154,59,10,12,1,1,49,0x6203695,120,350,768,480,0,0,0,0,0,0,0,6609,5000,6610,5000,6608,50,1163,100,1145,50,0,0,0,0,0,0,0,0,4606,1
+2475,MG_CORRUPTION_ROOT,Corrupted Soul,Corrupted Soul,150,1820000,1,2199906,2008478,3,3887,7774,333,333,201,20,90,201,201,20,10,12,2,6,62,0x6280084,2000,576,672,480,0,0,0,0,0,0,0,616,5000,617,10000,6607,5000,607,10000,2854,1000,7566,10000,0,0,0,0,0,0,4603,1
+2476,MG_AMDARAIS,Amdarias,Amdarias,150,4290000,1,2291324,2197024,3,5290,9190,30,40,255,39,90,169,166,20,10,12,2,1,89,0x6283695,120,312,1200,432,0,0,0,0,0,0,0,616,5000,617,10000,6607,5000,607,10000,1186,1000,1004,10000,0,0,0,0,0,0,4601,1
2477,NG_WANDER_MAN,Nightmare Wander Man,Nightmare Wander Man,151,130682,1,19814,17228,2,2827,3045,129,16,208,151,76,39,231,50,12,12,1,6,24,0x2003695,100,672,500,192,0,0,0,0,0,0,0,7005,4850,616,2,13015,5,2270,5,21003,1,984,110,1164,10,0,0,0,0,0,0
2478,NG_RIDEWORD,Nightmare Rideword,Nightmare Rideword,146,103220,1,10500,15840,1,2320,2486,140,59,131,195,58,66,263,5,12,12,0,0,60,0x3695,150,864,500,192,0,0,0,0,0,0,0,1097,4850,1568,5,1569,5,1570,5,1571,5,7015,150,18752,1,0,0,0,0,0,0
@@ -1682,9 +1685,9 @@
//2525,WATERMELON_16
//2526,E_BANDIT
//2527,ME_ANOPHELES
-2528,FACEWORM,Faceworm,Faceworm,140,482427,1,38800,3960,2,1818,727,50,30,100,50,100,100,100,50,10,12,2,4,25,0x2000085,200,384,720,480,0,0,0,0,0,0,0,971,100,22507,100,0,0,0,0,0,0,0,0,13089,10,7326,1000,972,100,0,0
-2529,FACEWORM_QUEEN,Faceworm Queen,Faceworm Queen,155,50000000,1,200000,200000,2,4024,1609,100,60,200,100,200,200,200,100,10,12,2,4,85,0x6283695,200,768,540,480,90909,0,0,617,2500,12246,2500,607,1000,0,0,0,0,0,0,0,0,13090,100,0,0,6649,5000,0,0,0,0
-2530,FACEWORM_DARK,Faceworm Dark,Dark Faceworm,144,5000000,1,100000,80000,2,2012,805,100,30,150,100,150,150,150,100,10,12,2,4,45,0x6283695,180,576,480,480,0,0,0,0,0,0,0,13089,10,22507,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2528,FACEWORM,Faceworm,Faceworm,140,482427,1,38800,3960,2,1818,727,50,30,100,50,100,100,100,50,10,12,2,4,25,0x2000085,200,384,720,480,0,0,0,0,0,0,0,971,100,22507,100,0,0,0,0,0,0,0,0,13089,10,7326,1000,972,100,27163,1
+2529,FACEWORM_QUEEN,Faceworm Queen,Faceworm Queen,155,50000000,1,200000,200000,2,4024,1609,100,60,200,100,200,200,200,100,10,12,2,4,85,0x6283695,200,768,540,480,90909,0,0,617,2500,12246,2500,607,1000,0,0,0,0,0,0,0,0,13090,100,0,0,6649,5000,0,0,27164,1
+2530,FACEWORM_DARK,Faceworm Dark,Dark Faceworm,144,5000000,1,100000,80000,2,2012,805,100,30,150,100,150,150,150,100,10,12,2,4,45,0x6283695,180,576,480,480,0,0,0,0,0,0,0,13089,10,22507,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27165,1
2531,VENOM_BUG,Venom Bug,Venom Bug,140,10000,1,0,0,1,340,0,200,100,200,200,200,200,200,200,12,12,0,4,25,0x2200084,2000,384,0,480,0,0,0,0,0,0,0,938,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7326,1000,0,0
2532,FACEWORM_QUEEN_R,Faceworm Queen (Red),Red Faceworm Queen,155,50000000,1,200000,200000,2,12000,4800,400,400,500,100,200,200,200,100,10,12,2,4,23,0x6283695,200,768,540,480,90909,12246,2500,617,2500,0,0,994,5000,0,0,0,0,0,0,0,0,13090,100,0,0,6649,5000,0,0,0,0
2533,FACEWORM_QUEEN_G,Faceworm Queen (Green),Green Faceworm Queen,155,50000000,1,200000,200000,2,5000,2000,500,60,200,100,400,200,200,100,10,12,2,4,22,0x6283695,200,768,540,480,90909,617,2500,12246,2500,0,0,6649,5000,13090,100,997,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -1694,30 +1697,30 @@
2537,HIDDEN_MOB4,Hidden Mob 4,Monster 4,151,10000,200,0,0,1,2000,0,200,100,100,100,100,100,100,100,12,12,0,0,88,0x0370084,2000,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
//2538,E_KING_PORING
2539,HIDDEN_MOB5,Hidden Mob 5,Monster 5,151,10000,200,0,0,9,500,0,200,100,100,100,100,100,100,100,12,12,0,0,88,0x2370084,2000,0,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2540,FACEWORM_EGG,Faceworm Egg,Faceworm Egg,140,10,1,10,12,1,150,150,10,10,10,10,10,10,10,10,10,12,1,4,25,0x2370000,150,24,0,0,0,0,0,0,0,0,0,7032,5000,938,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2541,FACEWORM_LARVA,Faceworm Larva,Faceworm Larva,145,260380,1,10,12,1,1286,1851,10,10,10,50,50,50,180,50,10,12,1,4,45,0x2000085,150,1000,792,336,0,0,0,0,0,0,0,912,225,0,0,0,0,0,0,0,0,0,0,1096,1750,943,400,938,1500,0,0
-2542,IRENE_ELDER,Irene Elder,Doyen Irene,101,433110,1,11360,27032,1,1749,2281,145,73,82,36,55,100,182,88,10,12,1,7,20,102774421,170,73,384,288,0,0,0,0,0,0,0,12072,100,12082,100,12087,100,12077,100,12092,100,12097,100,7481,1,12129,1,0,0,0,0
-2543,PAYONSOLDIER,1st Payon Soldier,1st Payon Soldier,101,20099,1,1083,2688,1,545,596,66,36,20,46,35,35,64,30,10,12,1,7,20,0x3095,225,73,348,288,0,0,0,0,0,0,0,12054,533,12044,533,12059,533,12069,533,12049,533,12127,266,12064,533,7479,1,0,0,0,0
-2544,PAYONSOLDIER2,2nd Payon Soldier,2nd Payon Soldier,101,21099,1,1136,2703,1,697,748,66,36,20,46,25,35,64,30,10,12,1,7,20,0x3095,200,73,348,288,0,0,0,0,0,0,0,12071,400,12076,400,12091,400,12081,400,12096,400,12086,400,12128,133,7480,1,0,0,0,0
+2540,FACEWORM_EGG,Faceworm Egg,Faceworm Egg,140,10,1,10,12,1,150,150,10,10,10,10,10,10,10,10,10,12,1,4,25,0x2370000,150,24,0,0,0,0,0,0,0,0,0,7032,5000,938,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27166,1
+2541,FACEWORM_LARVA,Faceworm Larva,Faceworm Larva,145,260380,1,10,12,1,1286,1851,10,10,10,50,50,50,180,50,10,12,1,4,45,0x2000085,150,1000,792,336,0,0,0,0,0,0,0,912,225,0,0,0,0,0,0,0,0,0,0,1096,1750,943,400,938,1500,27167,1
+2542,IRENE_ELDER,Irene Elder,Doyen Irene,101,433110,1,11360,27032,1,1749,2281,145,73,82,36,55,100,182,88,10,12,1,7,20,102774421,170,73,384,288,0,0,0,0,0,0,0,12072,100,12082,100,12087,100,12077,100,12092,100,12097,100,7481,1,12129,1,0,0,27168,1
+2543,PAYONSOLDIER,1st Payon Soldier,1st Payon Soldier,101,20099,1,1083,2688,1,545,596,66,36,20,46,35,35,64,30,10,12,1,7,20,0x3095,225,73,348,288,0,0,0,0,0,0,0,12054,533,12044,533,12059,533,12069,533,12049,533,12127,266,12064,533,7479,1,0,0,27169,1
+2544,PAYONSOLDIER2,2nd Payon Soldier,2nd Payon Soldier,101,21099,1,1136,2703,1,697,748,66,36,20,46,25,35,64,30,10,12,1,7,20,0x3095,200,73,348,288,0,0,0,0,0,0,0,12071,400,12076,400,12091,400,12081,400,12096,400,12086,400,12128,133,7480,1,0,0,27169,1
2545,GUARDDOG,1st Guard Dog,1st Guard Dog,101,20099,1,944,2658,1,546,598,66,36,20,46,25,35,64,30,10,12,1,2,22,0x3091,150,73,348,288,0,0,0,0,0,0,0,12043,600,12068,600,7477,1,12048,600,12053,600,12058,600,12063,600,12125,333,0,0,0,0
2546,GUARDDOG2,2nd Guard Dog,2nd Guard Dog,101,21099,1,1014,2673,1,573,229,66,36,20,46,25,35,64,30,10,12,1,2,23,0x3095,120,73,348,288,0,0,0,0,0,0,0,12045,466,7478,1,12050,466,12055,466,12060,466,12065,466,12070,466,12126,200,0,0,0,0
//2547,MER_GARM_BABY
//2548,MER_HILLSRION
-2549,GEFFEN_MAGE_1,Arhi,Arhi,90,100000,1,8900,4550,1,329,424,64,38,50,50,50,50,130,50,10,12,1,7,20,0x85,200,1000,864,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2550,GEFFEN_MAGE_2,Dio Anemos,Dio Anemos,95,200000,1,9440,4430,1,478,649,129,18,40,40,50,80,130,60,10,12,1,7,20,0x85,200,900,672,480,0,0,0,0,0,0,0,1095,10000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2551,GEFFEN_MAGE_3_1,Geffen Shoplifter,Geffen Shoplifter,100,300000,1,9780,3665,1,478,632,93,36,70,70,40,40,140,60,10,12,1,7,20,0x85,200,800,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2552,GEFFEN_MAGE_3_2,Geffen Bully,Geffen Bully,100,300000,1,9780,3665,1,478,632,93,36,70,50,70,40,140,40,10,12,1,7,20,0x85,200,900,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2553,GEFFEN_MAGE_3_3,Geffen Gang Member,Geffen Gang Member,100,300000,1,9780,3665,1,468,622,93,36,60,80,30,30,140,70,10,12,1,7,20,0x85,200,950,864,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2554,GEFFEN_MAGE_4,Faymont,Faymont,105,400000,1,11660,4370,1,477,633,114,21,60,60,60,60,140,60,10,12,1,7,20,0x85,200,672,648,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2555,GEFFEN_MAGE_5,Ordre,Ordre,110,600000,1,15610,4861,1,654,906,107,21,40,70,40,100,150,60,10,12,1,7,20,0x85,200,768,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2556,GEFFEN_MAGE_6,Blut Hase,Blut Hase,120,1000000,1,20560,10010,1,480,601,66,47,120,120,120,50,150,60,10,12,1,7,48,0x85,200,800,768,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2557,GEFFEN_MAGE_7,Kuro Akuma,Kuro Akuma,130,1200000,1,26100,12030,1,761,1026,135,10,100,100,100,100,145,100,10,12,1,7,20,0x85,200,1000,864,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2558,GEFFEN_MAGE_8,Ifodes,Ifodes,140,1400000,1,46150,18900,1,676,869,120,60,150,100,100,50,170,100,10,12,1,7,20,0x85,200,800,768,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2559,GEFFEN_MAGE_9,Licheniyes,Licheniyes,145,1600000,1,52060,24105,1,763,1048,140,57,50,100,50,200,220,75,10,12,1,7,20,0x85,200,864,768,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2560,GEFFEN_MAGE_10,Odoric,Odoric,150,2000000,1,60027,40237,1,950,1250,165,62,200,150,50,50,170,100,10,12,1,7,20,0x85,200,800,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2561,GEFFEN_MAGE_11,Ju,Ju,155,5000000,1,75335,52130,1,1045,1465,170,65,50,100,100,200,220,100,10,12,1,7,20,0x85,200,800,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2562,GEFFEN_MAGE_12,Dwigh,Dwigh,160,7000000,1,151317,123000,1,1410,2010,175,65,50,100,100,250,220,100,10,12,1,7,48,0x6200085,200,800,768,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2563,FEI_KANABIAN,Fei Kanabian,Fay Kanavian,160,8000000,1,157975,110571,1,1710,2460,175,65,50,100,100,250,220,100,10,12,1,7,48,0x6200085,200,720,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2549,GEFFEN_MAGE_1,Arhi,Arhi,90,100000,1,8900,4550,1,329,424,64,38,50,50,50,50,130,50,10,12,1,7,20,0x85,200,1000,864,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27249,1
+2550,GEFFEN_MAGE_2,Dio Anemos,Dio Anemos,95,200000,1,9440,4430,1,478,649,129,18,40,40,50,80,130,60,10,12,1,7,20,0x85,200,900,672,480,0,0,0,0,0,0,0,1095,10000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27250,1
+2551,GEFFEN_MAGE_3_1,Geffen Shoplifter,Geffen Shoplifter,100,300000,1,9780,3665,1,478,632,93,36,70,70,40,40,140,60,10,12,1,7,20,0x85,200,800,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27253,1
+2552,GEFFEN_MAGE_3_2,Geffen Bully,Geffen Bully,100,300000,1,9780,3665,1,478,632,93,36,70,50,70,40,140,40,10,12,1,7,20,0x85,200,900,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27252,1
+2553,GEFFEN_MAGE_3_3,Geffen Gang Member,Geffen Gang Member,100,300000,1,9780,3665,1,468,622,93,36,60,80,30,30,140,70,10,12,1,7,20,0x85,200,950,864,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27251,1
+2554,GEFFEN_MAGE_4,Faymont,Faymont,105,400000,1,11660,4370,1,477,633,114,21,60,60,60,60,140,60,10,12,1,7,20,0x85,200,672,648,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27254,1
+2555,GEFFEN_MAGE_5,Ordre,Ordre,110,600000,1,15610,4861,1,654,906,107,21,40,70,40,100,150,60,10,12,1,7,20,0x85,200,768,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27255,1
+2556,GEFFEN_MAGE_6,Blut Hase,Blut Hase,120,1000000,1,20560,10010,1,480,601,66,47,120,120,120,50,150,60,10,12,1,7,48,0x85,200,800,768,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27256,1
+2557,GEFFEN_MAGE_7,Kuro Akuma,Kuro Akuma,130,1200000,1,26100,12030,1,761,1026,135,10,100,100,100,100,145,100,10,12,1,7,20,0x85,200,1000,864,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27257,1
+2558,GEFFEN_MAGE_8,Ifodes,Ifodes,140,1400000,1,46150,18900,1,676,869,120,60,150,100,100,50,170,100,10,12,1,7,20,0x85,200,800,768,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27258,1
+2559,GEFFEN_MAGE_9,Licheniyes,Licheniyes,145,1600000,1,52060,24105,1,763,1048,140,57,50,100,50,200,220,75,10,12,1,7,20,0x85,200,864,768,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27259,1
+2560,GEFFEN_MAGE_10,Odoric,Odoric,150,2000000,1,60027,40237,1,950,1250,165,62,200,150,50,50,170,100,10,12,1,7,20,0x85,200,800,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27260,1
+2561,GEFFEN_MAGE_11,Ju,Ju,155,5000000,1,75335,52130,1,1045,1465,170,65,50,100,100,200,220,100,10,12,1,7,20,0x85,200,800,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27261,1
+2562,GEFFEN_MAGE_12,Dwigh,Dwigh,160,7000000,1,151317,123000,1,1410,2010,175,65,50,100,100,250,220,100,10,12,1,7,48,0x6200085,200,800,768,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27262,1
+2563,FEI_KANABIAN,Fei Kanabian,Fay Kanavian,160,8000000,1,157975,110571,1,1710,2460,175,65,50,100,100,250,220,100,10,12,1,7,48,0x6200085,200,720,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27263,1
2564,GEFFEN_FENRIR,Geffen Fenrir,Fenrir,160,20000000,1,323300,300000,1,2160,3060,200,70,200,100,200,200,220,100,10,12,1,7,48,0x6200085,200,900,864,480,0,0,0,0,0,0,0,22511,100,22511,100,22511,100,22511,100,22511,100,22511,100,0,0,0,0,0,0,4556,1
2565,ALPHONSE,Alphonse,Alphonse,150,1000000,1,0,0,1,650,850,100,20,100,100,50,50,170,100,10,12,1,7,42,0x85,200,1400,816,396,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
2566,ALPHONSE_JR,Alphonse Jr,Alphonse Jr,150,100000,1,0,0,1,450,550,80,20,100,100,50,50,170,100,10,12,1,7,62,0x85,200,936,792,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -2102,20 +2105,20 @@
//2945,J_MUMMY
//2946,J_ANUBIS
//2947,J_EGGYRA
-//2948,CURSED_SOLDIER
-//2949,CURSED_SENTINEL
-//2950,BROKEN_MIND
-//2951,FLOATING_WORD
-//2952,LIKE_LOVE
-//2953,CURSED_MEMORY
-//2954,COLORLESS_VOW
-//2955,OLD_FRIENDSHIP
-//2956,SWEET_SLAUGHTER
-//2957,FORGOTTEN_NAME
-//2958,FATAL_DAYS
-//2959,TORTUROUS_REDEEMER
+2948,CURSED_SOLDIER,Cursed Soldier,Cursed Soldier,110,18574,1,1907,1851,9,1258,1791,85,35,81,50,64,56,178,23,10,12,1,1,69,0x3885,150,1960,576,420,0,0,0,0,0,0,0,6672,1000,957,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2949,CURSED_SENTINEL,Cursed Sentinel,Cursed Sentinel,110,14099,1,1634,1346,2,1347,1906,84,41,120,65,66,41,107,26,10,12,2,7,67,0x3885,175,914,1344,384,0,0,0,0,0,0,0,6672,1000,934,2500,1097,1500,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2950,BROKEN_MIND,Broken Mind,Broken Mind,110,13520,1,1545,1557,1,1259,1799,67,27,69,37,36,10,64,5,10,12,1,6,67,0x2003885,200,920,720,200,0,0,0,0,0,0,0,6672,1000,6086,2500,683,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2951,FLOATING_WORD,Floating Word,Floating Word,110,11276,1,1166,1034,1,1080,1509,93,40,111,90,60,70,139,65,10,12,0,6,68,0x2003885,150,972,648,432,0,0,0,0,0,0,0,6672,1000,938,3000,947,2500,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2952,LIKE_LOVE,Like Love,Like Love,110,14008,1,1505,1667,2,1182,1183,64,51,62,27,25,55,102,20,10,12,1,6,64,0x2003885,150,1056,1056,336,0,0,0,0,0,0,0,6672,1000,929,2500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2953,CURSED_MEMORY,Cursed Memory,Cursed Memory,110,18045,1,1802,1623,1,1310,1867,89,28,87,39,58,5,82,10,10,12,1,1,69,0x3885,350,1768,500,192,0,0,0,0,0,0,0,6672,1000,957,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2954,COLORLESS_VOW,Colorless Vow,Colorless Vow,110,19194,0,1939,1881,1,1478,2121,95,41,84,35,60,20,85,15,10,12,1,1,69,0x3885,350,0,500,0,0,0,0,0,0,0,0,6672,1000,958,3500,1063,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2955,OLD_FRIENDSHIP,Old Friendship,Old Friendship,110,12614,0,1306,1328,0,1147,1638,78,5,56,12,19,11,30,10,10,12,1,1,49,0x3885,250,2460,912,0,0,0,0,0,0,0,0,6672,1000,932,3500,1098,2500,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2956,SWEET_SLAUGHTER,Sweet Slaughter,Sweet Slaughter,110,13986,0,1960,1587,0,1216,1709,125,10,121,48,40,31,125,32,10,12,2,1,29,0x3885,350,1538,1000,396,0,0,0,0,0,0,0,6672,1000,929,2000,682,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2957,FORGOTTEN_NAME,Forgotten Name,Forgotten Name,120,19546,1,1505,1485,2,1093,1520,111,38,121,29,51,43,100,3,10,12,1,1,49,0x3885,155,1169,1152,480,0,0,0,0,0,0,0,6672,1500,682,5000,683,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2958,FATAL_DAYS,Fatal Days,Fatal Days,120,24240,1,2052,2026,2,1025,1428,72,15,100,71,63,85,115,37,10,12,1,6,67,0x2003885,190,720,384,480,0,0,0,0,0,0,0,6672,1500,1050,2500,1038,2500,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2959,TORTUROUS_REDEEMER,Torturous Redeemer,Torturous Redeemer,120,103342,0,10590,8378,0,1253,1753,144,28,133,69,72,55,165,44,10,12,1,7,62,0x3885,200,672,420,360,0,0,0,0,0,0,0,6672,10000,6672,10000,923,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0
//2960,MM_FLAMECROSS
-//2961,E_TORTUROUS_REDEEMER
+2961,E_TORTUROUS_REDEEMER,Torturous Redeemer,Torturous Redeemer,120,103342,1,10590,8378,1,1253,1753,144,28,133,69,72,55,165,44,10,12,1,7,62,0x3885,200,672,420,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
//2962,E_DEVILING
//2963,WOODIE
//2964,EXP_1000
@@ -2174,15 +2177,15 @@
//3017,EP14_3_DEATH_C_MOB2
//3018,EP14_3_DEATH_C_MOB3
//3019,CELINE_KIMI
-//3020,FIRE_CONDOR
-//3021,FIRE_SAND_MAN
-//3022,FIRE_FRILLDORA
-//3023,FIRE_GOLEM
+3020,FIRE_CONDOR,Fire Condor,Fire Condor,141,125114,1,7021,7481,1,1364,2565,71,45,104,72,66,10,113,52,10,12,1,2,43,0x0000081,110,1148,648,480,0,0,0,0,0,0,0,6691,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3021,FIRE_SAND_MAN,Fire Sand Man,Fire Sandman,143,130501,1,7207,7734,1,1404,2760,122,73,84,36,25,55,124,35,10,12,1,0,63,0x003885,150,1672,720,288,0,0,0,0,0,0,0,6694,1500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3022,FIRE_FRILLDORA,Fire Frilldora,Fire Frilldora,147,141301,1,7807,8199,1,1511,2903,134,40,148,38,128,45,121,30,10,12,1,2,63,0x0000081,130,1540,720,432,0,0,0,0,0,0,0,6694,1500,6696,1500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3023,FIRE_GOLEM,Fire Golem,Fire Golem,148,180213,1,8912,9464,1,1478,2799,292,102,70,78,267,25,84,25,10,12,2,0,83,0x003885,200,1608,816,396,0,0,0,0,0,0,0,6693,2000,6695,1500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
//3024,14_3_MERCENARY_A
//3025,14_3_MERCENARY_B
-//3026,FIREPIT
-//3027,FULBUK
-//3028,SONIA
+3026,FIREPIT,Fire Pit,Fire Pit,17,10,1,58,43,1,38,50,20,3,15,8,17,0,15,0,10,12,1,1,29,0x170000,400,2612,912,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3027,FULBUK,Fire Bug,Fire Bug,150,234,1,58,47,1,38,50,20,3,15,8,17,0,15,0,10,12,1,1,29,0x0000001,120,1288,288,768,0,0,0,0,0,0,0,6689,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3028,SONIA,Sonia,Sonia,17,20,1,58,43,1,38,50,20,3,15,8,17,0,15,0,10,12,1,1,29,0x170000,400,2612,912,288,0,0,0,0,0,0,0,6690,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
//3029,GRIM_REAPER_ANKOU
//3030,STANDING_SOUL
//3031,MUTANT_NECROMANCER
@@ -2279,7 +2282,7 @@
//3122,CHARLESTON1
//3123,CHARLESTON2
//3124,CHARLESTON3
-3125,STEP,Step,Step,130,55403,0,3088,2392,1,871,1566,101,58,117,127,55,61,116,60,10,12,0,6,22,234894485,250,0,780,0,0,0,0,0,0,0,0,6751,1000,998,150,13213,400,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3125,STEP,Step,Step,130,55403,0,3088,2392,1,871,1566,101,58,117,127,55,61,116,60,10,12,0,6,22,0x2000000,250,0,780,0,0,0,0,0,0,0,0,6751,1000,998,150,13213,400,0,0,0,0,0,0,0,0,0,0,0,0,0,0
//3126,ROCK_STEP
//3127,KICK_STEP
//3128,KICK_AND_KICK
@@ -2307,13 +2310,13 @@
//3150,MG_AMDARAIS_H
//3151,MG_CORRUPTION_ROOT_H
//3152,G_MG_KHALITZBURG_H
-//3153,EXCAVATOR_ROBOT
-//3154,RECON_ROBOT
-//3155,REPAIR_ROBOT
-//3156,EXPLORATION_ROVER
-//3157,RUIN_BELIEVER1
-//3158,RUIN_BELIEVER2
-//3159,ILLEGAL_PROMOTION
+3153,EXCAVATOR_ROBOT,Excavator Robot,Excavator Robot,163,166860,0,15026,16915,1,4093,6007,138,53,102,104,72,57,98,57,10,12,1,0,60,0x0000085,250,1020,500,768,0,0,0,0,0,0,0,11597,251,984,101,6962,101,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3154,RECON_ROBOT,Recon Robot,Recon Robot,165,256000,0,15796,17738,1,2668,3863,128,60,112,60,72,57,120,77,10,12,2,0,80,0x0000085,170,1072,672,384,0,0,0,0,0,0,0,998,1001,756,1001,11597,151,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3155,REPAIR_ROBOT,Repair Robot,Repair Robot,155,154760,0,11748,47654,1,1893,2714,99,55,98,39,30,35,95,45,10,12,0,3,24,0x0000085,300,1500,500,660,0,0,0,0,0,0,0,998,5000,756,1501,999,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3156,EXPLORATION_ROVER,Exploration Rover,Exploration Rover,168,293640,0,18172,126234,1,2278,3283,105,41,100,63,35,99,106,61,10,12,2,7,80,0x0000085,165,1552,1152,336,0,0,0,0,0,0,0,998,5000,756,1,999,1,6961,1,0,0,0,0,0,0,0,0,0,0,0,0
+3157,RUIN_BELIEVER1,Ruin Grace Believer,Ruin Grace Believer,100,61350,0,4666,3874,1,982,1379,91,50,88,61,51,62,136,60,10,12,1,7,40,0x0000085,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3158,RUIN_BELIEVER2,Ruin Grace Believer,Ruin Grace Believer,100,61350,0,4666,139500,1,982,1379,91,50,88,61,51,62,136,60,10,12,1,7,40,0x0000085,200,2125,2112,0,0,0,0,0,0,0,0,6753,10000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3159,ILLEGAL_PROMOTION,Illegal Promotion,Illegal Promotion,100,10,0,0,0,1,101,102,1,50,1,1,1,1,1,1,10,12,0,0,40,0x0370020,200,0,0,768,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
//3160,BOILED_RICE_DUANWU
//3161,BOMB
//3162,ELEPHANT
@@ -2323,8 +2326,8 @@
//3166,M_E_DEVILING
//3167,E_POPORING_CRO
//3168,POURING_SEA_FES
-3169,J_REB_SHECIL1,Shooting Target,Shooting Target,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0x1,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-3170,J_REB_SHECIL2,Shooting Target,Shooting Target,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0x1,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3169,J_REB_SHECIL1,Shooting Target,Shooting Target,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0x0000001,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3170,J_REB_SHECIL2,Shooting Target,Shooting Target,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0x0000001,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
//3171,EVENT_MONEMUS01
//3172,EVENT_MONEMUS02
//3173,EVENT_FIREFOX
@@ -2344,17 +2347,17 @@
//3187,E2_G_S_NYDHOG
//3188,E2_FELOCK
//3189,WOLF_MOON
-//3190,MM_SARAH
-//3191,MM_M_GIGAN1
-//3192,MM_M_GIGAN2
-//3193,MM_M_GIGAN3
-//3194,MM_L_GIGAN1
-//3195,MM_L_GIGAN2
-//3196,MM_L_GIGAN3
-//3197,MM_M_GARGOYLE
-//3198,MM_M_GALION
-//3199,MM_M_MUTANT_DRAGON
-//3200,MM_M_CHIMERA
+3190,MM_SARAH,Sarah,Sarah Irene,160,100000000,1,0,0,12,1090,2755,276,255,43,161,6,188,225,136,10,12,0,0,20,0x87700A4,2000,500,500,0,0,0,0,0,0,0,0,15121,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4610,1
+3191,MM_M_GIGAN1,Gigantes,Gigantes,160,6653400,1,0,1,2,4635,4755,64,112,156,151,30,62,265,21,10,12,1,6,47,0x62D3885,250,500,500,600,0,0,0,0,0,0,0,15121,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3192,MM_M_GIGAN2,Gigantes,Gigantes,160,9870000,1,0,0,2,5128,5217,89,175,212,138,43,21,227,15,10,12,1,6,47,0x62A3885,250,500,500,600,0,0,0,0,0,0,0,15121,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3193,MM_M_GIGAN3,Ancient Medium Gigantes,Ancient Medium Gigantes,160,1126300,1,0,0,2,3967,4132,113,155,121,125,45,35,271,15,10,12,1,6,47,0x6283885,300,500,500,600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3194,MM_L_GIGAN1,Large Gigantes,Large Gigantes,160,2482000,1,0,0,2,4172,4254,55,177,135,135,12,72,220,91,10,12,2,6,47,0x62D3885,200,500,500,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3195,MM_L_GIGAN2,Large Gigantes,Large Gigantes,160,2784175,1,0,0,2,3641,3757,71,140,102,119,18,45,275,71,10,12,2,6,47,0x62A3885,200,500,500,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3196,MM_L_GIGAN3,Ancient Gigantes,Ancient Gigantes,160,12063464,1,0,0,2,8957,9018,48,190,203,141,1,66,355,103,10,12,2,6,47,0x6283885,330,800,800,500,0,0,0,0,0,0,0,6803,10000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3197,MM_M_GARGOYLE,Gargoyle,Mutant Gargoyle,150,256780,1,0,0,9,712,801,124,43,147,110,66,57,191,70,10,12,1,6,64,0x2002085,200,1020,720,384,0,0,0,0,0,0,0,912,1940,1039,250,1746,3,0,0,2619,1,1769,1000,757,119,0,0,0,0,0,0
+3198,MM_M_GALION,Galion,Mutant Galion,150,293165,1,0,0,1,801,878,166,71,133,142,71,45,166,45,10,12,1,2,44,0x020108F,150,864,624,360,0,0,0,0,0,0,0,7564,1500,919,1500,996,5,2531,3,0,0,0,0,0,0,0,0,0,0,0,0
+3199,MM_M_MUTANT_DRAGON,Mutant Dragon,Wicked Mutant Dragon,150,324891,1,0,0,4,1176,1274,185,86,175,161,66,68,201,35,10,12,2,9,43,0x0203695,250,1280,1080,240,0,0,0,0,0,0,0,7054,2425,1035,250,1036,250,930,250,1559,50,7296,750,2527,25,0,0,0,0,0,0
+3200,MM_M_CHIMERA,Wicked Chimera,Wicked Chimera,150,301158,1,0,0,1,1029,1177,199,10,166,175,110,88,188,85,10,12,2,2,63,0x0203695,200,772,672,360,0,0,0,0,0,0,0,7054,2668,1048,1250,568,500,1306,1,7295,750,1364,1,984,80,0,0,0,0,0,0
//3201,LUCKYCASE,Poring,Poring,1,60,1,27,20,1,8,9,2,5,6,1,1,0,6,5,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
3202,ORGANIC_JAKK,Organic Pumpkin,Organic Pumpkin,10,40,1,20,13,1,100,100,160,99,1,1,1,1,999,1,0,0,0,3,21,0x4370001,200,0,0,0,0,0,0,0,0,0,0,6804,5000,6804,5000,6804,1000,2267,100,1062,1000,664,100,546,1000,12192,100,0,0,0,0
3203,INORGANIC_JAKK,Inorganic Pumpkin,Inorganic Pumpkin,10,40,1,20,13,1,100,100,160,99,1,1,1,1,999,1,0,0,0,3,21,0x4370001,200,0,0,0,0,0,0,0,0,0,0,6805,5000,6805,5000,6805,1000,2267,100,1062,1000,664,100,546,1000,12192,100,0,0,0,0
@@ -2401,16 +2404,16 @@
3244,V_B_GERTIE,Shadow Chaser Gertie,Shadow Chaser Gertie,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
3245,V_B_ALPHOCCIO,Minstrel Alphoccio,Minstrel Alphoccio,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
3246,V_B_TRENTINI,Wanderer Trentini,Wanderer Trentini,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-//3247,CENERE_G
-//3248,REPAIR_ROBOT_T
-//3249,EXPLORATION_ROVER_T
-//3250,SCR_MT_ROBOTS
-//3251,GC109
-//3252,DR815
-//3253,SYS_MSG
-//3254,T_W_O
-//3255,GHOUL_H
-//3256,ZOMBIE_H
+3247,CENERE_G,Cenere G,Green Cenere,150,140088,1,7635,7698,1,1897,2007,91,81,70,48,40,37,100,45,10,12,0,0,24,0x0000085,300,3009,720,360,0,0,0,0,0,0,0,6561,5000,7322,500,7001,1500,7320,1000,12815,500,0,0,0,0,0,0,0,0,27014,1
+3248,REPAIR_ROBOT_T,Repair Robot T,Repair Robot Turbo,158,186320,1,13208,14489,1,2431,2657,118,59,101,42,55,35,110,45,10,12,0,0,40,0x000008B,300,1515,500,660,0,0,0,0,0,0,0,7512,500,7507,250,998,2000,999,500,11597,1500,0,0,0,0,0,0,0,0,27015,1
+3249,EXPLORATION_ROVER_T,Exploration Rover T,Explorer Robot Turbo,171,318117,1,19826,41023,1,2945,3786,121,67,118,80,45,121,138,65,10,12,2,0,80,0x0000085,165,1552,1152,336,0,0,0,0,0,0,0,7512,500,7507,250,998,2000,999,500,11597,1500,0,0,0,0,0,0,0,0,27016,1
+3250,SCR_MT_ROBOTS,Scr Mt Robots,Can Robot,155,30,1,61,58,1,95,97,100,99,35,42,20,12,68,3,10,12,0,0,20,0x0070085,300,0,500,400,0,0,0,0,0,0,0,7512,1000,7507,1500,7319,2000,0,0,0,0,0,0,0,0,0,0,0,0,27017,1
+3251,GC109,Machine Component,Machine Component,149,217650,1,6598,5931,1,2678,3935,121,71,60,132,45,35,155,15,10,12,0,0,47,0x0000085,120,1000,500,600,0,0,0,0,0,0,0,7512,1000,7507,1500,7319,2000,0,0,0,0,0,0,0,0,0,0,0,0,27018,1
+3252,DR815,Machine Component,Machine Component,153,245670,1,7255,7011,1,3315,4076,143,45,88,98,88,21,116,22,10,12,1,0,27,0x0000085,135,1500,600,500,0,0,0,0,0,0,0,7512,1000,7507,1500,7319,2000,0,0,0,0,0,0,0,0,0,0,0,0,27019,1
+3253,SYS_MSG,Sys Msg,System message,160,100,1,0,0,1,1,2,276,99,0,0,0,188,0,0,10,12,0,0,20,0xC170081,2000,3000,600,550,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3254,T_W_O,T_W_O,T_W_O,165,48000000,1,0,0,1,3955,4151,158,134,90,141,7,87,267,70,10,12,2,6,67,0x6280085,150,1250,500,350,0,6832,5000,617,5000,617,5000,22699,3000,1531,500,7319,2000,0,0,0,0,0,0,0,0,0,0,0,0,27020,1
+3255,GHOUL_H,Ghoul H,Smelly Ghoul,155,178652,1,10233,10598,1,2235,2451,99,55,98,55,61,22,133,2,10,12,0,3,24,0x0000085,200,0,500,660,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3256,ZOMBIE_H,Zombie H,Smelly Zombie,148,134615,1,6859,6903,1,1995,2445,91,42,76,53,54,21,125,3,10,12,0,0,60,0x0000085,220,0,960,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
//3257,MALE_PORING
//3258,FEMALE_PORING
//3259,FANTASTIC_B_UNICORN
@@ -3034,7 +3037,17 @@
//3874,AB_MOB_048
//3875,AB_MOB_049
//3876,AB_MOB_050
-
+//3877,E_NYAIL_PIG
+//3878,E_PIT
+//3879,E_SEA_WORMS
+//3880,E_SMALL_SWIRL
+//3881,E_RIPE_WATERMELON
+//3882,E_MD_NYAILO
+//3883,E_MD_NYAILO_LEG
+//3884,E_MD_S_TREASURE_BOX
+//3885,E_MD_B_TREASURE_BOX
+//3886,E_MD_BOX_PUPPET
+//3887,E_MD_DEPRESS_SOUL
//3888,TW_I_QUEEN_SCARABA
//3889,TW_GIOIA
//3890,TW_TIMEHOLDER
@@ -3051,3 +3064,292 @@
//3901,MD_ORK_HERO
//3902,MD_ORC_LORD
//3903,MD_ORC_FLOWER
+//3904,DUCKLING
+//3905,BIG_DUCKLING
+//3906,IA_LOLI_RURI
+//3907,IA_TEDDY_BEAR
+//3908,IA_MIYABI_NINGYO
+//3909,IA_MARIONETTE
+//3910,E_EMPEL_1
+//3911,E_GIBBET
+//3912,E_LOLI_RURI
+//3913,E_DULLAHAN
+//3914,E_BLOODY_MURDERER
+//3915,E_EMPEL_1B
+//3916,JP_E_MONSTER_74
+//3917,JP_E_MONSTER_75
+//3918,JP_E_MONSTER_76
+//3919,JP_E_MONSTER_77
+//3920,JP_E_MONSTER_78
+//3921,JP_E_MONSTER_79
+//3922,JP_E_MONSTER_80
+//3923,JP_E_MONSTER_81
+//3924,JP_E_MONSTER_82
+//3925,JP_E_MONSTER_83
+//3926,JP_E_MONSTER_84
+//3927,JP_E_MONSTER_85
+//3928,JP_E_MONSTER_86
+//3929,JP_E_MONSTER_87
+//3930,JP_E_MONSTER_88
+//3931,JP_E_MONSTER_89
+//3932,JP_E_MONSTER_90
+//3933,JP_E_MONSTER_91
+//3934,JP_E_MONSTER_92
+//3935,JP_E_MONSTER_93
+//3936,JP_E_MONSTER_94
+//3937,JP_E_MONSTER_95
+//3938,JP_E_MONSTER_96
+//3939,JP_E_MONSTER_97
+//3940,JP_E_MONSTER_98
+//3941,JP_E_MONSTER_99
+//3942,JP_E_MONSTER_100
+//3943,JP_E_MONSTER_101
+//3944,JP_E_MONSTER_102
+//3945,JP_E_MONSTER_103
+//3946,JP_E_MONSTER_104
+//3947,JP_E_MONSTER_105
+//3948,ORC_WARRIOR_MJ
+//3949,ORC_LADY_MJ
+//3950,ORC_BABY_MJ
+//3951,HIGH_ORC_MJ
+//3952,ORC_ARCHER_MJ
+//3953,ORC_HERO_MJ
+//3954,ORC_LORD_MJ
+//3955,E_SAVAGE
+//3956,E_ELDER_WILOW
+//3957,HORNET_MJ
+//3958,MANTIS_MJ
+//3959,ARGOS_MJ
+//3960,MISTRESS_MJ
+//3961,BIGFOOT_MJ
+//3962,SNAKE_MJ
+//3963,WOLF_MJ
+//3964,EDDGA_MJ
+//3965,FRILLDORA_MJ
+//3966,SANDMAN_MJ
+//3967,HODE_MJ
+//3968,PHREEONI_MJ
+//3969,MD_RED_MUSHROOM
+//3970,MD_BLACK_MUSHROOM
+//3971,SKELION
+//3972,MD_THIEF_BUG__
+//3973,MD_THIEF_BUG
+//3974,MD_THIEF_BUG_EGG
+//3975,MD_GOLDEN_BUG
+//3976,EIRA_BRZ
+//3977,AB_MOB_051
+//3978,AB_MOB_052
+//3979,AB_MOB_053
+//3980,AB_MOB_054
+//3981,AB_MOB_055
+//3982,AB_MOB_056
+//3983,AB_MOB_057
+//3984,AB_MOB_058
+//3985,AB_MOB_059
+//3986,AB_MOB_060
+//3987,AB_MOB_061
+//3988,AB_MOB_062
+//3989,AB_MOB_063
+//3990,AB_MOB_064
+//3991,AB_MOB_065
+//3992,AB_MOB_066
+//3993,AB_MOB_067
+//3994,AB_MOB_068
+//3995,AB_MOB_069
+//3996,AB_MOB_070
+//3997,AB_MOB_071
+//3998,AB_MOB_072
+
+// New Monster Range
+//20021,AB_MOB_073
+//20022,AB_MOB_074
+//20023,AB_MOB_075
+//20024,AB_MOB_076
+//20025,JP_CM_MOB_001
+//20026,JP_CM_MOB_002
+//20027,JP_CM_MOB_003
+//20028,JP_CM_MOB_004
+//20029,JP_CM_MOB_005
+//20030,JP_CM_MOB_006
+//20031,JP_CM_MOB_007
+//20032,JP_CM_MOB_008
+//20033,JP_CM_MOB_009
+//20034,JP_CM_MOB_010
+//20035,JP_CM_MOB_011
+//20036,JP_CM_MOB_012
+//20037,JP_CM_MOB_013
+//20038,JP_CM_MOB_014
+//20039,JP_CM_MOB_015
+//20040,JP_CM_MOB_016
+//20041,JP_CM_MOB_017
+//20042,JP_CM_MOB_018
+//20043,JP_CM_MOB_019
+//20044,JP_CM_MOB_020
+//20045,JP_CM_MOB_021
+//20046,JP_CM_MOB_022
+//20047,JP_CM_MOB_023
+//20048,JP_CM_MOB_024
+//20049,JP_CM_MOB_025
+//20050,JP_CM_MOB_026
+//20051,JP_CM_MOB_027
+//20052,JP_CM_MOB_028
+//20053,JP_CM_MOB_029
+//20054,JP_CM_MOB_030
+//20055,JP_CM_MOB_031
+//20056,JP_CM_MOB_032
+//20057,JP_CM_MOB_033
+//20058,JP_CM_MOB_034
+//20059,JP_CM_MOB_035
+//20060,JP_CM_MOB_036
+//20061,EVT_BAPHOMET
+//20062,EVT_BAPHO_JR
+//20063,EVT_V_WOLF
+//20064,EVT_ECLIPSE
+//20065,EVT_VOCAL
+//20066,EVT_UNGOLIANT
+//20067,EVT_GEOGRAPHER
+//20068,EVT_MANTIS
+//20069,EVT_GRIZZLY
+//20070,EVT_KINDOFBEETLE
+//20071,EVT_BIGFOOT
+//20072,EVT_COCO
+//20073,E_SIROMA
+//20074,E_MYSTCASE
+//20075,E_X_PORING
+//20076,MD_MAYA
+//20077,MD_DENIRO
+//20078,MD_VITATA
+//20079,MD_ANDRE
+//20080,MD_PIERE
+//20081,MD_IZ_COELACANTH
+//20082,MD_IZ_MARSE
+//20083,MD_IZ_MERMAN
+//20084,MD_IZ_OBEAUNE
+//20085,MD_IZ_CORNUTUS
+//20086,RED_ERUMA_MJ
+//20087,SIORAVA_MJ
+
+//20101,WILOW_MJ
+//20102,MANDRAGORA_MJ
+//20103,STEM_WORM_MJ
+//20104,SPORE_MJ
+//20105,TW_V_B_KATRINN
+//20106,TW_V_B_SHECIL
+//20107,TW_DETALE
+//20108,TW_KIEL
+//20109,TW_TAO_GUNKA
+//20110,TW_KNIGHT_OF_WINDSTORM
+//20111,MD_TRE_DRAKE
+//20112,MD_MANHOLE
+//20113,MD_TRE_MIMIC
+//20114,MD_TRE_WRAITH
+//20115,MD_TRE_PIRATE_SKEL
+//20116,MD_TRE_WHISPER
+//20117,MD_TRE_HYDRA
+//20118,GOBLIN_KING
+//20119,BAD_CATCUMBER
+
+//20165,MD_TOUCAN
+//20166,FLAME_GHOST
+//20167,ICE_GHOST
+//20168,B_FLAME_GHOST
+//20169,B_ICE_GHOST
+//20170,GARGOYLE_MJ
+//20171,STING_MJ
+//20172,RAYDRIC_MJ
+//20173,RAYDRIC_ARCHER_MJ
+//20174,RAGGED_ZOMBIE_MJ
+//20175,EXTRA_JOKER
+//20176,ERZSEBET
+//20177,JENIFFER
+//20178,GENERAL_ORC
+//20179,SIEGLOUSE
+
+//20181,VH_AMON_RA
+//20182,VH_BAPHOMET
+//20183,VH_DARK_LORD
+//20184,VH_DOPPELGANGER
+//20185,VH_DRACULA
+//20186,VH_DRAKE
+//20187,VH_EDDGA
+//20188,VH_GARM
+//20189,VH_GOLDEN_BUG
+//20190,VH_KNIGHT_OF_WS
+//20191,VH_MAYA
+//20192,VH_MISTRESS
+//20193,VH_MOONLIGHT
+//20194,VH_ORC_LORD
+//20195,VH_ORK_HERO
+//20196,VH_OSIRIS
+//20197,VH_PHARAOH
+//20198,VH_PHREEONI
+//20199,VH_TAO_GUNKA
+//20200,VH_TURTLE_GENERAL
+//20201,VH_B_SEYREN
+//20202,VH_B_HARWORD
+//20203,VH_B_EREMES
+//20204,VH_B_KATRINN
+//20205,VH_B_MAGALETA
+//20206,VH_LORD_OF_DEATH
+//20207,VH_ENTWEIHEN
+//20208,VH_NAGHT_SIEGER
+//20209,VH_DETALE
+//20210,VH_THANATOS
+//20211,VH_APOCALIPS_H
+//20212,VH_KIEL_
+//20213,VH_RANDGRIS
+//20214,VH_RSX_0806
+//20215,VH_B_YGNIZEM
+//20216,VH_ATROCE
+//20217,VH_BEELZEBUB_
+//20218,VH_FALLINGBISHOP
+//20219,VH_GLOOM_U_N
+//20220,VH_IFRIT
+//20221,VH_KTULLANUX
+//20222,VH_H_HUNTER_EV
+//20223,VH_MM_CUTIE
+//20224,VH_VENOM_KIMERA
+//20225,VH_B_SHECIL
+//20226,VH_B_RANDEL
+//20227,VH_B_FLAMEL
+//20228,VH_B_TRENTINI
+//20229,VH_CHARLESTON3
+//20230,VH_GRAND_PERE
+//20231,VH_S_NYDHOG
+//20232,VH_QUEEN_SCARABA
+//20233,VH_KRAKEN
+//20234,VH_TIMEHOLDER
+//20235,VH_INCAN_SAMURAI
+//20236,VH_BACSOJIN
+//20237,VH_DARK_S_LORD
+//20238,VH_LADY_TANEE
+//20239,VH_GOPINICH
+//20240,VH_LEAK
+//20241,VH_MECHASPIDER
+//20242,VH_PYURIEL
+//20243,VH_KADES
+//20244,VH_GIOIA
+//20245,VH_DAEHYON
+//20246,VH_B_CELIA
+//20247,VH_B_CHEN
+//20248,VH_B_ALPHOCCIO
+//20249,VH_B_GERTIE
+//20250,VH_ENTWEIHEN_R
+//20251,VH_ENTWEIHEN_H
+//20252,VH_ENTWEIHEN_M
+//20253,VH_ENTWEIHEN_S
+//20254,VH_MIMIC
+//20255,ILL_TEDDY_BEAR_R
+//20256,ILL_TEDDY_BEAR_Y
+//20257,ILL_TEDDY_BEAR_G
+//20258,ILL_TEDDY_BEAR_W
+//20259,ILL_TEDDY_BEAR_B
+//20260,ILL_TEDDY_BEAR_S
+//20261,ILL_PITMAN
+//20262,ILL_MINERAL
+//20263,ILL_OBSIDIAN
+//20264,G_ILL_TEDDY_BEAR_R
+//20265,G_ILL_TEDDY_BEAR_Y
+//20266,G_ILL_TEDDY_BEAR_G
+//20267,G_ILL_TEDDY_BEAR_W
+//20268,G_ILL_TEDDY_BEAR_B
diff --git a/db/re/mob_drop.txt b/db/re/mob_drop.txt
index cd45806656b..3f866df9019 100644
--- a/db/re/mob_drop.txt
+++ b/db/re/mob_drop.txt
@@ -46,11 +46,11 @@
2700,28705,250,RDMOPTG_Crimson_Weapon // C2_PORCELLIO
2745,13127,250,RDMOPTG_None // C2_MOLE
2746,1939,250,RDMOPTG_Crimson_Weapon // C3_MIYABI_NINGYO
-1102,2009,50,RDMOPTG_None // BATHORY
+1102,1680,50,RDMOPTG_None // BATHORY
1155,16040,50,RDMOPTG_Crimson_Weapon // PETIT
2714,16040,250,RDMOPTG_Crimson_Weapon // C1_PETIT
2715,16040,250,RDMOPTG_Crimson_Weapon // C2_PETIT
-2885,2009,250,RDMOPTG_None // C4_BATHORY
+2885,1680,250,RDMOPTG_None // C4_BATHORY
2199,28705,50,RDMOPTG_Crimson_Weapon // SIORAVA
1143,16040,50,RDMOPTG_Crimson_Weapon // MARIONETTE
1413,1995,50,RDMOPTG_Crimson_Weapon // WILD_GINSENG
@@ -106,9 +106,9 @@
1653,28705,50,RDMOPTG_Crimson_Weapon // WHIKEBAIN
1655,1839,50,RDMOPTG_Crimson_Weapon // EREND
1655,16040,50,RDMOPTG_Crimson_Weapon // EREND
-1657,2009,50,RDMOPTG_None // RAWREL
+1657,1680,50,RDMOPTG_None // RAWREL
1829,21015,50,RDMOPTG_Crimson_Weapon // SWORD_GUARDIAN
-2692,2009,250,RDMOPTG_None // C3_RAWREL
+2692,1680,250,RDMOPTG_None // C3_RAWREL
1654,13454,50,RDMOPTG_Crimson_Weapon // ARMAIA
1654,28106,50,RDMOPTG_Crimson_Weapon // ARMAIA
1656,1939,50,RDMOPTG_Crimson_Weapon // KAVAC
diff --git a/db/re/mob_skill_db.txt b/db/re/mob_skill_db.txt
index 510ad74480d..0b7ad8683d6 100644
--- a/db/re/mob_skill_db.txt
+++ b/db/re/mob_skill_db.txt
@@ -8730,47 +8730,85 @@
2449,Nasarin@RG_CLOSECONFINE,attack,1005,1,1000,0,30000,no,target,always,0,,,,,,,
2449,Nasarin@NPC_POISONATTACK,attack,188,5,1000,0,5000,no,target,always,0,,,,,,,
-// Old Glast Heim (currently placeholders)
-2464,MG Zombie@AL_HEAL,idle,28,10,10000,0,5000,yes,self,always,0,,,,,,,26
-2464,MG Zombie@NPC_UNDEADATTACK,chase,347,10,8000,1000,5000,yes,target,always,0,,,,,,,
-2465,MG Wraith@NPC_ENERGYDRAIN,attack,200,1,500,0,5000,yes,target,always,0,,,,,,,
-2466,MG Ghoul@NPC_UNDEADATTACK,chase,347,10,8000,1000,5000,yes,target,always,0,,,,,,,
-2467,MG Arclouse@NPC_GROUNDATTACK,attack,185,10,2000,0,5000,yes,target,always,0,,,,,,,
-2468,MG Raydric@BS_MAXIMIZE,attack,114,5,500,1000,5000,no,self,always,0,,,,,,,
-2468,MG Raydric@BS_MAXIMIZE,chase,114,5,500,1000,5000,no,self,always,0,,,,,,,
-2468,MG Raydric@NPC_EMOTION,chase,197,1,2000,0,5000,yes,self,always,0,0,,,,,,
-2468,MG Raydric@SM_MAGNUM,attack,7,9,500,500,5000,no,self,always,0,,,,,,6,
-2468,MG Raydric@CR_AUTOGUARD,chase,249,2,2000,0,300000,yes,self,longrangeattacked,,,,,,,,
-2468,MG Raydric@CR_AUTOGUARD,attack,249,2,500,0,300000,yes,self,always,0,,,,,,,
-2469,MG Raydric Archer@AC_CHARGEARROW,attack,148,1,500,0,5000,yes,target,always,0,,,,,,9,
-2469,MG Raydric Archer@NPC_DARKNESSATTACK,attack,190,10,500,500,5000,no,target,always,0,,,,,,9,
-2469,MG Raydric Archer@CR_AUTOGUARD,attack,249,2,500,0,300000,yes,self,always,0,,,,,,,
-2470,MG Knight of Abyss@AC_CHARGEARROW,chase,148,1,500,0,5000,yes,target,always,0,,,,,,,
-2470,MG Knight of Abyss@KN_BRANDISHSPEAR,attack,57,10,500,1000,5000,no,target,always,0,,,,,,9,
-2470,MG Knight of Abyss@NPC_DARKNESSATTACK,attack,190,5,500,500,5000,no,target,always,0,,,,,,9,
-2470,MG Knight of Abyss@CR_AUTOGUARD,chase,249,10,2000,0,300000,yes,self,longrangeattacked,,,,,,,,
-2470,MG Knight of Abyss@CR_AUTOGUARD,attack,249,10,500,0,300000,yes,self,always,0,,,,,,,
-2472,MG Bloody Knight@KN_BRANDISHSPEAR,attack,57,5,500,1000,5000,no,target,always,0,,,,,,9,
-2472,MG Bloody Knight@NPC_CHANGEFIRE,attack,164,1,10000,2000,600000,no,self,myhpltmaxrate,20,,,,,,,
-2472,MG Bloody Knight@NPC_DARKNESSATTACK,attack,190,2,500,500,5000,no,target,always,0,,,,,,9,
-2472,MG Bloody Knight@CR_SHIELDCHARGE,attack,250,5,500,0,5000,yes,target,always,0,,,,,,9,
-2472,MG Bloody Knight@WZ_METEOR,attack,83,5,2000,0,5000,no,target,myhpltmaxrate,20,,,,,,,
-2472,MG Bloody Knight@WZ_METEOR,chase,83,5,2000,0,5000,no,target,myhpltmaxrate,20,,,,,,,
-2472,MG Bloody Knight@NPC_WEAPONBRAKER,attack,343,5,500,0,30000,yes,target,always,0,,,,,,,
-2475,MG_CORRUPTION_ROOT@NPC_HELLJUDGEMENT,idle,662,10,10000,4000,100,no,self,always,0,,,,,,36,
-2475,MG_CORRUPTION_ROOT@NPC_HELLJUDGEMENT,attack,662,10,10000,1000,10000,no,self,always,0,,,,,,36,
-2475,MG_CORRUPTION_ROOT@NPC_DARKSTRIKE,attack,340,10,2000,0,5000,yes,target,always,0,,,,,,,
-2475,MG_CORRUPTION_ROOT@NPC_SILENCEATTACK,attack,178,10,2000,0,5000,no,target,always,0,,,,,,,
-2475,MG_CORRUPTION_ROOT@NPC_PETRIFYATTACK,attack,180,5,500,500,5000,no,target,always,0,,,,,,3,
-//2475,MG_CORRUPTION_ROOT@NPC_TALK,idle,682,10,10000,0,60000,no,self,myhpltmaxrate,100,,,,,,,41
-2476,MG_AMDARAIS@NPC_DRAGONFEAR,chase,659,5,10000,0,30000,no,self,always,0,,,,,,6,
-2476,MG_AMDARAIS@NPC_DRAGONFEAR,attack,659,5,2000,1000,20000,no,self,myhpltmaxrate,80,,,,,,32,
-2476,MG_AMDARAIS@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,0,,,,,,,
-2476,MG_AMDARAIS@NPC_FIREBREATH,attack,654,5,500,800,5000,no,target,always,0,,,,,,32,
-2476,MG_AMDARAIS@NPC_DARKBREATH,attack,202,5,500,800,5000,no,target,always,0,,,,,,36,
-2476,MG_AMDARAIS@NPC_WEAPONBRAKER,attack,343,10,500,0,30000,yes,target,always,0,,,,,,,
-2476,MG_AMDARAIS@MG_FIREBALL,chase,17,44,5000,500,1000,no,target,always,0,,,,,,,
-//2476,MG_AMDARAIS@NPC_TALK,idle,682,10,10000,0,60000,no,self,myhpltmaxrate,100,,,,,,,42
+// Old Glast Heim
+2464,Corrupted Steward@NPC_UNDEADATTACK,chase,347,3,5000,0,5000,no,target,always,0,,,,,,,
+2464,Corrupted Steward@AL_HEAL,idle,28,1,5000,1000,3000,no,self,always,0,,,,,,26,
+2464,Corrupted Steward@NPC_UNDEADATTACK,attack,347,3,5000,500,3000,no,target,always,0,,,,,,28,
+2464,Corrupted Steward@NPC_BLOODDRAIN,attack,199,1,5000,500,5000,no,target,always,0,,,,,,47,
+2465,Corrupted Monk@NPC_CURSEATTACK,chase,181,5,5000,800,5000,no,target,always,0,,,,,,9,
+2465,Corrupted Monk@NPC_BLINDATTACK,attack,177,5,5000,0,5000,no,target,always,0,,,,,,,
+2465,Corrupted Monk@NPC_CURSEATTACK,attack,181,5,5000,800,5000,no,target,always,0,,,,,,9,
+2465,Corrupted Monk@NPC_ENERGYDRAIN,attack,200,1,5000,0,5000,no,target,always,0,,,,,,,
+2466,Grand Chamberlain in pain@NPC_UNDEADATTACK,chase,347,4,5000,0,5000,no,target,always,0,,,,,,,
+2466,Grand Chamberlain in pain@AL_HEAL,idle,28,1,5000,1000,3000,no,self,always,0,,,,,,26,
+2466,Grand Chamberlain in pain@NPC_BLEEDING,attack,660,4,500,900,5000,no,target,always,0,,,,,,9,
+2466,Grand Chamberlain in pain@NPC_UNDEADATTACK,attack,347,4,5000,500,3000,no,target,always,0,,,,,,28,
+2466,Grand Chamberlain in pain@NPC_BLOODDRAIN,attack,199,2,5000,500,5000,no,target,always,0,,,,,,47,
+2467,Maggot@NPC_GROUNDATTACK,attack,185,5,2000,0,5000,no,target,always,0,,,,,,,
+2467,Maggot@NPC_EMOTION,chase,197,1,200,0,5000,no,self,always,0,19,0x81,,,,,
+2467,Maggot@NPC_EMOTION,idle,197,1,2000,0,5000,no,self,always,0,7,0x3095,,,,,
+2468,Corrupted Palace Guard@SM_BASH,chase,5,8,5000,1000,5000,no,target,always,0,,,,,,,
+2468,Corrupted Palace Guard@BS_MAXIMIZE,chase,114,5,5000,1000,5000,no,self,always,0,,,,,,,
+2468,Corrupted Palace Guard@CR_AUTOGUARD,chase,249,2,2000,0,300000,no,self,always,0,,,,,,,
+2468,Corrupted Palace Guard@SM_MAGNUM,attack,7,9,5000,1000,5000,no,self,always,0,,,,,,,
+2468,Corrupted Palace Guard@NPC_DARKNESSATTACK,attack,190,5,5000,500,5000,no,target,always,0,,,,,,,
+2469,Wandering Archer@AC_DOUBLE,chase,46,5,5000,1000,1000,no,target,always,0,,,,,,,
+2469,Wandering Archer@AC_CHARGEARROW,attack,148,1,5000,0,50000,no,target,always,0,,,,,,,
+2469,Wandering Archer@NPC_DARKNESSATTACK,attack,190,5,5000,1000,5000,no,target,always,0,,,,,,,
+2469,Wandering Archer@AC_DOUBLE,attack,46,9,5000,1800,5000,no,target,always,0,,,,,,,
+2470,Corrupted Knight of Abyss@NPC_DARKSTRIKE,idle,340,3,5000,0,10000,no,target,rudeattacked,,,,,,,,
+2470,Corrupted Knight of Abyss@CR_AUTOGUARD,chase,249,10,2000,0,300000,no,self,longrangeattacked,,,,,,,,
+2470,Corrupted Knight of Abyss@AC_CHARGEARROW,chase,148,1,500,0,5000,no,target,always,0,,,,,,,
+2470,Corrupted Knight of Abyss@KN_BRANDISHSPEAR,attack,57,10,500,2000,5000,no,target,always,0,,,,,,9,
+2470,Corrupted Knight of Abyss@NPC_DARKNESSATTACK,attack,190,9,500,1500,10000,no,target,always,0,,,,,,7,
+2470,Corrupted Knight of Abyss@NPC_CRITICALSLASH,attack,170,1,500,0,5000,no,target,always,0,,,,,,,
+2472,Bloody Knight@WZ_METEOR,chase,83,7,2000,0,10000,no,target,myhpltmaxrate,50,,,,,,,
+2472,Bloody Knight@WZ_METEOR,attack,83,7,2000,0,5000,no,target,myhpltmaxrate,30,,,,,,,
+2472,Bloody Knight@KN_BRANDISHSPEAR,attack,57,7,500,1000,5000,no,target,always,0,,,,,,9,
+2472,Bloody Knight@NPC_DARKNESSATTACK,attack,190,3,500,500,5000,no,target,always,0,,,,,,9,
+2472,Bloody Knight@NPC_PULSESTRIKE,attack,661,3,500,2000,10000,no,self,always,0,,,,,,7,
+2475,Corrupted Soul@NPC_EARTHQUAKE,idle,653,2,10000,5000,5000,yes,self,rudeattacked,,,,,,,7,
+2475,Corrupted Soul@NPC_EVILLAND,idle,670,10,7000,3000,5000,yes,randomtarget,always,0,,,,,,9,
+2475,Corrupted Soul@NPC_HELLJUDGEMENT,idle,662,5,10000,5000,0,yes,self,always,0,,,,,,9,
+2475,Corrupted Soul@NPC_VAMPIRE_GIFT,idle,679,5,2000,5000,5000,yes,self,always,0,,,,,,29,
+2475,Corrupted Soul@NPC_BLOODDRAIN,idle,199,1,2000,0,2000,no,randomtarget,always,0,,,,,,29,
+2475,Corrupted Soul@AM_DEMONSTRATION,idle,229,9,10000,0,2000,no,randomtarget,always,0,,,,,,,
+2475,Corrupted Soul@NPC_HELLJUDGEMENT,idle,662,5,10000,5000,5000,yes,self,myhpltmaxrate,50,,,,,,,
+2475,Corrupted Soul@AL_HEAL,idle,28,11,10000,0,5000,no,self,myhpltmaxrate,50,,,,,,,
+2475,Corrupted Soul@NPC_POWERUP,idle,349,5,10000,1000,5000,yes,self,myhpltmaxrate,50,,,,,,,
+2475,Corrupted Soul@NPC_EARTHQUAKE,idle,653,4,10000,5000,5000,yes,self,myhpltmaxrate,30,,,,,,7,
+2475,Corrupted Soul@NPC_EVILLAND,idle,670,10,10000,1000,5000,yes,randomtarget,myhpltmaxrate,30,,,,,,9,
+2475,Corrupted Soul@NPC_HELLJUDGEMENT,idle,662,10,10000,5000,0,yes,self,rudeattacked,,,,,,,9,
+2475,Corrupted Soul@NPC_HELLJUDGEMENT,idle,662,8,10000,5000,0,yes,self,casttargeted,,,,,,,9,
+2475,Corrupted Soul@NPC_HELLJUDGEMENT,idle,662,6,10000,5000,0,yes,self,longrangeattacked,,,,,,,9,
+2475,Corrupted Soul@NPC_WIDESOULDRAIN,idle,680,5,10000,1000,0,yes,self,skillused,490,,,,,,9,
+2475,Corrupted Soul@NPC_WIDESOULDRAIN,idle,680,5,10000,1000,0,yes,self,skillused,271,,,,,,9,
+2475,Corrupted Soul@NPC_DARKSTRIKE,attack,340,10,5000,1000,5000,yes,target,always,0,,,,,,,
+2475,Corrupted Soul@NPC_BLOODDRAIN,attack,199,1,2000,1000,0,no,target,always,0,,,,,,29,
+2475,Corrupted Soul@NPC_CRITICALWOUND,attack,673,4,500,0,5000,no,target,always,0,,,,,,,
+2475,Corrupted Soul@AS_SONICBLOW,attack,136,10,500,800,5000,yes,target,always,0,,,,,,,
+2475,Corrupted Soul@NPC_WIDECURSE,attack,677,5,10000,1000,5000,yes,self,always,0,,,,,,,
+2475,Corrupted Soul@NPC_WIDESILENCE,attack,663,5,8000,1000,5000,yes,self,always,0,,,,,,,
+2475,Corrupted Soul@NPC_WIDESTONE,attack,666,3,10000,1000,5000,yes,self,always,0,,,,,,,
+2475,Corrupted Soul@NPC_WIDESTUN,attack,678,3,5000,1000,5000,yes,self,always,0,,,,,,,
+2476,Amdarias@NPC_DARKSTRIKE,idle,340,10,10000,0,0,no,target,rudeattacked,,,,,,,,
+2476,Amdarias@NPC_DARKSTRIKE,chase,340,5,5000,0,1000,no,target,always,0,,,,,,,
+2476,Amdarias@NPC_HELLJUDGEMENT,chase,662,5,5000,4000,5000,yes,self,myhpltmaxrate,30,,,,,,7,
+2476,Amdarias@NPC_DRAGONFEAR,chase,659,5,10000,0,0,no,self,always,0,,,,,,,
+2476,Amdarias@NPC_DRAGONFEAR,attack,659,5,2000,1000,20000,yes,self,always,0,,,,,,,
+2476,Amdarias@NPC_HELLJUDGEMENT,attack,662,5,10000,4000,5000,yes,self,myhpltmaxrate,30,,,,,,7,
+2476,Amdarias@NPC_GRANDDARKNESS,attack,339,10,10000,2000,1000,yes,self,myhpltmaxrate,30,,,,,,9,
+2476,Amdarias@NPC_POWERUP,attack,349,5,10000,0,50000,no,self,myhpltmaxrate,30,,,,,,6,
+2476,Amdarias@NPC_VAMPIRE_GIFT,attack,679,5,10000,0,0,no,self,skillused,490,,,,,,42,
+2476,Amdarias@NPC_CRITICALWOUND,attack,673,4,500,500,5000,yes,target,always,0,,,,,,,
+2476,Amdarias@NPC_CHANGEUNDEAD,attack,348,1,500,0,5000,no,target,always,0,,,,,,44,
+2476,Amdarias@NPC_MENTALBREAKER,attack,159,4,500,1500,5000,no,target,always,0,,,,,,42,
+2476,Amdarias@NPC_CRITICALSLASH,attack,170,1,10000,0,5000,no,target,always,0,,,,,,,
+2476,Amdarias@NPC_DARKCROSS,attack,338,10,5000,0,5000,no,target,always,0,,,,,,,
+2476,Amdarias@NPC_UNDEADATTACK,attack,347,10,10000,500,5000,yes,target,always,0,,,,,,,
+2476,Amdarias@NPC_CURSEATTACK,attack,181,5,4000,0,3000,no,target,always,0,,,,,,,
+2476,Amdarias@NPC_STUNATTACK,attack,179,5,2000,0,3000,no,target,always,0,,,,,,,
+2476,Amdarias@SM_MAGNUM,attack,7,25,10000,500,5000,yes,self,always,0,,,,,,,
// Nightmare Glast Heim
2477,Wanderer (Nightmare)@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
@@ -10916,6 +10954,54 @@
2923,Owl Marquees@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,6,0x3695,,,,,
2923,Owl Marquees@NPC_SUMMONSLAVE,idle,196,2,10000,2000,60000,no,self,slavele,0,2922,,,,,,
+// Ghost Palace Memorial
+2948,Cursed Soldier@NPC_BLINDATTACK,attack,177,5,500,0,5000,no,target,always,0,,,,,,,
+2948,Cursed Soldier@AC_DOUBLE,attack,46,5,500,0,5000,no,target,always,0,,,,,,,
+2948,Cursed Soldier@NPC_MAGICALATTACK,attack,192,1,500,800,5000,yes,target,always,0,,,,,,,
+2948,Cursed Soldier@AC_SHOWER,attack,47,3,500,0,5000,no,target,always,0,,,,,,,
+2949,Cursed Sentinel@AS_SONICBLOW,attack,136,7,500,800,5000,yes,target,always,0,,,,,,29,
+2949,Cursed Sentinel@NPC_CURSEATTACK,attack,181,5,500,800,5000,yes,target,always,0,,,,,,29,
+2950,Broken Mind@NPC_BLINDATTACK,attack,177,3,1500,0,5000,no,target,always,0,,,,,,1,
+2950,Broken Mind@NPC_BLINDATTACK,chase,177,3,1500,0,5000,no,target,always,0,,,,,,1,
+2950,Broken Mind@NPC_BLOODDRAIN,attack,199,1,500,0,5000,no,target,always,0,,,,,,26,
+2950,Broken Mind@NPC_CURSEATTACK,attack,181,3,500,800,5000,yes,target,always,0,,,,,,0,
+2950,Broken Mind@NPC_CURSEATTACK,chase,181,3,500,800,5000,yes,target,always,0,,,,,,0,
+2950,Broken Mind@CR_REFLECTSHIELD,attack,252,2,500,0,300000,yes,self,always,0,,,,,,7,
+2950,Broken Mind@NPC_PETRIFYATTACK,attack,180,3,500,500,5000,yes,target,always,0,,,,,,2,
+2950,Broken Mind@NPC_PETRIFYATTACK,chase,180,3,500,500,5000,yes,target,always,0,,,,,,2,
+2951,Floating Word@NPC_BLOODDRAIN,attack,199,1,500,0,5000,no,target,always,0,,,,,,2,
+2951,Floating Word@NPC_EMOTION,idle,197,1,2000,0,5000,no,self,always,0,29,,,,,,
+2951,Floating Word@MG_FIREBALL,chase,17,5,1500,500,5000,yes,target,always,0,,,,,,,
+2951,Floating Word@MO_BODYRELOCATION,chase,264,1,2000,500,5000,yes,target,always,0,,,,,,,
+2952,Like Love@HT_SHOCKWAVE,idle,118,5,500,0,300000,no,around2,always,0,,,,,,29,
+2952,Like Love@MG_LIGHTNINGBOLT,attack,20,5,500,1500,5000,no,target,always,0,,,,,,6,
+2952,Like Love@MG_LIGHTNINGBOLT,chase,20,5,500,1500,5000,no,target,always,0,,,,,,6,
+2952,Like Love@NPC_EMOTION,idle,197,1,2000,0,5000,no,self,always,0,29,,,,,,
+2952,Like Love@NPC_MAGICALATTACK,attack,192,1,500,1000,5000,yes,target,always,0,,,,,,9,
+2952,Like Love@NPC_UNDEADATTACK,attack,347,2,2000,0,5000,no,target,always,0,,,,,,,
+2952,Like Love@WZ_JUPITEL,attack,84,3,500,1500,5000,no,target,always,0,,,,,,6,
+2952,Like Love@WZ_JUPITEL,chase,84,3,500,1500,5000,no,target,always,0,,,,,,6,
+2953,Cursed Memory@NPC_POISON,attack,176,3,500,800,5000,yes,target,always,0,,,,,,,
+2953,Cursed Memory@NPC_POISONATTACK,attack,188,3,500,800,5000,yes,target,always,0,,,,,,,
+2953,Cursed Memory@NPC_UNDEADATTACK,attack,347,2,500,500,5000,yes,target,always,0,,,,,,,
+2954,Colorless Vow@NPC_CRITICALSLASH,attack,170,1,500,500,5000,yes,target,always,0,,,,,,,
+2954,Colorless Vow@NPC_SPLASHATTACK,attack,174,1,2000,0,5000,no,target,always,0,,,,,,,
+2955,Old Friendship@NPC_POISON,attack,176,3,500,800,5000,yes,target,always,0,,,,,,,
+2955,Old Friendship@NPC_POISON,angry,176,3,500,800,5000,yes,target,always,0,,,,,,,
+2956,Sweet Slaughter@AS_GRIMTOOTH,chase,137,5,2000,0,5000,no,target,always,0,,,,,,,
+2956,Sweet Slaughter@BS_MAXIMIZE,attack,114,5,500,1000,5000,yes,self,always,0,,,,,,,
+2956,Sweet Slaughter@BS_MAXIMIZE,chase,114,5,500,1000,5000,yes,self,always,0,,,,,,,
+2956,Sweet Slaughter@NPC_SPLASHATTACK,attack,174,1,2000,0,5000,no,target,always,0,,,,,,9,
+2956,Sweet Slaughter@NPC_STUNATTACK,attack,179,3,500,1500,5000,yes,target,always,0,,,,,,,
+2957,Forgotten Name@NPC_CRITICALSLASH,attack,170,1,1000,500,5000,yes,target,always,0,,,,,,,
+2957,Forgotten Name@NPC_DARKNESSATTACK,attack,190,3,500,500,5000,yes,target,always,0,,,,,,6,
+2958,Fatal Days@MG_SOULSTRIKE,chase,13,5,2000,0,3000,no,target,always,0,,,,,,,
+2958,Fatal Days@AS_GRIMTOOTH,attack,137,5,10000,0,700,no,target,always,0,,,,,,,
+2959,Torturous Redeemer@SM_MAGNUM,attack,7,5,500,0,10000,no,self,always,0,,,,,,,
+2959,Torturous Redeemer@NPC_FIREATTACK,attack,186,3,1000,1000,200000,yes,target,always,0,,,,,,,
+2959,Torturous Redeemer@WZ_FIREPILLAR,attack,80,5,500,0,10000,no,around2,always,0,,,,,,,
+2959,Torturous Redeemer@SM_BASH,attack,5,5,500,0,5000,no,target,always,0,,,,,,,
+
// Horror Toy Factory
2987,Decorated Evil Tree@AS_GRIMTOOTH,chase,137,5,2000,0,5000,yes,target,always,0,,,,,,,
2987,Decorated Evil Tree@NPC_CURSEATTACK,attack,181,3,1000,0,5000,yes,target,always,0,,,,,,6,
@@ -10990,6 +11076,9 @@
2997,Kimi's Phantom@NPC_WIDESOULDRAIN,attack,680,3,10000,5000,50000,no,self,myhpltmaxrate,10,,,,,,42,
2997,Kimi's Phantom@NPC_MAXPAIN,attack,716,3,10000,3000,50000,no,self,myhpltmaxrate,10,,,,,,,
2997,Kimi's Phantom@NPC_POWERUP,attack,349,1,10000,0,50000,no,self,myhpltmaxrate,5,,,,,,6,
+
+3026,Fire Pit@NPC_DEATHSUMMON,dead,718,3,10000,0,10000,no,self,always,0,3027,3027,3027,,,,
+
3038,Hidden Mob 7@NPC_INVISIBLE,idle,353,1,10000,0,30000,yes,self,always,0,,,,,,,
3038,Hidden Mob 7@NPC_INVISIBLE,attack,353,1,10000,0,30000,yes,self,always,0,,,,,,,
// 3038,Hidden Mob 7@NPC_HELLBURNING,idle,719,1,10000,0,3000,yes,self,always,0,,,,,,,
@@ -11006,3 +11095,8 @@
3074,Time Holder@NPC_PULSESTRIKE,attack,661,5,2000,0,30000,yes,self,always,0,,,,,,,
3074,Time Holder@NPC_SUMMONSLAVE,attack,196,5,1000,700,10000,no,self,slavele,0,2917,,,,,,
3074,Time Holder@NPC_SUMMONSLAVE,idle,196,5,1000,700,10000,no,self,slavele,0,2917,,,,,,
+
+3200,Wicked Chimera@WZ_HEAVENDRIVE,attack,91,5,500,1200,5000,yes,target,always,0,,,,,,6,
+3200,Wicked Chimera@WZ_HEAVENDRIVE,chase,91,5,500,1200,5000,yes,target,always,0,,,,,,6,
+3200,Wicked Chimera@CR_AUTOGUARD,attack,249,5,500,0,300000,yes,self,always,0,,,,,,,
+3200,Wicked Chimera@CR_AUTOGUARD,chase,249,5,2000,0,300000,yes,self,longrangeattacked,,,,,,,,
diff --git a/db/re/quest_db.txt b/db/re/quest_db.txt
index 5f90d5f1a7b..a7ca28d23a2 100644
--- a/db/re/quest_db.txt
+++ b/db/re/quest_db.txt
@@ -136,6 +136,10 @@
1239,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Shop guide"
1240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Shop guide"
+// Ghost Palace memorial
+1261,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Cursed Swordman"
+1263,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Cursed Swordman"
+
2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Job Change to Blacksmith"
2001,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Job Change to Blacksmith"
2002,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Job Change to Blacksmith"
@@ -686,6 +690,16 @@
4286,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ninja training-test"
4287,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ninja training-test"
+// Episode 15.1 Bard's Story
+4295,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Wandering Bard"
+4296,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Take a Break"
+4297,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Bard's Story: Some Corporation"
+4298,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Bard's Story: The President"
+4299,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Bard's Story: a Scholar in Juno"
+4300,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Bard's Story: a Mad Scientist"
+4301,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Bard's Story: Hugel"
+4302,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Bard's Story: Odin Temple"
+
//4303,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
//4304,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
//4305,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
@@ -865,6 +879,55 @@
5226,7200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Saving energy crystal[Stand by]"
5227,7200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Saving energy crystal[Stand by]"
+// Episode 15.1 Phantasmagorika
+5304,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Police Chief Kesler"
+5305,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Police Officer Salgran"
+5306,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Police Officer Gerev"
+5307,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Police Officer Seiden"
+5308,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Police Officer Piffs"
+5309,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Police Chief's Request"
+5310,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Salgran's Problem"
+5311,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Gerev's Problem"
+5312,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Seiden's Problem"
+5313,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Piffs's Problem"
+5314,0,3159,10,0,0,0,0,0,0,0,0,0,0,0,0,0,"Salgran's Request"
+5315,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Gerev's Request"
+5316,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Seiden's Request"
+5317,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Piffs's Request"
+5318,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Come Back Tomorrow"
+
+// Episode 15.2 Memory Record
+5341,79200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Restriction on the Journey"
+5342,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Help Her"
+5343,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Making a Head Count"
+5344,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Making a Head Count"
+5345,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Making a Head Count"
+5346,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Making a Head Count"
+5347,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Finishing a Head Count"
+5348,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Finishing a Head Count"
+5349,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Finishing a Head Count"
+5350,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Finishing a Head Count"
+5351,79200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Restriction on the Journey"
+5352,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Air Purifier"
+5353,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Delivered to C-0"
+5354,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Delivered to F-1"
+5355,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Delivered to F-2"
+5356,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Delivered to I-0"
+5357,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Delivered to Z-0"
+5358,79200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Restriction on the Journey"
+5359,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Grape Harvest"
+5360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Grape Delivery"
+5361,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Grape Delivery"
+5362,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Grape Delivery"
+5363,79200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Restriction on the Journey"
+5364,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Subdue Hysterical Patients"
+5365,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Urgent News"
+5366,79200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Restriction on the Journey"
+5367,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Daily Necessities Transport"
+5368,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Delivered Supplies"
+5369,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Delivered the Message"
+5370,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Memory Record"
+
6000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Job Change to Taekwon"
6001,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Job Change to Taekwon"
6002,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Job Change to Taekwon"
@@ -1442,16 +1505,49 @@
7563,72000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Standby for Kafragaten Challenge 1"
7564,72000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Standby for Kafragaten Challenge 2"
-//7619,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
-//7621,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
-//7622,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
-//7623,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
-//7624,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
-//7625,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
-//7626,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
-//7627,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
-//7628,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
-//7629,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
+// Episode 15.1 Verus City
+7606,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Phantasmagorika Excavator Recruitment"
+7607,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Eden Group Leader"
+7608,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Artnard Excavation Team 1"
+7609,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Artnard Excavation Team 2"
+7610,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Registered Excavator"
+7611,0,3154,10,0,0,0,0,0,0,0,0,0,0,0,0,0,"Passage Cleaning"
+7612,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Passage Cleaning - Down"
+7613,0,3155,15,3156,15,0,0,0,0,0,0,0,0,0,0,0,"Eliminating Risks"
+7614,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Eliminating Risks - Down"
+7615,0,0,0,0,0,0,0,3154,6749,2000,3155,6749,2000,3156,6749,2000,"Core Collection"
+7616,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Core Collection - Down"
+7617,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Turning In Excavation Report"
+7618,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Reporting the Results - Down"
+7619,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Assisting the Excavation Team"
+7620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Young Blood?"
+7621,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Bottling the Energy"
+7622,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Good News!"
+7623,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Artnard's Summon"
+7624,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"In Search of a Delicacy"
+7625,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Count On Me"
+7626,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Delicacy for Him"
+7627,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Last Exploration"
+7628,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"New Power Source"
+7629,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Tomorrow for Tomorrow's Energy"
+
+// Episode 15.2 Atnad Excavator 2
+7641,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Access Permitted"
+7642,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Explore Research facilities"
+7643,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Mysterious Piece"
+7644,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Record Player"
+7645,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Piece of Memory Record"
+7646,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Play Memory Record"
+7647,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Report Memory Record"
+7648,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Memory Records of the Laboratories"
+7649,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Report Memory Record Content"
+7650,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Collect Memory Records of Research facilities"
+7651,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"One Memory a Day"
+7652,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Collect Memory Records of Laboratories"
+7653,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"One Memory a Day 2"
+7654,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Play Research facilities Memory Records"
+7655,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Play Laboratories Memory Records"
+7656,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Invitation of Rekenber"
// Lasagna Quests
7711,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Beginning"
@@ -1843,6 +1939,15 @@
9260,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Survey investigation notes"
9262,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Mystery Robbery Incident 16"
+// Academy 14.2
+9264,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Job change to Mage"
+9265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Job change to Mage"
+9266,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Job change to Mage"
+9267,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"The way to be a strong Mage - 1"
+9268,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"The way to be a strong Mage - 2"
+9269,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"The way to be a strong Mage - 3"
+9270,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"The way to be a strong Mage - 4"
+
//Geffen Magic Tournament
9284,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9285,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
@@ -1878,15 +1983,6 @@
9315,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9316,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
-// Academy 14.2
-9264,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Job change to Mage"
-9265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Job change to Mage"
-9266,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Job change to Mage"
-9267,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"The way to be a strong Mage - 1"
-9268,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"The way to be a strong Mage - 2"
-9269,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"The way to be a strong Mage - 3"
-9270,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"The way to be a strong Mage - 4"
-
//9327,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
//9328,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
//9329,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
@@ -1896,6 +1992,11 @@
//9333,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
//9334,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
+// Sarah Fenrir memorial
+9335,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Search for shards of Gigantes"
+9336,604800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Go back to Professor Bernhard"
+9337,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Wrapping up the Adventure"
+
10000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"To the Prontera Royal Court"
10001,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Qualification Test"
10002,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Qualification Review"
@@ -2333,9 +2434,54 @@
11347,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Acolyte_soft bone(LV.18)"
11348,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Acolyte_Solid bone(LV.23)"
-//11366,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
+// Dimensional Travel Quest
+11349,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Dimensional Travel"
+11350,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Dimensional Travel"
+11351,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Dimensional Travel"
+11352,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Dimensional Travel"
+11353,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Dimensional Travel"
+11354,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Specimen Collection"
+11355,0,3026,20,0,0,0,0,0,0,0,0,0,0,0,0,0,"Specimen Collection"
+11356,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Specimen Collection"
+11357,0,3028,25,0,0,0,0,0,0,0,0,0,0,0,0,0,"Specimen Collection"
+11358,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Specimen Collection"
+11359,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Antidote"
+11360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Antidote"
+11361,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Antidote"
+11362,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Antidote"
+
+// Episode 15.1 To Phantasmagorika!
+11363,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"To Phantasmagorika!"
+11364,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"To Phantasmagorika!"
+11365,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"To Phantasmagorika!"
+11366,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"To Phantasmagorika!"
+11367,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Looking for the Traces"
+11368,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Looking for the Traces"
+11369,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Looking for the Traces"
+11370,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Looking for the Traces"
+11371,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Looking for the Traces"
+11372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Looking for the Traces"
+11373,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Looking for the Traces"
+11374,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Looking for the Traces"
+11375,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Looking for the Traces"
+11376,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Let the Specialists Handle It"
+11377,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Act of Kindness"
+
11378,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Trick or treat" // Halloween Event 2013
+// Episode 15.2 The Last Room Instance
+11379,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Final Room"
+11380,0,3254,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Final Room"
+11381,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Vestige"
+11382,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Vestige"
+11383,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Vestige"
+11384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Vestige"
+11385,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Vestige"
+11386,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Vestige"
+11387,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Vestige"
+11388,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Vestige"
+11389,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Vestige"
+
// Lasagna Quests
11435,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Vigilante Corp"
11436,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Vigilante Corp"
@@ -2690,6 +2836,10 @@
12344,0,3170,3,0,0,0,0,0,0,0,0,0,0,0,0,0,"Rebellion Job Change Quest"
12345,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Rebellion Job Change Quest"
+// Episode 15.2: Central Laboratory
+12346,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Strange Ancient Science"
+12347,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Trace of Laboratory Access"
+
12363,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"?????? ?? ??"
13000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"RWC2011Card Gathering"
@@ -2869,6 +3019,19 @@
13187,0,3125,50,0,0,0,0,0,0,0,0,0,0,0,0,0,"Deal with the Staff"
13188,72000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Deal with the Staff - Hold"
+// Episode 15.2 Krotzel's Request
+13195,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Monthly Brigan"
+13196,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Monthly Brigan"
+13197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Monthly Brigan"
+13198,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Monthly Brigan : Krotzel's Request"
+13199,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Krotzel's Request - Complete"
+13200,0,3247,30,0,0,0,0,0,0,0,0,0,0,0,0,0,"Monthly Brigan : Rookie's Request"
+13201,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Rookie's Request - Complete"
+13202,0,3248,30,0,0,0,0,0,0,0,0,0,0,0,0,0,"Monthly Brigan : Photo Journalist's Request"
+13203,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Photo Journalist's Request - Complete"
+13204,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Monthly Brigan : Grylls' Request"
+13205,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Grylls' Request - Complete"
+
14118,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Wuhari's concern"
14119,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Test of patience"
14120,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Test of patience 2"
@@ -3337,7 +3500,8 @@
19129,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"The Eye of Hellion"
21001,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Escape the Wreck"
-21002,0,0,0,0,0,0,0,1002,6008,10000,0,0,0,0,0,0,"The first battle"
+21002,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"The first battle"
+21008,0,0,0,0,0,0,0,2401,6008,10000,0,0,0,0,0,0,"The first battle"
50000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Pirate Dagger materials"
50001,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Weather Beaten Old Man"
diff --git a/db/re/refine_db.txt b/db/re/refine_db.txt
deleted file mode 100644
index 87a134b276a..00000000000
--- a/db/re/refine_db.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-// Refine Database [Renewal]
-//
-// Structure of Database:
-// Type,Stats per level,Random bonus start level,Random bonus value,Chance+1:Bonus+1,Chance+2:Bonus+2,Chance+3:Bonus+3,...
-//
-// For armors, values of 100 add 1 armor defense.
-// For weapons, values of 100 add 1 ATK&MATK.
-//
-// Type:
-// 0 - Armors
-// 1 - Level 1 weapons
-// 2 - Level 2 weapons
-// 3 - Level 3 weapons
-// 4 - Level 4 weapons
-//
-// Stats per level:
-// This value is applied for every upgrade level.
-//
-// Random bonus start level:
-// This value specifies the start point for those levels that give a random bonus value (usually the first unsafe upgrade).
-//
-// Random bonus value:
-// A random number between 0 and (Random bonus start level - Upgrade level + 1) * this value is applied for all upgrades past
-// Random bonus start level. This is only applied for weapons, and not displayed client-side.
-//
-// Chance:
-// 100 = 100%
-//
-// Notes:
-// Changing the number of upgrade levels requires modifying MAX_REFINE in src/map/status.h.
-// For Renewal Armors, there may or may not be another bonus, according to iRO wiki: Every upgrade gives floor[( 3 + current upgrade ) / 4] equipment DEF)
-
-0,0,0,0,100:100,100:100,100:100,100:100,60:200,40:200,40:200,20:200,20:300,9:300,8:300,8:300,8:400,8:400,7:400,7:400,7:500,7:500,5:500,5:500
-// Level 1 weapons
-1,200,8,300,100:0,100:0,100:0,100:0,100:0,100:0,100:0,60:0,40:0,19:0,18:0,18:0,18:0,18:0,18:0,17:300,17:300,17:300,15:300,15:300
-// Level 2 weapons
-2,300,7,500,100:0,100:0,100:0,100:0,100:0,100:0,60:0,40:0,20:0,19:0,18:0,18:0,18:0,18:0,18:0,17:600,17:600,17:600,15:600,15:600
-// Level 3 weapons
-3,500,6,800,100:0,100:0,100:0,100:0,100:0,60:0,50:0,20:0,20:0,19:0,18:0,18:0,18:0,18:0,18:0,17:900,17:900,17:900,15:900,15:900
-// Level 4 weapons
-4,700,5,1400,100:0,100:0,100:0,100:0,60:0,40:0,40:0,20:0,20:0,9:0,8:0,8:0,8:0,8:0,7:0,7:1200,7:1200,7:1200,5:1200,5:1200
diff --git a/db/re/refine_db.yml b/db/re/refine_db.yml
new file mode 100644
index 00000000000..f96e0d2d9a8
--- /dev/null
+++ b/db/re/refine_db.yml
@@ -0,0 +1,584 @@
+# 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/>.
+#
+###########################################################################
+# Renewal Refine Database
+###########################################################################
+Armor:
+ StatsPerLevel: 0
+ RandomBonusStartLevel: 0
+ RandomBonusValue: 0
+ Costs:
+ - Type: REFINE_COST_NORMAL
+ Price: 2000
+ Material: 985
+ - Type: REFINE_COST_OVER10
+ Price: 100000
+ Material: 6223
+ - Type: REFINE_COST_HD
+ Price: 20000
+ Material: 6241
+ - Type: REFINE_COST_ENRICHED
+ Price: 2000
+ Material: 7619
+ - Type: REFINE_COST_OVER10_HD
+ Price: 100000
+ Material: 6225
+ Rates:
+ - Level: 1
+ Bonus: 100
+ - Level: 2
+ Bonus: 100
+ - Level: 3
+ Bonus: 100
+ - Level: 4
+ Bonus: 100
+ - Level: 5
+ NormalChance: 60
+ EnrichedChance: 90
+ EventNormalChance: 60
+ EventEnrichedChance: 95
+ Bonus: 200
+ - Level: 6
+ NormalChance: 40
+ EnrichedChance: 70
+ EventNormalChance: 40
+ EventEnrichedChance: 80
+ Bonus: 200
+ - Level: 7
+ NormalChance: 40
+ EnrichedChance: 70
+ EventNormalChance: 40
+ EventEnrichedChance: 80
+ Bonus: 200
+ - Level: 8
+ NormalChance: 20
+ EnrichedChance: 40
+ EventNormalChance: 20
+ EventEnrichedChance: 50
+ Bonus: 200
+ - Level: 9
+ NormalChance: 20
+ EnrichedChance: 40
+ EventNormalChance: 20
+ EventEnrichedChance: 50
+ Bonus: 300
+ - Level: 10
+ NormalChance: 9
+ EnrichedChance: 20
+ EventNormalChance: 9
+ EventEnrichedChance: 35
+ Bonus: 300
+ - Level: 11
+ NormalChance: 8
+ EnrichedChance: 8
+ EventNormalChance: 20
+ EventEnrichedChance: 20
+ Bonus: 300
+ - Level: 12
+ NormalChance: 8
+ EnrichedChance: 8
+ EventNormalChance: 20
+ EventEnrichedChance: 20
+ Bonus: 300
+ - Level: 13
+ NormalChance: 8
+ EnrichedChance: 8
+ EventNormalChance: 16
+ EventEnrichedChance: 16
+ Bonus: 400
+ - Level: 14
+ NormalChance: 8
+ EnrichedChance: 8
+ EventNormalChance: 16
+ EventEnrichedChance: 16
+ Bonus: 400
+ - Level: 15
+ NormalChance: 7
+ EnrichedChance: 7
+ EventNormalChance: 15
+ EventEnrichedChance: 15
+ Bonus: 400
+ - Level: 16
+ NormalChance: 7
+ EnrichedChance: 7
+ EventNormalChance: 15
+ EventEnrichedChance: 15
+ Bonus: 400
+ - Level: 17
+ NormalChance: 7
+ EnrichedChance: 7
+ EventNormalChance: 14
+ EventEnrichedChance: 14
+ Bonus: 500
+ - Level: 18
+ NormalChance: 7
+ EnrichedChance: 7
+ EventNormalChance: 14
+ EventEnrichedChance: 14
+ Bonus: 500
+ - Level: 19
+ NormalChance: 5
+ EnrichedChance: 5
+ EventNormalChance: 10
+ EventEnrichedChance: 10
+ Bonus: 500
+ - Level: 20
+ NormalChance: 5
+ EnrichedChance: 5
+ EventNormalChance: 10
+ EventEnrichedChance: 10
+ Bonus: 500
+WeaponLv1:
+ StatsPerLevel: 200
+ RandomBonusStartLevel: 8
+ RandomBonusValue: 300
+ Costs:
+ - Type: REFINE_COST_NORMAL
+ Price: 50
+ Material: 1010
+ - Type: REFINE_COST_OVER10
+ Price: 100000
+ Material: 6224
+ - Type: REFINE_COST_HD
+ Price: 20000
+ Material: 6240
+ - Type: REFINE_COST_ENRICHED
+ Price: 2000
+ Material: 7620
+ - Type: REFINE_COST_OVER10_HD
+ Price: 100000
+ Material: 6226
+ Rates:
+ - Level: 8
+ NormalChance: 60
+ EnrichedChance: 90
+ EventNormalChance: 60
+ EventEnrichedChance: 95
+ - Level: 9
+ NormalChance: 40
+ EnrichedChance: 70
+ EventNormalChance: 40
+ EventEnrichedChance: 85
+ - Level: 10
+ NormalChance: 19
+ EnrichedChance: 30
+ EventNormalChance: 19
+ EventEnrichedChance: 55
+ - Level: 11
+ NormalChance: 18
+ EnrichedChance: 18
+ EventNormalChance: 40
+ EventEnrichedChance: 40
+ - Level: 12
+ NormalChance: 18
+ EnrichedChance: 18
+ EventNormalChance: 40
+ EventEnrichedChance: 40
+ - Level: 13
+ NormalChance: 18
+ EnrichedChance: 18
+ EventNormalChance: 35
+ EventEnrichedChance: 35
+ - Level: 14
+ NormalChance: 18
+ EnrichedChance: 18
+ EventNormalChance: 35
+ EventEnrichedChance: 35
+ - Level: 15
+ NormalChance: 18
+ EnrichedChance: 18
+ EventNormalChance: 30
+ EventEnrichedChance: 30
+ - Level: 16
+ NormalChance: 17
+ EnrichedChance: 17
+ EventNormalChance: 30
+ EventEnrichedChance: 30
+ Bonus: 300
+ - Level: 17
+ NormalChance: 17
+ EnrichedChance: 17
+ EventNormalChance: 20
+ EventEnrichedChance: 20
+ Bonus: 300
+ - Level: 18
+ NormalChance: 17
+ EnrichedChance: 17
+ EventNormalChance: 20
+ EventEnrichedChance: 20
+ Bonus: 300
+ - Level: 19
+ NormalChance: 15
+ EnrichedChance: 15
+ EventNormalChance: 15
+ EventEnrichedChance: 15
+ Bonus: 300
+ - Level: 20
+ NormalChance: 15
+ EnrichedChance: 15
+ EventNormalChance: 15
+ EventEnrichedChance: 15
+ Bonus: 300
+WeaponLv2:
+ StatsPerLevel: 300
+ RandomBonusStartLevel: 7
+ RandomBonusValue: 500
+ Costs:
+ - Type: REFINE_COST_NORMAL
+ Price: 200
+ Material: 1011
+ - Type: REFINE_COST_OVER10
+ Price: 100000
+ Material: 6224
+ - Type: REFINE_COST_HD
+ Price: 20000
+ Material: 6240
+ - Type: REFINE_COST_ENRICHED
+ Price: 2000
+ Material: 7620
+ - Type: REFINE_COST_OVER10_HD
+ Price: 100000
+ Material: 6226
+ Rates:
+ - Level: 7
+ NormalChance: 60
+ EnrichedChance: 90
+ EventNormalChance: 60
+ EventEnrichedChance: 95
+ - Level: 8
+ NormalChance: 40
+ EnrichedChance: 70
+ EventNormalChance: 40
+ EventEnrichedChance: 85
+ - Level: 9
+ NormalChance: 20
+ EnrichedChance: 40
+ EventNormalChance: 20
+ EventEnrichedChance: 60
+ - Level: 10
+ NormalChance: 19
+ EnrichedChance: 30
+ EventNormalChance: 19
+ EventEnrichedChance: 45
+ - Level: 11
+ NormalChance: 18
+ EnrichedChance: 18
+ EventNormalChance: 40
+ EventEnrichedChance: 40
+ - Level: 12
+ NormalChance: 18
+ EnrichedChance: 18
+ EventNormalChance: 40
+ EventEnrichedChance: 40
+ - Level: 13
+ NormalChance: 18
+ EnrichedChance: 18
+ EventNormalChance: 35
+ EventEnrichedChance: 35
+ - Level: 14
+ NormalChance: 18
+ EnrichedChance: 18
+ EventNormalChance: 35
+ EventEnrichedChance: 35
+ - Level: 15
+ NormalChance: 18
+ EnrichedChance: 18
+ EventNormalChance: 30
+ EventEnrichedChance: 30
+ - Level: 16
+ NormalChance: 17
+ EnrichedChance: 17
+ EventNormalChance: 30
+ EventEnrichedChance: 30
+ Bonus: 600
+ - Level: 17
+ NormalChance: 17
+ EnrichedChance: 17
+ EventNormalChance: 20
+ EventEnrichedChance: 20
+ Bonus: 600
+ - Level: 18
+ NormalChance: 17
+ EnrichedChance: 17
+ EventNormalChance: 20
+ EventEnrichedChance: 20
+ Bonus: 600
+ - Level: 19
+ NormalChance: 15
+ EnrichedChance: 15
+ EventNormalChance: 15
+ EventEnrichedChance: 15
+ Bonus: 600
+ - Level: 20
+ NormalChance: 15
+ EnrichedChance: 15
+ EventNormalChance: 15
+ EventEnrichedChance: 15
+ Bonus: 600
+WeaponLv3:
+ StatsPerLevel: 500
+ RandomBonusStartLevel: 6
+ RandomBonusValue: 800
+ Costs:
+ - Type: REFINE_COST_NORMAL
+ Price: 5000
+ Material: 984
+ - Type: REFINE_COST_OVER10
+ Price: 100000
+ Material: 6224
+ - Type: REFINE_COST_HD
+ Price: 20000
+ Material: 6240
+ - Type: REFINE_COST_ENRICHED
+ Price: 2000
+ Material: 7620
+ - Type: REFINE_COST_OVER10_HD
+ Price: 100000
+ Material: 6226
+ Rates:
+ - Level: 6
+ NormalChance: 60
+ EnrichedChance: 90
+ EventNormalChance: 60
+ EventEnrichedChance: 95
+ - Level: 7
+ NormalChance: 50
+ EnrichedChance: 80
+ EventNormalChance: 50
+ EventEnrichedChance: 90
+ - Level: 8
+ NormalChance: 20
+ EnrichedChance: 40
+ EventNormalChance: 20
+ EventEnrichedChance: 70
+ - Level: 9
+ NormalChance: 20
+ EnrichedChance: 40
+ EventNormalChance: 20
+ EventEnrichedChance: 60
+ - Level: 10
+ NormalChance: 19
+ EnrichedChance: 30
+ EventNormalChance: 19
+ EventEnrichedChance: 45
+ - Level: 11
+ NormalChance: 18
+ EnrichedChance: 18
+ EventNormalChance: 40
+ EventEnrichedChance: 40
+ - Level: 12
+ NormalChance: 18
+ EnrichedChance: 18
+ EventNormalChance: 40
+ EventEnrichedChance: 40
+ - Level: 13
+ NormalChance: 18
+ EnrichedChance: 18
+ EventNormalChance: 35
+ EventEnrichedChance: 35
+ - Level: 14
+ NormalChance: 18
+ EnrichedChance: 18
+ EventNormalChance: 35
+ EventEnrichedChance: 35
+ - Level: 15
+ NormalChance: 18
+ EnrichedChance: 18
+ EventNormalChance: 30
+ EventEnrichedChance: 30
+ - Level: 16
+ NormalChance: 17
+ EnrichedChance: 17
+ EventNormalChance: 30
+ EventEnrichedChance: 30
+ Bonus: 900
+ - Level: 17
+ NormalChance: 17
+ EnrichedChance: 17
+ EventNormalChance: 20
+ EventEnrichedChance: 20
+ Bonus: 900
+ - Level: 18
+ NormalChance: 17
+ EnrichedChance: 17
+ EventNormalChance: 20
+ EventEnrichedChance: 20
+ Bonus: 900
+ - Level: 19
+ NormalChance: 15
+ EnrichedChance: 15
+ EventNormalChance: 15
+ EventEnrichedChance: 15
+ Bonus: 900
+ - Level: 20
+ NormalChance: 15
+ EnrichedChance: 15
+ EventNormalChance: 15
+ EventEnrichedChance: 15
+ Bonus: 900
+WeaponLv4:
+ StatsPerLevel: 700
+ RandomBonusStartLevel: 5
+ RandomBonusValue: 1400
+ Costs:
+ - Type: REFINE_COST_NORMAL
+ Price: 20000
+ Material: 984
+ - Type: REFINE_COST_OVER10
+ Price: 100000
+ Material: 6224
+ - Type: REFINE_COST_HD
+ Price: 20000
+ Material: 6240
+ - Type: REFINE_COST_ENRICHED
+ Price: 2000
+ Material: 7620
+ - Type: REFINE_COST_OVER10_HD
+ Price: 100000
+ Material: 6226
+ Rates:
+ - Level: 5
+ NormalChance: 60
+ EnrichedChance: 90
+ EventNormalChance: 60
+ EventEnrichedChance: 95
+ - Level: 6
+ NormalChance: 40
+ EnrichedChance: 70
+ EventNormalChance: 40
+ EventEnrichedChance: 80
+ - Level: 7
+ NormalChance: 40
+ EnrichedChance: 70
+ EventNormalChance: 40
+ EventEnrichedChance: 80
+ - Level: 8
+ NormalChance: 20
+ EnrichedChance: 40
+ EventNormalChance: 20
+ EventEnrichedChance: 60
+ - Level: 9
+ NormalChance: 20
+ EnrichedChance: 40
+ EventNormalChance: 20
+ EventEnrichedChance: 50
+ - Level: 10
+ NormalChance: 9
+ EnrichedChance: 20
+ EventNormalChance: 9
+ EventEnrichedChance: 35
+ - Level: 11
+ NormalChance: 8
+ EnrichedChance: 8
+ EventNormalChance: 20
+ EventEnrichedChance: 20
+ - Level: 12
+ NormalChance: 8
+ EnrichedChance: 8
+ EventNormalChance: 20
+ EventEnrichedChance: 20
+ - Level: 13
+ NormalChance: 8
+ EnrichedChance: 8
+ EventNormalChance: 16
+ EventEnrichedChance: 16
+ - Level: 14
+ NormalChance: 8
+ EnrichedChance: 8
+ EventNormalChance: 16
+ EventEnrichedChance: 16
+ - Level: 15
+ NormalChance: 7
+ EnrichedChance: 7
+ EventNormalChance: 15
+ EventEnrichedChance: 15
+ - Level: 16
+ NormalChance: 7
+ EnrichedChance: 7
+ EventNormalChance: 15
+ EventEnrichedChance: 15
+ Bonus: 1200
+ - Level: 17
+ NormalChance: 7
+ EnrichedChance: 7
+ EventNormalChance: 14
+ EventEnrichedChance: 14
+ Bonus: 1200
+ - Level: 18
+ NormalChance: 7
+ EnrichedChance: 7
+ EventNormalChance: 14
+ EventEnrichedChance: 14
+ Bonus: 1200
+ - Level: 19
+ NormalChance: 5
+ EnrichedChance: 5
+ EventNormalChance: 10
+ EventEnrichedChance: 10
+ Bonus: 1200
+ - Level: 20
+ NormalChance: 5
+ EnrichedChance: 5
+ EventNormalChance: 10
+ EventEnrichedChance: 10
+ Bonus: 1200
+Shadow:
+ StatsPerLevel: 0
+ RandomBonusStartLevel: 0
+ RandomBonusValue: 0
+ Costs:
+ - Type: REFINE_COST_NORMAL
+ Price: 20000
+ Material: 985
+ - Type: REFINE_COST_HD
+ Price: 20000
+ Material: 6241
+ - Type: REFINE_COST_ENRICHED
+ Price: 20000
+ Material: 7619
+ Rates:
+ - Level: 5
+ NormalChance: 60
+ EnrichedChance: 90
+ EventNormalChance: 60
+ EventEnrichedChance: 95
+ - Level: 6
+ NormalChance: 40
+ EnrichedChance: 70
+ EventNormalChance: 40
+ EventEnrichedChance: 80
+ - Level: 7
+ NormalChance: 40
+ EnrichedChance: 70
+ EventNormalChance: 40
+ EventEnrichedChance: 80
+ - Level: 8
+ NormalChance: 20
+ EnrichedChance: 40
+ EventNormalChance: 20
+ EventEnrichedChance: 50
+ - Level: 9
+ NormalChance: 20
+ EnrichedChance: 40
+ EventNormalChance: 20
+ EventEnrichedChance: 50
+ - Level: 10
+ NormalChance: 9
+ EnrichedChance: 20
+ EventNormalChance: 9
+ EventEnrichedChance: 35
diff --git a/db/re/skill_cast_db.txt b/db/re/skill_cast_db.txt
index d43791e74f4..a1179794493 100644
--- a/db/re/skill_cast_db.txt
+++ b/db/re/skill_cast_db.txt
@@ -570,7 +570,7 @@
//-- CH_PALMSTRIKE
370,0,300,0,0,0,0,0
//-- CH_TIGERFIST
-371,0,0,0,0,2000:4000:6000:8000:10000,0,0
+371,0,0,0,4000:8000:12000:16000:24000,0,0,0
//==========================================
@@ -853,11 +853,11 @@
//-- GS_INCREASING
506,0,1000,0,60000,0,0,0
//-- GS_MAGICALBULLET
-507,0,500,0,0,0,0,0
+507,0,500,0,30000,0,0,0
//-- GS_CRACKER
508,0,1000,0,0,5000,0,0
//-- GS_TRACKING
-512,600:700:800:900:1000:1100:1200:1300:1400:1500,1500,0,0,0,0,600:700:800:900:1000:1100:1200:1300:1400:1500
+512,0,1500,0,0,0,0,600:700:800:900:1000:1100:1200:1300:1400:1500
//-- GS_DISARM
513,1600,1000,0,30000,0,0,400
//-- GS_PIERCINGSHOT
@@ -869,11 +869,11 @@
//-- GS_GATLINGFEVER
517,800,1000,0,30000:45000:60000:75000:90000:105000:120000:135000:150000:165000,0,0,200
//-- GS_DUST
-518,1200,1000,0,0,0,0,300
+518,0,1000,0,0,0,0,-1
//-- GS_FULLBUSTER
519,800,1200:1400:1600:1800:2000:2200:2400:2600:2800:3000,0,0,10000,0,200
//-- GS_SPREADATTACK
-520,800,1000,0,0,0,0,200
+520,0,1000,0,0,0,0,-1
//-- GS_GROUNDDRIFT (Upkeep2 times are duration of: Stun(lv1), Blind(lv2), Poison(lv3) and Freeze(lv4))
521,800,1000,0,3000:6000:9000:12000:15000:18000:21000:24000:27000:30000,5000:20000:20000:30000,0,200
//==========================================
@@ -1654,43 +1654,43 @@
//-- RL_RICHS_COIN
2552,0,1000,0,600000,0,3000,-1
//-- RL_MASS_SPIRAL
-2553,1000,1000,0,0,30000,10000,2000
+2553,2000,1000,0,0,30000,2000,1000
//-- RL_BANISHING_BUSTER
-2554,3000:2500:2000:1500:1000,0,0,0,0,10000,-1
+2554,3000:2500:2000:1500:1000,2000,0,0,0,10000,-1
//-- RL_B_TRAP
-2555,0,0,0,10000:11000:12000:13000:14000,6000:7000:8000:9000:10000,0,-1
+2555,0,2500:2000:1500:1000:500,0,10000,9000:14000:19000:24000:29000,10000,-1
//-- RL_FLICKER
2556,0,0,0,0,0,10000,-1
//-- RL_S_STORM
-2557,3000:2500:2000:1500:1000,0,0,0,0,2000,-1
+2557,3000:2500:2000:1500:1000,2000,0,0,0,2000,1000
//-- RL_E_CHAIN
-2558,0,1000,0,45000:60000:75000:90000:105000:120000:135000:150000:165000:180000,0,5000,-1
+2558,1000,1000,0,45000:60000:75000:90000:105000:120000:135000:150000:165000:180000,0,0,-1
//-- RL_QD_SHOT
-2559,0,1000,0,1500,0,5000,-1
+2559,0,0,0,1500,0,0,-1
//-- RL_C_MARKER
2560,0,0,0,30000,0,1000,-1
//-- RL_FIREDANCE
-2561,0,2000,0,0,0,5000,-1
+2561,0,500,0,0,0,5000,-1
//-- RL_H_MINE
-2562,1500,0,0,30000,15000,5000:4500:4000:3500:3000,500
+2562,1000,1000,0,50000,15000,5000:4500:4000:3500:3000,-1
//-- RL_P_ALTER
-2563,0,1000,0,30000:45000:60000:75000:90000,0,5000,-1
+2563,0,0,0,30000:45000:60000:75000:90000,0,0,-1
//-- RL_FALLEN_ANGEL
-2564,500,1500,0,0,0,10000:8000:6000:4000:2000,500
+2564,0,0,0,2000,0,0,-1
//-- RL_R_TRIP
-2565,0,1000,0,0,0,1000,-1
+2565,0,1000,0,0,0,3000:2500:2000:1500:1000,-1
//-- RL_D_TAIL
-2566,500,2000,0,0,0,5000,500
+2566,1200:1400:1600:1800:2000,2000,0,0,0,5000,-1
//-- RL_FIRE_RAIN
-2567,1800:1600:1400:1200:1000,2000,0,100,0,5000,200
+2567,0,1000,0,100,0,5000,-1
//-- RL_HEAT_BARREL
-2568,0,1000,0,60000,10000,10000,-1
+2568,2000,1000,0,60000,0,100000:95000:90000:85000:80000,-1
//-- RL_AM_BLAST
2569,2000,1000,0,0,6000:7000:8000:9000:10000,5000,1000
//-- RL_SLUGSHOT
-2570,5000:6000:7000:8000:9000,1000,0,0,2000,10000,1000
+2570,5000:6000:7000:8000:9000,1000,0,0,2000,5000,1000
//-- RL_HAMMER_OF_GOD
-2571,8000,2000,0,0,3000:3000:4000:4000:5000,30000,2000
+2571,0,2000,0,0,3000:3000:4000:4000:5000,30000,-1
//-- RL_R_TRIP_PLUSATK
//2572,0,0,0,0,0,0,-1
//-- RL_B_FLICKER_ATK
@@ -1770,7 +1770,7 @@
//===== Summoner ===========================
//-- SU_BITE
-5019,1000,1000,0,0,0,0,0
+5019,1000,1000,0,0,0,0,-1
//-- SU_HIDE
5020,0,1000,0,-1,0,15000,0
//-- SU_SCRATCH
@@ -1778,35 +1778,62 @@
//-- SU_STOOP
5022,0,1000,0,6000,0,15000,0
//-- SU_LOPE
-5023,500,1000,0,0,0,2000:4000:6000,0
+5023,500,1000,0,0,0,2000:4000:6000,-1
//-- SU_SV_STEMSPEAR
-5026,2500,1000,0,0,120000,0,0
+5026,2000,1000,0,0,120000,0,-1
//-- SU_CN_POWDERING
-5027,1500,1000,0,3000:4000:5000:6000:7000,0,0,0
+5027,2000,1000,0,3000:4000:5000:6000:7000,0,10000,-1
//-- SU_CN_METEOR
-5028,7500,1000,0,1500:2000:2500:3000:3500,20000,5000,-1
+5028,3000,1000,0,1500:2000:2500:3000:3500,20000,5000,3000
//-- SU_SV_ROOTTWIST
-5029,0,1000,0,7000:9000:11000:13000:15000,0,3000,0
-//-- SU_SV_ROOTTWIST_ATK
-5030,0,1000,0,0,0,0
+5029,0,1000,0,7000:9000:11000:13000:15000,0,3000:2500:2000:1500:1000,0
//-- SU_SCAROFTAROU
-5032,500,1000,0,9000,1000,0,0
+5032,500,1000,0,9000,1000,10000,-1
//-- SU_PICKYPECK
-5033,2500,1000,0,0,0,0,0
+5033,1000,1000,0,0,0,0,-1
//-- SU_PICKYPECK_DOUBLE_ATK
5034,0,1000,0,0,0,0,0
//-- SU_ARCLOUSEDASH
-5035,2500,1000,0,60000:70000:80000:90000:100000,0,10000,0
+5035,1000,1000,0,60000:70000:80000:90000:100000,0,10000,0
//-- SU_LUNATICCARROTBEAT
-5036,1500,1000,0,0,5000,6000,0
+5036,1000,1000,0,0,5000,6000,-1
//-- SU_TUNABELLY
-5038,2000,1000,0,0,0,8000:10000:12000:14000:16000,0
+5038,1000,1000,0,5000,0,2000:5000:8000:11000:14000,-1
//-- SU_TUNAPARTY
5039,0,1000,0,30000,0,20000,0
//-- SU_BUNCHOFSHRIMP
-5040,0,1000,0,60000:90000:120000:150000:180000,0,10000,0
+5040,0,1000,0,60000:90000:120000:150000:180000,120000,10000,0
//-- SU_FRESHSHRIMP
-5041,0,1000,0,120000,0,7000,0
+5041,0,1000,0,120000,0,6000:5000:4000:3000:2000,0
+//-- SU_POWEROFFLOCK
+5045,5000:4000:3000:2000:1000,1000,0,15000,10000,100000,-1
+//-- SU_SVG_SPIRIT
+5046,3000:3000:2500:2000:0,1000,0,0,0,22000,-1
+//-- SU_HISS
+5047,1000,1000,0,3000,3000:3000:4000:4000:5000,60000,-1
+//-- SU_NYANGGRASS
+5048,3000:2500:2000:1500:1000,1000,0,6000:7000:8000:9000:10000,0,60000,-1
+//-- SU_GROOMING
+5049,1000,1000,0,3000:4000:5000:6000:7000,0,60000:50000:40000:30000:20000,0
+//-- SU_PURRING
+5050,1000,1000,0,3000:4000:5000:6000:7000,0,65000:60000:55000:50000:45000,-1
+//-- SU_SHRIMPARTY
+5051,3500:3000:2500:2000:1500,1000,0,12000:14000:16000:18000:20000,0,65000:60000:55000:50000:45000,-1
+//-- SU_MEOWMEOW
+5053,0,1000,0,8000:8000:10000:10000:12000,0,180000:160000:140000:120000:100000,0
+//-- SU_SPIRITOFLAND
+5054,0,0,0,3000,0,0,0
+//-- SU_CHATTERING
+5055,0,1000,0,5000,10000,140000:120000:100000:80000:60000,0
+//==========================================
+
+//===== Wedding Skills 3 ===================
+//-- WE_CALLALLFAMILY
+5063,1500,0,0,0,0,0,1500
+//-- WE_ONEFOREVER
+5064,1500,0,0,0,0,0,1500
+//-- WE_CHEERUP
+5065,1500,0,0,60000,0,0,1500
//==========================================
//===== Homunculus Skills ==================
diff --git a/db/re/skill_castnodex_db.txt b/db/re/skill_castnodex_db.txt
index 7c5af996275..893ade68dd6 100644
--- a/db/re/skill_castnodex_db.txt
+++ b/db/re/skill_castnodex_db.txt
@@ -36,6 +36,10 @@
512,3 //GS_TRACKING
1014,1 //PR_REDEMPTIO
+5063,1 //WE_CALLALLFAMILY
+5064,1 //WE_ONEFOREVER
+5065,1 //WE_CHEERUP
+
2012,7 //RK_CRUSHSTRIKE
2013,7 //RK_REFRESH
2014,7 //RK_GIANTGROWTH
diff --git a/db/re/skill_db.txt b/db/re/skill_db.txt
index 3b5378b85c4..e85a16124b3 100644
--- a/db/re/skill_db.txt
+++ b/db/re/skill_db.txt
@@ -581,7 +581,7 @@
//****
// Clown & Gypsy
394,9,8,1,-1,0,0,10,-9,yes,0,0,0,weapon,0,0x0, CG_ARROWVULCAN,Vulcan Arrow
-395,0,0,4,0,0x1,3,1,1,yes,0,0x40,0,misc,2,0x0, CG_MOONLIT,Sheltering Bliss
+395,0,0,4,0,0x1,3,5,1,yes,0,0x40,0,misc,2,0x0, CG_MOONLIT,Sheltering Bliss
396,7,6,16,0,0x1,0,1,1,yes,0,0x600,0,none,0,0x40, CG_MARIONETTE,Marionette Control
//****
@@ -710,7 +710,7 @@
482,0,6,4,0,0x1,0,5,1,no,0,0,0,magic,0,0x0, PF_DOUBLECASTING,Double Casting
483,18,6,2,0,0x1,1:2:3:4:5,1,1,no,0,0,0,none,0,0x0, HW_GANBANTEIN,Ganbantein
484,18,6,2,2,0xD1,0,5,1,yes,0,0x18000,0,misc,0,0x11010, HW_GRAVITATION,Gravitation Field
-485,-2,6,1,-1,0x8,0,10,1,no,0,0,0,weapon,0,0x4000, WS_CARTTERMINATION,Cart Termination
+485,-2,6,1,-1,0x0,0,10,1,no,0,0,0,weapon,0,0x4000, WS_CARTTERMINATION,Cart Termination
486,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0,0x4000, WS_OVERTHRUSTMAX,Maximum Power Thrust
487,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x8, CG_LONGINGFREEDOM,Longing for Freedom
488,0,6,4,0,0x1,1,5,1,no,0,0x20,0,misc,0,0x1, CG_HERMODE,Wand of Hermode
@@ -735,7 +735,7 @@
504,0,6,4,0,0x1,0,1,1,no,0,0,0,weapon,0,0x0, GS_MADNESSCANCEL,Madness Canceller
505,0,6,4,0,0x1,0,1,1,no,0,0,0,weapon,0,0x0, GS_ADJUSTMENT,AdJustment
506,0,6,4,0,0x1,0,1,1,no,0,0,0,weapon,0,0x0, GS_INCREASING,Increasing Accuracy
-507,-9,6,1,8,0x20,0,1,1,no,0,0,0,misc,0,0x0, GS_MAGICALBULLET,Magical Bullet
+507,0,6,4,0,0x1,0,1,1,no,0,0,0,magic,0,0x0, GS_MAGICALBULLET,Magical Bullet
508,-9,6,1,-1,0x1,0,1,1,no,0,0,0,weapon,0,0x0, GS_CRACKER,Cracker
509,0,0,0,0,0,0,10,0,no,0,0,0,none,0,0x0, GS_SINGLEACTION,Single Action
510,0,0,0,0,0,0,10,0,no,0,0,0,none,0,0x0, GS_SNAKEEYE,Snake Eye
@@ -744,7 +744,7 @@
513,-9,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x0, GS_DISARM,Disarm
514,-9,6,1,-1,0x20,0,5,1,no,0,0,0,weapon,0,0x100, GS_PIERCINGSHOT,Piercing Shot
515,-9,8,1,-1,0,0,10,-5,no,0,0,0,weapon,0,0x100, GS_RAPIDSHOWER,Rapid Shower
-516,0,8,4,-1,0x2,3,10,1,no,0,0,0,weapon,0,0x0, GS_DESPERADO,Desperado
+516,5,8,4,-1,0x2,3,10,1,no,0,0,0,weapon,0,0x0, GS_DESPERADO,Desperado
517,0,6,4,-1,0x1,0,10,1,no,0,0,0,weapon,0,0x0, GS_GATLINGFEVER,Gatling Fever
518,2,6,1,-1,0,0,10,1,no,0,0,0,weapon,5,0x0, GS_DUST,Dust
519,-9,6,1,-1,0,0,10,1,yes,0,0,0,weapon,0,0x100, GS_FULLBUSTER,Full Buster
@@ -861,7 +861,7 @@
//715,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_DARKPIERCING,Dark Piercing
716,0,6,4,0,0x1,0,10,0,no,0,0x2,0,none,0,0x0, NPC_MAXPAIN,Max Pain
717,0,6,1,0,0xD2,18,10,1,no,0,0x2,0,misc,0,0x0, NPC_MAXPAIN_ATK,Max Pain Attack
-//718,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_DEATHSUMMON,Death Summon
+718,0,0,4,0,0x1,0,10,1,no,0,0x2,0,magic,0,0x0, NPC_DEATHSUMMON,Death Summon
//719,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_HELLBURNING,Hell Burning
//720,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_JACKFROST,Jack Frost 2
//721,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_WIDEWEB,Wide Web
@@ -954,7 +954,7 @@
2211,11,8,1,3,0x2,3,5,-7,yes,0,0,0,magic,3,0x400, WL_CRIMSONROCK,Crimson Rock
2212,11,6,1,3,0,0,5,1,yes,0,0,0,magic,0,0x400, WL_HELLINFERNO,Hell Inferno
2213,11,8,2,0,0x2,9,5,-20,yes,0,0,0,magic,2,0x400, WL_COMET,Comet
-2214,11,6,1,0,0x2,3,5,1,yes,0,0,0,magic,0,0x400, WL_CHAINLIGHTNING,Chain Lightning //CHECK Is the splash being used for the target search?
+2214,11,6,1,0,0x1,0,5,1,yes,0,0,0,magic,0,0x400, WL_CHAINLIGHTNING,Chain Lightning
2215,11,6,1,4,0,0,5,1,no,0,0,0,magic,0,0x0, WL_CHAINLIGHTNING_ATK,Chain Lightning Attack
2216,6,8,2,2,0,0,5,-6:-7:-8:-9:-10,yes,0,0,0,magic,0,0x10000, WL_EARTHSTRAIN,Earth Strain
2217,11,6,1,0,0,0,5,1,yes,0,0,0,magic,0,0x400, WL_TETRAVORTEX,Tetra Vortex
@@ -1273,24 +1273,24 @@
//2551,0,0,0,0,0,0,10,0,no,0,0,0,none,0,0, RL_GLITTERING_GREED,Flip The Coin Greed
2552,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0,0x0, RL_RICHS_COIN,Rich's Coin
2553,-9,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x0, RL_MASS_SPIRAL,Mass Spiral
-2554,-9,6,1,-1,0x2,2,5,1,no,0,0,0,weapon,0,0x10020, RL_BANISHING_BUSTER,Banishing Buster
+2554,-9,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x10020, RL_BANISHING_BUSTER,Banishing Buster
2555,3:4:4:5:5,6,2,0,0x1,1,5,1,no,0,0,1,misc,0,0x0, RL_B_TRAP,Bind Trap
2556,0,6,4,0,0x3,-1,1,1,no,0,0,0,none,0,0x0, RL_FLICKER,Flicker
-2557,-9,6,1,-1,0x2,2,5,1,no,0,0,0,weapon,0,0x0, RL_S_STORM,Shatter Storm
+2557,-9,6,1,-1,0x2,2:2:2:2:3,5,1,no,0,0,0,weapon,0,0x0, RL_S_STORM,Shatter Storm
2558,0,6,4,0,0x1,0,10,1,no,0,0,0,none,0,0x0, RL_E_CHAIN,Eternal Chain
2559,-9,6,4,-1,0x0,10,1,1,no,0,0x0,0,weapon,0,0x0, RL_QD_SHOT,Quick Draw Shot
2560,-9,6,1,0,0x1,0,1,1,no,0,0,3,none,0,0x0, RL_C_MARKER,Crimson Marker
-2561,0,6,4,-1,0x2,3,5,1,no,0,0,0,weapon,0,0x0, RL_FIREDANCE,Fire Dance
+2561,5,6,4,-1,0x2,3,5,1,no,0,0,0,weapon,0,0x0, RL_FIREDANCE,Fire Dance
2562,-9,6,1,-1,0x0,2,5,1,no,0,0,0,weapon,0,0x0, RL_H_MINE,Howling Mine
2563,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0, RL_P_ALTER,Platinum Alter
2564,-9,6,2,0,0x1,0,5,1,no,0,0,0,none,0,0x0, RL_FALLEN_ANGEL,Fallen Angel
-2565,0,6,4,-1,0x2,3:3:4:5:6,5,1,no,0,0,0,weapon,3,0x0, RL_R_TRIP,Round Trip
-2566,0,6,4,-1,0x3,-1,5,1,no,0,0,0,weapon,0,0x0, RL_D_TAIL,Dragon Tail
-2567,-9,6,2,-1,0x2,1,5,1,no,0,0,0,weapon,0,0, RL_FIRE_RAIN,Fire Rain
+2565,5,6,4,-1,0x2,3:3:4:5:6,5,1,no,0,0,0,weapon,3,0x0, RL_R_TRIP,Round Trip
+2566,5,6,4,0,0x30,-1,5,1,no,0,0,0,weapon,0,0x0, RL_D_TAIL,Dragon Tail
+2567,2,6,2,-1,0x2,1,5,1,no,0,0,0,weapon,0,0, RL_FIRE_RAIN,Fire Rain
2568,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0, RL_HEAT_BARREL,Heat Barrel
2569,-9,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x0, RL_AM_BLAST,Anti-Material Blast
-2570,-9,6,1,-1,0,0,5,1,no,0,0,0,weapon,6,0x0, RL_SLUGSHOT,Slug Shot
-2571,-9,6,2,-1,0x2,2,5,1,no,0,0,0,weapon,0,0x0, RL_HAMMER_OF_GOD,Hammer of God
+2570,-9,6,1,0,0,0,5,1,no,0,0,0,weapon,6,0x0, RL_SLUGSHOT,Slug Shot
+2571,-9,6,1,0,0x2,2,5,1,no,0,0,0,weapon,0,0x0, RL_HAMMER_OF_GOD,Hammer of God
2572,0,6,1,-1,0x40,0,5,1,no,0,0,0,weapon,0,0, RL_R_TRIP_PLUSATK,Round Trip Plus Attack
//2573,0,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0, RL_B_FLICKER_ATK,Bind Flicker Attack
//2574,0,6,1,-1,0,0,10,1,no,0,0,0,weapon,0,0, RL_GLITTERING_GREED_ATK,Flip The Coin Greed Attack
@@ -1365,11 +1365,11 @@
5023,6:10:14,6,2,0,0x1,0,3,1,yes,0,0,0,none,0,0x0, SU_LOPE,Lope
5024,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, SU_SPRITEMABLE,Spirit Marble
5025,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, SU_POWEROFLAND,Power of Land
-5026,9,6,1,2:3:1:4:8,0x0,0,5,1,yes,0,0,0,magic,0,0x0, SU_SV_STEMSPEAR,Silvervine Stem Spear
+5026,9,6,1,2:3:1:4:8,0,0,5,1,yes,0,0,0,magic,0,0x0, SU_SV_STEMSPEAR,Silvervine Stem Spear
5027,9,6,1,0,0x3,0,5,1,yes,0,0,1,none,0,0x0, SU_CN_POWDERING,Catnip Powdering
5028,9,8,2,0,0,1:1:2:2:3,5,-5,yes,0,0,0,magic,0,0x0, SU_CN_METEOR,Catnip Meteor
-5029,9,6,1,0,0x1,0,5,1,yes,0,0,1,none,0,0x0, SU_SV_ROOTTWIST,Silvervine Root Twist
-5030,0,6,1,5,0x30,0,5,1,no,0,0,1,magic,0,0x0, SU_SV_ROOTTWIST_ATK,Silver Vine Root Twist Attack
+5029,9,6,1,0,0x1,0,5,1,yes,0,0,0,none,0,0x0, SU_SV_ROOTTWIST,Silvervine Root Twist
+5030,0,6,1,5,0x70,0,5,1,no,0,0,0,misc,0,0x0, SU_SV_ROOTTWIST_ATK,Silver Vine Root Twist Attack
5031,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, SU_POWEROFLIFE,Power of Life
5032,9,6,1,-1,0,0,5,1,yes,0,0,0,weapon,0,0x0, SU_SCAROFTAROU,Scar of Tarou
5033,9,8,1,-1,0,0,5,-5,yes,0,0,0,weapon,0,0x0, SU_PICKYPECK,Picky Peck
@@ -1386,6 +1386,25 @@
//5042,0,0,0,0,0,0,5,0,yes,0,0,0,none,0,0x0, SU_CN_METEOR_SEC,
//5043,0,0,0,0,0,0,5,0,yes,0,0,0,none,0,0x0, SU_LUNATICCARROTBEAT_SEC,
+5044,14,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, SU_SOULATTACK,Soul Attack
+5045,0,6,4,0,0x3,3:4:5:6:-1,5,0,yes,0,0,0,magic,0,0x0, SU_POWEROFFLOCK,Power of Flock
+5046,9,8,1,-1,0,1,5,1,yes,0,0,14,weapon,0,0x0, SU_SVG_SPIRIT,Spirit of Savage
+5047,0,6,4,0,0x3,-1,5,1,yes,0,0,0,magic,0,0x0, SU_HISS,Hiss
+5048,9,6,2,0,0x1,0,5,1,yes,0,0,1,none,0,0x0, SU_NYANGGRASS,Nyang Grass
+5049,0,6,4,0,0x1,0,5,1,yes,0,0,0,none,0,0x0, SU_GROOMING,Grooming
+5050,0,6,4,0,0x3,-1,5,1,yes,0,0,0,magic,0,0x0, SU_PURRING,Purring
+5051,0,6,4,0,0x3,-1,5,1,yes,0,0,0,magic,0,0x0, SU_SHRIMPARTY,Tasty Shrimp Party
+5052,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, SU_SPIRITOFLIFE,Spirit of Life
+5053,0,6,4,0,0x3,-1,5,1,yes,0,0,0,magic,0,0x0, SU_MEOWMEOW,Meow Meow
+5054,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, SU_SPIRITOFLAND,Spirit of Land
+5055,0,6,4,0,0x1,0,5,1,yes,0,0,0,none,0,0x0, SU_CHATTERING,Chattering
+5056,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, SU_SPIRITOFSEA,Spirit of Sea
+
+// Wedding Skills 3
+5063,1,6,4,0,0x1,0,1,1,yes,0,0x4,0,none,0,0, WE_CALLALLFAMILY,Call All Family
+5064,3,6,16,0,0x1,0,1,1,yes,0,0x4,0,none,0,0, WE_ONEFOREVER,One Forever
+5065,1,6,4,0,0x3,3,1,1,yes,0,0x4,0,none,0,0, WE_CHEERUP,Cheer Up
+
//****
// Homunculus S
8001,9,6,4,0,0x1,0,5,1,no,0,0,0,magic,0,0x0, HLIF_HEAL,Healing Touch
diff --git a/db/re/skill_nocast_db.txt b/db/re/skill_nocast_db.txt
index 8efd76c0b90..6d4213ef4e8 100644
--- a/db/re/skill_nocast_db.txt
+++ b/db/re/skill_nocast_db.txt
@@ -56,6 +56,7 @@
691,4 //CASH_ASSUMPTIO
2284,4 //SC_FATALMENACE
2300,4 //SC_DIMENSIONDOOR
+5063,4 //WE_CALLALLFAMILY
//----------------------------------------------------------------------------
// Battlegrounds
@@ -93,7 +94,7 @@
691,8 //CASH_ASSUMPITO
2284,8 //SC_FATALMENACE
2300,8 //SC_DIMENSIONDOOR
-5023,8 //SU_LOPE
+5063,8 //WE_CALLALLFAMILY
//----------------------------------------------------------------------------
// Mixed
@@ -134,6 +135,7 @@
// 2296,16 // SC_UNLUCKY
// 2494,16 // GN_CHANGEMATERIAL
// 2462,16 // SO_EL_ANALYSIS
+5063,16 //WE_CALLALLFAMILY
//----------------------------------------------------------------------------
// Zone 1 - Aldebaran Turbo Track
@@ -177,7 +179,6 @@
//----------------------------------------------------------------------------
426,256 //TK_HIGHJUMP
290,256 //SA_ABRACADABRA
-5023,256 //SU_LOPE
//----------------------------------------------------------------------------
// Zone 5 - Sealed Shrine
@@ -220,3 +221,4 @@
336,4096 // WE_CALLPARTNER
409,4096 // WE_CALLPARENT
410,4096 // WE_CALLBABY
+5063,4096 //WE_CALLALLFAMILY
diff --git a/db/re/skill_require_db.txt b/db/re/skill_require_db.txt
index db61699e96d..95151b52b30 100644
--- a/db/re/skill_require_db.txt
+++ b/db/re/skill_require_db.txt
@@ -489,7 +489,7 @@
501,0,0,10,0,0,0,99,0,0,none,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GS_FLING
502,0,0,20,0,0,0,99,99,1,none,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GS_TRIPLEACTION
503,0,0,30,0,0,0,99,99,1,none,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GS_BULLSEYE
-504,0,0,30,0,0,0,99,0,0,none,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GS_MADNESSCANCEL
+504,0,0,30,0,0,0,99,0,0,none,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GS_MADNESSCANCEL
505,0,0,15,0,0,0,99,0,0,none,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GS_ADJUSTMENT
506,0,0,30,0,0,0,99,0,0,none,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GS_INCREASING
507,0,0,7,0,0,0,99,0,0,none,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GS_MAGICALBULLET
@@ -497,13 +497,13 @@
512,0,0,15:20:25:30:35:40:45:50:55:60,0,0,0,17:18,3,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0//GS_TRACKING
513,0,0,15:20:25:30:35,0,0,0,17:18,3,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GS_DISARM
514,0,0,11:12:13:14:15,0,0,0,17:18,3,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GS_PIERCINGSHOT
-515,0,0,22:24:26:28:30:32:34:36:38:40,0,0,0,17,3,5,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GS_RAPIDSHOWER
+515,0,0,22:24:26:28:30:32:34:36:38:40,0,0,0,17,3,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GS_RAPIDSHOWER
516,0,0,32:34:36:38:40:42:44:46:48:50,0,0,0,17,3,10,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GS_DESPERADO
517,0,0,30:32:34:36:38:40:42:44:46:48,0,0,0,19,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GS_GATLINGFEVER
518,0,0,3:6:9:12:15:18:21:24:27:30,0,0,0,20,3,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GS_DUST
-519,0,0,20:25:30:35:40:45:50:55:60:65,0,0,0,20,3,2:2:4:4:6:6:8:8:10:10,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GS_FULLBUSTER
-520,0,0,15:20:25:30:35:40:45:50:55:60,0,0,0,20:21,3:5,5,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0//GS_SPREADATTACK
-521,0,0,4:8:12:16:20:24:28:32:36:40,0,0,0,21,5,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GS_GROUNDDRIFT
+519,0,0,20:25:30:35:40:45:50:55:60:65,0,0,0,20,3,2,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GS_FULLBUSTER
+520,0,0,13:16:19:22:25:28:31:34:37:40,0,0,0,20:21,3:5,5,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0//GS_SPREADATTACK
+521,0,0,3:6:9:12:15:18:21:24:27:30,0,0,0,21,5,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GS_GROUNDDRIFT
//****
// NJ Ninja
@@ -579,7 +579,7 @@
2025,0,0,10,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GC_CREATENEWPOISON
2026,0,0,10,0,0,0,99,0,0,none,0,0,6128,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GC_ANTIDOTE
-2027,0,0,20:24:28:32:36,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GC_POISONINGWEAPON
+2027,0,0,20:24:28:32:36,0,0,0,1:16,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GC_POISONINGWEAPON
2028,0,0,40:36:32:28:24,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GC_WEAPONBLOCKING
2029,0,0,5:8:11:14:17,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GC_COUNTERSLASH
2030,0,0,20,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GC_WEAPONCRUSH
@@ -684,23 +684,23 @@
2259,0,0,20,0,0,0,99,0,0,mado,0,0,2139,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_FLAMELAUNCHER
2260,0,0,20,0,0,0,99,0,0,mado,0,0,6146,1,6147,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_COLDSLOWER
2261,0,0,30:45:60,0,0,0,99,8,1,mado,0,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_ARMSCANNON
-2262,0,0,20:40:60,0,0,0,99,0,0,mado,0,0,2800,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_ACCELERATION
+2262,0,0,20:40:60,0,0,0,99,0,0,mado,0,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2800 //NC_ACCELERATION
2263,0,0,25,0,0,0,99,0,0,mado,0,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2801 //NC_HOVERING
2264,0,0,5,0,0,0,99,0,0,mado,0,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_F_SIDESLIDE
2265,0,0,5,0,0,0,99,0,0,mado,0,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_B_SIDESLIDE
-2267,0,0,200,0,0,0,99,0,0,mado,0,0,2802,0,6146,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_SELFDESTRUCTION
-2268,0,0,100,0,0,0,99,0,0,mado,0,0,6360,3,6363,3,6362,3,6361,3,2803,0,0,0,0,0,0,0,0,0,6146,2,0 //NC_SHAPESHIFT
-2269,0,0,20,0,0,0,99,0,0,mado,0,0,2804,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_EMERGENCYCOOL
+2267,0,0,200,0,0,0,99,0,0,mado,0,0,6146,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2802 //NC_SELFDESTRUCTION
+2268,0,0,100,0,0,0,99,0,0,mado,0,0,6360,3,6363,3,6362,3,6361,3,6146,2,0,0,0,0,0,0,0,0,0,0,2803 //NC_SHAPESHIFT
+2269,0,0,20,0,0,0,99,0,0,mado,0,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2804 //NC_EMERGENCYCOOL
2270,0,0,45,0,0,0,99,0,0,mado,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_INFRAREDSCAN
2271,0,0,30,0,0,0,99,0,0,mado,0,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_ANALYZE
-2272,0,0,60:70:80,0,0,0,99,0,0,mado,0,0,2805,0,6146,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_MAGNETICFIELD
-2273,0,0,80:90:100,0,0,0,99,0,0,mado,0,0,2806,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_NEUTRALBARRIER
-2274,0,0,80:100:120,0,0,0,99,0,0,mado,0,0,2808,0,6146,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_STEALTHFIELD
-2275,0,0,25:30:35:40:45,0,0,0,99,0,0,mado,0,0,12392,1,12392,1,12393,1,12393,1,12394,1,0,0,0,0,0,0,0,0,2807,0,0 //NC_REPAIR
+2272,0,0,60:70:80,0,0,0,99,0,0,mado,0,0,6146,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2805 //NC_MAGNETICFIELD
+2273,0,0,80:90:100,0,0,0,99,0,0,mado,0,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2806 //NC_NEUTRALBARRIER
+2274,0,0,80:100:120,0,0,0,99,0,0,mado,0,0,6146,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2808 //NC_STEALTHFIELD
+2275,0,0,25:30:35:40:45,0,0,0,99,0,0,mado,0,0,12392,1,12392,1,12393,1,12393,1,12394,1,0,0,0,0,0,0,0,0,0,0,2807 //NC_REPAIR
2278,0,0,20:22:24:26:28,0,0,0,6:7,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_AXEBOOMERANG
-2279,0,0,20:22:24:26:28,0,0,0,6:7,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_POWERSWING
+2279,0,0,20:22:24:26:28,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_POWERSWING
2280,20:40:60:80:100,0,18:20:22:24:26,0,0,0,6:7,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_AXETORNADO
2281,0,0,25:30:35:40:45,0,0,0,99,0,0,none,0,0,612,0,615,0,998,1,999,2,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_SILVERSNIPER
2282,0,0,40:45:50:55:60,0,0,0,99,0,0,none,0,0,612,0,615,0,998,2,7054,1,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_MAGICDECOY
@@ -763,7 +763,7 @@
2332,0,0,150,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_RAMPAGEBLASTER
2333,0,0,80,0,0,0,99,0,0,none,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_CRESCENTELBOW
2334,0,0,40:60:80:100:120,-1:-2:-3:-4:-5,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_CURSEDCIRCLE
-2335,0,0,40,-5:-4:-3:-2:-1,0,0,99,0,0,none,0,1:2:3:4:5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_LIGHTNINGWALK
+2335,0,0,80:70:60:50:40,-5:-4:-3:-2:-1,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_LIGHTNINGWALK
2336,0,0,10:15:20:25:30,0,0,0,99,0,0,none,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_KNUCKLEARROW
2337,0,0,45,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_WINDMILL
2338,0,0,120,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_RAISINGDRAGON
@@ -892,25 +892,25 @@
// Rebellion
//2551,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_GLITTERING_GREED
2552,0,0,10,0,0,100,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_RICHS_COIN
-2553,0,0,80:84:88:92:96,0,0,0,18,3,1,none,0,1,7663,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_MASS_SPIRAL
-2554,0,0,55:60:65:70:75,0,0,0,20,3,1,none,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_BANISHING_BUSTER
+2553,0,0,40:44:48:52:56,0,0,0,18,3,1,none,0,0,7663,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_MASS_SPIRAL
+2554,0,0,55:60:65:70:75,0,0,0,20,3,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_BANISHING_BUSTER
2555,0,0,30:32:34:36:38,0,0,0,17:18:19:20:21,0,0,none,0,1,7940,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_B_TRAP
-2556,0,0,2,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_FLICKER
-2557,0,0,55:60:65:70:75,0,0,0,20,3,1,none,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_S_STORM
-2558,0,0,45,0,0,0,17:18:19:20:21,0,0,none,0,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_E_CHAIN
+2556,0,0,2,0,0,0,99,0,0,none,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_FLICKER
+2557,0,0,50:55:60:65:70,0,0,0,20,3,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_S_STORM
+2558,0,0,45,0,0,0,17:18:19:20:21,0,0,none,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_E_CHAIN
2559,0,0,5,0,0,0,17:18:19:20:21,3:4:5,1,none,SC_QD_SHOT_READY,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_QD_SHOT
-2560,0,0,10,0,0,0,17:18:19:20:21,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_C_MARKER
-2561,0,0,10:15:20:25:30,0,0,0,17,3,5,none,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_FIREDANCE
-2562,0,0,45:50:55:60:65,0,0,0,21,0,0,none,0,1,7664,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_H_MINE
-2563,0,0,20:24:28:32:36,0,0,0,99,0,0,none,0,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_P_ALTER
+2560,0,0,10,0,0,0,17:18:19:20:21,0,0,none,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_C_MARKER
+2561,0,0,12:14:16:18:20,0,0,0,17,3,5,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_FIREDANCE
+2562,0,0,45:50:55:60:65,0,0,0,21,0,0,none,0,0,7664,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_H_MINE
+2563,0,0,20:24:28:32:36,0,0,0,99,3,1,none,0,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13201:13220:13221 //RL_P_ALTER
2564,0,0,10,0,0,0,17,0,0,none,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_FALLEN_ANGEL
-2565,0,0,40:45:50:55:60,0,0,0,19,3,5,none,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_R_TRIP
+2565,0,0,40:45:50:55:60,0,0,0,19,3,5,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_R_TRIP
2566,0,0,60:70:80:90:100,0,0,0,21,5,1,none,0,0,7665,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_D_TAIL
2567,0,0,70,0,0,0,19,3,10,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_FIRE_RAIN
2568,0,0,30,0,0,0,99,0,0,none,0,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_HEAT_BARREL
-2569,0,0,80:84:88:92:96,0,0,0,17:18:19:20:21,0,0,none,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_AM_BLAST
-2570,0,0,55:60:65:70:75,0,0,0,20,3,1,none,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_SLUGSHOT
-2571,0,0,70:80:90:100:110,0,0,0,18,3,0,none,0,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_HAMMER_OF_GOD
+2569,0,0,80:84:88:92:96,0,0,0,18,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_AM_BLAST
+2570,0,0,80:84:88:92:96,0,0,0,20,0,0,none,0,0,13214,1,13213,1,13212,1,13211,1,13210,1,0,0,0,0,0,0,0,0,0,0,0 //RL_SLUGSHOT
+2571,0,0,35:40:45:50:55,0,0,0,18,0,0,none,0,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_HAMMER_OF_GOD
2572,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_R_TRIP_PLUSATK
//2573,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_B_FLICKER_ATK
//2574,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_GLITTERING_GREED_ATK
@@ -973,7 +973,7 @@
// Summoner
5019,0,0,10,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_BITE
-5020,0,0,30,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_HIDE
+5020,0,0,10,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_HIDE
5021,0,0,20:25:30,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_SCRATCH
5022,0,0,10,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_STOOP
5023,0,0,30,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_LOPE
@@ -996,6 +996,21 @@
//5042,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //
//5043,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //
+5045,0,0,50,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_POWEROFFLOCK
+5046,0,0,60,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_SVG_SPIRIT
+5047,0,0,50:46:42:38:34,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_HISS
+5048,0,0,50:48:46:44:42,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_NYANGGRASS
+5049,0,0,15,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_GROOMING
+5050,0,0,70:65:60:55:50,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_PURRING
+5051,0,0,100:90:80:70:60,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_SHRIMPARTY
+5053,0,0,100:90:80:70:60,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_MEOWMEOW
+5055,0,0,50:45:40:35:30,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_CHATTERING
+
+// Wedding Skills 3
+5063,0,0,100,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WE_CALLALLFAMILY
+5064,0,0,100,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WE_ONEFOREVER
+5065,0,0,50,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP
+
8001,0,0,13:16:19:22:25,0,0,0,99,0,0,none,0,0,545,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //HLIF_HEAL
8002,0,0,20:25:30:35:40,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //HLIF_AVOID
8004,0,0,100,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //HLIF_CHANGE
diff --git a/db/re/skill_tree.txt b/db/re/skill_tree.txt
index 7646efb7b34..12595becc8d 100644
--- a/db/re/skill_tree.txt
+++ b/db/re/skill_tree.txt
@@ -597,6 +597,8 @@
22,335,1,0,0,0,0,0,0,0,0,0,0 //WE_FEMALE#I Look up to You#
22,336,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARTNER#I miss You#
22,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby#
+22,5063,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLALLFAMILY#Call All Family#
+22,5064,1,0,0,0,0,0,0,0,0,0,0 //WE_ONEFOREVER#One Forever#
//SuperNovice
23,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
23,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -657,11 +659,11 @@
24,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
24,500,5,0,0,0,0,0,0,0,0,0,0 //GS_GLITTERING#Flip the Coin#
24,501,1,500,1,0,0,0,0,0,0,0,0 //GS_FLING#Fling#
-24,502,1,500,1,511,10,0,0,0,0,0,0 //GS_TRIPLEACTION#Triple Action#
-24,503,1,500,5,512,10,0,0,0,0,0,0 //GS_BULLSEYE#Bulls Eye#
-24,504,1,500,4,517,10,0,0,0,0,0,0 //GS_MADNESSCANCEL#Madness Canceler#
-24,505,1,500,4,513,5,0,0,0,0,0,0 //GS_ADJUSTMENT#AdJustment#
-24,506,1,500,2,510,10,0,0,0,0,0,0 //GS_INCREASING#Increasing Accuracy#
+24,502,1,500,1,0,0,0,0,0,0,0,0 //GS_TRIPLEACTION#Triple Action#
+24,503,1,500,5,0,0,0,0,0,0,0,0 //GS_BULLSEYE#Bulls Eye#
+24,504,1,500,4,0,0,0,0,0,0,0,0 //GS_MADNESSCANCEL#Madness Canceler#
+24,505,1,500,4,0,0,0,0,0,0,0,0 //GS_ADJUSTMENT#Adjustment#
+24,506,1,500,2,0,0,0,0,0,0,0,0 //GS_INCREASING#Increasing Accuracy#
24,507,1,500,1,0,0,0,0,0,0,0,0 //GS_MAGICALBULLET#Magical Bullet#
24,508,1,500,1,0,0,0,0,0,0,0,0 //GS_CRACKER#Cracker#
24,509,10,0,0,0,0,0,0,0,0,0,0 //GS_SINGLEACTION#Single Action#
@@ -675,7 +677,7 @@
24,517,10,515,7,516,5,0,0,0,0,0,0 //GS_GATLINGFEVER#Gatling Fever#
24,518,10,509,5,0,0,0,0,0,0,0,0 //GS_DUST#Dust#
24,519,10,518,3,0,0,0,0,0,0,0,0 //GS_FULLBUSTER#Full Buster#
-24,520,10,519,5,0,0,0,0,0,0,0,0 //GS_SPREADATTACK#Spread Attack#
+24,520,10,509,5,0,0,0,0,0,0,0,0 //GS_SPREADATTACK#Spread Attack#
24,521,10,520,7,0,0,0,0,0,0,0,0 //GS_GROUNDDRIFT#Ground Drift#
24,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby#
//Ninja
@@ -830,7 +832,7 @@
4008,356,10,3,10,6,5,60,3,0,0,0,0 //LK_PARRYING#Parrying#
4008,357,5,4,5,55,5,63,1,0,0,0,0 //LK_CONCENTRATION#Concentration#
4008,358,1,4,10,6,5,8,3,0,0,0,0 //LK_TENSIONRELAX#Relax#
-4008,359,1,50,0,0,0,0,0,0,0,0,0,0 //LK_BERSERK#Frenzy# //It has an extra column after "MaxLevel" for Job Level 50 requirement
+4008,359,1,0,50,0,0,0,0,0,0,0,0,0,0 //LK_BERSERK#Frenzy# //It has 2 extra columns after "MaxLevel" for Job Level 50 requirement
4008,397,5,55,5,56,5,58,5,63,1,0,0 //LK_SPIRALPIERCE#Spiral Pierce#
4008,398,5,55,9,63,1,0,0,0,0,0,0 //LK_HEADCRUSH#Traumatic Blow#
4008,399,10,64,3,398,3,0,0,0,0,0,0 //LK_JOINTBEAT#Vital Strike#
@@ -1057,7 +1059,7 @@
4014,356,10,3,10,6,5,60,3,0,0,0,0 //LK_PARRYING#Parrying#
4014,357,5,4,5,55,5,63,1,0,0,0,0 //LK_CONCENTRATION#Concentration#
4014,358,1,4,10,6,5,8,3,0,0,0,0 //LK_TENSIONRELAX#Relax#
-4014,359,1,50,0,0,0,0,0,0,0,0,0,0 //LK_BERSERK#Frenzy# //It has an extra column after "MaxLevel" for Job Level 50 requirement
+4014,359,1,0,50,0,0,0,0,0,0,0,0,0,0 //LK_BERSERK#Frenzy# //It has 2 extra columns after "MaxLevel" for Job Level 50 requirement
4014,397,5,55,5,56,5,58,5,63,1,0,0 //LK_SPIRALPIERCE#Spiral Pierce#
4014,398,5,55,9,63,1,0,0,0,0,0,0 //LK_HEADCRUSH#Traumatic Blow#
4014,399,10,64,3,398,3,0,0,0,0,0,0 //LK_JOINTBEAT#Vital Strike#
@@ -1302,7 +1304,7 @@
4020,313,5,321,10,0,0,0,0,0,0,0,0 //BD_SIEGFRIED#Acoustic Rhythm#
4020,1010,1,0,0,0,0,0,0,0,0,0,0 //BA_PANGVOICE#Pang Voice#
4020,394,10,47,5,316,1,46,5,0,0,0,0 //CG_ARROWVULCAN#Vulcan Arrow#
-4020,395,1,45,5,315,7,0,0,0,0,0,0 //CG_MOONLIT#Sheltering Bliss#
+4020,395,5,45,5,315,7,0,0,0,0,0,0 //CG_MOONLIT#Sheltering Bliss#
4020,396,1,45,10,315,5,0,0,0,0,0,0 //CG_MARIONETTE#Marionette Control#
4020,487,5,315,10,396,1,317,3,0,0,0,0 //CG_LONGINGFREEDOM#Longing for Freedom#
4020,488,5,45,10,315,10,0,0,0,0,0,0 //CG_HERMODE#Wand of Hermod#
@@ -1338,7 +1340,7 @@
4021,313,5,329,10,0,0,0,0,0,0,0,0 //BD_SIEGFRIED#Acoustic Rhythm#
4021,1011,1,0,0,0,0,0,0,0,0,0,0 //DC_WINKCHARM#Wink of Charm#
4021,394,10,47,5,324,1,46,5,0,0,0,0 //CG_ARROWVULCAN#Vulcan Arrow#
-4021,395,1,45,5,323,7,0,0,0,0,0,0 //CG_MOONLIT#Sheltering Bliss#
+4021,395,5,45,5,323,7,0,0,0,0,0,0 //CG_MOONLIT#Sheltering Bliss#
4021,396,1,45,10,323,5,0,0,0,0,0,0 //CG_MARIONETTE#Marionette Control#
4021,487,5,323,10,396,1,325,3,0,0,0,0 //CG_LONGINGFREEDOM#Longing for Freedom#
4021,488,5,45,10,323,10,0,0,0,0,0,0 //CG_HERMODE#Wand of Hermod#
@@ -1387,6 +1389,7 @@
4023,143,1,0,0,0,0,0,0,0,0,0,0 //NV_TRICKDEAD#Act Dead#
4023,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby#
4023,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent#
+4023,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Swordman
4024,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4024,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -1402,6 +1405,7 @@
4024,146,1,0,0,0,0,0,0,0,0,0,0 //SM_AUTOBERSERK#Auto Berserk#
4024,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby#
4024,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent#
+4024,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Magician
4025,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4025,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -1421,6 +1425,7 @@
4025,157,1,0,0,0,0,0,0,0,0,0,0 //MG_ENERGYCOAT#Energy Coat#
4025,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby#
4025,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent#
+4025,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Archer
4026,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4026,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -1433,6 +1438,7 @@
4026,148,1,0,0,0,0,0,0,0,0,0,0 //AC_CHARGEARROW#Arrow Repel#
4026,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby#
4026,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent#
+4026,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Acolyte
4027,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4027,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -1453,6 +1459,7 @@
4027,156,1,0,0,0,0,0,0,0,0,0,0 //AL_HOLYLIGHT#Holy Light#
4027,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby#
4027,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent#
+4027,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Merchant
4028,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4028,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -1470,6 +1477,7 @@
4028,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent#
4028,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
4028,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
+4028,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Thief
4029,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4029,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -1485,6 +1493,7 @@
4029,152,1,0,0,0,0,0,0,0,0,0,0 //TF_THROWSTONE#Stone Fling#
4029,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby#
4029,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent#
+4029,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Knight
4030,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4030,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -1512,6 +1521,7 @@
4030,64,5,63,1,0,0,0,0,0,0,0,0 //KN_CAVALIERMASTERY#Cavalier Mastery#
4030,1001,1,0,0,0,0,0,0,0,0,0,0 //KN_CHARGEATK#Charge Attack#
4030,495,1,60,10,0,0,0,0,0,0,0,0 //KN_ONEHAND#Onehand Quicken#
+4030,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Priest
4031,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4031,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -1551,6 +1561,7 @@
4031,78,1,76,5,0,0,0,0,0,0,0,0 //PR_LEXAETERNA#Lex Aeterna#
4031,79,10,12,1,78,1,77,3,0,0,0,0 //PR_MAGNUS#Magnus Exorcismus#
4031,1014,1,0,0,0,0,0,0,0,0,0,0 //PR_REDEMPTIO#Redemptio#
+4031,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Wizard
4032,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4032,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -1584,6 +1595,7 @@
4032,92,5,91,1,0,0,0,0,0,0,0,0 //WZ_QUAGMIRE#Quagmire#
4032,93,1,0,0,0,0,0,0,0,0,0,0 //WZ_ESTIMATION#Sense#
4032,1006,1,0,0,0,0,0,0,0,0,0,0 //WZ_SIGHTBLASTER#Sight Blaster#
+4032,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Blacksmith
4033,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4033,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -1625,6 +1637,7 @@
4033,459,1,111,5,0,0,0,0,0,0,0,0 //BS_ADRENALINE2#Full Adrenaline Rush#
4033,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
4033,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
+4033,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Hunter
4034,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4034,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -1656,6 +1669,7 @@
4034,131,5,124,1,127,1,0,0,0,0,0,0 //HT_SPRINGTRAP#Spring Trap#
4034,1009,1,0,0,0,0,0,0,0,0,0,0 //HT_PHANTASMIC#Phantasmic Arrow#
4034,499,1,46,10,0,0,0,0,0,0,0,0 //HT_POWER#Beast Strafing#
+4034,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Assassin
4035,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4035,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -1683,6 +1697,7 @@
4035,141,10,139,5,140,5,0,0,0,0,0,0 //AS_SPLASHER#Venom Splasher#
4035,1003,1,0,0,0,0,0,0,0,0,0,0 //AS_SONICACCEL#Sonic Acceleration#
4035,1004,1,0,0,0,0,0,0,0,0,0,0 //AS_VENOMKNIFE#Throw Venom Knife#
+4035,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Knight(Peco)
4036,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4036,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -1710,6 +1725,7 @@
4036,64,5,63,1,0,0,0,0,0,0,0,0 //KN_CAVALIERMASTERY#Cavalier Mastery#
4036,1001,1,0,0,0,0,0,0,0,0,0,0 //KN_CHARGEATK#Charge Attack#
4036,495,1,60,10,0,0,0,0,0,0,0,0 //KN_ONEHAND#Onehand Quicken#
+4036,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Crusader
4037,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4037,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -1744,6 +1760,7 @@
4037,257,5,251,1,0,0,0,0,0,0,0,0 //CR_DEFENDER#Defending Aura#
4037,258,10,55,10,0,0,0,0,0,0,0,0 //CR_SPEARQUICKEN#Spear Quicken#
4037,1002,1,0,0,0,0,0,0,0,0,0,0 //CR_SHRINK#Shrink#
+4037,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Monk
4038,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4038,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -1781,6 +1798,7 @@
4038,273,5,272,3,0,0,0,0,0,0,0,0 //MO_COMBOFINISH#Raging Thrust#
4038,1015,1,0,0,0,0,0,0,0,0,0,0 //MO_KITRANSLATION#Ki Translation#
4038,1016,1,0,0,0,0,0,0,0,0,0,0 //MO_BALKYOUNG#Ki Explosion#
+4038,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Sage
4039,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4039,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -1825,6 +1843,7 @@
4039,1017,1,0,0,0,0,0,0,0,0,0,0 //SA_ELEMENTGROUND#Elemental Change Earth#
4039,1018,1,0,0,0,0,0,0,0,0,0,0 //SA_ELEMENTFIRE#Elemental Change Fire#
4039,1019,1,0,0,0,0,0,0,0,0,0,0 //SA_ELEMENTWIND#Elemental Change Wind#
+4039,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Rogue
4040,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4040,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -1861,6 +1880,7 @@
4040,224,5,223,1,0,0,0,0,0,0,0,0 //RG_COMPULSION#Haggle#
4040,225,10,219,5,0,0,0,0,0,0,0,0 //RG_PLAGIARISM#Intimidate#
4040,1005,1,0,0,0,0,0,0,0,0,0,0 //RG_CLOSECONFINE#Close Confine#
+4040,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Alchemist
4041,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4041,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -1898,6 +1918,7 @@
4041,498,1,228,10,0,0,0,0,0,0,0,0 //AM_TWILIGHT3#Twilight Alchemy 3#
4041,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
4041,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
+4041,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Bard
4042,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4042,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -1929,6 +1950,7 @@
4042,312,1,306,1,0,0,0,0,0,0,0,0 //BD_INTOABYSS#Power Chord#
4042,313,5,321,10,0,0,0,0,0,0,0,0 //BD_SIEGFRIED#Acoustic Rhythm#
4042,1010,1,0,0,0,0,0,0,0,0,0,0 //BA_PANGVOICE#Pang Voice#
+4042,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Dancer
4043,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4043,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -1960,6 +1982,7 @@
4043,312,1,306,1,0,0,0,0,0,0,0,0 //BD_INTOABYSS#Power Chord#
4043,313,5,329,10,0,0,0,0,0,0,0,0 //BD_SIEGFRIED#Acoustic Rhythm#
4043,1011,1,0,0,0,0,0,0,0,0,0,0 //DC_WINKCHARM#Wink of Charm#
+4043,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Crusader(Peco)
4044,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4044,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -1994,6 +2017,7 @@
4044,257,5,251,1,0,0,0,0,0,0,0,0 //CR_DEFENDER#Defending Aura#
4044,258,10,55,10,0,0,0,0,0,0,0,0 //CR_SPEARQUICKEN#Spear Quicken#
4044,1002,1,0,0,0,0,0,0,0,0,0,0 //CR_SHRINK#Shrink#
+4044,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Super Baby
4045,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4045,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -2050,6 +2074,7 @@
4045,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent#
4045,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
4045,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
+4045,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Taekwon
4046,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4046,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -2731,7 +2756,7 @@
4060,356,10,3,10,6,5,60,3,0,0,0,0 //LK_PARRYING#Parrying#
4060,357,5,4,5,55,5,63,1,0,0,0,0 //LK_CONCENTRATION#Concentration#
4060,358,1,4,10,6,5,8,3,0,0,0,0 //LK_TENSIONRELAX#Relax#
-4060,359,1,0,0,0,0,0,0,0,0,0,0 //LK_BERSERK#Frenzy# //Extra column removed. Rune Knights dont require job level 50 to use Berserk.
+4060,359,1,0,0,0,0,0,0,0,0,0,0 //LK_BERSERK#Frenzy# //Extra columns removed. Rune Knights dont require job level 50 to use Berserk.
4060,397,5,55,5,56,5,58,5,63,1,0,0 //LK_SPIRALPIERCE#Spiral Pierce#
4060,398,5,55,9,63,1,0,0,0,0,0,0 //LK_HEADCRUSH#Traumatic Blow#
4060,399,10,64,3,398,3,0,0,0,0,0,0 //LK_JOINTBEAT#Vital Strike#
@@ -3639,7 +3664,7 @@
4075,313,5,321,10,0,0,0,0,0,0,0,0 //BD_SIEGFRIED#Acoustic Rhythm#
4075,1010,1,0,0,0,0,0,0,0,0,0,0 //BA_PANGVOICE#Pang Voice#
4075,394,10,47,5,316,1,46,5,0,0,0,0 //CG_ARROWVULCAN#Vulcan Arrow#
-4075,395,1,45,5,315,7,0,0,0,0,0,0 //CG_MOONLIT#Sheltering Bliss#
+4075,395,5,45,5,315,7,0,0,0,0,0,0 //CG_MOONLIT#Sheltering Bliss#
4075,396,1,45,10,315,5,0,0,0,0,0,0 //CG_MARIONETTE#Marionette Control#
4075,487,5,315,10,396,1,317,3,0,0,0,0 //CG_LONGINGFREEDOM#Longing for Freedom#
4075,488,5,45,10,315,10,0,0,0,0,0,0 //CG_HERMODE#Wand of Hermod#
@@ -3701,7 +3726,7 @@
4076,313,5,329,10,0,0,0,0,0,0,0,0 //BD_SIEGFRIED#Acoustic Rhythm#
4076,1011,1,0,0,0,0,0,0,0,0,0,0 //DC_WINKCHARM#Wink of Charm#
4076,394,10,47,5,324,1,46,5,0,0,0,0 //CG_ARROWVULCAN#Vulcan Arrow#
-4076,395,1,45,5,323,7,0,0,0,0,0,0 //CG_MOONLIT#Sheltering Bliss#
+4076,395,5,45,5,323,7,0,0,0,0,0,0 //CG_MOONLIT#Sheltering Bliss#
4076,396,1,45,10,323,5,0,0,0,0,0,0 //CG_MARIONETTE#Marionette Control#
4076,487,5,323,10,396,1,325,3,0,0,0,0 //CG_LONGINGFREEDOM#Longing for Freedom#
4076,488,5,45,10,323,10,0,0,0,0,0,0 //CG_HERMODE#Wand of Hermod#
@@ -3987,7 +4012,7 @@
4081,356,10,3,10,6,5,60,3,0,0,0,0 //LK_PARRYING#Parrying#
4081,357,5,4,5,55,5,63,1,0,0,0,0 //LK_CONCENTRATION#Concentration#
4081,358,1,4,10,6,5,8,3,0,0,0,0 //LK_TENSIONRELAX#Relax#
-4081,359,1,0,0,0,0,0,0,0,0,0,0 //LK_BERSERK#Frenzy# //Extra column removed. Rune Knights dont require job level 50 to use Berserk.
+4081,359,1,0,0,0,0,0,0,0,0,0,0 //LK_BERSERK#Frenzy# //Extra columns removed. Rune Knights dont require job level 50 to use Berserk.
4081,397,5,55,5,56,5,58,5,63,1,0,0 //LK_SPIRALPIERCE#Spiral Pierce#
4081,398,5,55,9,63,1,0,0,0,0,0,0 //LK_HEADCRUSH#Traumatic Blow#
4081,399,10,64,3,398,3,0,0,0,0,0,0 //LK_JOINTBEAT#Vital Strike#
@@ -4417,6 +4442,7 @@
4096,2020,5,57,2,0,0,0,0,0,0,0,0 //RK_PHANTOMTHRUST#Phantom Thrust#
4096,5004,10,2007,2,0,0,0,0,0,0,0,0 //RK_DRAGONBREATH_WATER#Dragon Breath(Water)#
4096,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
+4096,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Warlock
4097,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4097,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -4475,6 +4501,7 @@
4097,2232,5,0,0,0,0,0,0,0,0,0,0 //WL_FREEZE_SP#Freeze Spell#
4097,5012,5,2202,5,0,0,0,0,0,0,0,0 //WL_TELEKINESIS_INTENSE#Intense Telekinesis#
4097,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
+4097,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Ranger
4098,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4098,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -4530,6 +4557,7 @@
4098,2254,5,2237,1,0,0,0,0,0,0,0,0 //RA_ICEBOUNDTRAP#Icebound Trap#
4098,5002,5,2234,5,0,0,0,0,0,0,0,0 //RA_UNLIMIT#Unlimit#
4098,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
+4098,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Arch Bishop
4099,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4099,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -4590,6 +4618,7 @@
4099,2515,5,2044,1,2053,1,0,0,0,0,0,0 //AB_SECRAMENT#Secrament#
4099,5011,5,2051,2,0,0,0,0,0,0,0,0 //AB_OFFERTORIUM#Offertorium#
4099,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
+4099,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Mechanic
4100,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4100,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -4662,6 +4691,7 @@
4100,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
4100,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
4100,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
+4100,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Guillotine Cross
4101,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4101,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -4708,6 +4738,7 @@
4101,2037,5,2036,1,0,0,0,0,0,0,0,0 //GC_CROSSRIPPERSLASHER#Cross Ripper Slasher#
4101,5001,5,2023,5,0,0,0,0,0,0,0,0 //GC_DARKCROW#Dark Claw#
4101,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
+4101,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Royal Guard
4102,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4102,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -4763,6 +4794,7 @@
4102,2325,5,2315,3,2321,4,2322,5,0,0,0,0 //LG_INSPIRATION#Inspiration#
4102,5013,5,2311,5,0,0,0,0,0,0,0,0 //LG_KINGS_GRACE#King's Grace#
4102,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
+4102,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Sorcerer
4103,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4103,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -4835,6 +4867,7 @@
4103,2468,3,2460,3,0,0,0,0,0,0,0,0 //SO_EARTH_INSIGNIA#Earth Insignia#
4103,5008,5,2456,3,0,0,0,0,0,0,0,0 //SO_ELEMENTAL_SHIELD#Elemental Shield#
4103,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
+4103,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Minstrel
4104,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4104,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -4892,6 +4925,7 @@
4104,2434,5,2429,1,2433,1,0,0,0,0,0,0 //WM_UNLIMITED_HUMMING_VOICE#Unlimited Humming Voice#
4104,5007,5,2412,2,0,0,0,0,0,0,0,0 //WM_FRIGG_SONG#
4104,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
+4104,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Wanderer
4105,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4105,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -4949,6 +4983,7 @@
4105,2434,5,2429,1,2433,1,0,0,0,0,0,0 //WM_UNLIMITED_HUMMING_VOICE#Unlimited Humming Voice#
4105,5007,5,2412,2,0,0,0,0,0,0,0,0 //WM_FRIGG_SONG#
4105,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
+4105,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Sura
4106,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4106,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -5010,6 +5045,7 @@
4106,2518,5,267,3,0,0,0,0,0,0,0,0 //SR_RIDEINLIGHTNING#Ride In Lightening#
4106,5009,5,2326,3,2329,3,2330,1,2327,1,0,0 //SR_FLASHCOMBO#Flash Combo#
4106,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
+4106,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Genetic
4107,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4107,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -5068,6 +5104,7 @@
4107,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
4107,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
4107,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
+4107,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Shadow Chaser
4108,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4108,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -5127,6 +5164,7 @@
4108,2304,3,2300,3,0,0,0,0,0,0,0,0 //SC_FEINTBOMB#Feint Bomb#
4108,5010,5,2288,2,0,0,0,0,0,0,0,0 //SC_ESCAPE#Emergency Escape#
4108,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
+4108,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Rune Knight (Dragon)
4109,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4109,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -5167,6 +5205,7 @@
4109,2020,5,57,2,0,0,0,0,0,0,0,0 //RK_PHANTOMTHRUST#Phantom Thrust#
4109,5004,10,2007,2,0,0,0,0,0,0,0,0 //RK_DRAGONBREATH_WATER#Dragon Breath(Water)#
4109,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
+4109,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Royal Guard (Gryphon)
4110,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4110,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -5222,6 +5261,7 @@
4110,2325,5,2315,3,2321,4,2322,5,0,0,0,0 //LG_INSPIRATION#Inspiration#
4110,5013,5,2311,5,0,0,0,0,0,0,0,0 //LG_KINGS_GRACE#King's Grace#
4110,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
+4110,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Ranger (Warg)
4111,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4111,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -5277,6 +5317,7 @@
4111,2254,5,2237,1,0,0,0,0,0,0,0,0 //RA_ICEBOUNDTRAP#Icebound Trap#
4111,5002,5,2234,5,0,0,0,0,0,0,0,0 //RA_UNLIMIT#Unlimit#
4111,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
+4111,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Mechanic (Mado)
4112,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4112,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -5349,6 +5390,7 @@
4112,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
4112,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
4112,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
+4112,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Super Novice (Expanded)
4190,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4190,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -5518,6 +5560,7 @@
4191,365,1,9,1,0,0,0,0,0,0,0,0 //HW_MAGICCRASHER#Stave Crasher#
4191,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
4191,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
+4191,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Kagerou
4211,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4211,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -5627,11 +5670,11 @@
4215,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
4215,500,5,0,0,0,0,0,0,0,0,0,0 //GS_GLITTERING#Flip the Coin#
4215,501,1,500,1,0,0,0,0,0,0,0,0 //GS_FLING#Fling#
-4215,502,1,500,1,511,10,0,0,0,0,0,0 //GS_TRIPLEACTION#Triple Action#
-4215,503,1,500,5,512,10,0,0,0,0,0,0 //GS_BULLSEYE#Bulls Eye#
-4215,504,1,500,4,517,10,0,0,0,0,0,0 //GS_MADNESSCANCEL#Madness Canceler#
-4215,505,1,500,4,513,5,0,0,0,0,0,0 //GS_ADJUSTMENT#AdJustment#
-4215,506,1,500,2,510,10,0,0,0,0,0,0 //GS_INCREASING#Increasing Accuracy#
+4215,502,1,500,1,0,0,0,0,0,0,0,0 //GS_TRIPLEACTION#Triple Action#
+4215,503,1,500,5,0,0,0,0,0,0,0,0 //GS_BULLSEYE#Bulls Eye#
+4215,504,1,500,4,0,0,0,0,0,0,0,0 //GS_MADNESSCANCEL#Madness Canceler#
+4215,505,1,500,4,0,0,0,0,0,0,0,0 //GS_ADJUSTMENT#Adjustment#
+4215,506,1,500,2,0,0,0,0,0,0,0,0 //GS_INCREASING#Increasing Accuracy#
4215,507,1,500,1,0,0,0,0,0,0,0,0 //GS_MAGICALBULLET#Magical Bullet#
4215,508,1,500,1,0,0,0,0,0,0,0,0 //GS_CRACKER#Cracker#
4215,509,10,0,0,0,0,0,0,0,0,0,0 //GS_SINGLEACTION#Single Action#
@@ -5645,29 +5688,29 @@
4215,517,10,515,7,516,5,0,0,0,0,0,0 //GS_GATLINGFEVER#Gatling Fever#
4215,518,10,509,5,0,0,0,0,0,0,0,0 //GS_DUST#Dust#
4215,519,10,518,3,0,0,0,0,0,0,0,0 //GS_FULLBUSTER#Full Buster#
-4215,520,10,519,5,0,0,0,0,0,0,0,0 //GS_SPREADATTACK#Spread Attack#
+4215,520,10,509,5,0,0,0,0,0,0,0,0 //GS_SPREADATTACK#Spread Attack#
4215,521,10,520,7,0,0,0,0,0,0,0,0 //GS_GROUNDDRIFT#Ground Drift#
4215,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby#
4215,2552,1,500,5,0,0,0,0,0,0,0,0 //RL_RICHS_COIN#Rich's Coin#
4215,2553,5,514,1,0,0,0,0,0,0,0,0 //RL_MASS_SPIRAL#Mass Spiral#
4215,2554,5,2557,1,0,0,0,0,0,0,0,0 //RL_BANISHING_BUSTER#Banishing Buster#
-4215,2555,5,0,0,0,0,0,0,0,0,0,0 //RL_B_TRAP#Bind Trap#
-4215,2556,1,501,1,0,0,0,0,0,0,0,0 //RL_FLICKER#Flicker#
+4215,2555,5,2556,1,0,0,0,0,0,0,0,0 //RL_B_TRAP#Bind Trap#
+4215,2556,1,500,1,0,0,0,0,0,0,0,0 //RL_FLICKER#Flicker#
4215,2557,5,513,1,518,1,0,0,0,0,0,0 //RL_S_STORM#Shatter Storm#
-4215,2558,10,511,10,0,0,0,0,0,0,0,0 //RL_E_CHAIN#Eternal Chain#
-4215,2559,1,2558,1,0,0,0,0,0,0,0,0 //RL_QD_SHOT#Quick Draw Shot#
-4215,2560,1,506,1,0,0,0,0,0,0,0,0 //RL_C_MARKER#Crimson Marker#
-4215,2561,5,2564,1,0,0,0,0,0,0,0,0 //RL_FIREDANCE#Fire Dance#
-4215,2562,5,520,1,0,0,0,0,0,0,0,0 //RL_H_MINE#Howling Mine#
-4215,2563,5,0,0,0,0,0,0,0,0,0,0 //RL_P_ALTER#Platinum Alter#
-4215,2564,5,516,10,0,0,0,0,0,0,0,0 //RL_FALLEN_ANGEL#Fallen Angel#
+4215,2558,10,500,1,511,10,0,0,0,0,0,0 //RL_E_CHAIN#Eternal Chain#
+4215,2559,1,511,1,0,0,0,0,0,0,0,0 //RL_QD_SHOT#Quick Draw Shot#
+4215,2560,1,500,1,0,0,0,0,0,0,0,0 //RL_C_MARKER#Crimson Marker#
+4215,2561,5,516,1,0,0,0,0,0,0,0,0 //RL_FIREDANCE#Fire Dance#
+4215,2562,5,521,1,0,0,0,0,0,0,0,0 //RL_H_MINE#Howling Mine#
+4215,2563,5,2552,1,0,0,0,0,0,0,0,0 //RL_P_ALTER#Platinum Alter#
+4215,2564,1,516,10,0,0,0,0,0,0,0,0 //RL_FALLEN_ANGEL#Fallen Angel#
4215,2565,5,2567,1,0,0,0,0,0,0,0,0 //RL_R_TRIP#Round Trip#
4215,2566,5,2560,1,2562,3,0,0,0,0,0,0 //RL_D_TAIL#Dragon Tail#
4215,2567,5,517,1,0,0,0,0,0,0,0,0 //RL_FIRE_RAIN#Fire Rain#
-4215,2568,5,2561,2,0,0,0,0,0,0,0,0 //RL_HEAT_BARREL#Heat Barrel#
+4215,2568,5,2552,1,0,0,0,0,0,0,0,0 //RL_HEAT_BARREL#Heat Barrel#
4215,2569,5,2553,1,0,0,0,0,0,0,0,0 //RL_AM_BLAST#Anti-Material Blast#
4215,2570,5,2554,3,0,0,0,0,0,0,0,0 //RL_SLUGSHOT#Slug Shot#
-4215,2571,5,2569,3,0,0,0,0,0,0,0,0 //RL_HAMMER_OF_GOD#Hammer of God#
+4215,2571,5,2552,1,2569,3,0,0,0,0,0,0 //RL_HAMMER_OF_GOD#Hammer of God#
//Summoner
4218,5018,1,0,0,0,0,0,0,0,0,0,0 //SU_BASIC_SKILL##
4218,5019,1,5018,1,0,0,0,0,0,0,0,0 //SU_BITE##
@@ -5691,8 +5734,20 @@
4218,5039,5,5038,3,0,0,0,0,0,0,0,0 //SU_TUNAPARTY##
4218,5040,5,5041,3,0,0,0,0,0,0,0,0 //SU_BUNCHOFSHRIMP##
4218,5041,5,5024,1,0,0,0,0,0,0,0,0 //SU_FRESHSHRIMP##
-4218,681,1,0,0,0,0,0,0,0,0,0,0 //ALL_INCCARRY#Enlarge Weight Limit R#
-
+4218,5044,1,5024,1,0,0,0,0,0,0,0,0 //SU_SOULATTACK##
+4218,5045,5,100,0,5047,5,0,0,0,0,0,0,0,0 //SU_POWEROFFLOCK##
+4218,5046,5,100,0,5045,5,0,0,0,0,0,0,0,0 //SU_SVG_SPIRIT##
+4218,5047,5,100,0,5031,1,0,0,0,0,0,0,0,0 //SU_HISS##
+4218,5048,5,100,0,5053,5,0,0,0,0,0,0,0,0 //SU_NYANGGRASS##
+4218,5049,5,100,0,5037,1,0,0,0,0,0,0,0,0 //SU_GROOMING##
+4218,5050,5,100,0,5049,5,0,0,0,0,0,0,0,0 //SU_PURRING##
+4218,5051,5,100,0,5050,5,0,0,0,0,0,0,0,0 //SU_SHRIMPARTY##
+4218,5052,1,100,0,5046,5,0,0,0,0,0,0,0,0 //SU_SPIRITOFLIFE##
+4218,5053,5,100,0,5025,1,0,0,0,0,0,0,0,0 //SU_MEOWMEOW##
+4218,5054,1,100,0,5048,5,0,0,0,0,0,0,0,0 //SU_SPIRITOFLAND##
+4218,5055,5,100,0,5025,1,0,0,0,0,0,0,0,0 //SU_CHATTERING##
+4218,5056,1,100,0,5051,5,0,0,0,0,0,0,0,0 //SU_SPIRITOFSEA##
+4218,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby#
//Baby Summoner
4220,5018,1,0,0,0,0,0,0,0,0,0,0 //SU_BASIC_SKILL##
4220,5019,1,5018,1,0,0,0,0,0,0,0,0 //SU_BITE##
@@ -5716,8 +5771,9 @@
4220,5039,5,5038,3,0,0,0,0,0,0,0,0 //SU_TUNAPARTY##
4220,5040,5,5041,3,0,0,0,0,0,0,0,0 //SU_BUNCHOFSHRIMP##
4220,5041,5,5024,1,0,0,0,0,0,0,0,0 //SU_FRESHSHRIMP##
-4220,681,1,0,0,0,0,0,0,0,0,0,0 //ALL_INCCARRY#Enlarge Weight Limit R#
-
+4220,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby#
+4220,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent#
+4220,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Ninja
4222,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4222,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -5744,8 +5800,9 @@
4222,542,5,533,10,541,5,0,0,0,0,0,0 //NJ_KAMAITACHI#NJ_KAMAITACHI#
4222,543,5,533,5,0,0,0,0,0,0,0,0 //NJ_NEN#NJ_NEN#
4222,544,10,522,7,530,5,543,1,0,0,0,0 //NJ_ISSEN#NJ_ISSEN#
-4222,681,1,0,0,0,0,0,0,0,0,0,0 //ALL_INCCARRY#Enlarge Weight Limit R#
-
+4222,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby#
+4222,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent#
+4222,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Kagerou
4223,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4223,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -5772,7 +5829,8 @@
4223,542,5,533,10,541,5,0,0,0,0,0,0 //NJ_KAMAITACHI#NJ_KAMAITACHI#
4223,543,5,533,5,0,0,0,0,0,0,0,0 //NJ_NEN#NJ_NEN#
4223,544,10,522,7,530,5,543,1,0,0,0,0 //NJ_ISSEN#NJ_ISSEN#
-4223,681,1,0,0,0,0,0,0,0,0,0,0 //ALL_INCCARRY#Enlarge Weight Limit R#
+4223,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby#
+4223,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent#
4223,3001,1,530,5,0,0,0,0,0,0,0,0 //KO_YAMIKUMO##
4223,3002,5,0,0,0,0,0,0,0,0,0,0 //KO_RIGHT##
4223,3003,5,0,0,0,0,0,0,0,0,0,0 //KO_LEFT##
@@ -5798,7 +5856,7 @@
4223,3023,5,3012,1,0,0,0,0,0,0,0,0 //KG_KAGEHUMI##
4223,3024,5,3023,2,0,0,0,0,0,0,0,0 //KG_KYOMU##
4223,3025,5,3024,3,0,0,0,0,0,0,0,0 //KG_KAGEMUSYA##
-
+4223,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Oboro
4224,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4224,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -5825,7 +5883,8 @@
4224,542,5,533,10,541,5,0,0,0,0,0,0 //NJ_KAMAITACHI#NJ_KAMAITACHI#
4224,543,5,533,5,0,0,0,0,0,0,0,0 //NJ_NEN#NJ_NEN#
4224,544,10,522,7,530,5,543,1,0,0,0,0 //NJ_ISSEN#NJ_ISSEN#
-4224,681,1,0,0,0,0,0,0,0,0,0,0 //ALL_INCCARRY#Enlarge Weight Limit R#
+4224,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby#
+4224,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent#
4224,3001,1,530,5,0,0,0,0,0,0,0,0 //KO_YAMIKUMO##
4224,3002,5,0,0,0,0,0,0,0,0,0,0 //KO_RIGHT##
4224,3003,5,0,0,0,0,0,0,0,0,0,0 //KO_LEFT##
@@ -5851,7 +5910,7 @@
4224,3026,5,3021,1,0,0,0,0,0,0,0,0 //OB_ZANGETSU##
4224,3027,5,3029,3,0,0,0,0,0,0,0,0 //OB_OBOROGENSOU##
4224,3029,5,3026,2,0,0,0,0,0,0,0,0 //OB_AKAITSUKI##
-
+4224,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Taekwon
4225,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4225,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -5872,8 +5931,9 @@
4225,425,7,422,5,423,5,424,5,0,0,0,0 //TK_SEVENWIND#Warm Wind#
4225,426,5,0,0,0,0,0,0,0,0,0,0 //TK_HIGHJUMP#High Jump#
4225,493,1,424,5,0,0,0,0,0,0,0,0 //TK_MISSION#Taekwon Mission#
-4225,681,1,0,0,0,0,0,0,0,0,0,0 //ALL_INCCARRY#Enlarge Weight Limit R#
-
+4225,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby#
+4225,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent#
+4225,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Star Gladiator
4226,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4226,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -5894,6 +5954,8 @@
4226,425,7,422,5,423,5,424,5,0,0,0,0 //TK_SEVENWIND#Warm Wind#
4226,426,5,0,0,0,0,0,0,0,0,0,0 //TK_HIGHJUMP#High Jump#
4226,493,1,424,5,0,0,0,0,0,0,0,0 //TK_MISSION#Taekwon Mission#
+4226,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby#
+4226,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent#
4226,427,3,0,0,0,0,0,0,0,0,0,0 //SG_FEEL#Feeling the Sun, Moon and Stars#
4226,428,3,427,1,0,0,0,0,0,0,0,0 //SG_SUN_WARM#Warmth of the Sun#
4226,429,3,427,2,0,0,0,0,0,0,0,0 //SG_MOON_WARM#Warmth of the Moon#
@@ -5912,8 +5974,7 @@
4226,442,3,0,0,0,0,0,0,0,0,0,0 //SG_FRIEND#Friend of the Sun, Moon and Stars#
4226,443,10,0,0,0,0,0,0,0,0,0,0 //SG_KNOWLEDGE#Knowledge of the Sun, Moon and Stars#
4226,444,1,443,9,0,0,0,0,0,0,0,0 //SG_FUSION#Union of the Sun, Moon and Stars#
-4226,681,1,0,0,0,0,0,0,0,0,0,0 //ALL_INCCARRY#Enlarge Weight Limit R#
-
+4226,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Soul Linker
4227,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4227,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -5934,6 +5995,8 @@
4227,425,7,422,5,423,5,424,5,0,0,0,0 //TK_SEVENWIND#Warm Wind#
4227,426,5,0,0,0,0,0,0,0,0,0,0 //TK_HIGHJUMP#High Jump#
4227,493,1,424,5,0,0,0,0,0,0,0,0 //TK_MISSION#Taekwon Mission#
+4227,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby#
+4227,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent#
4227,445,5,0,0,0,0,0,0,0,0,0,0 //SL_ALCHEMIST#Spirit of the Alchemist#
4227,447,5,0,0,0,0,0,0,0,0,0,0 //SL_MONK#Spirit of the Monk#
4227,448,5,0,0,0,0,0,0,0,0,0,0 //SL_STAR#Spirit of the Star Knight#
@@ -5961,8 +6024,7 @@
4227,471,3,452,1,0,0,0,0,0,0,0,0 //SL_SKE#Esk#
4227,472,3,447,1,0,0,0,0,0,0,0,0 //SL_SKA#Eska#
4227,494,5,451,1,0,0,0,0,0,0,0,0 //SL_HIGH#Spirit of Rebirth#
-4227,681,1,0,0,0,0,0,0,0,0,0,0 //ALL_INCCARRY#Enlarge Weight Limit R#
-
+4227,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Gunslinger
4228,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4228,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -5988,8 +6050,9 @@
4228,519,10,518,3,0,0,0,0,0,0,0,0 //GS_FULLBUSTER#Full Buster#
4228,520,10,519,5,0,0,0,0,0,0,0,0 //GS_SPREADATTACK#Spread Attack#
4228,521,10,520,7,0,0,0,0,0,0,0,0 //GS_GROUNDDRIFT#Ground Drift#
-4228,681,1,0,0,0,0,0,0,0,0,0,0 //ALL_INCCARRY#Enlarge Weight Limit R#
-
+4228,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby#
+4228,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent#
+4228,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Rebellion
4229,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4229,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -6015,7 +6078,8 @@
4229,519,10,518,3,0,0,0,0,0,0,0,0 //GS_FULLBUSTER#Full Buster#
4229,520,10,519,5,0,0,0,0,0,0,0,0 //GS_SPREADATTACK#Spread Attack#
4229,521,10,520,7,0,0,0,0,0,0,0,0 //GS_GROUNDDRIFT#Ground Drift#
-4229,681,1,0,0,0,0,0,0,0,0,0,0 //ALL_INCCARRY#Enlarge Weight Limit R#
+4229,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby#
+4229,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent#
4229,2552,1,500,5,0,0,0,0,0,0,0,0 //RL_RICHS_COIN#Rich's Coin#
4229,2553,5,514,1,0,0,0,0,0,0,0,0 //RL_MASS_SPIRAL#Mass Spiral#
4229,2554,5,2557,1,0,0,0,0,0,0,0,0 //RL_BANISHING_BUSTER#Banishing Buster#
@@ -6036,7 +6100,7 @@
4229,2569,5,2553,1,0,0,0,0,0,0,0,0 //RL_AM_BLAST#Anti-Material Blast#
4229,2570,5,2554,3,0,0,0,0,0,0,0,0 //RL_SLUGSHOT#Slug Shot#
4229,2571,5,2569,3,0,0,0,0,0,0,0,0 //RL_HAMMER_OF_GOD#Hammer of God#
-
+4229,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
//Baby Star Gladiator (Union)
4238,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
4238,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -6057,6 +6121,8 @@
4238,425,7,422,5,423,5,424,5,0,0,0,0 //TK_SEVENWIND#Warm Wind#
4238,426,5,0,0,0,0,0,0,0,0,0,0 //TK_HIGHJUMP#High Jump#
4238,493,1,424,5,0,0,0,0,0,0,0,0 //TK_MISSION#Taekwon Mission#
+4238,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby#
+4238,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent#
4238,427,3,0,0,0,0,0,0,0,0,0,0 //SG_FEEL#Feeling the Sun, Moon and Stars#
4238,428,3,427,1,0,0,0,0,0,0,0,0 //SG_SUN_WARM#Warmth of the Sun#
4238,429,3,427,2,0,0,0,0,0,0,0,0 //SG_MOON_WARM#Warmth of the Moon#
@@ -6075,4 +6141,4 @@
4238,442,3,0,0,0,0,0,0,0,0,0,0 //SG_FRIEND#Friend of the Sun, Moon and Stars#
4238,443,10,0,0,0,0,0,0,0,0,0,0 //SG_KNOWLEDGE#Knowledge of the Sun, Moon and Stars#
4238,444,1,443,9,0,0,0,0,0,0,0,0 //SG_FUSION#Union of the Sun, Moon and Stars#
-4238,681,1,0,0,0,0,0,0,0,0,0,0 //ALL_INCCARRY#Enlarge Weight Limit R#
\ No newline at end of file
+4238,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
diff --git a/db/re/skill_unit_db.txt b/db/re/skill_unit_db.txt
index 359be00630b..4b4383a57d8 100644
--- a/db/re/skill_unit_db.txt
+++ b/db/re/skill_unit_db.txt
@@ -115,7 +115,6 @@
2032,0xe1, , 2, 0,1000,enemy, 0x8018 //GC_POISONSMOKE
2213,0x86, , 0, 9,1000,enemy, 0x018 //WL_COMET
-2214,0x86, , 0, 5, 100,enemy, 0x080 //WL_CHAINLIGHTNING
2216,0xcb, , -1, 2,2000,enemy, 0x018 //WL_EARTHSTRAIN
2238,0xd8, , 0, 1,1000,enemy, 0x8006 //RA_ELECTRICSHOCKER
@@ -151,10 +150,10 @@
2450,0xe0, , 3, 0, -1,enemy, 0xA010 //SO_CLOUD_KILL
2452,0xe4, , 3, 0, -1,all, 0xA010 //SO_WARMER
2453,0xeb, , 0, 1:1:2:2:3,500,enemy,0x8010 //SO_VACUUM_EXTREME
-2465,0xf1, , 0, 1,1000,all, 0x010 //SO_FIRE_INSIGNIA
-2466,0xf2, , 0, 1,1000,all, 0x010 //SO_WATER_INSIGNIA
-2467,0xf3, , 0, 1,1000,all, 0x010 //SO_WIND_INSIGNIA
-2468,0xf4, , 0, 1,1000,all, 0x010 //SO_EARTH_INSIGNIA
+2465,0xf1, , 1, 0, -1,all, 0x2010 //SO_FIRE_INSIGNIA
+2466,0xf2, , 1, 0, -1,all, 0x2010 //SO_WATER_INSIGNIA
+2467,0xf3, , 1, 0, -1,all, 0x2010 //SO_WIND_INSIGNIA
+2468,0xf4, , 1, 0, -1,all, 0x2010 //SO_EARTH_INSIGNIA
2479,0xe5, , 0, 1,1000,enemy, 0x8006 //GN_THORNS_TRAP
2482,0xe6,0x7f, -1, 1, 300,enemy, 0x8000 //GN_WALLOFTHORN
@@ -179,7 +178,7 @@
5027,0x106, , 1:1:2:2:3, 0, -1,enemy, 0x2010 // SU_CN_POWDERING
5028,0x86, , 0, 3, 500,enemy, 0x10 // SU_CN_METEOR
-5029,0x107, , 0, 0,1000,enemy, 0x10 // SU_SV_ROOTTWIST
+5048,0x107, , 2:2:3:3:4, 0, -1, enemy, 0x2010 // SU_NYANGGRASS
8020,0xf5, , 3, 0,2300:2100:1900:1700:1500,enemy, 0x018 //MH_POISON_MIST
8033,0x7e, , 0, 0, -1,all, 0x003 //MH_STEINWAND
diff --git a/db/readme.md b/db/readme.md
new file mode 100644
index 00000000000..eeddb1faed2
--- /dev/null
+++ b/db/readme.md
@@ -0,0 +1,106 @@
+# Import Directories
+
+## What is the import directory for?
+
+The `import/` directory provides a way for you to change your config settings without the need to even touch the main `/conf/` and `/db/` files.
+
+By placing your custom entries into the `import/` directory within these two locations, your core files will not need to have any conflicts resolved when you update your server. You store your changes, and the rest is updated with rAthena.
+
+## How does this work?
+
+Think of "import" as in "override". Place only the settings you have changed in the import files, or settings you are "overriding".
+
+For example, when setting up a server there are always a few config settings that users would like to change in order for rAthena to suit their needs. The following example will show you how to use the `/db/import/` directory correctly. (for `/conf/import/` examples, see [/conf/readme.md](/conf/readme.md))
+
+### Achievements
+---
+We want to add our own custom achievement that can be given to a player via an NPC Script and another that we can give to our GMs.
+
+#### /db/import/achievement_db.yml
+
+
+ Achievements:
+ - ID: 280000
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Emperio"
+ Reward:
+ TitleID: 1035
+ Score: 50
+ - ID: 280001
+ Group: "AG_GOAL_ACHIEVE"
+ Name: "Staff"
+ Reward:
+ TitleID: 1036
+ Score: 50
+
+
+### Instances
+---
+We want to add our own customized Housing Instance.
+
+#### /db/import/instance_db.txt
+
+ // ID,Name,LimitTime,IdleTimeOut,EnterMap,EnterX,EnterY,Map2,Map3,...,Map255
+ 35,Home,3600,900,1@home,24,6,2@home,3@home
+
+
+### Mob Alias
+---
+We want to give a custom mob a Novice player sprite.
+
+#### /db/import/mob_avail.txt
+
+ // Structure of Database:
+ // MobID,SpriteID{,Equipment}
+ 3850,0
+
+
+### Custom Maps
+---
+We want to add our own custom maps. For this we need to add our map names to `import/map_index.txt` and then to the `import/map_cache.dat` file for the Map Server to load.
+
+#### /db/import/map_index.txt
+
+ 1@home 1250
+ 2@home
+ 3@home
+ ev_has
+ shops
+ prt_pvp
+
+
+### Item Trade Restrictions
+---
+We want to ensure that specific items cannot be traded, sold, dropped, placed in storage, etc.
+
+#### /db/import/item_trade.txt
+
+ // Legend for 'TradeMask' field (bitmask):
+ // 1 - item can't be dropped
+ // 2 - item can't be traded (nor vended)
+ // 4 - wedded partner can override restriction 2
+ // 8 - item can't be sold to npcs
+ // 16 - item can't be placed in the cart
+ // 32 - item can't be placed in the storage
+ // 64 - item can't be placed in the guild storage
+ // 128 - item can't be attached to mail
+ // 256 - item can't be auctioned
+ // Full outright value = 511
+ 34000,511,100 // Old Green Box
+ 34001,511,100 // House Keys
+ 34002,511,100 // Reputation Journal
+
+
+### Custom Quests
+---
+We want to add our own custom quests to the quest_db.
+
+#### /db/import/quest_db.txt
+
+ // Quest ID,Time Limit,Target1,Val1,Target2,Val2,Target3,Val3,MobID1,NameID1,Rate1,MobID2,NameID2,Rate2,MobID3,NameID3,Rate3,Quest Title
+ 89001,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Reputation Quest"
+ 89002,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Reputation Quest"
+
+
+
+We cannot stress enough how helpful this system is for everyone. The majority of git conflicts will simply go away if users make use of the `import/` system.
diff --git a/db/skill_copyable_db.txt b/db/skill_copyable_db.txt
index 85cf459dbef..e7b6c4830e5 100644
--- a/db/skill_copyable_db.txt
+++ b/db/skill_copyable_db.txt
@@ -181,6 +181,7 @@ GC_DARKCROW,2 // Dark Claw
// Arch Bishop
AB_JUDEX,2 // Judex
AB_ADORAMUS,2 // Adoramus
+AB_RENOVATIO,2 // Renovatio
AB_HIGHNESSHEAL,2 // Highness Heal
AB_DUPLELIGHT,2 // Duple Light
AB_DUPLELIGHT_MELEE,2 // Dummy skill for Duple Light
diff --git a/doc/achievements.txt b/doc/achievements.txt
new file mode 100644
index 00000000000..e08b34f395a
--- /dev/null
+++ b/doc/achievements.txt
@@ -0,0 +1,102 @@
+//===== rAthena Documentation ================================
+//= Achievement Database Structure
+//===== By: ==================================================
+//= rAthena Dev Team
+//===== Last Updated: ========================================
+//= 20170531
+//===== Description: =========================================
+//= Explanation of the achievements_db.yml file and structure.
+//============================================================
+
+---------------------------------------
+
+ID: Unique achievement ID.
+
+---------------------------------------
+
+Group: Achievement group type. Each achievement type calls a specific objective check.
+Valid groups:
+ AG_ADD_FRIEND - Triggered when a player adds a friend.
+ AG_ADVENTURE - Does not trigger automatically. These are triggered by the achievementcomplete script command.
+ AG_BABY - Triggered when a player becomes a baby job.
+ AG_BATTLE - Triggered when a player kills a monster.
+ AG_CHATTING - Unknown.
+ AG_CHATTING_COUNT - Triggered when a player has a chatroom open and others join.
+ AG_CHATTING_CREATE - Triggered when a player creates a chatroom.
+ AG_CHATTING_DYING - Triggered when a player creates a chatroom and dies with it open.
+ AG_EAT - Unknown.
+ AG_GET_ITEM - Triggered when a player gets an item that has a specific sell value.
+ AG_GET_ZENY - Triggered when a player gets a specific amount of zeny at once.
+ AG_GOAL_ACHIEVE - Triggered when a player's achievement rank levels up.
+ AG_GOAL_LEVEL - Triggered when a player's base level or job level changes.
+ AG_GOAL_STATUS - Triggered when a player's base stats changes.
+ AG_HEAR - Unknown.
+ AG_JOB_CHANGE - Triggered when a player's job changes.
+ AG_MARRY - Triggered when two players get married.
+ AG_PARTY - Triggered when a player creates a party.
+ AG_ENCHANT_FAIL - Triggered when a player fails to refine an equipment.
+ AG_ENCHANT_SUCCESS - Triggered when a player successfully refines an equipment.
+ AG_SEE - Unknown.
+ AG_SPEND_ZENY - Triggered when a player spends any amount of zeny on vendors.
+ AG_TAMING - Triggered when a player tames a monster.
+
+---------------------------------------
+
+Name: Achievement name. Not read into source but used for quick look ups.
+
+---------------------------------------
+
+Target: A list of monster ID and count values that the achievement requires.
+ The target count can also be used for achievements that keep a counter while not being related to monster kills.
+ Capped at MAX_ACHIEVEMENT_OBJECTIVES.
+
+Example:
+ // Player must kill 5 Scorpions and 10 Poring.
+ Target:
+ - MobID: 1001
+ Count: 5
+ - MobID: 1002
+ Count: 10
+
+Example 2:
+ // Player must have 100 or more of ARG0 value. Using the count target value is useful for achievements that are increased in increments
+ // and not checked for a total (UI_Type = 1).
+ // IE: In the achievement_list.lub file, UI_Type 0 is displayed as non-incremental while 1 shows a progress bar of completion for the achievement.
+ Condition: " ARG0 >= 100 "
+ Target:
+ - Count: 100
+
+---------------------------------------
+
+Condition: A conditional statement that must be met for the achievement to be considered complete. Accepts script constants, player variables, and
+ ARGX (where X is the argument vector value). The ARGX values are sent from the server to the achievement script engine on special events.
+ Below are two examples of how the ARGX feature works.
+
+Example:
+ // This function will send 1 argument (ARG0) with a value of i + 1 when a friend is added.
+ achievement_update_objective(f_sd, AG_ADD_FRIEND, 1, i + 1);
+
+Example 2:
+ // This function will send 2 arguments (ARG0 and ARG1) with values of weapon level and refine level, respectively, when an equipment is
+ // successfully refined.
+ achievement_update_objective(sd, AG_REFINE_SUCCESS, 2, sd->inventory_data[i]->wlv, sd->inventory.u.items_inventory[i].refine);
+
+---------------------------------------
+
+Map: A map name that is used for the AG_CHATTING type which increments the counter based on the player's map.
+
+---------------------------------------
+
+Dependent: A list of achievement IDs that need to be completed before this achievement is considered complete.
+
+---------------------------------------
+
+Reward: A list of rewards that are given on completion. All fields are optional.
+ ItemID: Item ID
+ Amount: Amount of Item ID (default 1)
+ Script: Bonus Script
+ TitleID: Title ID
+
+---------------------------------------
+
+Score: Achievement points that are given on completion.
diff --git a/doc/atcommands.txt b/doc/atcommands.txt
index e7b9e488f72..ee54aefd5f0 100644
--- a/doc/atcommands.txt
+++ b/doc/atcommands.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= rAthena Dev Team
//===== Last Updated: ========================================
-//= 20160313
+//= 20171011
//===== Description: =========================================
//= List of available atcommands and their functions.
//============================================================
@@ -226,14 +226,24 @@ New warp NPC 'my_warp_sample' created.
@effect <effect ID>
Creates a visual effect on or around the character.
-A list of IDs can be found in '/db/const.txt'.
-Descriptions of the effects can be found in '/doc/effect_list.txt'.
+A list of IDs and descriptions of the effects can be found in '/doc/effect_list.txt'.
---------------------------------------
-@misceffect
+@misceffect <effect ID>
-Does some visual effect on the character (more info needed).
+Does some visual effect on the character.
+Possible effect IDs:
+ 0 = base level up
+ 1 = job level up
+ 2 = refine failure
+ 3 = refine success
+ 4 = game over
+ 5 = pharmacy success
+ 6 = pharmacy failure
+ 7 = base level up (super novice)
+ 8 = job level up (super novice)
+ 9 = base level up (taekwon)
---------------------------------------
@@ -1300,7 +1310,7 @@ Bans or unbans a player for a limited time.
Time elements: y/a, m, d/j, h, mn, s
Example:
-@ban +2d Char2
+@charban +2d Char2
-> bans Char2's for 2 days.
---------------------------------------
@@ -1320,12 +1330,12 @@ This will also send a packet to clients causing them to close.
@reloadmobdb
@reloadmotd
@reloadmsgconf
-@reloadpacketdb
@reloadpcdb
@reloadquestdb
@reloadscript
@reloadskilldb
@reloadstatusdb
+@reloadachievementdb
Reloads a database or configuration file.
@@ -1333,10 +1343,10 @@ Databases:
-- instancedb: Instance Database
-- itemdb: Item Database
-- mobdb: Monster Database
--- packetdb: Packet Database
-- questdb: Quest Database
-- script: NPC Scripts
-- skilldb: Skill Database
+-- achievementdb: Achievement Database
Configuration files:
-- atcommand: Atcommand Settings
@@ -1354,12 +1364,12 @@ Affected files:
-- mobdb: mob_db.txt, mob_item_ratio.txt, mob_chat_db.txt, mob_avail.txt, mob_race2_db.txt, mob_branch.txt, mob_poring.txt, mob_boss.txt, mob_pouch.txt, mob_classchange.txt, pet_db.txt, homunculus_db.txt, homun_skill_tree.txt, exp_homun.txt, mercenary_db.txt, mercenary_skill_db.txt, elemental_db.txt, elemental_skill_db.txt
-- motd: motd.txt
-- msgconf: atcommand_athena.conf
--- packetdb: packet_db.txt
-- pcdb: statpoint.txt, job_exp.txt, skill_tree.txt, attr_fix.txt, job_db1.txt, job_db2.txt, job_basehpsp_db.txt, job_maxhpsp_db.txt, job_param_db.txt, level_penalty.txt
-- questdb: quest_db.txt
-- script: /npc/*.txt, /npc/*.conf
-- skilldb: skill_db.txt, const.txt, skill_require_db.txt, skill_cast_db.txt, skill_castnodex_db.txt, skill_nocast_db.txt, skill_copyable_db.txt, skill_improvise_db.txt, skill_changematerial_db.txt, skill_nonearnpc_db.txt, skill_damage_db.txt, skill_unit_db.txt, abra_db.txt, create_arrow_db.txt, produce_db.txt, spellbook_db.txt, magicmushroom_db.txt
--- statusdb: attr_fix.txt, size_fix.txt, refine_db.tx
+-- statusdb: attr_fix.txt, size_fix.txt, refine_db.txt
+-- achievementdb: achievement_db.conf
Restriction:
- Used from 'atcommand' or 'useatcmd'. For @reload & @reloadscript
diff --git a/doc/effect_list.txt b/doc/effect_list.txt
index 27e9f6b0b1f..2966a3c0cae 100644
--- a/doc/effect_list.txt
+++ b/doc/effect_list.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= rAthena Dev Team
//===== Last Updated: ========================================
-//= 20120822
+//= 20171011
//===== Description: =========================================
//= A list of client-side effects sorted by ID.
//============================================================
@@ -11,7 +11,7 @@
The following is a compiled list of visual and sound effects which the client
can produce when receiving a packet with id 0x1f3 (01f3 <ID>.l <type>.l).
Each list entry contains a number and a short description of the effect.
-You can produce these effects ingame by doing "@effect <number> 22" (22=self).
+You can produce these effects ingame by doing "@effect <number>".
It's also possible to attach effects to item/npc scripts by using 'misceffect'.
Number Description
diff --git a/doc/item_group.txt b/doc/item_group.txt
index 4ad9412d072..6e4fb8b4032 100644
--- a/doc/item_group.txt
+++ b/doc/item_group.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= rAthena Dev Team
//===== Last Updated: ========================================
-//= 20131223
+//= 20170915
//===== Description: =========================================
//= Explanation of the item_group.txt file and structure.
//============================================================
@@ -38,7 +38,7 @@ The table below explains which fields are accessed in each.
---------------------------------------
-GroupID: See the "Item Group ID" section in 'db/const.txt'.
+GroupID: See the "Item Group ID" section in 'src/map/itemdb.h' and the "item groups" section in 'src/map/script_constants.h'.
Supports IG_* constants.
---------------------------------------
diff --git a/doc/mapflags.txt b/doc/mapflags.txt
index 981c2256931..afb174b2603 100644
--- a/doc/mapflags.txt
+++ b/doc/mapflags.txt
@@ -196,6 +196,8 @@ Disables usage of monster-spawning items on a map:
- Poring Box (ID 12109)
- Red Pouch (ID 12024)
+Items listed above can be modified under db/(pre-)re/item_flag.txt
+
Note that when 'mob_warp' is enabled in '/conf/battle/monster.conf' and flag 4 is set, this will
also prevent mobs from being warped onto the map (except slave mobs).
diff --git a/doc/packet_interserv.txt b/doc/packet_interserv.txt
index 28afd7ad6e7..5065298a439 100644
--- a/doc/packet_interserv.txt
+++ b/doc/packet_interserv.txt
@@ -47,9 +47,9 @@ Currently the max packet size is 0xFFFF (see 'WFIFOSET()' in 'src/common/socket.
0x2713:
Type: AH
- Structure: <cmd>.W <aid>.L <login_id1>.L <login_id2>.L <sex>.B <auth>.B <request_id>.L <version>.L <clienttype>.B
- index: 0,2,6,10,14,15,16,20,24
- len: 25
+ Structure: <cmd>.W <aid>.L <login_id1>.L <login_id2>.L <sex>.B <auth>.B <request_id>.L <clienttype>.B
+ index: 0,2,6,10,14,15,16,20
+ len: 21
parameter:
- cmd : packet identification (0x2713)
- aid : account identification
@@ -58,7 +58,6 @@ Currently the max packet size is 0xFFFF (see 'WFIFOSET()' in 'src/common/socket.
- sex: the sex of the account
- ok : 1=auth failed, 1=ok
- request_id: unknown @FIXME
- - version: client version, (clientinfo version)
- clienttype: unknown @FIXME
desc:
- Acknowledge the authentication request from char-serv
@@ -131,24 +130,23 @@ Currently the max packet size is 0xFFFF (see 'WFIFOSET()' in 'src/common/socket.
0x2720:
Type: HA
- Structure: <cmd>.W <map_fd>.L <u_fd>.L <u_aid>.L <u_group>.L <account_id>.L
- index: 0,2,6,10,14,18
- len: 22
+ Structure: <cmd>.W <map_fd>.L <u_fd>.L <u_aid>.L <account_id>.L
+ index: 0,2,6,10,14
+ len: 18
parameter:
- cmd : packet identification (0x2720)
- map_fd :
- u_fd :
- u_aid :
- - u_group :
- account_id :
desc:
-
0x2721:
Type: AH
- Structure: <cmd>.W <map_fd>.L <u_fd>.L <u_aid>.L <account_id>.L <status>.B <password>.33B <email>.40B <last_ip>.16B <last_login>.24B <group_id>.L <logincount>.L <state>.L <password>.33B <birthdate>.11B <pincode>.?B <userid>.?B
- index: 0,2,6,10,18,19,52,92,108,132,136,140,144,155,155+PINCODE_LENGTH
- len: 155 + PINCODE_LENGTH + NAME_LENGTH
+ Structure: <cmd>.W <map_fd>.L <u_fd>.L <u_aid>.L <account_id>.L <status>.B <password>.33B <email>.40B <last_ip>.16B <last_login>.24B <group_id>.L <logincount>.L <state>.L <birthdate>.11B <userid>.?B
+ index: 0,2,6,10,18,19,52,92,108,132,136,140,144,122+NAME_LENGTH
+ len: 122 + NAME_LENGTH
parameter:
- cmd : packet identification (0x2721)
- map_fd
@@ -163,9 +161,7 @@ Currently the max packet size is 0xFFFF (see 'WFIFOSET()' in 'src/common/socket.
- group_id
- logincount
- state
- - password
- birthdate
- - pincode
- userid
desc:
-
@@ -1190,6 +1186,27 @@ Currently the max packet size is 0xFFFF (see 'WFIFOSET()' in 'src/common/socket.
desc:
- Requests to the inter server to save a character's quest log entries.
+0x3062
+ Type: ZI
+ Structure: <cmd>.W <cid>.L
+ index: 0,2
+ len: 6
+ parameter:
+ - cmd : packet identification (0x3062)
+ - cid
+ desc:
+ - Requests a character's achievement log entries to the inter server.
+
+0x3063
+ Type: ZI
+ Structure: <cmd>.W <len>.W <cid>.L <achievement_log>.?B
+ index: 0,2,4,8
+ len: variable: 8+count
+ parameter:
+ - cmd : packet identification (0x3063)
+ desc:
+ - Requests to the inter server to save a character's achievement log entries.
+
0x3070
Type: ZI
Structure: <cmd>.W <size>.W <merc>.?B
@@ -2769,16 +2786,15 @@ Currently the max packet size is 0xFFFF (see 'WFIFOSET()' in 'src/common/socket.
0x2b02
Type: ZA
- Structure: <cmd>.W <id>.L <login_id1>.L <login_id2>.L <s_ip>.L <packet_ver>.B
- index: 0,2,6,10,14,18
- len: 19
+ Structure: <cmd>.W <id>.L <login_id1>.L <login_id2>.L <s_ip>.L
+ index: 0,2,6,10,14
+ len: 18
parameter:
- cmd : packet identification (0x2b02)
- id
- login_id1
- login_id2
- s_ip
- - packet_ver
desc:
- chrif_charselectreq
diff --git a/doc/sample/getequipcardid.txt b/doc/sample/getequipcardid.txt
index 0556eb8e77a..db5cdde3db3 100644
--- a/doc/sample/getequipcardid.txt
+++ b/doc/sample/getequipcardid.txt
@@ -22,6 +22,6 @@ prontera,155,177,4 script Check My Hat 810,{
close;
}
mes "Nothing?";
- emotion e_hmm;
+ emotion ET_SCRATCH;
close;
}
diff --git a/doc/sample/instancing.txt b/doc/sample/instancing.txt
index ae67468f6c1..0fa082a3f19 100644
--- a/doc/sample/instancing.txt
+++ b/doc/sample/instancing.txt
@@ -27,7 +27,7 @@ prontera,151,190,6 script Sample Instance 101,{
case 2:
mes "[Sample Instance]";
mes "You don't want to try again?";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
} else {
@@ -47,7 +47,7 @@ prontera,151,190,6 script Sample Instance 101,{
}
mes " ";
mes "Instance creation ^FF0000failed^000000.";
- emotion e_omg;
+ emotion ET_HUK;
close;
}
mes "[Sample Instance]";
@@ -72,7 +72,7 @@ prontera,151,190,6 script Sample Instance 101,{
}
mes " ";
mes "Instance entry ^FF0000failed^000000.";
- emotion e_omg;
+ emotion ET_HUK;
close;
}
close;
@@ -164,7 +164,7 @@ abyss_03,97,102,4 script Instance NPC#finish 101,{
mes "[Instance NPC]";
mes "Congratulations! You've finished the instance.";
mes "I'll send you back to town now.";
- emotion e_no1;
+ emotion ET_BEST;
close2;
warp "prontera",156,191;
instance_destroy();
@@ -199,4 +199,4 @@ OnTouch:
OnInit:
disablenpc strnpcinfo(0);
end;
-}
\ No newline at end of file
+}
diff --git a/doc/sample/npc_live_dialogues.txt b/doc/sample/npc_live_dialogues.txt
index 56941558f42..cef959d871a 100644
--- a/doc/sample/npc_live_dialogues.txt
+++ b/doc/sample/npc_live_dialogues.txt
@@ -34,7 +34,7 @@ prontera,167,177,5 script Luppy 1107,{
mes "I like "+callfunc("F_Sex","smiling ladies!","bloody pirates!");
// Show one of 3 emotion from the list (we added ,1 to show emotion over PLAYER's head)
- emotion callfunc("F_Rand",e_scissors,e_kis,e_pat),1;
+ emotion callfunc("F_Rand",ET_SCISSOR,ET_CHUP,ET_GOODBOY), playerattached();
close;
}
diff --git a/doc/sample/npc_test_duplicate.txt b/doc/sample/npc_test_duplicate.txt
index 983450430d8..be3db81c8b4 100644
--- a/doc/sample/npc_test_duplicate.txt
+++ b/doc/sample/npc_test_duplicate.txt
@@ -23,7 +23,7 @@ OnInit:
OnTouch:
getmapxy(.map$, .x, .y, 1);
- emotion e_scissors;
+ emotion ET_SCISSOR;
end;
}
diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 47e262dda50..d769b4364df 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -3,7 +3,7 @@
//===== By:==================================================
//= rAthena Dev Team
//===== Last Updated:========================================
-//= 20161206
+//= 20171011
//===== Description:=========================================
//= A reference manual for the rAthena scripting language.
//= Commands are sorted depending on their functionality.
@@ -565,8 +565,7 @@ setting it will make the character own this number of Zeny.
If you try to set Zeny to a negative number, the script will be terminated with an error.
Some source-end constants can also be accessed in scripts. This list is located in
-'src/map/script.c' in the 'script_hardcoded_constants' function, which contains
-constants such as server defines and status options:
+'src/map/script_constants.h', which contains constants such as server defines and status options:
PACKETVER, MAX_LEVEL, MAX_STORAGE, MAX_INVENTORY, MAX_CART, MAX_ZENY, MAX_PARTY,
MAX_GUILD, MAX_GUILDLEVEL, MAX_GUILD_STORAGE, MAX_BG_MEMBERS, MAX_CHAT_USERS,
@@ -1037,6 +1036,7 @@ From here on, we will have the commands sorted as follow:
12.- Mercenary commands.
13.- Party commands.
14.- Channel commands.
+15.- Achievement commands.
=====================
|1.- Basic commands.|
@@ -1150,6 +1150,22 @@ will terminate.
---------------------------------------
+*clear;
+
+This command will clear the dialog text and continue the script without player interaction.
+
+Example:
+ mes "This is how the 'clear' script command works.";
+ sleep2 3000;
+ clear; // This will clear the dialog and continue to the next one.
+ mes "I will show you again.";
+ sleep2 3000;
+ clear;
+ mes "Bye!";
+ close;
+
+---------------------------------------
+
*close;
This command will create a 'close' button in the message window for the invoking
@@ -2719,14 +2735,17 @@ Examples:
---------------------------------------
-*getequippercentrefinery(<equipment slot>{,<char_id>})
+*getequippercentrefinery(<equipment slot>{,<enriched>,<char_id>})
This function calculates and returns the percent value chance to successfully
refine the item found in the specified equipment slot of the invoking character
by +1. There is no actual formula, the success rate for a given weapon level of
-a certain refine level is found in the db/refine_db.txt file. For a list of
+a certain refine level is found in the db/(pre-)re/refine_db.yml file. For a list of
equipment slots see 'getequipid'.
+If enriched parameter is set to true, chance to successfully refine the item with
+enriched material is returned instead.
+
These values can be displayed for the player to see, or used to calculate the
random change of a refine succeeding or failing and then going through with it
(which is what the official NPC refinery scripts use it for)
@@ -2737,6 +2756,31 @@ random change of a refine succeeding or failing and then going through with it
---------------------------------------
+*getequiprefinecost(<equipment slot>,<type>,<information>{,<char id>})
+
+This function returns refine cost for equipment in <equipment slot> based on
+passed arguments <type> and <information>.
+
+Valid cost types are:
+
+REFINE_COST_NORMAL - For normal refining
+REFINE_COST_OVER10 - For refining over +10
+REFINE_COST_HD - For refining with HD ores
+REFINE_COST_ENRICHED - For refining with enriched ores
+REFINE_COST_OVER10_HD - For refining over +10 with HD ores
+
+This function will return required cost for refining based on <information> argument.
+
+Valid information types are:
+
+REFINE_ZENY_COST - Zeny
+REFINE_MATERIAL_ID - Material Item ID
+
+This function will return -1 on failure. The function fails if the cost type
+is invalid or if there is no item in the equipment slot.
+
+---------------------------------------
+
*getareadropitem("<map name>",<x1>,<y1>,<x2>,<y2>,<item>)
This function will count all the items with the specified ID number lying on the
@@ -2907,6 +2951,13 @@ Merge all stackable items that separated by GUID flags
(either by flag 4 item_flag.txt or GUID in item_group).
If no item ID/name given, all possible items in player's inventory will be merged.
+---------------------------------------
+
+*getequiptradability(<equipment slot>{,<char id>});
+
+Returns true if the item in <equipment slot> is tradable.
+Returns false otherwise.
+
---------------------------------------
//
2,1.- End of item-related commands.
@@ -3018,10 +3069,10 @@ It will only return numbers. If another type is supplied -1 will be returned.
---------------------------------------
-*gettimestr(<format string>,<max length>)
+*gettimestr(<"time format">,<max length>{,<time_tick>})
This function will return a string containing time data as specified by the
-format string.
+time format.
This uses the C function 'strfmtime', which obeys special format characters. For
a full description see, for example, the description of 'strfmtime' at
@@ -3033,7 +3084,11 @@ The example given in rAthena sample scripts works like this:
mes gettimestr("%Y-%m/%d %H:%M:%S",21);
-This will print a full date and time like 'YYYY-MM/DD HH:MM:SS'.
+The example above will print the current date and time like 'YYYY-MM/DD HH:MM:SS'.
+The following example will print the date and time when the player's VIP status
+expires by the given <time_tick>:
+
+ mes gettimestr("%Y-%m/%d %H:%M:%S",21,vip_status(VIP_STATUS_EXPIRE));
---------------------------------------
@@ -3723,18 +3778,6 @@ The renewal feature to check is determined by type.
4 - RENEWAL_LVDMG (renewal level modifier on damage)
5 - RENEWAL_ASPD (renewal ASPD)
----------------------------------------
-
-*is_clientver(<type>,<value>{,<char id>})
-
-Checks a character's client version against a specified value. If no char id is
-given, the command will run for the invoking character. The function will return
-1 if the player's version is greater than or equal to the value, and 0 otherwise.
-
-Available types are:
- 0 - version number (packet_db_ver)
- 1 - client date (YYYYMMDD)
-
---------------------------------------
\\
3,1.- Item-related commands
@@ -3851,10 +3894,13 @@ by default green
---------------------------------------
-*showscript "<message>"{,<GID>};
+*showscript "<message>"{,<GID>, <flag>};
Makes attached player or GID says a message like shouting a skill name, the message
will be seen to everyone around but not in chat window.
+flag: Specify target
+ AREA - Message is sent to players in the vicinity of the source (default).
+ SELF - Message is sent only to player attached.
---------------------------------------
@@ -4841,7 +4887,7 @@ More info, see doc/item_group.txt.
---------------------------------------
-*getrandgroupitem <group_id>{,<quantity>{,<sub_group>}};
+*getrandgroupitem <group_id>{,<quantity>{,<sub_group>{,<identify>{,<char_id>}}}};
Similar to the above example, this command allows players to obtain the specified
quantity of a random item from the group "<group id>". The different groups and
@@ -4852,16 +4898,24 @@ If 'quantity' is not defined or 0, it will uses defined amount from Item Group l
If 'sub_group' is not defined the value will be 1 (since random group is 1 ~ 5, and 0 is
'must' item group).
+For item with type IT_WEAPON, IT_ARMOR, IT_PETARMOR, and IT_SHADOWGEAR will be given
+as unidentified item (as defined by itemdb_isidentified in src/map/itemdb.cpp) except
+if 'identify' is defined with value 1.
+
More info, see doc/item_group.txt.
---------------------------------------
-*getgroupitem <group_id>{,<char_id>};
+*getgroupitem <group_id>{,<identify>{,<char_id>}};
Gives item(s) to the attached player based on item group contents.
This is not working like 'getrandgroupitem' which only give 1 item for specified
item group & sub_group.
+For item with type IT_WEAPON, IT_ARMOR, IT_PETARMOR, and IT_SHADOWGEAR will be given
+as unidentified item (as defined by itemdb_isidentified in src/map/itemdb.cpp) except
+if 'identify' is defined with value 1.
+
More info, see doc/item_group.txt.
---------------------------------------
@@ -5169,7 +5223,7 @@ window, to avoid any disruption when both windows overlap.
*openstorage2 <storage_id>,<mode>{,<account_id>};
Just like the 'openstorage' command, except this command can open additional storages
-by the specified <storage_id>. For <storage_id>, please read the conf/inter_server.conf
+by the specified <storage_id>. For <storage_id>, please read the conf/inter_server.yml
for storage groups.
Values for <mode> are:
@@ -5323,10 +5377,11 @@ Used in reset NPC's (duh!)
---------------------------------------
-*sc_start <effect type>,<ticks>,<value 1>{,<rate>,<flag>{,<GID>}};
-*sc_start2 <effect type>,<ticks>,<value 1>,<value 2>{,<rate>,<flag>{,<GID>}};
-*sc_start4 <effect type>,<ticks>,<value 1>,<value 2>,<value 3>,<value 4>{,<rate>,<flag>{,<GID>}};
-*sc_end <effect type>{,<GID>};
+*sc_start <effect type>,<ticks>,<value 1>{,<rate>,<flag>{,<GID>}};
+*sc_start2 <effect type>,<ticks>,<value 1>,<value 2>{,<rate>,<flag>{,<GID>}};
+*sc_start4 <effect type>,<ticks>,<value 1>,<value 2>,<value 3>,<value 4>{,<rate>,<flag>{,<GID>}};
+*sc_end <effect type>{,<GID>};
+*sc_end_class {<char_id>{,<job_id>}};
These commands will bestow a status effect on a character.
@@ -5364,6 +5419,9 @@ and theirs val1, val2, val3, and val4 usage in source.
'sc_end' will remove a specified status effect. If SC_ALL (-1) is given, it will
perform a complete removal of all statuses (although permanent ones will re-apply).
+'sc_end_class' works like 'sc_end' but will remove all status effects from any learned
+skill on the invoking character. If <job_id> is provided it will end the effect for that job.
+
Examples:
// This will poison the invoking character for 10 minutes at 50% chance.
sc_start SC_POISON,600000,0,5000;
@@ -5380,6 +5438,18 @@ Examples:
// This will end the Freezing status for the invoking character.
sc_end SC_FREEZE;
+
+ // This will end the effect of any learned skill for the invoking character.
+ sc_end_class;
+
+ // This will end the effect of any learned skill for the character with the <char_id> 150000.
+ // val1: <char_id>
+ sc_end_class(150000);
+
+ // This will end the effect of any Arch Bishop skill for the invoking character.
+ // val1: <char_id>
+ // val2: <job_id> of Arch Bishop
+ sc_end_class(getcharid(0),Job_Arch_Bishop);
Note: to use SC_NOCHAT you should alter Manner
set Manner, -5; // Will mute a user for 5 minutes
@@ -5920,7 +5990,7 @@ Example:
// spawn 1 Shining Plant in the 5x5 area centered on (155,188)
areamonster "prontera",153,186,157,190,"Shining Plant",1083,1;
// make the plant cast level 10 Cold Bolt on a random target
- areamobuseskill "prontera",155,188,2,1083,"MG_COLDBOLT",10,3000,1,e_gg,3;
+ areamobuseskill "prontera",155,188,2,1083,"MG_COLDBOLT",10,3000,1,ET_KEK,3;
---------------------------------------
@@ -6404,9 +6474,22 @@ This command works almost like sleep2, but displays a progress bar
above the head of the currently attached character (like cast bar).
Once the given amount of seconds passes, the script resumes. If the
character moves while the progress bar progresses, it is aborted and
-the script ends. The color format is in RGB (0xRRGGBB). The color is
+the script ends. The color format is in RGB (RRGGBB). The color is
currently ignored by the client and appears always green.
+---------------------------------------
+
+*progressbar_npc "<color>",<seconds>{,<"NPC Name">};
+
+This command works like progressbar, but displays a progress bar
+above the head of the currently attached (or given) NPC. Once the
+given amount of seconds passes, the script resumes. The color format
+is in RGB (RRGGBB). The color is currently ignored by the client and
+appears always green.
+
+Note: If a player is attached to the NPC, they are detached from the NPC
+as soon as the progress bar activates.
+
---------------------------------------
//
5,1.- End of time-related commands
@@ -6500,6 +6583,8 @@ The options are:
1 = The buy window
2 = The sell window
+Note: The <option> parameter only works on the 'shop' type NPC.
+
A shop called with this command will trigger the labels "OnBuyItem" and "OnSellItem"
(as long as an npcshop* command is executed from that NPC, see note below). These
labels, if used, will replace how the shop handles the buying and selling of items,
@@ -6510,15 +6595,30 @@ The label "OnBuyItem" sets the following arrays:
@bought_quantity - amount bought
The label "OnSellItem" sets the following arrays:
- @sold_nameid - item ID sold
- @sold_quantity - amount sold
- @sold_refine - refine count
- @sold_attribute - if the item is broken (1) or not (0)
- @sold_identify - if the item is identified (1) or not (0)
- @sold_card1 - card slot 1
- @sold_card2 - card slot 2
- @sold_card3 - card slot 3
- @sold_card4 - card slot 4
+ @sold_nameid - item ID sold
+ @sold_quantity - amount sold
+ @sold_refine - refine count
+ @sold_attribute - if the item is broken (1) or not (0)
+ @sold_identify - if the item is identified (1) or not (0)
+ @sold_card1 - card slot 1
+ @sold_card2 - card slot 2
+ @sold_card3 - card slot 3
+ @sold_card4 - card slot 4
+ @sold_option_id1 - random option ID 1
+ @sold_option_val1 - random option value 1
+ @sold_option_param1 - random option param 1
+ @sold_option_id2 - random option ID 2
+ @sold_option_val2 - random option value 2
+ @sold_option_param2 - random option param 2
+ @sold_option_id3 - random option ID 3
+ @sold_option_val3 - random option value 3
+ @sold_option_param3 - random option param 3
+ @sold_option_id4 - random option ID 4
+ @sold_option_val4 - random option value 4
+ @sold_option_param4 - random option param 4
+ @sold_option_id5 - random option ID 5
+ @sold_option_val5 - random option value 5
+ @sold_option_param5 - random option param 5
Note: These labels will only be triggered if an npcshop* command is executed because these
commands set a special data on the shop NPC, named master_nd in the source. The above labels
@@ -7155,19 +7255,15 @@ must be used.
---------------------------------------
-*emotion <emotion number>{,<target>{,"<target name>"}};
+*emotion <emotion number>{,<target>};
This command makes an object display an emotion sprite above their own as
if they were doing that emotion. For a full list of emotion numbers,
-see 'src/map/script_constants.h' under 'e_'. The not so obvious ones are 'e_what'
-(a question mark) and 'e_gasp' (the exclamation mark).
+see 'src/map/script_constants.h' under 'ET_'. The not so obvious ones are 'ET_QUESTION'
+(a question mark) and 'ET_SURPRISE' (the exclamation mark).
The optional target parameter specifies who will get the emotion on top of
-their head. If 0 (the default if omitted), the NPC in current use will show
-the emotion, if 1, the player that is running the script will display it.
-
-Target name parameter allows to display emotion on top of other NPC/PC without
-event labels. If specified name is not found, command does nothing.
+their head. Use the target Game ID (GID).
---------------------------------------
@@ -7271,6 +7367,7 @@ The commands can also run without an attached rid.
This command will bind a NPC event label to an atcommand. Upon execution of the
atcommand, the user will invoke the NPC event label. Each atcommand is only allowed
one binding. If you rebind, it will override the original binding.
+Note: The default level for atcommand is 0 while the default level for charcommand is 100.
The following variables are set upon execution:
.@atcmd_command$ = The name of the @command used.
@@ -7286,7 +7383,7 @@ Example:
bindatcmd "test",strnpcinfo(3) + "::OnAtcommand";
end;
OnAtcommand:
- specialeffect2 338;
+ specialeffect2 EF_ANGEL2;
end;
}
@@ -7350,12 +7447,17 @@ Examples:
*unitattack <GID>,<Target ID>{,<action type>};
*unitattack <GID>,"<Target Name>"{,<action type>};
-This command will make a <GID> attack the specified target. It returns 1 upon
-success and 0 for all failures.
+This command will make a <GID> attack the specified target. It returns true upon
+success and false for all failures.
If <GID> is a player and a non-zero <action type> is given, the unit will perform a
continuous attack instead of a single attack.
+Note:
+Using unitattack with <GID> 0 means that it will use the currently attached unit.
+For players any attack requests will fail, because talking to an NPC prevents attacking a monster.
+Therefore you need to detach the player from the NPC before using this command.
+
---------------------------------------
*unitkill <GID>;
@@ -7382,7 +7484,7 @@ This command will make a <GID> stop attacking.
---------------------------------------
-*unitstopwalk <GID>;
+*unitstopwalk <GID>{,<flag>};
This command will make a <GID> stop moving.
@@ -7390,6 +7492,14 @@ Note: If this is called from OnTouch, then the walktimer attached to the unit is
removed from OnTouch which causes this command to not stop the unit from walking.
Suggest to use 'unitblockmove' to forcefully stop the unit with OnTouch.
+The <flag> value affects how the unit is stopped. The following flags are bitwise
+values (can be combined using the pipe operator):
+ USW_NONE = Unit will keep walking to their original destination.
+ USW_FIXPOS = Issue a fixpos packet afterwards.
+ USW_MOVE_ONCE = Force the unit to move one cell if it hasn't yet.
+ USW_MOVE_FULL_CELL = Enable moving to the next cell when unit was already half-way there (may cause on-touch/place side-effects, such as a scripted map change).
+ USW_FORCE_STOP = Force stop moving.
+
---------------------------------------
*unittalk <GID>,"<text>"{,flag};
@@ -7401,13 +7511,6 @@ flag: Specify target
---------------------------------------
-*unitemote <GID>,<emotion number>;
-
-This command will make a <GID> display an emotion sprite.
-For a full list of emotion numbers, see 'src/map/script_constants.h' under 'e_'.
-
----------------------------------------
-
*unitskilluseid <GID>,<skill id>,<skill lvl>{,<target id>,<casttime>};
*unitskilluseid <GID>,"<skill name>",<skill lvl>{,<target id>,<casttime>};
*unitskillusepos <GID>,<skill id>,<skill lvl>,<x>,<y>{,<casttime>};
@@ -7799,6 +7902,11 @@ and "NPC level" is the temporary level of the NPC (used in some skills).
Neither value can be greater than the max level defined in config, and will
not work properly if the NPC has a mob sprite.
+Before using skills, NPCs must have basic stats applied to them depending on the
+skill being used: UNPC_ATKMIN, UNPC_ATKMAX, UNPC_MATKMIN, UNPC_MATKMAX, UNPC_STR,
+UNPC_AGI, UNPC_VIT, UNPC_INT, UNPC_DEX, UNPC_LUK.
+See 'setunitdata' for more information on usage.
+
// Casts Level 10 Heal on the attached player, calculated with
// all stats 99 and base level 60.
npcskill "AL_HEAL",10,99,60;
@@ -7928,6 +8036,19 @@ Example:
---------------------------------------
+*round(<number>,<precision>);
+*ceil(<number>,<precision>);
+*floor(<number>,<precision>);
+
+Returns <number> rounded to multiple of <precision>.
+
+`round` function will round the <number> up if its division with <precision> yield a remainder
+with a value equals to or more than half of <precision>. Otherwise, it rounds the <number> down.
+`ceil` always round the <number> up.
+`floor` always round the <number> down.
+
+---------------------------------------
+
*md5("<string>")
Returns the md5 checksum of a number or string.
@@ -8926,6 +9047,7 @@ mapflag <map name> battleground 2
---------------------------------------
*bpet;
+*birthpet;
This command opens up a pet hatching window on the client connected to the
invoking character. It is used in item script for the pet incubators and will
@@ -8936,13 +9058,21 @@ This is still usable outside item scripts.
---------------------------------------
*pet <pet id>;
+*catchpet <pet id>;
This command is used in all the item scripts for taming items. Running this
command will make the pet catching cursor appear on the client connected to the
invoking character, usable on the monsters with the specified pet ID number. It
will still work outside an item script.
+If the <pet id> is PET_CATCH_UNIVERSAL the item will attempt to catch the targeted
+monster as long as it is in the pet database and does not have the MD_STATUS_IMMUNE
+monster mode.
+If the <pet id> is PET_CATCH_UNIVERSAL_ITEM the item will attempt to catch the targeted
+monster as long as it is in the pet database and the targeted monster requires the lure
+item used.
+See 'doc/mob_db_mode_list.txt' for more information about monster modes.
-A full list of pet IDs can be found inside 'db/pet_db.txt'.
+A full list of pet IDs can be found inside 'db/(pre-)re/pet_db.txt'.
---------------------------------------
@@ -8950,7 +9080,7 @@ A full list of pet IDs can be found inside 'db/pet_db.txt'.
This command will create a pet egg and put it in the invoking character's
inventory. The kind of pet is specified by pet ID numbers listed in
-'db/pet_db.txt'. The egg is created exactly as if the character just successfully
+'db/(pre-)re/pet_db.txt'. The egg is created exactly as if the character just successfully
caught a pet in the normal way.
// This will make you a poring:
@@ -8968,7 +9098,7 @@ This function will return pet information for the pet the invoking character
currently has active. Valid types are:
PETINFO_ID - Pet ID
- PETINFO_CLASS - Pet class number as per 'db/pet_db.txt' - will tell you what kind of a pet it
+ PETINFO_CLASS - Pet class number as per 'db/(pre-)re/pet_db.txt' - will tell you what kind of a pet it
is.
PETINFO_NAME - Pet name. Will return "null" if there's no pet.
PETINFO_INTIMATE - Pet friendly level (intimacy score). 1000 is full loyalty.
@@ -9503,11 +9633,31 @@ solution rather than sending the map and the monster_id.
---------------------------------------
+*costume <equipment position>;
+
+Converts equipment in <equipment position> to costume version that has no stats.
+
+Applicable positions are:
+ EQI_HEAD_TOP - Top Headgear
+ EQI_HEAD_MID - Middle Headgear
+ EQI_HEAD_LOW - Lower Headgear
+ EQI_GARMENT - Garment
+
+---------------------------------------
+
+*getcostumeitem <item id>;
+*getcostumeitem <"item name">;
+
+Spawn a costume version of an <item id> or <"item name"> in attached player's inventory.
+
+---------------------------------------
+
*hateffect(<Hat Effect ID>,<State>);
This will set a Hat Effect onto the player. The state field allows you to
enable (true) or disable (false) the effect on the player.
-The Hat Effect constants can be found in db/const.txt starting with HAT_EF_*.
+The Hat Effect constants can be found in 'src/map/script_constants.h' starting
+with HAT_EF_*.
Requires client 2015-05-13aRagEXE or newer.
@@ -9724,3 +9874,83 @@ local map channel.
Returns 0 on success.
---------------------------------------
+
+============================
+|15.- Achievement commands.|
+============================
+---------------------------------------
+
+*achievementadd(<achievement id>{,<char id>})
+
+This function will add an achievement to the player's log for the attached
+player or the supplied <char id>. The objective requirements are not ignored
+when using this function.
+Returns true on success and false on failure.
+
+---------------------------------------
+
+*achievementremove(<achievement id>{,<char id>})
+
+This function will remove an achievement from the player's log for the attached
+player or the supplied <char id>.
+Returns true on success and false on failure.
+
+---------------------------------------
+
+*achievementinfo(<achievement id>,<type>{,<char id>})
+
+This function will return the specified <type> value for an achievement of the
+attached player or the supplied <char id>. If the player doesn't have the
+achievement active (no progress has been made): if the achievement doesn't
+exist -1 will be returned, or -2 will be returned on any other error such as
+an invalid <type>.
+
+Valid types:
+- ACHIEVEINFO_COUNT1
+- ACHIEVEINFO_COUNT2
+- ACHIEVEINFO_COUNT3
+- ACHIEVEINFO_COUNT4
+- ACHIEVEINFO_COUNT5
+- ACHIEVEINFO_COUNT6
+- ACHIEVEINFO_COUNT7
+- ACHIEVEINFO_COUNT8
+- ACHIEVEINFO_COUNT9
+- ACHIEVEINFO_COUNT10
+- ACHIEVEINFO_COMPLETE
+- ACHIEVEINFO_COMPLETEDATE
+- ACHIEVEINFO_GOTREWARD
+- ACHIEVEINFO_LEVEL (<achievement id> is useless for this)
+- ACHIEVEINFO_SCORE (<achievement id> is useless for this)
+
+---------------------------------------
+
+*achievementcomplete(<achievement id>{,<char id>})
+
+This function will complete an achievement for the attached player or the supplied
+<char id>. The objective requirements are ignored when using this function.
+Returns true on success and false on failure.
+
+---------------------------------------
+
+*achievementexists(<achievement id>{,<char id>});
+
+This function will return if the achievement exists on the player or the supplied
+<char id>.
+Returns true on success and false on failure.
+
+---------------------------------------
+
+*achievementupdate(<achievement id>,<type>,<value>{,<char id>})
+
+This function will update an achievement's value for an achievement of the attached
+player or the supplied <char id>. If the player does not have the achievement active
+(no progress has been made) it will be added to the player's log first before updating
+the <type> value.
+Returns true on success and false on failure.
+
+See 'achievementinfo' for valid <type> values.
+- ACHIEVEINFO_COMPLETE, ACHIEVEINFO_COMPLETEDATE, and ACHIEVEINFO_GOTREWARD require the
+ specific value returned from 'gettimetick(2)'.
+- Excludes ACHIEVEINFO_LEVEL and ACHIEVEINFO_SCORE.
+
+---------------------------------------
diff --git a/doc/status_change.txt b/doc/status_change.txt
index f1c595a10ba..0b4be646644 100644
--- a/doc/status_change.txt
+++ b/doc/status_change.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= rAthena Dev Team
//===== Last Updated: ========================================
-//= 20151030
+//= 20171207
//===== Description: =========================================
//= List of all Status Changes and theirs val1, val2, val3, and
//= val4 usage in source. Providing easier guide to use
@@ -939,22 +939,29 @@ SC_MIRACLE ()
desc:
val1:
-SC_MADNESSCANCEL ()
- desc:
+SC_MADNESSCANCEL (SI_MADNESSCANCEL)
+ desc: Increases some statuses (Base ATK, ASPD)
val1:
-SC_ADJUSTMENT ()
- desc:
+SC_ADJUSTMENT (SI_ADJUSTMENT)
+ desc: Increases some statuses (Hit, Flee)
val1:
SC_INCREASING (SI_ACCURACY)
- desc: Increase some statuses (hit, dex, agi), GS_INCREASING effect
- val1: (hardocded)
+ desc: Increase some statuses (Hit, Dex, Agi), GS_INCREASING effect
+ val1:
-SC_GATLINGFEVER ()
- desc:
+SC_MAGICALBULLET (SI_GS_MAGICAL_BULLET)
+ desc: Increases damage based on source's MATK and is reduced by target's MDEF
val1:
+SC_GATLINGFEVER (SI_GATLINGFEVER)
+ desc: Increases some statuses (Base ATK, Flee, Movement Speed, ASPD)
+ val1: SkillLv
+ val2: ASPD increase (20 * val1)
+ val3: Base ATK (20 + 10 * val1) [pre-renewal]
+ val4: Flee decrease (5 * val1)
+
SC_TATAMIGAESHI ()
desc:
val1:
@@ -1065,8 +1072,11 @@ SC_ITEMBOOST (SI_ITEMBOOST)
val1: +% Drop
SC_BOSSMAPINFO (SI_BOSSMAPINFO)
- desc:
- val1:
+ desc: Used to display Boss location on minimap
+ val1: Boss game ID
+ val2: Used to keep timer message from spamming chat window
+ val3:
+ val4: Remaining tick
SC_LIFEINSURANCE (SI_LIFEINSURANCE)
desc: Remove death pleanlties
@@ -1626,9 +1636,12 @@ SC_CRYSTALIZE ()
desc:
val1:
-SC_STRIKING ()
+SC_STRIKING (SI_STRIKING)
desc:
- val1:
+ val1: SO_STRIKING Skill Level
+ val2: Increased ATK
+ val3: SP Drain / Sec
+ val4: Tick Left (in sec)
SC_WARMER ()
desc:
@@ -1650,13 +1663,17 @@ SC_SYMPHONYOFLOVER ()
desc:
val1:
-SC_MOONLITSERENADE ()
+SC_MOONLITSERENADE (SI_MOONLITSERENADE)
desc:
- val1:
+ val1: WA_MOONLIT_SERENADE Skill Level
+ val2: WM_LESSON Level
+ val3: Increased MATK
-SC_RUSHWINDMILL ()
+SC_RUSHWINDMILL (SI_RUSHWINDMILL)
desc:
- val1:
+ val1: MI_RUSH_WINDMILL Skill Level
+ val2: WM_LESSON Level
+ val3: Increased ATK
SC_ECHOSONG ()
desc:
@@ -1742,17 +1759,24 @@ SC_RAISINGDRAGON ()
desc:
val1:
-SC_GT_ENERGYGAIN ()
- desc:
- val1:
+SC_GT_ENERGYGAIN (SI_GENTLETOUCH_ENERGYGAIN)
+ desc:
+ val1: SR_GENTLETOUCH_ENERGYGAIN Skill Level
+ val2: Sphere Gain Chance
-SC_GT_CHANGE ()
- desc:
- val1:
+SC_GT_CHANGE (SI_GENTLETOUCH_CHANGE)
+ desc: ATK increase: ATK [{(Caster DEX / 4) + (Caster STR / 2)} x Skill Level / 5]; ASPD increase: [(Target AGI x Skill Level) / 60] %; MDEF decrease: MDEF [(200 / Caster INT) x Skill Level]; Max HP decrease: [Skill Level x 4] %
+ val1: SR_GENTLETOUCH_CHANGE Skill Level
+ val2: Increased ATK
+ val3: Increased ASPD Rate
+ val4: Decreased MDEF
-SC_GT_REVITALIZE ()
- desc:
- val1:
+SC_GT_REVITALIZE (SI_GENTLETOUCH_REVITALIZE)
+ desc: MaxHP: [(Skill Level * 2)]%; Natural HP recovery increase: [(Skill Level x 30) + 50] %; STAT DEF increase: [(Caster VIT / 4) x Skill Level] (The stat def is not shown in the status window and it is processed differently)
+ val1: SR_GENTLETOUCH_REVITALIZE Skill Level
+ val2: Max HP Rate bonus
+ val3: HP Regen Rage Value
+ val4: Increased DEF
SC_GN_CARTBOOST ()
desc:
@@ -2368,7 +2392,7 @@ SC_OFFERTORIUM (SI_OFFERTORIUM)
SC_FRIGG_SONG (SI_FRIGG_SONG)
desc: Add Max HP & heal each iteration (default 1 seconds)
- val1:
+ val1: Skill Level
val2: +% MaxHP
val3: +HP heal
@@ -2398,47 +2422,43 @@ SC_SUPER_STAR (SI_SUPER_STAR)
desc: Visual effect
val1:
-SC_HEAT_BARREL ()
- desc: (Rebellion) Reduce fixed cast time, add ASPD rate, & reduce flee
- val1:
- val2: -Fixed Casttime
- val3: +% ASPD
- val4: -Flee
-
-SC_HEAT_BARREL_AFTER (SI_HEAT_BARREL_AFTER)
- desc: (Rebellion) Heat Barrel after-effect, can't do anything in this effect (like Extremity Fist after-effect)
- val1:
+SC_HEAT_BARREL (SI_HEAT_BARREL)
+ desc: (Rebellion) Reduce fixed cast time, add ASPD rate, and reduce FLEE
+ val1: SkillLv
+ val2: -Fixed Casttime (5 * val1)
+ val3: +% ASPD (6 + val1 * 2)
+ val4: -FLEE (25 + val1 * 5)
SC_P_ALTER (SI_P_ALTER)
- desc: Increase attack ratio & def againts Undead monster
- val1:
- val2: +ATK ratio
- val3: +Def
+ desc: Increase attack ratio and creates a barrier like Kyrie
+ val1: SkillLv
+ val2: +ATK ratio (10 * Coin Count)
+ val3: Barrier HP (Max HP * (val1 * 5) / 100)
SC_E_CHAIN (SI_E_CHAIN)
desc: (Rebellion) Has chance to trigger Chain Action for any weapon
- val1:
- val2: Coins used for succes rate. (5*val)
+ val1: SkillLv
+ val2: Coins used for success rate. (5 * val)
SC_C_MARKER (SI_C_MARKER)
desc: (Rebellion) Crimson Marker effect, also sends the target location to the caster
- val1:
+ val1: SkillLv
val2:
- val3: -Flee
+ val3: -FLEE (10)
SC_ANTI_M_BLAST (SI_ANTI_M_BLAST)
desc: (Rebellion) Anti-Material effect, reduce resistance of Neutral attack
- val1: Level for duration look up
- val2: Reduction ratio
+ val1: SkillLv
+ val2: Reduction ratio (10 * val1)
SC_B_TRAP (SI_B_TRAP)
- desc: (Rebellion) Bind Trap effect, waiting for Flicker being used
- val1:
+ desc: (Rebellion) Bind Trap effect, waiting for Flicker to be used
+ val1: SkillLv
val2:
- val3: -Walk Speed (Unstackable penalty)
+ val3: -Walk Speed (Unstackable penalty) (25 * val1)
SC_H_MINE (SI_H_MINE)
- desc: (Rebellion) Howling Mine effect, waiting for Flicker being used
+ desc: (Rebellion) Howling Mine effect, waiting for Flicker to be used
val1:
SC_QD_SHOT_READY (SI_E_QD_SHOT_READY)
@@ -2530,6 +2550,94 @@ SC_CHASEWALK2 (SI_CHASEWALK2)
desc: 2nd effect of Chasewalk
val1: +STR
+SC_SUHIDE (SI_SUHIDE)
+ desc: Hide caster. Can be seen by insect, demon, and boss. Cannot move or pickup items.
+ val1: Skill Lv
+
+SC_SU_STOOP (SI_SU_STOOP)
+ desc: Places a temporary buff on the user that decreases all damage taken by 90%.
+ val1: Skill Lv
+
+SC_SPRITEMABLE (SI_SPRITEMABLE)
+ desc: Increase 1000 HP and 100 SP.
+ val1:
+
+SC_CATNIPPOWDER (SI_CATNIPPOWDER)
+ desc: Reduces ATK and MATK by 50% to targets in a 3x3~7x7 area. HP and SP recovery rate increase.
+ val1: Skill Lv
+ val2: WATK% / MATK%
+ val3: Movement speed reduction
+
+SC_SV_ROOTTWIST (SI_SV_ROOTTWIST)
+ desc: Prevents the target from moving and receives 100 Poison damage every second. Cannot be used on Boss monsters.
+ val1: Skill Lv
+
+SC_BITESCAR (SI_BITESCAR)
+ desc: Drains a portion of the target's Max HP each second.
+ val1: Skill Lv
+ val2: Max HP% damage
+ val4: Tick
+
+SC_ARCLOUSEDASH (SI_ARCLOUSEDASH)
+ desc: Increases Agi and movement speed.
+ val1: AGI
+ val2: Movement speed increase
+ val4: Ranged ATK increase for Doram
+
+SC_TUNAPARTY (SI_TUNAPARTY)
+ desc: Protects from damage, the amount is based on Max HP.
+ val1: Max HP% to absorb
+ val2: Double the shield life with Spirit of Sea
+
+SC_SHRIMP (SI_SHRIMP)
+ desc: Gives all party members on screen +10% ATK and MATK.
+ val1: BATK% / MATK%
+
+SC_FRESHSHRIMP (SI_FRESHSHRIMP)
+ desc: Recovers a small amount of HP. Each level reduces the time between each HP recovery tick.
+ val1: Skill Lv
+ val2: Heal amount
+ val4: Tick
+
+SC_HISS (SI_HISS)
+ desc: Increases movement speed and perfect dodge of the user and his party.
+ val1: Skill Lv
+ val2: Perfect Dodge
+
+SC_NYANGGRASS (SI_NYANGGRASS)
+ desc: Reduces monster's DEF and MDEF by 50%. Reduces other player's equipment DEF and MDEF to 0.
+ val1: Skill Lv
+
+SC_GROOMING (SI_GROOMING)
+ desc: FLEE + 100. Cures Poison, Frozen, Stun, Sleep, Bleeding, Silence, Crystallization, Deep Sleep, Fear, and Mandragora Howling.
+ val1: Skill Lv
+ val2: FLEE
+
+SC_SHRIMPBLESSING (SI_PROTECTIONOFSHRIMP)
+ desc: Increases caster's SP recovery by 150%.
+ val1: Skill Lv
+
+SC_CHATTERING (SI_CHATTERING)
+ desc: Increases the player's ATK and MATK by 100. Increases the player's movespeed.
+ val1: Skill Lv
+ val2: ATK / MATK
+
+SC_DORAM_WALKSPEED ()
+ desc: Adjusts player's walk speed.
+ val1: Movement speed adjustment
+
+SC_DORAM_MATK ()
+ desc: Statically increases MATK for Spirit of Land.
+ val1: MATK
+
+SC_DORAM_FLEE2 ()
+ desc: Statically increase FLEE2 for Spirit of Land.
+ val1: FLEE2
+
+SC_DORAM_SVSP ()
+ desc: Casts Silvervine Stem Spear when receiving Magic or Ranged damage after using Catnip Meteor for Spirit of Land.
+ val1: Value to know it's active
+
SC_GVG_GIANT (SI_GVG_GIANT)
desc: Instantly consumes HP/SP, increases Physical/Magic damage on player enemies by n%.
val1: Amount of HP that are instantly consumed
diff --git a/npc/airports/airships.txt b/npc/airports/airships.txt
index 199962b5a24..71bd52609fa 100644
--- a/npc/airports/airships.txt
+++ b/npc/airports/airships.txt
@@ -190,7 +190,7 @@ airplane,100,69,3 script Airship Crew#ein-1 852,{
}
airplane,64,94,1 script Umbala Kid#ein_p 787,{
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
mes "[Kid]";
if (event_umbala >= 3) {
mes "Wow, mom!";
@@ -208,7 +208,7 @@ airplane,64,94,1 script Umbala Kid#ein_p 787,{
}
airplane,66,93,3 script Umbala Lady#ein_p 783,{
- emotion e_dots;
+ emotion ET_THINK;
mes "[Lady]";
if (event_umbala >= 3) {
mes "Shush...";
@@ -235,7 +235,7 @@ airplane,71,91,7 script Umbala Man#ein_p 789,{
mes "you can understand";
mes "me. ^333333*Whew...!*^000000";
next;
- emotion e_pif;
+ emotion ET_HNG;
mes "[Chrmlim]";
mes "I've been helping the";
mes "Airship enterprise by";
@@ -248,7 +248,7 @@ airplane,71,91,7 script Umbala Man#ein_p 789,{
mes "Some of them couldn't";
mes "overcome their fear of";
mes "heights. And a few even";
- mes "ended up, um, ^333333in Nifflheim^000000.";
+ mes "ended up, um, ^333333in Niflheim^000000.";
}
else {
mes "[Chrmlim]";
@@ -259,7 +259,7 @@ airplane,71,91,7 script Umbala Man#ein_p 789,{
mes "...";
mes "......";
next;
- emotion e_pif;
+ emotion ET_HNG;
mes "[Chrmlim]";
mes "Shabala moow bajama";
mes "Airship kulaha googoona ";
@@ -373,7 +373,7 @@ airplane,221,158,2 script Pilot#airplane 852,{
mes "[Pilot]";
mes "But! Driving under the influence is not good.";
mes "But! That makes me want to drink more and more!";
- emotion e_sob;
+ emotion ET_CRY;
next;
select("Do you know a passenger named Thierry?");
mes "[Pilot]";
@@ -389,7 +389,7 @@ airplane,221,158,2 script Pilot#airplane 852,{
mes "comes into this room.";
mes "And the captain IS a reindeer. I could just strip to my boxers.";
next;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Pilot]";
mes "Wah!? Who is it!";
next;
@@ -414,7 +414,7 @@ airplane,221,158,2 script Pilot#airplane 852,{
mes "or even a day off. Yeap, some";
mes "booze, some chips, some TV";
mes "and serius R&R is in order.";
- emotion e_sob;
+ emotion ET_CRY;
close;
case 2:
mes "[Pilot]";
@@ -449,7 +449,7 @@ airplane,221,158,2 script Pilot#airplane 852,{
mes "Yeah, they got this Airship";
mes "operation in a hurry.";
next;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Pilot]";
mes "Still, they where real";
mes "serius, really thought";
@@ -1009,7 +1009,7 @@ airplane_01,221,158,2 script Pilot#airplane_01 852,{
mes "And the captain IS a reindeer.";
mes "I could just strip to my boxers.";
next;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Pilot]";
mes "Oh...! Hello there!";
mes "E-e-enjoying your flight?!";
@@ -1028,7 +1028,7 @@ airplane_01,83,61,2 script Dianne#01airplane_01 72,2,2,{
close;
OnTouch_:
- emotion e_sob;
+ emotion ET_CRY;
end;
}
diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt
index c51869686fb..bbf1230fe3f 100644
--- a/npc/cities/amatsu.txt
+++ b/npc/cities/amatsu.txt
@@ -366,7 +366,7 @@ amatsu,269,221,1 script Propose Girl#ama 758,{
mes "After the proposal, the reply must";
mes "be answered before Sunday evening. This is the most crucial part of it.";
next;
- emotion e_lv2;
+ emotion ET_BIGTHROB;
mes "[Hutari Shioko]";
mes "If you like someone...";
mes "You should try proposing";
@@ -398,7 +398,7 @@ amatsu,243,202,3 script Drama Teacher#ama 760,{
mes "as the 'White Drayd...'";
close;
}
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Garakame sensei]";
mes "Are you interested in acting?";
mes "I need someone who sees";
@@ -426,19 +426,19 @@ amatsu,283,203,1 script Bonubonu#ama1 1323,{
amatsu,283,203,1 script Bonubonu#ama2 111,{
set jap_tree,3;
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
mes "[Bonubonu]";
mes "That tree on the hill is";
mes "a very old tree. It is a big";
mes "cherry tree with everlasting blossoms.";
next;
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
mes "[Bonubonu]";
mes "There is something about this";
mes "tree that makes me forget about";
mes "all the troubles in my life when I sit under it.";
next;
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
mes "[Bonubonu]";
mes "Everything about this tree is";
mes "simply wonderful...";
@@ -446,7 +446,7 @@ amatsu,283,203,1 script Bonubonu#ama2 111,{
mes "I feel when I look at it...";
mes "It just leaves me breathless...";
next;
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
mes "[Bonubonu]";
mes "You should visit the tree and";
mes "spend some time there.";
@@ -481,7 +481,7 @@ amatsu,274,178,7 script Veterinarian#ama 735,{
mes "By the way, do you want";
mes "make a bet on it...?";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "[Sakura Seiichi]";
mes "If I..........";
mes "............";
@@ -495,7 +495,7 @@ amatsu,274,178,7 script Veterinarian#ama 735,{
mes "[Sakura Seiichi]";
mes "I can't help it if you think that way. But one day, you too could be buried underneath...";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "[Sakura Seiichi]";
mes "Haha... Hahaha.....";
mes "...............";
diff --git a/npc/cities/ayothaya.txt b/npc/cities/ayothaya.txt
index 2c0cd5581b7..e96e3bfba71 100644
--- a/npc/cities/ayothaya.txt
+++ b/npc/cities/ayothaya.txt
@@ -145,14 +145,14 @@ ayothaya,171,152,5 script Girl#Lalitha 838,{
next;
mes "[Lalitha]";
mes "You know, like the dresses and jewelry that ladies wear in other countries, whether or not the men are good looking, what kind of songs you have, what kind of girls that guys over there like...";
- emotion e_what;
+ emotion ET_QUESTION;
next;
mes "[" +strcharinfo(0)+ "]";
mes ".........";
next;
mes "[Lalitha]";
mes "..........";
- emotion e_swt;
+ emotion ET_SWEAT;
next;
mes "[Lalitha]";
mes "Okay~!";
@@ -174,7 +174,7 @@ ayothaya,171,152,5 script Girl#Lalitha 838,{
mes "Ah...";
mes "I wonder where";
mes "my Black Knight is~";
- emotion e_lv;
+ emotion ET_THROB;
next;
mes "["+strcharinfo(0)+"]";
mes "Don't you mean...";
@@ -289,12 +289,12 @@ ayothaya,241,264,5 script Young Man#5ayothaya2 843,{
next;
mes "[Eik]";
mes "I'm not so rude as to pick fights with strangers for no reason!";
- emotion e_wah;
+ emotion ET_KEK;
close;
}
mes "[Eik]";
mes "Real power is developed after having thousands of matches with other people. So, don't be afraid of fighting, okay?";
- emotion e_pif;
+ emotion ET_HNG;
close;
}
diff --git a/npc/cities/einbroch.txt b/npc/cities/einbroch.txt
index 16364950b6b..4650a8b3f11 100644
--- a/npc/cities/einbroch.txt
+++ b/npc/cities/einbroch.txt
@@ -351,7 +351,7 @@ einbroch,40,116,1 script Airship Engineer#ein-1 855,{
mes "ain't special at all. You've";
mes "gone loony tunes, paley boy.";
next;
- emotion e_an;
+ emotion ET_FRET;
mes "[Airship Engineer]";
mes "Wh-what...?!";
close;
diff --git a/npc/cities/geffen.txt b/npc/cities/geffen.txt
index 94380a343a8..19babfd802f 100644
--- a/npc/cities/geffen.txt
+++ b/npc/cities/geffen.txt
@@ -102,7 +102,7 @@ geffen,147,26,0 script Ralphie 97,{
mes "With that, anyone could be as strong as Hercules... Even a weakling like me! Hahahahahah,";
mes "I must have it!";
next;
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Ralphie]";
mes "...Good Heavens!";
mes "Since when were";
@@ -156,7 +156,7 @@ geffen,111,48,0 script Stacey 101,{
mes "It's...";
mes "It's like you're surrounded by this incredibly masculine aura! Oooh~! You must be irresistable to all the girls!";
next;
- emotion e_lv;
+ emotion ET_THROB;
mes "[Stacey]";
mes "And I'm no exception.";
}
@@ -460,7 +460,7 @@ geffen_in,22,125,1 script Crumpler 52,{
mes "[Crumpler]";
mes "Ooooooooh";
mes "crraaaap!";
- emotion e_gasp;
+ emotion ET_SURPRISE;
next;
mes "[Crumpler]";
mes "Help meeeee!";
@@ -498,7 +498,7 @@ geffen_in,22,125,1 script Crumpler 52,{
mes "[Crumpler]";
mes "A...";
mes "Sage?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
mes "[Crumpler]";
mes "I don't know what that is. But I guess it can't be half as bad as a Mage.";
diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt
index 447a9bcfbd9..d5048dddd4a 100644
--- a/npc/cities/jawaii.txt
+++ b/npc/cities/jawaii.txt
@@ -260,7 +260,7 @@ jawaii,141,200,3 script Employee#sroom 798,{
mes "[Alowa]";
mes "^666666*Sniff*^000000";
mes "B-but I promise th-that this room is the nicest and cl-cleanest room! P-Please! C-come back!";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
@@ -457,10 +457,10 @@ jawaii_in,25,94,0 script Employee#jaw1 724,{
close;
OnWelcome:
- emotion e_kis;
+ emotion ET_CHUP;
end;
OnSolo:
- emotion e_omg;
+ emotion ET_HUK;
end;
}
@@ -487,10 +487,10 @@ jawaii_in,25,96,0 script Employee#jaw2 724,{
close;
OnWelcome:
- emotion e_kis;
+ emotion ET_CHUP;
end;
OnSolo:
- emotion e_omg;
+ emotion ET_HUK;
end;
}
@@ -531,10 +531,10 @@ jawaii_in,25,98,0 script Employee#jaw3 724,{
close;
OnWelcome:
- emotion e_kis;
+ emotion ET_CHUP;
end;
OnSolo:
- emotion e_omg;
+ emotion ET_HUK;
end;
}
@@ -570,10 +570,10 @@ jawaii_in,25,100,0 script Employee#jaw4 724,{
close;
OnWelcome:
- emotion e_kis;
+ emotion ET_CHUP;
end;
OnSolo:
- emotion e_omg;
+ emotion ET_HUK;
end;
}
@@ -603,10 +603,10 @@ jawaii_in,30,94,4 script Employee#jaw5 724,{
close;
OnWelcome:
- emotion e_kis;
+ emotion ET_CHUP;
end;
OnSolo:
- emotion e_omg;
+ emotion ET_HUK;
end;
}
@@ -628,10 +628,10 @@ jawaii_in,30,96,4 script Employee#jaw6 724,{
close;
OnWelcome:
- emotion e_kis;
+ emotion ET_CHUP;
end;
OnSolo:
- emotion e_omg;
+ emotion ET_HUK;
end;
}
@@ -662,10 +662,10 @@ jawaii_in,30,98,4 script Employee#jaw7 724,{
close;
OnWelcome:
- emotion e_kis;
+ emotion ET_CHUP;
end;
OnSolo:
- emotion e_omg;
+ emotion ET_HUK;
end;
}
@@ -686,10 +686,10 @@ jawaii_in,30,100,4 script Employee#jaw8 724,{
close;
OnWelcome:
- emotion e_kis;
+ emotion ET_CHUP;
end;
OnSolo:
- emotion e_omg;
+ emotion ET_HUK;
end;
}
@@ -727,7 +727,7 @@ jawaii_in,15,104,0 script Waitress#jawaii 80,{
mes "[Waitress]";
mes "Hello,";
mes "how can I help you?";
- emotion e_kis;
+ emotion ET_CHUP;
next;
switch(select("Give me food.:Bring me drink.:Where's the bar?")) {
case 1:
@@ -789,7 +789,7 @@ jawaii_in,15,104,0 script Waitress#jawaii 80,{
close;
}
}
- emotion e_omg;
+ emotion ET_HUK;
mes "[Waitress]";
mes "Hey, hey...!";
mes "I have no idea";
@@ -1243,7 +1243,7 @@ prt_in,173,13,4 script Customer#SoloHan 86,{
next;
mes "[Bachewcca]";
mes "...!";
- emotion e_no1,0,"Customer#Bachewcca";
+ emotion ET_BEST, getnpcid(0, "Customer#Bachewcca");
next;
mes "[SoloHan]";
mes "It's doesn't really matter whether you're married";
@@ -1393,7 +1393,7 @@ prt_in,170,14,0 script Customer#Bachewcca 89,{
mes "..............";
mes "^666666*Gulp....gulp...*^000000";
mes "Grrrrr!! That hit the spot!";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt
index cc3b7cb736c..8af190d8076 100644
--- a/npc/cities/lighthalzen.txt
+++ b/npc/cities/lighthalzen.txt
@@ -239,8 +239,8 @@ lighthalzen,66,94,3 script Elmer Keays#li_03 866,{
mes "precious sight to these";
mes "old eyes, my dear. I'm";
mes "really lucky to be with you.";
- emotion e_kis,0,"Margie Keays#li_02";
- emotion e_kis2;
+ emotion ET_CHUP, getnpcid(0, "Margie Keays#li_02");
+ emotion ET_CHUPCHUP;
close;
}
@@ -959,7 +959,7 @@ lighthalzen,296,239,3 script Berru#lhz_01 706,{
mes "[Berru]";
mes "Daddy...! Waaaaah~!";
mes "I wanna see my Daddy!";
- emotion e_sob,0,"Berru#lhz_01";
+ emotion ET_CRY, getnpcid(0, "Berru#lhz_01");
next;
mes "[Pilia]";
mes "Berru, I don't ";
@@ -973,7 +973,7 @@ lighthalzen,296,239,3 script Berru#lhz_01 706,{
mes "home! He said he'll";
mes "bring us candy tonight!";
mes "You go sleep first, Pilia!";
- emotion e_ag,0,"Berru#lhz_01";
+ emotion ET_ANGER, getnpcid(0, "Berru#lhz_01");
next;
mes "[Pilia]";
mes "^333333*Sigh...*^000000";
@@ -981,7 +981,7 @@ lighthalzen,296,239,3 script Berru#lhz_01 706,{
mes "He said he found a";
mes "good job, but we haven't";
mes "heard from him since then...";
- emotion e_dots,0,"Pilia#lhz_01";
+ emotion ET_THINK, getnpcid(0, "Pilia#lhz_01");
close;
case 2:
mes "[Pilia]";
@@ -989,7 +989,7 @@ lighthalzen,296,239,3 script Berru#lhz_01 706,{
mes "so long? I hope Daddy";
mes "comes back home soon.";
mes "Come on, Berru, don't cry.";
- emotion e_dots,0,"Pilia#lhz_01";
+ emotion ET_THINK, getnpcid(0, "Pilia#lhz_01");
next;
mes "[Berru]";
mes "^333333*Sob...*^000000";
@@ -1007,7 +1007,7 @@ lighthalzen,296,239,3 script Berru#lhz_01 706,{
mes "but my little brother";
mes "just won't stop crying.";
mes "I'm sorry if we're loud...";
- emotion e_what,0,"Pilia#lhz_01";
+ emotion ET_QUESTION, getnpcid(0, "Pilia#lhz_01");
next;
mes "[Pilia]";
mes "Our daddy goes to work";
@@ -1022,7 +1022,7 @@ lighthalzen,296,239,3 script Berru#lhz_01 706,{
mes "misses him a lot. I don't";
mes "know how to make him";
mes "stop crying! What do I do?";
- emotion e_swt2,0,"Pilia#lhz_01";
+ emotion ET_PROFUSELY_SWEAT, getnpcid(0, "Pilia#lhz_01");
close;
}
}
@@ -1047,7 +1047,7 @@ OnTouch_:
mes "looks like you're in need";
mes "of zeny, too. Would you";
mes "like to join me?";
- emotion e_heh;
+ emotion ET_SMILE;
close;
}
mes "[" + strcharinfo(0) + "]";
@@ -1062,7 +1062,7 @@ OnTouch_:
mes "a story with you and impart";
mes "some of the wisdom I've";
mes "learned over the years.";
- emotion e_thx;
+ emotion ET_THANKS;
next;
switch(rand(1,3)) {
case 1:
@@ -1089,22 +1089,22 @@ OnTouch_:
mes "during the day, we'll always have hope, even if we can't see it.";
next;
mes "[" + strcharinfo(0) + "]";
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
mes ". . . . . . . . . . . .";
next;
mes "[" + strcharinfo(0) + "]";
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
mes ". . . . . . . . . . . .";
mes ". . . . . . . . . . . .";
next;
mes "[" + strcharinfo(0) + "]";
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
mes ". . . . . . . . . . . .";
mes ". . . . . . . . . . . .";
mes ". . . . . . . . . . . .";
next;
mes "[Beggar]";
- emotion e_what;
+ emotion ET_QUESTION;
mes "Hmm...?";
mes "You seem surprised~";
close;
@@ -1140,22 +1140,22 @@ OnTouch_:
mes "miracle. Isn't that wonderful?";
next;
mes "[" + strcharinfo(0) + "]";
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
mes ". . . . . . . . . . . .";
next;
mes "[" + strcharinfo(0) + "]";
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
mes ". . . . . . . . . . . .";
mes ". . . . . . . . . . . .";
next;
mes "[" + strcharinfo(0) + "]";
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
mes ". . . . . . . . . . . .";
mes ". . . . . . . . . . . .";
mes ". . . . . . . . . . . .";
next;
mes "[Beggar]";
- emotion e_what;
+ emotion ET_QUESTION;
mes "Don't believe me?";
mes "Well, you'll see for";
mes "yourself, youngster.";
@@ -1208,22 +1208,22 @@ OnTouch_:
mes "born of frustration will make you a bully. Know the difference.";
next;
mes "[" + strcharinfo(0) + "]";
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
mes ". . . . . . . . . . . .";
next;
mes "[" + strcharinfo(0) + "]";
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
mes ". . . . . . . . . . . .";
mes ". . . . . . . . . . . .";
next;
mes "[" + strcharinfo(0) + "]";
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
mes ". . . . . . . . . . . .";
mes ". . . . . . . . . . . .";
mes ". . . . . . . . . . . .";
next;
mes "[Beggar]";
- emotion e_what;
+ emotion ET_QUESTION;
mes "What's wrong?";
mes "It might be a lot";
mes "to take in, I know.";
@@ -1244,14 +1244,14 @@ lighthalzen,311,194,3 script Reuben#lhz_02 870,{
mes "become a train conductor";
mes "and just get outta here!";
mes "I really hate this place!";
- emotion e_ag;
+ emotion ET_ANGER;
next;
mes "[Reuben]]";
mes "Wh-whoa...!";
mes "Did you just hear";
mes "me talk to myself?";
mes "Crud! Don't be so nosy!";
- emotion e_an;
+ emotion ET_FRET;
close;
}
mes "[Reuben]";
@@ -1260,7 +1260,7 @@ lighthalzen,311,194,3 script Reuben#lhz_02 870,{
mes "looking at me?";
mes "I don't know you";
mes "from Adam, so get lost~";
- emotion e_rock;
+ emotion ET_ROCK;
close;
}
@@ -1427,7 +1427,7 @@ lhz_in01,125,40,3 script Dowbow Ryuei#ryusei 843,{
mes "outlook on life. If you don't";
mes "mind, I'd like to shake";
mes "your hand, adventurer.";
- emotion e_no1;
+ emotion ET_BEST;
close;
}
mes "[Dowbow Ryuei]";
@@ -1864,7 +1864,7 @@ lhz_in01,217,121,3 script Repairman#li_01 851,{
mes "Hey, you don't work--";
mes "G-guards! Hurry! There's";
mes "somebody over here!";
- emotion e_gasp;
+ emotion ET_SURPRISE;
close2;
warp "lhz_in01",33,224;
end;
@@ -1895,7 +1895,7 @@ lhz_in01,203,123,3 script Scientist#li_02 750,{
mes "replace th--hey. You're";
mes "not Ralphie. Wait. Guaaards!";
mes "Help me, there's some weirdo!";
- emotion e_gasp;
+ emotion ET_SURPRISE;
close2;
warp "lhz_in01",33,224;
end;
@@ -1917,7 +1917,7 @@ lhz_in01,199,137,3 script Scientist#li_03 865,{
mes "here, and I think";
mes "it's one of those crazy";
mes "stalkers! Why, why me?!";
- emotion e_gasp;
+ emotion ET_SURPRISE;
close2;
warp "lhz_in01",33,224;
end;
@@ -1932,7 +1932,7 @@ OnTouch_:
if (select("Nice day, huh?:Cancel") == 1) {
mes "[Rekenber Guard]";
mes "...";
- emotion e_an;
+ emotion ET_FRET;
close;
}
mes "[Rekenber Guard]";
@@ -1941,7 +1941,7 @@ OnTouch_:
}
mes "[Rekenber Guard]";
mes "...!";
- emotion e_gasp;
+ emotion ET_SURPRISE;
close2;
warp "lhz_in01",33,224;
end;
@@ -2326,7 +2326,7 @@ lhz_in01,157,47,1 script Mareth#seram 797,{
mes "Yoo hoo hoo~";
mes "Oh, how I love";
mes "love love chocolate!";
- emotion e_lv;
+ emotion ET_THROB;
next;
mes "[Mareth]";
mes "Eat it up...";
@@ -2459,7 +2459,7 @@ lighthalzen,162,304,7 script Rekenber Guard Drew#li 868,{
mes "Official glossy photos";
mes "of the Kafra Ladies. Now...";
mes "With 20% more garter belts!";
- emotion e_ho;
+ emotion ET_DELIGHT;
next;
mes "[Rekenber Guard Tan]";
mes "So they're all wearing";
@@ -2468,7 +2468,7 @@ lighthalzen,162,304,7 script Rekenber Guard Drew#li 868,{
mes "even got the glasses chick";
mes "to wear 'em too? That's the";
mes "best news I've heard all day!";
- emotion e_omg,0,"Rekenber Guard Tan#li";
+ emotion ET_HUK, getnpcid(0, "Rekenber Guard Tan#li");
next;
mes "[Rekenber Guard Drew]";
mes "Okay man, you know these";
@@ -2494,7 +2494,7 @@ lighthalzen,163,306,3 script Rekenber Guard Tan#li 867,{
mes "This is art. The lighting,";
mes "the angle, the... the...";
mes "subject matter. Oh yes.";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Rekenber Guard Drew]";
mes "Man, these officially licensed";
@@ -2688,7 +2688,7 @@ lhz_in02,267,25,4 script Diana#npc 747,{
mes "good taste. Now, this Stiletto";
mes "is a steal at 39,800 zeny...";
next;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Diana]";
mes "Huh...?!";
mes "That's ridiculous!";
@@ -2947,7 +2947,7 @@ lhz_in01,139,48,7 script Leimi#mimir 73,{
mes "Oh...!";
mes "Good heavens!";
mes "Um, may I help you?";
- emotion e_omg;
+ emotion ET_HUK;
if (BaseJob == Job_Assassin) {
if (Sex == SEX_MALE) {
next;
@@ -3144,7 +3144,7 @@ lighthalzen,337,296,3 script Rekenber Employee#li_2 868,{
mes "professional positions. This";
mes "is a great chance to make a";
mes "difference... and some money~";
- emotion e_no1;
+ emotion ET_BEST;
close;
}
}
@@ -3171,7 +3171,7 @@ lhz_in01,221,131,7 script Scientist#li_01 865,{
mes "What?! Guards!";
mes "Hurry, there's an";
mes "intruder right here!";
- emotion e_gasp;
+ emotion ET_SURPRISE;
close2;
warp "lhz_in01",33,224;
end;
diff --git a/npc/cities/louyang.txt b/npc/cities/louyang.txt
index 6f935251a25..e659ab5cfb7 100644
--- a/npc/cities/louyang.txt
+++ b/npc/cities/louyang.txt
@@ -144,7 +144,7 @@ louyang,297,167,2 script Muscular Woman#lou 815,{
next;
mes "[Zhi Ching Li]";
mes "Recently we've had a hard time recruiting new members, so I came here to check if there's any woman who wishes to join us.";
- emotion e_dots;
+ emotion ET_THINK;
close;
}
mes "[Zhi Ching Li]";
diff --git a/npc/cities/niflheim.txt b/npc/cities/niflheim.txt
index 58d3dedb710..633798a2357 100644
--- a/npc/cities/niflheim.txt
+++ b/npc/cities/niflheim.txt
@@ -180,7 +180,7 @@ niflheim,350,258,1 script Cursed Spirit#nif 802,{
next;
mes "[Ashe Bruce]";
mes "Just because I'm a cursed spirit, you adventurers think you can just dump your curses on me?!";
- emotion e_an;
+ emotion ET_FRET;
next;
mes "[Ashe Bruce]";
mes "I refuse to let";
@@ -233,7 +233,7 @@ niflheim,350,258,1 script Cursed Spirit#nif 802,{
mes "And the spell to lift";
mes "your curse has been";
mes "lost to the ages~!";
- emotion e_gg;
+ emotion ET_KIK;
next;
if (select("Clover:Klaatu:Klaytos") == 2)
set .@spell,.@spell+1;
diff --git a/npc/cities/rachel.txt b/npc/cities/rachel.txt
index 7c1f9592a0a..90f14923886 100644
--- a/npc/cities/rachel.txt
+++ b/npc/cities/rachel.txt
@@ -276,7 +276,7 @@ rachel,206,30,3 script Freya's Priest#play 920,{
mes "[Freya's Priest]";
mes "You!";
mes "Entertain me!";
- emotion e_ag;
+ emotion ET_ANGER;
next;
if (select("What? You can't tell me what to do!:You got it.") == 1) {
mes "[Freya's Priest]";
@@ -343,7 +343,7 @@ rachel,197,137,3 script Bard#aru 51,{
mes ".........";
mes ".........";
mes ".........";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
@@ -421,7 +421,7 @@ ra_temin,138,64,5 script Child Follower#in1 921,{
mes "I really wanted it to just";
mes "rest and be healthy again";
mes "but it died! Waaaaah!";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Child Follower]";
mes "I... I'm going to";
@@ -557,7 +557,7 @@ rachel,127,117,4 script Child Follower#2 914,{
mes "believe that if it is Freya's";
mes "will, then it shall be realized.";
next;
- emotion e_what;
+ emotion ET_QUESTION;
mes "[Deno]";
mes "I know it might seem";
mes "a little confusing to";
diff --git a/npc/cities/splendide.txt b/npc/cities/splendide.txt
index a35fd4b943e..572c03f1805 100644
--- a/npc/cities/splendide.txt
+++ b/npc/cities/splendide.txt
@@ -381,13 +381,13 @@ splendide,210,95,3 script Middle-Ranked Laphine#2 442,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Middle-Ranked Laphine]";
mes "Wow~ Great!!";
- emotion e_no1;
+ emotion ET_BEST;
close;
}
else {
mes "[Middle-Ranked Laphine]";
mes "MushIyazTur Ee YurDana";
- emotion e_no1;
+ emotion ET_BEST;
close;
}
}
diff --git a/npc/cities/umbala.txt b/npc/cities/umbala.txt
index a8681c6e220..7a734894e78 100644
--- a/npc/cities/umbala.txt
+++ b/npc/cities/umbala.txt
@@ -43,7 +43,7 @@ comodo,171,137,1 script Haith#um 92,{
next;
mes "[La Ed]";
mes "Let's do it~ !!";
- emotion e_gg;
+ emotion ET_KIK;
next;
mes "[Haith]";
mes "................";
@@ -52,8 +52,8 @@ comodo,171,137,1 script Haith#um 92,{
mes "By the way...do you think he";
mes "would tell us about such a";
mes "great treasure so easily?";
- emotion e_hmm;
- emotion e_hmm,0,"La Ed#um";
+ emotion ET_SCRATCH;
+ emotion ET_SCRATCH, getnpcid(0, "La Ed#um");
next;
select("Hm? What treasure?");
mes "[La Ed]";
@@ -63,7 +63,7 @@ comodo,171,137,1 script Haith#um 92,{
mes "Huh...seems like you wanna know";
mes "more about the treasure. Well,";
mes "this information doesn't come cheap...";
- emotion e_gg;
+ emotion ET_KIK;
next;
mes "[La Ed]";
mes "Plus, we'll need a little";
@@ -73,8 +73,8 @@ comodo,171,137,1 script Haith#um 92,{
next;
mes "[La Ed, Haith]";
mes "If you pay us 1,000 zeny, we will tell you!";
- emotion e_gg;
- emotion e_gg,0,"La Ed#um";
+ emotion ET_KIK;
+ emotion ET_KIK, getnpcid(0, "La Ed#um");
next;
if (select("Pay 1,000 zeny:Refuse to pay") == 1) {
if (Zeny > 999) {
@@ -108,7 +108,7 @@ comodo,171,137,1 script Haith#um 92,{
mes "whether or not Niels would tell";
mes "us the location of where he";
mes "found the treasure...";
- emotion e_hmm;
+ emotion ET_SCRATCH;
next;
mes "[La Ed]";
mes "Because Niels always treat us like";
@@ -133,8 +133,8 @@ comodo,171,137,1 script Haith#um 92,{
}
mes "[Haith]";
mes "Bah! Whatever~";
- emotion e_hmm;
- emotion e_hmm,0,"La Ed#um";
+ emotion ET_SCRATCH;
+ emotion ET_SCRATCH, getnpcid(0, "La Ed#um");
close;
}
@@ -208,7 +208,7 @@ cmd_in01,164,115,1 script Niels#um 731,{
mes "rather dramatic sound effect";
mes "for my declaration!";
mes "Eh, oh well...";
- emotion e_hmm;
+ emotion ET_SCRATCH;
next;
mes "[Niels]";
mes "Well, in the spirit of discovery,";
@@ -247,7 +247,7 @@ umbala,70,106,3 script Utan Kid#um 781,{
mes "[???]";
mes "Heh! Hi!";
mes "My name is Haatan.";
- emotion e_heh;
+ emotion ET_SMILE;
next;
mes "[Haatan]";
mes "...*Sigh*";
@@ -255,7 +255,7 @@ umbala,70,106,3 script Utan Kid#um 781,{
mes "you right now. My parent's house";
mes "was struck by lightning yesterday";
mes "and it burned down our roof...";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Haatan]";
mes " . . . !";
@@ -267,7 +267,7 @@ umbala,70,106,3 script Utan Kid#um 781,{
mes "re-constructing my parents' house?";
mes "You Rune-Midgardians are all";
mes "richier than Utans! I beg you!";
- emotion e_heh;
+ emotion ET_SMILE;
next;
if (select("(Nod head):(Shake head)") == 1) {
mes "[Haatan]";
@@ -279,7 +279,7 @@ umbala,70,106,3 script Utan Kid#um 781,{
if (checkweight(517,1)) {
getitem 517,1;// Meat
}
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
}
else {
next;
@@ -288,18 +288,18 @@ umbala,70,106,3 script Utan Kid#um 781,{
mes "It looks like...";
mes "You don't have much";
mes "yourself...";
- emotion e_pif;
+ emotion ET_HNG;
close;
}
next;
mes "[Haatan]";
mes "Thank you so much!";
- emotion e_heh;
+ emotion ET_SMILE;
close;
}
mes "[Haatan]";
mes ".............*Sob*...";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
else {
@@ -310,7 +310,7 @@ umbala,70,106,3 script Utan Kid#um 781,{
mes "[???]";
mes "Umbah! Umbaumbah!";
mes "Umbahumbah Haatan babah.";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Haatan]";
mes "........umbah,";
@@ -318,7 +318,7 @@ umbala,70,106,3 script Utan Kid#um 781,{
mes "Babaum babahum woombah umbah umbabah";
mes "Umbah umbah";
mes "..Umbah umbabah umbah...";
- emotion e_heh;
+ emotion ET_SMILE;
next;
mes "[Haatan]";
mes " . . . !";
@@ -328,7 +328,7 @@ umbala,70,106,3 script Utan Kid#um 781,{
mes "Umbah umbah? Umbah umbahbah";
mes "abaum babahum woombah!";
mes "Umbahumbah umbabahumbaumhumbah! Umbah!";
- emotion e_heh;
+ emotion ET_SMILE;
next;
if (select("(Nod head):(Shake head)") == 1) {
mes "[Haatan]";
@@ -340,24 +340,24 @@ umbala,70,106,3 script Utan Kid#um 781,{
if (checkweight(517,1)) {
getitem 517,1;// Meat
}
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
}
else {
next;
mes "[Haatan]";
mes "...umbah? Umbahumbah!! Umbaum!";
- emotion e_pif;
+ emotion ET_HNG;
close;
}
next;
mes "[Haatan]";
mes "Umba umba umbaum.";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
mes "[Haatan]";
mes "........umbah..";
- emotion e_heh;
+ emotion ET_SMILE;
close;
}
close;
@@ -370,7 +370,7 @@ umbala,59,243,5 script Utan Kid#1 787,{
mes ".........poop!";
mes ".....me like Meat.";
mes "....gimme a Meat.";
- emotion e_rock;
+ emotion ET_ROCK;
next;
if (select("Give him Meat.:Refuse.") == 1) {
if (countitem(517) > 0) {
@@ -382,7 +382,7 @@ umbala,59,243,5 script Utan Kid#1 787,{
getitem 909,2;// Jellopy
getitem 914,2;// Fluff
getitem 705,2;// Clover
- emotion e_scissors;
+ emotion ET_SCISSOR;
close;
}
mes "[Kotan]";
@@ -391,7 +391,7 @@ umbala,59,243,5 script Utan Kid#1 787,{
mes "I hate people who lie";
mes "to me!!";
percentheal -20,0;
- emotion e_an;
+ emotion ET_FRET;
close;
}
mes "[Kotan]";
@@ -399,7 +399,7 @@ umbala,59,243,5 script Utan Kid#1 787,{
mes ".....hungwee.";
mes ".....I want Meat.";
percentheal -1,0;
- emotion e_sob;
+ emotion ET_CRY;
close;
}
else {
@@ -408,7 +408,7 @@ umbala,59,243,5 script Utan Kid#1 787,{
mes "........umbah.";
mes ".......umbabah.";
mes "......humbah.";
- emotion e_rock;
+ emotion ET_ROCK;
next;
if (select("Umbah:Umbaboo") == 1) {
if (countitem(517) > 0) {
@@ -419,21 +419,21 @@ umbala,59,243,5 script Utan Kid#1 787,{
getitem 909,2;// Jellopy
getitem 914,2;// Fluff
getitem 705,2;// Clover
- emotion e_scissors;
+ emotion ET_SCISSOR;
close;
}
mes "[???]";
mes "Umbahumumhumbubabababah!!";
mes "Umbahumbababah umbahumboo!";
percentheal -20,0;
- emotion e_an;
+ emotion ET_FRET;
close;
}
mes "[???]";
mes "...........";
mes "......woong bah.";
mes "....umbabababah.";
- emotion e_sob;
+ emotion ET_CRY;
percentheal -1,0;
close;
}
@@ -441,7 +441,7 @@ umbala,59,243,5 script Utan Kid#1 787,{
umbala,177,153,3 script Pasto#um 97,{
mes "[Pasto]";
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "Oh my god~! Finally,";
mes "another Rune-Midgardian!";
mes "I've never seen anyone from";
@@ -486,7 +486,7 @@ umbala,177,153,3 script Pasto#um 97,{
mes "people here that speak my";
mes "language...I...I'm...";
mes "So very lonely...*Sob*";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
@@ -798,7 +798,7 @@ umbala,92,159,4 script Bertan#um 785,{
next;
mes "[????]";
mes "Umbaumba Umbaumbah woo~";
- emotion e_ho;
+ emotion ET_DELIGHT;
close;
}
close;
diff --git a/npc/custom/card_seller.txt b/npc/custom/card_seller.txt
index 5226b9d35a9..2dfa0ea4154 100644
--- a/npc/custom/card_seller.txt
+++ b/npc/custom/card_seller.txt
@@ -1,28 +1,36 @@
//===== rAthena Script =======================================
//= Card Seller A-Z
-//===== By: ==================================================
-//= AnnieRuru
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= rAthena Project
//===== Description: =========================================
//= Sells all cards dropped by mobs, grouped alphabetically.
//= MVP cards are excluded from the list.
//=
//= NOTE: Requires SQL item and mob databases.
-//===== Additional Comments: =================================
-//= 1.0 First version, edited. [Euphy]
+//===== Changelogs: ==========================================
+//= 1.0 First version [AnnieRuru]
+//= 1.1 Minor edits [Euphy]
+//= 1.2 Update for monster mode and enchants [Lemongrass]
//============================================================
prontera,155,177,5 script Card Seller 100,{
+ .@menu$ = getvariableofnpc( .alphabet_menu$, "card_seller_creation" );
+ if (.@menu$ == "") {
+ mes "[Card Seller]";
+ mes "I am sorry, it seems like something went wrong.";
+ mes "I cannot find any cards in our database at the moment.";
+ mes "Please contact a game master.";
+ close;
+ }
mes "[Card Seller]";
mes "Welcome!";
mes "I can sell you any normal monster card in the game. Would you like to have a look?";
next;
- .@s = select( .alphabet_menu$ ) -1;
+ .@s = select(.@menu$) -1;
close2;
- callshop "card_mob#"+ .alphabet$[.@s], 1;
+ callshop "card_mob#"+ getvariableofnpc( .alphabet$[.@s], "card_seller_creation" ), 1;
+ end;
+}
+
+- script card_seller_creation -1,{
end;
OnInit:
if (checkre(0)) {
@@ -32,14 +40,20 @@ OnInit:
.@mob_db$ = "mob_db";
.@item_db$ = "item_db";
}
- freeloop 1;
- .@total = query_sql( "SELECT DISTINCT LEFT( `name_japanese`, 1 ) AS alphabets FROM `"+ .@item_db$ +"` RIGHT JOIN `"+ .@mob_db$ +"` ON `"+ .@item_db$ +"`.`id` = `"+ .@mob_db$ +"`.`dropcardid` WHERE ~(`MODE`) & 32 AND `type` = 6 GROUP BY `name_japanese` ORDER BY alphabets;", .alphabet$ );
+ freeloop 1;
+ .@total = query_sql( "SELECT DISTINCT LEFT( `name_japanese`, 1 ) AS alphabets FROM `"+ .@item_db$ +"` WHERE `type` = " + IT_CARD + " AND `id` IN ( SELECT DISTINCT `dropcardid` FROM `"+ .@mob_db$ +"` WHERE ~(`MODE`) & " + MD_MVP + " ) ORDER BY alphabets;", .@alphabet$ );
for ( .@i = 0; .@i < .@total; .@i++ ) {
- .alphabet_menu$ = .alphabet_menu$ + .alphabet$[.@i] +" Cards:";
- .@nb = query_sql( "SELECT `"+ .@item_db$ +"`.`id` FROM `"+ .@item_db$ +"` RIGHT JOIN `"+ .@mob_db$ +"` ON `"+ .@item_db$ +"`.`id` = `"+ .@mob_db$ +"`.`dropcardid` WHERE ~(`MODE`) & 32 AND `type` = 6 AND LEFT( `name_japanese`, 1 ) = '"+ .alphabet$[.@i] +"' GROUP BY `name_japanese` ORDER BY `name_japanese` LIMIT 128;", .@id );
- npcshopdelitem "card_mob#"+ .alphabet$[.@i], 501;
- for ( .@j = 0; .@j < .@nb; .@j++ )
- npcshopadditem "card_mob#"+ .alphabet$[.@i], .@id[.@j], 1000000;
+ .@nb = query_sql( "SELECT `"+ .@item_db$ +"`.`id` FROM `"+ .@item_db$ +"` WHERE `type` = " + IT_CARD + " AND LEFT( `name_japanese`, 1 ) = '"+ .@alphabet$[.@i] +"' AND `id` IN ( SELECT DISTINCT `dropcardid` FROM `"+ .@mob_db$ +"` WHERE ~(`MODE`) & " + MD_MVP + " ) ORDER BY `name_japanese` LIMIT 128;", .@id );
+ if (.@nb > 0) {
+ .alphabet$[.@size_alphabet++] = .@alphabet$[.@i];
+ .alphabet_menu$ = .alphabet_menu$ + .@alphabet$[.@i] +" Cards:";
+ npcshopdelitem "card_mob#"+ .@alphabet$[.@i], 501;
+ for ( .@j = 0; .@j < .@nb; .@j++ ) {
+ if (callfunc( "F_IsCharm", .@id[.@j] ) == true)// Skip enchants in case someone added them as card drop
+ continue;
+ npcshopadditem "card_mob#"+ .@alphabet$[.@i], .@id[.@j], 1000000;
+ }
+ }
}
freeloop 0;
end;
diff --git a/npc/custom/etc/marriage.txt b/npc/custom/etc/marriage.txt
index a15aed3bfdc..595056e882d 100644
--- a/npc/custom/etc/marriage.txt
+++ b/npc/custom/etc/marriage.txt
@@ -109,7 +109,7 @@ prt_church,100,123,4 script Vomars 60,{
mes "Why should they not be wed?";
input $@msg$;
npctalk @name$ +" : "+ strcharinfo(0) +"'s objection is: "+$@msg$;
- emotion e_sob;
+ emotion ET_CRY;
mes "I see...";
} else
mes "Very well, go sit and enjoy the ceremony.";
@@ -195,14 +195,14 @@ function SF_AcceptGroom {
mes "["+@name$+"]";
mes "You what!?";
mes "err.. *cough* *cough* very well... come back after you've made up your mind.";
- emotion e_ag;
+ emotion ET_ANGER;
close;
case 2:
mes "["+@name$+"]";
mes "!!";
mes "Ah... err... ehm... okay. You two seem to have some differences to settle first.";
close2;
- emotion e_omg;
+ emotion ET_HUK;
npctalk @name$ +" : Ladies and gentlemen, "+$wed_bride$+" has rejected to marry "+$wed_groom$+"!";
SF_wed_end();
break;
@@ -212,7 +212,7 @@ function SF_AcceptGroom {
SF_RingsAccepted();
break;
}
- emotion e_ok;
+ emotion ET_OK;
mes "["+@name$+"]";
mes "After your groom approves, you will be given your rings, the ceremony will begin and you will be officially married.";
close;
@@ -228,13 +228,13 @@ function SF_AcceptBride {
mes "["+@name$+"]";
mes "You what!?";
mes "err.. *cough* *cough* very well... come back after you've made up your mind.";
- emotion e_ag;
+ emotion ET_ANGER;
close;
case 2:
mes "["+@name$+"]";
mes "!!";
mes "Ah... err... ehm... okay. You two seem to have some differences to settle first.";
- emotion e_omg;
+ emotion ET_HUK;
close2;
npctalk @name$ +" : Ladies and gentlemen, "+$wed_groom$+" has rejected to marry "+$wed_bride$+"!";
SF_wed_end();
@@ -245,7 +245,7 @@ function SF_AcceptBride {
SF_RingsAccepted();
break;
}
- emotion e_ok;
+ emotion ET_OK;
mes "["+@name$+"]";
mes "After your bride approves, you will be given your rings, the ceremony will begin and you will be officially married.";
close;
@@ -259,7 +259,7 @@ function SF_RingsAccepted {
set $wed_groom_progress,3;
announce $wed_groom$+" and "+$wed_bride$+"'s wedding ceremony will be held at the church!",8;
close2;
- emotion e_lv;
+ emotion ET_THROB;
npctalk @name$ +" : May the groom and bride please step forward and retrieve their rings?";
}
@@ -397,19 +397,19 @@ function SF_equip_check {
if (Sex == SEX_MALE && getequipid(EQI_ARMOR) != 7170) {
mes "["+@name$+"]";
mes "Child, what did you do with your "+getitemname(7170)+"?";
- emotion e_dots;
+ emotion ET_THINK;
return 0;
}
if (Sex == SEX_FEMALE && getequipid(EQI_ARMOR) != 2338) {
mes "["+@name$+"]";
mes "Child, you are supposed to wear a "+getitemname(2338)+" at all times during the ceremony...";
- emotion e_dots;
+ emotion ET_THINK;
return 0;
}
if (Sex == SEX_FEMALE && $@wed_veil && getequipid(EQI_HEAD_TOP) != 2206) {
mes "["+@name$+"]";
mes "Child, you can't take off your "+getitemname(2206)+" yet....";
- emotion e_dots;
+ emotion ET_THINK;
return 0;
}
return 1;
@@ -513,7 +513,7 @@ function SF_Register {
mes "["+@name$+"]";
mes "You are now registered as the groom.";
mes "Tell your bride to register as soon as possible.";
- emotion e_hmm;
+ emotion ET_SCRATCH;
initnpctimer;
close;
case 2: //Bride
@@ -522,7 +522,7 @@ function SF_Register {
mes "["+@name$+"]";
mes "You are now registered as the bride.";
mes "Tell your groom to register as soon as possible.";
- emotion e_hmm;
+ emotion ET_SCRATCH;
initnpctimer;
close;
default: //Cancel
@@ -559,10 +559,10 @@ function SF_WedProgress {
set $wed_groom_progress,1;
mes "["+@name$+"]";
mes "Very well, now go to the Priest to reaffirm your vows and the ceremony will begin.";
- emotion e_no1;
+ emotion ET_BEST;
close2;
npctalk @name$ +" : Registration finished. "+$wed_groom$+" and "+$wed_bride$+", please reaffirm your vows with the Priest.";
- emotion e_no1;
+ emotion ET_BEST;
end;
} else {
mes "["+@name$+"]";
@@ -580,10 +580,10 @@ function SF_WedProgress {
stopnpctimer;
mes "["+@name$+"]";
mes "Very well, now go to the Priest to reaffirm your vows and the ceremony will begin.";
- emotion e_no1;
+ emotion ET_BEST;
close2;
npctalk @name$ +" : Registration finished. "+$wed_groom$+" and "+$wed_bride$+", please reaffirm your vows with the Priest.";
- emotion e_no1;
+ emotion ET_BEST;
end;
} else {
mes "["+@name$+"]";
@@ -659,7 +659,7 @@ OnTimer60000:
set $@msg$, $wed_groom$;
npctalk @name$ +" : Registration timed out. Is it that noone wants to marry "+$@msg$+"..?";
- emotion e_hmm;
+ emotion ET_SCRATCH;
set $wed_groom$,"";
set $wed_groom_sex, 0;
@@ -684,7 +684,7 @@ function SF_TryRegister {
if (Upper == 2) {
mes "["+@name$+"]";
mes "Oh dear, you are too young to be thinking of marriage!";
- emotion e_gasp;
+ emotion ET_SURPRISE;
close;
}
if (Sex == SEX_MALE)
@@ -898,7 +898,7 @@ function SF_InProgress {
if (select("I don't want to divorce....","Yes, we have agreed to this.")!=2) {
mes "["+@name$+"]";
mes "I hope you can work things out.";
- emotion e_pat;
+ emotion ET_GOODBOY;
goto SF_DivorceEnd;
close;
}
@@ -910,14 +910,14 @@ function SF_InProgress {
if (!(divorce())) {
mes "["+@name$+"]";
mes "Where has "+$@divorcer$+" gone to? I can't divorce you unless you both are here...";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
close;
}
set Zeny,Zeny-$@wed_divorce_fee;
announce $@divorcer$+" has just divorced "+strcharinfo(0)+"...", 8;
mes "["+@name$+"]";
mes "Your divorce has been filed. You are no longer wed.";
- emotion e_sob;
+ emotion ET_CRY;
goto SF_DivorceEnd;
close;
}
@@ -931,7 +931,7 @@ function SF_DivorceEnd {
OnTimer60000:
npctalk @name$ +" : Divorce confirmation time's is up. Where did "+$@divorcer$+"'s spouse go...";
- emotion e_what;
+ emotion ET_QUESTION;
SF_DivorceEnd();
end;
}
diff --git a/npc/custom/etc/morroc_raceway.txt b/npc/custom/etc/morroc_raceway.txt
index bf3d96ddcac..44610e805ad 100644
--- a/npc/custom/etc/morroc_raceway.txt
+++ b/npc/custom/etc/morroc_raceway.txt
@@ -88,7 +88,7 @@ OnCount3000:
announce "[1]",1;
end;
OnCount4000:
- emotion e_go;
+ emotion ET_GO;
specialeffect EF_CHIMTO;
announce "[GO!]",1;
set $@race,1;
diff --git a/npc/custom/etc/penal_servitude.txt b/npc/custom/etc/penal_servitude.txt
index 3a9f12d39fb..4ae137200a8 100644
--- a/npc/custom/etc/penal_servitude.txt
+++ b/npc/custom/etc/penal_servitude.txt
@@ -18,7 +18,7 @@
sec_pri,36,58,1 script Chief Warder 105,{
mes "[Saddeus]";
- emotion e_what;
+ emotion ET_QUESTION;
mes (Sex==SEX_MALE?"Mr.":"Ms.")+" Prisoner #"+BaseLevel+JobLevel+",";
mes "what's the noise over there?";
next;
@@ -83,7 +83,7 @@ M_Q1:
mes "[Saddeus]";
if(checkcart() || checkfalcon() || checkriding()){
- emotion e_hmm;
+ emotion ET_SCRATCH;
mes "I'm sorry, you should release your Cart, PecoPeco or Falcon!";
close;
}
@@ -121,7 +121,7 @@ M_NO_THANKS:
mes "[Saddeus]";
if (rand(2)) mes "Is today X-Mas time, huh?";
mes "Now shut up and back off!";
- if (rand(2)) emotion e_omg;
+ if (rand(2)) emotion ET_HUK;
close;
}
diff --git a/npc/custom/etc/quest_warper.txt b/npc/custom/etc/quest_warper.txt
index aca0efe765a..dfb7c4f995f 100644
--- a/npc/custom/etc/quest_warper.txt
+++ b/npc/custom/etc/quest_warper.txt
@@ -548,7 +548,7 @@ stampcard:
mes "You collected^00FF00 "+@Tstamp+" of "+@MaxTstamp+" ^000000Towns.";
if (@Tstamp == 15) {
mes "They say there is an island you can only get to when married...";
- emotion e_heh;
+ emotion ET_SMILE;
}
next;
mes "Let me check what dungeons you have.";
diff --git a/npc/custom/etc/rpsroulette.txt b/npc/custom/etc/rpsroulette.txt
index d00cf682fe4..a582b1efbeb 100644
--- a/npc/custom/etc/rpsroulette.txt
+++ b/npc/custom/etc/rpsroulette.txt
@@ -27,9 +27,9 @@ PLAY:
menu "^0000FFROCK!",-,"^FF0000SCISSORS!",SCISSORS,"^00FF00PAPER!^000000",PAPER;
if (.@lastchoice == 1) set .@opp, rand(1,3);
- if (.@opp == 1) emotion e_rock;
- else if (.@opp == 2) emotion e_scissors;
- else emotion e_paper;
+ if (.@opp == 1) emotion ET_ROCK;
+ else if (.@opp == 2) emotion ET_SCISSOR;
+ else emotion ET_WRAP;
set .@lastchoice,1;
if (.@opp == 1) goto SAME;
if (.@opp == 2) goto WIN;
@@ -37,9 +37,9 @@ PLAY:
SCISSORS:
if (.@lastchoice == 2) set .@opp,rand(1,2);
- if (.@opp == 1) emotion e_rock;
- else if (.@opp == 2) emotion e_scissors;
- else emotion e_paper;
+ if (.@opp == 1) emotion ET_ROCK;
+ else if (.@opp == 2) emotion ET_SCISSOR;
+ else emotion ET_WRAP;
set .@lastchoice,2;
if (.@opp == 1) goto LOSE;
if (.@opp == 2) goto SAME;
@@ -47,9 +47,9 @@ SCISSORS:
PAPER:
if (.@lastchoice == 3) set .@opp,rand(2,3);
- if (.@opp == 1) emotion e_rock;
- else if (.@opp == 2) emotion e_scissors;
- else emotion e_paper;
+ if (.@opp == 1) emotion ET_ROCK;
+ else if (.@opp == 2) emotion ET_SCISSOR;
+ else emotion ET_WRAP;
set .@lastchoice,3;
if (.@opp == 1) goto WIN;
if (.@opp == 2) goto LOSE;
@@ -57,13 +57,13 @@ PAPER:
WIN:
mes "Damnit, You Win!";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
set .@win, 1;
goto YOUPULL;
LOSE:
- emotion e_heh;
+ emotion ET_SMILE;
mes "Boorah! You Lose!";
next;
set .@win, 0;
@@ -78,13 +78,13 @@ YOUPULL:
if ( .@pull == 1 ) {
if ( .@win ) goto KILL;
specialeffect2 EF_SUI_EXPLOSION;
- emotion e_gg;
+ emotion ET_KIK;
percentheal -100,-100;
mes "*^0000FFClick^000000* *^FF0000BANG^000000*";
mes "You're dead!";
close;
}
- emotion e_pif;
+ emotion ET_HNG;
mes "*^0000FFClick^000000* whew...";
goto PLAY;
@@ -100,7 +100,7 @@ RULES:
KILL:
specialeffect EF_SUI_EXPLOSION;
- emotion e_omg;
+ emotion ET_HUK;
mes "*^0000FFClick^000000* *^FF0000BANG^000000*";
mes "OWWW @#$%^!! THAT HURT LIKE HELL!!";
next;
diff --git a/npc/custom/events/cluckers.txt b/npc/custom/events/cluckers.txt
index 9d375f6d869..128654963c8 100644
--- a/npc/custom/events/cluckers.txt
+++ b/npc/custom/events/cluckers.txt
@@ -26,17 +26,17 @@ prontera,156,219,4 script Cluckers 800,{
if (.startcluck) {
specialeffect2 EF_HIT3;
switch(rand(15)) {
- case 0: npctalk "Cluckers : CLUUUUUUCK!!!"; unitkill getcharid(3); skilleffect "NPC_SELFDESTRUCTION",1; emotion e_omg; break;
+ case 0: npctalk "Cluckers : CLUUUUUUCK!!!"; unitkill getcharid(3); skilleffect "NPC_SELFDESTRUCTION",1; emotion ET_HUK; break;
case 1: npctalk "Cluckers : Cluuuuuck!~"; break;
case 2: unitkill getcharid(3); skilleffect "NPC_SELFDESTRUCTION",1; break;
case 3: sc_start SC_Freeze,10000,0; break;
- case 4: npctalk "Cluckers : CLUUUUUUUUUCK!!!"; unitkill getcharid(3); skilleffect "NPC_SELFDESTRUCTION",1; emotion e_omg; break;
+ case 4: npctalk "Cluckers : CLUUUUUUUUUCK!!!"; unitkill getcharid(3); skilleffect "NPC_SELFDESTRUCTION",1; emotion ET_HUK; break;
case 5: sc_start SC_Sleep,10000,0; break;
- case 6: sc_start SC_Stone,10000,0; emotion e_gg; break;
- case 7: npctalk "Cluckers : CLUUUUUUCK!!!"; unitkill getcharid(3); skilleffect "NPC_SELFDESTRUCTION",1; emotion e_omg; break;
- case 8: npctalk "Cluckers : Cluck! CLUUUCK!!"; unitkill getcharid(3); skilleffect "NPC_SELFDESTRUCTION",1; emotion e_omg; break;
+ case 6: sc_start SC_Stone,10000,0; emotion ET_KIK; break;
+ case 7: npctalk "Cluckers : CLUUUUUUCK!!!"; unitkill getcharid(3); skilleffect "NPC_SELFDESTRUCTION",1; emotion ET_HUK; break;
+ case 8: npctalk "Cluckers : Cluck! CLUUUCK!!"; unitkill getcharid(3); skilleffect "NPC_SELFDESTRUCTION",1; emotion ET_HUK; break;
case 9: sc_start SC_Stun,10000,0; break;
- case 10: sc_start SC_Sleep,10000,0; emotion e_gg; break;
+ case 10: sc_start SC_Sleep,10000,0; emotion ET_KIK; break;
case 11: npctalk "Cluckers : Cluck! Cluck!"; break;
case 12: sc_start SC_Stun,10000,0; break;
case 13: unitkill getcharid(3); skilleffect "NPC_SELFDESTRUCTION",1; break;
@@ -64,7 +64,7 @@ prontera,156,219,4 script Cluckers 800,{
case 1:
mes "[Cluckers]";
mes "CLUCK! ^FF0000~Sure thing!~^000000";
- emotion e_ok;
+ emotion ET_OK;
close2;
announce "[Cluck! Cluck! Boom!] is about to start in Prontera!",bc_blue;
initnpctimer;
@@ -85,7 +85,7 @@ prontera,156,219,4 script Cluckers 800,{
next;
mes "[Cluckers]";
mes "Cluck cluck..? Cluck. ^FF0000~So, the prize is^000000 ^008000"+ $cluck_item_amount +" "+ getitemname($cluck_item_id) +"^000000? ^FF0000Great.~^000000";
- emotion e_ok;
+ emotion ET_OK;
next;
break;
case 4:
diff --git a/npc/custom/events/holiday/hallow06.txt b/npc/custom/events/holiday/hallow06.txt
index 361c3625865..5262030f30c 100644
--- a/npc/custom/events/holiday/hallow06.txt
+++ b/npc/custom/events/holiday/hallow06.txt
@@ -17,12 +17,12 @@ prontera,151,190,5 script Hallows' Eve Event 807,{
mes "[Hallows' Eve Event]";
if(Class == Job_Novice){
mes "I am sorry but you have to got a job to complete the event.";
- emotion e_swt,1;
+ emotion ET_SWEAT, playerattached();
close;
}
if((EVENT_HALWN06&1) && (EVENT_HALWN06&2)){
mes "I am sorry but you have already completed the event.";
- emotion e_sry;
+ emotion ET_SORRY;
close;
}
mes "Greetings fellow lively human.";
@@ -38,7 +38,7 @@ prontera,151,190,5 script Hallows' Eve Event 807,{
mes "[Hallows' Eve Event]";
if(EVENT_HALWN06&2){
mes "I'm sorry but you have already had a trick. Why don't you go pick a treat now.";
- emotion e_sry;
+ emotion ET_SORRY;
close;
}
mes "Give me a min...";
@@ -57,7 +57,7 @@ L_Treat:
mes "[Hallows' Eve Event]";
if(EVENT_HALWN06&1){
mes "I'm sorry but you have already had a treat. Why don't you go pick a trick now.";
- emotion e_sry;
+ emotion ET_SORRY;
close;
}
if(!(EVENT_HALWN06&4)){
@@ -91,7 +91,7 @@ L_Treat:
mes "[Hallows' Eve Event]";
if((countitem(2220) < 1) || (countitem(535) < 30) || (countitem(7205) < 20)){
mes "You don't have enough items. Come back when you do.";
- emotion e_sry;
+ emotion ET_SORRY;
close;
}
delitem 2220,1;
@@ -100,11 +100,11 @@ L_Treat:
getitem 5134,1;
set EVENT_HALWN06,EVENT_HALWN06|1;
mes "Good job! I hope you are happy with your item.";
- emotion e_grat;
+ emotion ET_CONGRATULATION;
next;
mes "[Hallows' Eve Event]";
mes "Enjoy the rest of your halloween.";
- emotion e_scissors,1;
+ emotion ET_SCISSOR, playerattached();
close;
L_Dont_Have:
diff --git a/npc/custom/events/holiday/uneasy_cemetery.txt b/npc/custom/events/holiday/uneasy_cemetery.txt
index 5d8d700f679..640cb97137c 100644
--- a/npc/custom/events/holiday/uneasy_cemetery.txt
+++ b/npc/custom/events/holiday/uneasy_cemetery.txt
@@ -72,7 +72,7 @@ prontera,257,313,5 script Mother Mathana 79,{
mes "I'm afraid there's something wrong with our old cemetery...";
if ($UNEASY_H$==strcharinfo(0)) mes "But thanks to you, "+$UNEASY_H$+", we'll be able to sleep " + $UNEASY_DL + " nights!";
if ($UNEASY_H$!=strcharinfo(0)) mes "But thanks to "+$UNEASY_H$+"'s support, we've got " + $UNEASY_DL + " easy nights!";
- emotion e_gasp;
+ emotion ET_SURPRISE;
close;
L_Undead_Walk:
diff --git a/npc/custom/events/holiday/valentinesdayexp.txt b/npc/custom/events/holiday/valentinesdayexp.txt
index d9161be6fdf..63489bd007a 100644
--- a/npc/custom/events/holiday/valentinesdayexp.txt
+++ b/npc/custom/events/holiday/valentinesdayexp.txt
@@ -62,9 +62,9 @@ M_INFO:
OnInit:
//559,Hand-made_Chocolate
- setitemscript 559,"{ itemheal 50,50; if(Sex==SEX_FEMALE || @dsv == gettime(DT_HOUR)+1 || ispartneron()==0)end; set @dsv,gettime(DT_HOUR)+1; misceffect 113; }";
+ setitemscript 559,"{ itemheal 50,50; if(Sex==SEX_FEMALE || @dsv == gettime(DT_HOUR)+1 || ispartneron()==0)end; set @dsv,gettime(DT_HOUR)+1; misceffect EF_MAGNUS; }";
//560,Hand-made_White_Chocolate
- setitemscript 560,"{ itemheal 50,50; if(Sex==SEX_MALE || @dsv == gettime(DT_HOUR)+1 || ispartneron()==0)end; set @dsv,gettime(DT_HOUR)+1; misceffect 113; }";
+ setitemscript 560,"{ itemheal 50,50; if(Sex==SEX_MALE || @dsv == gettime(DT_HOUR)+1 || ispartneron()==0)end; set @dsv,gettime(DT_HOUR)+1; misceffect EF_MAGNUS; }";
//2634,Wedding_Ring_M,Wedding Ring,5,,10,0,,0,,0,127918079,7,1,136,,0,0,0,{ skill 334,1; skill 335,1; skill 336,1; }
setitemscript 2634,"{ skill 334,1; skill 335,1; skill 336,1; if(@dsv == gettime(DT_HOUR)+1 && ispartneron()){ bonus2 bExpAddRace,5,50; bonus2 bExpAddRace,6,50; bonus2 bExpAddRace,7,50; bonus2 bExpAddRace,8,50; bonus2 bExpAddRace,1,50; } }";
diff --git a/npc/custom/events/holiday/xmas_rings_event.txt b/npc/custom/events/holiday/xmas_rings_event.txt
index c160e591528..1eba705a909 100644
--- a/npc/custom/events/holiday/xmas_rings_event.txt
+++ b/npc/custom/events/holiday/xmas_rings_event.txt
@@ -21,7 +21,7 @@ prontera,156,174,4 script Snower 713,{
} else if (Q_XMSRINGS == 3) {
mes "Snoowy's sent me a bird with a message. She told me about your help...";
mes "I'll tell you a secret of the magic rings.";
- emotion e_no1;
+ emotion ET_BEST;
next;
mes "[Snower]";
mes "They have magic power only from 8 December till 8 January.";
@@ -36,7 +36,7 @@ prontera,156,174,4 script Snower 713,{
} else {
mes "Hi! Two my sisters and I are preparing gifts for the whole 3 holidays!";
}
- emotion e_sob;
+ emotion ET_CRY;
next;
menu "Where are your sisters?",-, "What holidays?",M_PR,"What gifts?",M_WRAP,"May I help you?",M_QUEST;
@@ -91,7 +91,7 @@ M_QUEST:
OnInit:
//Santa's Hat
- setitemscript 2236,"{ bonus bMdef,1; bonus bLuk,1; if(isequipped(2636,2637)){if(@xmr == gettime(DT_MINUTE))end; set @xmr,gettime(DT_MINUTE); misceffect 410; end;} if(isequipped(2636)){if(@xmr == gettime(DT_MINUTE))end; set @xmr,gettime(DT_MINUTE); misceffect 72;} if(isequipped(2637)){if(@xmr == gettime(DT_MINUTE))end; set @xmr,gettime(DT_MINUTE); misceffect 338;}}";
+ setitemscript 2236,"{ bonus bMdef,1; bonus bLuk,1; if(isequipped(2636,2637)){if(@xmr == gettime(DT_MINUTE))end; set @xmr,gettime(DT_MINUTE); misceffect EF_RAINBOW; end;} if(isequipped(2636)){if(@xmr == gettime(DT_MINUTE))end; set @xmr,gettime(DT_MINUTE); misceffect EF_SPHERE;} if(isequipped(2637)){if(@xmr == gettime(DT_MINUTE))end; set @xmr,gettime(DT_MINUTE); misceffect EF_ANGEL2;}}";
//Gold Xmas Ring
setitemscript 2636,"{ bonus bLoseSPWhenUnequip,30; if(isequipped(2236)==0)end; if(getskilllv(\"AL_HEAL\")){skill \"TF_HIDING\",4+isequipped(2637);}else{skill \"AL_HEAL\",1+4*isequipped(2637);} }";
//Silver Xmas Ring
@@ -103,12 +103,12 @@ louyang,224,249,4 script Sneewy 717,{
mes "[Sneewy]";
if (Q_XMSRINGS == 0) {
mes "Hi! I'm waithing for my sister's birdy with mail...";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
if (Q_XMSRINGS == 1) {
mes "I wish I had 4 more gray Gift Boxes for native children...";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Sneewy]";
mes "Oh, hello. Has my brother Snower told you everything?";
@@ -118,27 +118,27 @@ louyang,224,249,4 script Sneewy 717,{
mes "[Sneewy]";
if (countitem(644) < 4) {
mes "Gimme 4 gifts for poor kids... Wait, you haven't got 4 of them!";
- emotion e_sry;
+ emotion ET_SORRY;
close;
}
set Q_XMSRINGS,2;
delitem 644,4;
getnameditem 2637,strcharinfo(0);
- emotion e_kis2;
+ emotion ET_CHUPCHUP;
mes "Thank you! Here's my li'l something for you!";
next;
mes "[Sneewy]";
mes "By the way, if you put on 2 different rings then your holidays leveling would be easier!";
close;
}
- emotion e_thx;
+ emotion ET_THANKS;
mes "Thanks again! No children will meet the holidays without the gifts!";
close;
M_END:
mes "[Sneewy]";
mes "Pity... I've got a magic Santa's ring... I'd exchange it for 4 Gift Boxes...";
- emotion e_swt;
+ emotion ET_SWEAT;
close;
}
@@ -146,7 +146,7 @@ izlu2dun,133,160,2 script Snoowy 714,{
mes "[Snoowy]";
if (Q_XMSRINGS == 0) {
mes "Helloooou! Do you know my bro and sis? How so? My brother Snower's well known in Prontera!! Just ask any child there.";
- emotion e_hmm;
+ emotion ET_SCRATCH;
close;
}
if (Q_XMSRINGS == 1) {
@@ -170,17 +170,17 @@ izlu2dun,133,160,2 script Snoowy 714,{
mes "[Snoowy]";
if (countitem(644) < 3) {
mes "Oops!! You haven't got 3 gray gift boxes on you.";
- emotion e_sry;
+ emotion ET_SORRY;
close;
}
set Q_XMSRINGS,3;
delitem 644,3;
getnameditem 2636,strcharinfo(0);
- emotion e_kis;
+ emotion ET_CHUP;
mes "Thaank yoouu! Have this magic ring!";
close;
}
- emotion e_thx;
+ emotion ET_THANKS;
mes "Oh... the whole marine folk send you their thanks! They love presents so much!!!";
if (rand(2))
mes "Didn't you know that Santa's Hat reveals the real power of the rings?";
@@ -189,6 +189,6 @@ izlu2dun,133,160,2 script Snoowy 714,{
M_END:
mes "[Snoowy]";
mes "I'd exchange a GOLD magic ring for 3 gift boxes...";
- emotion e_swt;
+ emotion ET_SWEAT;
close;
}
diff --git a/npc/custom/item_signer.txt b/npc/custom/item_signer.txt
index 79f1015d54f..429e04ee1ed 100644
--- a/npc/custom/item_signer.txt
+++ b/npc/custom/item_signer.txt
@@ -25,7 +25,7 @@ prt_in,24,61,7 script Perchik 47,{
if(select("Tell me more...:Sign my items, please!") == 1) {
mes "[Perchik]";
mes "I can put your name on any slotless equipment or weapon.";
- emotion e_ic;
+ emotion ET_AHA;
next;
mes "[Perchik]";
if (getarraysize(.@Item) || getarraysize(.@Cost)) {
@@ -37,7 +37,7 @@ prt_in,24,61,7 script Perchik 47,{
}
else mes "I work for free, but...";
next;
- emotion e_cry;
+ emotion ET_CRY;
mes "[Perchik]";
mes "Alas, I have 12 hungry children";
mes "and a very angry wife.";
@@ -45,7 +45,7 @@ prt_in,24,61,7 script Perchik 47,{
mes "[Perchik]";
mes "Or it was 12 angry children";
mes "and a very hungry wife...";
- emotion e_hmm;
+ emotion ET_SCRATCH;
close;
}
mes "[Perchik]";
@@ -63,7 +63,7 @@ prt_in,24,61,7 script Perchik 47,{
mes "[Perchik]";
if (!getequipisequiped(.@part)) {
mes "Nothing is equipped there!";
- emotion e_wah;
+ emotion ET_KEK;
close;
}
for(set .@i,0; .@i<4; set .@i,.@i+1)
@@ -71,25 +71,25 @@ prt_in,24,61,7 script Perchik 47,{
if (.@slot[0]==255 || .@slot[0]==254 || .@slot[0]<0) {
mes "Alas, this item's already signed.";
mes "I would never touch a master's work.";
- emotion e_hmm;
+ emotion ET_SCRATCH;
close;
}
if (.@slot[0]>4000 && .@slot[0]<5000) {
mes "A card? Here?!";
mes "As I said before, I don't sign items with cards.";
- emotion e_hmm;
+ emotion ET_SCRATCH;
close;
}
if (getiteminfo(.@id,10)) {
mes "Sorry, I don't sign slotted items.";
- emotion e_sry;
+ emotion ET_SORRY;
close;
}
getinventorylist;
for(set .@i,0; .@i<@inventorylist_count; set .@i,.@i+1)
if (@inventorylist_expire[.@i] != 0) {
mes "Sorry, I don't sign rental items!";
- emotion e_hmm;
+ emotion ET_SCRATCH;
close;
}
set .@price, .@Cost[0]+(.@Cost[1]*.@ref);
@@ -106,20 +106,20 @@ prt_in,24,61,7 script Perchik 47,{
if(select("Ok!:Leave")==2) {
mes "[Perchik]";
mes "See you...";
- emotion e_yawn;
+ emotion ET_SLEEPY;
close;
}
mes "[Perchik]";
if (Zeny < .@price || .@nr) {
mes "I don't work for 'thanks'.";
- emotion e_sry;
+ emotion ET_SORRY;
close;
}
if (!countitem2(.@id,1,.@ref,0,.@slot[0],.@slot[1],.@slot[2],.@slot[3])) {
mes "Where is "+getitemname(@id)+"...?";
npctalk "Perchik : You're a snoozy cheater!";
logmes "Hack: Tried to sign an item not having it: "+getitemname(@id);
- emotion e_wah;
+ emotion ET_KEK;
close;
}
if (.@price) set Zeny, Zeny-.@price;
@@ -127,7 +127,7 @@ prt_in,24,61,7 script Perchik 47,{
delitem .@Item[.@i], .@Item[.@i+1];
delitem2 .@id,1,1,.@ref,0,.@slot[0],.@slot[1],.@slot[2],.@slot[3];
mes "Done!";
- emotion e_proud;
+ emotion ET_OK;
getitem2 .@id,1,1,.@ref,0,254,0,getcharid(0)&0xffff,(getcharid(0)>>16)&0xffff;
equip .@id;
close;
diff --git a/npc/custom/jobmaster.txt b/npc/custom/jobmaster.txt
index b3d6194ae6c..d7499753dfd 100644
--- a/npc/custom/jobmaster.txt
+++ b/npc/custom/jobmaster.txt
@@ -1,29 +1,95 @@
//===== rAthena Script =======================================
//= Job Master
-//===== By: ==================================================
-//= Euphy
-//===== Current Version: =====================================
-//= 1.4
-//===== Compatible With: =====================================
-//= rAthena Project
//===== Description: =========================================
//= A fully functional job changer.
//===== Additional Comments: =================================
-//= 1.0 Initial script.
+//= 1.0 Initial script. [Euphy]
//= 1.1 Fixed reset on Baby job change.
//= 1.2 Added Expanded Super Novice support and initial Kagerou/Oboro support.
//= 1.3 Kagerou/Oboro added.
//= 1.4 Rebellion added.
+//= 1.5 Added option to disable RebirthClass. [mazvi]
+//= 1.6 Added option to get job related equipment on change. [Braniff]
+//= 1.7 Readability changes. Also added BabyExpanded and BabySummoner classes. [Jey]
+//= 1.8 Added option to disable Baby Novice Only but Baby Class can be Enabled [mazvi]
+//= 1.9 Migrate/Integrate to Global Functions Platinum Skills. [mazvi]
//============================================================
prontera,153,193,6 script Job Master 123,{
-function Job_Menu;
-
- mes "[Job Master]";
- if (Class > Job_Soul_Linker) {
- mes "No more jobs are available.";
+function Get_Job_Equip;
+// Checks if the Player has the required level.
+// closes if not, returns if yes
+function Require_Level {
+ if (BaseLevel < getarg(0) || JobLevel < getarg(1)) {
+ .@blvl = getarg(0) - BaseLevel;
+ .@jlvl = getarg(1) - JobLevel;
+ mes "Level requirement:";
+ mes ((getarg(0)>1)?
+ "^bb0000"+getarg(0)+"^000000 (^bb0000Base^000000) / ":"")+"^00bb00"+
+ getarg(1)+"^000000 (^00bb00Job^000000)";
+ mes "You need " +
+ ((.@blvl > 0) ? "^bb0000"+.@blvl+"^000000 more base levels " +
+ ((.@jlvl > 0) ? "and " : "") : "") +
+ ((.@jlvl > 0) ? "^00bb00"+.@jlvl+"^000000 more job levels " : "") +
+ "to continue.";
close;
}
+ return;
+}
+
+// Checks if the given eac is a baby class
+function Is_Baby {
+ return ((getarg(0, eaclass())&EAJL_BABY)>0);
+}
+
+// Checks if the player can change to third class.
+// Note: This does not include the level checks.
+function Can_Change_Third {
+ // To change to third class you either need to be:
+ // * Second Class
+ // * Transcendent Second Class
+ // * Baby Second Class
+ if( !.ThirdClass )
+ return false; // Third job change disabled
+ if( !(eaclass()&EAJL_2) )
+ return false; // Not second Class
+ if( eaclass()&EAJL_THIRD )
+ return false; // Already Third Class
+ if( roclass(eaclass()|EAJL_THIRD) < 0 )
+ return false; // Job has no third Class
+ if( (eaclass()&EAJ_UPPERMASK) == EAJ_SUPER_NOVICE )
+ return false; // Exp. Super Novice equals 3rd Cls, but has it's own case
+ if( Is_Baby() && (!.BabyClass || !.BabyThird) )
+ return false; // No Baby (Third) change allowed
+ return true;
+}
+
+function Can_Rebirth {
+ // To rebirth, you need to be:
+ // * Second Class
+ if( !.RebirthClass )
+ return false; // Rebirth disabled
+ if( !(eaclass()&EAJL_2) )
+ return false; // Not second Class
+ if( eaclass()&EAJL_UPPER )
+ return false; // Already Rebirthed
+ if( roclass(eaclass()|EAJL_UPPER) < 0 )
+ return false; // Job has no transcended class
+ if( Is_Baby() && !.BabyClass )
+ return false; // No Baby changes allowed
+ return true;
+}
+
+// Checks if the given eac is a first class
+function Is_First_Cls {
+ return (getarg(0) <= EAJ_TAEKWON);
+}
+
+function Check_Riding {
+ // Note: Why we should always check for Riding:
+ // Mounts are considered as another class, which
+ // would make this NPC bigger just to handle with
+ // those special cases.
if (checkfalcon() || checkcart() || checkriding() || ismounting()) {
mes "Please remove your " +
((checkfalcon()) ? "falcon" : "") +
@@ -33,274 +99,392 @@ function Job_Menu;
" before proceeding.";
close;
}
+ return;
+}
+function Check_SkillPoints {
if (.SkillPointCheck && SkillPoint) {
mes "Please use all your skill points before proceeding.";
close;
}
+ return;
+}
+
+// addJobOptions is essentially the same like
+// setarray .@array[getarraysize(.@array)],opt1,opt2,...;
+// It's just easier to read, since we're using it very often
+function Job_Options {
+ .@argcount = getargcount();
+ .@arr_size = getarraysize(getarg(0));
+ for( .@i = 1; .@i < .@argcount; .@i++) {
+ setarray getelementofarray(getarg(0), .@arr_size++),getarg(.@i);
+ }
+}
+// Begin of the NPC
+ mes .NPCName$;
+ Check_Riding();
+ Check_SkillPoints();
+
+ // initialisation
+ deletearray .@job_opt[0],getarraysize(.@job_opt);
.@eac = eaclass();
- .@i = ((.ThirdClass) ? roclass(.@eac&EAJ_UPPERMASK) : Class);
- if (.@i >= Job_Knight && .@i <= Job_Crusader2) {
- if (BaseLevel < .Rebirth[0] || JobLevel < .Rebirth[1]) {
- .@blvl = .Rebirth[0] - BaseLevel;
- .@jlvl = .Rebirth[1] - JobLevel;
- mes "You need " +
- ((.@blvl > 0) ? .@blvl + " more base levels " + ((.@jlvl > 0) ? "/ " : "") : "") +
- ((.@jlvl > 0) ? .@jlvl + " more job levels " : "") + "to continue.";
- close;
- }
- if (Class > Job_Crusader2) {
- mes "Switch to third class?";
- next;
- Job_Menu(roclass(.@eac|EAJL_THIRD));
- close;
- }
- while(1) {
- mes "Select an option.";
- next;
- .@i = select(" ~ ^0055FFRebirth^000000:" + ((.ThirdClass) ? " ~ ^FF0000Third Class^000000" : "") + ": ~ ^777777Cancel^000000");
- if (.@i == 3)
- close;
- mes "[Job Master]";
- mes "Are you sure?";
- next;
- Job_Menu(((.@i == 1) ? Job_Novice_High : roclass(.@eac|EAJL_THIRD)));
- mes "[Job Master]";
- }
+ .@third_possible = Can_Change_Third();
+ .@rebirth_possible = Can_Rebirth();
+ .@first_eac = .@eac&EAJ_BASEMASK;
+ .@second_eac = .@eac&EAJ_UPPERMASK;
+ // Note: These are already set in pc.c
+ // BaseClass = roclass(.@eac&EAJ_BASEMASK) which is the players First Class
+ // BaseJob = roclass(.@eac&EAJ_UPPERMASK) which is the players Second Class
+ //dispbottom "Debug: eac ("+.@eac+"), third ("+.@third_possible+"), rebirth("+.@rebirth_possible+"), BaseClass ("+BaseClass+"), BaseJob ("+BaseJob+")";
+
+ // From here on the jobmaster checks the current class
+ // and fills the the array `.@job_opt` with possible
+ // job options for the player.
+
+ if( .@rebirth_possible ) {
+ // Rebirth option (displayed on the top of the menu)
+ Require_Level(.Req_Rebirth[0], .Req_Rebirth[1]);
+ Job_Options(.@job_opt, Job_Novice_High);
}
- .@j1 = roclass(.@eac|EAJL_2_1);
- .@j2 = roclass(.@eac|EAJL_2_2);
- if ((.@eac&EAJ_UPPERMASK) == EAJ_SUPER_NOVICE)
- setarray .@exp[0], roclass(.@eac|EAJL_THIRD), 99;
- if (Class == Job_Ninja || Class == Job_Gunslinger)
- setarray .@exp[0], .@j1, 70;
- if (.@exp[0] && .SecondExpanded) {
- if (BaseLevel < .Rebirth[0] || JobLevel < .@exp[1]) {
- .@blvl = .Rebirth[0] - BaseLevel;
- .@jlvl = .@exp[1] - JobLevel;
- mes "You need " +
- ((.@blvl > 0) ? .@blvl + " more base levels " + ((.@jlvl > 0) ? "/ " : "") : "") +
- ((.@jlvl > 0) ? .@jlvl + " more job levels " : "") + "to continue.";
- close;
+ if( .@third_possible ) {
+ // Third Job change (displayed below rebirth)
+ Require_Level(.Req_Third[0], .Req_Third[1]);
+ Job_Options(.@job_opt, roclass(.@eac|EAJL_THIRD));
+ }
+
+ if (.SecondExpanded &&
+ (.@eac&EAJ_UPPERMASK) == EAJ_SUPER_NOVICE && // is Super Novice
+ !(eaclass()&EAJL_THIRD) ) { // not already Expanded SN
+ // (Baby) Super Novice to Expanded (Baby) Super Novice
+ if( !Is_Baby(.@eac) || (.BabyClass && .BabyExpanded) ) {
+ // .BabyClass & .BabyExpanded must be enabled if the is a baby
+ Require_Level(.Req_Exp_SNOVI[0], .Req_Exp_SNOVI[1]);
+ Job_Options(.@job_opt,roclass(.@eac|EAJL_THIRD)); // Expanded SN is "third" cls
}
- mes "Switch to " + jobname(.@exp[0]) + "?";
- next;
- Job_Menu(.@exp[0]);
- close;
}
- if (.@eac&EAJL_2)
- if ((.@eac&(EAJL_UPPER|EAJL_BABY)) || roclass(.@eac|EAJL_UPPER) == -1) {
- mes "No more jobs are available.";
- close;
+
+ if (.SecondExpanded &&
+ ((.@eac&(~EAJL_BABY)) == EAJ_NINJA || // is (Baby) Ninja
+ (.@eac&(~EAJL_BABY)) == EAJ_GUNSLINGER)) { // is (Baby) Gunslinger
+ // (Baby) Ninja to (Baby) Kagerou / Oboro
+ // (Baby) Gunslinger to (Baby) Rebellion
+ if( !Is_Baby(.@eac) || (.BabyClass && .BabyExpanded) ) {
+ // .BabyClass & .BabyExpanded must be enabled if the is a baby
+ Require_Level(.Req_Exp_NJ_GS[0], .Req_Exp_NJ_GS[1]);
+ // Kagerou, Oboro, Rebellion are considered as a 2-1 class
+ Job_Options(.@job_opt, roclass(.@eac|EAJL_2_1));
}
- if ((.@eac&EAJ_BASEMASK) == EAJ_NOVICE) {
- if (JobLevel < .JobReq[0])
- mes "A job level of " + .JobReq[0] + " is required to change into the 1st Class.";
- else if (Class == Job_Novice_High && .LastJob && lastJob) {
- mes "Switch classes now?";
- next;
- Job_Menu(roclass((eaclass(lastJob)&EAJ_BASEMASK)|EAJL_UPPER));
- } else {
- switch(Class) {
+ }
+
+ // Player is Job_Novice, Job_Novice_High or Job_Baby
+ if (.@first_eac == EAJ_NOVICE && .@second_eac != EAJ_SUPER_NOVICE) {
+ // MAPID_NOVICE, MAPID_SUPER_NOVICE, MAPID_NOVICE_HIGH, MAPID_BABY
+ Require_Level(.Req_First[0], .Req_First[1]);
+ switch(Class) {
case Job_Novice:
- Job_Menu(
- Job_Swordman,
- Job_Mage,
- Job_Archer,
- Job_Acolyte,
- Job_Merchant,
- Job_Thief,
- Job_Super_Novice,
- Job_Taekwon,
- Job_Gunslinger,
- Job_Ninja,
- Job_Baby
- );
+ // First job change
+ Job_Options(.@job_opt,Job_Swordman,
+ Job_Mage, Job_Archer, Job_Acolyte, Job_Merchant, Job_Thief,
+ Job_Super_Novice, Job_Taekwon, Job_Gunslinger, Job_Ninja);
+ if( .BabyNovice )
+ Job_Options(.@job_opt, Job_Baby);
break;
case Job_Novice_High:
- Job_Menu(
- Job_Swordman_High,
- Job_Mage_High,
- Job_Archer_High,
- Job_Acolyte_High,
- Job_Merchant_High,
- Job_Thief_High
- );
+ // Job change after rebirth
+ if( .LastJob && lastJob )
+ Job_Options(.@job_opt,
+ roclass((eaclass(lastJob)&EAJ_BASEMASK)|EAJL_UPPER));
+ else
+ Job_Options(.@job_opt,
+ Job_Swordman_High, Job_Mage_High, Job_Archer_High,
+ Job_Acolyte_High, Job_Merchant_High, Job_Thief_High);
break;
case Job_Baby:
- Job_Menu(
- Job_Baby_Swordman,
- Job_Baby_Mage,
- Job_Baby_Archer,
- Job_Baby_Acolyte,
- Job_Baby_Merchant,
- Job_Baby_Thief,
- Job_Super_Baby
- );
+ if( !.BabyClass )
+ break;
+ // First job change as a baby
+ Job_Options(.@job_opt, Job_Baby_Swordman, Job_Baby_Mage,
+ Job_Baby_Archer,Job_Baby_Acolyte, Job_Baby_Merchant,
+ Job_Baby_Thief);
+ if( .BabyExpanded )
+ Job_Options(.@job_opt, Job_Super_Baby, Job_Baby_Taekwon,
+ Job_Baby_Gunslinger, Job_Baby_Ninja);
+ if( .BabySummoner )
+ Job_Options(.@job_opt, Job_Baby_Summoner);
break;
default:
mes "An error has occurred.";
- break;
+ close;
+ }
+ } else if( Is_First_Cls(.@eac) || // First Class
+ Is_First_Cls(.@eac&(~EAJL_UPPER)) || // Trans. First Cls
+ (.BabyClass && Is_First_Cls(.@eac&(~EAJL_BABY))) ) { // Baby First Cls
+ // Player is First Class (not Novice)
+ // most jobs should have two options here (2-1 and 2-2)
+ .@class1 = roclass(.@eac|EAJL_2_1); // 2-1
+ .@class2 = roclass(.@eac|EAJL_2_2); // 2-2
+ // dispbottom "Debug: Classes: class1 ("+.@class1+"), class2 ("+.@class2+")";
+ if(.LastJob && lastJob && (.@eac&EAJL_UPPER)) {
+ // Player is rebirth Cls and linear class changes are enforced
+ Require_Level(.Req_Second[0], .Req_Second[1]);
+ Job_Options(.@job_opt, lastJob + Job_Novice_High);
+ } else {
+ // Class is not enforced, player can decide.
+ if( .@class1 > 0 ) { // 2-1
+ Require_Level(.Req_Second[0], .Req_Second[1]);
+ Job_Options(.@job_opt, .@class1);
+ }
+ if( .@class2 > 0 ) { // 2-2
+ Require_Level(.Req_Second[0], .Req_Second[1]);
+ Job_Options(.@job_opt, .@class2);
}
}
- close;
}
- if (roclass(.@eac|EAJL_2_1) == -1 || roclass(.@eac|EAJL_2_2) == -1)
- mes "No more jobs are available.";
- else if (!(.@eac&EAJL_2) && JobLevel < .JobReq[1])
- mes "A job level of " + .JobReq[1] + " is required to change into the 2nd Class.";
- else if (.LastJob && lastJob && (.@eac&EAJL_UPPER)) {
- mes "Switch classes now?";
- next;
- Job_Menu(lastJob + Job_Novice_High);
- } else
- Job_Menu(.@j1, .@j2);
+
+ // Displaying the Job Menu defined by .@job_opt.
+ // .@job_opt should not be changed below this line.
+ function Job_Menu;
+ Job_Menu(.@job_opt);
close;
-function Job_Menu {
- while(1) {
- if (getargcount() > 1) {
+// Displays the job menu
+function Job_Menu {
+ // getarg(0) is the .@job_opt array holding all available job changes.
+ function Confirm_Change;
+ while(true) {
+ .@opt_cnt = getarraysize(getarg(0));
+ if( .@opt_cnt <= 0 ) {
+ mes "No more jobs are available.";
+ close;
+ }
+
+ .@selected = 0; // Just a single job class given, no select needed
+ if (.@opt_cnt > 1) {
+ // Multiple job classes given. Select one and save it to .@class
+ // After that confirm .@class
mes "Select a job.";
.@menu$ = "";
- for (.@i = 0; .@i < getargcount(); .@i++)
- .@menu$ = .@menu$ + " ~ " + jobname(getarg(.@i)) + ":";
+ for (.@i = 0; .@i < .@opt_cnt; .@i++) {
+ if( getelementofarray(getarg(0), .@i) == Job_Novice_High)
+ .@jobname$ = "^0055FFRebirth^000000";
+ else
+ .@jobname$ = jobname(getelementofarray(getarg(0), .@i));
+ .@menu$ = .@menu$ + " ~ " + .@jobname$ + ":";
+ }
.@menu$ = .@menu$+" ~ ^777777Cancel^000000";
- next;
- .@i = getarg(select(.@menu$) - 1, 0);
- if (!.@i)
+ .@selected = select(.@menu$) - 1;
+ if( .@selected < 0 || .@selected >= .@opt_cnt )
close;
- if ((.@i == Job_Super_Novice || .@i == Job_Super_Baby) && BaseLevel < .SNovice) {
- mes "[Job Master]";
- mes "A base level of " + .SNovice + " is required to turn into a " + jobname(.@i) + ".";
- close;
- }
- mes "[Job Master]";
- mes "Are you sure?";
next;
- } else
- .@i = getarg(0);
- if (select(" ~ Change into ^0055FF" + jobname(.@i) + "^000000 class: ~ ^777777" + ((getargcount() > 1) ? "Go back" : "Cancel") + "^000000") == 1) {
- mes "[Job Master]";
- mes "You are now " + callfunc("F_InsertArticle", jobname(.@i)) + "!";
- if (.@i == Job_Novice_High && .LastJob)
- lastJob = Class;
- jobchange .@i;
- if (.@i == Job_Novice_High)
- resetlvl(1);
- else if (.@i == Job_Baby) {
- resetstatus;
- resetskill;
- set SkillPoint,0;
- }
- specialeffect2 EF_ANGEL2;
- specialeffect2 EF_ELECTRIC;
- if (.Platinum)
- callsub Get_Platinum;
- close;
+ mes .NPCName$;
}
- if (getargcount() == 1)
+ .@class = getelementofarray(getarg(0), .@selected);
+ if ((.@class == Job_Super_Novice || .@class == Job_Super_Baby) &&
+ BaseLevel < .SNovice) {
+ // Special Level Requirement because Super Novice and
+ // Supber Baby can both be selected in one of the first class
+ // changes. That's why the Levelrequirement is after and not before
+ // the selection.
+ mes "A base level of " + .SNovice +
+ " is required to turn into a " + jobname(.@class) + ".";
return;
- mes "[Job Master]";
+ }
+ // Confirm the Class
+ Confirm_Change(.@class, .@opt_cnt > 1);
+ next;
+ mes .NPCName$;
}
- end;
+ return;
+}
+
+
+// Executes the actual jobchange and closes.
+function Job_Change {
+ .@to_cls = getarg(0);
+ next;
+ mes .NPCName$;
+ mes "You are now " + callfunc("F_InsertArticle", jobname(.@to_cls)) + "!";
+ if (.@to_cls == Job_Novice_High && .LastJob)
+ lastJob = Class; // Saves the lastJob for rebirth
+ jobchange .@to_cls;
+ if (.@to_cls == Job_Novice_High)
+ resetlvl(1);
+ else if (.@to_cls == Job_Baby) {
+ resetstatus;
+ resetskill;
+ set SkillPoint,0;
+ }
+ specialeffect2 EF_ANGEL2;
+ specialeffect2 EF_ELECTRIC;
+ if (.Platinum)
+ callfunc "F_GetPlatinumSkills";
+ if (.GetJobEquip)
+ Get_Job_Equip();
+ close; // Always closes after the change
}
-Get_Platinum:
- skill "NV_FIRSTAID",1,SKILL_PERM;
- switch (BaseClass) {
- case Job_Novice:
- if (Class != Job_Super_Novice)
- skill "NV_TRICKDEAD",1,SKILL_PERM;
- break;
- case Job_Swordman:
- skill "SM_MOVINGRECOVERY",1,SKILL_PERM;
- skill "SM_FATALBLOW",1,SKILL_PERM;
- skill "SM_AUTOBERSERK",1,SKILL_PERM;
- break;
- case Job_Mage:
- skill "MG_ENERGYCOAT",1,SKILL_PERM;
- break;
- case Job_Archer:
- skill "AC_MAKINGARROW",1,SKILL_PERM;
- skill "AC_CHARGEARROW",1,SKILL_PERM;
- break;
- case Job_Acolyte:
- skill "AL_HOLYLIGHT",1,SKILL_PERM;
- break;
- case Job_Merchant:
- skill "MC_CARTREVOLUTION",1,SKILL_PERM;
- skill "MC_CHANGECART",1,SKILL_PERM;
- skill "MC_LOUD",1,SKILL_PERM;
- break;
- case Job_Thief:
- skill "TF_SPRINKLESAND",1,SKILL_PERM;
- skill "TF_BACKSLIDING",1,SKILL_PERM;
- skill "TF_PICKSTONE",1,SKILL_PERM;
- skill "TF_THROWSTONE",1,SKILL_PERM;
- break;
- default:
- break;
+function Confirm_Change {
+ // Player confirms he want to change into .@class
+ .@class = getarg(0, -1);
+ .@back = getarg(1, false);
+ if( .@class < 0 ) {
+ mes "Unknow Class Error.";
+ close;
}
- switch (BaseJob) {
- case Job_Knight:
- skill "KN_CHARGEATK",1,SKILL_PERM;
- break;
- case Job_Priest:
- skill "PR_REDEMPTIO",1,SKILL_PERM;
- break;
- case Job_Wizard:
- skill "WZ_SIGHTBLASTER",1,SKILL_PERM;
- break;
- case Job_Blacksmith:
- skill "BS_UNFAIRLYTRICK",1,SKILL_PERM;
- skill "BS_GREED",1,SKILL_PERM;
- break;
- case Job_Hunter:
- skill "HT_PHANTASMIC",1,SKILL_PERM;
- break;
- case Job_Assassin:
- skill "AS_SONICACCEL",1,SKILL_PERM;
- skill "AS_VENOMKNIFE",1,SKILL_PERM;
- break;
- case Job_Crusader:
- skill "CR_SHRINK",1,SKILL_PERM;
- break;
- case Job_Monk:
- skill "MO_KITRANSLATION",1,SKILL_PERM;
- skill "MO_BALKYOUNG",1,SKILL_PERM;
- break;
- case Job_Sage:
- skill "SA_CREATECON",1,SKILL_PERM;
- skill "SA_ELEMENTWATER",1,SKILL_PERM;
- skill "SA_ELEMENTGROUND",1,SKILL_PERM;
- skill "SA_ELEMENTFIRE",1,SKILL_PERM;
- skill "SA_ELEMENTWIND",1,SKILL_PERM;
- break;
- case Job_Rogue:
- skill "RG_CLOSECONFINE",1,SKILL_PERM;
- break;
- case Job_Alchemist:
- skill "AM_BIOETHICS",1,SKILL_PERM;
- break;
- case Job_Bard:
- skill "BA_PANGVOICE",1,SKILL_PERM;
- break;
- case Job_Dancer:
- skill "DC_WINKCHARM",1,SKILL_PERM;
- break;
- default:
- break;
+ mes "Do you want to change into ^0055FF"+jobname(.@class)+"^000000 class?";
+ .@job_option$ = " ~ Change into ^0055FF"+jobname(.@class)+"^000000 class";
+ if( .@class == Job_Novice_High)
+ .@job_option$ = " ~ ^0055FFRebirth^000000";
+
+ if (select(.@job_option$+": ~ ^777777" +
+ ((.@back) ?"Go back" : "Cancel") + "^000000") == 1) {
+ Job_Change(.@class);
}
+ if (!.@back)
+ close; // "Cancel" pressed
return;
+}
+
+// Function which gives a job related item to the player
+// the items are the rewards from the original job change quests
+function Get_Job_Equip {
+ // Note: The item is dropping, when the player can't hold it.
+ // But that's better than not giving the item at all.
+ .@eac = eaclass();
+ if( .@eac&EAJL_THIRD ) {
+ // Third Class Items
+ getitem 2795,1; // Green Apple Ring for every 3rd Class
+ switch(BaseJob) {
+ // BaseJob of Third Cls
+ // For Normal Third, Baby Third and Transcended Third Cls
+ case Job_Knight:
+ getitem 5746,1; break; // Rune Circlet [1]
+ case Job_Wizard:
+ getitem 5753,1; break; // Magic Stone Hat [1]
+ case Job_Hunter:
+ getitem 5748,1; break; // Sniper Goggle [1]
+ case Job_Priest:
+ getitem 5747,1; break; // Mitra [1]
+ case Job_Blacksmith:
+ getitem 5749,1; break; // Driver Band [1]
+ case Job_Assassin:
+ getitem 5755,1; break; // Silent Executor [1]
+ case Job_Crusader:
+ getitem 5757,1; break; // Dip Schmidt Helm [1]
+ case Job_Sage:
+ getitem 5756,1; break; // Wind Whisper [1]
+ case Job_Bard:
+ getitem 5751,1; break; // Maestro Song's Hat [1]
+ case Job_Dancer:
+ getitem 5758,1; break; // Dying Swan [1]
+ case Job_Monk:
+ getitem 5754,1; break; // Blazing Soul [1]
+ case Job_Alchemist:
+ getitem 5752,1; break; // Midas Whisper[1]
+ case Job_Rogue:
+ getitem 5750,1; // Shadow Handicraft [1]
+ getitem 6121,1; // Makeover Brush
+ getitem 6122,1; break; // Paint Brush
+ }
+ } else if (.@eac&EAJL_2) {
+ // Second Class (And not Third Class)
+ switch(BaseJob) {
+ // Second Class
+ case Job_Knight:
+ getitem 1163,1; break; // Claymore [0]
+ case Job_Priest:
+ getitem 1522,1; break; // Stunner [0]
+ case Job_Wizard:
+ getitem 1617,1; break; // Survivor's Rod [0]
+ case Job_Blacksmith:
+ getitem 1360,1; break; // Two-Handed-Axe [1]
+ case Job_Hunter:
+ getitem 1718,1; break; // Hunter Bow [0]
+ case Job_Assassin:
+ getitem 1254,1; break; // Jamadhar [0]
+ case Job_Crusader:
+ getitem 1410,1; break; // Lance [0]
+ case Job_Monk:
+ getitem 1807,1; break; // Fist [0]
+ case Job_Sage:
+ getitem 1550,1; break; // Book [3]
+ case Job_Rogue:
+ getitem 1222,1; break; // Damascus [1]
+ case Job_Alchemist:
+ getitem 1126,1; break; // Saber [2]
+ case Job_Bard:
+ getitem 1907,1; break; // Guitar [0]
+ case Job_Dancer:
+ getitem 1960,1; break; // Whip [1]
+ case Job_Super_Novice:
+ getitem 1208,1; break; // Main Gauche [4]
+ case Job_Gunslinger:
+ getitem 13101,1; break; // Six Shooter [2]
+ case Job_Ninja:
+ getitem 13010,1; break; // Asura [2]
+ case Job_Star_Gladiator:
+ getitem 1550,1; break; // Book [3]
+ case Job_Soul_Linker:
+ getitem 1617,1; break; // Survivor's Rod [0]
+ }
+ } else {
+ // Neither Second or Third Cls
+ // => First Cls or not covered by the switch
+ switch(BaseClass) {
+ // First Class
+ case Job_Swordman:
+ getitem 1108,1; break; // Blade [4]
+ case Job_Mage:
+ getitem 1602,1; break; // Rod [4]
+ case Job_Archer:
+ getitem 1705,1; break; // Composite Bow [4]
+ case Job_Acolyte:
+ getitem 1505,1; break; // Mace [4]
+ case Job_Merchant:
+ getitem 1302,1; break; // Axe [4]
+ case Job_Thief:
+ getitem 1208,1; break; // Main Gauche [4]
+ }
+ }
+ return;
+}
OnInit:
- setarray .Rebirth[0],99,50; // Minimum base level, job level to rebirth OR change to third class
- setarray .JobReq[0],10,40; // Minimum job level to turn into 1st class, 2nd class
- .ThirdClass = 1; // Enable third classes? (1: yes / 0: no)
- .SecondExpanded = 1; // Enable new expanded second classes: Ex. Super Novice, Kagerou/Oboro, Rebellion? (1: yes / 0: no)
- .SNovice = 45; // Minimum base level to turn into Super Novice
- .LastJob = 1; // Enforce linear class changes? (1: yes / 0: no)
- .SkillPointCheck = 1; // Force player to use up all skill points? (1: yes / 0: no)
- .Platinum = 1; // Get platinum skills automatically? (1: yes / 0: no)
+ // Initialisation, do not edit these
+ .NPCName$ = "[Job Master]";
+
+ // Settings
+ .ThirdClass = true; // Enable third classes?
+ .RebirthClass = true; // Enable rebirth classes?
+ .SecondExpanded = true; // Enable new expanded second classes: Ex. Super Novice, Kagerou/Oboro, Rebellion?
+ .BabyNovice = true; // Enable Baby novice classes? Disable it if you like player must have parent to get job baby.
+ .BabyClass = true; // Enable Baby classes?
+ .BabyThird = true; // Enable Baby third classes?
+ .BabyExpanded = true; // Enable Baby Expanded classes: Ex. Baby Ninja, Baby Taekwon, etc.
+ .BabySummoner = true; // Enable Baby Summoner?
+ .LastJob = true; // Enforce linear class changes?
+ .SkillPointCheck = true; // Force player to use up all skill points?
+ .Platinum = true; // Get platinum skills automatically?
+ .GetJobEquip = false; // Get job equipment (mostly weapons) on job change?
+
+ // Level Requirements
+ setarray .Req_First[0],1,10; // Minimum base level, job level to turn into 1st class
+ setarray .Req_Second[0],1,40; // Minimum base level, job level to turn into 2nd class
+ setarray .Req_Rebirth[0],99,50; // Minimum base level, job level to rebirth
+ setarray .Req_Third[0],99,50; // Minimum base level, job level to change to third class
+ setarray .Req_Exp_NJ_GS[0],99,70; // Minimum base level, job level to turn into Expanded Ninja and Gunslinger
+ setarray .Req_Exp_SNOVI[0],99,99; // Minimum base level, job level to turn into Expanded Super Novice
+ .SNovice = 45; // Minimum base level to turn into Super Novice
+
+ // Setting adjustments by PACKETVER
+ if( PACKETVER < 20161207 ) {
+ if( .BabyExpanded )
+ debugmes "jobmaster: BabyExpanded is disabled due to outdated PACKETVER.";
+ if( .BabySummoner )
+ debugmes "jobmaster: BabySummoner is disabled due to outdated PACKETVER.";
+ .BabyExpanded = false;
+ .BabySummoner = false;
+ }
end;
}
+
diff --git a/npc/custom/official/GeffenMagicTournament.txt b/npc/custom/official/GeffenMagicTournament.txt
index 700071289a3..bd8f2760595 100644
--- a/npc/custom/official/GeffenMagicTournament.txt
+++ b/npc/custom/official/GeffenMagicTournament.txt
@@ -127,42 +127,42 @@ OnTimer1000:
case 88: npctalk "Hook up with both of them? Ho ho ho~!", instance_npcname("Young Lady#gef1"); break;
case 91:
npctalk "Yes! You have finally arrived, my love!", instance_npcname("Handsome Adventurer#gef");
- emotion 23, 0, instance_npcname("Young Lady#gef1");
- emotion 23, 0, instance_npcname("Young Lady#gef2");
- emotion 23, 0, instance_npcname("Young Lady#gef3");
+ emotion ET_HUK, getnpcid(0, instance_npcname("Young Lady#gef1"));
+ emotion ET_HUK, getnpcid(0, instance_npcname("Young Lady#gef2"));
+ emotion ET_HUK, getnpcid(0, instance_npcname("Young Lady#gef3"));
break;
case 95:
npctalk "My love...", instance_npcname("Male Adventurer#gef");
- emotion 3, 0, instance_npcname("Male Adventurer#gef");
- emotion 3, 0, instance_npcname("Handsome Adventurer#gef");
- emotion 3, 0, instance_npcname("Handsome Adventurer#gef");
+ emotion ET_THROB, getnpcid(0, instance_npcname("Male Adventurer#gef"));
+ emotion ET_THROB, getnpcid(0, instance_npcname("Handsome Adventurer#gef"));
+ emotion ET_THROB, getnpcid(0, instance_npcname("Handsome Adventurer#gef"));
break;
case 99:
npctalk "Maybe... There are no good guys left for us...", instance_npcname("Young Lady#gef3");
- emotion 3, 0, instance_npcname("Handsome Adventurer#gef");
+ emotion ET_THROB, getnpcid(0, instance_npcname("Handsome Adventurer#gef"));
break;
case 103:
npctalk "Ahem... Maybe... Just the three of us... will be together forever...", instance_npcname("Young Lady#gef2");
- emotion 3, 0, instance_npcname("Male Adventurer#gef");
+ emotion ET_THROB, getnpcid(0, instance_npcname("Male Adventurer#gef"));
break;
case 106:
npctalk "Our friendship is forever~!!!", instance_npcname("Young Lady#gef3");
- emotion 3, 0, instance_npcname("Handsome Adventurer#gef");
- sleep2 500;
+ emotion ET_THROB, getnpcid(0, instance_npcname("Handsome Adventurer#gef"));
+ sleep 500;
npctalk "Our friendship is forever~!!!", instance_npcname("Young Lady#gef1");
- sleep2 500;
+ sleep 500;
npctalk "Our friendship is forever~!!!", instance_npcname("Young Lady#gef2");
'm1_timer++;
break;
case 109:
- emotion 3, 0, instance_npcname("Male Adventurer#gef");
- emotion 28, 0, instance_npcname("Young Lady#gef1");
- emotion 28, 0, instance_npcname("Young Lady#gef2");
- emotion 28, 0, instance_npcname("Young Lady#gef3");
+ emotion ET_THROB, getnpcid(0, instance_npcname("Male Adventurer#gef"));
+ emotion ET_CRY, getnpcid(0, instance_npcname("Young Lady#gef1"));
+ emotion ET_CRY, getnpcid(0, instance_npcname("Young Lady#gef2"));
+ emotion ET_CRY, getnpcid(0, instance_npcname("Young Lady#gef3"));
break;
- case 111: emotion 3, 0, instance_npcname("Handsome Adventurer#gef"); break;
- case 113: emotion 3, 0, instance_npcname("Male Adventurer#gef"); break;
- case 115: emotion 3, 0, instance_npcname("Handsome Adventurer#gef"); break;
+ case 111: emotion ET_THROB, getnpcid(0, instance_npcname("Handsome Adventurer#gef")); break;
+ case 113: emotion ET_THROB, getnpcid(0, instance_npcname("Male Adventurer#gef")); break;
+ case 115: emotion ET_THROB, getnpcid(0, instance_npcname("Handsome Adventurer#gef")); break;
case 118:
hideonnpc instance_npcname("Male Adventurer#gef");
hideonnpc instance_npcname("Handsome Adventurer#gef");
@@ -183,12 +183,13 @@ OnTimer2500:
.@r = rand(0,1);
if (.@r != 0 ) { stopnpctimer; initnpctimer; end; }
stopnpctimer;
- specialeffect .effects[rand(0,18)],AREA,instance_npcname(strnpcinfo(0));
+ specialeffect .effects[rand(getarraysize(.effects))],AREA,instance_npcname(strnpcinfo(0));
initnpctimer;
end;
OnInit:
- setarray .effects,97,255,28,256,29,257,244,92,32,195,258,22,62,234,89,30,225,116,94;
+ setarray .effects[0],EF_FIREPILLARBOMB,EF_FLAMELAUNCHER,EF_FROSTDIVER2,EF_FROSTWEAPON,EF_LIGHTBOLT,EF_LIGHTNINGLOADER,EF_MAGICROD,EF_METEORSTORM,EF_NAPALMBEAT;
+ setarray .effects[9],EF_PETRIFYATTACK,EF_SEISMICWEAPON,EF_SIGHT,EF_SIGHTRASHER,EF_SPELLBREAKER,EF_STORMGUST,EF_THUNDERSTORM,EF_VOLCANO,EF_WATERBALL,EF_YUFITELHIT;
hideonnpc strnpcinfo(0);
end;
@@ -2289,7 +2290,7 @@ OnEnd:
mes "Enjoy.";
mes "Good luck on the next round!";
percentheal 100,100;
- specialeffect2 312;
+ specialeffect2 EF_HEAL;
close2;
hideonnpc instance_npcname("Tournament Healer#1"); // 83649
end;
@@ -2303,13 +2304,13 @@ end;
OnStart:
initnpctimer;
for ( .@i = 11; .@i <= 20; .@i++ ) {
- specialeffect .effect[rand(3)], AREA, instance_npcname("#fireworks_" +.@i);
+ specialeffect .effect[rand(getarraysize(.effect))], AREA, instance_npcname("#fireworks_" +.@i);
}
end;
OnTimer6000:
initnpctimer;
for ( .@i = 0; .@i < 5; .@i++) {
- specialeffect .effect[rand(3)], AREA, instance_npcname("#fireworks_" + rand(11,20));
+ specialeffect .effect[rand(getarraysize(.effect))], AREA, instance_npcname("#fireworks_" + rand(11,20));
}
end;
@@ -2319,23 +2320,23 @@ OnTurn:
OnWin:
for ( .@i = 1; .@i <= 5; .@i++ ) {
- specialeffect 90, AREA, instance_npcname("#fireworks_f" + .@i);
+ specialeffect EF_LORD, AREA, instance_npcname("#fireworks_f" + .@i);
}
sleep 3000;
for ( .@i = 1; .@i <= 5; .@i++ ) {
- specialeffect 62, AREA, instance_npcname("#fireworks_f" + .@i);
+ specialeffect EF_SIGHTRASHER, AREA, instance_npcname("#fireworks_f" + .@i);
}
sleep 500;
for ( .@i = 1; .@i <= 5; .@i++ ){
- specialeffect 89, AREA, instance_npcname("#fireworks_f" + .@i);
+ specialeffect EF_STORMGUST, AREA, instance_npcname("#fireworks_f" + .@i);
}
sleep 3000;
for ( .@i = 1; .@i <= 5; .@i++ ) {
- specialeffect 237, AREA, instance_npcname("#fireworks_f" + .@i);
+ specialeffect EF_VIOLENTGALE, AREA, instance_npcname("#fireworks_f" + .@i);
}
end;
OnInstanceInit:
- setarray .effect, 30, 89, 92;
+ setarray .effect, EF_THUNDERSTORM, EF_STORMGUST, EF_METEORSTORM;
end;
}
@@ -4098,9 +4099,9 @@ OnTimer1000:
switch('gmt_timer_evt1) {
case 1:
- specialeffect 220, AREA, instance_npcname("Geffen Gangster#1");
- specialeffect 220, AREA, instance_npcname("Geffen Gangster#2");
- specialeffect 220, AREA, instance_npcname("Geffen Gangster#3");
+ specialeffect EF_POTION_BERSERK, AREA, instance_npcname("Geffen Gangster#1");
+ specialeffect EF_POTION_BERSERK, AREA, instance_npcname("Geffen Gangster#2");
+ specialeffect EF_POTION_BERSERK, AREA, instance_npcname("Geffen Gangster#3");
npctalk "Geffen Gangster : You're pretty good...!", instance_npcname("Geffen Gangster#1");
npctalk "Geffen Gangster : We should stop playing around...", instance_npcname("Geffen Gangster#2");
npctalk "Geffen Gangster : You're gonna pay the price!", instance_npcname("Geffen Gangster#3");
@@ -4112,7 +4113,7 @@ OnTimer1000:
break;
case 8: npctalk "Iris : That's enough.", instance_npcname("Iris#Gef1"); break;
case 11: npctalk "Iris : I won't forgive you~!", instance_npcname("Iris#Gef1"); break;
- case 13: specialeffect 204, AREA, instance_npcname("Iris#Gef1"); break;
+ case 13: specialeffect EF_POTION1, AREA, instance_npcname("Iris#Gef1"); break;
case 14:
npctalk "Geffen Gangster : Why hello there, are you scared?", instance_npcname("Geffen Gangster#1");
npctalk "Geffen Gangster : You're pretty cute. Do you want to play with us too?", instance_npcname("Geffen Gangster#2");
@@ -4128,23 +4129,23 @@ OnTimer1000:
break;
case 22: mapannounce instance_mapname("1@gef"), "Stop right there! Jerks!", 0x00ebff; break;
case 23: hideoffnpc instance_npcname("Chaos#Gef1"); break;
- case 25: specialeffect 218, AREA, instance_npcname("Chaos#Gef1"); break;
+ case 25: specialeffect EF_POTION_CON, AREA, instance_npcname("Chaos#Gef1"); break;
case 26: npctalk "Chaos : Are you clowns harassing Iris?", instance_npcname("Chaos#Gef1"); break;
case 30: npctalk "Chaos : I think I need to teach someone a lesson!", instance_npcname("Chaos#Gef1"); break;
case 31:
- specialeffect 60, AREA, instance_npcname("Geffen Gangster#11");
- specialeffect 60, AREA, instance_npcname("Geffen Gangster#22");
- specialeffect 60, AREA, instance_npcname("Geffen Gangster#33");
+ specialeffect EF_LOCKON, AREA, instance_npcname("Geffen Gangster#11");
+ specialeffect EF_LOCKON, AREA, instance_npcname("Geffen Gangster#22");
+ specialeffect EF_LOCKON, AREA, instance_npcname("Geffen Gangster#33");
npctalk "Chaos : Come and fight me!", instance_npcname("Chaos#Gef2");
hideonnpc instance_npcname("Chaos#Gef1");
hideoffnpc instance_npcname("Chaos#Gef2");
break;
case 34:
npctalk "Chaos : Bash~!!!", instance_npcname("Chaos#Gef2");
- specialeffect 1, AREA, instance_npcname("Chaos#Gef2");
- specialeffect 16, AREA, instance_npcname("Geffen Gangster#11");
- specialeffect 16, AREA, instance_npcname("Geffen Gangster#22");
- specialeffect 16, AREA, instance_npcname("Geffen Gangster#33");
+ specialeffect EF_HIT2, AREA, instance_npcname("Chaos#Gef2");
+ specialeffect EF_BASH, AREA, instance_npcname("Geffen Gangster#11");
+ specialeffect EF_BASH, AREA, instance_npcname("Geffen Gangster#22");
+ specialeffect EF_BASH, AREA, instance_npcname("Geffen Gangster#33");
hideonnpc instance_npcname("Geffen Gangster#11");
hideonnpc instance_npcname("Geffen Gangster#22");
hideonnpc instance_npcname("Geffen Gangster#33");
@@ -4165,14 +4166,14 @@ OnTimer1000:
break;
case 42:
npctalk "Chaos : I'm not done yet!! Magnum Break~!", instance_npcname("Chaos#3");
- specialeffect 17, AREA, instance_npcname("Geffen Gangster#1");
- specialeffect 17, AREA, instance_npcname("Geffen Gangster#2");
- specialeffect 17, AREA, instance_npcname("Geffen Gangster#3");
+ specialeffect EF_MAGNUMBREAK, AREA, instance_npcname("Geffen Gangster#1");
+ specialeffect EF_MAGNUMBREAK, AREA, instance_npcname("Geffen Gangster#2");
+ specialeffect EF_MAGNUMBREAK, AREA, instance_npcname("Geffen Gangster#3");
break;
case 43:
- specialeffect 183, AREA, instance_npcname("Geffen Gangster#1");
- specialeffect 183, AREA, instance_npcname("Geffen Gangster#2");
- specialeffect 183, AREA, instance_npcname("Geffen Gangster#3");
+ specialeffect EF_SUI_EXPLOSION, AREA, instance_npcname("Geffen Gangster#1");
+ specialeffect EF_SUI_EXPLOSION, AREA, instance_npcname("Geffen Gangster#2");
+ specialeffect EF_SUI_EXPLOSION, AREA, instance_npcname("Geffen Gangster#3");
hideonnpc instance_npcname("Geffen Gangster#1");
hideonnpc instance_npcname("Geffen Gangster#2");
hideonnpc instance_npcname("Geffen Gangster#3");
@@ -4314,7 +4315,7 @@ OnTimer1000:
case 9:
unittalk 'gmt_account_id, "I have to help!";
attachrid 'gmt_account_id;
- specialeffect2 60;
+ specialeffect2 EF_LOCKON;
detachrid;
monster instance_mapname("1@gef"), 75, 172, "Geffen Bully", 2567, 1, instance_npcname("#Event 2 start 2") + "::OnMobKilled";
monster instance_mapname("1@gef"), 76, 170, "Geffen Bully", 2567, 1, instance_npcname("#Event 2 start 2") + "::OnMobKilled";
@@ -4338,9 +4339,9 @@ OnMobKilled:
//completequest 9286;
//setquest 9287;
sleep2 500;
- specialeffect 220, AREA, instance_npcname("Geffen Bully#1");
- specialeffect 220, AREA, instance_npcname("Geffen Bully#2");
- specialeffect 220, AREA, instance_npcname("Geffen Bully#3");
+ specialeffect EF_POTION_BERSERK, AREA, instance_npcname("Geffen Bully#1");
+ specialeffect EF_POTION_BERSERK, AREA, instance_npcname("Geffen Bully#2");
+ specialeffect EF_POTION_BERSERK, AREA, instance_npcname("Geffen Bully#3");
$gmt_timer_evt2 = -1;
@@ -4364,7 +4365,7 @@ OnMobKilled:
case 10: npctalk "Fenrir : This is really uncomfortable. I can't just sit back and watch.", instance_npcname("Fenrir#1"); break;
case 13:
npctalk "Fenrir : Stop harassing her. I won't forgive you.", instance_npcname("Fenrir#1");
- specialeffect 204, AREA, instance_npcname("Fenrir#1");
+ specialeffect EF_POTION1, AREA, instance_npcname("Fenrir#1");
break;
case 15: npctalk "Geffen Bully : Hey~ You look rich, you must have a lot of zeny right?", instance_npcname("Geffen Bully#1"); break;
case 17: npctalk "Geffen Bully : What's a rich girl like you doing around here?~", instance_npcname("Geffen Bully#2"); break;
@@ -4378,22 +4379,22 @@ OnMobKilled:
hideoffnpc instance_npcname("Geffen Bully#33");
break;
case 23:
- emotion e_gasp, 0, instance_npcname("Fenrir#1");
+ emotion ET_SURPRISE, getnpcid(0, instance_npcname("Fenrir#1"));
mapannounce instance_mapname("1@gef"), "Take your dirty hands off of me.", 0x00ebff;
break;
case 25:
hideoffnpc instance_npcname("Loki#1");
sleep2 500;
- specialeffect 126, AREA, instance_npcname("Loki#1");
+ specialeffect EF_POISONREACT, AREA, instance_npcname("Loki#1");
sleep2 1500;
- specialeffect 121, AREA, instance_npcname("Loki#1");
+ specialeffect EF_SONICBLOW, AREA, instance_npcname("Loki#1");
npctalk "Loki : Hmph!", instance_npcname("Loki#1");
sleep2 500;
- specialeffect 124, AREA, instance_npcname("Loki#1");
- specialeffect 122, AREA, instance_npcname("Geffen Bully#33");
- specialeffect 143, AREA, instance_npcname("Geffen Bully#33");
+ specialeffect EF_VENOMDUST, AREA, instance_npcname("Loki#1");
+ specialeffect EF_SONICBLOWHIT, AREA, instance_npcname("Geffen Bully#33");
+ specialeffect EF_SONICBLOW2, AREA, instance_npcname("Geffen Bully#33");
sleep2 330;
- specialeffect 32, AREA, instance_npcname("Geffen Bully#33");
+ specialeffect EF_NAPALMBEAT, AREA, instance_npcname("Geffen Bully#33");
hideonnpc instance_npcname("Geffen Bully#33");
hideoffnpc instance_npcname("Geffen Bully#3");
break;
@@ -4404,11 +4405,11 @@ OnMobKilled:
sleep2 750;
npctalk "Loki : Take this.", instance_npcname("Loki#2");
sleep2 500;
- specialeffect 271, AREA, instance_npcname("Geffen Bully#22");
- specialeffect 122, AREA, instance_npcname("Geffen Bully#22");
- specialeffect 143, AREA, instance_npcname("Geffen Bully#22");
+ specialeffect EF_STRIPARMOR, AREA, instance_npcname("Geffen Bully#22");
+ specialeffect EF_SONICBLOWHIT, AREA, instance_npcname("Geffen Bully#22");
+ specialeffect EF_SONICBLOW2, AREA, instance_npcname("Geffen Bully#22");
sleep2 330;
- specialeffect 32, AREA, instance_npcname("Geffen Bully#22");
+ specialeffect EF_NAPALMBEAT, AREA, instance_npcname("Geffen Bully#22");
hideonnpc instance_npcname("Geffen Bully#22");
hideoffnpc instance_npcname("Geffen Bully#2");
break;
@@ -4419,11 +4420,11 @@ OnMobKilled:
sleep2 750;
npctalk "Loki : Change your mind yet?", instance_npcname("Loki#3");
sleep2 500;
- specialeffect 270, AREA, instance_npcname("Geffen Bully#11");
- specialeffect 122, AREA, instance_npcname("Geffen Bully#11");
- specialeffect 143, AREA, instance_npcname("Geffen Bully#11");
+ specialeffect EF_STRIPSHIELD, AREA, instance_npcname("Geffen Bully#11");
+ specialeffect EF_SONICBLOWHIT, AREA, instance_npcname("Geffen Bully#11");
+ specialeffect EF_SONICBLOW2, AREA, instance_npcname("Geffen Bully#11");
sleep2 330;
- specialeffect 32, AREA, instance_npcname("Geffen Bully#11");
+ specialeffect EF_NAPALMBEAT, AREA, instance_npcname("Geffen Bully#11");
hideonnpc instance_npcname("Geffen Bully#11");
hideoffnpc instance_npcname("Geffen Bully#1");
break;
@@ -4435,20 +4436,20 @@ OnMobKilled:
case 40: npctalk "Geffen Bully : Let's get away!~!!!!!", instance_npcname("Geffen Bully#3"); break;
case 41:
npctalk "Loki : You have 10 seconds.", instance_npcname("Loki#3");
- specialeffect 121, AREA, instance_npcname("Loki#3");
+ specialeffect EF_SONICBLOW, AREA, instance_npcname("Loki#3");
break;
case 43:
- specialeffect 136, AREA, instance_npcname("Loki#3");
+ specialeffect EF_SLOWPOISON, AREA, instance_npcname("Loki#3");
npctalk "Loki : 10... 9...", instance_npcname("Loki#3");
sleep2 500;
- specialeffect 269, AREA, instance_npcname("Loki#3");
- specialeffect 126, AREA, instance_npcname("Loki#3");
- specialeffect 127, AREA, instance_npcname("Loki#3");
+ specialeffect EF_STRIPWEAPON, AREA, instance_npcname("Loki#3");
+ specialeffect EF_POISONREACT, AREA, instance_npcname("Loki#3");
+ specialeffect EF_POISONREACT2, AREA, instance_npcname("Loki#3");
break;
case 45:
- specialeffect 125, AREA, instance_npcname("Loki#3");
+ specialeffect EF_ENCHANTPOISON, AREA, instance_npcname("Loki#3");
sleep2 500;
- emotion e_gg, 0, instance_npcname("Loki#3");
+ emotion ET_KIK, getnpcid(0, instance_npcname("Loki#3"));
npctalk "Loki : 3... 2...", instance_npcname("Loki#3");
sleep2 500;
npctalk "Geffen Bully : What?! You went from from 9 to 3 seconds!!", instance_npcname("Geffen Bully#1");
@@ -4456,8 +4457,8 @@ OnMobKilled:
npctalk "Geffen Bully : I will have my revenge~!!", instance_npcname("Geffen Bully#3");
break;
case 46:
- specialeffect 361, AREA, instance_npcname("Loki#3");
- specialeffect 124, AREA, instance_npcname("Loki#3");
+ specialeffect EF_SOULBREAKER, AREA, instance_npcname("Loki#3");
+ specialeffect EF_VENOMDUST, AREA, instance_npcname("Loki#3");
npctalk "Loki : 1...", instance_npcname("Loki#3");
sleep2 330;
hideonnpc instance_npcname("Geffen Bully#1");
@@ -4644,7 +4645,7 @@ OnTimer1000:
'gmt_timer_evt3++;
switch('gmt_timer_evt3) {
- case 1: specialeffect 20, AREA, instance_npcname("Geffen Shoplifter#1"); break;
+ case 1: specialeffect EF_PATTACK, AREA, instance_npcname("Geffen Shoplifter#1"); break;
case 4: npctalk "Geffen Shoplifter : Ugh, I shouldn't fight toe to toe with anyone...", instance_npcname("Geffen Shoplifter#1"); break;
case 7: unittalk 'gmt_account_id, "Don't want to be in a fair fight, huh thief?"; break;
case 10: npctalk "Geffen Shoplifter : Umm... stealing zeny is my job~ I did nothing wrong~!", instance_npcname("Geffen Shoplifter#1"); break;
diff --git a/npc/custom/platinum_skills.txt b/npc/custom/platinum_skills.txt
index d26f0f31abc..2ab78e272c8 100644
--- a/npc/custom/platinum_skills.txt
+++ b/npc/custom/platinum_skills.txt
@@ -1,23 +1,20 @@
//===== rAthena Script =======================================
//= Platinum Skills
-//===== By: ==================================================
-//= Keichii, DarkChild
-//===== Current Version: =====================================
-//= 2.8
-//===== Compatible With: =====================================
-//= rAthena Project
//===== Description: =========================================
//= Single NPC that assigns quests skills for all classes
//===== Additional Comments: =================================
-//= 2.0 Added advanced classes by ShadowLady.
-//= 2.1 Added baby clases by Midas
-//= 2.2 Simplified Job Checks [Silentdragon]
-//= 2.3 Thehell? Cleaned up script removed the nastiness. Also added rebirth skills. [Spre]
+//= 1.0 Initial release. [Keichii] [DarkChild]
+//= 2.0 Added advanced classes. [ShadowLady]
+//= 2.1 Added baby classes. [Midas]
+//= 2.2 Simplified Job Checks. [Silentdragon]
+//= 2.3 Thehell? Cleaned up script, removed the nastiness. Also added rebirth skills. [Spre]
//= 2.4 Added Advanced skills. [Spre]
//= 2.5 Added dialog for if the user is none of the listed jobs. [Kisuka]
//= 2.6 Fixed 2nd advanced classes not being able to get their advanced skills. [Ancyker]
//= 2.7 Rewrote to give all correct skills to all proper classes. [Paradox924X]
//= 2.8 Clustered conditionals replaced with switch to include all Upper types. [Euphy]
+//= 2.9 Added MC_CARTDECORATE for Merchant class. [mazvi]
+//= 3.0 Migrate/Integrate to Global Functions. [mazvi]
//============================================================
prontera,128,200,6 script Platinum Skill NPC 94,{
@@ -30,91 +27,7 @@ prontera,128,200,6 script Platinum Skill NPC 94,{
mes "Have a nice day... >.>";
close;
}
- skill "NV_FIRSTAID",1,SKILL_PERM;
- switch (BaseClass) {
- case Job_Novice:
- if (Class != Job_Super_Novice)
- skill "NV_TRICKDEAD",1,SKILL_PERM;
- break;
- case Job_Swordman:
- skill "SM_MOVINGRECOVERY",1,SKILL_PERM;
- skill "SM_FATALBLOW",1,SKILL_PERM;
- skill "SM_AUTOBERSERK",1,SKILL_PERM;
- break;
- case Job_Mage:
- skill "MG_ENERGYCOAT",1,SKILL_PERM;
- break;
- case Job_Archer:
- skill "AC_MAKINGARROW",1,SKILL_PERM;
- skill "AC_CHARGEARROW",1,SKILL_PERM;
- break;
- case Job_Acolyte:
- skill "AL_HOLYLIGHT",1,SKILL_PERM;
- break;
- case Job_Merchant:
- skill "MC_CARTREVOLUTION",1,SKILL_PERM;
- skill "MC_CHANGECART",1,SKILL_PERM;
- skill "MC_LOUD",1,SKILL_PERM;
- break;
- case Job_Thief:
- skill "TF_SPRINKLESAND",1,SKILL_PERM;
- skill "TF_BACKSLIDING",1,SKILL_PERM;
- skill "TF_PICKSTONE",1,SKILL_PERM;
- skill "TF_THROWSTONE",1,SKILL_PERM;
- break;
- default:
- break;
- }
- switch (BaseJob) {
- case Job_Knight:
- skill "KN_CHARGEATK",1,SKILL_PERM;
- break;
- case Job_Priest:
- skill "PR_REDEMPTIO",1,SKILL_PERM;
- break;
- case Job_Wizard:
- skill "WZ_SIGHTBLASTER",1,SKILL_PERM;
- break;
- case Job_Blacksmith:
- skill "BS_UNFAIRLYTRICK",1,SKILL_PERM;
- skill "BS_GREED",1,SKILL_PERM;
- break;
- case Job_Hunter:
- skill "HT_PHANTASMIC",1,SKILL_PERM;
- break;
- case Job_Assassin:
- skill "AS_SONICACCEL",1,SKILL_PERM;
- skill "AS_VENOMKNIFE",1,SKILL_PERM;
- break;
- case Job_Crusader:
- skill "CR_SHRINK",1,SKILL_PERM;
- break;
- case Job_Monk:
- skill "MO_KITRANSLATION",1,SKILL_PERM;
- skill "MO_BALKYOUNG",1,SKILL_PERM;
- break;
- case Job_Sage:
- skill "SA_CREATECON",1,SKILL_PERM;
- skill "SA_ELEMENTWATER",1,SKILL_PERM;
- skill "SA_ELEMENTGROUND",1,SKILL_PERM;
- skill "SA_ELEMENTFIRE",1,SKILL_PERM;
- skill "SA_ELEMENTWIND",1,SKILL_PERM;
- break;
- case Job_Rogue:
- skill "RG_CLOSECONFINE",1,SKILL_PERM;
- break;
- case Job_Alchemist:
- skill "AM_BIOETHICS",1,SKILL_PERM;
- break;
- case Job_Bard:
- skill "BA_PANGVOICE",1,SKILL_PERM;
- break;
- case Job_Dancer:
- skill "DC_WINKCHARM",1,SKILL_PERM;
- break;
- default:
- break;
- }
+ callfunc "F_GetPlatinumSkills";
mes "[Platinum Skill NPC]";
mes "There you go!";
close;
diff --git a/npc/custom/quests/bandit_beard.txt b/npc/custom/quests/bandit_beard.txt
index 47e76cc6852..f02467cbabd 100644
--- a/npc/custom/quests/bandit_beard.txt
+++ b/npc/custom/quests/bandit_beard.txt
@@ -30,7 +30,7 @@ umbala,126,129,4 script Bearded Man#bandit 120,{
mes "[Bearded Man]";
mes "HoHo~ So you want some whiskers.";
- emotion e_heh;
+ emotion ET_SMILE;
mes "Well I would give you my beards but there not cheap.";
mes "Matter of fact I have only one left...";
mes "but I'm not selling it.";
@@ -59,14 +59,14 @@ L_LIST:
M_NO:
mes "[Bearded Man]";
mes "Fine, be that way!";
- emotion e_ag;
+ emotion ET_ANGER;
close;
L_DONE:
mes "[Bearded Man]";
mes "Sorry, I can only make one per person.";
mes "We don't want too many beards now. Right?";
- emotion e_gg;
+ emotion ET_KIK;
close;
L_MAKE:
@@ -90,14 +90,14 @@ L_MAKE:
set BEARD_QUEST, 5;
mes "[Bearded Man]";
mes "Have a nice day!";
- emotion e_gg;
+ emotion ET_KIK;
close;
L_NOITEMS:
mes "[Bearded Man]";
mes "What the hell! I can't make a beard without the items!";
mes "Here is the list again:";
- emotion e_omg;
+ emotion ET_HUK;
goto L_LIST;
}
@@ -174,7 +174,7 @@ alberta,65,123,6 script Man#bandit 85,{
if($@beardmob > 0) mes "Kill! Kill them already!!!";
if($@beardmob > 0) close;
mes "Are you here to help me?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
menu "Yes",-,"No",M_NO;
@@ -184,7 +184,7 @@ alberta,65,123,6 script Man#bandit 85,{
next;
mes "[Thread Merchant]";
mes "Oh NO! Here they come!!";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
donpcevent "BRDQ_MOBS::OnStart";
close;
@@ -199,7 +199,7 @@ L_KILLED:
L_DONE:
mes "[Thread Merchant]";
mes "Thank you again!";
- emotion e_thx;
+ emotion ET_THANKS;
close;
M_NO:
diff --git a/npc/custom/quests/berzebub.txt b/npc/custom/quests/berzebub.txt
index f000e2f89ea..9def18b5116 100644
--- a/npc/custom/quests/berzebub.txt
+++ b/npc/custom/quests/berzebub.txt
@@ -54,7 +54,7 @@ prontera,165,178,8 script Old Woman 103,{
getitem 4145,1;
set BerzQuest, 1;
mes "Congratulations! You have all the items. Here is your ^FF0000Berzebub Card^000000, as promised.";
- emotion e_grat;
+ emotion ET_CONGRATULATION;
close;
M_Leave:
diff --git a/npc/custom/quests/hunting_missions.txt b/npc/custom/quests/hunting_missions.txt
index 98ad6c1f549..7570fb30f20 100644
--- a/npc/custom/quests/hunting_missions.txt
+++ b/npc/custom/quests/hunting_missions.txt
@@ -32,10 +32,10 @@ function Chk;
mes "[Hunting Missions]";
mes "I can't find any records...";
mes "You must be new here!";
- emotion e_omg;
+ emotion ET_HUK;
next;
callsub Mission_Info;
- emotion e_go;
+ emotion ET_GO;
#Mission_Delay = 1;
close;
}
@@ -62,7 +62,7 @@ function Chk;
mes "I can't seem to find any records";
mes "for that character, though...";
mes "One moment, please.";
- emotion e_hmm;
+ emotion ET_SCRATCH;
#Mission_Count = 0;
}
@hm_char_del_check = 1;
@@ -108,11 +108,11 @@ function Chk;
mes "[Hunting Missions]";
mes "You don't have enough";
mes "Zeny to drop this mission.";
- emotion e_sry;
+ emotion ET_SORRY;
close;
}
Zeny -= .Reset;
- emotion e_cash;
+ emotion ET_MONEY;
}
mes "[Hunting Missions]";
mes "Alright, I've dropped";
@@ -130,7 +130,7 @@ function Chk;
mes "[Hunting Missions]";
mes "I knew you were kidding!";
mes "Keep up the good work.";
- emotion e_heh;
+ emotion ET_SMILE;
close;
}
case 4:
@@ -153,7 +153,7 @@ function Chk;
case 7:
mes "[Hunting Missions]";
mes "Nothing? Okay...";
- emotion e_hmm;
+ emotion ET_SCRATCH;
close;
}
end;
@@ -191,7 +191,7 @@ Mission_Status:
mes "Oh, you're done!";
mes "Good work.";
mes "Here's your reward.";
- emotion e_no1;
+ emotion ET_BEST;
specialeffect2 EF_ANGEL;
specialeffect2 EF_TRUESIGHT;
#Mission_Points += .@Mission_Points;
@@ -259,7 +259,7 @@ OnBuyItem:
}
#Mission_Points -= @cost;
mes "Deal completed.";
- emotion e_cash;
+ emotion ET_MONEY;
}
@cost = 0;
deletearray @bought_nameid[0], getarraysize(@bought_nameid);
@@ -287,7 +287,7 @@ OnNPCKillEvent:
if (isloggedin($@partymemberaid[.@i], $@partymembercid[.@i])) {
set .@Mission_Count, getvar(#Mission_Count, $@partymembercid[.@i]);
set .@Mission0, getvar(Mission0, $@partymembercid[.@i]);
- set .@HP, getvar(HP, $@partymembercid[.@i]);
+ set .@HP, readparam(HP, $@partymembercid[.@i]);
if (.@Mission_Count && .@Mission0 && .@HP > 0) {
getmapxy(.@map2$,.@x2,.@y2,UNITTYPE_PC);
diff --git a/npc/custom/quests/jewel_case.txt b/npc/custom/quests/jewel_case.txt
index a89faf3f30d..8c3b9b101be 100644
--- a/npc/custom/quests/jewel_case.txt
+++ b/npc/custom/quests/jewel_case.txt
@@ -19,17 +19,17 @@ lighthalzen,108,229,2 script La Fenn 766,{
if(Q_99LVL) {
mes "You... You got younger!!! But you are defenitely YOU!";
mes "I couldn't think you were able to meet my condition...";
- emotion e_hmm;
+ emotion ET_SCRATCH;
next;
mes "[La Fenn]";
mes "Here is your prize. It's yours for good.";
set Q_99LVL,0;
getitem 12106,1; //Jewel Case
- emotion e_grat;
+ emotion ET_CONGRATULATION;
} else {
mes callfunc("F_Hi");
mes "...";
- emotion e_yawn;
+ emotion ET_SLEEPY;
next;
mes "[La Fenn]";
mes "I've got a riddle for a strong man of 2nd Class and 99 Base Level.";
@@ -55,12 +55,12 @@ lighthalzen,108,229,2 script La Fenn 766,{
mes "Now you're REALLY strong.";
mes "And if you get younger than now I'll give you my treasure.";
set Q_99LVL,1;
- emotion e_no1;
+ emotion ET_BEST;
}
}
close;
}
- emotion e_hmm;
+ emotion ET_SCRATCH;
mes "...";
close;
}
diff --git a/npc/custom/quests/may_hats.txt b/npc/custom/quests/may_hats.txt
index 1d62613062a..b72c321b072 100644
--- a/npc/custom/quests/may_hats.txt
+++ b/npc/custom/quests/may_hats.txt
@@ -25,7 +25,7 @@ gonryun,187,140,4 script Yakima 850,{
mes "[Yakima]";
mes "Oh.. it's an excellent item for any beast hunter.";
- emotion e_rock;
+ emotion ET_ROCK;
next;
mes "[Yakima]";
mes "For the hat I'll need:";
@@ -51,7 +51,7 @@ gonryun,187,140,4 script Yakima 850,{
M_2:
mes "[Yakima]";
mes "Bingo! Many people are afraid of lions... to the muteness...";
- emotion e_slur;
+ emotion ET_SEXY;
next;
mes "[Yakima]";
mes "For the hat I'll need:";
@@ -80,7 +80,7 @@ M_3:
mes "[Yakima]";
mes "I wish I sold this filthy manteau faster...";
mes "Guess it isn't so plain as it looks... Hmm.";
- emotion e_wah;
+ emotion ET_KEK;
next;
mes "[Yakima]";
mes "I'm giving it almost for free:";
@@ -109,7 +109,7 @@ M_4:
mes "[Yakima]";
mes "It's a fresh style! Ancessory and a bag all in one! You'd get +2 STR... It's different from that sabby nest!";
mes "It fits to Merchant classonly.";
- emotion e_heh;
+ emotion ET_SMILE;
next;
mes "[Yakima]";
mes "Now my stock is full of those bags... So I'll make it from 3 flower things and a rough piece of clothes:";
@@ -138,7 +138,7 @@ M_5:
mes "[Yakima]";
mes "Well, well, well... this sign fits any class from a certain level!";
mes "Your foes'd be dazzled!";
- emotion e_no1;
+ emotion ET_BEST;
next;
mes "[Yakima]";
mes "Well... we construct it from some common items:";
@@ -170,7 +170,7 @@ M_5:
L_NOITEM:
mes "[Yakima]";
mes "You are lack of items. Please, get all the items.";
- emotion e_sry;
+ emotion ET_SORRY;
close;
M_EXIT:
diff --git a/npc/custom/quests/thq/THQS_GuildNPC.txt b/npc/custom/quests/thq/THQS_GuildNPC.txt
index 3b264156c1a..6b03f62c4a8 100644
--- a/npc/custom/quests/thq/THQS_GuildNPC.txt
+++ b/npc/custom/quests/thq/THQS_GuildNPC.txt
@@ -34,7 +34,7 @@ yuno_in01,124,164,6 script Guild Leader 108,{
set Event_THQS,1;
mes "[Keegan]";
mes "Congratulations!";
- emotion e_grat;
+ emotion ET_CONGRATULATION;
next;
mes "[Keegan]";
mes "Welcome to the Guild of Treasure Hunters.";
diff --git a/npc/custom/quests/thq/THQS_QuestNPC.txt b/npc/custom/quests/thq/THQS_QuestNPC.txt
index 7bb56bb498a..325534c4aea 100644
--- a/npc/custom/quests/thq/THQS_QuestNPC.txt
+++ b/npc/custom/quests/thq/THQS_QuestNPC.txt
@@ -50,7 +50,7 @@ N_PayZeny:
mes "[Guy]";
mes "Its sad to see someone give a quest up...";
mes "Shame on you.";
- emotion e_ag;
+ emotion ET_ANGER;
close;
N_ZenyFail:
@@ -74,7 +74,7 @@ N_NewQuest:
mes "The quest names in ^FF0000This Colour^000000 mean that they are more challanging then the rest, but have better rewards.";
next;
set #THQ_DELAY,(GetTime(DT_YEAR)*12*31*24+GetTime(DT_MONTH)*31*24+GetTime(DT_DAYOFMONTH)*24+GetTime(DT_HOUR) + 1); //you can get another quest after 1 hour [Lupus]
- emotion e_no1;
+ emotion ET_BEST;
if(@treasure_job==0) set @treasure_job,rand(1,10); //doesn't allow cheaters to pick any quest they want
if(@treasure_job==2) goto N_JobList2;
if(@treasure_job==3) goto N_JobList3;
@@ -90,20 +90,20 @@ N_NewQuest:
N_NoTime:
mes "[Guy]";
mes "Alright maybe next time "+strcharinfo(0)+".";
- emotion e_hmm;
+ emotion ET_SCRATCH;
close;
N_Signup:
mes "[Guy]";
mes "I'm afraid you must sign up for the guild before you can go on a quest!";
- emotion e_sry;
+ emotion ET_SORRY;
close;
L_NoQuestsForYet:
mes "[Guy]";
mes "I'm afraid there aren't any Quests for you yet.";
mes "Call in "+ (#THQ_DELAY - (GetTime(DT_YEAR)*12*31*24+GetTime(DT_MONTH)*31*24+GetTime(DT_DAYOFMONTH)*24+GetTime(DT_HOUR)) )+" hours later.";
- emotion e_sry;
+ emotion ET_SORRY;
close;
L_QuestGiven:
diff --git a/npc/custom/quests/umbalian_language.txt b/npc/custom/quests/umbalian_language.txt
index 6f7e8bc1a76..5e898951371 100644
--- a/npc/custom/quests/umbalian_language.txt
+++ b/npc/custom/quests/umbalian_language.txt
@@ -79,7 +79,7 @@ M_DONE:
close;
L_AGAIN:
- emotion e_thx;
+ emotion ET_THANKS;
mes "Yay, I found her! Thank you very much for you help!";
close;
@@ -99,7 +99,7 @@ aldebaran,153,212,1 script Mojo 740,{
if(umb_lang==1) set umb_mojo,1;
close;
L_NOT_GOT_QUEST:
- emotion e_what;
+ emotion ET_QUESTION;
mes "I lost my teacher's book! What am I going to do...";
close;
}
@@ -115,14 +115,14 @@ amatsu,267,189,4 script Marie 744,{
mes "[Marie]";
mes "What does he want from me?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
mes "[Marie]";
mes "Oh wait, I see... he wants his reference scroll back am I right? Well, I'm kinda still using it buuut... I'll give it back if you can gimme a poring egg and an incubator. Those things are so cute!";
close;
L_NOT_GOT_QUEST:
- emotion e_what;
+ emotion ET_QUESTION;
mes "Hi! What do you want from me?";
close;
@@ -149,7 +149,7 @@ M_DOH:
close;
L_AGAIN:
- emotion e_thx;
+ emotion ET_THANKS;
mes "Yay! I love Porings!";
close;
}
@@ -165,7 +165,7 @@ L_QUEST:
delitem 1006,1; //Items: Old Magic Book,
delitem 7118,1; //Items: Torn Scroll,
delitem 7117,1;//Items: Torn Spell Book,
- emotion e_thx;
+ emotion ET_THANKS;
mes "Ah, you've done well in retrieving my references. These artifacts holds information about ruins around the world, from the burning hell of the Magma Dungeon, to the strange eerie Hidden Forest of Yggsadril.";
next;
mes "[Fabius]";
diff --git a/npc/custom/resetnpc.txt b/npc/custom/resetnpc.txt
index aa6bc14b2df..e3c902cb0a6 100644
--- a/npc/custom/resetnpc.txt
+++ b/npc/custom/resetnpc.txt
@@ -1,11 +1,5 @@
//===== rAthena Script =======================================
//= Reset NPC
-//===== By: ==================================================
-//= rAthena Dev Team
-//===== Current Version: =====================================
-//= 1.4
-//===== Compatible With: =====================================
-//= rAthena Project
//===== Description: =========================================
//= Resets skills, stats, or both.
//===== Additional Comments: =================================
@@ -15,6 +9,7 @@
//= 1.3 All statuses removed upon skill reset. [Euphy]
//= 1.4 Compressed Script, Added limit use option [Stolao]
//= Changed set -> setarray, Improved text with F_InsertPlural
+//= 1.5 Added sc_end_class to reset related status changes [sader1992]
//============================================================
prontera,150,193,4 script Reset Girl 124,{
// Skills, Stats, Both, Limit
@@ -44,7 +39,7 @@ prontera,150,193,4 script Reset Girl 124,{
}
set Zeny, Zeny-.@Reset[.@i-1];
if(.@i&1){
- sc_end SC_ALL;// TODO make a sc_end current classes sc only
+ sc_end_class;
ResetSkill;
}
if(.@i&2) ResetStatus;
diff --git a/npc/custom/warper.txt b/npc/custom/warper.txt
index b9216f4a30e..e49c7c314cf 100644
--- a/npc/custom/warper.txt
+++ b/npc/custom/warper.txt
@@ -1,23 +1,19 @@
//===== rAthena Script =======================================
//= Warper
-//===== By: ==================================================
-//= Euphy
-//===== Current Version: =====================================
-//= 1.4b
-//===== Compatible With: =====================================
-//= rAthena Project
//===== Description: =========================================
//= A complete - but very condensed - warper script.
-//= Some coordinates written by Tekno-Kanix and ToastOfDoom.
//===== Additional Comments: =================================
-//= 1.0 Initial script.
+//= 1.0 Initial script By [Euphy].
//= 1.1 Added missing duplicates and fixed coordinates.
+//= Some coordinates written by [Tekno-Kanix] and [ToastOfDoom].
//= 1.2 Added new episodes and simplified functions.
//= 1.3 Added Renewal checks and Instances menu.
//= Aligned coordinates with @go.
//= 1.4 Added new Guild Dungeons.
//= 1.4a Slight edits.
//= 1.4b Added Wolfchev's Laboratory warp.
+//= 1.5 Added Lasagna ,Para Market ,WOE TE ,Instances and settings [sader1992].
+//= 1.5a Fix Bifrost Tower
//============================================================
- script Warper -1,{
@@ -49,6 +45,7 @@ menu "Last Warp ^777777["+lastwarp$+"]^000000",-,
// * Disp("<Menu Option>",<first option>,<last option>);
// * Pick("<map_prefix>"{,<index offset>});
// ~ Dynamic menu and map selection (auto-numbered).
+// ~ Fields and Dungeons must use Disp and Pick Functions.
//
// * Disp("<Option 1>:<Option 2>:<etc.>");
// * Pick("","<map1>","<map2>","<etc.>");
@@ -85,7 +82,16 @@ function Disp {
function Pick {
set .@warp_block,@warp_block;
set @warp_block,0;
- set .@select, select(@menu$);
+ if((@f && .OnlyFirstFld) || (@d && .OnlyFirstDun)){
+ set .@select,1;
+ if(.@warp_block){
+ while(.@warp_block & (1<<.@select)){
+ .@select += 1;
+ }
+ }
+ }else{
+ set .@select, select(@menu$);
+ }
if (getarg(0) == "") {
set .@i, .@select;
set .@map$, getarg(.@i);
@@ -100,6 +106,7 @@ function Pick {
set .@x, @c[.@i*2];
set .@y, @c[.@i*2+1];
deletearray @c[0],getarraysize(@c);
+ @f = false; @d = false;
Go(.@map$,.@x,.@y);
}
function Restrict {
@@ -122,11 +129,11 @@ function Restrict {
menu "Prontera",T1, "Alberta",T2, "Aldebaran",T3, "Amatsu",T4, "Ayothaya",T5,
"Brasilis",T6, "Comodo",T7, "Dewata",T8, "Eclage",T9, "Einbech",T10,
"Einbroch",T11, "El Dicastes",T12, "Geffen",T13, "Gonryun",T14, "Hugel",T15,
- "Izlude",T16, "Jawaii",T17, "Lighthalzen",T18, "Louyang",T19, "Lutie",T20,
- "Malangdo",T21, "Malaya",T22, "Manuk",T23, "Midgarts Expedition Camp",T24,
- "Mora",T25, "Morroc",T26, "Moscovia",T27, "Nameless Island",T28,
- "Niflheim",T29, "Payon",T30, "Rachel",T31, "Splendide",T32, "Thor Camp",T33,
- "Umbala",T34, "Veins",T35, "Yuno",T36;
+ "Izlude",T16, "Jawaii",T17, "Lasagna",T18, "Lighthalzen",T19, "Louyang",T20,
+ "Lutie",T21, "Malangdo",T22, "Malaya",T23, "Manuk",T24,
+ "Midgarts Expedition Camp",T25, "Mora",T26, "Morroc",T27, "Moscovia",T28,
+ "Nameless Island",T29, "Niflheim",T30, "Payon",T31, "Rachel",T32, "Splendide",T33,
+ "Thor Camp",T34, "Umbala",T35, "Veins",T36, "Yuno",T37;
T1: Go("prontera",155,183);
T2: Go("alberta",28,234);
@@ -149,42 +156,45 @@ T14: Go("gonryun",160,120);
T15: Go("hugel",96,145);
T16: Go("izlude",128,(checkre(3)?146:114));
T17: Go("jawaii",251,132);
-T18: Go("lighthalzen",158,92);
-T19: Go("louyang",217,100);
-T20: Go("xmas",147,134);
-T21: Restrict("RE");
- Go("malangdo",140,114);
+T18: Restrict("RE");
+ Go("lasagna",193,182);
+T19: Go("lighthalzen",158,92);
+T20: Go("louyang",217,100);
+T21: Go("xmas",147,134);
T22: Restrict("RE");
+ Go("malangdo",140,114);
+T23: Restrict("RE");
Go("malaya",231,200);
-T23: Go("manuk",282,138);
-T24: Go("mid_camp",210,288);
-T25: Restrict("RE");
+T24: Go("manuk",282,138);
+T25: Go("mid_camp",210,288);
+T26: Restrict("RE");
Go("mora",55,146);
-T26: Go("morocc",156,93);
-T27: Go("moscovia",223,184);
-T28: Go("nameless_n",256,215);
-T29: Go("niflheim",202,174);
-T30: Go("payon",179,100);
-T31: Go("rachel",130,110);
-T32: Go("splendide",201,147);
-T33: Go("thor_camp",246,68);
-T34: Go("umbala",97,153);
-T35: Go("veins",216,123);
-T36: Go("yuno",157,51);
+T27: Go("morocc",156,93);
+T28: Go("moscovia",223,184);
+T29: Go("nameless_n",256,215);
+T30: Go("niflheim",202,174);
+T31: Go("payon",179,100);
+T32: Go("rachel",130,110);
+T33: Go("splendide",201,147);
+T34: Go("thor_camp",246,68);
+T35: Go("umbala",97,153);
+T36: Go("veins",216,123);
+T37: Go("yuno",157,51);
// --------------------------------------------------
Fields:
// --------------------------------------------------
+@f = true;
menu "Amatsu Fields",F1, "Ayothaya Fields",F2, "Bifrost Fields", F3,
"Brasilis Fields",F4, "Comodo Fields",F5, "Dewata Fields",F6,
"Eclage Fields",F7, "Einbroch Fields",F8, "El Dicastes Fields",F9,
"Geffen Fields",F10, "Gonryun Fields",F11, "Hugel Fields",F12,
- "Lighthalzen Fields",F13, "Louyang Field",F14, "Lutie Field",F15,
- "Malaya Fields",F16, "Manuk Fields",F17, "Mjolnir Fields",F18,
- "Moscovia Fields",F19, "Niflheim Fields",F20, "Payon Forests",F21,
- "Prontera Fields",F22, "Rachel Fields",F23, "Sograt Deserts",F24,
- "Splendide Fields",F25, "Umbala Fields",F26, "Veins Fields",F27,
- "Yuno Fields",F28;
+ "Lasagna Fields",F13, "Lighthalzen Fields",F14, "Louyang Field",F15,
+ "Lutie Field",F16, "Malaya Fields",F17, "Manuk Fields",F18,
+ "Mjolnir Fields",F19, "Moscovia Fields",F20, "Niflheim Fields",F21,
+ "Payon Forests",F22, "Prontera Fields",F23, "Rachel Fields",F24,
+ "Sograt Deserts",F25, "Splendide Fields",F26, "Umbala Fields",F27,
+ "Veins Fields",F28, "Yuno Fields",F29;
F1: setarray @c[2],190,197;
Disp("Amatsu Field",1,1); Pick("ama_fild");
@@ -219,60 +229,69 @@ F11: setarray @c[2],220,227;
F12: Restrict("Pre-RE",3,7);
setarray @c[2],268,101,222,193,232,185,252,189,196,106,216,220,227,197;
Disp("Hugel Field",1,7); Pick("hu_fild");
-F13: setarray @c[2],240,179,185,235,240,226;
+F13: Restrict("RE");
+ setarray @c[2],344,371,20,98;
+ Disp("Lasagna Field",1,2); Pick("lasa_fild");
+F14: setarray @c[2],240,179,185,235,240,226;
Disp("Lighthalzen Field",1,3); Pick("lhz_fild");
-F14: setarray @c[2],229,187;
+F15: setarray @c[2],229,187;
Disp("Louyang Field",1,1); Pick("lou_fild");
-F15: setarray @c[2],115,145;
+F16: setarray @c[2],115,145;
Disp("Lutie Field",1,1); Pick("xmas_fild");
-F16: Restrict("RE");
+F17: Restrict("RE");
setarray @c[2],40,272,207,180;
Disp("Malaya Field",1,2); Pick("ma_fild");
-F17: setarray @c[2],35,236,35,262,84,365;
+F18: setarray @c[2],35,236,35,262,84,365;
Disp("Manuk Field",1,3); Pick("man_fild");
-F18: setarray @c[2],204,120,175,193,208,213,179,180,181,240,195,270,235,202,188,215,205,144,245,223,180,206,196,208;
+F19: setarray @c[2],204,120,175,193,208,213,179,180,181,240,195,270,235,202,188,215,205,144,245,223,180,206,196,208;
Disp("Mjolnir Field",1,12); Pick("mjolnir_");
-F19: setarray @c[2],82,104,131,147;
+F20: setarray @c[2],82,104,131,147;
Disp("Moscovia Field",1,2); Pick("mosk_fild");
-F20: setarray @c[2],215,229,167,234;
+F21: setarray @c[2],215,229,167,234;
Disp("Niflheim Field",1,2); Pick("nif_fild");
-F21: Restrict("Pre-RE",5,11);
+F22: Restrict("Pre-RE",5,11);
setarray @c[2],158,206,151,219,205,148,186,247,134,204,193,235,200,177,137,189,201,224,160,205,194,150;
Disp("Payon Forest",1,11); Pick("pay_fild");
-F22: setarray @c[0],208,227,190,206,240,206,190,143,307,252,239,213,185,188,193,194,187,218,210,183,195,149,198,164;
+F23: setarray @c[0],208,227,190,206,240,206,190,143,307,252,239,213,185,188,193,194,187,218,210,183,195,149,198,164;
Disp("Prontera Field",0,11); Pick("prt_fild",1);
-F23: Restrict("Pre-RE",2,7,9,10,11,13);
+F24: Restrict("Pre-RE",2,7,9,10,11,13);
setarray @c[2],192,162,235,166,202,206,202,208,225,202,202,214,263,196,217,201,87,121,277,181,221,185,175,200,174,197;
Disp("Rachel Field",1,13); Pick("ra_fild");
-F24: setarray @c[2],219,205,177,206,194,182,224,170,198,216,156,187,185,263,206,228,208,238,209,223,85,97,207,202,31,195,38,195;
+F25: if(.Satan_Morroc){
+ setarray @c[2],219,205,177,206,194,182,224,170,198,216,156,187,185,263,206,228,208,238,209,223,85,97,207,202,31,195,38,195;
Disp("Sograt Desert 1:Sograt Desert 2:Sograt Desert 3:Sograt Desert 7:Sograt Desert 11:Sograt Desert 12:Sograt Desert 13:Sograt Desert 16:Sograt Desert 17:Sograt Desert 18:Sograt Desert 19:Sograt Desert 20:Sograt Desert 21:Sograt Desert 22");
Pick("","moc_fild01","moc_fild02","moc_fild03","moc_fild07","moc_fild11","moc_fild12","moc_fild13","moc_fild16","moc_fild17","moc_fild18","moc_fild19","moc_fild20","moc_fild21","moc_fild22");
-F25: setarray @c[2],175,186,236,184,188,204;
+ }else{
+ setarray @c[2],219,205,177,206,194,182,146,297,204,197,275,302,224,170,139,123,101,110,341,39,198,216,156,187,185,263,223,222,170,257,206,228,208,238,209,223,85,97;
+ Disp("Sograt Desert",1,19); Pick("moc_fild");
+ }
+F26: setarray @c[2],175,186,236,184,188,204;
Disp("Splendide Field",1,3); Pick("spl_fild");
-F26: setarray @c[2],217,206,223,221,237,215,202,197;
+F27: setarray @c[2],217,206,223,221,237,215,202,197;
Disp("Umbala Field",1,4); Pick("um_fild");
-F27: Restrict("Pre-RE",5);
+F28: Restrict("Pre-RE",5);
setarray @c[2],186,175,196,370,222,45,51,250,202,324,150,223,149,307;
Disp("Veins Field",1,7); Pick("ve_fild");
-F28: Restrict("Pre-RE",5,10);
+F29: Restrict("Pre-RE",5,10);
setarray @c[2],189,224,192,207,221,157,226,199,223,177,187,232,231,174,196,203,183,214,200,124,195,226,210,304;
Disp("Yuno Field",1,12); Pick("yuno_fild");
// --------------------------------------------------
Dungeons:
// --------------------------------------------------
+@d = true;
menu "Abyss Lakes",D1, "Amatsu Dungeon",D2, "Anthell",D3,
- "Ayothaya Dungeon",D4, "Beach Dungeon",D5, "Bifrost Tower",D41,
+ "Ayothaya Dungeon",D4, "Beach Dungeon",D5, "Bifrost Tower",D42,
"Bio Labs",D6, "Brasilis Dungeon",D7, "Byalan Dungeon",D8, "Clock Tower",D9,
"Coal Mines",D10, "Culvert",D11, "Cursed Abbey",D12, "Dewata Dungeon",D13,
"Einbroch Dungeon",D14, "Gefenia",D15, "Geffen Dungeon",D16,
"Glast Heim",D17, "Gonryun Dungeon",D18, "Hidden Dungeon",D19,
- "Ice Dungeon",D20, "Juperos",D21, "Kiel Dungeon",D22, "Louyang Dungeon",D23,
- "Magma Dungeon",D24, "Malangdo Dungeon",D25, "Moscovia Dungeon",D26,
- "Nidhogg's Dungeon",D27, "Odin Temple",D28, "Orc Dungeon",D29,
- "Payon Dungeon",D30, "Pyramids",D31, "Rachel Sanctuary",D32,
- "Scaraba Hole",D33, "Sphinx",D34, "Sunken Ship",D35, "Thanatos Tower",D36,
- "Thor Volcano",D37, "Toy Factory",D38, "Turtle Dungeon",D39, "Umbala Dungeon",D40;
+ "Ice Dungeon",D20, "Juperos",D21, "Kiel Dungeon",D22, "Lasagna Dungeon",D23,
+ "Louyang Dungeon",D24, "Magma Dungeon",D25, "Malangdo Dungeon",D26,
+ "Moscovia Dungeon",D27, "Nidhogg's Dungeon",D28, "Odin Temple",D29,
+ "Orc Dungeon",D30, "Payon Dungeon",D31, "Pyramids",D32, "Rachel Sanctuary",D33,
+ "Scaraba Hole",D34, "Sphinx",D35, "Sunken Ship",D36, "Thanatos Tower",D37,
+ "Thor Volcano",D38, "Toy Factory",D39, "Turtle Dungeon",D40, "Umbala Dungeon",D41;
D1: setarray @c[2],261,272,275,270,116,27;
Disp("Abyss Lakes",1,3); Pick("abyss_");
@@ -325,57 +344,61 @@ D21: setarray @c[2],140,51,53,247,37,63,150,285;
Pick("","jupe_cave","juperos_01","juperos_02","jupe_core");
D22: setarray @c[2],28,226,41,198;
Disp("Kiel Dungeon",1,2); Pick("kh_dun");
-D23: setarray @c[2],218,196,282,20,165,38;
+D23: Restrict("RE");
+ setarray @c[2],24,143,22,171,190,18;
+ Disp("Lasagna Dungeon",1,3); Pick("lasa_dun");
+D24: setarray @c[2],218,196,282,20,165,38;
Disp("The Royal Tomb:Inside the Royal Tomb:Suei Long Gon"); Pick("lou_dun");
-D24: setarray @c[2],126,68,47,30;
+D25: setarray @c[2],126,68,47,30;
Disp("Magma Dungeon",1,2); Pick("mag_dun");
-D25: Restrict("RE");
+D26: Restrict("RE");
setarray @c[2],33,230;
Disp("Malangdo Dungeon",1,1); Pick("mal_dun");
-D26: setarray @c[2],189,48,165,30,32,135;
+D27: setarray @c[2],189,48,165,30,32,135;
Disp("Moscovia Dungeon",1,3); Pick("mosk_dun");
-D27: setarray @c[2],61,239,60,271;
+D28: setarray @c[2],61,239,60,271;
Disp("Nidhogg's Dungeon",1,2); Pick("nyd_dun");
-D28: setarray @c[2],298,167,224,149,266,280;
+D29: setarray @c[2],298,167,224,149,266,280;
Disp("Odin Temple",1,3); Pick("odin_tem");
-D29: setarray @c[2],32,170,21,185;
+D30: setarray @c[2],32,170,21,185;
Disp("Orc Dungeon",1,2); Pick("orcsdun");
-D30: setarray @c[0],21,183,19,33,19,63,155,159,201,204;
+D31: setarray @c[0],21,183,19,33,19,63,155,159,201,204;
Disp("Payon Dungeon",1,5); Pick("pay_dun",1);
-D31: Restrict("RE",7,8);
+D32: Restrict("RE",7,8);
setarray @c[2],192,9,10,192,100,92,181,11,94,96,192,8,94,96,192,8;
Disp("Pyramids 1:Pyramids 2:Pyramids 3:Pyramids 4:Basement 1:Basement 2:Basement 1 - Nightmare Mode:Basement 2 - Nightmare Mode");
Pick("","moc_pryd01","moc_pryd02","moc_pryd03","moc_pryd04","moc_pryd05","moc_pryd06","moc_prydn1","moc_prydn2");
-D32: setarray @c[2],140,11,32,21,8,149,204,218,150,9;
+D33: setarray @c[2],140,11,32,21,8,149,204,218,150,9;
Disp("Rachel Sanctuary",1,5); Pick("ra_san");
-D33: Restrict("RE");
+D34: Restrict("RE");
setarray @c[2],364,44,101,141;
Disp("Scaraba Hole",1,2); Pick("dic_dun");
-D34: setarray @c[2],288,9,149,81,210,54,10,222,100,99;
+D35: setarray @c[2],288,9,149,81,210,54,10,222,100,99;
Disp("Sphinx",1,5); Pick("","in_sphinx1","in_sphinx2","in_sphinx3","in_sphinx4","in_sphinx5");
-D35: setarray @c[2],69,24,102,27;
+D36: setarray @c[2],69,24,102,27;
Disp("Sunken Ship",1,2); Pick("treasure");
-D36: setarray @c[2],150,39,150,136,220,158,59,143,62,11,89,221,35,166,93,148,29,107,159,138,19,20,130,52;
+D37: setarray @c[2],150,39,150,136,220,158,59,143,62,11,89,221,35,166,93,148,29,107,159,138,19,20,130,52;
Disp("Thanatos Tower",1,12); Pick("tha_t");
-D37: setarray @c[2],21,228,75,205,34,272;
+D38: setarray @c[2],21,228,75,205,34,272;
Disp("Thor Volcano",1,3); Pick("thor_v");
-D38: setarray @c[2],205,15,129,133;
+D39: setarray @c[2],205,15,129,133;
Disp("Toy Factory",1,2); Pick("xmas_dun");
-D39: setarray @c[2],154,49,148,261,132,189,100,192;
+D40: setarray @c[2],154,49,148,261,132,189,100,192;
Disp("Entrance:Turtle Dungeon 1:Turtle Dungeon 2:Turtle Dungeon 3"); Pick("tur_dun");
-D40: Restrict("Pre-RE",1,2);
+D41: Restrict("Pre-RE",1,2);
setarray @c[2],42,31,48,30,204,78;
Disp("Carpenter's Shop in the Tree:Passage to a Foreign World:Hvergermil's Fountain");
Pick("","um_dun01","um_dun02","yggdrasil01");
-D41: Restrict("RE");
+D42: Restrict("RE");
setarray @c[2],57,13,64,88,45,14,26,23;
Disp("Bifrost Tower",1,4); Pick("ecl_tdun");
// --------------------------------------------------
Castles:
// --------------------------------------------------
-menu "Aldebaran Castles",C1, "Geffen Castles",C2, "Payon Castles",C3,
- "Prontera Castles",C4, "Arunafeltz Castles",C5, "Schwaltzvalt Castles",C6;
+menu "[FE] Aldebaran Castles",C1, "[FE] Geffen Castles",C2, "[FE] Payon Castles",C3,
+ "[FE] Prontera Castles",C4, "[SE] Arunafeltz Castles",C5, "[SE] Schwaltzvalt Castles",C6,
+ "[TE] Aldebaran Castles",C7, "[TE] Prontera Castles",C8;
C1: setarray @c[2],48,83,95,249,142,85,239,242,264,90;
Disp("Neuschwanstein:Hohenschwangau:Nuenberg:Wuerzburg:Rothenburg");
@@ -395,12 +418,21 @@ C5: setarray @c[2],158,272,83,47,68,155,299,345,292,107;
C6: setarray @c[2],293,100,288,252,97,196,137,90,71,315;
Disp("Himinn:Andlangr:Viblainn:Hljod:Skidbladnir");
Pick("","sch_gld","sch_gld","sch_gld","sch_gld","sch_gld");
-
+C7: Restrict("RE");
+ setarray @c[2],48,83,95,249,142,85,239,242,264,90;
+ Disp("Kafragarten 1:Kafragarten 2:Kafragarten 3:Kafragarten 4:Kafragarten 5");
+ Pick("","te_alde_gld","te_alde_gld","te_alde_gld","te_alde_gld","te_alde_gld");
+C8: Restrict("RE");
+ setarray @c[2],134,65,240,128,153,137,111,240,208,240;
+ Disp("Gloria 1:Gloria 2:Gloria 3:Gloria 4:Gloria 5");
+ Pick("","te_prt_gld","te_prt_gld","te_prt_gld","te_prt_gld","te_prt_gld");
+
// --------------------------------------------------
Guild_Dungeons:
// --------------------------------------------------
menu "Baldur",G1, "Luina",G2, "Valkyrie",G3, "Britoniah",G4,
- "Arunafeltz",G5, "Schwaltzvalt",G6;
+ "Arunafeltz",G5, "Schwaltzvalt",G6, "Kafragarten",G7,
+ "Gloria",G8;
G1: Restrict("RE",2,3);
setarray @c[2],119,93,119,93,120,130;
@@ -420,14 +452,21 @@ G4: Restrict("RE",2,3);
Pick("","gld_dun04","gld_dun04_2","gld2_gef");
G5: Go("arug_dun01",199,195);
G6: Go("schg_dun01",200,124);
+G7: Restrict("RE");
+ Go("teg_dun01",42,36);
+G8: Restrict("RE");
+ Go("teg_dun02",26,160);
// --------------------------------------------------
Instances:
// --------------------------------------------------
menu "Bakonawa Lake",I1, "Bangungot Hospital 2F",I2, "Buwaya Cave",I3,
- "Endless Tower",I4, "Hazy Forest",I5, "Malangdo Culvert",I6, "Nidhoggur's Nest",I7,
- "Octopus Cave",I8, "Old Glast Heim",I9, "Orc's Memory",I10, "Sealed Shrine",I11,
- "Wolfchev's Laboratory",I12;
+ "Devil Tower",I4, "Eclage Interior",I5, "Endless Tower",I6,
+ "Faceworms Nest",I7, "Geffen Magic Tournament",I8, "Ghost Palace",I9,
+ "Hazy Forest",I10, "Horror Toy Factory",I11, "Malangdo Culvert",I12,
+ "Nidhoggur's Nest",I13, "Octopus Cave",I14, "Old Glast Heim",I15,
+ "Orc's Memory",I16, "Sarah and Fenrir",I17, "Sara Memory",I18,
+ "Sealed Shrine",I19, "Wolfchev's Laboratory",I20;
I1: Restrict("RE");
Go("ma_scene01",172,175);
@@ -435,36 +474,62 @@ I2: Restrict("RE");
Go("ma_dun01",151,8);
I3: Restrict("RE");
Go("ma_fild02",316,317);
-I4: Go("e_tower",72,112);
+I4: Restrict("RE");
+ Go("dali02",137,115);
I5: Restrict("RE");
+ Go("ecl_hub01",129,12);
+I6: Go("e_tower",72,112);
+I7: Restrict("RE");
+ Go("dali",85,64);
+I8: Restrict("RE");
+ Go("dali",94,141);
+I9: Restrict("RE");
+ Go("dali02",46,128);
+I10: Restrict("RE");
Go("bif_fild01",161,334);
-I6: Restrict("RE");
+I11: Restrict("RE");
+ Go("xmas",234,298);
+I12: Restrict("RE");
Go("mal_in01",164,21);
-I7: Go("nyd_dun02",95,193);
-I8: Restrict("RE");
+I13: Go("nyd_dun02",95,193);
+I14: Restrict("RE");
Go("mal_dun01",152,230);
-I9: Restrict("RE");
+I15: Restrict("RE");
Go("glast_01",204,268);
-I10: Go("gef_fild10",240,198);
-I11: Go("monk_test",306,143);
-I12: Restrict("RE");
+I16: Go("gef_fild10",240,198);
+I17: Restrict("RE");
+ Go("dali02",92,141);
+I18: Restrict("RE");
+ Go("dali",133,108);
+I19: Go("monk_test",306,143);
+I20: Restrict("RE");
Go("lhz_dun04",148,269);
// --------------------------------------------------
Special:
// --------------------------------------------------
-menu "Auction Hall",S1, "Battlegrounds",S2, "Casino",S3, "Eden Group Headquarters",S4,
- "Gonryun Arena",S5, "Izlude Arena",S6, "Monster Race Arena",S7, "Turbo Track",S8;
+menu "Auction Hall",S1, "Battlegrounds",S2, "Casino",S3, "Dimensional Rift",S4,
+ "Eden Group Headquarters",S5, "Gonryun Arena",S6, "Izlude Arena",S7,
+ "Monster Race Arena",S8, "Para Market",S9, "Turbo Track",S10;
S1: Go("auction_01",22,68);
S2: Go("bat_room",154,150);
S3: Go("cmd_in02",179,129);
S4: Restrict("RE");
+ Go("dali",113,82);
+S5: Restrict("RE");
Go("moc_para01",31,14);
-S5: Go("gon_test",48,10);
-S6: Go("arena_room",100,88);
-S7: Go("p_track01",62,41);
-S8: Go("turbo_room",99,114);
+S6: Go("gon_test",48,10);
+S7: Go("arena_room",100,88);
+S8: Go("p_track01",62,41);
+S9: Restrict("RE");
+ Go("paramk",97,17);
+S10: Go("turbo_room",99,114);
+
+OnInit:
+ .Satan_Morroc = true; // false will enable moc_fild 4,5,6,8,9,10,14,15 while disable moc_fild 20,21,22 Default is true.
+ .OnlyFirstFld = false; // true will teleport to the first level of the Fields Default is false.
+ .OnlyFirstDun = false; // true will teleport to the first level of the Dungeons Default is false.
}
// --------------------------------------------------
@@ -515,6 +580,7 @@ brasilis,201,222,4 duplicate(Warper) Warper#bra 811
dewata,204,186,6 duplicate(Warper) Warper#dew 811
dicastes01,194,194,6 duplicate(Warper) Warper#dic 811
ecl_in01,51,60,4 duplicate(Warper) Warper#ecl 811
+lasagna,196,187,4 duplicate(Warper) Warper#las 811
malangdo,134,117,6 duplicate(Warper) Warper#mal 811
malaya,231,204,4 duplicate(Warper) Warper#ma 811
mora,57,152,4 duplicate(Warper) Warper#mora 811
diff --git a/npc/events/MemorialDay_2008.txt b/npc/events/MemorialDay_2008.txt
index 5c4e93ecdee..f048eebf18f 100644
--- a/npc/events/MemorialDay_2008.txt
+++ b/npc/events/MemorialDay_2008.txt
@@ -29,7 +29,7 @@ prontera,182,214,4 script Lauds#Memorial 58,{
next;
mes "[Mad Sago Lauds]";
mes "What is this!?";
- emotion e_gasp;
+ emotion ET_SURPRISE;
next;
mes "[Mad Sago Lauds]";
mes "Where is your towel!?";
@@ -166,7 +166,7 @@ prontera,182,214,4 script Lauds#Memorial 58,{
if (.@RandomMsg == 1) {
mes "[Mad Sago Lauds]";
mes "Don't panic!";
- emotion e_gasp;
+ emotion ET_SURPRISE;
close;
}
else if (.@RandomMsg == 2) {
diff --git a/npc/events/RWC_2011.txt b/npc/events/RWC_2011.txt
index f06ec602047..e8e6903074a 100644
--- a/npc/events/RWC_2011.txt
+++ b/npc/events/RWC_2011.txt
@@ -23,7 +23,7 @@ prontera,114,81,5 script RWC2011 Agent#2 407,{
if (oversea_event == 0) {
mes "[New Agent]";
mes "Wow~ Finally!! It's the season we've all been waiting for!";
- emotion e_lv2;
+ emotion ET_BIGTHROB;
next;
mes "[New Agent]";
mes "It's RWC time!";
@@ -134,7 +134,7 @@ prontera,114,81,5 script RWC2011 Agent#2 407,{
mes "[New Agent]";
mes "If you see the Golden Poring, could you please find the precious blue cards for me?";
next;
- emotion e_sob;
+ emotion ET_CRY;
mes "- He looks at you with imploring eyes. -";
next;
if(select("Ok, I will help you!:How much money can you offer me?") == 2) {
diff --git a/npc/events/RWC_2012.txt b/npc/events/RWC_2012.txt
index d27e84dec3a..f9be96dc055 100644
--- a/npc/events/RWC_2012.txt
+++ b/npc/events/RWC_2012.txt
@@ -315,7 +315,7 @@ prontera,147,59,3 script Goldberg#pron 878,{
mes "I'm sorry. But you don't have the RWC Initialization coupon. Can you check your inventory?";
close;
}
- if (.@equip_card[3] == 0) {
+ if (callfunc("F_IsCharm",.@equip_card[3]) == false) {
mes "[Goldberg]";
mes "Hm... this equipment is clean. I cannot initialize it if there's nothing! Check it again.";
close;
@@ -327,9 +327,9 @@ prontera,147,59,3 script Goldberg#pron 878,{
delequip .@part;
// GetNonSlotItemSock2 .@equip_refine .@equip_id .@equip_card[0] .@equip_card[1] .@equip_card[2] .@equip_card[3]
- for(set .@i,0; .@i<4; set .@i,.@i+1) {
- if (.@equip_card[.@i] >= 4700) // Armor Enchant System
- set .@equip_card[.@i],0;
+ for ( .@i = getiteminfo(.@equip_id,10); .@i < MAX_SLOTS; .@i++ ) {
+ if (callfunc("F_IsCharm",.@equip_card[.@i]) == true)
+ .@equip_card[.@i] = 0;// Armor Enchant System
}
getitem2 .@equip_id,1,1,.@equip_refine,0,.@equip_card[0],.@equip_card[1],.@equip_card[2],.@equip_card[3];
diff --git a/npc/events/christmas_2005.txt b/npc/events/christmas_2005.txt
index 1b57e1f2702..ab5eb758097 100644
--- a/npc/events/christmas_2005.txt
+++ b/npc/events/christmas_2005.txt
@@ -49,7 +49,7 @@ xmas_in,89,92,5 script Louise Kim#designer 714,{
mes "bring it to me.";
mes "I'll change it to brand new one.";
mes "Stylish Louise's hat.";
- emotion e_lv;
+ emotion ET_THROB;
next;
if (countitem(2236) > 0) {
if (select("Here.:It's ok.") == 1) {
@@ -84,7 +84,7 @@ xmas_in,89,92,5 script Louise Kim#designer 714,{
mes "I like your style~.";
mes "Ok!! If everything is ready, no need to hesitate.";
mes "I'll show you what Designer Louise Kim's power is.";
- emotion e_no1;
+ emotion ET_BEST;
next;
mes "-She puts the hat in a bucket -";
mes "-filled with Holy Water.-";
@@ -94,7 +94,7 @@ xmas_in,89,92,5 script Louise Kim#designer 714,{
mes "[Designer Louise Kim]";
mes "~With the number one designer, Louise Kim,~";
mes "~you are the most blessed soul.~";
- emotion e_ho;
+ emotion ET_DELIGHT;
misceffect EF_BLESSING;
next;
mes "-Immediately, she puts Rosary in an-";
@@ -106,7 +106,7 @@ xmas_in,89,92,5 script Louise Kim#designer 714,{
mes "[Designer Louise Kim]";
mes "~With the number one designer, Louise Kim,~";
mes "~you are the luckiest soul.~";
- emotion e_ho;
+ emotion ET_DELIGHT;
misceffect EF_GLORIA;
next;
mes "-She starts sewing the hat with -";
@@ -117,7 +117,7 @@ xmas_in,89,92,5 script Louise Kim#designer 714,{
mes "~This is called the Louise's miracle.~";
mes "~The most talented disigner,~";
mes "~L_O_U_I_S_E K_I_M~";
- emotion e_lv;
+ emotion ET_THROB;
misceffect EF_BENEDICTIO;
next;
mes "[Designer Louise Kim]";
@@ -132,7 +132,7 @@ xmas_in,89,92,5 script Louise Kim#designer 714,{
mes "It's a gift for you!";
mes "I won't charge anything.";
mes "Just tell many people how good it is.";
- emotion e_heh;
+ emotion ET_SMILE;
next;
mes "[Designer Louise Kim]";
mes "Wherever you go,";
@@ -146,7 +146,7 @@ xmas_in,89,92,5 script Louise Kim#designer 714,{
mes "Go brag yourself!";
mes "~Who would be happier than~";
mes "~being with Louise.~";
- emotion e_ho;
+ emotion ET_DELIGHT;
delitem 2236,1; //Santa's_Hat
delitem 952,1; //Cactus_Needle
delitem 523,10; //Holy_Water
@@ -159,21 +159,21 @@ xmas_in,89,92,5 script Louise Kim#designer 714,{
mes "Come on~If you just get me the materials,";
mes "I won't charge anything,";
mes "Call me if you change your mind.";
- emotion e_lv;
+ emotion ET_THROB;
close;
}
}
mes "[Designer Louise Kim]";
mes "You'll regret!";
mes "Think again!";
- emotion e_heh;
+ emotion ET_SMILE;
close;
}
mes "[Designer Louise Kim]";
mes "Ok~ whatever~";
mes "It's not me,";
mes "who's going to lose whose own luck.";
- emotion e_heh;
+ emotion ET_SMILE;
close;
}
else {
@@ -182,7 +182,7 @@ xmas_in,89,92,5 script Louise Kim#designer 714,{
mes "think about it carefully.";
mes "You can get the better designed hat,";
mes "and I can show off my talent.";
- emotion e_heh;
+ emotion ET_SMILE;
close;
}
}
@@ -250,7 +250,7 @@ prontera,155,285,3 script Enjoy#enjoy 753,{
mes "5 branch of dead trees!!!";
mes "Must bring item to attack town~";
mes "hahahaha~~";
- emotion e_gg;
+ emotion ET_KIK;
next;
mes "[Enjoy]";
mes "Get it?!!!!";
@@ -384,8 +384,8 @@ prontera,155,285,3 script Enjoy#enjoy 753,{
mes " ";
mes "[All]";
mes "Let's punish!!!!!";
- emotion e_go;
- emotion e_go,1;
+ emotion ET_GO;
+ emotion ET_GO, playerattached();
donpcevent "Happymerry#happymerry02::OnCommandEmotion";
donpcevent "Christ#christ02::OnCommandEmotion";
donpcevent "Mas#mas02::OnCommandEmotion";
@@ -512,7 +512,7 @@ OnCommandOn:
initnpctimer;
enablenpc "Happymerry#happymerry02";
OnCommandEmotion:
- emotion e_go;
+ emotion ET_GO;
end;
OnCommandOff:
@@ -538,7 +538,7 @@ OnInit:
OnCommandOn:
enablenpc "Christ#christ02";
OnCommandEmotion:
- emotion e_go;
+ emotion ET_GO;
end;
OnCommandOff:
@@ -555,7 +555,7 @@ OnInit:
OnCommandOn:
enablenpc "Mas#mas02";
OnCommandEmotion:
- emotion e_go;
+ emotion ET_GO;
end;
OnCommandOff:
@@ -572,7 +572,7 @@ OnInit:
OnCommandOn:
enablenpc "Event#event02";
OnCommandEmotion:
- emotion e_go;
+ emotion ET_GO;
end;
OnCommandOff:
@@ -586,7 +586,7 @@ prontera,188,177,4 script Happymerry#happymerry 869,{
mes "Holgren~~!!";
mes "I've never expected you betraying me! Don't wanna get refined~!!!";
mes "I hate christmas~!";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "["+ strcharinfo(0) +"]";
mes "Are...you...?";
@@ -645,7 +645,7 @@ prontera,188,177,4 script Happymerry#happymerry 869,{
mes "Holgren!!";
mes "I've never expected you betraying me! Don't wanna get refined~!!!";
mes "I hate christmas~!";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Happymerry]";
mes "What are you laughing at? huh~!";
@@ -836,7 +836,7 @@ prontera,35,209,5 script Event#event 881,{
next;
mes "[Event]";
mes "...I love you too~!!!";
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
next;
mes "["+ strcharinfo(0) +"]";
mes "(Oh,my..)";
@@ -848,7 +848,7 @@ prontera,35,209,5 script Event#event 881,{
next;
mes "-He laughed talking to his right hand.-";
//Emotion "Event#event" ET_KIK
- emotion e_kis;
+ emotion ET_CHUP;
next;
mes "["+ strcharinfo(0) +"]";
mes "Mas sent me here.";
@@ -900,7 +900,7 @@ prontera,35,209,5 script Event#event 881,{
next;
mes "[Event]";
mes "...I love you too~!!!";
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
next;
mes "["+ strcharinfo(0) +"]";
mes "(Oh.my~)";
@@ -911,7 +911,7 @@ prontera,35,209,5 script Event#event 881,{
mes "Hahahaha~~~";
next;
mes "-He laughed talking to his right hand.-";
- emotion e_kis;
+ emotion ET_CHUP;
close;
}
}
@@ -955,7 +955,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 79,{
mes "[Oholy]";
mes "The latest headline by Oholy";
mes "Isn't it amazing?";
- emotion e_heh;
+ emotion ET_SMILE;
close;
case 2:
mes "[Oholy]";
@@ -979,7 +979,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 79,{
mes "[Oholy]";
mes "The latest headline by Oholy";
mes "Isn't it amazing?";
- emotion e_heh;
+ emotion ET_SMILE;
close;
case 3:
mes "[Oholy]";
@@ -1015,7 +1015,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 79,{
mes "Good gracious! Are you for real?";
mes "Oh? Shee... Can you hear it?";
mes "Every kids appreciate your kindness.";
- emotion e_heh;
+ emotion ET_SMILE;
mes "Don't be afraid. I will not";
mes "ask you to make a new christmas carol.";
next;
@@ -1035,7 +1035,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 79,{
mes "you are dealing with devil.";
mes "Well then, hope you a good luck!!!";
mes " ";
- emotion e_no1;
+ emotion ET_BEST;
set christ_carol05,1;
close;
case 4:
@@ -1066,7 +1066,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 79,{
mes "[Oholy]";
mes "The latest headline by Oholy";
mes "Isn't it amazing?";
- emotion e_heh;
+ emotion ET_SMILE;
close;
case 5:
mes "[Oholy]";
@@ -1084,7 +1084,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 79,{
mes "[Oholy]";
mes "The latest headline by Oholy";
mes "Isn't it amazing?";
- emotion e_heh;
+ emotion ET_SMILE;
close;
}
}
@@ -1168,7 +1168,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 79,{
mes "I wrapped those indivisually.";
mes "There are many sweets in them.";
mes "Merry Christmas!";
- emotion e_heh;
+ emotion ET_SMILE;
delitem 1097,1;//Worn_Out_Page
set christ_carol05,3;
getitem 12130,7;//Cookie_Bag
@@ -1180,7 +1180,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 79,{
mes "Chief noun.";
mes "Very sweet and delicious.";
mes "Merry Christmas!";
- emotion e_heh;
+ emotion ET_SMILE;
delitem 1097,1;//Worn_Out_Page
set christ_carol05,3;
getitem 529,20;//Candy
@@ -1192,7 +1192,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 79,{
mes "Chief noun.";
mes "Very sweet and delicious.";
mes "Merry Christmas!";
- emotion e_heh;
+ emotion ET_SMILE;
delitem 1097,1;//Worn_Out_Page
set christ_carol05,3;
getitem 530,15;//Candy_Striper
@@ -1204,7 +1204,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 79,{
mes "Chief Acolyte.";
mes "Very soft and delicious.";
mes "Merry Christmas!";
- emotion e_heh;
+ emotion ET_SMILE;
delitem 1097,1;//Worn_Out_Page
set christ_carol05,3;
getitem 539,5;//Piece_of_Cake
@@ -1216,7 +1216,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 79,{
mes "Chief Acolyte.";
mes "Very crispy and delicious.";
mes "Merry Christmas!";
- emotion e_heh;
+ emotion ET_SMILE;
delitem 1097,1;//Worn_Out_Page
set christ_carol05,3;
getitem 538,10;//Well_baked_Cookie
@@ -1228,7 +1228,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 79,{
mes "Bishop, Tomas.";
mes "Very cute.";
mes "Merry Christmas!";
- emotion e_heh;
+ emotion ET_SMILE;
delitem 1097,1;//Worn_Out_Page
set christ_carol05,3;
getitem 743,1;//Spore_Doll
@@ -1240,7 +1240,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 79,{
mes "How did it get in here..?!";
mes "Oops, oh well.";
mes "Merry Christmas!";
- emotion e_heh;
+ emotion ET_SMILE;
delitem 1097,1;//Worn_Out_Page
set christ_carol05,3;
getitem 750,1;//Baphomet_Doll
@@ -1252,7 +1252,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 79,{
mes "How did it get in here..?!";
mes "Oops, oh well.";
mes "Merry Christmas!";
- emotion e_heh;
+ emotion ET_SMILE;
delitem 1097,1;//Worn_Out_Page
set christ_carol05,3;
getitem 751,1;//Osiris_Doll
@@ -1264,7 +1264,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 79,{
mes "a knight, Lighten.";
mes "Very kind of him.";
mes "Merry Christmas!";
- emotion e_heh;
+ emotion ET_SMILE;
delitem 1097,1;//Worn_Out_Page
set christ_carol05,3;
getitem 752,1;//Grasshopper_Doll
@@ -1277,7 +1277,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 79,{
mes "an assassin, Marzia.";
mes "Very kind of him.";
mes "Merry Christmas!";
- emotion e_heh;
+ emotion ET_SMILE;
delitem 1097,1;//Worn_Out_Page
set christ_carol05,3;
getitem 753,1;//Monkey_Doll
@@ -1289,7 +1289,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 79,{
mes "a hunter, Raiden Kurs.";
mes "Very kind of him.";
mes "Merry Christmas!";
- emotion e_heh;
+ emotion ET_SMILE;
delitem 1097,1;//Worn_Out_Page
set christ_carol05,3;
getitem 754,1;//Raccoondog_Doll
@@ -1302,7 +1302,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 79,{
mes "Very kind of her.";
mes "Hope she is doing okay.";
mes "Merry Christmas!";
- emotion e_heh;
+ emotion ET_SMILE;
delitem 1097,1;//Worn_Out_Page
set christ_carol05,3;
getitem 7206,1;//Black_Kitty_Doll
@@ -1313,7 +1313,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 79,{
mes "I made this doll.";
mes "Isn't it adorable?!";
mes "Merry Christmas!";
- emotion e_heh;
+ emotion ET_SMILE;
delitem 1097,1;//Worn_Out_Page
set christ_carol05,3;
getitem 7212,1;//Hanging_Doll
@@ -1326,7 +1326,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 79,{
mes "An artisan made this doll";
mes "with his passion.";
mes "Merry Christmas!";
- emotion e_heh;
+ emotion ET_SMILE;
delitem 1097,1;//Worn_Out_Page
set christ_carol05,3;
getitem 7277,1;//Munak_Doll
@@ -1338,7 +1338,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 79,{
mes "during Christmas season.";
mes "It is not a common hat.";
mes "Merry Christmas!";
- emotion e_heh;
+ emotion ET_SMILE;
delitem 1097,1;//Worn_Out_Page
set christ_carol05,3;
getitem 2236,1;//Santa's_Hat
@@ -1377,7 +1377,7 @@ function script F_carol_devi {
mes "Heyhey, human!!";
mes "Don't ya wanna sell your";
mes "soul and be bound in a beneficial contract with me?";
- emotion e_kis;
+ emotion ET_CHUP;
next;
mes "["+ strcharinfo(0) +"]";
mes "Hey, you! Deviruchi!!!";
@@ -1392,8 +1392,8 @@ function script F_carol_devi {
mes "What are you doing!?";
mes "Human?";
mes "Let go of me...right now!";
- emotion e_omg;
- emotion e_omg,1;
+ emotion ET_HUK;
+ emotion ET_HUK, playerattached();
next;
mes "-Deviruchi quickly ran away-";
mes "-^4d4dffWhere Deviruchi is gone,-";
@@ -1415,8 +1415,8 @@ function script F_carol_devi {
mes "What are you doing!?";
mes "Human?";
mes "Let go of me...right now!";
- emotion e_omg;
- emotion e_omg,1;
+ emotion ET_HUK;
+ emotion ET_HUK, playerattached();
next;
mes "-Deviruchi ran away quickly-";
mes "-and mumbled something.-";
@@ -1425,15 +1425,15 @@ function script F_carol_devi {
next;
mes "-You are now cursed!!!-";
sc_start SC_Curse,5000,0;
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
close;
case 3:
mes "[Deviruchi]";
mes "What are you doing!?";
mes "Human?";
mes "Let go of me...right now!";
- emotion e_omg;
- emotion e_omg,1;
+ emotion ET_HUK;
+ emotion ET_HUK, playerattached();
next;
mes "-Deviruchi ran away quickly-";
mes "-and mumbled something.-";
@@ -1442,15 +1442,15 @@ function script F_carol_devi {
next;
mes "-You are blinded!!!-";
sc_start SC_Blind,5000,0;
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
close;
case 4:
mes "[Deviruchi]";
mes "What are you doing!?";
mes "Human?";
mes "Let go of me...right now!";
- emotion e_omg;
- emotion e_omg,1;
+ emotion ET_HUK;
+ emotion ET_HUK, playerattached();
next;
mes "-Deviruchi ran away quickly-";
mes "-and mumbled something.-";
@@ -1459,7 +1459,7 @@ function script F_carol_devi {
next;
mes "-You are poisoned!!!-";
sc_start SC_Poison,5000,0;
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
close;
}
}
@@ -1468,7 +1468,7 @@ function script F_carol_devi {
mes "Heyhey, human!!";
mes "Don't ya wanna sell your";
mes "soul and be bound in a beneficial contract with me?";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "["+ strcharinfo(0) +"]";
mes "Hey, you! Deviruchi!!!";
@@ -1481,8 +1481,8 @@ function script F_carol_devi {
mes "What are you doing!?";
mes "Human?";
mes "Let go of me...right now!";
- emotion e_omg;
- emotion e_omg,1;
+ emotion ET_HUK;
+ emotion ET_HUK, playerattached();
next;
mes "-Deviruchi ran away quickly-";
mes "-and mumbled something.-";
@@ -1498,7 +1498,7 @@ function script F_carol_devi2 {
mes "Heyhey, human!!";
mes "Don't ya wanna sell your";
mes "soul and be bound in a beneficial contract with me?";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "["+ strcharinfo(0) +"]";
mes "Hey, you! Deviruchi!!!";
@@ -1511,8 +1511,8 @@ function script F_carol_devi2 {
mes "What are you doing!?";
mes "Human?";
mes "Let go of me...right now!";
- emotion e_omg;
- emotion e_omg,1;
+ emotion ET_HUK;
+ emotion ET_HUK, playerattached();
next;
mes "-Deviruchi ran away quickly-";
mes "-and mumbled something.-";
diff --git a/npc/events/christmas_2008.txt b/npc/events/christmas_2008.txt
index 84309bd4c06..9eb25bb26fd 100644
--- a/npc/events/christmas_2008.txt
+++ b/npc/events/christmas_2008.txt
@@ -69,7 +69,7 @@ prontera,226,306,4 script Caroller#iROxmas08 79,{
mes "[Caroller]";
mes "If you win over Santa, you can get a gift. Would you go for it?";
next;
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Caroller]";
mes "Caroller's hot news! Ha!";
mes "Isn't that big news?";
@@ -87,7 +87,7 @@ prontera,226,306,4 script Caroller#iROxmas08 79,{
mes "[Caroller]";
mes "Furthermore, he has put bad magic on the gifts so that they become monsters!";
next;
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Caroller]";
mes "Caroller's hot news! Ha!";
mes "Isn't it amazing?";
@@ -133,7 +133,7 @@ prontera,226,306,4 script Caroller#iROxmas08 79,{
mes "[Caroller]";
mes "If you can get ^0000FFSinging Crystal Pieces^000000, give them to me please?";
next;
- emotion e_heh;
+ emotion ET_SMILE;
delitem 6092,6;
getnameditem 12354,strcharinfo(0);
mes "[Caroller]";
@@ -154,7 +154,7 @@ prontera,226,306,4 script Caroller#iROxmas08 79,{
mes "[Caroller]";
mes "If you can get ^0000FFSinging Crystal Pieces^000000, give them to me please?";
next;
- emotion e_heh;
+ emotion ET_SMILE;
delitem 6092,6;
getitem 12354,1;
mes "[Caroller]";
@@ -232,7 +232,7 @@ prontera,226,306,4 script Caroller#iROxmas08 79,{
mes "Please, for our children's hope!!!?";
mes "Please bring me 6 Singing Crystal Pieces from ^0000FFViolent Gift Boxes^000000!";
next;
- emotion e_ok;
+ emotion ET_OK;
mes "[Caroller]";
mes "They're definitely as harsh as their name.";
mes "Go on please!";
@@ -251,10 +251,10 @@ prontera,226,306,4 script Caroller#iROxmas08 79,{
mes "Every year, adventurers challenge to attack Antonio the fake Santa, but there's no way to catch up to him due to his hat and costume!";
next;
mes "[Caroller]";
- mes "Are there some spcial abilities within them?";
+ mes "Are there some special abilities within them?";
mes "There's still the designer in the Christmas village... How about asking her to make that costume?";
next;
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Caroller]";
mes "Caroller's hot news! Ha!";
mes "It's hot, huh?";
@@ -272,7 +272,7 @@ prontera,226,306,4 script Caroller#iROxmas08 79,{
mes "[Caroller]";
mes "And he isn't alone anymore... is what I heard...";
next;
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Caroller]";
mes "Caroller's hot news! Ha!";
mes "Hotness, right?";
@@ -295,7 +295,7 @@ prontera,226,306,4 script Caroller#iROxmas08 79,{
mes "For all of the children of this world!!!";
mes "Please bring me ^0000FFSinging Crystal Pieces^000000 from ^0000FFViolent Gift Boxes^000000!";
next;
- emotion e_ok;
+ emotion ET_OK;
mes "[Caroller]";
mes "Be careful!";
mes "They're definitely as harsh as their name.";
@@ -337,7 +337,7 @@ prontera,226,306,4 script Caroller#iROxmas08 79,{
mes "^0000FF10 Trunk, 1 Hammer Of Blacksmith, 1 Jubilee, 10 Sticky Mucus, 3carat Diamond^000000!";
next;
delitem 6092,6;
- emotion e_ok;
+ emotion ET_OK;
set iROxmas08carol,2;
mes "[Caroller]";
mes "Those are all needed.";
@@ -356,7 +356,7 @@ prontera,226,306,4 script Caroller#iROxmas08 79,{
mes "So, we need more of some materials.";
mes "^0000FF10 Trunk, 1 Hammer Of Blacksmith, 1 Jubilee, 10 Sticky Mucus, 3carat Diamond^000000!";
next;
- emotion e_ok;
+ emotion ET_OK;
mes "[Caroller]";
mes "That's all we need.";
mes "Isn't that easy?";
@@ -416,7 +416,7 @@ prontera,226,306,4 script Caroller#iROxmas08 79,{
mes "[Caroller]";
mes "Don't worry, it tastes good.";
next;
- emotion e_ok;
+ emotion ET_OK;
getitem 2784,1;
getnameditem 12354,strcharinfo(0);
delitem 1019,10;
@@ -528,7 +528,7 @@ prontera,226,306,4 script Caroller#iROxmas08 79,{
mes "Let's get started!";
next;
while(.@SantaCardTurn != 5) {
- emotion e_loud;
+ emotion ET_BLABLA;
mes "[Santa Claus]";
mes "First let me shuffle up these cards... Ok!!!";
next;
@@ -595,16 +595,16 @@ prontera,226,306,4 script Caroller#iROxmas08 79,{
set .@SantaCardTurn,.@SantaCardTurn+1;
if (.@SantaCardP == .@SantaCardNpc) {
set .@SantaCardWins,.@SantaCardWins+1;
- emotion e_gasp;
- emotion e_ic,1;
+ emotion ET_SURPRISE;
+ emotion ET_AHA, playerattached();
cutin "",255;
mes "[Santa Claus]";
mes "You're lucky.";
mes "Can you guess the right card the next time around?";
next;
} else {
- emotion e_gasp;
- emotion e_omg,1;
+ emotion ET_SURPRISE;
+ emotion ET_HUK, playerattached();
cutin "",255;
mes "[Santa Claus]";
mes "Aww maybe next time...";
@@ -730,7 +730,7 @@ xmas_in,89,92,4 script Louise Kim#iROxmas08 714,{
mes "The reason catching up to him is so hard, is that his clothes have been given strong power!";
mes "I blessed them with good luck!";
next;
- emotion e_lv;
+ emotion ET_THROB;
mes "[Louise Kim]";
mes "Preta Porter!!";
mes "Which is quite luxurious but sold at good price ~";
@@ -747,7 +747,7 @@ xmas_in,89,92,4 script Louise Kim#iROxmas08 714,{
mes "Ah!";
mes "You're silly! You lost your big chance!";
next;
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Louise Kim]";
mes "Come to me later if you want to get the mission.";
mes "I, Louise Kim, am generous enough to accept you next time.";
@@ -765,7 +765,7 @@ xmas_in,89,92,4 script Louise Kim#iROxmas08 714,{
mes "Anyway, can you bring me some stuff?";
next;
if (select("Why not? What do you need?:Sorry, no time.") == 2) {
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Louise Kim]";
mes "What?";
mes "You will definitely regret it.";
@@ -783,13 +783,13 @@ xmas_in,89,92,4 script Louise Kim#iROxmas08 714,{
mes "[Louise Kim]";
mes "If you were to bring me all the stuff, I would make you a wonderful costume, for free...";
next;
- emotion e_lv;
+ emotion ET_THROB;
mes "[Louise Kim]";
mes "Please see me again if you are interested.";
close;
} else {
select("Here you are.");
- emotion e_ok;
+ emotion ET_OK;
mes "[Louise Kim]";
mes "Oh! Good!";
mes "Let's not delay.";
@@ -801,7 +801,7 @@ xmas_in,89,92,4 script Louise Kim#iROxmas08 714,{
mes "-and many blessings she sings.-";
next;
specialeffect EF_BLESSING;
- emotion e_ho;
+ emotion ET_DELIGHT;
mes "[Louise Kim]";
mes "By artist, Louise Kim!";
mes "All over the world will be blessed tonight!";
@@ -815,7 +815,7 @@ xmas_in,89,92,4 script Louise Kim#iROxmas08 714,{
mes "-Count your blessings and sing!-";
next;
specialeffect EF_GLORIA;
- emotion e_ho;
+ emotion ET_DELIGHT;
mes "[Louise Kim]";
mes "By artist, Louise Kim!";
mes "All over the world will be blessed tonight!";
@@ -827,7 +827,7 @@ xmas_in,89,92,4 script Louise Kim#iROxmas08 714,{
mes "-cheer and goodwill!-";
next;
specialeffect EF_BENEDICTIO;
- emotion e_lv;
+ emotion ET_THROB;
mes "[Louise Kim]";
mes "This is miraculous!";
mes "I am a genius of the world.";
@@ -839,7 +839,7 @@ xmas_in,89,92,4 script Louise Kim#iROxmas08 714,{
mes "My fashion is radiant.";
mes "I ain't envious of Designer Pierre.";
next;
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Louise Kim]";
mes "I am supposed to get paid well, however I will just let it be free, since this is Christmas!";
next;
diff --git a/npc/events/christmas_2013.txt b/npc/events/christmas_2013.txt
index 5896f6b7b2b..6eba818859f 100644
--- a/npc/events/christmas_2013.txt
+++ b/npc/events/christmas_2013.txt
@@ -399,20 +399,20 @@ xmas,108,149,5 script Drop Machine#xmas 562,{
if (isbegin_quest(15056) == 0) {
mes "[Drop Machine]";
mes "Dingding dong Ding!~";
- emotion e_lv;
+ emotion ET_THROB;
next;
mes "[Slot Machine]";
mes "!~";
- emotion e_lv,0,"Slot Machine#xmas";
+ emotion ET_THROB, getnpcid(0, "Slot Machine#xmas");
close;
} else if (isbegin_quest(15056) == 1 && xmas2013_01 < 5) {
mes "[Drop Machine]";
mes "Dingdingding ding!~";
- emotion e_lv;
+ emotion ET_THROB;
next;
mes "[Slot Machine]";
mes "Charrrrr Sharrrrrrrr Ding!~";
- emotion e_lv,0,"Slot Machine#xmas";
+ emotion ET_THROB, getnpcid(0, "Slot Machine#xmas");
next;
mes "- Oh no, another couple!";
mes "- Even though they're just machines...";
@@ -469,20 +469,20 @@ xmas,181,150,5 script Frightened Man#xmas 711,{
if (isbegin_quest(15056) == 0) {
mes "[Frightened Man]";
mes "It's my fault, I'm sorry. Please don't be mad.";
- emotion e_sry;
+ emotion ET_SORRY;
next;
mes "[Angry Woman]";
mes "You're sorry? Do you know what you did? Do you have any idea why I'm mad?";
- emotion e_an,0,"Angry Woman#xmas";
+ emotion ET_FRET, getnpcid(0, "Angry Woman#xmas");
close;
} else if (isbegin_quest(15056) == 1 && xmas2013_01 < 5) {
mes "[Frightened Man]";
mes "It's my bad, I'm sorry. Please don't be mad";
- emotion e_sry;
+ emotion ET_SORRY;
next;
mes "[Angry Woman]";
mes "You're sorry? Do you know what you did? Do you have any idea why I'm mad?";
- emotion e_an,0,"Angry Woman#xmas";
+ emotion ET_FRET, getnpcid(0, "Angry Woman#xmas");
next;
mes "[Frightened Man]";
mes "Well, I just feel like everything's my fault";
@@ -580,20 +580,20 @@ xmas_in,32,99,5 script Singles Union Kwami 10089,{
if (isbegin_quest(15056) == 0) {
mes "[Singles Union Kwami]";
mes "Rinka. It's a huge mystery how such a pretty girl like you ended up in this Singles Union Army.";
- emotion e_lv;
+ emotion ET_THROB;
next;
mes "[Singles Union Rinka]";
mes "You think I'm pretty? hoho... It's mystery for me too, that a handsome man like you joined the Singles Union Army.";
- emotion e_lv,0,"Singles Union Rinka";
+ emotion ET_THROB, getnpcid(0, "Singles Union Rinka");
close;
} else if (isbegin_quest(15056) == 1 && xmas2013_01 < 5) {
mes "[Singles Union Kwami]";
mes "Rinka. It's a huge mystery how such a pretty girl like you ended up in this Singles Union Army.";
- emotion e_lv;
+ emotion ET_THROB;
next;
mes "[Singles Union Rinka]";
mes "You think I'm pretty? hoho... It's mystery for me too, that a handsome man like you joined the Singles Union Army.";
- emotion e_lv,0,"Singles Union Rinka";
+ emotion ET_THROB, getnpcid(0, "Singles Union Rinka");
next;
mes "[Singles Union Kwami]";
mes "Well, isn't it a shame we should spend Christmas alone? What do you say, Rinka, you and me...";
@@ -640,22 +640,22 @@ xmas,156,109,5 script Poor Alchemist#xmas 749,{
if (isbegin_quest(15056) == 0) {
mes "[Poor Alchemist]";
mes "Oh, hello.";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Florist]";
mes "Hello, Mr. Alchemist.";
mes "Are you working today, too?";
- emotion e_ho,0,"Florist#xmas";
+ emotion ET_DELIGHT, getnpcid(0, "Florist#xmas");
close;
} else if (isbegin_quest(15056) == 1 && xmas2013_01 < 5) {
mes "[Poor Alchemist]";
mes "Oh, hello.";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Florist]";
mes "Hello, Mr. Alchemist.";
mes "Are you working today, too?";
- emotion e_ho,0,"Florist#xmas";
+ emotion ET_DELIGHT, getnpcid(0, "Florist#xmas");
next;
mes "[Poor Alchemist]";
mes "Actually, I have something to tell you.";
@@ -768,22 +768,22 @@ xmas,166,164,5 script Raffini Boy#xmas 443,{
if (isbegin_quest(15056) == 0) {
mes "[Raffini Boy]";
mes "This is Lutie village...";
- emotion e_no;
+ emotion ET_STARE_ABOUT;
next;
mes "[Raffini Girl]";
mes "So much beautiful white snow flakes.";
mes "But it's too cold here...";
- emotion e_sob,0,"Raffini Girl#xmas";
+ emotion ET_CRY, getnpcid(0, "Raffini Girl#xmas");
close;
} else if (isbegin_quest(15056) == 1 && xmas2013_01 < 5) {
mes "[Raffini Boy]";
mes "This is Lutie village...";
- emotion e_no;
+ emotion ET_STARE_ABOUT;
next;
mes "[Raffini Girl]";
mes "So much beautiful white snow flakes.";
mes "But it's too cold here...";
- emotion e_sob,0,"Raffini Girl#xmas";
+ emotion ET_CRY, getnpcid(0, "Raffini Girl#xmas");
next;
mes "[Raffini Boy]";
mes "But it's you who wanted to see the snow this Christmas.";
@@ -865,20 +865,20 @@ xmas,147,123,5 script Angeling#xmas 948,{
if (isbegin_quest(15056) == 0) {
mes "[Angeling]";
mes "Kkuing~";
- emotion e_lv;
+ emotion ET_THROB;
next;
mes "[Arc Angeling]";
mes "Kkuing Kkuing~";
- emotion e_lv,0,"Arc Angeling#xmas";
+ emotion ET_THROB, getnpcid(0, "Arc Angeling#xmas");
close;
} else if (isbegin_quest(15056) == 1 && xmas2013_01 < 5) {
mes "[Angeling]";
mes "Kkuing~";
- emotion e_lv;
+ emotion ET_THROB;
next;
mes "[Arc Angeling]";
mes "Kkuing Kkuing~";
- emotion e_lv,0,"Arc Angeling#xmas";
+ emotion ET_THROB, getnpcid(0, "Arc Angeling#xmas");
next;
mes "- I cannot bother them though.";
mes "- Can't even talk to them,";
@@ -905,11 +905,11 @@ xmas,129,115,5 script Prenetan#xmas 783,{
next;
mes "[Prenetan]";
mes "Finally got you, huh? You are cheating on me until now and even made me chase after you? I'll kill you boy!";
- emotion e_an;
+ emotion ET_FRET;
next;
mes "[Umpoucoriotan]";
mes "Ooohh... my wife is too violent. Ohh...it hurts!";
- emotion e_sob,0,"Umpoucoriotan#xmas";
+ emotion ET_CRY, getnpcid(0, "Umpoucoriotan#xmas");
close;
} else if (isbegin_quest(15056) == 1 && xmas2013_01 < 5) {
mes "[Prenetan]";
@@ -918,11 +918,11 @@ xmas,129,115,5 script Prenetan#xmas 783,{
next;
mes "[Prenetan]";
mes "Finally got you, huh? You are cheating on me until now and even made me chase after you? I'll kill you boy!";
- emotion e_an;
+ emotion ET_FRET;
next;
mes "[Umpoucoriotan]";
mes "Ooohh... my wife is too violent. Ohh...it hurts!";
- emotion e_sob,0,"Umpoucoriotan#xmas";
+ emotion ET_CRY, getnpcid(0, "Umpoucoriotan#xmas");
next;
mes "[Umpoucoriotan]";
mes "Wenathan, berzthan, Chabimathan";
@@ -985,20 +985,20 @@ xmas,138,174,5 script Dark Lord#xmas 737,{
if (isbegin_quest(15056) == 0) {
mes "[Dark Lord]";
mes "Whahahahaha the world will turn into darkness soon and everyone will kneel down before me!!";
- emotion e_gasp;
+ emotion ET_SURPRISE;
next;
mes "[Succubus]";
mes "My master. All worlds will follow your will.";
- emotion e_lv,0,"Succubus#xmas";
+ emotion ET_THROB, getnpcid(0, "Succubus#xmas");
close;
} else if (isbegin_quest(15056) == 1 && xmas2013_01 < 5) {
mes "[Dark Lord]";
mes "Whahahahaha the world will turn into darkness soon and everyone will kneel down before me!!";
- emotion e_gasp;
+ emotion ET_SURPRISE;
next;
mes "[Succubus]";
mes "My master. All worlds will follow your will.";
- emotion e_lv,0,"Succubus#xmas";
+ emotion ET_THROB, getnpcid(0, "Succubus#xmas");
next;
mes "[Dark Lord]";
mes "You've been loyal to me even though I've been giving difficult orders. You deserve a reward. What do you want for now? I'll definitely make it for you. I can even give you more power!";
diff --git a/npc/events/easter_2010.txt b/npc/events/easter_2010.txt
index 2d7136c9ed1..ce0ea748ec3 100644
--- a/npc/events/easter_2010.txt
+++ b/npc/events/easter_2010.txt
@@ -55,7 +55,7 @@ prontera,202,297,3 script Rina#Easter 727,{
mes "several problems instead of me.";
next;
if (select("Let's help ^800080Rina^000000.:Just skip it.") == 2) {
- emotion e_sigh;
+ emotion ET_OHNO;
mes "[Rina]";
mes "To help me,";
mes "I need a competent adventurer.";
@@ -63,7 +63,7 @@ prontera,202,297,3 script Rina#Easter 727,{
mes "I hope you to introduce them to me later.";
close;
}
- emotion e_awsm;
+ emotion ET_COOL;
mes "[Rina]";
mes "Are you really going to help me?";
mes "Thank you.";
@@ -90,7 +90,7 @@ prontera,202,297,3 script Rina#Easter 727,{
mes "^800080Oath-taking ceremony^000000 is done enough now.";
mes "Isn't that so simple?";
next;
- emotion e_dum;
+ emotion ET_HUM;
mes "[Rina]";
mes "Okay, from no on,";
mes "you need to go on ^006400a real adventure";
@@ -171,7 +171,7 @@ prontera,202,297,3 script Rina#Easter 727,{
mes "you cannot feel the music.";
mes "What should we do now...";
close2;
- emotion e_sob;
+ emotion ET_CRY;
end;
}
mes "[Rina]";
@@ -215,12 +215,12 @@ prontera,202,297,3 script Rina#Easter 727,{
mes "It must be tough";
mes "but I hope you good luck.";
close2;
- emotion e_sigh;
+ emotion ET_OHNO;
end;
} else {
set .@quest3, checkquest(9123);
if (.@quest3 == 0 || .@quest3 == 1) {
- emotion e_kis;
+ emotion ET_CHUP;
mes "[Rina]";
mes "You're back~!";
mes "My curse has been released.";
@@ -336,7 +336,7 @@ rachel,36,132,4 script #Hiddne04Easter 844,{
prontera,204,297,3 script Rina's Little Friend 463,{
disable_items;
if (checkquest(9117) == -1) {
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
mes "[Rina's Little Friend]";
mes ".......";
mes " ";
@@ -344,7 +344,7 @@ prontera,204,297,3 script Rina's Little Friend 463,{
close;
}
if (checkquest(9123) == 2) {
- emotion e_meh;
+ emotion ET_MERONG;
mes "[Rina's Little Friend]";
mes "Hi.";
mes "I guess you're the trustworthy friend.";
@@ -402,7 +402,7 @@ prontera,204,297,3 script Rina's Little Friend 463,{
else
getitem 9023,1; //Deviruchi_Egg
close2;
- emotion e_yawn;
+ emotion ET_SLEEPY;
end;
} else if (.@nPercentage <= 60) {
if (.@nPercentage >= 42 && .@nPercentage <= 45)
@@ -414,7 +414,7 @@ prontera,204,297,3 script Rina's Little Friend 463,{
mes "I need to take some rest.";
mes "Good bye~!";
close2;
- emotion e_yawn;
+ emotion ET_SLEEPY;
end;
} else if (.@nPercentage <= 85) {
if (.@nPercentage >= 61 && .@nPercentage <= 75) {
@@ -429,7 +429,7 @@ prontera,204,297,3 script Rina's Little Friend 463,{
mes "I didn't mean to do it,";
mes "but I'm sorry...";
mes "I hope to see you again, my friend.";
- emotion e_dum;
+ emotion ET_HUM;
close;
} else {
getitem 12093,2; //Dex_Dish08
@@ -439,7 +439,7 @@ prontera,204,297,3 script Rina's Little Friend 463,{
mes "Looks delicious.";
mes "Then, good bye~!";
close2;
- emotion e_rice;
+ emotion ET_HUNGRY;
end;
}
case 2:
@@ -449,7 +449,7 @@ prontera,204,297,3 script Rina's Little Friend 463,{
mes "pretending to see me?";
mes "It's funny... haha~";
close2;
- emotion e_gg;
+ emotion ET_KIK;
end;
case 3:
playbgm "23.mp3"; // Travel
@@ -504,11 +504,11 @@ prontera,204,297,3 script Rina's Little Friend 463,{
mes "I'll be waiting for you.";
close2;
playbgm "08.mp3"; // Theme of Prontera
- emotion e_gg;
+ emotion ET_KIK;
end;
}
}
- emotion e_meh;
+ emotion ET_MERONG;
mes "[Rina's Little Friend]";
mes "Ahem!";
mes "Why? Are you surprised to see me speaking?";
@@ -549,7 +549,7 @@ prontera,116,82,5 script Traveler#01Easter 85,{
mes "who were standing";
mes "near the ^8B4513Cathedral^000000.";
next;
- emotion e_lv;
+ emotion ET_THROB;
mes "[Traveler]";
mes "That adventurer seemed pretty.";
mes "But...";
@@ -584,7 +584,7 @@ OnInit:
initnpctimer;
end;
OnTimer5000:
- emotion e_gasp;
+ emotion ET_SURPRISE;
stopnpctimer;
initnpctimer;
end;
@@ -613,7 +613,7 @@ OnInit:
initnpctimer;
end;
OnTimer5000:
- emotion e_gasp;
+ emotion ET_SURPRISE;
stopnpctimer;
initnpctimer;
end;
diff --git a/npc/events/event_skill_reset.txt b/npc/events/event_skill_reset.txt
index 3d7585cf336..f09a78a179b 100644
--- a/npc/events/event_skill_reset.txt
+++ b/npc/events/event_skill_reset.txt
@@ -95,7 +95,7 @@ L_Reset:
mes @npcname$;
mes "It seems that you don't have enough money.";
mes "In addition we wait for the opportunity.";
- emotion e_hmm;
+ emotion ET_SCRATCH;
close;
}
set Zeny, Zeny-@zeny;
@@ -103,7 +103,7 @@ L_Reset:
resetskill;
mes @npcname$;
mes "Thank you.";
- emotion e_thx;
+ emotion ET_THANKS;
// logmes "SKILL RESET EVENT";
close;
}
diff --git a/npc/events/gdevent_aru.txt b/npc/events/gdevent_aru.txt
index 22648935f0b..cc0ac58ff69 100644
--- a/npc/events/gdevent_aru.txt
+++ b/npc/events/gdevent_aru.txt
@@ -173,7 +173,7 @@ arug_dun01,199,195,5 script Dwarf#aru_gd 826,{
case 2:
set $@gdeventv_a1,0;
set $@gdevents_a$,"";
- emotion e_sob;
+ emotion ET_CRY;
mes "[Dwarf]";
mes "Ahhh...";
close;
@@ -306,7 +306,7 @@ arug_dun01,199,195,5 script Dwarf#aru_gd 826,{
case 2:
set $@gdeventv_a1,0;
set $@gdevents_a$,"";
- emotion e_sob;
+ emotion ET_CRY;
mes "[Dwarf]";
mes "Ah....";
close;
@@ -450,7 +450,7 @@ arug_dun01,199,195,5 script Dwarf#aru_gd 826,{
case 2:
set $@gdeventv_a1,0;
set $@gdevents_a$,"";
- emotion e_sob;
+ emotion ET_CRY;
mes "[Dwarf]";
mes "Ah....";
close;
@@ -539,22 +539,22 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 715,{
mes "Let me see...";
mapannounce "arug_que01", "Pierrot Pier: Let me see...",bc_map,"0x99CC00";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "[Pierrot Pier]";
mes "Hm...";
mapannounce "arug_que01", "Pierrot Pier: Hm...",bc_map,"0x99CC00";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "[Pierrot Pier]";
mes "Okay, I see...";
mapannounce "arug_que01", "Pierrot Pier: Okay, I see...",bc_map,"0x99CC00";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "[Pierrot Pier]";
mes "Indeed...";
mapannounce "arug_que01", "Pierrot Pier: Indeed...",bc_map,"0x99CC00";
next;
- emotion e_bzz;
+ emotion ET_STARE;
mes "[Pierrot Pier]";
mes "Verification completed!";
mapannounce "arug_que01", "Pierrot Pier: Verification completed!",bc_map,"0x99CC00";
@@ -570,12 +570,12 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 715,{
mes "^3131FF<You're someone who can only think about nonsense everyday, you have no focus at all.>^000000";
mapannounce "arug_que01", "Pierrot Pier: <You're someone who can only think about nonsense everyday, you have no focus at all.>",bc_map,"0x99CC00";
next;
- emotion e_ho;
+ emotion ET_DELIGHT;
mes "[Pierrot Pier]";
mes "Hm? You don't think so?";
mapannounce "arug_que01", "Pierrot Pier: Hm? You don't think so?",bc_map,"0x99CC00";
next;
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Pierrot Pier]";
mes "Haha, I'm just kidding. Beep beep.";
mes "Ah, you are the one my master speaks of.";
@@ -628,7 +628,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 715,{
case 2:
break;
case 3:
- emotion e_sob;
+ emotion ET_CRY;
mes "[Pierrot Pier]";
mes "Oh, you don't want to play?";
close;
@@ -878,22 +878,22 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 715,{
mes "Let me see...";
mapannounce "arug_que01", "Pierrot Pier: Let me see...",bc_map,"0x99CC00";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "[Pierrot Pier]";
mes "Hm...";
mapannounce "arug_que01", "Pierrot Pier: Hm...",bc_map,"0x99CC00";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "[Pierrot Pier]";
mes "Okay, I see...";
mapannounce "arug_que01", "Pierrot Pier: Okay, I see...",bc_map,"0x99CC00";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "[Pierrot Pier]";
mes "Indeed...";
mapannounce "arug_que01", "Pierrot Pier: Indeed...",bc_map,"0x99CC00";
next;
- emotion e_bzz;
+ emotion ET_STARE;
mes "[Pierrot Pier]";
mes "Verification completed!";
mapannounce "arug_que01", "Pierrot Pier: Verification completed!",bc_map,"0x99CC00";
@@ -905,11 +905,11 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 715,{
mes "When is that person coming? I am very bored~!";
close;
}
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Pierrot Pier]";
mes "^3131FF<Although you're a weirdo, you seem to be very dedicated>^000000. Beep beep.";
next;
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
mes "[Pierrot Pier]";
mes "Hm? You don't think so?";
next;
diff --git a/npc/events/gdevent_sch.txt b/npc/events/gdevent_sch.txt
index 89ced007a67..197141c5019 100644
--- a/npc/events/gdevent_sch.txt
+++ b/npc/events/gdevent_sch.txt
@@ -173,7 +173,7 @@ schg_dun01,194,148,5 script Dwarf#sch_gd 826,{
case 2:
set $@gdeventv_s1,0;
set $@gdevents_s$,"";
- emotion e_sob;
+ emotion ET_CRY;
mes "[Dwarf]";
mes "Ahhh...";
close;
@@ -306,7 +306,7 @@ schg_dun01,194,148,5 script Dwarf#sch_gd 826,{
case 2:
set $@gdeventv_s1,0;
set $@gdevents_s$,"";
- emotion e_sob;
+ emotion ET_CRY;
mes "[Dwarf]";
mes "Ah....";
close;
@@ -449,7 +449,7 @@ schg_dun01,194,148,5 script Dwarf#sch_gd 826,{
case 2:
set $@gdeventv_s1,0;
set $@gdevents_s$,"";
- emotion e_sob;
+ emotion ET_CRY;
mes "[Dwarf]";
mes "Ah....";
close;
@@ -538,22 +538,22 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 715,{
mes "Let me see...";
mapannounce "schg_que01", "Pierrot Pier: Let me see...",bc_map,"0x99CC00";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "[Pierrot Pier]";
mes "Hm...";
mapannounce "schg_que01", "Pierrot Pier: Hm...",bc_map,"0x99CC00";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "[Pierrot Pier]";
mes "Okay, I see...";
mapannounce "schg_que01", "Pierrot Pier: Okay, I see...",bc_map,"0x99CC00";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "[Pierrot Pier]";
mes "Indeed...";
mapannounce "schg_que01", "Pierrot Pier: Indeed...",bc_map,"0x99CC00";
next;
- emotion e_bzz;
+ emotion ET_STARE;
mes "[Pierrot Pier]";
mes "Verification completed!";
mapannounce "schg_que01", "Pierrot Pier: Verification completed!",bc_map,"0x99CC00";
@@ -569,12 +569,12 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 715,{
mes "^3131FF<You're someone who can only think about nonsense everyday, you have no focus at all.>^000000";
mapannounce "schg_que01", "Pierrot Pier: <You're someone who can only think about nonsense everyday, you have no focus at all.>",bc_map,"0x99CC00";
next;
- emotion e_ho;
+ emotion ET_DELIGHT;
mes "[Pierrot Pier]";
mes "Hm? You don't think so?";
mapannounce "schg_que01", "Pierrot Pier: Hm? You don't think so?",bc_map,"0x99CC00";
next;
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Pierrot Pier]";
mes "Haha, I'm just kidding. Beep beep.";
mes "Ah, you are the one my master speaks of.";
@@ -627,7 +627,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 715,{
case 2:
break;
case 3:
- emotion e_sob;
+ emotion ET_CRY;
mes "[Pierrot Pier]";
mes "Oh, you don't want to play?";
close;
@@ -877,22 +877,22 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 715,{
mes "Let me see...";
mapannounce "schg_que01", "Pierrot Pier: Let me see...",bc_map,"0x99CC00";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "[Pierrot Pier]";
mes "Hm...";
mapannounce "schg_que01", "Pierrot Pier: Hm...",bc_map,"0x99CC00";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "[Pierrot Pier]";
mes "Okay, I see...";
mapannounce "schg_que01", "Pierrot Pier: Okay, I see...",bc_map,"0x99CC00";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "[Pierrot Pier]";
mes "Indeed...";
mapannounce "schg_que01", "Pierrot Pier: Indeed...",bc_map,"0x99CC00";
next;
- emotion e_bzz;
+ emotion ET_STARE;
mes "[Pierrot Pier]";
mes "Verification completed!";
mapannounce "schg_que01", "Pierrot Pier: Verification completed!",bc_map,"0x99CC00";
@@ -904,11 +904,11 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 715,{
mes "When is that person coming? I am very bored~!";
close;
}
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Pierrot Pier]";
mes "^3131FF<Although you're a weirdo, you seem to be very dedicated>^000000. Beep beep.";
next;
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
mes "[Pierrot Pier]";
mes "Hm? You don't think so?";
next;
diff --git a/npc/events/halloween_2006.txt b/npc/events/halloween_2006.txt
index e4d4151e4b4..faff568081d 100644
--- a/npc/events/halloween_2006.txt
+++ b/npc/events/halloween_2006.txt
@@ -654,7 +654,7 @@ nif_fild01,167,113,3 script Masta's chicken#06_hw01 800,{
next;
input .@inputstr$;
if( .@inputstr$ == "Return" ) {
- emotion e_omg;
+ emotion ET_HUK;
specialeffect EF_TELEPORTATION;
mes "The magic spell has been casted.";
set halloween, 103;
@@ -1035,11 +1035,11 @@ prontera,155,285,3 script Familiar#06_hw01::HWFamiDup 799,{
mes "Hello.";
mes "I'm Loli Ruri's faithful and cute Familiar.";
mes "Do you have an invitation from Loli Ruri?";
- mes "That's a kind of^4d4dffa special ticket to Nifflheim^000000..";
+ mes "That's a kind of^4d4dffa special ticket to Niflheim^000000..";
next;
if (select( "Yes, I do.:No, I don't.") == 1) {
mes "[Familiar]";
- mes "Do you want to go to Nifflheim?";
+ mes "Do you want to go to Niflheim?";
mes "It's available during Halloween.";
next;
if (select( "Yes, I do:No, I don't.") == 1) {
@@ -1058,13 +1058,13 @@ prontera,155,285,3 script Familiar#06_hw01::HWFamiDup 799,{
mes "You don't have the ticket!";
mes "I'll suck up all your blood, you liar!";
percentheal -20,0;
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
close;
}
}
mes "[Familiar]";
mes "Ok.";
- mes "Actually, it's useless to have a special ticket to Nifflheim.";
+ mes "Actually, it's useless to have a special ticket to Niflheim.";
close;
}
mes "[Familiar]";
diff --git a/npc/events/idul_fitri.txt b/npc/events/idul_fitri.txt
index 13c74489b3c..726f5da1141 100644
--- a/npc/events/idul_fitri.txt
+++ b/npc/events/idul_fitri.txt
@@ -62,12 +62,12 @@ prontera,146,92,3 script Cellerb 58,{
next;
mes "[Staff Idul Fitri]";
mes "We appreciate your participation in this special event.";
- emotion e_thx;
+ emotion ET_THANKS;
close;
case 2:
mes "[Staff Idul Fitri]";
mes "Oh well, maybe you will participate in tommorow's quest.";
- emotion e_hmm;
+ emotion ET_SCRATCH;
close;
}
}
diff --git a/npc/events/nguild/nguild_warper.txt b/npc/events/nguild/nguild_warper.txt
index 981e3c234f3..2f69038ff84 100644
--- a/npc/events/nguild/nguild_warper.txt
+++ b/npc/events/nguild/nguild_warper.txt
@@ -51,15 +51,15 @@ prontera,146,163,6 script Novice Castles 729,{
) {
mes "I see... your guild has Emergency Call mastered.";
mes "You cannot enter the Novice Castle area.";
- emotion e_hmm;
- emotion e_wah,1;
+ emotion ET_SCRATCH;
+ emotion ET_KEK, playerattached();
} else {
mes "I'm a new usher of Novice Castles.";
next;
mes "[Cita]";
if ((eaclass()&(EAJL_2|EAJL_UPPER)) || BaseLevel>=60) {
mes "I'm sorry, you can't enter the sacred Novice Castles place.";
- emotion e_sry;
+ emotion ET_SORRY;
} else if (select("Warp me to Novice Castles","Cancel") == 1) {
// remove several unallowed buffs
sc_end SC_ASSUMPTIO;
diff --git a/npc/events/twintowers.txt b/npc/events/twintowers.txt
index 43d8c63383a..8f431d71944 100644
--- a/npc/events/twintowers.txt
+++ b/npc/events/twintowers.txt
@@ -65,25 +65,25 @@ prontera,146,92,4 script Twin Towers#tt1::Twin-Towers 812,{
menu "Hidden Temple", HiddenTemple,"Orc Dungeon",OrcDungeon,"Ant Hell",AntHell,"Mjolnir Waste Pit",MjolnirWastePit,"Sphinx",Sphinx,"Glast Heim",GlastHeim,"Comodo",Comodo;
HiddenTemple:
warp "prt_fild01",136,368;
- close;
+ end;
OrcDungeon:
warp "gef_fild10",67,334;
- close;
+ end;
AntHell:
warp "moc_fild04",210,329;
- close;
+ end;
MjolnirWastePit:
warp "mjolnir_02",79,361;
- close;
+ end;
Sphinx:
warp "moc_fild19",105,99;
- close;
+ end;
GlastHeim:
warp "gef_fild06",45,304;
- close;
+ end;
Comodo:
warp "cmd_fild01",30,317;
- close;
+ end;
}
morocc,160,97,4 duplicate(Twin-Towers) Twin Towers#tt2 812
diff --git a/npc/events/xmas.txt b/npc/events/xmas.txt
index 5e6eb4a7dde..b025bb69d0a 100644
--- a/npc/events/xmas.txt
+++ b/npc/events/xmas.txt
@@ -106,7 +106,7 @@ L_Start:
close;
OnInit:
- disablenpc "Santa1";
+ disablenpc "Santa Claus";
end;
}
diff --git a/npc/guild2/agit_main_se.txt b/npc/guild2/agit_main_se.txt
index b0197187dc3..462695fc2f8 100644
--- a/npc/guild2/agit_main_se.txt
+++ b/npc/guild2/agit_main_se.txt
@@ -1003,11 +1003,11 @@ OnInit:
mes "their Magic properties by";
mes "their casting effect.^000000";
next;
- setarray .@effect[0],56,54,225;
+ setarray .@effect[0],EF_BEGINSPELL4,EF_BEGINSPELL2,EF_VOLCANO;
setarray .@color$[0],"Red","Yellow","Blue";
while(1) {
if (.@roof0 > 7) break;
- set .@i, rand(3);
+ set .@i, rand(getarraysize(.@effect));
specialeffect .@effect[.@i];
mes "^3355FFThe Gemstones must";
mes "be arranged in the correct";
diff --git a/npc/instances/SealedShrine.txt b/npc/instances/SealedShrine.txt
index 42d97110dc5..f662e727f33 100644
--- a/npc/instances/SealedShrine.txt
+++ b/npc/instances/SealedShrine.txt
@@ -1095,11 +1095,11 @@ OnTouch_:
specialeffect EF_LEXDIVINA;
disablenpc instance_npcname(strnpcinfo(0));
set .@map$, instance_mapname("2@cata");
- if (strnpcinfo(2) == "0") areamobuseskill .@map$,79,81,10,1929,"NPC_INVINCIBLEOFF",1,0,0,e_hlp,0;
- else if (strnpcinfo(2) == "2") areamobuseskill .@map$,123,109,10,1929,"NPC_INVINCIBLEOFF",1,0,0,e_hlp,0;
- else if (strnpcinfo(2) == "4") areamobuseskill .@map$,123,22,10,1929,"NPC_INVINCIBLEOFF",1,0,0,e_hlp,0;
- else if (strnpcinfo(2) == "8") areamobuseskill .@map$,35,21,10,1929,"NPC_INVINCIBLEOFF",1,0,0,e_hlp,0;
- else if (strnpcinfo(2) == "10") areamobuseskill .@map$,35,109,10,1929,"NPC_INVINCIBLEOFF",1,0,0,e_hlp,0;
+ if (strnpcinfo(2) == "0") areamobuseskill .@map$,79,81,10,1929,"NPC_INVINCIBLEOFF",1,0,0,ET_HELP,0;
+ else if (strnpcinfo(2) == "2") areamobuseskill .@map$,123,109,10,1929,"NPC_INVINCIBLEOFF",1,0,0,ET_HELP,0;
+ else if (strnpcinfo(2) == "4") areamobuseskill .@map$,123,22,10,1929,"NPC_INVINCIBLEOFF",1,0,0,ET_HELP,0;
+ else if (strnpcinfo(2) == "8") areamobuseskill .@map$,35,21,10,1929,"NPC_INVINCIBLEOFF",1,0,0,ET_HELP,0;
+ else if (strnpcinfo(2) == "10") areamobuseskill .@map$,35,109,10,1929,"NPC_INVINCIBLEOFF",1,0,0,ET_HELP,0;
percentheal -50,0;
sc_start Eff_Stone,20000,0;
setquest 3041;
diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt
index aca7432cb3e..7da38ab88d5 100644
--- a/npc/jobs/2-1/assassin.txt
+++ b/npc/jobs/2-1/assassin.txt
@@ -297,7 +297,7 @@ in_moc_16,19,33,1 script Guildsman#asn 55,{
in_moc_16,25,90,1 script Guildsman#ASN2 730,2,2,{
mes "[Assassin 'Khai']";
mes "Umm?!";
- emotion e_gasp;
+ emotion ET_SURPRISE;
next;
mes "[Assassin 'Khai']";
mes "Come closer. I prefer to talk to people face to face. It really irritates me if I have to raise my voice, just so you can hear me.";
@@ -1606,7 +1606,8 @@ OnTouch_:
if (ASSIN_Q == 5 || ASSIN_Q == 6) {
warp "in_moc_16",181,183;
set ASSIN_Q,ASSIN_Q+1;
- changequest 8005,8006;
+ if (!isbegin_quest(8006))
+ changequest 8005,8006;
}
else {
mapannounce "in_moc_16",strcharinfo(0)+" has entered 'Guildmaster's room.'",bc_map;
diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt
index 7e3f66a06bf..810ab73392b 100644
--- a/npc/jobs/2-1/blacksmith.txt
+++ b/npc/jobs/2-1/blacksmith.txt
@@ -1076,7 +1076,7 @@ morocc,27,112,4 script Wickebine#BLS 725,{
mes "Tell him I'm satisfied with the quality of the workmanship.";
next;
getitem 1073,1; //Merchant_Voucher_1
- emotion e_lv;
+ emotion ET_THROB;
mes "[Wickebine]";
mes "Here's the receipt.";
mes "I think you did";
@@ -1087,7 +1087,7 @@ morocc,27,112,4 script Wickebine#BLS 725,{
end;
}
else if (BSMITH_Q == 14) {
- emotion e_lv;
+ emotion ET_THROB;
cutin "Job_Black_hucke02",2;
mes "[Wickebine]";
mes "Thanks for the delivery.";
@@ -1113,7 +1113,7 @@ morocc,27,112,4 script Wickebine#BLS 725,{
mes "[Wickebine]";
mes "How long does it take for something to ship from Geschupenschte? Usually, the Geffen Blacksmith Guild is pretty prompt...";
next;
- emotion e_lv;
+ emotion ET_THROB;
mes "[Wickebine]";
mes "Ooohh...";
mes "This is very";
@@ -1375,7 +1375,7 @@ hugel,168,183,1 script Bismarc#BLS 118,{
ein_in01,24,41,5 script Blacksmith Guildsman#moc 726,{
if (BSMITH_Q == 16) {
- emotion e_hmm;
+ emotion ET_SCRATCH;
mes "[Mitehmaeeuh]";
mes "Oh...so you're the one who wants to be a blacksmith?";
mes "Nice, heh heh.";
@@ -1563,7 +1563,7 @@ ein_in01,24,41,5 script Blacksmith Guildsman#moc 726,{
close;
}
else if (BSMITH_Q == 17) {
- emotion e_hmm;
+ emotion ET_SCRATCH;
mes "[Mitehmaeeuh]";
mes "Yeap, you just passed the Blacksmith job test~";
next;
@@ -1578,7 +1578,7 @@ ein_in01,24,41,5 script Blacksmith Guildsman#moc 726,{
close;
}
else {
- emotion e_hmm;
+ emotion ET_SCRATCH;
mes "[Mitehmaeeuh]";
mes "I had to deal with the heat when I was in Morroc,";
mes "and now I have to deal with the smog in this Einbroch!";
diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt
index a3147448804..e11664b86d3 100644
--- a/npc/jobs/2-2/dancer.txt
+++ b/npc/jobs/2-2/dancer.txt
@@ -1328,14 +1328,14 @@ job_duncer,63,110,4 script Backdancer#1 724,{
end;
OnSmile:
- emotion e_no1;
+ emotion ET_BEST;
donpcevent "Backdancer#2::OnSmile";
donpcevent "Backdancer#3::OnSmile";
donpcevent "Backdancer#4::OnSmile";
end;
OnOmg:
- emotion e_omg;
+ emotion ET_HUK;
donpcevent "Backdancer#2::OnOmg";
donpcevent "Backdancer#3::OnOmg";
donpcevent "Backdancer#4::OnOmg";
@@ -1346,11 +1346,11 @@ job_duncer,66,113,4 script Backdancer#2 724,{
end;
OnSmile:
- emotion e_no1;
+ emotion ET_BEST;
end;
OnOmg:
- emotion e_omg;
+ emotion ET_HUK;
end;
}
@@ -1358,11 +1358,11 @@ job_duncer,72,113,4 script Backdancer#3 724,{
end;
OnSmile:
- emotion e_no1;
+ emotion ET_BEST;
end;
OnOmg:
- emotion e_omg;
+ emotion ET_HUK;
end;
}
@@ -1370,11 +1370,11 @@ job_duncer,75,110,4 script Backdancer#4 724,{
end;
OnSmile:
- emotion e_no1;
+ emotion ET_BEST;
end;
OnOmg:
- emotion e_omg;
+ emotion ET_HUK;
end;
}
diff --git a/npc/jobs/2-2e/SoulLinker.txt b/npc/jobs/2-2e/SoulLinker.txt
index c40ca0eb7ac..522bfb25f3f 100644
--- a/npc/jobs/2-2e/SoulLinker.txt
+++ b/npc/jobs/2-2e/SoulLinker.txt
@@ -91,7 +91,7 @@ morocc_in,174,30,6 script Kid#link1 716,{
mes "in you! I might look";
mes "like a kid, but I'm over";
mes "three hundred years old!";
- emotion e_pif;
+ emotion ET_HNG;
next;
mes "[Kid]";
mes "Now listen...";
@@ -100,7 +100,7 @@ morocc_in,174,30,6 script Kid#link1 716,{
mes "It's a respectable art, but";
mes "I've got a proposition for";
mes "you if you want to hear it.";
- emotion e_heh;
+ emotion ET_SMILE;
next;
mes "[Kid]";
mes "I'm looking at you, and I can";
@@ -229,7 +229,7 @@ morocc_in,174,30,6 script Kid#link1 716,{
mes "go back and bring";
mes "everything that I ask";
mes "for this time, okay?";
- emotion e_pif;
+ emotion ET_HNG;
next;
mes "[Kid]";
mes "I know I just told you";
diff --git a/npc/jobs/novice/supernovice.txt b/npc/jobs/novice/supernovice.txt
index eb47f20bd01..5dccc886755 100644
--- a/npc/jobs/novice/supernovice.txt
+++ b/npc/jobs/novice/supernovice.txt
@@ -117,7 +117,7 @@ aldeba_in,223,167,3 script Tzerero#sn 709,{
mes ".....";
mes ".......";
mes ".........";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "[Tzerero]";
mes "I see that the light";
diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt
index 85a60e85f48..d5b165919c8 100644
--- a/npc/kafras/functions_kafras.txt
+++ b/npc/kafras/functions_kafras.txt
@@ -1,12 +1,12 @@
-//===== rAthena Script =======================================
+//===== rAthena Script =======================================
//= Kafra Functions
-//===== By: ==================================================
+//===== By: ==================================================
//= rAthena Dev Team
//= Darlskies, Darkchild, Syrus22, Lupus, kobra_k88 (2.0)
//= L0ne_W0lf
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 6.8
-//===== Compatible With: =====================================
+//===== Compatible With: =====================================
//= rAthena Project
//===== Description: =========================================
//= These functions handle save, storage, cart rental, teleport,
@@ -15,7 +15,7 @@
//= Kafra's will need a lot of work. The Welcome Message argument
//= may become obsolete, as most kafras have a slightly differing
//= Welcome message.
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.1 Now using functions v2.1 Added Cart Rent for Classes: Whitesmith, Professor.
//= Replaced checkoption(x) into checkcart(0) [Lupus] v2.1b Added Fix Kafra Pass Func [Kobra_k88]
//= 2.2 Final fix of the Kafra Pass Exploit! [Lupus] a -Izlude[4] fix
@@ -39,7 +39,7 @@
//= 5.1a Temporary? Added F_ClearGarbage to clear unused/outdated variables [Lupus]
//= 5.2 By default commented out custom Guilds Kafra's "Guild Storage". [Lupus]
//= 5.3 uncommented Guild Storage. Confirmed kRO feature. [Lupus]
-//= 5.4 added -Guide option (Kafra shows you nearest Guide) Work in progress.
+//= 5.4 added -Guide option (Kafra shows you nearest Guide) Work in progress.
//= Need all coords for all guides.. and somehow pass their coords to kafra.
//= Removed universal Kafra Pass, added 3 new Kafra Tickets [Lupus]
//= 5.4b temporary moved "-Guide" from the 1st menu punct [Lupus]
@@ -47,7 +47,7 @@
//= Cleaned up the menus a bit. Got rid of the proceeding "-" prefix.
//= 5.5b Missed a preceeding hyphen, which was screwing up teleporting. [L0ne_W0lf]
//= 5.6 Further dialog updates, added dynamic costs for cart and storage use. [L0ne_W0lf]
-//= Updated some functions to handle Guild Kafras the way they should.
+//= Updated some functions to handle Guild Kafras the way they should.
//= 5.6a Corrected a few wrong names in the teleport function. [L0ne_W0lf]
//= 5.7 Correced end message no longer displaying, and the duplicate names [L0ne_W0lf]
//= Thanks to Barron-Monster for pointing out the issues.
@@ -63,7 +63,7 @@
//= 6.6 Added Warp Points / View Points Function. [Joseph]
//= 6.7 Added Rune Knight Kafra. [Euphy]
//= 6.8 Updated some functions and added VIP features. [Euphy]
-//============================================================
+//============================================================
//=== Main Function ========================================================
//= arg(0): Used to determine which welcome message to show.
@@ -78,97 +78,85 @@ function script F_Kafra {
.@menu_num = getarg(1);
// Display Kafra Welcome Message
- switch(.@welcome){
- default:
- case 0:
- // Default message (obsolete)
- mes "[Kafra Employee]";
- mes "Welcome to the";
- mes "Kafra Corporation.";
- mes "The Kafra services";
- mes "are always on your side.";
- mes "How may I assist you?";
- break;
- case 1:
- // Niflheim specific message
- mes "[Kafra Employee]";
- mes "^666666W-weeeelc-c-come";
- mes "to th-the K-kaaafrrrra";
- mes "C-coorpoor-r-ratioooonn...^000000";
- break;
- case 2:
- // Guild Castle Kafra message
- set @GID,getcharid(2);
- mes "[Kafra Employee]";
- mes "Welcome. ^ff0000" + GetGuildName(@GID) + "^000000 Member.";
- mes "The Kafra Coporation will stay with you wherever you go.";
- break;
- case 3:
- // Amatsu specific message (obsolete)
- mes "[Kafra Employee]";
- mes "So, have you come from a faraway land to study our culture, or are you just sightseeing?";
- mes "In either case, why not stay awhile?";
- mes "The air is eternally heavy with the";
- mes "scent of pleasant wildflowers.";
- break;
- case 4:
- // Louyang and Ayothaya specific message (obsolete)
- mes "[Kafra Employee]";
- mes "With our many Kafra";
- mes "service locations, you're never";
- mes "far from home.";
- break;
- case 5:
- // NPC has it's own welcome message. (Display nothing)
- break;
+ switch(.@welcome) {
+ default:// Default message (obsolete)
+ mes "[Kafra Employee]";
+ mes "Welcome to the";
+ mes "Kafra Corporation.";
+ mes "The Kafra services";
+ mes "are always on your side.";
+ mes "How may I assist you?";
+ break;
+ case 1:// Niflheim specific message
+ mes "[Kafra Employee]";
+ mes "^666666W-weeeelc-c-come";
+ mes "to th-the K-kaaafrrrra";
+ mes "C-coorpoor-r-ratioooonn...^000000";
+ break;
+ case 2:// Guild Castle Kafra message
+ mes "[Kafra Employee]";
+ mes "Welcome. ^ff0000" + getguildname( getcharid(2) ) + "^000000 Member.";
+ mes "The Kafra Coporation will stay with you wherever you go.";
+ break;
+ case 3:// Amatsu specific message (obsolete)
+ mes "[Kafra Employee]";
+ mes "So, have you come from a faraway land to study our culture, or are you just sightseeing?";
+ mes "In either case, why not stay awhile?";
+ mes "The air is eternally heavy with the";
+ mes "scent of pleasant wildflowers.";
+ break;
+ case 4:// Louyang and Ayothaya specific message (obsolete)
+ mes "[Kafra Employee]";
+ mes "With our many Kafra";
+ mes "service locations, you're never";
+ mes "far from home.";
+ break;
+ case 5:// NPC has it's own welcome message. (Display nothing)
+ break;
}
next;
- while (1) {
- deletearray @K_Menu0$[0],getarraysize(@K_Menu0$);
- if (.@welcome == 2) {
- // Guild Kafra Menu override (free Teleport, free Storage, Free Cart)
- setarray @K_Menu0$[0],"Use Storage","Use Guild Storage","Rent a Pushcart","Use Teleport Service","Cancel";
- } else {
- switch(.@menu_num){
- // Save and Storage only
- case 1: setarray @K_Menu0$[0],"Save","Use Storage","Cancel"; break;
- // Storage only
- case 2: setarray @K_Menu0$[0],"Use Storage","Cancel"; break;
- // No Teleport (Common)
- case 3: setarray @K_Menu0$[0],"Save","Use Storage","Rent a Pushcart","Check Other Information","Cancel"; break;
- // Case 4 is Einbroch no tele message.
- // No save, or teleport. (Common)
- case 5: setarray @K_Menu0$[0],"Use Storage","Rent a Pushcart","Check Other Information","Cancel"; break;
- // Storage and Check Other Information only.
- case 6: setarray @K_Menu0$[0],"Use Storage","Check Other Information","Cancel"; break;
- // Save, Storage, and Pushcart only (Kafra Warehouse)
- case 7: setarray @K_Menu0$[0],"Save","Use Storage","Rent a Pushcart","Cancel"; break;
- // Save, Storage, Other Check information. (Turbo track)
- case 8: setarray @K_Menu0$[0],"Save","Use Storage","Check Other Information","Cancel"; break;
- // No Save (Rune Knight)
- case 9: setarray @K_Menu0$[0],"Use Storage","Rent a Pushcart","Use Teleport Service","Check Other Information","Cancel"; break;
- // Storage, Save, and Pushcart (Dewata, reorder of case 7)
- case 10: setarray @K_Menu0$[0],"Use Storage","Save","Rent a Pushcart","Cancel"; break;
- // Default message (obsolete)
- default: setarray @K_Menu0$[0],"Save","Use Storage","Use Teleport Service","Rent a Pushcart","Check Other Information","Cancel"; break;
- }
+ if (.@welcome == 2)// Guild Kafra Menu override (free Teleport, free Storage, Free Cart)
+ setarray .@K_Menu0$[0], "Use Storage", "Use Guild Storage", "Rent a Pushcart", "Use Teleport Service", "Cancel";
+ else {
+ switch(.@menu_num) {
+ // Save and Storage only
+ case 1: setarray .@K_Menu0$[0],"Save","Use Storage","Cancel"; break;
+ // Storage only
+ case 2: setarray .@K_Menu0$[0],"Use Storage","Cancel"; break;
+ // No Teleport (Common)
+ case 3: setarray .@K_Menu0$[0],"Save","Use Storage","Rent a Pushcart","Check Other Information","Cancel"; break;
+ // Case 4 is Einbroch no tele message.
+ // No save, or teleport. (Common)
+ case 5: setarray .@K_Menu0$[0],"Use Storage","Rent a Pushcart","Check Other Information","Cancel"; break;
+ // Storage and Check Other Information only.
+ case 6: setarray .@K_Menu0$[0],"Use Storage","Check Other Information","Cancel"; break;
+ // Save, Storage, and Pushcart only (Kafra Warehouse)
+ case 7: setarray .@K_Menu0$[0],"Save","Use Storage","Rent a Pushcart","Cancel"; break;
+ // Save, Storage, Other Check information. (Turbo track)
+ case 8: setarray .@K_Menu0$[0],"Save","Use Storage","Check Other Information","Cancel"; break;
+ // No Save (Rune Knight)
+ case 9: setarray .@K_Menu0$[0],"Use Storage","Rent a Pushcart","Use Teleport Service","Check Other Information","Cancel"; break;
+ // Storage, Save, and Pushcart (Dewata, reorder of case 7)
+ case 10: setarray .@K_Menu0$[0],"Use Storage","Save","Rent a Pushcart","Cancel"; break;
+ // Default message (obsolete)
+ default: setarray .@K_Menu0$[0],"Save","Use Storage","Use Teleport Service","Rent a Pushcart","Check Other Information","Cancel"; break;
}
- set .@menu$,"";
- for (set .@i, 0; .@i < getarraysize(@K_Menu0$); set .@i, .@i + 1)
- set .@menu$, .@menu$ + @K_Menu0$[.@i] + ":";
- set .@j, select (.@menu$) - 1;
- if (@K_Menu0$[.@j] == "Save") {
+ }
+ .@menu$ = implode(.@K_Menu0$,":");
+ while (true) {
+ .@j = select(.@menu$) - 1;
+ if (.@K_Menu0$[.@j] == "Save")
return;
- } else if (@K_Menu0$[.@j] == "Use Storage") {
- // Do not charge for Guild Storage
- if(.@welcome == 2)
+ else if (.@K_Menu0$[.@j] == "Use Storage") {
+ if (.@welcome == 2)// Do not charge for Guild Storage
callfunc "F_KafStor",2,0,0;
- else
+ else
callfunc "F_KafStor",0,getarg(3),.@welcome;
next;
- } else if (@K_Menu0$[.@j] == "Use Teleport Service") {
- // Display Einbroch "No Teleport Service" notice.
- if(.@menu_num != 4) callfunc "F_KafTele",.@welcome;
+ }
+ else if (.@K_Menu0$[.@j] == "Use Teleport Service") {
+ if (.@menu_num != 4)// Display Einbroch "No Teleport Service" notice.
+ callfunc "F_KafTele",.@welcome;
else {
mes "[Kafra Employee]";
mes "Because of the ^FF0000Limited";
@@ -184,16 +172,20 @@ function script F_Kafra {
mes "understanding and cooperation.";
}
next;
- } else if (@K_Menu0$[.@j] == "Rent a Pushcart") {
- if(callfunc("F_KafCart",.@welcome,getarg(4)) == 1)
+ }
+ else if (.@K_Menu0$[.@j] == "Rent a Pushcart") {
+ if (callfunc("F_KafCart",.@welcome,getarg(4)) == 1)
next;
- } else if (@K_Menu0$[.@j] == "Check Other Information") {
+ }
+ else if (.@K_Menu0$[.@j] == "Check Other Information") {
callfunc "F_KafInfo",getarg(2);
next;
- } else if (@K_Menu0$[.@j] == "Cancel"){
+ }
+ else if (.@K_Menu0$[.@j] == "Cancel") {
callfunc "F_KafEnd",.@welcome,0;
end;
- } else if (@K_Menu0$[.@j] == "Use Guild Storage") {
+ }
+ else if (.@K_Menu0$[.@j] == "Use Guild Storage") {
callfunc "F_KafStor",1,0;
next;
}
@@ -208,20 +200,18 @@ function script F_KafStor {
.@fee = getarg(1);
// Unable to access Guild Storage (Busy)
- if(.@type == 1){
- if(guildopenstorage()){
+ if (.@type == 1) {
+ if (guildopenstorage()) {
mes "[Kafra Employee]";
mes "I'm sorry but another guild member is using the guild storage";
mes "right now. Please wait until that person is finished.";
- close2;
- cutin "", 255;
- end;
+ close3;
}
cutin "", 255;
close;
}
// Unable to access Normal Storage (Insufficient Basic Skills)
- if(!callfunc("F_CanOpenStorage")){
+ if (!callfunc("F_CanOpenStorage")) {
mes "[Kafra Employee]";
// Niflheim Specific Message
if (getarg(2) == 1) {
@@ -238,11 +228,12 @@ function script F_KafStor {
return;
}
// Accessing Normal Storage (Skipped if accessing Storage from Guild castle)
- if(.@type != 2){
+ if (.@type != 2) {
// Consume "Free Ticket for Kafra Storage" if available.
- if(countitem(7059)) delitem 7059,1;
+ if (countitem(7059))
+ delitem 7059,1;
else {
- if(Zeny<.@fee){
+ if (Zeny < .@fee) {
mes "[Kafra Employee]";
// Niflheim Specific Message
if (getarg(2) == 1) {
@@ -257,11 +248,11 @@ function script F_KafStor {
mes "I'm sorry, but you don't";
mes "have enough zeny to use";
mes "the Storage Service. Our";
- mes "Storage access fee is "+.@fee+" zeny.";
+ mes "Storage access fee is " + .@fee + " zeny.";
return;
}
- set Zeny, Zeny-.@fee;
- set RESRVPTS, RESRVPTS + (.@fee/5);
+ Zeny -= .@fee;
+ RESRVPTS += (.@fee/5);
}
}
@@ -271,7 +262,7 @@ function script F_KafStor {
if (getarg(2) == 1) {
percentheal 0,-10;
mes "[Kafra Employee]";
- for (set .@i, 0; .@i < 5; set .@i, .@i + 1)
+ for ( .@i = 0; .@i < 5; .@i++ )
mes "^666666Thank you.. for... using...^000000";
}
// Normal message
@@ -298,27 +289,24 @@ function script F_KafTele {
mes "Please choose";
mes "your destination.";
next;
- set .@menu$, "";
- for (set .@i, 0; .@i <= 6; set .@i, .@i + 1)
- set .@menu$, .@menu$ + @wrpC$[.@i] + ":";
- set .@j, select (.@menu$) - 1;
- if (@wrpC$[.@j] == "Cancel") return;
+ .@j = select( implode(@wrpC$,":") ) - 1;
+ if (@wrpC$[.@j] == "Cancel")
+ return;
// Consume "Free Ticket for Kafra Transportation" if available.
// Do not consume if in Guild castle
- if(countitem(7060) > 0 && getarg(0) != 2) delitem 7060,1;
+ if (countitem(7060) > 0 && getarg(0) != 2)
+ delitem 7060,1;
else {
- if (Zeny<@wrpP[.@j]){
+ if (Zeny < @wrpP[.@j]) {
mes "[Kafra Employee]";
mes "I'm sorry, but you don't have";
mes "enough zeny for the Teleport";
mes "Service. The fee to teleport";
- mes "to "+@wrpD$[.@j]+" is "+@wrpP[.@j]+" zeny.";
- close2;
- cutin "", 255;
- end;
+ mes "to " + @wrpD$[.@j] + " is " + @wrpP[.@j] + " zeny.";
+ close3;
}
- set Zeny, Zeny - @wrpP[.@j];
- set RESRVPTS, RESRVPTS + (@wrpP[.@j]/16);
+ Zeny -= @wrpP[.@j];
+ RESRVPTS += (@wrpP[.@j]/16);
}
cutin "", 255;
if (@wrpD$[.@j] == "Al De Baran") warp "aldebaran",168,112;
@@ -326,7 +314,12 @@ function script F_KafTele {
else if (@wrpD$[.@j] == "Comodo") warp "comodo", 209, 143;
else if (@wrpD$[.@j] == "Comodo Pharos Beacon") warp "cmd_fild07", 127, 134;
else if (@wrpD$[.@j] == "Geffen") warp "geffen", 120, 39;
- else if (@wrpD$[.@j] == "Izlude") { if (checkre(0)) warp "izlude", 128, 98; else warp "izlude", 91, 105; }
+ else if (@wrpD$[.@j] == "Izlude") {
+ if (checkre(RENEWAL) == true)
+ warp "izlude", 128, 98;
+ else
+ warp "izlude", 91, 105;
+ }
else if (@wrpD$[.@j] == "Juno") warp "yuno", 158, 125;
else if (@wrpD$[.@j] == "Mjolnir Dead Pit") warp "mjolnir_02", 99, 351;
else if (@wrpD$[.@j] == "Morroc") warp "morocc", 156, 46;
@@ -343,11 +336,11 @@ function script F_KafTele {
//===================================================
function script F_KafCart {
// Ensure that the class wanting to rent a pushcart is a merchant
- if(BaseClass != Job_Merchant){
+ if (BaseClass != Job_Merchant) {
mes "[Kafra Employee]";
mes "I'm sorry, but the";
mes "Pushcart rental service";
- if (checkre(0))
+ if (checkre(RENEWAL) == true)
mes "is only available to Merchant classes.";
else {
mes "is only available to Merchants,";
@@ -357,7 +350,7 @@ function script F_KafCart {
return 1;
}
// Make sure the invoking character does not have a cart already
- else if(checkcart() == 1){
+ else if (checkcart() == true) {
mes "[Kafra Employee]";
mes "You already have";
mes "a Pushcart equipped.";
@@ -367,31 +360,34 @@ function script F_KafCart {
return 1;
}
// Check if the player has the Pushcart skill
- else if(getskilllv("MC_PUSHCART") == 0) {
+ else if (getskilllv("MC_PUSHCART") == 0) {
mes "[Kafra Employee]";
mes "You can only rent a cart after learning the \"Push Cart\" skill.";
return 1;
}
// Consume "Free Ticket for the Cart Service" if available.
// Do not consume if in Guild castle.
- if(countitem(7061) > 0 && getarg(0) != 2) delitem 7061,1;
+ if (countitem(7061) > 0 && getarg(0) != 2)
+ delitem 7061,1;
else {
+ .@rental_fee = getarg(1);
mes "[Kafra Employee]";
mes "The Pushcart rental";
- mes "fee is "+getarg(1)+" zeny. Would";
+ mes "fee is " + .@rental_fee + " zeny. Would";
mes "you like to rent a Pushcart?";
next;
- if (select("Rent a Pushcart.:Cancel") == 2) return 0;
- if(Zeny<getarg(1)){
- mes "[Kafra Employee]";
- mes "I'm sorry, but you";
- mes "don't have enough";
- mes "zeny to pay the Pushcart";
- mes "rental fee of "+getarg(1)+" zeny.";
- return 1;
- }
- set Zeny,Zeny-getarg(1);
- set RESRVPTS, RESRVPTS + 48;
+ if (select("Rent a Pushcart.:Cancel") == 2)
+ return 0;
+ if (Zeny < .@rental_fee) {
+ mes "[Kafra Employee]";
+ mes "I'm sorry, but you";
+ mes "don't have enough";
+ mes "zeny to pay the Pushcart";
+ mes "rental fee of " + .@rental_fee + " zeny.";
+ return 1;
+ }
+ Zeny -= .@rental_fee;
+ RESRVPTS += 48;
}
setcart;
return 1;
@@ -401,36 +397,44 @@ function script F_KafCart {
// Special Reserve Points Function
//===================================================
function script F_KafInfo {
- // Uncomment next line to block Kafra Storage Protection
- // set .@block, 1;
- setarray .@m$, "Check Special Reserve Points.","Storage Password Service","Kafra Employee Locations","Cancel";
- if (getarg(0) == 2) deletearray .@m$[1],2; // Port Malaya, Rune Knight
- else if (.@block) deletearray .@m$[1],1;
- while (1) {
- set .@j, select(implode(.@m$,":")) - 1;
- if (.@m$[.@j] == "Check Special Reserve Points.") {
+// Uncomment next line to block Kafra Storage Protection
+// .@block = 1;
+ if (getarg(0) == 2)// Port Malaya, Rune Knight
+ setarray .@menu$[0], "Check Special Reserve Points.", "", "", "Cancel";
+ else if (.@block)
+ setarray .@menu$[0], "Check Special Reserve Points.", "", "Kafra Employee Locations", "Cancel";
+ else
+ setarray .@menu$[0], "Check Special Reserve Points.", "Storage Password Service", "Kafra Employee Locations", "Cancel";
+ .@menu_list$ = implode(.@menu$,":");
+ while (true) {
+ .@j = select(.@menu_list$) - 1;
+ switch(.@j) {
+ case 0:// Check Special Reserve Points.
mes "[Kafra Employee]";
mes "Let's see...";
- mes strcharinfo(0) + "...";
+ mes "" + strcharinfo(0) + "...";
mes "Ah, you have a total of";
- mes RESRVPTS+ " Special Reserve Points.";
+ mes "" + RESRVPTS + " Special Reserve Points.";
next;
mes "[Kafra Employee]";
mes "You can exchange your";
mes "Special Reserve Points for";
mes "rewards at the Kafra Main Office in Al De Baran. Please use our";
mes "convenient services to see the benefits of our rewards program.";
+ if (getarg(0) == 1)
+ return;
next;
- if(getarg(0) == 1) return;
- } else if (.@m$[.@j] == "Kafra Employee Locations") {
- for (set .@i, 0; .@i <= 3; set .@i, .@i + 1)
+ break;
+ case 1:// Storage Password Service
+ callfunc("F_SetKafCode","[Kafra Employee]","Kafra Services");
+ case 2:// Kafra Employee Locations
+ for ( .@i = 0; .@i <= 3; .@i++ )
viewpoint 1,@viewpX[.@i],@viewpY[.@i],(.@i+1),0xFF00FF;
next;
- for (set .@i, 0; .@i <= 3; set .@i, .@i + 1)
+ for ( .@i = 0; .@i <= 3; .@i++ )
viewpoint 2,@viewpX[.@i],@viewpY[.@i],(.@i+1),0xFF00FF;
- } else if (.@m$[.@j] == "Storage Password Service") {
- callfunc("F_SetKafCode","[Kafra Employee]","Kafra Services");
- } else {
+ break;
+ default:
return;
}
}
@@ -442,46 +446,39 @@ function script F_KafInfo {
// arg(2): used to display the name of the area you're saving in.
//===================================================================
function script F_KafEnd {
+ .@type = getarg(0);
mes "[Kafra Employee]";
- if(getarg(1)==1) {
- // Save
+ if (getarg(1) == true) {// Save
mes "Your Respawn Point";
mes "has been saved here";
- mes getarg(2)+".";
+ mes "" + getarg(2) + ".";
mes "Thank you for using";
mes "the Kafra Services.";
- } else if(getarg(0)==0 || getarg(0)==5) {
- // Generic End
+ } else if (.@type == 0 || .@type == 5) {// Generic End
mes "We, here at Kafra Corporation,";
mes "are always endeavoring to provide you with the best services. We hope that we meet your adventuring needs and standards of excellence.";
- } else if(getarg(0)==1) {
- // Niflheim End
- percentheal 0,- 25;
+ } else if (.@type == 1) {// Niflheim End
+ percentheal 0,-25;
mes "^666666Kaffffra n-never";
mes "diiiiiiiiiiiiiies. On...";
mes "On y-yooour siiiiide~^000000";
}
- close2;
- cutin "", 255;
- end;
+ close3;
}
//===================================================
// Check Storage Password Function
//===================================================
function script F_CheckKafCode {
- if(!#kafra_code) return;
+ if (!#kafra_code)
+ return;
mes "Enter your storage password:";
- set @code_,0;
- input @code_;
- if(@code_ != #kafra_code) {
+ input .@code_;
+ if (.@code_ != #kafra_code) {
dispbottom "Wrong storage password.";
- close2;
- cutin "",255;
- end;
+ close3;
}
- set @kafcode_try,0;
- set @code_,0;
+ @kafcode_try = 0;
return;
}
@@ -494,87 +491,86 @@ function script F_SetKafCode {
.@comp_name$ = getarg(1);
mes .@npc_name$;
- if(#kafra_code) {
- mes "Your storage is protected with a password. What would you do now?";
+ if (#kafra_code == 0) {
+ mes "" + .@comp_name$ + " proudly presents you a new service:";
+ mes "Additional storage protection with a password.";
next;
- switch (select("Change old password -> 5000z:Remove storage password -> 1000z:Cancel")) {
- case 1:
- mes .@npc_name$;
- mes "At first, please enter your ^0000FFold password^000000.";
- set @code,callfunc("F_EntKafCode");
- if(!@code || @code != #kafra_code) {
- mes "Wrong password. You can't set a new password.";
- emotion e_hmm;
- break;
- }
- next;
- callsub S_SET,.@npc_name$,.@comp_name$;
- break;
- case 2:
- mes .@npc_name$;
- mes "Please, enter your password before its removal.";
- set @code,callfunc("F_EntKafCode");
- if(!@code) {
- mes "The password hasn't been removed.";
- emotion e_hmm;
- break;
- }
- next;
- mes .@npc_name$;
- if(Zeny < 1000) {
- mes "You don't have enough zeny.";
- emotion e_cash;
- break;
- }
- set Zeny,Zeny-1000;
- if(@code == #kafra_code) {
- set #kafra_code,0;
- mes "You've successfully cleared your storage password.";
- mes "Thank you for using "+.@comp_name$+".";
- emotion e_thx;
- } else {
- mes "Wrong password. We won't return your 1000z.";
- mes "Please, next time enter correct password.";
- emotion e_sry;
- }
- break;
- case 3:
- break;
+ if (select( "Set new password -> 5000z", "Cancel" ) == 1)
+ callsub( S_SET, .@npc_name$, .@comp_name$ );
+ close3;
+ }
+ mes "Your storage is protected with a password. What would you do now?";
+ next;
+ switch( select( "Change old password -> 5000z", "Remove storage password -> 1000z", "Cancel" ) ) {
+ case 1:
+ mes .@npc_name$;
+ mes "At first, please enter your ^0000FFold password^000000.";
+ .@code = callfunc("F_EntKafCode");
+ if (!.@code || .@code != #kafra_code) {
+ mes "Wrong password. You can't set a new password.";
+ emotion ET_SCRATCH;
+ break;
}
- } else {
- mes .@comp_name$+" proudly presents you a new service:";
- mes "Additional storage protection with a password.";
next;
- switch (select("Set new password -> 5000z:Cancel")) {
- case 1: callsub S_SET,.@npc_name$,.@comp_name$; break;
- case 2: break;
+ callsub( S_SET, .@npc_name$, .@comp_name$ );
+ break;
+ case 2:
+ mes .@npc_name$;
+ mes "Please, enter your password before its removal.";
+ .@code = callfunc("F_EntKafCode");
+ if (!.@code) {
+ mes "The password hasn't been removed.";
+ emotion ET_SCRATCH;
+ break;
+ }
+ next;
+ mes .@npc_name$;
+ if (Zeny < 1000) {
+ mes "You don't have enough zeny.";
+ emotion ET_MONEY;
+ break;
+ }
+ Zeny -= 1000;
+ if (.@code == #kafra_code) {
+ #kafra_code = 0;
+ mes "You've successfully cleared your storage password.";
+ mes "Thank you for using " + .@comp_name$ + ".";
+ emotion ET_THANKS;
+ } else {
+ mes "Wrong password. We won't return your 1000z.";
+ mes "Please, next time enter correct password.";
+ emotion ET_SORRY;
}
+ break;
+ case 3:
+ break;
}
- close2;
- cutin "",255;
- end;
+ close3;
S_SET:
+ .@npc_name$ = getarg(0);
+ .@comp_name$ = getarg(1);
+
mes .@npc_name$;
mes "Now enter your ^FF0000new password^000000 to protect your storage from thieves.";
- set @code,callfunc("F_EntKafCode");
- if(!@code) {
+ .@code = callfunc("F_EntKafCode");
+ if (!.@code) {
mes "The password hasn't been changed.";
- emotion e_hmm;
+ emotion ET_SCRATCH;
return;
}
next;
mes .@npc_name$;
- if(Zeny < 5000) {
+ if (Zeny < 5000) {
mes "You don't have enough zeny.";
- emotion e_cash;
+ emotion ET_MONEY;
return;
}
- set Zeny,Zeny-5000;
- set #kafra_code,@code;
+ Zeny -= 5000;
+ #kafra_code = .@code;
mes "You've protected your storage with a secret password.";
- mes "Thank you for using "+.@comp_name$+".";
- emotion e_thx;
+ mes "Thank you for using " + .@comp_name$ + ".";
+ emotion ET_THANKS;
return;
}
@@ -583,88 +579,92 @@ S_SET:
//===================================================
function script F_EntKafCode {
mes "Enter a number 1000~10000000:";
- set @code_,0;
- set @kafcode_try,@kafcode_try+1;
- if(@kafcode_try>10) {
- set @kafcode_try,0;
+ @kafcode_try += 1;
+ if (@kafcode_try > 10) {
+ @kafcode_try = 0;
logmes "Tried to fit storage password.";
+ return 0;
}
- if(input(@code_) == 1) {
+ if (input(.@code_) == 1) {
mes "You can't use such big password.";
return 0;
}
- if(@code_<1000) {
+ if (.@code_ < 1000) {
mes "You shouldn't use such short password.";
return 0;
}
- return @code_;
+ return .@code_;
}
//===================================================
// Warp Points / View Points Function
//===================================================
function script F_KafSet {
- cleararray @wrpC$[0],"",getarraysize(@wrpC$);
- cleararray @wrpD$[0],"",getarraysize(@wrpD$);
- cleararray @wrpP$[0],"",getarraysize(@wrpP$);
- cleararray @viewpX[0],"",getarraysize(@viewpX);
- cleararray @viewpY[0],"",getarraysize(@viewpY);
- if (strnpcinfo(4) == "prontera") {
+ deletearray @wrpC$[0], getarraysize(@wrpC$);
+ deletearray @wrpD$[0], getarraysize(@wrpD$);
+ deletearray @wrpP$[0], getarraysize(@wrpP$);
+ deletearray @viewpX[0], getarraysize(@viewpX);
+ deletearray @viewpY[0], getarraysize(@viewpY);
+
+ .@map$ = strnpcinfo(4);
+ if (.@map$ == "prontera") {
setarray @wrpD$[0], "Izlude", "Geffen", "Payon", "Morroc", "Orc Dungeon", "Alberta";
setarray @wrpP[0], 600, 1200, 1200, 1200, 1700, 1800;
setarray @viewpX[0], 151, 29, 282, 152;
setarray @viewpY[0], 29, 207, 200, 326;
- } else if (strnpcinfo(4) == "alberta") {
+ } else if (.@map$ == "alberta") {
setarray @wrpP[0], 1200, 1800, 1800;
setarray @wrpD$[0], "Payon", "Morroc", "Prontera";
setarray @viewpX[0], 28, 113, 0, 0;
setarray @viewpY[0], 229, 60, 0, 0;
- } else if (strnpcinfo(4) == "aldebaran") {
+ } else if (.@map$ == "aldebaran") {
setarray @wrpP[0], 1200, 1200, 1800, 1700;
setarray @wrpD$[0], "Geffen", "Juno" , "Izlude", "Mjolnir Dead Pit";
- } else if (strnpcinfo(4) == "comodo" ) {
+ } else if (.@map$ == "comodo" ) {
setarray @wrpD$[0], "Morroc", "Comodo Pharos Beacon", "Umbala";
setarray @wrpP[0], 1800, 1200, 1800;
- } else if (strnpcinfo(4) == "cmd_fild07") {
+ } else if (.@map$ == "cmd_fild07") {
setarray @wrpD$[0], "Comodo", "Morroc";
setarray @wrpP[0], 1200, 1200;
- } else if (strnpcinfo(4) == "geffen") {
+ } else if (.@map$ == "geffen") {
setarray @wrpD$[0], "Prontera", "Al De Baran", "Orc Dungeon", "Mjolnir Dead Pit";
setarray @wrpP[0], 1200, 1200, 1700, 1700;
setarray @viewpX[0], 120, 203;
setarray @viewpY[0], 62, 123;
- } else if (strnpcinfo(4) == "izlude") {
+ } else if (.@map$ == "izlude") {
setarray @wrpD$[0], "Geffen", "Payon", "Morroc", "Al De Baran";
setarray @wrpP[0], 1200, 1200, 1200, 1800;
- } else if (strnpcinfo(4) == "morocc") {
+ } else if (.@map$ == "morocc") {
setarray @wrpD$[0], "Prontera", "Payon", "Alberta", "Comodo", "Comodo Pharos Beacon";
setarray @wrpP[0], 1200, 1200, 1800, 1800, 1200;
setarray @viewpX[0], 156, 163, 28, 292;
setarray @viewpY[0], 97, 260, 167, 211;
- } else if (strnpcinfo(4) == "umbala") {
+ } else if (.@map$ == "umbala") {
setarray @wrpD$[0], "Comodo";
setarray @wrpP[0], 1800;
- } else if (strnpcinfo(4) == "payon") {
+ } else if (.@map$ == "payon") {
setarray @wrpD$[0], "Prontera", "Alberta", "Morroc";
setarray @wrpP[0], 1200, 1200, 1200;
- } else if (strnpcinfo(4) == "yuno") {
+ } else if (.@map$ == "yuno") {
setarray @wrpD$[0], "Al De Baran";
setarray @wrpP[0], 1200;
setarray @viewpX[0], 328, 278, 153, 0;
setarray @viewpY[0], 108, 221, 187, 0;
- } else if (strnpcinfo(4) == "job3_rune01") {
+ } else if (.@map$ == "job3_rune01") {
setarray @wrpD$[0], "Izlude", "Geffen", "Payon", "Morroc", "Alberta";
setarray @wrpP[0], 600, 1200, 1200, 1200, 1800;
}
+ .@warp_size = getarraysize(@wrpD$);
+
// VIP pricing varies across the regional servers; this is most practical.
if (VIP_SCRIPT && !vip_status(VIP_STATUS_ACTIVE)) {
- for (set .@i, 0; .@i < getarraysize(@wrpD$); set .@i, .@i + 1)
- setd "@wrpP["+.@i+"]",getd("@wrpP["+.@i+"]") * 2;
+ for ( .@i = 0; .@i < .@warp_size; .@i++ )
+ @wrpP[.@i] *= 2;
}
- for (set .@i, 0; .@i < getarraysize(@wrpD$); set .@i, .@i + 1)
- setd "@wrpC$["+.@i+"]",getd("@wrpD$["+.@i+"]")+" -> "+getd("@wrpP["+.@i+"]")+" z";
- setd "@wrpC$["+getarraysize(@wrpC$)+"]","Cancel";
+ for ( .@i = 0; .@i < .@warp_size; .@i++ )
+ @wrpC$[.@i] = @wrpD$[.@i] + " -> " + @wrpP[.@i] + " z";
+ @wrpC$[ .@warp_size ] = "Cancel";
return;
}
diff --git a/npc/kafras/kafras.txt b/npc/kafras/kafras.txt
index b433e2cbbfa..8326a62050b 100644
--- a/npc/kafras/kafras.txt
+++ b/npc/kafras/kafras.txt
@@ -427,7 +427,7 @@ moscovia,223,191,3 script Kafra Employee::kaf_mosk 114,{
cutin "kafra_04",2;
callfunc "F_Kafra",0,3,0,80,700;
savepoint "moscovia",221,194,1,1;
- callfunc "F_KafEnd",0,3,"in the city of Moscovia";
+ callfunc "F_KafEnd",0,1,"in the city of Moscovia";
}
// Amatsu
@@ -628,7 +628,7 @@ prt_fild05,290,224,3 script Kafra Employee::prt_fild05 114,{
mes "what can I do for you today?";
callfunc "F_Kafra",5,1,1,40,0;
savepoint "prt_fild05",274,243,1,1;
- callfunc "F_KafEnd",0,1, "at the Prontera Culverts";
+ callfunc "F_KafEnd",0,1,"at the Prontera Culverts";
}
// - Coal Mine (Dead Pitt)
@@ -657,7 +657,7 @@ moc_ruins,59,157,5 script Kafra Employee::moc_ruins 114,{
mes "what can I do for you today?";
callfunc "F_Kafra",5,2,1,90,1200;
savepoint "moc_ruins",41,141,1,1;
- callfunc "F_KafEnd",0,1," at the Pyramids";
+ callfunc "F_KafEnd",0,1,"at the Pyramids";
}
// - Orc Dungeon
@@ -685,5 +685,5 @@ alb2trea,59,69,5 script Kafra Employee::kaf_alb2trea 117,{
mes "How may I assist you?";
callfunc "F_Kafra",5,2,1,50,0;
savepoint "alb2trea",92,64,1,1;
- callfunc "F_KafEnd",0,1,0,"at Sunken Ship";
+ callfunc "F_KafEnd",0,1,"at Sunken Ship";
}
diff --git a/npc/merchants/advanced_refiner.txt b/npc/merchants/advanced_refiner.txt
index d2e05c64064..de09883df15 100644
--- a/npc/merchants/advanced_refiner.txt
+++ b/npc/merchants/advanced_refiner.txt
@@ -1,22 +1,11 @@
//===== rAthena Script =======================================
//= Advanced Refiner
-//===== By: ==================================================
-//= L0ne_W0lf
-//===== Current Version: =====================================
-//= 1.6
-//===== Compatible With: =====================================
-//= rAthena Project
//===== Description: =========================================
//= [Official Conversion]
//= Refiner that uses Enriched ores to increase upgrade success.
-//= After a conversation with Doddler, it's been established that
-//= the advanced refiner works similar the the "Bubble Gum" item.
-//= The success percentage is not "increased" however, if it fails
-//= You get a second try. This tries twice at the same time,
-//= effectively giving you a re-roll on your attempt.
//= - Dialog is only partly official to iRO.
//= - Uses the iRO position for this NPC.
-//===== Additional Comments: =================================
+//===== Changelog: ===========================================
//= 1.0 First Version. [L0ne_W0lf]
//= 1.1 Fixed a weird carriage return. o_o [L0ne_W0lf]
//= 1.2 Optimizing refine method [Zephyrus]
@@ -26,6 +15,7 @@
//= 1.4b Fixed coordinates. [Euphy]
//= 1.5 Some official script updates. [Euphy]
//= 1.6 Added VIP features. [Euphy]
+//= 1.7 Removed re-roll behavior. [Secret]
//============================================================
payon,157,146,6 script Suhnbi#cash 85,{
@@ -65,22 +55,19 @@ payon,157,146,6 script Suhnbi#cash 85,{
close;
}
+ .@price = getequiprefinecost(.@part, REFINE_COST_ENRICHED, REFINE_ZENY_COST);
+ .@material = getequiprefinecost(.@part, REFINE_COST_ENRICHED, REFINE_MATERIAL_ID);
+
// Make sure you have the neccessary items and Zeny to refine your items
// Determines chance of failure and verifies that you want to continue.
- switch(getequipweaponlv(.@part)) {
- case 1: callsub S_RefineValidate,1,7620,50,.@part; break;
- case 2: callsub S_RefineValidate,2,7620,200,.@part; break;
- case 3: callsub S_RefineValidate,3,7620,5000,.@part; break;
- case 4: callsub S_RefineValidate,4,7620,20000,.@part; break;
- default: callsub S_RefineValidate,0,7619,2000,.@part; break;
- }
+ callsub S_RefineValidate,getequipweaponlv(.@part),.@material,.@price,.@part;
mes "[Suhnbi]";
mes "Clang! Clang! Clang!";
- if (getequippercentrefinery(.@part) > rand(100) || getequippercentrefinery(.@part) > rand(100)) {
+ if (getequippercentrefinery(.@part, true) > rand(100)) {
successrefitem .@part;
next;
- emotion e_no1;
+ emotion ET_BEST;
mes "[Suhnbi]";
mes "There you go! It's done.";
mes "It's been a while since I've made such a fine "+((getequipweaponlv(.@part))?"weapon":"armor")+". You must be happy because it has become stronger!";
@@ -88,7 +75,7 @@ payon,157,146,6 script Suhnbi#cash 85,{
}
failedrefitem .@part;
next;
- emotion (!rand(5))?e_cash:e_omg;
+ emotion (!rand(5))?ET_MONEY:ET_HUK;
mes "[Suhnbi]";
mes "Uuuuuuuuuummmmmph!!!";
next;
diff --git a/npc/merchants/hair_style.txt b/npc/merchants/hair_style.txt
index d5e5f7a8d7f..096a4bc47a4 100644
--- a/npc/merchants/hair_style.txt
+++ b/npc/merchants/hair_style.txt
@@ -753,7 +753,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 122,{
mes "you're an adventurer, I know";
mes "you can be more daring than";
mes "that! Be fashionably adventurous, you fashionable adventurer~";
- emotion e_lv,"Hair Dresser#i";
+ emotion ET_THROB;
close;
}
}
@@ -805,7 +805,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 122,{
mes "you're an adventurer, I know";
mes "you can be more daring than";
mes "that! Be fashionably adventurous, you fashionable adventurer~";
- emotion e_lv,"Hair Dresser#li";
+ emotion ET_THROB;
close;
}
}
@@ -846,7 +846,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 122,{
mes "you're an adventurer, I know";
mes "you can be more daring than";
mes "that! Be fashionably adventurous, you fashionable adventurer~";
- emotion e_lv,"Hair Dresser#li";
+ emotion ET_THROB;
close;
}
}
@@ -886,7 +886,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 122,{
mes "you're an adventurer, I know";
mes "you can be more daring than";
mes "that! Be fashionably adventurous, you fashionable adventurer~";
- emotion e_lv,"Hair Dresser#li";
+ emotion ET_THROB;
close;
}
}
@@ -1068,7 +1068,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 122,{
mes "how graceful and elegant you";
mes "look! Absolutely gorgeous!";
}
- emotion e_kis,"Hair Dresser#li";
+ emotion ET_CHUP;
next;
mes "[Prince Shammi]";
mes "You love your new";
@@ -1076,7 +1076,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 122,{
mes "free to come back anytime.";
mes "I'll make you the best looking";
mes "person in the entire world!";
- emotion e_no1,"Hair Dresser#li";
+ emotion ET_BEST;
close;
case 2:
mes "[Prince Shammi]";
@@ -1104,7 +1104,7 @@ lhz_in02,91,155,5 script Assistant Beautician#li 862,{
mes "Wah?! Sweet Jiminy,";
mes "you freaked me out!";
mes "What are you doing?!";
- emotion e_omg,"Assistant Beautician#li";
+ emotion ET_HUK;
next;
mes "[Assistant Beautician]";
mes "Oh! Um, a customer!";
@@ -1273,7 +1273,7 @@ lhz_in02,91,155,5 script Assistant Beautician#li 862,{
mes "sweetheart for helping";
mes "me! Thank you for using";
mes "my service and come again~";
- emotion e_kis,"Assistant Beautician#li";
+ emotion ET_CHUP;
close;
case 2:
mes "[Assistant Beautician]";
diff --git a/npc/merchants/old_pharmacist.txt b/npc/merchants/old_pharmacist.txt
index ef653609d8d..3f549686e0b 100644
--- a/npc/merchants/old_pharmacist.txt
+++ b/npc/merchants/old_pharmacist.txt
@@ -36,9 +36,9 @@ alberta_in,16,28,4 script Pharmacist 61,{
mes "[Old Pharmacist]";
mes "Ummmm...";
mes "What brings you here...?";
+ next;
switch(select("Make Potion:Talk.:Mixing Information:Cancel")) {
case 1:
- next;
if (MaxWeight - Weight < 5000) {
mes "[Old Pharmacist]";
mes "Why are you carrying these so many!";
@@ -51,11 +51,11 @@ alberta_in,16,28,4 script Pharmacist 61,{
} else {
mes "[Old Pharmacist]";
mes "You have all the stuff ready, right? Which one would you like?";
+ next;
switch(select("Red Potion.:Orange Potion.:Yellow Potion.:White Potion.:Blue Potion.:Green Potion.:Actually, I don't want anything.")) {
case 1:
callsub L_Making,507,3,501;
case 2:
- next;
mes "[Old Pharmacist]";
if (countitem(507) < countitem(713)) {
set .@max,countitem(507);
@@ -77,9 +77,9 @@ alberta_in,16,28,4 script Pharmacist 61,{
close;
}
mes "How many?";
+ next;
switch(select("Make as many as I can.:I want to choose an amount.:Actually, I don't want anything.")) {
case 1:
- next;
if ((countitem(507) < .@max) || (countitem(508) < .@max) || (countitem(713) < .@max) || (Zeny < .@max*3)) {
mes "[Old Pharmacist]";
mes "You rascal! You don't even have all the materials and you want me to make you potions?!";
@@ -92,24 +92,21 @@ alberta_in,16,28,4 script Pharmacist 61,{
getitem 502,.@max; //Orange_Potion
break;
case 2:
- next;
mes "[Old Pharmacist]";
mes "Then pick a number below 100. If you don't want any, just enter '0'. With the materials you have, you can make about "+.@max+" potions.";
+ next;
input .@amount,0,101;
if (.@amount == 0) {
- next;
mes "[Old Pharmacist]";
mes "Make up your mind, will you?!";
close;
}
if (.@amount > 100) {
- next;
mes "[Old Pharmacist]";
mes "Are you deaf? I said less than 100!";
close;
}
if ((countitem(507) < .@amount) || (countitem(508) < .@amount) || (countitem(713) < .@amount) || (Zeny < .@amount*3)) {
- next;
mes "[Old Pharmacist]";
mes "You rascal! You don't even have all the materials and you want me to make you potions?!";
close;
@@ -122,7 +119,6 @@ alberta_in,16,28,4 script Pharmacist 61,{
getitem 502,.@amount; //Orange_Potion
break;
case 3:
- next;
mes "[Old Pharmacist]";
mes "What?!";
mes "Grrr...";
@@ -188,7 +184,6 @@ L_Making:
.@item_req = getarg(0);
.@req_amount = getarg(1);
- next;
mes "[Old Pharmacist]";
if ((countitem(.@item_req)/2) < countitem(713)) {
.@max = countitem(.@item_req) /2;
@@ -206,9 +201,9 @@ L_Making:
close;
}
mes "How many?";
+ next;
switch(select("Make as many as I can.:I want to choose an amount.:Actually, I don't want anything.")) {
case 1:
- next;
if ((countitem(.@item_req) < .@max*2) || countitem(713) < .@max || (Zeny < .@max*.@req_amount)) {
mes "[Old Pharmacist]";
mes "You rascal! You don't even have all the materials and you want me to make you potions?!";
@@ -220,11 +215,10 @@ L_Making:
getitem getarg(2),.@max;
break;
case 2:
- next;
mes "[Old Pharmacist]";
mes "Then pick a number below 100. If you don't want any, just enter '0'. With the materials you have, you can make about "+.@max+" potions.";
- input .@amount;
next;
+ input .@amount;
if (.@amount == 0) {
mes "[Old Pharmacist]";
mes "Make up your mind, will you?!";
@@ -246,7 +240,6 @@ L_Making:
getitem getarg(2),.@amount;
break;
case 3:
- next;
mes "[Old Pharmacist]";
mes "What?!";
mes "Grrr...";
diff --git a/npc/merchants/quivers.txt b/npc/merchants/quivers.txt
index b8b4a97e51c..bbb9e242c77 100644
--- a/npc/merchants/quivers.txt
+++ b/npc/merchants/quivers.txt
@@ -42,7 +42,7 @@ payon_in01,5,134,5 script Inventor Jaax 89,{
mes "created something";
mes "truly extraordinary. I call them... ^663300Magic Quivers^000000 !! This will be remembered in history as an";
mes "arrow revolution!";
- emotion e_no1;
+ emotion ET_BEST;
next;
mes "[Inventor Jaax]";
mes "I've studied magic and quivers for years, working night and day until I finally figured how to condense arrows with magic! With magic quivers, you'll be carrying more arrows, but with less weight!";
diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt
index 862ebd2189c..48a82d7fbb3 100644
--- a/npc/merchants/refine.txt
+++ b/npc/merchants/refine.txt
@@ -38,7 +38,7 @@ geffen_in,110,172,0 script Christopher#1 63,{
close;
}
getitem 986,1; // Anvil
- set Zeny, Zeny-30000;
+ Zeny = Zeny-30000;
mes "[Christopher Guillenrow]";
mes "This is the cheapest one, but efficient enough to forge most items. Thank ye fer shopping at me workshop. Feel free to come anytime, whenever ye need.";
close;
@@ -49,7 +49,7 @@ geffen_in,110,172,0 script Christopher#1 63,{
close;
}
getitem 987,1; // Oridecon_Anvil
- set Zeny, Zeny-120000;
+ Zeny = Zeny-120000;
mes "[Christopher Guillenrow]";
mes "Aye, friend ye have an eye for the anvil. This must be the proper anvil for a Blacksmith, eh? Thank ye fer shopping at me workshop. Feel free to come anytime, whenever ye need.";
close;
@@ -60,7 +60,7 @@ geffen_in,110,172,0 script Christopher#1 63,{
close;
}
getitem 988,1; // Golden_Anvil
- set Zeny, Zeny-300000;
+ Zeny = Zeny-300000;
mes "[Christopher Guillenrow]";
mes "This one is the best among all me stuffs in me workshop! With this, ye can rule the Blacksmith world! Thank ye fer shopping at me workshop. Feel free to come anytime, whenever ye need.";
close;
@@ -101,7 +101,7 @@ geffen_in,110,172,0 script Christopher#1 63,{
break;
}
}
- set .@sell,.@input * 150;
+ .@sell = .@input * 150;
if (Zeny < .@sell) {
mes "[Christopher Guillenrow]";
mes "I don't think I can let ye have this with the zeny ye have. I can't lose me money because of ye.";
@@ -113,7 +113,7 @@ geffen_in,110,172,0 script Christopher#1 63,{
close;
}
getitem 612,.@input; // Portable_Furnace
- set Zeny, Zeny-.@sell;
+ Zeny = Zeny-.@sell;
mes "[Christopher Guillenrow]";
mes "Thank ye fer shopping at me workshop. Feel free to come anytime, whenever ye need.";
close;
@@ -124,7 +124,7 @@ geffen_in,110,172,0 script Christopher#1 63,{
close;
}
getitem 613,1; // Iron_Hammer
- set Zeny, Zeny-1000;
+ Zeny = Zeny-1000;
mes "[Christopher Guillenrow]";
mes "Thank ye fer shopping at me workshop. Feel free to come anytime, whenever ye need.";
close;
@@ -135,7 +135,7 @@ geffen_in,110,172,0 script Christopher#1 63,{
close;
}
getitem 614,1; // Golden_Hammer
- set Zeny, Zeny-3000;
+ Zeny = Zeny-3000;
mes "[Christopher Guillenrow]";
mes "Thank ye fer shopping at me workshop. Feel free to come anytime, whenever ye need.";
close;
@@ -146,7 +146,7 @@ geffen_in,110,172,0 script Christopher#1 63,{
close;
}
getitem 615,1; // Oridecon_Hammer
- set Zeny, Zeny-5000;
+ Zeny = Zeny-5000;
mes "[Christopher Guillenrow]";
mes "Thank ye fer shopping at me workshop. Feel free to come anytime, whenever ye need.";
close;
@@ -182,7 +182,7 @@ geffen_in,110,172,0 script Christopher#1 63,{
break;
}
}
- set .@sell,.@input * 200;
+ .@sell = .@input * 200;
if (Zeny < .@sell) {
mes "[Christopher Guillenrow]";
mes "Ye don't have enough money. Ye know I can't sell this at a lower price... You know how the wifey nags about Zeny.";
@@ -194,7 +194,7 @@ geffen_in,110,172,0 script Christopher#1 63,{
close;
}
getitem 1010,.@input; // Phracon
- set Zeny, Zeny-.@sell;
+ Zeny = Zeny-.@sell;
mes "[Christopher Guillenrow]";
mes "Thank ye fer shopping at me workshop. Feel free to come anytime, whenever ye need.";
close;
@@ -220,7 +220,7 @@ geffen_in,110,172,0 script Christopher#1 63,{
break;
}
}
- set .@sell,.@input * 1000;
+ .@sell = .@input * 1000;
if (Zeny < .@sell) {
mes "[Christopher Guillenrow]";
mes "I don't think I can let ye have this with the zeny ye have. I can't lose me money because of ye.";
@@ -232,7 +232,7 @@ geffen_in,110,172,0 script Christopher#1 63,{
close;
}
getitem 1011,.@input; // Emveretarcon
- set Zeny, Zeny-.@sell;
+ Zeny = Zeny-.@sell;
mes "[Christopher Guillenrow]";
mes "Thank ye fer shopping at me workshop. Feel free to come anytime, whenever ye need, whenever ye want.";
close;
@@ -314,7 +314,7 @@ ein_in01,38,29,0 script Paul Spanner 63,{
close;
}
getitem 986,1; //Anvil
- set Zeny, Zeny-30000;
+ Zeny = Zeny-30000;
mes "[Paul Spanner]";
mes "It is the cheapest anvil which has the most basic ability.";
mes "Thank you for using my shop. If you need anything, just let me know.";
@@ -326,7 +326,7 @@ ein_in01,38,29,0 script Paul Spanner 63,{
close;
}
getitem 987,1; //Oridecon_Anvil
- set Zeny, Zeny-120000;
+ Zeny = Zeny-120000;
mes "[Paul Spanner]";
mes "Ah, you have an eye for anvil. A Blacksmith needs an anvil at least as good as this.";
mes "Thank you for using my shop. If you need anything, just let me know.";
@@ -338,7 +338,7 @@ ein_in01,38,29,0 script Paul Spanner 63,{
close;
}
getitem 988,1; //Golden_Anvil
- set Zeny, Zeny-300000;
+ Zeny = Zeny-300000;
mes "[Paul Spanner]";
mes "I can tell your ambition to become a good Blacksmith just by looking at you to choose this Golden Anvil!";
mes "This anvil will surely aid you in creating the best weapons.";
@@ -360,27 +360,27 @@ ein_in01,38,29,0 script Paul Spanner 63,{
next;
switch(select("Mini Furnace - 150z.:Iron Hammer - 1,000z.:Golden Hammer - 3,000z.:Oridecon Hammer - 5,000z.:Cancel.")) {
case 1:
- set .@item,612;
- set .@item_cost,150;
- set .@item_weight,200;
+ .@item = 612;
+ .@item_cost = 150;
+ .@item_weight = 200;
mes "[Paul Spanner]";
mes "You definately need this furnce to process ores!";
next;
break;
case 2:
- set .@item,613;
- set .@item_cost,1000;
- set .@item_weight,200;
+ .@item = 613;
+ .@item_cost = 1000;
+ .@item_weight = 200;
break;
case 3:
- set .@item,614;
- set .@item_cost,3000;
- set .@item_weight,300;
+ .@item = 614;
+ .@item_cost = 3000;
+ .@item_weight = 300;
break;
case 4:
- set .@item,615;
- set .@item_cost,5000;
- set .@item_weight,400;
+ .@item = 615;
+ .@item_cost = 5000;
+ .@item_weight = 400;
break;
case 5:
mes "[Paul Spanner]";
@@ -406,7 +406,7 @@ ein_in01,38,29,0 script Paul Spanner 63,{
break;
}
}
- set .@sell,.@input * .@item_cost;
+ .@sell = .@input * .@item_cost;
if (Zeny < .@sell) {
mes "[Paul Spanner]";
mes "You don't have enough money. Sorry, I cannot sell them at a loss.";
@@ -417,7 +417,7 @@ ein_in01,38,29,0 script Paul Spanner 63,{
mes "Hey, you look pale. Why don't you go lighten your weight first.";
close;
}
- set Zeny, Zeny-.@sell;
+ Zeny = Zeny-.@sell;
getitem .@item,.@input;
mes "[Paul Spanner]";
mes "Thank you for using my shop. If you need anything, just let me know.";
@@ -429,12 +429,12 @@ ein_in01,38,29,0 script Paul Spanner 63,{
next;
switch(select("Phracon - 200z.:Emveretarcon - 1,000z.:Quit.")) {
case 1:
- set .@item,1010;
- set .@item_price,200;
+ .@item = 1010;
+ .@item_price = 200;
break;
case 2:
- set .@item,1011;
- set .@item_price,1000;
+ .@item = 1011;
+ .@item_price = 1000;
break;
case 3:
mes "[Paul Spanner]";
@@ -460,7 +460,7 @@ ein_in01,38,29,0 script Paul Spanner 63,{
break;
}
}
- set .@sell,.@input * .@item_price;
+ .@sell = .@input * .@item_price;
if (Zeny < .@sell) {
mes "[Paul Spanner]";
mes "You don't have enough money. Sorry, I cannot sell them at a loss.";
@@ -472,7 +472,7 @@ ein_in01,38,29,0 script Paul Spanner 63,{
close;
}
getitem .@item,.@input;
- set Zeny, Zeny-.@sell;
+ Zeny = Zeny-.@sell;
mes "[Paul Spanner]";
mes "Thank you for using my shop. If you need anything, just let me know.";
close;
@@ -562,7 +562,7 @@ lhz_in02,282,20,7 script Fulerr 869,{
function script refinemain {
disable_items;
.@npc_name$ = getarg(0);
- set .@features,getarg(1);
+ .@features = getarg(1);
mes "["+ .@npc_name$ +"]";
mes "I'm the Armsmith.";
mes "I can refine all kinds of weapons, armor and equipment, so let me";
@@ -570,26 +570,26 @@ function script refinemain {
next;
setarray .@indices[1], EQI_HEAD_TOP, EQI_ARMOR, EQI_HAND_L, EQI_HAND_R, EQI_GARMENT, EQI_SHOES, EQI_ACC_L, EQI_ACC_R, EQI_HEAD_MID, EQI_HEAD_LOW;
- for(set .@i,1; .@i<getarraysize(.@indices); set .@i,.@i+1) {
+ for(.@i = 1; .@i<getarraysize(.@indices); ++.@i) {
if(getequipisequiped(.@indices[.@i])) {
- set .@menu$, .@menu$ + F_getpositionname(.@indices[.@i]) + "-[" + getequipname(.@indices[.@i]) + "]";
- set .@equipped,1;
+ .@menu$ = .@menu$ + F_getpositionname(.@indices[.@i]) + "-[" + getequipname(.@indices[.@i]) + "]";
+ .@equipped = 1;
}
- set .@menu$, .@menu$ + ":";
+ .@menu$ = .@menu$ + ":";
}
if (.@equipped == 0) {
mes "["+ .@npc_name$ +"]";
mes "I don't think I can refine any items you have...";
close;
}
- set .@part, .@indices[select(.@menu$)];
+ .@part = .@indices[select(.@menu$)];
if(!getequipisequiped(.@part)) { //custom check
mes "["+ .@npc_name$ +"]";
mes "You're not wearing";
mes "anything there that";
mes "I can refine.";
- emotion e_an;
+ emotion ET_FRET;
close;
}
//Check if the item is refinable...
@@ -607,50 +607,28 @@ function script refinemain {
mes "refined as it gets!";
close;
}
- set .@refineitemid, getequipid(.@part); // save id of the item
- set .@refinerycnt, getequiprefinerycnt(.@part); //save refinery count
- switch(getequipweaponlv(.@part)){
- case 0: //Refine Armor
- set .@price,2000;
- set .@material,985; //Elunium
- set .@safe,4;
- break;
- case 1: //Refine Level 1 Weapon
- set .@price,50;
- set .@material,1010; //Phracon
- set .@safe,7;
- break;
- case 2: //Refine Level 2 Weapon
- set .@price,200;
- set .@material,1011; //Emveretarcon
- set .@safe,6;
- break;
- case 3: //Refine Level 3 Weapon
- set .@price,5000;
- set .@material,984; //Oridecon
- set .@safe,5;
- break;
- case 4: //Refine Level 4 Weapon
- set .@price,20000;
- set .@material,984; //Oridecon
- set .@safe,4;
- break;
- case 5: //Refine other stuff?
- set .@price,2000;
- set .@material,985; //Elunium
- set .@safe,4;
- break;
+ .@refineitemid = getequipid(.@part); // save id of the item
+ .@refinerycnt = getequiprefinerycnt(.@part); //save refinery count
+ .@price = getequiprefinecost(.@part, REFINE_COST_NORMAL, REFINE_ZENY_COST);
+ .@material = getequiprefinecost(.@part, REFINE_COST_NORMAL, REFINE_MATERIAL_ID);
+
+ switch (getequipweaponlv(.@part)) {
+ case 1: .@safe = 7; break;
+ case 2: .@safe = 6; break;
+ case 3: .@safe = 5; break;
+ case 4:
+ default: .@safe = 4; break;
}
// If the VIP system is enabled, the prices for non-VIP players are considerably higher.
if (VIP_SCRIPT && !vip_status(VIP_STATUS_ACTIVE)) {
switch(getequipweaponlv(.@part)) {
- case 0: set .@price, .@price * 10; break;
- case 1: set .@price, .@price * 40; break;
- case 2: set .@price, .@price * 50; break;
- case 3: set .@price, .@price * 2; break;
- case 4: set .@price, .@price * 2; break;
- case 5: set .@price, .@price * 10; break;
+ case 0: .@price = .@price * 10; break;
+ case 1: .@price = .@price * 40; break;
+ case 2: .@price = .@price * 50; break;
+ case 3: .@price = .@price * 2; break;
+ case 4: .@price = .@price * 2; break;
+ case 5: .@price = .@price * 10; break;
}
}
@@ -705,14 +683,14 @@ function script refinemain {
mes "here all day if you need me.";
close;
}
- set Zeny, Zeny-.@price;
+ Zeny = Zeny-.@price;
delitem .@material,1;
// anti-hack
if (callfunc("F_IsEquipIDHack", .@part, .@refineitemid) ||
callfunc("F_IsEquipRefineHack", .@part, .@refinerycnt)) {
mes "["+ .@npc_name$ +"]";
- emotion e_an;
+ emotion ET_FRET;
mes "Wait a second...";
mes "Do you think I'm stupid?!";
mes "You switched the item while I wasn't looking! Get out of here!";
@@ -722,8 +700,8 @@ function script refinemain {
if(getequippercentrefinery(.@part) <= rand(100)) {
failedrefitem .@part;
mes "["+ .@npc_name$ +"]";
- emotion (!rand(5))?e_cash:e_omg;
- set .@lose,rand(1,3);
+ emotion (!rand(5))?ET_MONEY:ET_HUK;
+ .@lose = rand(1,3);
if (.@lose == 1) {
mes "OH! MY GOD!";
mes "Damn it! Not again!";
@@ -743,8 +721,8 @@ function script refinemain {
}
mes "["+getarg(0)+"]";
successrefitem .@part;
- emotion e_heh;
- set .@win,rand(1,3);
+ emotion ET_SMILE;
+ .@win = rand(1,3);
if (.@win == 1) {
mes "Perfect!";
mes "Heh heh!";
@@ -771,12 +749,12 @@ function script refinemain {
mes "["+ .@npc_name$ +"]";
mes "I can refine this to the safe limit or a desired number of times. It's your choice.";
next;
- set .@menu2,select("To the safe limit, please.","I'll decide how many times.","I've changed my mind...");
+ .@menu2 = select("To the safe limit, please.","I'll decide how many times.","I've changed my mind...");
} else
- set .@menu2,2;
+ .@menu2 = 2;
switch(.@menu2){
case 1:
- set .@refinecnt,.@safe - getequiprefinerycnt(.@part);
+ .@refinecnt = .@safe - getequiprefinerycnt(.@part);
break;
case 2:
next;
@@ -784,14 +762,14 @@ function script refinemain {
mes "How many times would you like me to refine your item?";
next;
input .@refinecnt;
- set .@refinecheck,.@refinecnt + getequiprefinerycnt(.@part);
+ .@refinecheck = .@refinecnt + getequiprefinerycnt(.@part);
if (.@refinecnt < 1 || .@refinecheck > 10) {
mes "["+ .@npc_name$ +"]";
mes "I can't refine this item that many times.";
close;
}
if(.@refinecheck > .@safe) {
- set .@refinecheck,.@refinecheck - .@safe;
+ .@refinecheck = .@refinecheck - .@safe;
mes "["+ .@npc_name$ +"]";
mes "This will try to refine the equipment " + .@refinecheck + " times past the safe limit. Your equipment may be destroyed... is that ok?";
next;
@@ -808,7 +786,7 @@ function script refinemain {
mes "You said so... So be it.";
close;
}
- set .@fullprice,.@price * .@refinecnt;
+ .@fullprice = .@price * .@refinecnt;
mes "["+ .@npc_name$ +"]";
mes "That will cost you " + .@refinecnt + " " + getitemname(.@material) + " and " + .@fullprice + " Zeny. Is that ok?";
next;
@@ -822,7 +800,7 @@ function script refinemain {
mes "Is that all you got? Unfortunately I can't work for you at a lower price. Try putting yourself in my shoes.";
close;
}
- set Zeny, Zeny - .@fullprice;
+ Zeny = Zeny - .@fullprice;
delitem .@material,.@refinecnt;
while(.@refinecnt){
if (getequipisequiped(.@part) == 0) {
@@ -840,20 +818,20 @@ function script refinemain {
mes "Clang, clang!!!";
if(.@menu2 == 2 && getequippercentrefinery(.@part) <= rand(100)) {
failedrefitem .@part;
- emotion e_omg;
+ emotion ET_HUK;
mes "["+ .@npc_name$ +"]";
mes "WAHHHH!!! I'm so sorry... I warned you this could happen...";
- set .@refinecnt,.@refinecnt - 1;
+ .@refinecnt = .@refinecnt - 1;
if(.@refinecnt == 0) close;
mes "Here's the unused Zeny and materials back...";
getitem .@material,.@refinecnt;
- set .@fullprice,.@refinecnt * .@price;
- set Zeny, Zeny + .@fullprice;
+ .@fullprice = .@refinecnt * .@price;
+ Zeny = Zeny + .@fullprice;
close;
}
successrefitem .@part;
- emotion e_no1;
- set .@refinecnt,.@refinecnt - 1;
+ emotion ET_BEST;
+ .@refinecnt = .@refinecnt - 1;
next;
}
mes "["+ .@npc_name$ +"]";
@@ -913,12 +891,12 @@ function script phramain {
next;
switch(select("Phracon - 200 Zeny:Emveretarcon - 1000 Zeny:Ask about other Metals")) {
case 1:
- set .@material,1010;
- set .@price,200;
+ .@material = 1010;
+ .@price = 200;
break;
case 2:
- set .@material,1011;
- set .@price,1000;
+ .@material = 1011;
+ .@price = 1000;
break;
case 3:
mes "["+ .@npc_name$ +"]";
@@ -951,7 +929,7 @@ function script phramain {
break;
}
}
- set .@sell,.@input * .@price;
+ .@sell = .@input * .@price;
if (Zeny < .@sell) {
mes "["+ .@npc_name$ +"]";
mes "Err...";
@@ -967,7 +945,7 @@ function script phramain {
close;
}
getitem .@material,.@input;
- set Zeny, Zeny-.@sell;
+ Zeny = Zeny-.@sell;
mes "["+ .@npc_name$ +"]";
mes "Here you are!";
mes "Thank you for";
@@ -1151,7 +1129,7 @@ sch_gld,340,80,7 script Repairman#sch_gld 86,{
// Equipment Repair Function
//============================================================
function script repairmain {
- set .@repairprice,5000;
+ .@repairprice = 5000;
.@npc_name$ = getarg(0);
mes "["+ .@npc_name$ +"]";
mes "Hey there!";
@@ -1162,14 +1140,14 @@ function script repairmain {
next;
switch(select("Actually, I do have some items...:None at the moment.")) {
case 1:
- set .@checkitem,1;
+ .@checkitem = 1;
while (1) {
if (getbrokenid(.@checkitem) == 0) {
break;
}
- set .@checkitem,.@checkitem+1;
+ .@checkitem = .@checkitem+1;
}
- set .@checkitem,.@checkitem-1;
+ .@checkitem = .@checkitem-1;
if (!.@checkitem) {
mes "["+ .@npc_name$ +"]";
mes "Oh wow, this is incredible!";
@@ -1186,7 +1164,7 @@ function script repairmain {
mes "" + .@checkitem + " are damaged.";
mes "Would you like to repair?";
next;
- set .@totalcost,.@repairprice*.@checkitem;
+ .@totalcost = .@repairprice*.@checkitem;
mes "["+ .@npc_name$ +"]";
mes "Each repair costs " + .@repairprice + " Zeny. So to repair all your damaged items would cost " + .@totalcost + " Zeny! Would you like to repair the items?";
next;
@@ -1198,19 +1176,19 @@ function script repairmain {
mes "Check your wallet before you receive the repair bill! I can't repair anything because you don't have enough Zeny.";
close;
}
- set .@checkitem2,1;
+ .@checkitem2 = 1;
while (1) {
if (getbrokenid(.@checkitem2) == 0) {
break;
}
- set .@checkitem2,.@checkitem2+1;
+ .@checkitem2 = .@checkitem2+1;
}
- set .@checkitem2,.@checkitem2-1;
+ .@checkitem2 = .@checkitem2-1;
if (.@checkitem == .@checkitem2) {
- set Zeny, Zeny-.@totalcost;
+ Zeny = Zeny-.@totalcost;
while (.@checkitem) {
repair(.@checkitem);
- set .@checkitem,.@checkitem-1;
+ .@checkitem = .@checkitem-1;
}
mes "["+ .@npc_name$ +"]";
mes "Okay! All done. Now, try to be a little more careful. Items have lives too you know.";
diff --git a/npc/other/Global_Functions.txt b/npc/other/Global_Functions.txt
index 4defc821c24..5c12d343119 100644
--- a/npc/other/Global_Functions.txt
+++ b/npc/other/Global_Functions.txt
@@ -1,14 +1,9 @@
//===== rAthena Script =======================================
//= Global Functions
-//===== By: ==================================================
-//= Lupus, kobra_k88
-//===== Current Version: =====================================
-//= 2.25
-//===== Compatible With: =====================================
-//= rAthena Project
//===== Description: =========================================
//= General script functions.
//===== Additional Comments: =================================
+//= 1.0 Initial script. [Lupus] [kobra_k88]
//= Added F_ClearJobVar - on getting a new job it clears all Job Quest variables
//= Removed individual job check functions as they were redundant [kobra_k88]
//= 1.3 Added Job Change Function for Baby/Normal Classes
@@ -49,6 +44,8 @@
//= 2.24 Added functions to check for equipment swap hacks. [Euphy]
//= 2.25 Added "F_CanOpenStorage" and "F_CanChangeJob". [secretdataz]
//= 2.26 Added "F_getpositionname". [Capuche]
+//= 2.27 Added "F_GetPlatinumSkills". [mazvi]
+//= 2.28 Added "close3". [Capuche]
//============================================================
//////////////////////////////////////////////////////////////////////////////////
@@ -165,9 +162,9 @@ function script F_Rand {
//////////////////////////////////////////////////////////////////////////////////
// Returns 1st argument if female, 2nd argument if male.
-// -- callfunc "F_Sex",argFemale,argMale
+// -- callfunc "F_SexMes",argFemale,argMale
// Example:
-// mes callfunc("F_Sex","What a beautiful lady!","What a handsome man!");
+// mes callfunc("F_SexMes","What a beautiful lady!","What a handsome man!");
//////////////////////////////////////////////////////////////////////////////////
function script F_SexMes {
return getarg(Sex);
@@ -659,3 +656,114 @@ function script F_getpositionname {
return "Unknown";
}
}
+
+//////////////////////////////////////////////////////////////////////////////////
+// Gives attached player their Platinum Skill based on their class.
+//////////////////////////////////////////////////////////////////////////////////
+function script F_GetPlatinumSkills {
+ skill "NV_FIRSTAID",1,SKILL_PERM;
+ switch (BaseClass) {
+ case Job_Novice:
+ if (Class != Job_Super_Novice)
+ skill "NV_TRICKDEAD",1,SKILL_PERM;
+ break;
+ case Job_Swordman:
+ skill "SM_MOVINGRECOVERY",1,SKILL_PERM;
+ skill "SM_FATALBLOW",1,SKILL_PERM;
+ skill "SM_AUTOBERSERK",1,SKILL_PERM;
+ break;
+ case Job_Mage:
+ skill "MG_ENERGYCOAT",1,SKILL_PERM;
+ break;
+ case Job_Archer:
+ skill "AC_MAKINGARROW",1,SKILL_PERM;
+ skill "AC_CHARGEARROW",1,SKILL_PERM;
+ break;
+ case Job_Acolyte:
+ skill "AL_HOLYLIGHT",1,SKILL_PERM;
+ break;
+ case Job_Merchant:
+ skill "MC_CARTREVOLUTION",1,SKILL_PERM;
+ skill "MC_CHANGECART",1,SKILL_PERM;
+ skill "MC_LOUD",1,SKILL_PERM;
+ if(PACKETVER >= 20150826)
+ skill "MC_CARTDECORATE",1,SKILL_PERM;
+ break;
+ case Job_Thief:
+ skill "TF_SPRINKLESAND",1,SKILL_PERM;
+ skill "TF_BACKSLIDING",1,SKILL_PERM;
+ skill "TF_PICKSTONE",1,SKILL_PERM;
+ skill "TF_THROWSTONE",1,SKILL_PERM;
+ break;
+ default:
+ break;
+ }
+ switch (BaseJob) {
+ case Job_Knight:
+ skill "KN_CHARGEATK",1,SKILL_PERM;
+ break;
+ case Job_Priest:
+ skill "PR_REDEMPTIO",1,SKILL_PERM;
+ break;
+ case Job_Wizard:
+ skill "WZ_SIGHTBLASTER",1,SKILL_PERM;
+ break;
+ case Job_Blacksmith:
+ skill "BS_UNFAIRLYTRICK",1,SKILL_PERM;
+ skill "BS_GREED",1,SKILL_PERM;
+ break;
+ case Job_Hunter:
+ skill "HT_PHANTASMIC",1,SKILL_PERM;
+ break;
+ case Job_Assassin:
+ skill "AS_SONICACCEL",1,SKILL_PERM;
+ skill "AS_VENOMKNIFE",1,SKILL_PERM;
+ break;
+ case Job_Crusader:
+ skill "CR_SHRINK",1,SKILL_PERM;
+ break;
+ case Job_Monk:
+ skill "MO_KITRANSLATION",1,SKILL_PERM;
+ skill "MO_BALKYOUNG",1,SKILL_PERM;
+ break;
+ case Job_Sage:
+ skill "SA_CREATECON",1,SKILL_PERM;
+ skill "SA_ELEMENTWATER",1,SKILL_PERM;
+ skill "SA_ELEMENTGROUND",1,SKILL_PERM;
+ skill "SA_ELEMENTFIRE",1,SKILL_PERM;
+ skill "SA_ELEMENTWIND",1,SKILL_PERM;
+ break;
+ case Job_Rogue:
+ skill "RG_CLOSECONFINE",1,SKILL_PERM;
+ break;
+ case Job_Alchemist:
+ skill "AM_BIOETHICS",1,SKILL_PERM;
+ break;
+ case Job_Bard:
+ skill "BA_PANGVOICE",1,SKILL_PERM;
+ break;
+ case Job_Dancer:
+ skill "DC_WINKCHARM",1,SKILL_PERM;
+ break;
+ default:
+ break;
+ }
+ return;
+}
+
+//////////////////////////////////////////////////////////////////////////////////
+// Shortcut : close button and clear cutin.
+//////////////////////////////////////////////////////////////////////////////////
+function script close3 {
+ close2;
+ cutin "",255;
+ end;
+}
+
+//////////////////////////////////////////////////////////////////////////////////
+// Return true if the card is a charm (enchant card), false otherwise.
+//////////////////////////////////////////////////////////////////////////////////
+function script F_IsCharm {
+ .@id = getarg(0);
+ return ((.@id >= 4700 && .@id < 5000) || (.@id >= 29000 && .@id <= 29162));
+}
diff --git a/npc/other/acolyte_warp.txt b/npc/other/acolyte_warp.txt
index 356002df7d0..c962af55613 100644
--- a/npc/other/acolyte_warp.txt
+++ b/npc/other/acolyte_warp.txt
@@ -29,7 +29,7 @@ prontera,98,121,4 script Acolyte#Prtclear 90,{
mes "[Keiki]";
mes "I am the one and only Acolyte that has attained the Level 10 Warp Portal skill!";
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
next;
mes "[Keiki]";
mes "That's right! And...";
@@ -97,7 +97,7 @@ yuno,142,184,6 script Acolyte#Junoclear 90,{
mes "[Isalei]";
mes "Though I have not mastered up to the level that she has, I have been able to attain Level 5.";
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
next;
mes "[Isalei]";
mes "Maybe one day I can level up my skills enough so that I can use Warp portal to more saved locations.";
diff --git a/npc/other/arena/arena_aco.txt b/npc/other/arena/arena_aco.txt
index ff03417ec7a..0fd78d8e783 100644
--- a/npc/other/arena/arena_aco.txt
+++ b/npc/other/arena/arena_aco.txt
@@ -1096,7 +1096,7 @@ prt_are_in,25,31,3 script Staff#aco-2 67,{
set .@record_minaco, ((.@record_timeaco % 3600) / 60);
set .@record_secaco, .@record_timeaco % 60;
if ((.@record_timeaco < 0 ) || (.@record_houraco < 0) || (.@record_minaco < 0 ) || (.@record_secaco < 0)) {
- emotion e_omg;
+ emotion ET_HUK;
mes "[Staff]";
mes "How did you...?";
mes "According to these re-";
@@ -1122,7 +1122,7 @@ prt_are_in,25,31,3 script Staff#aco-2 67,{
percentheal 100,100;
next;
mes "[Staff]";
- emotion e_korea;
+ emotion ET_FLAG;
mes "Thank you.";
mes "I hope you enjoy";
mes "your time in the Arena~";
@@ -1178,7 +1178,7 @@ prt_are_in,25,31,3 script Staff#aco-2 67,{
mes "of ^3131FF"+.@topbunaco+"^000000 minutes, ^3131FF"+.@topchoaco+"^000000 seconds, of the Acolyte Class Time Force Battle.";
next;
if ((.@acotop_t < 0) || (.@topbunaco < 0 ) || (.@topchoaco < 0)) {
- emotion e_omg;
+ emotion ET_HUK;
mes "[Staff]";
mes "Wait a second...";
mes "Your time is better";
@@ -1186,7 +1186,7 @@ prt_are_in,25,31,3 script Staff#aco-2 67,{
mes "It's time I made a little";
mes "correction to the records.";
next;
- emotion e_no1;
+ emotion ET_BEST;
mes "[Staff]";
mes "Wow! A new record!";
mes "Excellent!";
@@ -1344,7 +1344,7 @@ prt_are_in,25,31,3 script Staff#aco-2 67,{
end;
}
else {
- emotion e_omg;
+ emotion ET_HUK;
mes "[Staff]";
mes "Wow! A new record!";
mes "This is awsome!";
diff --git a/npc/other/arena/arena_lvl50.txt b/npc/other/arena/arena_lvl50.txt
index a4c21dd48db..9d3183eecd7 100644
--- a/npc/other/arena/arena_lvl50.txt
+++ b/npc/other/arena/arena_lvl50.txt
@@ -872,7 +872,7 @@ prt_are_in,25,188,3 script Staff#50-2 67,{
donpcevent "Lv50 Waiting Room::OnStart";
end;
} else {
- emotion e_omg;
+ emotion ET_HUK;
mes "[Staff]";
mes "Wow! You have renewed the record!";
mes "What a great job!";
diff --git a/npc/other/arena/arena_lvl60.txt b/npc/other/arena/arena_lvl60.txt
index 77a1b3ce0ab..1cb78a69fae 100644
--- a/npc/other/arena/arena_lvl60.txt
+++ b/npc/other/arena/arena_lvl60.txt
@@ -882,7 +882,7 @@ prt_are_in,25,135,3 script Staff#60-2 67,{
donpcevent "Lv60 Waiting Room::OnStart";
end;
} else {
- emotion e_omg;
+ emotion ET_HUK;
mes "[Staff]";
mes "Wow! You have renewed the record!";
mes "What a great job!";
diff --git a/npc/other/arena/arena_lvl70.txt b/npc/other/arena/arena_lvl70.txt
index fcec2922eaf..f1999d5957c 100644
--- a/npc/other/arena/arena_lvl70.txt
+++ b/npc/other/arena/arena_lvl70.txt
@@ -847,7 +847,7 @@ prt_are_in,25,84,3 script Staff#70-2 67,{
donpcevent "Lv70 Waiting Room::OnStart";
end;
} else {
- emotion e_omg;
+ emotion ET_HUK;
mes "[Staff]";
mes "Wow! You have renewed the record!";
mes "What a great job!";
diff --git a/npc/other/arena/arena_lvl80.txt b/npc/other/arena/arena_lvl80.txt
index 6a8b96e3e8d..4e5dc514daf 100644
--- a/npc/other/arena/arena_lvl80.txt
+++ b/npc/other/arena/arena_lvl80.txt
@@ -828,7 +828,7 @@ prt_are_in,77,187,3 script Staff#80-2 67,{
donpcevent "Lv80 Waiting Room::OnStart";
end;
} else {
- emotion e_omg;
+ emotion ET_HUK;
mes "[Staff]";
mes "Wow! You have renewed the record!";
mes "What a great job!";
diff --git a/npc/other/arena/arena_party.txt b/npc/other/arena/arena_party.txt
index 4258baf7025..2dc88578513 100644
--- a/npc/other/arena/arena_party.txt
+++ b/npc/other/arena/arena_party.txt
@@ -43,7 +43,7 @@ OnStart:
prt_are_in,76,87,3 script Helper#party 67,4,4,{
if($arn_partywait == 0) {
set $arn_partywait,1;
- emotion e_gasp,0;
+ emotion ET_SURPRISE;
mes "[Helper Iriff]";
mes "Good day, challengers!";
mes "You are in the party arena waiting room.";
@@ -1044,7 +1044,7 @@ prt_are_in,77,135,3 script Staff#party-2 67,{
warp "arena_room",100,75;
end;
} else {
- emotion e_omg;
+ emotion ET_HUK;
mes "[Staff]";
mes "Wow! You have renewed the record!";
mes "What a great job!";
diff --git a/npc/other/arena/arena_point.txt b/npc/other/arena/arena_point.txt
index b98b778ced0..97c9bf7ebb3 100644
--- a/npc/other/arena/arena_point.txt
+++ b/npc/other/arena/arena_point.txt
@@ -62,7 +62,7 @@ prt_are_in,103,11,3 script Arena Point Manager 732,{
mes "To cancel, enter ''^3355FF0^000000.''";
next;
input .@input;
- if (.@input == 0) {
+ if (.@input <= 0) {
mes "[Arena Point Manager]";
mes "You have";
mes "canceled";
@@ -113,8 +113,8 @@ prt_are_in,103,11,3 script Arena Point Manager 732,{
mes "into 5 Arena Points " + .@input + " times.";
mes "A total of " + .@want_point1 + " Turbo Track Points were converted into";
mes "" + .@want_point +" Arena Points.";
- set tt_point,tt_point - .@want_point1;
- set arena_point,arena_point+.@want_point;
+ set tt_point, .@my_turbo_all;
+ set arena_point, .@my_arena_all;
next;
mes "[Arena Point Manager]";
mes "" + strcharinfo(0) + ",";
diff --git a/npc/other/arena/arena_room.txt b/npc/other/arena/arena_room.txt
index 973b8bb9cd5..ed44650023f 100644
--- a/npc/other/arena/arena_room.txt
+++ b/npc/other/arena/arena_room.txt
@@ -260,7 +260,7 @@ arena_room,147,49,3 script Helper Epin 727,{
mes "I am a helper of Lv 80 arena stage and my name is Epin.";
mes "I like reading and I am 19 years old...huh...? Don't you want to hear about me...?";
next;
- emotion e_cry,0;
+ emotion ET_CRY;
mes "[Epin]";
mes "Okay...";
next;
@@ -368,7 +368,7 @@ arena_room,158,93,5 script Helper Lunic 828,{
}
arena_room,158,82,1 script Helper Lonik 828,{
- emotion e_no1,0;
+ emotion ET_BEST;
mes "[Lonik]";
mes "Tah dah! Here I am!";
next;
@@ -379,14 +379,14 @@ arena_room,158,82,1 script Helper Lonik 828,{
mes "My answer is...";
mes ".............";
if (getmapusers("force_1-2")) {
- emotion e_oh,0;
+ emotion ET_O;
mes "Yes!";
mes "There is someone inside.";
next;
mes "[Lonik]";
mes "You'd better wait a little bit longer!";
} else {
- emotion e_x,0;
+ emotion ET_X;
mes "No!";
mes "Go for it, good luck!";
}
@@ -739,22 +739,22 @@ OnInit:
end;
OnHeart:
- emotion e_lv,0;
+ emotion ET_THROB;
end;
OnSci:
- emotion e_scissors,0;
+ emotion ET_SCISSOR;
end;
OnBest:
- emotion e_no1,0;
+ emotion ET_BEST;
end;
OnOmg:
- emotion e_omg,0;
+ emotion ET_HUK;
end;
OnKik:
- emotion e_gg,0;
+ emotion ET_KIK;
end;
OnKis:
- emotion e_kis,0;
+ emotion ET_CHUP;
end;
}
prt_are_in,1,1,5 duplicate(#arena_1039) #arena_6969 714
@@ -999,7 +999,7 @@ function script Func_Are_Rew {
mes "If you wish to cancel, please enter 0. If you don't, please enter how many ^3131FFtimes^000000 of arena points you wish to spend.";
next;
input .@reward;
- if (.@reward == 0) {
+ if (.@reward <= 0) {
mes "[Givu]";
mes "You have canceled your request.";
close;
@@ -1008,7 +1008,7 @@ function script Func_Are_Rew {
mes "You have exceeded the maximum capacity.";
close;
}
- if (arena_point < .@reward * .@arena_point) {
+ if (arena_point < (.@reward * .@arena_point)) {
mes "[Givu]";
mes "You do not have enough arena points.";
mes "Please check the total amount of arena points you have.";
diff --git a/npc/other/bulletin_boards.txt b/npc/other/bulletin_boards.txt
index ba586536edd..be8e1c95fa5 100644
--- a/npc/other/bulletin_boards.txt
+++ b/npc/other/bulletin_boards.txt
@@ -360,23 +360,23 @@ xmas_fild01,75,80,5 script Bulletin Board#22 837,{
}
niflheim,200,191,5 script Bulletin Board#25 837,{
- mes "[City of the Dead, Nifflheim]";
- mes "Welcome to Nifflheim, the City of the Dead.";
- mes "Nifflheim was known as the other world where";
+ mes "[City of the Dead, Niflheim]";
+ mes "Welcome to Niflheim, the City of the Dead.";
+ mes "Niflheim was known as the other world where";
mes "you come after the death.";
mes "However, recently people found out a secret path behind of a mysterious tree.";
mes "So, you will find many other people travelling around this area.";
next;
- mes "[City of the Dead, Nifflheim]";
+ mes "[City of the Dead, Niflheim]";
mes "As a tourist attraction, The Witch's castle is suggested.";
mes "Unlike normal towns, it is prohibited to save respawn point or";
- mes "warp point inside Nifflheim. Also monsters spawn within the town as well.";
+ mes "warp point inside Niflheim. Also monsters spawn within the town as well.";
next;
- mes "[City of the Dead, Nifflheim]";
+ mes "[City of the Dead, Niflheim]";
mes "Especially, please be attentive with a boss monster";
mes "called ^6B1312Lord of the Death^000000.";
next;
- mes "[City of the Dead, Nifflheim]";
+ mes "[City of the Dead, Niflheim]";
mes "When you go ahead west, you will arrive at ^6B1312Valley of Gyoll^000000";
mes "where all the powerful and fearful monsters dwell upon.";
mes "It is suggested to leave the area immediately in case of a new solo adventurer.";
diff --git a/npc/other/comodo_gambling.txt b/npc/other/comodo_gambling.txt
index 011f51ea18a..552712a860e 100644
--- a/npc/other/comodo_gambling.txt
+++ b/npc/other/comodo_gambling.txt
@@ -494,7 +494,7 @@ mjolnir_02,85,362,3 script Blacksmith Miner 4_F_JOB_BLACKSMITH,{
mes "thousands of Diamonds,";
mes "all of them mine!";
mes "I'm rich!";
- emotion e_heh;
+ emotion ET_SMILE;
next;
switch(select("I want to buy some.:Congratulations.")){
case 1:
diff --git a/npc/other/divorce.txt b/npc/other/divorce.txt
index 597df852265..f4aa4e0cb31 100644
--- a/npc/other/divorce.txt
+++ b/npc/other/divorce.txt
@@ -117,7 +117,7 @@ nif_in,190,112,5 script Deviruchi#divorce 738,{
mes "marriage as a contract...a";
mes "contract that ends with 'till";
mes "death do we part.' Here in";
- mes "Nifleheim, it's easy to use";
+ mes "Niflheim, it's easy to use";
mes "that little loophole...";
next;
mes "[Deviruchi]";
diff --git a/npc/other/gm_npcs.txt b/npc/other/gm_npcs.txt
index 5097055d7b3..2b456c987e3 100644
--- a/npc/other/gm_npcs.txt
+++ b/npc/other/gm_npcs.txt
@@ -104,6 +104,7 @@ List of GM Management NPCs (incomplete)
- Button Girl#sura
- Battle Test Control#ko
- Guide#ko_helper
+- Admin1
--------------------------
- Soul Linker Var
- 1st Job Quest Reset
diff --git a/npc/other/marriage.txt b/npc/other/marriage.txt
index a40b6befc3e..2a6b1615c67 100644
--- a/npc/other/marriage.txt
+++ b/npc/other/marriage.txt
@@ -376,7 +376,7 @@ prt_church,97,100,4 script Wedding Staff#w 71,{
mes "process, both of you should";
mes "speak to the Bishop to begin";
mes "the wedding ceremony.";
- emotion e_lv;
+ emotion ET_THROB;
next;
mes "[Marry Happy]";
if (Sex == SEX_FEMALE) {
@@ -425,47 +425,47 @@ prt_church,97,100,4 script Wedding Staff#w 71,{
donpcevent "Single Army#Payon::OnEnable";
donpcevent "Single Army#Amatsu::OnEnable";
donpcevent "Single Army#Gonryun::OnEnable";
- emotion e_omg;
+ emotion ET_HUK;
mes "[Single Army]";
mes "^CC9933You have to refine";
mes "items on your own to";
mes "make great equipment!^000000";
- emotion e_rock,0,"Single Army#Prontera";
+ emotion ET_ROCK, getnpcid(0, "Single Army#Prontera");
next;
mes "[Single Army]";
mes "^330099It's a waste to";
mes "form parties in";
mes "dungeons! I can";
mes "make it on my own!^000000";
- emotion e_rock,0,"Single Army#Geffen";
+ emotion ET_ROCK, getnpcid(0, "Single Army#Geffen");
next;
mes "[Single Army]";
mes "^666666Hell, I've trained";
mes "all by myself since";
mes "birth, all the way";
mes "to my job change!^000000";
- emotion e_rock,0,"Single Army#Morocc";
+ emotion ET_ROCK, getnpcid(0, "Single Army#Morocc");
next;
mes "[Single Army]";
mes "^666600I CHOOSE to spend";
mes "Christmas alone...";
mes "playing Solitaire and";
mes "doing crossword puzzles!^000000";
- emotion e_rock,0,"Single Army#Payon";
+ emotion ET_ROCK, getnpcid(0, "Single Army#Payon");
next;
mes "[Single Army]";
mes "^CC9966Women may break my";
mes "spirit, but they'll never";
mes "take... my FREEDOM!^000000";
- emotion e_rock,0,"Single Army#Amatsu";
+ emotion ET_ROCK, getnpcid(0, "Single Army#Amatsu");
next;
mes "[Single Army]";
mes "^669900...We're the free! We're";
mes "the Invincible Single Army!^000000";
- emotion e_rock,0,"Single Army#Gonryun";
+ emotion ET_ROCK, getnpcid(0, "Single Army#Gonryun");
close2;
cutin "wedding_marry01",255;
- emotion e_swt;
+ emotion ET_SWEAT;
donpcevent "Single Army#Prontera::OnInit";
donpcevent "Single Army#Geffen::OnInit";
donpcevent "Single Army#Morocc::OnInit";
@@ -497,7 +497,7 @@ OnInit:
OnEnable:
hideoffnpc "Single Army#Prontera";
- emotion e_go;
+ emotion ET_GO;
end;
}
@@ -515,7 +515,7 @@ OnInit:
OnEnable:
hideoffnpc "Single Army#Geffen";
- emotion e_go;
+ emotion ET_GO;
end;
}
@@ -533,7 +533,7 @@ OnInit:
OnEnable:
hideoffnpc "Single Army#Morocc";
- emotion e_go;
+ emotion ET_GO;
end;
}
@@ -551,7 +551,7 @@ OnInit:
OnEnable:
hideoffnpc "Single Army#Payon";
- emotion e_go;
+ emotion ET_GO;
end;
}
@@ -568,7 +568,7 @@ OnInit:
OnEnable:
hideoffnpc "Single Army#Amatsu";
- emotion e_go;
+ emotion ET_GO;
end;
}
@@ -584,7 +584,7 @@ OnInit:
OnEnable:
hideoffnpc "Single Army#Gonryun";
- emotion e_go;
+ emotion ET_GO;
end;
}
diff --git a/npc/other/monster_race.txt b/npc/other/monster_race.txt
index 87fa0aa76aa..e1f37040366 100644
--- a/npc/other/monster_race.txt
+++ b/npc/other/monster_race.txt
@@ -207,7 +207,7 @@ OnInit:
- script Runner_main -1,{
OnEnable:
- emotion e_gasp;
+ emotion ET_SURPRISE;
enablenpc strnpcinfo(0);
getmapxy(.@m$,.@x,.@y,UNITTYPE_NPC);
setarray .@mob[1], 1725,1726,1727,1728,1730,1729;
@@ -381,7 +381,7 @@ p_track01,67,45,5 script Medal Distributor#single 845,{
OnEnable:
enablenpc "Medal Distributor#single";
- emotion e_gasp;
+ emotion ET_SURPRISE;
initnpctimer;
end;
@@ -1352,7 +1352,7 @@ p_track02,73,22,1 script Ticket Helper#2 899,{
mes "to win this race. Good luck!";
mes "I really hope that the odds";
mes "work out in your favor~";
- emotion e_kis;
+ emotion ET_CHUP;
monster_race_2_1 = .@m1;
monster_race_2_2 = .@m;
getitem 7514,1; //Monster_Ticket
@@ -1700,13 +1700,13 @@ OnEnable:
OnTouchNPC:
.@i = MN;
if (!$@mon_race_2_1) {
- emotion e_lv;
+ emotion ET_THROB;
specialeffect EF_MVP;
mapannounce "p_track02","Monster "+.@i+" has reached the Finish Line!",bc_map,"0x66FFCC";
$@mon_race_2_1 = .@i;
donpcevent strnpcinfo(0)+"::OnDisable";
} else {
- emotion e_lv;
+ emotion ET_THROB;
specialeffect EF_MVP;
mapannounce "p_track02","The race is over! Monster "+.@i+" has reached the Finish Line!",bc_map,"0x66FFCC";
$@mon_race_2_2 = .@i;
@@ -2223,7 +2223,7 @@ S_Reward:
mes "those medals, so if you";
mes "change your mind, please";
mes "come back as soon as you can.";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
mes "[Ei'felle]";
@@ -2250,8 +2250,8 @@ S_Reward:
mes "becoming what you want";
mes "to be! B-believe... with";
mes "all of your freakin' heart!";
- emotion e_omg,1;
- emotion e_omg;
+ emotion ET_HUK, playerattached();
+ emotion ET_HUK;
next;
mes "[Ei'felle]";
mes "*Phew* How's that?";
@@ -2310,8 +2310,8 @@ S_Reward:
mes "You've gotta see it, and";
mes "you've gotta feel it in your";
mes "freakin' heart and mind!";
- emotion e_omg,1;
- emotion e_omg;
+ emotion ET_HUK, playerattached();
+ emotion ET_HUK;
next;
mes "[Ei'felle]";
mes "Yeap, it doesn't matter";
@@ -2482,7 +2482,7 @@ S_Reward:
mes "medals with you. Make sure";
mes "that you offer me an amount of";
mes "medals that you actually have.";
- emotion e_heh;
+ emotion ET_SMILE;
close;
} else {
mes "[Ei'felle]";
@@ -2808,7 +2808,7 @@ p_track02,32,45,5 script Eccentric Scholar#double 755,{
mes "my calculations!";
mes "Now, where was I...?";
specialeffect EF_CLAYMORE;
- emotion e_an;
+ emotion ET_FRET;
close;
}
@@ -2820,7 +2820,7 @@ p_track02,69,31,1 script Blacksmith Guildsman#dou 726,{
mes "I haven't won even once!";
mes "Oh, I must have the worst";
mes "luck in wagering history!";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Blacksmith Guildsman]";
mes "I've been assigned by my";
@@ -2829,7 +2829,7 @@ p_track02,69,31,1 script Blacksmith Guildsman#dou 726,{
mes "They're apparently made";
mes "with some rare metal, but...";
mes "It's too hard for me to win~!";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
close;
}
mes "[Blacksmith Guildsman]";
@@ -2838,7 +2838,7 @@ p_track02,69,31,1 script Blacksmith Guildsman#dou 726,{
mes "medals! Otherwise, I'll";
mes "be too ashamed to return";
mes "home to Einbroch! F-faster!";
- emotion e_korea;
+ emotion ET_FLAG;
close;
}
@@ -2862,7 +2862,7 @@ p_track02,53,45,3 script Valiant Knight#double 733,{
mes "You too...!";
mes "Always bet";
mes "on Deviruchi!";
- emotion e_no1;
+ emotion ET_BEST;
close;
}
diff --git a/npc/other/poring_war.txt b/npc/other/poring_war.txt
index f5d6b224203..ff10ac808ba 100644
--- a/npc/other/poring_war.txt
+++ b/npc/other/poring_war.txt
@@ -1677,11 +1677,11 @@ OnTouch:
next;
mes "[Porings]";
mes "Let's go! Let's fight! Let's win, win, win!!!";
- emotion e_go,0,"Angeling Side Poring#wa1";
- emotion e_go,0,"Angeling Side Poring#wa2";
- emotion e_go,0,"Angeling Side Poring#wa3";
- emotion e_go,0,"Angeling Side Poring#wa4";
- emotion e_go,0,"Angeling Side Poring#wa5";
+ emotion ET_GO, getnpcid(0, "Angeling Side Poring#wa1");
+ emotion ET_GO, getnpcid(0, "Angeling Side Poring#wa2");
+ emotion ET_GO, getnpcid(0, "Angeling Side Poring#wa3");
+ emotion ET_GO, getnpcid(0, "Angeling Side Poring#wa4");
+ emotion ET_GO, getnpcid(0, "Angeling Side Poring#wa5");
next;
if (wop_team == 1) {
mes "[Porings]";
@@ -1695,20 +1695,20 @@ OnTouch:
mes "Wait, YOU! Aren't you on the side of the Devilings?!";
mes "Get out now! Leave!!";
mes "Booooo~ Boo~ Boooo~";
- emotion e_omg,0,"Angeling Side Poring#wa1";
- emotion e_an,0,"Angeling Side Poring#wa2";
- emotion e_omg,0,"Angeling Side Poring#wa3";
- emotion e_an,0,"Angeling Side Poring#wa4";
- emotion e_gasp,0,"Angeling Side Poring#wa5";
+ emotion ET_HUK, getnpcid(0, "Angeling Side Poring#wa1");
+ emotion ET_FRET, getnpcid(0, "Angeling Side Poring#wa2");
+ emotion ET_HUK, getnpcid(0, "Angeling Side Poring#wa3");
+ emotion ET_FRET, getnpcid(0, "Angeling Side Poring#wa4");
+ emotion ET_SURPRISE, getnpcid(0, "Angeling Side Poring#wa5");
}
else {
mes "[Porings]";
mes "Hey, human. How about fighting for us Porings on Angeling's side??!";
- emotion e_hlp,0,"Angeling Side Poring#wa1";
- emotion e_go,0,"Angeling Side Poring#wa2";
- emotion e_hlp,0,"Angeling Side Poring#wa3";
- emotion e_go,0,"Angeling Side Poring#wa4";
- emotion e_go,0,"Angeling Side Poring#wa5";
+ emotion ET_HELP, getnpcid(0, "Angeling Side Poring#wa1");
+ emotion ET_GO, getnpcid(0, "Angeling Side Poring#wa2");
+ emotion ET_HELP, getnpcid(0, "Angeling Side Poring#wa3");
+ emotion ET_GO, getnpcid(0, "Angeling Side Poring#wa4");
+ emotion ET_GO, getnpcid(0, "Angeling Side Poring#wa5");
}
next;
mes "[Porings]";
@@ -1730,11 +1730,11 @@ OnTouch:
next;
mes "[Marins]";
mes "Let's go! Let's fight! Fight for Triumph!!!!";
- emotion e_go,0,"Deviling Side Marin#wd1";
- emotion e_go,0,"Deviling Side Marin#wd2";
- emotion e_go,0,"Deviling Side Marin#wd3";
- emotion e_go,0,"Deviling Side Marin#wd4";
- emotion e_go,0,"Deviling Side Marin#wd5";
+ emotion ET_GO, getnpcid(0, "Deviling Side Marin#wd1");
+ emotion ET_GO, getnpcid(0, "Deviling Side Marin#wd2");
+ emotion ET_GO, getnpcid(0, "Deviling Side Marin#wd3");
+ emotion ET_GO, getnpcid(0, "Deviling Side Marin#wd4");
+ emotion ET_GO, getnpcid(0, "Deviling Side Marin#wd5");
next;
if (wop_team == 2) {
mes "[Marins]";
@@ -1747,20 +1747,20 @@ OnTouch:
mes "Wait, YOU! Aren't you on the side of the Angelings?!";
mes "Get out now! Leave!!";
mes "Booooo~ Boo~ Boooo~";
- emotion e_omg,0,"Deviling Side Marin#wd1";
- emotion e_an,0,"Deviling Side Marin#wd2";
- emotion e_omg,0,"Deviling Side Marin#wd3";
- emotion e_an,0,"Deviling Side Marin#wd4";
- emotion e_gasp,0,"Deviling Side Marin#wd5";
+ emotion ET_HUK, getnpcid(0, "Deviling Side Marin#wd1");
+ emotion ET_FRET, getnpcid(0, "Deviling Side Marin#wd2");
+ emotion ET_HUK, getnpcid(0, "Deviling Side Marin#wd3");
+ emotion ET_FRET, getnpcid(0, "Deviling Side Marin#wd4");
+ emotion ET_SURPRISE, getnpcid(0, "Deviling Side Marin#wd5");
}
else {
mes "[Marins]";
mes "Hey, human. Don't you wanna fight for Deviling, the noble of darkness? What do you say?!";
- emotion e_hlp,0,"Deviling Side Marin#wd1";
- emotion e_go,0,"Deviling Side Marin#wd2";
- emotion e_hlp,0,"Deviling Side Marin#wd3";
- emotion e_go,0,"Deviling Side Marin#wd4";
- emotion e_go,0,"Deviling Side Marin#wd5";
+ emotion ET_HELP, getnpcid(0, "Deviling Side Marin#wd1");
+ emotion ET_GO, getnpcid(0, "Deviling Side Marin#wd2");
+ emotion ET_HELP, getnpcid(0, "Deviling Side Marin#wd3");
+ emotion ET_GO, getnpcid(0, "Deviling Side Marin#wd4");
+ emotion ET_GO, getnpcid(0, "Deviling Side Marin#wd5");
}
next;
mes "[Marins]";
diff --git a/npc/other/powernpc.txt b/npc/other/powernpc.txt
index 09d0546ef12..24ca8bfbb02 100644
--- a/npc/other/powernpc.txt
+++ b/npc/other/powernpc.txt
@@ -58,7 +58,7 @@ gonryun,180,118,4 script Iron man#gnp 85,{
case 3:
mes "[Songmoodoo]";
mes "I guess not...";
- emotion e_pif;
+ emotion ET_HNG;
break;
}
} else if (in_battle == 1) {
@@ -85,7 +85,7 @@ gonryun,180,118,4 script Iron man#gnp 85,{
mes "Guess you're not strong enough!";
mes "I'll give you another chance.";
mes "See you again.";
- emotion e_pif;
+ emotion ET_HNG;
set in_battle,1;
}
close;
@@ -96,7 +96,7 @@ L_Lifting:
set in_battle,1;
getitem 7049, getarg(0); // Stone
next;
- emotion e_no1;
+ emotion ET_BEST;
mes "[Songmoodoo]";
mes "Wow~ Excellent~";
mes "I'll take you to someplace nice";
diff --git a/npc/other/turbo_track.txt b/npc/other/turbo_track.txt
index ddd5f61f517..3bbea4bd915 100644
--- a/npc/other/turbo_track.txt
+++ b/npc/other/turbo_track.txt
@@ -51,12 +51,12 @@ OnStartArena:
OnInit:
if (compare(strnpcinfo(0),"main")) end;
if (compare(strnpcinfo(2),"n1")) {
- waitingroom "Solo Mode",60,"Solo Mode#n1::OnStartArena",1;
+ waitingroom "Solo Mode",60,"Solo Mode#n1::OnStartArena",1,1000,10;
} else {
if (compare(strnpcinfo(1),"4")) set .@in, 4;
if (compare(strnpcinfo(1),"8")) set .@in, 8;
if (compare(strnpcinfo(1),"16")) set .@in, 16;
- waitingroom strnpcinfo(1),60,strnpcinfo(0)+"::OnStartArena",.@in,1000,10,99;
+ waitingroom strnpcinfo(1),60,strnpcinfo(0)+"::OnStartArena",.@in,1000,10;
}
enablewaitingroomevent strnpcinfo(0);
end;
@@ -995,7 +995,7 @@ OnTouch_:
case 1:
case 9:
sc_start SC_CONFUSION,8000,0;
- emotion e_swt2,1;
+ emotion ET_PROFUSELY_SWEAT, playerattached();
end;
case 2:
sc_start SC_STONE,4000,0;
@@ -1005,7 +1005,7 @@ OnTouch_:
end;
case 6:
sc_start SC_FREEZE,4000,0;
- emotion e_swt2,1;
+ emotion ET_PROFUSELY_SWEAT, playerattached();
end;
case 8:
sc_start SC_STUN,4000,0;
@@ -1807,7 +1807,7 @@ turbo_n_1,232,14,0 duplicate(cos#tt_main) #cos_n1_8 45,1,1
turbo_e_16,179,55,0 script TurboHint_1#tt_main -1,1,1,{
OnTouch_:
- emotion e_what,1;
+ emotion ET_QUESTION, playerattached();
end;
}
turbo_e_16,179,55,0 duplicate(TurboHint_1#tt_main) #e16Intersectiona -1,1,1
@@ -1855,7 +1855,7 @@ turbo_n_1,208,56,0 duplicate(TurboHint_1#tt_main) #n1Intersectionn -1,1,1
- script TurboHint_2#tt_main -1,{
OnTouch_:
- emotion e_gasp,1;
+ emotion ET_SURPRISE, playerattached();
end;
}
turbo_e_16,178,63,0 duplicate(TurboHint_2#tt_main) #e16CorrectPath1 -1,1,1
@@ -1888,9 +1888,9 @@ turbo_n_1,191,30,0 duplicate(TurboHint_2#tt_main) #n1CorrectPath9 -1,1,1
- script TurboHint_3#tt_main -1,{
OnTouch_:
- emotion e_swt2,1;
+ emotion ET_PROFUSELY_SWEAT, playerattached();
if (rand(1,4) == 3)
- emotion e_gasp;
+ emotion ET_SURPRISE;
end;
}
turbo_e_16,187,55,0 duplicate(TurboHint_3#tt_main) #e16NoWayOut1 -1,1,1
@@ -1908,7 +1908,7 @@ turbo_n_1,219,39,0 duplicate(TurboHint_3#tt_main) #n1NoWayOut4 -1,1,1
- script TurboHint_4#tt_main -1,1,1,{
OnTouch_:
- emotion e_swt2,1;
+ emotion ET_PROFUSELY_SWEAT, playerattached();
end;
}
turbo_e_16,222,45,0 duplicate(TurboHint_4#tt_main) #e16NoWayOut5 -1,1,1
@@ -4492,7 +4492,7 @@ turbo_room,106,117,3 script Point Manager#tt 833,{
mes "is 20. To cancel, enter '^3355FF0^000000.'";
next;
input .@input;
- if (.@input == 0) {
+ if (.@input <= 0) {
mes "[Turbo Track Point Manager]";
mes "You have";
mes "canceled";
diff --git a/npc/pre-re/guides/guides_niflheim.txt b/npc/pre-re/guides/guides_niflheim.txt
index 6bb725d9fa0..50b54642a51 100644
--- a/npc/pre-re/guides/guides_niflheim.txt
+++ b/npc/pre-re/guides/guides_niflheim.txt
@@ -68,7 +68,7 @@ niflheim,107,156,6 script Roaming Man#nif 798,{
mes "special once I realized no";
mes "Potion can ease the pain I feel.";
mes "...I wish I was in prison.";
- emotion e_wah;
+ emotion ET_KEK;
viewpoint 1,217,196,3,0xCE6300;
break;
case 3:
@@ -84,7 +84,7 @@ niflheim,107,156,6 script Roaming Man#nif 798,{
mes "the monsters here will just";
mes "make them angrier. You may as";
mes "well let them eat you.";
- emotion e_wah;
+ emotion ET_KEK;
viewpoint 1,216,171,4,0x55FF33;
break;
case 4:
diff --git a/npc/pre-re/jobs/novice/novice.txt b/npc/pre-re/jobs/novice/novice.txt
index 276afea970c..8aecf33a4e1 100644
--- a/npc/pre-re/jobs/novice/novice.txt
+++ b/npc/pre-re/jobs/novice/novice.txt
@@ -565,7 +565,7 @@ new_1-2,99,105,3 script Interfaces Tutor#nv1 751,{
warp "new_1-2",28,178;
end;
case 3:
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
close;
}
}
@@ -608,7 +608,7 @@ new_1-2,99,105,3 script Interfaces Tutor#nv1 751,{
end;
}
case 3:
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
close;
}
}
@@ -648,7 +648,7 @@ new_1-2,99,105,3 script Interfaces Tutor#nv1 751,{
end;
}
case 3:
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
close;
}
}
@@ -848,7 +848,7 @@ new_1-2,83,111,3 script Skill Tutor#nv 753,{
warp "new_1-2",28,178;
end;
case 3:
- emotion e_omg;
+ emotion ET_HUK;
close;
}
case 2:
@@ -859,7 +859,7 @@ new_1-2,83,111,3 script Skill Tutor#nv 753,{
warp "new_1-2",28,178;
end;
case 3:
- emotion e_omg;
+ emotion ET_HUK;
close;
}
}
@@ -882,7 +882,7 @@ new_1-2,83,111,3 script Skill Tutor#nv 753,{
warp "new_1-2",28,178;
end;
case 3:
- emotion e_omg;
+ emotion ET_HUK;
close;
}
}
@@ -905,7 +905,7 @@ new_1-2,83,111,3 script Skill Tutor#nv 753,{
warp "new_1-2",28,178;
end;
case 3:
- emotion e_omg;
+ emotion ET_HUK;
close;
}
}
@@ -1926,7 +1926,7 @@ new_1-2,184,172,1 script Understandings of Skills 47,{
mes "[Leo Handerson]";
mes "I, Leo Handerson,";
mes "feel so responsible for your performance and will be teaching you to the best of my ability. Now, please select the subject you wish to learn.";
- emotion e_kis;
+ emotion ET_CHUP;
next;
while(1) {
switch(select("Passive and Active skills:Basic Skills:Use of Emoticons:Cancel.")) {
@@ -2066,7 +2066,7 @@ new_1-2,184,172,1 script Understandings of Skills 47,{
mes "An adorable Novice";
mes "like you should pick";
mes "on this really quickly~";
- emotion e_kis;
+ emotion ET_CHUP;
next;
break;
case 3:
@@ -2162,7 +2162,7 @@ new_1-2,184,172,1 script Understandings of Skills 47,{
next;
mes "[Leo Handerson]";
mes "To check out the commands for even more emoticons, type the command ^4d4dff//emotion^000000 into your Chat Window to see the list~";
- emotion e_lv;
+ emotion ET_THROB;
next;
break;
case 4:
diff --git a/npc/pre-re/mobs/dungeons/yggdrasil.txt b/npc/pre-re/mobs/dungeons/yggdrasil.txt
index 66beaac7a57..5af870f1102 100644
--- a/npc/pre-re/mobs/dungeons/yggdrasil.txt
+++ b/npc/pre-re/mobs/dungeons/yggdrasil.txt
@@ -7,7 +7,7 @@
//===== Compatible With: =====================================
//= rAthena Project
//===== Additional Comments: =================================
-//= 1.0 Splitted from Nifflheim fields [DracoRPG]
+//= 1.0 Splitted from Niflheim fields [DracoRPG]
//= 1.1 Official kRO 10.1 spawns [Playtester]
//============================================================
diff --git a/npc/quests/bard_quest.txt b/npc/quests/bard_quest.txt
index 01c805c6215..55389f0250c 100644
--- a/npc/quests/bard_quest.txt
+++ b/npc/quests/bard_quest.txt
@@ -2908,7 +2908,7 @@ yuno_in04,33,119,3 script Adventurer#1 828,{
mes "What is it?";
next;
if (Sex == SEX_FEMALE) {
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Energetic Young Man]";
mes "Oh...!";
mes "A beautiful,";
@@ -2932,7 +2932,7 @@ yuno_in04,33,119,3 script Adventurer#1 828,{
next;
mes "[Energetic Young Man]";
mes "I shall remember your name, my lady. Oh, but I'm so sorry. I'm kind of busy right now. Would you come back later? I'll do my best to please you next time.";
- emotion e_kis;
+ emotion ET_CHUP;
close;
} else {
@@ -2940,7 +2940,7 @@ yuno_in04,33,119,3 script Adventurer#1 828,{
next;
mes "[Energetic Young Man]";
mes "Eh, whatever. Oh, but I'm so sorry. I'm kind of busy right now. Would you come back later? I'll do my best to please you next time.";
- emotion e_heh;
+ emotion ET_SMILE;
close;
}
diff --git a/npc/quests/cooking_quest.txt b/npc/quests/cooking_quest.txt
index 3b3b13cc786..21bd65a6687 100644
--- a/npc/quests/cooking_quest.txt
+++ b/npc/quests/cooking_quest.txt
@@ -52,7 +52,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 878,{
mes "kitchen, then I'd like to";
mes "ask you to leave now.";
next;
- emotion e_an;
+ emotion ET_FRET;
mes "[Charles Orleans]";
mes "Please don't be";
mes "offended, but I can't";
@@ -82,7 +82,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 878,{
else if (getequipid(EQI_HEAD_TOP) != 5026) {
if (Sex == SEX_MALE) {
cutin "orleans_5",0;
- emotion e_an;
+ emotion ET_FRET;
mes "[Charles Orleans]";
mes "Monsieur, why you look";
mes "at me so? Is it the Morroc";
@@ -138,14 +138,14 @@ prt_castle,43,30,3 script Charles Orleans#cook 878,{
switch(select("......?:She is my sister:Actually, I don't know her.")) {
case 1:
cutin "nyuang_3",2;
- emotion e_ho,0,"Child with Cat#cook";
+ emotion ET_DELIGHT, getnpcid(0, "Child with Cat#cook");
mes "[The kid with a cat]";
mes "Nyahahaha,";
mes "Nyahahaha~";
mes "Meow~ Meow~";
next;
cutin "orleans_2",0;
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Charles Orleans]";
mes "What a lovely child.";
mes "Be quiet like a good girl.";
@@ -153,13 +153,13 @@ prt_castle,43,30,3 script Charles Orleans#cook 878,{
break;
case 2:
cutin "nyuang_1",2;
- emotion e_what,0,"Child with Cat#cook";
+ emotion ET_QUESTION, getnpcid(0, "Child with Cat#cook");
mes "[Child with Cat]";
mes "...Nya?";
mes "...Meow?";
next;
cutin "orleans_2",0;
- emotion e_lv2;
+ emotion ET_BIGTHROB;
mes "[Charles Orleans]";
mes "She is lovely and";
mes "quite although she";
@@ -168,7 +168,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 878,{
break;
case 3:
cutin "nyuang_2",2;
- emotion e_pif,0,"Child with Cat#cook";
+ emotion ET_HNG, getnpcid(0, "Child with Cat#cook");
mes "[Child with Cat]";
mes "Nyahahaha,";
mes "Nyahahaha~";
@@ -176,7 +176,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 878,{
next;
cutin "orleans_4",0;
cutin "orleans_3",0;
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
mes "[Charles Orleans]";
mes "Ah, again, let me";
mes "apologize. I had believed";
@@ -232,7 +232,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 878,{
}
else if (cooking_q == 0) {
cutin "orleans_5",0;
- emotion e_dots;
+ emotion ET_THINK;
mes "[Charles Orleans]";
mes "Oh, have you come here";
mes "to learn cooking? ^333333*Sigh*^000000";
@@ -259,7 +259,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 878,{
next;
cutin "orleans_4",0;
cutin "orleans_3",0;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Charles Orleans]";
mes "Goodness, you scared me!";
mes "What an ill natured kid!";
@@ -423,7 +423,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 878,{
else if (cooking_q == 1) {
if (countitem(940) > 4 && countitem(7031) > 0 && countitem(7457) > 0) {
cutin "orleans_4",0;
- emotion e_an;
+ emotion ET_FRET;
mes "[Charles Orleans]";
mes "Finally, you're here! Never";
mes "forget: your ingredients must";
@@ -828,7 +828,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 878,{
next;
switch(select("What's your name, kid?:Do you want to eat something?:Here, kitty~:Get out!")) {
case 1:
- emotion e_ok,0,"Child with Cat#cook";
+ emotion ET_OK, getnpcid(0, "Child with Cat#cook");
mes "[Child with Cat]";
mes "Nyaaa~";
mes "nyaaa~";
@@ -842,7 +842,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 878,{
goto L_End;
case 2:
cutin "nyuang_2",2;
- emotion e_pif,0,"Child with Cat#cook";
+ emotion ET_HNG, getnpcid(0, "Child with Cat#cook");
mes "[Child with Cat]";
mes "Nyaaaa~";
mes "(Purrrrrr~)";
@@ -858,7 +858,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 878,{
goto L_End;
case 3:
cutin "nyuang_3",2;
- emotion e_heh,0,"Child with Cat#cook";
+ emotion ET_SMILE, getnpcid(0, "Child with Cat#cook");
mes "[Child with Cat]";
mes "Nyahahaha~";
mes "Nyhhahaha~";
@@ -870,13 +870,13 @@ prt_castle,43,30,3 script Charles Orleans#cook 878,{
mes "...Then I don't need you to be here.";
goto L_End;
case 4:
- emotion e_dots,0,"Child with Cat#cook";
+ emotion ET_THINK, getnpcid(0, "Child with Cat#cook");
mes "[Child with Cat]";
mes "...";
mes "(Meow?)";
next;
cutin "nyuang_4",2;
- emotion e_an,0,"Child with Cat#cook";
+ emotion ET_FRET, getnpcid(0, "Child with Cat#cook");
specialeffect2 EF_HIT2;
percentheal -10,0;
mes "[Child with Cat]";
@@ -894,7 +894,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 878,{
}
else if (cooking_q == 9) {
cutin "orleans_5",0;
- emotion e_an;
+ emotion ET_FRET;
mes "[Charles Orleans]";
mes "Alright, enough";
mes "is enough. We can't";
@@ -913,14 +913,14 @@ prt_castle,43,30,3 script Charles Orleans#cook 878,{
mes "or shed on any of the food!";
next;
cutin "nyuang_4",2;
- emotion e_an,0,"Child with Cat#cook";
+ emotion ET_FRET, getnpcid(0, "Child with Cat#cook");
mes "[Child with Cat]";
mes "Grrrrrrr!";
mes "RRRRreow!";
next;
donpcevent "Wickebine#cook::OnEnable";
- emotion e_omg;
- emotion e_ho,0,"Child with Cat#cook";
+ emotion ET_HUK;
+ emotion ET_DELIGHT, getnpcid(0, "Child with Cat#cook");
next;
cutin "job_black_hucke01",1;
mes "[Wickebine]";
@@ -948,7 +948,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 878,{
mes "bothering Charles, Nyuyang?";
next;
cutin "nyuang_3",2;
- emotion e_heh,0,"Child with Cat#cook";
+ emotion ET_SMILE, getnpcid(0, "Child with Cat#cook");
mes "[Child with Cat]";
mes "Nyuuuunyuuu~";
mes "nyuuuunyuuu~";
@@ -966,7 +966,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 878,{
mes "wants you to leave?";
next;
cutin "orleans_3",0;
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
mes "[Charles Orleans]";
mes "Hahahahah, what";
mes "are you talking about!";
@@ -984,7 +984,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 878,{
mes "So do not worry, Madam~";
next;
cutin "job_black_hucke01",1;
- emotion e_what,0,"Wickebine#cook";
+ emotion ET_QUESTION, getnpcid(0, "Wickebine#cook");
mes "[Wickebine]";
mes "Are you sure, Charles?";
mes "I know how serious you";
@@ -1001,18 +1001,18 @@ prt_castle,43,30,3 script Charles Orleans#cook 878,{
mes "Well then, take care~";
next;
cutin "nyuang_3",2;
- emotion e_heh,0,"Child with Cat#cook";
+ emotion ET_SMILE, getnpcid(0, "Child with Cat#cook");
mes "[Child with Cat]";
mes "Nyahahaha~";
mes "Nyahahaha~";
mes "(Meow, meow~)";
next;
cutin "job_black_hucke02",255;
- emotion e_ho,0,"Wickebine#cook";
+ emotion ET_DELIGHT, getnpcid(0, "Wickebine#cook");
donpcevent "Wickebine#cook::OnDisable";
next;
- emotion e_dots;
- emotion e_dots,0,"Child with Cat#cook";
+ emotion ET_THINK;
+ emotion ET_THINK, getnpcid(0, "Child with Cat#cook");
mes "[Charles Orleans]";
mes "......";
next;
@@ -1058,7 +1058,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 878,{
mes "suggests that he is hiding";
mes "in the Schwaltzvalt Republic...";
next;
- emotion e_go;
+ emotion ET_GO;
mes "[Charles Orleans]";
mes "Praise the glories of the";
mes "Rune-Midgarts Kingdom!";
@@ -1067,7 +1067,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 878,{
}
else if (cooking_q == 11) {
cutin "orleans_5",0;
- emotion e_dots;
+ emotion ET_THINK;
mes "[Charles Orleans]";
mes "Oh, I'm in great need of";
mes "some rest. Unless you ";
@@ -2124,7 +2124,7 @@ prt_castle,45,28,3 script Child with Cat#cook 877,{
set .@nyu,rand(1,2);
if (.@nyu == 1) {
cutin "nyuang_1",2;
- emotion e_what;
+ emotion ET_QUESTION;
mes "[Child with Cat]";
mes "...Nya?";
mes "(...Meow?)";
@@ -2133,7 +2133,7 @@ prt_castle,45,28,3 script Child with Cat#cook 877,{
end;
}
cutin "nyuang_3",2;
- emotion e_ho;
+ emotion ET_DELIGHT;
mes "[Child with Cat]";
mes "Nyahahahaha,";
mes "nyahahahaha~";
diff --git a/npc/quests/dandelion_request.txt b/npc/quests/dandelion_request.txt
index e28932b201c..0eeec0344a7 100644
--- a/npc/quests/dandelion_request.txt
+++ b/npc/quests/dandelion_request.txt
@@ -3079,7 +3079,7 @@ que_job01,16,21,5 script Valdes#1 55,{
mes "Hey there~";
mes "I'm Kidd.";
mes "Nice to meet you.";
- emotion e_ok,0,"Kidd#1";
+ emotion ET_OK, getnpcid(0, "Kidd#1");
cutin "mocseal_kid01.bmp",2;
next;
mes "[Valdes]";
@@ -3114,7 +3114,7 @@ que_job01,16,21,5 script Valdes#1 55,{
mes "I'm lookin' forward";
mes "to working together";
mes "with you. Heh heh~";
- emotion e_ok,0,"Lin#1";
+ emotion ET_OK, getnpcid(0, "Lin#1");
cutin "mocseal_rin01.bmp",2;
next;
mes "[Valdes]";
@@ -5490,7 +5490,7 @@ que_job01,91,83,3 script Kidd#hall 884,{
mes "[Dandelion Member]";
mes "I still can't believe it...";
mes "Those poor, poor children...";
- emotion e_hmm,1;
+ emotion ET_SCRATCH, playerattached();
close2;
}
else if(mao_request > 102 && mao_request < 126)
@@ -7725,7 +7725,7 @@ moc_castle,40,20,3 script Man 849,{
{
mes "^3355FFYou find the body";
mes "of a dead man.^000000";
- emotion e_hmm,1;
+ emotion ET_SCRATCH, playerattached();
close;
}
mes "^3355FFYou find a man lying";
@@ -8273,7 +8273,7 @@ OnStop2:
OnTouch:
initnpctimer;
- emotion e_wah,1;
+ emotion ET_KEK, playerattached();
disablenpc "#maogate1_battle";
end;
@@ -8339,7 +8339,7 @@ que_job02,66,85,5 script Dandelion Member#1_bt 880,{
mes "...I said--!";
mes "...That's...";
mes "Why I oughta--!";
- emotion e_gasp,0;
+ emotion ET_SURPRISE;
next;
mes "[Dandelion Member]";
mes "Yeah, that's him again.";
@@ -8349,7 +8349,7 @@ que_job02,66,85,5 script Dandelion Member#1_bt 880,{
mes "your strength while I go";
mes "in there and help him...";
close2;
- emotion e_gasp,1;
+ emotion ET_SURPRISE, playerattached();
set mao_request,27;
disablenpc "Dandelion Member#1_bt";
end;
@@ -8413,7 +8413,7 @@ OnTouch:
mes "on here? Kidd! Lin?";
mes "A-and who's that guy?";
mes "Could it possibly be...";
- emotion e_gasp,1;
+ emotion ET_SURPRISE, playerattached();
next;
cutin "mocseal_kid01.bmp",0;
mes "[Kidd]";
@@ -8432,7 +8432,7 @@ OnTouch:
mes "working for, the Dandelion";
mes "Organization, have been";
mes "hunting Mr. Moore down...";
- emotion e_wah,0,"Lin#maogate1_1";
+ emotion ET_KEK, getnpcid(0, "Lin#maogate1_1");
next;
cutin "mocseal_kid01.bmp",0;
mes "[Kidd]";
@@ -8455,7 +8455,7 @@ OnTouch:
mes "me everything you know";
mes "about your own client,";
mes "the Dandelion Organization...";
- emotion e_hmm,0,"R#maogate1";
+ emotion ET_SCRATCH, getnpcid(0, "R#maogate1");
next;
cutin "mocseal_rin01.bmp",255;
cutin "mocseal_kid01.bmp",255;
@@ -8472,8 +8472,8 @@ OnTouch:
mes "Your blood will be used";
mes "to revive Morroc Satan!";
donpcevent "R#maogate1::OnSpell";
- emotion e_gasp,0,"Kidd#maogate1_1";
- emotion e_gasp,1;
+ emotion ET_SURPRISE, getnpcid(0, "Kidd#maogate1_1");
+ emotion ET_SURPRISE, playerattached();
next;
mes "[Kidd]";
mes "Watch out!";
@@ -8503,7 +8503,7 @@ OnTouch:
mes "Fine, you leave me";
mes "no choice. Feel the";
mes "power of Morroc Satan!";
- emotion e_gg,0,"R#maogate1";
+ emotion ET_KIK, getnpcid(0, "R#maogate1");
next;
donpcevent "R#maogate1::OnInit";
initnpctimer;
@@ -8536,10 +8536,10 @@ OnTimer500:
mapannounce "que_job02","I'll back you up!",1,0x90EE90;
donpcevent "Dandelion#maogate1_3::OnEnter";
donpcevent "Dandelion#maogate1_4::OnEnter";
- emotion e_go,0,"Dandelion#maogate1_1";
- emotion e_go,0,"Dandelion#maogate1_2";
- emotion e_go,0,"Dandelion#maogate1_3";
- emotion e_go,0,"Dandelion#maogate1_4";
+ emotion ET_GO, getnpcid(0, "Dandelion#maogate1_1");
+ emotion ET_GO, getnpcid(0, "Dandelion#maogate1_2");
+ emotion ET_GO, getnpcid(0, "Dandelion#maogate1_3");
+ emotion ET_GO, getnpcid(0, "Dandelion#maogate1_4");
end;
OnTimer3000:
@@ -9256,7 +9256,7 @@ OnStop2:
OnTouch:
initnpctimer;
- emotion e_wah,1;
+ emotion ET_KEK, playerattached();
disablenpc "#maogate2_battle";
end;
@@ -9334,7 +9334,7 @@ que_job03,66,85,5 script Dandelion Member#2_bt 880,{
mes "...S-stop...";
mes "...This is...";
mes "This is all insane!";
- emotion e_gasp,0;
+ emotion ET_SURPRISE;
next;
mes "["+ strcharinfo(0) +"]";
mes "That's... That's Lin's";
@@ -9406,7 +9406,7 @@ OnTouch:
mes "on here? Kidd! Lin?";
mes "A-and who's that guy?";
mes "Could it possibly be...";
- emotion e_gasp,1;
+ emotion ET_SURPRISE, playerattached();
next;
cutin "mocseal_kid01.bmp",0;
mes "[Kidd]";
@@ -9425,7 +9425,7 @@ OnTouch:
mes "working for, the Dandelion";
mes "Organization, have been";
mes "hunting Mr. Moore down...";
- emotion e_wah,0,"Lin#maogate2_1";
+ emotion ET_KEK, getnpcid(0, "Lin#maogate2_1");
next;
cutin "mocseal_kid01.bmp",0;
mes "[Kidd]";
@@ -9448,7 +9448,7 @@ OnTouch:
mes "me everything you know";
mes "about your own client,";
mes "the Dandelion Organization...";
- emotion e_hmm,0,"R#maogate2";
+ emotion ET_SCRATCH, getnpcid(0, "R#maogate2");
next;
cutin "mocseal_rin01.bmp",255;
cutin "mocseal_kid01.bmp",255;
@@ -9465,8 +9465,8 @@ OnTouch:
mes "Your blood will be used";
mes "to revive Morroc Satan!";
donpcevent "R#maogate2::OnSpell";
- emotion e_gasp,0,"Kidd#maogate2_1";
- emotion e_gasp,1;
+ emotion ET_SURPRISE, getnpcid(0, "Kidd#maogate2_1");
+ emotion ET_SURPRISE, playerattached();
next;
mes "[Kidd]";
mes "Watch out!";
@@ -9496,7 +9496,7 @@ OnTouch:
mes "Fine, you leave me";
mes "no choice. Feel the";
mes "power of Morroc Satan!";
- emotion e_gg,0,"R#maogate2";
+ emotion ET_KIK, getnpcid(0, "R#maogate2");
next;
donpcevent "R#maogate2::OnInit";
initnpctimer;
@@ -9530,10 +9530,10 @@ OnTimer500:
mapannounce "que_job03","I'll back you up!",1,0x90EE90;
donpcevent "Dandelion#maogate2_3::OnEnter";
donpcevent "Dandelion#maogate2_4::OnEnter";
- emotion e_go,0,"Dandelion#maogate2_1";
- emotion e_go,0,"Dandelion#maogate2_2";
- emotion e_go,0,"Dandelion#maogate2_3";
- emotion e_go,0,"Dandelion#maogate2_4";
+ emotion ET_GO, getnpcid(0, "Dandelion#maogate2_1");
+ emotion ET_GO, getnpcid(0, "Dandelion#maogate2_2");
+ emotion ET_GO, getnpcid(0, "Dandelion#maogate2_3");
+ emotion ET_GO, getnpcid(0, "Dandelion#maogate2_4");
end;
OnTimer3000:
@@ -10147,18 +10147,17 @@ OnMyMobDead:
}
que_job01,68,88,5 script Simon#mao 881,{
-
mes "[Simon]";
mes "...No. How many";
mes "times must I tell you?";
mes "I'm not going back.";
- emotion e_swt,0,"Simon#mao";
+ emotion ET_SWEAT, getnpcid(0, "Simon#mao");
next;
mes "[Kimmie]";
mes "Please...";
mes "We really need";
mes "you back home...";
- emotion e_sob,0,"Kimmie";
+ emotion ET_CRY, getnpcid(0, "Kimmie");
next;
mes "[Simon]";
mes "I'm sorry, Kimmie.";
@@ -10174,7 +10173,7 @@ que_job01,68,88,5 script Simon#mao 881,{
mes "I d-didn't want to tell you";
mes "this, but Jimmy's been getting";
mes "in trouble with the law and...";
- emotion e_wah,0,"Kimmie";
+ emotion ET_KEK, getnpcid(0, "Kimmie");
next;
mes "[Simon]";
mes "Then it's his own";
@@ -10197,7 +10196,7 @@ que_job01,68,88,5 script Simon#mao 881,{
close;
}
-que_job01,70,84,1 duplicate(Simon#mao) Kimmie 882,0,0
+que_job01,70,84,1 duplicate(Simon#mao) Kimmie 882
sec_in02,38,162,0 script Morroc Invasion Manager 882,{
callfunc "F_GM_NPC";
diff --git a/npc/quests/first_class/tu_acolyte.txt b/npc/quests/first_class/tu_acolyte.txt
index c27ca822f73..259ebe74ce4 100644
--- a/npc/quests/first_class/tu_acolyte.txt
+++ b/npc/quests/first_class/tu_acolyte.txt
@@ -96,7 +96,7 @@ prt_church,179,15,1 script Priest Praupin 4_M_MINISTER,{
close;
case 22:
if(countitem(7181) > 0){// Receipt_01
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "Oh my, you seem";
mes "to be growing quickly";
mes "into your role as an Acolyte.";
@@ -370,7 +370,7 @@ prt_monk,230,106,3 script Asthe#tu 1_F_PRIEST,{
mes "[Asthe]";
mes "Thank you so much.";
mes "You have returned the Mace.";
- emotion e_heh;
+ emotion ET_SMILE;
tu_acolyte01 = 5;
delitem 1504,1; //Mace
if(Class == Job_Acolyte_High)
@@ -796,7 +796,7 @@ monk_in,18,38,6 script Priest Gardron#tu 4_M_MINISTER,{
mes "What's that?";
mes "You have something for me?";
next;
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Priest Gardron]";
mes "Oh! This is a letter from my mother back home. Thank you for bringing this to me, young Acolyte.";
next;
@@ -863,7 +863,7 @@ monk_in,18,38,6 script Priest Gardron#tu 4_M_MINISTER,{
next;
mes "[Priest Gardron]";
mes "....!";
- emotion e_gasp;
+ emotion ET_SURPRISE;
next;
mes "[Priest Gardron]";
mes "May I entrust you, acolyte "+strcharinfo(0)+",";
@@ -897,7 +897,7 @@ monk_in,18,38,6 script Priest Gardron#tu 4_M_MINISTER,{
next;
mes "[Priest Gardron]";
mes "....!";
- emotion e_gasp;
+ emotion ET_SURPRISE;
next;
mes "[Priest Gardron]";
mes ""+strcharinfo(0)+",";
@@ -952,7 +952,7 @@ prt_monk,235,245,5 script Dog#tu 4_DOG01,{
if(.@dog_food > 4){
mes "[Dog]";
mes "^CDB79EGrrrrrr...!^000000";
- emotion e_an;
+ emotion ET_FRET;
next;
mes "^3355FFThe dog grinds";
mes "its teeth and glares";
@@ -960,13 +960,13 @@ prt_monk,235,245,5 script Dog#tu 4_DOG01,{
} else {
mes "[Dog]";
mes "^CDB79ERoof roof!^000000";
- emotion e_lv;
+ emotion ET_THROB;
}
break;
case 2:
mes "[Dog]";
mes "^CDB79ERoof roof~^000000";
- emotion e_lv;
+ emotion ET_THROB;
break;
case 3:
mes "[Dog]";
@@ -1000,7 +1000,7 @@ prt_monk,226,257,6 script Ill Girl#tu 4_F_04,{
mes "Thanks for helping me.";
mes "I'm sad my older sister is no longer with me, but I oughta";
mes "cheer up, right? I'll try my best!";
- emotion e_heh;
+ emotion ET_SMILE;
close;
}
mes "Sister, don't go...";
@@ -1059,7 +1059,7 @@ prt_monk,226,257,6 script Ill Girl#tu 4_F_04,{
next;
specialeffect EF_CURSEATTACK;
soundeffectall "_curse.wav",0;
- emotion e_omg;
+ emotion ET_HUK;
mes "["+strcharinfo(0)+"]";
mes "This is....!";
mes "A cursed spirit";
@@ -1216,7 +1216,7 @@ prt_monk,197,228,3 script Veiner 4_M_ORIENT02,{
mes "[Veiner]";
mes "Oh right!";
mes "Thank you very much for delivering this to me. Sorry, but I'm always excited to hear from my cutie pie~";
- emotion e_thx;
+ emotion ET_THANKS;
tu_acolyte01 = 19;
delitem 1081,1; //Merchant_Box_1
}
@@ -1224,7 +1224,7 @@ prt_monk,197,228,3 script Veiner 4_M_ORIENT02,{
mes "I can't wait";
mes "to see her again!";
mes "Bibi...! I loooove you!";
- emotion e_kis2;
+ emotion ET_CHUPCHUP;
}
else {
mes "So very";
@@ -1378,7 +1378,7 @@ prt_monk,219,164,3 script Gloria#tu 4_F_SISTER,{
mes "one ^3131FFBlue Gemstone^000000.";
mes "Is this to help me?";
mes "Wow, I'm touched!";
- emotion e_sob;
+ emotion ET_CRY;
close;
case 2:
mes "[Gloria]";
@@ -1440,7 +1440,7 @@ prt_monk,153,210,3 script Cleope Verce 4_F_SISTER,{
mes "[Cleope Verce]";
mes "You'll have to go through a lot until you reach the point where I'm at right now. Ho ho ho! You still have a looong way to go~";
next;
- emotion e_gg;
+ emotion ET_KIK;
mes "[Cleope Verce]";
mes "Good luck...";
mes "Rookie.";
@@ -1491,7 +1491,7 @@ prt_monk,153,210,3 script Cleope Verce 4_F_SISTER,{
mes "until you become a well";
mes "experienced Acolyte. Ho ho~";
next;
- emotion e_gg;
+ emotion ET_KIK;
mes "[Cleope Verce]";
mes "Good luck,";
mes "young friend.";
@@ -1549,7 +1549,7 @@ prt_monk,153,210,3 script Cleope Verce 4_F_SISTER,{
mes "memories when you're";
mes "still an Acolyte.";
next;
- emotion e_gg;
+ emotion ET_KIK;
mes "[Cleope Verce]";
mes "Good luck,";
mes "young friend~";
diff --git a/npc/quests/first_class/tu_archer.txt b/npc/quests/first_class/tu_archer.txt
index 5409619eccd..3978b2ebd90 100644
--- a/npc/quests/first_class/tu_archer.txt
+++ b/npc/quests/first_class/tu_archer.txt
@@ -48,7 +48,7 @@ payon_in02,67,65,3 script Bard Jet#tu 1_M_BARD,{
mes "Let me tell you a joke!";
mes "Trust me, it's hilarious~";
mes "^333333*Ahem*^000000";
- emotion e_gasp;
+ emotion ET_SURPRISE;
next;
mes "[Jet]";
mes "A termite walks";
@@ -56,7 +56,7 @@ payon_in02,67,65,3 script Bard Jet#tu 1_M_BARD,{
mes "'Is the bar tender here?'";
mes "Hahahahaha!";
mes "Bwehehehehe!";
- emotion e_lv;
+ emotion ET_THROB;
next;
mes "[Jet]";
mes "Hahaha~!";
@@ -65,7 +65,7 @@ payon_in02,67,65,3 script Bard Jet#tu 1_M_BARD,{
mes "Now, you try!";
mes "Come on, make";
mes "up a joke~!";
- emotion e_gg;
+ emotion ET_KIK;
next;
if (Sex == SEX_MALE) {
select("A joke, eh?");
@@ -89,7 +89,7 @@ payon_in02,67,65,3 script Bard Jet#tu 1_M_BARD,{
mes "I don't know why, but that was truly amazing. You must have";
mes "what it takes to become a Dancer...";
}
- emotion e_no1;
+ emotion ET_BEST;
next;
mes "[Jet]";
mes "But before any of that, you've got to get rid of the Archer look, no?";
@@ -110,7 +110,7 @@ payon_in02,67,65,3 script Bard Jet#tu 1_M_BARD,{
next;
specialeffect2 EF_TALK_FROSTJOKE;
//specialeffect EF_TALK_FROSTJOKE,AREA,"Bard Jet#tu";
- emotion e_no1;
+ emotion ET_BEST;
mes "[Jet]";
mes "Let's see...";
mes "I've been working";
@@ -428,7 +428,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
mes "Kavaruk told you";
mes "to come to me, eh?";
mes "Alright. Okay.";
- emotion e_gg;
+ emotion ET_KIK;
next;
break;
case 2:
@@ -512,7 +512,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
mes "That's what I'm talkin' about! Yeah! Just trust me and you'll learn almost everything about Archer skills! Let's get started!";
next;
select("Yes, Chief!");
- emotion e_ok;
+ emotion ET_OK;
mes "[Reidin Corse]";
mes "Great...!";
mes "I like your style!";
@@ -570,7 +570,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
mes "about trying to become as";
mes "good as the greatest Archer";
mes "ever: me.";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "[Reidin Corse]";
mes "Okay...!";
@@ -595,7 +595,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
close;
}
case 2:
- emotion e_an;
+ emotion ET_FRET;
mes "[Reidin Corse]";
mes "Say what...?";
mes "Alright, then.";
@@ -606,7 +606,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
}
} else {
- emotion e_ag;
+ emotion ET_ANGER;
mes "Huh. So you already know a little about Owl's Eye already, huh? Well then, I guess I oughta talk about something you don't know about!";
tu_archer01 = 7;
getexp 500,0;
@@ -630,7 +630,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
mes "You've kept me";
mes "waiting for a while!";
next;
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Reidin Corse]";
mes "Ah, but your eyes look a lot sharper than they used to be.";
mes "Here, this is a small, special reward for you.";
@@ -638,7 +638,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
tu_archer01 = 7;
getexp 500,0;
next;
- emotion e_pif;
+ emotion ET_HNG;
mes "[Reidin Corse]";
mes "Not bad, but you really should master Owl's Eye. That means";
mes "you need to learn it all the way";
@@ -678,7 +678,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
mes "Exactly!";
break;
case 2:
- emotion e_lv2;
+ emotion ET_BIGTHROB;
mes "[Reidin Corse]";
mes "Hahahaha!";
mes "Well, I am famous";
@@ -691,7 +691,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
mes "[Reidin Corse]";
mes "Vultures circle the sky, find a target on the ground, and then very swiftly swoop down and ensnare their prey in their claws.";
next;
- emotion e_lv;
+ emotion ET_THROB;
mes "[Reidin Corse]";
mes "No doubt about it.";
mes "Vultures are awesome!";
@@ -700,7 +700,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
mes "The ^3131FFVulture's Eye^000000 skill allows";
mes "you to train your vision to be like a vulture's. You'll increase your Attack Accuracy and can target enemies from further away.";
next;
- emotion e_no;
+ emotion ET_STARE_ABOUT;
mes "[Reidin Corse]";
mes "I know that you can attack";
mes "from a distance now, but don't";
@@ -762,7 +762,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
} else {
mes "Eh?";
mes "Wait a minute...";
- emotion e_what;
+ emotion ET_QUESTION;
next;
mes "[Reidin Corse]";
mes "You already";
@@ -863,7 +863,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
// tu_archer01 = 10;
getexp 0,500;
}
- emotion e_no1;
+ emotion ET_BEST;
next;
mes "[Reidin Corse]";
mes "Now, there's another skill known as ^FF0000Arrow Shower^000000. Where Double Strafe uses 2 Arrows, Arrow Shower fires a bunch of arrows at once.";
@@ -871,13 +871,13 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
mes "[Reidin Corse]";
mes "Not even I can handle";
mes "Arrow Shower all that well since it's really hard. Still, maybe if you trained more at it, you'd manage to pull it off?";
- emotion e_heh;
+ emotion ET_SMILE;
close;
}
} else if(tu_archer01 == 10){
if (checkre(0)) {
mes "Now, I've taught you a lot of stuff and I wanna make sure you retain all of it. That's why I want you to take this midterm. Your mission: ^FF0000Attack the Rockers^000000!";
- emotion e_no1;
+ emotion ET_BEST;
next;
mes "[Reidin Corse]";
mes "Rockers live just southwest of Prontera.";
@@ -893,7 +893,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
mes "It's easier to find them if you pass by the southern gate of Prontera and then head west. Alright, off you go, " + strcharinfo(0) + "~";
} else {
mes "Now, I've taught you a lot of stuff and I wanna make sure you retain all of it. That's why I want you to take this midterm. Your mission: ^FF0000Attack the Rockers^000000!";
- emotion e_no1;
+ emotion ET_BEST;
next;
mes "[Reidin Corse]";
mes "There's a ship that";
@@ -933,7 +933,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
mes "Hey, you're back!";
mes "Let's see now...";
next;
- emotion e_no1;
+ emotion ET_BEST;
mes "[Reidin Corse]";
mes "Good! You pass.";
mes "Don't forget that you gotta keep training and improve your skills. Before you know it, you'll be an expert almost as good as me!";
@@ -973,7 +973,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
mes "It was a pain in the";
mes "ass, but we're finally";
mes "done with all of your lessons.";
- emotion e_pif;
+ emotion ET_HNG;
next;
mes "[Reidin Corse]";
mes "Ah, but it's not time for";
@@ -1042,7 +1042,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
mes "Alright!";
mes "Oh, and if you get";
mes "the chance, give a hello to my Acolyte pal over there for me~";
- emotion e_heh;
+ emotion ET_SMILE;
close2;
warp "mjolnir_11",25,221;
end;
@@ -1081,17 +1081,17 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
mes "[Reidin Corse]";
mes "Well, it's like you're a full fledged Archer now. Honestly,";
mes "I've got nothing more to teach you. Well, about archery, anyway.";
- emotion e_heh;
+ emotion ET_SMILE;
next;
mes "[Reidin Corse]";
mes "Well, if you talk to him, Master Kavaruk might have something for you to do. He happens to have me running around to doing errands";
mes "for him too. That creep!";
- emotion e_pif;
+ emotion ET_HNG;
next;
mes "[Reidin Corse]";
mes "Well, "+ strcharinfo(0) +",";
mes "It'd make me really happy if you get to the point where you develop a true love for the art of archery. I'll see you sometime, okay?";
- emotion e_no1;
+ emotion ET_BEST;
close;
} else if(tu_archer01 == 16){
mes "I really like this town.";
@@ -1100,7 +1100,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
next;
mes "[Reidin Corse]";
mes "Of course, I've got friends here that I can trust with my life. We always argue, but we all want what's best for each other.";
- emotion e_pif;
+ emotion ET_HNG;
next;
mes "[Reidin Corse]";
mes "Wouldn't you";
@@ -1118,7 +1118,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
mes "[Reidin Corse]";
mes "It might also be because I have my trustable friends here with me. Haha.";
mes "We always argue, but we care for each other deep down inside.";
- emotion e_pif;
+ emotion ET_HNG;
next;
mes "[Reidin Corse]";
mes "..'friend' is a wonderful word. Don't you agree?";
@@ -1127,26 +1127,26 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
}
mes "Allow me to introduce myself. I'm the Archer of all Archers, ^3131FFReidin Corse^000000, Master of the Icarus Guild!";
next;
- emotion e_no1;
+ emotion ET_BEST;
mes "[Reidin Corse]";
mes "Right now, we're having a special event! The application fee for the Icarus Guild has been slashed by 50%! Join now and there'll be no annual fees!";
next;
- emotion e_lv;
+ emotion ET_THROB;
mes "[Reidin Corse]";
mes "During our special event, we'll have no job class restrictions!";
mes "As an added bonus, all new male members will be introduced to beautiful Dancer girls!";
next;
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Reidin Corse]";
mes "And new female members will have the special opportunity to go out on a date with me! Don't miss out!";
next;
- emotion e_cash;
+ emotion ET_MONEY;
mes "[Reidin Corse]";
mes "Join right now";
mes "for a one time fee of only ^3131FF1,000,000, zeny^000000! Hurry and join the Icarus Guild while";
mes "this offer still lasts!";
next;
- emotion e_pif,"Arpesto";
+ emotion ET_HNG, getnpcid(0, "Arpesto");
mes "[Arpesto]";
mes "Reiden...";
mes "Stop messing around.";
@@ -1154,12 +1154,12 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
mes "master of the Icarus Guild";
mes "is in that building.";
next;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Reidin Corse]";
mes "Arpesto...!";
mes "Why'd you...?!";
next;
- emotion e_ag;
+ emotion ET_ANGER;
mes "[Reidin Corse]";
mes "^333333*Sigh*^000000";
mes "You got me, you got me.";
@@ -1397,7 +1397,7 @@ pay_arche,76,135,3 script #Target HIDDEN_NPC,{ end; }
mes "Uh... Oh no~";
mes "What am I supposed";
mes "t-to tell you...?";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Acolyte]";
mes "Oh, since I'm training to be an Acolyte, I'm supposed to help out the people he's teaching. So...";
@@ -1419,7 +1419,7 @@ pay_arche,76,135,3 script #Target HIDDEN_NPC,{ end; }
mes "If you don't need";
mes "my help, I guess";
mes "that's alright...";
- emotion e_sob;
+ emotion ET_CRY;
close;
case 3:
mes "[Acolyte]";
@@ -1538,7 +1538,7 @@ pay_arche,130,113,3 script Alchemist Guildmember#tu 2_M_ALCHE,{
mes "for the Icarus Guild";
mes "to send somebody";
mes "to help us! Finally!";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Alchemist Guildmember]";
mes "Would you like to sell ^3131FFStems^000000";
@@ -1570,13 +1570,13 @@ pay_arche,130,113,3 script Alchemist Guildmember#tu 2_M_ALCHE,{
mes "Seriously...";
mes "I'm on the verge of begging!";
mes "The Alchemist Guild really needs lots of new supplies to keep our Flora field running!";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
} else {
mes "I don't know if you've heard";
mes "from Kavaruk, but our Flora field is getting ruined by stray cats.";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Alchemist Guildmember]";
mes "No matter how much we chase";
@@ -1679,7 +1679,7 @@ prontera,126,335,5 script Arthail 1_M_BARD,{
mes "I sense something";
mes "dark and ominous...";
mes "I wonder what it could be?";
- emotion e_hmm;
+ emotion ET_SCRATCH;
next;
mes "[Arthail]";
mes "I'm probably just stressed and exhausted. I'll feel better once";
@@ -1719,7 +1719,7 @@ prontera,126,335,5 script Arthail 1_M_BARD,{
next;
mes "[????]";
mes "AAAAAAAAAAAAAAAHHHHHHHHHHH!!!!!";
- emotion e_omg;
+ emotion ET_HUK;
soundeffectall "se_scream_w01.wav",0;
next;
mes "["+strcharinfo(0)+"]";
@@ -1805,7 +1805,7 @@ prontera,144,301,5 script Mage#tu 2_F_MAGICMASTER,{
mes "Talk about getting";
mes "on your soapbox!";
next;
- emotion e_pif;
+ emotion ET_HNG;
mes "[Mage]";
mes "Doesn't he know that there";
mes "are a lot of famous guilds around nowadays? Why would anyone want";
diff --git a/npc/quests/first_class/tu_magician01.txt b/npc/quests/first_class/tu_magician01.txt
index 60ea6da5905..09a1161bcdf 100644
--- a/npc/quests/first_class/tu_magician01.txt
+++ b/npc/quests/first_class/tu_magician01.txt
@@ -708,7 +708,7 @@ geffen,67,180,4 script New Mage Manager#M 8_F,{
mes "has you do, come back";
mes "and report to me, okay?";
tu_magician01 = 7;
- emotion e_heh;
+ emotion ET_SMILE;
warp "morocc",182,286;
close;
case 2:
diff --git a/npc/quests/first_class/tu_merchant.txt b/npc/quests/first_class/tu_merchant.txt
index 76ef5290403..2af769fb384 100644
--- a/npc/quests/first_class/tu_merchant.txt
+++ b/npc/quests/first_class/tu_merchant.txt
@@ -521,7 +521,7 @@ alberta_in,70,51,5 script Guarnien 4W_M_02,{
tu_merchant = 1;
setquest 8229;
mes "[Guarnien]";
- mes callfunc("F_Sex","Atta girl~!","Atta boy~!");
+ mes callfunc("F_SexMes","Atta girl~!","Atta boy~!");
mes "But first things first!";
mes "You better learn the";
mes "^871F78Increase Weight Limit^000000 skill!";
diff --git a/npc/quests/guildrelay.txt b/npc/quests/guildrelay.txt
index 103be5f3816..9d87d233f47 100644
--- a/npc/quests/guildrelay.txt
+++ b/npc/quests/guildrelay.txt
@@ -116,7 +116,7 @@
mes "deeds when you're overworked!";
mes "Rest. Your guild must be able";
mes "to depend on your strength.";
- emotion e_gasp;
+ emotion ET_SURPRISE;
next;
mes "[" + .@name$ + "]";
mes "Your determination and";
@@ -173,7 +173,7 @@
mes "deeds when you're overworked!";
mes "Rest. Your guild must be able";
mes "to depend on your strength.";
- emotion e_gasp;
+ emotion ET_SURPRISE;
next;
mes "[" + .@name$ + "]";
mes "Your determination and";
@@ -229,7 +229,7 @@
mes "deeds when you're overworked!";
mes "Rest. Your guild must be able";
mes "to depend on your strength.";
- emotion e_gasp;
+ emotion ET_SURPRISE;
next;
mes "[" + .@name$ + "]";
mes "Your determination and";
@@ -293,7 +293,7 @@
mes "deeds when you're overworked!";
mes "Rest. Your guild must be able";
mes "to depend on your strength.";
- emotion e_gasp;
+ emotion ET_SURPRISE;
next;
mes "[" + .@name$ + "]";
mes "Your determination and";
@@ -331,7 +331,7 @@
mes "...............................";
next;
mes "[" + .@name$ + "]";
- emotion e_omg;
+ emotion ET_HUK;
mes "Oh! M-master? Wh-when";
mes "did you...? I'm so sorry.";
mes "I was busy working.";
@@ -357,7 +357,7 @@
case 1:
mes "[" + .@name$ + "]";
mes "Hm? That's strange.";
- emotion e_swt;
+ emotion ET_SWEAT;
mes "You didn't want to take";
mes "the trials again, did you?";
close;
diff --git a/npc/quests/kiel_hyre_quest.txt b/npc/quests/kiel_hyre_quest.txt
index 8599357b30f..a3d5d8ddd27 100644
--- a/npc/quests/kiel_hyre_quest.txt
+++ b/npc/quests/kiel_hyre_quest.txt
@@ -841,7 +841,7 @@ kh_school,57,139,0 script Student#khb 893,{
mes "know, rumors and ghost";
mes "stories that make no sense?";
mes "C'mon, Laci, knock it off!";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
close;
}
@@ -1012,7 +1012,7 @@ kh_school,179,39,0 script Cute Student#kh 895,{
mes "Come back, you";
mes "d-don't...! I really";
mes "need some help!";
- emotion e_sob;
+ emotion ET_CRY;
close2;
cutin "",255;
end;
@@ -1120,7 +1120,7 @@ kh_school,179,39,0 script Cute Student#kh 895,{
//KHPubMasterEnd no longer needed-- deleting.
set KHPubMasterEnd,0;
set KHToastGirlEnd,0;
- emotion e_ho;
+ emotion ET_DELIGHT;
}
}
else if (KielHyreQuest == 8) {
diff --git a/npc/quests/newgears/2004_headgears.txt b/npc/quests/newgears/2004_headgears.txt
index 8b889f9c0ba..010f24bb303 100644
--- a/npc/quests/newgears/2004_headgears.txt
+++ b/npc/quests/newgears/2004_headgears.txt
@@ -115,7 +115,7 @@ geffen,129,148,3 script Argen#1 779,{
mes "You mind sharing them with me?";
close;
}
- emotion e_hmm;
+ emotion ET_SCRATCH;
mes "[Argen]";
mes "Man, oh man~";
mes "Am I bored~!";
@@ -124,7 +124,7 @@ geffen,129,148,3 script Argen#1 779,{
mes "[" + strcharinfo(0) + "]";
mes "Impress the ladies...?";
next;
- emotion e_gasp;
+ emotion ET_SURPRISE;
if (Sex == SEX_MALE) {
mes "[Argen]";
mes "Yeah dude. There are two things chicks dig. Small, adorable presents. And suave dudes.";
@@ -153,7 +153,7 @@ geffen,129,148,3 script Argen#1 779,{
mes "So go ahead and tell me what kinda hairpin you're interested in.";
}
next;
- emotion e_heh;
+ emotion ET_SMILE;
switch(select("^3131FFX Hairpin^000000:^3131FFBand Aid^000000:^3131FFFlower Hairpin^000000:No thanks.")) {
case 1:
if (countitem(2294) > 0 && countitem(7220) > 399) {
@@ -161,7 +161,7 @@ geffen,129,148,3 script Argen#1 779,{
mes "X Hairpin!";
mes "Nice choice~!";
next;
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Argen]";
mes "Ah... Right.";
mes "About the Stellar...";
@@ -175,7 +175,7 @@ geffen,129,148,3 script Argen#1 779,{
mes "^3131FF * Scrape Scrape * ^000000";
mes "^3131FF * Scrape Scrape * ^000000";
next;
- emotion e_no1;
+ emotion ET_BEST;
mes "[Argen]";
mes "Alright, I'm done!";
mes "So what do you think?";
@@ -215,7 +215,7 @@ geffen,129,148,3 script Argen#1 779,{
mes "^3131FF * Scrape Scrape * ^000000";
mes "^3131FF * Scrape Scrape * ^000000";
next;
- emotion e_no1;
+ emotion ET_BEST;
mes "[Argen]";
mes "*Whew~!*";
mes "I'm finished!";
@@ -246,7 +246,7 @@ geffen,129,148,3 script Argen#1 779,{
mes "^3131FF - Scrape Scrape - ^000000";
mes "^3131FF - Scrape Scrape - ^000000";
next;
- emotion e_no1;
+ emotion ET_BEST;
mes "[Argen]";
mes "Ah... It's done!";
mes "Hey, that looks pretty smooth! Oh, and uh, you can keep this leftover Stem.";
@@ -289,7 +289,7 @@ geffen,129,148,3 script Argen#1 779,{
mes "If you want some kinda hairpin, just come back. I'll just be here, looking ^FF3333suaaave^000000 with this yo-yo.";
close;
}
- emotion e_paper;
+ emotion ET_WRAP;
mes "[Argen]";
mes "Feel free to come ask me if you want more hairpins. Hey, I know I look lazy, but I do like to make things for the ladies. See ya later~!";
close;
@@ -979,7 +979,7 @@ xmas,183,267,3 script Pretty Lindsay#1 793,{
close;
}
else if (countitem(5033) > 0 && countitem(5064) > 0) {
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Pretty Lindsay]";
mes "Whoa~";
mes "You brought everything!";
@@ -1014,7 +1014,7 @@ xmas,183,267,3 script Pretty Lindsay#1 793,{
mes "Hello, there?";
mes "Mister...?";
next;
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Pretty Lindsay]";
mes "You look like you're freezing...";
mes "Um, I know! How about I make you a cute, warm and fuzzy Sea-Otter hat?";
@@ -1026,7 +1026,7 @@ xmas,183,267,3 script Pretty Lindsay#1 793,{
mes "I have to put together ^0000FF1 Raccoon Hat^000000 and ^0000FF1 Smokie Leaf^000000 to make a ^4D4DFFSea-Otter Hat^000000 for you, though.";
next;
if (select("Okay, I will come back with the stuff.:Um... How come you need a Raccoon Hat?") == 1) {
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Pretty Lindsay]";
mes "Cool~! Come back soon as you can~!";
close;
@@ -1051,7 +1051,7 @@ xmas,183,267,3 script Pretty Lindsay#1 793,{
mes "Hello, hello~!";
mes "You're such a pretty lady!";
next;
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Pretty Lindsay]";
mes "Hey hey! Can I make you a Sea-Otter hat! It's really really really really cute!";
next;
@@ -1059,7 +1059,7 @@ xmas,183,267,3 script Pretty Lindsay#1 793,{
mes "I need ^0000FF1 Raccoon Hat^000000 and ^0000FF1 Smokie Leaf^000000 so I can make a ^4D4DFFSea-Otter Hat^000000 for you.";
next;
if (select("Okay, I will come back with the stuff.:Um, why do you want to make hats so much?") == 1) {
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Pretty Lindsay]";
mes "Cool~!";
mes "Come back as";
@@ -1097,7 +1097,7 @@ xmas,175,156,3 script Fuzzy Fuzz#1 712,{
mes "[Fuzzy Fuzz]";
mes "Excellent! You brought everything! Please make yourself comfortable while I make you your Teddybear Hat.";
next;
- emotion e_ho;
+ emotion ET_DELIGHT;
mes "[Fuzzy Fuzz]";
mes "Hmm Hm Hmm...";
mes "Tear this off...";
@@ -1105,11 +1105,11 @@ xmas,175,156,3 script Fuzzy Fuzz#1 712,{
mes "Okay, it's almost done...";
next;
mes "[Fuzzy Fuzz]";
- emotion e_an;
+ emotion ET_FRET;
mes "There is an old saying, 'Everything comes to those who wait.' Oh, are you freezing? Why don't you rub your hands together?";
next;
mes "[Fuzzy Fuzz]";
- emotion e_ic;
+ emotion ET_AHA;
mes "It's complete! There you go. I think this one will look really good on you! Please take good care of this hat.";
delitem 5030,1; //Panda_Cap
delitem 7213,100; //Needle_Pouch
@@ -1118,7 +1118,7 @@ xmas,175,156,3 script Fuzzy Fuzz#1 712,{
getitem 5059,1; //Brown_Bear_Cap
close;
}
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Fuzzy Fuzz]";
mes "Hello there, young man.";
mes "What brings you to Lutie, town of goodwill and year round Christmas cheer?";
@@ -1159,7 +1159,7 @@ xmas,175,156,3 script Fuzzy Fuzz#1 712,{
next;
mes "[Fuzzy Fuzz]";
mes "So, do you think you can get all of them? I will be here waiting for you.";
- emotion e_heh;
+ emotion ET_SMILE;
close;
}
@@ -1227,7 +1227,7 @@ payon_in03,8,193,4 script Nanhyang#1 77,{
}
if (countitem(2285) > 0 && countitem(1550) > 0) {
mes "[Nanhyang]";
- emotion e_heh;
+ emotion ET_SMILE;
mes "You brought the materials~";
next;
mes "[Nanhyang]";
@@ -1241,7 +1241,7 @@ payon_in03,8,193,4 script Nanhyang#1 77,{
next;
if (select("Create:Cancel") == 1) {
mes "[Nanhyang]";
- emotion e_ok;
+ emotion ET_OK;
mes "Thank you.";
mes "Let me create one for you right away. Please have a seat and make yourself comfortable.";
next;
@@ -1257,7 +1257,7 @@ payon_in03,8,193,4 script Nanhyang#1 77,{
mes " . . . . . . . . . . . . . ";
next;
mes "[Nanhyang]";
- emotion e_ic;
+ emotion ET_AHA;
mes "That wasn't too difficult. I hope you wear this hat everyday to improve your posture.";
next;
mes "[Nanhyang]";
@@ -1282,12 +1282,12 @@ payon_in03,8,193,4 script Nanhyang#1 77,{
close;
}
mes "[Nanhyang]";
- emotion e_dots;
+ emotion ET_THINK;
mes "I see. You must have brought items with cards or upgrades that you didn't want to lose. Feel free to come back anytime when you are ready.";
close;
}
mes "[Nanhyang]";
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "Hello~";
mes "Welcome to the Handsome Charm Modeling School. May I help you?";
next;
@@ -1307,7 +1307,7 @@ payon_in03,8,193,4 script Nanhyang#1 77,{
mes "Although we can't offer any classes at this time, I can create a special 'Model Training Hat' for you. That way, you can practice the glamourous way of walking down the catwalk on your own.";
next;
mes "[Nanhyang]";
- emotion e_what;
+ emotion ET_QUESTION;
mes "But since our director is gone, we can't really use our budget to give you a hat. If you want, please bring me the following items...";
next;
mes "[Nanhyang]";
@@ -1337,27 +1337,27 @@ geffen,83,189,5 script Seth#1 716,{
mes " [Seth]";
mes "Hello, my name is Seth!";
mes "I like folding paper and making origami. I made my mommy a big paper boat, and she gave me a big smile and patted my head!";
- emotion e_heh;
+ emotion ET_SMILE;
next;
mes "[Seth]";
mes "Today at school, I learned how to make a paper flower! The flower was sort of hard, but now I can do it! Then I made a tiny tiny flower and put in on my head~";
- emotion e_lv;
+ emotion ET_THROB;
next;
if (countitem(2278) > 0 && countitem(975) > 0) {
mes "[Seth]";
mes "Hey~!";
mes "You have a Mr. Smile and Scarlet Dyestuffs! Yaaay~! I could use those and make you a paper flower. C'mon, lemme show you!";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Seth]";
mes "Lemme make";
mes "one for you,";
mes "pwease pwease?";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
switch(select("Alright!:No thanks kid.:Boys aren't supposed to make flowers.")) {
case 1:
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Seth]";
mes "Yay~";
mes "You're the best!";
@@ -1368,7 +1368,7 @@ geffen,83,189,5 script Seth#1 716,{
mes "*Snip Snip Snip~~*";
mes "*Snip...Snip...*";
mes "Yyyyyaaaeeep...";
- emotion e_ho;
+ emotion ET_DELIGHT;
next;
mes "[Seth]";
mes "Tah dah~!";
@@ -1399,7 +1399,7 @@ geffen,83,189,5 script Seth#1 716,{
mes "*Sniff sniff*";
mes "O-okay...";
mes "But I just wanted to show you how good I am...";
- emotion e_sob;
+ emotion ET_CRY;
close;
case 3:
mes "[" + strcharinfo(0) + "]";
@@ -1411,7 +1411,7 @@ geffen,83,189,5 script Seth#1 716,{
mes "[Seth]";
mes "Waaaaaaah~!";
mes "But flowers are so nice and pweety!!!";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
}
@@ -1436,7 +1436,7 @@ geffen,83,189,5 script Seth#1 716,{
mes "Seth will wait for you here. Promise me you'll come back?";
close;
}
- emotion e_sob;
+ emotion ET_CRY;
mes "[Seth]";
mes "Wah~~~~~!";
close;
@@ -2145,7 +2145,7 @@ morocc,273,79,4 script Educated Traveller 99,{
delitem 7206,300; //Black_Kitty_Doll
delitem 7030,1; //Claw_Of_Desert_Wolf
getitem 5058,1; //Drooping_Kitty
- emotion e_ho;
+ emotion ET_DELIGHT;
close;
}
else {
@@ -2215,7 +2215,7 @@ morocc,273,79,4 script Educated Traveller 99,{
delitem 945,600; //Raccoon_Leaf
delitem 7030,1; //Claw_Of_Desert_Wolf
getitem 5064,1; //Leaf_Headgear
- emotion e_gasp;
+ emotion ET_SURPRISE;
close;
}
else {
@@ -2292,7 +2292,7 @@ morocc,273,79,4 script Educated Traveller 99,{
delitem 945,10; //Raccoon_Leaf
delitem 7030,1; //Claw_Of_Desert_Wolf
getitem 5084,1; //Lazy_Raccoon
- emotion e_heh;
+ emotion ET_SMILE;
close;
}
else {
@@ -2379,7 +2379,7 @@ morocc,273,79,4 script Educated Traveller 99,{
delitem 938,100; //Sticky_Mucus
delitem 7030,1; //Claw_Of_Desert_Wolf
getitem 5065,1; //Fish_On_Head
- emotion e_ic;
+ emotion ET_AHA;
close;
}
else {
@@ -2448,7 +2448,7 @@ morocc,273,79,4 script Educated Traveller 99,{
next;
mes "[Lee Hester]";
mes "I hope you're having a good time here in Morroc. If you ever question the special abilities of animals, just think of the majestic Desert Wolf that's able to thrive in the harsh Morroc deserts.";
- emotion e_paper;
+ emotion ET_WRAP;
close;
}
}
diff --git a/npc/quests/newgears/2005_headgears.txt b/npc/quests/newgears/2005_headgears.txt
index 3dc221529ed..d4e7890d54e 100644
--- a/npc/quests/newgears/2005_headgears.txt
+++ b/npc/quests/newgears/2005_headgears.txt
@@ -340,7 +340,7 @@ lighthalzen,143,68,0 script Strange Guy#LhzHat 47,{
mes "Did you just--?!";
mes "Ugh, you're the worst";
mes "type of person, you know that?";
- emotion e_omg;
+ emotion ET_HUK;
close;
case 2:
mes "[Morris]";
@@ -369,7 +369,7 @@ lighthalzen,143,68,0 script Strange Guy#LhzHat 47,{
mes "cannot be forgiven, no";
mes "matter how unfounded";
mes "and groundless they are!";
- emotion e_omg;
+ emotion ET_HUK;
close;
}
}
@@ -548,7 +548,7 @@ lighthalzen,143,68,0 script Strange Guy#LhzHat 47,{
mes "^0000FF1887 Tassels^000000,";
mes "^0000FF1 Slotted Bucket Hat^000000";
mes "and ^0000FF1,887 zeny^000000. That's all!";
- emotion e_an;
+ emotion ET_FRET;
next;
mes "[Morris]";
mes "Now, remember everything";
@@ -648,7 +648,7 @@ lighthalzen,143,68,0 script Strange Guy#LhzHat 47,{
mes "and be able to recall";
mes "minute details in order";
mes "to crack the case.";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Morris]";
mes "Remember...";
@@ -715,7 +715,7 @@ lighthalzen,143,68,0 script Strange Guy#LhzHat 47,{
mes "^0000FF1887 Tassels^000000,";
mes "^0000FF1 Slotted Bucket Hat^000000";
mes "and ^0000FF1,887 zeny^000000. Okay?";
- emotion e_an;
+ emotion ET_FRET;
close;
}
mes "[Morris]";
@@ -801,7 +801,7 @@ lighthalzen,360,313,3 script Kid#LhzHat 706,{
mes "for the past few days. But";
mes "if she doesn't eat, how does";
mes "she expect to get better?";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Kid]";
mes "So I guess what I'm";
@@ -857,7 +857,7 @@ lighthalzen,360,313,3 script Kid#LhzHat 706,{
mes "asking too much from";
mes "you. I mean, it's true";
mes "that you barely know me...";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
case 2:
@@ -868,7 +868,7 @@ lighthalzen,360,313,3 script Kid#LhzHat 706,{
mes "don't even have the";
mes "time to listen to some";
mes "little boy's problems...";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
}
@@ -1129,7 +1129,7 @@ lighthalzen,182,89,0 script Relaxed-Looking Lady 91,{
mes "do much of anything.";
mes "Just sit. Relax.";
set LHZBTQ,1;
- emotion e_heh;
+ emotion ET_SMILE;
next;
mes "[Achiha]";
mes "I do have a hobby,";
@@ -1584,7 +1584,7 @@ gl_prison1,137,138,5 script Zealotus#LhzHat 1200,{
mes "passionate ways. Now I can";
mes "show him the stinging love";
mes "of my whip! Hohohohohoho!";
- emotion e_kis;
+ emotion ET_CHUP;
close;
}
@@ -1623,7 +1623,7 @@ gl_prison1,97,104,1 script Phendark#LhzHat 1202,{
mes "honestly not carrying anything";
mes "of value! Z-Zealotus, please!";
mes "Zealotus, heeeeeelp me~!";
- emotion e_sob;
+ emotion ET_CRY;
if(!(
countitem(1950) || countitem(1951) || countitem(1952) ||
@@ -1686,7 +1686,7 @@ gl_prison1,97,104,1 script Phendark#LhzHat 1202,{
mes "Th-there's nothing I can";
mes "give you, so please don't";
mes "hurt me! Oh, oh p-please...!";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
switch( select( "Feed him Dark Crystal Fragment.", "Threaten him." ) )
{
@@ -1753,7 +1753,7 @@ gl_prison1,97,104,1 script Phendark#LhzHat 1202,{
mes "They're everywhere!";
mes "You guys--I can't...";
mes "You're torturing me!";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
else if(ZLMASKQ == 4)
@@ -1843,7 +1843,7 @@ gl_prison1,97,104,1 script Phendark#LhzHat 1202,{
mes "Zealotus is too good for me.";
mes "I'm not even worthy of tasting";
mes "the sting of her Love Whip.";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
else if(.@phen_point == 4)
@@ -1926,7 +1926,7 @@ gl_prison1,97,104,1 script Phendark#LhzHat 1202,{
mes "[Phendark]";
mes "GRRRRRR!";
mes "THAT'S ENOUGH!";
- emotion e_ag;
+ emotion ET_ANGER;
next;
mes "[Phendark]";
mes "I don't care who the";
@@ -1935,7 +1935,7 @@ gl_prison1,97,104,1 script Phendark#LhzHat 1202,{
mes "that tramp a piece of my";
mes "mind! Grrrr! She'll be sorry!";
set ZLMASKQ,6;
- emotion e_an;
+ emotion ET_FRET;
close;
case 2:
mes "^3131FF[" + strcharinfo(0) + "]^000000";
diff --git a/npc/quests/newgears/2008_headgears.txt b/npc/quests/newgears/2008_headgears.txt
index 567fd4c71b6..c0bcfc29cc6 100644
--- a/npc/quests/newgears/2008_headgears.txt
+++ b/npc/quests/newgears/2008_headgears.txt
@@ -17,7 +17,7 @@
gef_fild05,80,149,3 script Myu#08_hat 877,{
mes "[Myu]";
mes "Meow...";
- emotion e_omg;
+ emotion ET_HUK;
next;
if(hatcat2008 == 0) {
mes "[Myu]";
diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt
index 8b2c347a734..4f60b23d8eb 100644
--- a/npc/quests/quests_13_1.txt
+++ b/npc/quests/quests_13_1.txt
@@ -1982,7 +1982,7 @@ mid_camp,222,283,4 script Marian#ep13bs 727,{
mes "As expected~";
mes "I'm not lying, but usually";
mes "I never forget a face.";
- emotion e_lv;
+ emotion ET_THROB;
next;
mes "[Marian]";
mes "Well, anyway...";
@@ -2030,21 +2030,21 @@ mid_camp,222,283,4 script Marian#ep13bs 727,{
if (ep13_newbs == 1) {
mes "[Marian]";
mes "Go to the right to see ^0000FFInstructor Lugen^000000.";
- emotion e_lv;
+ emotion ET_THROB;
close;
}
if ((ep13_newbs > 1) && (ep13_newbs < 13)) {
mes "[Marian]";
mes "Wow, good to see you again.";
mes "Do you feel comfortable around here?";
- emotion e_lv;
+ emotion ET_THROB;
close;
}
if (ep13_newbs == 13) {
mes "[Marian]";
mes "Hey, how are you?";
mes "What brings you here?";
- emotion e_lv;
+ emotion ET_THROB;
next;
mes "["+ strcharinfo(0) +"]";
mes "The instructor sent me.";
@@ -2079,7 +2079,7 @@ mid_camp,222,283,4 script Marian#ep13bs 727,{
mes "[Marian]";
mes "Ha! You misplaced the Supply Box?!";
mes "What the~~?";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Marian]";
mes "Ok, I have spares.";
@@ -2093,7 +2093,7 @@ mid_camp,222,283,4 script Marian#ep13bs 727,{
mes "Do your job, man~";
mes "And please say hello";
mes "to the instructor.";
- emotion e_lv;
+ emotion ET_THROB;
close;
}
}
@@ -2102,14 +2102,14 @@ mid_camp,222,283,4 script Marian#ep13bs 727,{
mes "Hey~";
mes "How have you been recently?";
mes "I am busy all the time...";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Marian]";
mes "The supplies from the motherland are...";
mes "Ah...";
mes "Nothing, do not care...";
mes "Hohoho...";
- emotion e_omg;
+ emotion ET_HUK;
close;
}
}
@@ -2459,7 +2459,7 @@ mid_camp,261,284,4 script Instructor#ep13bs 405,{
mes "please take care of yourself.";
mes "I have more things";
mes "to do now, ha...";
- emotion e_pif;
+ emotion ET_HNG;
set ep13_newbs,21;
completequest 11098;
close;
@@ -2470,7 +2470,7 @@ mid_camp,261,284,4 script Instructor#ep13bs 405,{
mes "There must be no";
mes "time to rest for me.";
mes "Huu...~";
- emotion e_pif;
+ emotion ET_HNG;
next;
mes "["+ strcharinfo(0) +"]";
mes "What is wrong with you?";
@@ -2563,7 +2563,7 @@ mid_camp,261,284,4 script Instructor#ep13bs 405,{
mes "There must be no";
mes "time to rest for me.";
mes "Huu...~";
- emotion e_pif;
+ emotion ET_HNG;
close;
}
}
@@ -2572,7 +2572,7 @@ mid_camp,261,284,4 script Instructor#ep13bs 405,{
mes "There must be no";
mes "time to rest for me.";
mes "Huu...~";
- emotion e_pif;
+ emotion ET_HNG;
next;
switch(select("Help him.:Just pass.")) {
case 1:
@@ -2666,7 +2666,7 @@ mid_camp,261,284,4 script Instructor#ep13bs 405,{
mes "Hehe, don't mention it.";
mes "And Otto said that he";
mes "would come to see you.";
- emotion e_shy,1;
+ emotion ET_SHY, playerattached();
next;
mes "[Instructor Lugen]";
mes "Did he?";
@@ -2832,7 +2832,7 @@ mid_campin,106,122,4 script Receptionist Brink#ep13b 89,{
mes "...I mean...";
mes "Hmm...";
mes "...I would...";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
close;
}
if (ep13_newbs == 3) {
@@ -2841,7 +2841,7 @@ mid_campin,106,122,4 script Receptionist Brink#ep13b 89,{
mes "...What makes...";
mes "Hmm...";
mes "...I would...";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Brink]";
mes "Hmmm... Hey...";
@@ -2855,7 +2855,7 @@ mid_campin,106,122,4 script Receptionist Brink#ep13b 89,{
mes "Hmm...";
mes "...Hey...";
mes "What...your name...";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "["+ strcharinfo(0) +"]";
mes "My name is "+ strcharinfo(0) +".";
@@ -2866,7 +2866,7 @@ mid_campin,106,122,4 script Receptionist Brink#ep13b 89,{
mes "You...";
mes "...registered...Hmm...";
mes "...";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Brink]";
mes "Here...";
@@ -2877,7 +2877,7 @@ mid_campin,106,122,4 script Receptionist Brink#ep13b 89,{
mes "Hmmm...";
mes "and...";
mes "I mean...";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "["+ strcharinfo(0) +"]";
mes "Is it finished?";
@@ -2903,7 +2903,7 @@ mid_campin,106,122,4 script Receptionist Brink#ep13b 89,{
mes "And...";
mes "......This thing...";
mes "...Ehh...";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
close;
}
}
@@ -2925,20 +2925,20 @@ mid_camp,264,263,4 script Diego#ep13bs 931,{
if (ep13_newbs < 5) {
mes "[Diego]";
mes "I'm busy right now!";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
close;
}
if (ep13_newbs == 5) {
mes "[Diego]";
mes "Wow, this is tent is big!";
mes "Hey, you there, adventurer. Please help me.";
- emotion e_sob;
+ emotion ET_CRY;
next;
switch(select("Help him.:Don't help.")) {
case 1:
mes "[Diego]";
mes "Thanks.";
- emotion e_thx;
+ emotion ET_THANKS;
next;
mes "["+ strcharinfo(0) +"]";
mes "What do you need?";
@@ -2960,11 +2960,11 @@ mid_camp,264,263,4 script Diego#ep13bs 931,{
next;
mes "["+ strcharinfo(0) +"]";
mes "Hah!! How did you know my name?!";
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
next;
mes "[Diego]";
mes "It's on your nameplate.";
- emotion e_dots;
+ emotion ET_THINK;
next;
select("So how can I help you.");
mes "[Diego]";
@@ -2998,7 +2998,7 @@ mid_camp,264,263,4 script Diego#ep13bs 931,{
mes "...";
mes "You're too harsh.";
mes "Sob...";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
}
@@ -3009,7 +3009,7 @@ mid_camp,264,263,4 script Diego#ep13bs 931,{
mes "You finally brought";
mes "the materials!";
mes "I'm so grateful!!";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Diego]";
mes "Ok, so while I hold this post,";
@@ -3063,7 +3063,7 @@ mid_camp,264,263,4 script Diego#ep13bs 931,{
mes "No, I just...";
mes "I was assigned to stay";
mes "in these barracks.";
- emotion e_swt2,1;
+ emotion ET_PROFUSELY_SWEAT, playerattached();
next;
mes "[Diego]";
mes "Oh!!!";
@@ -3087,7 +3087,7 @@ mid_camp,264,263,4 script Diego#ep13bs 931,{
else {
mes "[Diego]";
mes "I'm busy right now!";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
close;
}
}
@@ -3189,7 +3189,7 @@ mid_campin,292,120,4 script Davi#ep13bs 849,{
mes "Ahhh, my body...";
mes "I walked too much...";
mes "and my body hurts.";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
@@ -3202,12 +3202,12 @@ mid_camp,160,298,4 script Jan#ep13bs 865,{
next;
mes "["+ strcharinfo(0) +"]";
mes "Yes...";
- emotion e_swt,1;
+ emotion ET_SWEAT, playerattached();
next;
mes "[Jan]";
mes "Ahhh, it's exciting~";
mes "I love it.";
- emotion e_awsm;
+ emotion ET_COOL;
next;
mes "[Jan]";
mes "I want to unwrap it right now~";
@@ -3225,7 +3225,7 @@ mid_camp,160,298,4 script Jan#ep13bs 865,{
mes "Why hasn't the product";
mes "that I ordered one month";
mes "ago come yet?";
- emotion e_an;
+ emotion ET_FRET;
close;
}
}
@@ -3243,7 +3243,7 @@ mid_camp,160,298,4 script Jan#ep13bs 865,{
next;
mes "[Jan]";
mes "It, it's a secret...";
- emotion e_shy;
+ emotion ET_SHY;
close;
}
else {
@@ -3281,7 +3281,7 @@ mid_camp,30,168,4 script Gerard#ep13bs 939,{
mes "I was considering";
mes "going back to the camp.";
mes "I really appreciate this.";
- emotion e_rice;
+ emotion ET_HUNGRY;
next;
mes "["+ strcharinfo(0) +"]";
mes "...";
@@ -3296,7 +3296,7 @@ mid_camp,30,168,4 script Gerard#ep13bs 939,{
mes "[Gerard]";
mes "Please tell the instructor that";
mes "I won't be back for some time.";
- emotion e_no1;
+ emotion ET_BEST;
delitem 6045,1; //Supply_Box
set ep13_newbs,18;
getitem 12322,1; //Chocolate_Pie
@@ -3308,7 +3308,7 @@ mid_camp,30,168,4 script Gerard#ep13bs 939,{
mes "Hhhh, I am starving.";
mes "When will the supplies come?";
mes "It is killing me...";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
}
@@ -3349,7 +3349,7 @@ man_fild01,80,248,4 script Alberto#ep13bs 934,{
mes "I finally got it.";
mes "My coat...sniff.";
mes "It's freezing here.";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Alberto]";
mes "Sniff...";
@@ -3378,7 +3378,7 @@ man_fild01,80,248,4 script Alberto#ep13bs 934,{
mes "Please tell the Instructor";
mes "that I am still alive.";
mes "Sniff.";
- emotion e_sob;
+ emotion ET_CRY;
delitem 6045,1; //Supply_Box
set ep13_newbs,20;
getitem 12322,1; //Chocolate_Pie
@@ -3389,7 +3389,7 @@ man_fild01,80,248,4 script Alberto#ep13bs 934,{
mes "[Alberto]";
mes "It's so cold here~~";
mes "the wind chills me to the bones~";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
}
@@ -3437,7 +3437,7 @@ mid_camp,166,248,4 script Sorcerer#ep13bs 937,{
next;
mes "[Biolay]";
mes "I want to go back to my house.";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
@@ -3541,7 +3541,7 @@ mid_camp,267,263,0 script Post#ep13bs1 111,{
mes "[Diego]";
mes "...";
mes "Why aren't you helping?";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
}
@@ -3625,7 +3625,7 @@ mid_camp,267,258,0 script Post#ep13bs2 111,{
mes "[Diego]";
mes "...";
mes "Why aren't you helping?";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
}
@@ -3696,7 +3696,7 @@ mid_camp,188,254,3 script Monster Scholar#ep13 883,{
mes "Botanist Terris Block is";
mes "my older twin brother.";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "[Rumis Block]";
mes "This place is freezing. Not only";
mes "that, it's deserted and too";
@@ -4103,7 +4103,7 @@ mid_camp,188,254,3 script Monster Scholar#ep13 883,{
changequest 2153,2154;
close;
case 2:
- emotion e_sob;
+ emotion ET_CRY;
mes "[Rumis Block]";
mes "Oh.........";
close;
@@ -4338,7 +4338,7 @@ mid_camp,240,270,3 script Botanist#ep13 750,{
mes "Undiscovered life!";
mes "Everything about this world excites me.";
next;
- emotion e_lv2;
+ emotion ET_BIGTHROB;
mes "[Botanist]";
mes "Oh, okay... Ah-hah!";
mes "This is how it goes...";
@@ -4351,7 +4351,7 @@ mid_camp,240,270,3 script Botanist#ep13 750,{
mes "Undiscovered life!";
mes "Everything about this world excites me.";
next;
- emotion e_lv2;
+ emotion ET_BIGTHROB;
mes "[Botanist]";
mes "Oh, okay... Ah-hah!";
mes "This is how it goes...";
@@ -4362,8 +4362,8 @@ mid_camp,240,270,3 script Botanist#ep13 750,{
mes "Undiscovered life!";
mes "Everything about this world excites me.";
next;
- emotion e_lv2;
- emotion e_dots,1;
+ emotion ET_BIGTHROB;
+ emotion ET_THINK, playerattached();
mes "[Botanist]";
mes "Oh, okay... Ah-hah!";
mes "This is how it goes...";
@@ -4380,7 +4380,7 @@ mid_camp,240,270,3 script Botanist#ep13 750,{
next;
break;
case 2:
- emotion e_lv2,1;
+ emotion ET_BIGTHROB, playerattached();
mes "["+strcharinfo(0)+"]";
mes "I agree. There's so much to see around here!";
next;
@@ -4396,11 +4396,11 @@ mid_camp,240,270,3 script Botanist#ep13 750,{
next;
mes "- You have given the Nepenthes Specimen to the botanist. -";
next;
- emotion e_bzz;
+ emotion ET_STARE;
mes "[Botanist]";
mes "Oh...? Isn't this?!";
next;
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
mes "[Botanist]";
mes "...Well, I've got a ton of samples of this specimen. Sorry.";
next;
@@ -4428,14 +4428,14 @@ mid_camp,240,270,3 script Botanist#ep13 750,{
mes "[Botanist]";
mes "Usually twins share the same feelings and ideas, I can see what he does or thinks if I try hard.";
next;
- emotion e_sigh;
+ emotion ET_OHNO;
mes "[Botanist]";
mes "Let me see what Rumis is doing right now... Oh, he's picking his nose with his left hand and eating a slice of bread with his right.";
mes "God, how disgusting!";
next;
switch(select("Go check Rumis if it's true.:Do not trust his word.")) {
case 1:
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Botanist]";
mes "Hahaha!";
mes "Muhahaha!";
@@ -4448,7 +4448,7 @@ mid_camp,240,270,3 script Botanist#ep13 750,{
next;
break;
case 2:
- emotion e_sigh;
+ emotion ET_OHNO;
mes "[Botanist]";
mes "Oh,";
mes "won't you cut me some slack? I was just joking to melt the ice.";
@@ -4456,7 +4456,7 @@ mid_camp,240,270,3 script Botanist#ep13 750,{
next;
break;
}
- emotion e_pif;
+ emotion ET_HNG;
mes "[Botanist]";
mes "Anyways, as I said, I've got a lot of Nepenthes specimens.";
mes "But I'll gratefully take this pretentious gift of his.";
@@ -4852,7 +4852,7 @@ spl_fild02,34,223,5 script Small Fairy#spl 442,{
mes "It has tiny wings on the back...";
mes "It's a fairy!";
next;
- emotion e_an;
+ emotion ET_FRET;
mes "[Small Fairy]";
mes "RLGHLRXLA TKANTLFDMS";
mes "WJACK TNAHRDNJSDMFH";
@@ -4867,7 +4867,7 @@ spl_fild02,34,223,5 script Small Fairy#spl 442,{
close;
}
}
- emotion e_an;
+ emotion ET_FRET;
if (!isequipped(2782) && ep13_2_rhea < 100) {
mes "[Small Fairy]";
mes "RLGHLRXLA TKANTLFDMS";
@@ -4889,7 +4889,7 @@ man_fild03,236,105,3 script Tree Giant#man 454,{
mes "You have found something moving between dry branches.";
mes "It appears to be a tree at first glance, but it turns out to be a giant that is half tree and half man.";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "[Tree Giant]";
mes "TJDTMFJDNS CJFDI";
mes "TKADLFDMF QKATOS";
@@ -4904,7 +4904,7 @@ man_fild03,236,105,3 script Tree Giant#man 454,{
close;
}
}
- emotion e_dots;
+ emotion ET_THINK;
if (!isequipped(2782) && ep13_2_rhea < 100) {
mes "[Tree Giant]";
mes "TJDTMFJDNS CJFDI";
@@ -5007,7 +5007,7 @@ OnTouch_:
next;
mes "[United Research Official]";
mes "Alas, the head office keeps pushing me to submit a report... As if I could perform miracles!";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[United Research Official]";
mes "I can't go around and meet those people myself, mediate among troubled people... This is impossible!! Unless...Unless someone helps me with that ! I need... someone...";
@@ -5084,7 +5084,7 @@ OnTouch_:
next;
mes "[United Research Official]";
mes "As you've heard, about the 3 researchers, they don't agree with eachother too often. It's just too obvious that their meeting will turn out a disaster, and the whole research group could break down!";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[United Research Official]";
mes "Oh, just thinking about it scares the crap out of me.";
@@ -5114,7 +5114,7 @@ OnTouch_:
next;
mes "[United Research Official]";
mes "First, you should go meet those 3 researchers and check on them to prepare for the meeting. Hope they're not preparing any weapons though...";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
else if (ep13_1_rhea == 19) {
@@ -5229,7 +5229,7 @@ OnTouch_:
mes "Hhmm, hmmmm...";
mes "I really don't know what to say.";
mes "I mean... I'm totally OK with other monsters, mutants or whatever, but that black evil thing... Oh, I can't stand that one...";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "- Knock, knock-";
mes "- The researchers come back into the room. -";
@@ -9829,7 +9829,7 @@ mid_camp,206,286,3 script Expedition Messenger 997,{
mes "[Expedition Messenger]";
mes "You, head to Schwaltzval Republic.";
mes "And you, take Arunafeltz. I'll visit Prontera Palace.";
- emotion e_ok,0,"Expedition Messenger#2";
+ emotion ET_OK, getnpcid(0, "Expedition Messenger#2");
next;
mes "[Expedition Messenger]";
mes "I'll see you guys later.";
@@ -9859,7 +9859,7 @@ mid_camp,206,286,3 script Expedition Messenger 997,{
mes "Give it to me, now!";
next;
donpcevent "Expedition Messenger#2::OnEnable";
- emotion e_casp,0,"Expedition Messenger#3";
+ emotion ET_SURPRISE, getnpcid(0, "Expedition Messenger#3");
cutin "ep13_shadow_edq",2;
mes "[???]";
mes "Argh...";
@@ -9913,7 +9913,7 @@ mid_camp,206,286,3 script Expedition Messenger 997,{
mes "Oh, yeah? Then I'll have to use force!";
next;
donpcevent "Expedition Messenger#2::OnEnable";
- emotion e_casp,0,"Expedition Messenger#3";
+ emotion ET_SURPRISE, getnpcid(0, "Expedition Messenger#3");
mes "[???]";
mes "Argh!";
next;
@@ -13527,8 +13527,8 @@ OnTouch_:
next;
specialeffect EF_BEGINSPELL2,AREA,"Dandelion Member#moc2_1";
specialeffect EF_BEGINSPELL2,AREA,"Dandelion Member#moc2_2";
- emotion e_gasp,"Rin#moc2_bt_rin01";
- emotion e_gasp,1;
+ emotion ET_SURPRISE, getnpcid(0, "Rin#moc2_bt_rin01");
+ emotion ET_SURPRISE, playerattached();
mes "[Rin]";
mes "You're not alone. So what?";
mes "You're still coming with me!";
@@ -13554,7 +13554,7 @@ OnTouch_:
donpcevent "Dandelion Member#moc2_5::OnEnable";
next;
specialeffect EF_FREEZED,AREA,"Rin#moc2_bt_rin02";
- emotion e_gasp;
+ emotion ET_SURPRISE;
mapannounce "que_dan01", "Rin: When.. When did you...!?!",bc_map,"0x7b68ee";
mes "[Rayan]";
mes "I'm sorry that I have to do this.";
diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt
index f89005bc504..bba86c50cb8 100644
--- a/npc/quests/quests_13_2.txt
+++ b/npc/quests/quests_13_2.txt
@@ -3454,8 +3454,8 @@ OnReset:
end;
OnTouch_:
- emotion e_gasp,1;
- emotion e_omg;
+ emotion ET_SURPRISE, playerattached();
+ emotion ET_HUK;
disablenpc "Stranger#ep13_2_dan01";
donpcevent "Stranger#ep13_2_dan02::OnCall";
end;
@@ -3482,8 +3482,8 @@ OnReset:
end;
OnTouch_:
- emotion e_gasp,1;
- emotion e_omg;
+ emotion ET_SURPRISE, playerattached();
+ emotion ET_HUK;
disablenpc "Stranger#ep13_2_dan02";
donpcevent "Stranger#ep13_2_dan01::OnCall";
end;
@@ -4381,7 +4381,7 @@ mid_camp,147,256,3 script Rune Midgarts Magician#1 735,{
mes "Lumos Nox Densaugeo Dissendium Diffindo Engorgio Mobiliarbus Expecto patronum!!!!";
next;
specialeffect EF_FLASHER; // 99 : "Rune Midgarts Magician#ep132_rhea03" EF_FLASHER
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Magician Whisper]";
mes "Wow!!! Th, This is unbelievable!";
next;
@@ -4904,7 +4904,7 @@ mjolnir_12,220,37,0 duplicate(mjo_no_find) #mj12_find_3 -1,5,5
}
else {
mes "- You succeeded to mine minerals. -";
- emotion e_ic,1;
+ emotion ET_AHA, playerattached();
set .@stst,rand(1,5);
if (.@stst == 5) getitem 6077,5; //Rough_Mineral
else if (.@stst == 1) getitem 6077,1; //Rough_Mineral
@@ -5255,7 +5255,7 @@ OnTouch_:
}
else {
mes "- You succeeded to mine minerals. -";
- emotion e_ic,1;
+ emotion ET_AHA, playerattached();
set .@stst,rand(1,5);
if (.@stst == 5) getitem 6077,5; //Rough_Mineral
else if (.@stst == 1) getitem 6077,2; //Rough_Mineral
@@ -5388,7 +5388,7 @@ OnTouch_:
}
else {
mes "- You succeeded to mine minerals. -";
- emotion e_ic,1;
+ emotion ET_AHA, playerattached();
set .@stst,rand(1,5);
if (.@stst == 5) getitem 6077,5; //Rough_Mineral
else if (.@stst == 1) getitem 6077,2; //Rough_Mineral
@@ -5571,13 +5571,13 @@ spl_in01,30,324,3 script High Laphine#grenouille 446,{
}
else if (ep13_2_tre1 == 3) {
if (countitem(6079) == 1) {
- emotion e_swt;
- emotion e_swt,1;
+ emotion ET_SWEAT;
+ emotion ET_SWEAT, playerattached();
mes "[Grenouille]";
mes "Hoo, this is one of the";
mes "most common kinds of flowers.";
next;
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Grenouille]";
mes "Haha, Don't worry.";
mes "Common flowers like this can bring the familiarity of home back to the soldiers.";
@@ -5728,16 +5728,16 @@ spl_in02,139,65,3 script Middle-Ranked Laphine#la 438,{
mes "but sometimes he help others well! Huhu!";
next;
mes "- rummaging -";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "- rummaging -";
mes "- rummaging -";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "- rummaging -";
mes "- rummaging -";
mes "- rummaging -";
- emotion e_ic;
+ emotion ET_AHA;
next;
mes "[Flowery]";
mes "Wow! Come here!";
@@ -5833,7 +5833,7 @@ splendide,205,139,5 script Exhausted Soldier#1 447,{
next;
mes "[Exhausted Soldier]";
mes "Ahh! Feeling much better!";
- emotion e_heh;
+ emotion ET_SMILE;
delitem 6082,1; //Spirit_Of_Alfheim
close2;
donpcevent "#tukare_1::OnEnable";
@@ -5890,7 +5890,7 @@ splendide,181,135,5 script Exhausted Soldier#2 447,{
mes "What happen?";
mes "Feel better suddenly! I'm so happy now!";
mes "Let's go to work!";
- emotion e_heh;
+ emotion ET_SMILE;
delitem 6082,1; //Spirit_Of_Alfheim
close2;
donpcevent "#tukare_2::OnEnable";
@@ -5950,7 +5950,7 @@ splendide,139,178,5 script Exhausted Soldier#3 447,{
next;
mes "[Exhausted Soldier]";
mes "Let's beat Sapha and go back home!";
- emotion e_heh;
+ emotion ET_SMILE;
delitem 6082,1; //Spirit_Of_Alfheim
close2;
donpcevent "#tukare_3::OnEnable";
@@ -6010,7 +6010,7 @@ splendide,164,188,5 script Exhausted Soldier#4 447,{
next;
mes "[Exhausted Soldier]";
mes "Ahh! Feels like at home!!";
- emotion e_sob;
+ emotion ET_CRY;
delitem 6082,1; //Spirit_Of_Alfheim
close2;
donpcevent "#tukare_4::OnEnable";
@@ -6070,7 +6070,7 @@ splendide,177,257,5 script Exhausted Soldier#5 447,{
next;
mes "[Exhausted Soldier]";
mes "Ahh! Feeling much better!";
- emotion e_heh;
+ emotion ET_SMILE;
delitem 6082,1; //Spirit_Of_Alfheim
close2;
donpcevent "#tukare_5::OnEnable";
@@ -6130,7 +6130,7 @@ splendide,124,212,5 script Exhausted Soldier#6 447,{
mes "[Exhausted Soldier]";
mes "Yes, Splendide also a part of Alfheim!";
mes "Go Laphines!";
- emotion e_heh;
+ emotion ET_SMILE;
delitem 6082,1; //Spirit_Of_Alfheim
close2;
donpcevent "#tukare_6::OnEnable";
@@ -6190,7 +6190,7 @@ splendide,196,153,5 script Exhausted Soldier#7 447,{
next;
mes "[Exhausted Soldier]";
mes "Ahh! Feeling much better!";
- emotion e_heh;
+ emotion ET_SMILE;
delitem 6082,1; //Spirit_Of_Alfheim
close2;
donpcevent "#tukare_7::OnEnable";
@@ -6247,7 +6247,7 @@ mid_camp,283,198,5 script Bazett Teablack#ep13bs 883,{
mes "Hu~~";
mes "That's pretty interesting...";
mes "I will take note of it in my research papers.";
- emotion e_ic,"Bazett Teablack#ep13bs";
+ emotion ET_AHA;
next;
mes "[Industrious Man]";
mes "write...write...";
@@ -6267,7 +6267,7 @@ mid_camp,283,198,5 script Bazett Teablack#ep13bs 883,{
mes "Hu~~";
mes "That's pretty interesting...";
mes "I will take note of it in my research papers.";
- emotion e_ic,"Bazett Teablack#ep13bs";
+ emotion ET_AHA;
next;
mes "[Industrious Man]";
mes "write...write...";
@@ -6284,7 +6284,7 @@ mid_camp,283,198,5 script Bazett Teablack#ep13bs 883,{
mes "Auch!!!";
mes "Who...who are you?!";
mes "How long have you been standing there?";
- emotion e_omg,"Bazett Teablack#ep13bs";
+ emotion ET_HUK;
next;
mes "["+strcharinfo(0)+"]";
mes "Uh, I'm just passing by.";
@@ -6292,7 +6292,7 @@ mid_camp,283,198,5 script Bazett Teablack#ep13bs 883,{
next;
mes "["+strcharinfo(0)+"]";
mes "See you~!!";
- emotion e_swt2,1;
+ emotion ET_PROFUSELY_SWEAT, playerattached();
next;
mes "[Industrious Man]";
mes "Uh!! Wait!!";
@@ -6306,12 +6306,12 @@ mid_camp,283,198,5 script Bazett Teablack#ep13bs 883,{
next;
mes "[Industrious Man]";
mes "My research is not going so well. The god of fate must have sent you to me. I'm sure of it!!";
- emotion e_no1,"Bazett Teablack#ep13bs";
+ emotion ET_BEST;
next;
mes "["+strcharinfo(0)+"]";
mes "......";
mes "......What?!";
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
next;
mes "[Industrious Man]";
mes "Would you like to help me with my search?";
@@ -6363,7 +6363,7 @@ mid_camp,283,198,5 script Bazett Teablack#ep13bs 883,{
mes ".............";
mes ".............";
mes "...........Why!!!!!";
- emotion e_sob,"Bazett Teablack#ep13bs";
+ emotion ET_CRY;
next;
mes "[Industrious Man]";
mes "Well if you decide to change your mind, come back to me.";
@@ -6422,7 +6422,7 @@ mid_camp,283,198,5 script Bazett Teablack#ep13bs 883,{
mes ".............";
mes ".............";
mes "...........Why!!!!!";
- emotion e_sob,"Bazett Teablack#ep13bs";
+ emotion ET_CRY;
next;
mes "[Industrious Man]";
mes "Well if you decide to change your mind, come back to me.";
@@ -6509,7 +6509,7 @@ mid_camp,283,198,5 script Bazett Teablack#ep13bs 883,{
mes "[Industrious Man]";
mes ".............";
mes "Well if you decide to change your mind, come back to me.";
- emotion e_sob,"Bazett Teablack#ep13bs";
+ emotion ET_CRY;
close;
}
}
@@ -6648,7 +6648,7 @@ manuk,193,135,0 script Worker#ep13bs 454,{
mes "......";
mes ".........";
mes "Nothing!!";
- emotion e_omg,"Worker#ep13bs";
+ emotion ET_HUK;
next;
mes "["+strcharinfo(0)+"]";
mes "What's up?";
@@ -6660,7 +6660,7 @@ manuk,193,135,0 script Worker#ep13bs 454,{
next;
mes "["+strcharinfo(0)+"]";
mes "Yes, sorry to startle you.";
- emotion e_heh,1;
+ emotion ET_SMILE, playerattached();
next;
mes "[Worker]";
mes "Haha, it's ok.";
@@ -6703,8 +6703,8 @@ manuk,193,135,0 script Worker#ep13bs 454,{
mes "[Worker]";
mes "Ugh!!!";
mes "**Sigh**";
- emotion e_sob,"Worker#ep13bs";
- emotion e_sob,1;
+ emotion ET_CRY;
+ emotion ET_CRY, playerattached();
next;
mes "[Worker]";
mes "Well that's that!";
@@ -6767,7 +6767,7 @@ manuk,193,135,0 script Worker#ep13bs 454,{
mes "......";
mes ".........";
mes "Nevermind. Nothing.";
- emotion e_omg,"Worker#ep13bs";
+ emotion ET_HUK;
next;
mes "["+strcharinfo(0)+"]";
mes "You don't have to be like this.";
@@ -6779,7 +6779,7 @@ manuk,193,135,0 script Worker#ep13bs 454,{
next;
mes "["+strcharinfo(0)+"]";
mes "Since I'm travelling here, so I thought I'd need it...";
- emotion e_heh,1," ET_SMILE";
+ emotion ET_SMILE, playerattached();
next;
mes "[Worker]";
mes "Haha, is that so?";
@@ -6824,8 +6824,8 @@ manuk,193,135,0 script Worker#ep13bs 454,{
next;
mes "[Worker]";
mes "Ah!!!";
- emotion e_sob,"Worker#ep13bs";
- emotion e_sob,1;
+ emotion ET_CRY;
+ emotion ET_CRY, playerattached();
next;
mes "[Worker]";
mes "I can't just care about pride now.";
diff --git a/npc/quests/quests_airship.txt b/npc/quests/quests_airship.txt
index 536331cba39..179ceb01a11 100644
--- a/npc/quests/quests_airship.txt
+++ b/npc/quests/quests_airship.txt
@@ -132,7 +132,7 @@ airplane,47,61,7 script Crewman 4_M_ZONDAOYAJI,{
mes "K-Kafra...?";
mes "Hmm, maybe I better";
mes "not send this up after all...";
- emotion e_an;
+ emotion ET_FRET;
} else if (.@comment$ == "0") {
mes "[Kain Himere]";
mes "Ah, well, if you have any";
@@ -663,7 +663,7 @@ ein_in01,123,94,1 script Theo Cherno 4_M_REPAIR,{
mes "Tarsha's father? Oh,";
mes "you must be a godsend!";
} else if (kain_ticket > 12) {
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Theo Cherno]";
mes "I'm so happy";
mes "for my wife. I....";
@@ -738,24 +738,24 @@ ein_in01,125,99,3 script Tarsha Cherno 4_F_EINWOMAN,{
mes "my husband in school and";
mes "it was the greatest thing that";
mes "ever happened to me~";
- emotion e_lv,0,"Theo Cherno";
+ emotion ET_THROB, getnpcid(0, "Theo Cherno");
next;
mes "["+ strcharinfo(0) +"]";
mes "By the way, I heard";
mes "your daughter singing";
mes "some sort of Miner's Song.";
mes "Did you teach her that?";
- emotion e_omg,0,"Tarsha Cherno";
- emotion e_omg,0,"Theo Cherno";
+ emotion ET_HUK;
+ emotion ET_HUK, getnpcid(0, "Theo Cherno");
next;
mes "[Theo Cherno]";
mes "I don't understand";
mes "why little Elle likes";
mes "such a rowdy, man song.";
mes "This is all your fault, Tarsha!";
- emotion e_ag,0,"Theo Cherno";
+ emotion ET_ANGER, getnpcid(0, "Theo Cherno");
next;
- emotion e_heh,0,"Tarsha Cherno";
+ emotion ET_SMILE;
mes "[Tarsha Cherno]";
mes "Oh~hohohoho~";
mes "I was too young to";
@@ -778,7 +778,7 @@ ein_in01,125,99,3 script Tarsha Cherno 4_F_EINWOMAN,{
mes "a miner who lost his";
mes "daughter! Just maybe...)";
next;
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "["+ strcharinfo(0) +"]";
mes "...!";
mes "Tarsha...";
@@ -806,7 +806,7 @@ ein_in01,125,99,3 script Tarsha Cherno 4_F_EINWOMAN,{
mes "Oh, welcome back~";
mes "So were you able to";
mes "bring back good news?";
- emotion e_heh,0,"Tarsha Cherno";
+ emotion ET_SMILE;
next;
mes "["+strcharinfo(0)+"]";
mes "Why, yes.";
@@ -944,8 +944,8 @@ function script F_Cherno {
specialeffect EF_POISONATTACK,AREA,"#exp_ein";
mes "^33355F*Crash!*^000000";
mes ".....";
- emotion e_swt,0,"Theo Cherno";
- emotion e_swt,0,"Tarsha Cherno";
+ emotion ET_SWEAT, getnpcid(0, "Theo Cherno");
+ emotion ET_SWEAT, getnpcid(0, "Tarsha Cherno");
next;
mes "[Theo Cherno]";
mes "Honey...";
@@ -963,7 +963,7 @@ function script F_Cherno {
mes "it a day and finish";
mes "this tomorrow, yeah?";
next;
- emotion e_what,0,"Tarsha Cherno";
+ emotion ET_QUESTION, getnpcid(0, "Tarsha Cherno");
mes "[Tarsha Cherno]";
mes "Oh~";
mes "I didn't know we";
@@ -983,8 +983,8 @@ function script F_Cherno {
mes "It's what we do...";
close;
case 2:
- emotion e_swt,0,"Tarsha Cherno";
- emotion e_swt,0,"Theo Cherno";
+ emotion ET_SWEAT, getnpcid(0, "Tarsha Cherno");
+ emotion ET_SWEAT, getnpcid(0, "Theo Cherno");
mes "[Tarsha Cherno]";
mes "Hahaha, Elle?";
mes "Why would our";
@@ -998,7 +998,7 @@ function script F_Cherno {
mes "was sick or sad";
mes "...Or something?";
next;
- emotion e_omg,0,"Tarsha Cherno";
+ emotion ET_HUK, getnpcid(0, "Tarsha Cherno");
mes "[Tarsha Cherno]";
mes "Oh my god...!";
mes "What is she thinking?";
@@ -1030,7 +1030,7 @@ function script F_Cherno {
mes "["+ strcharinfo(0) +"]";
mes "I am called,";
mes ""+ strcharinfo(0) +".";
- emotion e_heh;
+ emotion ET_SMILE;
next;
mes "[Tarsha Cherno]";
mes ""+ strcharinfo(0) +",";
@@ -1167,7 +1167,7 @@ ein_in01,121,99,3 script Mirror#ein HIDDEN_NPC,{
mes "and I can't seem to find";
mes "any flaws with my figure...";
next;
- emotion e_swt2,0,"Tarsha Cherno";
+ emotion ET_PROFUSELY_SWEAT, getnpcid(0, "Tarsha Cherno");
mes "[Tarsha Cherno]";
mes "Actually...";
mes "That's not one";
@@ -1517,7 +1517,7 @@ OnTimer63000:
hideoffnpc "Airship Captain#02";
end;
OnTimer68000:
- emotion e_ag,0,"Airship Captain#02";
+ emotion ET_ANGER, getnpcid(0, "Airship Captain#02");
mapannounce "airplane_01", "Captain Tarlock: You ugly, godforsaken creatures... Get off my ship!",bc_map,0x70DBDB;
end;
OnTimer73000:
@@ -1583,15 +1583,15 @@ OnTimer87000:
specialeffect EF_SUI_EXPLOSION,AREA,"boom7#airplane";
end;
OnTimer88000:
- emotion e_ag,0,"Airship Captain#02";
+ emotion ET_ANGER, getnpcid(0, "Airship Captain#02");
mapannounce "airplane_01", "Captain Tarlock: You dirty monsters are dealing with this ship's captain...",bc_map,0x70DBDB;
end;
OnTimer93000:
- emotion e_ag,0,"Airship Captain#02";
+ emotion ET_ANGER, getnpcid(0, "Airship Captain#02");
mapannounce "airplane_01", "Captain Tarlock: I'll protect this ship and my crew with my life!",bc_map,0x70DBDB;
end;
OnTimer98000:
- emotion e_pif,0,"Airship Captain#02";
+ emotion ET_HNG, getnpcid(0, "Airship Captain#02");
mapannounce "airplane_01", "Captain Tarlock: Here goes! Special Exodus Joker XIII Doom Rifle!",bc_map,0x70DBDB;
end;
OnTimer103000:
@@ -1639,7 +1639,7 @@ OnTimer108000:
killmonster "airplane_01","Airship#airplane02::OnCaptainMobDead";
end;
OnTimer113000:
- emotion e_pif,0,"Airship Captain#02";
+ emotion ET_HNG, getnpcid(0, "Airship Captain#02");
mapannounce "airplane_01","Captain Tarlock: Filthy animals! Stop ruining my ship!",bc_map,0x70DBDB;
end;
OnTimer118000:
@@ -1699,18 +1699,18 @@ OnTimer127000:
specialeffect EF_SUI_EXPLOSION,AREA,"boom7#airplane";
end;
OnTimer128000:
- emotion e_an,0,"Airship Captain#02";
+ emotion ET_FRET, getnpcid(0, "Airship Captain#02");
mapannounce "airplane_01", "Captain Tarlock: There's... Too many to handle!",bc_map,0x70DBDB;
end;
OnTimer133000:
mapannounce "airplane_01", "Pilot: Captain, sir, the situation is getting critical!",bc_map,0x00FF00;
end;
OnTimer138000:
- emotion e_swt,0,"Airship Captain#02";
+ emotion ET_SWEAT, getnpcid(0, "Airship Captain#02");
mapannounce "airplane_01", "Captain Tarlock: We'll need all the help we can get!",bc_map,0x70DBDB;
end;
OnTimer143000:
- emotion e_sry,0,"Airship Captain#02";
+ emotion ET_SORRY, getnpcid(0, "Airship Captain#02");
mapannounce "airplane_01", "Captain Tarlock: All hands and any passenger who can fight! We've got to drive away these monsters!",bc_map,0x70DBDB;
end;
OnTimer148000:
@@ -2495,7 +2495,7 @@ airplane,236,63,4 script Hallen 4_M_KID1,{
next;
switch(select("I'm not a passenger.:Hey kid, what are you doing?")) {
case 1:
- emotion e_what,0;
+ emotion ET_QUESTION;
mes "[Hallen]";
mes "Does that mean you're";
mes "one of the crewmen, then?";
@@ -2503,7 +2503,7 @@ airplane,236,63,4 script Hallen 4_M_KID1,{
mes "and I should be familiar with";
mes "everyone working here by now...";
next;
- emotion e_gasp,0;
+ emotion ET_SURPRISE;
mes "[Hallen]";
mes "Hey...!";
mes "If you're on duty,";
@@ -2557,7 +2557,7 @@ airplane,236,63,4 script Hallen 4_M_KID1,{
mes "this floor. It's gonna";
mes "take quite a while.";
next;
- emotion e_gasp,0;
+ emotion ET_SURPRISE;
mes "[Hallen]";
mes "It doesn't look like";
mes "I'm gonna finish this";
@@ -2816,7 +2816,7 @@ airplane,236,63,4 script Hallen 4_M_KID1,{
mes "But where have I heard";
mes "about that before...?";
next;
- emotion e_gasp,0;
+ emotion ET_SURPRISE;
mes "[Hallen]";
mes "Oh, that's right!";
mes "Kaci told me about a";
@@ -3292,7 +3292,7 @@ OnTouch_:
mes "Airship. Wait, wait...";
mes "You look familiar...";
next;
- emotion e_omg,0,"Ferlock#lab";
+ emotion ET_HUK, getnpcid(0, "Ferlock#lab");
mes "[Ferlock]";
mes "That's right, aren't you the";
mes "one who brought me my";
diff --git a/npc/quests/quests_alberta.txt b/npc/quests/quests_alberta.txt
index 21d789a3855..0cae4fc565b 100644
--- a/npc/quests/quests_alberta.txt
+++ b/npc/quests/quests_alberta.txt
@@ -2074,7 +2074,7 @@ tur_dun03,105,74,4 script Mudasamu#tur 119,{
mes "[Mudasamu]";
mes "Basically, our leader was so distracted by the idea of finding treasure himself that we've lost our men. It's bad enough that he's a fat slob, but he's a greedy slob too!";
next;
- emotion e_ag;
+ emotion ET_ANGER;
mes "[Takuyaka]";
mes "Hey, Mudasamu!";
mes "Are you talking";
diff --git a/npc/quests/quests_amatsu.txt b/npc/quests/quests_amatsu.txt
index 19502f39538..325f4616ebb 100644
--- a/npc/quests/quests_amatsu.txt
+++ b/npc/quests/quests_amatsu.txt
@@ -1711,7 +1711,7 @@ ama_in02,115,177,7 script Soldier#ama10 767,{
mes "[Jyuro]";
mes "What gate are you talking about?";
mes "A gate? On the top floor of the building??? Surely, you must been be mistaken.";
- emotion e_swt;
+ emotion ET_SWEAT;
next;
if (countitem(7160) > 0) {
if (select("Show him the ticket:Cancel") == 1) {
diff --git a/npc/quests/quests_ayothaya.txt b/npc/quests/quests_ayothaya.txt
index 1d1126968ad..e94f5e54720 100644
--- a/npc/quests/quests_ayothaya.txt
+++ b/npc/quests/quests_ayothaya.txt
@@ -117,9 +117,9 @@ ayothaya,233,105,3 script Powerful-Looking Woman 838,2,2,{
next;
mes "[Shuda]";
mes "In the meantime, I'll think of how I'm gonna pay back Annon for leaving me in misery! So hurry and find Annon! Hoo ho ho ho ho!";
- emotion e_heh;
+ emotion ET_SMILE;
next;
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
mes "["+strcharinfo(0)+"]";
mes "(She's so scary!";
mes "Making me do stuff";
@@ -209,7 +209,7 @@ ayothaya,233,105,3 script Powerful-Looking Woman 838,2,2,{
mes "standing around for my";
mes "own amusement or something?!";
next;
- emotion e_gg,1;
+ emotion ET_KIK, playerattached();
mes "["+strcharinfo(0)+"]";
mes "No no no no...";
mes "I meant, I can't";
@@ -313,7 +313,7 @@ ayothaya,233,105,3 script Powerful-Looking Woman 838,2,2,{
mes "^660000enslave^000000 him.";
mes "^666666*Grinds teeth*^000000";
next;
- emotion e_gasp,1;
+ emotion ET_SURPRISE, playerattached();
mes "[" +strcharinfo(0)+ "]";
mes "(...H-Horrifying!)";
next;
@@ -323,7 +323,7 @@ ayothaya,233,105,3 script Powerful-Looking Woman 838,2,2,{
mes "[Shuda]";
mes "And so, that is my quest for you. It should keep you entertained for a while. So get into the water, and I'll supervise from here.";
mes "Oho ho ho ho ho!";
- emotion e_heh;
+ emotion ET_SMILE;
set thai_find,1;
close;
case 2:
@@ -464,7 +464,7 @@ if (!$@annonactive) {
mes "...Awwww";
mes "Oh... Oh God...!";
next;
- emotion e_gasp,1;
+ emotion ET_SURPRISE, playerattached();
mes "[" +strcharinfo(0)+ "]";
mes "Huh...?";
mes "I heard something";
@@ -483,7 +483,7 @@ if (!$@annonactive) {
mes "Wh...who's there?";
mes "Shuda?! If that's you,";
mes "stay back, or I'll kill myself!";
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
next;
switch(select("What are you doing here?:I'm not Shuda!")) {
case 1:
@@ -547,7 +547,7 @@ if (!$@annonactive) {
OnTouch_:
if (thai_find == 12) {
if (!rand(0,2)) {
- emotion e_gasp,1;
+ emotion ET_SURPRISE, playerattached();
mes "[" +strcharinfo(0)+ "]";
mes "Huh...?";
next;
@@ -789,7 +789,7 @@ ayo_dun02,91,264,3 script Haggard Man 841,{
mes "My mission: Bring back an";
mes "ultra powerful potion for";
mes "this poor guy~";
- emotion e_no1,1;
+ emotion ET_BEST, playerattached();
close;
}
case 2:
@@ -970,7 +970,7 @@ ayo_dun01,255,62,0 script AyoFootprint1 139,2,0,{
OnTouch_:
if (thai_find == 4) {
if (rand(1,3) < 2) {
- emotion e_gasp,1;
+ emotion ET_SURPRISE, playerattached();
mes "^3355FFYou find footprints heading to the ^5C3317North^3355FF. It looks like somebody was in quite a hurry, just like the villager said!^000000";
set thai_find,5;
changequest 12032,12033;
@@ -984,7 +984,7 @@ ayo_dun01,74,142,0 script AyoFootprint2 139,2,0,{
OnTouch_:
if (thai_find == 5) {
if (rand(1,3) < 2) {
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
mes "^3355FFYou find another set of footprints. It seems that somebody was running away from something. These prints are heading to the ^5C3317East^3355FF. You'd better follow them to see what";
mes "you can find.^000000";
set thai_find,6;
@@ -998,7 +998,7 @@ ayo_dun01,244,256,2 script AyoFootprint3 139,2,0,{
OnTouch_:
if (thai_find == 6) {
if (rand(1,3) < 2) {
- emotion e_no,1;
+ emotion ET_STARE_ABOUT, playerattached();
mes "^3355FFThe footprints end around this area. Whoever was running must";
mes "have been exhausted and stumbled on something. Perhaps the owner of the footprints is nearby...^000000";
set thai_find,7;
@@ -1012,7 +1012,7 @@ ayo_dun01,17,257,0 script AyoFootprint4 139,2,0,{
OnTouch_:
if (thai_find == 7) {
if (rand(1,3) < 2) {
- emotion e_ic,1;
+ emotion ET_AHA, playerattached();
mes "^3355FFAs you follow the footprints,";
mes "you arrive at the '^5C3317Entrance of the Shrine^3355FF.' Whoever this person was, he just ran into the second level.^000000";
set thai_find,8;
@@ -1043,7 +1043,7 @@ ayo_dun02,135,168,0 script AyoFootprint6 139,0,2,{
OnTouch_:
if (thai_find == 9) {
if (rand(1,3) == 1) {
- emotion e_gasp,1;
+ emotion ET_SURPRISE, playerattached();
mes "^3355FFThe trail of footprints";
mes "continue here, and seem";
mes "to look more freshly made.^000000.";
@@ -1091,7 +1091,7 @@ OnTouch_:
mes "[Rat]";
mes "^FF0000Squeak!";
mes "^FF0000Squeak Squeak!^000000";
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
next;
mes "["+strcharinfo(0)+"]";
mes "^8C1717Wah^000000!";
@@ -1117,7 +1117,7 @@ ayo_dun02,77,213,0 script AyoFootprint7 139,1,1,{
OnTouch_:
if (thai_find == 10) {
if (rand(1,3) < 2) {
- emotion e_gasp,1;
+ emotion ET_SURPRISE, playerattached();
mes "^3355FFWhere is he...?";
mes "He seems to have gone";
mes "deep into the dungeon.";
@@ -1134,7 +1134,7 @@ ayo_dun02,86,254,0 script AyoFootprint8 139,1,1,{
OnTouch_:
if (thai_find == 11) {
if (rand(1,3) < 2) {
- emotion e_gasp,1;
+ emotion ET_SURPRISE, playerattached();
mes "^3355FFYou find traces of blood. Whoever was running in this direction may have been wounded. The trail of blood leads to the ^5C3317North^3355FF.^000000";
changequest 12032,12033;
set thai_find,12;
@@ -1155,7 +1155,7 @@ ayothaya,193,171,3 script Old Man#02 842,{
mes "bothers me...";
next;
mes "[Tham]";
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "Oh, aren't you";
mes "from Rune-Midgard?";
mes "Hello there~";
@@ -1168,7 +1168,7 @@ ayothaya,193,171,3 script Old Man#02 842,{
mes "He came from out of nowhere, so he scared the crap out of me. Do you think he could be a criminal?";
next;
mes "[Tham]";
- emotion e_ic;
+ emotion ET_AHA;
mes "Ah! I think, in his intense fear, he was screaming something about some kind of '^FF0000Shuda^000000,' or whatever. But what could it possibly mean?";
next;
mes "[Tham]";
@@ -2139,7 +2139,7 @@ ayothaya,196,265,3 script Einon#ayo 842,{
mes "I recommend that you go";
mes "visit ^3131FFMali the Spicy^000000.";
next;
- emotion e_no1;
+ emotion ET_BEST;
set tomyumgoong,1;
setquest 8123;
mes "[Einon]";
@@ -2271,7 +2271,7 @@ ayo_in01,145,163,3 script Cook#ayo 839,{
mes "you've brought. Hmm...";
mes "These are...";
next;
- emotion e_no1;
+ emotion ET_BEST;
mes "[Mali the Spicy]";
mes "The freshest Shrimp that";
mes "I've been looking for! Well done~";
@@ -2303,7 +2303,7 @@ ayo_in01,145,163,3 script Cook#ayo 839,{
mes "I guess.";
close;
}
- emotion e_ag;
+ emotion ET_ANGER;
mes "[Mali the Spicy]";
mes "What a stupid...!";
mes "If you quit just because you really hate sour flavors, you must not be that eager to have my Tom Yum Goong!";
@@ -2344,7 +2344,7 @@ ayo_in01,145,163,3 script Cook#ayo 839,{
close;
} else if (tomyumgoong == 5) {
if (countitem(568) > 9) {
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Mali the Spicy]";
mes "Welcome back!";
mes "Wow, you came back";
@@ -2424,7 +2424,7 @@ ayo_in01,145,163,3 script Cook#ayo 839,{
if (MaxWeight - Weight > 1499) {
if (countitem(7286) > 29) {
delitem 7286,30; //Chilli
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Mali the Spicy]";
mes "Now...";
mes "Everything is all set!";
@@ -2459,7 +2459,7 @@ ayo_in01,145,163,3 script Cook#ayo 839,{
next;
mes "[Mali the Spicy]";
mes "Wah^00009Cah^0000FFahhhh^0063FFaaaahhh^000000!";
- emotion e_omg;
+ emotion ET_HUK;
specialeffect EF_FLASHER;
specialeffect EF_LORD;
next;
@@ -2471,7 +2471,7 @@ ayo_in01,145,163,3 script Cook#ayo 839,{
set tomyumgoong,8;
completequest 8126;
getitem 566,10; //Tomyumkung
- emotion e_no1;
+ emotion ET_BEST;
mes "[Mali the Spicy]";
mes "Here's your";
mes "Tom Yum Goong!";
@@ -2509,7 +2509,7 @@ ayo_in01,145,163,3 script Cook#ayo 839,{
mes "You seem to be carrying too many things. Why don't you free up some space in your inventory first, and then come back?";
close;
}
- emotion e_wah;
+ emotion ET_KEK;
mes "[Mali the Spicy]";
mes "Ah...!";
mes "So busy, so busy!";
@@ -2562,7 +2562,7 @@ ayothaya,153,86,5 script Thongpool#ayo 843,{
set Zeny, Zeny-11000;
set tomyumgoong,3;
getitem 567,20; //Prawn
- emotion e_no1;
+ emotion ET_BEST;
mes "[Thongpool]";
mes "Good, now you have the";
mes "freshest Shrimp in this village! It's time for you to go back and ask Ms. Mali to cook them for you.";
@@ -2642,7 +2642,7 @@ ayothaya,121,240,7 script Mr. Jun#ayo 842,1,1,{
close;
}
if (tomyumgoong == 5) {
- emotion e_swt;
+ emotion ET_SWEAT;
mes "[Mr. Jun]";
mes "Umm...?";
mes "You don't need";
@@ -2651,13 +2651,13 @@ ayothaya,121,240,7 script Mr. Jun#ayo 842,1,1,{
next;
switch(select("No.:Give me Lemons, old man!:Can I have some more Lemons, please?")) {
case 1:
- emotion e_ho;
+ emotion ET_DELIGHT;
mes "[Mr. Jun]";
mes "Then why don't you taste";
mes "the Lemons I gave you last time? They're really sour, but also very delicious!";
close;
case 2:
- emotion e_an;
+ emotion ET_FRET;
mes "[Mr. Jun]";
mes "What...!?";
mes "What's wrong with you, kid?";
@@ -2694,7 +2694,7 @@ OnTouch_:
mes "Hello, there?";
mes "Did you need";
mes "some help...?";
- emotion e_hmm;
+ emotion ET_SCRATCH;
next;
if (select("I need some Lemons.:No, thanks.") == 1) {
mes "[Mr. Jun]";
@@ -2741,7 +2741,7 @@ OnTouch_:
mes "Paper, Scissors!^000000";
mes "Perhaps you've heard";
mes "of it in your land.";
- emotion e_scissors;
+ emotion ET_SCISSOR;
next;
mes "[Mr. Jun]";
mes "Nuh-uh, don't look at me like that. I'm an old man, and I want to play this game and re-live my youth";
@@ -2774,8 +2774,8 @@ OnTouch_:
switch(select("Scissors:Rock:Paper")) {
case 1:
if (.@jun_mark == 1) {
- emotion e_scissors;
- emotion e_scissors,1;
+ emotion ET_SCISSOR;
+ emotion ET_SCISSOR, playerattached();
mes "[Mr. Jun]";
mes "Hmpf.";
mes "It's a draw.";
@@ -2785,8 +2785,8 @@ OnTouch_:
next;
}
else if (.@jun_mark == 2) {
- emotion e_rock;
- emotion e_scissors,1;
+ emotion ET_ROCK;
+ emotion ET_SCISSOR, playerattached();
set @pc_score,@pc_score + 1;
mes "[Mr. Jun]";
mes "Yes...!";
@@ -2794,8 +2794,8 @@ OnTouch_:
next;
}
else {
- emotion e_paper;
- emotion e_scissors,1;
+ emotion ET_WRAP;
+ emotion ET_SCISSOR, playerattached();
set @pc_score,@pc_score + 1;
set @user_score,@user_score + 1;
mes "[Mr. Jun]";
@@ -2807,8 +2807,8 @@ OnTouch_:
break;
case 2:
if (.@jun_mark == 1) {
- emotion e_scissors;
- emotion e_rock,1;
+ emotion ET_SCISSOR;
+ emotion ET_ROCK, playerattached();
set @pc_score,@pc_score + 1;
set @user_score,@user_score + 1;
mes "[Mr. Jun]";
@@ -2817,8 +2817,8 @@ OnTouch_:
next;
}
else if (.@jun_mark == 2) {
- emotion e_rock;
- emotion e_rock,1;
+ emotion ET_ROCK;
+ emotion ET_ROCK, playerattached();
mes "[Mr. Jun]";
mes "Hmpf.";
mes "It's a draw.";
@@ -2828,8 +2828,8 @@ OnTouch_:
next;
}
else {
- emotion e_paper;
- emotion e_rock,1;
+ emotion ET_WRAP;
+ emotion ET_ROCK, playerattached();
set @pc_score,@pc_score + 1;
mes "[Mr. Jun]";
mes "Bwahahaha!";
@@ -2839,8 +2839,8 @@ OnTouch_:
break;
case 3:
if (.@jun_mark == 1) {
- emotion e_scissors;
- emotion e_paper,1;
+ emotion ET_SCISSOR;
+ emotion ET_WRAP, playerattached();
set @pc_score,@pc_score + 1;
mes "[Mr. Jun]";
mes "Heh heh~";
@@ -2848,8 +2848,8 @@ OnTouch_:
next;
}
else if (.@jun_mark == 2) {
- emotion e_rock;
- emotion e_paper,1;
+ emotion ET_ROCK;
+ emotion ET_WRAP, playerattached();
set @user_score,@user_score + 1;
set @pc_score,@pc_score + 1;
mes "[Mr. Jun]";
@@ -2858,8 +2858,8 @@ OnTouch_:
next;
}
else {
- emotion e_paper;
- emotion e_paper,1;
+ emotion ET_WRAP;
+ emotion ET_WRAP, playerattached();
mes "[Mr. Jun]";
mes "Hmpf.";
mes "It's a draw.";
@@ -2873,7 +2873,7 @@ OnTouch_:
}
}
if (@user_score == 3) {
- emotion e_pif;
+ emotion ET_HNG;
mes "[Mr. Jun]";
mes "You... won.";
mes "I'm so exhausted.";
@@ -2891,7 +2891,7 @@ OnTouch_:
set tomyumgoong,5;
getitem 568,10; //Lemon
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "[Mr. Jun]";
mes "Hmm...";
mes "Looks like you need a lot of them. Oh well, that's fine with me. I had a good time with you.";
@@ -2901,7 +2901,7 @@ OnTouch_:
mes "Don't be selfish, and always share what you have with others. That's one of the most important values for human beings.";
close;
}
- emotion e_scissors;
+ emotion ET_SCISSOR;
mes "[Mr. Jun]";
mes "Muhahahaha!";
mes "Victory is mine!";
@@ -2951,7 +2951,7 @@ ayothaya,213,94,7 script Merchant#ayo 841,{
mes "it all to you for 2,000 zeny.";
next;
if (select("Thanks, I'll take it.:It's a rip-off, man!") == 1) {
- emotion e_thx;
+ emotion ET_THANKS;
if (Zeny > 1999) {
if (MaxWeight - Weight > 1199) {
set Zeny, Zeny-2000;
@@ -2984,7 +2984,7 @@ ayothaya,213,94,7 script Merchant#ayo 841,{
mes "need from me.";
close;
}
- emotion e_no;
+ emotion ET_STARE_ABOUT;
mes "[Merchant Thongdum]";
mes "Don't say that.";
mes "My prices are always";
diff --git a/npc/quests/quests_ein.txt b/npc/quests/quests_ein.txt
index 79733d0470f..68749dc7389 100644
--- a/npc/quests/quests_ein.txt
+++ b/npc/quests/quests_ein.txt
@@ -4234,7 +4234,7 @@ einbech,165,105,7 script Buender Hikeman#ein 847,{
mes "...";
mes "......";
mes "......You...";
- emotion e_what,1;
+ emotion ET_QUESTION, playerattached();
next;
mes "[Buender Hikeman]";
mes "...";
@@ -4556,7 +4556,7 @@ einbech,165,105,7 script Buender Hikeman#ein 847,{
next;
mes "[Buender Hikeman]";
mes "................";
- emotion e_gasp;
+ emotion ET_SURPRISE;
next;
mes "[Buender Hikeman]";
mes "Uhhhh......";
@@ -4851,12 +4851,12 @@ ein_in01,231,163,7 script Sick Old Man#ein 849,{
mes "[Shinokas]";
mes "...";
mes ".......";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "["+strcharinfo(0)+"]";
mes "I was right.";
mes "You're Shinokas!";
- emotion e_gg,1;
+ emotion ET_KIK, playerattached();
next;
mes "[Shinokas]";
mes "Curses!";
@@ -4864,7 +4864,7 @@ ein_in01,231,163,7 script Sick Old Man#ein 849,{
mes "my cover!";
mes "W-wait! How much";
mes "do you know?!";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Shinokas]";
mes "Did ^3131FFthey^000000 send you?";
@@ -4891,7 +4891,7 @@ ein_in01,231,163,7 script Sick Old Man#ein 849,{
mes "Errr....";
mes "You're not";
mes "here to kill me?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
mes "["+strcharinfo(0)+"]";
mes "No...!";
@@ -5401,7 +5401,7 @@ airplane,31,77,5 script Drunken Man#ein 853,{
mes "Let's do it!";
mes "^3131FFYmir's Heart^000000 is";
mes "on my side! GO!";
- emotion e_go;
+ emotion ET_GO;
next;
mes "["+strcharinfo(0)+"]";
mes "Huh...?";
@@ -5410,7 +5410,7 @@ airplane,31,77,5 script Drunken Man#ein 853,{
next;
mes "^3355FF*Rolling and rumbling*^000000";
next;
- emotion e_kis;
+ emotion ET_CHUP;
mes "[Kaci]";
mes "I have a total of ^FF000011^000000";
mes "and you have total ^FF00005^000000.";
@@ -5462,7 +5462,7 @@ airplane,31,77,5 script Drunken Man#ein 853,{
mes "^3355FF*Rolling and rumbling*^000000";
next;
if (rand(1,10) > 7) {
- emotion e_kis;
+ emotion ET_CHUP;
mes "[Kaci]";
mes "I got a total of ^FF00008^000000,";
mes "and you have total ^FF000011^000000.";
@@ -5472,7 +5472,7 @@ airplane,31,77,5 script Drunken Man#ein 853,{
next;
}
else {
- emotion e_omg;
+ emotion ET_HUK;
mes "[Kaci]";
mes "Oooh...";
mes "I got a total of ^FF000010^000000,";
@@ -5612,7 +5612,7 @@ airplane,31,77,5 script Drunken Man#ein 853,{
mes "Let's do it!";
mes "^3131FFYmir's Heart^000000 is";
mes "on my side! GO!";
- emotion e_go;
+ emotion ET_GO;
next;
mes "["+strcharinfo(0)+"]";
mes "Huh...?";
@@ -5621,7 +5621,7 @@ airplane,31,77,5 script Drunken Man#ein 853,{
next;
mes "^3355FF*Rolling and rumbling*^000000";
next;
- emotion e_kis;
+ emotion ET_CHUP;
mes "[Kaci]";
mes "I have a total of ^FF00003^000000";
mes "and you have total ^FF00002^000000.";
diff --git a/npc/quests/quests_gonryun.txt b/npc/quests/quests_gonryun.txt
index 7ab6ab1fc40..40cd6302922 100644
--- a/npc/quests/quests_gonryun.txt
+++ b/npc/quests/quests_gonryun.txt
@@ -521,7 +521,7 @@ gon_in,165,16,4 script Man in hangover#gon 748,{
mes "Ahhh.. my stomach.. my head..";
mes "I shouldn't drink so much..";
mes "Ehhhh....";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
close;
}
else if (b_sword < 6) {
@@ -532,7 +532,7 @@ gon_in,165,16,4 script Man in hangover#gon 748,{
mes "*Urk!* I feel sick...";
mes "Can somebody bring me a potion?";
mes "*Groan*....";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
close;
}
mes "[Xue Bong]";
@@ -603,7 +603,7 @@ gon_in,165,16,4 script Man in hangover#gon 748,{
case 2:
delitem 506,1; //Green_Potion
set b_sword,5;
- emotion e_thx;
+ emotion ET_THANKS;
mes "[Xue Bong]";
mes "Whew, Thanks!";
mes "I feel much better now.";
@@ -754,7 +754,7 @@ gon_in,165,16,4 script Man in hangover#gon 748,{
mes "Ahhh.. my stomach.. my head..";
mes "I shouldn't drink so much..";
mes "ughh....";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
close;
case 12:
mes "[Xue Bong]";
@@ -764,7 +764,7 @@ gon_in,165,16,4 script Man in hangover#gon 748,{
mes "blind eye to a";
mes "boozer's suffering?";
mes "Urk...!";
- emotion e_an;
+ emotion ET_FRET;
close;
case 13:
mes "[Xue Bong]";
@@ -773,7 +773,7 @@ gon_in,165,16,4 script Man in hangover#gon 748,{
mes "How could you turn away";
mes "a drunk in need...?";
mes "*Groan*...";
- emotion e_an;
+ emotion ET_FRET;
close;
}
}
@@ -2088,7 +2088,7 @@ gon_in,18,27,5 script Madam#gnbs 771,{
mes "My~! Aren't you a darling young";
mes "man. But still, not nearly as handsome as my husband~";
mes "Tee hee~";
- emotion e_lv;
+ emotion ET_THROB;
close;
}
@@ -2149,7 +2149,7 @@ gonryun,139,142,7 script Girl##gnbs1 772,{
mes "I was happy meeting visitors";
mes "from outside the village,";
mes "but because of the thief, I feel terrible now...";
- emotion e_dots;
+ emotion ET_THINK;
close;
}
mes "[Shi Ying Xiao]";
@@ -2172,7 +2172,7 @@ gonryun,139,142,7 script Girl##gnbs1 772,{
mes "[ ^6699FF" + strcharinfo(0) + "^000000 ]";
mes "I AM YOUR HERO!";
next;
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Shi Ying Xiao]";
mes "Thank you so much for bringing hope to our village, hero~";
close;
@@ -2183,7 +2183,7 @@ gonryun,100,241,0 script Stranger#gnbs 733,{
mes "[Zuo Hei]";
mes "Hmm...";
mes "I'm pretty busy right now, come back later.";
- emotion e_dots;
+ emotion ET_THINK;
close;
}
else if (b_sword < 17) {
@@ -2234,7 +2234,7 @@ gonryun,100,241,0 script Stranger#gnbs 733,{
mes "That's none of your business.";
mes "Take a look in the mirror first";
mes "before you say things like that.";
- emotion e_ag;
+ emotion ET_ANGER;
close;
case 1:
mes "[Zuo Hei]";
@@ -2290,7 +2290,7 @@ gonryun,100,241,0 script Stranger#gnbs 733,{
mes "That's none of your business.";
mes "Take a look in the mirror first";
mes "before you say things like that.";
- emotion e_ag;
+ emotion ET_ANGER;
close;
case 4:
mes "[Zuo Hei]";
@@ -2312,7 +2312,7 @@ gonryun,100,241,0 script Stranger#gnbs 733,{
mes "[Zuo Hei]";
mes "Sorry, I'm busy right now.";
mes "Why don't you come back later.";
- emotion e_dots;
+ emotion ET_THINK;
close;
case 16:
switch(nakha) {
@@ -2374,7 +2374,7 @@ gonryun,100,241,0 script Stranger#gnbs 733,{
mes "That's none of your business.";
mes "Take a look in the mirror first";
mes "before you say things like that.";
- emotion e_ag;
+ emotion ET_ANGER;
close;
case 4:
mes "[Zuo Hei]";
@@ -2487,7 +2487,7 @@ geffen_in,71,112,2 script Blacksmith#SaYumMoon 731,{
mes "granddaughter all of a sudden!?";
mes "Get the hell out of here!";
mes "Don't ever come back here again!";
- emotion e_pif;
+ emotion ET_HNG;
close;
case 2:
mes "[Aumgarl]";
@@ -2511,7 +2511,7 @@ geffen_in,71,112,2 script Blacksmith#SaYumMoon 731,{
mes "granddaughter all of a sudden!?";
mes "Get out of here you pervert!";
mes "Don't ever come back here again!";
- emotion e_pif;
+ emotion ET_HNG;
close;
case 2:
mes "[Aumgarl]";
@@ -2573,7 +2573,7 @@ geffen_in,71,112,2 script Blacksmith#SaYumMoon 731,{
mes "as her fate. I just feel";
mes "so sorry for Lyroo.";
mes "...";
- emotion e_dots;
+ emotion ET_THINK;
close;
case 2:
mes "[Aumgarl]";
@@ -2678,7 +2678,7 @@ geffen_in,71,112,2 script Blacksmith#SaYumMoon 731,{
mes "I hate people who lie like that. Get out of my sight.";
mes "Get out of my sight.";
mes " ";
- emotion e_pif;
+ emotion ET_HNG;
close2;
warp "geffen",173,169;
end;
@@ -2758,7 +2758,7 @@ geffen_in,71,112,2 script Blacksmith#SaYumMoon 731,{
mes "[Aumgarl]";
mes "Thank you so much...";
mes "Without your help...";
- emotion e_sob;
+ emotion ET_CRY;
mes "it would have been hopeless.";
next;
mes "[Aumgarl]";
@@ -3237,7 +3237,7 @@ yuno_in01,99,101,4 script Doctor#gnbs 744,{
mes "Ah...I'm sorry..";
mes "I haven't seen a guy like you";
mes "for a long time.";
- emotion e_heh;
+ emotion ET_SMILE;
next;
mes "[Cylrnel]";
mes "You make me laugh...";
@@ -3671,7 +3671,7 @@ yuno_in01,99,101,4 script Doctor#gnbs 744,{
mes "[Cylrnel]";
mes "But I found a treatment...";
mes "And...it's..a...secret! Haha~!";
- emotion e_ho;
+ emotion ET_DELIGHT;
close;
}
diff --git a/npc/quests/quests_hugel.txt b/npc/quests/quests_hugel.txt
index 1ad5a2fb2a7..600462fae5e 100644
--- a/npc/quests/quests_hugel.txt
+++ b/npc/quests/quests_hugel.txt
@@ -304,7 +304,7 @@ hu_in01,387,245,0 script Allen Schuwell 849,2,2,{
mes "Something's not";
mes "right. Bunkoll A";
mes "doesn't taste like this...";
- emotion e_swt,0,"Postell Schuwell#D";
+ emotion ET_SWEAT, getnpcid(0, "Postell Schuwell#D");
next;
mes "[Postell]";
mes "Bunkoll A...?";
@@ -332,8 +332,8 @@ hu_in01,387,245,0 script Allen Schuwell 849,2,2,{
close2;
set hg_herb,11;
disablenpc "Postell Schuwell#D";
- emotion e_swt,1;
- emotion e_swt;
+ emotion ET_SWEAT, playerattached();
+ emotion ET_SWEAT;
end;
} else if (hg_herb == 11) {
mes "[Allen]";
@@ -1903,7 +1903,7 @@ hugel,70,137,5 script Shede 879,{
mes "[Shede]";
mes "Yay~ are you talking to me? Yay!";
mes "Hey, are you from a different city? Wow, nice to see you!";
- emotion e_gasp;
+ emotion ET_SURPRISE;
next;
mes "[Shede]";
mes "Ever since the airport was built, Hugel has been so busy to welcome tourists and adventurers.";
@@ -1919,7 +1919,7 @@ hugel,70,137,5 script Shede 879,{
mes "[Shede]";
mes "Oh~ how kind of you! Thank you so much~";
mes "Then can I ask you a favor?";
- emotion e_lv;
+ emotion ET_THROB;
next;
mes "[Shede]";
switch(rand(1,3)) {
@@ -2027,7 +2027,7 @@ hugel,70,137,5 script Shede 879,{
next;
mes "["+strcharinfo(0)+"]";
mes "'......I am confused...Does she love him or hate him?'";
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
set hg_tre,30;
close2;
cutin "",255;
@@ -2067,7 +2067,7 @@ hugel,70,137,5 script Shede 879,{
mes "Oh! You came back earlier than I thought.";
mes "Now, I can bake the Mushroom Flavor Cookies for uncle Hollun.";
mes "Thank you so much.";
- emotion e_heh;
+ emotion ET_SMILE;
set hg_tre,40;
close2;
cutin "",255;
@@ -2077,7 +2077,7 @@ hugel,70,137,5 script Shede 879,{
mes "Oh! You came back earlier than I thought.";
mes "Now, I can bake the best cookies of mine and compete with Agette!";
mes "Thank you so much.";
- emotion e_heh;
+ emotion ET_SMILE;
set hg_tre,40;
close2;
cutin "",255;
@@ -2087,12 +2087,12 @@ hugel,70,137,5 script Shede 879,{
mes "Oh! You came back earlier than I thought.";
mes "Now, I can bake Devil's Cookies to confess my love to the gentleman.";
mes "Thank you so much.";
- emotion e_heh;
+ emotion ET_SMILE;
next;
mes "["+strcharinfo(0)+"]";
mes "(If he knew what ingredients she used for the cookies,)";
mes "(I am pretty sure that at least he will remember her face to avoid next time...)'";
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
set hg_tre,40;
close2;
cutin "",255;
@@ -2460,8 +2460,8 @@ hu_in01,256,40,3 script Herico 897,{
mes "[Herico]";
mes "Haha, the first part was funny,";
mes "but the second part was kind of scary, you know?";
- emotion e_dots;
- emotion e_sob,1;
+ emotion ET_THINK;
+ emotion ET_CRY, playerattached();
next;
mes "[Herico]";
mes "So, tell me, where are all of his research documents?";
@@ -2491,7 +2491,7 @@ hu_in01,256,40,3 script Herico 897,{
mes "I may now be an old man whose days are numbered,";
mes "but I used to work at ^3131FFthe Ymir's Heart imitation research department";
mes " in Regenschirm laboratory^000000 under Sage Varmunt's supervision.";
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
next;
cutin "heri2.bmp",2;
mes "[Herico]";
@@ -2579,7 +2579,7 @@ hu_in01,256,40,3 script Herico 897,{
mes "in order to continue with their research without Sage Varmunt.";
next;
cutin "heri3.bmp",2;
- emotion e_ag;
+ emotion ET_ANGER;
mes "[Herico]";
mes "What? \"Bio Lab\"? I didn't image that they could";
mes "even think of that! I can't express enough of my resentment toward them!";
@@ -3007,7 +3007,7 @@ lhz_in03,39,44,3 script Enquro Carson 97,{
mes "Wow, this is that famous drink!";
mes "Let's see...*Gulp*";
next;
- emotion e_no1;
+ emotion ET_BEST;
mes "[Enquro Carson]";
mes "Wow! This is awsome!";
mes "It is as delicious as I heard!";
@@ -3044,7 +3044,7 @@ lhz_in03,39,44,3 script Enquro Carson 97,{
mes "this secret between you and me.";
mes "I released the personal information at my discretion,";
mes "and I know that I am not allowed to do that. Hehe.";
- emotion e_gg;
+ emotion ET_KIK;
set hg_tre,47;
delitem 12112,1; //Tropical Sograt
delitem 12113,1; //Vermilion on the Beach
@@ -4205,7 +4205,7 @@ hugel,198,169,0 script #HugelTree 139,2,2,{
mes "feeling of dread?";
mes "This peculiar chill...";
mes "It's almost as if you";
- mes "were in Nifflheim...^000000";
+ mes "were in Niflheim...^000000";
close;
} else {
mes "^3355FFFor some reason, you";
@@ -4302,7 +4302,7 @@ hugel,191,172,3 script Manainne 892,1,{
mes "What? That's...";
mes "That's an incredible";
mes "story. You met my dead";
- mes "sister in Nifflheim?! You";
+ mes "sister in Niflheim?! You";
mes "must be lying to me!";
next;
mes "[Manainne]";
@@ -4316,7 +4316,7 @@ hugel,191,172,3 script Manainne 892,1,{
set hg_memory,8;
mes "[Manainne]";
mes "Gosh, all that talk";
- mes "about Nifflheim is...";
+ mes "about Niflheim is...";
mes "It's giving me the chills!";
mes "A-aren't you cold?";
close;
@@ -4357,7 +4357,7 @@ hugel,191,172,3 script Manainne 892,1,{
mes "long! Hello, adventurer,";
mes "remember me? I'm Kanainne,";
mes "the spirit you saw down in";
- mes "Nifflheim. Let me explain...";
+ mes "Niflheim. Let me explain...";
next;
mes "[Manainne]";
mes "My spirit was able to follow";
@@ -4561,7 +4561,7 @@ niflheim,90,106,3 script A Spirit#HQuest 802,{
} else {
mes "[Spirit]";
mes "The living shouldn't";
- mes "be here in Nifflheim...";
+ mes "be here in Niflheim...";
mes "Go back! Go back to your";
mes "own world before it's too late!";
next;
@@ -4930,7 +4930,7 @@ hugel,107,67,3 script Torpy 706,{
mes "disappeared too! I-I'm all";
mes "alone now! Waaaaaah~!";
next;
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
mes "["+strcharinfo(0)+"]";
mes "Don't worry, I'll look";
mes "for your parents. I'm";
@@ -4947,7 +4947,7 @@ hugel,107,67,3 script Torpy 706,{
mes "show up sooner";
mes "or later. Well, lots";
mes "of luck, kid.";
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
close;
}
case 2:
@@ -4989,7 +4989,7 @@ hugel,107,67,3 script Torpy 706,{
mes "also tell her that Daddy";
mes "is safe! See you later~";
next;
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
mes "......";
mes ".........";
mes "............";
@@ -5009,7 +5009,7 @@ hugel,107,67,3 script Torpy 706,{
mes "this town, where you last";
mes "saw her. Bye bye for now~";
next;
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
mes "......";
mes ".........";
mes "............";
@@ -5023,7 +5023,7 @@ hugel,107,67,3 script Torpy 706,{
mes "Um, that might not be good...^000000";
close;
} else if (hg_ubu01 == 8) {
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
mes "[Torpy]";
mes "Daddy promised to get";
mes "me a girlfriend if I beat him";
@@ -5039,7 +5039,7 @@ hugel,107,67,3 script Torpy 706,{
set hg_ubu01,9;
close;
} else if (hg_ubu01 == 9) {
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
mes "[Torpy]";
mes "Maybe I should wait until";
mes "I'm older to have a girlfriend.";
@@ -5168,7 +5168,7 @@ hu_fild06,190,367,3 script Torpy's Mom 701,{
mes "after each other. Oh, well...";
close;
} else if (hg_ubu01 == 9) {
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
mes "[Torpy's Mom]";
mes "When is that husband";
mes "of mine going to come";
@@ -5197,7 +5197,7 @@ hugel,100,176,3 script Suspicious Barrel 111,{
mes "h-health... with... Steamed...";
mes "Crab... Nippers... Please...";
next;
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
mes "^3355FFIt sounds like";
mes "this barrel wants";
mes "Steamed Crab Nippers.^000000";
@@ -5212,7 +5212,7 @@ hugel,100,176,3 script Suspicious Barrel 111,{
mes "and 10... N-Nippers... to";
mes "c-cook th-them. Ugh...";
next;
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
mes "["+strcharinfo(0)+"]";
mes "Hold on,";
mes "I have to cook";
@@ -5233,7 +5233,7 @@ hugel,100,176,3 script Suspicious Barrel 111,{
mes "hunger...! It... It can't...";
mes "It c-can't be... d-denied!";
next;
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
mes "["+strcharinfo(0)+"]";
mes "Weirdo! Why don't you";
mes "get out of that barrel,";
@@ -5250,7 +5250,7 @@ hugel,100,176,3 script Suspicious Barrel 111,{
mes "It's b-been so... l-long...";
mes "G-Give me! G-Give me now!";
next;
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
mes "^3355FFYou dumped the";
mes "Steamed Crab Nippers";
mes "into the barrel where";
@@ -5276,7 +5276,7 @@ hugel,100,176,3 script Suspicious Barrel 111,{
mes "and 10... N-Nippers... to";
mes "c-cook th-them. Ugh...";
next;
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
mes "["+strcharinfo(0)+"]";
mes "Hold on,";
mes "I have to cook";
@@ -5298,7 +5298,7 @@ hugel,100,176,3 script Suspicious Barrel 111,{
mes "It's b-been so... l-long...";
mes "G-Give me! G-Give me now!";
next;
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
mes "^3355FFYou dumped the";
mes "Steamed Crab Nippers";
mes "into the barrel where";
@@ -5324,7 +5324,7 @@ hugel,100,176,3 script Suspicious Barrel 111,{
mes "and 10... N-Nippers... to";
mes "c-cook th-them. Ugh...";
next;
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
mes "["+strcharinfo(0)+"]";
mes "Hold on,";
mes "I have to cook";
@@ -5338,7 +5338,7 @@ hugel,100,176,3 script Suspicious Barrel 111,{
close;
}
} else if (hg_ubu01 == 6) {
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
mes "^3355FFFor now, you should";
mes "tell Torpy and his mom";
mes "where Torpy's father is";
@@ -5346,22 +5346,22 @@ hugel,100,176,3 script Suspicious Barrel 111,{
mes "worry about him so much.";
close;
} else if (hg_ubu01 == 7) {
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
mes "^800080Torpy's mom might want to know about^000000";
mes "^800080this extraordinary barrel.^000000";
close;
} else if (hg_ubu01 == 8) {
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
mes "^800080How long does Torpy's father plan to stay within the barrel?^000000";
close;
} else if (hg_ubu01 == 9) {
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
mes "^800080That barrel will become a symbolic object^000000";
mes "^800080that pays tribute to the firm will of Torpy's father^000000";
mes "^800080who is trying hard to avoid keeping the promise with his son to find his wife.^000000";
close;
} else {
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
mes "^800080You hear something bustling from the hole in the barrel.^000000";
mes "^800080However, it doesn't seem to be a big deal.^000000";
close;
@@ -7205,13 +7205,13 @@ OnTouch_:
mes "do?! I need to deliver the";
mes "milk tomorrow, but Burupu";
mes "still hasn't arrived yet!";
- emotion e_omg,0;
+ emotion ET_HUK;
next;
mes "[Kurupe]";
mes "When is he coming";
mes "to work? Burupu,";
mes "where are you?!";
- emotion e_swt,0;
+ emotion ET_SWEAT;
set hg_milk,1;
close;
}
@@ -7339,7 +7339,7 @@ hu_fild06,217,270,3 script Burupu 896,3,3,{
mes "world! But first, I gotta";
mes "learn how to use this thing!";
mes "Heeeeee-YAH! How's that? That was almost a Magnum Break, right?";
- emotion e_swt2,0;
+ emotion ET_PROFUSELY_SWEAT;
close;
}
@@ -7349,7 +7349,7 @@ OnTouch_:
mes "Heeeyah!";
mes "Yaaaaaaaah!";
mes "Wh-whooooooosh!";
- emotion e_swt2,0;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Burupu]";
mes "Crap! Why do I have";
@@ -7358,14 +7358,14 @@ OnTouch_:
mes "tired of making all my own";
mes "whooshing sounds and effects.";
set hg_milk,3;
- emotion e_an,0;
+ emotion ET_FRET;
close;
} else if (hg_milk == 5) {
mes "[Burupu]";
mes "Heeeyah!";
mes "Yaaaaaaaah!";
mes "Yeeeeeeeyoooop!";
- emotion e_swt2,0;
+ emotion ET_PROFUSELY_SWEAT;
close;
}
}
@@ -7907,7 +7907,7 @@ hu_in01,19,161,0 script Alex 803,{
mes "when you're done and";
mes "don't waste my time!";
next;
- emotion e_ho,0,"Julian";
+ emotion ET_DELIGHT, getnpcid(0, "Julian");
mes "[Julian]";
mes "Hey, you know what,";
mes "Alex? You can't push";
@@ -7916,7 +7916,7 @@ hu_in01,19,161,0 script Alex 803,{
mes "isn't a pushover, you know?";
next;
cutin "hu_alex03.bmp",2;
- emotion e_an;
+ emotion ET_FRET;
mes "[Alex]";
mes "What was that...?";
mes "Are you trying to";
@@ -8024,7 +8024,7 @@ hu_in01,19,161,0 script Alex 803,{
mes "And what is that grey haired";
mes "crone thinking? Hmmmm...";
next;
- emotion e_omg;
+ emotion ET_HUK;
cutin "hu_alex03.bmp",2;
cutin "hu_alex01.bmp",2;
mes "[Alex]";
@@ -8129,7 +8129,7 @@ hu_in01,14,11,4 script Laura 70,{
mes "Milton, is right over";
mes "there. Say, 'Hello,' Ashe.";
next;
- emotion e_heh,0,"Ashe";
+ emotion ET_SMILE, getnpcid(0, "Ashe");
mes "[Ashe]";
mes "Hello!";
next;
@@ -8263,7 +8263,7 @@ hu_in01,14,11,4 script Laura 70,{
mes "expedition for the Rune Midgarts Kingdom. Ashe Milton is my";
mes "assistant for this excavation.";
next;
- emotion e_heh,0,"Ashe";
+ emotion ET_SMILE, getnpcid(0, "Ashe");
mes "[Ashe]";
mes "Hello!";
next;
@@ -8417,7 +8417,7 @@ hu_in01,14,11,4 script Laura 70,{
mes "greets me with a fake";
mes "smile. I hate her!";
next;
- emotion e_swt2,0,"Ashe";
+ emotion ET_PROFUSELY_SWEAT, getnpcid(0, "Ashe");
mes "[Ashe]";
mes "Ms. Laurence...!";
mes "Stop it, please!";
@@ -8770,7 +8770,7 @@ hu_in01,14,11,4 script Laura 70,{
mes "Well, have you";
mes "ever heard of Ymir's...";
next;
- emotion e_gasp,0,"Ashe";
+ emotion ET_SURPRISE, getnpcid(0, "Ashe");
mes "[Ashe]";
mes "...Heart?";
mes "Ymir's Heart, right?";
@@ -8812,7 +8812,7 @@ hu_in01,14,11,4 script Laura 70,{
next;
break;
}
- emotion e_ok,0,"Ashe";
+ emotion ET_OK, getnpcid(0, "Ashe");
mes "[Ashe]";
mes "Ymir's Heart?";
mes "That's a clothing";
@@ -9130,7 +9130,7 @@ OnTouch_:
hu_in01,159,84,3 script Laura#2 70,{
if (hg_odin == 22 || hg_odin == 23) {
cutin "hu_laura03.bmp",2;
- emotion e_an,0,"Laura#2";
+ emotion ET_FRET, getnpcid(0, "Laura#2");
mes "[Laura]";
mes "Wh-what...?!";
mes "Does this mean";
@@ -9140,7 +9140,7 @@ hu_in01,159,84,3 script Laura#2 70,{
mes "complete lunacy!";
next;
cutin "hu_alex04.bmp",0;
- emotion e_an,0,"Alex#2";
+ emotion ET_FRET, getnpcid(0, "Alex#2");
mes "[Alex]";
mes "What are you talking";
mes "about, you crazy wench?";
@@ -9197,12 +9197,12 @@ hu_in01,159,84,3 script Laura#2 70,{
mes "waves a thick file";
mes "clasped in her hands.^000000";
next;
- emotion e_omg,0,"Julian#2";
+ emotion ET_HUK, getnpcid(0, "Julian#2");
mes "[Julian]";
mes "What...?";
mes "Argh, that's--!";
next;
- emotion e_ag,0,"Laura#2";
+ emotion ET_ANGER, getnpcid(0, "Laura#2");
mes "[Laura]";
mes "That's right.";
mes "Now tell me, what the";
@@ -9213,7 +9213,7 @@ hu_in01,159,84,3 script Laura#2 70,{
mes "......";
mes "Julian!";
next;
- emotion e_swt2,0,"Julian#2";
+ emotion ET_PROFUSELY_SWEAT, getnpcid(0, "Julian#2");
mes "[Julian]";
mes "Uh, this isn't my fault!";
mes "Sh-she doesn't have any";
@@ -9237,7 +9237,7 @@ hu_in01,159,84,3 script Laura#2 70,{
mes "what are your true goals?!";
next;
cutin "hu_alex03.bmp",0;
- emotion e_swt2,0,"Alex#2";
+ emotion ET_PROFUSELY_SWEAT, getnpcid(0, "Alex#2");
mes "[Alex]";
mes "I-I don't know what you're";
mes "talking about! J-Julian must";
@@ -9255,18 +9255,18 @@ hu_in01,159,84,3 script Laura#2 70,{
mes "away, and threateningly";
mes "rolled up her sleeves.^000000";
next;
- emotion e_sob,0,"Ashe#2";
+ emotion ET_CRY, getnpcid(0, "Ashe#2");
mes "[Ashe]";
mes "S-stop!";
mes "Both of you!";
next;
- emotion e_swt2,0,"Laura#2";
+ emotion ET_PROFUSELY_SWEAT, getnpcid(0, "Laura#2");
mes "[Laura]";
mes "Stay out of";
mes "this, Ashe!";
next;
cutin "hu_alex04.bmp",0;
- emotion e_an,0,"Alex#2";
+ emotion ET_FRET, getnpcid(0, "Alex#2");
mes "[Alex]";
mes "Yeah, this is none";
mes "of your business!";
@@ -9279,14 +9279,14 @@ hu_in01,159,84,3 script Laura#2 70,{
end;
} else if (hg_odin > 23) {
cutin "hu_laura03.bmp",2;
- emotion e_an,0,"Laura#2";
+ emotion ET_FRET, getnpcid(0, "Laura#2");
mes "[Laura]";
mes "Hah...!";
mes "Did you...";
mes "Just hit me?";
next;
cutin "hu_alex04.bmp",0;
- emotion e_an,0,"Alex#2";
+ emotion ET_FRET, getnpcid(0, "Alex#2");
mes "[Alex]";
mes "You crazy...!";
close2;
@@ -9295,7 +9295,7 @@ hu_in01,159,84,3 script Laura#2 70,{
}
}
-hu_in01,158,84,5 duplicate(Laura#2) Alex#2 803,0,0
+hu_in01,158,84,5 duplicate(Laura#2) Alex#2 803
hu_in01,162,85,4 script Ashe#2 95,{
if (hg_odin == 22 || hg_odin == 23) {
diff --git a/npc/quests/quests_juperos.txt b/npc/quests/quests_juperos.txt
index 077a88bd66c..efbfd9e0c63 100644
--- a/npc/quests/quests_juperos.txt
+++ b/npc/quests/quests_juperos.txt
@@ -1052,7 +1052,7 @@ yuno_in04,186,125,4 script Bundle of Files 111,{
mes "less clear I am on what";
mes "the theory actually is.";
mes "I don't think there is one...";
- emotion e_swt,1;
+ emotion ET_SWEAT, playerattached();
close;
}
mes "^8B6914What is most unsettling";
diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt
index 03afe37c2a3..4233949fa45 100644
--- a/npc/quests/quests_lighthalzen.txt
+++ b/npc/quests/quests_lighthalzen.txt
@@ -1921,7 +1921,7 @@ OnTouch_:
mes "I'll give you back";
mes "your money, just ";
mes "let me go! Crap!";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[" + strcharinfo(0) + "]";
mes "Alright, fine,";
@@ -3421,7 +3421,7 @@ OnTouch_:
next;
mes "............";
next;
- emotion e_what,1;
+ emotion ET_QUESTION, playerattached();
mes "["+strcharinfo(0)+"]";
mes "Those voices weren't";
mes "just in my head, were they?";
@@ -3499,7 +3499,7 @@ OnTouch_:
next;
mes "............";
next;
- emotion e_what,1;
+ emotion ET_QUESTION, playerattached();
mes "["+strcharinfo(0)+"]";
mes "I'm hearing things";
mes "again! Where are all of";
@@ -3784,7 +3784,7 @@ lhz_que01,21,31,5 script #li_Varmunt 755,{
mes "you've finally agreed";
mes "to join us. Welcome!";
next;
- emotion e_swt,"#li_Varmunt";
+ emotion ET_SWEAT;
mes "[Varmunt]";
mes "Well, I don't know if I agree";
mes "with this company's policies,";
@@ -3792,7 +3792,7 @@ lhz_que01,21,31,5 script #li_Varmunt 755,{
mes "seems to be an opportunity that";
mes "comes once in a lifetime, so...";
next;
- emotion e_no1,"#li_researcher";
+ emotion ET_BEST, getnpcid(0, "#li_researcher");
mes "[??]";
mes "To be honest, this project";
mes "can only be a success with";
@@ -3919,7 +3919,7 @@ lhz_que01,29,24,3 script #li_researcher 754,{
mes "you've finally agreed";
mes "to join us. Welcome!";
next;
- emotion e_swt,"#li_Varmunt";
+ emotion ET_SWEAT, getnpcid(0, "#li_Varmunt");
mes "[Varmunt]";
mes "Well, I don't know if I agree";
mes "with this company's policies,";
@@ -3927,7 +3927,7 @@ lhz_que01,29,24,3 script #li_researcher 754,{
mes "seems to be an opportunity that";
mes "comes once in a lifetime, so...";
next;
- emotion e_no1,"#li_researcher";
+ emotion ET_BEST;
mes "[??]";
mes "To be honest, this project";
mes "can only be a success with";
@@ -4853,7 +4853,7 @@ lhz_in03,32,162,3 script Crippled Girl#li_tre 53,{
mes "What are you talking about?";
close;
}
- emotion e_gasp,"Crippled Girl#li_tre";
+ emotion ET_SURPRISE;
mes "[Crippled Girl]";
mes "Oh, that's mine!";
mes "I gave it to my big brother";
@@ -5520,7 +5520,7 @@ lhz_in01,273,121,1 script Mad Scientist#li 865,{
mes "You again?!";
mes "What the hell do";
mes "you want from me?!";
- emotion e_ag,"Mad Scientist#li";
+ emotion ET_ANGER;
next;
switch(select("Let me speak with you.:Sorry for bothering you.")) {
case 1:
@@ -5531,7 +5531,7 @@ lhz_in01,273,121,1 script Mad Scientist#li 865,{
next;
mes "[Wolfchev]";
mes "...........!";
- emotion e_gasp,"Mad Scientist#li";
+ emotion ET_SURPRISE;
next;
mes "[Wolfchev]";
mes "Ah, but wait! I am collecting";
@@ -5543,7 +5543,7 @@ lhz_in01,273,121,1 script Mad Scientist#li 865,{
changequest 2089,2090;
close;
case 2:
- emotion e_an,"Mad Scientist#li";
+ emotion ET_FRET;
mes "[Wolfchev]";
mes "''Sorry?!'' Do you";
mes "think ''sorry'' will";
@@ -5571,7 +5571,7 @@ lhz_in01,273,121,1 script Mad Scientist#li 865,{
mes "now that I would never";
mes "tell you why I neeeeed";
mes "these Beads. Bweh-heh!";
- emotion e_gg,"Mad Scientist#li";
+ emotion ET_KIK;
next;
break;
}
@@ -5673,9 +5673,9 @@ lhz_in01,273,121,1 script Mad Scientist#li 865,{
next;
mes "[Wolfchev]";
mes "...........!";
- emotion e_gasp,"Mad Scientist#li";
+ emotion ET_SURPRISE;
next;
- emotion e_gg,"Mad Scientist#li";
+ emotion ET_KIK;
mes "[Wolfchev]";
mes "Ah, but wait! I am collecting";
mes "something. Yes, bring me the";
@@ -5763,7 +5763,7 @@ lhz_in01,286,226,3 script Secretary Slierre#li 831,{
case 1:
mes "[Sueii Slierre]";
mes ".............!";
- emotion e_gasp,"Secretary Slierre#li";
+ emotion ET_SURPRISE;
next;
mes "[Sueii Slierre]";
mes "How do you know";
@@ -5828,7 +5828,7 @@ lhz_in01,286,226,3 script Secretary Slierre#li 831,{
mes "you have any more questions.";
next;
select("About Wolfchev's Research");
- emotion e_dots,"Secretary Slierre#li";
+ emotion ET_THINK;
mes "[Sueii Slierre]";
mes "I couldn't tell you any";
mes "more about Wolfchev.";
@@ -5900,7 +5900,7 @@ lhz_in01,286,226,3 script Secretary Slierre#li 831,{
mes "[Sueii Slierre]";
mes "...";
mes "......";
- emotion e_ic,"Secretary Slierre#li";
+ emotion ET_AHA;
next;
mes "[Sueii Slierre]";
mes "So... You're";
@@ -6008,7 +6008,7 @@ lhz_in01,286,226,3 script Secretary Slierre#li 831,{
mes "[Sueii Slierre]";
mes "...";
mes "......";
- emotion e_ic,"Secretary Slierre#li";
+ emotion ET_AHA;
next;
mes "[Sueii Slierre]";
mes "So... You're";
@@ -8429,7 +8429,7 @@ L_Mission:
mes "["+strcharinfo(0)+"]";
mes "Not long ago, the scientists of Regenschrim have stolen the research record and destroyed the machines that they used for research purposes.";
next;
- emotion e_gasp,0;
+ emotion ET_SURPRISE;
mes "[Karl]";
mes "...!";
mes "Did you do that? ";
diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt
index 0fa94906ba6..b35d7545542 100644
--- a/npc/quests/quests_louyang.txt
+++ b/npc/quests/quests_louyang.txt
@@ -214,7 +214,7 @@ lou_in02,61,175,3 script Employee#3 818,2,2,{
mes "you go upstairs?";
mes "Ha ha ha!";
next;
- emotion e_swt;
+ emotion ET_SWEAT;
mes "[Ya Hua]";
mes "Oh, if by any chance you came to try the Dragon Soup, I'm sorry, but it's no longer availalbe.";
next;
@@ -609,7 +609,7 @@ lou_fild01,195,177,5 script Jiu Lian Bu#1-1 819,{
}
lou_fild01,175,173,3 script Jiu Lian Bu#1-2 819,{
- emotion e_heh;
+ emotion ET_SMILE;
if (ch_tre == 4) {
mes "[Jiu Lian Bu]";
mes "So...";
@@ -627,7 +627,7 @@ lou_fild01,175,173,3 script Jiu Lian Bu#1-2 819,{
mes "[Jiu Lian Bu]";
mes "Why don't you sit down and close your eyes, and feel that soothing wind. It's pretty refreshing...";
next;
- emotion e_hmm;
+ emotion ET_SCRATCH;
mes "[Jiu Lian Bu]";
mes "Also...";
mes "I'm a little";
@@ -888,7 +888,7 @@ lou_in02,58,183,5 script Chef Assistant#lou1 823,5,5,{
specialeffect EF_SONICBLOWHIT;
mes "^3355FF* Chop chop chop chop chop *^000000";
next;
- emotion e_no1;
+ emotion ET_BEST;
mes "[Jin Wei Ling]";
mes "Hahahaha! Look these perfect vergetable slices! Muhahahaha!!";
mes "I will continue to hone my martial arts through cooking!";
@@ -984,7 +984,7 @@ lou_in02,42,186,5 script Liu Jia Lim#lou 816,{
mes "[Liu Jia Lim]";
mes "Do you know what was this restaurant's best dish throughout all of its history? Dragon Soup!";
next;
- emotion e_lv;
+ emotion ET_THROB;
mes "[Liu Jia Lim]";
mes "Its delicate taste comes from";
mes "a broth extracted from pure meat that does not contain any fat. So it's also a very popular diet food for the ladies.";
@@ -1034,7 +1034,7 @@ louyang,261,123,3 script Chi Wu Ping#lou 824,{
mes "All my muscles are sore...";
mes "There's only one thing that could cure all of this agonizing... pain...";
next;
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Chi Wu Ping]";
mes "Hey kid~!";
mes "You don't look like a local!";
@@ -1103,7 +1103,7 @@ lou_in02,265,69,5 script Doctor#lyang 814,{
mes "[Hua Tuo]";
mes "However, as I studied and experimented with every pressure point, I came to the conclusion that the use of pressure points, depending on the circumstances,";
mes "can produce different results.";
- emotion e_gasp;
+ emotion ET_SURPRISE;
next;
mes "[Hua Tuo]";
mes "Few pressure points tend to show the same symptoms, regardless of the problem. Most of the time, the effects of pressure points will differ depending on the body's health or the time of day.";
@@ -1145,7 +1145,7 @@ lou_in02,265,69,5 script Doctor#lyang 814,{
mes "I cannot do anything without my medicine. But one my patients";
mes "needs immediate treatment and";
mes "I can't leave the office...";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
if (select("I can help you.:What a shame!") == 1) {
mes "[Hua Tuo]";
@@ -1166,7 +1166,7 @@ lou_in02,265,69,5 script Doctor#lyang 814,{
mes "However, I will ask you";
mes "if we meet another time.";
mes "Now, if you'll excuse me...";
- emotion e_thx;
+ emotion ET_THANKS;
close;
}
mes "[Hua Tuo]";
@@ -1507,7 +1507,7 @@ lou_in02,272,55,0 script Familiar-Looking Patient 798,{
mes "Awwww.....";
mes "Ummm....";
mes "^666666*Cough...cough...*^000000";
- emotion e_omg;
+ emotion ET_HUK;
set ch_par,1;
close;
}
@@ -1516,7 +1516,7 @@ lou_in02,272,55,0 script Familiar-Looking Patient 798,{
mes "^666666*Cough cough...*^000000";
mes "Aww......www...";
mes "Aww...wwww..";
- emotion e_dots;
+ emotion ET_THINK;
close;
}
else {
@@ -1544,7 +1544,7 @@ lou_in02,248,166,2 script Tool Shop Master#lou 824,{
mes "[Wang Chuiyi]";
mes "Um? Can I help";
mes "you with anything?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
if (select("I'm here to get something for the doctor...:I agree, the weather really is bad.") == 1) {
mes "[Wang Chuiyi]";
@@ -1632,7 +1632,7 @@ lou_in02,201,166,4 script Storage Keeper#lou 819,{
mes "say so? Let's see.";
mes "Hmmm...";
next;
- emotion e_gasp;
+ emotion ET_SURPRISE;
next;
mes "[Jiang Xiayou]";
mes "Actually, could you help me";
@@ -1696,7 +1696,7 @@ lou_in02,201,166,4 script Storage Keeper#lou 819,{
next;
mes "[Jiang Xiayou]";
mes "The medicines you're looking for might be around here, so look around. If it weren't for the doctor, I wouldn't even let you hang around, you know that?";
- emotion e_pif;
+ emotion ET_HNG;
set ch_par,4;
changequest 11045,11050;
close;
@@ -1874,7 +1874,7 @@ lou_in02,210,47,0 script City Hall Officer#lou 825,{
mes "[Jin Chiyuan]";
mes "I mean...";
mes "How dare you bribe an officer of the law! I hope other outsiders are not like you! Please leave immediately!";
- emotion e_pif;
+ emotion ET_HNG;
close;
}
else {
@@ -1913,7 +1913,7 @@ lou_in02,210,47,0 script City Hall Officer#lou 825,{
mes "[Jin Chiyuan]";
mes "I mean...";
mes "How dare you bribe an officer of the law! I hope other outsiders are not like you! Please leave immediately!";
- emotion e_pif;
+ emotion ET_HNG;
close;
}
}
@@ -1970,7 +1970,7 @@ lou_in02,210,47,0 script City Hall Officer#lou 825,{
mes "Hahaha...";
mes "Enjoy your stay";
mes "in Louyang!";
- emotion e_heh;
+ emotion ET_SMILE;
close;
}
mes "[Jin Chiyuan]";
@@ -1980,7 +1980,7 @@ lou_in02,210,47,0 script City Hall Officer#lou 825,{
mes "[Jin Chiyuan]";
mes "If you have nothing to ask of me, please leave. This place is not";
mes "a playground for adventurers.";
- emotion e_pif;
+ emotion ET_HNG;
close;
}
@@ -2066,7 +2066,7 @@ lou_in02,156,38,0 script Studying Officer#lou 822,{
next;
mes "^3355FF*Rummage rummage...*";
mes ".........^000000";
- emotion e_gasp;
+ emotion ET_SURPRISE;
close;
}
mes "[Huang Zhishu]";
@@ -2147,7 +2147,7 @@ lou_in02,156,38,0 script Studying Officer#lou 822,{
mes "[Huang Zhishu]";
mes "Hmmm...?";
mes "Do you think I need to go outside more often? Well, I guess for some reason, I don't feel well. I guess I really should get some fresh air. ^666666*Yawn...*^000000";
- emotion e_ok;
+ emotion ET_OK;
next;
mes "[Huang Zhishu]";
mes "But you should get out more often yourself! It's not a good idea to always stay home. If you don't get some exercise when you're young,";
@@ -2191,7 +2191,7 @@ lou_in02,204,169,0 script Supply Stack#1lou 111,{
mes "[Jiang Xiayou]";
mes "Hey, hey...";
mes "I told you! It's not too late, why don't you do me the favor I asked? I'm only asking you once!";
- emotion e_an,0,"Storage Keeper#lou";
+ emotion ET_FRET, getnpcid(0, "Storage Keeper#lou");
close;
}
mes "^3355FF*Rummage rummage*";
@@ -2253,7 +2253,7 @@ lou_in02,207,168,0 script Supply Stack#5lou 111,{
next;
mes "[Jiang Xiayou]";
mes "Hey, don't touch anything! If you mess anything up, you've gotta pile it up again, got it? If you don't want to clean up after yourself, don't make a mess!";
- emotion e_rock,0,"Storage Keeper#lou";
+ emotion ET_ROCK, getnpcid(0, "Storage Keeper#lou");
close;
}
@@ -2282,7 +2282,7 @@ lou_in02,206,163,0 script Supply Stack#4lou 111,{
mes "You found it...?!";
mes "I can't believe it!";
mes "You just lucked out.";
- emotion e_wah,0,"Storage Keeper#lou";
+ emotion ET_KEK, getnpcid(0, "Storage Keeper#lou");
close;
}
mes "^3355FF*Rummage rummage*";
@@ -2347,7 +2347,7 @@ lou_in02,198,170,0 script Supply Stack#3lou 111,{
mes "It's not too late for you";
mes "to do the favor I asked.";
mes "I'm only asking you once!";
- emotion e_gg,0,"Storage Keeper#lou";
+ emotion ET_KIK, getnpcid(0, "Storage Keeper#lou");
close;
}
mes "^3355FF*Rummage rummage*";
@@ -2395,7 +2395,7 @@ lou_in02,192,170,0 script Supply Stack#2 111,{
next;
mes "[Jiang Xiayou]";
mes "I told you! Now stop bugging me and leave now! I don't wanna deal with someone who won't trust me.";
- emotion e_pif,0,"Storage Keeper#lou";
+ emotion ET_HNG, getnpcid(0, "Storage Keeper#lou");
close;
}
mes "^3355FF*Rummage rummage*";
@@ -3303,7 +3303,7 @@ lou_in02,123,39,4 script Poison King#lou 824,{
mes "You did?!";
mes "Oh~ thank you,";
mes "thank you so much!";
- emotion e_an;
+ emotion ET_FRET;
next;
mes "[Nagash Arses]";
mes "Thank God I've";
@@ -3709,7 +3709,7 @@ lou_in02,253,45,0 script Employee#poison 822,{
close;
}
else if (ch_par > 9 && ch_poison == 8) {
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Song Zhi Du]";
mes "Ah, hello.";
mes "Please give me a minute,";
@@ -3754,14 +3754,14 @@ lou_in02,253,45,0 script Employee#poison 822,{
mes "Now, I've got to do this just right. This is a very delicate procedure...";
next;
specialeffect EF_MAGNUMBREAK;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Song Zhi Du]";
mes "No!! I failed again! ^666666*Sigh...*^000000 And I spent a long time preparing all of those materials...";
set ch_poison,10;
changequest 11074,11075;
close;
}
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Song Zhi Du]";
mes "Ah, hello.";
mes "Please give me a minute,";
@@ -3826,7 +3826,7 @@ lou_in02,253,45,0 script Employee#poison 822,{
next;
specialeffect EF_PATTACK;
specialeffect EF_POISONHIT;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Song Zhi Du]";
mes "Hahaha~!";
mes "Success! ";
@@ -3872,7 +3872,7 @@ lou_in02,253,45,0 script Employee#poison 822,{
mes "Did I make it?";
next;
specialeffect EF_MAGNUMBREAK;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Song Zhi Du]";
mes "NO! I... I've failed again! And I spent a long time getting everything ready...";
close;
@@ -4110,7 +4110,7 @@ lou_fild01,224,348,0 script Lady#delivery 817,{
mes "entrance of Louyang.";
mes "I hope you enjoy";
mes "your stay here~";
- emotion e_kis;
+ emotion ET_CHUP;
close;
}
mes "[Lady]";
@@ -4133,7 +4133,7 @@ lou_fild01,224,348,0 script Lady#delivery 817,{
}
mes "[Lady]";
mes "Hmpf...!";
- emotion e_dots;
+ emotion ET_THINK;
close;
}
else if (ch_poison == 8) {
@@ -4192,7 +4192,7 @@ lou_fild01,224,348,0 script Lady#delivery 817,{
mes "[Lady]";
mes "Errr...";
mes "You don't have enough zeny for the fee. I can't give you the package unless the delivery fee is paid!";
- emotion e_an;
+ emotion ET_FRET;
close;
}
mes "[Lady]";
@@ -4217,7 +4217,7 @@ lou_fild01,224,348,0 script Lady#delivery 817,{
mes "You're at the";
mes "entrance of Louyang.";
mes "I hope you have a good time~";
- emotion e_kis;
+ emotion ET_CHUP;
close;
}
mes "[Lady]";
@@ -4243,7 +4243,7 @@ lou_fild01,224,348,0 script Lady#delivery 817,{
}
mes "[Lady]";
mes "Hmpf...!";
- emotion e_dots;
+ emotion ET_THINK;
close;
}
}
diff --git a/npc/quests/quests_lutie.txt b/npc/quests/quests_lutie.txt
index 182d7467899..b29f69576d8 100644
--- a/npc/quests/quests_lutie.txt
+++ b/npc/quests/quests_lutie.txt
@@ -39,18 +39,18 @@ xmas,117,295,4 script Vending Machine Man 704,{
next;
mes "[Titicupe]";
mes "Oh, this creation of mine is so magnificent!";
- emotion e_kis2;
+ emotion ET_CHUPCHUP;
next;
mes "[Titicupe]";
mes "And the headgears--! I... I can't contain myself!";
next;
mes "^3355FFToy factory manager Titicupe jumps and convulses with joy. Clearly he's insane, but it may be possible that he may be brilliant.^000000";
- emotion e_gasp;
+ emotion ET_SURPRISE;
close;
case 2:
mes "[Titicupe]";
mes "Oh right! You need to know what kind of items to put into the Vending Machine to get what you want, yes? Go ahead... Ask me~";
- emotion e_ic;
+ emotion ET_AHA;
next;
switch(select("Raccoon Hat:Spore Hat:Wonder Nutshell:Ranbow Eggshell:Blush:Chef Hat:Candle:Cake Hat:End Conversation")) {
case 1:
@@ -133,7 +133,7 @@ xmas,117,295,4 script Vending Machine Man 704,{
mes "I love you";
mes "Mister Snowman";
mes "Vending Machine.";
- emotion e_kis2;
+ emotion ET_CHUPCHUP;
next;
mes "^3355FFToy factory manager Titicupe begins to jump around and emit screams of unbridled ecstacy. At this point, it's not difficult to doubt his sanity, as well as his genius.";
close;
@@ -171,7 +171,7 @@ xmas,115,297,4 script Vending Machine 111,{
delitem 1036,20; //Dragon_Scale
delitem 7012,200; //Tough_Scalelike_Stem
delitem 7065,300; //Sea_Otter_Leather
- emotion e_Oh;
+ emotion ET_O;
mes "^3355FF*Vroooooom~~*";
mes "*Bzzzzzt*";
mes "*choogachooga*";
@@ -192,7 +192,7 @@ xmas,115,297,4 script Vending Machine 111,{
delitem 7033,850; //Poison_Spore
delitem 7068,300; //Burn_Tree
delitem 1015,1; //Thin_N'_Long_Tongue
- emotion e_oh;
+ emotion ET_O;
mes "^3355FF*Vroooooom~~*";
mes "*Bzzzzzt*";
mes "*choogachooga*";
@@ -218,7 +218,7 @@ xmas,115,297,4 script Vending Machine 111,{
mes "*Kapang!*";
mes "*BeepBoopBeepBoop*";
mes "*Beeeeeeoop*^000000";
- emotion e_oh;
+ emotion ET_O;
getitem 5050,1; // Mystery_Fruit_Shell
next;
mes "[Audi]";
@@ -235,7 +235,7 @@ xmas,115,297,4 script Vending Machine 111,{
delitem 5015,1; //Egg_Shell
delitem 978,1; //Cobaltblue_Dyestuffs
delitem 7030,50; //Claw_Of_Desert_Wolf
- emotion e_oh;
+ emotion ET_O;
mes "^3355FF*Vroooooom~~*";
mes "*Bzzzzzt*";
mes "*choogachooga*";
@@ -254,7 +254,7 @@ xmas,115,297,4 script Vending Machine 111,{
mes "^3355FFYou gingerly place all 100 Aprons into the snowman's mouth.^000000";
next;
delitem 7047,100; //Alice's_Apron
- emotion e_oh;
+ emotion ET_O;
mes "^3355FF*Vroooooom~~*";
mes "*Bzzzzzt*";
mes "*choogachooga*";
@@ -280,7 +280,7 @@ xmas,115,297,4 script Vending Machine 111,{
delitem 982,1; //White_Dyestuffs
delitem 949,330; //Feather
delitem 1036,450; //Dragon_Scale
- emotion e_oh;
+ emotion ET_O;
mes "^3355FF*Vroooooom~~*";
mes "*Bzzzzzt*";
mes "*choogachooga*";
@@ -302,7 +302,7 @@ xmas,115,297,4 script Vending Machine 111,{
delitem 2279,1; //Bomb_Wick
delitem 7035,50; //Matchstick
delitem 526,100; //Royal_Jelly
- emotion e_oh;
+ emotion ET_O;
mes "^3355FF*Vroooooom~~*";
mes "*Bzzzzzt*";
mes "*choogachooga*";
@@ -325,7 +325,7 @@ xmas,115,297,4 script Vending Machine 111,{
delitem 538,15; //Well_Baked_Cookie
delitem 539,20; //Piece_Of_Cake
delitem 999,10; //Steel
- emotion e_oh;
+ emotion ET_O;
mes "^3355FF*Vroooooom~~*";
mes "*Bzzzzzt*";
mes "*choogachooga*";
@@ -346,7 +346,7 @@ xmas,115,297,4 script Vending Machine 111,{
mes "Items.^000000";
close;
}
- emotion e_x;
+ emotion ET_X;
mes "[Audi]";
mes "^555555Error Error!";
mes "Incorrect items!^000000";
diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt
index 44103b49207..07c18805ab1 100644
--- a/npc/quests/quests_morocc.txt
+++ b/npc/quests/quests_morocc.txt
@@ -880,7 +880,7 @@ que_job01,70,84,1 script Girl#moc_ex002 882,{
mes "Oh, the world.. the world is doomed..";
mes "-sobbing-";
mes "Nothing seems to be working now..";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "["+ strcharinfo(0) +"]";
mes "....Tsk..tsk...";
@@ -2115,14 +2115,14 @@ moc_ruins,137,70,3 script Book-Touching Man#garas 48,{
next;
mes "^660000Watching him makes you giggle, he looks no better than the dried corpses in the pyramid, but he is obviously alive and doesn't appear to be a monster. Somehow, you find yourself compelled to approach this interesting looking man.^000000";
next;
- emotion e_lv;
+ emotion ET_THROB;
mes "[Book-Touching Man]";
mes "Ah... Mammi...";
next;
mes "[Book-Touching Man]";
mes "Your healthy golden skin is glowing under the blessed sunlight of Morroc.";
next;
- emotion e_sob;
+ emotion ET_CRY;
mes "[Book-Touching Man]";
mes "Your smile outshines the aura of the gods of Valhalla. You are a living gospel. Your smile even makes Goddess Freya hide in the shadows in shame! Ah.... Mammi, my Mammi!";
next;
@@ -2133,7 +2133,7 @@ moc_ruins,137,70,3 script Book-Touching Man#garas 48,{
mes "["+ strcharinfo(0) +"]";
mes "Are you talking to yourself?";
next;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Book-Touching Man]";
mes "Wah! Oh, my god, you must be a messenger of the devil trying to interrupt me from feeling Mammi!";
mes "I'm not afraid of you, so bring it on!";
@@ -2144,11 +2144,11 @@ moc_ruins,137,70,3 script Book-Touching Man#garas 48,{
mes "["+ strcharinfo(0) +"]";
mes "Who's Mammi?";
next;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Book-Touching Man]";
mes "What? Don't you know Mammi, one of the three greatest Rune-Midgart's idols?";
next;
- emotion e_sigh;
+ emotion ET_OHNO;
mes "[Book-Touching Man]";
mes "Man, you don't know anything, do you?! Well, judging by the stupid look on your face, I guess you're an adventurer running around on meaningless errands for others. Heh heh!";
next;
@@ -2161,7 +2161,7 @@ moc_ruins,137,70,3 script Book-Touching Man#garas 48,{
mes "[Book-Touching Man]";
mes "She even mentioned in an interview in 'Morroc Times' that she wants to meet a man that loves books.";
next;
- emotion e_awsm;
+ emotion ET_COOL;
mes "[Book-Touching Man]";
mes "That means... She's waiting for someone like me. Hehehe!";
mes "You see, every book in Rune-Midgart's Library has the name Benjamin written on them... That's me!";
@@ -2182,7 +2182,7 @@ moc_ruins,137,70,3 script Book-Touching Man#garas 48,{
mes "[Benjamin]";
mes "I really need to read that book and tell her that I'm here for her, but I don't even have the time to regain my breath because of this situation in our hands!";
next;
- emotion e_sob;
+ emotion ET_CRY;
mes "[Benjamin]";
mes "My Mammi pillow cover is buried under debris... Gasp!";
mes "Mammi, I'm coming! Don't you die yet!";
@@ -2191,13 +2191,13 @@ moc_ruins,137,70,3 script Book-Touching Man#garas 48,{
next;
mes "^660000He inhaled deeply, and then suddenly turned his head toward you.^000000";
next;
- emotion e_ic;
+ emotion ET_AHA;
mes "[Benjamin]";
mes "....Ye... Yes, you!";
next;
mes "["+ strcharinfo(0) +"]";
mes "Huh?";
- emotion e_swt2,1;
+ emotion ET_PROFUSELY_SWEAT, playerattached();
next;
mes "[Benjamin]";
mes "You look bored. You must be waiting for someone to give you something to do!";
@@ -2259,7 +2259,7 @@ moc_ruins,137,70,3 script Book-Touching Man#garas 48,{
next;
mes "^660000You carefully approached him, and then gave him a pat on the shoulder.^000000";
next;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Benjamin]";
mes "Grrrr! Who dares touch me?!";
next;
@@ -2291,12 +2291,12 @@ moc_ruins,137,70,3 script Book-Touching Man#garas 48,{
next;
mes "[Benjamin]";
mes "Grrrr... Mammi! Here I am, following your noble tastes to read such a rare book! Mammi...!";
- emotion e_lv2;
+ emotion ET_BIGTHROB;
next;
mes "[Benjamin]";
mes "I feel so excited to think about having a deep conversation with Mammi about literature! Yay!";
mes "I should go read this book right away. Hehehe!";
- emotion e_ho;
+ emotion ET_DELIGHT;
next;
mes "[Benjamin]";
mes "Oops, I must not forget to repay you. You know, I'm a polite man.";
@@ -2501,7 +2501,7 @@ prt_in,179,92,3 script Library Curator#garas 57,{
}
break;
}
- emotion e_ic;
+ emotion ET_AHA;
mes "[Curator Guys]";
mes "Oh, right! I think I know the book:";
next;
@@ -2640,7 +2640,7 @@ yuno,333,210,5 script Library Master#garas 57,{
mes "I gurantee you that you'll get better quickly.";
next;
mes "^660000He sounded sincere, but it doesn't sound like that kind of broth would even be effective...^000000";
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
set barmunt_crow,3;
close;
}
@@ -2739,7 +2739,7 @@ OnTouch:
mes "I gurantee you that you'll get better quickly.";
next;
mes "^660000He sounded sincere, but it doesn't sound like that kind of broth would even be effective...^000000";
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
set barmunt_crow,3;
close;
}
@@ -2767,7 +2767,7 @@ yuno_in04,111,57,3 script Library Part-Timer#garas 862,{
next;
mes "["+ strcharinfo(0) +"]";
mes "I'm looking for a book called <The Crow of the Fate> written by Oliver Hilpert... Ahchoo!";
- emotion e_wah,1;
+ emotion ET_KEK, playerattached();
specialeffect2 EF_VENOMDUST;
next;
mes "[Library Part-Timer]";
@@ -3152,7 +3152,7 @@ yuno_in04,169,123,3 script Suspicious Man#oliver_h 407,{
case 2:
mes "[Oliver Hilpert]";
mes "Okay... I see...";
- emotion e_sob;
+ emotion ET_CRY;
close2;
cutin "",255;
end;
@@ -3233,13 +3233,13 @@ yuno_in04,169,123,3 script Suspicious Man#oliver_h 407,{
mes "What's happened to this feather?";
next;
mes "[Oliver Hilpert]";
- emotion e_wah;
+ emotion ET_KEK;
mes "Wah! Did I do this?";
mes "Oh my god, I'm sorry! I'm so sorry!";
next;
mes "^660000He changed back to himself, and started apologizing to you for his sudden rage.^000000";
next;
- emotion e_sob;
+ emotion ET_CRY;
mes "[Oliver Hilpert]";
mes "I... I don't know how to apologize...";
mes "It's just that... I became so angry that I--! Argh, I'm sorry!";
@@ -3423,7 +3423,7 @@ yuno_in04,167,120,3 script Worn-out Book#garas 111,{
mes "[Oliver Hilpert]";
mes "Wah!";
mes "Isn't that over there?!";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "["+ strcharinfo(0) +"]";
mes "Huh?";
@@ -3445,10 +3445,10 @@ yuno_in04,167,120,3 script Worn-out Book#garas 111,{
cutin "oliver_smile",2;
mes "[Oliver Hilpert]";
mes "Lady Mammi!";
- emotion e_lv2;
+ emotion ET_BIGTHROB;
next;
mes "^660000Yes, it was the picture book of Mammi, an idol whom Benjamin of Morroc insists to be one of the three greatest idols in the Rune-Midgart Kingdom. That must be why Oliver is squealing in delight.^000000";
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
next;
mes "["+ strcharinfo(0) +"]";
mes "Ahchoo! Are you also a Mammi fan?";
@@ -3472,12 +3472,12 @@ yuno_in04,167,120,3 script Worn-out Book#garas 111,{
mes "[Oliver Hilpert]";
mes "...Oh!";
cutin "mami01",4;
- emotion e_lv;
+ emotion ET_THROB;
next;
mes "[Oliver Hilpert]";
mes "...Ooooh!";
cutin "mami02",4;
- emotion e_lv;
+ emotion ET_THROB;
next;
cutin "oliver_smile",2;
mes "[Oliver Hilpert]";
@@ -3499,7 +3499,7 @@ yuno_in04,167,120,3 script Worn-out Book#garas 111,{
mes "["+ strcharinfo(0) +"]";
mes "...............";
mes "I... I see...";
- emotion e_swt,1;
+ emotion ET_SWEAT, playerattached();
next;
mes "[Oliver Hilpert]";
mes "Umm...";
@@ -3521,7 +3521,7 @@ yuno_in04,167,120,3 script Worn-out Book#garas 111,{
case 2:
mes "[Oliver Hilpert]";
mes "Okay... I see...";
- emotion e_sob;
+ emotion ET_CRY;
set barmunt_crow,13;
close2;
cutin "",255;
@@ -3926,7 +3926,7 @@ cave,82,97,3 script Cave Settler#g1 996,3,3,{
mes "Hmm...";
mes "Wait here.";
next;
- emotion e_com;
+ emotion ET_COMEON;
mes "[Cave Settler]";
mes "Hey, Jaeda!";
enablenpc "Jaeda#garas1";
@@ -4014,7 +4014,7 @@ OnTouch:
mes "Hmm...";
mes "Wait here.";
next;
- emotion e_com;
+ emotion ET_COMEON;
mes "[Cave Settler]";
mes "Hey, Jaeda!";
enablenpc "Jaeda#garas1";
@@ -4333,7 +4333,7 @@ prontera,153,353,4 script Messenger#prince1 105,{
next;
switch(select("Passed away?:Came for a celebration again?")) {
case 1:
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Messenger]";
mes "You already know about that...";
mes "Then, I don't need to give";
@@ -5457,7 +5457,7 @@ prt_castle,274,372,4 script Servant#hans 48,{
mes "That's all I can say about this.";
mes "Huh...~";
next;
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Hans]";
mes "Ah, Prince!";
mes "You can cut your finger!";
@@ -6276,7 +6276,7 @@ prt_castle,314,373,4 script Prince#eisen 983,{
mes "take it the wrong way.";
mes "I have been acting for Brother and Kingdom, and I will be the same ever after.";
next;
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Ahrum]";
mes "Ah, the appraiser has come.";
mes "How could you appear so suddenly? Ern and I were in the middle of conversation.";
@@ -6615,7 +6615,7 @@ prt_castle,314,373,4 script Prince#eisen 983,{
mes "Although all these";
mes "status system fade away";
mes "I will be the king, with my sole capability and aptitude! Hahaha.";
- emotion e_heh;
+ emotion ET_SMILE;
next;
mes "[Ahrum]";
mes "I know quite well about";
@@ -6931,7 +6931,7 @@ OnTouch:
mes "All the glory for Rune-Midgarts...";
mes "Hmm?";
next;
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[A man of Walter Family]";
mes "Quiet... Someone comes.";
mes "Ok... take care.";
@@ -7091,7 +7091,7 @@ prt_castle,314,371,0 script Prince#another_ern 985,{
mes "take it the wrong way.";
mes "I have been acting for Brother and Kingdom, and I will be the same ever after.";
next;
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Ahrum]";
mes "Ah, the appraiser has come.";
mes "How could you appear so suddenly? Ern and I were in the middle of conversation.";
diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt
index 0699bf26b62..0b574816e65 100644
--- a/npc/quests/quests_moscovia.txt
+++ b/npc/quests/quests_moscovia.txt
@@ -38,7 +38,7 @@
//----------------------------------------------------------------------------
moscovia,171,71,3 script Berbayeff#npc 4_M_RUSMAN2,{
if (!mos_whale_edq) {
- emotion e_an;
+ emotion ET_FRET;
mes "[Berbayeff]";
mes "This..and..that...";
mes "All guys...are distrustful.";
@@ -70,7 +70,7 @@ moscovia,171,71,3 script Berbayeff#npc 4_M_RUSMAN2,{
mes "you can talk to me whenever.";
close;
}
- emotion e_no1;
+ emotion ET_BEST;
mes "[Berbayeff]";
mes "Good, I have been thinking that";
mes "I would tell you this story from the start.";
@@ -228,12 +228,12 @@ moscovia,171,71,3 script Berbayeff#npc 4_M_RUSMAN2,{
changequest 18101,18102;
close;
} else if (mos_whale_edq > 2 && mos_whale_edq < 42) {
- emotion e_omg;
+ emotion ET_HUK;
mes "[Berbayeff]";
mes "Are you serious? Did you say";
mes "you've found The Moving Island?";
next;
- emotion e_no1;
+ emotion ET_BEST;
mes "[Berbayeff]";
mes "The legend is true!!";
mes "I was right, wasn't I?";
@@ -456,7 +456,7 @@ moscovia,135,49,5 script Mr. Ibanoff#npc 4_M_RUSBALD,{
changequest 18104,18105;
close;
}
- emotion e_ag;
+ emotion ET_ANGER;
mes "[Mr. Ibanoff]";
mes "You want to borrow";
mes "my ship so spontaneously??";
@@ -1698,7 +1698,7 @@ mosk_fild01,86,104,3 script Aged Stranger#npc 4_M_GUSLIMAN,{
S_AS_1:
if (rand(1,getarg(0)) == 2) {
soundeffect "mos_gusli1.wav",0;
- emotion e_no1;
+ emotion ET_BEST;
specialeffect2 EF_EXIT;
mes "[Aged Stranger]";
mes "Oh! You are good at playing the";
@@ -2188,8 +2188,8 @@ mosk_in,131,92,3 script Csar Alexsay III#npc 4_M_RUSKING,7,7,{
mes "Good, play it right away!";
next;
soundeffect "mos_gusli2.wav",0;
- emotion e_ag,0,"Csar Alexsay III#npc";
- emotion e_ag,0,"Prime Minister Dmitree#m";
+ emotion ET_ANGER;
+ emotion ET_ANGER, getnpcid(0, "Prime Minister Dmitree#m");
mes "[Csar Alexsay III]";
mes "Um... What is this? Do you mock me?";
mes "You are so impudent... You...!";
@@ -2208,7 +2208,7 @@ mosk_in,131,92,3 script Csar Alexsay III#npc 4_M_RUSKING,7,7,{
mes "[Prime Minister Dmitree]";
mes "How can I re...reward...?";
next;
- emotion e_pif;
+ emotion ET_HNG;
mes "[Csar Alexsay III]";
mes "I ordered you instead Prime";
mes "Minister, to make this poor player";
@@ -2309,8 +2309,8 @@ mosk_in,131,92,3 script Csar Alexsay III#npc 4_M_RUSKING,7,7,{
mes "played, all the people in the";
mes "Csar's Palace fall in with the tune.-";
next;
- emotion e_sob,0,"Csar Alexsay III#npc";
- emotion e_sob,0,"Prime Minister Dmitree#m";
+ emotion ET_CRY;
+ emotion ET_CRY, getnpcid(0, "Prime Minister Dmitree#m");
mes "[Csar Alexsay III]";
mes "Oh! I can't hear without tears.";
mes "That's a sad tune.";
@@ -2751,7 +2751,7 @@ function script F_MOS_1 {
mes "[Gallina]";
mes "It's because you didn't look after your brother. So you clean the house, Anna?";
next;
- emotion e_sob,0,"Anna#mos";
+ emotion ET_CRY, getnpcid(0, "Anna#mos");
mes "[Anna]";
mes "Oh, my................";
next;
@@ -2896,11 +2896,11 @@ mosk_in,148,274,1 script Anna#mos 4_F_RUSCHILD,{
mes "Where is Mikhail?";
mes "Do you know where he is?";
next;
- emotion e_meh;
+ emotion ET_MERONG;
mes "[Anna]";
mes "If I had known that, I would have already found him, you fool.";
next;
- emotion e_swt,1;
+ emotion ET_SWEAT, playerattached();
mes "["+strcharinfo(0)+"]";
mes "Hahaha, you're right.";
break;
@@ -2964,7 +2964,7 @@ mosk_in,148,274,1 script Anna#mos 4_F_RUSCHILD,{
mes "["+strcharinfo(0)+"]";
mes "Is there anyone who is close to him?";
next;
- emotion e_pif;
+ emotion ET_HNG;
mes "[Anna]";
mes "(giggle) He's a fool and has no friends.";
mes "But among our villagers, the lady of ^3131FFInn 'Sticky Herb Tree'^000000 has held Mikhail dear.";
@@ -3043,7 +3043,7 @@ mosk_in,148,274,1 script Anna#mos 4_F_RUSCHILD,{
mes "[Gallina]";
mes "Anna!";
next;
- emotion e_sob;
+ emotion ET_CRY;
mes "[Anna]";
mes "....I'm sorry.";
close;
@@ -3387,7 +3387,7 @@ mosk_in,135,191,5 script Landlord#mos 4_F_RUSWOMAN3,{
close;
case 3:
mes "[Landlord]";
- emotion e_lv;
+ emotion ET_THROB;
mes "Oh~! You look great! Look at the "+((Sex == SEX_MALE)?"solid muscle":"fair skin")+"!";
mes "But you look tired. Is it because of a long journey?";
next;
@@ -3399,7 +3399,7 @@ mosk_in,135,191,5 script Landlord#mos 4_F_RUSWOMAN3,{
mes "Oh, I'm sorry but I didn't come to stay here.";
mes "I'm looking for a kid and I've got something to ask you...";
next;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Landlord]";
mes "What!?!?";
next;
@@ -3412,7 +3412,7 @@ mosk_in,135,191,5 script Landlord#mos 4_F_RUSWOMAN3,{
mes "If you promise me to stay overnight, I'll tell you about what you want to know. Deal?";
next;
if(select("Refuse.:Stay overnight and get the info. - 5000z") == 1) {
- emotion e_ag;
+ emotion ET_ANGER;
mes "[Landlord]";
mes "Well, get the info by yourself then.";
close;
@@ -6443,7 +6443,7 @@ mosk_dun01,169,162,0 script Mysterious Stone#rus02 HIDDEN_NPC,{
percentheal -50,-50;
specialeffect2 EF_DARKBREATH;
specialeffect2 EF_HIT2;
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
next;
mes "- An unknown force has -";
mes "- drained your health -";
@@ -6458,7 +6458,7 @@ mosk_dun01,169,162,0 script Mysterious Stone#rus02 HIDDEN_NPC,{
mes "- You decide to go to the left -";
next;
mes "- !!!!!! -";
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
next;
mes "- An unknown force has -";
mes "- cursed your body -";
@@ -6469,7 +6469,7 @@ mosk_dun01,169,162,0 script Mysterious Stone#rus02 HIDDEN_NPC,{
mes "- You decide to go to the left -";
next;
mes "- !!!!!! -";
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
next;
mes "- Your trusty Pecopeco senses -";
mes "- an unknown force and tries -";
@@ -6488,7 +6488,7 @@ mosk_dun01,169,162,0 script Mysterious Stone#rus02 HIDDEN_NPC,{
mes "- toward the middle -";
next;
mes "- !!!!!! -";
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
donpcevent "Gray Wolf#rus03::OnEnable";
rhea_rus_main = 2;
// if (isbegin_quest(8136))
@@ -6547,7 +6547,7 @@ mosk_dun01,167,160,3 script Gray Wolf#rus03 4_RUS_DWOLF,{
mes "Unless you want to be killed, leave now.";
rhea_rus_main = 3;
// changequest 8137,8138;
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
specialeffect2 EF_HIT2;
percentheal -50,0;
next;
@@ -6637,20 +6637,20 @@ mosk_dun01,45,259,0 script Wall#rus04 HIDDEN_NPC,{
if (rhea_rus_main < 5) {
mes "["+ strcharinfo(0) +"]";
mes "...?!";
- emotion e_what,1;
+ emotion ET_QUESTION, playerattached();
close;
} else if (rhea_rus_main == 5) {
.@speak01 = rand(1,3);
if (.@speak01 == 3) {
mes "["+ strcharinfo(0) +"]";
mes "...?!";
- emotion e_what,1;
+ emotion ET_QUESTION, playerattached();
donpcevent "Gray Wolf#rus05::OnEnable";
next;
} else {
mes "["+ strcharinfo(0) +"]";
mes "...?!";
- emotion e_what,1;
+ emotion ET_QUESTION, playerattached();
close;
}
mes "[Girl's Voice]";
@@ -6819,7 +6819,7 @@ mosk_dun01,45,259,0 script Wall#rus04 HIDDEN_NPC,{
mes "["+ strcharinfo(0) +"]";
mes "Maria?! What happened?!";
sc_start SC_CURSE,60000,0;
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
next;
mes "[Koshei, the Immortal]";
mes "I really want to thank you, human. Maria was imprisoned in the wall so I couldn't do anything!";
@@ -6884,7 +6884,7 @@ mosk_dun01,45,259,0 script Wall#rus04 HIDDEN_NPC,{
next;
mes "[Gray Wolf]";
mes "No, it's not too late!";
- emotion e_gasp,1;
+ emotion ET_SURPRISE, playerattached();
donpcevent "Gray Wolf#rus05::OnEnable";
next;
mes "[Gray Wolf]";
@@ -7569,8 +7569,8 @@ moscovia,206,81,0 script Vassili Grandpapa#rus07 4_M_05,{
mes "^ff0000Cold marsh swallowing my body^000000";
mes "^ff0000Red ring taken away^000000";
mes "^ff0000Red ring enchanted^000000";
- emotion e_omg;
- emotion e_dots,1;
+ emotion ET_HUK;
+ emotion ET_THINK, playerattached();
next;
mes "[Vassili Grandpapa]";
mes "...W, what is this? Ehh??";
@@ -7631,8 +7631,8 @@ moscovia,206,81,0 script Vassili Grandpapa#rus07 4_M_05,{
mes "^ff0000Cold marsh swallowing my body^000000";
mes "^ff0000Red ring taken away^000000";
mes "^ff0000Red ring enchanted^000000";
- emotion e_dots;
- emotion e_dots,1;
+ emotion ET_THINK;
+ emotion ET_THINK, playerattached();
next;
mes "[Vassili Grandpapa]";
mes "It is.. It is true...";
@@ -7694,7 +7694,7 @@ moscovia,206,81,0 script Vassili Grandpapa#rus07 4_M_05,{
next;
mes "["+ strcharinfo(0) +"]";
mes "Ehh?! This is weird. Where is the flute?!";
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
close;
} else if (rhea_rus_ring == 9) {
mes "[Vassili Grandpapa]";
@@ -7726,7 +7726,7 @@ moscovia,213,216,3 script Ryubaba#rus08 4_F_RUSWOMAN2,{
next;
mes "[Ryubaba]";
mes "Mmm, you must be an adventurer? What would you say? Have you seen somebody more beautiful than me? I doubt it. How can you find anyone more beautiful than me?";
- emotion e_heh;
+ emotion ET_SMILE;
close;
}
else if (rhea_rus_main == 8) {
@@ -7736,7 +7736,7 @@ moscovia,213,216,3 script Ryubaba#rus08 4_F_RUSWOMAN2,{
next;
mes "[Ryubaba]";
mes "Mmm, you must be an adventurer? What would you say? Have you seen somebody more beautiful than me? I doubt it. How can you find anyone more beautiful than me?";
- emotion e_heh;
+ emotion ET_SMILE;
close;
} else if (rhea_rus_ring == 1) {
if (getequipid(EQI_SHOES) != 2429 && getequipid(EQI_SHOES) != 2430) {
@@ -7772,7 +7772,7 @@ moscovia,213,216,3 script Ryubaba#rus08 4_F_RUSWOMAN2,{
}
mes "["+ strcharinfo(0) +"]";
mes "Yes, you are really beautiful.";
- emotion e_heh,1;
+ emotion ET_SMILE, playerattached();
next;
mes "[Ryubaba]";
mes "Huhu, oh you jest. You know what you're talking about. Ah, this is a Choco drink that I have made. Give it a taste, isn't it good?";
@@ -7895,8 +7895,8 @@ moscovia,213,216,3 script Ryubaba#rus08 4_F_RUSWOMAN2,{
mes "^ff0000Cold marsh swallowing my body^000000";
mes "^ff0000Red ring taken away^000000";
mes "^ff0000Red ring enchanted^000000";
- emotion e_omg;
- emotion e_dots,1;
+ emotion ET_HUK;
+ emotion ET_THINK, playerattached();
next;
mes "[Ryubaba]";
mes "S, stop! You'd better stop!?";
@@ -7923,7 +7923,7 @@ moscovia,213,216,3 script Ryubaba#rus08 4_F_RUSWOMAN2,{
next;
mes "[Ryubaba]";
mes "Please, I am begging you... Don't tell my father...";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "- Suddenly, she sheds -";
mes "- tears and kneels down -";
@@ -8007,7 +8007,7 @@ moscovia,213,216,3 script Ryubaba#rus08 4_F_RUSWOMAN2,{
}
mes "["+ strcharinfo(0) +"]";
mes "...!? Where is the flute!?";
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
close;
} else if (rhea_rus_ring == 8) {
mes "[Ryubaba]";
@@ -8192,8 +8192,8 @@ mosk_fild02,157,233,0 script Shepherdess#rus10 1_F_04,{
mes "^ff0000Cold marsh swallowing my body^000000";
mes "^ff0000Red ring taken away^000000";
mes "^ff0000Red ring enchanted^000000";
- emotion e_omg;
- emotion e_omg,1;
+ emotion ET_HUK;
+ emotion ET_HUK, playerattached();
next;
mes "[Shepherdess]";
mes "W, what is this? Horrible! Why did this flute play a voice?";
@@ -8395,7 +8395,7 @@ mosk_fild02,116,202,3 script Lusalka#07russai_22 -1,3,3,{
end;
OnTouch_:
if (rhea_rus_main != 8 || rhea_rus_hair < 2) {
- emotion e_what,1;
+ emotion ET_QUESTION, playerattached();
end;
}
if (rhea_rus_hair == 2) {
@@ -8559,7 +8559,7 @@ mosk_fild02,124,202,3 script Lusalka#rus23 4_F_RUSGREEN,{
next;
mes "[Lusalka]";
mes "Ah... but...";
- emotion e_sob;
+ emotion ET_CRY;
donpcevent "Lusalka#rus23::OnDisable";
close;
}
@@ -8633,7 +8633,7 @@ mosk_fild02,124,202,3 script Lusalka#rus23 4_F_RUSGREEN,{
mes "Aaaaaaaah!??!?!";
sc_start SC_CURSE,60000,0;
specialeffect2 EF_LORD;
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
percentheal -30,0;
next;
mes "["+ strcharinfo(0) +"]";
@@ -8757,7 +8757,7 @@ prontera,228,279,3 script Wanderer#rus24 4_M_RUSMAN2,{
next;
mes "[A Wanderer from a strange land]";
mes "Ah, oh yes! How could I forget?";
- emotion e_ic;
+ emotion ET_AHA;
next;
mes "[A Wanderer from a strange land]";
mes "We came here from Moscovia together. He called himself Igg. I came here with him but parted with him quite a while ago. He was sad because he couldn't forget about his lost lover.";
@@ -9074,8 +9074,8 @@ OnTouch_:
close;
}
}
- emotion e_what,1;
- close;
+ emotion ET_QUESTION, playerattached();
+ end;
}
mosk_que,45,131,0 script Stone Furnace#rus28 HIDDEN_NPC,{
@@ -9107,7 +9107,7 @@ mosk_que,45,131,0 script Stone Furnace#rus28 HIDDEN_NPC,{
mes "["+ strcharinfo(0) +"]";
mes "Oops, it's hot, hot!!!";
specialeffect2 EF_FIREHIT;
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
percentheal -5,0;
close;
}
@@ -9123,8 +9123,8 @@ mosk_que,45,131,0 script Stone Furnace#rus28 HIDDEN_NPC,{
close;
}
}
- emotion e_what,1;
- close;
+ emotion ET_QUESTION, playerattached();
+ end;
OnMyMobDead:
stopnpctimer;
@@ -9163,7 +9163,7 @@ mosk_que,56,202,0 script Occult Apple Tree#rus29 HIDDEN_NPC,{
next;
mes "["+ strcharinfo(0) +"]";
mes "Ahhhhhhhh!!!";
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
close;
}
mes "- ^0000ff You get 100 Apples !!^000000 -";
@@ -9172,8 +9172,8 @@ mosk_que,56,202,0 script Occult Apple Tree#rus29 HIDDEN_NPC,{
close;
}
}
- emotion e_what,1;
- close;
+ emotion ET_QUESTION, playerattached();
+ end;
}
mosk_que,47,217,0 warp Escape#rus30 3,3,mosk_fild02,237,266
@@ -9342,8 +9342,8 @@ mosk_dun02,48,214,5 script Baba Yaga#rus32 4_F_BABAYAGA,{
mes "[Baba Yaga]";
mes "...........................";
mes "If you lotter around here any longer, I will make myself some tasty human soup! Hehehehehe.";
- emotion e_gg;
- emotion e_omg,1;
+ emotion ET_KIK;
+ emotion ET_HUK, playerattached();
close;
} else if (rhea_rus_main == 9) {
.@player_name$ = strcharinfo(0);
@@ -9361,7 +9361,7 @@ mosk_dun02,48,214,5 script Baba Yaga#rus32 4_F_BABAYAGA,{
mes "'Presto Change-o!!'";
mes "'Turn into a pig!!'";
specialeffect2 EF_BARRIER;
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Baba Yaga]";
mes "Hmm? You are protected by a Protection Spell?";
@@ -9586,14 +9586,14 @@ mosk_dun02,48,214,5 script Baba Yaga#rus32 4_F_BABAYAGA,{
next;
mes "["+ strcharinfo(0) +"]";
mes "Hey, I am talking...";
- emotion e_sob,1;
+ emotion ET_CRY, playerattached();
next;
mes "[Baba Yaga]";
mes "'In the corner...'";
next;
mes "["+ strcharinfo(0) +"]";
mes "!!!!!!!!!!!!!!!!!!!!!!!!!";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Baba Yaga]";
mes "What, child? Do you feel bad?";
@@ -9991,7 +9991,7 @@ OnTouch_:
next;
mes "["+ strcharinfo(0) +"]";
mes "You! Go home now!";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "- The cow seems surprised, jumps and tries to attack you !! -";
next;
@@ -10019,7 +10019,7 @@ OnTouch_:
next;
mes "[Cow]";
mes "...Moo...";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "- The cow, seems to gibe at you, looks at you quickly and runs to bushes !! -";
disablenpc strnpcinfo(0);
@@ -10191,7 +10191,7 @@ mosk_dun02,65,232,0 script Noisy Coffin#rus36 4_NFCOFFIN,{
next;
mes "[Noisy Coffin]";
mes "................................";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "["+ strcharinfo(0) +"]";
mes "Hu, the job has been done.";
@@ -10205,7 +10205,7 @@ mosk_dun02,65,232,0 script Noisy Coffin#rus36 4_NFCOFFIN,{
next;
mes "[Noisy Coffin]";
mes "................................";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "["+ strcharinfo(0) +"]";
mes "Hu, the job has been done.";
@@ -10218,7 +10218,7 @@ mosk_dun02,65,232,0 script Noisy Coffin#rus36 4_NFCOFFIN,{
next;
mes "[Noisy Coffin]";
mes "................................";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "["+ strcharinfo(0) +"]";
mes "Hu, the job has been done.";
@@ -10347,7 +10347,7 @@ treasure01,24,39,0 script Old Bed#rus38 HIDDEN_NPC,{
viewpoint 2,61,183,2,0x00FF00;
viewpoint 2,98,118,3,0x00FF00;
viewpoint 2,27,115,4,0x00FF00;
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
next;
mes "["+ strcharinfo(0) +"]";
mes "Eek, it would be best to run away now!";
@@ -10425,7 +10425,7 @@ treasure01,27,115,0 script Opened Treasure Chest#41 HIDDEN_NPC,{
next;
mes "["+ strcharinfo(0) +"]";
mes "W, what is this!?";
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
close;
}
mes "- ^0000ffYou find the handle of a broken key in the junk !!^000000 -";
@@ -10532,7 +10532,7 @@ mosk_dun02,57,220,0 script House Ghost Jar#rus43 HIDDEN_NPC,{
mes "- You tap the jar -";
mes "- with your hand -";
specialeffect EF_SIGHTRASHER;
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
next;
mes "- A voice laughs in the jar as -";
mes "- it shakes from right to left -";
@@ -10600,7 +10600,7 @@ mosk_dun02,57,220,0 script House Ghost Jar#rus43 HIDDEN_NPC,{
mes "[House Ghost]";
mes "Ok, first let me shuffle these cards around.";
mes "Ready!";
- emotion e_loud;
+ emotion ET_BLABLA;
next;
mes "[House Ghost]";
mes "One!";
@@ -10636,21 +10636,21 @@ mosk_dun02,57,220,0 script House Ghost Jar#rus43 HIDDEN_NPC,{
cutin "",255;
switch( .@rucard_game01 ) {
case 1:
- cutin "포링카드",4; // Poring Card
+ cutin "����ī��",4; // Poring Card
.@win_string$ = "You are good. Can you do it next time?";
break;
case 2:
- cutin "엔젤링카드",4; // Angeling Card
+ cutin "������ī��",4; // Angeling Card
.@win_string$ = "You are pretty good at this. Ok, but can you do it again?";
break;
case 3:
- cutin "고스트링카드",4; // Ghostring Card
+ cutin "����Ʈ��ī��",4; // Ghostring Card
.@win_string$ = "You are pretty good at this. Ok, but can you do it again?";
break;
}
- emotion e_gasp;
+ emotion ET_SURPRISE;
if (.@rucard_game01 == .@s +1) {
- emotion e_ic,1;
+ emotion ET_AHA, playerattached();
next;
mes "[House Ghost]";
mes "You got it right.";
@@ -10658,7 +10658,7 @@ mosk_dun02,57,220,0 script House Ghost Jar#rus43 HIDDEN_NPC,{
.@ruuser_score01++;
}
else {
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
next;
mes "[House Ghost]";
mes "Huuu...";
@@ -10963,7 +10963,7 @@ pay_dun04,163,186,0 script Ghost Tree#rus45 HIDDEN_NPC,{
mes "["+ .@player_name$ +"]";
mes "Ok! I will do it!";
next;
- setarray .@emo[1],58,59,60,61,62,63;
+ setarray .@emo[1], ET_DICE1, ET_DICE2, ET_DICE3, ET_DICE4, ET_DICE5, ET_DICE6;
while (.@rustree_turn01 < 3 && .@rususer_score01 == 0) {
mes "[Ghost Tree]";
mes "I cast first.";
@@ -10986,11 +10986,11 @@ pay_dun04,163,186,0 script Ghost Tree#rus45 HIDDEN_NPC,{
mes "["+ .@player_name$ +"]";
mes "Let's see...";
next;
- emotion .@emo[.@rus_dice01],1;
+ emotion .@emo[.@rus_dice01], playerattached();
mes "["+ .@player_name$ +"]";
if (.@rus_dice01 == .@tree_dice01) {
mes "Let's see... Wow, I got it! I've got ^0000ffNumber "+ .@rus_dice01 +"^000000!";
- emotion e_gasp;
+ emotion ET_SURPRISE;
next;
mes "[Ghost Tree]";
mes "You seem lucky...";
@@ -10999,7 +10999,7 @@ pay_dun04,163,186,0 script Ghost Tree#rus45 HIDDEN_NPC,{
mes "Let's see................... It is ^0000ff "+ .@rus_dice01 +" ^000000...";
mes "[Ghost Tree]";
mes "Huuu...";
- emotion e_heh;
+ emotion ET_SMILE;
}
.@rustree_turn01++;
next;
diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt
index 2e7d4255e5a..71ba6cd4407 100644
--- a/npc/quests/quests_nameless.txt
+++ b/npc/quests/quests_nameless.txt
@@ -1077,8 +1077,8 @@ OnTouch:
mes "turned into sand.";
next;
hideoffnpc "Creature#Monas";
- emotion e_omg,1;
- emotion e_omg,0,"Larjes#Monastery";
+ emotion ET_HUK, playerattached();
+ emotion ET_HUK, getnpcid(0, "Larjes#Monastery");
mes "[Larjes]";
mes "?!?!?!!!!!";
next;
@@ -1874,13 +1874,13 @@ ra_temple,165,57,5 script Niren#ss 915,{
mes "...................";
mes "...................";
mes "...................";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "[Sippie]";
mes "High Priestess Niren,";
mes "you must be really tired.";
mes "You look pale for some reason.";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[High Priestess Niren]";
mes "I do feel rather drained.";
@@ -1950,7 +1950,7 @@ ra_temple,165,57,5 script Niren#ss 915,{
mes "["+strcharinfo(0)+"]";
mes "Sure thing. You";
mes "can count on me!";
- emotion e_no1,1;
+ emotion ET_BEST, playerattached();
set aru_em,15;
changequest 2134,2135;
close2;
@@ -1991,7 +1991,7 @@ ra_temple,165,57,5 script Niren#ss 915,{
mes "side twenty-fours a day.";
mes "It's been like that for years.";
next;
- emotion e_wah;
+ emotion ET_KEK;
mes "[Sippie]";
mes "Oh, High Priestess Niren,";
mes "I love working for you, but";
@@ -1999,13 +1999,13 @@ ra_temple,165,57,5 script Niren#ss 915,{
mes "just to see my family. Even";
mes "just once a year would be nice.";
next;
- emotion e_ic;
+ emotion ET_AHA;
mes "[High Priestess Niren]";
mes "...............................";
mes "You're absolutely right.";
mes "That gives me an idea.";
next;
- emotion e_ho;
+ emotion ET_DELIGHT;
mes "[Sippie]";
mes "Huh? What is it?";
next;
@@ -2086,7 +2086,7 @@ ra_temple,165,57,5 script Niren#ss 915,{
mes "^3355FFYou handed Niren the";
mes "file forged by Ishmael.^000000";
next;
- emotion e_bzz;
+ emotion ET_STARE;
mes "[High Priestess Niren]";
mes "Perfect! This forgery is";
mes "so well done, I'm sure";
@@ -2262,7 +2262,7 @@ ra_temple,168,54,3 script Sippie#ss 917,{
moc_ruins,77,167,4 script Foreign Merchant#aru1 880,5,5,{
if (aru_vol == 27) {
if (aru_em == 0) {
- emotion e_dots;
+ emotion ET_THINK;
mes "[Foreign Merchant]";
mes "I never thought the desert";
mes "would be this hot! They built";
@@ -2271,7 +2271,7 @@ moc_ruins,77,167,4 script Foreign Merchant#aru1 880,5,5,{
mes "more, the crowds make things";
mes "around here so much hotter!";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "[Foreign Merchant]";
mes "I heard that I could make";
mes "a killing in Morroc, which is";
@@ -2280,7 +2280,7 @@ moc_ruins,77,167,4 script Foreign Merchant#aru1 880,5,5,{
mes "is going to kill me first!";
next;
select("How did you hear of Morroc?");
- emotion e_dots;
+ emotion ET_THINK;
mes "[Foreign Merchant]";
mes "I... I just told you.";
mes "I heard that Morroc is";
@@ -2288,7 +2288,7 @@ moc_ruins,77,167,4 script Foreign Merchant#aru1 880,5,5,{
mes "buy things at premium prices.";
mes "Ugh, but it's a burning hell!";
next;
- emotion e_swt;
+ emotion ET_SWEAT;
mes "[Foreign Merchant]";
mes "I don't even care about making";
mes "money anymore! I just want to";
@@ -2297,8 +2297,8 @@ moc_ruins,77,167,4 script Foreign Merchant#aru1 880,5,5,{
mes "I might just leave this town";
mes "tomorrow. Forget this desert!";
next;
- emotion e_sob;
- emotion e_swt,1;
+ emotion ET_CRY;
+ emotion ET_SWEAT, playerattached();
mes "[Foreign Merchant]";
mes "Ah, that's right. Don't they";
mes "sell some sweet, heavenly";
@@ -2344,7 +2344,7 @@ moc_ruins,77,167,4 script Foreign Merchant#aru1 880,5,5,{
mes "^3355FF*Gulp Gulp Gulp Gulp*^000000";
mes "^3355FF*Gulp Gulp Gulp Gulp*^000000";
next;
- emotion e_lv;
+ emotion ET_THROB;
mes "[Foreign Merchant]";
mes "Ahhh! That hit the spot!";
mes "It's so refreshing and so";
@@ -2376,13 +2376,13 @@ moc_ruins,77,167,4 script Foreign Merchant#aru1 880,5,5,{
mes " ";
mes " - Bekento^000000";
next;
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
mes "["+ strcharinfo(0) +"]";
mes "So... This means...";
mes "You're not really a";
mes "merchant, are you?";
next;
- emotion e_meh;
+ emotion ET_MERONG;
mes "^3355FFThe merchant quietly";
mes "looks at you with a";
mes "mischievous grin.^000000";
@@ -2391,7 +2391,7 @@ moc_ruins,77,167,4 script Foreign Merchant#aru1 880,5,5,{
mes "So you asked me to get";
mes "you a drink as an excuse";
mes "just to talk to you?!";
- emotion e_sob,1;
+ emotion ET_CRY, playerattached();
next;
mes "["+ strcharinfo(0) +"]";
mes "Oh well, thanks for";
@@ -2519,15 +2519,15 @@ moc_ruins,101,133,7 script Foreign Merchant#aru2 929,{
next;
mes "["+ strcharinfo(0) +"]";
mes "Oh, no...";
- emotion e_otl,1;
+ emotion ET_OTL, playerattached();
next;
mes "[Foreign Merchant]";
mes "...............................";
mes "...............................";
mes "...............................";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
mes "[Foreign Merchant]";
mes "You know, I save a small";
mes "bottle of wine for myself";
@@ -2548,7 +2548,7 @@ moc_ruins,101,133,7 script Foreign Merchant#aru2 929,{
mes "keep an extra bottle in case";
mes "you want more next time. Take";
mes "care, and I'll see you later!";
- emotion e_korea;
+ emotion ET_FLAG;
next;
mes "^3355FFYou received a bottle";
mes "of the famous fruit wine";
@@ -2685,7 +2685,7 @@ ra_fild03,139,355,5 script Ishmael#em 914,{
mes "just step away? I... I don't";
mes "like being too close to";
mes "other people. Please!";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
close;
}
else if (aru_em == 17) {
@@ -2695,7 +2695,7 @@ ra_fild03,139,355,5 script Ishmael#em 914,{
mes "just step away? Wait, you";
mes "don't have something you";
mes "need from me, do you?";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
switch(select("Give Her Niren's File:Leave Her Alone")) {
case 1:
@@ -2709,7 +2709,7 @@ ra_fild03,139,355,5 script Ishmael#em 914,{
mes "Just toss the file over";
mes "to me. I-I don't want";
mes "you coming any closer.";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Ishmael]";
mes "I'll be glad to help out";
@@ -2725,13 +2725,13 @@ ra_fild03,139,355,5 script Ishmael#em 914,{
mes "expert at forging writing!";
mes "Just give me a moment and--";
next;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Ishmael]";
mes "Dang it! I completely forgot!";
mes "Someone stole my pen yesterday!";
mes "Now how am I gonna do this...?";
next;
- emotion e_sob;
+ emotion ET_CRY;
mes "[Ishmael]";
mes "My pen was made of a very";
mes "rare gemstone called ^FF0000Sardonyx^000000.";
@@ -2783,7 +2783,7 @@ ra_fild03,139,355,5 script Ishmael#em 914,{
mes "I still... Uh... I don't mean";
mes "to be rude... It's just...";
mes "I'm just not good with...";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Ishmael]";
mes "If you just toss the";
@@ -2818,7 +2818,7 @@ ra_fild03,139,355,5 script Ishmael#em 914,{
mes "*Scribble*^000000";
specialeffect EF_COMBOATTACK4;
specialeffect EF_STEAL;
- emotion e_ic;
+ emotion ET_AHA;
next;
mes "[Ishmael]";
mes "There you go! I made the";
@@ -2840,7 +2840,7 @@ ra_fild03,139,355,5 script Ishmael#em 914,{
}
}
else {
- emotion e_sob;
+ emotion ET_CRY;
mes "[Ishmael]";
mes "If only I only had";
mes "my precious pen made";
@@ -5486,7 +5486,7 @@ geffen,128,153,3 script Leblo 883,{
mes "been asking questions about";
mes "the Diamond of Destruction.";
next;
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
mes "[Leblo]";
mes "Don't be so suprised:";
mes "word travels fast in the";
@@ -7840,7 +7840,7 @@ payon,192,176,3 script Gooho Ahn 903,{
mes "adventurer.";
mes "Um, was there";
mes "something you wanted?";
- emotion e_what,1;
+ emotion ET_QUESTION, playerattached();
next;
switch(select("Rogue Guild's Decoding Request")) {
case 1:
@@ -7857,7 +7857,7 @@ payon,192,176,3 script Gooho Ahn 903,{
mes "of heat and light, you can";
mes "read its contents. This is";
mes "some powerful encryption!";
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
next;
mes "[Gooho Ahn]";
mes "So far, I've only decrypted";
@@ -7913,7 +7913,7 @@ payon,192,176,3 script Gooho Ahn 903,{
delitem 970,2; //Alchol
delitem 7035,1; //Matchstick
delitem 7097,10; //Burning_Heart
- emotion e_ic;
+ emotion ET_AHA;
mes "[Gooho Ahn]";
mes "Oh, what? This language...";
mes "It's ancient! Aegye hasn't";
@@ -8271,7 +8271,7 @@ moc_fild17,209,235,0 script Odd Slab 111,4,4,{
mes "^FF0000*Creak Creak*";
mes "Etner sspawrod.^000000";
next;
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
mes "[" + strcharinfo(0) + "]";
mes "This slab is speaking";
mes "to me! I... I think. Now";
@@ -8282,7 +8282,7 @@ moc_fild17,209,235,0 script Odd Slab 111,4,4,{
mes "^FF0000*Creak Creak*";
mes "Etner sspawrod.^000000";
next;
- emotion e_ic,1;
+ emotion ET_AHA, playerattached();
mes "[" + strcharinfo(0) + "]";
mes "Oh, right! This is that";
mes "trashy language, Aegye,";
@@ -9058,7 +9058,7 @@ morocc,143,63,3 script Ragged Man#nd 929,{
mes "to finding that treasure.";
mes "I... I don't even have enough";
mes "money to go back home!";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Ragged Man]";
mes "Won't you spare some";
@@ -9276,7 +9276,7 @@ morocc,102,298,3 script Man#zgang 98,{
next;
switch(select("Tell me about the treasure.")) {
case 1:
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Man]";
mes "What? So you're the one";
mes "I was warned about! I've";
@@ -9746,7 +9746,7 @@ comodo,339,224,3 script Man in Hiding#nd 881,{
mes "for information";
mes "about the treasure.";
next;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Man in Hiding]";
mes "You... You've come";
mes "looking for me?!";
@@ -10177,7 +10177,7 @@ alberta_in,70,109,5 script Shaman 788,{
mes "mind if I take a look at it?";
next;
if (countitem(7725) > 0) {
- emotion e_dots;
+ emotion ET_THINK;
mes "[Shaman]";
mes "So this bauble's the";
mes "Unlucky Emerald? Yes,";
@@ -10305,7 +10305,7 @@ alberta_in,70,109,5 script Shaman 788,{
next;
mes "[Shaman]";
mes "Hhhkkk... Arrrgh...!";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[" + strcharinfo(0) +"]";
mes ".....?";
@@ -10581,7 +10581,7 @@ yuno_in04,38,48,3 script Archeologist 55,{
next;
switch(select("Ask About the Jewel's Curse:Show Off Jewel")) {
case 1:
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Archeologist]";
mes "The jewel's curse?";
mes "Hah! You believe in that";
@@ -11205,7 +11205,7 @@ gef_fild08,182,185,0 script The Wanderer 739,{
mes "When I came back to my";
mes "senses, they were all...";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "[The Wanderer]";
mes "I'm not sure what";
mes "happened. There was";
@@ -11287,7 +11287,7 @@ gef_fild08,182,185,0 script The Wanderer 739,{
mes "When I came back to my";
mes "senses, they were all...";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "[The Wanderer]";
mes "I'm not sure what";
mes "happened. There was";
@@ -11324,7 +11324,7 @@ gef_fild08,182,185,0 script The Wanderer 739,{
mes "When I came back to my";
mes "senses, they were all...";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "[The Wanderer]";
mes "I'm not sure what";
mes "happened. There was";
@@ -12213,7 +12213,7 @@ payon,209,44,5 script Rogue Guild Agent#nd2 828,{
mes "be talking a Rogue";
mes "agent in one of the";
mes "other towns.";
- emotion e_ag;
+ emotion ET_ANGER;
close;
}
else if (rumour_nd == 6) {
@@ -12248,7 +12248,7 @@ payon,209,44,5 script Rogue Guild Agent#nd2 828,{
next;
mes "[Agent]";
mes "Awwww, man!";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Agent]";
mes "I keep telling that";
@@ -12503,7 +12503,7 @@ payon,209,44,5 script Rogue Guild Agent#nd2 828,{
mes "You're a lifesaver!";
mes "Detrimindexta, huh?";
next;
- emotion e_gg;
+ emotion ET_KIK;
mes "[Agent]";
mes "Don't worry, I got";
mes "that one too! All you";
@@ -12592,7 +12592,7 @@ payon,209,44,5 script Rogue Guild Agent#nd2 828,{
close;
}
else if (rumour_nd == 15) {
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Agent]";
mes "Heh heh! Looks like";
mes "we solved the case!";
@@ -12629,7 +12629,7 @@ payon,209,44,5 script Rogue Guild Agent#nd2 828,{
mes "communicates solely";
mes "through doodles.^000000";
set rumour_nd,16;
- emotion e_heh;
+ emotion ET_SMILE;
close;
}
}
@@ -12720,7 +12720,7 @@ comodo,233,199,5 script Rogue Guild Agent#nd3 810,{
next;
switch(select("Yes, Sir!:...")) {
case 1:
- emotion e_dots;
+ emotion ET_THINK;
mes "[Agent]";
mes "Right on, right on.";
mes "Hm. Let's try that again...";
@@ -12823,9 +12823,9 @@ comodo,233,199,5 script Rogue Guild Agent#nd3 810,{
mes "I thought you were";
mes "here to take the Job";
mes "change test for Rogues!";
- emotion e_omg;
+ emotion ET_HUK;
next;
- emotion e_sry;
+ emotion ET_SORRY;
mes "[Agent]";
mes "Aw man, you came all this";
mes "way to help me out, and";
@@ -12840,7 +12840,7 @@ comodo,233,199,5 script Rogue Guild Agent#nd3 810,{
mes "Consider this... I dunno,";
mes "an insider look into the";
mes "Rogue world if you would.";
- emotion e_sob;
+ emotion ET_CRY;
next;
switch(select("Yes, sir!:I won't tell anyone.")) {
case 1:
diff --git a/npc/quests/quests_niflheim.txt b/npc/quests/quests_niflheim.txt
index 3561a291752..77ef48cbfb7 100644
--- a/npc/quests/quests_niflheim.txt
+++ b/npc/quests/quests_niflheim.txt
@@ -310,7 +310,7 @@ prt_in,161,20,3 script Erious#nif 92,{
mes "*Cries* Wahhh...!";
mes "Elly, how could you";
mes "leave me this way...";
- emotion e_sob;
+ emotion ET_CRY;
next;
if (select("Comfort him.:Neglect him.") == 1) {
mes "[Erious]";
@@ -515,7 +515,7 @@ umbala,215,181,3 script Billik 733,{
mes "future, let's meet in the";
mes "town of the dead later.";
mes "Hahahaha~";
- emotion e_no1;
+ emotion ET_BEST;
close;
}
if (nif_revive == 1) {
@@ -595,7 +595,7 @@ niflheim,153,215,3 script Feylin 794,{
mes "come to the wrong person.";
next;
mes "[Feylin]";
- mes "Nobody in Niffelheim can";
+ mes "Nobody in Niflheim can";
mes "perform that kind of miracle...";
next;
mes "[Feylin]";
@@ -614,7 +614,7 @@ niflheim,153,215,3 script Feylin 794,{
mes "town immediately. I'm sorry";
mes "but I know nothing about what";
mes "you are asking.";
- emotion e_an;
+ emotion ET_FRET;
next;
if (select("But...:I am sorry.") == 1) {
mes "[Feylin]";
@@ -680,7 +680,7 @@ niflheim,153,215,3 script Feylin 794,{
mes "I have failed to summon";
mes "who you wish to see. I am";
mes "really sorry for this result.";
- emotion e_omg;
+ emotion ET_HUK;
delitem 748,1; //Witherless_Rose
delitem 610,10; //Leaf_Of_Yggdrasil
set nif_revive,5;
diff --git a/npc/quests/quests_payon.txt b/npc/quests/quests_payon.txt
index d3254832818..54e2a17fa9f 100644
--- a/npc/quests/quests_payon.txt
+++ b/npc/quests/quests_payon.txt
@@ -79,11 +79,11 @@ payon_in01,18,10,4 script Mystic Lady 76,{
next;
mes "[Mystic Lady]";
mes "If you plan to travel to colder regions, I suggest that you bring some ^3355FFEar Muffs^000000...";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "[Mystic Lady]";
mes "Ear Muffs are my family's specialty, and we provide it to customers who have ^FF33551 Cursed Ruby^000000, ^3311AA1 Headset,^000000 ^3355FF 200 Feathers^000000 and ^DDDD005000 Zeny^000000.";
- emotion e_dots;
+ emotion ET_THINK;
next;
switch(select("Oh Yeah? That sounds good.:No thank you, Ma'am.")) {
case 1:
@@ -98,14 +98,14 @@ payon_in01,18,10,4 script Mystic Lady 76,{
next;
mes "[Mystic Lady]";
mes "Thank you for buying our product. You won't regret purchasing our Ear Muffs: Satisfaction guaranteed~";
- emotion e_dots;
+ emotion ET_THINK;
close;
}
else {
mes "[Mystic Lady]";
mes "Oh dear...";
mes "You don't have enough money or items. Unfortunately, we can't give any discounts. Please understand that we have to make a living...";
- emotion e_dots;
+ emotion ET_THINK;
close;
}
case 2:
@@ -114,7 +114,7 @@ payon_in01,18,10,4 script Mystic Lady 76,{
mes "I believe we";
mes "will meet again.";
mes "...One of these days.";
- emotion e_dots;
+ emotion ET_THINK;
close;
}
}
diff --git a/npc/quests/quests_prontera.txt b/npc/quests/quests_prontera.txt
index 87e12862c1a..a9640954257 100644
--- a/npc/quests/quests_prontera.txt
+++ b/npc/quests/quests_prontera.txt
@@ -287,7 +287,7 @@ prontera,248,212,3 script Busy Boy#prt 706,3,3,{
mes "all of those books earlier!";
mes "Wait, you ditched me before,";
mes "so why act all concerned now?";
- emotion e_gasp;
+ emotion ET_SURPRISE;
}
else {
mes "[Busy-Looking Boy]";
@@ -325,10 +325,10 @@ prontera,248,212,3 script Busy Boy#prt 706,3,3,{
mes "it was a natural reflex!^000000";
next;
Specialeffect EF_HITDARK;
- emotion e_omg;
+ emotion ET_HUK;
mes "^3355FF*BAM!*^000000";
next;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Busy-Looking Boy]";
mes "Ack! Those books...!";
mes "It took me so long to";
@@ -340,13 +340,13 @@ prontera,248,212,3 script Busy Boy#prt 706,3,3,{
mes "arrange these nicely";
mes "out of the bottom of";
mes "my freakin' heart.";
- emotion e_lv,1;
+ emotion ET_THROB, playerattached();
next;
mes "[Busy-Looking Boy]";
mes "...";
mes "......";
mes ".........";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "[Busy-Looking Boy]";
mes "Huh...?";
@@ -368,7 +368,7 @@ prontera,248,212,3 script Busy Boy#prt 706,3,3,{
mes "easily, so it scares me to";
mes "death to ride the Airship";
mes "all the way to Juno.";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "[Busy-Looking Boy]";
mes "Now I'm in trouble!";
@@ -376,7 +376,7 @@ prontera,248,212,3 script Busy Boy#prt 706,3,3,{
mes "time I just can't help it.";
mes "There's nothing I can do!";
mes "Oh, I'm gonna lose this job!";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Busy-Looking Boy]";
mes "Wait... You adventurers";
@@ -392,7 +392,7 @@ prontera,248,212,3 script Busy Boy#prt 706,3,3,{
mes "It's none of your ";
mes "business, I know, but";
mes "I'm just so desperate...";
- emotion e_sob;
+ emotion ET_CRY;
set prt_curse,2;
close;
}
@@ -404,7 +404,7 @@ prontera,248,212,3 script Busy Boy#prt 706,3,3,{
mes "Summon all my courage...";
mes "and b-board that Airship!";
mes "Argh! No, I can't do it!";
- emotion e_dots;
+ emotion ET_THINK;
next;
callsub S_GetBooks;
mes "[Busy-Looking Boy]";
@@ -413,7 +413,7 @@ prontera,248,212,3 script Busy Boy#prt 706,3,3,{
mes "That guy's been waiting";
mes "for me to deliver his books";
mes "for quite a while now...";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
else if (prt_curse == 3) {
@@ -453,7 +453,7 @@ OnTouch:
mes "Hey, look out!";
mes "Can't you be more";
mes "careful?! Geeeeez!";
- emotion e_ag;
+ emotion ET_ANGER;
next;
mes "["+strcharinfo(0)+"]";
mes "Oops, I'm so sorry.";
@@ -502,7 +502,7 @@ OnTouch:
mes "easily, so it scares me to";
mes "death to ride the Airship";
mes "all the way to Juno.";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "[Busy-Looking Boy]";
mes "Now I'm in trouble!";
@@ -510,7 +510,7 @@ OnTouch:
mes "time I just can't help it.";
mes "There's nothing I can do!";
mes "Oh, I'm gonna lose this job!";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Busy-Looking Boy]";
mes "Wait... You adventurers";
@@ -526,7 +526,7 @@ OnTouch:
mes "It's none of your ";
mes "business, I know, but";
mes "I'm just so desperate...";
- emotion e_sob;
+ emotion ET_CRY;
set prt_curse,2;
close;
}
@@ -621,7 +621,7 @@ yuno,311,195,3 script Historian#prt01 754,{
mes "[Historian]";
mes "GRRRRRRRRR!";
mes "Where are my books?!";
- emotion e_ag;
+ emotion ET_ANGER;
next;
select("Are you alright?");
mes "[Historian]";
@@ -652,7 +652,7 @@ yuno,311,195,3 script Historian#prt01 754,{
}
else {
select("Oh, I'm delivering the books for him.");
- emotion e_what;
+ emotion ET_QUESTION;
mes "[Historian]";
mes "Ah, really?";
mes "Great, you're here!";
@@ -809,7 +809,7 @@ yuno,311,195,3 script Historian#prt01 754,{
mes "ruling the kingdom, the 7 warriors agreed to hold a contest amongst";
mes "their families each generation to prevent royal corruption.";
next;
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
mes "[Historian]";
mes "Oh... Not too excited";
mes "about history, huh? Well,";
@@ -955,7 +955,7 @@ morocc_in,45,126,3 script Historian#prt02 702,{
mes "can't be good for my skin...";
mes "Ooh, I wish I were back home";
mes "in the Schwaltzvalt Republic~";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Historian Rodafrian]";
mes "Hello there.";
@@ -1206,11 +1206,11 @@ morocc_in,45,126,3 script Historian#prt02 702,{
mes "that you have learned to";
mes "Rodafrian, choosing not";
mes "to withhold any secrets.^000000";
- emotion e_ic;
+ emotion ET_AHA;
next;
mes "[Historian Rodafrian]";
mes ".....................!";
- emotion e_gasp;
+ emotion ET_SURPRISE;
next;
mes "[Historian Rodafrian]";
mes "Thank you for sharing that";
@@ -1298,7 +1298,7 @@ morocc_in,45,126,3 script Historian#prt02 702,{
close;
}
else if (prt_curse == 56) {
- emotion e_an;
+ emotion ET_FRET;
mes "[Historian Rodafrian]";
mes "I just paid a visit to";
mes "Karlomoff and gave him";
@@ -1309,7 +1309,7 @@ morocc_in,45,126,3 script Historian#prt02 702,{
close;
}
else if (prt_curse == 60) {
- emotion e_an;
+ emotion ET_FRET;
mes "[Historian Rodafrian]";
mes "I just aid a visit to";
mes "Karlomoff and gave him";
@@ -1995,7 +1995,7 @@ mjolnir_01,316,268,3 script Exhausted-Looking Woman 879,{
mes "with death. But the royal family and the Prontera Church took";
mes "mercy on me, and allowed";
mes "me to live here in exile.";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "[Bonnie Imbullea]";
mes "I began to sing this song";
@@ -2010,7 +2010,7 @@ mjolnir_01,316,268,3 script Exhausted-Looking Woman 879,{
mes "a maid found a fragment of a";
mes "Red Gemstone while cleaning";
mes "the secret ceremonial grounds.";
- emotion e_gasp,1;
+ emotion ET_SURPRISE, playerattached();
next;
mes "[Bonnie Imbullea]";
mes "I always thought it";
@@ -2312,7 +2312,7 @@ prt_church,185,106,3 script Father Bamph 60,{
mes "at a young age^000000. That is";
mes "Jormungand's curse and";
mes "the royal family's secret.";
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
next;
mes "["+strcharinfo(0)+"]";
mes "What...?!";
@@ -2375,7 +2375,7 @@ prt_church,185,106,3 script Father Bamph 60,{
mes "complicated. Please";
mes "listen to what we have";
mes "to ask from here on...";
- emotion e_dots;
+ emotion ET_THINK;
set prt_curse,15;
close;
}
@@ -2387,7 +2387,7 @@ prt_church,185,106,3 script Father Bamph 60,{
mes "looking marks on their bodies.";
mes "It almost looked as if they";
mes "were growing snake scales.";
- emotion e_gasp,1;
+ emotion ET_SURPRISE, playerattached();
next;
mes "["+strcharinfo(0)+"]";
mes "Wait, they grew snake";
@@ -3205,7 +3205,7 @@ prt_church,21,111,5 script #prince2 887,{
mes "curse, we all failed. Those";
mes "involved have begun to believe";
mes "that Odin may have abandoned us... ";
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
next;
mes "^3355FFYou examine the body of";
mes "the second prince and notice";
diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt
index 535724c107f..04318a6c450 100644
--- a/npc/quests/quests_rachel.txt
+++ b/npc/quests/quests_rachel.txt
@@ -2679,7 +2679,7 @@ rachel,157,183,3 script Sincere Follower Urstia 916,{
mes "foreigners, leading them here!";
next;
if (select("Freya? I'd like to know more.:That's crazy talk!") == 1) {
- emotion e_ok;
+ emotion ET_OK;
mes "[Urstialla]";
mes "The day is coming when";
mes "Freya will resurrect and";
@@ -2884,7 +2884,7 @@ ice_dun02,120,105,3 script Man Stuck in Ice#cave 924,5,5,{
}
if (ice_necklace_q == 1) {
cutin "ra_magic3",2;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Man Stuck in Ice]";
mes "H-hello?";
mes "Hey! Hey, you!";
@@ -2921,7 +2921,7 @@ ice_dun02,120,105,3 script Man Stuck in Ice#cave 924,5,5,{
mes "I can't even scratch it";
mes "Do you have any ideas?";
next;
- emotion e_sob;
+ emotion ET_CRY;
mes "[Man Stuck in Ice]";
mes "This is so humiliating...";
mes "Me, the greatest mage";
@@ -2933,7 +2933,7 @@ ice_dun02,120,105,3 script Man Stuck in Ice#cave 924,5,5,{
mes "You're Maheo?";
next;
cutin "ra_magic1",2;
- emotion e_gg;
+ emotion ET_KIK;
mes "[Maheo]";
mes "It's true. You're speaking to";
mes "Maheo, the greatest mage,";
@@ -3003,7 +3003,7 @@ ice_dun02,120,105,3 script Man Stuck in Ice#cave 924,5,5,{
mes "It has the power of a million";
mes "exploding suns! But then...";
next;
- emotion e_sob;
+ emotion ET_CRY;
mes "[Maheo]";
mes "It was too powerful!";
mes "There were tremors, and";
@@ -3011,7 +3011,7 @@ ice_dun02,120,105,3 script Man Stuck in Ice#cave 924,5,5,{
mes "all the flame caused my";
mes "clothes to catch on fire!";
next;
- emotion e_flash,1;
+ emotion ET_SPARK, playerattached();
mes "["+strcharinfo(0)+"]";
mes "You...";
mes "you set fire";
@@ -3100,7 +3100,7 @@ ice_dun02,120,105,3 script Man Stuck in Ice#cave 924,5,5,{
next;
mes "[Maheo]";
mes "Hey, hey! Can't you just release me first?";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
}
@@ -3138,7 +3138,7 @@ ice_dun02,120,105,3 script Man Stuck in Ice#cave 924,5,5,{
mes "*CRASH!*^000000";
next;
setnpcdisplay "Man Stuck in Ice#cave",937;
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Maheo]";
mes "Finally...!";
mes "After all of this";
@@ -3207,8 +3207,8 @@ OnTouch:
end;
OnTouchNPC:
- emotion e_an;
- //emotion e_gg,1; //Emote on monster - unsupported
+ emotion ET_FRET;
+ emotion ET_KIK, getattachedrid();
end;
OnMyMobDead:
@@ -3405,7 +3405,7 @@ rachel,113,97,5 script Mohadian 929,10,10,{
mes "If you are, I've got a bit of a";
mes "business proposition for you.";
next;
- emotion e_ic;
+ emotion ET_AHA;
mes "[Mohadian]";
mes "The weather around here";
mes "is naturally hot and humid,";
@@ -3787,7 +3787,7 @@ OnTouch:
mes "entrance is locked.^000000";
next;
select("Kick Door.:Smash Door with Weapon.");
- emotion e_omg,0,"Nemma#ra_temple";
+ emotion ET_HUK, getnpcid(0, "Nemma#ra_temple");
mes "[Priestess Nemma]";
mes "Please don't do that!";
close;
@@ -3834,7 +3834,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 920,{
mes "a contribution. Regardless,";
mes "we invite you to celebrate the";
mes "grace of the goddess with us.";
- emotion e_ho;
+ emotion ET_DELIGHT;
next;
mes "[Priestess Nemma]";
mes "There's one High Priest that";
@@ -4053,7 +4053,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 920,{
goto L_End;
}
else if (ra_tem_q == 11) {
- emotion e_ho;
+ emotion ET_DELIGHT;
cutin "ra_nemma03",2;
mes "[Priestess Nemma]";
mes "Hey, "+strcharinfo(0)+"~!";
@@ -5370,7 +5370,7 @@ ra_temin,277,159,3 script High Priest Zhed#rachel 932,{
mes "me like that! Saying";
mes "it like that is kind of";
mes "overdoing it, isn't it?";
- emotion e_sigh,1;
+ emotion ET_OHNO, playerattached();
next;
mes "[High Priest Zhed]";
mes "Not at all. In fact, I'm";
@@ -5907,7 +5907,7 @@ ra_temin,277,159,3 script High Priest Zhed#rachel 932,{
mes "before the other High";
mes "Priests ruin our nation.";
next;
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
mes "["+strcharinfo(0)+"]";
mes "Y-you're not thinking";
mes "of overthrowing the";
@@ -5915,7 +5915,7 @@ ra_temin,277,159,3 script High Priest Zhed#rachel 932,{
mes "that a bit extreme?";
next;
cutin "ra_gman2",2;
- emotion e_swt;
+ emotion ET_SWEAT;
mes "[High Priest Zhed]";
mes "What? No, no!";
mes "Don't jump to conclusions";
@@ -6034,7 +6034,7 @@ ra_temin,277,159,3 script High Priest Zhed#rachel 932,{
mes "I already have someone in";
mes "mind that might help us.";
next;
- emotion e_flash,1;
+ emotion ET_SPARK, playerattached();
mes "["+strcharinfo(0)+"]";
mes "That sounds good.";
mes "Who is he?";
@@ -6047,7 +6047,7 @@ ra_temin,277,159,3 script High Priest Zhed#rachel 932,{
mes "may even think I deserve";
mes "to be excommunicated...";
next;
- emotion e_no1,1;
+ emotion ET_BEST, playerattached();
mes "["+strcharinfo(0)+"]";
mes "Come on, it wouldn't";
mes "hurt to try! Besides,";
diff --git a/npc/quests/quests_umbala.txt b/npc/quests/quests_umbala.txt
index 62add04bb13..526929c21a4 100644
--- a/npc/quests/quests_umbala.txt
+++ b/npc/quests/quests_umbala.txt
@@ -1004,29 +1004,29 @@ um_in,139,48,5 script Phrenetan 783,{
}
if (um_wind <= 3 && (MISC_QUEST & 32768) == 0) {
if (um_wind) set um_wind,1;
- emotion e_an;
+ emotion ET_FRET;
mes "[Phrenetan]";
mes "Umbaumbah wooga wooga";
mes "Umbaumbabah babababah!";
mes "Umbaum!";
next;
- emotion e_oh;
+ emotion ET_O;
mes "[Phrenetan]";
mes "Umbah umbaumba umbah";
mes "Umbabababah wooga woo!";
mes "Wooga wooga umbabah umbaum!";
next;
- emotion e_go;
+ emotion ET_GO;
close;
}
else if (um_wind == 6 || (MISC_QUEST & 32768)) {
- emotion e_an;
+ emotion ET_FRET;
mes "[Phrenetan]";
mes "Umbabah! Umbaumbah.....";
mes "Umbaum Umbaum Wooga wooga!";
mes "Wooga umumum woombababap!!!!!";
next;
- emotion e_swt;
+ emotion ET_SWEAT;
close;
}
end;
@@ -1065,8 +1065,8 @@ um_in,144,45,5 script Umpokoriohtan 789,{
mes "...........";
mes "My back--!";
mes "Simmer down, baby, your turn is comin' in a minute~";
- emotion e_rock,0,"Phrenetan";
- emotion e_swt;
+ emotion ET_ROCK, getnpcid(0, "Phrenetan");
+ emotion ET_SWEAT;
close;
}
else {
@@ -1094,18 +1094,18 @@ um_in,144,45,5 script Umpokoriohtan 789,{
mes "Baby, why you gotta be rough?";
mes "Hit me gently, ya dig??";
mes "I don't mean to hurt you~";
- emotion e_omg,0,"Phrenetan";
- emotion e_wah;
+ emotion ET_HUK, getnpcid(0, "Phrenetan");
+ emotion ET_KEK;
close;
}
}
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Umpokoriohtan]";
mes "Umbaumbah...........";
mes "Umbahwooga woogawoo!";
mes "Umbah umumbabah umbawoo gaga.";
next;
- emotion e_an;
+ emotion ET_FRET;
close;
OnInit:
@@ -1130,13 +1130,13 @@ um_in,101,73,3 script Wainatan 783,{
if (um_wind == 1) {
if (gettime(DT_HOUR) > 18) {
set um_wind,2;
- emotion e_an;
+ emotion ET_FRET;
mes "[Wainatan]";
mes "Umbaumbah umgagaga.";
mes "Umbaumbawoogawoo gababah.";
mes "Umbahumbabah gawoo.";
next;
- emotion e_oh;
+ emotion ET_O;
mes "[Wainatan]";
mes "Wooga wooga woogagagah";
mes "Wogagagah woogagagah";
@@ -1174,13 +1174,13 @@ um_in,94,123,5 script Bertztan 783,{
if (um_wind == 2) {
if (gettime(DT_HOUR) > 18) {
set um_wind,3;
- emotion e_an;
+ emotion ET_FRET;
mes "[Bertztan]";
mes "Umbaumbah umgagaga.";
mes "Umbaumbawoogawoo gababah.";
mes "Umbahumbabah gawoo.";
next;
- emotion e_oh;
+ emotion ET_O;
mes "[Bertztan]";
mes "Wooga umbar umbar umbah!";
mes "Umbar woogagaga woo! Woo! Woo!";
@@ -1226,13 +1226,13 @@ umbala,145,217,3 script Chabimatan 783,{
if (um_wind == 3) {
if (gettime(DT_HOUR) > 18) {
set um_wind,4;
- emotion e_an;
+ emotion ET_FRET;
mes "[Chabimatan]";
mes "Umbabah umbarbar woogawooga um";
mes "Umbabah umbarbar woogawooga umbah";
mes "Umumum! Wooga!";
next;
- emotion e_oh;
+ emotion ET_O;
mes "[Chabimatan]";
mes "Umbabah~~~~~~~";
mes "Woogawooga umbar umbar woo!";
@@ -1275,7 +1275,7 @@ OnTouch_:
mes "Phrenetan beating a guy";
mes "mercilessly.^000000";
next;
- emotion e_an;
+ emotion ET_FRET;
mes "[Phrenetan]";
mes "Umbaumbaumbaumbah!";
mes "Umbaumbahumbah!!";
diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt
index a54bef09ab3..dfeb00b03a9 100644
--- a/npc/quests/quests_veins.txt
+++ b/npc/quests/quests_veins.txt
@@ -5132,7 +5132,7 @@ ra_temin,87,133,1 script Rachel Guard#vol1 934,5,2,{
mes "["+strcharinfo(0)+"]";
mes "You know ^3131FFLamir^000000, right?";
next;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Guard Karlum]";
mes "Lamir? Oh... My.";
mes "Oh no! Did something";
@@ -5626,8 +5626,8 @@ ve_in,233,116,3 script Drunken Man#vol 901,{
mes "Hahahaha! Guess I look";
mes "pretty tough, don't I?";
next;
- emotion e_lv,0,"Drunken Lady#1";
- emotion e_lv,0,"Drunken Lady#2";
+ emotion ET_THROB, getnpcid(0, "Drunken Lady#1");
+ emotion ET_THROB, getnpcid(0, "Drunken Lady#2");
mes "[Ladies]";
mes "Oh, my God!";
mes "You're so cool~!";
@@ -5656,8 +5656,8 @@ ve_in,233,116,3 script Drunken Man#vol 901,{
mes "Hahahaha! Guess I look";
mes "pretty tough, don't I?";
next;
- emotion e_lv,0,"Drunken Lady#1";
- emotion e_lv,0,"Drunken Lady#2";
+ emotion ET_THROB, getnpcid(0, "Drunken Lady#1");
+ emotion ET_THROB, getnpcid(0, "Drunken Lady#2");
mes "[Ladies]";
mes "Oh, my God!";
mes "You're so cool~!";
@@ -5724,8 +5724,8 @@ ve_in,233,116,3 script Drunken Man#vol 901,{
mes "but duty calls.";
mes "Hahahahahahha~";
next;
- emotion e_lv,0,"Drunken Lady#1";
- emotion e_lv,0,"Drunken Lady#2";
+ emotion ET_THROB, getnpcid(0, "Drunken Lady#1");
+ emotion ET_THROB, getnpcid(0, "Drunken Lady#2");
mes "[Ladies]";
mes "Please don't go~";
next;
@@ -5748,7 +5748,7 @@ ve_in,233,116,3 script Drunken Man#vol 901,{
mes "["+strcharinfo(0)+"]";
mes "Yes?";
next;
- emotion e_no1;
+ emotion ET_BEST;
mes "[Drunken Man]";
mes "I hereby promote you as";
mes "chief researcher of the";
@@ -5809,8 +5809,8 @@ ve_in,233,116,3 script Drunken Man#vol 901,{
mes "I should stay here and";
mes "entreat them to a lecture.";
next;
- emotion e_lv,0,"Drunken Lady#1";
- emotion e_lv,0,"Drunken Lady#2";
+ emotion ET_THROB, getnpcid(0, "Drunken Lady#1");
+ emotion ET_THROB, getnpcid(0, "Drunken Lady#2");
mes "[Ladies]";
mes "Oh~! You'll really";
mes "teach us geology?";
@@ -5982,8 +5982,8 @@ ve_in,233,116,3 script Drunken Man#vol 901,{
mes "Hahahaha! Guess I look";
mes "pretty tough, don't I?";
next;
- emotion e_lv,0,"Drunken Lady#1";
- emotion e_lv,0,"Drunken Lady#2";
+ emotion ET_THROB, getnpcid(0, "Drunken Lady#1");
+ emotion ET_THROB, getnpcid(0, "Drunken Lady#2");
mes "[Ladies]";
mes "Oh, my God!";
mes "You're so cool~!";
@@ -6334,7 +6334,7 @@ thor_camp,250,104,3 script Sahedi#vol 934,{
mes "[Sahedi]";
mes "Let's see...";
next;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Sahedi]";
mes "Oh God! Why is the";
mes "temperature so high?!";
@@ -6342,7 +6342,7 @@ thor_camp,250,104,3 script Sahedi#vol 934,{
mes "like this in the past, but...";
mes "Is this... How bad is this?";
next;
- emotion e_swt2,1;
+ emotion ET_PROFUSELY_SWEAT, playerattached();
mes "["+strcharinfo(0)+"]";
mes "Oh... Oh, no!";
mes "Yikes! I guess if it's";
@@ -6424,7 +6424,7 @@ thor_camp,250,104,3 script Sahedi#vol 934,{
next;
}
}
- emotion e_omg;
+ emotion ET_HUK;
mes "[Sahedi]";
mes "Huh? Are you serious?";
mes "Thor Volcano's gonna";
@@ -6433,7 +6433,7 @@ thor_camp,250,104,3 script Sahedi#vol 934,{
mes "It'll be a disaster, just";
mes "like it happened in the past!";
next;
- emotion e_flash,1;
+ emotion ET_SPARK, playerattached();
mes "["+strcharinfo(0)+"]";
mes "Yes, I agree. There's";
mes "a good chance of an...";
@@ -6445,7 +6445,7 @@ thor_camp,250,104,3 script Sahedi#vol 934,{
mes "How much time do we";
mes "have to evacuate?";
next;
- emotion e_flash,1;
+ emotion ET_SPARK, playerattached();
mes "["+strcharinfo(0)+"]";
mes "Well... Uh...";
mes "According to my data...";
@@ -7113,7 +7113,7 @@ thor_camp,150,65,3 script Dummy#1::VeinsDummy 111,{
else if (aru_vol == 20) {
mes "^3355FF*THUD*^000000";
specialeffect EF_HIT2;
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
next;
mes "[Colonel Vito]";
mes "Soldier...";
@@ -7188,7 +7188,7 @@ thor_camp,59,79,1 script Thor Volcano Soldier#vo3 939,{
}
thor_camp,143,114,1 script Thor Volcano Soldier#vo4 939,{
- emotion e_sob;
+ emotion ET_CRY;
mes "[Soldier]";
mes "Oh Freya...";
mes "Bless this Old Blue Box";
@@ -7353,7 +7353,7 @@ ve_in,237,131,1 script Female Customer#ve1 940,{
mes "[Bartender]";
mes "Oh, come on!";
mes "I was kidding~";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
mes "[Bartender]";
@@ -7364,12 +7364,12 @@ ve_in,237,131,1 script Female Customer#ve1 940,{
next;
mes "["+strcharinfo(0)+"]";
mes "Meee?";
- emotion e_swt2,1;
+ emotion ET_PROFUSELY_SWEAT, playerattached();
next;
mes "[Female Customer]";
mes "Mmm...";
mes "Not my style.";
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
close;
}
diff --git a/npc/quests/seals/brisingamen_seal.txt b/npc/quests/seals/brisingamen_seal.txt
index 1ecfc91466c..cc078d97ebb 100644
--- a/npc/quests/seals/brisingamen_seal.txt
+++ b/npc/quests/seals/brisingamen_seal.txt
@@ -914,7 +914,7 @@ yuno_in04,47,113,1 script Studying Scholar#1 749,{
mes "Why are you still here?";
mes "I asked you to go find Alfrik.";
mes "Ah~ I cannot wait...";
- emotion e_flash;
+ emotion ET_SPARK;
close;
}
else if (god_brising == 47) {
@@ -954,7 +954,7 @@ yuno_in04,47,113,1 script Studying Scholar#1 749,{
mes "Of course!";
mes "That's a great idea! I'll wait here while you go and ask Alfrik. You're my only hope in completing this research!";
next;
- emotion e_hmm,1;
+ emotion ET_SCRATCH, playerattached();
mes "[" + strcharinfo(0) + "]";
mes "(^333333I shouldn't have said anything...^000000)";
next;
@@ -2709,7 +2709,7 @@ gef_dun01,89,192,0 script #lowentrace 111,3,3,{
OnTouch_:
if ((god_brising > 9) && (god_brising < 34)) {
- emotion e_gasp;
+ emotion ET_SURPRISE;
}
end;
}
@@ -2841,7 +2841,7 @@ gef_dun01,203,48,0 script #lowentrace1 111,3,3,{
OnTouch_:
if ((god_brising > 9) && (god_brising < 34)) {
- emotion e_gasp;
+ emotion ET_SURPRISE;
}
end;
}
@@ -3199,10 +3199,10 @@ OnTouch_:
mapannounce "que_god02","Everyone, stay calm! Get into your positions!",0,0x9CFF00;
mes "^4E2F2F[Crusader Commander]";
mes "Everyone, get into your positions! Front line, block its movement! Rear line, support the defense!^000000";
- emotion e_go,0,"#knight1";
- emotion e_go,0,"#knight2";
- emotion e_go,0,"#knight3";
- emotion e_gasp,0,"#doppelganger1";
+ emotion ET_GO, getnpcid(0, "#knight1");
+ emotion ET_GO, getnpcid(0, "#knight2");
+ emotion ET_GO, getnpcid(0, "#knight3");
+ emotion ET_SURPRISE, getnpcid(0, "#doppelganger1");
next;
mes "[Lowen Ellenen]";
mes "N-no!";
@@ -3218,10 +3218,10 @@ OnTouch_:
mapannounce "que_god02","Mwahaha! Mortals are such fools...",0,0xA8A8A8;
donpcevent "#brisinsummon::OnDoppel1Off";
donpcevent "#brisinsummon::OnDoppel2On";
- emotion e_gasp,0,"#knight1";
- emotion e_gasp,0,"#knight2";
- emotion e_gasp,0,"#knight3";
- emotion e_gasp,0,"#lowen";
+ emotion ET_SURPRISE, getnpcid(0, "#knight1");
+ emotion ET_SURPRISE, getnpcid(0, "#knight2");
+ emotion ET_SURPRISE, getnpcid(0, "#knight3");
+ emotion ET_SURPRISE, getnpcid(0, "#lowen");
mes "[" + strcharinfo(0) + "]";
mes " ??!!!";
next;
@@ -3662,7 +3662,7 @@ xmas,38,105,0 script #brisindwarf1 111,3,3,{
close;
case 3:
mes "^3355FFYou use your finger to poke the pile of snow. However, you hurt your finger a little bit after hitting something really solid.^000000";
- emotion e_ag,1;
+ emotion ET_ANGER, playerattached();
percentheal -20,0;
close;
case 4:
@@ -3678,7 +3678,7 @@ xmas,38,105,0 script #brisindwarf1 111,3,3,{
OnTouch_:
if (god_brising > 39) {
- emotion e_gasp,1;
+ emotion ET_SURPRISE, playerattached();
}
end;
}
@@ -4000,7 +4000,7 @@ prt_fild02,185,269,0 script #brisindwarf2 111,3,3,{
end;
case 2:
mes "^3355FFAs you sweep away the moss with your hand, you scratch your palm from the sharp edges of the rock.^000000";
- emotion e_gasp,1;
+ emotion ET_SURPRISE, playerattached();
next;
mes "[" + strcharinfo(0) + "]";
mes "Damn...!";
@@ -4145,7 +4145,7 @@ prt_fild02,185,269,0 script #brisindwarf2 111,3,3,{
OnTouch_:
if (god_brising > 41) {
- emotion e_gasp,1;
+ emotion ET_SURPRISE, playerattached();
}
end;
}
@@ -4339,7 +4339,7 @@ mjolnir_09,85,129,0 script #brisindwarf3 111,3,3,{
OnTouch_:
if (god_brising > 42) {
- emotion e_gasp,1;
+ emotion ET_SURPRISE, playerattached();
}
end;
}
@@ -4589,7 +4589,7 @@ OnTouch_:
close;
}
if (god_brising == 44) {
- emotion e_gasp,1;
+ emotion ET_SURPRISE, playerattached();
mes "[Male Voice]";
mes "Don't come any closer!";
mes "How the hell do I feel";
diff --git a/npc/quests/seals/megingard_seal.txt b/npc/quests/seals/megingard_seal.txt
index 59ccd4e851a..a9cf9e47ab1 100644
--- a/npc/quests/seals/megingard_seal.txt
+++ b/npc/quests/seals/megingard_seal.txt
@@ -2031,7 +2031,7 @@ in_rogue,243,61,0 script Suspicious Man#megin 748,{
else if (countitem(743) > 0) {
set .@toy$,"Spore Doll";
}
- else if (countitem(744) > 0) {
+ else if (countitem(750) > 0) {
set .@toy$,"Baphomet Doll";
}
else if (countitem(751) > 0) {
diff --git a/npc/quests/seals/mjolnir_seal.txt b/npc/quests/seals/mjolnir_seal.txt
index 3145e71b98a..084152bfe40 100644
--- a/npc/quests/seals/mjolnir_seal.txt
+++ b/npc/quests/seals/mjolnir_seal.txt
@@ -2041,7 +2041,7 @@ mjolnir_01,35,136,7 script Dwarf Blacksmith#west 826,{
mes "^3355FF*Clang Clang!*^000000";
successrefitem .@part;
next;
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Vestri]";
mes "Mwahahaha~";
mes "I've still got it!";
@@ -2055,7 +2055,7 @@ mjolnir_01,35,136,7 script Dwarf Blacksmith#west 826,{
mes "^3355FF*Clang Clang!*^000000";
failedrefitem .@part;
next;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Vestri]";
mes "Waaahhhhh!";
mes "Dear God, no!";
@@ -2252,7 +2252,7 @@ mjolnir_01,35,136,7 script Dwarf Blacksmith#west 826,{
mes "^3355FF*Clang Clang!*^000000";
successrefitem .@part;
next;
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Vestri]";
mes "Mwahahaha~";
mes "I've still got it!";
@@ -2266,7 +2266,7 @@ mjolnir_01,35,136,7 script Dwarf Blacksmith#west 826,{
mes "^3355FF*Clang Clang!*^000000";
failedrefitem .@part;
next;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Vestri]";
mes "Waaahhhhh!";
mes "Dear God, no!";
diff --git a/npc/quests/seals/sleipnir_seal.txt b/npc/quests/seals/sleipnir_seal.txt
index e1dcb006d4e..d0af43bab1d 100644
--- a/npc/quests/seals/sleipnir_seal.txt
+++ b/npc/quests/seals/sleipnir_seal.txt
@@ -74,7 +74,7 @@ que_god01,98,98,4 script Manager#G 69,{
mes "Wait...!";
mes "I can't even remember the last";
mes "time I went out with a guy! At this rate, I might retire before I can find a boyfriend. Noooo, I'm still in my prime~!";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
close;
}
if ($God1 < $@god_check2) {
@@ -86,7 +86,7 @@ que_god01,98,98,4 script Manager#G 69,{
mes "Wait...!";
mes "I can't even remember the last";
mes "time I went out with a guy! At this rate, I might retire before I can find a boyfriend. Noooo, I'm still in my prime~!";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
close;
}
else if (god_sl_1 == 1) {
@@ -472,7 +472,7 @@ que_god01,98,98,4 script Manager#G 69,{
mes "Wait...!";
mes "I can't even remember the last";
mes "time I went out with a guy! At this rate, I might retire before I can find a boyfriend. Noooo, I'm still in my prime~!";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
close2;
}
else if (god_sl_1 < 51) {
@@ -567,12 +567,12 @@ que_god01,66,125,6 script Researcher#G1 89,{
mes "[Hallandaute]";
mes "A mad scientist?";
mes "That doesn't sound right. In my wildest dreams, I never would have suspected Metto of turning out that way...";
- emotion e_hmm;
+ emotion ET_SCRATCH;
next;
mes "[Hallandaute]";
mes "Huh. That's...";
mes "That's too bad. I don't know what to say. We used to go watch movies and celebrate our birthdays together. P-please give me a moment...";
- emotion e_dots;
+ emotion ET_THINK;
set god_sl_2,2;
close;
}
diff --git a/npc/quests/skills/assassin_skills.txt b/npc/quests/skills/assassin_skills.txt
index 3948877d878..6f2030b339d 100644
--- a/npc/quests/skills/assassin_skills.txt
+++ b/npc/quests/skills/assassin_skills.txt
@@ -633,7 +633,7 @@ in_moc_16,23,27,5 script Assassin#realgirl 885,{
mes "the one who invented this";
mes "skill, is also... He's a man";
mes "amongst men, I must say.";
- emotion e_lv;
+ emotion ET_THROB;
next;
break;
case 2:
@@ -715,7 +715,7 @@ in_moc_16,23,27,5 script Assassin#realgirl 885,{
mes "Have you heard about";
mes "the latest news from";
mes "the Assassin Guild?";
- emotion e_heh;
+ emotion ET_SMILE;
next;
select("News from the Assassin Guild?");
mes "[Assassin]";
@@ -761,7 +761,7 @@ OnTouch_:
mes "hand really hard!^000000";
sc_start SC_Poison,30000,0;
sc_start SC_Bleeding,10000,0;
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
close;
case 2:
mes "^3355FFYou try to peek";
@@ -833,7 +833,7 @@ OnTouch_:
mes "hand really hard!^000000";
sc_start SC_Poison,30000,0;
sc_start SC_Bleeding,10000,0;
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
close;
}
else {
@@ -946,7 +946,7 @@ OnTouch_:
mes "all gas in your lungs in time";
mes "to escape its effects. Sadly,";
mes "all you found was broken glass.^000000";
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
}
close;
}
diff --git a/npc/quests/skills/bard_skills.txt b/npc/quests/skills/bard_skills.txt
index f24c31c357a..ec8a47074fe 100644
--- a/npc/quests/skills/bard_skills.txt
+++ b/npc/quests/skills/bard_skills.txt
@@ -29,7 +29,7 @@
prontera,174,328,3 script Young Man#bard_q1 89,3,3,{
if (BaseJob == Job_Bard) {
- emotion e_omg;
+ emotion ET_HUK;
mes "[Timid Young Man]";
mes "Eh? Wwwaaaah--!";
mes "Y-you're--it's-it's--";
@@ -374,7 +374,7 @@ prontera,174,328,3 script Young Man#bard_q1 89,3,3,{
OnTouch:
if (BaseJob == Job_Bard) {
- emotion e_omg;
+ emotion ET_HUK;
}
end;
}
@@ -544,7 +544,7 @@ morocc_in,169,72,7 script Spiteful-Looking Bard#bs 741,3,3,{
mes "some fresh eggs laid by";
mes "Yhelle, just like I asked.";
mes "I'm sure it was dangerous";
- mes "going to Nifflheim, but the flavor of these eggs is worth it.";
+ mes "going to Niflheim, but the flavor of these eggs is worth it.";
next;
next;
mes "[Riott]";
@@ -654,7 +654,7 @@ morocc_in,169,72,7 script Spiteful-Looking Bard#bs 741,3,3,{
mes "[Riott]";
mes "Hmmrmpf!";
mes "Eh heh heh heh!";
- emotion e_gg;
+ emotion ET_KIK;
next;
mes "[" + strcharinfo(0) + "]";
mes "Um...";
@@ -839,7 +839,7 @@ morocc_in,169,72,7 script Spiteful-Looking Bard#bs 741,3,3,{
mes "[Riott]";
mes "Hmmrmpf!";
mes "Eh heh heh heh!";
- emotion e_gg;
+ emotion ET_KIK;
next;
mes "[" + strcharinfo(0) + "]";
mes "Um...";
@@ -898,15 +898,15 @@ morocc_in,169,72,7 script Spiteful-Looking Bard#bs 741,3,3,{
}
OnTouch:
- emotion e_gg;
+ emotion ET_KIK;
end;
}
// Yhelle the Chicken
//============================================================
niflheim,239,70,1 script Yhelle#bard_chick1 800,3,3,{
- emotion e_omg,1;
- emotion e_omg;
+ emotion ET_HUK, playerattached();
+ emotion ET_HUK;
mes "[Hen Yhelle]";
mes "Cluck-Cluuuck?";
mes "Cluck cluck cluck!";
@@ -938,8 +938,8 @@ OnTouch:
}
niflheim,185,205,3 script Yhelle#bard_chick2 800,3,3,{
- emotion e_omg,1;
- emotion e_omg;
+ emotion ET_HUK, playerattached();
+ emotion ET_HUK;
mes "[Hen Yhelle]";
mes "Cluck-Cluuuck?";
mes "Cluck cluck cluck!";
@@ -964,8 +964,8 @@ OnTouch:
}
niflheim,85,203,5 script Yhelle#bard_chick3 800,3,3,{
- emotion e_omg,1;
- emotion e_omg;
+ emotion ET_HUK, playerattached();
+ emotion ET_HUK;
mes "[Hen Yhelle]";
mes "Cluck-Cluuuck?";
mes "Cluck cluck cluck!";
@@ -990,8 +990,8 @@ OnTouch:
}
niflheim,149,81,7 script Yhelle#bard_chick4 800,3,3,{
- emotion e_omg,1;
- emotion e_omg;
+ emotion ET_HUK, playerattached();
+ emotion ET_HUK;
mes "[Hen Yhelle]";
mes "Cluck-Cluuuck?";
mes "Cluck cluck cluck!";
@@ -1016,8 +1016,8 @@ OnTouch:
}
niflheim,209,144,3 script Yhelle#bard_chick5 800,3,3,{
- emotion e_omg,1;
- emotion e_omg;
+ emotion ET_HUK, playerattached();
+ emotion ET_HUK;
mes "[Hen Yhelle]";
mes "Cluck-Cluuuck?";
mes "Cluck cluck cluck!";
@@ -1254,8 +1254,8 @@ function script F_BardSkillYhelle {
mes "You're carrying too many items and don't have enough inventory space to receive any rewards. Please make more inventory space available and come back to take this challenge.";
close;
}
- emotion e_omg,1;
- emotion e_omg;
+ emotion ET_HUK, playerattached();
+ emotion ET_HUK;
mes "[Hen Yhelle]";
mes "Cluck-Cluuuck?";
mes "Cluck cluck cluck!";
diff --git a/npc/quests/skills/dancer_skills.txt b/npc/quests/skills/dancer_skills.txt
index 44489c0fa0b..3e6d12a34c7 100644
--- a/npc/quests/skills/dancer_skills.txt
+++ b/npc/quests/skills/dancer_skills.txt
@@ -191,7 +191,7 @@ comodo,204,172,5 script Canell#qsk_dan01 724,{
next;
mes "^3355FFIt figures that she'd";
mes "keep your mirror.^000000";
- emotion e_ag,1;
+ emotion ET_ANGER, playerattached();
set DANCER_SK,3;
close;
}
@@ -203,7 +203,7 @@ comodo,204,172,5 script Canell#qsk_dan01 724,{
mes "Oh! It's you. So did my";
mes "sister in Prontera Church";
mes "teach you anything yet?";
- emotion e_go;
+ emotion ET_GO;
close;
}
else if (DANCER_SK == 7) {
@@ -266,7 +266,7 @@ comodo,204,172,5 script Canell#qsk_dan01 724,{
mes "Look at me, do it";
mes "like this. Un, deux, trois~";
mes "Now, let me see you try it.";
- emotion e_no1;
+ emotion ET_BEST;
next;
switch(select("Un deux trois~-:Un, doux trois~:Un, deux, trois~")) {
default:
@@ -286,7 +286,7 @@ comodo,204,172,5 script Canell#qsk_dan01 724,{
case 3:
mes "["+ strcharinfo(0) +"]";
mes "Un, deux, trois~";
- emotion e_no1,1;
+ emotion ET_BEST, playerattached();
specialeffect2 EF_FLASHER;
next;
mes "[Canell]";
@@ -296,7 +296,7 @@ comodo,204,172,5 script Canell#qsk_dan01 724,{
mes "of rhythm and naturalness";
mes "are absolutely essential to";
mes "this technique of enticement.";
- emotion e_kis;
+ emotion ET_CHUP;
next;
mes "[Canell]";
mes "Now that you've mastered";
@@ -311,7 +311,7 @@ comodo,204,172,5 script Canell#qsk_dan01 724,{
mes "have that drawback. Ho-ho~";
mes "Anyway, it's time for us to part now. I hope that you grow to";
mes "become a more glamorous and charming dancer in days to come.";
- emotion e_heh;
+ emotion ET_SMILE;
next;
mes "^3355FFYou have finally learned";
mes "the Charming Wink skill.^000000";
@@ -329,7 +329,7 @@ comodo,204,172,5 script Canell#qsk_dan01 724,{
mes "ask me? Ah, you must";
mes "be mesmerized by my";
mes "beauty, aren't you?";
- emotion e_pif;
+ emotion ET_HNG;
next;
mes "[Canell]";
mes "Oh, to be so beautiful";
@@ -389,7 +389,7 @@ comodo,204,172,5 script Canell#qsk_dan01 724,{
mes "Hey there,";
mes "handsome~";
mes "^333333*Wink~*^000000";
- emotion e_kis;
+ emotion ET_CHUP;
specialeffect2 EF_VALLENTINE2;
next;
mes "^3355FFStrangely enough,";
@@ -540,7 +540,7 @@ prontera,183,333,1 script Aelle#qsk_dan02 79,{
mes "I do it! Wink, j-just";
mes "like this, okay? Y' see?";
mes "^333333*Wiiiiiiiiiiiiiink*^000000";
- emotion e_no1;
+ emotion ET_BEST;
next;
mes "["+ strcharinfo(0) +"]";
mes "Wh-whoa...";
@@ -555,7 +555,7 @@ prontera,183,333,1 script Aelle#qsk_dan02 79,{
mes "*Urp* It'sh in the--";
mes "Bwahahahaahah!";
mes "It's all spinning!";
- emotion e_heh;
+ emotion ET_SMILE;
next;
mes "^3355FFIn her drunken stupor,";
mes "Aelle pummels you with";
@@ -563,7 +563,7 @@ prontera,183,333,1 script Aelle#qsk_dan02 79,{
mes "maniacally to herself.^000000";
percentheal -10,0;
specialeffect2 EF_HIT2;
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
delitem 970,1; //Alchol
delitem 512,1; //Apple
delitem 513,3; //Banana
@@ -644,7 +644,7 @@ prontera,183,333,1 script Aelle#qsk_dan02 79,{
mes "[Sober Aelle]";
mes "Ohhh...";
mes "H-headache...";
- emotion e_an;
+ emotion ET_FRET;
next;
mes "[Aelle]";
mes "Oh, wow, look at you!";
@@ -681,14 +681,14 @@ prontera,183,333,1 script Aelle#qsk_dan02 79,{
mes "Oh crap, it's the pastor!";
mes "Shhh, if anybody asks you,";
mes "I wasn't doing anything!";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Aelle]";
mes "Thanks, hon...";
mes "I know you can";
mes "keep my contraband";
mes "our little secret. ^333333*Wink*^000000";
- emotion e_no1;
+ emotion ET_BEST;
close;
}
}
@@ -711,14 +711,14 @@ prontera,183,333,1 script Aelle#qsk_dan02 79,{
mes "Oh crap, it's the pastor!";
mes "Shhh, if anybody asks you,";
mes "I wasn't doing anything!";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Aelle]";
mes "Thanks, hon...";
mes "I know you can";
mes "keep my contraband";
mes "our little secret. ^333333*Wink*^000000";
- emotion e_no1;
+ emotion ET_BEST;
close;
}
}
diff --git a/npc/quests/skills/hunter_skills.txt b/npc/quests/skills/hunter_skills.txt
index 1b73a138aae..a86214efb48 100644
--- a/npc/quests/skills/hunter_skills.txt
+++ b/npc/quests/skills/hunter_skills.txt
@@ -39,7 +39,7 @@ pay_arche,109,169,3 script Arpesto 712,{
mes "old man! You were";
mes "just scared! Me, on";
mes "the other hand...";
- emotion e_gg,"Reidin Corse#tu";
+ emotion ET_KIK, getnpcid(0, "Reidin Corse#tu");
next;
mes "[Arpesto]";
mes "You little";
@@ -104,7 +104,7 @@ pay_arche,109,169,3 script Arpesto 712,{
mes "Didn't you call it";
mes "Arpesto's 3rd Form";
mes "or something at first?";
- emotion e_swt,"Reidin Corse#tu";
+ emotion ET_SWEAT, getnpcid(0, "Reidin Corse#tu");
next;
mes "[Arpesto]";
mes "Er, yes, Arpesto's";
@@ -120,9 +120,9 @@ pay_arche,109,169,3 script Arpesto 712,{
mes "That's the old name you";
mes "gave that skill, right?";
mes "Didn't you change it?";
- emotion e_omg;
+ emotion ET_HUK;
next;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Arpesto]";
mes "What the hell";
mes "are you talkin--";
@@ -133,12 +133,12 @@ pay_arche,109,169,3 script Arpesto 712,{
mes "was too cheesy. What";
mes "did we call it now? Um...";
mes "''Phantasmic Arrow?''";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "[Arpesto]";
mes "...";
mes "......";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Reidin Corse]";
mes "Umm....";
@@ -149,7 +149,7 @@ pay_arche,109,169,3 script Arpesto 712,{
mes "''^3131FFPhantasmic Arrow^000000'' sounds";
mes "soooo much cooler than that";
mes "other name you came up with!";
- emotion e_ic,"Reidin Corse#tu";
+ emotion ET_AHA, getnpcid(0, "Reidin Corse#tu");
next;
mes "[Arpesto]";
mes "You can be pretty handy";
@@ -180,8 +180,8 @@ pay_arche,109,169,3 script Arpesto 712,{
mes "^3355FF*Swwwwwww!*";
mes "*Bang!*^000000";
specialeffect EF_HIT2;
- emotion e_omg;
- emotion e_omg,1;
+ emotion ET_HUK;
+ emotion ET_HUK, playerattached();
next;
mes "[Arpesto]";
mes "^333333*Pant Pant*";
@@ -190,7 +190,7 @@ pay_arche,109,169,3 script Arpesto 712,{
next;
mes "[Arpesto]";
mes "WHHHHHHHY MEEEEE?!";
- emotion e_omg,"Reidin Corse#tu";
+ emotion ET_HUK, getnpcid(0, "Reidin Corse#tu");
next;
mes "^3355FF*Thump*^000000";
next;
@@ -293,9 +293,9 @@ pay_arche,109,169,3 script Arpesto 712,{
mes "skill when you were bored";
mes "and just messing around";
mes "with one of the Bows!";
- emotion e_gg,"Reidin Corse#tu";
+ emotion ET_KIK, getnpcid(0, "Reidin Corse#tu");
next;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Arpesto]";
mes "^333333*Ahem*^000000 Please Reidin,";
mes "don't entertain unfounded";
@@ -340,7 +340,7 @@ pay_arche,109,169,3 script Arpesto 712,{
mes "......";
mes ".........";
mes "......Riiiight.";
- emotion e_dots,"Reidin Corse#tu";
+ emotion ET_THINK, getnpcid(0, "Reidin Corse#tu");
set qskill_hunter,1;
close;
case 2:
@@ -359,14 +359,14 @@ pay_arche,109,169,3 script Arpesto 712,{
mes "[Arpesto]";
mes "The sky still looks clear, but recently the winds that have been blowing through the land seem to carry with them an air of misfortune.";
next;
- emotion e_pif,"Reidin Corse#tu";
+ emotion ET_HNG, getnpcid(0, "Reidin Corse#tu");
mes "[Reidin Corse]";
mes "So...";
mes "Danger's coming?";
mes "Heh! Chill, gramps~";
mes "I got it covered!";
next;
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
mes "[Arpesto]";
mes "Ho ho...";
mes "Energetic, but";
diff --git a/npc/quests/skills/merchant_skills.txt b/npc/quests/skills/merchant_skills.txt
index b18c27e9b5b..3d6bf389a5e 100644
--- a/npc/quests/skills/merchant_skills.txt
+++ b/npc/quests/skills/merchant_skills.txt
@@ -41,7 +41,7 @@ alberta,83,96,5 script Necko 98,7,7,{
mes "Ppyakikakikakakakakakakaka!!";
close;
}
- else if (JobLevel < 15) {
+ else if (JobLevel < 15 && Class == Job_Merchant ) {
mes "[Necko]";
mes "Oh, did you come because";
mes "you are infatuated with my voice?";
diff --git a/npc/quests/thana_quest.txt b/npc/quests/thana_quest.txt
index 3596e64757f..1497eb2339f 100644
--- a/npc/quests/thana_quest.txt
+++ b/npc/quests/thana_quest.txt
@@ -2099,19 +2099,19 @@ OnTouch_:
// .@j$: FragmentName
switch(.@seal) {
case 1:
- setarray .@i[0],7437,1711,217,167,238;
+ setarray .@i[0],7437,1711,217,167,EF_LANDPROTECTOR;
set .@j$,"Misery";
break;
case 2:
- setarray .@i[0],7436,1712,202,75,102;
+ setarray .@i[0],7436,1712,202,75,EF_CRASHEARTH;
set .@j$,"Agony";
break;
case 3:
- setarray .@i[0],7438,1709,80,76,101;
+ setarray .@i[0],7438,1709,80,76,EF_REPAIRWEAPON;
set .@j$,"Hatred";
break;
case 4:
- setarray .@i[0],7439,1710,62,171,100;
+ setarray .@i[0],7439,1710,62,171,EF_REMOVETRAP;
set .@j$,"Despair";
break;
}
diff --git a/npc/quests/the_sign_quest.txt b/npc/quests/the_sign_quest.txt
index 4c9f9f6c452..9e575a48604 100644
--- a/npc/quests/the_sign_quest.txt
+++ b/npc/quests/the_sign_quest.txt
@@ -1050,7 +1050,7 @@ prt_in,248,23,0 script Maid#sign2 111,{
mes "so my body aches. Oh, what";
mes "am I saying? Please ignore";
mes "that--! Ho ho ho~";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
close;
}
else if (sign_q < 15) {
@@ -1066,7 +1066,7 @@ prt_in,248,23,0 script Maid#sign2 111,{
mes "easily. Hmph, there's not";
mes "too many boys I like out";
mes "there, anyway.";
- emotion e_pif;
+ emotion ET_HNG;
close;
}
else if (sign_q < 20) {
@@ -1093,7 +1093,7 @@ prt_in,248,23,0 script Maid#sign2 111,{
mes "much! Ahhhhhhh~";
delitem 504,1; //White_Potion
close2;
- emotion e_kis2;
+ emotion ET_CHUPCHUP;
end;
}
end;
@@ -1110,7 +1110,7 @@ prt_in,248,23,0 script Maid#sign2 111,{
mes "be smarter than me,";
mes "but maybe I can become";
mes "more beautiful than her...";
- emotion e_dots;
+ emotion ET_THINK;
close;
}
else if (sign_q < 35) {
@@ -1146,7 +1146,7 @@ prt_in,248,23,0 script Maid#sign2 111,{
close;
}
else if (sign_q == 54) {
- emotion e_ho;
+ emotion ET_DELIGHT;
mes "La la la~~";
mes "Oh, hello.";
mes "Long time no see.";
@@ -1199,7 +1199,7 @@ prt_in,248,23,0 script Maid#sign2 111,{
mes "visiting Master Metz.";
mes "Why can't they leave their";
mes "dirt outside of the manor?";
- emotion e_pif;
+ emotion ET_HNG;
close;
}
}
@@ -1212,7 +1212,7 @@ morocc_in,115,154,5 script Rogue#sign 810,{
close;
}
if (sign_q < 3) {
- emotion e_dots;
+ emotion ET_THINK;
end;
}
else if (sign_q == 3) {
@@ -1530,7 +1530,7 @@ morocc_in,115,154,5 script Rogue#sign 810,{
mes "I'm thinking about";
mes "solving world hunger";
mes "here! Or somethin' like that.";
- emotion e_dots;
+ emotion ET_THINK;
close;
}
}
@@ -1545,7 +1545,7 @@ morocc_in,114,162,4 script Young Man#sign 118,{
mes "trying to live here. Do you";
mes "know a nice and cool place";
mes "where I can work?";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
close;
}
else if (sign_q == 11) {
@@ -1768,7 +1768,7 @@ payon,154,170,3 script Hagin#sign 78,{
mes "a flower's life is brief.";
mes "I better snag Daewoon";
mes "while I still can~";
- emotion e_an;
+ emotion ET_FRET;
close;
}
}
@@ -1907,7 +1907,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{
mes "you and reveal it to";
mes "Daewoon's roving eyes.^000000";
next;
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Daewoon]";
mes "Eh? Why that's...";
mes "I see now, Arian must";
@@ -1939,7 +1939,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{
case 1:
set .@pay_point,.@pay_point+2;
mes "[Daewoon]";
- emotion e_dots;
+ emotion ET_THINK;
mes "Mmm...?";
mes "Handy? If you truly";
mes "understood, I don't";
@@ -1949,7 +1949,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{
break;
case 2:
set .@pay_point,.@pay_point+4;
- emotion e_pif;
+ emotion ET_HNG;
mes "[Daewoon]";
mes "Really?";
mes "Mm. At least you";
@@ -1960,7 +1960,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{
break;
case 2:
mes "[Daewoon]";
- emotion e_dots;
+ emotion ET_THINK;
mes "...";
mes "A rather crass way";
mes "of speaking, but perhaps";
@@ -2012,7 +2012,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{
break;
case 2:
set .@pay_point,.@pay_point+7;
- emotion e_ok;
+ emotion ET_OK;
mes "[Daewoon]";
mes "Mwah ah hah!";
mes "That's exactly what";
@@ -2023,13 +2023,13 @@ payon_in03,11,31,4 script Daewoon#sign 808,{
next;
break;
case 3:
- emotion e_an;
+ emotion ET_FRET;
set .@pay_point,.@pay_point+2;
mes "[Daewoon]";
mes "E...";
mes "Excuse me?";
next;
- emotion e_ag;
+ emotion ET_ANGER;
mes "[Daewoon]";
mes "How can you be";
mes "so ridiculous at";
@@ -2042,7 +2042,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{
break;
case 4:
set .@pay_point,.@pay_point+4;
- emotion e_dots;
+ emotion ET_THINK;
mes "[Daewoon]";
mes "Hmm. That kind of half-hearted";
mes "attitude won't get you very far on your adventures. Still, so long as you don't get overly negative, you should have a decent chance of surviving your challenges.";
@@ -2055,7 +2055,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{
mes "but that really isn't my style. For this test, why don't we just talk?";
mes "Just answer me honestly and";
mes "light heartedly, alright?";
- emotion e_hmm;
+ emotion ET_SCRATCH;
next;
mes "[Daewoon]";
mes "So...";
@@ -2066,7 +2066,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{
switch(select("Yes, I do.:I prefer soloing.:I am lonely.")) {
case 1:
set .@pay_point,.@pay_point+5;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Daewoon]";
mes "Oh, that's great~!";
mes "To have many friends";
@@ -2121,7 +2121,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{
next;
switch(select("Awesome~!:I hate people who do that.:I do it sometimes...")) {
case 1:
- emotion e_an;
+ emotion ET_FRET;
mes "[Daewoon]";
mes "But...";
mes "Wouldn't that be really";
@@ -2130,7 +2130,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{
mes "it would even interfere with";
mes "someone else's gameplay...";
next;
- emotion e_an;
+ emotion ET_FRET;
mes "[Daewoon]";
mes "Perhaps you should try";
mes "to consider other people's";
@@ -2150,7 +2150,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{
mes "heard some ruffians boasting";
mes "of their mob training activities. But personally, I feel they were compensating for their own shortcomings. ";
next;
- emotion e_an;
+ emotion ET_FRET;
mes "[Daewoon]";
mes "Such behavior truly";
mes "bothers me. Although I have";
@@ -2159,7 +2159,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{
mes "myself irked when encountering";
mes "such troublemakers.";
next;
- emotion e_no1;
+ emotion ET_BEST;
mes "[Daewoon]";
mes "When you face obstacles";
mes "in your own training, never give in to weakness. Assert yourself and find the determination to overcome your tribulations with honor!";
@@ -2319,7 +2319,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{
switch(select("Yes:No")) {
case 1:
mes "[Daewoon]";
- emotion e_heh;
+ emotion ET_SMILE;
mes "I'm glad.";
mes "When you don't live";
mes "with zeal, it's easy to";
@@ -2352,7 +2352,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{
mes "It's important to look forward,";
mes "but first you must find what is truly precious to you before you can define your happiness. That's why I think it's good to experience new things as well as reflect.";
next;
- emotion e_no1;
+ emotion ET_BEST;
mes "[Daewoon]";
mes "Now, what's precious to me?";
mes "Three things, actually...";
@@ -2379,7 +2379,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{
else if (BaseLevel < 90) getexp 13000,0;
else getexp 18000,0;
}
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Daewoon]";
mes "Well, I must say that I've";
mes "grown quite fond of you. Of";
@@ -2483,7 +2483,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{
close;
}
else if (sign_q == 99) {
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Daewoon]";
mes "Oh~! It's you!";
mes "It has been a while since";
@@ -2511,7 +2511,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{
mes "Mwah ah hah~!";
close;
case 2:
- emotion e_hmm;
+ emotion ET_SCRATCH;
mes "[Daewoon]";
mes "Eh...?";
mes "That's quite a surprise.";
@@ -2573,14 +2573,14 @@ aldeba_in,155,101,3 script Sir Jore#sign 805,7,7,{
mes "["+ strcharinfo(0) +"]";
mes "Excuse me...";
next;
- emotion e_omg;
+ emotion ET_HUK;
mes "^313FFF*Clink*^000000";
next;
mes "[Sir Jore]";
mes "...";
mes "......";
next;
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
mes "[Sir Jore]";
mes "...";
mes "......";
@@ -2588,14 +2588,14 @@ aldeba_in,155,101,3 script Sir Jore#sign 805,7,7,{
mes "Look what";
mes "you made me do!";
next;
- emotion e_sob;
+ emotion ET_CRY;
mes "[Sir Jore]";
mes "I've been fiddling";
mes "with this sample for";
mes "five hours. And now";
mes "it's ruined! ^333333*Sob*^000000";
next;
- emotion e_sob;
+ emotion ET_CRY;
mes "[Sir Jore]";
mes "^333333*Sob*^000000";
mes "I came to this town";
@@ -2606,7 +2606,7 @@ aldeba_in,155,101,3 script Sir Jore#sign 805,7,7,{
next;
switch(select("Daewoon sent me.:Oops, sorry. Later~")) {
case 1:
- emotion e_swt;
+ emotion ET_SWEAT;
mes "[Sir Jore]";
mes "O-oh!";
mes "That's right.";
@@ -2614,7 +2614,7 @@ aldeba_in,155,101,3 script Sir Jore#sign 805,7,7,{
mes "tested for the piece";
mes "of the Sobbing Starlight.";
next;
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
mes "[Sir Jore]";
mes "So...";
mes "Er. Then, what...";
@@ -2674,7 +2674,7 @@ aldeba_in,155,101,3 script Sir Jore#sign 805,7,7,{
mes "Yggdrasil. They can be used";
mes "to revive the dead, after all.";
next;
- emotion e_swt;
+ emotion ET_SWEAT;
mes "[Sir Jore]";
mes "Oh, and make sure to";
mes "bring those things to me";
@@ -2684,7 +2684,7 @@ aldeba_in,155,101,3 script Sir Jore#sign 805,7,7,{
mes "schedule, you know.";
close;
case 2:
- emotion e_sob;
+ emotion ET_CRY;
mes "[Sir Jore]";
mes "I spent five hours";
mes "observing the changes";
@@ -2700,7 +2700,7 @@ aldeba_in,155,101,3 script Sir Jore#sign 805,7,7,{
delitem 610,2; //Leaf_Of_Yggdrasil
delitem 511,10; //Green_Herb
set sign_q,17;
- emotion e_thx;
+ emotion ET_THANKS;
mes "[Sir Jore]";
mes "Ah! Th-thank you for";
mes "bringing what I need.";
@@ -2926,11 +2926,11 @@ aldeba_in,155,101,3 script Sir Jore#sign 805,7,7,{
OnTouch_:
if (rand(2)) {
- emotion e_ic;
+ emotion ET_AHA;
specialeffect EF_PHARMACY_OK;
}
else {
- emotion e_omg;
+ emotion ET_HUK;
specialeffect EF_PHARMACY_FAIL;
}
end;
@@ -2941,7 +2941,7 @@ aldeba_in,156,118,4 script Piru Piru#sign 102,{
mes "[Piru Piru]";
if ((gettime(DT_HOUR) >= 12) && (gettime(DT_HOUR) <= 24)) { //235959
if (sign_q == 17) {
- emotion e_sob;
+ emotion ET_CRY;
mes "Oh, I'm sooo tired~";
mes "But we can't sleep yet.";
mes "*Sob* Master, can't we";
@@ -2995,7 +2995,7 @@ aldeba_in,156,118,4 script Piru Piru#sign 102,{
}
}
else {
- emotion e_sob;
+ emotion ET_CRY;
mes "Oh, I'm sooo tired~";
mes "But we can't sleep yet.";
mes "*Sob* Master, can't we";
@@ -3131,16 +3131,16 @@ prt_maze02,16,183,3 script Pleur#sign 91,{
close;
OnHo:
- emotion e_ho;
+ emotion ET_DELIGHT;
end;
OnKis2:
- emotion e_kis2;
+ emotion ET_CHUPCHUP;
end;
OnGasp:
- emotion e_gasp;
+ emotion ET_SURPRISE;
end;
OnOmg:
- emotion e_omg;
+ emotion ET_HUK;
end;
}
@@ -3148,7 +3148,7 @@ prt_maze02,14,183,4 script Gordon#sign 51,{
callfunc "F_UpdateSignVars";
mes "[Gordon]";
if (sign_q < 18) {
- emotion e_ho;
+ emotion ET_DELIGHT;
mes "Hello darling.";
mes "What did you do today?";
next;
@@ -3158,7 +3158,7 @@ prt_maze02,14,183,4 script Gordon#sign 51,{
mes "with a white bear and a";
mes "blue bear, father.";
next;
- emotion e_ho;
+ emotion ET_DELIGHT;
mes "[Gordon]";
mes "Darling...";
mes "Aren't you tired";
@@ -3170,7 +3170,7 @@ prt_maze02,14,183,4 script Gordon#sign 51,{
mes "[Pleur]";
mes "Don't worry father, I understand. For now, this is the only place where we can relax and live inpeace. I think we deserve to rest after accomplishing our goals...";
next;
- emotion e_sob;
+ emotion ET_CRY;
mes "[Gordon]";
mes "Thank you, Pluer.";
mes "I have no regrets about";
@@ -3184,7 +3184,7 @@ prt_maze02,14,183,4 script Gordon#sign 51,{
case 1:
set sign_q,18;
donpcevent "#skill::OnEnable";
- emotion e_omg;
+ emotion ET_HUK;
donpcevent "Pleur#sign::OnOMG";
mes "[Pleur]";
mes "No no no!";
@@ -3195,7 +3195,7 @@ prt_maze02,14,183,4 script Gordon#sign 51,{
mes "Summon... Marine Sphere!";
close;
case 2:
- emotion e_gasp;
+ emotion ET_SURPRISE;
donpcevent "Pleur#sign::OnGasp";
mes "[Gordon]";
mes "Eh?! Don't you know";
@@ -3303,7 +3303,7 @@ prt_maze02,14,183,4 script Gordon#sign 51,{
}
}
else if (sign_q == 18) {
- emotion e_pif;
+ emotion ET_HNG;
mes "Oh...!";
mes "You scared us!";
mes "Roaring like some";
@@ -3414,12 +3414,12 @@ prt_maze02,14,183,4 script Gordon#sign 51,{
mes "would put all those newbie";
mes "scientists to shame~";
next;
- emotion e_swt;
+ emotion ET_SWEAT;
mes "[Pleur]";
mes "D...";
mes "D...Daddy!!";
next;
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Gordon]";
mes "Heh heh~";
mes "Am I being";
@@ -3448,14 +3448,14 @@ geffen_in,59,74,4 script Jesqurienne#sign 803,{
switch(select("I've never heard of you.:Oh gosh, it's Jesqurienne!")) {
case 1:
mes "[Jesqurienne]";
- emotion e_swt;
+ emotion ET_SWEAT;
mes "Ho ho ho~!";
mes "Surely you";
mes "must be joking~";
next;
switch(select("You got me, you got me.:Nope. Doesn't ring a bell.")) {
case 1:
- emotion e_pif;
+ emotion ET_HNG;
mes "[Jesqurienne]";
mes "Ohohohohoho~!";
mes "I knew it! I knew it!";
@@ -3472,7 +3472,7 @@ geffen_in,59,74,4 script Jesqurienne#sign 803,{
next;
break;
case 2:
- emotion e_dots;
+ emotion ET_THINK;
mes "[Jesqurienne]";
mes "...";
mes "......";
@@ -3524,7 +3524,7 @@ geffen_in,59,74,4 script Jesqurienne#sign 803,{
next;
switch(select("^333333Stuck-up chick.^000000:Take it easy on the drinks...")) {
case 1:
- emotion e_an;
+ emotion ET_FRET;
mes "[Jesqurienne]";
mes "What...?";
mes "What did you say?";
@@ -3533,7 +3533,7 @@ geffen_in,59,74,4 script Jesqurienne#sign 803,{
mes "that to me before!";
mes "H-how dare you...";
next;
- emotion e_ag;
+ emotion ET_ANGER;
mes "[Jesqurienne]";
mes "Prove that you can";
mes "hold a candle to my";
@@ -3549,8 +3549,8 @@ geffen_in,59,74,4 script Jesqurienne#sign 803,{
mes "ask us the questions?";
next;
donpcevent "Aaron#sign::onSmile";
- emotion e_gasp;
- emotion e_gasp,1;
+ emotion ET_SURPRISE;
+ emotion ET_SURPRISE, playerattached();
mes "[Aaron]";
mes "Did someone say";
mes "''Quiz Challenge?''";
@@ -3558,7 +3558,7 @@ geffen_in,59,74,4 script Jesqurienne#sign 803,{
mes "of assistance.";
next;
set sign_q,21;
- emotion e_gg;
+ emotion ET_KIK;
mes "[Jesqurienne]";
mes "Professor Aaron?";
mes "Ho ho~ If he's asking";
@@ -3608,11 +3608,11 @@ geffen_in,59,74,4 script Jesqurienne#sign 803,{
mes "never had a chance! Of course,";
mes "I did, but you know, I guess you had to learn for yourself.";
next;
- emotion e_an;
+ emotion ET_FRET;
mes "[Jesqurienne]";
mes "I'd insult you if it weren't for the fact that you embarassed yourself enough during the Quiz Challenge. As a matter of fact, I'll even forgive you for wounding my pride earlier.";
next;
- emotion e_gg;
+ emotion ET_KIK;
mes "[Jesqurienne]";
mes "Can you believe it?";
mes "Even drunk I can beat";
@@ -3708,11 +3708,11 @@ geffen_in,59,74,4 script Jesqurienne#sign 803,{
}
OnOmg:
- emotion e_omg;
+ emotion ET_HUK;
end;
OnHo:
- emotion e_ho;
+ emotion ET_DELIGHT;
end;
}
@@ -3724,7 +3724,7 @@ geffen_in,61,72,7 script Aaron#sign 754,{
mes "we begin, let me";
mes "tell you the rules...";
next;
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
mes "[Aaron]";
mes "I'm going to give you";
mes "ten multiple choice questions.";
@@ -4344,7 +4344,7 @@ geffen_in,61,72,7 script Aaron#sign 754,{
next;
if (.@npc_p > .@user_p) {
set sign_q,23;
- emotion e_gg;
+ emotion ET_KIK;
mes "[Jesqurienne]";
mes "Bwahahaha!";
mes "I win! I knew it!";
@@ -4375,7 +4375,7 @@ geffen_in,61,72,7 script Aaron#sign 754,{
close;
}
else {
- emotion e_omg;
+ emotion ET_HUK;
mes "Goodness...!";
mes "Either these beer";
mes "goggles are on too tight,";
@@ -4384,7 +4384,7 @@ geffen_in,61,72,7 script Aaron#sign 754,{
next;
if (Sex == SEX_MALE) {
select("Um, I'm a dude...");
- emotion e_sob;
+ emotion ET_CRY;
mes "[Aaron]";
mes "N-no...!";
mes "M-maybe I should";
@@ -4394,14 +4394,14 @@ geffen_in,61,72,7 script Aaron#sign 754,{
}
else {
select("Why, thank you~");
- emotion e_no1;
+ emotion ET_BEST;
mes "[Aaron]";
mes "Ah, yes. Your";
mes "sense of style, your";
mes "magnificent body. Everything";
mes "about you is beautiful! Not just that, but you're also intelligent!";
next;
- emotion e_lv2;
+ emotion ET_BIGTHROB;
mes "[Aaron]";
mes "I should know!";
mes "Not only do I teach";
@@ -4413,7 +4413,7 @@ geffen_in,61,72,7 script Aaron#sign 754,{
close;
}
OnSmile:
- emotion e_heh;
+ emotion ET_SMILE;
end;
}
@@ -4431,7 +4431,7 @@ cmd_in02,88,51,4 script Strange Guy#sign 806,{
mes "like you want something from";
if (Zeny < 10000) {
mes "me. Hah! You are poor!";
- emotion e_pif;
+ emotion ET_HNG;
mes "It also looks like you're low on cash~! Well, this is what guys like me to do to shameless";
mes "moochers like you!";
percentheal -10,0;
@@ -4807,7 +4807,7 @@ cmd_in02,88,51,4 script Strange Guy#sign 806,{
if (Zeny < 10000) {
mes "me. It also looks like you're low on cash~! Well, this is what guys like me to do to shameless";
mes "moochers like you!";
- emotion e_pif;
+ emotion ET_HNG;
percentheal -10,0;
close;
}
@@ -4827,14 +4827,14 @@ cmd_in02,88,51,4 script Strange Guy#sign 806,{
mes "other, I'm borrowing some";
mes "cash. You know, for old";
mes "time's sake. ^FF0000Yoink!^000000";
- emotion e_gg;
+ emotion ET_KIK;
set Zeny, Zeny-10000;
}
else {
mes "I got nothin' for you and";
mes "you obviously have nothing";
mes "for me! Now lemme gamble!";
- emotion e_pif;
+ emotion ET_HNG;
}
close;
}
@@ -4845,7 +4845,7 @@ cmd_in02,88,51,4 script Strange Guy#sign 806,{
mes "It's over. Not get outta";
mes "here before I jack some";
mes "more of your cash!";
- emotion e_gg;
+ emotion ET_KIK;
next;
switch(select("Okay.:I want to take Part Two again.")) {
case 1:
@@ -4854,7 +4854,7 @@ cmd_in02,88,51,4 script Strange Guy#sign 806,{
mes "Geez, why do";
mes "these guys always";
mes "come and bother me?";
- emotion e_pif;
+ emotion ET_HNG;
close;
case 2:
mes "[Dearles]";
@@ -5772,7 +5772,7 @@ alberta_in,154,171,5 script Maid#s10 758,{
mes "You see, it'll be my brother's";
mes "birthday, but I'm so busy with";
mes "work that I can't see him.";
- emotion e_thx;
+ emotion ET_THANKS;
next;
mes "[Seylin]";
mes "The last time I saw him,";
@@ -5845,7 +5845,7 @@ alberta_in,154,171,5 script Maid#s10 758,{
mes "I just thought";
mes "that maybe...";
close2;
- emotion e_dots;
+ emotion ET_THINK;
end;
case 2:
mes "[Seylin]";
@@ -5962,7 +5962,7 @@ alberta_in,154,171,5 script Maid#s10 758,{
set sign_q,51;
getitem 525,3; //Panacea
next;
- emotion e_kis2;
+ emotion ET_CHUPCHUP;
close;
}
}
@@ -6058,7 +6058,7 @@ prt_castle,107,58,5 script Soldier#s11 105,{
mes "Wow, I wonder what she";
mes "got for me this year?";
next;
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Maruin]";
mes "Th-this is--!";
mes "Oh. Snap. That's right.";
@@ -6947,7 +6947,7 @@ geffen_in,159,48,5 script Lonely-looking Woman 711,{
mes "I wonder";
mes "how my pickled";
mes "cabbage will turn out?";
- emotion e_ho;
+ emotion ET_DELIGHT;
close;
}
else {
@@ -6987,7 +6987,7 @@ geffen_in,159,48,5 script Lonely-looking Woman 711,{
mes "how he's doing. Still, he should";
mes "be doing a better job of keeping";
mes "in touch with us. ^333333*Sigh*^000000";
- emotion e_dots;
+ emotion ET_THINK;
close;
}
else if (sign_q < 62) {
@@ -7008,7 +7008,7 @@ geffen_in,159,48,5 script Lonely-looking Woman 711,{
else {
mes "Liana's daddy needs to come home more often. ^333333*Sigh*^000000 Even though he's away for long periods of time, I suppose it's for the best...";
close2;
- emotion e_dots;
+ emotion ET_THINK;
end;
}
}
@@ -7046,14 +7046,14 @@ geffen_in,171,42,3 script Cute Girl 703,{
mes "coming home?!";
mes "I... I miss him so much~";
mes "*Cries*";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
else if (sign_q == 54) {
mes "Oh, my mom said she's gonna cook me something good today.";
mes "I wonder what she's gonna make?";
mes "I hope it's pickled cabbage again!";
- emotion e_heh;
+ emotion ET_SMILE;
close;
}
else if (sign_q == 55) {
@@ -7087,7 +7087,7 @@ geffen_in,171,42,3 script Cute Girl 703,{
mes "time to come home and";
mes "see me. Sooooooooo~";
mes "I wrote this letter!";
- emotion e_dots;
+ emotion ET_THINK;
next;
switch(select("....:I'll bring this to him.")) {
case 1:
@@ -7104,7 +7104,7 @@ geffen_in,171,42,3 script Cute Girl 703,{
mes "Okay then, don't";
mes "forget to give this to";
mes "my dad, okay? Promise?";
- emotion e_ho;
+ emotion ET_DELIGHT;
set sign_q,56;
getitem 7276,1; //Picture_Letter
close;
@@ -7179,14 +7179,14 @@ mjo_dun02,88,295,4 script Flaming Spirit Man 85,{
mes "I suppose I understand.";
mes "However, you're lucky that I don't kick you out of my forge right here and right now~";
close2;
- emotion e_pif;
+ emotion ET_HNG;
end;
}
}
else {
mes "I hope you understand that";
mes "this forge isn't really open to the public. I'm doing some intensive training,so I'd appreciate it if you would just leave now.";
- emotion e_pif;
+ emotion ET_HNG;
close2;
warp "mjo_dun02",372,346;
end;
@@ -7196,7 +7196,7 @@ mjo_dun02,88,295,4 script Flaming Spirit Man 85,{
mes "I hope you understand that";
mes "this forge isn't really open to the public. I'm doing some intensive training,so I'd appreciate it if you would just leave now.";
close2;
- emotion e_pif;
+ emotion ET_HNG;
end;
}
else if (sign_q == 56) {
@@ -7388,7 +7388,7 @@ mjo_dun02,88,295,4 script Flaming Spirit Man 85,{
case 67:
mes "You've returned?";
mes "Well, I don't know how to put this, but once you hear it, don't take it the wrong way...";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Engel]";
mes "^333333*Ahem*^000000";
@@ -7418,7 +7418,7 @@ mjo_dun02,88,295,4 script Flaming Spirit Man 85,{
mes "I've got some bad news,";
mes "so please don't overreact~";
mes "Um, are you ready?";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Engel]";
mes "While I was trying to restore the ";
@@ -7658,7 +7658,7 @@ mjo_dun02,88,295,4 script Flaming Spirit Man 85,{
mes "Sometimes, you can only";
mes "improve yourself by training in solitude. But don't ever forget about the ones who really care about you. It's those people who make everything worth it.";
close2;
- emotion e_dots;
+ emotion ET_THINK;
end;
}
}
@@ -7672,7 +7672,7 @@ gef_tower,118,36,4 script Annoyed Man 64,{
mes "What could possibly be";
mes "the answer I'm looking";
mes "for? ^333333*Sigh...*^000000";
- emotion e_pif;
+ emotion ET_HNG;
close;
}
else if (sign_q == 72) {
@@ -7686,7 +7686,7 @@ gef_tower,118,36,4 script Annoyed Man 64,{
mes "Why bother climbing this tower?";
}
mes "What are you doing here?!";
- emotion e_pif;
+ emotion ET_HNG;
next;
input .@input$;
if ((.@input$ == "Metz Brayde") || (.@input$ == "Sobbing Starlight")) {
@@ -7702,18 +7702,18 @@ gef_tower,118,36,4 script Annoyed Man 64,{
next;
mes "[Dhota]";
mes "...";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "[Dhota]";
mes "...";
mes "......";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "[Dhota]";
mes "...";
mes "......";
mes "BWAAAAH~!";
- emotion e_ag;
+ emotion ET_ANGER;
next;
mes "[Dhota]";
mes "Right, he wants that guy";
@@ -7723,7 +7723,7 @@ gef_tower,118,36,4 script Annoyed Man 64,{
mes "near Comodo to investigate some";
mes "tribal people or whatever.";
set sign_q,73;
- emotion e_pif;
+ emotion ET_HNG;
close;
}
else {
@@ -7742,7 +7742,7 @@ gef_tower,118,36,4 script Annoyed Man 64,{
mes "What could possibly be";
mes "the answer I'm looking";
mes "for? ^333333*Sigh...*^000000";
- emotion e_pif;
+ emotion ET_HNG;
close;
}
}
@@ -7758,7 +7758,7 @@ umbala,163,256,3 script Native#_s 781,{
mes "one of those? Well, I'd";
mes "be happy if I had some";
mes "Meat to eat, I guess!";
- emotion e_ho;
+ emotion ET_DELIGHT;
close;
}
else if (sign_q == 73) {
@@ -7836,7 +7836,7 @@ um_in,27,23,3 script Fastidious-Looking Guy 121,{
mes "then that and then...";
mes "Ooh, these calculations";
mes "are absolutely perfect!";
- emotion e_gg;
+ emotion ET_KIK;
next;
mes "[Cyon]";
mes "Wh-what?!";
@@ -7844,7 +7844,7 @@ um_in,27,23,3 script Fastidious-Looking Guy 121,{
mes "H-how did you get";
mes "in here? I demand";
mes "that you leave, right now!";
- emotion e_an;
+ emotion ET_FRET;
close2;
warp "umbala",111,121;
end;
@@ -7856,7 +7856,7 @@ um_in,27,23,3 script Fastidious-Looking Guy 121,{
mes "then that and then...";
mes "Ooh, these calculations";
mes "are absolutely perfect!";
- emotion e_gg;
+ emotion ET_KIK;
next;
mes "[Cyon]";
mes "Wh-what?!";
@@ -7864,7 +7864,7 @@ um_in,27,23,3 script Fastidious-Looking Guy 121,{
mes "H-how did you get";
mes "in here? I demand";
mes "that you leave, right now!";
- emotion e_an;
+ emotion ET_FRET;
next;
switch(select("I'm here for Metz Brayde.:My apologies.:Would you look at this?:...")) {
case 1:
@@ -7881,7 +7881,7 @@ um_in,27,23,3 script Fastidious-Looking Guy 121,{
mes "then hurry up and get";
mes "out of here! Not just anyone";
mes "is allowed here! Leave!";
- emotion e_pif;
+ emotion ET_HNG;
close;
case 3:
mes "[Cyon]";
@@ -7891,7 +7891,7 @@ um_in,27,23,3 script Fastidious-Looking Guy 121,{
mes "Fine, you've piqued my";
mes "scientific curiosity...";
next;
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Cyon]";
mes "Sweet lord...";
@@ -8550,7 +8550,7 @@ que_sign01,196,39,4 script Serin#serin 90,{
mes "I really don't want to fight you,";
mes "but I've come too far to give up now. If you insist on interfering, then you leave me no choice...";
next;
- emotion e_gg,0,"Dark Lord#serin";
+ emotion ET_KIK, getnpcid(0, "Dark Lord#serin");
mes "[Dark Lord]";
mes "^330033Insolent mortal!";
mes "Do you really think";
@@ -8733,7 +8733,7 @@ que_sign01,197,195,4 script Serin#witch 90,{
mes "[Serin]";
mes "...";
mes "......";
- emotion e_dots;
+ emotion ET_THINK;
close;
}
else if (sign_q == 124) {
@@ -9351,7 +9351,7 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 90,{
mes "At least we both agree that";
mes "somehow I don't really belong";
mes "here in Niflheim.";
- emotion e_dots;
+ emotion ET_THINK;
set sign_q,93;
close;
}
@@ -9374,7 +9374,7 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 90,{
mes "but it seems like Angrboda";
mes "has been sealed away in the";
mes "world of Rune-Midgard...";
- emotion e_dots;
+ emotion ET_THINK;
set sign_q,94;
close;
}
@@ -9542,7 +9542,7 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 90,{
mes "you for giving back my ring,";
mes "my most precious possession.";
mes "Thank you, thank you...";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "^3355FFThe sound of Serin's voice";
mes "softened and when it grew silent, her eyes blankly stared ahead as";
@@ -9557,31 +9557,31 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 90,{
getexp (checkre(3))?50000:500000,0;
close;
case 2:
- emotion e_sob;
+ emotion ET_CRY;
close;
}
}
else {
- emotion e_sob;
+ emotion ET_CRY;
close;
}
}
else if (sign_q == 130) {
mes "[Serin]";
mes "...........";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Serin]";
mes "...........";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "[Serin]";
mes "...........";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "[Serin]";
mes "...........";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
else if (sign_q == 131) {
@@ -9710,7 +9710,7 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 90,{
mes "......";
mes "W-who...";
mes "Who are you?";
- emotion e_dots;
+ emotion ET_THINK;
close;
}
else if (sign_q > 199) {
@@ -9734,7 +9734,7 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 90,{
if (countitem(2642) > 0) {
mes "[Serin]";
mes "Thank you...";
- emotion e_sob;
+ emotion ET_CRY;
delitem 2642,1; //Serin's_Gold_Ring
next;
mes "^3355FFYou returned";
@@ -9744,7 +9744,7 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 90,{
mes "[Serin]";
mes "...";
mes "......";
- emotion e_dots;
+ emotion ET_THINK;
close;
}
}
@@ -9911,7 +9911,7 @@ que_sign01,122,141,4 script Witch#s 792,{
mes "Why haven't you";
mes "brought my books";
mes "back to me yet?";
- emotion e_pif;
+ emotion ET_HNG;
close;
}
}
@@ -9993,7 +9993,7 @@ que_sign01,122,141,4 script Witch#s 792,{
next;
mes "[Kirkena]";
mes "Serin's already hid herself";
- mes "deep within Niffleim, but I'm";
+ mes "deep within Niflheim, but I'm";
mes "sure you can find something";
mes "if you can find any remaining";
mes "trace of her.";
@@ -10008,7 +10008,7 @@ que_sign01,122,141,4 script Witch#s 792,{
mes "side! Well, I won't take the";
mes "symbol against your will, but";
mes "you better think this over...";
- emotion e_dots;
+ emotion ET_THINK;
close;
}
}
@@ -10674,7 +10674,7 @@ OnTouch_:
mes "[Kirkena]";
mes "...";
mes "Hrrmmmpf...";
- emotion e_pif;
+ emotion ET_HNG;
close;
case 2:
mes "[Kirkena]";
@@ -11300,7 +11300,7 @@ niflheim,102,54,4 script Mad Man#s 739,{
mes "for me to enjoy myself";
mes "if my soul ends up getting";
mes "busted by the gods.";
- emotion e_pif;
+ emotion ET_HNG;
close;
}
else {
@@ -11401,7 +11401,7 @@ niflheim,102,54,4 script Mad Man#s 739,{
mes "Hehehehe~";
close;
}
- emotion e_pif;
+ emotion ET_HNG;
close;
case 2:
if (Zeny < 60000) {
@@ -11409,7 +11409,7 @@ niflheim,102,54,4 script Mad Man#s 739,{
mes "What is this?";
mes "You tryin to welch";
mes "me or somethin'?";
- emotion e_pif;
+ emotion ET_HNG;
close;
}
else {
@@ -11504,7 +11504,7 @@ niflheim,102,54,4 script Mad Man#s 739,{
mes "[Laichin]";
mes "Whatever, dude!";
mes "Freakin' cheapskate...";
- emotion e_pif;
+ emotion ET_HNG;
close;
}
}
@@ -11867,7 +11867,7 @@ OnTouch_:
mes "^333333*Cries*^000000";
mes "Where am I?";
mes "I... I wanna go home~";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
else if (sign_sq == 1) {
@@ -11893,7 +11893,7 @@ OnTouch_:
mes "N-no...";
mes "I wanna go home...";
close2;
- emotion e_sob;
+ emotion ET_CRY;
end;
}
}
@@ -11902,7 +11902,7 @@ OnTouch_:
mes "^333333*Cries*^000000";
mes "Where am I?";
mes "I... I wanna go home~";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
else if ((sign_sq == 3) || (sign_sq == 4)) {
@@ -11923,7 +11923,7 @@ OnTouch_:
mes "who knows how to";
mes "get me back home...";
mes "^333333*Cries*^000000";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
}
@@ -11934,7 +11934,7 @@ OnTouch_:
mes "anything! I-I'm still here";
mes "in this scary place! ^333333*Cries*^000000";
set sign_sq,6;
- emotion e_sob;
+ emotion ET_CRY;
close;
}
else {
@@ -11944,7 +11944,7 @@ OnTouch_:
mes "but you didn't help me";
mes "at all. Y-you lied to me!";
mes "I... I hate you! ^333333*Wah~!*^000000";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
}
@@ -11953,7 +11953,7 @@ OnTouch_:
mes "^333333*Cries*^000000";
mes "Where am I?";
mes "I... I wanna go home~";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
end;
diff --git a/npc/re/cities/dewata.txt b/npc/re/cities/dewata.txt
index 6b0ea9ef733..8309b6efd89 100644
--- a/npc/re/cities/dewata.txt
+++ b/npc/re/cities/dewata.txt
@@ -208,13 +208,13 @@ OnTouch:
mes "[Lazy Young Man]";
mes "Arrgg~ I'm thirsty~~ so thirsty~~";
mes "Give me Palm juice... Palm Juuiice~~";
- emotion e_an;
+ emotion ET_FRET;
next;
- emotion e_an;
+ emotion ET_FRET;
next;
- emotion e_an;
+ emotion ET_FRET;
next;
- emotion e_an;
+ emotion ET_FRET;
close;
}
end;
@@ -227,11 +227,11 @@ dewata,159,81,4 script Tourist#dew-1 881,{
next;
mes "[Nasolo]";
mes "If only I had one...";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Nasolo]";
mes "I wonder when my princess will come...";
- emotion e_sigh;
+ emotion ET_OHNO;
close;
}
@@ -324,12 +324,12 @@ dewata,147,107,6 script Gourmet#dew 85,{
mes "[Gourmet]";
mes "Oh... it's like a party in my";
mes "mouth... and everyone's invited!";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Gourmet]";
mes "Master~ One more please~";
- emotion e_no1;
- emotion e_ok,0,"Restauranteur#dew";
+ emotion ET_BEST;
+ emotion ET_OK, getnpcid(0, "Restauranteur#dew");
next;
mes "[Gourmet]";
mes "You must try this! The Food here is succulent~";
@@ -340,7 +340,7 @@ dewata,154,107,4 script Sightseer#dew 86,{
mes "[Tourist]";
mes "Wow...";
mes "How many has he already eaten?";
- emotion e_hmm;
+ emotion ET_SCRATCH;
next;
mes "[Tourist]";
mes "He must be big eater, not the gourmet...";
@@ -355,19 +355,19 @@ dewata,95,203,6 script Travel Guide#dew 536,{
mes "This temple behind me is called Borobudur.";
mes "Borobudur temple was built in the 9th century";
mes "to venerate the Great Buddha, an ancient religious figure.";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Guide]";
mes "This temple is made with 6 square platforms and 3 round platforms, and 2672 hand carved relief panels as well as 504 statue of various Buddhas.";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Guide]";
mes "The central stupa, or shrine is located at the center of high platform, which is surrounded by 72 more statues.";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Guide]";
mes "Even in modern times Borobudur temple is a pilgimage site for many monks worshiping the Buddha. It's also a major tourist attraction, as you can imagine.";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Guide]";
mes "That is all I have on Borobudur temple, are there any questions?";
@@ -383,11 +383,11 @@ dewata,97,207,4 script Tourist#dew1 803,{
mes "[Tourist]";
mes "This hombre is a real snooze...";
mes "Why make it longer..";
- emotion e_spin;
+ emotion ET_CONFUSE;
next;
mes "[Tourist]";
mes "I need to change my travel agent...";
- emotion e_sigh;
+ emotion ET_OHNO;
close;
}
@@ -415,7 +415,7 @@ dewata,99,203,4 script Tourist#dew4 755,{
mes "[Tourist]";
mes "Oh~ This is very interesting. A";
mes "temple that worships the Buddha...";
- emotion e_ok;
+ emotion ET_OK;
next;
mes "[Tourist]";
mes "But I don't really get all the";
@@ -653,7 +653,7 @@ dewata,245,244,4 script Lodge Employee#dew 536,2,3,{
OnTouch:
mes "[Lodge employee]";
mes "Argg~ This is really ticking me off!";
- emotion e_an;
+ emotion ET_FRET;
next;
mes "[Lodge employee]";
mes "How come more and more couples come here?";
@@ -670,17 +670,17 @@ dewata,233,263,8 script Sweet Married Couple#1 828,2,3,{
OnTouch:
mes "[Sweet Husband]";
mes "You are the most beautiful thing in the world baby~";
- emotion e_kis;
+ emotion ET_CHUP;
next;
mes "[Sweet Wife]";
mes "Really? I'm that beautiful? I love you, honey~";
- emotion e_kis2,0,"Sweet Married Couple#dew2";
+ emotion ET_CHUPCHUP, getnpcid(0, "Sweet Married Couple#dew2");
next;
mes "[Sweet Married Couple]";
mes "Hahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahaha";
mes "Hohohohohohohohohohohohohohohohohohohohohohohohohohohohohohohohohohohoho";
- emotion e_heh;
- emotion e_heh,0,"Sweet Married Couple#dew2";
+ emotion ET_SMILE;
+ emotion ET_SMILE, getnpcid(0, "Sweet Married Couple#dew2");
next;
mes "Come on now, I'm growing tired of this. Let's go.";
close;
@@ -690,28 +690,28 @@ dewata,234,263,8 script Sweet Married Couple#2 727,2,3,{
OnTouch:
mes "[Sweet Wife]";
mes "Baby~ You know what flower that is~?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
mes "[Sweet Husband]";
mes "Hmm? I don't know. But it's really pretty.";
next;
mes "[Sweet Wife]";
mes "Baby~ Who's prettier, me or the flower?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
mes "[Sweet Husband]";
mes "No matter how pretty the flower is, you are always more beautiful~";
- emotion e_kis,0,"Sweet Married Couple#dew1";
+ emotion ET_CHUP, getnpcid(0, "Sweet Married Couple#dew1");
next;
mes "[Sweet Wife]";
mes "Really? I'm that pretty? I love you, sweetie~";
- emotion e_kis2;
+ emotion ET_CHUPCHUP;
next;
mes "[Sweet Married Couple]";
mes "Hahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahaha";
mes "Hohohohohohohohohohohohohohohohohohohohohohohohohohohohohohohohohohohoho";
- emotion e_heh,0,"Sweet Married Couple#dew1";
- emotion e_heh;
+ emotion ET_SMILE, getnpcid(0, "Sweet Married Couple#dew1");
+ emotion ET_SMILE;
next;
mes "Come on now, this bores me. Let's move on.";
close;
@@ -731,7 +731,7 @@ OnTouch:
next;
mes "[Reclining Tourist]";
mes "That's why I haven't moved in a whole week! Hahahaha~";
- emotion e_heh;
+ emotion ET_SMILE;
close;
}
@@ -745,7 +745,7 @@ OnTouch:
next;
mes "[Kid]";
mes "Who IS that man?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
mes "[Kid]";
mes "I don't want to be a lazybones like him when I grow up.";
@@ -782,14 +782,14 @@ OnTouch:
next;
mes "[Sarr]";
mes "I found Siyak!! Come out, come out!!";
- emotion e_gg,0,"Sarr#dew";
- emotion e_omg;
- emotion e_gg,0,"Sipo#dew";
- emotion e_omg,1;
+ emotion ET_KIK, getnpcid(0, "Sarr#dew");
+ emotion ET_HUK;
+ emotion ET_KIK, getnpcid(0, "Sipo#dew");
+ emotion ET_HUK, playerattached();
next;
mes "[Siyak]";
mes "Arrgg!! This is all your fault~!!";
- emotion e_an;
+ emotion ET_FRET;
close;
}
@@ -800,10 +800,10 @@ OnTouch:
next;
mes "[Sarr]";
mes "I found Siyak!! Come out come out!!";
- emotion e_gg,0,"Sarr#dew";
- emotion e_omg,0,"Siyak#dew";
- emotion e_gg;
- emotion e_omg,1;
+ emotion ET_KIK, getnpcid(0, "Sarr#dew");
+ emotion ET_HUK, getnpcid(0, "Siyak#dew");
+ emotion ET_KIK;
+ emotion ET_HUK, playerattached();
next;
mes "[Sipo]";
mes "Hehe~ Now Siyak is IT~ I'll just keep hiding in here.";
@@ -817,7 +817,7 @@ OnTouch:
next;
mes "[Majya]";
mes "I've been just standing here, and they haven't found me for 3 hours...";
- emotion e_hmm;
+ emotion ET_SCRATCH;
next;
mes "[Majya]";
mes "What should I do? Come out? I don't want to be IT...";
@@ -828,24 +828,24 @@ dewata,278,100,4 script Missing Child#dew 703,2,3,{
OnTouch:
mes "[Ukki]";
mes "WaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaa~";
- emotion e_sob;
- emotion e_swt2;
+ emotion ET_CRY;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "["+strcharinfo(0)+"]";
mes "Hey, kid...";
next;
mes "[Ukki]";
mes "WaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaa~";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Ukki]";
mes "Mama~ Papa~ Where are youuu~ Waa~";
- emotion e_sob;
- emotion e_swt2;
+ emotion ET_CRY;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "["+strcharinfo(0)+"]";
mes "... ... ...";
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
close;
}
@@ -853,14 +853,14 @@ dewata,249,87,4 script Mum#dew 101,2,3,{
OnTouch:
mes "[Mum]";
mes "Ukki~ Ukki~ Where did she go?";
- emotion e_wah;
+ emotion ET_KEK;
next;
mes "[Mum]";
mes "I can't take my eyes of her for a second...";
next;
mes "[Mum]";
mes "Ukki~";
- emotion e_wah;
+ emotion ET_KEK;
close;
}
@@ -868,20 +868,20 @@ dewata,251,85,6 script Poppa#dew 97,2,3,{
OnTouch:
mes "[Poppa]";
mes "Honey, is Ukki lost again?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
mes "[Poppa]";
mes "Arrgg... I can't go anywhere with her... How many times already?";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Daddy]";
mes "She's gotten lost in Louyang, Amatsu, Moscovia, Brasilis, Kunlun,";
mes "and in Ayothaya...";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Daddy]";
mes "What!! It's already been 7 times including this time in Dewata... 7 times!!!!!!";
- emotion e_otl;
+ emotion ET_OTL;
close;
}
@@ -897,7 +897,7 @@ dewata,278,281,4 script Happily Married Grandpa 534,{
mes "[Happily Married Grandpa]";
mes "It makes me love her even more.";
mes "You can't imagine the wonderful flavor!";
- emotion e_lv;
+ emotion ET_THROB;
close;
}
@@ -906,7 +906,7 @@ dewata,280,277,4 script Happily Married Grandma 535,{
mes "In my younger days,";
mes "there were many gentleman callers";
mes "who wanted to court me.";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Happily Married Grandma]";
mes "Yet, I met just the right guy,";
@@ -925,7 +925,7 @@ dewata,280,277,4 script Happily Married Grandma 535,{
mes "I always think it was lucky";
mes "to be growing old with a guy";
mes "who loves what I cook.";
- emotion e_lv;
+ emotion ET_THROB;
close;
}
@@ -1077,7 +1077,7 @@ dewata,204,230,6 script Dieting Lady#dew 537,{
mes "too much of a good thing is bad...";
mes "I should stick with my diet.";
mes "Sorry, I'll give it back to you.";
- emotion e_sob;
+ emotion ET_CRY;
close;
case 2:
mes "[Dieting Lady]";
@@ -1085,7 +1085,7 @@ dewata,204,230,6 script Dieting Lady#dew 537,{
mes "Since you don't want to share.";
mes "Anyway, I shouldn't cheat on my diet";
mes "even for something that looks and smells so good...";
- emotion e_pif;
+ emotion ET_HNG;
close;
}
}
@@ -1145,7 +1145,7 @@ dewata,127,248,6 script Wishing Kid#dew 539,{
mes "But, what should I do...?";
mes "I've forgotten how many ^FF0000nights^000000";
mes "I've already slept... boo hoo!";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
diff --git a/npc/re/cities/dicastes.txt b/npc/re/cities/dicastes.txt
index 96200cbc64c..606a4f86d0a 100644
--- a/npc/re/cities/dicastes.txt
+++ b/npc/re/cities/dicastes.txt
@@ -22,7 +22,7 @@ dicastes01,194,159,5 script Excited Galten#a 492,{
if (isequipped(2782)) {
mes "I can't get beautiful";
mes "Ahat's image out of my head.";
- emotion e_lv;
+ emotion ET_THROB;
mes "As long as we have him,";
mes "it will only be a matter of time before Sapha";
mes "will rule this land.";
@@ -301,14 +301,14 @@ dic_in01,149,104,5 script Tired Piom#b 455,{
mes "I will need another dose of Bradium.";
mes "I think the effects are weaker than before,";
mes "or is it just me?";
- emotion e_what;
+ emotion ET_QUESTION;
close;
}
mes "��� �� ��";
mes "������ �� ��� �� �����";
mes "����� �� ������ �� ���";
mes "������ ��";
- emotion e_what;
+ emotion ET_QUESTION;
close;
}
@@ -324,7 +324,7 @@ dic_in01,341,113,3 script Tired Piom#a 491,{
mes "[Tired Piom]";
mes "...";
next;
- emotion e_swt;
+ emotion ET_SWEAT;
mes "[Tired Piom]";
mes "I'll be rejected again, right?";
close;
@@ -337,7 +337,7 @@ dic_in01,341,113,3 script Tired Piom#a 491,{
mes "[Tired Piom]";
mes "��";
next;
- emotion e_swt;
+ emotion ET_SWEAT;
mes "[Tired Piom]";
mes "������ �� ����";
close;
@@ -547,13 +547,13 @@ dicastes01,235,245,4 script Excited Piom#a 490,{
if (isequipped(2782)) {
mes "[Excited Piom]";
mes "Have you seen Ahat?";
- emotion e_ho;
+ emotion ET_DELIGHT;
mes "His popularity here in El Discastes is phenomenal!";
close;
}
mes "[Excited Piom]";
mes "������ �� ������ ��";
- emotion e_ho;
+ emotion ET_DELIGHT;
mes "����� �� ����� �� ����� �� �� ��";
close;
}
@@ -584,7 +584,7 @@ dicastes01,164,180,4 script Limpy Piom#a 489,{
mes "I hope everything goes well.";
mes "I hope it doesn't come all";
mes "the way to the capital city here.";
- emotion e_dots;
+ emotion ET_THINK;
close;
}
mes "������ �� ����";
@@ -592,7 +592,7 @@ dicastes01,164,180,4 script Limpy Piom#a 489,{
mes "������ �� ������";
mes "���� �� ������";
mes "����� �� ���� �� ����";
- emotion e_dots;
+ emotion ET_THINK;
close;
}
@@ -612,13 +612,13 @@ dicastes01,191,202,4 script Complaining Galten#fihs 450,{
mes "Then, I don't know what to talk about with you.";
close;
}
- emotion e_gg,0,"Crazy Venknick#fihsing1";
+ emotion ET_KIK, getnpcid(0, "Crazy Venknick#fihsing1");
mes "[Complaining Galten]";
mes "You also fell for that crazy man.";
next;
mes "[" + strcharinfo(0) + "]";
mes "Yes";
- emotion e_sob,1;
+ emotion ET_CRY, playerattached();
next;
mes "[Complaining Galten]";
mes "Just forget about it quickly for your own good.";
@@ -658,19 +658,19 @@ dicastes01,202,197,4 script Crazy Venknick#fihsing1 449,{
set Zeny, Zeny-5000;
mes "[Crazy Venknick]";
mes "Thanks.";
- emotion e_gg,0,"Complaining Galten#fihs";
+ emotion ET_KIK, getnpcid(0, "Complaining Galten#fihs");
next;
mes "["+strcharinfo(0)+"]";
mes "What is the sad legend?";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "["+strcharinfo(0)+"]";
mes "I asked what the sad legend is about!";
next;
mes "[Crazy Venknick]";
mes "I don't believe in legends.";
next;
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
mes "["+strcharinfo(0)+"]";
mes "Was I tricked?";
sc_start SC_Blind,20000,0;
diff --git a/npc/re/cities/malangdo.txt b/npc/re/cities/malangdo.txt
index 04d67697784..d55077e62b5 100644
--- a/npc/re/cities/malangdo.txt
+++ b/npc/re/cities/malangdo.txt
@@ -304,7 +304,7 @@ malangdo,147,117,3 script Innkeeper#malang 554,{
specialeffect2 EF_HEALSP;
mes "[Innkeeper]";
mes "Now relax.";
- emotion e_kis;
+ emotion ET_CHUP;
next;
warp "malangdo",140,121;
close;
@@ -362,20 +362,20 @@ OnTouch:
soundeffect "assassin_of_sunset.wav",0;
break;
case 4:
- emotion e_ho;
- emotion e_ho,0,"Wandering Minstrel#mal";
+ emotion ET_DELIGHT;
+ emotion ET_DELIGHT, getnpcid(0, "Wandering Minstrel#mal");
break;
}
end;
}
malangdo,216,168,3 script Cat Trainer#mal1 558,0,8,{
- emotion e_awsm;
+ emotion ET_COOL;
mes "[Cat Trainer]";
mes "Ooo~ their soft puffy tails and soft fur~";
mes "I can't stand it, this is heaven~~!!";
next;
- emotion e_gg;
+ emotion ET_KIK;
mes "[Cat Trainer]";
mes "My hidden card, ^FF0000Silvervine Fruit^000000, can make all cats in Malangdo my slaves~ haha!";
next;
@@ -390,24 +390,24 @@ malangdo,216,168,3 script Cat Trainer#mal1 558,0,8,{
mes "Why would I tell you when I can barely get it?";
mes "I wouldn't even tell you for all the zeny in the world~!";
next;
- emotion e_gg;
+ emotion ET_KIK;
mes "[Cat Trainer]";
mes "All the Malangdo cats are mine~!";
mes "Muahahahaha~";
mes "With enough ^FF0000Silvervine Fruit^000000 I can be a queen in Malangdo~ ohhhh!!!";
close;
OnTouch:
- emotion e_flash;
+ emotion ET_SPARK;
end;
}
malangdo,164,203,3 script Cat Trainer#mal2 853,{
- emotion e_awsm;
+ emotion ET_COOL;
mes "[Cat Trainer]";
mes "Ooo~ their soft puffy tails and soft fur~";
mes "I can't stand it, this is heaven~~!!";
next;
- emotion e_gg;
+ emotion ET_KIK;
mes "[Cat Trainer]";
mes "This is my little secret called";
mes "^FF0000Silvervine Fruit^000000. I can use";
@@ -427,7 +427,7 @@ malangdo,164,203,3 script Cat Trainer#mal2 853,{
mes "[Cat Trainer]";
mes "Hey, you almost made me tell my secret.";
next;
- emotion e_gg;
+ emotion ET_KIK;
mes "[Cat Trainer]";
mes "One day these cats will be mine.";
mes "I can be a king in Malangdo~ ohhh~!";
diff --git a/npc/re/cities/malaya.txt b/npc/re/cities/malaya.txt
index d6f0683e541..d16c8775838 100644
--- a/npc/re/cities/malaya.txt
+++ b/npc/re/cities/malaya.txt
@@ -325,11 +325,11 @@ malaya,227,311,4 script Grandma#ma01 575,{
malaya,189,263,4 script Drumming Young Man#ma02 578,{
if (malaya_hi < 10) {
- emotion e_omg;
+ emotion ET_HUK;
mes "[Drumming Young Man]";
mes "Ugh... it's just like that time before...";
next;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Drumming Young Man]";
mes "When the moon was swallowed. Argh!";
close;
@@ -337,7 +337,7 @@ malaya,189,263,4 script Drumming Young Man#ma02 578,{
mes "[Drumming Young Man]";
mes "I think the village was saved by a nameless adventurer.";
next;
- emotion e_sigh;
+ emotion ET_OHNO;
mes "[Drumming Young Man]";
mes "Phew... I thought Bakonawa appeared again.";
close;
@@ -354,7 +354,7 @@ malaya,189,263,4 script Drumming Young Man#ma02 578,{
mes "But I know that Bakonawa could also 'swallow people', too.";
next;
select("Huk! Then isn't it dangerous?");
- emotion e_gg;
+ emotion ET_KIK;
mes "[Drumming Young Man]";
mes "Ha ha ha. There is a way to stop Bakonawa from swallowing a person.";
next;
@@ -378,12 +378,12 @@ malaya,189,263,4 script Drumming Young Man#ma02 578,{
malaya,270,59,4 script Port Guard#ma03 570,{
if (malaya_hi < 10) {
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
mes "[Port Guard]";
mes "The village is chaotic these days. Is it okay for me to be off like this?";
close;
} else if (malaya_hi < 20) {
- emotion e_no;
+ emotion ET_STARE_ABOUT;
mes "[Port Guard]";
mes "The village is somewhat stable now but you should still be careful walking around at night.";
close;
@@ -393,7 +393,7 @@ malaya,270,59,4 script Port Guard#ma03 570,{
mes getd("$ma_name0"+rand(1,6)+"$")+" is said to escape from Buwaya alive after being captured. This person must be powerful.";
close;
}
- emotion e_omg;
+ emotion ET_HUK;
mes "[Port Guard]";
mes "What!! Port all clear!!";
next;
@@ -422,7 +422,7 @@ malaya,270,59,4 script Port Guard#ma03 570,{
mes "[Port Guard]";
mes "And you should run into the nearest building when you hear Wokwoks wings fluttering from afar.";
next;
- emotion e_hmm;
+ emotion ET_SCRATCH;
mes "[Port Guard]";
mes "But if the fluttering sound is small or if you don't hear anything, let's just say you should prepare for attack and wish for luck.";
close;
diff --git a/npc/re/cities/mora.txt b/npc/re/cities/mora.txt
index 9b86ae914fe..a127ebe2a64 100644
--- a/npc/re/cities/mora.txt
+++ b/npc/re/cities/mora.txt
@@ -37,12 +37,12 @@ mora,160,123,3 script Nemnem#p 517,{
case 1:
mes "[Nemnem]";
mes "Bra~vo!";
- emotion e_awsm;
+ emotion ET_COOL;
close;
case 2:
mes "[Nemnem]";
mes "If not, never mind!";
- emotion e_swt2,1;
+ emotion ET_PROFUSELY_SWEAT, playerattached();
close;
}
}
@@ -71,7 +71,7 @@ mora,105,104,3 script Boaster#podo 514,{
mes "So the situation got";
mes "more and more serious...";
mes "Now give me some more coins.";
- emotion e_swt2,1;
+ emotion ET_PROFUSELY_SWEAT, playerattached();
close;
}
@@ -232,7 +232,7 @@ mora,174,171,0 script Warehouse Worker#mo1 518,{
mes "[Shortffle]";
mes "I want to climb the ladder,";
mes "but my legs are too short to do that.";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Shortffle]";
mes "I wonder who brought it here.";
@@ -314,7 +314,7 @@ mora,113,185,4 script Reading Raffle#ep14_1 516,{
mes "[Reading Rafflesia]";
mes "*gasp* Who are you? How long";
mes "were you standing there? How rude.";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "The Rafflesia closed the book hastily.";
mes "You're curious what will happen next,";
@@ -338,13 +338,13 @@ mora,99,65,6 script Banana Rafflesia#ep14_1 516,{
mes "[Banana Rafflesia]";
mes "Take it if you can.";
mes "If you are successful, you can have it for free.";
- emotion e_ok;
+ emotion ET_OK;
close;
case 2:
mes "[Banana Rafflesia]";
mes "Well, I was going to give it for free,";
mes "but if you don't want it, it's fine with me.";
- emotion e_pif;
+ emotion ET_HNG;
close;
}
}
@@ -359,7 +359,7 @@ mora,30,128,4 script Relaxing Traveler#ep14_1 514,{
select("... ... ...");
mes "[Traveler]";
mes "Sorry... maybe it's just me...";
- emotion e_sry;
+ emotion ET_SORRY;
close;
}
@@ -402,7 +402,7 @@ mora,168,161,4 script Warehouse Worker#mo2 513,{
next;
mes "[Lively]";
mes "Ahhh... I'd like to make money...";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
@@ -415,12 +415,12 @@ mora,175,161,6 script Warehouse Worker#mo3 518,{
mes "and the blush on its cheeks...";
mes "and its wings, ready to take off";
mes "any moment...";
- emotion e_shy;
+ emotion ET_SHY;
next;
mes "[Kuorita]";
mes "I want to have it badly...";
mes "What would happen if I stole it?";
- emotion e_rice;
+ emotion ET_HUNGRY;
close;
}
@@ -911,17 +911,17 @@ mora,140,186,3 script Raffle Philosopher 517,{
- script #mora_traveler -1,{
mes "[Upset Traveler]";
mes "You... you dare play a game with me?";
- emotion e_ag,0,"Traveler#ep14_1_1";
+ emotion ET_ANGER, getnpcid(0, "Traveler#ep14_1_1");
next;
mes "[Traveler That Posed the Question]";
mes "What...? Do you have proof?";
mes "Do you have proof?!!";
- emotion e_an,0,"Traveler#ep14_1_2";
+ emotion ET_FRET, getnpcid(0, "Traveler#ep14_1_2");
next;
mes "[Traveler Trying to Stop the Fight]";
mes "Look, stop it, just stop it!";
mes "I'm afraid it will turn into a big fight...";
- emotion e_swt2,0,"Traveler#ep14_1_3";
+ emotion ET_PROFUSELY_SWEAT, getnpcid(0, "Traveler#ep14_1_3");
next;
mes "[Traveler Trying to Stop the Fight]";
mes "Oh! Why don't we ask";
@@ -931,7 +931,7 @@ mora,140,186,3 script Raffle Philosopher 517,{
mes "Oh, yes! That's a great idea.";
mes "Well~ Hello there~";
mes "You there, traveler!";
- emotion e_ic,0,"Traveler#ep14_1_1";
+ emotion ET_AHA, getnpcid(0, "Traveler#ep14_1_1");
next;
mes "They seem to be calling out to you.";
next;
@@ -942,7 +942,7 @@ mora,140,186,3 script Raffle Philosopher 517,{
}
mes "["+strcharinfo(0)+"]";
mes "What's happening here?";
- emotion e_what,1;
+ emotion ET_QUESTION, playerattached();
next;
mes "[Upset Traveler]";
mes "I'll tell you what.";
@@ -952,20 +952,20 @@ mora,140,186,3 script Raffle Philosopher 517,{
mes "the third Rosethree...";
mes "the ninth Rosenine...";
mes "you get how it works, right?";
- emotion e_ag,0,"Traveler#ep14_1_1";
+ emotion ET_ANGER, getnpcid(0, "Traveler#ep14_1_1");
next;
mes "[Traveler That Posed the Question]";
mes "Right, that's how it works.";
mes "So I asked what the youngest one would be called,";
mes "and when I told him the answer,";
mes "he got all upset and started cursing me.";
- emotion e_an,0,"Traveler#ep14_1_2";
+ emotion ET_FRET, getnpcid(0, "Traveler#ep14_1_2");
next;
mes "[Upset Traveler]";
mes "You... you bastard!";
mes "Hey there, what do you think";
mes "the answer to the question is?";
- emotion e_ag,0,"Traveler#ep14_1_1";
+ emotion ET_ANGER, getnpcid(0, "Traveler#ep14_1_1");
next;
switch(select("Roseten.:Rose.:How would I know that?")) {
case 1:
@@ -977,11 +977,11 @@ mora,140,186,3 script Raffle Philosopher 517,{
mes "See? Even this traveler says";
mes "Roseten is the answer.";
mes "How dare you try to play tricks on me?";
- emotion e_gg,0,"Traveler#ep14_1_1";
+ emotion ET_KIK, getnpcid(0, "Traveler#ep14_1_1");
next;
mes "[Traveler That Posed the Question]";
mes "You idiot... you don't have the slightest clue!";
- emotion e_an,0,"Traveler#ep14_1_2";
+ emotion ET_FRET, getnpcid(0, "Traveler#ep14_1_2");
break;
case 2:
mes "["+strcharinfo(0)+"]";
@@ -996,12 +996,12 @@ mora,140,186,3 script Raffle Philosopher 517,{
mes "That's exactly what I mean!";
mes "I can't hang around with him.";
mes "I guess we live in two different worlds.";
- emotion e_ok,0,"Traveler#ep14_1_2";
+ emotion ET_OK, getnpcid(0, "Traveler#ep14_1_2");
next;
mes "[Upset Traveler]";
mes "You bastard... What did you";
mes "get from this guy...?";
- emotion e_ag,0,"Traveler#ep14_1_1";
+ emotion ET_ANGER, getnpcid(0, "Traveler#ep14_1_1");
break;
case 3:
mes "["+strcharinfo(0)+"]";
@@ -1011,7 +1011,7 @@ mora,140,186,3 script Raffle Philosopher 517,{
mes "[Traveler Trying to Stop the Fight]";
mes "You good-for-nothing bastard,";
mes "you're trying to leave this mess to me?";
- emotion e_an,0,"Traveler#ep14_1_3";
+ emotion ET_FRET, getnpcid(0, "Traveler#ep14_1_3");
break;
}
next;
@@ -1147,7 +1147,7 @@ mora,43,127,3 script Innkeeper#mora_inn 522,{
mes "[Innkeeper]";
mes "What's worse is that whoever takes medicine made out of Savages will come back for more!";
mes "And he will wander around looking for the tower, and eventually turn into an enormous Savage!";
- emotion e_no,1;
+ emotion ET_STARE_ABOUT, playerattached();
next;
} else {
mes "[Innkeeper]";
diff --git a/npc/re/custom/lasagna/lasagna_npcs.txt b/npc/re/custom/lasagna/lasagna_npcs.txt
index 20e4c0cccda..0cc16710d8b 100644
--- a/npc/re/custom/lasagna/lasagna_npcs.txt
+++ b/npc/re/custom/lasagna/lasagna_npcs.txt
@@ -11,12 +11,6 @@
//= 1.0 First version. [Capuche]
//============================================================
-function script close3 {
- close2;
- cutin "",255;
- end;
-}
-
lasa_fild01,47,297,0 script #doint_evt01 HIDDEN_WARP_NPC,1,1,{
end;
OnTouch:
@@ -161,8 +155,8 @@ OnTouch:
sleep2 2000;
npctalk "You have no idea! DEX comes first if you want your attack to be successful!!", "Applicant MacCarnie#doramt13", bc_self;
sleep2 1000;
- emotion 36,0,"Applicant Paul#doramt13";
- emotion 54,0,"Applicant MacCarnie#doramt13";
+ emotion ET_STARE, getnpcid(0, "Applicant Paul#doramt13");
+ emotion ET_OHNO, getnpcid(0, "Applicant MacCarnie#doramt13");
}
end;
OnInit:
@@ -1628,12 +1622,18 @@ lasagna,208,188,3 script Cat Paw Service#lasagna 4_M_MERCAT1,4,4,{
savepoint "lasagna",193,183,1,1;
close;
case 2:
- if (getskilllv("SU_BASIC_SKILL") < 1) {
+ if (!callfunc("F_CanOpenStorage")) {
mes "[Cat Paw Commerce Group]";
mes "I'm sorry, but...";
- mes "You should learn some basic skills first if you want to use the warehouse.";
- mes "Go and learn the skills until you reach the level to use the warehouse.";
- mes "I believe it should be ^4d4dffbasic level 6^000000 for humans.";
+ if (Class == Job_Summoner) {
+ mes "You should learn the new basic skill first.";
+ mes "Go and learn the skill if you want to use the warehouse.";
+ }
+ else {
+ mes "You should learn some basic skills first if you want to use the warehouse.";
+ mes "Go and learn the skills until you reach the level to use the warehouse.";
+ mes "I believe it should be ^4d4dffbasic level 6^000000 for humans.";
+ }
close;
}
if (countitem(7059) > 0)// Free Ticket for Kafra Storage
@@ -1669,11 +1669,11 @@ OnInit:
}
lasagna,171,105,5 script Emergency Patient#dorco 4_M_DIEMAN,5,5,{
- emotion 26;
+ emotion ET_HELP;
npctalk "S-someone help me... Dorams, they're so cute I'm going to die...", "", bc_self;
end;
OnTouch:
- emotion 26;
+ emotion ET_HELP;
end;
}
@@ -1901,7 +1901,7 @@ lasagna,184,234,5 script Youngster meow#dorcon04 4_M_BABYCAT,{
}
lasagna,186,231,3 script Youngster meow#dorcon05 4_DR_KID_01,{
- emotion 28;
+ emotion ET_CRY;
npctalk "Why Isn't this rolling- Make it roll-", "", bc_self;
end;
}
@@ -1981,10 +1981,10 @@ lasagna,230,192,3 script Perky Doram#do_hint03 4_CAT_ADV2,{
lasagna,235,193,3 script Customer#dorcon02 4_DR_TORTEL,{
npctalk "Always right-click when it comes to information! Right-click a human, item and cat to know more about them!", "", bc_self;
sleep2 1000;
- emotion 3;
+ emotion ET_THROB;
npctalk "Ha- ppi- ness-", "", bc_self;
sleep2 2000;
- emotion 45;
+ emotion ET_SLEEPY;
npctalk "We're full, so there's only one thing to do. Sleep.", "", bc_self;
end;
}
@@ -2046,7 +2046,7 @@ lasagna,236,179,5 script Meow goon#dorcon01 4_DR_M_01,{
mes "Right! They're Aglio and Oligo!";
npctalk "Aglio and Oligo!", "", bc_self;
next;
- emotion 4,0,"Goon meow#dorcon01";
+ emotion ET_SWEAT, getnpcid(0, "Goon meow#dorcon01");
mes "[Goon meow]";
mes "Hey, That's not it... No...";
next;
@@ -2077,8 +2077,8 @@ lasagna,235,178,5 script Goon meow#dorcon01 4_DR_M_02,{
mes "[Meow goon]";
mes "Kah... The poltergeist that had been sleeping inside my bag is raging!";
next;
- emotion 21;
- emotion 21,0,"Meow goon#dorcon01";
+ emotion ET_BEST;
+ emotion ET_BEST, getnpcid(0, "Meow goon#dorcon01");
mes "[Goon meow]";
mes "Good! This should be enough to keep me from getting snubbed in the new world.";
npctalk "We're thoroughly prepared all right!", "Meow goon#dorcon01";
@@ -2117,32 +2117,32 @@ lasagna,131,245,5 script The diligent second son 4_CAT_3COLOR,{
mes "[Yota Chara]";
mes "...My parents keep going out into the dangerous areas. I'm still a child to help them, so what I do is to make these amulets for them.";
next;
- emotion 19;
+ emotion ET_PROFUSELY_SWEAT;
mes "[Yota Chara]";
mes "What if some bad news reach us even if I try hard making these amulets for their safety?";
next;
mes "[Yota Chara]";
mes "I get startled each time some mail arrives...";
next;
- emotion 28,0,"The skittish fourth#wea";
+ emotion ET_CRY, getnpcid(0, "The skittish fourth#wea");
mes "[Dandi Chara]";
mes "Whatever happened to our parents? ~Bursting into crying~";
next;
- emotion 21,0,"The brave third#weapon";
+ emotion ET_BEST, getnpcid(0, "The brave third#weapon");
mes "[Jogi Chara]";
mes "Well, then. I'll be your dad!!";
next;
- emotion 28,0,"The skittish fourth#wea";
- emotion 19;
+ emotion ET_CRY, getnpcid(0, "The skittish fourth#wea");
+ emotion ET_PROFUSELY_SWEAT;
mes "[Dandi Chara]";
mes "~Keeps crying uncontrollably~ No way!! Mom!! Dad!!";
next;
mes "[Goma Chara]";
- emotion 6,0,"The sensitive-minded ela";
- emotion 19;
+ emotion ET_FRET, getnpcid(0, "The sensitive-minded ela");
+ emotion ET_PROFUSELY_SWEAT;
mes "Both will be totally fine and return to us soon. So quit it! Did you really have to make him cry, huh?!";
next;
- emotion 9;
+ emotion ET_THINK;
mes "- Yota became disheartened and started making another amulet, quietly. -";
close;
}
@@ -2226,30 +2226,30 @@ lasagna,131,250,5 script The brave third#weapon 4_DR_M_02,{
mes "What should we do next?";
next;
if (select( "Exchange tokens for a weapon.", "About the Family" ) == 2) {
- emotion 21;
+ emotion ET_BEST;
mes "[Jogi Chara]";
mes "My sister told me my parents are warriors! They left for a huge adventure!!";
next;
- emotion 21;
+ emotion ET_BEST;
mes "[Jogi Chara]";
mes "I'll join the Militia and become great like my parents!";
mes "I'm still too young to join the Militia, but, I'm positive that I can be the ace of the band once I join it because I'm committed to training myself.";
next;
- emotion 32;
+ emotion ET_HNG;
mes "[Jogi Chara]";
mes "My family members are very lazy. Unless I train them based on my strong belief, they can never become warriors.";
mes "Most notoriously, my elder and younger brother can be a real pain in my neck!";
next;
- emotion 18;
+ emotion ET_SMILE;
mes "[Jogi Chara]";
mes "Dandi! Today's training is to <put 10 earthworms on the head!> Get over here!";
next;
- emotion 28,0,"The skittish fourth#wea";
+ emotion ET_CRY, getnpcid(0, "The skittish fourth#wea");
mes "[Dandi Chara]";
mes "~Bursting into crying~ Goma Chara!!";
close;
}
- emotion 52;
+ emotion ET_SPARK;
mes "[Jogi Chara]";
mes "Whoa, a new weapon! New power!";
mes "What are you going to give me? Do you have a lot of weapons? Can I search into them? Will you exchange it for <ITEM>Doram Token <INFO>25142</INFO></ITEM>?";
@@ -2311,7 +2311,7 @@ lasagna,140,250,3 script The skittish fourth#wea 4_DR_F_01,{
mes "- and try again. -";
close;
}
- emotion 23;
+ emotion ET_HUK;
mes "[Dandi Chara]";
mes "~Shrieks~ Hi...Hiya...";
mes "You really startled me...I thought it was Jogi.";
@@ -2321,20 +2321,20 @@ lasagna,140,250,3 script The skittish fourth#wea 4_DR_F_01,{
mes "She gets angry easily but makes new clothes for me, saying I deserve pretty ones.";
mes "I like her...";
next;
- emotion 28;
+ emotion ET_CRY;
mes "[Dandi Chara]";
mes "My brothers can be pretty mean. So I try my best to obey what Dandi tells me to.";
mes "Still, Yota would never show his smiles, while Jogi would bring me hideous stuff like an earthworm, saying I should be tougher. ~Makes a sobbing sound~";
next;
- emotion 28;
+ emotion ET_CRY;
mes "[Dandi Chara]";
mes "What's more, Jogi keeps wandering near the forest, saying He's going for the Militia. Mom said it's dangerous...";
next;
- emotion 28;
+ emotion ET_CRY;
mes "[Dandi Chara]";
mes "What if a monster takes my brother away? That monster's gotta hurt a lot...";
next;
- emotion 0;
+ emotion ET_SURPRISE;
mes "[Dandi Chara]";
mes "Do you happen to have any piece of armor to spare for my brother? Would you give it to me? I'll pay for it...";
close;
@@ -2430,15 +2430,15 @@ lasagna,140,245,3 script The sensitive-minded el 4_CAT_SAILOR3,{
mes "[Goma Chara]";
mes "So taking care of these bratty brothers has become my responsibility! I wonder why I was born the eldest! I've almost had it!";
next;
- emotion 6;
+ emotion ET_FRET;
mes "[Goma Chara]";
mes "Yota! Tidy up your place after making amulets! Pick up the scales of horse mackerels there. Oh, my days...";
next;
- emotion 6;
+ emotion ET_FRET;
mes "[Goma Chara]";
mes "Jogi, Dandi is about to burst into crying. Please behave yourself, will you?";
next;
- emotion 7;
+ emotion ET_ANGER;
mes "[Goma Chara]";
mes "~Signs deeply~ My head is spinning!";
mes "I'm sorry but our chit-chat ends here. Time flies when you're busy taking care of little brothers.";
@@ -3794,7 +3794,7 @@ lasagna,85,93,5 script Shaman meow#dorcon 4_DR_KID_01,{
mes "[" + strcharinfo(0) + "]";
mes "Uh, that boatswain is the person who had asked for my help.";
next;
- emotion 23;
+ emotion ET_HUK;
mes "[Shaman meow]";
mes "Indeed, who else would do such an idiotic thing? I can't help him, so please leave.";
next;
@@ -3928,7 +3928,7 @@ lasagna,85,93,5 script Shaman meow#dorcon 4_DR_KID_01,{
mes "[Shaman meow]";
mes "I'll tell you today's talisman. It is...";
next;
- specialeffect 330;
+ specialeffect EF_HITLINE;
mes "[Shaman meow]";
.@quest_id = rand(14560,14562);
switch( .@quest_id ) {
@@ -5322,8 +5322,8 @@ conch_in,24,62,5 script Stello#dorcon 4_DR_STELO,{
mes "[" + strcharinfo(0) + "]";
mes "Well... The Purser has sent me to take care of the problem.";
next;
- emotion 0;
- emotion 0,0,"Captain Gamberi#dorcon0";
+ emotion ET_SURPRISE;
+ emotion ET_SURPRISE, getnpcid(0, "Captain Gamberi#dorcon0");
mes "[Stello]";
mes "There is.";
next;
@@ -5337,7 +5337,7 @@ conch_in,24,62,5 script Stello#dorcon 4_DR_STELO,{
mes "In front of us.";
npctalk "Yes, there is.", "", bc_self;
next;
- emotion 4,1;
+ emotion ET_SWEAT, playerattached();
mes "[Stello]";
mes "Good. Consider it as the last training before sailing off.";
next;
@@ -5405,8 +5405,8 @@ conch_in,24,62,5 script Stello#dorcon 4_DR_STELO,{
next;
mes "[Captain Gamberi]";
mes "We were wondering if we had to go down there to recover your dead body...";
- emotion 23;
- emotion 23,1;
+ emotion ET_HUK;
+ emotion ET_HUK, playerattached();
next;
mes "[" + strcharinfo(0) + "]";
mes "What? Was it such a dangerous mission?";
@@ -5469,7 +5469,7 @@ conch_in,24,62,5 script Stello#dorcon 4_DR_STELO,{
next;
mes "[Stello]";
mes "Oh! How did you know?";
- emotion 23;
+ emotion ET_HUK;
next;
mes "[" + strcharinfo(0) + "]";
mes "I have received a handful. I don't need more.";
@@ -5503,7 +5503,7 @@ conch_in,24,62,5 script Stello#dorcon 4_DR_STELO,{
next;
mes "[Stello]";
mes "I'll give you some ^0000cdKahlugna Milk^000000 which all Dorams who have ever visited Lasagna crave. Thank you so much for your effort.";
- emotion 2;
+ emotion ET_DELIGHT;
next;
mes "[Captain Gamberi]";
mes "Well then. It is the time to issue the sailing signal.";
@@ -5559,7 +5559,7 @@ conch_in,26,64,5 script Captain Gamberi#dorcon0 4_DR_GAMBERI,{
mes "[Captain Gamberi]";
mes "You need to overcome the inconvenience to have a correct posture. The correct posture is your first step to become a gentleman. Do you get it, Stello?";
next;
- emotion 33;
+ emotion ET_OK;
mes "[Captain Gamberi]";
mes "Stello, say it again.";
npctalk "Stello?", "", bc_self;
@@ -5664,7 +5664,7 @@ conch_in,26,64,5 script Captain Gamberi#dorcon0 4_DR_GAMBERI,{
mes "[Captain Gamberi]";
mes "You need to overcome the inconvenience to have a correct posture. The correct posture is your first step to become a gentleman. Do you get it, Stello?";
next;
- emotion 33,0,"Stello#dorcon";
+ emotion ET_OK, getnpcid(0, "Stello#dorcon");
mes "[Captain Gamberi]";
mes "Stello, say it again.";
npctalk "Stello?", "", bc_self;
@@ -5926,7 +5926,7 @@ conch_in,96,29,5 script Recorder#dorcon 4_CAT_MERMASTER,{
mes "[Recorder]";
mes "The dirt and grass on your feet... You are not a neat person... Oh, never mind. I am not writing down your faults... This is enough.";
next;
- emotion 23;
+ emotion ET_HUK;
mes "[" + strcharinfo(0) + "]";
mes "How do you know such things in detail?";
next;
@@ -5936,7 +5936,7 @@ conch_in,96,29,5 script Recorder#dorcon 4_CAT_MERMASTER,{
mes "[Recorder]";
mes "Let's see, you must have met the Captain and the Chief Officer. This place must be your second stop.";
next;
- emotion 23;
+ emotion ET_HUK;
mes "[" + strcharinfo(0) + "]";
mes "That's right!";
next;
@@ -6050,7 +6050,7 @@ conch_in,96,29,5 script Recorder#dorcon 4_CAT_MERMASTER,{
next;
mes "[Recorder]";
mes "It is consisted not only of the events which have happened on the ship but also of the history of almost every person who has anything to do with Con-Chliina.";
- emotion 4,1;
+ emotion ET_SWEAT, playerattached();
next;
mes "[Recorder]";
mes "The future can be seen through the past.";
@@ -6150,7 +6150,7 @@ conch_in,96,29,5 script Recorder#dorcon 4_CAT_MERMASTER,{
next;
mes "[When you told the story you heard from Captain Gamberi and about how Stello interrupted, the Recorder started writing it down.]";
next;
- emotion 20;
+ emotion ET_SCRATCH;
mes "[Recorder]";
mes "That is strange. I cannot remember all the records, but the story told by Captain Gamberi ^0000cdis different^000000 from the part of the record I do remember.";
npctalk "It wasn't supposed to be lengthy like this.", "", bc_self;
@@ -6277,7 +6277,7 @@ conch_in,96,29,5 script Recorder#dorcon 4_CAT_MERMASTER,{
mes "[Recorder]";
mes "Dear captain, what are you doing here?";
next;
- emotion 23,0,"Captain Gamberi#dorcon0";
+ emotion ET_HUK, getnpcid(0, "Captain Gamberi#dorcon0");
mes "[Captain Gamberi]";
mes "You were in place. I am just checking if everyone is in the right place prior to the voyage.";
npctalk "Hum! Hum! I thought there was no one around here.", "Captain Gamberi#dorcon0_2", bc_self;
@@ -6288,7 +6288,7 @@ conch_in,96,29,5 script Recorder#dorcon 4_CAT_MERMASTER,{
mes "[Captain Gamberi]";
mes "As an experienced crew of Con-Chliina, one must be able to cope with any situation whenever they need to.";
next;
- emotion 23,1;
+ emotion ET_HUK, playerattached();
mes "[Recorder]";
mes "I see. ^0000cdIt must be the duty of the captain to tear and burn the document as well^000000, I guess.";
npctalk "Did you really think that I wouldn't find out? You have left a long trail od evidence after you.", "", bc_self;
@@ -6904,7 +6904,7 @@ conch_in,181,61,5 script Boatswain#dorcon 4_M_BOSSCAT,{
next;
mes "[Boatswain]";
mes "This... This is...";
- specialeffect 66;
+ specialeffect EF_CURE;
next;
mes "[" + strcharinfo(0) + "]";
mes "What do you think?";
@@ -6931,7 +6931,7 @@ conch_in,181,61,5 script Boatswain#dorcon 4_M_BOSSCAT,{
next;
mes "[" + strcharinfo(0) + "]";
mes "I knew it!";
- emotion 6,1;
+ emotion ET_FRET, playerattached();
next;
mes "[Boatswain]";
mes "I will reward you handsomely. However, you haven't been able to solve the problem permanently so I don't have to keep the promise I have made.";
@@ -6985,7 +6985,7 @@ conch_in,181,61,5 script Boatswain#dorcon 4_M_BOSSCAT,{
mes "This is the amulet for today! Give me all the Basilrocks you have.";
next;
mes "[Boatswain]";
- specialeffect 66;
+ specialeffect EF_CURE;
if (isbegin_quest(14560) == 1) {
mes "It feels like watching the blue horizon on a clear and windless day. It is refreshing.";
next;
@@ -7112,9 +7112,9 @@ conch_in,179,64,5 script Cow#dorcon01_bis 4_WHITE_COW,{
mes "[Boatswain]";
mes "So? What! I won her on a bet. Every time I call her name, it reminds me of that moment of victory. It's beautiful.";
npctalk "Moo -", "", bc_self;
- emotion 14;
+ emotion ET_BIGTHROB;
npctalk "Right?", "Boatswain#dorcon", bc_self;
- emotion 3;
+ emotion ET_THROB;
next;
mes "[" + strcharinfo(0) + "]";
mes "Anyway, why is there a cow on this ship?";
@@ -7138,7 +7138,7 @@ conch_in,179,64,5 script Cow#dorcon01_bis 4_WHITE_COW,{
}
conch_in,189,63,3 script Head Chef#dorcon 4_DR_TORTEL,{
- emotion 45;
+ emotion ET_SLEEPY;
mes "[Head Chef]";
mes "*Snore*";
npctalk "*Snore*", "", bc_self;
@@ -7212,8 +7212,8 @@ conch_in,186,57,3 script Sous Chef#dorcon 4_CAT_CHEF,{
next;
mes "[" + strcharinfo(0) + "]";
mes "I mean, ^0000cdhere comes the newbie!^000000";
- emotion 23,0,"Boatswain#dorcon";
- emotion 23,0,"Helmsman#dorcon";
+ emotion ET_HUK, getnpcid(0, "Boatswain#dorcon");
+ emotion ET_HUK, getnpcid(0, "Helmsman#dorcon");
next;
mes "[Sous Chef]";
mes "What are you doing? Is it a new way to get yourself killed? I am not afraid of challenges. Draw your weapon.";
@@ -7307,14 +7307,14 @@ conch_in,186,57,3 script Sous Chef#dorcon 4_CAT_CHEF,{
mes "[Sous Chef]";
mes "There are two main functions of cooking.";
next;
- emotion 0;
+ emotion ET_SURPRISE;
mes "[Sous Chef]";
mes "Firstly, it ^0000cdenhances status^000000.";
next;
mes "[Sous Chef]";
mes "There are six types of cooking. Each enhances ^0000cdStr, Agi, Vit, Int, Dex or Luk^000000. The amount of status enhancement depends on the level of cooking.";
next;
- emotion 0;
+ emotion ET_SURPRISE;
mes "[Sous Chef]";
mes "Secondly, it ^0000cdrecovers HP and SP^000000. The amount of recovery also depends on the level of cooking, and some food only recovers HP.";
next;
@@ -7324,14 +7324,14 @@ conch_in,186,57,3 script Sous Chef#dorcon 4_CAT_CHEF,{
mes "[Sous Chef]";
mes "There are two steps for the preparation.";
next;
- emotion 0;
+ emotion ET_SURPRISE;
mes "[Sous Chef]";
mes "First! You need a ^0000cdCookbook^000000.";
next;
mes "[Sous Chef]";
mes "You need a Cookbook to learn how to prepare the ingredients and cook. You can get this Cookbook from a ^0000cdquest^000000 or a ^0000cdmonster^000000.";
next;
- emotion 0;
+ emotion ET_SURPRISE;
mes "[Sous Chef]";
mes "Once you get a Cookbook, you need to collect the ^0000cdingredients^000000. It doesn't help to lick the pages if the Cookbook without preparing the ingredients. Even the eggrings know better than that.";
next;
@@ -7549,7 +7549,7 @@ conch_in,186,57,3 script Sous Chef#dorcon 4_CAT_CHEF,{
next;
mes "[Sous Chef]";
mes "Look over there. The man sleeping on the floor who seems so far from being a gentleman. ^0000cdHe is our Head Chef^000000. The captain has always said how we have to do our best at what we do. But no use.";
- emotion 45,0,"Head Chef#dorcon";
+ emotion ET_SLEEPY, getnpcid(0, "Head Chef#dorcon");
npctalk "*Snore*","Head Chef#dorcon", bc_self;
next;
mes "[Sous Chef]";
@@ -7763,7 +7763,7 @@ S_Check:
mes "Bring me " + .@string$ + " now!";
close;
}
- emotion 52;
+ emotion ET_SPARK;
mes "Oh, you have brought them all! Let me cook them for you right away.";
next;
mes "[Sous Chef]";
@@ -8016,7 +8016,7 @@ lasa_dun01,153,103,3 script Vigilante#dorcon02 4_DR_SOLDIER,{
next;
mes "[Vigilante]";
mes "I think the adventurer knows what the problem is already.";
- emotion 4;
+ emotion ET_SWEAT;
next;
mes "[Machie]";
mes "You don't have to say it like that.";
@@ -8222,7 +8222,7 @@ lasa_dun03,161,292,5 script Lord Imuk#dorcon 4_NFWISP,{
next;
mes "[???]";
mes "How dare you treat me like a ghost! I have lived for ^0000cd2,500 years^000000!";
- specialeffect2 29;
+ specialeffect2 EF_LIGHTBOLT;
next;
mes "[" + strcharinfo(0) + "]";
mes "Oww...that hurts. I'm sorry if I've offended you, but are you Imoogi, the chief of the Basilisk?";
@@ -9578,26 +9578,26 @@ lasagna,195,235,3 script Cute Baby#dorcon 4_F_KR_TIGER,{
mes "Okay, I'm sitting now.";
npctalk "Sitting now.", "Daldal#dorcon02", bc_self;
next;
- emotion 1,0,"Cute Baby#dorcon";
+ emotion ET_QUESTION;
mes "[Daldal]";
mes "Sitting.";
npctalk "Sitting.", "Gopara#dorcon02", bc_self;
next;
- emotion 1,0,"Cute Baby#dorcon";
+ emotion ET_QUESTION;
mes "[Gopara]";
mes "Patiently sitting.";
npctalk "Patiently -", "Daldal#dorcon02", bc_self;
next;
- emotion 1,0,"Cute Baby#dorcon";
+ emotion ET_QUESTION;
mes "[Daldal]";
mes "Sitting.";
npctalk "Sitting.", "Daldal#dorcon02", bc_self;
next;
- emotion 28,0,"Cute Baby#dorcon";
+ emotion ET_CRY;
mes "[Baby]";
mes "Waa. Waa!";
next;
- emotion 4,1;
+ emotion ET_SWEAT, playerattached();
mes "[" + strcharinfo(0) + "]";
mes "G-guys? didn't you want me to find you a babysitting job?";
next;
@@ -9618,7 +9618,7 @@ lasagna,195,235,3 script Cute Baby#dorcon 4_F_KR_TIGER,{
mes "[Daldal]";
mes "That was what babysitting was about? I didn't know. If I did, I wouldn't have done it.";
next;
- emotion 28,0,"Cute Baby#dorcon";
+ emotion ET_CRY;
mes "[Baby]";
mes "Waa. Waa.";
next;
@@ -9836,11 +9836,11 @@ lasagna,139,299,3 script Captain of Anchovy Fish 4_CAT_SAILOR5,{
mes "Captain of Anchovy Fishing Boat";
mes "No need to know about your past. I just need you to do a good job on the ship. Since this is the first time on a boat for both of you, looks like there's a long bumpy road ahead.";
next;
- emotion 28,0,"Daldal#dorcon04";
+ emotion ET_CRY, getnpcid(0, "Daldal#dorcon04");
mes "[Daldal]";
mes "So mean. I shared my painful past and you couldn't care any less.";
next;
- emotion 33,0,"Gopara#dorcon04";
+ emotion ET_OK, getnpcid(0, "Gopara#dorcon04");
mes "[Gopara]";
mes "It's okay. I care.";
next;
@@ -9854,7 +9854,7 @@ lasagna,139,299,3 script Captain of Anchovy Fish 4_CAT_SAILOR5,{
mes "[Daldal]";
mes "Not really interested.";
next;
- emotion 7,0,"Gopara#dorcon04";
+ emotion ET_ANGER, getnpcid(0, "Gopara#dorcon04");
mes "[Gopara]";
mes "Let's fight!";
next;
@@ -10095,10 +10095,10 @@ conch_in,59,29,5 script Engineer#dorcon01 4_CAT_SAILOR5,{
sleep2 2000;
npctalk "Hundreds of hamsters are running on treadmills on the bottom of this ship. The ship moves forward because this area is connected to the main part of the engine.", "", bc_self;
sleep2 1000;
- emotion 23;
+ emotion ET_HUK;
unittalk getcharid(3), "" + strcharinfo(0) + " : Pardon???", bc_self;
sleep2 1000;
- emotion 4;
+ emotion ET_SWEAT;
npctalk "Oh, wait. You're not taking me seriously, are you? It's a joke, a joke!", "", bc_self;
end;
}
diff --git a/npc/re/guides/guides_dicastes.txt b/npc/re/guides/guides_dicastes.txt
index 8e2c5b94164..db8dc8a07ce 100644
--- a/npc/re/guides/guides_dicastes.txt
+++ b/npc/re/guides/guides_dicastes.txt
@@ -87,6 +87,6 @@ dicastes01,189,191,5 script Traveler Ichack#info 481,2,2,{
}
OnTouch:
if (ep13_3_invite == 6)
- emotion e_gasp,0;
+ emotion ET_SURPRISE;
end;
}
diff --git a/npc/re/guides/navigation.txt b/npc/re/guides/navigation.txt
index 8ab9d833adf..ff749c42e0d 100644
--- a/npc/re/guides/navigation.txt
+++ b/npc/re/guides/navigation.txt
@@ -13,11 +13,12 @@
//===== Additional Comments: =================================
//= 1.0 First version.
//= 1.1 Added 'is_clientver' command. [Euphy]
+//= 1.2 Dropped 'is_clientver' command. [Lemongrass]
//============================================================
function script F_Navi {
- if (!is_clientver(1,20111010))
+ if ( PACKETVER < 20111010 )
set .@disabled,1;
// This function takes 0 ~ 3 parameters.
diff --git a/npc/re/guild/invest_main.txt b/npc/re/guild/invest_main.txt
index 4864be674c9..1a37e3a81e0 100644
--- a/npc/re/guild/invest_main.txt
+++ b/npc/re/guild/invest_main.txt
@@ -1329,9 +1329,9 @@ malangdo,218,123,1 script Namis#invest 545,4,4,{
mes "- lose some weight. -";
close;
}
- emotion e_omg;
- emotion e_an;
- emotion e_ag;
+ emotion ET_HUK;
+ emotion ET_FRET;
+ emotion ET_ANGER;
mes "[Namis]";
mes "Purr-Purr-Purrr-Purrrr-Pur~ Meow!!";
mes "Wh-- What? How rude. You scared me.";
@@ -1453,7 +1453,7 @@ L_Check:
close;
OnTouch:
if (rand(2))
- emotion e_yawn;
+ emotion ET_SLEEPY;
else
specialeffect EF_SLEEPATTACK;
end;
diff --git a/npc/re/instances/CentralLaboratory.txt b/npc/re/instances/CentralLaboratory.txt
new file mode 100644
index 00000000000..6d5354926d1
--- /dev/null
+++ b/npc/re/instances/CentralLaboratory.txt
@@ -0,0 +1,1384 @@
+//===== rAthena Script =======================================
+//= Central Laboratory
+//===== Description: =========================================
+//= [Walkthrough Conversion]
+//= Central Laboratory Instance
+//===== Changelogs: ==========================================
+//= 1.0 First version. [Capuche]
+//============================================================
+
+verus01,153,155,5 script Temporary Dimension-mov PORTAL,{
+ .@party_id = getcharid(1);
+ if (.@party_id == 0) {
+ mes "[Temporary Dimension-mover]";
+ mes "Do you not have a companion to join you? Organize your party even if traveling alone.";
+ close;
+ }
+ switch( checkquest(12347,PLAYTIME) ) {
+ case -1:
+ switch( instance_enter("Central Laboratory") ) {
+ case IE_NOMEMBER:
+ case IE_NOINSTANCE:
+ case IE_OTHER:
+ mes "[Temporary Dimension-mover]";
+ mes "The passage for dimensional moving has not been vitalized.";
+ close;
+ case IE_OK:
+ mapannounce "verus01", "" + strcharinfo(0) + " of the party, " + getpartyname(.@party_id) + ", is entering Central Laboratory.",bc_map,"0x00FF99";
+ setquest 12347;// Trace of Laboratory Access
+ end;
+ }
+ case 0:
+ case 1:
+ mes "[Temporary Dimension-mover]";
+ mes "There are remaining traces of the last event. Access denied.";
+ close;
+ case 2:
+ mes "^0000ffUse of Dimension-mover seems possible.^000000";
+ erasequest 12347;// Trace of Laboratory Access
+ close;
+ }
+}
+
+verus01,149,155,5 script Civilization Explorer#p 4_LGTSCIENCE,{
+ mes "^ff0000Taming monsters will impede progress in this dungeon. Please take note of this.^000000";
+ next;
+ mes "[Civilization Explorer]";
+ if (isbegin_quest(12346) == 2) {
+ mes "What do you want to do this time?";
+ next;
+ }
+ else {
+ mes "There are a lot of interesting things about the ancient civilizations in this area.";
+ next;
+ mes "[Civilization Explorer]";
+ mes "Observing the soil strata it is estimated to be 500 to 600 years old!";
+ mes "But many of the excavated objects here already far surpass our current technology.";
+ next;
+ mes "[Civilization Explorer]";
+ mes "A lot of undefined terms are found in the recovered records as well.";
+ next;
+ select("What kind of unknown terms?");
+ mes "[Civilization Explorer]";
+ mes "^0000ffMother Computer^000000 or, ^0000ff LSI Chip^000000 Or, and what else. ^0000ffChicken^000000?";
+ next;
+ mes "[Civilization Explorer]";
+ mes "Mm that's right. There definitely was the word Chicken. I don't know what kind of combination of technology that may be...";
+ next;
+ mes "[Civilization Explorer]";
+ mes "It is referrenced in the records of people who seem to 'root' amongst the many traces of technology.";
+ next;
+ if (select( "It is not a topic I would be interested in.", "Interesting. Have there been any results?" ) == 1) {
+ mes "[Civilization Explorer]";
+ mes "Unfortunate.";
+ close;
+ }
+ mes "[Civilization Explorer]";
+ mes "My aim is to research the use of technology related to the relevant times. Even though what I have found out so far is insignificant.";
+ next;
+ mes "[Civilization Explorer]";
+ mes "If I had it my way I would use the dimension mover to see for myself but there's too much work. Besides I am not an adventurer...";
+ next;
+ mes "[Civilization Explorer]";
+ mes "By any chance, would you interested in traveling to the past?";
+ next;
+ mes "[Civilization Explorer]";
+ mes "Even better if you show me around if you find an interesting object.";
+ next;
+ if (select( "Not interested.", "Ok." ) == 1) {
+ mes "[Civilization Explorer]";
+ mes "Unfortunate.";
+ close;
+ }
+ mes "[Civilization Explorer]";
+ mes "You are an adventurer. Tell me what you decide to do.";
+ if (isbegin_quest(12346) == 0)
+ setquest 12346;// Strange Ancient Science
+ next;
+ completequest 12346;
+ }
+ .@party_id = getcharid(1);
+ if (.@party_id == 0) {
+ mes "[Civilization Explorer]";
+ mes "Please talk to me after composing a party of 1 or more, or after joining a party.";
+ close;
+ }
+ if (getpartyleader(.@party_id,2) != getcharid(0)) {
+ mes "[Civilization Explorer]";
+ mes "Ah. You aren't the party leader. Take me to your leader! Or perhaps take your leader to me.";
+ close;
+ }
+ switch( checkquest(12347,PLAYTIME) ) {
+ case -1:
+ if (select( "Produce a crack of time", "Cancel" ) == 1) {
+ mes "[Civilization Explorer]";
+ mes "When the crack of time opens take a breath and speak again.";
+ instance_create("Central Laboratory");
+ }
+ close;
+ case 0:
+ case 1:
+ mes "[Civilization Explorer]";
+ mes "Ah, oh no.";
+ mes "There are some remaining aftereffects of dimensional travel. We cannot travel again in this condition.";
+ close;
+ case 2:
+ mes "^0000ffAll the traces of entering the central laboratory have been erased. Speaking with the Civilization Explorer seems possible.^000000";
+ erasequest 12347;// Trace of Laboratory Access
+ close;
+ }
+}
+
+// Entrance
+1@lab,104,34,4 script Probationary researcher 4_LGTSCIENCE,{
+ if ('switch_enabled == 1) {
+ mes "[Probationary researcher]";
+ mes "The entrance door is already open.";
+ close;
+ }
+ if (getpartyleader(getcharid(1),2) != getcharid(0)) {
+ mes "[Probationary researcher]";
+ mes "Please hold. I am speaking with the guide about whether or not you have been authorized.";
+ close;
+ }
+ mes "[Probationary researcher]";
+ mes "Are you participating as assistants to the experiments of research project 32001?";
+ next;
+ if (select( "Yes.", "No." ) == 2) {
+ mes "[Probationary researcher]";
+ mes "It seems you're in the wrong laboratory. Please exit and ask for help.";
+ close;
+ }
+ mes "[Probationary researcher]";
+ mes "We need about 5 seconds of time. Confirming access code.";
+ close2;
+ sleep 3000;
+ npctalk "Probationary researcher : The access code matches. I will open the door.";
+ sleep 6000;
+ npctalk "Probationary researcher : You may now enter. Please note that you cannot open the door from the other side.";
+ if ('switch_enabled == 0) {
+ 'switch_enabled = 1;
+ enablenpc instance_npcname("#central_warp_1");
+ enablenpc instance_npcname("#central_warp_2");
+ enablenpc instance_npcname("#central_warp_3");
+ enablenpc instance_npcname("Main Switch#");
+ enablenpc instance_npcname("Senior researcher#pa082");
+ enablenpc instance_npcname("effect_switch");
+ for ( .@i = 1; .@i <= 8; ++.@i )
+ enablenpc instance_npcname( "Switch" + .@i + "#" );
+ 'code = 5 * gettime(DT_DAYOFMONTH);
+ }
+ end;
+
+OnInstanceInit:
+ 'map_name$ = instance_mapname("1@lab");
+ 'code_found = 'code = 0;
+ for ( .@i = 1; .@i <= 8; .@i++ )
+ 'switch_position[.@i] = 0;
+
+ // Entrance
+ disablenpc instance_npcname("#central_warp_1");
+ disablenpc instance_npcname("#central_warp_2");
+ disablenpc instance_npcname("#central_warp_3");
+
+ // Switchs
+ disablenpc instance_npcname("Main Switch#");
+ disablenpc instance_npcname("Senior researcher#pa082");
+ disablenpc instance_npcname("effect_switch");
+ for ( .@i = 1; .@i <= 8; ++.@i )
+ disablenpc instance_npcname( "Switch" + .@i + "#" );
+
+ // Experiments
+ disablenpc instance_npcname("#central_warp_4");
+ disablenpc instance_npcname("#central_warp_5");
+ disablenpc instance_npcname("DR Silvia#pa0829");
+ disablenpc instance_npcname("DR Federico#pa0829");
+ disablenpc instance_npcname("DR Artemia#pa0829");
+ disablenpc instance_npcname("DR Vincent#pa0829");
+ disablenpc instance_npcname("#wp01");
+ disablenpc instance_npcname("#wp02");
+ for ( .@i = 1; .@i <= 14; ++.@i )
+ hideonnpc instance_npcname("#gen_" + (.@i < 10 ? "0" : "") + .@i);
+ disablenpc instance_npcname("#central_warp_6");
+ end;
+}
+
+// Switchs
+1@lab,37,37,3 script Switch1# CLEAR_NPC,{
+ .@num = charat( strnpcinfo(1),6 );
+ setarray .@position$[0], "OFF", "ON";
+ mes "[Switch " + .@num + "]";
+ mes "The switch is currently in the " + .@position$[ 'switch_position[.@num] ] + " position. What will you do?";
+ next;
+ 'switch_position[.@num] = !( select( "ON","OFF" ) - 1 );
+ close;
+}
+1@lab,39,37,3 duplicate(Switch1#) Switch2# CLEAR_NPC
+1@lab,41,37,3 duplicate(Switch1#) Switch3# CLEAR_NPC
+1@lab,43,37,3 duplicate(Switch1#) Switch4# CLEAR_NPC
+1@lab,46,37,3 duplicate(Switch1#) Switch5# CLEAR_NPC
+1@lab,48,37,3 duplicate(Switch1#) Switch6# CLEAR_NPC
+1@lab,50,37,3 duplicate(Switch1#) Switch7# CLEAR_NPC
+1@lab,52,37,3 duplicate(Switch1#) Switch8# CLEAR_NPC
+
+1@lab,34,37,3 script Main Switch# CLEAR_NPC,{
+ .@string$ = 'switch_position[1] + "" + 'switch_position[2] + "" + 'switch_position[3] + "" + 'switch_position[4] + "" +
+ 'switch_position[5] + "" + 'switch_position[6] + "" + 'switch_position[7] + "" + 'switch_position[8];
+ .@current_code = strtol( .@string$,2 );
+ npctalk "Today's access code " + 'code + ", currently entered code " + .@current_code + ".";
+ sleep 6000;
+ if ('code_found > 0)
+ npctalk "The door is already open.";
+ else if (.@current_code != 'code)
+ npctalk "The code is incorrect. Please try again.";
+ else {
+ 'code_found = 1;
+ npctalk "The code is correct. Opening door.";
+ enablenpc instance_npcname("#central_warp_4");
+ enablenpc instance_npcname("#central_warp_5");
+ enablenpc instance_npcname("DR Silvia#pa0829");
+ enablenpc instance_npcname("DR Federico#pa0829");
+ enablenpc instance_npcname("DR Artemia#pa0829");
+ enablenpc instance_npcname("DR Vincent#pa0829");
+ enablenpc instance_npcname("#wp01");
+ enablenpc instance_npcname("#wp02");
+ donpcevent instance_npcname("effect_switch") + "::OnStop";
+ }
+ end;
+}
+
+1@lab,45,32,3 script Senior researcher#pa082 4_LGTSCIENCE,{
+ if ('code_found > 0) {
+ mes "[Senior Researcher]";
+ mes "The door is open so you may now enter. Please note that you cannot open the door from the other side.";
+ close;
+ }
+ mes "[Senior Researcher]";
+ mes "It seems you are here to participate in the particle acceleration experiment.";
+ next;
+ mes "[Senior Researcher]";
+ mes "Today's access code is ^0000ff" + 'code + "^000000.";
+ mes "The code needs to be entered as a binary number. Use the switches behind me to enter it.";
+ next;
+ mes "[Senior Researcher]";
+ mes "After entering the code press the main button near the entrance.";
+ for ( .@i = 1; .@i <= 8; ++.@i )
+ specialeffect EF_STEAL, AREA, instance_npcname("Switch" + .@i + "#");
+ close2;
+ donpcevent instance_npcname("effect_switch") + "::OnStart";
+ end;
+}
+
+1@lab,1,1,0 script effect_switch -1,{
+OnStart:
+OnTimer2000:
+ specialeffect 203,AREA, instance_npcname("Main Switch#");
+ for ( .@i = 1; .@i <= 8; ++.@i )
+ specialeffect (203+.@i),AREA, instance_npcname("Switch" + .@i + "#");
+ initnpctimer;
+ end;
+OnStop:
+ stopnpctimer;
+ end;
+}
+
+1@lab,81,84,7 script DR Silvia#pa0829 4_F_SCIENCE,{
+ mes "[DR Silvia]";
+ mes "After the experiment I want to go home and enjoy an ice cold beer and some fried chicken.";
+ next;
+ mes "[DR Silvia]";
+ mes "I haven't been home for almost 2 years.";
+ next;
+ mes "^0000ffSilvia is looking at the particle accelerator device with a very exhausted look.^000000";
+ close;
+}
+
+1@lab,80,87,7 script DR Federico#pa0829 4_LGTSCIENCE,{
+ mes "[DR Federico]";
+ mes "This device is more amazing the more I look at. There has never been a particle accelerator made in this scale.";
+ next;
+ mes "[DR Federico]";
+ mes "With this size I wonder if it's possible to create a small scale black hole...";
+ next;
+ mes "[DR Federico]";
+ mes "Ah, I was just talking. Such an event is closer to a disaster than an experiment haha.";
+ close;
+}
+
+1@lab,80,90,6 script DR Artemia#pa0829 4_F_SCIENCE,{
+ mes "[DR Artemia]";
+ mes "Look, reality doesn't like it when you grab a piece of string and give it a tug.";
+ next;
+ mes "[DR Artemia]";
+ mes "A dimensional distortion can happen with such a powerful particle acceleration.";
+ next;
+ mes "[DR Artemia]";
+ mes "I have a bad feeling about this because... Nature finds a way.";
+ close;
+}
+
+1@lab,81,93,6 script DR Vincent#pa0829 4_LGTSCIENCE,{
+ mes "[DR Vincent]";
+ mes "The machine is perfect. Nothing will go wrong!";
+ next;
+ mes "[DR Vincent]";
+ mes "Artemia worries too much. Anyway I'm going on a trip after the experiment.";
+ close;
+}
+
+1@lab,80,89,0 script #wp01 HIDDEN_WARP_NPC,9,9,{
+ end;
+OnTouch:
+ donpcevent instance_npcname("#wp02") + "::OnStart";
+ disablenpc instance_npcname("#wp01");
+ end;
+}
+
+1@lab,80,89,0 script #wp02 HIDDEN_WARP_NPC,{
+ end;
+
+function effect_gen {
+ .@effect = getarg(0);
+ .@count = getargcount();
+ for ( .@i = 1; .@i < .@count; .@i++ )
+ specialeffect .@effect, AREA, getd( "'gen_" + ( getarg(.@i) < 10 ? "0" : "" ) + getarg(.@i) + "$" );
+ return;
+}
+
+function effect_1_10_gen { effect_gen( getarg(0), 1,2,3,4,5,6,7,8,10 ); }
+
+OnStart:
+ 'vincent$ = instance_npcname("DR Vincent#pa0829");
+ 'federico$ = instance_npcname("DR Federico#pa0829");
+ 'silvia$ = instance_npcname("DR Silvia#pa0829");
+ 'artemia$ = instance_npcname("DR Artemia#pa0829");
+ 'gen_01$ = instance_npcname("#gen_01");
+ 'gen_02$ = instance_npcname("#gen_02");
+ 'gen_03$ = instance_npcname("#gen_03");
+ 'gen_04$ = instance_npcname("#gen_04");
+ 'gen_05$ = instance_npcname("#gen_05");
+ 'gen_06$ = instance_npcname("#gen_06");
+ 'gen_07$ = instance_npcname("#gen_07");
+ 'gen_08$ = instance_npcname("#gen_08");
+ 'gen_09$ = instance_npcname("#gen_09");
+ 'gen_10$ = instance_npcname("#gen_10");
+ 'gen_11$ = instance_npcname("#gen_11");
+ 'gen_12$ = instance_npcname("#gen_12");
+ 'gen_13$ = instance_npcname("#gen_13");
+ 'gen_14$ = instance_npcname("#gen_14");
+
+ npctalk "Federico : Let us get started. Hm... Are you ready Dr. Fresa?", 'federico$;
+ sleep 5000;
+ npctalk "Artemia : Probably making final confirmation checks. An experiment of this scope needs such caution.", 'artemia$;
+ sleep 6000;
+ npctalk "Silvia : Care is needed for operating a finished product for the first experiment.", 'silvia$;
+ sleep 4000;
+ npctalk "Vincent : Ah, I hope we can finish quickly so I can go eat chicken.", 'vincent$;
+ sleep 3000;
+ npctalk "Silvia : Ah! I like that too! Call me when you go.", 'silvia$;
+ sleep 6000;
+ mapannounce 'map_name$, "?????: Ah, ah, one two one two, mic test.", bc_map,0xFF77,FW_NORMAL,12;
+ sleep 2000;
+ npctalk "Federico : She's here.", 'federico$;
+ sleep 3000;
+ mapannounce 'map_name$, "?????: Chief director Lona Fresa of project particle accelerator.", bc_map,0xFF77,FW_NORMAL,12;
+ sleep 5000;
+ mapannounce 'map_name$, "Lona Fresa : Current time " + gettime(DT_MONTH) + " Month " + gettime(DT_DAYOFMONTH) + " Day 25 minutes after 10.", bc_map,0xFF77,FW_NORMAL,12;
+ sleep 5000;
+ mapannounce 'map_name$, "Lona Fresa : Testing the effects of particle acceleration on its surroundings in an open space.", bc_map,0xFF77,FW_NORMAL,12;
+ sleep 5000;
+ npctalk "Artemia : Aah... I really don't like this experiment.", 'artemia$;
+ sleep 3000;
+ mapannounce 'map_name$, "Lona Fresa : Starting the experiment. Chief researcher Dr. Federico, Artemia, Silvia, Vincent and assistant researchers.", bc_map,0xFF77,FW_NORMAL,12;
+ sleep 5000;
+ npctalk "Artemia : Let us start~", 'artemia$;
+ specialeffect EF_MAGICALATTHIT, AREA, 'gen_01$;
+ sleep 1800;
+ effect_gen( EF_MAGICALATTHIT, 1,3 );
+ sleep 700;
+ npctalk "Vincent : Starting rotation of generator.", 'vincent$;
+ sleep 1000;
+ effect_gen( EF_MAGICALATTHIT, 1,3,8 );
+ sleep 1500;
+ effect_gen( EF_MAGICALATTHIT, 1,3,8,4 );
+ npctalk "Federico : Generator rotation fixed at 10000 RPM.", 'federico$;
+ sleep 1200;
+ effect_gen( EF_MAGICALATTHIT, 1,3,8,4,6 );
+ sleep 1000;
+ npctalk "Silvia : Voltage is still within the tolerance band.", 'silvia$;
+ sleep 400;
+ effect_gen( EF_MAGICALATTHIT, 1,3,8,4,6,2 );
+ sleep 1200;
+ effect_gen( EF_MAGICALATTHIT, 1,3,8,4,6,2,7 );
+ sleep 1000;
+ effect_gen( EF_MAGICALATTHIT, 1,3,8,4,6,2,7,9 );
+ mapannounce 'map_name$, "Lona Fresa : This experiment is for the creation of new material that hasn't existed before.", bc_map,0xFF77,FW_NORMAL,12;
+ sleep 1000;
+ effect_gen( EF_MAGICALATTHIT, 1,2,3,4,5,6,7,8,9 );
+ sleep 1000;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 900;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ mapannounce 'map_name$, "Lona Fresa : Recorders make sure to make detailed records of the catalyst bed's reaction when it is installed to the accelerator.", bc_map,0xFF77,FW_NORMAL,12;
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 1000;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 900;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 500;
+ npctalk "Artemia : Contacting catalyst bed number 1.", 'artemia$;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 1100;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 850;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 1000;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 850;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 700;
+ npctalk "Silvia : Generator voltage unstable. Still within tolerance band.", 'silvia$;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 830;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 400;
+ specialeffect EF_BLASTMINEBOMB, AREA, 'gen_01$;
+ sleep 400;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 830;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 430;
+ npctalk "Silvia : Detecting heat close to the tolerance band between the catalyst bed and the accelerator!", 'silvia$;
+ effect_gen( EF_BLASTMINEBOMB, 1,3 );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 1000;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 400;
+ effect_gen( EF_BLASTMINEBOMB, 1,3,8 );
+ sleep 400;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_gen( EF_BLASTMINEBOMB, 1,3,8,4 );
+ sleep 600;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 400;
+ npctalk "Vincent : Accelerator is heating.", 'vincent$;
+ sleep 400;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_gen( EF_BLASTMINEBOMB, 1,3,8,4,6 );
+ sleep 830;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 400;
+ effect_gen( EF_BLASTMINEBOMB, 1,3,8,4,6,2 );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_gen( EF_BLASTMINEBOMB, 1,3,8,4,6,2,7 );
+ sleep 830;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_gen( EF_BLASTMINEBOMB, 1,3,8,4,6,2,7,9 );
+ npctalk "Vincent: 320c.", 'vincent$;
+ sleep 300;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 600;
+ effect_gen( EF_BLASTMINEBOMB, 1,3,8,4,6,2,7,9,5 );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 900;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ sleep 930;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ sleep 780;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ npctalk "Vincent : 670c It's heating up too fast!", 'vincent$;
+ sleep 430;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ sleep 630;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ sleep 450;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 330;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ npctalk "Vincent : Broke through 1000c!!!! Dr. Fresa! We have to momentarily stop the device!", 'vincent$;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 530;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 650;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ mapannounce 'map_name$, "Lona Fresa : It is fine.", bc_map,0xFF77,FW_NORMAL,12;
+ sleep 733;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 900;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 900;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ sleep 830;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ npctalk "Silvia : It is not a simple problem. The temperature has far exceeded the predicted numbers!", 'silvia$;
+ sleep 430;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ sleep 630;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ sleep 330;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ mapannounce 'map_name$, "Lona Fresa : This problem was predicted. Maintain current state.", bc_map,0xFF77,FW_NORMAL,12;
+ sleep 500;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 600;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 600;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ npctalk "Artemia : But at least.. I will have chicken later.", 'artemia$;
+ sleep 400;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 900;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 850;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ mapannounce 'map_name$, "MA-4885: Receiving changed circumstance through main server. Detecting dimensional distortion between particle accelerator and catalyst.", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 710;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ sleep 400;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ sleep 330;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ npctalk "Artemia : Dr. Fresa! It's a dangerous situation of Mother Computer. Shut down the main power!", 'artemia$;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ sleep 360;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 530;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 1000;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 930;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ mapannounce 'map_name$, "MA-4885: Alert. New unidentified creature approaching from demi-plane.", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 810;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ sleep 630;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ npctalk "Vincent : What is going on. Somebody turn off that computer!", 'vincent$;
+ sleep 430;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ sleep 380;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 530;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ mapannounce 'map_name$, "MA-4885: A new organism will be soon transmitted from the demi-plane.", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 430;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 710;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 730;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 880;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 1000;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ mapannounce 'map_name$, "MA-4885: 5 seconds remaining", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 1000;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ mapannounce 'map_name$, "MA-4885: 4 seconds remaining", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 1000;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ mapannounce 'map_name$, "MA-4885: 3 seconds remaining", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 1000;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ mapannounce 'map_name$, "MA-4885: 2 seconds remaining", bc_map,0xFFFF00,FW_NORMAL,13;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ sleep 1000;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ mapannounce 'map_name$, "MA-4885: 1 seconds remaining", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 600;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ sleep 400;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ mapannounce 'map_name$, "MA-4885: Unidentifiable creature discovered. Temporarily shutting down main power.", bc_map,0xFFFF00,FW_NORMAL,13;
+ callsub S_Spawn,1;
+ sleep 400;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ sleep 400;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 750;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ npctalk "Artemia : What... what is that?!", 'artemia$; // text can stack if OnMyMobDead already called
+ sleep 3000;
+ npctalk "Silvia : It isn't reacting to us. Maybe it can't see us?", 'silvia$;
+ sleep 5000;
+ npctalk "Vincent : But it is hostile to the project assistants! What is that creature!?", 'vincent$;
+ sleep 5000;
+ npctalk "Vincent : I can't move my body! I think space is frozen!", 'vincent$;
+ end;
+
+OnMyMobDead1:
+ mapannounce 'map_name$, "MA-4885: Unidentified creature eliminated. Restarting device.", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 2000;
+ npctalk "Artemia: MA-4885!! On who's order are you restarting! Stop!!", 'artemia$;
+ sleep 3000;
+ mapannounce 'map_name$, "MA-4885: Unrecognized command.", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 6000;
+ npctalk "Artemia: Dr. Fresa!! We have to stop! This is too dangerous!", 'artemia$;
+ sleep 3000;
+ mapannounce 'map_name$, "Lona Fresa : ......", bc_map,0xFF77,FW_NORMAL,12;
+ sleep 3000;
+ npctalk "Vincent: Fresa! We don't have time! Turn off the computer!!", 'vincent$;
+ sleep 3000;
+ mapannounce 'map_name$, "MA-4885: Restarting particle acceleration procedure.", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 3000;
+ npctalk "Silvia : Fresa! Make a decision!", 'silvia$;
+ specialeffect EF_MAGICALATTHIT, AREA, 'gen_01$;
+ sleep 1800;
+ effect_gen( EF_MAGICALATTHIT, 1,3 );
+ mapannounce 'map_name$, "Lona Fresa : ......", bc_map,0xFF77,FW_NORMAL,12;
+ sleep 1700;
+ effect_gen( EF_MAGICALATTHIT, 1,3,8 );
+ sleep 1500;
+ effect_gen( EF_MAGICALATTHIT, 1,3,8,4 );
+ sleep 1400;
+ effect_gen( EF_MAGICALATTHIT, 1,3,8,4,6 );
+ sleep 1300;
+ effect_gen( EF_MAGICALATTHIT, 1,3,8,4,6,2 );
+ mapannounce 'map_name$, "Lona Fresa : Current time 20 minutes past 11. Momentarily postpone experiment.", bc_map,0xFF77,FW_NORMAL,12;
+ sleep 1200;
+ effect_gen( EF_MAGICALATTHIT, 1,3,8,4,6,2,7 );
+ sleep 1100;
+ effect_gen( EF_MAGICALATTHIT, 1,3,8,4,6,2,7,9 );
+ sleep 1000;
+ effect_gen( EF_MAGICALATTHIT, 1,3,8,4,6,2,7,9,5 );
+ sleep 930;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ mapannounce 'map_name$, "MA-4885: Access denied. Cannot understand command.", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 810;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ specialeffect EF_BLASTMINEBOMB, AREA, 'gen_01$;
+ sleep 830;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ mapannounce 'map_name$, "Lona Fresa : Mother Comp MA-4885. I am your Chief director Dr. Fresa. Cease current progress.", bc_map,0xFF77,FW_NORMAL,12;
+ effect_gen( EF_BLASTMINEBOMB, 1,3 );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_gen( EF_BLASTMINEBOMB, 1,3,8 );
+ sleep 750;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 700;
+ effect_gen( EF_BLASTMINEBOMB, 1,3,8,4 );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 950;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ mapannounce 'map_name$, "MA-4885: Access denied. Cannot understand command.", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 380;
+ effect_gen( EF_BLASTMINEBOMB, 1,3,8,4,6 );
+ sleep 410;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_gen( EF_BLASTMINEBOMB, 1,3,8,4,6,2 );
+ sleep 830;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 450;
+ effect_gen( EF_BLASTMINEBOMB, 1,3,8,4,6,2,7 );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 950;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_gen( EF_BLASTMINEBOMB, 1,3,8,4,6,2,7,9 );
+ npctalk "Federico : Damnit! Something else is coming!!", 'federico$;
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_gen( EF_BLASTMINEBOMB, 1,3,8,4,6,2,7,9,5 );
+ sleep 600;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 400;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ mapannounce 'map_name$, "MA-4885: Alert. New unidentified creature approaching from demi-plane.", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 430;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 500;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 730;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 430;
+ npctalk "Vincent : Oh... damnit. This is why you shouldn't install the newest CPU.", 'vincent$;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 930;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 830;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ sleep 400;
+ npctalk "Federico : Ah... my body...can't move. Damn", 'federico$;
+ sleep 430;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ sleep 600;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 400;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ sleep 430;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 400;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ mapannounce 'map_name$, "MA-4885: A new organism will be soon transmitted from the demi-plane.", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 430;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 400;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 530;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 700;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 900;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ mapannounce 'map_name$, "MA-4885: 5 seconds remaining", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 1000;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ mapannounce 'map_name$, "MA-4885: 4 seconds remaining", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 1000;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ mapannounce 'map_name$, "MA-4885: 3 seconds remaining", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 1000;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ mapannounce 'map_name$, "MA-4885: 2 seconds remaining", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 1000;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ mapannounce 'map_name$, "MA-4885: 1 seconds remaining", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 600;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 400;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ mapannounce 'map_name$, "MA-4885: Unidentifiable creature discovered. Temporarily shutting down main power.", bc_map,0xFFFF00,FW_NORMAL,13;
+ callsub S_Spawn,2;
+ sleep 500;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 600;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ sleep 350;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 600;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ sleep 350;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 1000;
+ npctalk "Silvia: Same as the last time. It seems to have no interest in us.", 'silvia$;
+ sleep 6000;
+ npctalk "Vincent: Let's completely shut down the mother computer while the main power is temporarily off!", 'vincent$;
+ sleep 4000;
+ mapannounce 'map_name$, "MA-4885: Answering question. This space is currently stuck in a distorted phase.", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 5000;
+ mapannounce 'map_name$, "MA-4885: Direct interaction between the demi-plane creature and this world's organisms will be possible after the phase has been balanced.", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 5000;
+ mapannounce 'map_name$, "MA-4885: Conducting calculations to restore balance to distorted phase. Please wait a moment.", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 5000;
+ npctalk "Artemia: What is that crazy clump of metal saying? It is saying we aren't in the same phase as those monster like things?", 'artemia$;
+ sleep 5000;
+ npctalk "Federico: Aah, I guess we should hope that Mother computer doesn't make the right calculations.", 'federico$;
+ end;
+
+OnMyMobDead2:
+ mapannounce 'map_name$, "MA-4885: Unidentified creature eliminated. Phase adjustment failed. Restarting relevant procedure.", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 4000;
+ mapannounce 'map_name$, "Lona Fresa : Mother Computer MA-4885. Looks like you are trying to synchronize the other dimension and this world.", bc_map,0xFF77,FW_NORMAL,12;
+ sleep 7000;
+ mapannounce 'map_name$, "MA-4885: That is correct.", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 5000;
+ npctalk "Artemia: Dr. Fresa!! This ridiculous event is completely unrelated to our original experiment!", 'artemia$;
+ sleep 7000;
+ mapannounce 'map_name$, "Lona Fresa : I have fully realized that.", bc_map,0xFF77,FW_NORMAL,12;
+ sleep 6000;
+ npctalk "Silvia: Can we not shut down main power completely?", 'silvia$;
+ sleep 6000;
+ mapannounce 'map_name$, "MA-4885: Restarting particle acceleration procedure.", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 5000;
+ mapannounce 'map_name$, "Lona Fresa : " + gettime(DT_MONTH) + " Month " + gettime(DT_DAYOFMONTH) + " Day. Current time 38 minutes past 11 temporarily terminating particle accelerator project.", bc_map,0xFF77,FW_NORMAL,12;
+ specialeffect EF_MAGICALATTHIT, AREA, 'gen_01$;
+ sleep 1834;
+ effect_gen( EF_MAGICALATTHIT, 1,3 );
+ sleep 1734;
+ effect_gen( EF_MAGICALATTHIT, 1,3,8 );
+ sleep 1550;
+ effect_gen( EF_MAGICALATTHIT, 1,3,8,4 );
+ mapannounce 'map_name$, "Lona Fresa : Ending record with reasons of Mother Computer malfunction and overheating of accelerator.", bc_map,0xFF77,FW_NORMAL,12;
+ sleep 1400;
+ effect_gen( EF_MAGICALATTHIT, 1,3,8,4,6 );
+ sleep 1300;
+ effect_gen( EF_MAGICALATTHIT, 1,3,8,4,6,2 );
+ sleep 1200;
+ effect_gen( EF_MAGICALATTHIT, 1,3,8,4,6,2,7 );
+ sleep 700;
+ npctalk "Silvia : Alright! Now Dr. Fresa just has to shut down the power.", 'silvia$;
+ sleep 400;
+ effect_gen( EF_MAGICALATTHIT, 1,3,8,4,6,2,7,9 );
+ sleep 1000;
+ effect_gen( EF_MAGICALATTHIT, 1,3,8,4,6,2,7,9,5 );
+ sleep 950;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ mapannounce 'map_name$, "Lona Fresa : Cutting off power to Mother Computer MA-4885.", bc_map,0xFF77,FW_NORMAL,12;
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ specialeffect EF_MAGICALATTHIT, AREA, 'gen_01$;
+ sleep 300;
+ effect_gen( EF_MAGICALATTHIT, 2,3,4,5,6,7,8,9,10 );
+ sleep 700;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ mapannounce 'map_name$, "MA-4885: Suspending operation of all equipment as per Administrator request.", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 830;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ mapannounce 'map_name$, "MA-4885: .....command... ----!!! Zizip... ---!! -- following command ----- !! Zizip.", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 750;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 750;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 750;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ npctalk "Artemia : Whew... is it over?", 'artemia$;
+ sleep 6000;
+ mapannounce 'map_name$, "Lona Fresa : Completed shut down of Mother computer MA-4885. Confirm equipment suspension", bc_map,0xFF77,FW_NORMAL,12;
+ sleep 5000;
+ npctalk "Silvia: Looks like it's over.", 'silvia$;
+ sleep 4000;
+ npctalk "Federico: Plant initialization is the best.", 'federico$;
+ sleep 4000;
+ mapannounce 'map_name$, "Lona Fresa : Recording all experiment progress and terminating at current point.", bc_map,0xFF77,FW_NORMAL,12;
+ sleep 5000;
+ mapannounce 'map_name$, "Lona Fresa : The final experiment failure is unfortunate. But I will promise a more perfect experiment next time.", bc_map,0xFF77,FW_NORMAL,12;
+ sleep 5000;
+ mapannounce 'map_name$, "Lona Fresa : Good work everybody.", bc_map,0xFF77,FW_NORMAL,12;
+ sleep 5000;
+ npctalk "Artemia: It seems to be over.", 'artemia$;
+ sleep 5000;
+ npctalk "Federico: I thought it was Fresa's dogmatic experiment. But it was a problem with the mother comp.", 'federico$;
+ sleep 5000;
+ npctalk "Silvia: Let's just calm down. And get out of this dreadful laboratory.", 'silvia$;
+ sleep 5000;
+ npctalk "Vincent : By the way... I still can't move so what is going on?", 'vincent$;
+ sleep 5000;
+ specialeffect EF_MAGICALATTHIT, AREA, 'gen_01$;
+ specialeffect EF_LORD, AREA, 'gen_11$;
+ mapannounce 'map_name$, "MA-4885: CODE NAME - DESCENT", bc_map,0xFF0000,FW_NORMAL,16;
+ sleep 2000;
+ effect_gen( EF_MAGICALATTHIT, 1,3 );
+ specialeffect EF_LORD, AREA, 'gen_12$;
+ sleep 1700;
+ effect_gen( EF_MAGICALATTHIT, 1,3,8 );
+ specialeffect EF_LORD, AREA, 'gen_13$;
+ sleep 1500;
+ effect_gen( EF_MAGICALATTHIT, 1,3,8,4 );
+ sleep 400;
+ specialeffect EF_LORD, AREA, 'gen_14$;
+ sleep 1000;
+ npctalk "Federico : What? Wasn't this the initialization stage?", 'federico$;
+ effect_gen( EF_MAGICALATTHIT, 1,3,8,4,6 );
+ sleep 630;
+ specialeffect EF_LORD, AREA, 'gen_11$;
+ sleep 800;
+ effect_gen( EF_MAGICALATTHIT, 1,3,8,4,6,2 );
+ mapannounce 'map_name$, "MA-4885 : Starting final phase transformation.", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 1200;
+ specialeffect EF_LORD, AREA, 'gen_12$;
+ effect_gen( EF_MAGICALATTHIT, 1,3,8,4,6,2,7 );
+ sleep 1200;
+ effect_gen( EF_MAGICALATTHIT, 1,3,8,4,6,2,7,9 );
+ sleep 430;
+ specialeffect EF_LORD, AREA, 'gen_13$;
+ sleep 480;
+ npctalk "Silvia : It's all over.", 'silvia$;
+ effect_gen( EF_MAGICALATTHIT, 1,3,8,4,6,2,7,9,5 );
+ sleep 1000;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ specialeffect EF_LORD, AREA, 'gen_14$;
+ sleep 700;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 930;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ specialeffect EF_LORD, AREA, 'gen_11$;
+ sleep 780;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 900;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ mapannounce 'map_name$, "MA-4885: A new organism will be soon transmitted from the demi-plane.", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 400;
+ specialeffect EF_LORD, AREA, 'gen_12$;
+ sleep 600;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 830;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ specialeffect EF_LORD, AREA, 'gen_13$;
+ sleep 630;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 1130;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ specialeffect EF_LORD, AREA, 'gen_14$;
+ sleep 700;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ mapannounce 'map_name$, "MA-4885: 5 seconds remaining", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 1000;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ mapannounce 'map_name$, "MA-4885: 4 seconds remaining", bc_map,0xFFFF00,FW_NORMAL,13;
+ specialeffect EF_LORD, AREA, 'gen_11$;
+ sleep 1000;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ mapannounce 'map_name$, "MA-4885: 3 seconds remaining", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 1000;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ mapannounce 'map_name$, "MA-4885: 2 seconds remaining", bc_map,0xFFFF00,FW_NORMAL,13;
+ specialeffect EF_LORD, AREA, 'gen_12$;
+ sleep 1000;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ mapannounce 'map_name$, "MA-4885: 1 seconds remaining", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 1000;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ mapannounce 'map_name$, "MA-4885: Temporarily shutting down main power for syntonization with transformed phase.", bc_map,0xFFFF00,FW_NORMAL,13;
+ callsub S_Spawn,3;
+ mapannounce 'map_name$, "MA-4885: Final phase transformation process.", bc_map,0xFFFF00,FW_NORMAL,13;
+ specialeffect EF_LORD, AREA, 'gen_13$;
+ sleep 630;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 1000;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ specialeffect EF_LORD, AREA, 'gen_14$;
+ sleep 630;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 1000;
+ mapannounce 'map_name$, "MA-4885: This world will be summoned to the demi-plane after the phase interference phenomenon with creature fades.", bc_map,"0xFFFF00";
+ end;
+
+OnMyMobDead3:
+ mapannounce 'map_name$, "MA-4885: Phase synchronization completed before creature is eliminated. Starting dimensional travel.", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 2500;
+ specialeffect EF_MAGICALATTHIT, AREA, 'gen_01$;
+ sleep 2000;
+ effect_gen( EF_MAGICALATTHIT, 1,3 );
+ sleep 1800;
+ effect_gen( EF_MAGICALATTHIT, 1,3,8 );
+ sleep 1500;
+ effect_gen( EF_MAGICALATTHIT, 1,3,8,4 );
+ sleep 1400;
+ effect_gen( EF_MAGICALATTHIT, 1,3,8,4,6 );
+ sleep 1300;
+ effect_gen( EF_MAGICALATTHIT, 1,3,8,4,6,2 );
+ sleep 1200;
+ effect_gen( EF_MAGICALATTHIT, 1,3,8,4,6,2,7 );
+ sleep 1000;
+ effect_gen( EF_MAGICALATTHIT, 1,3,8,4,6,2,7,9 );
+ mapannounce 'map_name$, "MA-4885: Conducting calculations to restore balance to distorted phase. Please wait a moment.", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 1000;
+ effect_gen( EF_MAGICALATTHIT, 1,3,8,4,6,2,7,9,5 );
+ sleep 900;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 830;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 810;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ npctalk "Federico : Mother comp is conducting a tremendous experiment going beyond what we thought of.", 'federico$;
+ sleep 710;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 550;
+ npctalk "Vincent : Seems more magnanimous than we are. Fresa!!! Are you listening? Sound the alarm!", 'vincent$;
+ sleep 310;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 830;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 500;
+ npctalk "Vincent : We should at least evacuate the people in the other labs.", 'vincent$;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 830;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 960;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 910;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 730;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ mapannounce 'map_name$, "Lona Fresa : But ... you.", bc_map,0xFF77,FW_NORMAL,12;
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 1110;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 950;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 880;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 430;
+ npctalk "Silvia : Gee, I don't know what will happen but I am curious about shifting dimensions. Don't mind me!", 'silvia$;
+ sleep 360;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 880;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 950;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 900;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 510;
+ npctalk "Artemia : Dimension moving while experimenting on new material production. Got caught up in a different level of an experiment.", 'artemia$;
+ sleep 400;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 883;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 1100;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 830;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ mapannounce 'map_name$, "Alarm System : Alert! Alert! Class 1 alert issued from the Particle Laboratory. All researchers evacuate to the bunker.", bc_map,0xFF0000,FW_NORMAL,13;
+ sleep 850;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 950;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 1000;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 830;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ mapannounce 'map_name$, "Alarm System : I repeat. Class 1 alert issued from the Particle Laboratory. All researchers evacuate to the bunker.", bc_map,0xFF0000,FW_NORMAL,13;
+ sleep 600;
+ npctalk "Federico : Is this how it feels to move dimensions. How strange...", 'federico$;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 1030;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 1000;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 380;
+ specialeffect EF_SUI_EXPLOSION,AREA,'federico$;
+ disablenpc 'federico$;
+ mapannounce 'map_name$, "MA-4885: Dimension move at 20% progress. There could be dimensional interference with certain creatures. Please be aware.", bc_map,0xFFFF00,FW_NORMAL,13;
+ npctalk "Vincent : I wonder if the others evacuated?", 'vincent$;
+ specialeffect EF_BLASTMINEBOMB, AREA, 'gen_01$;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 900;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 500;
+ effect_gen( EF_BLASTMINEBOMB, 1,3 );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 900;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 380;
+ effect_gen( EF_BLASTMINEBOMB, 1,3,8 );
+ sleep 550;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 350;
+ specialeffect EF_SUI_EXPLOSION,AREA,'vincent$;
+ disablenpc 'vincent$;
+ npctalk "Silvia : Ah...... I should be seeing this while having chicken and beer...", 'silvia$;
+ sleep 380;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_gen( EF_BLASTMINEBOMB, 1,3,8,4 );
+ sleep 700;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 730;
+ effect_gen( EF_BLASTMINEBOMB, 1,3,8,4,6 );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 860;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 350;
+ effect_gen( EF_BLASTMINEBOMB, 1,3,8,4,6,2 );
+ sleep 360;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 400;
+ specialeffect EF_SUI_EXPLOSION,AREA,'silvia$;
+ disablenpc 'silvia$;
+ mapannounce 'map_name$, "MA-4885: Dimension move at 78% progress. Most of the dimension encroached by demi-plane.", bc_map,0xFFFF00,FW_NORMAL,13;
+ npctalk "Artemia : Ha... whose going to eat the chicken now?", 'artemia$;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_gen( EF_BLASTMINEBOMB, 1,3,8,4,6,2,7 );
+ sleep 830;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_gen( EF_BLASTMINEBOMB, 1,3,8,4,6,2,7,9 );
+ sleep 350;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 630;
+ effect_gen( EF_BLASTMINEBOMB, 1,3,8,4,6,2,7,9,5 );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 930;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 400;
+ specialeffect EF_SUI_EXPLOSION,AREA,'artemia$;
+ disablenpc 'artemia$;
+ specialeffect EF_LORD, AREA, 'gen_11$;
+ sleep 400;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ sleep 934;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ specialeffect EF_LORD, AREA, 'gen_12$;
+ sleep 500;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ sleep 630;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ specialeffect EF_LORD, AREA, 'gen_13$;
+ sleep 430;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ sleep 360;
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ specialeffect EF_LORD, AREA, 'gen_14$;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 460;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 430;
+ specialeffect EF_LORD, AREA, 'gen_11$;
+ sleep 400;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ sleep 800;
+ effect_1_10_gen( EF_BLASTMINEBOMB );
+ effect_1_10_gen( EF_MAGICALATTHIT );
+ mapannounce 'map_name$, "MA-4885: Dimension move 100% completed. Welcome to the demi-plane dimension.", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 600;
+ specialeffect EF_LORD, AREA, 'gen_12$;
+ sleep 1800;
+ specialeffect EF_LORD, AREA, 'gen_13$;
+ sleep 2000;
+ specialeffect EF_LORD, AREA, 'gen_14$;
+ mapannounce 'map_name$, "MA-4885: A gateway possible for contact with the demi-plane open at 3 o'clock of the laboratory.", bc_map,0xFFFF00,FW_NORMAL,13;
+ enablenpc instance_npcname("#central_warp_6");
+ sleep 5000;
+ mapannounce 'map_name$, "MA-4885: Cannot guarantee what kind of dimension will be met due to the instability of the gateway...", bc_map,0xFFFF00,FW_NORMAL,13;
+ sleep 5000;
+ mapannounce 'map_name$, "MA-4885: If there are any surviving organisms I wish you luck. I hope to see you again.", bc_map,0xFFFF00,FW_NORMAL,13;
+ end;
+
+S_Spawn:
+ .@round = getarg(0);
+ switch( .@round ) {
+ case 1:
+ setarray .@mob_id[0],
+ 1087, // Orc Hero
+ 1147, // Maya
+ 1190, // Orc Lord
+ 1115, // Eddga
+ 1086, // GTB
+ 1038, // Osiris
+ 1159, // Phreeoni
+ 1389, // Dracula
+ 1046, // Doppelganger
+ 1046, // Doppelganger
+ 1059, // Mistress
+ 1150, // Moonlight
+ 1688, // Lady Tanee
+ 1039, // Baphomet
+ 1089, // Toad
+ 1092, // Vagabond Wolf
+ 1088, // Vocal
+ 1096, // Angeling
+ 1093, // Eclipse
+ 1120, // Ghostring
+ 1090; // Mastering
+ break;
+ case 2:
+ setarray .@mob_id[0],
+ 1980, // Kublin
+ 1157, // Pharaoh
+ 1112, // Drake
+ 1251, // Stormy Knight
+ 2068, // Boitata
+ 1373, // Lord of Death
+ 2156, // Leak
+ 1272, // Dark Lord
+ 1518, // Bacsojin
+ 1252, // Garm
+ 1779, // Ktullanux
+ 1708, // Thanatos
+ 1089, // Toad
+ 1092, // Vagabond Wolf
+ 1088, // Vocal
+ 1096, // Angeling
+ 1093, // Eclipse
+ 1120, // Ghostring
+ 1090; // Mastering
+ break;
+ case 3:
+ setarray .@mob_id[0],
+ 1623, // RSX
+ 1418, // Evil Snake Lord
+ 1312, // Turtle Generals
+ 1785, // Atroce
+ 1734, // Kiel
+ 1719, // Detale
+ 1768, // Gloom Under Night
+ 2087, // Queen Scaraba
+ 1751, // Valkyrie Randgris
+ 2253, // Daehyon
+ 2255, // Kades
+ 1832, // Ifrit
+ 1873, // Beezlebub
+ 1089, // Toad
+ 1092, // Vagabond Wolf
+ 1088, // Vocal
+ 1096, // Angeling
+ 1120, // Ghostring
+ 1090, // Mastering
+ 1093; // Eclipse
+ break;
+ }
+ .@r = rand( getarraysize(.@mob_id) );
+ monster 'map_name$,90,88, "Unidentified creature",.@mob_id[.@r],1, instance_npcname("#wp02") + "::OnMyMobDead" + .@round;
+ return;
+}
+
+1@lab,91,80,5 script #gen_01 CLEAR_NPC,{ end; }
+1@lab,96,81,5 duplicate(#gen_01) #gen_02 CLEAR_NPC
+1@lab,99,85,5 duplicate(#gen_01) #gen_03 CLEAR_NPC
+1@lab,99,91,5 duplicate(#gen_01) #gen_04 CLEAR_NPC
+1@lab,96,95,5 duplicate(#gen_01) #gen_05 CLEAR_NPC
+1@lab,91,97,5 duplicate(#gen_01) #gen_06 CLEAR_NPC
+1@lab,85,96,5 duplicate(#gen_01) #gen_07 CLEAR_NPC
+1@lab,82,91,5 duplicate(#gen_01) #gen_08 CLEAR_NPC
+1@lab,82,86,5 duplicate(#gen_01) #gen_09 CLEAR_NPC
+1@lab,85,81,5 duplicate(#gen_01) #gen_10 CLEAR_NPC
+1@lab,90,97,5 duplicate(#gen_01) #gen_11 CLEAR_NPC
+1@lab,82,89,5 duplicate(#gen_01) #gen_12 CLEAR_NPC
+1@lab,91,80,5 duplicate(#gen_01) #gen_13 CLEAR_NPC
+1@lab,99,88,5 duplicate(#gen_01) #gen_14 CLEAR_NPC
+
+1@lab,102,28,0 warp2 #central_warp_1 2,2,1@lab,97,28
+1@lab,80,28,0 warp2 #central_warp_2 2,2,1@lab,75,28
+1@lab,58,28,0 warp2 #central_warp_3 2,2,1@lab,53,28
+1@lab,29,38,0 warp2 #central_warp_4 2,2,1@lab,29,43
+1@lab,48,82,0 warp2 #central_warp_5 2,2,1@lab,58,82
+1@lab,123,88,0 warp2 #central_warp_6 2,2,verus01,152,150
diff --git a/npc/re/instances/GhostPalace.txt b/npc/re/instances/GhostPalace.txt
new file mode 100644
index 00000000000..af243957ea6
--- /dev/null
+++ b/npc/re/instances/GhostPalace.txt
@@ -0,0 +1,991 @@
+//===== rAthena Script =======================================
+//= Ghost Palace
+//===== Description: =========================================
+//= [Walkthrough Conversion]
+//= Ghost Palace Instance
+//===== Changelogs: ==========================================
+//= 1.0 First version. [Capuche]
+//============================================================
+
+dali02,43,129,5 script Unpleasant Royal Guard# 4_M_SAKRAYROYAL,{
+ if (BaseLevel < 120) {
+ mes "[Unpleasant Royal Guard]";
+ mes "Althought I need help with a task, you are not strong enough to assist me, noob~!";
+ next;
+ mes "[Unpleasant Royal Guard]";
+ mes "Come back later when you have done some training and are at least level 120!";
+ close;
+ }
+ .@party_id = getcharid(1);
+ if (getcharid(0) != getpartyleader(.@party_id,2) || .@party_id < 1) {
+ mes "[Unpleasant Royal Guard]";
+ mes "I can only open the secret passage for party leaders. Please have your party leader talk to me.";
+ close;
+ }
+ switch( checkquest(1261,PLAYTIME) ) {
+ case -1:
+ break;
+ case 0:
+ case 1:
+ mes "[Unpleasant Royal Guard]";
+ mes "Have you found the princess yet?! Is she safe?";
+ close;
+ case 2:
+ mes "[Unpleasant Royal Guard]";
+ mes "The monsters around the secret passage have disappeared. Now is our chance to save the princess!";
+ erasequest 1261;// Cursed Swordman
+ close;
+ }
+ mes "[Unpleasant Royal Guard]";
+ mes "I need help, even from the likes of you.";
+ next;
+ mes "[Unpleasant Royal Guard]";
+ mes "In the middle of battle the princess disappeared while I was guarding the palace.";
+ next;
+ mes "[Unpleasant Royal Guard]";
+ mes "You run ahead and I will catch up. We must save her.";
+ next;
+ if (select( "I will help.", "This is not a good time." ) == 2) {
+ mes "[Unpleasant Royal Guard]";
+ mes "Even now all the royal guards are fighting and dying from the monsters.";
+ next;
+ mes "[Unpleasant Royal Guard]";
+ mes "We must, no matter how much fear grips our hearts, save the princess!";
+ close;
+ }
+ instance_create("Ghost Palace");
+ mes "[Unpleasant Royal Guard]";
+ mes "Thank you..";
+ mes "I will open the secret passage to the ^0000ffGhost Palace^000000.";
+ mes "Please be ready!";
+ close;
+}
+
+dali02,40,134,5 script Interdimensional Device#dk PORTAL,{
+ if (BaseLevel < 120) {
+ mes "[Unpleasant Royal Guard]";
+ mes "Althought I need help with a task, you are not strong enough to assist me, noob~!";
+ next;
+ mes "[Unpleasant Royal Guard]";
+ mes "Come back later when you have done some training and are at least level 120!";
+ close;
+ }
+ mes "[Unpleasant Royal Guard]";
+ mes "I can see the secret passage into the palace. Are you ready to save the princess?!";
+ next;
+ if (select( "Enter", "Stop" ) == 2) {
+ mes "[Unpleasant Royal Guard]";
+ mes "Even now all the royal guards are fighting and dying from the monsters.";
+ next;
+ mes "[Unpleasant Royal Guard]";
+ mes "We must, no matter how much fear grips our hearts, save the princess!";
+ close;
+ }
+ switch( checkquest(1261,PLAYTIME) ) {
+ case -1:
+ break;
+ case 0:
+ case 1:
+ mes "[Unpleasant Royal Guard]";
+ mes "The monsters that attacked the palace are wandering around the secret entrance. It would be very bad if they spotted us... Please wait.";
+ next;
+ mes "When the time limit for the entrance is up";
+ mes "let's try to re-enter.";
+ close;
+ case 2:
+ mes "^0000ffThe time limit for entering to the Curse of the Swordsman is finished. Please try to talk to the Unpleasent Royal Guard again..^000000";
+ erasequest 1261;// Cursed Swordman
+ close;
+ }
+ .@party_id = getcharid(1);
+ if (getcharid(0) != getpartyleader(.@party_id,2) || .@party_id < 1) {
+ mes "[Unpleasant Royal Guard]";
+ mes "I can only open the secret passage for party leaders. Please have your party leader talk to me.";
+ close;
+ }
+
+ .@md_name$ = "Ghost Palace";
+ switch( instance_enter(.@md_name$) ) {
+ case IE_OTHER:
+ mes "An unknown error occurred.";
+ close;
+ case IE_NOINSTANCE:
+ mes "^ff0000Inside the devices you see a dark hole. If you wish to enter you must to talk to the Unpleasent Royal Guard first.^000000";
+ close;
+ case IE_NOMEMBER:
+ mes "Only registered members can enter the " + .@md_name$ + " instance.";
+ close;
+ case IE_OK:
+ mapannounce "dali", "" + strcharinfo(0) + " of the party, " + getpartyname(.@party_id) + ", is entering the Ghost Palace.", bc_map, 0x00ff99;
+ // warp "1@spa",42,196;
+ setquest 1261;// Cursed Swordman
+ end;
+ }
+}
+
+// 1st floor
+1@spa,41,204,5 script King#dk 4_M_RUSKING,{
+ mes "[King]";
+ mes "You are hereby appointed as the personal guard to Princess Tiara. I trust your loyalty above all else.";
+ npctalk "King: You are hereby appointed as the personal guard to Princess Tiara. I trust your loyalty above all else.";
+ next;
+ mes "[Lurid Royal Guard]";
+ mes "I will protect the princess with my life.";
+ npctalk "Lurid Royal Guard: I will protect the princess with my life.", instance_npcname("Lurid Royal Guard#dk");
+ next;
+ mes "[King]";
+ mes "The marriage arrangements are going as planned. The prince is here to meet with the princess.";
+ npctalk "King: The marriage arrangements are going as planned. The prince is here to meet with the princess.";
+ next;
+ mes "[Lurid Royal Guard]";
+ mes "...Yes, your majesty.";
+ npctalk "Lurid Royal Guard: ...Yes, your majesty.", instance_npcname("Lurid Royal Guard#dk");
+ next;
+ mes "[King]";
+ mes "My gods, there are monsters in the castle! Get rid of them now!";
+ npctalk "King: My gods, there are monsters in the castle! Get rid of them now!";
+ close2;
+ donpcevent instance_npcname("#gp_control_1") + "::OnStart";
+ end;
+
+OnInstanceInit:
+ // 1: enabled potential double spawn (official), 0: disabled
+ 'bool_double_spawn = 1;
+
+ 'map_spa$ = instance_mapname("1@spa");
+
+ // warps
+ disablenpc instance_npcname("The second floor of Palace");
+ disablenpc instance_npcname("3rd floor in the palace");
+ disablenpc instance_npcname("4th floor in the palace");
+ disablenpc instance_npcname("5th floor of Palace");
+ disablenpc instance_npcname("Way out of Palace");
+
+ // first floor
+ disablenpc instance_npcname("#gp_control_1");
+
+ // second floor
+ disablenpc instance_npcname("Lurid Royal Guard#dk1");
+ disablenpc instance_npcname("Princess Tiara#dk");
+ disablenpc instance_npcname("#gp_control_2");
+
+ // 3rd floor
+ disablenpc instance_npcname("King#dk1");
+ disablenpc instance_npcname("Lurid Royal Guard#dk2");
+ disablenpc instance_npcname("Captain of the Guard#dk");
+ disablenpc instance_npcname("Soldier#dk1");
+ disablenpc instance_npcname("Soldier#dk2");
+ disablenpc instance_npcname("Soldier#dk3");
+ disablenpc instance_npcname("Lurid Royal Guard#dk3");
+ disablenpc instance_npcname("Thanatos Magic Trace#dk1");
+ disablenpc instance_npcname("#gp_control_3");
+
+ // 4th floor
+ disablenpc instance_npcname("#gp_control_4");
+ disablenpc instance_npcname("#gp_control_5");
+ disablenpc instance_npcname("Thanatos Magic Trace#dk2");
+ disablenpc instance_npcname("Visiting Prince#dk");
+ disablenpc instance_npcname("Lurid Royal Guard#dk4");
+ disablenpc instance_npcname("King's Corpse#dk");
+ disablenpc instance_npcname("Captain's Corpse#dk");
+ disablenpc instance_npcname("Soldier's Corpse#dk");
+ disablenpc instance_npcname("Soldier's Corpse#dk1");
+ disablenpc instance_npcname("Soldier's Corpse#dk2");
+ disablenpc instance_npcname("Soldier's Corpse#dk3");
+ disablenpc instance_npcname("Soldier's Corpse#dk4");
+
+ // 5th floor
+ disablenpc instance_npcname("#gp_control_6");
+ disablenpc instance_npcname("Princess Tiara#dk1");
+ disablenpc instance_npcname("Lurid Royal Guard#dk5");
+ disablenpc instance_npcname("King#dk11");
+ disablenpc instance_npcname("Sakray#dk");
+ disablenpc instance_npcname("Thanatos Magic Trace#dk3");
+ disablenpc instance_npcname("#tb");
+ disablenpc instance_npcname("#sv");
+ disablenpc instance_npcname("#tv");
+ end;
+}
+
+1@spa,42,201,1 script Lurid Royal Guard#dk 4_M_SAKRAYROYAL,{ end; }
+
+1@spa,1,1,1 script #gp_control_1 HIDDEN_WARP_NPC,{
+ end;
+OnStart:
+ enablenpc instance_npcname("#gp_control_1");
+ disablenpc instance_npcname("King#dk");
+ disablenpc instance_npcname("Lurid Royal Guard#dk");
+ initnpctimer;
+ end;
+OnTimer2000:
+ .@label$ = instance_npcname("#gp_control_1") + "::OnMyMobDead1";
+ monster 'map_spa$,50,194,"Cursed Soldier",2948,1, .@label$; // CURSED_SOLDIER
+ monster 'map_spa$,34,208,"Cursed Soldier",2948,1, .@label$; // CURSED_SOLDIER
+ monster 'map_spa$,32,194,"Cursed Gatekeeper",2949,1, .@label$; // CURSED_SENTINEL
+ monster 'map_spa$,52,209,"Cursed Gatekeeper",2949,1, .@label$; // CURSED_SENTINEL
+ stopnpctimer;
+ end;
+OnMyMobDead1:
+ if (mobcount('map_spa$, instance_npcname("#gp_control_1") + "::OnMyMobDead1") < (1 + 'bool_double_spawn)) {
+ deltimer instance_npcname("#gp_control_1") + "::OnSpawn1"; // stop double spawn if timer is running
+ addtimer 2000, instance_npcname("#gp_control_1") + "::OnSpawn1";
+ }
+ end;
+OnSpawn1:
+ .@label$ = instance_npcname("#gp_control_1") + "::OnMyMobDead2";
+ monster 'map_spa$,37,182,"Cursed Soldier",2948,1, .@label$; // CURSED_SOLDIER
+ monster 'map_spa$,46,182,"Cursed Gatekeeper",2949,1, .@label$; // CURSED_SENTINEL
+ end;
+OnMyMobDead2:
+ if (mobcount('map_spa$, instance_npcname("#gp_control_1") + "::OnMyMobDead2") < 1) {
+ deltimer instance_npcname("#gp_control_1") + "::OnSpawn1"; // stop double spawn if timer is running
+ deltimer instance_npcname("#gp_control_1") + "::OnSpawn2";
+ addtimer 2000, instance_npcname("#gp_control_1") + "::OnSpawn2";
+ }
+ end;
+OnSpawn2:
+ .@label$ = instance_npcname("#gp_control_1") + "::OnMyMobDead3";
+ monster 'map_spa$,30,200,"Cursed Soldier",2948,1, .@label$; // CURSED_SOLDIER
+ monster 'map_spa$,51,200,"Cursed Gatekeeper",2949,1, .@label$; // CURSED_SENTINEL
+ monster 'map_spa$,53,199,"Cursed Gatekeeper",2949,1, .@label$; // CURSED_SENTINEL
+ end;
+OnMyMobDead3:
+ if (mobcount('map_spa$, instance_npcname("#gp_control_1") + "::OnMyMobDead3") < 1) {
+ mapannounce 'map_spa$, "The passage on the 2nd floor in the palace of ghost is open .", bc_map,0xFFFF00;
+ enablenpc instance_npcname("The second floor of Palace");
+ enablenpc instance_npcname("Lurid Royal Guard#dk1");
+ enablenpc instance_npcname("Princess Tiara#dk");
+ }
+ end;
+}
+
+// 2nd floor
+1@spa,132,122,7 script Lurid Royal Guard#dk1 4_M_SAKRAYROYAL,{
+ .@tiara$ = instance_npcname("Princess Tiara#dk");
+ cutin "npc-tiara.bmp",3;
+ mes "[Lurid Royal Guard]";
+ mes "Your highness, the King has invited a prince from a neighboring country to be your betrothed. Be ready to meet him...";
+ npctalk "Lurid Royal Guard: Your highness, the King has invited a prince from a neighboring country to be your betrothed. Be ready to meet him...";
+ next;
+ mes "[Princess Tiara]";
+ mes "If...If a marriage is arranged what should I do?";
+ npctalk "Princess Tiara: If...If a marriage is arranged what should I do?", .@tiara$;
+ next;
+ mes "[Lurid Royal Guard]";
+ mes "The only thing I can do is protect you from physical harm.";
+ npctalk "Lurid Royal Guard: The only thing I can do is protect you from physical harm.";
+ next;
+ mes "[Princess Tiara]";
+ mes "Then, what can I do?";
+ npctalk "Princess Tiara: Then, what can I do?", .@tiara$;
+ next;
+ mes "[Lurid Royal Guard]";
+ mes "You must decide that for yourself your highness...";
+ npctalk "Lurid Royal Guard: You must decide that for yourself your highness...";
+ next;
+ mes "[Princess Tiara]";
+ mes "Would it be easier for you if I were married and sent off to another country?";
+ npctalk "Princess Tiara: Would it be easier for you if I were married and sent off to another country?", .@tiara$;
+ next;
+ mes "[Lurid Royal Guard]";
+ mes "I will always stand by you and protect you forever.";
+ npctalk "Lurid Royal Guard: I will always stand by you and protect you forever.";
+ cutin "npc-tiara.bmp",255;
+ next;
+ mes "[Princess Tiara]";
+ mes "Monsters have gotten inside the castle? Please, protect me!";
+ npctalk "Princess Tiara: Monsters have gotten inside the castle? Please, protect me!", .@tiara$;
+ next;
+ mes "[Lurid Royal Guard]";
+ mes "Stay behind me. Let's go!";
+ npctalk "Lurid Royal Guard: Stay behind me. Let's go!";
+ close2;
+ donpcevent instance_npcname("#gp_control_2") + "::OnStart";
+ end;
+}
+
+1@spa,135,125,3 duplicate(Lurid Royal Guard#dk) Princess Tiara#dk 4_F_MAYSEL
+
+1@spa,1,1,1 script #gp_control_2 HIDDEN_WARP_NPC,{
+ end;
+OnStart:
+ enablenpc instance_npcname("#gp_control_2");
+ disablenpc instance_npcname("Lurid Royal Guard#dk1");
+ disablenpc instance_npcname("Princess Tiara#dk");
+ disablenpc instance_npcname("The second floor of Palace");
+
+ killmonster 'map_spa$, instance_npcname("#gp_control_1") + "::OnMyMobDead1";
+ killmonster 'map_spa$, instance_npcname("#gp_control_1") + "::OnMyMobDead2";
+ killmonster 'map_spa$, instance_npcname("#gp_control_1") + "::OnMyMobDead3";
+ disablenpc instance_npcname("#gp_control_1");
+ initnpctimer;
+ end;
+OnTimer2000:
+ .@label$ = instance_npcname("#gp_control_2") + "::OnMyMobDead1";
+ monster 'map_spa$,135,116,"Broken Promise",2950,1, .@label$; // BROKEN_MIND
+ monster 'map_spa$,110,120,"Broken Promise",2950,1, .@label$; // BROKEN_MIND
+ monster 'map_spa$,122,112,"Floating Sorrow",2951,1, .@label$; // FLOATING_WORD
+ monster 'map_spa$,121,129,"Unfulfilled Love",2952,1, .@label$; // LIKE_LOVE
+ stopnpctimer;
+ end;
+OnMyMobDead1:
+ if (mobcount('map_spa$, instance_npcname("#gp_control_2") + "::OnMyMobDead1") < 1) {
+ sleep 2000;
+ .@label$ = instance_npcname("#gp_control_2") + "::OnMyMobDead2";
+ monster 'map_spa$,120,103,"Broken Promise",2950,1, .@label$; // BROKEN_MIND
+ monster 'map_spa$,115,137,"Floating Sorrow",2951,1, .@label$; // FLOATING_WORD
+ monster 'map_spa$,103,130,"Unfulfilled Love",2952,1, .@label$; // LIKE_LOVE
+ }
+ end;
+OnMyMobDead2:
+ if (mobcount('map_spa$, instance_npcname("#gp_control_2") + "::OnMyMobDead2") < 1) {
+ sleep 2000;
+ .@label$ = instance_npcname("#gp_control_2") + "::OnMyMobDead3";
+ monster 'map_spa$,98,119,"Floating Sorrow",2951,1, .@label$; // FLOATING_WORD
+ monster 'map_spa$,98,120,"Floating Sorrow",2951,1, .@label$; // FLOATING_WORD
+ monster 'map_spa$,103,109,"Unfulfilled Love",2952,1, .@label$; // LIKE_LOVE
+ }
+ end;
+OnMyMobDead3:
+ if (mobcount('map_spa$, instance_npcname("#gp_control_2") + "::OnMyMobDead3") < 1) {
+ mapannounce 'map_spa$, "The passage on the 3rd floor of the palace is open.", bc_map,0xFFFF00;
+ enablenpc instance_npcname("3rd floor in the palace");
+ enablenpc instance_npcname("King#dk1");
+ enablenpc instance_npcname("Lurid Royal Guard#dk2");
+ enablenpc instance_npcname("Captain of the Guard#dk");
+ enablenpc instance_npcname("Soldier#dk1");
+ enablenpc instance_npcname("Soldier#dk2");
+ enablenpc instance_npcname("Soldier#dk3");
+ disablenpc instance_npcname("#gp_control_2");
+ }
+ end;
+}
+
+// 3rd floor
+1@spa,32,54,1 script King#dk1 4_M_RUSKING,{
+ mes "[King]";
+ mes "It was you who brought the monsters here! You want to get rid of me and have the princess for yourself?";
+ npctalk "King: It was you who brought the monsters here! You want to get rid of me and have the princess for yourself?";
+ next;
+ mes "[Lurid Royal Guard]";
+ mes "It is a trap your majesty! You must trust me!";
+ npctalk "Lurid Royal Guard: It is a trap your majesty! You must trust me!", instance_npcname("Lurid Royal Guard#dk2");
+ next;
+ mes "[King]";
+ mes "Shut up! You've betrayed me! I trusted you... you must pay for your disgrace.";
+ npctalk "King: Shut up! You've betrayed me! I trusted you... you must pay for your disgrace.";
+ next;
+ mes "[King]";
+ mes "You will suffer for the rest of your life.";
+ npctalk "King: You will suffer for the rest of your life.";
+ close2;
+ disablenpc instance_npcname("3rd floor in the palace");
+ disablenpc instance_npcname("King#dk1");
+ disablenpc instance_npcname("Captain of the Guard#dk");
+ disablenpc instance_npcname("Soldier#dk1");
+ disablenpc instance_npcname("Soldier#dk2");
+ disablenpc instance_npcname("Soldier#dk3");
+ disablenpc instance_npcname("Lurid Royal Guard#dk2");
+ donpcevent instance_npcname("Thanatos Magic Trace#dk1") + "::OnStart";
+ end;
+}
+
+1@spa,35,56,5 script Thanatos Magic Trace#dk1 4_TRACE,{
+ end;
+OnStart:
+ enablenpc instance_npcname("Thanatos Magic Trace#dk1");
+ enablenpc instance_npcname("Lurid Royal Guard#dk3");
+ initnpctimer;
+ end;
+OnTimer5000:
+ npctalk "Ominous Voice: Oh, faithful royal guard, you are trapped.";
+ end;
+OnTimer8000:
+ npctalk "Ominous Voice: The conspiracy in the palace has your princess in grave danger...";
+ end;
+OnTimer12000:
+ npctalk "Lurid Royal Guard: Who are you? Show yourself!", instance_npcname("Lurid Royal Guard#dk3");
+ end;
+OnTimer15000:
+ npctalk "Ominous Voice: Ah... so you do you hear me?";
+ end;
+OnTimer20000:
+ npctalk "Lurid Royal Guard: ...?", instance_npcname("Lurid Royal Guard#dk3");
+ end;
+OnTimer23000:
+ npctalk "Ominous Voice: I can give you unlimited power. If you make a pact with me.";
+ end;
+OnTimer28000:
+ npctalk "Lurid Royal Guard: I..I...", instance_npcname("Lurid Royal Guard#dk3");
+ end;
+OnTimer33000:
+ npctalk "Thanatos Magic Trace: Kukuku... What do you want boy?";
+ end;
+OnTimer34000:
+ stopnpctimer;
+ disablenpc instance_npcname("Thanatos Magic Trace#dk1");
+ disablenpc instance_npcname("Lurid Royal Guard#dk3");
+ donpcevent instance_npcname("#gp_control_3") + "::OnStart";
+ end;
+}
+
+1@spa,28,52,7 duplicate(Lurid Royal Guard#dk) Captain of the Guard#dk 4_M_KY_KNT
+1@spa,25,53,7 duplicate(Lurid Royal Guard#dk) Soldier#dk1 4_M_CRU_SOLD
+1@spa,34,53,1 duplicate(Lurid Royal Guard#dk) Soldier#dk2 4_M_CRU_SOLD
+1@spa,30,52,7 duplicate(Lurid Royal Guard#dk) Soldier#dk3 4_M_KY_SOLD
+1@spa,30,58,5 duplicate(Lurid Royal Guard#dk) Lurid Royal Guard#dk2 4_M_SAKRAY_TIED
+1@spa,31,57,5 duplicate(Lurid Royal Guard#dk) Lurid Royal Guard#dk3 4_M_SAKRAY_TIED
+
+1@spa,1,1,1 script #gp_control_3 HIDDEN_WARP_NPC,{
+ end;
+OnStart:
+ enablenpc instance_npcname("#gp_control_3");
+ initnpctimer;
+ end;
+OnTimer2000:
+ .@label$ = instance_npcname("#gp_control_3") + "::OnMyMobDead1";
+ monster 'map_spa$,31,57, "Regretful Memory",2953,1, .@label$; // CURSED_MEMORY
+ monster 'map_spa$,59,24, "Regretful Memory",2953,1, .@label$; // CURSED_MEMORY
+ monster 'map_spa$,23,40, "Wasted Friendship",2955,1, .@label$; // OLD_FRIENDSHIP
+ monster 'map_spa$,54,45, "Tarnished Oath",2954,1, .@label$; // COLORLESS_VOW
+ monster 'map_spa$,26,20, "Tarnished Oath",2954,1, .@label$; // COLORLESS_VOW
+ stopnpctimer;
+ end;
+OnMyMobDead1:
+ if (mobcount('map_spa$, instance_npcname("#gp_control_3") + "::OnMyMobDead1") < 1)
+ addtimer 2000, instance_npcname("#gp_control_3") + "::OnSpawn1";
+ end;
+OnSpawn1:
+ .@label$ = instance_npcname("#gp_control_3") + "::OnMyMobDead2";
+ monster 'map_spa$,30,52, "Tarnished Oath",2954,1, .@label$; // COLORLESS_VOW
+ monster 'map_spa$,58,58, "Wasted Friendship",2955,1, .@label$; // OLD_FRIENDSHIP
+ monster 'map_spa$,54,24, "Regretful Memory",2953,1, .@label$; // CURSED_MEMORY
+ end;
+OnMyMobDead2:
+ if (mobcount('map_spa$, instance_npcname("#gp_control_3") + "::OnMyMobDead2") < (1 + 'bool_double_spawn)) {
+ deltimer instance_npcname("#gp_control_3") + "::OnAnnounce";
+ addtimer 500, instance_npcname("#gp_control_3") + "::OnAnnounce";
+ }
+ end;
+OnAnnounce:
+ mapannounce 'map_spa$, "The passage on the 4th floor of the palace is open.", bc_map,0xFFFF00;
+ enablenpc instance_npcname("4th floor in the palace");
+ deltimer instance_npcname("#gp_control_3") + "::OnSpawn2"; // stop double spawn if timer is running
+ addtimer 2000, instance_npcname("#gp_control_3") + "::OnSpawn2";
+ end;
+OnSpawn2:
+ donpcevent instance_npcname("#gp_control_4") + "::OnStart";
+ // 35 mobs
+ .@label$ = instance_npcname("#gp_control_3") + "::OnMyMobDead3";
+ monster 'map_spa$,67,46, "Regretful Memory",2953,1, .@label$; // CURSED_MEMORY
+ unittalk $@mobid[0], "You are trapped...";
+ monster 'map_spa$,62,48, "Tarnished Oath",2954,1, .@label$; // COLORLESS_VOW
+ unittalk $@mobid[0], "Run away!";
+ monster 'map_spa$,57,46, "Wasted Friendship",2955,1, .@label$; // OLD_FRIENDSHIP
+ unittalk $@mobid[0], "Run away quickly!";
+ monster 'map_spa$,51,48, "Regretful Memory",2953,1, .@label$; // CURSED_MEMORY
+ unittalk $@mobid[0], "Faithful royal guard...";
+ monster 'map_spa$,56,55, "Tarnished Oath",2954,1, .@label$; // COLORLESS_VOW
+ unittalk $@mobid[0], "Run away!";
+ monster 'map_spa$,62,56, "Wasted Friendship",2955,1, .@label$; // OLD_FRIENDSHIP
+ unittalk $@mobid[0], "You are trapped...";
+ monster 'map_spa$,66,58, "Regretful Memory",2953,1, .@label$; // CURSED_MEMORY
+ unittalk $@mobid[0], "You put your princess in grave danger...";
+ monster 'map_spa$,66,64, "Tarnished Oath",2954,1, .@label$; // COLORLESS_VOW
+ unittalk $@mobid[0], "Faithful royal guard...";
+ monster 'map_spa$,62,65, "Regretful Memory",2953,1, .@label$; // CURSED_MEMORY
+ unittalk $@mobid[0], "Run away quickly!";
+ monster 'map_spa$,57,67, "Tarnished Oath",2954,1, .@label$; // COLORLESS_VOW
+ unittalk $@mobid[0], "You are trapped...";
+ monster 'map_spa$,49,66, "Wasted Friendship",2955,1, .@label$; // OLD_FRIENDSHIP
+ unittalk $@mobid[0], "Run away!";
+ monster 'map_spa$,44,66, "Regretful Memory",2953,1, .@label$; // CURSED_MEMORY
+ unittalk $@mobid[0], "Run away quickly!";
+ monster 'map_spa$,45,20, "Tarnished Oath",2954,1, .@label$; // COLORLESS_VOW
+ unittalk $@mobid[0], "Run away!";
+ monster 'map_spa$,38,20, "Regretful Memory",2953,1, .@label$; // CURSED_MEMORY
+ unittalk $@mobid[0], "You are trapped...";
+ monster 'map_spa$,32,20, "Wasted Friendship",2955,1, .@label$; // OLD_FRIENDSHIP
+ unittalk $@mobid[0], "Run away quickly!";
+ monster 'map_spa$,51,22, "Wasted Friendship",2955,1, .@label$; // OLD_FRIENDSHIP
+ unittalk $@mobid[0], "Run away quickly!";
+ monster 'map_spa$,26,34,"Wasted Friendship",2955,1, .@label$; // OLD_FRIENDSHIP
+ unittalk $@mobid[0], "Run away!";
+ monster 'map_spa$,21,37,"Tarnished Oath",2954,1, .@label$; // COLORLESS_VOW
+ unittalk $@mobid[0], "Faithful royal guard...";
+ monster 'map_spa$,18,39,"Regretful Memory",2953,1, .@label$; // CURSED_MEMORY
+ unittalk $@mobid[0], "Run away quickly!";
+ monster 'map_spa$,21,45,"Tarnished Oath",2954,1, .@label$; // COLORLESS_VOW
+ unittalk $@mobid[0], "Run away!";
+ monster 'map_spa$,23,49,"Regretful Memory",2953,1, .@label$; // CURSED_MEMORY
+ unittalk $@mobid[0], "You are trapped...";
+ monster 'map_spa$,25,54,"Wasted Friendship",2955,1, .@label$; // OLD_FRIENDSHIP
+ unittalk $@mobid[0], "Run away quickly!";
+ monster 'map_spa$,29,54,"Tarnished Oath",2954,1, .@label$; // COLORLESS_VOW
+ unittalk $@mobid[0], "You put your princess in grave danger...";
+ monster 'map_spa$,56,39,"Regretful Memory",2953,1, .@label$; // CURSED_MEMORY
+ unittalk $@mobid[0], "Run away!";
+ monster 'map_spa$,61,36,"Tarnished Oath",2954,1, .@label$; // COLORLESS_VOW
+ unittalk $@mobid[0], "Faithful royal guard...";
+ monster 'map_spa$,66,38,"Wasted Friendship",2955,1, .@label$; // OLD_FRIENDSHIP
+ unittalk $@mobid[0], "Run away quickly!";
+ monster 'map_spa$,42,54,"Wasted Friendship",2955,1, .@label$; // OLD_FRIENDSHIP
+ unittalk $@mobid[0], "Run away!";
+ monster 'map_spa$,35,54,"Regretful Memory",2953,1, .@label$; // CURSED_MEMORY
+ unittalk $@mobid[0], "You are trapped...";
+ monster 'map_spa$,43,60,"Tarnished Oath",2954,1, .@label$; // COLORLESS_VOW
+ unittalk $@mobid[0], "Faithful royal guard...";
+ monster 'map_spa$,30,25,"Tarnished Oath",2954,1, .@label$; // COLORLESS_VOW
+ unittalk $@mobid[0], "You put your princess in grave danger...";
+ monster 'map_spa$,30,31,"Regretful Memory",2953,1, .@label$; // CURSED_MEMORY
+ unittalk $@mobid[0], "You are trapped...";
+ monster 'map_spa$,65,64, "Regretful Memory",2953,1, .@label$; // CURSED_MEMORY
+ monster 'map_spa$,65,67, "Regretful Memory",2953,1, .@label$; // CURSED_MEMORY
+ monster 'map_spa$,18,43,"Regretful Memory",2953,1, .@label$; // CURSED_MEMORY
+ monster 'map_spa$,21,43,"Regretful Memory",2953,1, .@label$; // CURSED_MEMORY
+ end;
+OnMyMobDead3:
+ end;
+}
+
+// 4th floor
+1@spa,1,1,1 script #gp_control_4 HIDDEN_WARP_NPC,{
+ end;
+OnStart:
+ enablenpc instance_npcname("#gp_control_4");
+ .@label$ = instance_npcname("#gp_control_4") + "::OnMyMobDead1";
+ monster 'map_spa$,215,194, "Sweet Slaughter",2956,1, .@label$; // SWEET_SLAUGHTER
+ monster 'map_spa$,194,178, "Sweet Slaughter",2956,1, .@label$; // SWEET_SLAUGHTER
+ monster 'map_spa$,191,211, "Sweet Slaughter",2956,1, .@label$; // SWEET_SLAUGHTER
+ monster 'map_spa$,185,203, "Cursed Gatekeeper",2949,1, .@label$; // CURSED_SENTINEL
+ monster 'map_spa$,209,218, "Cursed Gatekeeper",2949,1, .@label$; // CURSED_SENTINEL
+ end;
+OnMyMobDead1:
+ if (mobcount('map_spa$, instance_npcname("#gp_control_4") + "::OnMyMobDead1") < (1 + 'bool_double_spawn)) {
+ deltimer instance_npcname("#gp_control_4") + "::OnSpawn1";
+ addtimer 2000, instance_npcname("#gp_control_4") + "::OnSpawn1";
+ }
+ end;
+OnSpawn1:
+ .@label$ = instance_npcname("#gp_control_4") + "::OnMyMobDead2";
+ monster 'map_spa$,189,192, "Cursed Gatekeeper",2949,1, .@label$; // CURSED_SENTINEL
+ monster 'map_spa$,211,209, "Sweet Slaughter",2956,1, .@label$; // SWEET_SLAUGHTER
+ end;
+OnMyMobDead2:
+ if (mobcount('map_spa$, instance_npcname("#gp_control_4") + "::OnMyMobDead2") < 1) {
+ enablenpc instance_npcname("Thanatos Magic Trace#dk2");
+ enablenpc instance_npcname("Visiting Prince#dk");
+ enablenpc instance_npcname("Lurid Royal Guard#dk4");
+ enablenpc instance_npcname("King's Corpse#dk");
+ enablenpc instance_npcname("Captain's Corpse#dk");
+ enablenpc instance_npcname("Soldier's Corpse#dk");
+ enablenpc instance_npcname("Soldier's Corpse#dk1");
+ enablenpc instance_npcname("Soldier's Corpse#dk2");
+ enablenpc instance_npcname("Soldier's Corpse#dk3");
+ enablenpc instance_npcname("Soldier's Corpse#dk4");
+ }
+ end;
+}
+
+1@spa,199,214,1 script Lurid Royal Guard#dk4 4_M_SAKRAYROYAL,{
+ .@prince$ = instance_npcname("Visiting Prince#dk");
+ mes "[Lurid Royal Guard]";
+ mes "Where is Princess Tiara?";
+ npctalk "Lurid Royal Guard: Where is Princess Tiara?";
+ next;
+ mes "[Visiting Prince]";
+ mes "You are too late... but you brought what I was looking for. Thanks for your help.";
+ npctalk "Visiting Prince: You are too late... but you brought what I was looking for. Thanks for your help.", .@prince$;
+ next;
+ mes "[Visiting Prince]";
+ mes "Cursed Thanatos Magic Trace! Are you ready to have a new master?";
+ npctalk "Visiting Prince: Cursed Thanatos Magic Trace! Are you ready to have a new master?", .@prince$;
+ next;
+ cutin "tartanos.bmp",3;
+ mes "[Thanatos Magic Trace]";
+ mes "How dare you!";
+ npctalk "Thanatos Magic Trace: How dare you!", instance_npcname("Thanatos Magic Trace#dk2");
+ next;
+ mes "[Visiting Prince]";
+ mes "aah, aah !!!";
+ npctalk "Visiting Prince: Aah, aah!!!", .@prince$;
+ donpcevent instance_npcname("#gp_control_5") + "::OnStart";
+ close2;
+ cutin "",255;
+ end;
+}
+1@spa,201,214,1 duplicate(Lurid Royal Guard#dk) Thanatos Magic Trace#dk2 CLEAR_NPC
+1@spa,197,218,5 duplicate(Lurid Royal Guard#dk) Visiting Prince#dk 4_M_KNIGHT_SILVER
+1@spa,194,214,5 duplicate(Lurid Royal Guard#dk) King's Corpse#dk 4_M_TRISTAN
+1@spa,211,194,3 duplicate(Lurid Royal Guard#dk) Captain's Corpse#dk 4_M_LIEMAN
+1@spa,201,198,1 duplicate(Lurid Royal Guard#dk) Soldier's Corpse#dk 4_M_DIEMAN
+1@spa,197,190,1 duplicate(Lurid Royal Guard#dk) Soldier's Corpse#dk1 4_M_DIEMAN
+1@spa,191,207,7 duplicate(Lurid Royal Guard#dk) Soldier's Corpse#dk2 4_M_DIEMAN
+1@spa,206,209,7 duplicate(Lurid Royal Guard#dk) Soldier's Corpse#dk3 4_M_DIEMAN
+1@spa,189,195,1 duplicate(Lurid Royal Guard#dk) Soldier's Corpse#dk4 4_M_DIEMAN
+
+1@spa,1,1,1 script #gp_control_5 HIDDEN_WARP_NPC,{
+ end;
+OnStart:
+ enablenpc instance_npcname("#gp_control_5");
+ disablenpc instance_npcname("Thanatos Magic Trace#dk2");
+ disablenpc instance_npcname("Visiting Prince#dk");
+ disablenpc instance_npcname("Lurid Royal Guard#dk4");
+ disablenpc instance_npcname("King's Corpse#dk");
+ disablenpc instance_npcname("Captain's Corpse#dk");
+ disablenpc instance_npcname("Soldier's Corpse#dk");
+ disablenpc instance_npcname("Soldier's Corpse#dk1");
+ disablenpc instance_npcname("Soldier's Corpse#dk2");
+ disablenpc instance_npcname("Soldier's Corpse#dk3");
+ disablenpc instance_npcname("Soldier's Corpse#dk4");
+ sleep 1000;
+ .@label$ = instance_npcname("#gp_control_5") + "::OnMyMobDead";
+ monster 'map_spa$,198,218, "Torturous Redeemer",2959,1, .@label$; // TORTUROUS_REDEEMER
+ monster 'map_spa$,198,182, "Sweet Slaughter",2956,1, .@label$; // SWEET_SLAUGHTER
+ end;
+OnMyMobDead:
+ if (mobcount('map_spa$, instance_npcname("#gp_control_5") + "::OnMyMobDead") < 1) {
+ deltimer instance_npcname("#gp_control_4") + "::OnSpawn1"; // stop double spawn if timer is running
+ mapannounce 'map_spa$, "The passage on the 5th floor of the palace is open.", bc_map,0xFFFF00;
+ disablenpc instance_npcname("4th floor in the palace");
+ enablenpc instance_npcname("5th floor of Palace");
+ enablenpc instance_npcname("Princess Tiara#dk1");
+ enablenpc instance_npcname("Lurid Royal Guard#dk5");
+
+ killmonster 'map_spa$, instance_npcname("#gp_control_3") + "::OnMyMobDead2";
+ killmonster 'map_spa$, instance_npcname("#gp_control_3") + "::OnMyMobDead3";
+ disablenpc instance_npcname("#gp_control_3");
+ }
+ end;
+}
+
+// 5th floor
+1@spa,216,43,3 script Princess Tiara#dk1 4_F_MAYSEL,{
+ .@guard$ = instance_npcname("Lurid Royal Guard#dk5");
+ mes "[Princess Tiara]";
+ mes "You kept your promise.";
+ npctalk "Princess Tiara: You kept your promise.";
+ next;
+ mes "[Lurid Royal Guard]";
+ mes "princess!";
+ npctalk "Lurid Royal Guard: Princess!", .@guard$;
+ next;
+ cutin "npc-tiara.bmp",3;
+ mes "[Princess Tiara]";
+ mes "Thank you... now I can rest beside you...";
+ npctalk "Princess Tiara: Thank you... now I can rest beside you...";
+ next;
+ mes "[Lurid Royal Guard]";
+ mes "No..No!!!!!";
+ npctalk "Lurid Royal Guard: No..No!!!!!", .@guard$;
+ next;
+ mes "[The voice of Princess Tiara]";
+ mes "I want to be with you forever in peace...forever...";
+ npctalk "Princess Tiara: I want to be with you forever in peace...forever...";
+ next;
+ cutin "b-tiara.BMP",3;
+ mes "[Lurid Royal Guard]";
+ mes "no.....Ahh ahh ahh!!!!~!";
+ npctalk "Lurid Royal Guard: no.....Ahh ahh ahh!!!!~!", .@guard$;
+ next;
+ mes "[The voice of Princess Tiara]";
+ mes "I love you...";
+ npctalk "Princess Tiara: I love you...";
+ cutin "",255;
+ close2;
+ donpcevent instance_npcname("#gp_control_6") + "::OnStart";
+ end;
+}
+
+1@spa,213,42,7 duplicate(Lurid Royal Guard#dk) Lurid Royal Guard#dk5 4_M_SAKRAYROYAL
+
+1@spa,1,1,1 script #gp_control_6 HIDDEN_WARP_NPC,{
+ end;
+OnStart:
+ enablenpc instance_npcname("#gp_control_6");
+ disablenpc instance_npcname("Princess Tiara#dk1");
+ disablenpc instance_npcname("Lurid Royal Guard#dk5");
+
+ killmonster 'map_spa$, instance_npcname("#gp_control_4") + "::OnMyMobDead1";
+ killmonster 'map_spa$, instance_npcname("#gp_control_4") + "::OnMyMobDead2";
+ killmonster 'map_spa$, instance_npcname("#gp_control_5") + "::OnMyMobDead";
+ disablenpc instance_npcname("#gp_control_4");
+ disablenpc instance_npcname("#gp_control_5");
+ disablenpc instance_npcname("5th floor of Palace");
+ sleep 2000;
+ .@label$ = instance_npcname("#gp_control_6") + "::OnMyMobDead1";
+ monster 'map_spa$,217,52, "Forgotten Name" ,2957,1, .@label$; // FORGOTTEN_NAME
+ unittalk $@mobid[0], "Wake up! look at us... We are monsters?";
+ monster 'map_spa$,190,21, "Tarnished Oath" ,2954,1, .@label$; // COLORLESS_VOW
+ unittalk $@mobid[0], "Sakray killed the King and tried to kill us!";
+ monster 'map_spa$,198,49, "Tarnished Oath" ,2954,1, .@label$; // COLORLESS_VOW
+ unittalk $@mobid[0], "What is this..??";
+ monster 'map_spa$,212,28, "Fatal Days" ,2958,1, .@label$; // FATAL_DAYS
+ unittalk $@mobid[0], "Sakray killed a princess!";
+ end;
+OnMyMobDead1:
+ if (mobcount('map_spa$, instance_npcname("#gp_control_6") + "::OnMyMobDead1") < 1) {
+ sleep 2000;
+ .@label$ = instance_npcname("#gp_control_6") + "::OnMyMobDead2";
+ monster 'map_spa$,217,43, "Forgotten Name" ,2957,1, .@label$; // FORGOTTEN_NAME
+ unittalk $@mobid[0], "Wake up! look at us... We are monsters?";
+ monster 'map_spa$,193,24, "Forgotten Name" ,2957,1, .@label$; // FORGOTTEN_NAME
+ unittalk $@mobid[0], "Sakray..?? why.....Sakray!";
+ monster 'map_spa$,216,59, "Tarnished Oath" ,2954,1, .@label$; // COLORLESS_VOW
+ unittalk $@mobid[0], "Sakray killed the King and tried to kill us!";
+ monster 'map_spa$,197,57, "Fatal Days" ,2958,1, .@label$; // FATAL_DAYS
+ unittalk $@mobid[0], "Sakray killed a princess!";
+ }
+ end;
+OnMyMobDead2:
+ if (mobcount('map_spa$, instance_npcname("#gp_control_6") + "::OnMyMobDead2") < 1) {
+ sleep 2000;
+ .@label$ = instance_npcname("#gp_control_6") + "::OnMyMobDead3";
+ monster 'map_spa$,193,39, "Forgotten Name" ,2957,1, .@label$; // FORGOTTEN_NAME
+ unittalk $@mobid[0], "Wake up! look at us... We are monsters?";
+ monster 'map_spa$,212,34, "Forgotten Name" ,2957,1, .@label$; // FORGOTTEN_NAME
+ unittalk $@mobid[0], "Sakray..?? why.....Sakray!";
+ monster 'map_spa$,201,64, "Tarnished Oath" ,2954,1, .@label$; // COLORLESS_VOW
+ unittalk $@mobid[0], "Sakray killed the King and tried to kill us!";
+ monster 'map_spa$,175,44, "Fatal Days" ,2958,1, .@label$; // FATAL_DAYS
+ unittalk $@mobid[0], "Sakray killed a princess!";
+ }
+ end;
+OnMyMobDead3:
+ if (mobcount('map_spa$, instance_npcname("#gp_control_6") + "::OnMyMobDead3") < 1) {
+ sleep 2000;
+ monster 'map_spa$,200,45, "Torturous Redeemer" ,2961,1, instance_npcname("#gp_control_6") + "::OnMyMobDead4"; // E_TORTUROUS_REDEEMER
+ unittalk $@mobid[0], "Thanatos Magic Trace! I will destroy you if I can't have you... Oh no! How could this be?";
+ sleep 5000;
+ killmonster 'map_spa$, instance_npcname("#gp_control_6") + "::OnMyMobDead4";
+ enablenpc instance_npcname("Sakray#dk");
+ enablenpc instance_npcname("Thanatos Magic Trace#dk3");
+ disablenpc instance_npcname("#gp_control_6");
+ }
+ end;
+OnMyMobDead4:
+ end;
+}
+
+1@spa,196,44,5 script Sakray#dk 4_M_SAKRAY,{
+ mes "[Lurid Royal Guard]";
+ mes "Are you satisfied..? Thanatos Magic Trace?";
+ npctalk "Lurid Royal Guard: Are you satisfied..? Thanatos Magic Trace?";
+ next;
+ mes "[Thanatos Magic Trace]";
+ mes "I need more blood..Sakray, offer me his blood.";
+ npctalk "Thanatos Magic Trace: I need more blood..Sakray, offer me his blood.", instance_npcname("Thanatos Magic Trace#dk3");
+ next;
+ mes "[Sakray]";
+ mes "Okay, that is good. A traveller. Did you see?";
+ npctalk "Sakray: Okay, that is good. A traveller. Did you see?";
+ next;
+ mes "[" + strcharinfo(0) + "]";
+ mes "Sakray, what do you want? Sympathy? Or is it a trap?";
+ unittalk getcharid(3), "" + strcharinfo(0) + " : Sakray, what do you want? Sympathy? Or is it a trap?";
+ next;
+ mes "[Sakray]";
+ mes "No... I do not need to make any effort to catch a novice.";
+ npctalk "Sakray: No... I do not need to make any effort to catch a novice.";
+ next;
+ mes "[" + strcharinfo(0) + "]";
+ mes "If so... then why...?";
+ unittalk getcharid(3), "" + strcharinfo(0) + " : If so... then why...?";
+ next;
+ cutin "cry-b.bmp",2;
+ mes "[Sakray]";
+ mes "I wanted to get rid of a piece of humanity inside of me through you.";
+ npctalk "Sakray: I wanted to get rid of a piece of humanity inside of me through you.";
+ next;
+ mes "[Sakray]";
+ mes "I am quite satisfied with the result.";
+ npctalk "Sakray: I am quite satisfied with the result.";
+ next;
+ mes "[Thanatos Magic Trace]";
+ mes "Sakray, offer the blood to me now!";
+ npctalk "Thanatos Magic Trace: Sakray, offer the blood to me now!", instance_npcname("Thanatos Magic Trace#dk3");
+ next;
+ mes "[Sakray]";
+ mes "If you were me, what would you do?";
+ npctalk "Sakray: If you were me, what would you do?";
+ next;
+ mes "[Sakray]";
+ mes "Can you set yourself free from this curse?";
+ npctalk "Sakray: Can you set yourself free from this curse?";
+ next;
+ mes "[" + strcharinfo(0) + "]";
+ mes "...";
+ unittalk getcharid(3), "" + strcharinfo(0) + " : ...";
+ next;
+ mes "[Sakray]";
+ mes "Heh heh... I will keep watching you until the day comes when you are old enough.";
+ npctalk "Sakray: Heh heh... I will keep watching you until the day comes when you are old enough.";
+ next;
+ mes "[Sakray]";
+ mes "I am willing to hunt you later for Thanatos.";
+ npctalk "Sakray: I am willing to hunt you later for Thanatos.";
+ cutin "",255;
+ next;
+ mes "[Sakray]";
+ mes "Farewell then.";
+ npctalk "Sakray: Farewell then.";
+ close2;
+ donpcevent instance_npcname("#tb") + "::OnStart";
+ end;
+}
+
+1@spa,196,46,1 script #tb CLEAR_NPC,{
+ end;
+OnStart:
+ disablenpc instance_npcname("Sakray#dk");
+ disablenpc instance_npcname("Thanatos Magic Trace#dk3");
+ enablenpc instance_npcname("#tb");
+ enablenpc instance_npcname("#sv");
+ enablenpc instance_npcname("#tv");
+ initnpctimer;
+ end;
+OnTimer3000:
+ npctalk "Voice of Princess Tiara : What can I do for you?";
+ end;
+OnTimer8000:
+ npctalk "Voice of Sakray : I will always stand by you. Please rest beside me.", instance_npcname("#sv");
+ end;
+OnTimer13000:
+ npctalk "Thanatos Magic Trace: Sakray, do not forget the covenant of blood between us.", instance_npcname("#tv");
+ end;
+OnTimer17000:
+ npctalk "Thanatos Magic Trace: Your soul is mine until you find the blood that satisfies me...", instance_npcname("#tv");
+ end;
+OnTimer22000:
+ npctalk "Voice of Sakray : Rest in the shadow with me.", instance_npcname("#sv");
+ end;
+OnTimer25000:
+ npctalk "Voice of Sakray : In the dark forever...", instance_npcname("#sv");
+ end;
+OnTimer28500:
+ disablenpc instance_npcname("#tb");
+ disablenpc instance_npcname("#sv");
+ disablenpc instance_npcname("#tv");
+ mapannounce 'map_spa$, "It is time to leave the Ghost Palace.", bc_map,0xFFFF00;
+ enablenpc instance_npcname("Way out of Palace");
+ enablenpc instance_npcname("King#dk11");
+ end;
+}
+
+1@spa,195,41,1 duplicate(Lurid Royal Guard#dk) Thanatos Magic Trace#dk3 CLEAR_NPC
+1@spa,198,43,1 duplicate(Lurid Royal Guard#dk) #sv CLEAR_NPC
+1@spa,196,41,1 duplicate(Lurid Royal Guard#dk) #tv CLEAR_NPC
+
+1@spa,204,29,1 script King#dk11 4_M_RUSKING,{
+ disable_items;
+ mes "[King]";
+ mes "Hey there, are you alive?";
+ mes "I did not expect to meet someone who is still alive.";
+ next;
+ mes "[King]";
+ mes "Do you possibly have the ^006400Gray Shard^000000?";
+ mes "Can you give it to me?";
+ mes "The memories of the faithful royal guard";
+ mes "and the memories of everyone he loved";
+ mes "are contained inside of these shards.";
+ next;
+ mes "[King]";
+ mes "Will you give the ^006400Gray Shard^000000 to me?";
+ mes "The guilt is eating my soul.";
+ mes "My soul is stuck within the Ghost Palace.";
+ next;
+ mes "[King]";
+ mes "I am collecting Sakray's abandoned memories from these shards.";
+ next;
+ mes "[King]";
+ mes "If you give any ^006400Gray Shard^000000s to me, I can make equipment for you.";
+ next;
+ mes "[King]";
+ mes "The cursed knight...";
+ mes "Please help me save the soul of Sakray.";
+ next;
+ setarray .@item_name$[0],
+ "Thanatos Sword", "Thanatos Great Sword", "Thanatos Spear", "Thanatos Long Spear", "Thanatos Staff",
+ "Thanatos Two-handed Staff", "Thanatos Bow", "Thanatos Dagger", "Thanatos Katar", "Thanatos Knuckle",
+ "Thanatos Hammer", "Thanatos Axe", "Thanatos Violin", "Thanatos Whip",
+ "Gray Shield", "Gray Armor", "Gray Robe", "Gray Cloak", "Gray Shoes", "Gray Helmet";
+ setarray .@items_list[0],13441,21009,1438,1496,1669,2023,18119,13093,28000,1836,16028,28100,1933,1988,2187,15090,15091,20721,22033,18820;
+
+ for ( .@i = 0; .@i < 20; .@i++ )
+ .@menu$ += .@item_name$[.@i] + ":";
+ .@menu$ += "Cancel";
+
+ while(true) {
+ .@s = select(.@menu$) - 1;
+ if (.@s == 20) {
+ mes "[King]";
+ mes "Someday, Sakray will";
+ mes "get out of this curse for sure.";
+ mes "I believe";
+ mes "^006400Gray Shard^000000s are the only method";
+ mes "to save him....";
+ close;
+ }
+ .@cost = ( .@s > 13 ? 100 : 200 );
+ mes "[King]";
+ mes "To make a ^FF0000" + .@item_name$[.@s] + "^000000";
+ mes "I need " + .@cost + " ^006400Gray Shard^000000.";
+ next;
+ if (select( "Cancel", "Hand over " + .@cost + " Gray Shard." ) == 1) {
+ mes "[King]";
+ mes "Someday, Sakray will";
+ mes "get out of this curse for sure.";
+ next;
+ continue;
+ }
+ if (countitem(6672) < .@cost) {
+ mes "[King]";
+ mes "You do not have enough ^006400Gray Shard^000000";
+ mes "to make a ^FF0000" + .@item_name$[.@s] + "^000000.";
+ mes "I need " + .@cost + " ^006400Gray Shard^000000.";
+ next;
+ continue;
+ }
+ mes "[King]";
+ mes "I will make a ^FF0000" + .@item_name$[.@s] + "^000000";
+ mes "with " + .@cost + " ^006400Gray Shard^000000.";
+ next;
+ mes "You see a light through the folded hands of the king and it gradually takes on a shape.";
+ next;
+ mes "[King]";
+ mes "All right, it is done.";
+ mes "Take this ^FF0000" + .@item_name$[.@s] + "^000000";
+ mes "to confront Sakray and Thanatos.";
+ next;
+ mes "[King]";
+ mes "The power requires a sacrifice.";
+ mes "Please be careful...";
+ delitem 6672,.@cost;// Gray Shard
+ getitem .@items_list[.@s],1;
+ close;
+ }
+}
+
+1@spa,210,28,0 script Way out of Palace WARPNPC,2,2,{
+ end;
+OnTouch_:
+ mes "It is time to leave the Ghost Palace.";
+ mes "Everything is now complete";
+ mes "and will vanish..";
+ close2;
+ if (isbegin_quest(1263) == 2)
+ getitem 6672,1;// Gray Shard
+ else {
+ setquest 1263;// Cursed Swordman
+ completequest 1263;
+ getexp 900000,500000;
+ getitem 6672,2;// Gray Shard
+ }
+ warp "dali02",46,129;
+ end;
+}
+
+1@spa,41,217,0 warp The second floor of Palace 2,2,1@spa,114,120
+1@spa,117,137,0 warp 3rd floor in the palace 2,2,1@spa,60,43
+1@spa,54,28,0 warp 4th floor in the palace 2,2,1@spa,218,186
+1@spa,178,186,0 warp 5th floor of Palace 2,2,1@spa,186,57
diff --git a/npc/re/instances/HorrorToyFactory.txt b/npc/re/instances/HorrorToyFactory.txt
index d586a13cc31..1b99436ddaa 100644
--- a/npc/re/instances/HorrorToyFactory.txt
+++ b/npc/re/instances/HorrorToyFactory.txt
@@ -1324,7 +1324,7 @@ OnStart:
.@mon_num++;
if (.@mon_num > 20)
break;
- sleep2 200;
+ sleep 200;
}
sleep 6000;
killmonster 'xm_d_map$, .@event$;
@@ -1455,19 +1455,19 @@ OnInstanceInit:
OnStart:
sleep 1000;
npctalk "Catherine Jet Johnson: Unfortunately, I am failed to persuade Kimi.";
- sleep2 3000;
+ sleep 3000;
npctalk "Catherine Jet Johnson: What was the voice of phantom? Why it torments Kimi so harshly...";
- sleep2 4000;
+ sleep 4000;
npctalk "Catherine Jet Johnson: I guess that the curse of my face was form the unidentified voice.";
- sleep2 4000;
+ sleep 4000;
npctalk "Catherine Jet Johnson: Anyway, even Kimi, saying hates everyone, has collected her recollections here a lot.";
- sleep2 6000;
+ sleep 6000;
npctalk "Catherine Jet Johnson: I will put this thing safely even if her soul will return and she won't be disappointed.";
- sleep2 5000;
+ sleep 5000;
npctalk "Catherine Jet Johnson: Thanks to you, everything that I have wondered is completely resolved. Please call me again if you are going to send her to Heaven next time.";
- sleep2 5000;
+ sleep 5000;
npctalk "Catherine Jet Johnson: I will open the exit way out. I will go outside first, so just follow me.";
- sleep2 3000;
+ sleep 3000;
disablenpc instance_npcname("Catherine Jet Johnson#6");
enablenpc instance_npcname("#exwp1");
end;
diff --git a/npc/re/instances/LastRoom.txt b/npc/re/instances/LastRoom.txt
new file mode 100644
index 00000000000..0677d8a73f6
--- /dev/null
+++ b/npc/re/instances/LastRoom.txt
@@ -0,0 +1,589 @@
+//===== rAthena Script =======================================
+//= The Last Room
+//===== Description: =========================================
+//= [Walkthrough Conversion]
+//= The Last Room Instance
+//===== Changelogs: ==========================================
+//= 1.0 First version. [Capuche]
+//============================================================
+
+un_myst,163,38,5 script Mark 4_M_BLUEMAN,{
+ mes "[Mark]";
+ cutin "bu_mark1.bmp",0;
+
+ if (BaseLevel < 150) {
+ mes "It's dangerous here.";
+ mes "It would be better to come back next time when we are stronger.";
+ close3;
+ }
+ if (getcharid(1) < 1) {
+ mes "...It doesn't feel right here.";
+ mes "It may be dangerous alone so it might be better to form a party.";
+ close3;
+ }
+ mes "Unlike the other doors we saw this door has traces of it being blocked from this side.";
+ next;
+ mes "[Mark]";
+ mes "Is there something inside?";
+ next;
+ switch( checkquest(11379,PLAYTIME) ) {
+ case -1:
+ .@party_id = getcharid(1);
+ if (getpartyleader(.@party_id,2) == getcharid(0))
+ .@string$ = "Open door.";
+ .@s = select( .@string$, "Go in.", "Quit." );
+ if (.@s == 1) {
+ mes "[Mark]";
+ mes "I'm opening the door.";
+ mes "Go in when the door is completely open.";
+ instance_create("Last room");
+ }
+ else if (.@s == 2) {
+ mes "[Mark]";
+ switch( instance_enter("Last room") ) {
+ case IE_NOMEMBER:
+ case IE_NOINSTANCE:
+ case IE_OTHER:
+ mes "The door won't open right.";
+ break;
+ case IE_OK:
+ mapannounce "un_myst", strcharinfo(0) + " of the party, " + getpartyname(.@party_id) + ", is entering Last room.",bc_map,"0x00FF99";
+ setquest 11379;// Final Room
+ if (isbegin_quest(11380) == 0)
+ setquest 11380;// Final Room
+ break;
+ }
+ }
+ close3;
+ case 0:
+ case 1:
+ mes "[Mark]";
+ cutin "bu_mark1.bmp",0;
+ mes "...You look tired.";
+ mes "Since you went there you should take a day to rest.";
+ close3;
+ case 2:
+ mes "[Mark]";
+ cutin "bu_mark1.bmp",0;
+ mes "I can't believe you want to enter a place like this again...";
+ erasequest 11379;// Final Room
+ close3;
+ }
+}
+
+// 1st step
+1@uns,139,41,3 script Mark#room1 4_M_BLUEMAN,{
+ mes "[Mark]";
+ mes "Something doesn't feel right. It is better that we move carefully.";
+ cutin "bu_mark4.bmp",0;
+ close3;
+}
+
+1@uns,145,32,5 script Alp#room1 4_M_BLACKMAN,{
+ mes "[Alp]";
+ mes "There are suspicious traces everywhere.";
+ mes "Some kind of heavy machine seems to have passed...";
+ cutin "bu_alp1.bmp",2;
+ close3;
+}
+
+1@uns,145,37,3 script Tamarin#room1 4_M_TAMARIN,{
+ mes "[Tamarin]";
+ mes "Verity, are you alright?";
+ mes "You do not look good...";
+ cutin "ep143_taang.bmp",2;
+ close3;
+}
+
+1@uns,143,38,5 script Du#room1 4_M_REDMAN,{
+ mes "[Du]";
+ mes "I have a bad feeling about this...";
+ cutin "bu_du1.bmp",2;
+ close3;
+}
+
+1@uns,143,39,5 script Maggi#room1 4_F_PINKWOMAN,{
+ mes "[Maggi]";
+ mes "Aahh....";
+ cutin "bu_maggi4.bmp",2;
+ close3;
+}
+
+1@uns,144,37,3 script Verity#room1 4_F_BERRYTEA,{
+ if ('protocole < 2) {
+ mes "[Verity]";
+ mes "Umph...I suddenly have a feeling that's not good.";
+ cutin "EP15_2_brt_6.bmp",2;
+ if (getpartyleader(getcharid(1),2) != getcharid(0)) {
+ mes "I wish to talk with the leader.";
+ close3;
+ }
+ npctalk "Verity: Umph...I suddenly have a feeling that's not good.";
+ next;
+ mes "[Verity]";
+ mes "Something is splitting my head....Ugh....";
+ npctalk "Verity: Something is splitting my head....Ugh....";
+ next;
+ mes "[Verity]";
+ mes "....Ugh....";
+ npctalk "Verity: ....Ugh....";
+ next;
+ mes "[Du]";
+ mes "Sister! Are you alright?!";
+ cutin "bu_du5.bmp",2;
+ npctalk "Du: Sister! Are you alright?!", instance_npcname("Du#room1");
+ next;
+ mes "[Verity]";
+ mes "....Have to go back....";
+ cutin "EP15_2_brt_7.bmp",2;
+ npctalk "Verity: ....Have to go back....";
+ next;
+ mes "[Tamarin]";
+ mes "Verity, are you alright?";
+ mes "Can you walk?";
+ cutin "ep143_tahuk.bmp",2;
+ npctalk "Tamarin: Verity, are you alright? Can you walk?", instance_npcname("Tamarin#room1");
+ next;
+ mes "[Verity]";
+ mes "Ugh...";
+ cutin "EP15_2_brt_6.bmp",2;
+ npctalk "Verity: Ugh...";
+ next;
+ mes "[Du]";
+ mes "" + strcharinfo(0) + "! I think it is better that you go back.";
+ cutin "bu_du5.bmp",2;
+ npctalk "Du: " + strcharinfo(0) + "! I think it is better that you go back.", instance_npcname("Du#room1");
+ next;
+ mes "[Verity]";
+ mes "N...no. I will catch up soon so go on ahead.";
+ cutin "EP15_2_brt_4.bmp",2;
+ npctalk "Verity: N...no. I will catch up soon so go on ahead.";
+ next;
+ mes "[Tamarin]";
+ mes "Then I will stay with Verity until she recovers so you can go on ahead.";
+ cutin "ep143_tahuk.bmp",2;
+ npctalk "Tamarin: Then I will stay with Verity until she recovers so you can go on ahead.";
+ close2;
+ 'protocole = 1;
+ cutin "",255;
+ }
+ end;
+}
+
+1@uns,140,45,0 script #lrdoor2 HIDDEN_WARP_NPC,6,6,{
+ end;
+OnTouch:
+ if ('protocole == 0)
+ warp 'map_name$,142,30;
+ else if ('protocole == 1) {
+ 'protocole = 2;
+ disablenpc instance_npcname("#lrdoor2");
+ disablenpc instance_npcname("Mark#room1");
+ disablenpc instance_npcname("Du#room1");
+ disablenpc instance_npcname("Tamarin#room1");
+ disablenpc instance_npcname("Verity#room1");
+ disablenpc instance_npcname("Maggi#room1");
+ disablenpc instance_npcname("Alp#room1");
+ mapannounce 'map_name$, "-----------------Creak---------------------",bc_map,"0xFF0000";
+ sleep 2000;
+ mapannounce 'map_name$, "-----Creak---Wrr--------------------------",bc_map,"0xFF0000";
+ sleep 2000;
+ mapannounce 'map_name$, "--------------Wirrrrrrr-----------------",bc_map,"0xFF0000";
+ sleep 2000;
+ mapannounce 'map_name$, "-----Zizip--------Zizizip------------------",bc_map,"0xFF0000";
+ sleep 2000;
+ mapannounce 'map_name$, "System message : Intruder detected.",bc_map,"0xFF0000";
+ sleep 2000;
+ mapannounce 'map_name$, "System message : Sealing off entrance and eliminating intruder according to designated protocols.",bc_map,"0xFF0000";
+ donpcevent instance_npcname("protocole1") + "::OnStart";
+ }
+ end;
+}
+
+1@uns,1,1,0 script protocole1 -1,{
+ end;
+OnStart:
+ enablenpc instance_npcname("protocole1");
+ monster 'map_name$,47,49,"System message",3253,1, instance_npcname("protocole1") + "::OnMyMobDead2";
+ callsub S_Spawn;
+OnTimer300000:
+ mapannounce 'map_name$, "System message : Eliminating intruder.",bc_map,"0xFF0000";
+ callsub S_Spawn;
+S_Spawn:
+ initnpctimer;
+ .@npc_name$ = instance_npcname("protocole1");
+ // don't kill System message
+ killmonster 'map_name$, .@npc_name$ + "::OnMyMobDead";
+ areamonster 'map_name$,118,56,131,67, "Machine Component",3251,6, .@npc_name$ + "::OnMyMobDead";
+ areamonster 'map_name$, 62,82, 61,67, "Machine Component",3251,6, .@npc_name$ + "::OnMyMobDead";
+ areamonster 'map_name$, 46,89, 64,96, "Machine Component",3251,6, .@npc_name$ + "::OnMyMobDead";
+ areamonster 'map_name$,118,56,131,67, "Machine Component",3252,6, .@npc_name$ + "::OnMyMobDead";
+ areamonster 'map_name$, 62,82, 61,67, "Machine Component",3252,6, .@npc_name$ + "::OnMyMobDead";
+ areamonster 'map_name$, 46,89, 64,96, "Machine Component",3252,6, .@npc_name$ + "::OnMyMobDead";
+ end;
+OnMyMobDead:
+OnMyMobDead2:
+ .@count = mobcount( 'map_name$, instance_npcname("protocole1") + "::OnMyMobDead" ) + mobcount( 'map_name$, instance_npcname("protocole1") + "::OnMyMobDead2" );
+ if (.@count < 1) {
+ mapannounce 'map_name$, "System message : First protocol failed. Commencing next protocol.",bc_map,"0xFF0000";
+ stopnpctimer;
+ enablenpc instance_npcname("Tamarin#room2");
+ disablenpc instance_npcname("protocole1");
+ }
+ end;
+}
+
+1@uns,67,97,3 script Tamarin#room2 4_M_TAMARIN,{
+ mes "[Tamarin]";
+ mes "Huff huff... Verity suddenly huff huff couldn't even stand straight before huff huff...";
+ cutin "ep143_tahuk.bmp",2;
+ if (getpartyleader(getcharid(1),2) != getcharid(0)) {
+ next;
+ mes "[Tamarin]";
+ mes "I don't think this is a problem we can solve by talking amongst ourselves.";
+ mes "Let's ask the leader's opinion first.";
+ close3;
+ }
+ npctalk "Tamarin: Huff huff... Verity suddenly huff huff couldn't even stand straight before huff huff...";
+ next;
+ mes "[Tamarin]";
+ mes "Ran off so fast huff...huff... to even catch up. Huff huff";
+ npctalk "Tamarin: Ran off so fast huff...huff... to even catch up. Huff huff";
+ next;
+ mapannounce 'map_name$, "System message : An unidentified object is moving fast from Zone 1 to Zone 2.",bc_map,"0xFF0000";
+ mes "[Tamarin]";
+ mes "Uh... Could Verity have gone that far?";
+ npctalk "Tamarin: Uh... Could Verity have gone that far?";
+ next;
+ mapannounce 'map_name$, "System message : Commencing emergency protocol.",bc_map,"0xFF0000";
+ mes "[Tamarin]";
+ mes "We need to find Verity quickly";
+ npctalk "Tamarin: We need to find Verity quickly";
+ next;
+ mes "[Tamarin]";
+ mes "There is only the route going up so go ahead.";
+ npctalk "Tamarin: There is only the route going up so go ahead.";
+ close2;
+ if ('protocole == 2) {
+ 'protocole = 3;
+ enablenpc instance_npcname("#lrdoor4");
+ for ( .@i = 1; .@i < 16; ++.@i )
+ enablenpc instance_npcname( "#lrboom" + .@i );
+ enablenpc instance_npcname("Verity#room2");
+ enablenpc instance_npcname("Verity#room3");
+ }
+ cutin "",255;
+ end;
+}
+
+// 2nd step
+1@uns,100,121,0 warp2 #lrdoor4 3,3,1@uns,145,107
+
+1@uns,157,94,0 script #lrboom1 4_CRACK,2,2,{
+ end;
+OnTouch:
+ .@npc_name$ = instance_npcname( strnpcinfo(0) );
+ areamonster 'map_name$,176,26,196,52, "Machine Component", (3251 + rand(2)), 3, .@npc_name$ + "::OnMyMobDead";
+ mapannounce 'map_name$, "System message : Intruder detected in Zone 2.",bc_map,"0xFF0000";
+ disablenpc .@npc_name$;
+ end;
+OnMyMobDead:
+ end;
+}
+1@uns,164,97,0 duplicate(#lrboom1) #lrboom2 4_CRACK,2,2
+1@uns,166,92,0 duplicate(#lrboom1) #lrboom3 4_CRACK,2,2
+1@uns,170,96,0 duplicate(#lrboom1) #lrboom4 4_CRACK,2,2
+1@uns,175,93,0 duplicate(#lrboom1) #lrboom5 4_CRACK,2,2
+1@uns,190,97,0 duplicate(#lrboom1) #lrboom6 4_CRACK,2,2
+1@uns,194,94,0 duplicate(#lrboom1) #lrboom7 4_CRACK,2,2
+1@uns,199,96,0 duplicate(#lrboom1) #lrboom8 4_CRACK,2,2
+1@uns,206,93,0 duplicate(#lrboom1) #lrboom9 4_CRACK,2,2
+1@uns,217,91,0 duplicate(#lrboom1) #lrboom10 4_CRACK,2,2
+1@uns,224,79,0 duplicate(#lrboom1) #lrboom11 4_CRACK,2,2
+1@uns,227,73,0 duplicate(#lrboom1) #lrboom12 4_CRACK,2,2
+1@uns,227,69,0 duplicate(#lrboom1) #lrboom13 4_CRACK,2,2
+1@uns,220,63,0 duplicate(#lrboom1) #lrboom14 4_CRACK,2,2
+1@uns,201,60,0 duplicate(#lrboom1) #lrboom15 4_CRACK,2,2
+
+1@uns,224,29,3 script Verity#room2 4_F_BERRYTEA,{
+ mes "[Verity]";
+ mes "Ah...Where am I..";
+ mes "What happened?";
+ cutin "EP15_2_brt_6.bmp",2;
+ next;
+ mes "[Verity]";
+ mes "My head...is splitting.";
+ mes "A sound coming from this...door...";
+ next;
+ if (select( "Quit.", "Go inside." ) == 1) {
+ mes "[Verity]";
+ mes "Go back...we have to go back...";
+ cutin "EP15_2_brt_7.bmp",2;
+ close3;
+ }
+ mes "[Verity]";
+ mes "Quickly...we have to go back...";
+ cutin "EP15_2_brt_7.bmp",2;
+ close2;
+ warp 'map_name$,240,255;
+ cutin "",255;
+ end;
+}
+
+// Last step
+1@uns,242,253,3 script Verity#room3 4_F_BERRYTEA,{
+ mes "[Verity]";
+ mes "Finally.. We came back...";
+ mes "Finally.....";
+ cutin "EP15_2_brt_7.bmp",2;
+ close2;
+ cutin "",255;
+ if ('protocole == 3) {
+ 'protocole = 4;
+ disablenpc instance_npcname("Verity#room3");
+ donpcevent instance_npcname("protocole3") + "::OnStart";
+ }
+ end;
+}
+
+1@uns,1,1,0 script protocole3 -1,{
+ end;
+OnStart:
+ enablenpc instance_npcname("protocole3");
+ initnpctimer;
+ mapannounce 'map_name$, "System message : Intruder detected in Mother Room.",bc_map,"0xFF0000";
+ monster 'map_name$,247,270,"T_W_O",3254,1, instance_npcname("protocole3") + "::OnMyMobDead";
+ end;
+OnTimer2000:
+ mapannounce 'map_name$, "System message : Commencing final protocol.",bc_map,"0xFF0000";
+ end;
+OnTimer4000:
+ mapannounce 'map_name$, "System message : Changing all systems from maintenance mode to combat mode.",bc_map,"0xFF0000";
+ end;
+OnTimer6000:
+ mapannounce 'map_name$, "System message : This is the final protocol to protect... all unrelated personnel please evacuate.",bc_map,"0xFF0000";
+ end;
+OnTimer9000:
+ mapannounce 'map_name$, "T_W_O : Have to go back..... This place isn't it....",bc_map,"0xFF0000";
+ end;
+OnTimer28000:
+ mapannounce 'map_name$, "System message : System damage occurred.",bc_map,"0xFF0000";
+ areamonster 'map_name$,222,250,267,281, "System message",3253,3, instance_npcname("protocole3") + "::OnMyMobDead2";
+ end;
+OnTimer30000:
+ mapannounce 'map_name$, "T_W_O : Who am I? Why am I here?.",bc_map,"0xFF0000";
+ end;
+OnTimer58000:
+ mapannounce 'map_name$, "System message : There may be critical damage within the Zone during system damage so please be careful.",bc_map,"0xFF0000";
+ end;
+OnTimer88000:
+ mapannounce 'map_name$, "System message : System damage occurred.",bc_map,"0xFF0000";
+ areamonster 'map_name$,222,250,267,281, "System message",3253,3, instance_npcname("protocole3") + "::OnMyMobDead2";
+ end;
+OnTimer98000:
+ mapannounce 'map_name$, "T_W_O : There is nothing left....",bc_map,"0xFF0000";
+ end;
+OnTimer108000:
+ mapannounce 'map_name$, "T_W_O : I... Nor them....",bc_map,"0xFF0000";
+ end;
+OnTimer148000:
+ mapannounce 'map_name$, "System message : System damage occurred.",bc_map,"0xFF0000";
+ areamonster 'map_name$,222,250,267,281, "System message",3253,3, instance_npcname("protocole3") + "::OnMyMobDead2";
+ end;
+OnTimer208000:
+ mapannounce 'map_name$, "System message : System damage occurred.",bc_map,"0xFF0000";
+ areamonster 'map_name$,222,250,267,281, "System message",3253,3, instance_npcname("protocole3") + "::OnMyMobDead2";
+ stopnpctimer;
+ end;
+OnMyMobDead:
+ stopnpctimer;
+ killmonster 'map_name$, instance_npcname("protocole3") + "::OnMyMobDead2";
+ mapannounce 'map_name$, "System message : All protocols failed. Locking down area excluding threat element.",bc_map,"0xFF0000";
+ enablenpc instance_npcname("Alp#room4");
+ enablenpc instance_npcname("Tamarin#room4");
+ enablenpc instance_npcname("Maggi#room4");
+ enablenpc instance_npcname("Du#room4");
+ enablenpc instance_npcname("Mark#room4");
+ enablenpc instance_npcname("Verity#room4");
+ disablenpc instance_npcname("protocole3");
+ end;
+OnMyMobDead2:
+ end;
+}
+
+1@uns,236,258,1 script Alp#room4 4_M_BLACKMAN,{
+ mes "[Alp]";
+ mes "It's too early to relax...";
+ cutin "bu_alp1.bmp",2;
+ close3;
+}
+
+1@uns,244,257,3 script Tamarin#room4 4_M_TAMARIN,{
+ mes "[Tamarin]";
+ mes "Verity!!!";
+ mes "Pull yourself together!";
+ cutin "ep143_tahuk.bmp",2;
+ close3;
+}
+
+1@uns,245,254,3 script Maggi#room4 4_F_PINKWOMAN,{
+ mes "[Maggi]";
+ mes "Verity, are you alright?";
+ cutin "bu_maggi4.bmp",2;
+ close3;
+}
+
+1@uns,244,254,3 script Du#room4 4_M_REDMAN,{
+ mes "[Du]";
+ mes "Sister!";
+ mes "What happened?!";
+ mes "Are you alright?";
+ cutin "bu_du5.bmp",2;
+ close3;
+}
+
+1@uns,242,255,5 script Mark#room4 4_M_BLUEMAN,{
+ mes "[Mark]";
+ mes "Everybody out of the way!";
+ mes "I will cast Heal!!!";
+ cutin "bu_mark4.bmp",0;
+ close3;
+}
+
+1@uns,242,253,3 script Verity#room4 4_F_BERRYTEA,{
+ mes "[Du]";
+ mes "Sister!";
+ mes "What happened?!";
+ mes "Are you alright?";
+ cutin "bu_du5.bmp",2;
+ npctalk "Du: Sister! What happened?! Are you alright?", instance_npcname("Du#room4");
+ next;
+ mes "[Tamarin]";
+ mes "Verity!!!";
+ mes "Pull yourself together!";
+ cutin "ep143_tahuk.bmp",2;
+ npctalk "Tamarin: Verity!!! Pull yourself together!", instance_npcname("Tamarin#room4");
+ next;
+ mes "[Mark]";
+ mes "Everybody out of the way!";
+ mes "I will cast Heal!!!";
+ cutin "bu_mark4.bmp",0;
+ npctalk "Mark: Everybody out of the way! I will cast Heal!!!", instance_npcname("Mark#room4");
+ next;
+ mes "[Verity]";
+ mes "Uh..uhm...";
+ cutin "EP15_2_brt_4.bmp",2;
+ npctalk "Verity: Uh..uhm...";
+ next;
+ mes "[Verity]";
+ mes "Oh...";
+ mes "What is going on.";
+ mes "With serious faces.";
+ cutin "EP15_2_brt_5.bmp",2;
+ npctalk "Verity Oh... What is going on. With serious faces.";
+ next;
+ mes "[Du]";
+ mes "What do you think!";
+ mes "You don't remember?";
+ cutin "bu_du4.bmp",2;
+ npctalk "Du: What do you think! You don't remember?", instance_npcname("Du#room4");
+ next;
+ mes "[Verity]";
+ mes "Remember?";
+ cutin "EP15_2_brt_5.bmp",2;
+ npctalk "Verity: Remember?";
+ next;
+ mes "[Verity]";
+ mes "... Come to think of it where am I?";
+ cutin "EP15_2_brt_3.bmp",2;
+ npctalk "Verity: ... Come to think of it where am I?";
+ next;
+ mes "[Tamarin]";
+ mes "Verity you really don't remember anything?";
+ mes "Before...";
+ cutin "ep143_tahuk.bmp",2;
+ npctalk "Tamarin: Verity you really don't remember anything? Before...", instance_npcname("Tamarin#room4");
+ next;
+ mes "[Verity]";
+ mes "Uhm...";
+ mes "I think my head was splitting since I went underground...";
+ npctalk "Verity: I think my head was splitting since I went underground...";
+ cutin "EP15_2_brt_3.bmp",2;
+ next;
+ mes "[Verity]";
+ mes "I don't remember anything after that.";
+ npctalk "Verity: I don't remember anything after that.";
+ cutin "EP15_2_brt_5.bmp",2;
+ next;
+ mes "[Du]";
+ mes "Just now something tremendous...";
+ cutin "bu_du4.bmp",2;
+ npctalk "Du: Just now something tremendous...", instance_npcname("Du#room4");
+ next;
+ mes "[Alp]";
+ mes "Hey... I don't think this is a situation where we should be chatting right now.";
+ cutin "bu_alp3.bmp",2;
+ npctalk "Alp: Hey... I don't think this is a situation where we should be chatting right now.", instance_npcname("Alp#room4");
+ next;
+ mes "[Du]";
+ mes "You call this chatting?";
+ mes "It was tremendous before okay?";
+ cutin "bu_du4.bmp",2;
+ npctalk "Du: You call this chatting? It was tremendous before okay?", instance_npcname("Du#room4");
+ next;
+ mes "[Alp]";
+ mes "Do you hear this?";
+ mes "Something is coming...";
+ cutin "bu_alp1.bmp",2;
+ npctalk "Alp: Do you hear this? Something is coming...", instance_npcname("Alp#room4");
+ next;
+ mes "[Tamarin]";
+ mes "Now...now that I look the ground is..., shaking a little, right?";
+ cutin "ep143_tahuk.bmp",2;
+ npctalk "Tamarin: Now...now that I look the ground is..., shaking a little, right?", instance_npcname("Tamarin#room4");
+ next;
+ mes "[Du]";
+ mes "What...what's this?";
+ cutin "bu_du4.bmp",2;
+ npctalk "Du: What...what's this?", instance_npcname("Du#room4");
+ next;
+ mes "[Alp]";
+ mes "This is...dangerous.";
+ mes "This is not a level we can handle...";
+ cutin "bu_alp2.bmp",2;
+ npctalk "Alp: This is...dangerous. This is not a level we can handle...", instance_npcname("Alp#room4");
+ next;
+ mes "[Mark]";
+ mes "Qui...quickly outside!!!!!";
+ cutin "bu_mark4.bmp",0;
+ npctalk "Mark: Qui...quickly outside!!!!!", instance_npcname("Mark#room4");
+ close2;
+ warp "un_bunker",299,162;
+ cutin "",255;
+ end;
+
+OnInstanceInit:
+ 'map_name$ = instance_mapname("1@uns");
+ 'protocole = 0;
+
+ // 1st step
+ disablenpc instance_npcname("protocole1");
+ disablenpc instance_npcname("Tamarin#room2");
+ disablenpc instance_npcname("#lrdoor4");
+
+ // 2nd step
+ disablenpc instance_npcname("Verity#room2");
+ for ( .@i = 1; .@i < 16; ++.@i )
+ disablenpc instance_npcname( "#lrboom" + .@i );
+
+ // Last step
+ disablenpc instance_npcname("Verity#room3");
+ disablenpc instance_npcname("protocole3");
+ disablenpc instance_npcname("Alp#room4");
+ disablenpc instance_npcname("Tamarin#room4");
+ disablenpc instance_npcname("Maggi#room4");
+ disablenpc instance_npcname("Du#room4");
+ disablenpc instance_npcname("Mark#room4");
+ disablenpc instance_npcname("Verity#room4");
+ end;
+}
diff --git a/npc/re/instances/MalangdoCulvert.txt b/npc/re/instances/MalangdoCulvert.txt
index d05e8dbaa52..39a4c23303a 100644
--- a/npc/re/instances/MalangdoCulvert.txt
+++ b/npc/re/instances/MalangdoCulvert.txt
@@ -1031,7 +1031,7 @@ OnTouch:
2@pump,1,1,4 duplicate(Monster Hole#n) Monster Hole#h -1
2@pump,1,1,4 duplicate(Boss Creation#n) Boss Creation#h -1
2@pump,39,88,4 duplicate(Missing, the Cleaner#no) Missing, the Cleaner#ho 545
-2@pump,38,100,0 duplicate(Culvert Entrance#n) Culvert Entrance#h 45,3,3
+2@pump,38,100,0 duplicate(Culvert Entrance#n) Culvert Entrance#h 3,3
//MD_Putmob "2@pump" 0 0 0 0 20 HYDRA 0 0 2
2@pump,1,1,4 duplicate(Hydra#n) Hydra#h -1
diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt
index 555d9b85455..e3604f94b26 100644
--- a/npc/re/instances/OldGlastHeim.txt
+++ b/npc/re/instances/OldGlastHeim.txt
@@ -1,1721 +1,1807 @@
-//===== rAthena Script =======================================
+//===== rAthena Script =======================================
//= Old Glast Heim
-//===== By: ==================================================
-//= Ziu, Heris (translation)
-//===== Current Version: =====================================
-//= 1.1
-//===== Compatible With: =====================================
-//= rAthena Project
-//===== Description: =========================================
+//===== Description: =========================================
//= Discover the history of events that took place in the
//= Glast Heim castle and how it ended up in ruins.
-//===== Additional Comments: =================================
-//= 1.0 First version. [Euphy]
+//===== Changelogs: =================================
+//= 1.0 First version. [Euphy, Ziu, Heris]
//= This is a custom version, and may contain bugs.
//= 1.1 Bug fixes; removed redundant OnInstanceInit scripts.
-//============================================================
+//= 1.2 Add NPC Hugin's Follower [exneval]
+//= NPC that give access to Glast Heim Nightmare Mode.
+//= 1.3 Add some NPCs placeholder. [exneval]
+//= 1.4 Update to its official text. [exneval]
+//= Support merchant, enchant, socket features.
+//= 1.5 idAthena merge. Removed Hugin's Follower NPCs. [Secretdataz]
+//= Changed `set` calls to direct assignments.
+//= Cleaned up the script.
+//= TODO: Confirm Hugin NPC's code flow.
+//= 1.6 Cleaned up the dialogue. [Aleos]
+//============================================================
-glast_01,204,273,6 script Hugin#ghinstance 755,{
- mes "^ff0000This isn't considered a normal progression dungeon. Please note this point.^000000";
- next;
- mes "[Hugin]";
- mes "Huh? You feel like you have seen me in different places? I see. What can I say?";
+glast_01,204,273,5 script Hugin 4_M_SAGE_C,{
+ if (BaseLevel < 130) {
+ mes "[Hugin]";
+ mes "Why don't you come back after becoming stronger?";
+ mes "Maybe, level 130.";
+ close;
+ }
+ if (isbegin_quest(12316) == 0) {
+ mes "[Hugin]";
+ mes "A long time ago, this castle did not look like this.";
+ next;
+ mes "[Hugin]";
+ mes "Ah, I'm sorry. I'm muttering in front of a stranger.";
+ next;
+ mes "[Hugin]";
+ mes "My name is Hugin. I'm studying the dimensional gap between time and space.";
+ next;
+ select("There's something like that here?");
+ mes "[Hugin]";
+ mes "Have you ever wondered about the history of Glast Heim?";
+ next;
+ mes "[Hugin]";
+ mes "There was a King named Shumiche who was known as a tyrant in the history of the Rune-Midgarts Kingdom.";
+ next;
+ mes "[Hugin]";
+ mes "Time will reveal the true answers if we look in the right places.";
+ next;
+ if (select("I don't care about history","That is interesting. Did you find anything?") == 1) {
+ mes "[Hugin]";
+ mes "Really? Hmm, please come back later when you are interested then.";
+ close;
+ }
+ mes "[Hugin]";
+ mes "Actually, dimensional time travel is possible but I'm too afraid to go there.";
+ next;
+ mes "[Hugin]";
+ mes "It might be possible for you!";
+ next;
+ mes "[Hugin]";
+ mes "Do you want to time travel?";
+ next;
+ if (select("No, thanks.","Yes, of course I do!") == 1) {
+ mes "[Hugin]";
+ mes "Really? But, jumping gigawatts, this is such a great opportunity.";
+ close;
+ }
+ mes "[Hugin]";
+ mes "I knew that you would understand what I said. Well, please tell me what you want to do.";
+ setquest 12316;// Meeting Hugin
+ completequest 12316;
+ }
+ else {
+ mes "[Hugin]";
+ mes "Umm? Did you see me at another place? I don't think so. What about this time?";
+ if (isbegin_quest(12322) == 1)
+ erasequest 12322;
+ }
next;
- set .@ghins_time, checkquest(12317,PLAYTIME);
- if (.@ghins_time == -1) {
+ switch( checkquest(12317,PLAYTIME) ) {
+ case -1:
+ .@party_id = getcharid(1);
+ .@p_name$ = getpartyname(.@party_id);
+ .@md_name$ = "Old Glast Heim";
- set .@party_id,getcharid(1);
- set .@p_name$,getpartyname(.@party_id);
- set .@md_name$,"Old Glast Heim";
-
- if (!instance_check_party(.@party_id,2)) {
- //custom
+ if (!instance_check_party(.@party_id)) {
mes "[Hugin]";
- mes "Where are your party members?";
+ mes "Why don't you make a party with more than 1 person and talk to me again?";
close;
}
-
if (getcharid(0) == getpartyleader(.@party_id,2))
- set .@menu$, "Create the time gap.:Enter the Old Glast Heim.:Cancel.";
- else
- set .@menu$, ":Enter the Old Glast Heim.:Cancel.";
- switch(select(.@menu$)) {
+ .@menu$ = "Generate Time Gap";
+ else {
+ mes "[Hugin]";
+ mes "Have we met before? No way. It's my first time seeing you. What do you want?";
+ }
+ if (isbegin_quest(12318) == 0)
+ setquest 12318;// Corrupted Soul Hunt
+ switch( select( .@menu$, "Enter Old Glast Heim", "Cancel" ) ) {
case 1:
- if (instance_create(.@md_name$) < 0) {
- mes "Party Name: "+.@p_name$;
- mes "Party Leader: "+strcharinfo(0);
- mes "^0000ff"+.@md_name$+" ^000000- Reservation Failed!";
+ switch( instance_create(.@md_name$) ) {
+ case -3:
+ dispbottom "Memorial Dungeon, 'Old Glast Heim' is already in progress.",0xFFFFFF;
+ close;
+ case -4:
+ case -2:
+ case -1:
+ mes "Party Name: " + getpartyname( getcharid(1) );
+ mes "Party Leader: " + strcharinfo(0);
+ mes "^0000ff" + .@md_name$ + "^000000 - time gap generation failed.";
close;
}
mes "[Hugin]";
- mes "The time gap was created. When you're ready, talk to me again.";
+ mes "After the time gap opens, please tell me again.";
close;
case 2:
- switch(instance_enter(.@md_name$)) {
+ switch( instance_enter(.@md_name$) ) {
case IE_OTHER:
+ mes "[Hugin]";
mes "An unknown error has occurred.";
close;
case IE_NOINSTANCE:
- mes "The memorial dungeon "+.@md_name$+" does not exist.";
- mes "The party leader did not generate the dungeon yet.";
+ mes "[Hugin]";
+ mes "The time gap is not yet open.";
close;
case IE_NOMEMBER:
- mes "Only the registered members can enter the instance "+.@md_name$+".";
+ mes "[Hugin]";
+ mes "Your body is not fit to enter the time gap. You won't be able to get in if you're not in a party.";
close;
case IE_OK:
- mapannounce "glast_01",strcharinfo(0)+", member of the party "+.@p_name$+" entered the instance "+.@md_name$+".",bc_map,"0x00ff99";
- setquest 12317;
- setquest 12318;
- //warp "1@gl_k",150,20;
- close;
+ mapannounce "glast_01", "" + getpartyname( getcharid(1) ) + " party member " + strcharinfo(0) + " enters the " + .@md_name$ + ".", bc_map,0x00FF99;
+ setquest 12317;// Trace of Time Travel
+ // warp "1@gl_k",150,20;
+ end;
}
case 3:
close;
}
- } else if (.@ghins_time == 0 || .@ghins_time == 1) {
+ case 0:
+ case 1:
mes "[Hugin]";
- mes "Oh, geez.";
- mes "Your body is still under the effects of time travel. In this state, you will not be able to travel again.";
+ mes "Oh, my...";
+ mes "You still have after-effects of time travel. You can't travel again with this condition.";
next;
mes "[Hugin]";
- mes "You should rest and come back later for more.";
+ mes "Staying healthy is important, so please take a break and come back again later.";
close;
- } else {
- mes "^0000ffOld Glast Heim access trail has been cleared. It is now possible to talk to Hugin.^000000";
+ case 2:
+ mes "^0000ffAll traces of access to Old Glast Heim have been removed. Now you can talk with Hugin again.^000000";
+ if (isbegin_quest(12318) == 0)
+ setquest 12318;// Corrupted Soul Hunt
erasequest 12317;
- if (checkquest(12318) > -1) erasequest 12318;
- if (checkquest(12319) > -1) erasequest 12319;
close;
}
}
+// Warps
+1@gl_k,96,80,0 warp #2Control 2,2,1@gl_k,80,80
+1@gl_k,90,80,0 warp #2Control2 2,2,1@gl_k,105,80
+1@gl_k,202,79,0 warp #3Control 2,2,1@gl_k,215,79
+1@gl_k,206,79,0 warp #3Control2 2,2,1@gl_k,195,79
+1@gl_k,227,216,0 warp #4Control 2,2,1@gl_k,215,216
+1@gl_k,222,216,0 warp #4Control2 2,2,1@gl_k,233,216
+1@gl_k,150,284,0 warp #2F Entrance 2,2,2@gl_k,150,46
+2@gl_k,149,32,0 warp #1 Control 2,2,1@gl_k,150,270
+2@gl_k,145,123,0 warp #22 Control 2,2,2@gl_k,126,123
+2@gl_k,136,122,0 warp #22 Control2 2,2,2@gl_k,150,116
+2@gl_k,154,101,0 warp #23 Control 2,2,2@gl_k,174,101
+2@gl_k,165,101,0 warp #23 Control2 2,2,2@gl_k,150,111
+2@gl_k,150,163,0 warp #24 Control 2,2,2@gl_k,150,179
+2@gl_k,150,167,0 warp #24 Control2 2,2,2@gl_k,150,149
+1@gl_k,69,168,0 warp #Secret Room Exit 2,2,1@gl_k,48,168
+
// Floor 1
//============================================================
-1@gl_k,149,41,6 script Varmunt#ghinstance1 654,{
- if (getcharid(0) == getpartyleader(getcharid(1),2)) {
- mes "Hey ^0000ffguys^000000, were you sent here to help me?";
- npctalk "Varmunt : Hey guys, were you sent here to help me?";
- cutin "gl_barmund1",2;
- next;
- select("Oh. Well, about that...");
- mes "["+strcharinfo(0)+"]";
- mes "Oh yeah, hahaha, we were told to meet someone called Varmunt.";
- unittalk getcharid(3), strcharinfo(0) +" : Oh yeah, hahaha, we were told to meet someone called Varmunt.";
- next;
- mes "[Varmunt]";
- mes "We don't have time. We must tell Sir Heinrich about Himmelmez's invasion.";
- npctalk "Varmunt : We don't have time. We must tell Sir Heinrich about Himmelmez's invasion.";
- cutin "gl_barmund2",2;
- next;
- select("What Himmelmez...");
- mes "["+strcharinfo(0)+"]";
- mes "Himmelmez? Who the hell is she?";
- unittalk getcharid(3), strcharinfo(0) +" : Himmelmez? Who the hell is she?";
- next;
- mes "[Varmunt]";
- mes "Didn't anybody give you the basic informations?";
- npctalk "Varmunt : Didn't anybody give you the basic informations?";
- cutin "gl_barmund3",2;
- next;
- mes "[Varmunt]";
- mes "The Valkyrie of the dead. She's after the Ymir's Heart pieces hidden here.";
- npctalk "Varmunt : The Valkyrie of the dead. She's after the Ymir's Heart pieces hidden here";
- cutin "gl_barmund2",2;
- next;
- mes "[Varmunt]";
- mes "She's capable of destroying the whole castle for this purpose.";
- npctalk "Varmunt : She's capable of destroying the whole castle for this purpose.";
- next;
- mes "[Varmunt]";
- mes "Hurry up! Inform Sir Heinrich that Himmelmez is coming. I will briefly explore the enchantments she made to this place!";
- npctalk "Varmunt : Hurry up! Inform Sir Heinrich that Himmelmez is coming. I will briefly explore the enchantments she made to this place!";
- close2;
- cutin "gl_barmund2",255;
- donpcevent instance_npcname("Varmunt#ghinstance1")+"::OnDisable2";
- end;
- } else {
- mes "[Varmunt]";
- mes "Where is he? We";
- mes "need his help.";
+1@gl_k,149,41,5 script Varmundt#0 4_M_BARMUND,{
+ if (getcharid(0) != getpartyleader(getcharid(1),2)) {
+ mes "[Varmundt]";
+ mes "Where's your leader? I need his help.";
cutin "gl_barmund2",2;
- close2;
- cutin "gl_barmund2",255;
- end;
+ close3;
}
-OnInstanceInit:
- donpcevent instance_npcname("Varmunt#ghinstance1")+"::OnEnable";
- end;
-OnDisable:
- hideonnpc instance_npcname("Varmunt#ghinstance1");
+ .@account_id = getcharid(3);
+ .@player_name$ = strcharinfo(0);
+ mes "[Varmundt]";
+ mes "Are you the one ^0000ffHerico^000000 sent to help me?";
+ npctalk "Varmundt: Are you the one Herico sent to help me?";
+ cutin "gl_barmund1",2;
+ next;
+ select("Oh. Well I...");
+ mes "[" + .@player_name$ + "]";
+ mes "Ah yes, I am. Herico told me to meet you.";
+ unittalk .@account_id, .@player_name$ + " : Ah yes, I am. Herico told me to meet you.";
+ next;
+ mes "[Varmundt]";
+ mes "We don't have much time. We must report to Sir Heinrich about Himelmez's invasion.";
+ npctalk "Varmundt: We don't have much time. We must report to Sir Heinrich about Himelmez's invasion.";
+ cutin "gl_barmund2",2;
+ next;
+ select("Himelmez...");
+ mes "[" + .@player_name$ + "]";
+ mes "Who is Himelmez?";
+ unittalk .@account_id, .@player_name$ + " : Who is Himelmez?";
+ next;
+ mes "[Varmundt]";
+ mes "Herico didn't tell you?";
+ npctalk "Varmundt: Herico didn't tell you?";
+ cutin "gl_barmund3",2;
+ next;
+ mes "[Varmundt]";
+ mes "She is the Ruler of Death, Dead man's Valkyrie. Himelmez is looking to take the heart of Ymir from us.";
+ npctalk "Varmundt: She is the Ruler of Death, Dead man's Valkyrie. Himelmez is looking to take the heart of Ymir from us.";
+ cutin "gl_barmund2",2;
+ next;
+ mes "[Varmundt]";
+ mes "She might even destroy this whole castle if she wanted to.";
+ npctalk "Varmundt: She might even destroy this whole castle if she wanted to.";
+ next;
+ mes "[Varmundt]";
+ mes "Hurry! Report to Sir. Heinrich about Himelmez. I must check the defense barrier here!";
+ npctalk "Varmundt: Hurry! Report to Sir. Heinrich about Himelmez. I must check the defense barrier here!";
+ close2;
+ cutin "",255;
+ disablenpc instance_npcname("Varmundt#0");
+ enablenpc instance_npcname("Heinrich#1");
+ enablenpc instance_npcname("Varmundt#1");
end;
-OnDisable2:
- hideonnpc instance_npcname("Varmunt#ghinstance1");
+}
- for(set .@i,1; .@i<=20; set .@i,.@i+4) {
- hideoffnpc instance_npcname("Khalitzburg Crusader#"+.@i);
- hideoffnpc instance_npcname("Khalitzburg Crusader#"+(.@i+1));
- hideoffnpc instance_npcname("White Knight#"+(.@i+2));
- hideoffnpc instance_npcname("White Knight#"+(.@i+3));
- }
- hideoffnpc instance_npcname("Khalitzburg Crusader#21");
- hideoffnpc instance_npcname("Khalitzburg Crusader#22");
+1@gl_k,145,104,6 script Khalitzburg Knightage#1 4_F_KHALITZBURG,{
+ mes "[Khalitzburg Knightage]";
+ mes "My work shift will be over soon, but the next crew is not coming.";
+ close;
+}
- hideoffnpc instance_npcname("Heinrich#ghinstance1");
- hideoffnpc instance_npcname("Varmunt#ghinstance2");
- end;
-OnEnable:
- hideoffnpc instance_npcname("Varmunt#ghinstance1");
- end;
+1@gl_k,154,104,3 script Khalitzburg Knightage#2 4_F_KHALITZBURG,{
+ mes "[Khalitzburg Knightage]";
+ mes "Something you want to tell me?";
+ close;
}
-1@gl_k,145,54,6 script Khalitzburg Crusader#1 655,{
- mes "["+strnpcinfo(1)+"]";
- switch((atoi(strnpcinfo(2)) + 1) / 2) {
- case 1: mes "Would I be recruited?"; break;
- case 2: mes "May I help you?"; break;
- case 3: mes "..."; break;
- case 4: mes "I do not like to chit-chat during work."; break;
- case 5: mes "The aura of the castle has changed, don't you think? Something like a presence seemed to appear a little while ago."; break;
- case 6: mes "I wonder what commandant Varmunt is doing. I heard people are running away..."; break;
- case 7: mes "Quiet please."; break;
- case 8: mes "A fuss seems to be near."; break;
- case 9: mes "A dream last night really bothered me. My mother used to say that these dreams may come true..."; break;
- case 10: mes "Is Varmunt going with you? The commandant is waiting for you."; break;
- case 11: mes "Soon it's time to change shifts. I wonder what happened to the other knights."; break;
- }
+1@gl_k,145,99,6 script White Knight#3 4_WHITEKNIGHT,{
+ mes "[White Knight]";
+ mes "Are you with Varmundt? Commander is waiting for you.";
close;
-OnInstanceInit:
-OnDisable:
- hideonnpc instance_npcname(strnpcinfo(0));
- end;
-OnEnable:
- hideoffnpc instance_npcname(strnpcinfo(0));
- end;
}
-1@gl_k,154,54,3 duplicate(Khalitzburg Crusader#1) Khalitzburg Crusader#2 655
-1@gl_k,145,59,6 duplicate(Khalitzburg Crusader#1) White Knight#3 657
-1@gl_k,154,59,3 duplicate(Khalitzburg Crusader#1) White Knight#4 657
-1@gl_k,145,64,6 duplicate(Khalitzburg Crusader#1) Khalitzburg Crusader#5 655
-1@gl_k,154,64,3 duplicate(Khalitzburg Crusader#1) Khalitzburg Crusader#6 655
-1@gl_k,145,69,6 duplicate(Khalitzburg Crusader#1) White Knight#7 657
-1@gl_k,154,69,3 duplicate(Khalitzburg Crusader#1) White Knight#8 657
-1@gl_k,145,74,6 duplicate(Khalitzburg Crusader#1) Khalitzburg Crusader#9 655
-1@gl_k,154,74,3 duplicate(Khalitzburg Crusader#1) Khalitzburg Crusader#10 655
-1@gl_k,145,79,6 duplicate(Khalitzburg Crusader#1) White Knight#11 657
-1@gl_k,154,79,3 duplicate(Khalitzburg Crusader#1) White Knight#12 657
-1@gl_k,145,84,6 duplicate(Khalitzburg Crusader#1) Khalitzburg Crusader#13 655
-1@gl_k,154,84,3 duplicate(Khalitzburg Crusader#1) Khalitzburg Crusader#14 655
-1@gl_k,145,89,6 duplicate(Khalitzburg Crusader#1) White Knight#15 657
-1@gl_k,154,89,3 duplicate(Khalitzburg Crusader#1) White Knight#16 657
-1@gl_k,145,94,6 duplicate(Khalitzburg Crusader#1) Khalitzburg Crusader#17 655
-1@gl_k,154,94,3 duplicate(Khalitzburg Crusader#1) Khalitzburg Crusader#18 655
-1@gl_k,145,99,6 duplicate(Khalitzburg Crusader#1) White Knight#19 657
-1@gl_k,154,99,3 duplicate(Khalitzburg Crusader#1) White Knight#20 657
-1@gl_k,145,104,6 duplicate(Khalitzburg Crusader#1) Khalitzburg Crusader#21 655
-1@gl_k,154,104,3 duplicate(Khalitzburg Crusader#1) Khalitzburg Crusader#22 655
-
-1@gl_k,149,100,6 script Heinrich#ghinstance1 652,{
- if (getcharid(0) == getpartyleader(getcharid(1),2)) {
- cutin "gl_heinrich2",2;
- select("Heinrich, about the castle...");
- mes "["+strcharinfo(0)+"]";
- mes "Do you know what is happening now in the castle, Heinrich?";
- unittalk getcharid(3), strcharinfo(0) +" : Do you know what is happening now in the castle, Heinrich?";
- next;
- mes "[Heinrich]";
- mes "You are the adventurers who have come with Varmunt, right?";
- npctalk "Heinrich : You are the adventurers who have come with Varmunt, right?";
- next;
- mes "[Heinrich]";
- mes "What can I do for you? Is there something wrong?";
- npctalk "Heinrich : What can I do for you? Is there something wrong?";
- next;
- select("The Ymir's Heart. Himmelmez...");
- mes "["+strcharinfo(0)+"]";
- mes "Himmelmez, the Valkyrie of the dead is looking to get a piece of the Ymir's heart hidden in the castle!";
- unittalk getcharid(3), strcharinfo(0) +" : Himmelmez, the Valkyrie of the dead is looking to get a piece of the Ymir's heart hidden in the castle!";
- next;
- mes "[Heinrich]";
- mes "Haha. That's a nice joke. Now tell me what brings you here.";
- npctalk "Heinrich : Haha. That's a nice joke. Now tell me what brings you here.";
- cutin "gl_heinrich1",2;
- next;
- mes "[Varmunt]";
- mes "I am not joking Heinrich, Sir. Now, if my judgement is correct, she will be here soon.";
- npctalk "Varmunt : I am not joking Heinrich, Sir. Now, if my judgement is correct, she will be here soon.", instance_npcname("Varmunt#ghinstance2");
- cutin "gl_barmund2",2;
- next;
- mes "[Varmunt]";
- mes "I trust this guy following me. The Ymir's Heart pieces must be hidden in a safe place before Himmelmez takes them!";
- npctalk "Varmunt : I trust this guy following me. The Ymir's Heart pieces must be hidden in a safe place before Himmelmez takes them!", instance_npcname("Varmunt#ghinstance2");
- next;
- select("Even if you do not believe...");
- mes "["+strcharinfo(0)+"]";
- mes "Even if you don't believe it, do something. We do not have much time!";
- unittalk getcharid(3), strcharinfo(0) +" : Even if you don't believe it, do something. We do not have much time!";
- cutin "gl_barmund2",255;
- next;
- mes "[Heinrich]";
- mes "I will be glad if you give me two minutes, please. But now the king isn't in his room.";
- npctalk "Heinrich : I will be glad if you give me two minutes, please. But now the king isn't in his room.";
- cutin "gl_heinrich1",2;
- next;
- mes "[Heinrich]";
- mes "But I think that with such a busy agenda, he won't be able to take care of this.";
- npctalk "Heinrich : But I think that with such a busy agenda, he won't be able to take care of this.";
- donpcevent instance_npcname("Heinrich#ghinstance1")+"::OnDisable";
- donpcevent instance_npcname("Heinrich#ghinstance2")+"::OnEnable";
- donpcevent instance_npcname("Himmelmez#ghinstance1")+"::OnEnable";
- donpcevent instance_npcname("#talkinstance1")+"::OnEnable";
- mapannounce instance_mapname("1@gl_k"), "???? Shout: Ohohohoho~!",bc_map,"0xFFFF00";
- close2;
- cutin "gl_heinrich1",255;
- end;
- } else {
- mes "[Heinrich]";
- mes "Where is your representative?";
- mes "I need to talk to him.";
- cutin "gl_heinrich2",2;
- close2;
- cutin "gl_heinrich2",255;
- end;
- }
-OnInstanceInit:
-OnDisable:
- hideonnpc instance_npcname("Heinrich#ghinstance1");
- end;
-OnEnable:
- hideoffnpc instance_npcname("Heinrich#ghinstance1");
- end;
+
+1@gl_k,154,99,3 duplicate(Khalitzburg Knightage#1) White Knight#4 4_WHITEKNIGHT
+
+1@gl_k,145,94,6 script Khalitzburg Knightage#5 4_F_KHALITZBURG,{
+ mes "[Khalitzburg Knightage]";
+ mes "I had a weird dream last night. My mom was in it... Wonder if she is ok...";
+ close;
}
-1@gl_k,152,97,3 script Varmunt#ghinstance2 654,{
- end;
-OnInstanceInit:
-OnDisable:
- hideonnpc instance_npcname("Varmunt#ghinstance2");
- end;
-OnEnable:
- hideoffnpc instance_npcname("Varmunt#ghinstance2");
- end;
+1@gl_k,154,94,3 duplicate(White Knight#3) Khalitzburg Knightage#6 4_F_KHALITZBURG
+
+1@gl_k,145,89,6 script White Knight#7 4_WHITEKNIGHT,{
+ mes "[White Knight]";
+ mes "Please do not make a mess here.";
+ close;
}
+1@gl_k,154,89,3 duplicate(White Knight#7) White Knight#8 4_WHITEKNIGHT
-1@gl_k,149,97,6 script Heinrich#ghinstance2 652,{
- end;
-OnInstanceInit:
-OnDisable:
- hideonnpc instance_npcname("Heinrich#ghinstance2");
- end;
-OnEnable:
- hideoffnpc instance_npcname("Heinrich#ghinstance2");
- end;
+1@gl_k,145,84,6 script Khalitzburg Knightage#9 4_F_KHALITZBURG,{
+ mes "[Khalitzburg Knightage]";
+ mes "Orders please.";
+ close;
}
+1@gl_k,154,84,3 duplicate(Khalitzburg Knightage#9) Khalitzburg Knightage#10 4_F_KHALITZBURG
-1@gl_k,149,100,6 script Heinrich#ghinstance3 652,{
- end;
-OnInstanceInit:
-OnDisable:
- hideonnpc instance_npcname("Heinrich#ghinstance3");
- end;
-OnEnable:
- hideoffnpc instance_npcname("Heinrich#ghinstance3");
- end;
+1@gl_k,145,79,6 script White Knight#11 4_WHITEKNIGHT,{
+ mes "[White Knight]";
+ mes "How do you know Varmundt? I heard that he's not really a friendly man...";
+ close;
}
+1@gl_k,154,79,3 duplicate(White Knight#11) White Knight#12 4_WHITEKNIGHT
-1@gl_k,149,89,1 script Himmelmez#ghinstance1 650,{
- end;
-OnInstanceInit:
-OnDisable:
- hideonnpc instance_npcname("Himmelmez#ghinstance1");
- end;
-OnEnable:
- hideoffnpc instance_npcname("Himmelmez#ghinstance1");
+1@gl_k,145,74,6 script Khalitzburg Knightage#13 4_F_KHALITZBURG,{
+ mes "[Khalitzburg Knightage]";
+ mes "Doesn't this castle seem weird all of a sudden? Something's not quite right.";
+ close;
+}
+1@gl_k,154,74,3 duplicate(Khalitzburg Knightage#13) Khalitzburg Knightage#14 4_F_KHALITZBURG
+
+1@gl_k,145,69,6 script White Knight#15 4_WHITEKNIGHT,{
+ mes "[White Knight]";
+ mes "I do not like to chat during work.";
+ close;
+}
+1@gl_k,154,69,3 duplicate(White Knight#15) White Knight#16 4_WHITEKNIGHT
+
+1@gl_k,145,64,6 script Khalitzburg Knightage#17 4_F_KHALITZBURG,{
+ mes "[Khalitzburg Knightage]";
+ mes "...";
+ close;
+}
+1@gl_k,154,64,3 duplicate(Khalitzburg Knightage#17) Khalitzburg Knightage#18 4_F_KHALITZBURG
+
+1@gl_k,145,59,6 script White Knight#19 4_WHITEKNIGHT,{
+ mes "[White Knight]";
+ mes "What can I do for you?";
+ close;
+}
+1@gl_k,154,59,3 duplicate(White Knight#19) White Knight#20 4_WHITEKNIGHT
+
+1@gl_k,145,54,6 script Khalitzburg Knightage#21 4_F_KHALITZBURG,{
+ mes "[Khalitzburg Knightage]";
+ mes "Is there something you need?";
+ close;
+}
+1@gl_k,154,54,3 duplicate(Khalitzburg Knightage#21) Khalitzburg Knightage#22 4_F_KHALITZBURG
+
+1@gl_k,149,100,6 script Heinrich#1 4_M_HEINRICH,{
+ if (getcharid(0) != getpartyleader(getcharid(1),2)) {
+ mes "[Heinrich]";
+ mes "Where is your leader? I must talk to him.";
+ cutin "gl_heinrich2",2;
+ close3;
+ }
+ .@account_id = getcharid(3);
+ .@player_name$ = strcharinfo(0);
+ cutin "gl_heinrich2",2;
+ select("Sir Heinrich. Varmundt...");
+ mes "[" + .@player_name$ + "]";
+ mes "Sir Heinrich. Do you know what is happening in the castle now?";
+ unittalk .@account_id, .@player_name$ + " : Sir Heinrich. Do you know what is happening in the castle now?";
+ next;
+ mes "[Heinrich]";
+ mes "Aren't you the adventurer that came along with Varmundt?";
+ npctalk "Heinrich: Aren't you the adventurer that came along with Varmundt?";
+ next;
+ mes "[Heinrich]";
+ mes "What is it? Something wrong with the castle?";
+ npctalk "Heinrich: What is it? Something wrong with the castle?";
+ next;
+ select("Himelmez's invasion...");
+ mes "[" + .@player_name$ + "]";
+ mes "Dead man's Valkyrie, Himelmez is coming to take the Ymir's Heart piece hidden inside this castle!";
+ unittalk .@account_id, .@player_name$ + " : Dead man's Valkyrie, Himelmez is coming to take the Ymir's Heart piece hidden inside this castle!";
+ next;
+ mes "[Heinrich]";
+ mes "Haha. Funny. Do you really think that is possible?";
+ npctalk "Heinrich: Haha. Funny. Do you really think that is possible?";
+ cutin "gl_heinrich1",2;
+ next;
+ mes "[Varmundt]";
+ mes "I'm not kidding, Sir Heinrich. If I'm correct, then she will be here very soon.";
+ npctalk "Varmundt: I'm not kidding, Sir Heinrich. If I'm correct, then she will be here very soon.", instance_npcname("Varmundt#1");
+ cutin "gl_barmund2",2;
+ next;
+ mes "[Varmundt]";
+ mes "We must hide the heart piece in a safe place before Himelmez's attack starts!";
+ npctalk "Varmundt: We must hide the heart piece in a safe place before Himelmez's attack starts!", instance_npcname("Varmundt#1");
+ next;
+ select("Even if you don't believe me...");
+ mes "[" + .@player_name$ + "]";
+ mes "I can't make you believe me, but there's no time to argue!";
+ unittalk .@account_id, .@player_name$ + " : I can't make you believe me, but there's no time to argue!";
+ cutin "",255;
+ next;
+ mes "[Heinrich]";
+ mes "Thank you for the help. But we don't even have our king with us right now.";
+ npctalk "Heinrich: Thank you for the help. But we don't even have our king with us right now.";
+ cutin "gl_heinrich1",2;
+ next;
+ mes "[Heinrich]";
+ mes "We cannot risk moving the heart just because some stranger says so.";
+ npctalk "Heinrich: We cannot risk moving the heart just because some stranger says so.";
+ close2;
+ disablenpc instance_npcname("Heinrich#1");
+ enablenpc instance_npcname("Heinrich#2");
+ enablenpc instance_npcname("Himelmez#1");
+ donpcevent instance_npcname("#talkinstance1") + "::OnEnable";
+ cutin "",255;
end;
}
+1@gl_k,152,97,3 script Varmundt#1 4_M_BARMUND,{ end; }
+1@gl_k,149,97,5 duplicate(Varmundt#1) Heinrich#2 4_M_HEINRICH
+1@gl_k,149,100,5 duplicate(Varmundt#1) Heinrich#3 4_M_HEINRICH
+1@gl_k,149,89,1 duplicate(Varmundt#1) Himelmez#1 4_F_HIMEL
+
// Control Timer
//============================================================
-1@gl_k,0,0,0 script #talkinstance1 -1,{
-OnInstanceInit:
-OnDisable:
- disablenpc instance_npcname("#talkinstance1");
+1@gl_k,1,1,0 script #talkinstance1 HIDDEN_WARP_NPC,{
end;
OnEnable:
- enablenpc instance_npcname("#talkinstance1");
+ mapannounce 'map_name$[0], "????'s: Muahahahaha~!", bc_map,0xFFFF00,FW_NORMAL,18;
initnpctimer;
+ 'npc_himelmez1$ = instance_npcname("Himelmez#1");
+ 'npc_varmundt1$ = instance_npcname("Varmundt#1");
+ 'npc_heinrich2$ = instance_npcname("Heinrich#2");
+ 'npc_heinrich3$ = instance_npcname("Heinrich#3");
end;
-OnTimer5000:
- npctalk "Heinrich : Who?!", instance_npcname("Heinrich#ghinstance2");
+OnTimer1500:
+ npctalk "Heinrich: Who are you?", 'npc_heinrich2$;
+ end;
+OnTimer4500:
+ npctalk "Himelmez: Well well~ Am I interrupting you? Weren't you expecting me?", 'npc_himelmez1$;
end;
OnTimer10000:
- npctalk "Himmelmez : This~ Did I interrupt your conversation? The thing is, it's been too long since the last guests saw some sadness spread...", instance_npcname("Himmelmez#ghinstance1");
+ npctalk "Varmundt: Himelmez!! Already!", 'npc_varmundt1$;
end;
-OnTimer15000:
- npctalk "Varmunt : Himmelmez!! Through the cracks!", instance_npcname("Varmunt#ghinstance2");
+OnTimer17500:
+ npctalk "Himelmez: My name is Lisa Kahn Himelmez. Master of Dullahan, Dead man's Valkyrie, that's what they call me.", 'npc_himelmez1$;
end;
-OnTimer20000:
- npctalk "Himmelmez : My name is Lisa Kahn Himmelmez. I am called the Valkyrie of the dead, master of the Dullahan.", instance_npcname("Himmelmez#ghinstance1");
+OnTimer22000:
+ npctalk "Heinrich: Aren't you a little too feminine to be the Ruler of death? We are not afraid of you...", 'npc_heinrich2$;
end;
-OnTimer25000:
- npctalk "Heinrich : That who rules the dead? No doubt, a pretty story. Here, some tea will be served to entertain the ladies. Unfortunately, I do not...", instance_npcname("Heinrich#ghinstance2");
+OnTimer28500:
+ npctalk "Himelmez: Let's see if you can relax like that after you find out where your king is.", 'npc_himelmez1$;
end;
-OnTimer30000:
- npctalk "Himmelmez : There's no need to pretend to be so laid back. Don't bluff about the whereabouts of you Majesty and things will be alright.", instance_npcname("Himmelmez#ghinstance1");
+OnTimer36000:
+ npctalk "Heinrich: What?", 'npc_heinrich2$;
end;
-OnTimer35000:
- npctalk "Heinrich : What did you say?", instance_npcname("Heinrich#ghinstance2");
+OnTimer41000:
+ npctalk "Himelmez: Hmm, now I have your attention do I not?", 'npc_himelmez1$;
end;
-OnTimer45000:
- npctalk "Himmelmez : Hohoho, do you have any questions? You're a really mysterious man.", instance_npcname("Himmelmez#ghinstance1");
- end;
-OnTimer50000:
- npctalk "Himmelmez : Not coveting the king's throne, you're such a stupid man, only waiting for his return. Your innocence is true, I love it.", instance_npcname("Himmelmez#ghinstance1");
+OnTimer47000:
+ npctalk "Himelmez: You don't want the king's position, just wait for him to come back. I like your purity.", 'npc_himelmez1$;
end;
-OnTimer55000:
- npctalk "Himmelmez : You make me wish we hadn't met in this situation. Too bad we did.", instance_npcname("Himmelmez#ghinstance1");
+OnTimer54000:
+ npctalk "Himelmez: It's a pity to meet you in a situation like this.", 'npc_himelmez1$;
end;
-OnTimer60000:
- npctalk "Heinrich : The King responded to the invitation of the Rune Midgard's Royal Family and hasn't come back yet.", instance_npcname("Heinrich#ghinstance2");
+OnTimer59000:
+ npctalk "Heinrich: My king is visiting the Rune-Midgarts royal family. He's not back yet.", 'npc_heinrich2$;
end;
-OnTimer65000:
- npctalk "Heinrich : Just leave before you get in trouble. This is the King's will!", instance_npcname("Heinrich#ghinstance2");
+OnTimer66500:
+ npctalk "Heinrich: And now you are trying to trick me, what has happened to him?!", 'npc_heinrich2$;
end;
-OnTimer70000:
- npctalk "Himmelmez : Well~ Today, with such a busy commandant, I won't be able to talk as much as I'd love for you to contemplate my explanation~", instance_npcname("Himmelmez#ghinstance1");
+OnTimer71500:
+ npctalk "Himelmez: Well~ I would love to sit down and explain for you, but I'm kind of busy today~", 'npc_himelmez1$;
end;
-OnTimer75000:
- npctalk "Himmelmez : I gotta get my job done. Meanwhile why don't you meet my men? Hohoho.", instance_npcname("Himmelmez#ghinstance1");
+OnTimer78000:
+ npctalk "Himelmez: I have business to take care of. My minions will treat you well enough for me~", 'npc_himelmez1$;
end;
-OnTimer80000:
- npctalk "Heinrich : Damn! She has detected the position of the Ymir's Heart pieces.", instance_npcname("Heinrich#ghinstance2");
- donpcevent instance_npcname("Himmelmez#ghinstance1")+"::OnDisable";
- end;
-OnTimer85000:
- npctalk "Heinrich : Now, Khalitzburg Crusaders and White Knights, follow me...", instance_npcname("Heinrich#ghinstance2");
- hideonnpc instance_npcname("Varmunt#ghinstance1");
-
- for(set .@i,1; .@i<=20; set .@i,.@i+4) {
- hideonnpc instance_npcname("Khalitzburg Crusader#"+.@i);
- hideonnpc instance_npcname("Khalitzburg Crusader#"+(.@i+1));
- hideonnpc instance_npcname("White Knight#"+(.@i+2));
- hideonnpc instance_npcname("White Knight#"+(.@i+3));
- }
- hideonnpc instance_npcname("Khalitzburg Crusader#21");
- hideonnpc instance_npcname("Khalitzburg Crusader#22");
-
- set .@map$, instance_mapname("1@gl_k");
- set .@label$, instance_npcname("#talkinstance1")+"::OnMyMobDead";
- monster .@map$,145,59,"Abyss Knight",2470,1,.@label$;
- monster .@map$,154,59,"Abyss Knight",2470,1,.@label$;
- monster .@map$,145,69,"Abyss Knight",2470,1,.@label$;
- monster .@map$,154,69,"Abyss Knight",2470,1,.@label$;
- monster .@map$,145,79,"Abyss Knight",2470,1,.@label$;
- monster .@map$,154,79,"Abyss Knight",2470,1,.@label$;
- monster .@map$,145,89,"Abyss Knight",2470,1,.@label$;
- monster .@map$,154,89,"Abyss Knight",2470,1,.@label$;
- monster .@map$,145,99,"Abyss Knight",2470,1,.@label$;
- monster .@map$,154,99,"Abyss Knight",2470,1,.@label$;
-
- for(set .@i,1; .@i<=22; set .@i,.@i+1)
- hideoffnpc instance_npcname(".#ghinstance"+.@i);
-
- npctalk ". : I'm so thirsty!", instance_npcname(".#ghinstance22");
- npctalk ". : Uhh... My body.", instance_npcname(".#ghinstance21");
- npctalk ". : Who am I...", instance_npcname(".#ghinstance18");
- npctalk ". : This is so uncomfortable. Eww!", instance_npcname(".#ghinstance17");
- npctalk ". : Oh... No... I cannot die...", instance_npcname(".#ghinstance14");
- npctalk ". : I'm thirsty.", instance_npcname(".#ghinstance13");
- npctalk ". : Ack... Ugh.", instance_npcname(".#ghinstance10");
- npctalk ". : Heinrich Sir, help!", instance_npcname(".#ghinstance9");
- npctalk ". : My stomach hurts...", instance_npcname(".#ghinstance6");
- npctalk ". : Help.", instance_npcname(".#ghinstance5");
- npctalk ". : Mom...", instance_npcname(".#ghinstance2");
- npctalk ". : I do not want to die.", instance_npcname(".#ghinstance1");
- end;
-OnTimer88000:
- npctalk "Heinrich : Unbelievable. My men are...This kind of thing is not possible!", instance_npcname("Heinrich#ghinstance2");
-
- for(set .@i,1; .@i<=20; set .@i,.@i+4) {
- hideonnpc instance_npcname(".#ghinstance"+.@i);
- hideonnpc instance_npcname(".#ghinstance"+(.@i+1));
- disablenpc instance_npcname(".#ghinstance"+(.@i+2));
- disablenpc instance_npcname(".#ghinstance"+(.@i+3));
+OnTimer84500:
+ npctalk "Heinrich: She probably already knows where the Ymir's heart piece is.", 'npc_heinrich2$;
+ disablenpc 'npc_himelmez1$;
+ end;
+OnTimer90500:
+ npctalk "Heinrich: All Khalitzburg and White Knights should follow me now...", 'npc_heinrich2$;
+ end;
+OnTimer92000:
+ for (.@i = 1; .@i <= 20; .@i += 4) {
+ hideonnpc instance_npcname("Khalitzburg Knightage#" + .@i);
+ hideonnpc instance_npcname("Khalitzburg Knightage#" + (.@i+1));
+ hideonnpc instance_npcname("White Knight#" + (.@i+2));
+ hideonnpc instance_npcname("White Knight#" + (.@i+3));
}
- hideonnpc instance_npcname(".#ghinstance21");
- hideonnpc instance_npcname(".#ghinstance22");
-
- set .@map$, instance_mapname("1@gl_k");
- set .@label$, instance_npcname("#talkinstance1")+"::OnMyMobDead";
- monster .@map$,145,54,"Khalitzburg",2471,1,.@label$;
- monster .@map$,154,54,"Khalitzburg",2471,1,.@label$;
- monster .@map$,145,64,"Khalitzburg",2471,1,.@label$;
- monster .@map$,154,64,"Khalitzburg",2471,1,.@label$;
- monster .@map$,145,74,"Khalitzburg",2471,1,.@label$;
- monster .@map$,154,74,"Khalitzburg",2471,1,.@label$;
- monster .@map$,145,84,"Khalitzburg",2471,1,.@label$;
- monster .@map$,154,84,"Khalitzburg",2471,1,.@label$;
- monster .@map$,145,94,"Khalitzburg",2471,1,.@label$;
- monster .@map$,154,94,"Khalitzburg",2471,1,.@label$;
- monster .@map$,145,104,"Khalitzburg",2471,1,.@label$;
- monster .@map$,154,104,"Khalitzburg",2471,1,.@label$;
- end;
-OnTimer93000:
- npctalk "Varmunt : Unbelievable. My men are...This kind of thing is not possible!", instance_npcname("Varmunt#ghinstance2");
- end;
-OnTimer97000:
- npctalk "Heinrich : I'm sorry...", instance_npcname("Heinrich#ghinstance2");
- end;
-OnTimer105000:
- npctalk "Heinrich : I'm sorry, my lord! Do not forgive me!", instance_npcname("Heinrich#ghinstance2");
- mapannounce instance_mapname("1@gl_k"), "Heinrich's Shout: Dead men, dead men all over the place!",bc_map,"0xFFFF00";
- end;
-OnTimer107000:
- mapannounce instance_mapname("1@gl_k"), "Heinrich's Shout: Everybody! Go back!",bc_map,"0xFFFF00";
+ hideonnpc instance_npcname("Khalitzburg Knightage#21");
+ hideonnpc instance_npcname("Khalitzburg Knightage#22");
+
+ .@label$ = instance_npcname("#talkinstance1") + "::OnMyMobDead";
+ monster 'map_name$[0],145,59,"Abysmal Knight",2470,1,.@label$;// MG_KNIGHT_OF_ABYSS
+ monster 'map_name$[0],154,59,"Abysmal Knight",2470,1,.@label$;
+ monster 'map_name$[0],145,69,"Abysmal Knight",2470,1,.@label$;
+ monster 'map_name$[0],154,69,"Abysmal Knight",2470,1,.@label$;
+ monster 'map_name$[0],145,79,"Abysmal Knight",2470,1,.@label$;
+ monster 'map_name$[0],154,79,"Abysmal Knight",2470,1,.@label$;
+ monster 'map_name$[0],145,89,"Abysmal Knight",2470,1,.@label$;
+ monster 'map_name$[0],154,89,"Abysmal Knight",2470,1,.@label$;
+ monster 'map_name$[0],145,99,"Abysmal Knight",2470,1,.@label$;
+ monster 'map_name$[0],154,99,"Abysmal Knight",2470,1,.@label$;
+
+ monster 'map_name$[0],145,54,"Khalitzburg",2471,1,.@label$;// G_MG_KHALITZBURG
+ unittalk $@mobid[0],"Water... Someone give me water...";
+ monster 'map_name$[0],154,54,"Khalitzburg",2471,1,.@label$;
+ unittalk $@mobid[0],"Kkkrrrruughgh...";
+ monster 'map_name$[0],145,64,"Khalitzburg",2471,1,.@label$;
+ unittalk $@mobid[0],"Sir Heinrich. Save me...";
+ monster 'map_name$[0],154,64,"Khalitzburg",2471,1,.@label$;
+ unittalk $@mobid[0],"I miss my sister...";
+ monster 'map_name$[0],145,74,"Khalitzburg",2471,1,.@label$;
+ unittalk $@mobid[0],"Don't leave me alone, help me.";
+ monster 'map_name$[0],154,74,"Khalitzburg",2471,1,.@label$;
+ unittalk $@mobid[0],"Aaarrrrrhhhh";
+ monster 'map_name$[0],145,84,"Khalitzburg",2471,1,.@label$;
+ unittalk $@mobid[0],"I am so thirsty.";
+ monster 'map_name$[0],154,84,"Khalitzburg",2471,1,.@label$;
+ unittalk $@mobid[0],"Oh...No...I can't die yet...";
+ monster 'map_name$[0],145,94,"Khalitzburg",2471,1,.@label$;
+ unittalk $@mobid[0],"I feel sick to my stomach urrgg";
+ monster 'map_name$[0],154,94,"Khalitzburg",2471,1,.@label$;
+ unittalk $@mobid[0],"Can someone...";
+ monster 'map_name$[0],145,104,"Khalitzburg",2471,1,.@label$;
+ unittalk $@mobid[0],"Arrgg... My body";
+ monster 'map_name$[0],154,104,"Khalitzburg",2471,1,.@label$;
+ unittalk $@mobid[0],"My throat is burning!";
+ end;
+OnTimer94000:
+ npctalk "Heinrich: My men... This can't be happening!", 'npc_heinrich2$;
+ end;
+OnTimer96500:
+ npctalk "Varmundt: Sir Heinrich, they're all monsters. You need to give them rest!", 'npc_varmundt1$;
+ end;
+OnTimer100000:
+ npctalk "Heinrich: I'm so sorry...", 'npc_heinrich2$;
+ end;
+OnTimer103000:
+ npctalk "Heinrich: I am sorry, my knights! Forgive me!", 'npc_heinrich2$;
+ end;
+OnTimer106000:
+ mapannounce 'map_name$[0], "Sir Heinrich: Death to all!", bc_map,0xFFFF33,FW_NORMAL,15;
+ end;
+OnTimer109000:
+ mapannounce 'map_name$[0], "Sir Heinrich: Go back to the darkness!", bc_map,0xFFFF33,FW_NORMAL,15;
+ end;
+OnTimer109500:
+ specialeffect EF_GRANDCROSS,AREA, instance_npcname("Khalitzburg Knightage#1");
+ specialeffect EF_GRANDCROSS,AREA, instance_npcname("Khalitzburg Knightage#2");
+ specialeffect EF_LEXAETERNA,AREA, instance_npcname("Khalitzburg Knightage#1");
+ specialeffect EF_LEXAETERNA,AREA, instance_npcname("Khalitzburg Knightage#2");
end;
OnTimer110000:
- donpcevent instance_npcname(".#ghinstance22")+"::OnEffect1";
- donpcevent instance_npcname(".#ghinstance21")+"::OnEffect1";
+ specialeffect EF_GRANDCROSS,AREA, instance_npcname("White Knight#3");
+ specialeffect EF_GRANDCROSS,AREA, instance_npcname("White Knight#4");
+ specialeffect EF_GRANDCROSS,AREA, instance_npcname("Khalitzburg Knightage#5");
+ specialeffect EF_GRANDCROSS,AREA, instance_npcname("Khalitzburg Knightage#6");
+ specialeffect EF_LEXAETERNA,AREA, instance_npcname("White Knight#3");
+ specialeffect EF_LEXAETERNA,AREA, instance_npcname("White Knight#4");
+ specialeffect EF_LEXAETERNA,AREA, instance_npcname("Khalitzburg Knightage#5");
+ specialeffect EF_LEXAETERNA,AREA, instance_npcname("Khalitzburg Knightage#6");
end;
OnTimer110500:
- enablenpc instance_npcname(".#ghinstance20");
- enablenpc instance_npcname(".#ghinstance19");
- donpcevent instance_npcname(".#ghinstance20")+"::OnEffect1";
- donpcevent instance_npcname(".#ghinstance19")+"::OnEffect1";
+ specialeffect EF_GRANDCROSS,AREA, instance_npcname("White Knight#7");
+ specialeffect EF_GRANDCROSS,AREA, instance_npcname("White Knight#8");
+ specialeffect EF_GRANDCROSS,AREA, instance_npcname("Khalitzburg Knightage#9");
+ specialeffect EF_GRANDCROSS,AREA, instance_npcname("Khalitzburg Knightage#10");
+ specialeffect EF_LEXAETERNA,AREA, instance_npcname("White Knight#7");
+ specialeffect EF_LEXAETERNA,AREA, instance_npcname("White Knight#8");
+ specialeffect EF_LEXAETERNA,AREA, instance_npcname("Khalitzburg Knightage#9");
+ specialeffect EF_LEXAETERNA,AREA, instance_npcname("Khalitzburg Knightage#10");
end;
OnTimer111000:
- donpcevent instance_npcname(".#ghinstance18")+"::OnEffect1";
- donpcevent instance_npcname(".#ghinstance17")+"::OnEffect1";
+ specialeffect EF_GRANDCROSS,AREA, instance_npcname("White Knight#11");
+ specialeffect EF_GRANDCROSS,AREA, instance_npcname("White Knight#12");
+ specialeffect EF_GRANDCROSS,AREA, instance_npcname("Khalitzburg Knightage#13");
+ specialeffect EF_GRANDCROSS,AREA, instance_npcname("Khalitzburg Knightage#14");
+ specialeffect EF_LEXAETERNA,AREA, instance_npcname("White Knight#11");
+ specialeffect EF_LEXAETERNA,AREA, instance_npcname("White Knight#12");
+ specialeffect EF_LEXAETERNA,AREA, instance_npcname("Khalitzburg Knightage#13");
+ specialeffect EF_LEXAETERNA,AREA, instance_npcname("Khalitzburg Knightage#14");
end;
OnTimer111500:
- enablenpc instance_npcname(".#ghinstance16");
- enablenpc instance_npcname(".#ghinstance15");
- donpcevent instance_npcname(".#ghinstance16")+"::OnEffect1";
- donpcevent instance_npcname(".#ghinstance15")+"::OnEffect1";
+ specialeffect EF_GRANDCROSS,AREA, instance_npcname("White Knight#15");
+ specialeffect EF_GRANDCROSS,AREA, instance_npcname("White Knight#16");
+ specialeffect EF_GRANDCROSS,AREA, instance_npcname("Khalitzburg Knightage#17");
+ specialeffect EF_GRANDCROSS,AREA, instance_npcname("Khalitzburg Knightage#18");
+ specialeffect EF_LEXAETERNA,AREA, instance_npcname("White Knight#15");
+ specialeffect EF_LEXAETERNA,AREA, instance_npcname("White Knight#16");
+ specialeffect EF_LEXAETERNA,AREA, instance_npcname("Khalitzburg Knightage#17");
+ specialeffect EF_LEXAETERNA,AREA, instance_npcname("Khalitzburg Knightage#18");
end;
OnTimer112000:
- donpcevent instance_npcname(".#ghinstance14")+"::OnEffect1";
- donpcevent instance_npcname(".#ghinstance13")+"::OnEffect1";
+ specialeffect EF_GRANDCROSS,AREA, instance_npcname("White Knight#19");
+ specialeffect EF_GRANDCROSS,AREA, instance_npcname("White Knight#20");
+ specialeffect EF_GRANDCROSS,AREA, instance_npcname("Khalitzburg Knightage#21");
+ specialeffect EF_GRANDCROSS,AREA, instance_npcname("Khalitzburg Knightage#22");
+ specialeffect EF_LEXAETERNA,AREA, instance_npcname("White Knight#19");
+ specialeffect EF_LEXAETERNA,AREA, instance_npcname("White Knight#20");
+ specialeffect EF_LEXAETERNA,AREA, instance_npcname("Khalitzburg Knightage#21");
+ specialeffect EF_LEXAETERNA,AREA, instance_npcname("Khalitzburg Knightage#22");
+ disablenpc 'npc_heinrich2$;
+ enablenpc 'npc_heinrich3$;
+ killmonster 'map_name$[0], instance_npcname("#talkinstance1") + "::OnMyMobDead";
end;
OnTimer112500:
- enablenpc instance_npcname(".#ghinstance12");
- enablenpc instance_npcname(".#ghinstance11");
- donpcevent instance_npcname(".#ghinstance12")+"::OnEffect1";
- donpcevent instance_npcname(".#ghinstance11")+"::OnEffect1";
- end;
-OnTimer113000:
- donpcevent instance_npcname(".#ghinstance10")+"::OnEffect1";
- donpcevent instance_npcname(".#ghinstance9")+"::OnEffect1";
- end;
-OnTimer113500:
- enablenpc instance_npcname(".#ghinstance8");
- enablenpc instance_npcname(".#ghinstance7");
- donpcevent instance_npcname(".#ghinstance8")+"::OnEffect1";
- donpcevent instance_npcname(".#ghinstance7")+"::OnEffect1";
- end;
-OnTimer114000:
- donpcevent instance_npcname(".#ghinstance6")+"::OnEffect1";
- donpcevent instance_npcname(".#ghinstance5")+"::OnEffect1";
- end;
-OnTimer114500:
- enablenpc instance_npcname(".#ghinstance4");
- enablenpc instance_npcname(".#ghinstance3");
- donpcevent instance_npcname(".#ghinstance4")+"::OnEffect1";
- donpcevent instance_npcname(".#ghinstance3")+"::OnEffect1";
- end;
-OnTimer114750: //custom time
- disablenpc instance_npcname(".#ghinstance3");
- disablenpc instance_npcname(".#ghinstance4");
- disablenpc instance_npcname(".#ghinstance7");
- disablenpc instance_npcname(".#ghinstance8");
- disablenpc instance_npcname(".#ghinstance11");
- disablenpc instance_npcname(".#ghinstance12");
- disablenpc instance_npcname(".#ghinstance15");
- disablenpc instance_npcname(".#ghinstance16");
- disablenpc instance_npcname(".#ghinstance19");
- disablenpc instance_npcname(".#ghinstance20");
- end;
-OnTimer115000:
- donpcevent instance_npcname("Heinrich#ghinstance3")+"::OnEnable";
- donpcevent instance_npcname("Heinrich#ghinstance2")+"::OnDisable";
- npctalk "Heinrich : I cannot believe I killed my men with my own hands!", instance_npcname("Heinrich#ghinstance3");
- donpcevent instance_npcname(".#ghinstance2")+"::OnEffect1";
- donpcevent instance_npcname(".#ghinstance1")+"::OnEffect1";
- killmonster instance_mapname("1@gl_k"),instance_npcname("#talkinstance1")+"::OnMyMobDead";
- end;
-OnTimer120000:
- npctalk "Varmunt : Heinrich, Sir! I need a quick decision.", instance_npcname("Varmunt#ghinstance2");
- end;
-OnTimer125000:
- npctalk "Varmunt : To prevent other attacks, go chase her!", instance_npcname("Varmunt#ghinstance2");
- end;
-OnTimer130000:
- npctalk "Heinrich : Varmunt is right about that. Now is not the time to regret.", instance_npcname("Heinrich#ghinstance3");
- end;
-OnTimer135000:
- npctalk "Heinrich : People, gather around and follow my orders.", instance_npcname("Heinrich#ghinstance3");
- end;
-OnTimer140000:
- npctalk "Heinrich : Himmelmez is turning into monsters all the people she put to sleep.", instance_npcname("Heinrich#ghinstance3");
- end;
-OnTimer145000:
- npctalk "Heinrich : I don't know if there are survivors around here yet.", instance_npcname("Heinrich#ghinstance3");
- end;
-OnTimer150000:
- npctalk "Heinrich : If there are survivors from this evil thing, please rescue them.", instance_npcname("Heinrich#ghinstance3");
- end;
-OnTimer155000:
- npctalk "Heinrich : With Varmunt by my side, I'm going to chase Himmelmez down.", instance_npcname("Heinrich#ghinstance3");
- end;
-OnTimer160000:
- npctalk "Varmunt : Now, your help is desperately needed. I hopefully ask you.", instance_npcname("Varmunt#ghinstance2");
- end;
-OnTimer165000:
- npctalk "Heinrich : Hurry up Varmunt, let's chase her down.", instance_npcname("Heinrich#ghinstance3");
- end;
-OnTimer167000:
- donpcevent instance_npcname("Heinrich#ghinstance3")+"::OnDisable";
- end;
-OnTimer168000:
- donpcevent instance_npcname("Varmunt#ghinstance2")+"::OnDisable";
- donpcevent instance_npcname("Heinrich#ghinstance3")+"::OnDisable";
- stopnpctimer;
- donpcevent instance_npcname("#ghinstancewarp1")+"::OnEnable";
- donpcevent instance_npcname("#ghinstancewarp2")+"::OnEnable";
- mapannounce instance_mapname("1@gl_k"), "9 o'clock warp leading to zone 2 is now open.",bc_map,"0xFFFF00";
- donpcevent instance_npcname("#talkinstance1")+"::OnDisable";
- donpcevent instance_npcname("#ghmemorialmob01")+"::OnEnable";
- end;
-OnMyMobDead:
+ npctalk "Heinrich: I killed my own men...", 'npc_heinrich3$;
end;
-}
-
-1@gl_k,145,54,6 script .#ghinstance1 2471,{
+OnTimer115500:
+ npctalk "Varmundt: Sir Heinrich! We don't have much time!", 'npc_varmundt1$;
end;
-OnInstanceInit:
-OnDisable:
- hideonnpc instance_npcname(strnpcinfo(0));
+OnTimer118500:
+ npctalk "Varmundt: If you hurry now, there's a chance!", 'npc_varmundt1$;
end;
-OnEnable:
- hideoffnpc instance_npcname(strnpcinfo(0));
+OnTimer121500:
+ npctalk "Heinrich: Varmundt is right. Now is not the time for mourning.", 'npc_heinrich3$;
end;
-OnEffect1:
- specialeffect EF_GRANDCROSS;
- specialeffect EF_LEXAETERNA;
+OnTimer124500:
+ npctalk "Heinrich: I have a request to you followers.", 'npc_heinrich3$;
end;
-}
-1@gl_k,154,54,3 duplicate(.#ghinstance1) .#ghinstance2 2471
-1@gl_k,145,64,6 duplicate(.#ghinstance1) .#ghinstance5 2471
-1@gl_k,154,64,3 duplicate(.#ghinstance1) .#ghinstance6 2471
-1@gl_k,145,74,6 duplicate(.#ghinstance1) .#ghinstance9 2471
-1@gl_k,154,74,3 duplicate(.#ghinstance1) .#ghinstance10 2471
-1@gl_k,145,84,6 duplicate(.#ghinstance1) .#ghinstance13 2471
-1@gl_k,154,84,3 duplicate(.#ghinstance1) .#ghinstance14 2471
-1@gl_k,145,94,6 duplicate(.#ghinstance1) .#ghinstance17 2471
-1@gl_k,154,94,3 duplicate(.#ghinstance1) .#ghinstance18 2471
-1@gl_k,145,104,6 duplicate(.#ghinstance1) .#ghinstance21 2471
-1@gl_k,154,104,3 duplicate(.#ghinstance1) .#ghinstance22 2471
-
-1@gl_k,145,59,6 script .#ghinstance3 111,{
+OnTimer127500:
+ npctalk "Heinrich: Himelmez can turn living beings into monsters.", 'npc_heinrich3$;
end;
-OnInstanceInit:
-OnDisable:
- hideonnpc instance_npcname(strnpcinfo(0));
+OnTimer130500:
+ npctalk "Heinrich: But, there might still be survivors here.", 'npc_heinrich3$;
end;
-OnEnable:
- hideoffnpc instance_npcname(strnpcinfo(0));
+OnTimer134500:
+ npctalk "Heinrich: Destroy the monsters and find any survivors.", 'npc_heinrich3$;
end;
-OnEffect1:
- specialeffect EF_GRANDCROSS;
- specialeffect EF_LEXAETERNA;
+OnTimer138500:
+ npctalk "Heinrich: Varmundt and I will chase Himelmez.", 'npc_heinrich3$;
end;
-}
-1@gl_k,154,59,3 duplicate(.#ghinstance3) .#ghinstance4 111
-1@gl_k,145,69,6 duplicate(.#ghinstance3) .#ghinstance7 111
-1@gl_k,154,69,3 duplicate(.#ghinstance3) .#ghinstance8 111
-1@gl_k,145,79,6 duplicate(.#ghinstance3) .#ghinstance11 111
-1@gl_k,154,79,3 duplicate(.#ghinstance3) .#ghinstance12 111
-1@gl_k,145,89,6 duplicate(.#ghinstance3) .#ghinstance15 111
-1@gl_k,154,89,3 duplicate(.#ghinstance3) .#ghinstance16 111
-1@gl_k,145,99,6 duplicate(.#ghinstance3) .#ghinstance19 111
-1@gl_k,154,99,3 duplicate(.#ghinstance3) .#ghinstance20 111
-
-1@gl_k,96,80,0 script #ghinstancewarp1 45,1,2,{
+OnTimer143500:
+ npctalk "Heinrich: Very well, Varmundt. Let's find Himelmez.", 'npc_heinrich3$;
end;
-OnInstanceInit:
-OnDisable:
- disablenpc instance_npcname(strnpcinfo(0));
+OnTimer147500:
+ disablenpc 'npc_heinrich3$;
end;
-OnEnable:
- enablenpc instance_npcname(strnpcinfo(0));
+OnTimer148500:
+ stopnpctimer;
+ donpcevent instance_npcname("#ghmemorialmob01") + "::OnStart";
+
+ disablenpc 'npc_varmundt1$;
+ disablenpc instance_npcname("#talkinstance1");
+ 'npc_himelmez1$ = 'npc_varmundt1$ = 'npc_heinrich2$ = 'npc_heinrich3$ = "";
end;
-OnTouch_:
- set .@map1$, instance_mapname("1@gl_k");
- set .@map2$, instance_mapname("2@gl_k");
- switch(atoi(replacestr(strnpcinfo(2),"ghinstancewarp",""))) {
- case 1: warp .@map1$,80,80; break;
- case 2: warp .@map1$,105,80; break;
- case 3: warp .@map1$,215,79; break;
- case 4: warp .@map1$,195,79; break;
- case 5: warp .@map1$,215,216; break;
- case 6: warp .@map1$,235,216; break;
- case 7: warp .@map2$,150,46; break;
- case 8: warp .@map2$,126,123; break;
- case 9: warp .@map2$,150,116; break;
- case 10: warp .@map2$,174,101; break;
- case 11: warp .@map2$,150,110; break;
- case 12: warp .@map2$,150,179; break;
- }
+OnMyMobDead:
end;
}
-1@gl_k,90,80,0 duplicate(#ghinstancewarp1) #ghinstancewarp2 45,1,2
-1@gl_k,202,79,0 duplicate(#ghinstancewarp1) #ghinstancewarp3 45,1,2
-1@gl_k,206,79,0 duplicate(#ghinstancewarp1) #ghinstancewarp4 45,1,2
-1@gl_k,228,216,0 duplicate(#ghinstancewarp1) #ghinstancewarp5 45,1,2
-1@gl_k,222,216,0 duplicate(#ghinstancewarp1) #ghinstancewarp6 45,1,2
-1@gl_k,150,284,0 duplicate(#ghinstancewarp1) #ghinstancewarp7 45,1,2
-2@gl_k,145,123,0 duplicate(#ghinstancewarp1) #ghinstancewarp8 45,1,2
-2@gl_k,136,122,0 duplicate(#ghinstancewarp1) #ghinstancewarp9 45,1,2
-2@gl_k,154,101,0 duplicate(#ghinstancewarp1) #ghinstancewarp10 45,1,2
-2@gl_k,165,101,0 duplicate(#ghinstancewarp1) #ghinstancewarp11 45,1,2
-2@gl_k,150,163,0 duplicate(#ghinstancewarp1) #ghinstancewarp12 45,1,2
-
// Sector 1 Mobs
//============================================================
-1@gl_k,0,0,0 script #ghmemorialmob01 -1,{
-OnInstanceInit:
-OnDisable:
- disablenpc instance_npcname("#ghmemorialmob01");
+1@gl_k,1,1,0 script #ghmemorialmob01 HIDDEN_WARP_NPC,{
end;
-OnEnable:
+OnStart:
enablenpc instance_npcname("#ghmemorialmob01");
- set .@map$, instance_mapname("1@gl_k");
- set .@label$, instance_npcname("#ghmemorialmob01")+"::OnMyMobDead";
- areamonster .@map$,76,99,87,10,"Suffering Chamberlain",2466,15,.@label$;
- areamonster .@map$,67,39,12,6,"Fallen Monk",2465,20,.@label$;
- areamonster .@map$,67,39,12,6,"Suffering Chamberlain",2466,3,.@label$;
- areamonster .@map$,32,75,51,58,"Decayed Butler",2464,6,.@label$;
- areamonster .@map$,45,84,6,137,"Decayed Butler",2464,12,.@label$;
+ enablenpc instance_npcname("#2Control");
+ enablenpc instance_npcname("#2Control2");
+ mapannounce 'map_name$[0], "A portal has opened to the west.", bc_map,0xFFFF00;
+
+ // note: x17 MG_GHOUL / x17 MG_ZOMBIE / x17 MG_WRAITH
+ .@label$ = instance_npcname("#ghmemorialmob01") + "::OnMyMobDead";
+ areamonster 'map_name$[0],76,99,87,10,"Grand Chamberlain in pain",2466,14,.@label$;
+ areamonster 'map_name$[0],67,39,12, 6,"Corrupted Monk",2465,17,.@label$;
+ areamonster 'map_name$[0],67,39,12, 6,"Grand Chamberlain in pain",2466,3,.@label$;
+ areamonster 'map_name$[0],32,75,51,58,"Corrupted Steward",2464,5,.@label$;
+ areamonster 'map_name$[0],45,84,6,137,"Corrupted Steward",2464,12,.@label$;
end;
OnMyMobDead:
- set .@map$, instance_mapname("1@gl_k");
- set .@label$, instance_npcname("#ghmemorialmob01")+"::OnMyMobDead";
- set .@mob_dead_num, 56 - mobcount(.@map$,.@label$);
+ .@label$ = instance_npcname("#ghmemorialmob01") + "::OnMyMobDead";
+ .@mob_dead_num = 51 - mobcount('map_name$[0],.@label$);
if (.@mob_dead_num > 35) {
- mapannounce .@map$, "Seems like Himmelmez drains the dead's souls. They must be destroyed.",bc_map,"0xFFFFFF";
- killmonster .@map$,.@label$;
- donpcevent instance_npcname("Aspiring Butcher#clearGH")+"::OnEnable";
- donpcevent instance_npcname("#ghmemorialmob01")+"::OnDisable";
+ mapannounce 'map_name$[0], "Himelmez's curse is getting weaker. Find any survivors!", bc_map,0xFFFFFF;
+ killmonster 'map_name$[0], .@label$;
+ enablenpc instance_npcname("Altar boy Domun#1");
+ disablenpc instance_npcname("#ghmemorialmob01");
}
end;
}
-1@gl_k,17,51,3 script Aspiring Butcher#clearGH 706,{
- if (getcharid(0) == getpartyleader(getcharid(1),2)) {
- mes "[Aspiring Butcher]";
- mes "Help me! Help me!!!";
- next;
- select("Hey, wake up! Are there any other survivors?");
- mes "["+strcharinfo(0)+"]";
- mes "Hey, wake up! Are you alone?";
- unittalk getcharid(3), strcharinfo(0) +" : Hey, wake up! Are you alone?";
- next;
- mes "[Aspiring Butcher]";
- mes "The Chamberlain... the Monk... They've become monsters. I couldn't do anything.";
- npctalk "Aspiring Butcher : The Chamberlain... the Monk... They've become monsters. I couldn't do anything.";
- next;
- mes "[Aspiring Butcher]";
- mes "I just stood still... Nothing, I couldn't do anything...";
- npctalk "Aspiring Butcher : I just stood still... Nothing, I couldn't do anything...";
- next;
- select("Wake up!");
- mes "["+strcharinfo(0)+"]";
- mes "Wake up kid! Go east along the central passage to the outside! The path is safe!";
- unittalk getcharid(3), strcharinfo(0) +" : Wake up kid! Go east along the central passage to the outside! The path is safe!";
- next;
- mes "[Aspiring Butcher]";
- mes "East passage? Alone? How?";
- npctalk "Aspiring Butcher : East passage? Alone? How?";
- next;
- select("I can guide you through the path.");
- mes "["+strcharinfo(0)+"]";
- mes "I will guide you, perhaps that will help. If you want to close your eyes try not to hit anything.";
- unittalk getcharid(3), strcharinfo(0) +" : I will guide you, perhaps that will help. If you want to close your eyes try not to hit anything.";
- next;
- mes "[Aspiring Butcher]";
- mes "Aspiring Butcher: I know, I... I'm trying to.";
- npctalk "Aspiring Butcher : Aspiring Butcher: I know, I... I'm trying to.";
- donpcevent instance_npcname("Aspiring Butcher#clearGH")+"::OnDisable";
- donpcevent instance_npcname("#ghmemorialmob02")+"::OnEnable";
- close;
- } else {
- mes "[Aspiring Butcher]";
- mes "Somebody help me, somebody help me, please.";
+1@gl_k,17,51,3 script Altar boy Domun#1 4_M_KID1,{
+ if (getcharid(0) != getpartyleader(getcharid(1),2)) {
+ mes "[Altar boy Domun]";
+ mes "Save me, save me, please...";
close;
}
-OnInstanceInit:
-OnDisable:
- hideonnpc instance_npcname("Aspiring Butcher#clearGH");
- end;
-OnEnable:
- hideoffnpc instance_npcname("Aspiring Butcher#clearGH");
- end;
+ .@account_id = getcharid(3);
+ .@player_name$ = strcharinfo(0);
+ mes "[Altar boy Domun]";
+ mes "Save me! Save me!!!";
+ npctalk "Save me! Save me!!!";
+ next;
+ select("Hold on! Are you the only survivor?");
+ mes "[" + .@player_name$ + "]";
+ mes "Hold on! Are you the only survivor?";
+ unittalk .@account_id, .@player_name$ + " : Hold on! Are you the only survivor?";
+ next;
+ mes "[Altar boy Domun]";
+ mes "Chamberlains... monks... They all turned into monsters. I couldn't do anything.";
+ npctalk "Altar boy Domun: Chamberlains... monks... They all turned into monsters. I couldn't do anything.";
+ next;
+ mes "[Altar boy Domun]";
+ mes "All I could do was... Just hide in here... Nothing, nothing I could do...";
+ npctalk "Altar boy Domun: All I could do was... Just hide in here... Nothing, nothing I could do...";
+ next;
+ select("Pull it together!");
+ mes "[" + .@player_name$ + "]";
+ mes "Wake up kid! Go east and find the middle passage to the outside! It is safe there!";
+ unittalk .@account_id, .@player_name$ + " : Wake up kid! Go east and find the middle passage to the outside! It is safe there!";
+ next;
+ mes "[Altar boy Domun]";
+ mes "To the east passage? Alone? How?";
+ npctalk "Altar boy Domun: To the east passage? Alone? How?";
+ next;
+ select("I will give you a weapon.");
+ mes "[" + .@player_name$ + "]";
+ mes "Here's a weapon. Just close your eye and swing for those monsters.";
+ unittalk .@account_id, .@player_name$ + " : Here's a weapon. Just close your eye and swing for those monsters.";
+ next;
+ mes "[Altar boy Domun]";
+ mes "Ok, I... I'll try.";
+ npctalk "Altar boy Domun: Ok, I... I'll try.";
+ disablenpc instance_npcname("Altar boy Domun#1");
+ donpcevent instance_npcname("#ghmemorialmob02") + "::OnStart";
+ close;
}
// Sector 2 Mobs
//============================================================
-1@gl_k,291,145,3 script Hollgrehenn Destroyer 726,{
- if (getcharid(0) == getpartyleader(getcharid(1),2)) {
- mes "[Hollgrehenn Destroyer]";
- mes "Yaaa!! Die!!!";
- npctalk "Hollgrehenn Destroyer : Yaaa!! Die!!!";
- specialeffect EF_CRASHEARTH;
- next;
- select("Don't worry!");
- mes "["+strcharinfo(0)+"]";
- mes "Don't worry! Mam. Are you alone? No other survivors?";
- unittalk getcharid(3), strcharinfo(0) +" : Don't worry! Mam. Are you alone? No other survivors?";
- next;
- mes "[Hollgrehenn Destroyer]";
- mes "I'm the only survivor left";
- npctalk "Hollgrehenn Destroyer : I'm the only survivor left";
- next;
- select("This is a very dangerous place.");
- mes "["+strcharinfo(0)+"]";
- mes "This is a very dangerous place. You know the central passage? Do you think you can move... and get to a safer place?";
- unittalk getcharid(3), strcharinfo(0) +" : This is a very dangerous place. You know the central passage? Do you think you can move... and get to a safer place?";
- next;
- mes "[Hollgrehenn Destroyer]";
- mes "Yes, I am able to move. I'll move for my baby's sake.";
- npctalk "Hollgrehenn Destroyer : Yes, I am able to move. I'll move for my baby's sake.";
- next;
- select("Survive the road...");
- mes "["+strcharinfo(0)+"]";
- mes "You and your baby will get out of here safely. But I'm sorry I can't help you more.";
- unittalk getcharid(3), strcharinfo(0) +" : You and your baby will get out of here safely. But I'm sorry I can't help you more.";
- next;
- mes "[Hollgrehenn Destroyer]";
- mes "That's ok. Thank you for helping us. I'm good to go alone. Ah and good luck also.";
- npctalk "Hollgrehenn Destroyer : That's ok. Thank you for helping us. I'm good to go alone. Ah and good luck also.";
- donpcevent instance_npcname("Hollgrehenn Destroyer")+"::OnDisable";
- donpcevent instance_npcname("#ghmemorialmob03")+"::OnEnable";
- close;
- } else {
- mes "[Hollgrehenn Destroyer]";
- mes "Somebody help me, somebody help me, please";
- close;
- }
-OnInstanceInit:
-OnDisable:
- hideonnpc instance_npcname("Hollgrehenn Destroyer");
- end;
-OnEnable:
- hideoffnpc instance_npcname("Hollgrehenn Destroyer");
+1@gl_k,1,1,0 script #ghmemorialmob02 HIDDEN_WARP_NPC,{
end;
-}
-
-1@gl_k,0,0,0 script #ghmemorialmob02 -1,{
-OnInstanceInit:
-OnDisable:
- disablenpc instance_npcname("#ghmemorialmob02");
- end;
-OnEnable:
+OnStart:
enablenpc instance_npcname("#ghmemorialmob02");
- donpcevent instance_npcname("#ghinstancewarp3")+"::OnEnable";
- donpcevent instance_npcname("#ghinstancewarp4")+"::OnEnable";
- set .@map$, instance_mapname("1@gl_k");
- set .@label$, instance_npcname("#ghmemorialmob02")+"::OnMyMobDead";
- mapannounce .@map$,"3 o'clock warp leading to zone 3 is now open.",bc_map,"0xFFFF00";
- areamonster .@map$,241,113,291,19,"Suffering Chamberlain",2466,12,.@label$;
- areamonster .@map$,241,113,291,19,"Decayed Monk",2464,12,.@label$;
- areamonster .@map$,227,217,291,135,"Suffering Chamberlain",2466,12,.@label$;
- areamonster .@map$,227,217,291,135,"Decayed Monk",2464,12,.@label$;
+ enablenpc instance_npcname("#3Control");
+ enablenpc instance_npcname("#3Control2");
+ for ( .@i = 1; .@i <= 26; .@i++ )
+ enablenpc instance_npcname("A dead man#" + .@i);
+ mapannounce 'map_name$[0], "A portal has opened to the east.", bc_map,0xFFFF00;
+
+ // note: x34 MG_ZOMBIE / x35 MG_GHOUL
+ .@label$ = instance_npcname("#ghmemorialmob02") + "::OnMyMobDead";
+ areamonster 'map_name$[0],236,12,288,52,"Outraged Refiner",2466,18,.@label$;// MG_GHOUL
+ areamonster 'map_name$[0],236,12,288,52,"Decomposed Blacksmith",2464,17,.@label$;// MG_ZOMBIE
+ areamonster 'map_name$[0],242,71,286,145,"Outraged Refiner",2466,17,.@label$;
+ areamonster 'map_name$[0],242,71,286,145,"Decomposed Blacksmith",2464,17,.@label$;
end;
OnMyMobDead:
- set .@map$, instance_mapname("1@gl_k");
- set .@label$, instance_npcname("#ghmemorialmob02")+"::OnMyMobDead";
- set .@mob_dead_num, 48 - mobcount(.@map$,.@label$);
- if (.@mob_dead_num > 28) {
- mapannounce .@map$, "Seems like Himmelmez drains the dead's souls. They must be destroyed.",bc_map,"0xFFFFFF";
- killmonster .@map$,.@label$;
- donpcevent instance_npcname("Hollgrehenn Destroyer")+"::OnEnable";
- donpcevent instance_npcname("#ghmemorialmob02")+"::OnDisable";
+ .@label$ = instance_npcname("#ghmemorialmob02") + "::OnMyMobDead";
+ .@mob_dead_num = 69 - mobcount('map_name$[0],.@label$);
+ if (.@mob_dead_num > 56) {
+ mapannounce 'map_name$[0], "Himelmez's curse is getting weaker. Find any survivors!", bc_map,0xFFFFFF;
+ killmonster 'map_name$[0],.@label$;
+ enablenpc instance_npcname("Holgren the Destroyer#1");
+ disablenpc instance_npcname("#ghmemorialmob02");
}
end;
}
+1@gl_k,291,145,3 script Holgren the Destroyer#1 4_F_JOB_BLACKSMITH,{
+ if (getcharid(0) != getpartyleader(getcharid(1),2)) {
+ mes "[Holgren the Destroyer]";
+ mes "You human?";
+ close;
+ }
+ .@account_id = getcharid(3);
+ .@player_name$ = strcharinfo(0);
+ mes "[Holgren the Destroyer]";
+ mes "Die!! You shall die!!!";
+ npctalk "Holgren the Destroyer: Die!! You shall die!!!";
+ specialeffect EF_CRASHEARTH;
+ next;
+ select("Relax! I'm not a monster!");
+ mes "[" + .@player_name$ + "]";
+ mes "Relax! I am Human. Are you alone? Is anyone else here?";
+ unittalk .@account_id, .@player_name$ + " : Relax! I am Human. Are you alone? Is anyone else here?";
+ next;
+ mes "[Holgren the Destroyer]";
+ mes "It's only me.";
+ npctalk "Holgren the Destroyer: It's only me.";
+ next;
+ select("It's dangerous here...");
+ mes "[" + .@player_name$ + "]";
+ mes "It's dangerous here. You know the way to the middle passage? Can you move?";
+ unittalk .@account_id, .@player_name$ + " : It's dangerous here. You know the way to the middle passage? Can you move?";
+ next;
+ mes "[Holgren the Destroyer]";
+ mes "Yes, I can move. I need to get out of here.";
+ npctalk "Holgren the Destroyer: Yes, I can move. I need to get out of here.";
+ next;
+ select("Be safe...");
+ mes "[" + .@player_name$ + "]";
+ mes "Sorry, I can't go with you.";
+ unittalk .@account_id, .@player_name$ + " : Sorry, I can't go with you.";
+ next;
+ mes "[Holgren the Destroyer]";
+ mes "It's ok. You've already done enough. I can help myself. Good luck to you too.";
+ npctalk "Holgren the Destroyer: It's ok. You've already done enough. I can help myself. Good luck to you too.";
+ disablenpc instance_npcname("Holgren the Destroyer#1");
+ donpcevent instance_npcname("#ghmemorialmob03") + "::OnEnable";
+ close;
+}
+
// Tramp Mobs
//============================================================
-1@gl_k,221,82,3 script Breathless Man#GHtramp1 849,4,4,{
+1@gl_k,221,82,3 script A dead man#1 4_M_DIEMAN,5,5,{
end;
OnTouch_:
- set .@i, rand(1,10);
- if (.@i == 1) set .@mobs,3;
- else if (.@i == 2) set .@mobs,4;
- else if (.@i == 3) set .@mobs,5;
- else if (.@i < 7) set .@mobs,6;
- else set .@mobs,7;
- getmapxy(.@map$,.@x,.@y,UNITTYPE_NPC);
+ .@i = rand(1,10);
+ if (.@i == 1) .@mobs = 3;
+ else if (.@i == 2) .@mobs = 4;
+ else if (.@i == 3) .@mobs = 5;
+ else if (.@i < 7) .@mobs = 6;
+ else .@mobs = 7;
+ getmapxy .@map$,.@x,.@y, UNITTYPE_NPC;
specialeffect EF_VENOMDUST;
- monster .@map$,.@x,.@y,"Muck Worm",2467,.@mobs,instance_npcname(strnpcinfo(0))+"::OnMyMobDead";
- disablenpc instance_npcname(strnpcinfo(0));
- end;
-OnMyMobDead:
- end;
-OnInstanceInit:
-OnEnable:
- enablenpc instance_npcname(strnpcinfo(0));
- end;
-OnDisable:
- disablenpc instance_npcname(strnpcinfo(0));
+ monster .@map$,.@x,.@y,"Maggot",2467,.@mobs;
+ disablenpc instance_npcname( strnpcinfo(0) );
end;
}
-1@gl_k,213,63,7 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp2 849,4,4
-1@gl_k,230,50,2 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp3 849,4,4
-1@gl_k,222,39,2 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp4 849,4,4
-1@gl_k,214,27,3 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp5 849,4,4
-1@gl_k,223,17,2 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp6 849,4,4
-1@gl_k,235,16,4 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp7 849,4,4
-1@gl_k,251,20,5 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp8 849,4,4
-1@gl_k,240,43,5 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp9 849,4,4
-1@gl_k,271,19,1 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp10 849,4,4
-1@gl_k,246,62,7 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp11 849,4,4
-1@gl_k,282,48,7 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp12 849,4,4
-1@gl_k,285,81,7 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp13 849,4,4
-1@gl_k,241,86,5 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp14 849,4,4
-1@gl_k,249,101,3 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp15 849,4,4
-1@gl_k,276,106,7 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp16 849,4,4
-1@gl_k,252,120,7 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp17 849,4,4
-1@gl_k,258,150,1 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp18 849,4,4
-1@gl_k,255,157,6 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp19 849,4,4
-1@gl_k,261,164,7 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp20 849,4,4
-1@gl_k,269,173,7 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp21 849,4,4
-1@gl_k,280,167,3 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp22 849,4,4
-1@gl_k,293,161,3 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp23 849,4,4
-1@gl_k,226,96,3 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp24 849,4,4
-1@gl_k,222,119,5 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp25 849,4,4
-1@gl_k,233,123,3 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp26 849,4,4
-2@gl_k,147,203,5 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp27 849,4,4
-2@gl_k,141,222,1 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp28 849,4,4
-2@gl_k,167,225,3 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp29 849,4,4
-2@gl_k,145,236,3 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp30 849,4,4
-2@gl_k,143,260,3 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp31 849,4,4
-2@gl_k,173,258,3 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp32 849,4,4
+1@gl_k,233,123,4 duplicate(A dead man#1) A dead man#2 4_M_DIEMAN,5,5
+1@gl_k,258,150,2 duplicate(A dead man#1) A dead man#3 4_M_DIEMAN,5,5
+1@gl_k,255,157,5 duplicate(A dead man#1) A dead man#4 4_M_DIEMAN,5,5
+1@gl_k,280,167,4 duplicate(A dead man#1) A dead man#5 4_M_DIEMAN,5,5
+1@gl_k,293,161,2 duplicate(A dead man#1) A dead man#6 4_M_DIEMAN,5,5
+1@gl_k,249,101,3 duplicate(A dead man#1) A dead man#7 4_M_DIEMAN,5,5
+1@gl_k,241,86,6 duplicate(A dead man#1) A dead man#8 4_M_DIEMAN,5,5
+1@gl_k,246,62,0 duplicate(A dead man#1) A dead man#9 4_M_DIEMAN,5,5
+1@gl_k,240,43,7 duplicate(A dead man#1) A dead man#10 4_M_DIEMAN,5,5
+1@gl_k,271,19,1 duplicate(A dead man#1) A dead man#11 4_M_DIEMAN,5,5
+1@gl_k,282,48,5 duplicate(A dead man#1) A dead man#12 4_M_DIEMAN,5,5
+1@gl_k,285,81,7 duplicate(A dead man#1) A dead man#13 4_M_DIEMAN,5,5
+1@gl_k,276,106,0 duplicate(A dead man#1) A dead man#14 4_M_DIEMAN,5,5
+1@gl_k,261,164,0 duplicate(A dead man#1) A dead man#15 4_M_DIEMAN,5,5
+1@gl_k,269,173,0 duplicate(A dead man#1) A dead man#16 4_M_DIEMAN,5,5
+1@gl_k,252,120,0 duplicate(A dead man#1) A dead man#17 4_M_DIEMAN,5,5
+1@gl_k,213,63,0 duplicate(A dead man#1) A dead man#18 4_M_DIEMAN,5,5
+1@gl_k,222,39,0 duplicate(A dead man#1) A dead man#19 4_M_DIEMAN,5,5
+1@gl_k,214,27,0 duplicate(A dead man#1) A dead man#20 4_M_DIEMAN,5,5
+1@gl_k,223,17,1 duplicate(A dead man#1) A dead man#21 4_M_DIEMAN,5,5
+1@gl_k,230,50,2 duplicate(A dead man#1) A dead man#22 4_M_DIEMAN,5,5
+1@gl_k,235,16,3 duplicate(A dead man#1) A dead man#23 4_M_DIEMAN,5,5
+1@gl_k,226,96,4 duplicate(A dead man#1) A dead man#24 4_M_DIEMAN,5,5
+1@gl_k,222,119,5 duplicate(A dead man#1) A dead man#25 4_M_DIEMAN,5,5
+1@gl_k,251,20,6 duplicate(A dead man#1) A dead man#26 4_M_DIEMAN,5,5
// Sector 3 Mobs
//============================================================
-1@gl_k,0,0,0 script #ghmemorialmob03 -1,{
-OnInstanceInit:
-OnDisable:
- disablenpc instance_npcname("#ghmemorialmob03");
+1@gl_k,1,1,0 script #ghmemorialmob03 HIDDEN_WARP_NPC,{
end;
OnEnable:
enablenpc instance_npcname("#ghmemorialmob03");
- donpcevent instance_npcname("#ghinstancewarp5")+"::OnEnable";
- donpcevent instance_npcname("#ghinstancewarp6")+"::OnEnable";
- set .@map$, instance_mapname("1@gl_k");
- set .@label$, instance_npcname("#ghmemorialmob03")+"::OnMyMobDead";
- mapannounce .@map$,"12 o'clock warp leading to the zone 4 was opened.",bc_map,"0xFFFF00";
- areamonster .@map$,17,259,53,180,"Decayed Guard",2468,11,.@label$;
- areamonster .@map$,17,259,53,180,"Sharpshooter Ranger",2469,14,.@label$;
- areamonster .@map$,62,281,73,186,"Decayed Guard",2468,11,.@label$;
- areamonster .@map$,62,281,73,186,"Sharpshooter Ranger",2469,14,.@label$;
- areamonster .@map$,74,251,109,224,"Decayed Guard",2468,11,.@label$;
- areamonster .@map$,74,251,109,224,"Sharpshooter Ranger",2469,14,.@label$;
- areamonster .@map$,108,281,231,234,"Decayed Guard",2468,11,.@label$;
- areamonster .@map$,108,281,231,234,"Sharpshooter Ranger",2469,14,.@label$;
+ enablenpc instance_npcname("#4Control");
+ enablenpc instance_npcname("#4Control2");
+ mapannounce 'map_name$[0], "A portal has appeared to the northwest.", bc_map,0xFFFF00;
+
+ // note: x50 MG_RAYDRIC / x50 MG_RAYDRIC_ARCHER
+ .@label$ = instance_npcname("#ghmemorialmob03") + "::OnMyMobDead";
+ areamonster 'map_name$[0],16,186,43,280,"Outraged Archer",2469,25,.@label$;
+ areamonster 'map_name$[0],44,191,89,225,"Hungry Palace Guard",2468,25,.@label$;
+ areamonster 'map_name$[0],115,215,188,273,"Corrupted Palace Guard",2468,20,.@label$;
+ areamonster 'map_name$[0],108,232,193,281,"Corrupted Palace Guard",2468,5,.@label$;
+ areamonster 'map_name$[0],158,236,230,250,"Wandering Archer",2469,12,.@label$;
+ areamonster 'map_name$[0],65,231,155,256,"Wandering Archer",2469,13,.@label$;
end;
OnMyMobDead:
- set .@map$, instance_mapname("1@gl_k");
- set .@label$, instance_npcname("#ghmemorialmob03")+"::OnMyMobDead";
- set .@mob_dead_num, 100 - mobcount(.@map$,.@label$);
+ .@label$ = instance_npcname("#ghmemorialmob03") + "::OnMyMobDead";
+ .@mob_dead_num = 100 - mobcount('map_name$[0],.@label$);
if (.@mob_dead_num > 85) {
- mapannounce .@map$,"Himmelmez: Nice parry. I thought you were going to die slowly surrounded by the dead I summoned~",bc_map,"0xFFFFFF";
- killmonster .@map$,.@label$;
- donpcevent instance_npcname("#GHMclear3")+"::OnEnable";
- donpcevent instance_npcname("Heinrich#ghinstance4")+"::OnEnable";
- donpcevent instance_npcname("Himmelmez#ghinstance2")+"::OnEnable";
- donpcevent instance_npcname("Varmunt#ghinstance3")+"::OnEnable";
- donpcevent instance_npcname("#ghmemorialmob03")+"::OnDisable";
+ killmonster 'map_name$[0],.@label$;
+ enablenpc instance_npcname("#Mimelon");
+ enablenpc instance_npcname("Himelmez#2");
+ enablenpc instance_npcname("Varmundt#2");
+ enablenpc instance_npcname("Heinrich#4");
+ disablenpc instance_npcname("#ghmemorialmob03");
+ mapannounce 'map_name$[0], "Himelmez: Not bad. Thought you would be dead by now by my creatures~", bc_map,0xFFFFFF;
+ initnpctimer;
}
end;
+OnTimer5000:
+ mapannounce 'map_name$[0], "Himelmez: I'll wait for you at the north of the castle. I want to see how lucky you are.", bc_map,0xFFFFFF;
+ stopnpctimer;
+ end;
}
// 1st MVP
//============================================================
-1@gl_k,0,0,0 script #ghmemorialmob04 -1,{
-OnInstanceInit:
-OnDisable:
- disablenpc instance_npcname("#ghmemorialmob04");
- end;
-OnEnable:
- enablenpc instance_npcname("#ghmemorialmob04");
- monster instance_mapname("1@gl_k"),150,258,"Root of Corruption",2475,1,instance_npcname("#ghmemorialmob04")+"::OnMyMobDead";
- end;
-OnMyMobDead:
- set .@map$, instance_mapname("1@gl_k");
- if (mobcount(.@map$,instance_npcname("#ghmemorialmob04")+"::OnMyMobDead") < 1) {
- mapannounce .@map$, "12 o'clock warp leading to the Chivalry's Second Floor is now open.",bc_map,"0xFFFF00";
- donpcevent instance_npcname("#ghinstancewarp7")+"::OnEnable";
- npctalk "Varmunt : From the monster I picked up some great stuff. People who are interested, talk to me.", instance_npcname("Varmunt#ghinstance3");
- donpcevent instance_npcname("#effectGH01")+"::OnEnable";
- donpcevent instance_npcname("Heinrich#ghinstance5")+"::OnEnable";
- donpcevent instance_npcname("Varmunt#ghinstance4")+"::OnEnable";
- donpcevent instance_npcname("#ghmemorialmob04")+"::OnDisable";
+1@gl_k,144,258,6 script Heinrich#4 4_M_HEINRICH,{
+ mes "[Heinrich]";
+ mes "Himelmez... I will never forget what you've done to my men.";
+ cutin "gl_heinrich1",2;
+ close3;
+}
+
+// note: never hidden
+1@gl_k,156,258,3 script Varmundt#2 4_M_BARMUND,{
+ cutin "gl_barmund1",2;
+ mes "[Varmundt]";
+ if (checkquest(12318,HUNTING) != 2) {
+ mes "I guess this is it. Is it impossible to stop the time traveler's will?!";
+ mes "A portal seems to have appeared to the north.";
+ close3;
}
- end;
+ erasequest 12318;
+ if (isbegin_quest(12319) == 0)
+ setquest 12319;// Amdarais Hunt
+ if (isbegin_quest(12320) == 0) {
+ setquest 12320;// Time Traveler
+ completequest 12320;
+ getexp 250000,250000;
+ }
+ mes "This item has an extraordinary aura with it. Can be very useful for someone special.";
+ getitem 6607,1;// Temporal_Crystal
+ getitem 6608,1;// Coagulated_Spell
+ close3;
}
-1@gl_k,150,257,3 script #GHMclear3 111,9,9,{
- end;
-OnTouch_:
- donpcevent instance_npcname("#controlGH3")+"::OnEnable";
- specialeffect EF_BASH;
- donpcevent instance_npcname("#GHMclear3")+"::OnDisable";
- end;
-OnInstanceInit:
-OnDisable:
- disablenpc instance_npcname("#GHMclear3");
- end;
-OnEnable:
- enablenpc instance_npcname("#GHMclear3");
- initnpctimer;
- end;
-OnTimer2000:
- mapannounce instance_mapname("1@gl_k"), "Himmelmez: You got me tempted to go to the 2nd floor, come to the entrance. I'm curious about how far your luck goes.",bc_map,"0xFFFFFF";
- stopnpctimer;
- end;
+1@gl_k,150,257,3 script Himelmez#2 4_F_HIMEL,{
+ cutin "gl_himel2",2;
+ mes "[Himelmez]";
+ mes "Don't look at me nervous like that. It will be over soon...";
+ close3;
}
-1@gl_k,0,0,0 script #controlGH3 -1,{
-OnInstanceInit:
-OnDisable:
- disablenpc instance_npcname("#controlGH3");
+1@gl_k,150,257,0 script #Mimelon HIDDEN_WARP_NPC,7,7,{
end;
-OnEnable:
- enablenpc instance_npcname("#controlGH3");
+OnTouch_:
+ disablenpc instance_npcname("#Mimelon");
initnpctimer;
+ 'npc_himelmez2$ = instance_npcname("Himelmez#2");
+ 'npc_heinrich4$ = instance_npcname("Heinrich#4");
end;
OnTimer3000:
- npctalk "Himmelmez : What an awfully lucky, I flew all the way over here and just one of them is really powerful.", instance_npcname("Himmelmez#ghinstance2");
+ npctalk "Himelmez: Guess you are either lucky or powerful to make it this far.", 'npc_himelmez2$;
end;
OnTimer6000:
- npctalk "Himmelmez : But it doesn't matter to me.", instance_npcname("Himmelmez#ghinstance2");
+ npctalk "Himelmez: But it doesn't matter.", 'npc_himelmez2$;
end;
OnTimer9000:
- npctalk "Himmelmez : Now, all of you will die.", instance_npcname("Himmelmez#ghinstance2");
+ npctalk "Himelmez: You will all die here.", 'npc_himelmez2$;
end;
OnTimer12000:
- npctalk "Heinrich : Himmelmez! I won't let you take even a single more step here.", instance_npcname("Heinrich#ghinstance4");
+ npctalk "Heinrich: Himelmez! We will not let you get away from us!", 'npc_heinrich4$;
end;
OnTimer15000:
- npctalk "Himmelmez : Hahaha, so you guys thought I would come alone?", instance_npcname("Himmelmez#ghinstance2");
+ npctalk "Himelmez: Ha ha ha, worry about yourself. You think I am alone here?", 'npc_himelmez2$;
end;
OnTimer18000:
- npctalk "Varmunt : Heinrich Sir! Something unknown holds an inexplicably powerful force!", instance_npcname("Varmunt#ghinstance3");
+ npctalk "Varmundt: Sir Heinrich! I sense something strange and strong coming!", instance_npcname("Varmundt#2");
end;
OnTimer21000:
- npctalk "Heinrich : What... is this?!", instance_npcname("Heinrich#ghinstance4");
+ npctalk "Heinrich: What... These are!", 'npc_heinrich4$;
end;
OnTimer24000:
- npctalk "Himmelmez : This is my new toy to keep you at my feet. Why don't you guys play while I entertain?", instance_npcname("Himmelmez#ghinstance2");
+ npctalk "Himelmez: I will go on my way while my new toy entertains you.", 'npc_himelmez2$;
end;
OnTimer27000:
- npctalk "Himmelmez : Sincerely~, If I am given the opportunity I'd like to meet you again, Heinrich.", instance_npcname("Himmelmez#ghinstance2");
+ npctalk "Himelmez: Fare well~, hope to see you again sometime, Heinrich.", 'npc_himelmez2$;
end;
OnTimer28000:
- donpcevent instance_npcname("Himmelmez#ghinstance2")+"::OnDisable";
+ disablenpc 'npc_himelmez2$;
end;
OnTimer31000:
- npctalk "Heinrich : Varmunt Sir! Help the adventurers and I'll chase Himmelmez!", instance_npcname("Heinrich#ghinstance4");
+ npctalk "Heinrich: Sir Varmundt! Help those adventurers. I will go after Himelmez!", 'npc_heinrich4$;
end;
OnTimer32000:
- donpcevent instance_npcname("Heinrich#ghinstance4")+"::OnDisable";
+ disablenpc 'npc_heinrich4$;
end;
OnTimer35000:
- mapannounce instance_mapname("1@gl_k"), "An eerie echo from the depths can be heard as you get closer.",bc_map,"0xFFFFFF";
+ mapannounce 'map_name$[0], "An echoing comes from deep inside of the knight's shrine.", bc_map,0xFFFFFF;
end;
OnTimer38000:
- donpcevent instance_npcname("#ghmemorialmob04")+"::OnEnable";
+ donpcevent instance_npcname("#ghmemorialmob04") + "::OnStart";
stopnpctimer;
- donpcevent instance_npcname("#controlGH3")+"::OnDisable";
- end;
-}
-
-1@gl_k,144,258,6 script Heinrich#ghinstance4 652,{
- mes "[Heinrich]";
- mes "Himmelmez... You made my men get killed and I will never forget that.";
- cutin "gl_heinrich1",2;
- close2;
- cutin "gl_heinrich1",255;
- end;
-OnInstanceInit:
-OnDisable:
- hideonnpc instance_npcname("Heinrich#ghinstance4");
- end;
-OnEnable:
- hideoffnpc instance_npcname("Heinrich#ghinstance4");
- end;
-}
-
-1@gl_k,150,257,3 script Himmelmez#ghinstance2 650,{
- mes "[Himmelmez]";
- mes "No need to stare at me with so insecure eyes. Soon they'll become relaxed...";
- cutin "gl_himel2",2;
- close2;
- cutin "gl_himel2",255;
- end;
-OnInstanceInit:
-OnDisable:
- hideonnpc instance_npcname("Himmelmez#ghinstance2");
- end;
-OnEnable:
- hideoffnpc instance_npcname("Himmelmez#ghinstance2");
+ 'npc_himelmez2$ = 'npc_heinrich4$ = "";
end;
}
-1@gl_k,156,259,3 script Varmunt#ghinstance3 654,{
- if (checkquest(12318,HUNTING) == 2) {
- if (checkquest(12319,HUNTING) == -1) {
- mes "[Varmunt]";
- mes "There's something unusual about this thing's aura. Maybe someday we will be able to understand what is behind all of this.";
- cutin "gl_barmund1",2;
- erasequest 12318;
- if (checkquest(12319,HUNTING) == -1)
- setquest 12319;
- setquest 12320;
- erasequest 12320;
- getitem 6607,1; //Temporal_Crystal
- getitem 6608,1; //Coagulated_Spell
- close2;
- cutin "gl_barmund1",255;
- end;
- }
- }
- mes "[Varmunt]";
- mes "Even after all this time, it is impossible to prevent from the will of the Transcendent.";
- cutin "gl_barmund1",2;
- close2;
- cutin "gl_barmund2",255;
+1@gl_k,1,1,0 script #ghmemorialmob04 HIDDEN_WARP_NPC,{
end;
-OnInstanceInit:
-OnDisable:
- hideonnpc instance_npcname("Varmunt#ghinstance3");
+OnStart:
+ enablenpc instance_npcname("#ghmemorialmob04");
+ monster 'map_name$[0],150,259,"Corrupted Soul",2475,1, instance_npcname("#ghmemorialmob04") + "::OnMyMobDead";// MG_CORRUPTION_ROOT
+ unittalk $@mobid[0],"Grrrrrrhh~~~";
end;
-OnEnable:
- hideoffnpc instance_npcname("Varmunt#ghinstance3");
+OnMyMobDead:
+ if (mobcount('map_name$[0], instance_npcname("#ghmemorialmob04") + "::OnMyMobDead") < 1) {
+ mapannounce 'map_name$[0], "Opening 2nd floor entrance towards 12 O'clock direction.", bc_map,0xFFFF00;
+ npctalk "Varmundt: I collected some items dropped from its body. You can take it from me.", instance_npcname("Varmundt#2");
+
+ enablenpc instance_npcname("#2F Entrance");
+ enablenpc instance_npcname("#1 Control");
+ enablenpc instance_npcname("#22 Control");
+ enablenpc instance_npcname("#22 Control2");
+ enablenpc instance_npcname("#Servanton");
+ enablenpc instance_npcname("Heinrich#21");
+ enablenpc instance_npcname("Varmundt#21");
+ donpcevent instance_npcname("#ghmemorialmob05") + "::OnStart";
+ disablenpc instance_npcname("#ghmemorialmob04");
+ }
end;
}
// Floor 2
//============================================================
-2@gl_k,148,67,1 script Heinrich#ghinstance5 652,{
+2@gl_k,148,67,1 script Heinrich#21 4_M_HEINRICH,{
mes "[Heinrich]";
- mes "Himmelmez's blocking spells";
- mes "are everywhere around here...";
+ mes "Himelmez's closed space covers everywhere...";
cutin "gl_heinrich1",2;
- close2;
- cutin "gl_heinrich1",255;
- end;
-OnInstanceInit:
-OnDisable:
- hideonnpc instance_npcname("Heinrich#ghinstance5");
- end;
-OnEnable:
- hideoffnpc instance_npcname("Heinrich#ghinstance5");
- end;
+ close3;
}
-2@gl_k,151,71,7 script Varmunt#ghinstance4 654,{
- mes "[Varmunt]";
- mes "Why am I doing this again? Doesn't seem like the first time. I've seen this place repeatedly dozens of times in my dreams. This feeling...";
- cutin "gl_barmund1",2;
- close2;
- cutin "gl_barmund1",255;
- end;
-OnInstanceInit:
-OnDisable:
- hideonnpc instance_npcname("Varmunt#ghinstance4");
- end;
-OnEnable:
- hideoffnpc instance_npcname("Varmunt#ghinstance4");
- end;
+2@gl_k,151,71,7 script Varmundt#21 4_M_BARMUND,{
+ mes "[Varmundt]";
+ mes "How many times have I done this job? In my dream, I did it over and over again...";
+ cutin "gl_barmund2",2;
+ close3;
}
-2@gl_k,150,67,0 script #effectGH01 111,10,10,{
- end;
-OnTouch_:
- if (.touch) {
- set .touch,0;
- specialeffect EF_BASH;
- donpcevent instance_npcname("#controlGH4")+"::OnEnable";
- }
+2@gl_k,150,66,0 script #Servanton_effect HIDDEN_WARP_NPC,{
end;
OnEffect:
specialeffect EF_LORD;
end;
-OnInstanceInit:
-OnDisable:
- disablenpc instance_npcname("#effectGH01");
- end;
-OnEnable:
- enablenpc instance_npcname("#effectGH01");
- set .touch,1; // only activate OnTouch once
- end;
}
-2@gl_k,0,0,0 script #controlGH4 -1,{
-OnInstanceInit:
-OnDisable:
- disablenpc instance_npcname("#controlGH4");
+// note: this part can be skipped
+2@gl_k,150,66,0 script #Servanton HIDDEN_WARP_NPC,7,7,{
end;
-OnEnable:
- enablenpc instance_npcname("#controlGH4");
+OnTouch_:
+ disablenpc instance_npcname("#Servanton");
initnpctimer;
+ 'npc_heinrich$ = instance_npcname("Heinrich#21");
+ 'npc_varmundt$ = instance_npcname("Varmundt#21");
end;
OnTimer3000:
- npctalk "Heinrich : These things have never been in the castle!", instance_npcname("Heinrich#ghinstance5");
- donpcevent instance_npcname("#ghmemorialmob05")+"::OnEnable";
+ npctalk "Heinrich: This structure was not in the castle before!", 'npc_heinrich$;
end;
OnTimer6000:
- npctalk "Varmunt : Himmelmez's enchantment has completely blocked the passage to each section.", instance_npcname("Varmunt#ghinstance4");
+ npctalk "Varmundt: This is Himelmez's closed space. We blocked each area and aisle.", 'npc_varmundt$;
end;
OnTimer9000:
- npctalk "Heinrich : Trying to break this power with common weapons doesn't work. I tried it.", instance_npcname("Heinrich#ghinstance5");
+ npctalk "Heinrich: We tried to break it down but it's really strong.", 'npc_heinrich$;
end;
OnTimer12000:
- npctalk "Varmunt : Get out of the way for a moment. I'll try to somehow break the spell with magical powers.", instance_npcname("Varmunt#ghinstance4");
+ npctalk "Varmundt: Step back. Let me try to dispel the magic.", 'npc_varmundt$;
end;
OnTimer15000:
- donpcevent instance_npcname("#effectGH01")+"::OnEffect";
+ specialeffect EF_LORD,AREA, instance_npcname("#Servanton_effect");
+ disablenpc instance_npcname("#Servanton_effect");
end;
OnTimer18000:
- donpcevent instance_npcname("#effectGH01")+"::OnDisable";
- npctalk "Varmunt : The enchantment seems to be broken.", instance_npcname("Varmunt#ghinstance4");
+ npctalk "Varmundt: I think that part of closed space is broken down.", 'npc_varmundt$;
end;
OnTimer21000:
- npctalk "Varmunt : I've never seen this spell before.", instance_npcname("Varmunt#ghinstance4");
+ npctalk "Varmundt: I have never seen this closed space.", 'npc_varmundt$;
end;
OnTimer24000:
- npctalk "Varmunt : Himmelmez doesn't use a seal on a person's body to turn it into an undead.", instance_npcname("Varmunt#ghinstance4");
+ npctalk "Varmundt: Himelmez hides stone chains in undead people's body.", 'npc_varmundt$;
end;
OnTimer27000:
- npctalk "Varmunt : She uses enchantment stones.This way, the spell is probably maintained.", instance_npcname("Varmunt#ghinstance4");
+ npctalk "Varmundt: Maybe this closed space is maintained with these stone chains.", 'npc_varmundt$;
end;
OnTimer30000:
- npctalk "Varmunt : We should kill the people who have the enchantment stones to break the spell.", instance_npcname("Varmunt#ghinstance4");
+ npctalk "Varmundt: If you want to break it, you have to kill one of those who have a stone chain.", 'npc_varmundt$;
end;
OnTimer33000:
- npctalk "Varmunt : However, we can't identify them. The purification can only be done randomly.", instance_npcname("Varmunt#ghinstance4");
+ npctalk "Varmundt: But we can't recognize who has a stone chain so we have to purify everything.", 'npc_varmundt$;
end;
OnTimer36000:
- npctalk "Heinrich : It is really unforgivable.", instance_npcname("Heinrich#ghinstance5");
+ npctalk "Heinrich: It is inexcusable behavior.", 'npc_heinrich$;
end;
OnTimer39000:
- npctalk "Heinrich : I, who already was a subordinate of genocide. How much more in the future...", instance_npcname("Heinrich#ghinstance5");
+ npctalk "Heinrich: I already exterminated all my soldiers and maybe more...", 'npc_heinrich$;
end;
OnTimer42000:
- npctalk "Varmunt : Commandant...", instance_npcname("Varmunt#ghinstance4");
+ npctalk "Varmundt: Commander...", 'npc_varmundt$;
end;
OnTimer45000:
- npctalk "Varmunt : Commandant, it seems too loose.", instance_npcname("Varmunt#ghinstance4");
+ npctalk "Varmundt: Commander! You need to be strong.", 'npc_varmundt$;
end;
OnTimer48000:
- npctalk "Varmunt : We are related to all these people, not just a few.", instance_npcname("Varmunt#ghinstance4");
+ npctalk "Varmundt: Our enemy is not human.", 'npc_varmundt$;
end;
OnTimer51000:
- npctalk "Varmunt : We can't deny that it's not their fault for what is going on.", instance_npcname("Varmunt#ghinstance4");
+ npctalk "Varmundt: Even though you deny it, they'll never turn back to human.", 'npc_varmundt$;
end;
OnTimer54000:
- npctalk "Heinrich : ...", instance_npcname("Heinrich#ghinstance5");
+ npctalk "Heinrich: ...", 'npc_heinrich$;
end;
OnTimer57000:
- npctalk "Varmunt : Well, let's do it then.", instance_npcname("Varmunt#ghinstance4");
+ npctalk "Varmundt: Well, let's go then.", 'npc_varmundt$;
end;
OnTimer60000:
- npctalk "Varmunt : You guys are of a great help. Try to follow us.", instance_npcname("Varmunt#ghinstance4");
+ npctalk "Varmundt: And you guys, just take a break and follow us.", 'npc_varmundt$;
end;
OnTimer63000:
- npctalk "Varmunt : There can be a tough fight. Hold on, and it would be nice to eat something.", instance_npcname("Varmunt#ghinstance4");
+ npctalk "Varmundt: It could be hard fighting so stay strong.", 'npc_varmundt$;
end;
OnTimer66000:
- npctalk "Varmunt : Guys. It is time to depart, Heinrich Sir.", instance_npcname("Varmunt#ghinstance4");
+ npctalk "Varmundt: Ok, it's time to begin Heinrich.", 'npc_varmundt$;
end;
OnTimer69000:
- mapannounce instance_mapname("2@gl_k"), "9 o'clock positioned warp leading to the 1st zone has been opened. Move from the central hallway. A being with an evil aura seems to be appearing in this region.",bc_map,"0xFFFF00";
- donpcevent instance_npcname("#ghinstancewarp8")+"::OnEnable";
- donpcevent instance_npcname("#ghinstancewarp9")+"::OnEnable";
- donpcevent instance_npcname("#ghmemorialmob06")+"::OnEnable";
- donpcevent instance_npcname("Varmunt#ghinstance4")+"::OnDisable";
- donpcevent instance_npcname("Heinrich#ghinstance5")+"::OnDisable";
- end;
-OnTimer70000:
+ mapannounce 'map_name$[1], "A portal to the west has opened in the central hallway.", bc_map,0xFFFF00;
+ disablenpc 'npc_varmundt$;
+ disablenpc 'npc_heinrich$;
stopnpctimer;
- donpcevent instance_npcname("#controlGH4")+"::OnDisable";
- end;
-}
-
-2@gl_k,0,0,0 script #ghmemorialmob05 -1,{
-OnInstanceInit:
-OnDisable:
- disablenpc instance_npcname("#ghmemorialmob05");
- end;
-OnEnable:
- enablenpc instance_npcname("#ghmemorialmob05");
- set .@map$, instance_mapname("2@gl_k");
- set .@label$, instance_npcname("#ghmemorialmob05")+"::OnMyMobDead";
- areamonster .@map$,124,20,31,162,"Decayed Guard",2468,8,.@label$;
- areamonster .@map$,124,20,31,162,"Sharpshooter Ranger",2469,8,.@label$;
- areamonster .@map$,124,20,31,162,"Fallen Abyss Knight",2470,8,.@label$;
- areamonster .@map$,124,20,31,162,"Suffering Khalitzburg",2471,8,.@label$;
- areamonster .@map$,124,20,31,162,"Swollen Knight",2472,8,.@label$;
- set 'MyMobs,80;
- end;
-OnMyMobDead:
- set .@map$, instance_mapname("2@gl_k");
- set 'MyMobs, 'MyMobs-1;
- if ('MyMobs == 0) {
- mapannounce .@map$, "A being with an evil aura seems to be appearing in this region.",bc_map,"0xFFFF00";
- donpcevent instance_npcname("#ghmemorialmob06")+"::OnDisable2";
- donpcevent instance_npcname("#ghmemorialmob07")+"::OnEnable";
- donpcevent instance_npcname("#ghmemorialmob05")+"::OnDisable";
- } else {
- set .@label$, instance_npcname("#ghmemorialmob05")+"::OnMyMobDead";
- switch(rand(5)) {
- case 0:
- areamonster .@map$,124,20,31,162,"Decayed Guard",2468,1,.@label$;
- break;
- case 1:
- areamonster .@map$,124,20,31,162,"Sharpshooter Ranger",2469,1,.@label$;
- break;
- case 2:
- areamonster .@map$,124,20,31,162,"Fallen Abyss Knight",2470,1,.@label$;
- break;
- case 3:
- areamonster .@map$,124,20,31,162,"Suffering Khalitzburg",2471,1,.@label$;
- break;
- case 4:
- areamonster .@map$,124,20,31,162,"Swollen Knight",2472,1,.@label$;
- break;
- }
- }
+ 'npc_varmundt$ = 'npc_heinrich$ = "";
end;
}
-2@gl_k,0,0,0 script #ghmemorialmob06 -1,{
-OnInstanceInit:
-OnDisable:
- disablenpc instance_npcname("#ghmemorialmob06");
- end;
-OnDisable2:
- stopnpctimer;
- disablenpc instance_npcname("#ghmemorialmob06");
+// Spots
+// Note: timer is the only condition for them to respawn
+2@gl_k,118,141,0 script #ogh_2-1 HIDDEN_WARP_NPC,20,20,{
end;
-OnEnable:
- enablenpc instance_npcname("#ghmemorialmob06");
- donpcevent instance_npcname("#ghmemorialmob06")+"::OnSpawn";
- end;
-OnSpawn:
+OnTouch_:
+ disablenpc instance_npcname( strnpcinfo(0) );
+ .@hidden_name$ = strnpcinfo(2);
+ .@event_type = atoi( charat(.@hidden_name$,4) );
+ if (.@event_type == 2)
+ .@label$ = instance_npcname("#ghmemorialmob05") + "::OnMyMobDead";
+ else
+ .@label$ = instance_npcname("#ghmemorialmob06") + "::OnMyMobDead";
+ getmapxy .@map$,.@x,.@y, UNITTYPE_NPC;
+ monster .@map$,.@x,.@y, "Corrupted Palace Guard", 2468,1, .@label$;
+ monster .@map$,.@x,.@y, "Archer of Death", 2469,1, .@label$;
+ monster .@map$,.@x,.@y, "Corrupted Abysmal Knight", 2470,1, .@label$;
+ monster .@map$,.@x,.@y, "Suffered Khalitzburg", 2471,1, .@label$;
+ monster .@map$,.@x,.@y, "Bloody Knight", 2472,1, .@label$;
initnpctimer;
end;
-OnTimer90000:
- set .@map$, instance_mapname("2@gl_k");
- set .@label$, instance_npcname("#ghmemorialmob05")+"::OnMyMobDead";
- setarray .@c[0],
- 114,141,118,139,
- 128,83,131,78,
- 88,53,93,48,
- 54,47,61,40,
- 58,83,63,78,
- 69,138,80,127,
- 34,143,39,138;
- for(set .@i,0; .@i<getarraysize(.@c); set .@i,.@i+4) {
- areamonster .@map$,.@c[.@i],.@c[.@i+1],.@c[.@i+2],.@c[.@i+3],"Decayed Guard",2468,1,.@label$;
- areamonster .@map$,.@c[.@i],.@c[.@i+1],.@c[.@i+2],.@c[.@i+3],"Sharpshooter Ranger",2469,1,.@label$;
- areamonster .@map$,.@c[.@i],.@c[.@i+1],.@c[.@i+2],.@c[.@i+3],"Fallen Abyss Knight",2470,1,.@label$;
- areamonster .@map$,.@c[.@i],.@c[.@i+1],.@c[.@i+2],.@c[.@i+3],"Suffering Khalitzburg",2471,1,.@label$;
- areamonster .@map$,.@c[.@i],.@c[.@i+1],.@c[.@i+2],.@c[.@i+3],"Swollen Knight",2472,1,.@label$;
- }
+OnTimer30000:
+ enablenpc instance_npcname( strnpcinfo(0) );
+ stopnpctimer;
end;
-OnTimer92000:
+OnStop:
+ disablenpc instance_npcname( strnpcinfo(0) );
stopnpctimer;
- donpcevent instance_npcname("#ghmemorialmob06")+"::OnSpawn";
end;
}
+2@gl_k,128,81,0 duplicate(#ogh_2-1) #ogh_2-2 HIDDEN_WARP_NPC,20,20
+2@gl_k,131,54,0 duplicate(#ogh_2-1) #ogh_2-3 HIDDEN_WARP_NPC,20,20
+2@gl_k,89,48,0 duplicate(#ogh_2-1) #ogh_2-4 HIDDEN_WARP_NPC,20,20
+2@gl_k,64,117,0 duplicate(#ogh_2-1) #ogh_2-5 HIDDEN_WARP_NPC,20,20
+2@gl_k,62,82,0 duplicate(#ogh_2-1) #ogh_2-6 HIDDEN_WARP_NPC,20,20
+2@gl_k,38,138,0 duplicate(#ogh_2-1) #ogh_2-7 HIDDEN_WARP_NPC,20,20
-2@gl_k,0,0,0 script #ghmemorialmob07 -1,{
-OnInstanceInit:
-OnDisable:
- disablenpc instance_npcname("#ghmemorialmob07");
- end;
-OnEnable:
- enablenpc instance_npcname("#ghmemorialmob07");
- areamonster instance_mapname("2@gl_k"),124,20,31,162,"The Destruction of the First Captain",2473,1,instance_npcname("#ghmemorialmob07")+"::OnMyMobDead";
- end;
-OnMyMobDead:
- set .@map$, instance_mapname("2@gl_k");
- if (mobcount(.@map$,instance_npcname("#ghmemorialmob07")+"::OnMyMobDead") < 1) {
- mapannounce .@map$, "3 o'clock positioned warp leading to the 2nd zone has been opened. Use the central hallway to get there.",bc_map,"0xFFFF00";
- donpcevent instance_npcname("#ghinstancewarp10")+"::OnEnable";
- donpcevent instance_npcname("#ghinstancewarp11")+"::OnEnable";
- donpcevent instance_npcname("#ghmemorialmob08")+"::OnEnable";
- donpcevent instance_npcname("#ghmemorialmob07")+"::OnDisable";
- }
- end;
-}
+2@gl_k,171,120,0 duplicate(#ogh_2-1) #ogh_3-1 HIDDEN_WARP_NPC,20,20
+2@gl_k,232,133,0 duplicate(#ogh_2-1) #ogh_3-2 HIDDEN_WARP_NPC,20,20
+2@gl_k,256,149,0 duplicate(#ogh_2-1) #ogh_3-3 HIDDEN_WARP_NPC,20,20
+2@gl_k,212,106,0 duplicate(#ogh_2-1) #ogh_3-4 HIDDEN_WARP_NPC,20,20
+2@gl_k,243,73,0 duplicate(#ogh_2-1) #ogh_3-5 HIDDEN_WARP_NPC,20,20
+2@gl_k,229,26,0 duplicate(#ogh_2-1) #ogh_3-6 HIDDEN_WARP_NPC,20,20
+2@gl_k,181,34,0 duplicate(#ogh_2-1) #ogh_3-7 HIDDEN_WARP_NPC,20,20
-2@gl_k,0,0,0 script #ghmemorialmob08 -1,{
-OnInstanceInit:
-OnDisable:
- disablenpc instance_npcname("#ghmemorialmob08");
+// Commander 1
+2@gl_k,1,1,0 script #ghmemorialmob05 HIDDEN_WARP_NPC,{
end;
-OnEnable:
- enablenpc instance_npcname("#ghmemorialmob08");
- set .@map$, instance_mapname("2@gl_k");
- set .@label$, instance_npcname("#ghmemorialmob08")+"::OnMyMobDead";
- areamonster .@map$,175,163,265,18,"Decayed Guard",2468,7,.@label$;
- areamonster .@map$,175,163,265,18,"Sharpshooter Ranger",2469,7,.@label$;
- areamonster .@map$,175,163,265,18,"Fallen Abyss Knight",2470,7,.@label$;
- areamonster .@map$,175,163,265,18,"Suffering Khalitzburg",2471,7,.@label$;
- areamonster .@map$,175,163,265,18,"Swollen Knight",2472,7,.@label$;
- set 'MyMobs,35;
+OnStart:
+ enablenpc instance_npcname("#ghmemorialmob05");
+ for ( .@i = 1; .@i <= 7; .@i++ )
+ enablenpc instance_npcname("#ogh_2-" + .@i);
end;
+
OnMyMobDead:
- set .@map$, instance_mapname("2@gl_k");
- set 'MyMobs, 'MyMobs-1;
- if ('MyMobs == 0) {
- mapannounce .@map$, "A being with an evil aura seems to be appearing in this region.",bc_map,"0xFFFF00";
- donpcevent instance_npcname("#ghmemorialmob09")+"::OnEnable";
- donpcevent instance_npcname("#ghmemorialmob08")+"::OnDisable";
- } else {
- set .@label$, instance_npcname("#ghmemorialmob08")+"::OnMyMobDead";
- switch(rand(5)) {
- case 0:
- areamonster .@map$,175,163,265,18,"Decayed Guard",2468,1,.@label$;
- break;
- case 1:
- areamonster .@map$,175,163,265,18,"Sharpshooter Ranger",2469,1,.@label$;
- break;
- case 2:
- areamonster .@map$,175,163,265,18,"Fallen Abyss Knight",2470,1,.@label$;
- break;
- case 3:
- areamonster .@map$,175,163,265,18,"Suffering Khalitzburg",2471,1,.@label$;
- break;
- case 4:
- areamonster .@map$,175,163,265,18,"Swollen Knight",2472,1,.@label$;
- break;
- }
+ if (rand(50) == 0) {// can re-spawn
+ mapannounce 'map_name$[1], "Evil Forces are appearing in this area.", bc_map,0xFFFF44,FW_NORMAL,15;
+ killmonster 'map_name$[1], instance_npcname("#ghmemorialmob05") + "::OnBossDead";
+
+ .@r = rand(4) * 2;
+ setarray .@coord[0], 41,146, 58,44, 122,148, 131,64;
+ monster 'map_name$[1],.@coord[.@r],.@coord[.@r+1], "1st Commander of Destruction",2473,1, instance_npcname("#ghmemorialmob05") + "::OnBossDead";
}
end;
-}
-2@gl_k,0,0,0 script #ghmemorialmob09 -1,{
-OnInstanceInit:
-OnDisable:
- disablenpc instance_npcname("#ghmemorialmob09");
- end;
-OnEnable:
- enablenpc instance_npcname("#ghmemorialmob09");
- areamonster instance_mapname("2@gl_k"),175,163,265,18,"The Destruction of the Second Captain",2474,1,instance_npcname("#ghmemorialmob09")+"::OnMyMobDead";
- end;
-OnMyMobDead:
- set .@map$, instance_mapname("2@gl_k");
- if (mobcount(.@map$,instance_npcname("#ghmemorialmob09")+"::OnMyMobDead") < 1) {
- mapannounce .@map$, "12 o'clock positioned warp leading to the 3rd zone has been opened. Use the central hallway to get there.",bc_map,"0xFFFF00";
- donpcevent instance_npcname("#ghinstancewarp12")+"::OnEnable";
- donpcevent instance_npcname("#controlGH6")+"::OnEnable";
- donpcevent instance_npcname("#ghmemorialmob08")+"::OnDisable";
- donpcevent instance_npcname("#ghmemorialmob09")+"::OnDisable";
- }
+OnBossDead:
+ mapannounce 'map_name$[1], "A portal has opened to the east in the central hallway.", bc_map,0xFFFF00;
+ enablenpc instance_npcname("#23 Control");
+ enablenpc instance_npcname("#23 Control2");
+ donpcevent instance_npcname("#ghmemorialmob06") + "::OnStart";
+
+ disablenpc instance_npcname("#ghmemorialmob05");
+ for ( .@i = 1; .@i <= 7; .@i++ )
+ donpcevent instance_npcname("#ogh_2-" + .@i) + "::OnStop";
end;
}
-2@gl_k,0,0,0 script #ghmemorialmob10 -1,{
-OnInstanceInit:
-OnDisable:
- disablenpc instance_npcname("#ghmemorialmob10");
+// Commander 2
+2@gl_k,1,1,0 script #ghmemorialmob06 HIDDEN_WARP_NPC,{
end;
-OnEnable:
- enablenpc instance_npcname("#ghmemorialmob10");
- donpcevent instance_npcname("Gerhard#ghinstance1")+"::OnDisable";
- monster instance_mapname("2@gl_k"),158,255,"Amdarias",2476,1,instance_npcname("#ghmemorialmob10")+"::OnMyMobDead";
+OnStart:
+ enablenpc instance_npcname("#ghmemorialmob06");
+ for ( .@i = 1; .@i <= 7; .@i++ )
+ enablenpc instance_npcname("#ogh_3-" + .@i);
+
+ // Fix spawn
+ .@label$ = instance_npcname("#ghmemorialmob06") + "::OnMyMobDead";
+ monster 'map_name$[1],252, 75, "Corrupted Palace Guard",2468,1, .@label$;
+ monster 'map_name$[1],253, 76, "Corrupted Palace Guard",2468,1, .@label$;
+ monster 'map_name$[1],247, 77, "Corrupted Palace Guard",2468,1, .@label$;
+ monster 'map_name$[1],248, 80, "Corrupted Palace Guard",2468,1, .@label$;
+ monster 'map_name$[1],236,100, "Corrupted Palace Guard",2468,1, .@label$;
+ monster 'map_name$[1],240,100, "Corrupted Palace Guard",2468,1, .@label$;
+ monster 'map_name$[1],242,100, "Corrupted Palace Guard",2468,1, .@label$;
+ monster 'map_name$[1],244,100, "Corrupted Palace Guard",2468,1, .@label$;
+ monster 'map_name$[1],199,111, "Corrupted Palace Guard",2468,1, .@label$;
+ monster 'map_name$[1],181,107, "Wandering Archer",2469,1, .@label$;
+ monster 'map_name$[1],177,110, "Wandering Archer",2469,1, .@label$;
+ monster 'map_name$[1],236, 27, "Wandering Archer",2469,1, .@label$;
+ monster 'map_name$[1],242, 27, "Wandering Archer",2469,1, .@label$;
+ monster 'map_name$[1],252, 26, "Wandering Archer",2469,1, .@label$;
+ monster 'map_name$[1],172,130, "Wandering Archer",2469,1, .@label$;
+ monster 'map_name$[1],171,127, "Wandering Archer",2469,1, .@label$;
+ monster 'map_name$[1],173,127, "Wandering Archer",2469,1, .@label$;
+ monster 'map_name$[1],177, 69, "Corrupted Abysmal Knight",2470,1, .@label$;
+ monster 'map_name$[1],186, 66, "Corrupted Abysmal Knight",2470,1, .@label$;
+ monster 'map_name$[1],189, 67, "Corrupted Abysmal Knight",2470,1, .@label$;
+ monster 'map_name$[1],190, 68, "Corrupted Abysmal Knight",2470,1, .@label$;
+ monster 'map_name$[1],257,157, "Corrupted Abysmal Knight",2470,1, .@label$;
+ monster 'map_name$[1],246,159, "Corrupted Abysmal Knight",2470,1, .@label$;
+ monster 'map_name$[1],237,158, "Corrupted Abysmal Knight",2470,1, .@label$;
+ monster 'map_name$[1],206,159, "Corrupted Abysmal Knight",2470,1, .@label$;
+ monster 'map_name$[1],172,120, "Corrupted Abysmal Knight",2470,1, .@label$;
+ monster 'map_name$[1],226, 30, "Suffered Khalitzburg",2471,1, .@label$;
+ monster 'map_name$[1],226, 38, "Suffered Khalitzburg",2471,1, .@label$;
+ monster 'map_name$[1],228, 29, "Suffered Khalitzburg",2471,1, .@label$;
+ monster 'map_name$[1],226, 63, "Suffered Khalitzburg",2471,1, .@label$;
+ monster 'map_name$[1],268,137, "Suffered Khalitzburg",2471,1, .@label$;
+ monster 'map_name$[1],263,138, "Suffered Khalitzburg",2471,1, .@label$;
+ monster 'map_name$[1],259,138, "Suffered Khalitzburg",2471,1, .@label$;
+ monster 'map_name$[1],259,138, "Suffered Khalitzburg",2471,1, .@label$;
+ monster 'map_name$[1],187,121, "Suffered Khalitzburg",2471,1, .@label$;
+ monster 'map_name$[1],265, 52, "Bloody Knight",2472,1, .@label$;
+ monster 'map_name$[1],265, 55, "Bloody Knight",2472,1, .@label$;
+ monster 'map_name$[1],264, 79, "Bloody Knight",2472,1, .@label$;
+ monster 'map_name$[1],225, 92, "Bloody Knight",2472,1, .@label$;
+ monster 'map_name$[1],237, 92, "Bloody Knight",2472,1, .@label$;
+ monster 'map_name$[1],249, 92, "Bloody Knight",2472,1, .@label$;
+ monster 'map_name$[1],256, 93, "Bloody Knight",2472,1, .@label$;
+ monster 'map_name$[1],264,100, "Bloody Knight",2472,1, .@label$;
+ monster 'map_name$[1],181,120, "Bloody Knight",2472,1, .@label$;
end;
+
OnMyMobDead:
- if (mobcount(instance_mapname("2@gl_k"),instance_npcname("#ghmemorialmob10")+"::OnMyMobDead") < 1) {
- donpcevent instance_npcname("Hugin#ghinstance1")+"::OnEnable";
- donpcevent instance_npcname("#ghmemorialmob10")+"::OnDisable";
+ if (rand(50) == 0) {// can re-spawn
+ mapannounce 'map_name$[1], "An evil presence has teleported into this area.", bc_map,0xFFFF44,FW_NORMAL,15;
+ killmonster 'map_name$[1], instance_npcname("#ghmemorialmob06") + "::OnBossDead";
+
+ .@r = rand(4) * 2;
+ setarray .@coord[0], 166,119, 211,45, 227,139, 245,74;
+ monster 'map_name$[1],.@coord[.@r],.@coord[.@r+1], "2nd Commander of Destruction",2474,1, instance_npcname("#ghmemorialmob06") + "::OnBossDead";
}
end;
-}
-2@gl_k,155,250,7 script Heinrich#ghinstance6 652,{
- end;
-OnInstanceInit:
-OnDisable:
- hideonnpc instance_npcname("Heinrich#ghinstance6");
- end;
-OnEnable:
- hideoffnpc instance_npcname("Heinrich#ghinstance6");
- end;
-}
+OnBossDead:
+ mapannounce 'map_name$[1], "A new portal has appeared at the end of the central corridor.", bc_map,0xFFFF00;
+ enablenpc instance_npcname("#24 Control");
+ enablenpc instance_npcname("#24 Control2");
+ enablenpc instance_npcname("#Geron");
+ for ( .@i = 1; .@i <= 35; .@i++ )
+ enablenpc instance_npcname("Decomposed body#" + .@i);
-2@gl_k,162,250,1 script Varmunt#ghinstance5 654,{
- mes "[Varmunt]";
- mes "We can't escape this";
- mes "eternal confinement...";
- cutin "gl_barmund2",2;
- close2;
- cutin "gl_barmund2",255;
- end;
-OnInstanceInit:
-OnDisable:
- hideonnpc instance_npcname("Varmunt#ghinstance5");
- end;
-OnEnable:
- hideoffnpc instance_npcname("Varmunt#ghinstance5");
- end;
-}
+ disablenpc instance_npcname("#ghmemorialmob06");
+ for ( .@i = 1; .@i <= 7; .@i++ )
+ donpcevent instance_npcname("#ogh_3-" + .@i) + "::OnStop";
-2@gl_k,158,252,3 script Himmelmez#ghinstance4 650,4,4,{
- end;
-OnInstanceInit:
-OnDisable:
- hideonnpc instance_npcname("Himmelmez#ghinstance4");
- end;
-OnEnable:
- hideoffnpc instance_npcname("Himmelmez#ghinstance4");
+ // Hidden mobs
+ setarray .@coord[0],
+ 37,265, 57,265, 77,265, 97,265, 117,265, 188,264, 208,264,
+ 50,172, 70,172, 90,172, 110,172, 170,172, 210,172, 230,172,
+ 88,214, 108,214, 128,214, 180,219, 200,219, 220,219, 240,219;
+ .@size = getarraysize(.@coord);
+ for ( .@i = 0; .@i < .@size; .@i += 2 )
+ monster 'map_name$[1], .@coord[.@i], .@coord[.@i+1], "Flame of destruction",2337,1;// HIDDEN_MOB
end;
}
-2@gl_k,150,179,0 script #controlGH6 111,2,2,{
+// Amdarais Room Entrance
+2@gl_k,150,180,0 script #Geron HIDDEN_WARP_NPC,7,7,{
end;
OnTouch_:
- mapannounce instance_mapname("2@gl_k"), "???: Do not come! There are traps everywhere here... Aaaaack!!!!",bc_map,"0xFF0000";
- specialeffect EF_BASH;
- donpcevent instance_npcname("Himmelmez#ghinstance3")+"::OnEnable";
- donpcevent instance_npcname("Heinrich#ghinstance6")+"::OnEnable";
- donpcevent instance_npcname("Varmunt#ghinstance5")+"::OnEnable";
- donpcevent instance_npcname("Gerhard#ghinstance1")+"::OnEnable";
- donpcevent instance_npcname("#controlGH6")+"::OnDisable";
- end;
-OnInstanceInit:
-OnDisable:
- disablenpc instance_npcname("#controlGH6");
- end;
-OnEnable:
- enablenpc instance_npcname("#controlGH6");
+ disablenpc instance_npcname("#Geron");
+ mapannounce 'map_name$[1], "???: Do not come here! It's a trap... Kkkkah!!!", bc_map,0xFF7777,FW_NORMAL,15;
+ enablenpc instance_npcname("Himelmez#22");
+ enablenpc instance_npcname("Varmundt#23");
+ enablenpc instance_npcname("Heinrich#23");
+ enablenpc instance_npcname("Gerhalt#23");
end;
}
-2@gl_k,158,252,1 script Himmelmez#ghinstance3 650,7,7,{
+2@gl_k,143,260,4 script Decomposed body#1 4_M_DIEMAN,5,5,{
end;
OnTouch_:
- specialeffect EF_BASH;
- donpcevent instance_npcname("#controlGH5")+"::OnEnable";
- donpcevent instance_npcname("Himmelmez#ghinstance4")+"::OnEnable";
- donpcevent instance_npcname("Himmelmez#ghinstance3")+"::OnDisable";
- end;
-OnInstanceInit:
-OnDisable:
- disablenpc instance_npcname("Himmelmez#ghinstance3");
+ disablenpc instance_npcname( strnpcinfo(0) );
+ .@i = rand(1,10);
+ if (.@i == 1) .@mobs = 3;
+ else if (.@i == 2) .@mobs = 4;
+ else if (.@i == 3) .@mobs = 5;
+ else if (.@i < 7) .@mobs = 6;
+ else .@mobs = 7;
+ getmapxy .@map$,.@x,.@y, UNITTYPE_NPC;
+ specialeffect EF_VENOMDUST;
+ monster .@map$,.@x,.@y,"Maggot",2467,.@mobs;
+ initnpctimer;
end;
-OnEnable:
- enablenpc instance_npcname("Himmelmez#ghinstance3");
+OnTimer45000:
+ enablenpc instance_npcname( strnpcinfo(0) );
+ stopnpctimer;
end;
}
+2@gl_k,145,236,4 duplicate(Decomposed body#1) Decomposed body#2 4_M_DIEMAN,5,5
+2@gl_k,141,222,2 duplicate(Decomposed body#1) Decomposed body#3 4_M_DIEMAN,5,5
+2@gl_k,147,203,5 duplicate(Decomposed body#1) Decomposed body#4 4_M_DIEMAN,5,5
+2@gl_k,167,225,4 duplicate(Decomposed body#1) Decomposed body#5 4_M_DIEMAN,5,5
+2@gl_k,172,233,2 duplicate(Decomposed body#1) Decomposed body#6 4_M_DIEMAN,5,5
+2@gl_k,176,244,3 duplicate(Decomposed body#1) Decomposed body#7 4_M_DIEMAN,5,5
+2@gl_k,184,248,6 duplicate(Decomposed body#1) Decomposed body#8 4_M_DIEMAN,5,5
+2@gl_k,193,228,0 duplicate(Decomposed body#1) Decomposed body#9 4_M_DIEMAN,5,5
+2@gl_k,206,250,7 duplicate(Decomposed body#1) Decomposed body#10 4_M_DIEMAN,5,5
+2@gl_k,130,249,1 duplicate(Decomposed body#1) Decomposed body#11 4_M_DIEMAN,5,5
+2@gl_k,122,236,5 duplicate(Decomposed body#1) Decomposed body#12 4_M_DIEMAN,5,5
+2@gl_k,130,228,7 duplicate(Decomposed body#1) Decomposed body#13 4_M_DIEMAN,5,5
+2@gl_k,106,226,0 duplicate(Decomposed body#1) Decomposed body#14 4_M_DIEMAN,5,5
+2@gl_k,104,245,0 duplicate(Decomposed body#1) Decomposed body#15 4_M_DIEMAN,5,5
+2@gl_k,131,187,0 duplicate(Decomposed body#1) Decomposed body#16 4_M_DIEMAN,5,5
+2@gl_k,121,197,0 duplicate(Decomposed body#1) Decomposed body#17 4_M_DIEMAN,5,5
+2@gl_k,107,194,0 duplicate(Decomposed body#1) Decomposed body#18 4_M_DIEMAN,5,5
+2@gl_k,92,187,0 duplicate(Decomposed body#1) Decomposed body#19 4_M_DIEMAN,5,5
+2@gl_k,153,214,3 duplicate(Decomposed body#1) Decomposed body#20 4_M_DIEMAN,5,5
+2@gl_k,155,195,4 duplicate(Decomposed body#1) Decomposed body#21 4_M_DIEMAN,5,5
+2@gl_k,154,188,2 duplicate(Decomposed body#1) Decomposed body#22 4_M_DIEMAN,5,5
+2@gl_k,143,195,5 duplicate(Decomposed body#1) Decomposed body#23 4_M_DIEMAN,5,5
+2@gl_k,132,214,4 duplicate(Decomposed body#1) Decomposed body#24 4_M_DIEMAN,5,5
+2@gl_k,125,208,2 duplicate(Decomposed body#1) Decomposed body#25 4_M_DIEMAN,5,5
+2@gl_k,114,210,3 duplicate(Decomposed body#1) Decomposed body#26 4_M_DIEMAN,5,5
+2@gl_k,137,182,6 duplicate(Decomposed body#1) Decomposed body#27 4_M_DIEMAN,5,5
+2@gl_k,138,246,0 duplicate(Decomposed body#1) Decomposed body#28 4_M_DIEMAN,5,5
+2@gl_k,132,260,7 duplicate(Decomposed body#1) Decomposed body#29 4_M_DIEMAN,5,5
+2@gl_k,128,251,1 duplicate(Decomposed body#1) Decomposed body#30 4_M_DIEMAN,5,5
+2@gl_k,179,260,3 duplicate(Decomposed body#1) Decomposed body#31 4_M_DIEMAN,5,5
+2@gl_k,170,261,4 duplicate(Decomposed body#1) Decomposed body#32 4_M_DIEMAN,5,5
+2@gl_k,177,219,2 duplicate(Decomposed body#1) Decomposed body#33 4_M_DIEMAN,5,5
+2@gl_k,190,214,5 duplicate(Decomposed body#1) Decomposed body#34 4_M_DIEMAN,5,5
+2@gl_k,201,214,4 duplicate(Decomposed body#1) Decomposed body#35 4_M_DIEMAN,5,5
-2@gl_k,158,255,3 script Gerhard#ghinstance1 651,{
- end;
-OnInstanceInit:
-OnDisable:
- hideonnpc instance_npcname("Gerhard#ghinstance1");
- end;
-OnEnable:
- hideoffnpc instance_npcname("Gerhard#ghinstance1");
- end;
-OnEffect1:
- specialeffect EF_BARRIER;
- end;
-OnEffect2:
- specialeffect EF_CHAINCOMBO;
- end;
-OnEffect3:
- specialeffect EF_MAPPILLAR2;
- end;
-OnEffect4:
- specialeffect EF_MAPPILLAR;
- end;
-OnEffect5:
- specialeffect EF_LORD;
- end;
+// Amdarais Spawn
+2@gl_k,153,250,8 script Heinrich#23 4_M_HEINRICH,{
+ cutin "gl_heinrich1",2;
+ mes "[Heinrich]";
+ mes "What are you putting on Himelmez!";
+ close3;
}
-2@gl_k,0,0,0 script #controlGH5 -1,{
-OnInstanceInit:
-OnDisable:
- disablenpc instance_npcname("#controlGH5");
+2@gl_k,162,250,1 script Varmundt#23 4_M_BARMUND,{
+ mes "[Varmundt]";
+ mes "Can't take off this bridle...";
+ cutin "gl_barmund2",2;
+ close3;
+}
+
+2@gl_k,158,255,1 script Gerhalt#23 4_LEVITATEMAN,{
+ mes "[Gerhalt]";
+ mes "Uuuuu... Khhhah! Just run away with the commander.";
+ close;
+}
+
+2@gl_k,158,252,1 script Himelmez#22 4_F_HIMEL,3,3,{
+ cutin "gl_himel2",2;
+ mes "[Himelmez]";
+ mes "That is amazing ~ you made it all the way here. May I say thank you?";
+ close3;
+
+OnTouch:
end;
-OnEnable:
- enablenpc instance_npcname("#controlGH5");
+OnTouch_:
+ disablenpc instance_npcname("Himelmez#22");
+ enablenpc instance_npcname("Himelmez#23");
initnpctimer;
+ 'npc_himelmez$ = instance_npcname("Himelmez#23");
+ 'npc_gerhalt$ = instance_npcname("Gerhalt#23");
+ 'npc_heinrich$ = instance_npcname("Heinrich#23");
+ 'npc_varmundt$ = instance_npcname("Varmundt#23");
end;
OnTimer3000:
- npctalk "Himmelmez : Great~ I thought you wouldn't come near the end...", instance_npcname("Himmelmez#ghinstance4");
+ npctalk "Himelmez: Amazing~ I thought that you were not even close to getting here...", 'npc_himelmez$;
end;
OnTimer6000:
- npctalk "Gerhard : Damn it! Run away! I can't withstand anymore!", instance_npcname("Gerhard#ghinstance1");
+ npctalk "Gerhalt: Kkkkah! Run away! I can't endure anymore!", 'npc_gerhalt$;
end;
OnTimer9000:
- npctalk "Heinrich : Gerhard!", instance_npcname("Heinrich#ghinstance6");
- end;
-OnTimer12000:
- npctalk "Gerhard : Commandant... Come on, you need to run away from here... Ugh.", instance_npcname("Gerhard#ghinstance1");
+ npctalk "Heinrich: Gerhalt!", 'npc_heinrich$;
end;
OnTimer15000:
- npctalk "Heinrich : What are you doing to my men, Himmelmez?!", instance_npcname("Heinrich#ghinstance6");
+ npctalk "Heinrich: What are you doing to my soldier Himelmez!", 'npc_heinrich$;
end;
OnTimer18000:
- npctalk "Himmelmez : Huhu, I have already found a piece of Ymir's Heart, Heinrich.", instance_npcname("Himmelmez#ghinstance4");
+ npctalk "Himelmez: Hoo hoo, I already found a piece of Ymir's heart, Heinrich.", 'npc_himelmez$;
end;
OnTimer21000:
- npctalk "Himmelmez : It would've been faster if there were no distractions.", instance_npcname("Himmelmez#ghinstance4");
+ npctalk "Himelmez: If he did not bother me it would have been faster.", 'npc_himelmez$;
end;
OnTimer24000:
- npctalk "Gerhard : Even if you defile my body, I won't let you take my soul, Himmelmez!", instance_npcname("Gerhard#ghinstance1");
+ npctalk "Gerhalt: Commandant... Come on, you need to run away from here... Ugh.", 'npc_gerhalt$;
end;
OnTimer27000:
- npctalk "Himmelmez : What do you think? Making it look like an accidental disease infected the king and the people around...", instance_npcname("Himmelmez#ghinstance4");
+ npctalk "Himelmez: Really? What makes you think so?", 'npc_himelmez$;
end;
OnTimer30000:
- npctalk "Heinrich : Himmelmez! You don't need to make any more sacrifices!", instance_npcname("Heinrich#ghinstance6");
+ npctalk "Heinrich: Himelmez! You already made what you wanted so there is no more need for a sacrifice!", 'npc_heinrich$;
end;
OnTimer33000:
- npctalk "Heinrich : Let him go! I don't want one more sacrifice!", instance_npcname("Heinrich#ghinstance6");
+ npctalk "Heinrich: Let him go! I don't need to see anyone else suffer!", 'npc_heinrich$;
end;
OnTimer36000:
- npctalk "Himmelmez : You want that?", instance_npcname("Himmelmez#ghinstance4");
+ npctalk "Himelmez: Let him go? I think... No...", 'npc_himelmez$;
end;
OnTimer39000:
- npctalk "Himmelmez : This one is your final blow, Heinrich.", instance_npcname("Himmelmez#ghinstance4");
+ npctalk "Himelmez: Besides, this is your last surviving soldier, Heinrich.", 'npc_himelmez$;
end;
OnTimer42000:
- npctalk "Himmelmez : It is said that stopping me requires a skillfull person.", instance_npcname("Himmelmez#ghinstance4");
+ npctalk "Himelmez: He made life difficult for me.", 'npc_himelmez$;
end;
OnTimer45000:
- npctalk "Himmelmez : Seems like a perfect scenario to make my new monster, Amdarias.", instance_npcname("Himmelmez#ghinstance4");
+ npctalk "Himelmez: He is perfectly fit for my new creation Amdarais.", 'npc_himelmez$;
end;
OnTimer48000:
- npctalk "Heinrich : I will not forgive you.", instance_npcname("Heinrich#ghinstance6");
+ npctalk "Heinrich: I'll never forgive you.", 'npc_heinrich$;
end;
OnTimer51000:
- npctalk "Himmelmez : Booh~ I'm scared.", instance_npcname("Himmelmez#ghinstance4");
+ npctalk "Himelmez: Uh uh~ I'm so scared.", 'npc_himelmez$;
end;
OnTimer54000:
- npctalk "Himmelmez : Anyway, it was nice talking to you. Maybe we'll have the chance to meet again in the next story.", instance_npcname("Himmelmez#ghinstance4");
+ npctalk "Himelmez: Anyway, we will have a chance to see because we need to talk more.", 'npc_himelmez$;
end;
OnTimer57000:
- npctalk "Himmelmez : Well, make sure you will come back again.", instance_npcname("Himmelmez#ghinstance4");
+ npctalk "Himelmez: So long boys.", 'npc_himelmez$;
end;
OnTimer60000:
- donpcevent instance_npcname("Gerhard#ghinstance1")+"::OnEffect1";
+ specialeffect EF_BARRIER, AREA, 'npc_gerhalt$;
end;
OnTimer63000:
- donpcevent instance_npcname("Himmelmez#ghinstance4")+"::OnDisable";
+ disablenpc 'npc_himelmez$;
end;
OnTimer65000:
- donpcevent instance_npcname("Gerhard#ghinstance1")+"::OnEffect3";
+ npctalk "Gerhalt: You can make my body but you can't take my soul, Himelmez!", 'npc_gerhalt$;
end;
OnTimer66000:
- donpcevent instance_npcname("Gerhard#ghinstance1")+"::OnEffect2";
+ specialeffect EF_CHAINCOMBO, AREA, 'npc_gerhalt$;
end;
OnTimer67000:
- npctalk "Heinrich : Just leave us alone, Himmelmez!!", instance_npcname("Heinrich#ghinstance6");
- donpcevent instance_npcname("Gerhard#ghinstance1")+"::OnEffect4";
+ npctalk "Heinrich: I'll never let you get away Himelmez!!", 'npc_heinrich$;
+ specialeffect EF_MAPPILLAR, AREA, 'npc_gerhalt$;
end;
OnTimer70000:
- donpcevent instance_npcname("Gerhard#ghinstance1")+"::OnEffect3";
- donpcevent instance_npcname("Gerhard#ghinstance1")+"::OnEffect4";
- donpcevent instance_npcname("Heinrich#ghinstance6")+"::OnDisable";
- npctalk "Varmunt : What? This cannot be. We must prevent Amdarias's attacks!", instance_npcname("Varmunt#ghinstance5");
+ specialeffect EF_MAPPILLAR2, AREA, 'npc_gerhalt$;
+ specialeffect EF_MAPPILLAR, AREA, 'npc_gerhalt$;
+ disablenpc 'npc_heinrich$;
+ npctalk "Varmundt: We have no choice. We have to fight against Amdarais!", 'npc_varmundt$;
end;
OnTimer73000:
- mapannounce instance_mapname("2@gl_k"), "Leads toward Gerhard's body.",bc_map,"0xFFFFFF";
+ mapannounce 'map_name$[1], "Gerhalt's body is changing.", bc_map,0xFFFFFF;
end;
OnTimer76000:
- donpcevent instance_npcname("Gerhard#ghinstance1")+"::OnEffect5";
+ specialeffect EF_LORD, AREA, 'npc_gerhalt$;
+ disablenpc 'npc_varmundt$;
+ mapannounce 'map_name$[1], "Varmundt: Let me help this battle with my illusion. Just follow the illusion's orders.", bc_map,0xFFFF00;
end;
OnTimer80000:
- donpcevent instance_npcname("#ghmemorialmob10")+"::OnEnable";
+ disablenpc 'npc_gerhalt$;
+ donpcevent instance_npcname("#ghmemorialmob07") + "::OnStart";
+ stopnpctimer;
+ 'npc_himelmez$ = 'npc_gerhalt$ = 'npc_heinrich$ = 'npc_varmundt$ = "";
+ end;
+}
+
+2@gl_k,158,252,4 script Himelmez#23 4_F_HIMEL,{
+ cutin "gl_himel2",2;
+ mes "[Himelmez]";
+ mes "That is amazing ~ you made it all the way here. May I say thank you?";
+ close3;
+}
+
+2@gl_k,1,1,0 script #ghmemorialmob07 HIDDEN_WARP_NPC,{
+ end;
+OnStart:
+ enablenpc instance_npcname("#ghmemorialmob07");
+ monster 'map_name$[1],158,255,"Amdarais",2476,1,instance_npcname("#ghmemorialmob07") + "::OnMyMobDead";// MG_AMDARAIS
+ 'boss_id = $@mobid[0];
+ unittalk 'boss_id, "Run away... run away from me...";
+ initnpctimer;
+ end;
+OnTimer5000:
+ unittalk 'boss_id, "I don't want... I don't want to kill anyone. Uhuuuuuh";
+ end;
+OnTimer10000:
+ unittalk 'boss_id, "Please kill me! Please!";
+ end;
+OnTimer16000:
+ unittalk 'boss_id, "Eeeeee...eee...die... die...";
+ end;
+OnTimer22000:
+ unittalk 'boss_id, "Demolition... Death!...";
+ end;
+OnTimer55000:
+ donpcevent instance_npcname("#ghmemorialmob08") + "::OnStart";// Varmundt buffs and additionnal monsters
+ stopnpctimer;
+ end;
+
+OnMyMobDead:
+ if (mobcount('map_name$[1], instance_npcname("#ghmemorialmob07") + "::OnMyMobDead") < 1) {
+ stopnpctimer;
+ enablenpc instance_npcname("Hugin#21");
+ enablenpc instance_npcname("#Secret Room Exit");
+
+ stopnpctimer;
+ disablenpc instance_npcname("#ghmemorialmob07");
+ // note: monsters from #ghmemorialmob08 still alive on Amdarais's dead
+ }
+ end;
+}
+
+// Varmundt Buffs
+2@gl_k,1,1,0 script #ghmemorialmob08 HIDDEN_WARP_NPC,{
+ end;
+OnStart:
+ enablenpc instance_npcname("#ghmemorialmob08");
+ initnpctimer;
+ end;
+OnTimer5000:
+ if (unitexists('boss_id) == 0) {
+ disablenpc instance_npcname("#ghmemorialmob08");
+ stopnpctimer;
+ end;
+ }
+ getunitdata 'boss_id, .@data;
+ .@percent_hp = (.@data[UMOB_HP] * 100) / .@data[UMOB_MAXHP];
+ mapannounce 'map_name$[1], "Amdarais HP " + .@percent_hp + "% reach!", bc_map,0x70DBDB;
+
+ // event type every 10%
+ switch( .@percent_hp / 10 ) {
+ case 10:
+ break;
+ case 9:
+ donpcevent instance_npcname("Varmundt's Ghost#Buff2") + "::OnEvent";
+ break;
+ case 8:
+ donpcevent instance_npcname("Varmundt's Ghost#Buff3") + "::OnEvent";
+ areamonster 'map_name$[1],140,220,175,255,"Suffered Khalitzburg",2471,6, instance_npcname("#ghmemorialmob08") + "::OnMobDead";
+ break;
+ case 7:
+ donpcevent instance_npcname("Varmundt's Ghost#Buff3") + "::OnEvent";
+ areamonster 'map_name$[1],140,220,175,255,"Abysmal Knight",2470,6, instance_npcname("#ghmemorialmob08") + "::OnMobDead";
+ break;
+ case 6:
+ donpcevent instance_npcname("Varmundt's Ghost#Buff3") + "::OnEvent";
+ areamonster 'map_name$[1],140,220,175,255,"Bloody Knight",2472,6, instance_npcname("#ghmemorialmob08") + "::OnMobDead";
+ break;
+ case 5:
+ donpcevent instance_npcname("Varmundt's Ghost#Buff2") + "::OnEvent";
+ break;
+ case 4:
+ donpcevent instance_npcname("Varmundt's Ghost#Buff3") + "::OnEvent";
+ areamonster 'map_name$[1],140,220,175,255,"Wandering Archer",2469,6, instance_npcname("#ghmemorialmob08") + "::OnMobDead";
+ break;
+ case 3:
+ donpcevent instance_npcname("Varmundt's Ghost#Buff1") + "::OnEvent";
+ donpcevent instance_npcname("Varmundt's Ghost#Buff3") + "::OnEvent";
+ areamonster 'map_name$[1],140,220,175,255,"Bloody Knight",2472,6, instance_npcname("#ghmemorialmob08") + "::OnMobDead";
+ break;
+ case 2:
+ donpcevent instance_npcname("Varmundt's Ghost#Buff1") + "::OnEvent";
+ donpcevent instance_npcname("Varmundt's Ghost#Buff3") + "::OnEvent";
+ areamonster 'map_name$[1],140,220,175,255,"Abysmal Knight",2470,6, instance_npcname("#ghmemorialmob08") + "::OnMobDead";
+ break;
+ case 1:
+ case 0:
+ donpcevent instance_npcname("Varmundt's Ghost#Buff1") + "::OnEvent";
+ donpcevent instance_npcname("Varmundt's Ghost#Buff4") + "::OnEvent";
+ areamonster 'map_name$[1],140,220,175,255,"Wandering Archer",2469,6, instance_npcname("#ghmemorialmob08") + "::OnMobDead";
+ break;
+ }
+ end;
+OnTimer30000:
+ killmonster 'map_name$[1], instance_npcname("#ghmemorialmob08") + "::OnMobDead";
+ initnpctimer;
+ end;
+OnMobDead:
+ end;
+}
+
+2@gl_k,150,247,5 script Varmundt's Ghost#Buff1 4_M_BARMUND,2,2,{
+ end;
+OnTouch:
+ specialeffect2 EF_ENHANCE;
+ // buff
+ // .@num = atoi( replacestr(strnpcinfo(2), "Buff", "") );
+ // if (.@num == 1)
+ // else if (.@num == 2)
+ // else if (.@num == 3)
+ // else
+ end;
+OnEvent:
+ initnpctimer;
+ enablenpc instance_npcname( strnpcinfo(0) );
+ .@num = atoi( replacestr(strnpcinfo(2), "Buff", "") );
+ if (.@num == 1)
+ npctalk "Varmundt's Ghost: Amdarais may use a strong magic shield! Stay close to me and I'll protect you!";
+ else if (.@num == 2)
+ npctalk "Varmundt's Ghost: Now's a chance to attack! Come closer to me and strike!";
+ else if (.@num == 3)
+ npctalk "Varmundt's Ghost: If you don't want to be attacked by Amdarais' zombie, come to me and get more power!";
+ else
+ npctalk "Varmundt's Ghost: If you don't want to be attacked by Amdarais's power, come to me and get more power! ";
+ end;
+OnTimer10000:
stopnpctimer;
- donpcevent instance_npcname("#controlGH5")+"::OnDisable";
+ disablenpc instance_npcname( strnpcinfo(0) );
end;
}
+2@gl_k,165,247,3 duplicate(Varmundt's Ghost#Buff1) Varmundt's Ghost#Buff2 4_M_BARMUND,2,2
+2@gl_k,150,232,8 duplicate(Varmundt's Ghost#Buff1) Varmundt's Ghost#Buff3 4_M_BARMUND,2,2
+2@gl_k,165,232,2 duplicate(Varmundt's Ghost#Buff1) Varmundt's Ghost#Buff4 4_M_BARMUND,2,2
-2@gl_k,158,241,1 script Hugin#ghinstance1 755,{
- if (checkquest(12319,HUNTING) == 2) {
+
+2@gl_k,158,241,1 script Hugin#21 4_M_SAGE_C,{
+ if (checkquest(12319,HUNTING) == 2) {// note: complete hunting 'Corrupted Soul Hunt' prerequis
mes "[Hugin]";
- mes "Well, you are pretty ridiculous. Beginners shouldn't get the loot Amdarias drops.";
+ mes "Hm, you are very well. First of all, let me give you some loot from Amdarais.";
erasequest 12319;
- setquest 12321;
- setquest 12322;
- erasequest 12321;
- if (gh_instance) {
- getitem 6607,1; //Temporal_Crystal
- getitem 6608,1; //Coagulated_Spell
- } else {
- getitem 6607,5; //Temporal_Crystal
- getitem 6608,5; //Coagulated_Spell
- gh_instance = 1;
+ setquest 12322;// Space Distortion
+ if (isbegin_quest(12321) == 0) {
+ setquest 12321;// Time Conqueror
+ completequest 12321;
+ getitem 6607,5;// Temporal_Crystal
+ getitem 6608,5;// Coagulated_Spell
+ getexp 350000,350000;
+ }
+ else {
+ getitem 6607,1;// Temporal_Crystal
+ getitem 6608,1;// Coagulated_Spell
}
next;
mes "[Hugin]";
- mes "Varmunt, I have arbitrarily stopped time. And soon, the time gap will be gone.";
+ mes "Varmundt's time is stopped by me.";
+ mes "And your time will be distorted soon.";
specialeffect2 EF_BLIND;
soundeffect "_blind.wav",0;
next;
mes "[Hugin]";
- mes "Poor time travelers.";
- mes "They will endlessly retry to prevent the tragedy that affected this city.";
+ mes "Maybe this poor time traveler will try to stop Glast Heim's tragedy from happening.";
next;
mes "[Hugin]";
- mes "But the beggining of these time travels won't redempt your actions.";
- mes "This will continue forever...";
+ mes "However, we will never overlook his behavior now and forever...";
next;
mes "[Hugin]";
- mes "Now, I may erase your memory again. Perhaps you will have a different fate next time.";
+ mes "Now let me remove your memory. If you see me again it will be someone new.";
specialeffect2 EF_FREEZE;
close2;
- getmapxy(.@map$,.@x,.@y,UNITTYPE_PC);
- warp .@map$,.@x,.@y;
+ warp 'map_name$[1],158,244;
end;
- } else {
- mes "[Hugin]";
- mes "The gap of time is almost distorted.";
- mes "Done. There you go. Come!";
- mes "I have to get out!";
- next;
- select("Bah... Soon after you...");
+ }
+ mes "[Hugin]";
+ mes "Oops. I almost distorted the time gap. Come over here. We need to go out!";
+ next;
+ select("You were just with me...");
+ mes "[Hugin]";
+ mes "What did you say just before?";
+ mes "Anyway, that is not important. The gap of time will be closed so we need to get out of here.";
+ next;
+ if (select("Let me look around more:Please let me out") == 1) {
mes "[Hugin]";
- mes "Soon after me? Anyways...";
- mes "Doesn't matter, soon the gap of time will be closed, I have to get out of here.";
- next;
- switch(select("Since I'm here, let's explore more.:Please, send me out.")) {
- case 1:
- mes "[Hugin]";
- mes "..................";
- close;
- case 2:
- close2;
- warp "glast_01",204,270;
- end;
- }
+ mes "Really? This place will be break down soon. Please look around quickly.";
+ close;
}
-OnInstanceInit:
-OnDisable:
- disablenpc instance_npcname("Hugin#ghinstance1");
+ close2;
+ warp "glast_01",204,270;
end;
-OnEnable:
- enablenpc instance_npcname("Hugin#ghinstance1");
+}
+
+// Treasure Room
+//============================================================
+1@gl_k,165,136,3 script Strange crack#2 CLEAR_NPC,{
+ if (isbegin_quest(12322) == 0) {// Space Distortion
+ mes "The crack looks suspicious but nothing more to check.";
+ close;
+ }
+ specialeffect EF_SPELLBREAKER;
+
+ .@random = rand(1,4);
+ switch( atoi(strnpcinfo(2)) ) {
+ case 2:
+ for ( .@i = 1; .@i <= .@random; ++.@i )
+ makeitem 719,1,"this",165,138;
+ makeitem 6608,1,"this",165,138;
+ break;
+ case 3:
+ for ( .@i = 1; .@i <= .@random; ++.@i )
+ makeitem 720,1,"this",159,138;
+ if (rand(1,4) == 4)
+ makeitem2 15066,1,"this",159,138,0,0,0,0,0,0,0;
+ makeitem 6608,1,"this",159,138;
+ makeitem 7229,1,"this",159,138;
+ break;
+ case 4:
+ for ( .@i = 1; .@i <= .@random; ++.@i )
+ makeitem 721,1,"this",153,138;
+ if (rand(1,4) == 4)
+ makeitem2 13086,1,"this",153,138,0,0,0,0,0,0,0;
+ makeitem 6608,1,"this",153,138;
+ makeitem 7230,1,"this",153,138;
+ break;
+ case 5:
+ for ( .@i = 1; .@i <= .@random; ++.@i )
+ makeitem 722,1,"this",147,138;
+ if (rand(1,4) == 4)
+ makeitem2 2949,1,"this",147,138,0,0,0,0,0,0,0;
+ makeitem 6612,1,"this",147,138;
+ makeitem 6613,1,"this",147,138;
+ makeitem 6608,1,"this",147,138;
+ break;
+ case 6:
+ for ( .@i = 1; .@i <= .@random; ++.@i )
+ makeitem 725,1,"this",141,138;
+ makeitem 7228,1,"this",141,138;
+ if (rand(1,4) == 4)
+ makeitem2 13440,1,"this",141,138,0,0,0,0,0,0,0;
+ makeitem 6608,1,"this",141,138;
+ break;
+ case 7:
+ for ( .@i = 1; .@i <= .@random; ++.@i )
+ makeitem 726,1,"this",135,138;
+ if (rand(1,4) == 4)
+ makeitem2 2022,1,"this",135,138,0,0,0,0,0,0,0;
+ makeitem 6608,1,"this",135,138;
+ break;
+ case 8:
+ for ( .@i = 1; .@i <= .@random; ++.@i )
+ makeitem 727,1,"this",129,138;
+ if (rand(1,4) == 4)
+ makeitem2 21007,1,"this",129,138,0,0,0,0,0,0,0;
+ makeitem 6608,1,"this",129,138;
+ break;
+ }
+ disablenpc instance_npcname( strnpcinfo(0) );
+ end;
+}
+1@gl_k,159,136,3 duplicate(Strange crack#2) Strange crack#3 CLEAR_NPC
+1@gl_k,153,136,3 duplicate(Strange crack#2) Strange crack#4 CLEAR_NPC
+1@gl_k,147,136,3 duplicate(Strange crack#2) Strange crack#5 CLEAR_NPC
+1@gl_k,141,136,3 duplicate(Strange crack#2) Strange crack#6 CLEAR_NPC
+1@gl_k,135,136,3 duplicate(Strange crack#2) Strange crack#7 CLEAR_NPC
+1@gl_k,129,136,3 duplicate(Strange crack#2) Strange crack#8 CLEAR_NPC
+
+1@gl_k,269,267,3 script Strange crack#1 CLEAR_NPC,{
+ if (isbegin_quest(12322) == 0) {// Space Distortion
+ mes "The crack looks suspicious but nothing more to check.";
+ close;
+ }
+ warp 'map_name$[0],149,198;
+ end;
+
+OnInstanceInit:
+ 'map_name$[0] = instance_mapname("1@gl_k");
+ 'map_name$[1] = instance_mapname("2@gl_k");
+
+ // Entrance
+ disablenpc instance_npcname("Himelmez#1");
+ disablenpc instance_npcname("Varmundt#1");
+ disablenpc instance_npcname("Heinrich#1");
+ disablenpc instance_npcname("Heinrich#2");
+ disablenpc instance_npcname("Heinrich#3");
+
+ // Rescue 1
+ disablenpc instance_npcname("#ghmemorialmob01");
+ disablenpc instance_npcname("Altar boy Domun#1");
+
+ // Rescue 2
+ disablenpc instance_npcname("#ghmemorialmob02");
+ disablenpc instance_npcname("Holgren the Destroyer#1");
+ for ( .@i = 1; .@i <= 26; .@i++ )
+ disablenpc instance_npcname("A dead man#" + .@i);
+
+ // Sector 3
+ disablenpc instance_npcname("#ghmemorialmob03");
+
+ // Root of Corruption
+ disablenpc instance_npcname("Himelmez#2");
+ disablenpc instance_npcname("Varmundt#2");
+ disablenpc instance_npcname("Heinrich#4");
+ disablenpc instance_npcname("#Mimelon");
+ disablenpc instance_npcname("#ghmemorialmob04");
+
+ // Entrance 2nd map
+ disablenpc instance_npcname("Varmundt#21");
+ disablenpc instance_npcname("Heinrich#21");
+ disablenpc instance_npcname("#Servanton");
+ hideonnpc instance_npcname("#Servanton_effect");
+
+ // Commanders
+ disablenpc instance_npcname("#ghmemorialmob05");
+ disablenpc instance_npcname("#ghmemorialmob06");
+ for ( .@i = 1; .@i <= 7; .@i++ ) {
+ disablenpc instance_npcname("#ogh_2-" + .@i);
+ disablenpc instance_npcname("#ogh_3-" + .@i);
+ }
+
+ // Amdarais Room Entrance
+ disablenpc instance_npcname("#Geron");
+ for ( .@i = 1; .@i <= 35; .@i++ )
+ disablenpc instance_npcname("Decomposed body#" + .@i);
+
+ // Amdarais Spawn
+ disablenpc instance_npcname("Gerhalt#23");
+ disablenpc instance_npcname("Himelmez#22");
+ disablenpc instance_npcname("Himelmez#23");
+ disablenpc instance_npcname("Varmundt#23");
+ disablenpc instance_npcname("Heinrich#23");
+ disablenpc instance_npcname("#ghmemorialmob07");
+
+ // Varmundt Buffs
+ disablenpc instance_npcname("#ghmemorialmob08");
+ disablenpc instance_npcname("Varmundt's Ghost#Buff1");
+ disablenpc instance_npcname("Varmundt's Ghost#Buff2");
+ disablenpc instance_npcname("Varmundt's Ghost#Buff3");
+ disablenpc instance_npcname("Varmundt's Ghost#Buff4");
+ disablenpc instance_npcname("Hugin#21");
+
+ // Warps
+ disablenpc instance_npcname("#2Control");
+ disablenpc instance_npcname("#2Control2");
+ disablenpc instance_npcname("#3Control");
+ disablenpc instance_npcname("#3Control2");
+ disablenpc instance_npcname("#4Control");
+ disablenpc instance_npcname("#4Control2");
+ disablenpc instance_npcname("#2F Entrance");
+ disablenpc instance_npcname("#1 Control");
+ disablenpc instance_npcname("#22 Control");
+ disablenpc instance_npcname("#22 Control2");
+ disablenpc instance_npcname("#23 Control");
+ disablenpc instance_npcname("#23 Control2");
+ disablenpc instance_npcname("#24 Control");
+ disablenpc instance_npcname("#24 Control2");
+ disablenpc instance_npcname("#Secret Room Exit");
end;
}
diff --git a/npc/re/instances/SaraMemory.txt b/npc/re/instances/SaraMemory.txt
index aaf6b34a9a6..40f1bfa513f 100644
--- a/npc/re/instances/SaraMemory.txt
+++ b/npc/re/instances/SaraMemory.txt
@@ -1414,8 +1414,8 @@ OnEnable:
unittalk $@mobid[0],"For Payon !!";
monster .@map$,161,217,"Payon Soldier",2544,1,instance_npcname("#BossSara01")+"::OnMyMobDead";
unittalk $@mobid[0],"For Payon !!";
- areamobuseskill .@map$,155,225,10,2544,"NPC_EMOTION",1,0,0,e_go,0;
- areamobuseskill .@map$,159,236,1,2543,"NPC_EMOTION",1,0,0,e_swt,0;
+ areamobuseskill .@map$,155,225,10,2544,"NPC_EMOTION",1,0,0,ET_GO,0;
+ areamobuseskill .@map$,159,236,1,2543,"NPC_EMOTION",1,0,0,ET_SWEAT,0;
set 'Sara_Mobs,8;
end;
diff --git a/npc/re/instances/SarahAndFenrir.txt b/npc/re/instances/SarahAndFenrir.txt
new file mode 100644
index 00000000000..eddce0efe3f
--- /dev/null
+++ b/npc/re/instances/SarahAndFenrir.txt
@@ -0,0 +1,2322 @@
+//===== rAthena Script =======================================
+//= Sarah and Fenrir
+//===== Description: =========================================
+//= [Walkthrough Conversion]
+//= Sarah and Fenrir Instance
+//===== Changelogs: ==========================================
+//= 1.0 First version. [Capuche]
+//============================================================
+
+dali02,97,142,3 script Professor Bernhard#a1 4_LGTSCIENCE,{
+ if (BaseLevel < 145) {
+ mes "- You may proceed after reaching level 145 or over -";
+ close;
+ }
+ switch( checkquest(9336,PLAYTIME) ) {
+ case -1:
+ switch( isbegin_quest(9335) ) {
+ case 0:// First time doing instance
+ mes "[Professor Bernhard]";
+ mes "I would say I am Professor Bernhard, the best weapons researcher in Schwaltzvalt.";
+ next;
+ mes "[Professor Bernhard]";
+ mes "After endless research I have created various weapons, but I felt something was missing so I found the ancient texts.";
+ mes "I found out about the Dimensional Device during my research.";
+ next;
+ mes "[Professor Bernhard]";
+ mes "I also realized that relics from the glorious past were also needed to create more powerful and superior weapons.";
+ mes "That is why..I need you..";
+ next;
+ mes "[Professor Bernhard]";
+ if (getpartyleader(getcharid(1),2) != getcharid(0)) {
+ mes "A longing for accomplishing a powerful weapon as a genuine professor!";
+ mes "In order to accomplish that, we need shards of Gigantes that once appeared in the past battle of Fenrir and Sarah.";
+ next;
+ mes "[Professor Bernhard]";
+ mes "I cannot leave my post.";
+ mes "I need a warrior who can bring me the shards instead..";
+ mes "You seem capable.";
+ next;
+ mes "[Professor Bernhard]";
+ mes "I will continue discussing this further with your party leader rather than with you.";
+ close;
+ }
+ mes "I need a warrior who can bring me the shard of Gigantes instead..";
+ mes "You seem capable.";
+ next;
+ mes "[Professor Bernhard]";
+ mes "What do you think?";
+ mes "Would you go to the past and bring me back the shards of Gigantes?";
+ mes "I will make sure to compensate you sufficiently.";
+ next;
+ if (select( "No", "Yes" ) == 1) {
+ mes "[Professor Bernhard]";
+ mes "Visit me again if you change your mind.";
+ close;
+ }
+ mes "[Professor Bernhard]";
+ mes "I set the Dimensional Device to Glast Heim of the past, where Fenrir and Sarah once fought.";
+ mes "The operating time isn't long so hurry up and come back.";
+ instance_create("Fenrir and Sarah");
+ close;
+ case 1:
+ mes "[Professor Bernhard]";
+ mes "Did you successfully bring back the shards of Gigantes?";
+ mes "You probably faced a lot of danger so thank you for the effort.";
+ next;
+ mes "[Professor Bernhard]";
+ mes "I don't expect to receive the shards for nothing when you have risked your life for them!";
+ if (sarah_fenrir == 0) {
+ mes "I will give you a useful looking earring from the relics I have happened to have obtained during my previous research.";
+ next;
+ mes "- The left earring of Sarah -";
+ mes "Usable for Heal 1Lv";
+ mes "- The right earring of Sarah -";
+ mes "Usable for Teleport 1Lv";
+ next;
+ .@s = select( "The left earring of Sarah", "The right earring of Sarah" ) - 1;
+ }
+ mes "[Professor Bernhard]";
+ mes "If you hand the shards of Gigantes to my chief assistant, I will make sure the earrings will be correspondingly great through an enchantment.";
+ next;
+ mes "[Professor Bernhard]";
+ mes "The more shards of Gigantes are collected, the better.";
+ mes "However, there isn't a stable supply of energy needed to work the Dimensional Device.";
+ next;
+ mes "[Professor Bernhard]";
+ mes "Come back and find me after one week has passed for the supply of Dimensional Device energy.";
+ mes "I need you to find shards of Gigantes again.";
+ erasequest 9335;// Search for shards of Gigantes
+ setquest 9336;// Go back to Professor Bernhard
+ if (isbegin_quest(9337) > 0)
+ erasequest 9337;// Wrapping up the Adventure
+ if (sarah_fenrir == 0) {
+ sarah_fenrir = 1;
+ getitem (28310+.@s),1;
+ }
+ close;
+ case 2:
+ end;
+ }
+ case 0:
+ case 1:
+ mes "[Professor Bernhard]";
+ mes "We lack the shards of Gigantes in order to make powerful weapons.";
+ mes "Because a lot of energy is needed to open a dimension device, come back and find me when the energy has accumulated.";
+ close;
+ case 2:
+ mes "[Professor Bernhard]";
+ mes "I have been waiting.";
+ mes "How is everything going?";
+ mes "While you were gone I have succeeded in accumulating dimensional energy.";
+ mes "We can open the dimension device again.";
+ next;
+ mes "[Professor Bernhard]";
+ mes "A longing for accomplishing a powerful weapon as a genuine professor!";
+ mes "In order to accomplish that, we need shards of Gigantes that once appeared in the past battle of Fenrir and Sarah.";
+ next;
+ mes "[Professor Bernhard]";
+ mes "Because I cannot leave my post, ";
+ mes "I need a warrior who can bring me the shards instead.";
+ mes "I think you can assist me once again..";
+ next;
+ mes "[Professor Bernhard]";
+ mes "There, all the preparations are finished.";
+ mes "Can you go back in time again and bring me the shards of Gigantes?";
+ mes "I will make sure to compensate you sufficiently.";
+ if (getpartyleader(getcharid(1),2) == getcharid(0)) {
+ next;
+ if (select( "No", "Yes" ) == 1) {
+ mes "[Professor Bernhard]";
+ mes "I set the Dimensional Device to Glast Heim of the past, where Fenrir and Sarah once were.";
+ mes "It won't last long so hurry up and come back.";
+ close;
+ }
+ instance_create("Fenrir and Sarah");
+ }
+ close;
+ }
+}
+
+dali02,99,148,3 script Dimensional Device#XX1 PORTAL,{
+ if (BaseLevel < 145) {
+ mes "- You must be level 145 or over";
+ mes "It seems entry is possible. -";
+ close;
+ }
+ switch( checkquest(9336,PLAYTIME) ) {
+ case -1:
+ break;
+ case 0:
+ case 1:
+ mes "- The Dimensional Device has closed.";
+ mes "It seems entry is not possible. -";
+ close;
+ case 2:
+ break;
+ }
+ if (isbegin_quest(9335) > 0) {
+ mes "- The Dimensional Device has closed.";
+ mes "It seems entry is not possible. -";
+ close;
+ }
+ if (select( "Do not enter the device.", "Enter the time device" ) == 1) {
+ if (getcharid(1) > 0) {
+ mes "- It seems the Dimensional Device ";
+ mes "will contort space time -";
+ close;
+ }
+ mes "- There is a damp presence. -";
+ close;
+ }
+ .@md_name$ = "Fenrir and Sarah";
+ switch( instance_enter(.@md_name$) ) {
+ case IE_OTHER:
+ mes "An unknown error occurred.";
+ close;
+ case IE_NOINSTANCE:
+ mes "Memorial Dungeon " + .@md_name$ + " does not exist.";
+ mes "The party leader has not created the Memorial Dungeon.";
+ close;
+ case IE_NOMEMBER:
+ mes "Only party members can enter the Memorial Dungeon.";
+ close;
+ case IE_OK:
+ mapannounce "dali02", "Party member " + strcharinfo(0) + " of party's " + getpartyname( getcharid(1) ) + " enters Room " + .@md_name$ + "", bc_map,0xFF99,FW_NORMAL,12;
+ setquest 9335;// Search for shards of Gigantes
+ if (isbegin_quest(9336) > 0)
+ erasequest 9336;
+ // warp "1@glast",367,304;
+ end;
+ }
+}
+
+dali02,93,146,6 script Assistant Professor#a1 4_M_REPAIR,{
+ if (sarah_fenrir == 0)
+ end;
+ disable_items;
+ mes "[Chief Assistant]";
+ mes "I've heard about you from the professor.";
+ mes "The professor has told me to sufficiently compensate you for risking your life and bringing the shards of Gigantes.";
+ next;
+ switch( select( "Enchant earring.", "Purchase earring", "Exit conversation" ) ) {
+ case 1:
+ mes "[Chief Assistant]";
+ mes "Sarah's earrings we have discovered at the archaeological site must certainly have great potential.";
+ next;
+ switch( select( "Enchant Sarah's earrings", "Initialize enchantment on Sarah's earrings", "Exit conversation" ) ) {
+ case 1:
+ mes "[Chief Assistant]";
+ mes "2 enchantments are possible on one earring.";
+ mes "Which earring do you wish to enchant?";
+ next;
+ switch( select( "The left earring of Sarah", "The right earring of Sarah", "Quit" ) ) {
+ case 1:
+ .@sarah_item_id = 28310;
+ .@sarah_earring$ = "left";
+ break;
+ case 2:
+ .@sarah_item_id = 28311;
+ .@sarah_earring$ = "right";
+ break;
+ case 3:
+ mes "[Chief Assistant]";
+ mes "If you want an enchantment ";
+ mes "on Sarah's earrings, ";
+ mes "come and find me again.";
+ close;
+ }
+ mes "[Chief Assistant]";
+ mes "You must equip the item to make enchantment possible.";
+ mes "Which column do you wish to enchant?";
+ next;
+ if (select( "Left column", "Right column" ) == 1) {
+ .@part = EQI_ACC_L;
+ .@column$ = "left";
+ .@bonus_size = 4; // 4 possibilities
+ .@bonus_chance = 20; // 20% per possibility
+ }
+ else {
+ .@part = EQI_ACC_R;
+ .@column$ = "right";
+ .@bonus_size = 6; // 6 possibilities
+ .@bonus_chance = 10; // 10% per possibility
+ }
+ .@equip_id = getequipid(.@part);
+ if (.@equip_id != .@sarah_item_id) {
+ mes "[Chief Assistant]";
+ mes "If you wish to enchant, you must equip Sarah's " + .@sarah_earring$ + " earring.";
+ close;
+ }
+ setarray .@card[0], getequipcardid(.@part,3), getequipcardid(.@part,2);
+ if (.@card[1] > 0) {// 2 enchants
+ mes "[Chief Assistant]";
+ mes "A fully enchanted earring of Sarah cannot be enchanted any further.";
+ close;
+ }
+ if (.@card[0] < 1) {// none enchant
+ mes "[Chief Assistant]";
+ mes "Sarah's Earring is currently in a state without enchantment.";
+ .@slot = 0;
+ }
+ else {// 1 enchant
+ mes "[Chief Assistant]";
+ mes "Sarah's Earring is currently in a state of enchantment in slot 4.";
+ .@slot = 1;
+ }
+ next;
+ mes "[Chief Assistant]";
+ mes "Which ability do you want as an enchantment on slot " + (4-.@slot) + "?";
+ next;
+ switch( select( "CRI or Critical", "Expert archer or Bleed", "Conservation or MATK", "Delay Attack or Delay Skill" ) ) {
+ case 1:
+ setarray .@bonus[0],
+ 4863, // Fatal1
+ 4864, // Fatal2
+ 4939, // Critical2
+ 4940, // Critical3
+ 4941, // Critical4
+ 4865; // Fatal3
+ mes "[Chief Assistant]";
+ mes "Selected for CRI or Critical Enchantment slot " + (4-.@slot) + ".";
+ break;
+ case 2:
+ setarray .@bonus[0],
+ 4832, // Expert_Archer1
+ 4833, // Expert_Archer2
+ 4942, // Dodge1
+ 4943, // Dodge2
+ 4944, // Dodge3
+ 4834; // Expert_Archer3
+ mes "[Chief Assistant]";
+ mes "Selected for Expert Archer or Bleed Enchantment slot " + (4-.@slot) + ".";
+ break;
+ case 3:
+ setarray .@bonus[0],
+ 4945, // Thrift1
+ 4946, // Thrift2
+ 4897, // Matk3p
+ 4898, // Matk4p
+ 4947, // Thrift3
+ 4899; // Matk5p
+ mes "[Chief Assistant]";
+ mes "Selected for Conservation or MATK Enchantment slot " + (4-.@slot) + ".";
+ break;
+ case 4:
+ setarray .@bonus[0],
+ 4869, // Attack_Delay_1
+ 4872, // Attack_Delay_2
+ 4948, // Skill_Delay1
+ 4949, // Skill_Delay2
+ 4950, // Skill_Delay3
+ 4873; // Attack_Delay_3
+ mes "[Chief Assistant]";
+ mes "Selected for Delay Attack or Delay Skill Enchantment slot " + (4-.@slot) + ".";
+ break;
+ }
+ next;
+ mes "[Chief Assistant]";
+ mes "4 shards of Gigantes is required for one enchantment.";
+ next;
+ mes "[Chief Assistant]";
+ mes "Because enchantment is a high risk process, there is risk of Sarah's earring being destroyed.";
+ mes "Do you still want to do it?";
+ next;
+ if (select( "No", "Yes" ) == 1) {
+ mes "[Chief Assistant]";
+ mes "Please speak to me again after making a clear decision!";
+ close;
+ }
+ if (countitem(6803) < 4) {
+ mes "[Chief Assistant]";
+ mes "There are not enough shards of Gigantes.";
+ mes "4 shards of Gigantes is required to do one enchantment.";
+ close;
+ }
+ mes "[Chief Assistant]";
+ mes "Good. I will start the enchantment!";
+ mes "I wish you luck~!";
+ next;
+ mes "[Chief Assistant]";
+ mes "Aahhhh!!";
+ next;
+ progressbar "000000",5;
+ specialeffect2 EF_MAGICALATTHIT;
+ specialeffect2 EF_POTION2;
+ delitem 6803,4;// Shard of Gigantes
+ delequip .@part;
+ .@r = rand(100);
+ for ( .@i = 0; .@i < .@bonus_size && (.@bonus_chance * (.@i+1)) < .@r; .@i++ );
+ if (.@i == .@bonus_size) {
+ specialeffect2 EF_CRASHEARTH;
+ specialeffect2 EF_MAXPOWER;
+ mes "[Chief Assistant]";
+ mes "Sadly... it is..";
+ mes "destroyed...";
+ mes "Whew.. ";
+ mes "enchantment is not an easy task..";
+ close;
+ }
+ .@card[.@slot] = .@bonus[.@i];
+ specialeffect2 EF_ANGEL2;
+ getitem2 .@sarah_item_id,1,1,0,0,0,0,.@card[1],.@card[0];
+ mes "[Chief Assistant]";
+ mes "Enchantment completed!";
+ close;
+ case 2:
+ mes "[Chief Assistant]";
+ mes "Which earring do you wish to initialize?";
+ next;
+ switch( select( "The left earring of Sarah", "The right earring of Sarah", "Quit" ) ) {
+ case 1:
+ .@sarah_item_id = 28310;
+ .@sarah_earring$ = "left";
+ break;
+ case 2:
+ .@sarah_item_id = 28311;
+ .@sarah_earring$ = "right";
+ break;
+ case 3:
+ mes "[Chief Assistant]";
+ mes "If you want to initialize an enchantment on Sarah's earrings, come and find me again.";
+ close;
+ }
+ mes "[Chief Assistant]";
+ mes "On Sarah's earring. 1 shard of Gigantes is required to initialize the enchantment..";
+ next;
+ if (countitem(6803) < 1) {
+ mes "[Chief Assistant]";
+ mes "There are not enough shards of Gigantes.";
+ mes "You will need them in order for initialization to take place.";
+ close;
+ }
+ mes "[Chief Assistant]";
+ mes "You must equip the item to make initialization possible.";
+ mes "Which column's earring do you wish to initialize?";
+ next;
+ if (select( "Left column", "Right column" ) == 1) {
+ .@part = EQI_ACC_L;
+ .@column$ = "left";
+ }
+ else {
+ .@part = EQI_ACC_R;
+ .@column$ = "right";
+ }
+ .@equip_id = getequipid(.@part);
+ if (.@equip_id == -1) {
+ mes "[Chief Assistant]";
+ mes "To initialize an enchantment, the relevant column must be equipped with gear.";
+ close;
+ }
+ if (.@equip_id != .@sarah_item_id) {
+ mes "[Chief Assistant]";
+ mes "To initialize an enchantment, the relevant column must be equipped with Sarah's earring.";
+ close;
+ }
+ if (getequipcardid(.@part,3) < 1) {
+ mes "[Chief Assistant]";
+ mes "Sarah's earring without an enchantment cannot be initialized.";
+ close;
+ }
+ mes "[Chief Assistant]";
+ mes "You have selected Sarah's " + .@sarah_earring$ + " earring on the " + .@column$ + " column.";
+ mes "It is impossible to restore abilities that are gone after initialization.";
+ mes "Do you still want to proceed?";
+ next;
+ if (select( "No", "Yes" ) == 2) {
+ mes "[Chief Assistant]";
+ mes "Yes sir. Initialization will start.";
+ next;
+ progressbar "000000",5;
+ specialeffect2 EF_MAGICALATTHIT;
+ specialeffect2 EF_POTION2;
+ specialeffect2 EF_ANGEL2;
+ delitem 6803,1;// Shard of Gigantes
+ delequip .@part;
+ getitem .@sarah_item_id,1;
+ mes "[Chief Assistant]";
+ mes "Initialization completed.";
+ mes "Please find me if you need me.";
+ }
+ close;
+ case 3:
+ mes "[Chief Assistant]";
+ mes "If you want an enchantment on Sarah's earrings, come and find me again.";
+ close;
+ }
+ case 2:
+ mes "[Chief Assistant]";
+ mes "Related to Glast Heim, this is an unique and rare earring found during an excavation with the professor.";
+ next;
+ mes "[Chief Assistant]";
+ mes "I think this has been worn by Sarah in the past and seems to have a great ability to draw out potential strength.";
+ next;
+ mes "[Chief Assistant]";
+ mes "I will specially trade it for 1 shard since you are the warrior who brought shards of Gigantes for the professor's work.";
+ next;
+ mes "[Chief Assistant]";
+ mes "- The left earring of Sarah -";
+ mes "Usable for Heal 1Lv";
+ mes "- The right earring of Sarah -";
+ mes "Usable for Teleport 1Lv";
+ mes "-----------------------";
+ mes "Which one do you wish?";
+ next;
+ .@s = select( "The left earring of Sarah", "The right earring of Sarah", "Exit conversation" ) - 1;
+ if (.@s < 2) {
+ if (countitem(6803) < 1) {
+ mes "[Chief Assistant]";
+ mes "There are not enough shards of Gigantes.";
+ mes "You will need them for me to trade with you.";
+ close;
+ }
+ delitem 6803,1;// Shard of Gigantes
+ getitem (28310+.@s),1;
+ }
+ mes "[Chief Assistant]";
+ mes "Professor Bernhard is the professor I respect the most.";
+ mes "Do you have someone you respect?";
+ close;
+ case 3:
+ mes "[Chief Assistant]";
+ mes "I've heard about you from the professor.";
+ mes "The professor has told me to sufficiently compensate you for risking your life and bringing the shards of Gigantes.";
+ close;
+ }
+}
+
+1@glast,360,295,0 script #glast_event_1 HIDDEN_WARP_NPC,8,8,{
+ end;
+OnTouch:
+ disablenpc instance_npcname("#glast_event_1");
+ mes "";
+ specialeffect2 EF_HIT2;
+ unittalk getcharid(3), "" + strcharinfo(0) + " : Huh? Somebody there? Hello~ You must be a traveler.";
+ sleep2 3000;
+ cutin "fenrir_a.bmp",2;
+ npctalk "Fenrith Fenrir: This is strange.. I don't recall Glast Heim castle being filled with such a dark presence..", 'fenrir_1$;
+ sleep2 3000;
+ npctalk "Fenrith Fenrir: Greetings can come later! Careful! It seems somebody has summoned a monster!", 'fenrir_1$;
+ sleep2 3000;
+ cutin "",255;
+ specialeffect EF_LOCKON, AREA, 'fenrir_1$;
+ .@label$ = instance_npcname("#glast_event_1") + "::OnMobDead";
+ monster 'map_glast$,355,300, "Mutant Galion",3198,1, .@label$; // MM_M_GALION
+ monster 'map_glast$,358,300, "Mutant Galion",3198,1, .@label$;
+ monster 'map_glast$,361,300, "Mutant Galion",3198,1, .@label$;
+ monster 'map_glast$,355,289, "Mutant Galion",3198,1, .@label$;
+ monster 'map_glast$,358,289, "Mutant Galion",3198,1, .@label$;
+ monster 'map_glast$,364,294, "Mutant Galion",3198,1, .@label$;
+ monster 'map_glast$,364,297, "Mutant Galion",3198,1, .@label$;
+ monster 'map_glast$,364,291, "Mutant Galion",3198,1, .@label$;
+ monster 'map_glast$,353,290, "Mutant Galion",3198,1, .@label$;
+ unittalk getcharid(3), "" + strcharinfo(0) + " : What are these things?";
+ npctalk "Fenrith Fenrir: Buy me some time while I cast magic! I will handle this!", 'fenrir_1$;
+ donpcevent instance_npcname("#glast_event_1") + "::OnBar";
+ donpcevent instance_npcname("#glast_event_1") + "::OnEvent";
+ end;
+OnBar:
+ progressbar_npc "000000",10, 'fenrir_1$;
+ end;
+
+OnEvent:
+ // npctalk "Fenrith Fenrir: Buy me some time while I cast magic! I will handle this!", 'fenrir_1$;// double on official
+ sleep 3000;
+ npctalk "Fenrith Fenrir: Wrath of the true sky.", 'fenrir_1$;
+ sleep 3000;
+ npctalk "Fenrith Fenrir: Thunderbolt that may split the earth!", 'fenrir_1$;
+ sleep 3000;
+ npctalk "Fenrith Fenrir: Fall before me now!", 'fenrir_1$;
+ sleep 3000;
+ npctalk "Fenrith Fenrir: Aaah!! Thunder Storm!!!!!", 'fenrir_1$;
+ for ( .@i = 1; .@i < 8; .@i++ )
+ specialeffect EF_THUNDERSTORM, AREA, instance_npcname( "#effect_glast_event01_" + .@i );
+ killmonster 'map_glast$, instance_npcname("#glast_event_1") + "::OnMobDead";
+ sleep 4000;
+ npctalk "Fenrith Fenrir: Glast Heim, once the cathedral for the Asgard gods..", 'fenrir_1$;
+ sleep 3000;
+ npctalk "Fenrith Fenrir: Now it has completely become a habitat for monsters..", 'fenrir_1$;
+ sleep 3000;
+ npctalk "Fenrith Fenrir: Wait.. Come to think of it, something is strange..", 'fenrir_1$;
+ sleep 3000;
+ npctalk "Fenrith Fenrir: Galions are the monsters that habit this vicinity..", 'fenrir_1$;
+ sleep 3000;
+ enablenpc instance_npcname("#glast_event_3");
+ end;
+
+OnMobDead:
+ end;
+}
+
+1@glast,360,295,0 script #glast_event_3 HIDDEN_WARP_NPC,8,8,{
+ end;
+OnTouch:
+ disablenpc instance_npcname("#glast_event_3");
+ mes "";
+ cutin "fenrir_a.bmp",2;
+ npctalk "Fenrith Fenrir: By the way, I know it was sudden but thank you for helping.", 'fenrir_1$;
+ sleep2 2000;
+ npctalk "Fenrith Fenrir: Anyway, who are you?", 'fenrir_1$;
+ sleep2 2000;
+ unittalk getcharid(3), "" + strcharinfo(0) + " : Ah.. that is....";
+ sleep2 2000;
+ unittalk getcharid(3), "" + strcharinfo(0) + " : .. I am a traveler who wanders around the world!";
+ sleep2 2000;
+ npctalk "Fenrith Fenrir: Is that so..? I see.. I guess it does not matter.", 'fenrir_1$;
+ sleep2 2000;
+ npctalk "Fenrith Fenrir: This place seems quite dangerous now. It is not too late to turn back.", 'fenrir_1$;
+ sleep2 2000;
+ npctalk "Fenrith Fenrir: There is an object I need to find. I need to hurry before it is too late.", 'fenrir_1$;
+ sleep2 2000;
+ npctalk "Fenrith Fenrir: Perhaps you can help me...", 'fenrir_1$;
+ sleep2 2000;
+ npctalk "Fenrith Fenrir: No.. Then thank you! I hope we can meet again later!", 'fenrir_1$;
+ sleep2 3000;
+ cutin "",255;
+ specialeffect EF_LOCKON, AREA, 'fenrir_1$;
+ unittalk getcharid(3), "" + strcharinfo(0) + " : Did that.. person.. really happen to be.. the.. Fenrir..? No way.. probably not..";
+
+ disablenpc 'fenrir_1$;
+ for ( .@i = 1; .@i < 8; .@i++ )
+ disablenpc instance_npcname("#effect_glast_event01_" + .@i);
+ enablenpc instance_npcname("#glast_move_01");
+ enablenpc instance_npcname("#glast_event_5");
+ enablenpc 'fenrir_2$;
+ end;
+}
+
+1@glast,359,296,4 script #effect_glast_event01_1 CLEAR_NPC,{ end; }
+1@glast,353,294,4 duplicate(#effect_glast_event01_1) #effect_glast_event01_2 CLEAR_NPC
+1@glast,360,304,4 duplicate(#effect_glast_event01_1) #effect_glast_event01_3 CLEAR_NPC
+1@glast,366,295,4 duplicate(#effect_glast_event01_1) #effect_glast_event01_4 CLEAR_NPC
+1@glast,352,304,4 duplicate(#effect_glast_event01_1) #effect_glast_event01_5 CLEAR_NPC
+1@glast,356,284,4 duplicate(#effect_glast_event01_1) #effect_glast_event01_6 CLEAR_NPC
+1@glast,345,283,4 duplicate(#effect_glast_event01_1) #effect_glast_event01_7 CLEAR_NPC
+
+1@glast,359,294,4 duplicate(#effect_glast_event01_1) Fenrith Fenrir#glast_01 4_F_FENRIR
+
+// Warps
+// From entrance
+1@glast,352,279,0 script #glast_move_01 WARPNPC,4,4,{
+ end;
+OnTouch:
+ if ('back_to_entrance == 0)
+ warp 'map_glast$,347,265;
+ else {
+ disablenpc instance_npcname("#glast_move_01");
+ initnpctimer;
+ }
+ end;
+
+OnTimer1500:
+ specialeffect EF_FIREPILLARON2, AREA, 'sarah_ego$;
+ end;
+OnTimer2000:
+ hideoffnpc 'sarah_ego$;
+ specialeffect EF_WHITEBODY, AREA, 'sarah_ego$;
+ end;
+OnTimer3000:
+ npctalk "Sarah Irene: Impressive Fenrith Fenrir, you cleverly escaped", 'sarah_ego$;
+ end;
+OnTimer7500:
+ npctalk "Sarah Irene: Mm.. today I will make you stand down", 'sarah_ego$;
+ end;
+OnTimer8000:
+ npctalk "Fenrith Fenrir: Today I hope to end our ill fated relationship.", 'fenrir_11$;
+ end;
+OnTimer11000:
+ npctalk "Sarah Irene: However, do not think this is the end", 'sarah_ego$;
+ end;
+OnTimer14000:
+ npctalk "Sarah Irene: You will surely see me again!!!", 'sarah_ego$;
+ end;
+OnTimer14500:
+ npctalk "Fenrith Fenrir: Mm... I look forward to it Sarah Irene..", 'fenrir_11$;
+ specialeffect EF_FIREPILLARON2, AREA, 'sarah_ego$;
+ end;
+OnTimer15500:
+ stopnpctimer;
+ disablenpc 'sarah_ego$;
+ end;
+}
+
+// Fenrir left side
+// 1@glast,42,350,0 warp2 #glast_event_warp_1 10,10,1@glast,105,369
+// 1@glast,52,346,0 warp2 #glast_event_warp_2 10,10,1@glast,105,369
+// 1@glast,35,364,0 warp2 #glast_event_warp_3 10,10,1@glast,105,369
+// 1@glast,41,364,0 warp2 #glast_event_warp_4 10,10,1@glast,105,369
+// 1@glast,44,371,0 warp2 #glast_event_warp_5 10,10,1@glast,105,369
+// 1@glast,54,362,0 warp2 #glast_event_warp_6 10,10,1@glast,105,369
+// 1@glast,44,358,0 warp2 #glast_event_warp_7 10,10,1@glast,105,369
+
+// To stairs final room
+1@glast,199,237,0 script #glast_move_03 WARPNPC,2,2,{
+ end;
+OnTouch:
+ if (getcharid(0) == getpartyleader(getcharid(1),2))
+ warpparty 'map_glast$,197,263, getcharid(1), 'map_glast$,1,1;
+ end;
+}
+
+// To final room
+1@glast,199,294,0 script #glast_move_03a WARPNPC,3,3,{
+ end;
+OnTouch:
+ if (getcharid(0) == getpartyleader(getcharid(1),2))
+ warpparty 'map_glast$,188,334, getcharid(1), 'map_glast$,1,1;
+ end;
+}
+
+// Exit final room
+//1@glast,189,331,0 warp2 #glast_event_warp_11 10,10,1@glast,197,221
+//1@glast,206,337,0 warp2 #glast_event_warp_12 10,10,1@glast,197,221
+//1@glast,205,330,0 warp2 #glast_event_warp_13 10,10,1@glast,197,221
+//1@glast,193,337,0 warp2 #glast_event_warp_14 10,10,1@glast,197,221
+//1@glast,210,331,0 warp2 #glast_event_warp_15 10,10,1@glast,197,221
+//1@glast,194,330,0 warp2 #glast_event_warp_16 10,10,1@glast,197,221
+
+// Back to entrance
+1@glast,351,269,0 script #glast_move_04 WARPNPC,3,3,{
+ end;
+OnTouch:
+ if (getcharid(0) == getpartyleader(getcharid(1),2)) {
+ donpcevent instance_npcname("#sarah_wrath") + "::OnStop";
+ warpparty 'map_glast$,349,282, getcharid(1), 'map_glast$,1,1;
+ }
+ end;
+}
+
+// Exit
+1@glast,376,303,0 warp2 #glast_move_05 2,2,dali02,91,140
+
+// Fenrir bottom
+1@glast,216,48,0 script #glast_event_5 HIDDEN_WARP_NPC,6,6,{
+ end;
+OnTouch:
+ disablenpc instance_npcname("#glast_event_5");
+ mes "";
+ cutin "fenrir_a.bmp",2;
+ npctalk "Fenrith Fenrir: You are still in Glast Heim? Why aren't you leaving this dangerous place?", 'fenrir_2$;
+ sleep2 2000;
+ unittalk getcharid(3), "" + strcharinfo(0) + " : I know it's dangerous but I thought it would be fun so I couldn't help myself..";
+ sleep2 2000;
+ npctalk "Fenrith Fenrir: Hm.. Adventurers..", 'fenrir_2$;
+ sleep2 2000;
+ unittalk getcharid(3), "" + strcharinfo(0) + " : You don't have to worry~! I am fairly strong myself!";
+ sleep2 2000;
+ npctalk "Fenrith Fenrir: Oh.. really? Do you think you can assist me then?", 'fenrir_2$;
+ sleep2 2000;
+ npctalk "Fenrith Fenrir: The object I am looking for is located somewhere in Glast Heim!", 'fenrir_2$;
+ viewpoint 1,47,270,1,0xFF0000;
+ sleep2 2000;
+ npctalk "Fenrith Fenrir: But others looking for the object will arrive there soon!", 'fenrir_2$;
+ sleep2 2000;
+ npctalk "Fenrith Fenrir: This is urgent because there isn't enough time. We have to arrive there soon. 5 minutes at the latest!", 'fenrir_2$;
+ sleep2 2000;
+ npctalk "Fenrith Fenrir: I will be waiting! If you are late I will have to go by myself!", 'fenrir_2$;
+ sleep2 2000;
+ npctalk "Fenrith Fenrir: Alright, I will go on ahead and you decide if you are going to assist me!", 'fenrir_2$;
+ sleep2 3000;
+ cutin "",255;
+ disablenpc 'fenrir_2$;
+ sleep2 1000;
+ unittalk getcharid(3), "" + strcharinfo(0) + " : Hm.. what should I do..? I need shards of Gigantes as requested by Professor Bernhard..";
+ sleep2 2000;
+ unittalk getcharid(3), "" + strcharinfo(0) + " : Should I help that person.. Or should I look for Gigantes to take the shards as requested by Professor Bernhard..?";
+ sleep2 2000;
+ donpcevent instance_npcname("#fenrir_left_final_2") + "::OnStart";// timer (5 mins)
+ for ( .@i = 1; .@i < 7; .@i++ )
+ enablenpc instance_npcname("Ancient Gigantes#glast_" + .@i);
+ enablenpc 'fenrir_3$;
+ enablenpc instance_npcname("#glast_event_7");
+ disablenpc instance_npcname("#glast_move_01"); // officially player can be stucked in entrance
+ end;
+}
+
+1@glast,216,52,6 script Fenrith Fenrir#glast_02 4_F_FENRIR,{ end; }
+
+// Fenrir left side, entrance
+1@glast,47,270,0 script #glast_event_7 HIDDEN_WARP_NPC,5,5,{
+ end;
+OnTouch:
+ if (getcharid(0) != getpartyleader(getcharid(1),2))
+ npctalk "Fenrith Fenrir: I would like your party leader to come and help me!", 'fenrir_3$;
+ else {
+ mes "";
+ disablenpc instance_npcname("#glast_event_7");
+ npctalk "Fenrith Fenrir: You came! I was waiting!", 'fenrir_3$;
+ sleep2 2000;
+ npctalk "Fenrith Fenrir: We don't have much time! We have to go search for it now! Let's go in!", 'fenrir_3$;
+ sleep2 2000;
+ if ('skip_left_part == 0) {// 5 mins have passed?
+ donpcevent instance_npcname("#fenrir_left_final_2") + "::OnStop";
+ disablenpc 'fenrir_3$;
+ enablenpc 'fenrir_4$;
+ enablenpc instance_npcname("#glast_event_9");
+ warpparty 'map_glast$,41,348, getcharid(1), 'map_glast$,1,1;
+ }
+ }
+ end;
+}
+
+1@glast,47,270,4 duplicate(#effect_glast_event01_1) Fenrith Fenrir#glast_03 4_F_FENRIR
+
+// Fenrir left side, inside
+1@glast,44,357,0 script #glast_event_9 HIDDEN_WARP_NPC,3,3,{
+ end;
+OnTouch:
+ disablenpc instance_npcname("#glast_event_9");
+ mes "";
+ cutin "fenrir_a.bmp",2;
+ npctalk "Fenrith Fenrir: The sword of Baldur, Sentinel Breeze... even after 1000 years..", 'fenrir_4$;
+ sleep2 3000;
+ npctalk "Fenrith Fenrir: I can feel the evil of monsters in this place.. as if they are being controlled by someone..", 'fenrir_4$;
+ sleep2 3000;
+ npctalk "Fenrith Fenrir: Then there is someone else here other than me?", 'fenrir_4$;
+ sleep2 3000;
+ npctalk "Fenrith Fenrir: That will do.. Now all I have to do is use Sentinel Breeze to find Baldur's whereabouts..", 'fenrir_4$;
+ sleep2 3000;
+ enablenpc 'sarah_10$;
+ enablenpc instance_npcname("Gigantes#semi1");
+ enablenpc instance_npcname("Gigantes#semi2");
+ sleep2 1000;
+ cutin "sarah_hero3.bmp",0;
+ npctalk "Sarah Irene: Hehe.. I see... just as I expected.", 'sarah_10$;
+ sleep2 3000;
+ npctalk "Sarah Irene: Was that blade the clue?", 'sarah_10$;
+ sleep2 3000;
+ npctalk "Sarah Irene: Then, Fenrith Fenrir, that means a 1000 year old seal can be broken with it?", 'sarah_10$;
+ sleep2 3500;
+ unittalk getcharid(3), "" + strcharinfo(0) + " : Could it be he was the real Fenrir?";
+ npctalk "Fenrith Fenrir: Could this be.. Valkyrie! Now it is not fun anymore", 'fenrir_4$;
+ cutin "fenrir_b.bmp",2;
+ sleep2 5000;
+ npctalk "Sarah Irene: Belated salutations, my name is Sarah Irene, one of the 12 Valkyries of Valhalla.", 'sarah_10$;
+ cutin "sarah_hero3.bmp",0;
+ sleep2 3000;
+ npctalk "Sarah Irene: Anyway, also to achieve Freyja's will.. hehe..", 'sarah_10$;
+ npctalk "Fenrith Fenrir: Two Gigantes! This will not be an easy fight. Help me and defeat the Gigantes!", 'fenrir_4$;
+ cutin "fenrir_b.bmp",2;
+ sleep2 3000;
+ npctalk "Sarah Irene: Go forth! Gigantes! And my loyal monsters!", 'sarah_10$;
+ npctalk "Fenrith Fenrir: Sarah will hide and continuously summon monsters! I will take care of that monster, you face the Gigantes!", 'fenrir_4$;
+ cutin "fenrir_b.bmp",255;
+ sleep2 2000;
+ disablenpc 'sarah_10$;
+ disablenpc instance_npcname("Gigantes#semi1");
+ disablenpc instance_npcname("Gigantes#semi2");
+ enablenpc instance_npcname("#fenrir_left_final_1");
+ monster 'map_glast$,49,363, "Gigantes#semi1", 3191,1, instance_npcname("#fenrir_left_final_1") + "::OnMobDead";// MM_M_GIGAN1
+ monster 'map_glast$,41,363, "Gigantes#semi2", 3192,1, instance_npcname("#fenrir_left_final_1") + "::OnMobDead";// MM_M_GIGAN2
+ donpcevent instance_npcname("#glast_event_9") + "::OnEvent";
+ end;
+OnEvent:
+ sleep 15000;
+ 'timer_left_side = 0;
+ donpcevent instance_npcname("#glast_event_9") + "::OnStart";
+ end;
+
+OnStart:
+ initnpctimer;
+ npctalk "Fenrith Fenrir: Currents vibrating in the atmosphere! Show me your strength!", 'fenrir_4$;
+ callsub S_Spawn,1,3198;// MM_M_GALION
+
+ progressbar_npc "000000",5, 'fenrir_4$; // note: display effect after dead of Gigantes
+ npctalk "Fenrith Fenrir: Light Bolt!!!", 'fenrir_4$;
+ for ( .@i = 1; .@i < 9; .@i++ )
+ specialeffect EF_LIGHTBOLT, AREA, instance_npcname("#effect_glast_event02_" + .@i);
+ end;
+OnTimer6000:
+ killmonster 'map_glast$, instance_npcname("#glast_event_9") + "::OnMobDead";
+ end;
+OnTimer15000:
+ npctalk "Fenrith Fenrir: Devour this evil presence with the fire pit of the universe!", 'fenrir_4$;
+ callsub S_Spawn,2,3198;// MM_M_GALION
+ progressbar_npc "000000",5, 'fenrir_4$;
+ npctalk "Fenrith Fenrir: Hell fire that can swallow even space! Meteor storm~!!!!!", 'fenrir_4$;
+ for ( .@i = 1; .@i < 9; .@i++ )
+ specialeffect EF_METEORSTORM, AREA, instance_npcname("#effect_glast_event02_" + .@i);
+ end;
+OnTimer21000:
+ killmonster 'map_glast$, instance_npcname("#glast_event_9") + "::OnMobDead";
+ end;
+OnTimer30000:
+ npctalk "Fenrith Fenrir: Currents vibrating in the atmosphere! Show me your strength!", 'fenrir_4$;
+ callsub S_Spawn,1,3199;// MM_M_MUTANT_DRAGON
+ progressbar_npc "000000",5, 'fenrir_4$;
+ npctalk "Fenrith Fenrir: Light Bolt!!!", 'fenrir_4$;
+ for ( .@i = 1; .@i < 9; .@i++ )
+ specialeffect EF_LIGHTBOLT, AREA, instance_npcname("#effect_glast_event02_" + .@i);
+ end;
+OnTimer36000:
+ killmonster 'map_glast$, instance_npcname("#glast_event_9") + "::OnMobDead";
+ end;
+OnTimer45000:
+ npctalk "Fenrith Fenrir: Freeze the evil presence with frost wind!!!", 'fenrir_4$;
+ callsub S_Spawn,2,3199;// MM_M_MUTANT_DRAGON
+ progressbar_npc "000000",5, 'fenrir_4$;
+ npctalk "Fenrith Fenrir: A storm that can freeze even the soul!! Storm gust~!!!!!", 'fenrir_4$;
+ for ( .@i = 1; .@i < 9; .@i++ )
+ specialeffect EF_STORMGUST, AREA, instance_npcname("#effect_glast_event02_" + .@i);
+ end;
+OnTimer51000:
+ killmonster 'map_glast$, instance_npcname("#glast_event_9") + "::OnMobDead";
+ end;
+OnTimer55000:
+ 'timer_left_side++;
+ if ('timer_left_side == 5) {
+ stopnpctimer;
+ donpcevent instance_npcname("#fenrir_left_vermilion") + "::OnEvent";
+ }
+ end;
+OnTimer60000:
+ donpcevent instance_npcname("#glast_event_9") + "::OnStart";
+ end;
+
+OnStop:
+ stopnpctimer;
+ end;
+
+OnMobDead:
+ end;
+
+S_Spawn:
+ .@mob_id = getarg(1);
+ .@label$ = instance_npcname("#glast_event_9") + "::OnMobDead";
+ if (getarg(0) == 1) {
+ monster 'map_glast$,43,355, "--ja--", .@mob_id,1, .@label$;
+ monster 'map_glast$,39,361, "--ja--", .@mob_id,1, .@label$;
+ monster 'map_glast$,48,361, "--ja--", .@mob_id,1, .@label$;
+ monster 'map_glast$,43,363, "--ja--", .@mob_id,1, .@label$;
+ }
+ else {
+ monster 'map_glast$,37,360, "--ja--", .@mob_id,1, .@label$;
+ monster 'map_glast$,37,362, "--ja--", .@mob_id,1, .@label$;
+ monster 'map_glast$,37,364, "--ja--", .@mob_id,1, .@label$;
+ monster 'map_glast$,37,366, "--ja--", .@mob_id,1, .@label$;
+ monster 'map_glast$,37,368, "--ja--", .@mob_id,1, .@label$;
+ monster 'map_glast$,41,371, "--ja--", .@mob_id,1, .@label$;
+ monster 'map_glast$,50,360, "--ja--", .@mob_id,1, .@label$;
+ monster 'map_glast$,50,362, "--ja--", .@mob_id,1, .@label$;
+ monster 'map_glast$,50,364, "--ja--", .@mob_id,1, .@label$;
+ monster 'map_glast$,50,366, "--ja--", .@mob_id,1, .@label$;
+ monster 'map_glast$,50,368, "--ja--", .@mob_id,1, .@label$;
+ monster 'map_glast$,46,371, "--ja--", .@mob_id,1, .@label$;
+ }
+ return;
+}
+
+1@glast,1,1,0 script #fenrir_left_vermilion HIDDEN_WARP_NPC,{
+ end;
+OnEvent:
+ enablenpc instance_npcname("#fenrir_left_vermilion");
+ initnpctimer;
+ npctalk "Fenrith Fenrir: They are endless. I should finish this absolutely.", 'fenrir_4$;
+ progressbar_npc "000000",10, 'fenrir_4$;
+ end;
+OnTimer2000:
+ npctalk "Fenrith Fenrir: Limitlessly distant monarch with the beautiful scarlet breath!!", 'fenrir_4$;
+ end;
+OnTimer4000:
+ npctalk "Fenrith Fenrir: Where you have passed will only be filled with nothingness.", 'fenrir_4$;
+ end;
+OnTimer7000:
+ npctalk "Fenrith Fenrir: Power to shake the earth's axis! Show your grace right here and now!!!", 'fenrir_4$;
+ end;
+OnTimer10000:
+ stopnpctimer;
+ npctalk "Fenrith Fenrir: Road of Vermilion!!!!", 'fenrir_4$;
+ for ( .@i = 1; .@i < 9; .@i++ )
+ specialeffect EF_LORD, AREA, instance_npcname("#effect_glast_event02_" + .@i);
+ killmonster 'map_glast$, instance_npcname("#fenrir_left_final_1") + "::OnMobDead";
+ donpcevent instance_npcname("#fenrir_left_final_1") + "::OnStart";
+ disablenpc instance_npcname("#fenrir_left_vermilion");
+ end;
+OnStop:
+ stopnpctimer;
+ disablenpc instance_npcname("#fenrir_left_vermilion");
+ end;
+}
+
+1@glast,1,1,0 script #fenrir_left_final_1 HIDDEN_WARP_NPC,{
+ end;
+OnStart:
+ initnpctimer;
+ end;
+OnTimer2000:
+ npctalk "Fenrith Fenrir: Alright! We have defeated a Gigantes!", 'fenrir_4$;
+ enablenpc 'sarah_10$;
+ end;
+OnTimer4000:
+ npctalk "Sarah Irene: As expected, Fenrith Fenrir, you do not yield easily!", 'sarah_10$;
+ end;
+OnTimer7000:
+ npctalk "Fenrith Fenrir: Get away from the Sentinel Breeze immediately!", 'fenrir_4$;
+ end;
+OnTimer9000:
+ npctalk "Sarah Irene: Hehe.. I can't do that!", 'sarah_10$;
+ specialeffect EF_WL_TELEKINESIS_INTENSE, AREA, instance_npcname("#effect_glast_event02_bis");
+ end;
+OnTimer11000:
+ npctalk "Sarah Irene: If you want it back come to Glast Heim Castle! I shall be waiting!", 'sarah_10$;
+ end;
+OnTimer13000:
+ specialeffect EF_FIREPILLARON2, AREA, 'sarah_10$;
+ end;
+OnTimer14000:
+ disablenpc 'sarah_10$;
+ end;
+OnTimer16000:
+ npctalk "Fenrith Fenrir: We must follow quickly to retrieve the sword! I shall use a group space movement spell!", 'fenrir_4$;
+ end;
+OnTimer19000:
+ npctalk "Fenrith Fenrir: Simultaneous large scale warp!", 'fenrir_4$;
+ end;
+OnTimer20000:
+ stopnpctimer;
+ //for ( .@i = 1; .@i < 8; .@i++ )
+ // enablenpc instance_npcname("#glast_event_warp_" + .@i); // warp to 105,369
+ areawarp 'map_glast$,26,338,59,375, 'map_glast$,105,369;
+ for ( .@i = 1; .@i < 9; .@i++ )
+ disablenpc instance_npcname("#effect_glast_event02_" + .@i);
+ disablenpc instance_npcname("#effect_glast_event02_bis");
+ disablenpc instance_npcname("#fenrir_left_final_1");
+ disablenpc 'fenrir_4$;
+ enablenpc instance_npcname("#glast_event_13");
+ enablenpc 'fenrir_5$;
+ end;
+
+OnMobDead:
+ if (mobcount( 'map_glast$, instance_npcname("#fenrir_left_final_1") + "::OnMobDead" ) < 1) {
+ donpcevent instance_npcname("#glast_event_9") + "::OnStop";
+ donpcevent instance_npcname("#fenrir_left_vermilion") + "::OnStop";
+ donpcevent instance_npcname("#fenrir_left_final_1") + "::OnStart";
+ }
+ end;
+}
+
+1@glast,44,357,8 duplicate(#effect_glast_event01_1) Fenrith Fenrir#glast_04 4_F_FENRIR
+1@glast,49,363,4 duplicate(#effect_glast_event01_1) Gigantes#semi1 4_GIGANTES_SMALL
+1@glast,41,363,4 duplicate(#effect_glast_event01_1) Gigantes#semi2 4_GIGANTES_SMALL
+1@glast,46,364,4 duplicate(#effect_glast_event01_1) Sarah Irene#glast_10 4_F_SARAH
+
+1@glast,52,345,4 duplicate(#effect_glast_event01_1) #effect_glast_event02_1 CLEAR_NPC
+1@glast,44,350,4 duplicate(#effect_glast_event01_1) #effect_glast_event02_2 CLEAR_NPC
+1@glast,35,360,4 duplicate(#effect_glast_event01_1) #effect_glast_event02_3 CLEAR_NPC
+1@glast,44,360,4 duplicate(#effect_glast_event01_1) #effect_glast_event02_4 CLEAR_NPC
+1@glast,52,360,4 duplicate(#effect_glast_event01_1) #effect_glast_event02_5 CLEAR_NPC
+1@glast,35,368,4 duplicate(#effect_glast_event01_1) #effect_glast_event02_6 CLEAR_NPC
+1@glast,53,368,4 duplicate(#effect_glast_event01_1) #effect_glast_event02_7 CLEAR_NPC
+1@glast,44,371,4 duplicate(#effect_glast_event01_1) #effect_glast_event02_8 CLEAR_NPC
+1@glast,44,366,4 duplicate(#effect_glast_event01_1) #effect_glast_event02_bis CLEAR_NPC
+
+// Event top side
+1@glast,133,365,0 script #glast_event_13 HIDDEN_WARP_NPC,8,8,{
+ end;
+OnTouch:
+ disablenpc instance_npcname("#glast_event_13");
+ //for ( .@i = 1; .@i < 8; .@i++ )
+ // disablenpc instance_npcname("#glast_event_warp_" + .@i);
+ mes "";
+ cutin "fenrir_a.bmp",2;
+ sleep2 1000;
+ npctalk "Fenrith Fenrir: I need to go to Glast Heim Castle to retrieve the sword of Baldur.", 'fenrir_5$;
+ sleep2 3000;
+ npctalk "Fenrith Fenrir: It could be difficult alone, I would gratefully accept your help.", 'fenrir_5$;
+ sleep2 3000;
+ npctalk "Fenrith Fenrir: Since there isn't enough time, we can't wait long.", 'fenrir_5$;
+ sleep2 3000;
+ npctalk "Fenrith Fenrir: I will wait in the central castle of Glast Heim for about 5 minutes.", 'fenrir_5$;
+ sleep2 3000;
+ npctalk "Fenrith Fenrir: Since it is dangerous you do not have to feel obligated to help me. I will try by myself if I have to.", 'fenrir_5$;
+ viewpoint 1,199,237,1,0xFF0000;
+ sleep2 3000;
+ npctalk "Fenrith Fenrir: Then I will go on ahead! Warp!", 'fenrir_5$;
+ cutin "",255;
+ donpcevent instance_npcname("#glast_event_13") + "::OnBar";
+ end;
+OnBar:
+ progressbar_npc "000000",3, 'fenrir_5$;
+ disablenpc 'fenrir_5$;
+ donpcevent instance_npcname("#fenrir_boss_final_2") + "::OnStart";// timer (5 mins)
+ enablenpc instance_npcname("#glast_move_03");
+ enablenpc instance_npcname("#glast_event_15");
+ enablenpc 'fenrir_6$;
+ end;
+}
+
+1@glast,133,365,4 duplicate(#effect_glast_event01_1) Fenrith Fenrir#glast_05 4_F_FENRIR
+
+// Skipped left side
+1@glast,1,1,0 script #fenrir_left_final_2 HIDDEN_WARP_NPC,{
+ end;
+OnStart:
+ enablenpc instance_npcname("#fenrir_left_final_2");
+ initnpctimer;
+ end;
+OnTimer300000:
+ 'skip_left_part = 1;
+ disablenpc instance_npcname("#glast_event_7");
+ disablenpc 'fenrir_3$;
+ mapannounce 'map_glast$, "Fenrith Fenrir: Alright! We have defeated a Gigantes!", bc_map,0xEBFF;
+ end;
+OnTimer302000:
+ mapannounce 'map_glast$, "Sarah Irene: As expected, Fenrith Fenrir, you do not yield easily!", bc_map,0xEBFF;
+ end;
+OnTimer305000:
+ mapannounce 'map_glast$, "Fenrith Fenrir: Get away from the Sentinel Breeze immediately!", bc_map,0xEBFF;
+ end;
+OnTimer307000:
+ mapannounce 'map_glast$, "Sarah Irene: Hehe.. I can't do that!", bc_map,0xEBFF;
+ end;
+OnTimer309000:
+ mapannounce 'map_glast$, "Sarah Irene: If you want it back come to Glast Heim Castle! I shall be waiting!", bc_map,0xEBFF;
+ end;
+OnTimer311000:
+ mapannounce 'map_glast$, "Fenrith Fenrir: I need to go to Glast Heim Castle to retrieve the sword of Baldur", bc_map,0xEBFF;
+ end;
+OnTimer313000:
+ mapannounce 'map_glast$, "Fenrith Fenrir: It may be difficult alone. If you are listening I will gratefully accept your help.", bc_map,0xEBFF;
+ end;
+OnTimer315000:
+ mapannounce 'map_glast$, "Fenrith Fenrir: Since there isn't enough time, we can't wait long.", bc_map,0xEBFF;
+ end;
+OnTimer317000:
+ mapannounce 'map_glast$, "Fenrith Fenrir: I will wait in the central castle of Glast Heim for about 5 minutes.", bc_map,0xEBFF;
+ end;
+OnTimer319000:
+ stopnpctimer;
+ mapannounce 'map_glast$, "Fenrith Fenrir: Since it is dangerous you do not have to feel obligated to help me. I will try by myself if I have to.", bc_map,0xEBFF;
+ enablenpc instance_npcname("#glast_move_03");
+ enablenpc 'fenrir_6$;
+ enablenpc instance_npcname("#glast_event_15");
+ disablenpc instance_npcname("#fenrir_left_final_2");
+ donpcevent instance_npcname("#fenrir_boss_final_2") + "::OnStart";// timer (5 mins)
+ end;
+OnStop:
+ stopnpctimer;
+ disablenpc instance_npcname("#fenrir_left_final_2");
+ end;
+}
+
+// Stairs final room
+1@glast,200,268,0 script #glast_event_15 HIDDEN_WARP_NPC,7,7,{
+ end;
+OnTouch:
+ disablenpc instance_npcname("#glast_move_03");
+ disablenpc instance_npcname("#glast_event_15");
+ donpcevent instance_npcname("#fenrir_boss_final_2") + "::OnStop";
+ mes "";
+ sleep2 1000;
+ npctalk "Fenrith Fenrir: I was waiting. Thank you for not being late.", 'fenrir_6$;
+ sleep2 3000;
+ npctalk "Fenrith Fenrir: Let us climb the castle to retrieve Sentinel Breeze! Sarah will be waiting!", 'fenrir_6$;
+ sleep2 3000;
+ disablenpc 'fenrir_6$;
+ enablenpc instance_npcname("#glast_move_03a");
+ enablenpc instance_npcname("#glast_event_18");
+ enablenpc instance_npcname("Sarah Irene#glast_17");
+ enablenpc 'fenrir_7$;
+ end;
+}
+
+1@glast,200,268,4 duplicate(#effect_glast_event01_1) Fenrith Fenrir#glast_06 4_F_FENRIR
+
+// Final room
+1@glast,199,336,0 script #glast_event_18 HIDDEN_WARP_NPC,10,10,{
+ end;
+OnTouch:
+ disablenpc instance_npcname("#glast_event_18");
+ mes "";
+ cutin "sarah_hero3.bmp",0;
+ sleep2 1000;
+ npctalk "Sarah Irene: It seemed like forever waiting for you~ Fenrith Fenrir.", 'sarah_17$;
+ sleep2 3000;
+ cutin "fenrir_b.bmp",2;
+ npctalk "Fenrith Fenrir: No need for useless words, hand over the Sentinel Breeze now!", 'fenrir_7$;
+ sleep2 3000;
+ cutin "sarah_hero3.bmp",0;
+ npctalk "Sarah Irene: Try if you can.", 'sarah_17$;
+ sleep2 3000;
+ cutin "fenrir_b.bmp",2;
+ npctalk "Fenrith Fenrir: Sarah may be too difficult for you to face alone. I must face her!", 'fenrir_7$;
+ sleep2 3000;
+ npctalk "Fenrith Fenrir: Pure white shackles, eternal prison, make a deal with me now!", 'fenrir_7$;
+ donpcevent instance_npcname("#glast_event_18") + "::OnBar";
+ sleep2 3000;
+ npctalk "Fenrith Fenrir: White Imprison!!", 'fenrir_7$;
+ specialeffect EF_BOTTOM_BASILICA2, AREA, 'sarah_17$;
+ sleep2 3000;
+ npctalk "Sarah Irene: Hurk.... he..", 'sarah_17$;
+ npctalk "Fenrith Fenrir: I will weaken Sarah with white imprison and face her while she's shackled,", 'fenrir_7$;
+ sleep2 3000;
+ npctalk "Fenrith Fenrir: you take care of the monsters she summons. I'm counting on you.", 'fenrir_7$;
+ sleep2 3000;
+ unittalk getcharid(3), "" + strcharinfo(0) + " : Will do. Powerful enemies make my blood boil.";
+ sleep2 6000;
+ npctalk "Fenrith Fenrir: This is a strategy to attack at once and finish Sarah off while she is in critical condition. Remember, our opponent is strong.", 'fenrir_7$;
+ sleep2 3000;
+ cutin "sarah_hero3_2.bmp",0;
+ npctalk "Sarah Irene: So your plan was to tie me up with this sort of trick?", 'sarah_17$;
+ sleep2 3000;
+ npctalk "Sarah Irene: Furthermore you borrow the assistance of such rookie adventurers...", 'sarah_17$;
+ sleep2 3000;
+ npctalk "Sarah Irene: You need to disappear from here along with that worn out blade!!", 'sarah_17$;
+ sleep2 3000;
+ cutin "",255;
+ hideonnpc 'sarah_17$;
+ donpcevent instance_npcname("#glast_event_19") + "::OnEvent";
+ monster 'map_glast$,200,336, "Sarah Irene#1",3190,1, instance_npcname("#fenrir_boss_final_1") + "::OnBossDead"; // MM_SARAH
+ 'boss_id = $@mobid[0];
+ end;
+OnBar:
+ progressbar_npc "000000",3, 'fenrir_7$;
+ end;
+}
+
+1@glast,200,336,4 duplicate(#effect_glast_event01_1) Sarah Irene#glast_17 4_F_SARAH
+
+1@glast,197,330,8 script Fenrith Fenrir#glast_07 4_F_FENRIR,{
+ end;
+OnStart:
+ initnpctimer;
+ end;
+OnTimer1000:
+ specialeffect EF_TETRACASTING;
+ initnpctimer;
+ end;
+OnStop:
+ stopnpctimer;
+ end;
+}
+
+1@glast,212,350,0 script #glast_event_19 HIDDEN_WARP_NPC,{
+ end;
+OnEvent:
+ enablenpc instance_npcname("#glast_event_19");
+ enablenpc instance_npcname("#fenrir_boss_final_1");
+ initnpctimer;
+ specialeffect EF_PRIMECHARGE4, AREA, 'fenrir_7$;
+ npctalk "Fenrith Fenrir: Lethal poison, Dark clouds, appear before me and show a most painful death!", 'fenrir_7$;
+ monster 'map_glast$,190,341, "Large Gigantes#a1", 3194,1, instance_npcname("#fenrir_boss_final_1") + "::OnMobDead";// MM_L_GIGAN1
+ monster 'map_glast$,214,331, "Large Gigantes#b2", 3195,1, instance_npcname("#fenrir_boss_final_1") + "::OnMobDead";// MM_L_GIGAN2
+ progressbar_npc "000000",10, 'fenrir_7$;
+ end;
+OnTimer1000:
+ specialeffect EF_BOTTOM_BASILICA2, AREA, 'sarah_17$;
+ end;
+OnTimer10000:
+ callsub S_Hit,1;
+ npctalk "Fenrith Fenrir: Go! Cloud Kill!!!!!", 'fenrir_7$;
+ specialeffect EF_POISONSMOKE, AREA, 'sarah_17$;
+ for ( .@i = 1; .@i <= 8; .@i++ )
+ specialeffect EF_POISONSMOKE, AREA, instance_npcname("#effect_glast_event03_" + .@i);
+ progressbar_npc "000000",10, 'fenrir_7$;
+ end;
+OnTimer10500:
+ unittalk 'boss_id, "Sarah Irene: That was sudden Fenrir. Is that all you've got?";
+ end;
+OnTimer11000:
+ specialeffect EF_POISONSMOKE2, AREA, 'sarah_17$;
+ specialeffect EF_POISONSMOKE2, AREA, instance_npcname("#effect_glast_event03_1");
+ specialeffect EF_ENCHANTPOISON, AREA, instance_npcname("#effect_glast_event03_2");
+ specialeffect EF_POISONSMOKE2, AREA, instance_npcname("#effect_glast_event03_3");
+ specialeffect EF_ENCHANTPOISON, AREA, instance_npcname("#effect_glast_event03_4");
+ specialeffect EF_POISONSMOKE2, AREA, instance_npcname("#effect_glast_event03_5");
+ specialeffect EF_ENCHANTPOISON, AREA, instance_npcname("#effect_glast_event03_6");
+ specialeffect EF_POISONSMOKE2, AREA, instance_npcname("#effect_glast_event03_7");
+ specialeffect EF_ENCHANTPOISON, AREA, instance_npcname("#effect_glast_event03_8");
+ end;
+OnTimer13000:
+ npctalk "Fenrith Fenrir: Lethal poison, Dark clouds, appear before me and show a most painful death!", 'fenrir_7$;
+ specialeffect EF_PRIMECHARGE4, AREA, 'fenrir_7$;
+ specialeffect EF_POISONSMOKE2, AREA, 'sarah_17$;
+ specialeffect EF_POISONSMOKE2, AREA, instance_npcname("#effect_glast_event03_1");
+ specialeffect EF_ENCHANTPOISON, AREA, instance_npcname("#effect_glast_event03_2");
+ specialeffect EF_POISONSMOKE2, AREA, instance_npcname("#effect_glast_event03_3");
+ specialeffect EF_ENCHANTPOISON, AREA, instance_npcname("#effect_glast_event03_4");
+ specialeffect EF_POISONSMOKE2, AREA, instance_npcname("#effect_glast_event03_5");
+ specialeffect EF_ENCHANTPOISON, AREA, instance_npcname("#effect_glast_event03_6");
+ specialeffect EF_POISONSMOKE2, AREA, instance_npcname("#effect_glast_event03_7");
+ specialeffect EF_ENCHANTPOISON, AREA, instance_npcname("#effect_glast_event03_8");
+ end;
+OnTimer20000:
+ callsub S_Hit,2;
+ npctalk "Fenrith Fenrir: Go! Cloud Kill!!!!!", 'fenrir_7$;
+ specialeffect EF_POISONSMOKE, AREA, 'sarah_17$;
+ specialeffect EF_BOTTOM_BASILICA2, AREA, 'sarah_17$;
+ for ( .@i = 1; .@i <= 8; .@i++ )
+ specialeffect EF_POISONSMOKE, AREA, instance_npcname("#effect_glast_event03_" + .@i);
+ progressbar_npc "000000",30, 'fenrir_7$;
+ end;
+OnTimer20500:
+ unittalk 'boss_id, "Sarah Irene: Try to entertain me a little more!!";
+ end;
+OnTimer21000:
+ specialeffect EF_POISONSMOKE2, AREA, 'sarah_17$;
+ specialeffect EF_POISONSMOKE2, AREA, instance_npcname("#effect_glast_event03_1");
+ specialeffect EF_ENCHANTPOISON, AREA, instance_npcname("#effect_glast_event03_2");
+ specialeffect EF_POISONSMOKE2, AREA, instance_npcname("#effect_glast_event03_3");
+ specialeffect EF_ENCHANTPOISON, AREA, instance_npcname("#effect_glast_event03_4");
+ specialeffect EF_POISONSMOKE2, AREA, instance_npcname("#effect_glast_event03_5");
+ specialeffect EF_ENCHANTPOISON, AREA, instance_npcname("#effect_glast_event03_6");
+ specialeffect EF_POISONSMOKE2, AREA, instance_npcname("#effect_glast_event03_7");
+ specialeffect EF_ENCHANTPOISON, AREA, instance_npcname("#effect_glast_event03_8");
+ end;
+OnTimer23000:
+ npctalk "Fenrith Fenrir: I speak to you who controls fire, I Fenrith, desire a fire that does not go out...", 'fenrir_7$;
+ specialeffect EF_BEGINSPELL_YB, AREA, 'fenrir_7$;
+ specialeffect EF_POISONSMOKE2, AREA, 'sarah_17$;
+ specialeffect EF_POISONSMOKE2, AREA, instance_npcname("#effect_glast_event03_1");
+ specialeffect EF_ENCHANTPOISON, AREA, instance_npcname("#effect_glast_event03_2");
+ specialeffect EF_POISONSMOKE2, AREA, instance_npcname("#effect_glast_event03_3");
+ specialeffect EF_ENCHANTPOISON, AREA, instance_npcname("#effect_glast_event03_4");
+ specialeffect EF_POISONSMOKE2, AREA, instance_npcname("#effect_glast_event03_5");
+ specialeffect EF_ENCHANTPOISON, AREA, instance_npcname("#effect_glast_event03_6");
+ specialeffect EF_POISONSMOKE2, AREA, instance_npcname("#effect_glast_event03_7");
+ specialeffect EF_ENCHANTPOISON, AREA, instance_npcname("#effect_glast_event03_8");
+ end;
+OnTimer36000:
+ npctalk "Fenrith Fenrir: Endlessly burning conflagration, a fire that can scorch even the soul!! Appear before me now!!", 'fenrir_7$;
+ specialeffect EF_BEGINSPELL_YB, AREA, 'fenrir_7$;
+ specialeffect EF_BOTTOM_BASILICA2, AREA, 'sarah_17$;
+ end;
+OnTimer50000:
+ callsub S_Hit,3;
+ npctalk "Fenrith Fenrir: Emerge!! Fire Insignia!!!!", 'fenrir_7$;
+ specialeffect EF_DEMONICFIRE, AREA, 'sarah_17$;
+ progressbar_npc "000000",10, 'fenrir_7$;
+ end;
+OnTimer50500:
+ unittalk 'boss_id, "Sarah Irene: Oh... not bad? But not good enough!!";
+ end;
+OnTimer51000:
+ specialeffect EF_BOTTOM_BASILICA2, AREA, 'sarah_17$;
+ end;
+OnTimer53000:
+ npctalk "Fenrith Fenrir: The root of earthshaking power!! Fear the power of the earth!!!", 'fenrir_7$;
+ specialeffect EF_PRIMECHARGE4, AREA, 'fenrir_7$;
+ end;
+OnTimer60000:
+ callsub S_Hit,4;
+ npctalk "Fenrith Fenrir: Go forth!! Heaven's Drive!!!", 'fenrir_7$;
+ specialeffect EF_HEAVENSDRIVE, AREA, 'sarah_17$;
+ monster 'map_glast$,190,341, "Large Gigantes#a1", 3194,1, instance_npcname("#fenrir_boss_final_1") + "::OnMobDead";// MM_L_GIGAN1
+ monster 'map_glast$,214,331, "Large Gigantes#b2", 3195,1, instance_npcname("#fenrir_boss_final_1") + "::OnMobDead";// MM_L_GIGAN2
+ progressbar_npc "000000",10, 'fenrir_7$;
+ end;
+OnTimer60500:
+ unittalk 'boss_id, "Sarah Irene: Why don't you stop your childish magic, Fenrir?";
+ end;
+OnTimer63000:
+ specialeffect EF_PRIMECHARGE4, AREA, 'fenrir_7$;
+ npctalk "Fenrith Fenrir: The root of earthshaking power!! Fear the power of the earth!!!", 'fenrir_7$;
+ end;
+OnTimer70000:
+ callsub S_Hit,5;
+ npctalk "Fenrith Fenrir: Go forth!! Heaven's Drive!!!", 'fenrir_7$;
+ specialeffect EF_HEAVENSDRIVE, AREA, 'sarah_17$;
+ specialeffect EF_BOTTOM_BASILICA2, AREA, 'sarah_17$;
+ progressbar_npc "000000",30, 'fenrir_7$;
+ end;
+OnTimer70500:
+ unittalk 'boss_id, "Sarah Irene: Do you think that is enough to beat me?";
+ end;
+OnTimer73000:
+ npctalk "Fenrith Fenrir: The mercilessly cold breath of the Northern winds,", 'fenrir_7$;
+ specialeffect EF_PRIMECHARGE2, AREA, 'fenrir_7$;
+ end;
+OnTimer85000:
+ npctalk "Fenrith Fenrir: Come like the silent dawn mist and freeze everything!!", 'fenrir_7$;
+ specialeffect EF_PRIMECHARGE2, AREA, 'fenrir_7$;
+ end;
+OnTimer100000:
+ callsub S_Hit,6;
+ npctalk "Fenrith Fenrir: Appear!!! Frost Misty!!!!!", 'fenrir_7$;
+ specialeffect EF_FROSTMYSTY, AREA, 'sarah_17$;
+ specialeffect EF_BOTTOM_BASILICA2, AREA, 'sarah_17$;
+ specialeffect EF_FROSTMYSTY, AREA, 'sarah_17$;
+ progressbar_npc "000000",10, 'fenrir_7$;
+ end;
+OnTimer100500:
+ unittalk 'boss_id, "Sarah Irene: Not bad but.. not even close!";
+ end;
+OnTimer103000:
+ npctalk "Fenrith Fenrir: The power of doubt, a powerful force, the power of deeply hidden secrets in the mind!!!", 'fenrir_7$;
+ specialeffect EF_PRIMECHARGE, AREA, 'fenrir_7$;
+ end;
+OnTimer110000:
+ callsub S_Hit,7;
+ npctalk "Fenrith Fenrir: Now!!! Psychic Wave!!!!", 'fenrir_7$;
+ specialeffect EF_SPR_PLANT10, AREA, 'sarah_17$;
+ specialeffect EF_BOTTOM_BASILICA2, AREA, 'sarah_17$;
+ progressbar_npc "000000",10, 'fenrir_7$;
+ end;
+OnTimer110500:
+ unittalk 'boss_id, "Sarah Irene: Ugh... that is no use Fenrir!";
+ end;
+OnTimer113000:
+ npctalk "Fenrith Fenrir: The power of doubt, a powerful force, the power of deeply hidden secrets in the mind!!!", 'fenrir_7$;
+ specialeffect EF_PRIMECHARGE, AREA, 'fenrir_7$;
+ end;
+OnTimer120000:
+ callsub S_Hit,8;
+ npctalk "Fenrith Fenrir: Now!!! Psychic Wave!!!!", 'fenrir_7$;
+ specialeffect EF_SPR_PLANT10, AREA, 'sarah_17$;
+ monster 'map_glast$,190,341, "Large Gigantes#a1", 3194,1, instance_npcname("#fenrir_boss_final_1") + "::OnMobDead";// MM_L_GIGAN1
+ monster 'map_glast$,214,331, "Large Gigantes#b2", 3195,1, instance_npcname("#fenrir_boss_final_1") + "::OnMobDead";// MM_L_GIGAN2
+ progressbar_npc "000000",30, 'fenrir_7$;
+ end;
+OnTimer120500:
+ unittalk 'boss_id, "Sarah Irene: Hurk.. such an annoying magic bombardment!!";
+ end;
+OnTimer123000:
+ npctalk "Fenrith Fenrir: I speak to you who controls fire, I Fenrith, desire a fire that does not go out...", 'fenrir_7$;
+ specialeffect EF_BEGINSPELL_YB, AREA, 'fenrir_7$;
+ end;
+OnTimer135000:
+ npctalk "Fenrith Fenrir: Endlessly burning conflagration, a fire that can scorch even the soul!! Appear before me now!!", 'fenrir_7$;
+ specialeffect EF_BEGINSPELL_YB, AREA, 'fenrir_7$;
+ specialeffect EF_BOTTOM_BASILICA2, AREA, 'sarah_17$;
+ end;
+OnTimer150000:
+ callsub S_Hit,9;
+ npctalk "Fenrith Fenrir: Emerge!! Fire Insignia!!!!", 'fenrir_7$;
+ specialeffect EF_DEMONICFIRE, AREA, 'sarah_17$;
+ specialeffect EF_BOTTOM_BASILICA2, AREA, 'sarah_17$;
+ progressbar_npc "000000",10, 'fenrir_7$;
+ end;
+OnTimer150500:
+ unittalk 'boss_id, "Sarah Irene: I am Sarah Irene! I will not fall so easily!!!";
+ end;
+OnTimer153000:
+ npctalk "Fenrith Fenrir: True wrath of the sky, thunderbolt that may split the earth... Fall before me now!!", 'fenrir_7$;
+ specialeffect EF_DQ9_CHARGE3, AREA, 'fenrir_7$;
+ end;
+OnTimer160000:
+ callsub S_Hit,10;
+ npctalk "Fenrith Fenrir: Come now!! Thunder Storm!!!!!", 'fenrir_7$;
+ specialeffect EF_THUNDERSTORM2, AREA, 'sarah_17$;
+ unittalk 'boss_id, "Sarah Irene: Ugh...you are.. stronger than I predicted Fenrir...";
+ progressbar_npc "000000",10, 'fenrir_7$;
+ end;
+OnTimer160500:
+ unittalk 'boss_id, "Sarah Irene: Ugh...you are.. stronger than I predicted Fenrir...";
+ end;
+OnTimer163000:
+ npctalk "Fenrith Fenrir: True wrath of the sky, thunderbolt that may split the earth... Fall before me now!!", 'fenrir_7$;
+ specialeffect EF_DQ9_CHARGE3, AREA, 'fenrir_7$;
+ end;
+OnTimer170000:
+ callsub S_Hit,11;
+ npctalk "Fenrith Fenrir: Come now!! Thunder Storm!!!!!", 'fenrir_7$;
+ specialeffect EF_THUNDERSTORM2, AREA, 'sarah_17$;
+ specialeffect EF_BOTTOM_BASILICA2, AREA, 'sarah_17$;
+ progressbar_npc "000000",30, 'fenrir_7$;
+ end;
+OnTimer170500:
+ unittalk 'boss_id, "Sarah Irene: Argh!!!!!! Ahhh!!!!!";
+ end;
+OnTimer173000:
+ npctalk "Fenrith Fenrir: The mercilessly cold breath of the Northern winds,", 'fenrir_7$;
+ specialeffect EF_PRIMECHARGE2, AREA, 'fenrir_7$;
+ end;
+OnTimer180000:
+ monster 'map_glast$,190,341, "Large Gigantes#a1", 3194,1, instance_npcname("#fenrir_boss_final_1") + "::OnMobDead";// MM_L_GIGAN1
+ monster 'map_glast$,185,331, "Large Gigantes#a2", 3194,1, instance_npcname("#fenrir_boss_final_1") + "::OnMobDead";// MM_L_GIGAN1
+ monster 'map_glast$,209,341, "Large Gigantes#b1", 3195,1, instance_npcname("#fenrir_boss_final_1") + "::OnMobDead";// MM_L_GIGAN2
+ monster 'map_glast$,214,331, "Large Gigantes#b2", 3195,1, instance_npcname("#fenrir_boss_final_1") + "::OnMobDead";// MM_L_GIGAN2
+ end;
+OnTimer185000:
+ npctalk "Fenrith Fenrir: Come like the silent dawn mist and freeze everything!!", 'fenrir_7$;
+ specialeffect EF_PRIMECHARGE2, AREA, 'fenrir_7$;
+ specialeffect EF_BOTTOM_BASILICA2, AREA, 'sarah_17$;
+ end;
+OnTimer200000:
+ callsub S_Hit,12;
+ npctalk "Fenrith Fenrir: Appear!!! Frost Misty!!!!!", 'fenrir_7$;
+ specialeffect EF_FROSTMYSTY, AREA, 'sarah_17$;
+ donpcevent 'fenrir_7$ + "::OnStart";
+ progressbar_npc "000000",50, 'fenrir_7$;
+ end;
+OnTimer200500:
+ unittalk 'boss_id, "Sarah Irene: Argh!!! I will kill you all!!!!!!";
+ specialeffect EF_FROSTMYSTY, AREA, 'sarah_17$;
+ specialeffect EF_BOTTOM_BASILICA2, AREA, 'sarah_17$;
+ end;
+OnTimer203000:
+ npctalk "Fenrith Fenrir: Heaven's sword piercing the sky", 'fenrir_7$;
+ specialeffect EF_BLACKBODY, AREA, 'fenrir_7$;
+ specialeffect EF_RECOGNIZED, AREA, 'fenrir_7$;
+ end;
+OnTimer216000:
+ npctalk "Fenrith Fenrir: I wish to borrow your strength for a moment!!", 'fenrir_7$;
+ end;
+OnTimer230000:
+ npctalk "Fenrith Fenrir: Let fall here your extreme strength that can tear even the vacuum!!", 'fenrir_7$;
+ specialeffect EF_BOTTOM_BASILICA2, AREA, 'sarah_17$;
+ end;
+OnTimer239000:
+ monster 'map_glast$,190,341, "Large Gigantes#a1", 3194,1, instance_npcname("#fenrir_boss_final_1") + "::OnMobDead";// MM_L_GIGAN1
+ monster 'map_glast$,185,331, "Large Gigantes#a2", 3194,1, instance_npcname("#fenrir_boss_final_1") + "::OnMobDead";// MM_L_GIGAN1
+ monster 'map_glast$,209,341, "Large Gigantes#b1", 3195,1, instance_npcname("#fenrir_boss_final_1") + "::OnMobDead";// MM_L_GIGAN2
+ monster 'map_glast$,214,331, "Large Gigantes#b2", 3195,1, instance_npcname("#fenrir_boss_final_1") + "::OnMobDead";// MM_L_GIGAN2
+ end;
+OnTimer240000:
+ npctalk "Fenrith Fenrir: Sword that can control life and death, and pierce space time!!!", 'fenrir_7$;
+ end;
+OnTimer250000:
+ npctalk "Fenrith Fenrir: Come out Baretis Spear!!!!!!", 'fenrir_7$;
+ specialeffect EF_PRESSURE3, AREA, 'sarah_17$;
+ for ( .@i = 1; .@i <= 8; .@i++ )
+ specialeffect EF_PRESSURE3, AREA, instance_npcname("#effect_glast_event03_" + .@i);
+ specialeffect EF_BOTTOM_BASILICA2, AREA, 'sarah_17$;
+ end;
+OnTimer253000:
+ setunitdata 'boss_id, UMOB_HP, 100;
+ specialeffect EF_PRESSURE3, AREA, 'sarah_17$;
+ for ( .@i = 1; .@i <= 8; .@i++ )
+ specialeffect EF_PRESSURE3, AREA, instance_npcname("#effect_glast_event03_" + .@i);
+ npctalk "Fenrith Fenrir: Now! I put Sarah in critical condition! You have to finish her off! Attack her quickly! Sarah is strong!", 'fenrir_7$;
+ mapannounce 'map_glast$, "Fenrith Fenrir: Now! I put Sarah in critical condition! You have to finish her off!! Attack her quickly! Sarah is strong!", bc_map,0xEBFF;
+ npctalk "Sarah Irene: Hurk...this.. cannot happen!!! I cannot lose!!!!!", 'sarah_17$;
+ end;
+OnTimer263000:
+ npctalk "Fenrith Fenrir: Since you may not be able to finish her off alone, I will prepare one final spell!!", 'fenrir_7$;
+ progressbar_npc "000000",50, 'fenrir_7$;
+ end;
+OnTimer273000:
+ specialeffect EF_BOTTOM_BASILICA2, AREA, 'sarah_17$;
+ npctalk "Fenrith Fenrir: Heaven's sword piercing the sky", 'fenrir_7$;
+ specialeffect EF_RECOGNIZED, AREA, 'fenrir_7$;
+ specialeffect EF_BLACKBODY, AREA, 'fenrir_7$;
+ end;
+OnTimer283000:
+ npctalk "Fenrith Fenrir: I wish to borrow your strength for a moment!!", 'fenrir_7$;
+ end;
+OnTimer293000:
+ npctalk "Fenrith Fenrir: Let fall here your extreme strength that can tear even the vacuum!!";
+ end;
+OnTimer303000:
+ npctalk "Fenrith Fenrir: Sword that can control life and death, and pierce space time!!!";
+ end;
+OnTimer313000:
+ npctalk "Fenrith Fenrir: Come out Baretis Spear!!!!!!";
+ specialeffect EF_PRESSURE3, AREA, 'sarah_17$;
+ for ( .@i = 1; .@i <= 8; .@i++ )
+ specialeffect EF_PRESSURE3, AREA, instance_npcname("#effect_glast_event03_" + .@i);
+ donpcevent 'fenrir_7$ + "::OnStop";
+ end;
+OnTimer316000:
+ specialeffect EF_PRESSURE3, AREA, 'sarah_17$;
+ for ( .@i = 1; .@i <= 8; .@i++ )
+ specialeffect EF_PRESSURE3, AREA, instance_npcname("#effect_glast_event03_" + .@i);
+ killmonster 'map_glast$, instance_npcname("#fenrir_boss_final_1") + "::OnBossDead";
+ donpcevent instance_npcname("#fenrir_boss_final_1") + "::OnBossDead";
+ end;
+
+OnStop:
+ stopnpctimer;
+ disablenpc instance_npcname("#glast_event_19");
+ end;
+
+S_Hit:
+ getunitdata 'boss_id, .@data;
+ .@hp = .@data[UMOB_MAXHP] - ((.@data[UMOB_MAXHP] * getarg(0)) / 13);
+ setunitdata 'boss_id, UMOB_HP, .@hp;
+ return;
+}
+
+1@glast,1,1,0 script #fenrir_boss_final_1 HIDDEN_WARP_NPC,{
+ end;
+OnBossDead:
+ donpcevent instance_npcname("#glast_event_19") + "::OnStop";
+ initnpctimer;
+ end;
+OnTimer1000:
+ killmonster 'map_glast$, instance_npcname("#fenrir_boss_final_1") + "::OnMobDead";
+ end;
+OnTimer6000:
+ disablenpc 'sarah_17$;
+ disablenpc 'fenrir_7$;
+ enablenpc 'fenrir_8$;
+ enablenpc 'sarah_20$;
+ end;
+OnTimer9000:
+ npctalk "Fenrith Fenrir: Sentinel Breeze! I have it in my hand!", 'fenrir_8$;
+ end;
+OnTimer12000:
+ npctalk "Sarah Irene: Hurk....", 'sarah_20$;
+ end;
+OnTimer15000:
+ npctalk "Fenrith Fenrir: I can find Baldur with this!", 'fenrir_8$;
+ end;
+OnTimer18000:
+ npctalk "Sarah Irene: Not yet!!", 'sarah_20$;
+ progressbar_npc "000000",2, 'sarah_20$;
+ end;
+OnTimer21000:
+ specialeffect EF_FIREPILLARON, AREA, 'fenrir_8$;
+ disablenpc 'fenrir_8$;
+ enablenpc 'fenrir_9$;
+ end;
+OnTimer24000:
+ npctalk "Sarah Irene: Hehe... You evade well like a rat.", 'sarah_20$;
+ end;
+OnTimer27000:
+ npctalk "Sarah Irene: However, I cannot let you leave with that.", 'sarah_20$;
+ end;
+OnTimer30000:
+ npctalk "Sarah Irene: I will blow this entire castle away! Yaah!", 'sarah_20$;
+ progressbar_npc "000000",15, 'sarah_20$;
+ end;
+OnTimer33000:
+ npctalk "Fenrith Fenrir: She is planning to collapse this place! I must perform a large scale teleportation!!!", 'fenrir_9$;
+ progressbar_npc "000000",6, 'fenrir_9$;
+ end;
+OnTimer36000:
+ npctalk "Fenrith Fenrir: Farewell Valkyrie!! I shall take the Sentinel Breeze! So long!", 'fenrir_9$;
+ end;
+OnTimer39000:
+ for ( .@i = 1; .@i <= 8; .@i++ )
+ specialeffect EF_LORD, AREA, instance_npcname("#effect_glast_event03_" + .@i);
+ disablenpc 'fenrir_9$;
+ end;
+OnTimer40000:
+ stopnpctimer;
+ enablenpc instance_npcname("#glast_event_24");
+ enablenpc instance_npcname("Fenrith Fenrir#glast_10");
+ //for ( .@i = 11; .@i <= 16; .@i++ )
+ // enablenpc instance_npcname("#glast_event_warp_" + .@i);// warp to 197,221
+ areawarp 'map_glast$,181,326,218,352, 'map_glast$,197,221;
+ for ( .@i = 1; .@i <= 8; .@i++ )
+ disablenpc instance_npcname("#effect_glast_event03_" + .@i);
+ disablenpc 'sarah_20$;
+ disablenpc instance_npcname("#fenrir_boss_final_1");
+ end;
+
+OnMobDead:
+ end;
+}
+
+1@glast,199,348,8 duplicate(#effect_glast_event01_1) Fenrith Fenrir#glast_08 4_F_FENRIR
+1@glast,201,346,4 duplicate(#effect_glast_event01_1) Fenrith Fenrir#glast_09 4_F_FENRIR
+1@glast,197,339,8 duplicate(#effect_glast_event01_1) Sarah Irene#glast_20 4_F_SARAH
+
+1@glast,201,336,4 duplicate(#effect_glast_event01_1) #effect_glast_event03_1 CLEAR_NPC
+1@glast,201,337,4 duplicate(#effect_glast_event01_1) #effect_glast_event03_2 CLEAR_NPC
+1@glast,200,337,4 duplicate(#effect_glast_event01_1) #effect_glast_event03_3 CLEAR_NPC
+1@glast,199,337,4 duplicate(#effect_glast_event01_1) #effect_glast_event03_4 CLEAR_NPC
+1@glast,199,336,4 duplicate(#effect_glast_event01_1) #effect_glast_event03_5 CLEAR_NPC
+1@glast,199,335,4 duplicate(#effect_glast_event01_1) #effect_glast_event03_6 CLEAR_NPC
+1@glast,200,335,4 duplicate(#effect_glast_event01_1) #effect_glast_event03_7 CLEAR_NPC
+1@glast,201,335,4 duplicate(#effect_glast_event01_1) #effect_glast_event03_8 CLEAR_NPC
+
+// Outside final room
+1@glast,200,224,0 script #glast_event_24 HIDDEN_WARP_NPC,7,7,{
+ end;
+OnTouch:
+ disablenpc instance_npcname("#glast_event_24");
+ mes "";
+ sleep2 1500;
+ cutin "fenrir_b.bmp",2;
+ npctalk "Fenrith Fenrir: Hehe.. You are certainly skilled but I think you have underestimated me, Valkyrie.", 'fenrir_10$;
+ sleep2 3000;
+ mapannounce 'map_glast$, "Sarah Irene: You rather entertain me Fenrith...", bc_map,0xEBFF;
+ sleep2 3000;
+ mapannounce 'map_glast$, "Sarah Irene: Did you think you can escape that easily?", bc_map,0xEBFF;
+ sleep2 3000;
+ mapannounce 'map_glast$, "Sarah Irene: I shall turn Glast Heim into hell!!", bc_map,0xEBFF;
+ sleep2 3000;
+ npctalk "Fenrith Fenrir: If we don't escape now we will suffer a gruesome fate by Sarah's monsters and magic!", 'fenrir_10$;
+ sleep2 3000;
+ npctalk "Fenrith Fenrir: Let's meet at Glast Heim entrance where we first met! If we flee that far it should be safe!", 'fenrir_10$;
+ sleep2 3000;
+ npctalk "Fenrith Fenrir: There is no time! Hurry!", 'fenrir_10$;
+ sleep2 3000;
+ cutin "",255;
+ disablenpc 'fenrir_10$;
+ donpcevent instance_npcname("#sarah_wrath") + "::OnStart";
+ end;
+}
+
+1@glast,200,224,4 duplicate(#effect_glast_event01_1) Fenrith Fenrir#glast_10 4_F_FENRIR
+
+// Skipped final room
+1@glast,1,1,0 script #fenrir_boss_final_2 HIDDEN_WARP_NPC,{
+ end;
+OnStart:
+ enablenpc instance_npcname("#fenrir_boss_final_2");
+ initnpctimer;
+ end;
+OnTimer300000:
+ disablenpc instance_npcname("#glast_move_03");
+ disablenpc instance_npcname("#glast_event_15");
+ disablenpc 'fenrir_6$;
+ end;
+OnTimer305000:
+ mapannounce 'map_glast$, "Fenrith Fenrir: Sentinel Breeze! I have it in my hand!", bc_map,0xEBFF;
+ end;
+OnTimer308000:
+ mapannounce 'map_glast$, "Sarah Irene: Hurk....", bc_map,0xEBFF;
+ end;
+OnTimer311000:
+ mapannounce 'map_glast$, "Fenrith Fenrir: Hehe.. You are certainly skilled but I think you have underestimated me, Valkyrie.", bc_map,0xEBFF;
+ end;
+OnTimer314000:
+ mapannounce 'map_glast$, "Sarah Irene: You rather entertain me Fenrith...", bc_map,0xEBFF;
+ end;
+OnTimer317000:
+ mapannounce 'map_glast$, "Sarah Irene: Did you think you can escape that easily?", bc_map,0xEBFF;
+ end;
+OnTimer320000:
+ mapannounce 'map_glast$, "Sarah Irene: I shall turn Glast Heim into hell!!", bc_map,0xEBFF;
+ end;
+OnTimer323000:
+ mapannounce 'map_glast$, "Fenrith Fenrir: If we don't escape now we will suffer a gruesome fate by Sarah's monsters and magic!", bc_map,0xEBFF;
+ end;
+OnTimer326000:
+ mapannounce 'map_glast$, "Fenrith Fenrir: Let's meet at Glast Heim entrance where we first met! If we flee that far it should be safe!", bc_map,0xEBFF;
+ end;
+OnTimer329000:
+ stopnpctimer;
+ mapannounce 'map_glast$, "Fenrith Fenrir: There is no time! Hurry!", bc_map,0xEBFF;
+ donpcevent instance_npcname("#sarah_wrath") + "::OnStart";
+ end;
+OnStop:
+ stopnpctimer;
+ disablenpc instance_npcname("#fenrir_boss_final_2");
+ end;
+}
+
+// Bombs
+1@glast,1,1,0 script #sarah_wrath HIDDEN_WARP_NPC,{
+ end;
+OnStart:
+ enablenpc instance_npcname("#sarah_wrath");
+ enablenpc instance_npcname("#glast_move_04");
+ enablenpc 'fenrir_11$;
+ enablenpc 'sarah_ego$;
+ hideonnpc 'sarah_ego$;
+ 'back_to_entrance = 1;
+ enablenpc instance_npcname("#glast_move_01");
+ hideonnpc instance_npcname("#glast_move_01");
+ enablenpc instance_npcname("#glast_move_05");
+ initnpctimer;
+ end;
+OnTimer10000:
+ mapannounce 'map_glast$, "Sarah Irene: Absurd little thing, you think you can escape that easily?", bc_map,0xEBFF;
+ callsub S_Spawn,0;
+ end;
+OnTimer50000:
+ mapannounce 'map_glast$, "Sarah Irene: My minions will make sure to kill you!!!", bc_map,0xEBFF;
+ callsub S_Spawn,1;
+ end;
+OnTimer80000:
+ mapannounce 'map_glast$, "Sarah Irene: I cannot let you escape!!", bc_map,0xEBFF;
+ callsub S_Spawn,2;
+ end;
+OnTimer110000:
+ mapannounce 'map_glast$, "Sarah Irene: Fenrith Fenrir.... Did you think I couldn't track you because you fled?", bc_map,0xEBFF;
+ callsub S_Spawn,3;
+ end;
+OnTimer150000:
+ mapannounce 'map_glast$, "Sarah Irene: Absurd little thing, you think you can escape that easily?", bc_map,0xEBFF;
+ callsub S_Spawn,4;
+ end;
+OnTimer300000:
+ stopnpctimer;
+ mapannounce 'map_glast$, "Sarah Irene: Bwahahahahahaha!! Glast Heim is being filled with my wrath!!", bc_map,0xEBFF;
+ for ( .@i = 1; .@i <= 14; .@i++ )
+ enablenpc instance_npcname("#glast_bomb_" + (.@i < 10 ? ("0"+.@i) : .@i));
+ end;
+OnStop:
+ stopnpctimer;
+ end;
+
+S_Spawn:
+ // inaccurate
+ switch( getarg(0) ) {
+ case 0:
+ monster 'map_glast$,204,52,"Large Gigantes#aa1",3194,1;
+ monster 'map_glast$,201,55,"Large Gigantes#aa1",3194,1;
+ monster 'map_glast$,196,53,"Large Gigantes#aa1",3194,1;
+ monster 'map_glast$,205,80,"Large Gigantes#aa2",3195,1;
+ monster 'map_glast$,210,77,"Large Gigantes#aa2",3195,1;
+ monster 'map_glast$,205,73,"Large Gigantes#aa2",3195,1;
+ monster 'map_glast$,236,96,"Large Gigantes#aa5",3194,1;
+ monster 'map_glast$,234,96,"Large Gigantes#aa5",3194,1;
+ monster 'map_glast$,234,96,"Large Gigantes#aa5",3194,1;
+ monster 'map_glast$,185,79,"Large Gigantes#bb3",3194,1;
+ monster 'map_glast$,189,78,"Large Gigantes#bb3",3194,1;
+ monster 'map_glast$,194,85,"Large Gigantes#bb3",3194,1;
+ monster 'map_glast$,168,113,"Large Gigantes#bb4",3195,1;
+ monster 'map_glast$,174,122,"Large Gigantes#bb4",3195,1;
+ break;
+ case 1:
+ monster 'map_glast$,131,182,"Large Gigantes#bb11",3194,1;
+ monster 'map_glast$,133,174,"Large Gigantes#bb11",3194,1;
+ monster 'map_glast$,134,187,"Large Gigantes#bb11",3194,1;
+ monster 'map_glast$,202,196,"Large Gigantes#aa9",3194,1;
+ monster 'map_glast$,196,194,"Large Gigantes#aa9",3194,1;
+ monster 'map_glast$,199,190,"Large Gigantes#aa9",3194,1;
+ monster 'map_glast$,233,198,"Large Gigantes#bb8",3195,1;
+ monster 'map_glast$,231,193,"Large Gigantes#bb8",3195,1;
+ monster 'map_glast$,232,196,"Large Gigantes#bb8",3195,1;
+ monster 'map_glast$,258,196,"Large Gigantes#bb7",3194,1;
+ monster 'map_glast$,265,187,"Large Gigantes#bb7",3194,1;
+ monster 'map_glast$,263,195,"Large Gigantes#bb7",3194,1;
+ monster 'map_glast$,271,106,"Large Gigantes#aa6",3195,1;
+ monster 'map_glast$,266,107,"Large Gigantes#aa6",3195,1;
+ monster 'map_glast$,272,109,"Large Gigantes#aa6",3195,1;
+ break;
+ case 2:
+ monster 'map_glast$,127,204,"Large Gigantes#bb12",3195,1;
+ monster 'map_glast$,130,205,"Large Gigantes#bb12",3195,1;
+ monster 'map_glast$,130,213,"Large Gigantes#bb12",3195,1;
+ monster 'map_glast$,139,243,"Large Gigantes#bb19",3194,1;
+ monster 'map_glast$,143,241,"Large Gigantes#bb19",3194,1;
+ monster 'map_glast$,146,234,"Large Gigantes#bb19",3194,1;
+ monster 'map_glast$,199,218,"Large Gigantes#aa14",3195,1;
+ monster 'map_glast$,201,219,"Large Gigantes#aa14",3195,1;
+ monster 'map_glast$,193,212,"Large Gigantes#aa14",3195,1;
+ monster 'map_glast$,261,251,"Large Gigantes#aa18",3195,1;
+ monster 'map_glast$,257,254,"Large Gigantes#aa18",3195,1;
+ monster 'map_glast$,257,250,"Large Gigantes#aa18",3195,1;
+ monster 'map_glast$,146,45,"Large Gigantes#bb35",3194,1;
+ monster 'map_glast$,145,49,"Large Gigantes#bb35",3194,1;
+ monster 'map_glast$,144,44,"Large Gigantes#bb35",3194,1;
+ break;
+ case 3:
+ monster 'map_glast$,67,259,"Large Gigantes#aa29",3194,1;
+ monster 'map_glast$,68,261,"Large Gigantes#aa29",3194,1;
+ monster 'map_glast$,61,260,"Large Gigantes#aa29",3194,1;
+ monster 'map_glast$,64,208,"Large Gigantes#aa30",3195,1;
+ monster 'map_glast$,67,210,"Large Gigantes#aa30",3195,1;
+ monster 'map_glast$,63,204,"Large Gigantes#aa30",3195,1;
+ monster 'map_glast$,87,57,"Large Gigantes#aa33",3194,1;
+ monster 'map_glast$,81,64,"Large Gigantes#aa33",3194,1;
+ monster 'map_glast$,83,58,"Large Gigantes#aa33",3194,1;
+ monster 'map_glast$,107,47,"Large Gigantes#aa34",3195,1;
+ monster 'map_glast$,105,45,"Large Gigantes#aa34",3195,1;
+ monster 'map_glast$,102,48,"Large Gigantes#aa34",3195,1;
+ monster 'map_glast$,80,152,"Large Gigantes#bb31",3194,1;
+ monster 'map_glast$,82,149,"Large Gigantes#bb31",3194,1;
+ monster 'map_glast$,75,156,"Large Gigantes#bb31",3194,1;
+ monster 'map_glast$,85,106,"Large Gigantes#bb32",3195,1;
+ monster 'map_glast$,82,111,"Large Gigantes#bb32",3195,1;
+ monster 'map_glast$,78,112,"Large Gigantes#bb32",3195,1;
+ monster 'map_glast$,55,149,"Large Gigantes#bb36",3195,1;
+ monster 'map_glast$,56,143,"Large Gigantes#bb36",3195,1;
+ monster 'map_glast$,49,142,"Large Gigantes#bb36",3195,1;
+ break;
+ case 4:
+ monster 'map_glast$,262,215,"Large Gigantes#aa17",3194,1;
+ monster 'map_glast$,266,212,"Large Gigantes#aa17",3194,1;
+ monster 'map_glast$,260,219,"Large Gigantes#aa17",3194,1;
+ monster 'map_glast$,253,47,"Large Gigantes#aa26",3195,1;
+ monster 'map_glast$,263,42,"Large Gigantes#aa26",3195,1;
+ monster 'map_glast$,255,39,"Large Gigantes#aa26",3195,1;
+ monster 'map_glast$,202,219,"Large Gigantes#bb15",3194,1;
+ monster 'map_glast$,201,222,"Large Gigantes#bb15",3194,1;
+ monster 'map_glast$,201,220,"Large Gigantes#bb15",3194,1;
+ monster 'map_glast$,231,210,"Large Gigantes#bb16",3195,1;
+ monster 'map_glast$,345,117,"Large Gigantes#bb27",3194,1;
+ monster 'map_glast$,341,115,"Large Gigantes#bb27",3194,1;
+ monster 'map_glast$,351,121,"Large Gigantes#bb27",3194,1;
+ monster 'map_glast$,346,252,"Large Gigantes#bb28",3195,1;
+ monster 'map_glast$,351,256,"Large Gigantes#bb28",3195,1;
+ monster 'map_glast$,345,254,"Large Gigantes#bb28",3195,1;
+ break;
+ }
+ end;
+}
+
+1@glast,290,43,0 script #glast_bomb_01 HIDDEN_WARP_NPC,10,10,{
+ end;
+OnTouch:
+ unitkill 0;
+ mapannounce 'map_glast$, "Sarah Irene: Bwahahahahahaha!! Glast Heim is being filled with my wrath!!", bc_map,0xEBFF;
+ specialeffect2 EF_LORD;
+ sleep2 1000;
+ specialeffect2 EF_LORD;
+ end;
+}
+
+1@glast,234,47,0 duplicate(#glast_bomb_01) #glast_bomb_02 HIDDEN_WARP_NPC,10,10
+1@glast,265,175,0 duplicate(#glast_bomb_01) #glast_bomb_03 HIDDEN_WARP_NPC,10,10
+1@glast,135,176,0 duplicate(#glast_bomb_01) #glast_bomb_04 HIDDEN_WARP_NPC,10,10
+1@glast,146,238,0 duplicate(#glast_bomb_01) #glast_bomb_05 HIDDEN_WARP_NPC,10,10
+1@glast,165,212,0 duplicate(#glast_bomb_01) #glast_bomb_06 HIDDEN_WARP_NPC,10,10
+1@glast,232,212,0 duplicate(#glast_bomb_01) #glast_bomb_07 HIDDEN_WARP_NPC,10,10
+1@glast,253,241,0 duplicate(#glast_bomb_01) #glast_bomb_08 HIDDEN_WARP_NPC,10,10
+1@glast,268,290,0 duplicate(#glast_bomb_01) #glast_bomb_09 HIDDEN_WARP_NPC,10,10
+1@glast,132,289,0 duplicate(#glast_bomb_01) #glast_bomb_10 HIDDEN_WARP_NPC,10,10
+1@glast,199,115,0 duplicate(#glast_bomb_01) #glast_bomb_11 HIDDEN_WARP_NPC,10,10
+1@glast,139,46,0 duplicate(#glast_bomb_01) #glast_bomb_12 HIDDEN_WARP_NPC,10,10
+1@glast,82,86,0 duplicate(#glast_bomb_01) #glast_bomb_13 HIDDEN_WARP_NPC,10,10
+1@glast,68,226,0 duplicate(#glast_bomb_01) #glast_bomb_14 HIDDEN_WARP_NPC,10,10
+
+// Back to entrance
+// event in #glast_move_01
+1@glast,359,294,4 script Fenrith Fenrir#glast_11 4_F_FENRIR,{
+ if (isbegin_quest(9337) == 0) {
+ cutin "fenrir_a.bmp",2;
+ mes "[Fenrith Fenrir]";
+ mes "You arrived safely!";
+ mes "The dangerous situation";
+ mes "had me worried.";
+ mes "It was difficult and dangerous work";
+ mes "so I am grateful for your help.";
+ next;
+ mes "[Fenrir]";
+ mes "I feel we will meet again";
+ mes "but perhaps it is just my imagination?";
+ mes "Mm.. that would be nice.";
+ next;
+ mes "[Fenrir]";
+ mes "We worked well together";
+ mes "so I hope we will meet again.";
+ mes "And watch for Sarah,";
+ mes "harm can come your way as well.";
+ setquest 9337;// Wrapping up the Adventure
+ getitem 607,1;// Yggdrasilberry
+ getitem 608,1;// Seed_Of_Yggdrasil
+ close2;
+ cutin "",255;
+ end;
+ }
+ mes "[Fenrir]";
+ mes "We worked well together";
+ mes "so I hope we will meet again.";
+ close;
+}
+
+1@glast,353,290,8 duplicate(#effect_glast_event01_1) Sarah Irene's alter ego 4_F_SARAH
+
+// Shards Events
+1@glast,290,147,4 script Ancient Gigantes#glast_1 4_GIGANTES_BIG,6,6,{
+ end;
+OnTouch:
+ disablenpc instance_npcname("Ancient Gigantes#glast_1");
+ .@label$ = instance_npcname("Ancient Gigantes#glast_1") + "::OnMobDead";
+ monster 'map_glast$,290,147, "Ancient Gigantes#X1",3196,1, .@label$; // MM_L_GIGAN3
+ monster 'map_glast$,290,146, "Ancient Medium Gigantes",3193,1, .@label$; // MM_M_GIGAN3
+ monster 'map_glast$,288,147, "Ancient Medium Gigantes",3193,1, .@label$; // MM_M_GIGAN3
+ unittalk getcharid(3), "" + strcharinfo(0) + " : The Ancient Gigantes that Professor Bernhard spoke of!!";
+ enablenpc instance_npcname("Stone Gargoyle#glast_01");
+ enablenpc instance_npcname("Stone Gargoyle#glast_02");
+ enablenpc instance_npcname("Stone Gargoyle#glast_03");
+ enablenpc instance_npcname("Stone Gargoyle#glast_04");
+ enablenpc instance_npcname("Stone Gargoyle#glast_05");
+ enablenpc instance_npcname("Stone Gargoyle#glast_06");
+ end;
+OnMobDead:
+ end;
+}
+
+1@glast,300,248,4 script Ancient Gigantes#glast_2 4_GIGANTES_BIG,4,4,{
+ end;
+OnTouch:
+ disablenpc instance_npcname("Ancient Gigantes#glast_2");
+ .@label$ = instance_npcname("Ancient Gigantes#glast_2") + "::OnMobDead";
+ monster 'map_glast$,300,248, "Ancient Gigantes#X2",3196,1, .@label$; // MM_L_GIGAN3
+ monster 'map_glast$,299,250, "Ancient Medium Gigantes",3193,1, .@label$; // MM_M_GIGAN3
+ monster 'map_glast$,302,246, "Ancient Medium Gigantes",3193,1, .@label$; // MM_M_GIGAN3
+ unittalk getcharid(3), "" + strcharinfo(0) + " : The Ancient Gigantes that Professor Bernhard spoke of!!";
+ enablenpc instance_npcname("Stone Gargoyle#glast_07");
+ enablenpc instance_npcname("Stone Gargoyle#glast_08");
+ enablenpc instance_npcname("Stone Gargoyle#glast_09");
+ enablenpc instance_npcname("Stone Gargoyle#glast_10");
+ enablenpc instance_npcname("Stone Gargoyle#glast_11");
+ end;
+OnMobDead:
+ end;
+}
+
+1@glast,292,344,4 script Ancient Gigantes#glast_3 4_GIGANTES_BIG,6,6,{
+ end;
+OnTouch:
+ disablenpc instance_npcname("Ancient Gigantes#glast_3");
+ .@label$ = instance_npcname("Ancient Gigantes#glast_3") + "::OnMobDead";
+ monster 'map_glast$,292,344, "Ancient Gigantes#X3",3196,1, .@label$; // MM_L_GIGAN3
+ monster 'map_glast$,290,346, "Ancient Medium Gigantes",3193,1, .@label$; // MM_M_GIGAN3
+ monster 'map_glast$,291,344, "Ancient Medium Gigantes",3193,1, .@label$; // MM_M_GIGAN3
+ unittalk getcharid(3), "" + strcharinfo(0) + " : The Ancient Gigantes that Professor Bernhard spoke of!!";
+ enablenpc instance_npcname("Stone Gargoyle#glast_12");
+ enablenpc instance_npcname("Stone Gargoyle#glast_13");
+ enablenpc instance_npcname("Stone Gargoyle#glast_14");
+ end;
+OnMobDead:
+ end;
+}
+
+1@glast,107,147,6 script Ancient Gigantes#glast_4 4_GIGANTES_BIG,6,6,{
+ end;
+OnTouch:
+ disablenpc instance_npcname("Ancient Gigantes#glast_4");
+ .@label$ = instance_npcname("Ancient Gigantes#glast_4") + "::OnMobDead";
+ monster 'map_glast$,107,147, "Ancient Gigantes#X4",3196,1, .@label$; // MM_L_GIGAN3
+ monster 'map_glast$,107,145, "Ancient Medium Gigantes",3193,1, .@label$; // MM_M_GIGAN3
+ monster 'map_glast$,106,148, "Ancient Medium Gigantes",3193,1, .@label$; // MM_M_GIGAN3
+ unittalk getcharid(3), "" + strcharinfo(0) + " : The Ancient Gigantes that Professor Bernhard spoke of!!";
+ enablenpc instance_npcname("Stone Gargoyle#glast_15");
+ enablenpc instance_npcname("Stone Gargoyle#glast_16");
+ enablenpc instance_npcname("Stone Gargoyle#glast_17");
+ enablenpc instance_npcname("Stone Gargoyle#glast_18");
+ enablenpc instance_npcname("Stone Gargoyle#glast_19");
+ enablenpc instance_npcname("Stone Gargoyle#glast_20");
+ end;
+OnMobDead:
+ end;
+}
+
+1@glast,98,248,6 script Ancient Gigantes#glast_5 4_GIGANTES_BIG,4,4,{
+ end;
+OnTouch:
+ disablenpc instance_npcname("Ancient Gigantes#glast_5");
+ .@label$ = instance_npcname("Ancient Gigantes#glast_5") + "::OnMobDead";
+ monster 'map_glast$,98,248, "Ancient Gigantes#X5",3196,1, .@label$; // MM_L_GIGAN3
+ monster 'map_glast$,96,250, "Ancient Medium Gigantes",3193,1, .@label$; // MM_M_GIGAN3
+ monster 'map_glast$,98,247, "Ancient Medium Gigantes",3193,1, .@label$; // MM_M_GIGAN3
+ unittalk getcharid(3), "" + strcharinfo(0) + " : The Ancient Gigantes that Professor Bernhard spoke of!!";
+ enablenpc instance_npcname("Stone Gargoyle#glast_21");
+ enablenpc instance_npcname("Stone Gargoyle#glast_22");
+ enablenpc instance_npcname("Stone Gargoyle#glast_23");
+ enablenpc instance_npcname("Stone Gargoyle#glast_24");
+ enablenpc instance_npcname("Stone Gargoyle#glast_25");
+ end;
+OnMobDead:
+ end;
+}
+
+1@glast,107,344,6 script Ancient Gigantes#glast_6 4_GIGANTES_BIG,6,6,{
+ end;
+OnTouch:
+ disablenpc instance_npcname("Ancient Gigantes#glast_6");
+ .@label$ = instance_npcname("Ancient Gigantes#glast_6") + "::OnMobDead";
+ monster 'map_glast$,107,344, "Ancient Gigantes#X6",3196,1, .@label$; // MM_L_GIGAN3
+ monster 'map_glast$,107,344, "Ancient Medium Gigantes",3193,1, .@label$; // MM_M_GIGAN3
+ monster 'map_glast$,109,346, "Ancient Medium Gigantes",3193,1, .@label$; // MM_M_GIGAN3
+ unittalk getcharid(3), "" + strcharinfo(0) + " : The Ancient Gigantes that Professor Bernhard spoke of!!";
+ enablenpc instance_npcname("Stone Gargoyle#glast_26");
+ enablenpc instance_npcname("Stone Gargoyle#glast_27");
+ enablenpc instance_npcname("Stone Gargoyle#glast_28");
+ end;
+OnMobDead:
+ end;
+}
+
+1@glast,277,130,8 script Stone Gargoyle#glast_01 4_GARGOYLE_STATUE,2,2,{
+ end;
+OnTouch:
+ getmapxy .@map$,.@x,.@y, UNITTYPE_NPC;
+ monster .@map$,.@x,.@y, "Mutant Gargoyle",3197,1, instance_npcname( strnpcinfo(0) ) + "::OnMobDead"; // MM_M_GARGOYLE
+ disablenpc instance_npcname( strnpcinfo(0) );
+ end;
+OnMobDead:
+ end;
+}
+
+1@glast,279,130,8 duplicate(Stone Gargoyle#glast_01) Stone Gargoyle#glast_02 4_GARGOYLE_STATUE,2,2
+1@glast,281,130,8 duplicate(Stone Gargoyle#glast_01) Stone Gargoyle#glast_03 4_GARGOYLE_STATUE,2,2
+1@glast,277,161,6 duplicate(Stone Gargoyle#glast_01) Stone Gargoyle#glast_04 4_GARGOYLE_STATUE,2,2
+1@glast,279,161,6 duplicate(Stone Gargoyle#glast_01) Stone Gargoyle#glast_05 4_GARGOYLE_STATUE,2,2
+1@glast,281,161,6 duplicate(Stone Gargoyle#glast_01) Stone Gargoyle#glast_06 4_GARGOYLE_STATUE,2,2
+1@glast,277,250,6 duplicate(Stone Gargoyle#glast_01) Stone Gargoyle#glast_07 4_GARGOYLE_STATUE,2,2
+1@glast,277,245,8 duplicate(Stone Gargoyle#glast_01) Stone Gargoyle#glast_08 4_GARGOYLE_STATUE,2,2
+1@glast,272,248,6 duplicate(Stone Gargoyle#glast_01) Stone Gargoyle#glast_09 4_GARGOYLE_STATUE,2,2
+1@glast,273,260,4 duplicate(Stone Gargoyle#glast_01) Stone Gargoyle#glast_10 4_GARGOYLE_STATUE,2,2
+1@glast,273,235,2 duplicate(Stone Gargoyle#glast_01) Stone Gargoyle#glast_11 4_GARGOYLE_STATUE,2,2
+1@glast,277,328,8 duplicate(Stone Gargoyle#glast_01) Stone Gargoyle#glast_12 4_GARGOYLE_STATUE,2,2
+1@glast,279,328,8 duplicate(Stone Gargoyle#glast_01) Stone Gargoyle#glast_13 4_GARGOYLE_STATUE,2,2
+1@glast,281,328,8 duplicate(Stone Gargoyle#glast_01) Stone Gargoyle#glast_14 4_GARGOYLE_STATUE,2,2
+1@glast,122,132,2 duplicate(Stone Gargoyle#glast_01) Stone Gargoyle#glast_15 4_GARGOYLE_STATUE,2,2
+1@glast,120,132,2 duplicate(Stone Gargoyle#glast_01) Stone Gargoyle#glast_16 4_GARGOYLE_STATUE,2,2
+1@glast,118,132,2 duplicate(Stone Gargoyle#glast_01) Stone Gargoyle#glast_17 4_GARGOYLE_STATUE,2,2
+1@glast,118,163,4 duplicate(Stone Gargoyle#glast_01) Stone Gargoyle#glast_18 4_GARGOYLE_STATUE,2,2
+1@glast,120,163,4 duplicate(Stone Gargoyle#glast_01) Stone Gargoyle#glast_19 4_GARGOYLE_STATUE,2,2
+1@glast,118,163,4 duplicate(Stone Gargoyle#glast_01) Stone Gargoyle#glast_20 4_GARGOYLE_STATUE,2,2
+1@glast,122,250,4 duplicate(Stone Gargoyle#glast_01) Stone Gargoyle#glast_21 4_GARGOYLE_STATUE,2,2
+1@glast,122,245,2 duplicate(Stone Gargoyle#glast_01) Stone Gargoyle#glast_22 4_GARGOYLE_STATUE,2,2
+1@glast,126,248,4 duplicate(Stone Gargoyle#glast_01) Stone Gargoyle#glast_23 4_GARGOYLE_STATUE,2,2
+1@glast,126,260,6 duplicate(Stone Gargoyle#glast_01) Stone Gargoyle#glast_24 4_GARGOYLE_STATUE,2,2
+1@glast,126,235,8 duplicate(Stone Gargoyle#glast_01) Stone Gargoyle#glast_25 4_GARGOYLE_STATUE,2,2
+1@glast,117,328,2 duplicate(Stone Gargoyle#glast_01) Stone Gargoyle#glast_26 4_GARGOYLE_STATUE,2,2
+1@glast,119,328,2 duplicate(Stone Gargoyle#glast_01) Stone Gargoyle#glast_27 4_GARGOYLE_STATUE,2,2
+1@glast,121,328,2 duplicate(Stone Gargoyle#glast_01) Stone Gargoyle#glast_28 4_GARGOYLE_STATUE,2,2
+
+
+1@glast,1,1,0 script #fenrir_spawn_chimera HIDDEN_WARP_NPC,{
+ end;
+OnSpawn:
+ // Right side
+ monster 'map_glast$,351,259,"Wicked Chimera#bb28",3200,1;
+ monster 'map_glast$,353,250,"Wicked Chimera#bb28",3200,1;
+ monster 'map_glast$,351,243,"Wicked Chimera#bb28",3200,1;
+ monster 'map_glast$,351,246,"Wicked Chimera#bb28",3200,1;
+ monster 'map_glast$,355,248,"Wicked Chimera#bb28",3200,1;
+ monster 'map_glast$,360,245,"Wicked Chimera#bb28",3200,1;
+
+ monster 'map_glast$,298,209,"Wicked Chimera#aa14",3200,1;
+ monster 'map_glast$,303,199,"Wicked Chimera#aa14",3200,1;
+ monster 'map_glast$,298,198,"Wicked Chimera#aa14",3200,1;
+ monster 'map_glast$,295,211,"Wicked Chimera#aa14",3200,1;
+
+ monster 'map_glast$,307,163,"Wicked Chimera#bb15",3200,1;
+ monster 'map_glast$,315,158,"Wicked Chimera#bb15",3200,1;
+ monster 'map_glast$,318,163,"Wicked Chimera#bb15",3200,1;
+ monster 'map_glast$,318,169,"Wicked Chimera#bb15",3200,1;
+
+ monster 'map_glast$,337,119,"Wicked Chimera#bb27",3200,1;
+ monster 'map_glast$,344,115,"Wicked Chimera#bb27",3200,1;
+ monster 'map_glast$,353,117,"Wicked Chimera#bb27",3200,1;
+ monster 'map_glast$,352,121,"Wicked Chimera#bb27",3200,1;
+ monster 'map_glast$,345,114,"Wicked Chimera#bb27",3200,1;
+ monster 'map_glast$,346,115,"Wicked Chimera#bb27",3200,1;
+
+ monster 'map_glast$,264,36,"Wicked Chimera#aa26",3200,1;
+ monster 'map_glast$,257,46,"Wicked Chimera#aa26",3200,1;
+ monster 'map_glast$,253,44,"Wicked Chimera#aa26",3200,1;
+ monster 'map_glast$,256,39,"Wicked Chimera#aa26",3200,1;
+
+ // Bottom, left
+ monster 'map_glast$,207,46,"Wicked Chimera#aa1",3200,1;
+ monster 'map_glast$,197,49,"Wicked Chimera#aa1",3200,1;
+ monster 'map_glast$,190,52,"Wicked Chimera#aa1",3200,1;
+ monster 'map_glast$,200,64,"Wicked Chimera#aa1",3200,1;
+ monster 'map_glast$,206,76,"Wicked Chimera#aa2",3200,1;
+ monster 'map_glast$,207,83,"Wicked Chimera#aa2",3200,1;
+ monster 'map_glast$,186,82,"Wicked Chimera#bb3",3200,1;
+ monster 'map_glast$,200,87,"Wicked Chimera#aa2",3200,1;
+ monster 'map_glast$,188,86,"Wicked Chimera#bb3",3200,1;
+ monster 'map_glast$,215,77,"Wicked Chimera#aa2",3200,1;
+ monster 'map_glast$,183,90,"Wicked Chimera#bb3",3200,1;
+ monster 'map_glast$,192,85,"Wicked Chimera#bb3",3200,1;
+ monster 'map_glast$,154,36,"Wicked Chimera#bb35",3200,1;
+ monster 'map_glast$,150,47,"Wicked Chimera#bb35",3200,1;
+ monster 'map_glast$,138,52,"Wicked Chimera#bb35",3200,1;
+ monster 'map_glast$,152,36,"Wicked Chimera#bb35",3200,1;
+ monster 'map_glast$,105,50,"Wicked Chimera#aa34",3200,1;
+ monster 'map_glast$,100,48,"Wicked Chimera#aa34",3200,1;
+ monster 'map_glast$,106,52,"Wicked Chimera#aa34",3200,1;
+ monster 'map_glast$,82,52,"Wicked Chimera#aa33",3200,1;
+ monster 'map_glast$,85,51,"Wicked Chimera#aa33",3200,1;
+ monster 'map_glast$,80,65,"Wicked Chimera#aa33",3200,1;
+ monster 'map_glast$,79,58,"Wicked Chimera#aa33",3200,1;
+ monster 'map_glast$,82,69,"Wicked Chimera#aa33",3200,1;
+ monster 'map_glast$,97,41,"Wicked Chimera#aa34",3200,1;
+ monster 'map_glast$,86,103,"Wicked Chimera#bb32",3200,1;
+ monster 'map_glast$,82,102,"Wicked Chimera#bb32",3200,1;
+ monster 'map_glast$,78,108,"Wicked Chimera#bb32",3200,1;
+ monster 'map_glast$,85,109,"Wicked Chimera#bb32",3200,1;
+ monster 'map_glast$,82,111,"Wicked Chimera#bb32",3200,1;
+ monster 'map_glast$,80,144,"Wicked Chimera#bb31",3200,1;
+ monster 'map_glast$,72,152,"Wicked Chimera#bb31",3200,1;
+ monster 'map_glast$,88,159,"Wicked Chimera#bb31",3200,1;
+ monster 'map_glast$,73,152,"Wicked Chimera#bb31",3200,1;
+ monster 'map_glast$,83,160,"Wicked Chimera#bb31",3200,1;
+ monster 'map_glast$,77,150,"Wicked Chimera#bb31",3200,1;
+ monster 'map_glast$,62,207,"Wicked Chimera#aa30",3200,1;
+ monster 'map_glast$,70,215,"Wicked Chimera#aa30",3200,1;
+ monster 'map_glast$,58,209,"Wicked Chimera#aa30",3200,1;
+ monster 'map_glast$,68,204,"Wicked Chimera#aa30",3200,1;
+ monster 'map_glast$,67,214,"Wicked Chimera#aa30",3200,1;
+ monster 'map_glast$,58,250,"Wicked Chimera#aa29",3200,1;
+ monster 'map_glast$,64,257,"Wicked Chimera#aa29",3200,1;
+ monster 'map_glast$,70,251,"Wicked Chimera#aa29",3200,1;
+ monster 'map_glast$,65,247,"Wicked Chimera#aa29",3200,1;
+ monster 'map_glast$,65,256,"Wicked Chimera#aa29",3200,1;
+ monster 'map_glast$,60,255,"Wicked Chimera#aa29",3200,1;
+ monster 'map_glast$,50,144,"Wicked Chimera#bb36",3200,1;
+ monster 'map_glast$,52,143,"Wicked Chimera#bb36",3200,1;
+ monster 'map_glast$,54,146,"Wicked Chimera#bb36",3200,1;
+ monster 'map_glast$,55,140,"Wicked Chimera#bb36",3200,1;
+
+ // Left inside
+ monster 'map_glast$,177,88,"Wicked Chimera#bb4",3200,1;
+ monster 'map_glast$,163,108,"Wicked Chimera#bb4",3200,1;
+ monster 'map_glast$,147,113,"Wicked Chimera#bb4",3200,1;
+ monster 'map_glast$,136,179,"Wicked Chimera#bb11",3200,1;
+ monster 'map_glast$,136,181,"Wicked Chimera#bb11",3200,1;
+ monster 'map_glast$,125,190,"Wicked Chimera#bb11",3200,1;
+ monster 'map_glast$,134,200,"Wicked Chimera#bb12",3200,1;
+ monster 'map_glast$,134,190,"Wicked Chimera#bb11",3200,1;
+ monster 'map_glast$,127,203,"Wicked Chimera#bb12",3200,1;
+ monster 'map_glast$,151,206,"Wicked Chimera#aa13",3200,1;
+ monster 'map_glast$,125,209,"Wicked Chimera#bb12",3200,1;
+ monster 'map_glast$,134,204,"Wicked Chimera#bb12",3200,1;
+ monster 'map_glast$,135,244,"Wicked Chimera#bb19",3200,1;
+ monster 'map_glast$,149,250,"Wicked Chimera#bb19",3200,1;
+ monster 'map_glast$,138,249,"Wicked Chimera#bb19",3200,1;
+ monster 'map_glast$,136,251,"Wicked Chimera#bb19",3200,1;
+ monster 'map_glast$,127,291,"Wicked Chimera#bb20",3200,1;
+ monster 'map_glast$,126,288,"Wicked Chimera#bb20",3200,1;
+ monster 'map_glast$,124,291,"Wicked Chimera#bb20",3200,1;
+ monster 'map_glast$,135,309,"Wicked Chimera#aa21",3200,1;
+ monster 'map_glast$,138,316,"Wicked Chimera#aa21",3200,1;
+ monster 'map_glast$,139,324,"Wicked Chimera#aa22",3200,1;
+ monster 'map_glast$,132,331,"Wicked Chimera#aa22",3200,1;
+ monster 'map_glast$,129,315,"Wicked Chimera#aa21",3200,1;
+ monster 'map_glast$,127,338,"Wicked Chimera#aa22",3200,1;
+ monster 'map_glast$,126,327,"Wicked Chimera#aa22",3200,1;
+ monster 'map_glast$,132,288,"Wicked Chimera#bb20",3200,1;
+ monster 'map_glast$,138,309,"Wicked Chimera#aa21",3200,1;
+
+ // Center and right side
+ monster 'map_glast$,158,214,"Wicked Chimera#aa13",3200,1;
+ monster 'map_glast$,162,208,"Wicked Chimera#aa13",3200,1;
+ monster 'map_glast$,166,215,"Wicked Chimera#aa13",3200,1;
+ monster 'map_glast$,168,191,"Wicked Chimera#aa10",3200,1;
+ monster 'map_glast$,164,186,"Wicked Chimera#aa10",3200,1;
+ monster 'map_glast$,165,191,"Wicked Chimera#aa10",3200,1;
+ monster 'map_glast$,177,189,"Wicked Chimera#aa10",3200,1;
+ monster 'map_glast$,199,200,"Wicked Chimera#aa9",3200,1;
+ monster 'map_glast$,205,195,"Wicked Chimera#aa9",3200,1;
+ monster 'map_glast$,191,200,"Wicked Chimera#aa9",3200,1;
+ monster 'map_glast$,196,192,"Wicked Chimera#aa9",3200,1;
+ monster 'map_glast$,224,196,"Wicked Chimera#bb8",3200,1;
+ monster 'map_glast$,233,196,"Wicked Chimera#bb8",3200,1;
+ monster 'map_glast$,239,192,"Wicked Chimera#bb8",3200,1;
+ monster 'map_glast$,231,193,"Wicked Chimera#bb8",3200,1;
+ monster 'map_glast$,239,214,"Wicked Chimera#bb16",3200,1;
+ monster 'map_glast$,232,213,"Wicked Chimera#bb16",3200,1;
+ monster 'map_glast$,238,209,"Wicked Chimera#bb16",3200,1;
+ monster 'map_glast$,244,220,"Wicked Chimera#bb16",3200,1;
+ monster 'map_glast$,252,249,"Wicked Chimera#aa18",3200,1;
+ monster 'map_glast$,268,221,"Wicked Chimera#aa17",3200,1;
+ monster 'map_glast$,261,219,"Wicked Chimera#aa17",3200,1;
+ monster 'map_glast$,261,248,"Wicked Chimera#aa18",3200,1;
+ monster 'map_glast$,264,211,"Wicked Chimera#aa17",3200,1;
+ monster 'map_glast$,267,210,"Wicked Chimera#aa17",3200,1;
+ monster 'map_glast$,258,193,"Wicked Chimera#bb7",3200,1;
+ monster 'map_glast$,258,192,"Wicked Chimera#bb7",3200,1;
+ monster 'map_glast$,258,190,"Wicked Chimera#bb7",3200,1;
+ monster 'map_glast$,269,192,"Wicked Chimera#bb7",3200,1;
+ monster 'map_glast$,269,110,"Wicked Chimera#aa6",3200,1;
+ monster 'map_glast$,266,105,"Wicked Chimera#aa6",3200,1;
+ monster 'map_glast$,277,103,"Wicked Chimera#aa6",3200,1;
+ monster 'map_glast$,263,107,"Wicked Chimera#aa6",3200,1;
+ monster 'map_glast$,249,101,"Wicked Chimera#aa5",3200,1;
+ monster 'map_glast$,237,93,"Wicked Chimera#aa5",3200,1;
+ monster 'map_glast$,242,107,"Wicked Chimera#aa5",3200,1;
+ monster 'map_glast$,237,105,"Wicked Chimera#aa5",3200,1;
+ monster 'map_glast$,264,235,"Wicked Chimera#aa18",3200,1;
+ monster 'map_glast$,260,255,"Wicked Chimera#aa18",3200,1;
+ monster 'map_glast$,261,282,"Wicked Chimera#bb23",3200,1;
+ monster 'map_glast$,260,284,"Wicked Chimera#bb23",3200,1;
+ monster 'map_glast$,264,289,"Wicked Chimera#bb23",3200,1;
+ monster 'map_glast$,268,301,"Wicked Chimera#bb24",3200,1;
+ monster 'map_glast$,262,308,"Wicked Chimera#bb24",3200,1;
+ monster 'map_glast$,273,306,"Wicked Chimera#bb24",3200,1;
+ monster 'map_glast$,259,307,"Wicked Chimera#bb24",3200,1;
+ monster 'map_glast$,269,283,"Wicked Chimera#bb23",3200,1;
+ monster 'map_glast$,257,350,"Wicked Chimera#aa25",3200,1;
+ monster 'map_glast$,268,350,"Wicked Chimera#aa25",3200,1;
+ monster 'map_glast$,268,357,"Wicked Chimera#aa25",3200,1;
+ monster 'map_glast$,271,358,"Wicked Chimera#aa25",3200,1;
+ end;
+
+OnInstanceInit:
+ 'skip_left_part = 0;
+ 'back_to_entrance = 0;
+ 'map_glast$ = instance_mapname("1@glast");
+ 'fenrir_1$ = instance_npcname("Fenrith Fenrir#glast_01");
+ 'fenrir_2$ = instance_npcname("Fenrith Fenrir#glast_02");
+ 'fenrir_3$ = instance_npcname("Fenrith Fenrir#glast_03");
+ 'fenrir_4$ = instance_npcname("Fenrith Fenrir#glast_04");
+ 'fenrir_5$ = instance_npcname("Fenrith Fenrir#glast_05");
+ 'fenrir_6$ = instance_npcname("Fenrith Fenrir#glast_06");
+ 'fenrir_7$ = instance_npcname("Fenrith Fenrir#glast_07");
+ 'fenrir_8$ = instance_npcname("Fenrith Fenrir#glast_08");
+ 'fenrir_9$ = instance_npcname("Fenrith Fenrir#glast_09");
+ 'fenrir_10$ = instance_npcname("Fenrith Fenrir#glast_10");
+ 'fenrir_11$ = instance_npcname("Fenrith Fenrir#glast_11");
+ 'sarah_10$ = instance_npcname("Sarah Irene#glast_10");
+ 'sarah_17$ = instance_npcname("Sarah Irene#glast_17");
+ 'sarah_20$ = instance_npcname("Sarah Irene#glast_20");
+ 'sarah_ego$ = instance_npcname("Sarah Irene's alter ego");
+
+ // Entrance
+ disablenpc instance_npcname("#glast_event_3");
+ for ( .@i = 1; .@i < 8; .@i++ )
+ hideonnpc instance_npcname("#effect_glast_event01_" + .@i);
+ disablenpc instance_npcname("#glast_move_01");
+
+ // Fenrir bottom
+ disablenpc instance_npcname("#glast_event_5");
+ disablenpc 'fenrir_2$;
+
+ // Fenrir left side, entrance
+ disablenpc instance_npcname("#glast_event_7");
+ disablenpc 'fenrir_3$;
+
+ // Fenrir left side, inside
+ disablenpc 'fenrir_4$;
+ disablenpc 'sarah_10$;
+ disablenpc instance_npcname("Gigantes#semi1");
+ disablenpc instance_npcname("Gigantes#semi2");
+ disablenpc instance_npcname("#glast_event_9");
+ for ( .@i = 1; .@i < 9; .@i++ )
+ hideonnpc instance_npcname("#effect_glast_event02_" + .@i);
+ hideonnpc instance_npcname("#effect_glast_event02_bis");
+ //for ( .@i = 1; .@i < 8; .@i++ )
+ // disablenpc instance_npcname("#glast_event_warp_" + .@i);
+ disablenpc instance_npcname("#fenrir_left_vermilion");
+ disablenpc instance_npcname("#fenrir_left_final_1");
+
+ // Event top side
+ disablenpc instance_npcname("#glast_event_13");
+ disablenpc 'fenrir_5$;
+
+ // Skipped left side
+ disablenpc instance_npcname("#fenrir_left_final_2");
+
+ // Stairs final room
+ disablenpc instance_npcname("#glast_move_03");
+ disablenpc instance_npcname("#glast_event_15");
+ disablenpc 'fenrir_6$;
+
+ // Final room
+ disablenpc instance_npcname("#glast_move_03a");
+ disablenpc instance_npcname("#glast_event_18");
+ disablenpc instance_npcname("Sarah Irene#glast_17");
+ disablenpc 'sarah_20$;
+ disablenpc 'fenrir_7$;
+ disablenpc 'fenrir_8$;
+ disablenpc 'fenrir_9$;
+ //for ( .@i = 11; .@i <= 16; .@i++ )
+ // disablenpc instance_npcname("#glast_event_warp_" + .@i);
+ for ( .@i = 1; .@i <= 8; .@i++ )
+ hideonnpc instance_npcname("#effect_glast_event03_" + .@i);
+ disablenpc instance_npcname("#glast_event_19");
+ disablenpc instance_npcname("#fenrir_boss_final_1");
+
+ // Outside final room
+ disablenpc instance_npcname("#glast_event_24");
+ disablenpc 'fenrir_10$;
+
+ // Skipped final room
+ disablenpc instance_npcname("#fenrir_boss_final_2");
+
+ // Bombs
+ disablenpc instance_npcname("#sarah_wrath");
+ for ( .@i = 1; .@i <= 14; .@i++ )
+ disablenpc instance_npcname("#glast_bomb_" + (.@i < 10 ? ("0"+.@i) : .@i));
+
+ // Back to entrance
+ disablenpc instance_npcname("Sarah Irene's alter ego");
+ disablenpc 'fenrir_11$;
+ disablenpc instance_npcname("#glast_move_04");
+ disablenpc instance_npcname("#glast_move_05");
+
+ // Shards
+ for ( .@i = 1; .@i < 7; .@i++ )
+ disablenpc instance_npcname("Ancient Gigantes#glast_" + .@i);
+ for ( .@i = 1; .@i < 29; .@i++ )
+ disablenpc instance_npcname( "Stone Gargoyle#glast_" + (.@i < 10 ? ("0"+.@i) : .@i) );
+
+ // Spawn chimera
+ donpcevent instance_npcname("#fenrir_spawn_chimera") + "::OnSpawn";
+ end;
+}
diff --git a/npc/re/instances/WolfchevLaboratory.txt b/npc/re/instances/WolfchevLaboratory.txt
index e3875ca462d..12ee8d3cbe7 100644
--- a/npc/re/instances/WolfchevLaboratory.txt
+++ b/npc/re/instances/WolfchevLaboratory.txt
@@ -24,7 +24,7 @@ lighthalzen,303,303,6 script Giacomo Girolamo#kiup2 4_M_KHMAN,3,3,{
if (lhz_boss > 30) {
if (!lght_duk01) {
if (Sex == SEX_MALE) {
- emotion e_pif, "Giacomo Girolamo#kiup2";
+ emotion ET_HNG;
mes "[Giacomo Girolamo]";
mes "....a guy....?";
next;
@@ -32,33 +32,33 @@ lighthalzen,303,303,6 script Giacomo Girolamo#kiup2 4_M_KHMAN,3,3,{
mes "Ah! Hey! Man!";
next;
select("What's up?");
- emotion e_what, 1;
+ emotion ET_QUESTION, playerattached();
mes "[Giacomo Girolamo]";
mes "Have you ever heard of horrific human experimentation committed in Rekenber Corporation whose head office is here in Lighthalzen?";
next;
select("Whaaat?! human experimentation?");
- emotion e_omg, 1;
+ emotion ET_HUK, playerattached();
mes "[Giacomo Girolamo]";
mes "Yea! human experimentation!!";
mes "There are a lot of rumors that horrible human experimentation is actually performed, but these people in the slum....don't want to believe that due to the welfare movement from Rekenber.";
next;
- emotion e_swt2, "Giacomo Girolamo#kiup2";
+ emotion ET_PROFUSELY_SWEAT;
mes "[Giacomo Girolamo]";
mes "Well! and those rich people, seem to know something but they never mention that...";
next;
mes "[Giacomo Girolamo]";
mes "Ahh!! And this is a secret that just SOME PEOPLE know. I heard that from Rekenber Lab.,.. a person named...um...Wol....";
next;
- emotion e_hmm, "Giacomo Girolamo#kiup2";
+ emotion ET_SCRATCH;
mes "[Giacomo Girolamo]";
mes "Anyway!! A scientist named Wolf.. something suddenly got sacked. and he must be related with this rumor, I think...";
next;
select("You mean... Wolfchev?");
- emotion e_gasp, "Giacomo Girolamo#kiup2";
+ emotion ET_SURPRISE;
mes "[Giacomo Girolamo]";
mes "Ohhhh?! yeah Wolfchev!! That's right, the name was Wolfchev.. The mad scientist..";
next;
- emotion e_ok, "Giacomo Girolamo#kiup2";
+ emotion ET_OK;
mes "[Giacomo Girolamo]";
mes "I suppose you can then understand the story faster... I am sure that he's involved in the rumor. I swear.";
next;
@@ -76,16 +76,16 @@ lighthalzen,303,303,6 script Giacomo Girolamo#kiup2 4_M_KHMAN,3,3,{
mes "["+ strcharinfo(0) +"]";
mes "He happens to research into Human 'Homunculus' without telling that to Rekenber Corp., and there was a whistle-blower who reported to the corp. so he was fired.";
next;
- emotion e_no1, "Giacomo Girolamo#kiup2";
+ emotion ET_BEST;
mes "[Giacomo Girolamo]";
mes "Oh! Man..! You seem to know pretty much! By any chance, are you concerned with Rekenber??";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "["+ strcharinfo(0) +"]";
mes "... .... ...";
next;
}
- emotion e_hmm, "Giacomo Girolamo#kiup2";
+ emotion ET_SCRATCH;
mes "[Giacomo Girolamo]";
mes "Don't worry. I didn't mean anything.";
next;
@@ -99,11 +99,11 @@ lighthalzen,303,303,6 script Giacomo Girolamo#kiup2 4_M_KHMAN,3,3,{
mes "Should investigate the lab where the experiment was carried out.";
close;
} else {
- emotion e_lv, "Giacomo Girolamo#kiup2";
+ emotion ET_THROB;
mes "[Giacomo Girolamo]";
mes "Oh! What a beautiful lady!!";
next;
- emotion e_what, "Giacomo Girolamo#kiup2";
+ emotion ET_QUESTION;
mes "[Giacomo Girolamo]";
mes "How come a beauty is here, in a place with dangerous rumor?";
next;
@@ -129,12 +129,12 @@ lighthalzen,303,303,6 script Giacomo Girolamo#kiup2 4_M_KHMAN,3,3,{
mes "[Giacomo Girolamo]";
mes "Well, how dare I ask you and be interested in what the lady does...";
next;
- emotion e_ok, "Giacomo Girolamo#kiup2";
+ emotion ET_OK;
mes "[Giacomo Girolamo]";
mes "I just hope that the lady gets out of this town with dangerous rumors..";
next;
select("Dangerous rumors?");
- emotion e_what, 1;
+ emotion ET_QUESTION, playerattached();
mes "[Giacomo Girolamo]";
mes "Ah... Lady may not have heard of the rumor.";
next;
@@ -145,7 +145,7 @@ lighthalzen,303,303,6 script Giacomo Girolamo#kiup2 4_M_KHMAN,3,3,{
mes "and then the rumor came up, since disappearance cases happen pretty often, that Rekenber is committing a horrible human experimentation in their secret lab.";
next;
select("Excuse me?! human experimentation?");
- emotion e_omg, 1;
+ emotion ET_HUK, playerattached();
mes "[Giacomo Girolamo]";
mes "Yea! human experimentation!!";
mes "There are a lot of rumors that horrible human experimentation is actually performed, but these people in the slum....don't want to believe that due to the welfare movement from Rekenber.";
@@ -167,33 +167,33 @@ lighthalzen,303,303,6 script Giacomo Girolamo#kiup2 4_M_KHMAN,3,3,{
} else {
mes "[Giacomo Girolamo]";
if (Sex == SEX_MALE) {
- emotion e_paper, "Giacomo Girolamo#kiup2";
+ emotion ET_WRAP;
mes "Take care yourself and don't disappear!";
} else {
- emotion e_lv2, "Giacomo Girolamo#kiup2";
+ emotion ET_BIGTHROB;
mes "Be careful, Lady.";
}
close;
}
} else {
if (Sex == SEX_MALE) {
- emotion e_ho, "Giacomo Girolamo#kiup2";
+ emotion ET_DELIGHT;
mes "[Giacomo Girolamo]";
mes "Only those beautiful ladies are the reason of my life~!";
mes "I, Giacomo Girolamo Casanova de Seingalt am never interested in guys like you though!!";
next;
- emotion e_an, "Giacomo Girolamo#kiup2";
+ emotion ET_FRET;
mes "[Giacomo Girolamo]";
mes "but I can listen to you...you wanna say anything to me?";
next;
switch(select("No..?", "About ladies..", "You Womanizer!!", "Envy you...", "What's the rumor lately?")) {
case 1:
- emotion e_hmm, "Giacomo Girolamo#kiup2";
+ emotion ET_SCRATCH;
mes "[Giacomo Girolamo]";
mes "Hey you, get out of my way then..";
close;
case 2:
- emotion e_an, "Giacomo Girolamo#kiup2";
+ emotion ET_FRET;
mes "[Giacomo Girolamo]";
mes "I don't feel like talking about my precious ladies making fun of them. You do it with your friends.";
close;
@@ -201,19 +201,19 @@ lighthalzen,303,303,6 script Giacomo Girolamo#kiup2 4_M_KHMAN,3,3,{
mes "[Giacomo Girolamo]";
mes "Hey.. Excuse me!!! but I'm not a 'Womanizer', I am just a person who adores ladies.";
next;
- emotion e_ok, "Giacomo Girolamo#kiup2";
+ emotion ET_OK;
mes "[Giacomo Girolamo]";
mes "Of course..... Yea... If I'm a womanizer, all the men on earth are too! I'm just Casanova. umhahahaha.";
close;
case 4:
- emotion e_what, "Giacomo Girolamo#kiup2";
+ emotion ET_QUESTION;
mes "[Giacomo Girolamo]";
mes "Haa.. Do you....? not have any woman but your sister and mother around you?";
next;
mes "[Giacomo Girolamo]";
mes "... .... ...";
next;
- emotion e_swt2, "Giacomo Girolamo#kiup2";
+ emotion ET_PROFUSELY_SWEAT;
mes "[Giacomo Girolamo]";
mes "Oh...... sorry.. I got your point....";
close;
@@ -229,7 +229,7 @@ lighthalzen,303,303,6 script Giacomo Girolamo#kiup2 4_M_KHMAN,3,3,{
close;
}
} else {
- emotion e_what, "Giacomo Girolamo#kiup2";
+ emotion ET_QUESTION;
mes "[Giacomo Girolamo]";
mes "Hey, lady?";
next;
@@ -276,7 +276,7 @@ lighthalzen,303,303,6 script Giacomo Girolamo#kiup2 4_M_KHMAN,3,3,{
next;
break;
}
- emotion e_lv2, "Giacomo Girolamo#kiup2";
+ emotion ET_BIGTHROB;
mes "[Giacomo Girolamo]";
mes "Today is the first day we met, but I love you, Lady <3 ";
next;
@@ -288,7 +288,7 @@ lighthalzen,303,303,6 script Giacomo Girolamo#kiup2 4_M_KHMAN,3,3,{
OnTouch:
if (!lght_duk01)
- emotion (Sex == SEX_MALE? e_pif : e_lv2), "Giacomo Girolamo#kiup2";
+ emotion (Sex == SEX_MALE? ET_HNG : ET_BIGTHROB), "Giacomo Girolamo#kiup2";
end;
}
@@ -371,11 +371,11 @@ que_lhz,206,74,4 script Researcher#02 4_LGTSCIENCE,3,3,{
OnTouch:
if (lght_duk01 == 2) {
- emotion e_omg, 1;
+ emotion ET_HUK, playerattached();
mes "["+ strcharinfo(0) +"]";
mes "You!!!! are Wolfchev?";
next;
- emotion e_gg, "Researcher#02";
+ emotion ET_KIK;
mes "[Wolfchev]";
mes "A Human! kaahaha. People tend to hate this place, why are you here?";
next;
@@ -385,7 +385,7 @@ OnTouch:
mes "["+ strcharinfo(0) +"]";
mes "And I see that you are still committing that!!!";
next;
- emotion e_gg, "Researcher#02";
+ emotion ET_KIK;
mes "[Wolfchev]";
mes "Kihihihi. I can see that you know something about me. Is that you who accused me?";
mes "How dare you come back to me after you did that. Kihihih";
@@ -399,7 +399,7 @@ OnTouch:
erasequest 5109;
setquest 5110;
lght_duk01 = 3;
- emotion e_omg, 1;
+ emotion ET_HUK, playerattached();
mes "["+ strcharinfo(0) +"]";
mes "Whoa! Wolfchev, stop!";
close2;
@@ -414,7 +414,7 @@ que_lhz,94,119,4 script Researcher#03 4_LGTSCIENCE,{
close;
}
if (lght_duk01 == 3) {
- emotion e_swt2, "Researcher#03";
+ emotion ET_PROFUSELY_SWEAT;
mes "[Wolfchev]";
mes "(Gasping) Pshaw... you are still following me. Hey, why do you keep following me?";
next;
@@ -427,7 +427,7 @@ que_lhz,94,119,4 script Researcher#03 4_LGTSCIENCE,{
mes "["+ strcharinfo(0) +"]";
mes "But, your experiment seem really dangerous. How come this is what everybody wants?";
next;
- emotion e_gg, "Researcher#03";
+ emotion ET_KIK;
mes "[Wolfchev]";
mes "Everyone has a desire to be stronger and wants to dominate others so those other people obey and admire you. Do you not have that desire?";
next;
@@ -457,7 +457,7 @@ que_lhz,147,224,4 script Researcher#04 4_LGTSCIENCE,{
mes "[Wolfchev]";
mes "You are pretty persistent, aren't you? Or I think.......that you like me, huh? Kihihii.";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "["+ strcharinfo(0) +"]";
mes "... .... ...";
next;
@@ -469,7 +469,7 @@ que_lhz,147,224,4 script Researcher#04 4_LGTSCIENCE,{
mes "[Wolfchev]";
mes "Again.. it's time to say goodbye.";
next;
- emotion e_gasp, "Researcher#04";
+ emotion ET_SURPRISE;
mes "[Wolfchev]";
mes "Well! May be....";
next;
@@ -478,7 +478,7 @@ que_lhz,147,224,4 script Researcher#04 4_LGTSCIENCE,{
next;
donpcevent "#Eventctrl::OnEnable";
progressbar "FF00FF", 5;
- emotion e_omg, "Researcher#04";
+ emotion ET_HUK;
mes "[Wolfchev]";
mes "Oh my,... What happened?";
next;
@@ -501,7 +501,7 @@ que_lhz,147,224,4 script Researcher#04 4_LGTSCIENCE,{
mes "- Hit him to wake him up -";
next;
specialeffect EF_DARKBREATH;
- emotion e_no;
+ emotion ET_STARE_ABOUT;
mes "["+ strcharinfo(0) +"]";
mes "Hey Dude! Anyway let's get out of here first! Isn't there any place where they cannot reach?";
next;
@@ -520,7 +520,7 @@ que_lhz,147,224,4 script Researcher#04 4_LGTSCIENCE,{
mes "Go to '^0000FFWolfchev's Lab^000000' at the 12 o'clock direction...";
close;
} else {
- emotion e_spin, "Researcher#04";
+ emotion ET_CONFUSE;
mes "Wolfchev is confused and has no idea now since those monsters are attacking him too.";
close;
}
@@ -688,7 +688,7 @@ lhz_dun04,151,276,3 script Researcher#memo 4_LGTSCIENCE,{
mes "[Wolfchev]";
mes "Urr.. I think they will ruin my whole laboratory!";
next;
- emotion e_loud, 1;
+ emotion ET_BLABLA, playerattached();
mes "["+ strcharinfo(0) +"]";
mes "Hey! Wolfchev!!";
next;
diff --git a/npc/re/jobs/2e/kagerou_oboro.txt b/npc/re/jobs/2e/kagerou_oboro.txt
index bf3d05204b0..99370399534 100644
--- a/npc/re/jobs/2e/kagerou_oboro.txt
+++ b/npc/re/jobs/2e/kagerou_oboro.txt
@@ -1054,7 +1054,7 @@ function script F_KO_Survival_dice {
}
set job_kagero_lp, job_kagero_lp - getarg(1,1);
set .@dice, rand(1,6);
- emotion 57 + .@dice,1;
+ emotion ET_OTL + .@dice, playerattached();
mes "The dice came out as " + .@dice + ".";
if (getarg(2,0))
return .@dice;
@@ -1081,25 +1081,25 @@ function script F_KO_Survival_dice2 {
mes "< Used " + getarg(1,2) + " LP >";
next;
set @job_ko_dice1, rand(1,6);
- emotion 57 + @job_ko_dice1,1;
+ emotion ET_OTL + @job_ko_dice1, playerattached();
mes "First dice result is " + @job_ko_dice1 + ". Do you want to roll the second dice?";
next;
select("Roll the second dice.");
set @job_ko_dice2, rand(1,6);
- emotion 57 + @job_ko_dice2,1;
+ emotion ET_OTL + @job_ko_dice2, playerattached();
return;
}
//Return: 1:win, 0:draw, -1:lose
function script F_KO_Survival_rps {
setarray .@rps$[1], "Scissors", "Rock", "Paper";
- setarray .@emote[1], e_scissors, e_rock, e_paper; //might be iRO custom(?)
+ setarray .@emote[1], ET_SCISSOR, ET_ROCK, ET_WRAP; //might be iRO custom(?)
mes "Rock! Paper! Scissors!";
next;
set .@pc, select("Give scissors.:Give rock.:Give paper.");
set .@npc, rand(1,3);
- emotion .@emote[.@pc],1;
+ emotion .@emote[.@pc], playerattached();
emotion .@emote[.@npc];
mes "=Game Results=";
mes "Machine: " + .@rps$[.@npc] + ".";
diff --git a/npc/re/jobs/2e/rebellion.txt b/npc/re/jobs/2e/rebellion.txt
new file mode 100644
index 00000000000..176a8a8f5f6
--- /dev/null
+++ b/npc/re/jobs/2e/rebellion.txt
@@ -0,0 +1,855 @@
+//===== rAthena Script =======================================
+//= Rebellion Job Quest
+//===== Description: =========================================
+//= [Official Conversion]
+//= Job change Quest from Gunslinger -> Rebellion.
+//===== Changelogs: ==========================================
+//= 1.0 First version. [exneval]
+//= 1.1 Syntax change. [Capuche]
+//============================================================
+
+moc_fild12,261,318,3 script Suspicious Man 4_M_MOCASS2,2,2,{
+ end;
+OnTouch:
+ if (Class == Job_Gunslinger && BaseLevel >= 99 && JobLevel >= 70) {
+ if (isbegin_quest(12340) == 0) {
+ mes "[Suspicious Man]";
+ mes "Finally I've found you, Vagabond Spike! Your neck is mine!";
+ next;
+ select("Say what?");
+ mes "[Suspicious Man]";
+ mes "*Snort* Don't pretend like you don't know. Look at this poster! You're in it!";
+ next;
+ select("I see the resemblance, but that's not me.");
+ mes "["+strcharinfo(0)+"]";
+ mes "Forget the resemblance. Where did you get that poster? I've never committed a crime.";
+ next;
+ mes "[Suspicious Man]";
+ mes "I knew you'd try to lie your way out.";
+ next;
+ mes "[Suspicious Man]";
+ mes "The ^0000ffEinbroch Private Pub^000000 has released that wanted poster. You have many bounty hunters like me on your heels.";
+ next;
+ mes "[Suspicious Man]";
+ mes "I don't care if you're the right one so long as you look it and I can take you dead or alive.";
+ }
+ else {
+ mes "[Suspicious Man]";
+ mes "It's you again! You've got guts to come back here!";
+ }
+ next;
+ if (select("Make a run for it.:Fight him.") == 1)
+ mes "^0000ffI should run for now and think about this later.^000000";
+ else
+ mes "^0000ffHe's not the only bounty hunter after me, if he's telling the truth. I need time to strategize.^000000";
+ close2;
+ if (isbegin_quest(12340) == 0)
+ setquest 12340;// Rebellion Job Change Quest
+ warp "moc_fild12",186,83;
+ }
+ end;
+}
+
+einbroch,54,97,3 script Bouncer 4_M_REBELLION,{
+ if (BaseClass != Job_Gunslinger) {
+ mes "[Bouncer]";
+ mes "No loitering around the venue.";
+ close;
+ }
+ switch( isbegin_quest(12340) ) {
+ case 0:
+ mes "[Bouncer]";
+ mes "Under construction, can't get in.";
+ close;
+ case 1:
+ mes "[Bouncer]";
+ mes "*Gasp* You! I thought you were already captured. Ooh, doesn't matter now. You're my Get Out of Jail Free card!";
+ next;
+ select("I'm not the criminal you think I am!");
+ mes "[Bouncer]";
+ mes "You aren't?";
+ next;
+ mes "^0000ffThe bouncer examines your face.^000000";
+ next;
+ mes "[Bouncer]";
+ mes "Hm, you bear a striking resemblance, though you don't look not as menacing as that criminal Spike";
+ next;
+ select("I want to talk to the poster publisher.");
+ mes "[Bouncer]";
+ mes "Your problem is a bit out of my league. Get in. If I find out you're the real deal all along, I'll see that you'll never see the outside again.";
+ close2;
+ warp "job_gun",81,29;
+ end;
+ case 2:
+ mes "[Bouncer]";
+ mes "You're back. Why?";
+ next;
+ if (select("I want in.:I was passing by.") == 2) {
+ mes "[Bouncer]";
+ mes "You're silly.";
+ close;
+ }
+ mes "[Bouncer]";
+ mes "Go ahead. Stay out of trouble.";
+ close2;
+ warp "job_gun",70,28;
+ end;
+ }
+}
+
+job_gun,68,33,3 script Ruthless Rebellion 4_F_REBELLION,{
+ mes "[Ruthless Rebellion]";
+ mes "Do you know how to use a gun?";
+ close;
+}
+
+job_gun,78,33,3 script Suspicious Gunslinger 4_M_JOB_BLACKSMITH,{
+ mes "[Suspicious Gunslinger]";
+ mes "...";
+ next;
+ mes "[Quiet Gunslinger]";
+ mes "Don't say I look like a blacksmith you know.";
+ close;
+}
+
+job_gun,74,24,6 script Drunken Man 4_M_LIEMAN,{
+ mes "[Drunken Man]";
+ mes "*Hiccups* Oh, I'm the owner here.";
+ mes "Oh wait, am I in the pub or someplace else? Zzz...";
+ close;
+}
+
+job_gun,64,33,6 script Anxious Man 4_M_ALCHE_A,{
+ mes "[Anxious Man]";
+ mes "Maybe I'm in the wrong place. This place doesn't look like a pub.";
+ close;
+}
+
+job_gun,86,29,3 script Kulbertinov 4_M_REBELLION,{
+ if (Class == Job_Rebellion) {
+ mes "[Kulbertinov]";
+ mes "Do you want to see the boss?";
+ next;
+ if (select("Yes.:No.") == 1) {
+ close2;
+ warp "job_gun",220,130;
+ end;
+ }
+ end;
+ }
+ if (Class != Job_Gunslinger) {
+ mes "[Kulbertinov]";
+ mes "Are you looking for me?";
+ close;
+ }
+ switch( isbegin_quest(12340) ) {
+ case 0:
+ mes "[Kulbertinov]";
+ mes "Can I help you?";
+ close;
+ case 1:
+ mes "[Kulbertinov]";
+ mes "What do you want?";
+ next;
+ select("I'm mistaken for a criminal!.");
+ mes "[Kulbertinov]";
+ mes "Wait a minute... Mwah hah hah!";
+ next;
+ mes "^0000ffHe scans your face, then guffaws.^000000";
+ next;
+ mes "[Kulbertinov]";
+ mes "I'm sorry. For a moment, I thought Spike came back to life. He was found dead three days ago.";
+ next;
+ select("He was captured already?");
+ mes "[Kulbertinov]";
+ mes "Yes, and the bounty hunter was already paid. The news hasn't spread, and you're the spitting image of him. Go figure.";
+ next;
+ select("You have to do something!");
+ mes "[Kulbertinov]";
+ mes "I'm sorry, but I can't talk to every single bounty hunter for you. Of course, I'm willing to compensate for your inconvenience.";
+ next;
+ mes "[Kulbertinov]";
+ mes "Hey, how about you join our ranks? At the very last, you won't get shot.";
+ next;
+ select("You want me become a bounty hunter?");
+ mes "[Kulbertinov]";
+ mes "No, bounty hunting is just a pastime. We're the experts of all the firearms in the world.";
+ next;
+ mes "[Kulbertinov]";
+ mes "Carefree spirits!";
+ mes "Magical spitfires!";
+ mes "We call ourselves the ^0000ffRebellion^000000.";
+ next;
+ mes "[Kulbertinov]";
+ mes "You look like you know how to use a gun. How'd you like to join our ranks? You won't have to worry about other bounty hunters anymore too.";
+ next;
+ if (select("Let me think it over.:I don't think I have a choice.") == 1) {
+ mes "[Kulbertinov]";
+ mes "You can think it over and over, but the answer won't change. Just take the offer.";
+ }
+ else {
+ mes "[Kulbertinov]";
+ mes "Good thinking. Might as well do it now and get it over with.";
+ }
+ next;
+ mes "[Kulbertinov]";
+ mes "Talk to Enwin Conick. She guides drifting spirits like you to the way of the Rebellion. I'll send word to her. Ah, and don't point your gun at her.";
+ completequest 12340;
+ setquest 12341;// Rebellion Job Change Quest
+ close2;
+ warp "job_gun",19,15;
+ end;
+ case 2:
+ mes "[Kulbertinov]";
+ mes "Do you have business with Elwin Conick?";
+ next;
+ if (select("No.:Send me to Elwin Conick.") == 1) {
+ mes "[Kulbertinov]";
+ mes "All right. Care for a shot of vodka?";
+ close;
+ }
+ mes "[Kulbertinov]";
+ mes "Okay, I'll let her know.";
+ close2;
+ warp "job_gun",19,15;
+ end;
+ }
+}
+
+job_gun,19,24,3 script Elwin Conick#1 4_F_REBELLION,{
+ if (Class != Job_Gunslinger) {
+ mes "[Elwin Conick]";
+ mes "If you don't want to join Rebellions, just get out.";
+ close2;
+ warp "job_gun",81,29;
+ end;
+ }
+ if (isbegin_quest(12341) == 1) {
+ mes "[Elwin Conick]";
+ mes "Do you to join us Rebellions?";
+ next;
+ mes "^0000ffThe short woman with keen eyes stares into your eyes.^000000";
+ next;
+ mes "[Elwin Conick]";
+ mes "Sign here.";
+ next;
+ mes "^0000ffThe undersigned party '_____' will not speak of the test even if he or she suffers injury, mutilation, or death in an unforeseen accident that may occur during the test.^000000";
+ next;
+ select("WHAT?!");
+ mes "[Elwin Conick]";
+ mes "Do you want join us or not?";
+ next;
+ if (select("I give up.:...I'll sign.") == 1) {
+ mes "[Elwin Conick]";
+ mes "Your choice.";
+ close2;
+ warp "job_gun",81,29;
+ end;
+ }
+ mes "[Elwin Conick]";
+ mes "Good. Now, follow me.";
+ close2;
+ warp "job_gun",117,41;
+ end;
+ }
+ if (isbegin_quest(12342) == 1) {
+ mes "[Elwin Conick]";
+ mes "Do you want to try again?";
+ next;
+ if (select("I give up.:Do it.") == 1) {
+ mes "[Elwin Conick]";
+ mes "Your choice.";
+ close2;
+ warp "job_gun",81,29;
+ end;
+ }
+ mes "[Elwin Conick]";
+ mes "Follow me.";
+ close2;
+ warp "job_gun",117,41;
+ end;
+ }
+ if (isbegin_quest(12343) > 0) {
+ mes "[Elwin Conick]";
+ if (isbegin_quest(12343) == 1)
+ mes "You still have Ivan's shooting test, do you want to try again?";
+ else
+ mes "Ivan's shooting test have not finished yet, do you want to try again?";
+ next;
+ if (select("I give up.:Do it.") == 1) {
+ mes "[Elwin Conick]";
+ mes "It's not worth to give up, now go out and relax.";
+ close2;
+ warp "job_gun",81,29;
+ end;
+ }
+ mes "[Elwin Conick]";
+ mes "Remember to give your best.";
+ close2;
+ warp "job_gun",120,130;
+ end;
+ }
+ if (isbegin_quest(12345) == 1) {
+ mes "[Elwin Conick]";
+ mes "Ivan is waiting for you, go find him.";
+ close2;
+ warp "job_gun",81,29;
+ end;
+ }
+ mes "[Elwin Conick]";
+ mes "You have no more test to take. Why don't you go out and have a drink?";
+ close2;
+ warp "job_gun",81,29;
+ end;
+}
+
+job_gun,117,46,3 script Elwin Conick#2 4_F_REBELLION,{
+ if (Class != Job_Gunslinger) {
+ mes "[Elwin Conick]";
+ mes "If you don't want to join Rebellions, just get out.";
+ close2;
+ warp "job_gun",81,29;
+ end;
+ }
+ .@emt_chk = getstatus(SC_MONSTER_TRANSFORM,1);
+ .@quest_12341 = isbegin_quest(12341);
+ .@quest_12342 = isbegin_quest(12342);
+ if (.@emt_chk == 3169) {
+ mes "^0000ffYou are already in the test form. If you have finished all your tests, report to Elwin Conick in the Assembly Room^000000.";
+ close;
+ }
+ if (.@emt_chk) {
+ mes "[Elwin Conick]";
+ mes "Look at yourself, do you really want to test?";
+ next;
+ mes "^0000ffElwin see you turn into another form and she is very angry. Wait for your current form ends, and then find her again.^000000";
+ next;
+ if (select("Wait.:Go away.") == 2) {
+ mes "[Elwin Conick]";
+ mes "Come back when you aren't in any form.";
+ close2;
+ warp "job_gun",81,29;
+ end;
+ }
+ mes "[Elwin Conick]";
+ mes "It's not worth to give up, now go out and relax.";
+ close;
+ }
+ if (.@quest_12341 == 1 || .@quest_12342 == 1) {
+ if (countitem(6746)) {
+ mes "[Elwin Conick]";
+ mes "Any leftover Steel Artifacts must be returned after the test.";
+ delitem 6746,countitem(6746);// Steel_Article
+ close;
+ }
+ if (countitem(6747)) {
+ mes "[Elwin Conick]";
+ mes "Any leftover Steel Artifacts must be returned after the test.";
+ delitem 6747,countitem(6747);// Steel_Article_
+ close;
+ }
+ if ((countitem(13118) - isequipped(13118)) > 0) {
+ mes "[Elwin Conick]";
+ mes "Time over. You failed the test. Let me take all your leftover test materials.";
+ delitem 13118,1;// Tiny_Flame
+ close;
+ }
+ if (.@quest_12342 == 1)
+ .@menu$ = "Got it.";
+ else {
+ .@menu$ = "Okay.";
+ setquest 12342;// Rebellion Job Change Quest
+ completequest 12341;
+ }
+ mes "[Elwin Conick]";
+ mes "Listen up. I'm not going to great lengths trying to explain the test to you.";
+ next;
+ select( .@menu$ );
+ mes "[Elwin Conick]";
+ if (.@quest_12341 == 1) {
+ mes "This is where the firearm molds are cast. Everywhere you can see Steel Artifacts are being produced.";
+ next;
+ mes "[Elwin Conick]";
+ mes "We Rebellions are weapon experts at heart. Here you will learn to create and assemble firearms.";
+ next;
+ mes "[Elwin Conick]";
+ mes "You'll be asked to control the furnace controller near the entrance and select 5 standard Steel Artifacts.";
+ next;
+ mes "[Elwin Conick]";
+ mes "You'll then take them to the next Assembly Room and assemble them info a firearm. You'll be given 3 minutes to do all that. You'd better be fast and focused, or you will fail the test.";
+ next;
+ mes "[Elwin Conick]";
+ mes "I'll be in the next room, waiting for you to bring me a complete firearm. To check the elapsed time, you'll be transformed into a different job. ^0000ffIf you pass 3 minutes and turn back to normal, go back to me and start the test again.^000000.";
+ }
+ else {
+ mes "You'll be asked to control switches on the machine and select 5 standard Steel Artifacts.";
+ next;
+ mes "[Elwin Conick]";
+ mes "You'll then take them to the next Assembly Room and assemble them into a complete firearm. You'll be given 3 minutes to finish all that. ^0000ffTo check the elapsed time, you'll be transformed into a different job^000000.";
+ next;
+ mes "[Elwin Conick]";
+ mes "I'll be in the next room, waiting for you to bring me a complete firearm. Remember, ^0000ffyou fail the test when your transformation expires after 3 minutes^000000.";
+ }
+ transform 3169,180000;
+ close;
+ }
+ mes "[Elwin Conick]";
+ mes "Ah? Are you lost? You need to register first and then get back here.";
+ close2;
+ warp "job_gun",81,29;
+ end;
+}
+
+job_gun,198,39,3 script Elwin Conick#3 4_F_REBELLION,{
+ if (Class != Job_Gunslinger) {
+ mes "[Elwin Conick]";
+ mes "If you don't want to join Rebellions, just get out.";
+ close2;
+ warp "job_gun",81,29;
+ end;
+ }
+ if (isbegin_quest(12342) == 1) {
+ .@emt_chk = getstatus(SC_MONSTER_TRANSFORM,1);
+ if (.@emt_chk == 3169) {
+ if ((countitem(13118) - isequipped(13118)) < 1) {// don't count if equipped
+ mes "[Elwin Conick]";
+ mes "Are you done? I don't see any completed firearm in your inventory.";
+ close;
+ }
+ mes "[Elwin Conick]";
+ mes "It's shoddy but not bad, given the time. You passed.";
+ delitem 13118,1;// Tiny_Flame
+ next;
+ mes "[Elwin Conick]";
+ mes "Let me take all your leftover test materials.";
+ delitem 6746,countitem(6746);// Iron_Artifact
+ delitem 6747,countitem(6747);// Steel_Artifact
+ next;
+ mes "[Elwin Conick]";
+ mes "Now you can move on to the next course. Ivan Sidorenko will oversee your test.";
+ completequest 12342;
+ close2;
+ warp "job_gun",120,133;
+ end;
+ }
+ if (.@emt_chk) {
+ mes "[Elwin Conick]";
+ mes "Look at yourself, do you really want to test?";
+ next;
+ mes "^0000ffElwin see you turn into another form and she is very angry. Wait for your current form ends, and then find her again.^000000";
+ next;
+ if (select("Wait.:Go away.") == 2) {
+ mes "[Elwin Conick]";
+ mes "Come back when you aren't in any form.";
+ close2;
+ warp "job_gun",81,29;
+ end;
+ }
+ mes "[Elwin Conick]";
+ mes "It's not worth to give up, now go out and relax.";
+ close;
+ }
+ mes "[Elwin Conick]";
+ mes "Time over. You failed the test. Let me take all your leftover test materials.";
+ delitem 6746,countitem(6746);// Iron_Artifact
+ delitem 6747,countitem(6747);// Steel_Artifact
+ delitem 13118,(countitem(13118) - isequipped(13118));// Tiny_Flame
+ next;
+ mes "[Elwin Conick]";
+ mes "Let's start again.";
+ close2;
+ warp "job_gun",117,41;
+ end;
+ }
+ mes "[Elwin Conick]";
+ mes "Ah? Are you lost? You need to register first and then get back here.";
+ close2;
+ warp "job_gun",81,29;
+ end;
+}
+
+job_gun,165,18,0 script Furnace Controller#1 CLEAR_NPC,{
+ if (Class != Job_Gunslinger) {
+ mes "Only authorized user can do the operation.";
+ close;
+ }
+ if (getstatus(SC_MONSTER_TRANSFORM,1) == 3169) {// J_REB_SHECIL1
+ if (isbegin_quest(12342) == 1) {
+ mes "Do you want to dredge the mold up from the furnace?";
+ next;
+ if (select("Quit.:Begin.") == 1) {
+ mes "Switch to the Standby mode.";
+ close;
+ }
+ mes "Initializing Furnace Controller ZX-3100...";
+ disablenpc "Furnace Controller#1";
+ donpcevent "Furnace Controller#2::OnStart";
+ close;
+ }
+ }
+ mes "Not an authorized user. Abort the operation.";
+ close;
+}
+
+job_gun,214,36,0 script Auto Anvil#1 CLEAR_NPC,{
+ if (Class != Job_Gunslinger) {
+ mes "Only authorized user can do the operation.";
+ close;
+ }
+ if ((countitem(13118) - isequipped(13118)) > 0) {// Tiny_Flame
+ mes "Unauthorized firearm creation has been detected. Report to Manager Elwin.";
+ close;
+ }
+ if (getstatus(SC_MONSTER_TRANSFORM,1) == 3169) {
+ if (countitem(6747) < 5) {// Steel_Article_
+ mes "You do not have standard Steel Artifacts.";
+ close;
+ }
+ if (isbegin_quest(12342) == 1) {
+ mes "Do you want to use the auto anvil and shape the standard Steel Artifacts into a firearm?";
+ next;
+ if (select("Quit.:Begin.") == 1) {
+ mes "For your safety, please step away from the auto anvil.";
+ close;
+ }
+ if (rand(1,10) > 6) {
+ mes "You have successfully created a firearm using the auto anvil. ^ff0000Please report before your transformation expires^000000.";
+ specialeffect EF_REPAIRWEAPON;
+ getitem 13118,1;// Tiny_Flame
+ }
+ else {
+ mes "Failed to create a firearm.";
+ specialeffect EF_SUI_EXPLOSION;
+ }
+ delitem 6747,5;// Steel_Article_
+ close;
+ }
+ }
+ mes "Not an authorized user. Abort the operation.";
+ close;
+}
+
+job_gun,165,18,0 script Furnace Controller#2 CLEAR_NPC,{
+ mes "The system is busy dredging a completed mold from the furnace.";
+ close;
+
+OnStart:
+ enablenpc "Furnace Controller#2";
+ sleep 3000;
+ mapannounce "job_gun","Furnace Controller: Dredging a mold up from the furnace... Workers, stand by at the production line.",bc_map,"0x00ff44";
+ sleep 500;
+ for ( .@i = 0; .@i < 30; ++.@i ) {
+ .@eff_rnd = rand(1,100);
+ if (.@eff_rnd < 33)
+ donpcevent "Heating Furnace#3::OnStart";
+ else if (.@eff_rnd > 66)
+ donpcevent "Heating Furnace#4::OnStart";
+ else
+ donpcevent "Heating Furnace#5::OnStart";
+ sleep 200;
+ .@d_itemx = rand(127,143);
+ .@d_itemy = rand(26,29);
+ makeitem 6746,1,"job_gun",.@d_itemx,.@d_itemy;// Steel_Article
+ if (rand(1,10) > 7)
+ makeitem 6747,1,"job_gun",.@d_itemx,.@d_itemy;// Steel_Article_
+ sleep 500;
+ }
+ sleep 2000;
+ mapannounce "job_gun","Furnace Controller: Finishing the operation... Entering Standby mode in 15 seconds.",bc_map,"0x00ff44";
+ sleep 15000;
+ disablenpc "Furnace Controller#2";
+ enablenpc "Furnace Controller#1";
+ end;
+OnInit:
+ disablenpc "Furnace Controller#2";
+ end;
+}
+
+job_gun,130,31,0 script Heating Furnace#3 CLEAR_NPC,{
+ end;
+OnStart:
+ specialeffect EF_FIREPILLAR;
+ sleep 500;
+ specialeffect EF_FIREPILLARBOMB;
+ end;
+}
+job_gun,136,31,0 duplicate(Heating Furnace#3) Heating Furnace#4 CLEAR_NPC
+job_gun,141,31,0 duplicate(Heating Furnace#3) Heating Furnace#5 CLEAR_NPC
+
+job_gun,120,138,3 script Ivan Sidorenko#1 4_M_REBELLION,{
+ if (Class != Job_Gunslinger) {
+ mes "[Ivan Sidorenko]";
+ mes "This is shooting test area, you can't come here as you like.";
+ close2;
+ warp "job_gun",81,29;
+ end;
+ }
+ if (isbegin_quest(12342) < 2) {
+ mes "[Ivan Sidorenko]";
+ mes "There seems to be a mistake, you can't stay here.";
+ close2;
+ warp "job_gun",81,29;
+ end;
+ }
+ if (isbegin_quest(12343) == 0) {
+ mes "[Ivan Sidorenko]";
+ mes "Hey, stay focused--we're using live ammo here, and you can get shot anytime.";
+ next;
+ mes "[Ivan Sidorenko]";
+ mes "Let me make this quick. Basically you'll be running in this shooting range consisting of 5 sections.";
+ next;
+ mes "[Ivan Sidorenko]";
+ mes "The objective is to find enemies in the midst of a crowd quickly and without fail.";
+ next;
+ mes "[Ivan Sidorenko]";
+ mes "Among all the targets, you must shoot only the ^0000ffStandard-issue Targets^000000. If you make a mistake, you'll lose points.";
+ next;
+ mes "[Ivan Sidorenko]";
+ mes "Let's try. There aren't many ^0000ffStandard-issue Targets^000000, so keep your eyes peeled.";
+ next;
+ mes "[Ivan Sidorenko]";
+ mes "^0000ffYou have 3 minutes to finish this test. If you can't finish before your transformation expires^000000, you'll fail. If that happens, just follow the path back to me.";
+ next;
+ mes "[Ivan Sidorenko]";
+ mes "^0000ffYou'll fail if you miss a Standard-issue Target, or shoot 3 incorrect targets^000000. Let's get started.";
+ setquest 12343;// Rebellion Job Change Quest
+ setquest 12344;// Rebellion Job Change Quest
+ transform 3169,180000;
+ close2;
+ warp "job_gun",102,146;
+ end;
+ }
+ if (isbegin_quest(12343) == 1) {
+ if (checkquest(12343,HUNTING) == 2)
+ .@j_r_s = 10;
+ if (checkquest(12344,HUNTING) == 2)
+ .@j_r_f = 2;
+ if (getstatus(SC_MONSTER_TRANSFORM,1) != 3169)
+ .@j_r_t = 5;
+ .@j_r_c = .@j_r_s - .@j_r_f - .@j_r_t;
+ if (.@j_r_c > 9) {
+ mes "[Ivan Sidorenko]";
+ mes "Good job. I didn't think you could pass so quickly.";
+ completequest 12343;
+ completequest 12344;
+ setquest 12345;// Rebellion Job Change Quest
+ next;
+ mes "[Ivan Sidorenko]";
+ mes "You may leave and wait outside. I'll bring other instructors' evaluation reports to see you.";
+ close2;
+ warp "job_gun",210,132;
+ end;
+ }
+ if (.@j_r_c == 8) {
+ mes "[Ivan Sidorenko]";
+ mes "You're quick enough, but you shot too many incorrect targets. You failed.";
+ }
+ else if (.@j_r_c == 5) {
+ mes "[Ivan Sidorenko]";
+ mes "You accurate enough, but you took too much time. Slow Rebellions don't survive long enough.";
+ }
+ else if (.@j_r_c < 5) {
+ mes "[Ivan Sidorenko]";
+ mes "You failed at both speed and accuracy. How did you survive this long?";
+ }
+ else {
+ mes "[Ivan Sidorenko]";
+ mes "There's a problem, the statistic seems to be wrong. Well... This can happen sometimes.";
+ }
+ erasequest 12343;
+ erasequest 12344;
+ next;
+ mes "[Ivan Sidorenko]";
+ mes "Let's try again. Be more careful this time.";
+ setquest 12343;
+ setquest 12344;
+ transform 3169,180000;
+ close2;
+ warp "job_gun",102,146;
+ end;
+ }
+ mes "[Ivan Sidorenko]";
+ mes "How did you not leave?";
+ next;
+ mes "[Ivan Sidorenko]";
+ mes "You may leave and wait outside. I'll bring other instructors' evaluation reports to see you.";
+ close2;
+ warp "job_gun",210,132;
+ end;
+}
+
+job_gun,1,4,0 script #target CLEAR_NPC,{
+ end;
+OnStart:
+ killmonster "job_gun","#target::OnMyMobDead";
+OnInit:
+OnMyMobDead:
+ hideonnpc "#target";
+ while( mobcount("job_gun","#target::OnMyMobDead") < 16 ) {
+ .@m_rg = rand(1,5);
+ if (.@m_rg == 1)
+ monster "job_gun",rand(88,99),rand(143,147),"Standard-issue Target",3169,1,"#target::OnMyMobDead";
+ else if (.@m_rg == 2)
+ monster "job_gun",rand(92,96),rand(95,122),"Standard-issue Target",3169,1,"#target::OnMyMobDead";
+ else if (.@m_rg == 3)
+ monster "job_gun",rand(143,159),rand(99,100),"Standard-issue Target",3169,1,"#target::OnMyMobDead";
+ else if (.@m_rg == 4)
+ monster "job_gun",rand(157,158),rand(137,160),"Standard-issue Target",3169,1,"#target::OnMyMobDead";
+ else
+ monster "job_gun",rand(119,134),rand(156,160),"Standard-issue Target",3169,1,"#target::OnMyMobDead";
+ }
+ end;
+}
+
+job_gun,1,5,0 script #nontarget CLEAR_NPC,{
+ end;
+OnStart:
+ killmonster "job_gun","#nontarget::OnMyMobDead";
+OnInit:
+OnMyMobDead:
+ hideonnpc "#nontarget";
+ while( mobcount("job_gun","#nontarget::OnMyMobDead") < 56 ) {
+ .@m_rg = rand(1,5);
+ if (.@m_rg == 1)
+ monster "job_gun",rand(88,99),rand(143,147),"Defective Target",3170,1,"#nontarget::OnMyMobDead";
+ else if (.@m_rg == 2)
+ monster "job_gun",rand(92,96),rand(95,122),"Defective Target",3170,1,"#nontarget::OnMyMobDead";
+ else if (.@m_rg == 3)
+ monster "job_gun",rand(143,159),rand(99,100),"Defective Target",3170,1,"#nontarget::OnMyMobDead";
+ else if (.@m_rg == 4)
+ monster "job_gun",rand(157,158),rand(137,160),"Defective Target",3170,1,"#nontarget::OnMyMobDead";
+ else
+ monster "job_gun",rand(119,134),rand(156,160),"Defective Target",3170,1,"#nontarget::OnMyMobDead";
+ }
+ end;
+}
+
+job_gun,220,132,3 script Ivan Sidorenko#2 10062,{
+ if (!checkweight(1201,1)) {
+ mes "You have too many items, please reduce them to continue.";
+ close;
+ }
+ if ((MaxWeight - Weight) < 1000) {
+ mes "The items in your inventory are weighing you down. Lighten your weight first.";
+ close;
+ }
+ if (isbegin_quest(12345) == 0) {
+ mes "[Ivan Sidorenko]";
+ mes "There must have been a mistake. You aren't supposed to remain here.";
+ close2;
+ warp "job_gun",81,29;
+ end;
+ }
+ if (Class == Job_Gunslinger) {
+ if (BaseLevel < 99 || JobLevel < 70) {
+ mes "[Ivan Sidorenko]";
+ mes "Huh? You look so weak? I have nothing more to say.";
+ close;
+ }
+ if (SkillPoint) {
+ mes "[Ivan Sidorenko]";
+ mes "Oh no~ You still have Skill Points.";
+ close;
+ }
+ mes "[Ivan Sidorenko]";
+ mes "Kulbertinov, Elwin, and I've evaluated your Rebellion test results.";
+ next;
+ mes "[Ivan Sidorenko]";
+ mes "And...";
+ next;
+ mes "[Ivan Sidorenko]";
+ mes "You've met all our requirements including the attitude and the test performance.";
+ next;
+ mes "[Ivan Sidorenko]";
+ mes "That's right, you're now a member of the Rebellion. Get ready to be wowed.";
+ next;
+ mes "[Ivan Sidorenko]";
+ mes "And Elwin wants you to have this. Take good care of it. He made it for you.";
+ jobchange Job_Rebellion;
+ completequest 12345;
+ getitem 13119,1;// Freedom_Flame
+ next;
+ mes "[Ivan Sidorenko]";
+ mes "See you later.";
+ close2;
+ warp "job_gun",81,29;
+ end;
+ }
+ if (Class == Job_Rebellion) {
+ mes "[Ivan Sidorenko]";
+ mes "This life should be fun, not boring.";
+ next;
+ mes "[Ivan Sidorenko]";
+ mes "And by becoming a Rebellion your life should be upgraded. So, go and create a great journey, make us proud!";
+ close2;
+ warp "job_gun",81,29;
+ end;
+ }
+ mes "[Ivan Sidorenko]";
+ mes "Do you have something to say to me, don't you?";
+ close;
+}
+
+job_gun,220,138,4 shop Prop Vending Machine 2_VENDING_MACHINE1,13210:-1,13211:-1,13212:-1,13213:-1,13214:-1,7663:-1,7664:-1,7665:-1
+
+job_gun,216,138,4 script Butler Karlex 1_M_01,{
+ mes "[Butler Karlex]";
+ mes "Use this temporary storage to keep your items safe while on the Advancement test.";
+ next;
+ .@s = select("Quit.:Open the storage.");
+ mes "[Butler Karlex]";
+ mes "Thank you for using the service.";
+ close2;
+ if (.@s == 2)
+ openstorage;
+ end;
+}
+
+job_gun,56,26,0 warp rebelroom#1 2,2,einbroch,49,97
+job_gun,18,10,0 warp rebelroom#2 2,2,job_gun,81,29
+job_gun,165,22,0 warp rebelroom#3 2,2,job_gun,196,35
+job_gun,197,49,0 warp rebelroom#4 2,2,job_gun,157,21
+job_gun,88,144,0 warp shootingrange#1 3,3,job_gun,93,123
+job_gun,105,97,0 warp shootingrange#2 3,3,job_gun,125,98
+job_gun,156,115,0 warp shootingrange#3 3,3,job_gun,157,137
+job_gun,152,154,0 warp shootingrange#4 3,3,job_gun,135,154
+job_gun,130,146,0 warp shootingrange#5 3,3,job_gun,120,130
+
+
+job_gun,1,1,0 script Admin1 CLEAR_NPC,{
+ callfunc "F_GM_NPC";
+ if (callfunc("F_GM_NPC",1854,0) != 1)
+ end;
+ mes "[Time Manager]";
+ mes "What time would you like to return?";
+ next;
+ switch( select("Cancel:Test monster spawn:Start from beginning:Furnace Zone:Shooting Zone:Complete the test") ) {
+ case 1:
+ end;
+ case 2:
+ donpcevent "#target::OnStart";
+ donpcevent "#nontarget::OnStart";
+ end;
+ case 3:
+ callsub S_Quest,0,0;
+ case 4:
+ callsub S_Quest,12341,12341;
+ case 5:
+ callsub S_Quest,12342,12342;
+ case 6:
+ callsub S_Quest,12345,12344;
+ }
+ end;
+
+S_Quest:
+ setarray .@arguments[0], getarg(0), getarg(1);
+ for ( .@quest = 12340; .@quest <= 12345; ++.@quest ) {
+ if (isbegin_quest(.@quest) > 0)
+ erasequest .@quest;
+ if (.@quest <= .@arguments[0])
+ setquest .@quest;
+ if (.@quest <= .@arguments[1])
+ completequest .@quest;
+ }
+ end;
+}
diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt
index 5bad20bf6ba..bfcb32d060b 100644
--- a/npc/re/jobs/3-1/archbishop.txt
+++ b/npc/re/jobs/3-1/archbishop.txt
@@ -193,7 +193,7 @@ umbala,139,227,3 script Priest#arch 60,{
mes "Is that... right?";
mes "Hmm... so...";
mes "Um...ma? Umau...ma?";
- emotion e_swt;
+ emotion ET_SWEAT;
next;
mes "[Utan Boy]";
mes "...............";
@@ -1261,7 +1261,7 @@ OnTouch:
mes "- Shoooo -";
specialeffect EF_CLOAKING,AREA,"Valkyrie Anguhilde#end";
hideonnpc "Valkyrie Anguhilde#end";
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
next;
mes "[Valkyrie of the heavens]";
mes "Set your mind at ease.";
diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt
index 405135c2039..9570ae84ce7 100644
--- a/npc/re/jobs/3-1/guillotine_cross.txt
+++ b/npc/re/jobs/3-1/guillotine_cross.txt
@@ -2439,7 +2439,7 @@ OnTouch_:
mes "May the goddess bless you eternally...";
npcskill "AL_BLESSING",10,0,0;
next;
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[A man with black clothes]";
mes "Who... who are you?!";
mes "A... Assassin Guild?!";
diff --git a/npc/re/jobs/3-1/ranger.txt b/npc/re/jobs/3-1/ranger.txt
index 3d9b79b9546..5328c804f22 100644
--- a/npc/re/jobs/3-1/ranger.txt
+++ b/npc/re/jobs/3-1/ranger.txt
@@ -515,7 +515,7 @@ tur_dun01,91,169,3 script Test Instructor#jr02 732,{
mes "[Test Instructor, Teardrop]";
mes "Aha... You've failed the middle!";
mes "You are such a fool.";
- emotion e_gg;
+ emotion ET_KIK;
next;
mes "[Test Instructor, Teardrop]";
mes "So what are you going to do? Try again?";
@@ -1188,7 +1188,7 @@ job3_rang02,111,56,3 script Staff Rust#jr_09 89,{
close;
}
next;
- emotion e_an;
+ emotion ET_FRET;
mes "[Staff Rust]";
mes "And the mission is.... to deliver these documents to the supervisor, Caution. He won't take what I give...";
setquest 8260;
@@ -1305,7 +1305,7 @@ OnTouch_:
next;
mes "[Test Supervisor, Caution]";
mes "What are those documents?";
- emotion e_no;
+ emotion ET_STARE_ABOUT;
next;
select("Mr. Rust asked me to give this to you.");
mes "[Test Supervisor, Caution]";
@@ -1316,7 +1316,7 @@ OnTouch_:
next;
mes "[Test Supervisor, Caution]";
mes "I've never imagined this could be a test...";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Test Supervisor, Caution]";
mes "Anyway you've passed the 2nd test very well.";
diff --git a/npc/re/jobs/3-1/warlock.txt b/npc/re/jobs/3-1/warlock.txt
index 83103f3daa2..35758570c15 100644
--- a/npc/re/jobs/3-1/warlock.txt
+++ b/npc/re/jobs/3-1/warlock.txt
@@ -659,7 +659,7 @@ spl_in02,80,108,5 script Guild Master#Warlock 465,{
mes "[Yoop]";
mes "Yup, Master.";
mes "Please follow me.";
- emotion e_ic,0,"Assistant#Warlock2";
+ emotion ET_AHA, getnpcid(0, "Assistant#Warlock2");
set job_wl,6;
changequest 11108,11109;
close;
diff --git a/npc/re/jobs/3-2/genetic.txt b/npc/re/jobs/3-2/genetic.txt
index d7b39b6d53e..21a8e63ae2d 100644
--- a/npc/re/jobs/3-2/genetic.txt
+++ b/npc/re/jobs/3-2/genetic.txt
@@ -132,7 +132,7 @@ job3_gen01,25,58,3 script Devries#gen 865,{
mes "My village is very big, everyone there speaks like this.";
break;
case 2:
- emotion e_lv;
+ emotion ET_THROB;
mes "[Devries]";
mes "Really! That's why I felt some kind of familiar atmosphere around you.";
mes "Meeting a hometown person in Schwaltzvalt, it's my pleasure to meet you!";
@@ -141,7 +141,7 @@ job3_gen01,25,58,3 script Devries#gen 865,{
next;
mes "- Thump!! -";
next;
- emotion e_ag;
+ emotion ET_ANGER;
mes "[Devries]";
mes "Ughhhhh! That woman started again!";
next;
@@ -150,7 +150,7 @@ job3_gen01,25,58,3 script Devries#gen 865,{
mes "That's the sound of an experiment being carried out by my roommate, Demi Calberine..";
mes "Demi's a fire shell technician so she's always noisy like that.";
next;
- emotion e_sob;
+ emotion ET_CRY;
mes "[Devries]";
mes "Look at that!";
mes "My spores and plants are all freaked out!";
@@ -226,13 +226,13 @@ job3_gen01,25,58,3 script Devries#gen 865,{
mes "Ah, The sweet buttery taste remains at the end of my tongue.";
mes "This really gives me peace of mind.";
next;
- emotion e_pif;
+ emotion ET_HNG;
mes "[Devries]";
mes "Demi is studying hard today as well";
mes "Huhuhu. She's really a hard worker.";
next;
mes "- That cookie changed her mood quick. -";
- emotion e_no1,1;
+ emotion ET_BEST, playerattached();
next;
mes "[Devries]";
mes "You came here with a love for Alchemy?";
@@ -323,7 +323,7 @@ job3_gen01,25,58,3 script Devries#gen 865,{
next;
mes "- Boom, Boom, Boom -";
next;
- emotion e_swt;
+ emotion ET_SWEAT;
mes "[Devries]";
mes "Ah, please tell me Demi Calberine is not starting again?";
mes "Please let my expectation be wrong ... Please... Demi, please...";
@@ -337,17 +337,17 @@ job3_gen01,25,58,3 script Devries#gen 865,{
next;
mes "- Boom!! Boom!! Boom!! Boom!! -";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "[Devries]";
mes ".......................";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "[Devries]";
mes "Techniques, plants are relatively easy to...";
next;
mes "- Boom!!!!!! -";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "[Devries]";
mes "Crossbreed...";
next;
@@ -356,15 +356,15 @@ job3_gen01,25,58,3 script Devries#gen 865,{
mes "- Boooooooooooooom!!!! -";
mes "- Boom!! Boom!! Boom!! -";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "[Devries]";
mes ".......................";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "[Devries]";
mes "Popo.";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "[Devries]";
mes "I'll give you the test to become a Geneticist.";
next;
@@ -881,13 +881,13 @@ job3_gen01,91,48,3 script Demi Calberine#gen 982,{
mes "[Demi Calberine]";
mes "Miss Devries seems to be studying childish experiments downstairs.";
mes "I don't understand why those research papers get so popular.";
- emotion e_pif;
+ emotion ET_HNG;
next;
mes "[Demi Calberine]";
mes "See this mini-mini cannon.";
mes "This is the smallest and the lightest cannon in the world.";
mes "This is what I made but isn?t this so cute? Yipee~";
- emotion e_awsm;
+ emotion ET_COOL;
next;
select("Can I get my cart remodeled?");
mes "[Demi Calberine]";
@@ -1028,7 +1028,7 @@ job3_gen01,24,32,0 script The gaze of Devries 139,2,2,{
OnTouch:
if (checkquest(2223,HUNTING) == 2) {
mapannounce "job3_gen01","Devries: Whoa? Was there a lost kitty in the spore pen?",bc_map,"0x99CC00"; //FW_NORMAL 12 0 0
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
warp "job3_gen01",21,38;
}
end;
diff --git a/npc/re/jobs/3-2/wanderer.txt b/npc/re/jobs/3-2/wanderer.txt
index ad6e562148b..5d5edc8a939 100644
--- a/npc/re/jobs/3-2/wanderer.txt
+++ b/npc/re/jobs/3-2/wanderer.txt
@@ -30,7 +30,7 @@ xmas,162,209,5 script Aspiring Wanderer, Soy 714,{
mes "[Soy]";
mes "Don't make fun of me Mimi~";
mes "I have dreamed of being at Dancer Kim's stage for a very long time!";
- emotion e_shy,0,"Aspiring Wanderer, Soy";
+ emotion ET_SHY, getnpcid(0, "Aspiring Wanderer, Soy");
next;
mes "[Soy]";
mes "I might lose my senses if I really see her dancing like a beautiful angel sent from above.";
@@ -45,7 +45,7 @@ xmas,162,209,5 script Aspiring Wanderer, Soy 714,{
if (BaseJob != Job_Dancer || BaseLevel < 99) close;
next;
select("Dancer Kim?:Wanderer?");
- emotion e_omg,0,"Aspiring Wanderer, Soy";
+ emotion ET_HUK, getnpcid(0, "Aspiring Wanderer, Soy");
mes "[Soy]";
mes "What? You don't know the famous Wanderer, Dancer Kim?";
mes "Oh my, oh my!!!";
@@ -66,7 +66,7 @@ xmas,162,209,5 script Aspiring Wanderer, Soy 714,{
mes "If you are a true Dancer, you must be struck with her Dance!";
mes "Will I ever meet a Maestro like Guitar Song someday, Mimi?";
next;
- emotion e_heh,0,"Aspiring Wanderer, Soy";
+ emotion ET_SMILE, getnpcid(0, "Aspiring Wanderer, Soy");
mes "[Mimi]";
mes "Just hang in there, Soy. Ha ha.";
next;
@@ -123,7 +123,7 @@ xmas,132,143,5 script Performance Manager#wnd 713,{
mes "Oh, what should I do?";
mes "Why did they do this?";
next;
- emotion e_shy,0,"Aspiring Wanderer, Soy";
+ emotion ET_SHY, getnpcid(0, "Aspiring Wanderer, Soy");
mes "[Performance Manager]";
mes "Hey, you there!";
mes "Please listen to my story.";
@@ -148,7 +148,7 @@ xmas,132,143,5 script Performance Manager#wnd 713,{
set .@loop,1;
break;
case 3:
- emotion e_ag;
+ emotion ET_ANGER;
mes "[Performance Manager]";
mes "I told you that I'm overwhelmed!";
mes "You don't understand me!";
@@ -166,7 +166,7 @@ xmas,132,143,5 script Performance Manager#wnd 713,{
mes "People will throw snowballs!";
mes "Maybe they will even throw a big snowman, no!";
next;
- emotion e_wah;
+ emotion ET_KEK;
mes "[Performance Manager]";
mes "People might grab me by the collar!!";
mes "Swing swing, dangling dangling!!";
@@ -238,7 +238,7 @@ xmas,132,143,5 script Performance Manager#wnd 713,{
mes "^3131FF" + .@inputstr$ + "^000000";
mes "......";
next;
- emotion e_ag;
+ emotion ET_ANGER;
mes "[Performance Manager]";
mes "What the hell are you talking about?";
mes "Are you teasing me because I'm emotionally unstable?";
@@ -253,7 +253,7 @@ xmas,132,143,5 script Performance Manager#wnd 713,{
case 1:
break;
case 2:
- emotion e_an;
+ emotion ET_FRET;
mes "[Performance Manager]";
mes "You're asking me why!?";
mes "Ahh, no.....";
@@ -323,13 +323,13 @@ comodo,140,86,5 script Cheerless Maestro 479,{
mes "- What a weird person, I better stay away. -";
close;
}
- emotion e_omg;
+ emotion ET_HUK;
mes "[Cheerless Maestro]";
mes "What?!";
mes "Are you ignoring my immortal masterpiece <Tambourine King>? You are the first person who's ever slapped me in the face.";
next;
select("I didn't slap you.");
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Cheerless Maestro]";
mes "Oh! Lady, looking at your appearance you must be a dancer, right?";
next;
@@ -345,7 +345,7 @@ comodo,140,86,5 script Cheerless Maestro 479,{
mes "It has an edgy kind of name So I think that it will be a very popular group.";
next;
select("Are you Guitar Song?");
- emotion e_shy;
+ emotion ET_SHY;
mes "[Guitar Song]";
mes "Huh... I'm a bit disappointed that you finally recognize me now.";
mes "Yes, I am the handsome Guitar Song in the famous group <Nollio>.";
@@ -388,7 +388,7 @@ comodo,140,86,5 script Cheerless Maestro 479,{
mes "[Guitar Song]";
mes "Wh...what!! What are you doing?!?";
mes "You almost damaged my eardrum.";
- emotion e_an;
+ emotion ET_FRET;
next;
mes "[" + strcharinfo(0) + "]";
mes "Hey, cheer up!!!";
@@ -432,28 +432,28 @@ comodo,140,86,5 script Cheerless Maestro 479,{
mes "- You cannot use this skill without learning it. -";
close;
}
- emotion e_what,1;
+ emotion ET_QUESTION, playerattached();
mes "[" + strcharinfo(0) + "]";
mes "Ah, ah my Guitar Song~";
next;
mes "[Guitar Song]";
mes "What? I've got goose bumps.";
next;
- emotion e_what,1;
+ emotion ET_QUESTION, playerattached();
mes "[" + strcharinfo(0) + "]";
mes "I've been watching <Nollio> for years.";
next;
mes "[Guitar Song]";
mes "I know that we are that popular! Ha ha ha!";
next;
- emotion e_what,1;
+ emotion ET_QUESTION, playerattached();
mes "[" + strcharinfo(0) + "]";
mes "I've seen other Maestro's performances but there was no one better then Guitar Song.";
next;
mes "[Guitar Song]";
mes "He he he! Yes, I know I am super great!";
next;
- emotion e_no1,1;
+ emotion ET_BEST, playerattached();
mes "[" + strcharinfo(0) + "]";
mes "Oh... When I hear Guitar Song's performance for the first time I has a crush on you immediately.";
next;
@@ -468,7 +468,7 @@ comodo,140,86,5 script Cheerless Maestro 479,{
mes "So I was looking forward to seeing your performance in Lutie this time.";
mes "But after I heard the performance got cancelled, I felt so sad.";
next;
- emotion e_sob,1;
+ emotion ET_CRY, playerattached();
mes "[" + strcharinfo(0) + "]";
mes "Now I can't hear Guitar Song's melody~~";
mes "I wanted to dance to your music like a beautiful butterfly.";
@@ -477,22 +477,22 @@ comodo,140,86,5 script Cheerless Maestro 479,{
mes "[Guitar Song]";
mes "Huh huh! No, that is not...";
next;
- emotion e_sob,1;
+ emotion ET_CRY, playerattached();
mes "[" + strcharinfo(0) + "]";
mes "I am really happy to meet you in person, but I hope to see your performance in the beautiful snowy town, Lutie.. Sob sob...";
next;
- emotion e_sob,1;
+ emotion ET_CRY, playerattached();
mes "[" + strcharinfo(0) + "]";
mes "Why in the world don't you show us the performance, Guitar Song?";
mes "Don't you like me? Sob sob..";
next;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Guitar Song]";
mes "No, it's not that kind of reason!";
next;
mes "[" + strcharinfo(0) + "]";
mes "Then please tell me, I really love your music... but now I feel so blue...";
- emotion e_what;
+ emotion ET_QUESTION;
next;
break;
}
@@ -501,7 +501,7 @@ comodo,140,86,5 script Cheerless Maestro 479,{
mes "I want to have a performance, too!";
mes "But I cannot do it all by myself!";
next;
- emotion e_ag;
+ emotion ET_ANGER;
mes "[Guitar Song]";
mes "It's all because of Dancer Kim!";
mes "One day, she suddenly got mad and told me that she would quit <Nollio>!";
@@ -513,7 +513,7 @@ comodo,140,86,5 script Cheerless Maestro 479,{
mes "[" + strcharinfo(0) + "]";
mes "Why did she get mad so suddenly?";
next;
- emotion e_swt;
+ emotion ET_SWEAT;
mes "[Guitar Song]";
mes "I don't know! She must be holding a grudge for something.";
mes "That's what she's like.";
@@ -527,7 +527,7 @@ comodo,140,86,5 script Cheerless Maestro 479,{
mes "I guess she might be back at her hometown.";
mes "That's where I met her for the first time.";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "[Guitar Song]";
mes "Although she loses her temper easily, her dance is so wonderful....";
mes "I don't know what I am doing wrong.";
@@ -545,7 +545,7 @@ comodo,140,86,5 script Cheerless Maestro 479,{
mes "Back in the day when she was addicted to the monster races, who do you think got her out of it?";
close;
} else if (job_wan == 8) {
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "- You tell him what happened in Hugel and ask him to go back to Lutie. -";
next;
mes "[Guitar Song]";
@@ -577,7 +577,7 @@ hu_in01,305,251,5 script Vacant Looking Lady#wnd 879,{
mes "Sob... sob...";
next;
select("Why are you crying?");
- emotion e_sob;
+ emotion ET_CRY;
mes "[Vacant Looking Lady]";
mes "I gave up my dream...";
mes "*Sob *Sob.";
@@ -587,7 +587,7 @@ hu_in01,305,251,5 script Vacant Looking Lady#wnd 879,{
mes "I said goodbye to my partner who had been working with me for a long time.";
next;
select("Why did you say goodbye?");
- emotion e_sob;
+ emotion ET_CRY;
mes "[Vacant Looking Lady]";
mes "it's because... sob... sob!";
next;
@@ -614,7 +614,7 @@ hu_in01,305,251,5 script Vacant Looking Lady#wnd 879,{
mes "[Vacant Looking Lady]";
mes "The following morning, I woke up and washed my fave and was looking for something to eat in my room..";
next;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Vacant Looking Lady]";
mes "Then Guitar Song suddenly opened the door of my room for some reason and said ^3131FFHey! What the hell are.. you doing here?^000000 and then he threw me out of my room!";
next;
@@ -622,14 +622,14 @@ hu_in01,305,251,5 script Vacant Looking Lady#wnd 879,{
mes "We've been together for a long time but how can he do such a thing to me?";
mes "At first, I thought he was kidding around with me! But when he kicked me out of my room...";
next;
- emotion e_sob;
+ emotion ET_CRY;
mes "[Vacant Looking Lady]";
mes "Why didn't he recognize my face?";
mes "Do you think he doesn't want to see my face without makeup?";
mes "Boo hoo hoo!";
next;
select("So you disbanded the team?");
- emotion e_sob;
+ emotion ET_CRY;
mes "[Vacant Looking Lady]";
mes "Are you also ignoring my wounded self-respect as a woman?";
next;
@@ -646,7 +646,7 @@ hu_in01,305,251,5 script Vacant Looking Lady#wnd 879,{
mes "After that day, I went to my hometown, Hugel and I just stayed indoors.";
mes "It was then when Shide comforted me with sweet cakes.";
next;
- emotion e_shy;
+ emotion ET_SHY;
mes "[Vacant Looking Lady]";
mes "Shide's cake is so wonderful!";
mes "It is the most famous cake in Hugel with soft sponge cake and fresh fruits and sweet chocolate cream!";
@@ -658,7 +658,7 @@ hu_in01,305,251,5 script Vacant Looking Lady#wnd 879,{
mes "So I ate it every morning and every night.";
next;
select("Oh, you wouldn't...");
- emotion e_sob;
+ emotion ET_CRY;
mes "[Vacant Looking Lady]";
mes "The angel of happiness took back my sadness and gave me a lot of belly fat!";
mes "Boo hoo hoo hoo!!";
@@ -681,7 +681,7 @@ hu_in01,305,251,5 script Vacant Looking Lady#wnd 879,{
set job_wan,5;
close;
} else if (job_wan == 5) {
- emotion e_sob;
+ emotion ET_CRY;
mes "[Vacant Looking Lady]";
mes "Not long ago, I was like a beautiful dove, but now I am just a fat chicken.";
mes "Sob sob...!";
@@ -715,7 +715,7 @@ hu_in01,305,251,5 script Vacant Looking Lady#wnd 879,{
mes "No dreams and no hope...";
close;
}
- emotion e_omg;
+ emotion ET_HUK;
mes "[Dancer Kim]";
mes "Will you exercise together with me?";
mes "Really?";
@@ -798,7 +798,7 @@ hu_fild05,342,130,5 script Dancer Kim#fild 879,{
mes "I want to start dancing again.";
next;
select("How about dancing in Lutie?");
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Dancer Kim]";
mes "Ah! Christmas Village! Yes! Yes!";
mes "My dream to dance in Lutie will finally come true.";
@@ -915,20 +915,20 @@ xmas,147,135,5 script Dancer Kim#xmas 485,{
}
mes "- <Nollio> is performing. -";
next;
- emotion e_ho,0,"Guitar Song#xmas";
- emotion e_ho;
+ emotion ET_DELIGHT, getnpcid(0, "Guitar Song#xmas");
+ emotion ET_DELIGHT;
mes "[Guitar Song]";
mes "One! Two! Three!";
mes "Blue fish dancing~";
mes "Fan! Fan! Fan! I am your fan~";
mes "With a strong mind and strong will, I complete fishing~";
next;
- emotion e_ho,0,"Spectator#xmas1";
- emotion e_ho,0,"Spectator#xmas2";
- emotion e_ho,0,"Spectator#xmas3";
- emotion e_ho,0,"Spectator#xmas4";
- emotion e_ho,0,"Soy#xmas";
- emotion e_ho,0,"Mimi#xmas";
+ emotion ET_DELIGHT, getnpcid(0, "Spectator#xmas1");
+ emotion ET_DELIGHT, getnpcid(0, "Spectator#xmas2");
+ emotion ET_DELIGHT, getnpcid(0, "Spectator#xmas3");
+ emotion ET_DELIGHT, getnpcid(0, "Spectator#xmas4");
+ emotion ET_DELIGHT, getnpcid(0, "Soy#xmas");
+ emotion ET_DELIGHT, getnpcid(0, "Mimi#xmas");
mes "[Spectators]";
mes "AAAAhhhhhhhhh - - !!!";
mes "So cool! Nollio is the best!!!";
@@ -936,28 +936,28 @@ xmas,147,135,5 script Dancer Kim#xmas 485,{
mes "[Guitar Song]";
mes "Hello, ladies and gentlemen!";
next;
- emotion e_lv,0,"Spectator#xmas1";
- emotion e_lv,0,"Spectator#xmas2";
- emotion e_lv,0,"Spectator#xmas3";
- emotion e_lv,0,"Spectator#xmas4";
- emotion e_lv,0,"Soy#xmas";
- emotion e_lv,0,"Mimi#xmas";
+ emotion ET_THROB, getnpcid(0, "Spectator#xmas1");
+ emotion ET_THROB, getnpcid(0, "Spectator#xmas2");
+ emotion ET_THROB, getnpcid(0, "Spectator#xmas3");
+ emotion ET_THROB, getnpcid(0, "Spectator#xmas4");
+ emotion ET_THROB, getnpcid(0, "Soy#xmas");
+ emotion ET_THROB, getnpcid(0, "Mimi#xmas");
mes "[Spectators]";
mes "Hello!!!!!";
next;
mes "[Guitar Song]";
mes "We are the romantic Wanderer team <Nollio> who stroll along the world following love and wind!";
next;
- emotion e_lv,0,"Spectator#xmas1";
- emotion e_lv,0,"Spectator#xmas2";
- emotion e_lv,0,"Spectator#xmas3";
- emotion e_lv,0,"Spectator#xmas4";
- emotion e_lv,0,"Soy#xmas";
- emotion e_lv,0,"Mimi#xmas";
+ emotion ET_THROB, getnpcid(0, "Spectator#xmas1");
+ emotion ET_THROB, getnpcid(0, "Spectator#xmas2");
+ emotion ET_THROB, getnpcid(0, "Spectator#xmas3");
+ emotion ET_THROB, getnpcid(0, "Spectator#xmas4");
+ emotion ET_THROB, getnpcid(0, "Soy#xmas");
+ emotion ET_THROB, getnpcid(0, "Mimi#xmas");
mes "[Spectators]";
mes "Wowwwww~!";
next;
- emotion e_no1;
+ emotion ET_BEST;
mes "[Dancer Kim]";
mes "It's so fascinating that I can dance in a snowy, beautiful village,";
mes "I'm so glad that I came here, Lutie.";
diff --git a/npc/re/jobs/novice/academy.txt b/npc/re/jobs/novice/academy.txt
index 999d147105a..e4fefec2853 100644
--- a/npc/re/jobs/novice/academy.txt
+++ b/npc/re/jobs/novice/academy.txt
@@ -13,166 +13,382 @@
//= 1.0.0 Initial Release. [Kisuka]
//= 1.0.1 Converted item constants to IDs and added hair coupon. [Kisuka]
//= 2.0.0 Converted from Hercules Script to rAthena Script. [Capuche]
+//= 2.0.1 Add new Intro Renewal based on Hercules [Jenkijo]
//==============================================================================
+//== Starting Point (iz_int) =================================
+iz_int,18,30,0 script iz_int#intro_start HIDDEN_WARP_NPC,6,6,{
+ end;
+OnTouch:
+ navigateto("iz_int", 52, 30, NAV_NONE, 1); // Individual map name not required
+ if (getd(".start" + strnpcinfo(1)) == 0) {
+ setd ".start" + strnpcinfo(1), 1;
+ initnpctimer;
+ mapannounce strnpcinfo(4), "[Tip] You can move to the desired point by clicking the ground with the left mouse button.", bc_map,0xFF0000;
+ }
+ end;
+OnTimer9000:
+ mapannounce strnpcinfo(4), "[Tip] While holding down the right mouse button, drag to rotate the screen.", bc_map,0xFF0000;
+ end;
+OnTimer18000:
+ mapannounce strnpcinfo(4), "[Tip] You can leave through the bluish warp gate.", bc_map,0xFF0000;
+ emotion ET_SURPRISE, getnpcid(0, "#room_out" + replacestr( strnpcinfo(4), "iz_int", "" ));
+ end;
+OnTimer21000:
+ emotion ET_SURPRISE, getnpcid(0, "#room_out" + replacestr( strnpcinfo(4), "iz_int", "" ));
+ end;
+OnTimer24000:
+ emotion ET_SURPRISE, getnpcid(0, "#room_out" + replacestr( strnpcinfo(4), "iz_int", "" ));
+ end;
+OnTimer27000:
+ mapannounce strnpcinfo(4), "[Tip] Leave this area to continue.", bc_map,0xFF0000;
+ stopnpctimer;
+ setd ".start" + strnpcinfo(1), 0;
+ end;
+}
+iz_int01,18,30,0 duplicate(iz_int#intro_start) iz_int01#intro_start HIDDEN_WARP_NPC,6,6
+iz_int02,18,30,0 duplicate(iz_int#intro_start) iz_int02#intro_start HIDDEN_WARP_NPC,6,6
+iz_int03,18,30,0 duplicate(iz_int#intro_start) iz_int03#intro_start HIDDEN_WARP_NPC,6,6
+iz_int04,18,30,0 duplicate(iz_int#intro_start) iz_int04#intro_start HIDDEN_WARP_NPC,6,6
+
+iz_int,51,30,0 script iz_int#intro_evt02 HIDDEN_WARP_NPC,1,1,{
+ end;
+OnTouch:
+ navigateto("int_land", 75, 100, NAV_NONE, 1);
+ end;
+}
+iz_int01,51,30,0 duplicate(iz_int#intro_evt02) iz_int01#intro_evt02 HIDDEN_WARP_NPC,1,1
+iz_int02,51,30,0 duplicate(iz_int#intro_evt02) iz_int02#intro_evt02 HIDDEN_WARP_NPC,1,1
+iz_int03,51,30,0 duplicate(iz_int#intro_evt02) iz_int03#intro_evt02 HIDDEN_WARP_NPC,1,1
+iz_int04,51,30,0 duplicate(iz_int#intro_evt02) iz_int04#intro_evt02 HIDDEN_WARP_NPC,1,1
+
+//== Wounded Swordsman (iz_int) =================================
+iz_int,56,32,3 script Wounded Swordsman#intro_npc01_iz_int 4_TOWER_01,5,5,{
+ @intro_npc01 = 1;
+ npctalk "Oh...", "", bc_self;
+ classchange HIDDEN_WARP_NPC, "", bc_self;// todo: classchange self remain on map
+ classchange 4_TOWER_02, "Wounded Swordsman#intro_npc02_" + strnpcinfo(4), bc_self;
+ end;
+
+OnTouch:
+ if (@intro_npc01 == 0) {
+ npctalk "Urgh... please... help me...", "", bc_self;
+ sleep2 500;
+ npctalk "In order to talk with me.. click my body..", "", bc_self;
+ }
+ else {// debug
+ classchange HIDDEN_WARP_NPC, "", bc_self;
+ classchange 4_TOWER_02, "Wounded Swordsman#intro_npc02_" + strnpcinfo(4), bc_self;
+ }
+ end;
+
+OnInit:
+ questinfo 21001, QTYPE_QUEST, 1, Job_Novice;
+ end;
+}
+iz_int01,56,32,3 duplicate(Wounded Swordsman#intro_npc01_iz_int) Wounded Swordsman#intro_npc01_iz_int01 4_TOWER_01,5,5
+iz_int02,56,32,3 duplicate(Wounded Swordsman#intro_npc01_iz_int) Wounded Swordsman#intro_npc01_iz_int02 4_TOWER_01,5,5
+iz_int03,56,32,3 duplicate(Wounded Swordsman#intro_npc01_iz_int) Wounded Swordsman#intro_npc01_iz_int03 4_TOWER_01,5,5
+iz_int04,56,32,3 duplicate(Wounded Swordsman#intro_npc01_iz_int) Wounded Swordsman#intro_npc01_iz_int04 4_TOWER_01,5,5
+
+iz_int,56,32,3 script Wounded Swordsman#intro_npc02_iz_int HIDDEN_WARP_NPC,{
+ if (isbegin_quest(21001) == 0) {
+ mes "[Wounded]";
+ mes "Wow! Thanks a lot!";
+ mes "I don't know how this happened to our ship";
+ mes "but we should go to see the captain.";
+ next;
+ mes "[Wounded]";
+ mes "... ohh, it seems my body is too injured.";
+ mes "Maybe you can go without me?";
+ setquest 21001;
+ next;
+ cutin "tutorial02",4;
+ mes "^4d4dff!- Information -!^000000";
+ mes "NPC Quest Received.";
+ }
+ else {
+ mes "[Wounded]";
+ mes "Luckily the water has not entered the ship.";
+ mes "I will wait here, you should go see the captain.";
+ next;
+ mes "[Wounded]";
+ mes "I'm fine! I'm fine!";
+ mes "Don't worry about me, you should really go to the captain!";
+ next;
+ mes "^4d4dff!- Information -!^000000";
+ }
+ mes "^4d4dffQuestinfo Shortcut is Alt + U^000000";
+ mes "You can check your quest status there anytime.";
+ close2;
+ cutin "",255;
+ end;
+
+OnInit:
+ questinfo 21001, QTYPE_QUEST, 1, Job_Novice;
+ end;
+}
+iz_int01,56,32,3 duplicate(Wounded Swordsman#intro_npc02_iz_int) Wounded Swordsman#intro_npc02_iz_int01 HIDDEN_WARP_NPC
+iz_int02,56,32,3 duplicate(Wounded Swordsman#intro_npc02_iz_int) Wounded Swordsman#intro_npc02_iz_int02 HIDDEN_WARP_NPC
+iz_int03,56,32,3 duplicate(Wounded Swordsman#intro_npc02_iz_int) Wounded Swordsman#intro_npc02_iz_int03 HIDDEN_WARP_NPC
+iz_int04,56,32,3 duplicate(Wounded Swordsman#intro_npc02_iz_int) Wounded Swordsman#intro_npc02_iz_int04 HIDDEN_WARP_NPC
+
// - Captain Carocc (Ship)
// -----------------------------------------------------------------------------
-iz_int,100,91,3 script Captain Carocc#iz_int 4_M_REINDEER,{
- if (Class == Job_Novice) {
- cutin "fly_trock", 2;
- if (!isbegin_quest(7471)) {
- mes "[Captain Carocc]";
- mes "Had a good dream?";
- mes "Soon, we will get to ^4d4fffIzlude^000000.";
- next;
- mes "[Captain Carocc]";
- mes "And you can talk to other people like you just talked to me.";
- next;
- cutin "tutorial01",3;
- mes "!- Information -!";
- mes "^4d4fffLeft mouse click allows basic game controls.";
- mes "Such as conversation with NPC, movement, and attacks.^000000";
- next;
- cutin "fly_trock",2;
- mes "[Captain Carocc]";
- mes "Many youngsters visit the ^4d4fffRune Midgard Kingdom^000000 to chase their dreams.";
- mes "Izlude is a satellite city of Prontera, the capital of the Rune Midgard Kingdom.";
- next;
- mes "[Captain Carocc]";
- mes "Izlude always welcomes young adventurers like you who have just started their journey to the World.";
- mes "You are one of them of course.";
- next;
- mes "[Captain Carocc]";
- mes "I would like to tell you more stories, but it's time to get ready for arrival.";
- mes "There is an academy in Izlude for newcomers like yourself.";
- next;
+int_land,78,103,5 script Captain Carocc#intro_npc03 4_M_REINDEER,{
+ switch( isbegin_quest(21008) ) {
+ case 0:
+ mes "[Captain Carocc]";
+ mes "There are still people in the cabins?!";
+ mes "At least you are safe.";
+ mes "Are you alright?";
+ next;
+ if (select("I'm alright, but others need help.", "I think I am the last?") == 1) {
mes "[Captain Carocc]";
- mes "Let me give you more details later.";
- mes "See you back at the harbor deck.";
- next;
+ mes "There are more people left?";
+ mes "I will send a rescue team to them.";
+ mes "Thank you for your report.";
+ } else {
mes "[Captain Carocc]";
- mes "To get off this ship, you should enter the ^4d4fffShining Portal^000000 over there.";
- mes "All transportation is made through the portals.";
- setquest 7471;
- completequest 7471;
- close2;
- cutin "", 255;
- end;
+ mes "Alright, that's good.";
+ mes "The storm came unexpectedly but I never thought it would hit us that hard.";
}
+ next;
mes "[Captain Carocc]";
- mes "Now, we are here in Izlude~";
- mes "Go through that ^4d4fffShining Portal^000000 and exit outside.";
+ mes "At least most people made it to safety.";
next;
mes "[Captain Carocc]";
- mes "Let's talk more when we get off to the deck.";
- mes "There are lots of things I want to teach you.";
- close2;
- cutin "", 255;
- end;
+ mes "Look at the trees there, ^4d4dfffollow them to the southwest^000000 to find a new ship.";
+ mes "The ship will take you to ^4d4dffIzlude^000000, our original destination.";
+ next;
+ mes "[Captain Carocc]";
+ mes "Ah! Speaking of it, those ^4d4dffPorings^000000 on this island drop several materials we could use for repairs.";
+ next;
+ mes "[Captain Carocc]";
+ mes "^4d4dffKill the Porings and bring 2 Lumbers to the southern crew^000000.";
+ next;
+ mes "[Captain Carocc]";
+ mes "It is a hard task, but you look tough enough.";
+ specialeffect2 EF_HEAL2;
+ heal 9999,0;
+ skilleffect 34,0;
+ sc_start SC_BLESSING,240000,10;
+ skilleffect 29,0;
+ sc_start SC_INCREASEAGI,240000,10;
+ if (isbegin_quest(21001) == 1) {
+ completequest 21001;
+ getexp 600,600;
+ }
+ setquest 21008;
+ next;
+ mes "[Captain Carocc]";
+ mes "Speaking of Porings, you have to equip your gears.";
+ mes "You should have a ^4d4dffweapon and an armor^000000 equipped.";
+ next;
+ cutin "tutorial03",4;
+ mes "!- Information -!";
+ mes "^4d4dffYou can equip gear or use items by simply double clicking them.";
+ mes "The item window can be opened by pressing Alt + E or using the menu button.^000000";
+ next;
+ mes "!- Information -!";
+ mes "^4d4dffEquipped Items can be seen by pressing Alt + Q.";
+ mes "Either double click or drag & drop to equip or unequip them.^000000";
+ next;
+ cutin "",255;
+ mes "[Captain Carlock]";
+ mes "Did you check all your equipment?";
+ mes "^4d4dffSkill distribution^000000 should be done.";
+ next;
+ mes "[Captain Carlock]";
+ mes "For a smooth battle, you have to distribute your abilities properly.";
+ mes "^4d4dffIf you want to increase your strength, you need to raise Str^000000. ^4d4dffIf you want to increase your hit, you must raise Dex^000000.";
+ break;
+ case 1:
+ mes "[Captain Carocc]";
+ specialeffect2 EF_HEAL2;
+ heal 9999, 0;
+ skilleffect 34,0;
+ sc_start SC_BLESSING,240000,10;
+ skilleffect 29,0;
+ sc_start SC_INCREASEAGI,240000,10;
+ mes "^4d4dffThe Ship^000000 is anchored in the southwest. It will take you to Izlude.";
+ mes "Don't forget to ^4d4dffget some Lumber^000000 for the ship.";
+ next;
+ mes "[Captain Carocc]";
+ mes "Don't forget to raise your ^4d4dffskills^000000.";
+ break;
+ case 2:
+ mes "[Captain Carocc]";
+ mes "Everything is ready to sail over to Izlude.";
+ mes "The ship is located at the south-western part of the island.";
+ close;
}
+ next;
+ mes "! - Information -!";
+ mes "^4d4dffYou get a stats bonus for every level you raise.";
+ mes "The status window can be opened and closed with the shortcut Alt + A^000000.";
+ next;
+ mes "! - Information -!";
+ mes "^4d4dffPlease properly allocate the stats you need to battle^000000.";
+ next;
+ mes "[Captain Carocc]";
+ mes "Kill Porings and bring the Lumber to the crew.";
+ mes "Good luck!";
+ close;
+
+OnInit:
+ questinfo 21008, QTYPE_QUEST, 1, Job_Novice;
+ end;
}
-iz_int01,100,91,3 duplicate(Captain Carocc#iz_int) Captain Carocc#iz_int01 4_M_REINDEER
-iz_int02,100,91,3 duplicate(Captain Carocc#iz_int) Captain Carocc#iz_int02 4_M_REINDEER
-iz_int03,100,91,3 duplicate(Captain Carocc#iz_int) Captain Carocc#iz_int03 4_M_REINDEER
-iz_int04,100,91,3 duplicate(Captain Carocc#iz_int) Captain Carocc#iz_int04 4_M_REINDEER
+int_land01,78,103,5 duplicate(Captain Carocc#intro_npc03) Captain Carocc#intro_npc03_01 4_M_REINDEER
+int_land02,78,103,5 duplicate(Captain Carocc#intro_npc03) Captain Carocc#intro_npc03_02 4_M_REINDEER
+int_land03,78,103,5 duplicate(Captain Carocc#intro_npc03) Captain Carocc#intro_npc03_03 4_M_REINDEER
+int_land04,78,103,5 duplicate(Captain Carocc#intro_npc03) Captain Carocc#intro_npc03_04 4_M_REINDEER
-// - Lumin (Ship)
-// -----------------------------------------------------------------------------
-iz_int,91,81,3 script Lumin#iz_int 4_M_NOV_RUMIN,{
- if (Class == Job_Novice) {
- if (!isbegin_quest(7471)) {
- mes "[Lumin]";
- mes "............";
- mes "...?";
- next;
- cutin "fly_trock",2;
- mes "[Captain Carocc]";
- mes "Hey, you awake now?";
- mes "That fella without much talk, I rescued him from the ocean.";
- next;
- mes "[Captain Carocc]";
- mes "Think he lost his memory.";
- mes "I gave him a new name 'Lumin'. But, just call him Lu...";
- next;
- mes "[Captain Carocc]";
- mes "And you can talk to other people like you just talked to me.";
- next;
- cutin "tutorial01",3;
- mes "!- Information -!";
- mes "^4d4fffLeft mouse click allows basic game control.";
- mes "Such as conversation with NPC, movement, and attacks.^000000";
- next;
- cutin "fly_trock",2;
- mes "[Captain Carocc]";
- mes "Many youngsters visit the ^4d4fffRune Midgard Kingdom^000000 to chase their dreams.";
- mes "Izlude is a satellite city of Prontera, the capital of the Rune Midgard Kingdom.";
- next;
- mes "[Captain Carocc]";
- mes "Izlude always welcomes young adventurers like you who have just started their journey to the World.";
- mes "You are one of them of course.";
- next;
- mes "[Captain Carocc]";
- mes "I would like to tell you more stories, but it's time to get ready for arrival.";
- mes "There is an academy in Izlude for newcomers like yourself.";
- next;
- mes "[Captain Carocc]";
- mes "Let me give you more detail later.";
- mes "See you back at the harbor deck.";
- next;
- mes "[Captain Carocc]";
- mes "To get off this ship, you should enter the ^4d4fffShining Portal^000000 over there.";
- mes "All transportation is made through those portals.";
- setquest 7471;
- completequest 7471;
- next;
- cutin "nov_lumin01",0;
- mes "[Lumin]";
- mes "Yes.";
- next;
- cutin "fly_trock",2;
- mes "[Carocc]";
- mes "Oh, boy.";
- mes "What cute reaction.";
- close2;
- cutin "", 255;
- end;
- }
- cutin "nov_lumin01",0;
+//== Lumin (int_land) ==========================================
+int_land,73,100,3 script Lumin#new_ship 4_M_NOV_RUMIN,{
+ if (isbegin_quest(7471) == 0) {
+ cutin "nov_lumin01.bmp",0;
mes "[Lumin]";
- mes ".....";
+ mes ".............";
+ mes "..?";
next;
- select("Should I introduce myself?", "My name is ~!");
- mes "["+strcharinfo(0)+"]";
- mes "I am "+strcharinfo(0)+"!";
+ cutin "fly_trock.bmp",2;
+ mes "[Captain Carocc]";
+ mes "Had a good dream?";
+ mes "Soon, we will get to Izlude. And you can talk to other people like you just talked to me.";
+ next;
+ mes "[Captain Carocc]";
+ mes "I think that guy over there lost his memory. I gave him a new name.";
+ mes "Lumin.";
+ next;
+ mes "[Captain Carocc]";
+ mes "Many youngsters visit the ^4d4dffRune-Midgarts Kingdom^000000 to chase their dreams.";
+ mes "Izlude is a satellite city of Prontera, the capital of the Rune-Midgarts Kingdom.";
next;
- mes "[Lu]";
- mes ".....";
+ mes "[Captain Carocc]";
+ mes "Izlude always welcomes young adventurers like you who have just started their journey through the world.";
+ mes "You are one of them, of course.";
next;
- mes "[Lu]";
- mes ".....";
- mes "....So?";
+ mes "[Captain Carocc]";
+ mes "I would like to tell you more stories, but it's time to get ready for arrival.";
+ mes "There is an academy in Izlude for newcomers like yourself.";
next;
- mes "- Lu just walked away with a cynical look on his face.";
+ mes "[Captain Carocc]";
+ mes "Let me give you more details later. See you back at the harbor deck.";
next;
- cutin "fly_trock",2;
- mes "[Carocc]";
- mes "He's just shy, you know.";
- mes "You will see him again in Izlude, be good to him please.";
+ mes "[Captain Carocc]";
+ mes "To get off this ship, you should enter the ^4d4dffShining Portal^000000 over there.";
+ mes "All transportation is made through the portals.";
+ setquest 7471;
+ completequest 7471;
next;
- mes "[Carocc]";
- mes "From now on, I'll be driving this ship around Izlude.";
- mes "Let's go, shall we?";
+ cutin "nov_lumin01.bmp", 0;
+ mes "[Lumin]";
+ mes "Yes.";
+ next;
+ classchange HIDDEN_WARP_NPC, "", bc_self;// todo: classchange self remain on map
+ cutin "fly_trock.bmp",2;
+ mes "[Captain Carocc]";
+ mes "Oh boy.";
+ mes "What a cute reaction.";
close2;
- cutin "", 255;
+ cutin "",255;
end;
}
+ cutin "nov_lumin01.bmp",0;
+ mes "[Lumin]";
+ mes ".....";
+ next;
+ select("Should I introduce myself?", "My name is ~!");
+ mes "[" + strcharinfo(0) + "]";
+ mes "I am " + strcharinfo(0) + "!";
+ next;
+ mes "[Lu]";
+ mes ".....";
+ next;
+ mes "[Lu]";
+ mes ".....";
+ mes "....So?";
+ next;
+ classchange HIDDEN_WARP_NPC, "", bc_self;// todo: classchange self remain on map
+ mes "- Lu just walked away with a cynical look on his face.";
+ next;
+ cutin "fly_trock.bmp",2;
+ mes "[Captain Carocc]";
+ mes "Looks like... he has a shy personality.";
+ mes "When you go to Izlude, will you check on him?";
+ next;
+ mes "[Captain Carocc]";
+ mes "From now on I'll be sailing the ship around the island.";
+ mes "Let's go, shall we?";
+ close2;
+ cutin "",255;
+ end;
+
+OnInit:
+ questinfo 7471, QTYPE_QUEST, 1, Job_Novice;
+ setquestinfo_req 7471,21008,1;
+ end;
+}
+int_land01,73,100,3 duplicate(Lumin#new_ship) Lumin#new_ship01 4_M_NOV_RUMIN
+int_land02,73,100,3 duplicate(Lumin#new_ship) Lumin#new_ship02 4_M_NOV_RUMIN
+int_land03,73,100,3 duplicate(Lumin#new_ship) Lumin#new_ship03 4_M_NOV_RUMIN
+int_land04,73,100,3 duplicate(Lumin#new_ship) Lumin#new_ship04 4_M_NOV_RUMIN
+
+int_land,58,69,5 script Sailor#intro_npc04 4W_SAILOR,{
+ if (isbegin_quest(21008) == 1) {
+ if (countitem(6008) < 2) {
+ mes "[Sailor]";
+ mes "These Porings stole my materials to repair the ship. Can you help me to get them back?";
+ mes "There are plenty of Porings on this island.";
+ next;
+ mes "[Sailor]";
+ mes "I would really appreciate it if you help me.";
+ mes "I am not allowed to set foot on this island.";
+ mes "That's why I ask for your help~";
+ close;
+ }
+ mes "[Sailor]";
+ mes "Unbelievable, perfect! Any chance you want to join my crew?";
+ mes "Enough talking!!";
+ mes "Come on, we're ready to set sail!";
+ mes "Thank you so much!";
+ next;
+ mes "[Sailor]";
+ mes "If you want to sail with us to Izlude, jump on board!";
+ delitem 6008,2;
+ getexp 100,100;
+ getitem 611,5;
+ completequest 21008;
+ next;
+ mes "[Sailor]";
+ mes "Oh, and take these ^4d4dffMagnifiers^000000.";
+ mes "When you hunt monsters you can find ^4d4dffunidentified items^000000.";
+ next;
+ mes "[Sailor]";
+ mes "Using a Magnifier will identify the item.";
+ next;
+ mes "[Sailor]";
+ mes "Maybe you already have some unidentified items from your fights with those Porings?";
+ close;
+ }
+ mes "[Sailor]";
+ mes "The ship is heading to Izlude soon~!";
+ mes "I'll let you know when we set sail~!";
+ close;
+
+OnInit:
+ questinfo 21002, QTYPE_QUEST, 1, Job_Novice;
+ setquestinfo_req 21002,21008,1;
+ end;
}
-iz_int01,91,81,3 duplicate(Lumin#iz_int) Lumin#iz_int01 4_M_NOV_RUMIN
-iz_int02,91,81,3 duplicate(Lumin#iz_int) Lumin#iz_int02 4_M_NOV_RUMIN
-iz_int03,91,81,3 duplicate(Lumin#iz_int) Lumin#iz_int03 4_M_NOV_RUMIN
-iz_int04,91,81,3 duplicate(Lumin#iz_int) Lumin#iz_int04 4_M_NOV_RUMIN
+int_land01,58,69,5 duplicate(Sailor#intro_npc04) Sailor#intro_npc04_01 4W_SAILOR
+int_land02,58,69,5 duplicate(Sailor#intro_npc04) Sailor#intro_npc04_02 4W_SAILOR
+int_land03,58,69,5 duplicate(Sailor#intro_npc04) Sailor#intro_npc04_03 4W_SAILOR
+int_land04,58,69,5 duplicate(Sailor#intro_npc04) Sailor#intro_npc04_04 4W_SAILOR
// - Captain Carocc
// -----------------------------------------------------------------------------
@@ -584,9 +800,9 @@ OnInit:
OnTouch:
if (Class == Job_Novice && BaseLevel < 15 && !isbegin_quest(4269))
- emotion e_gasp;
+ emotion ET_SURPRISE;
else
- emotion e_heh;
+ emotion ET_SMILE;
end;
}
@@ -751,7 +967,7 @@ izlude,122,207,3 script Criatura Academy Staff#0 4_M_KHKYEL,3,3,{
mes "<NAVI>[the Academy building]<INFO>iz_ac01,100,39</INFO></NAVI>.";
mes "Anybody can enroll, so take advantage of it.";
next;
- emotion e_gasp, 0, "Information Staff#"+strnpcinfo(2);
+ emotion ET_SURPRISE, getnpcid(0, "Information Staff#"+strnpcinfo(2));
mes "[Information Staff]";
mes "Sorry to interrupt.";
mes "But ^4d4dffif you need location info, please ask me.^000000";
@@ -773,7 +989,7 @@ izlude,122,207,3 script Criatura Academy Staff#0 4_M_KHKYEL,3,3,{
mes "If there are more adventurers like you, the future will be brighter.";
mes "Hahahaha.";
next;
- emotion e_gasp, 0, "Information Staff#"+strnpcinfo(2);
+ emotion ET_SURPRISE, getnpcid(0, "Information Staff#"+strnpcinfo(2));
mes "[Information Staff]";
mes "Sorry to interrupt.";
mes "But ^4d4dffif you need location info, please ask me.^000000";
@@ -792,7 +1008,7 @@ izlude,122,207,3 script Criatura Academy Staff#0 4_M_KHKYEL,3,3,{
mes "<NAVI>[the academy building]<INFO>iz_ac01,100,39</INFO></NAVI>.";
mes "What is well, is well- isn't it?";
next;
- emotion e_gasp, 0, "Information Staff#"+strnpcinfo(2);
+ emotion ET_SURPRISE, getnpcid(0, "Information Staff#"+strnpcinfo(2));
mes "[Information Staff]";
mes "You are correct.";
mes "Preperation is the key.";
@@ -827,7 +1043,7 @@ izlude,122,207,3 script Criatura Academy Staff#0 4_M_KHKYEL,3,3,{
mes "<NAVI>[the Academy building]<INFO>iz_ac01,100,39</INFO></NAVI>.";
mes "Anybody can enroll, so take advantage of it.";
next;
- emotion e_gasp, 0, "Information Staff#"+strnpcinfo(2);
+ emotion ET_SURPRISE, getnpcid(0, "Information Staff#"+strnpcinfo(2));
mes "[Information Staff]";
mes "Sorry to interrupt.";
mes "But ^4d4dffif you need location info, please ask me.^000000";
@@ -849,7 +1065,7 @@ izlude,122,207,3 script Criatura Academy Staff#0 4_M_KHKYEL,3,3,{
mes "If there are more adventurers like you, the future will be brighter.";
mes "Hahahaha.";
next;
- emotion e_gasp, 0, "Information Staff#"+strnpcinfo(2);
+ emotion ET_SURPRISE, getnpcid(0, "Information Staff#"+strnpcinfo(2));
mes "[Information Staff]";
mes "Sorry to interrupt.";
mes "But ^4d4dffif you need location info, please ask me.^000000";
@@ -868,7 +1084,7 @@ izlude,122,207,3 script Criatura Academy Staff#0 4_M_KHKYEL,3,3,{
mes "<NAVI>[the academy building]<INFO>iz_ac01,100,39</INFO></NAVI>.";
mes "What is well, is well- isn't it?";
next;
- emotion e_gasp, 0, "Information Staff#"+strnpcinfo(2);
+ emotion ET_SURPRISE, getnpcid(0, "Information Staff#"+strnpcinfo(2));
mes "[Information Staff]";
mes "You are correct.";
mes "Preperation is the key.";
@@ -905,9 +1121,9 @@ OnInit:
OnTouch:
if (!isbegin_quest(4269))
- emotion e_gasp;
+ emotion ET_SURPRISE;
else
- emotion e_heh;
+ emotion ET_SMILE;
end;
}
@@ -1565,7 +1781,7 @@ OnInit:
OnTouch:
if (isbegin_quest(7474) == 1 && !isbegin_quest(7475))
- emotion e_gasp;
+ emotion ET_SURPRISE;
end;
}
@@ -1708,7 +1924,7 @@ OnInit:
OnTouch:
if (isbegin_quest(7474) == 1 && !isbegin_quest(7476))
- emotion e_gasp;
+ emotion ET_SURPRISE;
end;
}
@@ -1851,7 +2067,7 @@ OnInit:
OnTouch:
if (isbegin_quest(7474) == 1 && !isbegin_quest(7477))
- emotion e_gasp;
+ emotion ET_SURPRISE;
end;
}
@@ -2077,8 +2293,8 @@ izlude,141,251,0 script Cultivated Red Plant#0 1078,3,3,{
OnTouch:
if (isbegin_quest(7478) == 1 && !isbegin_quest(7479)) {
specialeffect EF_STEAL;
- emotion e_heh, 0, "Academy Student#"+strnpcinfo(2);
- emotion e_gasp, 1;
+ emotion ET_SMILE, getnpcid(0, "Academy Student#"+strnpcinfo(2));
+ emotion ET_SURPRISE, playerattached();
donpcevent "Cultivated Red Plant#"+strnpcinfo(2)+"::OnDisable";
}
end;
@@ -2110,8 +2326,8 @@ izlude,140,249,7 script Academy Student#0 4_M_NOV_RUMIN,{
if (isbegin_quest(7478) == 1 && !isbegin_quest(7479)) {
specialeffect EF_STEAL, AREA, "Cultivated Red Plant#"+strnpcinfo(2);
donpcevent "Cultivated Red Plant#"+strnpcinfo(2)+"::OnDisable";
- emotion e_gasp, 1;
- emotion e_heh;
+ emotion ET_SURPRISE, playerattached();
+ emotion ET_SMILE;
mes "[Lumin]";
mes "Hey there Turtle";
mes "You are really slow.";
@@ -2245,12 +2461,12 @@ izlude,140,260,3 script Instructor Argos#iz 4_M_LIEMAN,{
mes "Yawn. Who are you making so much noise next to me...";
next;
select("You aren't dead?");
- emotion e_omg, 1;
+ emotion ET_HUK, playerattached();
mes "[Instructor Argos]";
mes "Dead?! Who....?";
mes "me? Pu ha ha ha!!";
next;
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Instructor Argos]";
mes "Sorry for laughing. Ha ha ha!";
mes "I was just taking a nap because the weather is good.";
@@ -2285,7 +2501,7 @@ izlude,140,260,3 script Instructor Argos#iz 4_M_LIEMAN,{
mes "[Instructor Argos]";
mes "You made a right decision!";
mes "I want to teach you for good.";
- emotion e_no1;
+ emotion ET_BEST;
next;
mes "[Instructor Argos]";
mes "A novice does not know the potential power of himself nor how strong the enemy is.";
@@ -2307,7 +2523,7 @@ izlude,140,260,3 script Instructor Argos#iz 4_M_LIEMAN,{
mes "[Instructor Argos]";
mes "I was faced with the risk of death, because I was not good at pretending to be dead.";
mes "Even when I look back at that time. it is still thrilling...";
- emotion e_wah;
+ emotion ET_KEK;
next;
mes "[Instructor Argos]";
mes "let's continue to talk";
@@ -2676,7 +2892,7 @@ iz_ac01,134,47,5 script Trainer Mainz#ac 4_M_KY_KNT,4,4,{
mes "[Mainz]";
mes "Imagine that you are in that status and monsters are rushing to you...";
mes "Believe me it'll happen.";
- emotion e_wah;
+ emotion ET_KEK;
next;
mes "[Mainz]";
mes "This time, I will teach you about <^FF0000Sleep^000000>.";
@@ -2708,7 +2924,7 @@ iz_ac01,134,47,5 script Trainer Mainz#ac 4_M_KY_KNT,4,4,{
next;
mes "[Mainz]";
mes "Sleep is good for recovery but not necessarily good while you're in the middle of a battle.";
- emotion e_flash;
+ emotion ET_SPARK;
next;
mes "[Mainz]";
mes "Lastly, I will teach you about <^FF0000 Silence ^000000>.";
@@ -2763,7 +2979,7 @@ iz_ac01,134,47,5 script Trainer Mainz#ac 4_M_KY_KNT,4,4,{
mes "[Mainz]";
mes "Hey, you there!";
mes "By any chance, are you a training beginner?";
- emotion e_flash;
+ emotion ET_SPARK;
next;
mes "[Mainz]";
mes "I'm Trainer Mainz; and I'm in charge of education at this Academy.";
@@ -2803,13 +3019,13 @@ iz_ac01,134,47,5 script Trainer Mainz#ac 4_M_KY_KNT,4,4,{
mes "[Mainz]";
mes "Should I just take it for myself then?";
close2;
- emotion e_sigh;
+ emotion ET_OHNO;
end;
}
mes "[Mainz]";
mes "Yes... You made a right decision.";
mes "Please keep in mind that I really wanted to have it but since you look exhausted I offered it to you first!";
- emotion e_no1;
+ emotion ET_BEST;
next;
mes "- You open the lunchbox and there is some type of food inside -";
next;
@@ -2828,7 +3044,7 @@ iz_ac01,134,47,5 script Trainer Mainz#ac 4_M_KY_KNT,4,4,{
mes "[Mainz]";
mes "Oh... what happened to you?";
mes "You don't look too good!";
- emotion e_what;
+ emotion ET_QUESTION;
next;
mes "[Mainz]";
mes "Oh, man...";
@@ -2852,7 +3068,7 @@ iz_ac01,134,47,5 script Trainer Mainz#ac 4_M_KY_KNT,4,4,{
next;
mes "- You roll your eyes at Mainz -";
mes "- Mainz turns his head as if he doesn't notice -";
- emotion e_bzz;
+ emotion ET_STARE;
next;
mes "[Mainz]";
mes "Ehem! Anyway, I am sorry.";
@@ -2870,7 +3086,7 @@ iz_ac01,134,47,5 script Trainer Mainz#ac 4_M_KY_KNT,4,4,{
next;
mes "[Mainz]";
mes "Understand that I didn't intend to pass my wife's lunchbox as if it was a present. It was just another lesson from the Criatura Academy.";
- emotion e_otl;
+ emotion ET_OTL;
next;
mes "[Mainz]";
mes "As an apology, I would like to inform you of several abnormal statuses you might experience in the Rune Midgard Continent.";
@@ -2879,7 +3095,7 @@ iz_ac01,134,47,5 script Trainer Mainz#ac 4_M_KY_KNT,4,4,{
mes "Don't decline it! Being ready to learn so speak to me again.";
setquest 15000;
close2;
- emotion e_sry;
+ emotion ET_SORRY;
end;
} else {
mes "[Mainz]";
@@ -2954,7 +3170,7 @@ iz_ac01,134,47,5 script Trainer Mainz#ac 4_M_KY_KNT,4,4,{
mes "[Mainz]";
mes "Imagine that you are in that status and monsters are rushing to you...";
mes "Believe me it'll happen.";
- emotion e_wah;
+ emotion ET_KEK;
next;
mes "[Mainz]";
mes "What else are you anxious about?";
@@ -2991,7 +3207,7 @@ iz_ac01,134,47,5 script Trainer Mainz#ac 4_M_KY_KNT,4,4,{
next;
mes "[Mainz]";
mes "Sleep is good for recovery but not necessarily good while you're in the middle of a battle.";
- emotion e_flash;
+ emotion ET_SPARK;
next;
mes "[Mainz]";
mes "What else are you anxious about?";
@@ -3042,14 +3258,14 @@ iz_ac01,134,47,5 script Trainer Mainz#ac 4_M_KY_KNT,4,4,{
mes "Haaaaa...";
mes "What should I do with this lunchbox?";
close2;
- emotion e_sigh;
+ emotion ET_OHNO;
end;
}
}
}
OnTouch_:
- emotion e_otl;
+ emotion ET_OTL;
end;
}
@@ -3687,19 +3903,19 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{
mes "["+strcharinfo(0)+"]";
mes ""+strcharinfo(0)+", hello.";
next;
- emotion e_no1;
+ emotion ET_BEST;
mes "[Dacquoise]";
mes "I am Dacquoise, the pupil of the legendary chef of Rune Midgard, ^0000cdCharles Orleans^000000.";
next;
- emotion e_no1, 0, "Eclaire#"+strnpcinfo(2);
+ emotion ET_BEST, getnpcid(0, "Eclaire#"+strnpcinfo(2));
mes "[Eclaire]";
mes "And we are also club members of Sir Orleans' ^0000cdfan club- Loverleans^000000.";
next;
- emotion e_lv,"Mille Feuille#"+strnpcinfo(2);
+ emotion ET_THROB, getnpcid(0, "Mille Feuille#"+strnpcinfo(2));
mes "[Mille Feuille]";
mes "Orlean belongs to all of us!";
next;
- emotion e_sob;
+ emotion ET_CRY;
mes "[Dacquoise]";
mes "Ah, what do all the fools of the land eat?";
next;
@@ -3718,7 +3934,7 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{
mes "[Eclaire]";
mes "You, do you want to know more about cooking?";
next;
- emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2);
+ emotion ET_THROB, getnpcid(0, "Mille Feuille#"+strnpcinfo(2));
mes "[Mille Feuille]";
mes "Will you exeprience the various spectrums of cooking?";
next;
@@ -3733,15 +3949,15 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{
mes "Don't forget to pound your chest if you choke on sweet potato!";
close;
}
- emotion e_no1;
+ emotion ET_BEST;
mes "[Dacquoise]";
mes "Ok, we will be kind guides to the journey of cooking!!";
next;
- emotion e_no1, 0, "Eclaire#"+strnpcinfo(2);
+ emotion ET_BEST, getnpcid(0, "Eclaire#"+strnpcinfo(2));
mes "[Eclaire]";
mes "It's ok with me, asking me everthing you want to know.";
next;
- emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2);
+ emotion ET_THROB, getnpcid(0, "Mille Feuille#"+strnpcinfo(2));
mes "[Mille Feuille]";
mes "Kindness is our spice~";
next;
@@ -3750,7 +3966,7 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{
mes "[Dacquoise]";
mes "Aha! You want to know about the benefits of cooking? Cooked meals have two benefits!";
next;
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Dacquoise]";
mes "First, ^0000cdincreased stats!^000000 Baaam!!";
next;
@@ -3760,7 +3976,7 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{
mes "[Mille Feuille]";
mes "The amount of the stat increase changes depending on the level of cooking.";
next;
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Dacquoise]";
mes "And the next benefit? Babam!";
next;
@@ -3795,24 +4011,24 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{
mes "[Dacquoise]";
mes "Preparation can also be split into two stages.";
next;
- emotion e_gasp;
+ emotion ET_SURPRISE;
break;
case 2:
mes "[Dacquoise]";
mes "Right, cooking needs some preparation. This can also be divided into two catagories.";
next;
- emotion e_gasp,"Dacquoise#"+strnpcinfo(2);
+ emotion ET_SURPRISE, getnpcid(0, "Dacquoise#"+strnpcinfo(2));
break;
case 3:
- emotion e_an;
+ emotion ET_FRET;
mes "[Dacquoise]";
mes "What is this? What a waste of time!";
next;
- emotion e_ag, 0, "Eclaire#"+strnpcinfo(2);
+ emotion ET_ANGER, getnpcid(0, "Eclaire#"+strnpcinfo(2));
mes "[Eclaire]";
mes "I thought we were going to get more members!";
next;
- emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2);
+ emotion ET_THROB, getnpcid(0, "Mille Feuille#"+strnpcinfo(2));
mes "[Mille Feuille]";
mes "Never show up again!!";
close;
@@ -3835,7 +4051,7 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{
mes "[Mille Feuille]";
mes "Cookbook can be earned ^0000cdthrough Quest^000000s or can be found by hunting ^0000cdmonster^000000s.";
next;
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Dacquoise]";
mes "After getting the Cookbook, next preperation is!";
mes "The ^0000cdingredients!^000000.";
@@ -3857,7 +4073,7 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{
mes "[Dacquoise]";
mes "That's the spirit! Let's cook for real!";
mes "Get prepared and come back!";
- emotion e_no1;
+ emotion ET_BEST;
} else {
mes "[Eclaire]";
mes "We are not responsible even if it fails!";
@@ -3873,15 +4089,15 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{
mes "[Dacquoise]";
mes "I used my valuable time to introduce the cooking world to you.";
mes "Then you just give up?";
- emotion e_an;
+ emotion ET_FRET;
next;
mes "[Eclaire]";
mes "You have insulted us!";
- emotion e_ag, 0, "Eclaire#"+strnpcinfo(2);
+ emotion ET_ANGER, getnpcid(0, "Eclaire#"+strnpcinfo(2));
next;
mes "[Mille Feuille]";
mes "Come back again, if you want to learn later~ I guess...";
- emotion e_dots, 0, "Mille Feuille#"+strnpcinfo(2);
+ emotion ET_THINK, getnpcid(0, "Mille Feuille#"+strnpcinfo(2));
close2;
if (isbegin_quest(14154) == 1)
erasequest 14154;
@@ -3900,16 +4116,16 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{
mes "[Dacquoise]";
mes "You brough what I need! Okay, then I will cook for you as I promised.";
mes "Time to move like greased lightning!!!!";
- emotion e_flash;
+ emotion ET_SPARK;
next;
mes "[Eclaire]";
mes "Go hunting after eating this. You will feel your power enhanced.";
- emotion e_no1, 0, "Eclaire#"+strnpcinfo(2);
+ emotion ET_BEST, getnpcid(0, "Eclaire#"+strnpcinfo(2));
next;
mes "[Mille Feuille]";
mes "If you really want to cook, go and see ^0000ffSir. Charles Orleans at the basement of Prontera castle^000000!!";
mes "Kya... Sir Orleans!!";
- emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2);
+ emotion ET_THROB, getnpcid(0, "Mille Feuille#"+strnpcinfo(2));
close2;
delitem 705,1;// Clover
delitem 511,1;// Green_Herb
@@ -3922,15 +4138,15 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{
mes "[Dacquoise]";
mes "You brough what I need! Okay, then I will cook for you as I promised.";
mes "Time to move like greased lightning!!!!";
- emotion e_flash;
+ emotion ET_SPARK;
next;
mes "[Eclaire]";
mes "Try this. It will make you run like you are a flying bee.";
- emotion e_no1, 0, "Eclaire#"+strnpcinfo(2);
+ emotion ET_BEST, getnpcid(0, "Eclaire#"+strnpcinfo(2));
next;
mes "[Mille Feuille]";
mes "If you really want to cook, go and see ^0000ffSir. Charles Orleans at the basement of Prontera castle^000000!! You must be attracted by him!!";
- emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2);
+ emotion ET_THROB, getnpcid(0, "Mille Feuille#"+strnpcinfo(2));
close2;
delitem 512,1;// Apple
delitem 515,2;// Carrot
@@ -3942,15 +4158,15 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{
mes "[Dacquoise]";
mes "You brough what I need! Okay, then I will cook for you as I promised.";
mes "Time to move like greased lightning!!!!";
- emotion e_flash;
+ emotion ET_SPARK;
next;
mes "[Eclaire]";
mes "Can you feel unknown power coursing through your veins? You're eating it!";
- emotion e_no1, 0, "Eclaire#"+strnpcinfo(2);
+ emotion ET_BEST, getnpcid(0, "Eclaire#"+strnpcinfo(2));
next;
mes "[Mille Feuille]";
mes "If you are really curious about the cooking, go seek Sir. Charles Orleans at the basement of Prontera Castle.";
- emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2);
+ emotion ET_THROB, getnpcid(0, "Mille Feuille#"+strnpcinfo(2));
close2;
delitem 909,1;// Jellopy
delitem 914,1;// Fluff
@@ -3963,17 +4179,17 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{
mes "[Dacquoise]";
mes "You brough what I need! Okay, then I will cook for you as I promised.";
mes "Time to move like greased lightning!!!!";
- emotion e_flash;
+ emotion ET_SPARK;
next;
mes "[Eclaire]";
mes "If you eat this. You will never miss your target!";
mes "In fact, never miss the target for level 1!";
- emotion e_no1, 0, "Eclaire#"+strnpcinfo(2);
+ emotion ET_BEST, getnpcid(0, "Eclaire#"+strnpcinfo(2));
next;
mes "[Mille Feuille]";
mes "Go and see Sir. Charles Orleans at the basement of Prontera castle!!";
mes "You can learn real cooking from him!";
- emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2);
+ emotion ET_THROB, getnpcid(0, "Mille Feuille#"+strnpcinfo(2));
close2;
delitem 512,1;// Apple
delitem 705,1;// Clover
@@ -4005,34 +4221,34 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{
mes "[Mille Feuille]";
mes "The cooking we are about to show you requires a recipe and cooking equipment but it is difficult for novices so I will cook for you.";
next;
- emotion e_bzz;
+ emotion ET_STARE;
mes "[Dacquoise]";
mes "Why are you saying you will make them?";
next;
- emotion e_hmm, 0, "Mille Feuille#"+strnpcinfo(2);
+ emotion ET_SCRATCH, getnpcid(0, "Mille Feuille#"+strnpcinfo(2));
mes "[Mille Feuille]";
mes "Ah, Why not?";
next;
mes "[Dacquoise]";
mes "I am the leader of this flame cooking trio chefs!";
next;
- emotion e_omg, 0, "Eclaire#"+strnpcinfo(2);
+ emotion ET_HUK, getnpcid(0, "Eclaire#"+strnpcinfo(2));
mes "[Eclaire]";
mes "What?!! When was that decided?";
next;
- emotion e_no;
+ emotion ET_STARE_ABOUT;
mes "[Dacquoise]";
mes "Is there anyone who is older than me?";
next;
- emotion e_omg, 0, "Eclaire#"+strnpcinfo(2);
+ emotion ET_HUK, getnpcid(0, "Eclaire#"+strnpcinfo(2));
mes "[Eclaire]";
mes "Age! There is nothing I can do with it.";
next;
- emotion e_ok,"Mille Feuille#"+strnpcinfo(2);
+ emotion ET_OK, getnpcid(0, "Mille Feuille#"+strnpcinfo(2));
mes "[Mille Feuille]";
mes "Just because you're one year older, you want to automatically be rejected. Anyone have an objection?";
next;
- emotion e_an;
+ emotion ET_FRET;
mes "[Dacquoise]";
mes "Quiet!";
next;
@@ -4151,15 +4367,15 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{
end;
}
} else {
- emotion e_no1;
+ emotion ET_BEST;
mes "[Dacquoise]";
mes "I am Dacquoise, the pupil of the legendary chef of Rune Midgard, ^0000cdCharles Orleans^000000.";
next;
- emotion e_no1, 0, "Eclaire#"+strnpcinfo(2);
+ emotion ET_BEST, getnpcid(0, "Eclaire#"+strnpcinfo(2));
mes "[Eclaire]";
mes "Steaks not only increase stats but also recover both your HP and SP.";
next;
- emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2);
+ emotion ET_THROB, getnpcid(0, "Mille Feuille#"+strnpcinfo(2));
mes "[Mille Feuille]";
mes "If you really want to cook, go and see^0000cd Sir. Charles Orleans at the basement of Prontera castle^000000!! You must be attracted by him!!";
close;
@@ -4900,7 +5116,7 @@ new_1-3,99,169,3 script Friendly Poring#ac 4_PORING,{
mes "[Poring]";
mes "Dear oh dear...what do we have 'ere?";
next;
- if (select("What happend?", "Ignore him/it?") == 2) {
+ if (select("What happened?", "Ignore him/it?") == 2) {
mes "[Poring]";
mes "Oh dear, oh dear...";
close;
@@ -4916,29 +5132,29 @@ new_1-3,99,169,3 script Friendly Poring#ac 4_PORING,{
next;
mes "[Ghostring]";
mes "Oi you lot! Tell me wot I want to hear!";
- emotion e_gasp, 0, "Ghostring#cupet";
+ emotion ET_SURPRISE, getnpcid(0, "Ghostring#cupet");
next;
mes "[Unskilled Poring]";
mes "Ghostring's the strongest in the world!";
- emotion e_paper, 0, "Cowardly Poring#pet_1";
- emotion e_paper, 0, "Unskilled Poring#pet_2";
- emotion e_paper, 0, "Foolish Poring#pet_3";
+ emotion ET_WRAP, getnpcid(0, "Cowardly Poring#pet_1");
+ emotion ET_WRAP, getnpcid(0, "Unskilled Poring#pet_2");
+ emotion ET_WRAP, getnpcid(0, "Foolish Poring#pet_3");
next;
mes "[Ghostring]";
mes "What kind of monster I am?";
- emotion e_gasp, 0, "Ghostring#cupet";
+ emotion ET_SURPRISE, getnpcid(0, "Ghostring#cupet");
next;
mes "[Unskilled Poring]";
mes "Ghostring's da Boss!";
- emotion e_paper, 0, "Cowardly Poring#pet_1";
- emotion e_paper, 0, "Unskilled Poring#pet_2";
- emotion e_paper, 0, "Foolish Poring#pet_3";
+ emotion ET_WRAP, getnpcid(0, "Cowardly Poring#pet_1");
+ emotion ET_WRAP, getnpcid(0, "Unskilled Poring#pet_2");
+ emotion ET_WRAP, getnpcid(0, "Foolish Poring#pet_3");
next;
mes "[Ghostring]";
mes "Bwa ha ha ha~";
- emotion e_heh, 0, "Ghostring#cupet";
+ emotion ET_SMILE, getnpcid(0, "Ghostring#cupet");
next;
- emotion e_sob, 0, "Friendly Poring#ac";
+ emotion ET_CRY;
mes "[Poring]";
mes "Bleedin' shame...";
mes "Little Porings takin' up with a git like that and not bein' cute anymore.";
@@ -4960,14 +5176,14 @@ new_1-3,99,169,3 script Friendly Poring#ac 4_PORING,{
mes "[Unskilled Poring]";
mes "Wot's Dat? Onna them Poring's talkin' to a huumie.";
mes "Shall we beat him up?";
- emotion e_paper, 0, "Cowardly Poring#pet_1";
- emotion e_paper, 0, "Unskilled Poring#pet_2";
- emotion e_paper, 0, "Foolish Poring#pet_3";
+ emotion ET_WRAP, getnpcid(0, "Cowardly Poring#pet_1");
+ emotion ET_WRAP, getnpcid(0, "Unskilled Poring#pet_2");
+ emotion ET_WRAP, getnpcid(0, "Foolish Poring#pet_3");
next;
mes "[Poring]";
mes "Blimey!";
mes "Help me! Save me!";
- emotion e_omg, 0, "Friendly Poring#ac";
+ emotion ET_HUK;
next;
select("What can I do to help?");
mes "[Poring]";
@@ -5012,7 +5228,7 @@ new_1-3,99,169,3 script Friendly Poring#ac 4_PORING,{
mes "["+strcharinfo(0)+"]";
mes "I used the unripe apples that you gave me, then they turned into eggs.";
next;
- emotion e_sob, 0, "Friendly Poring#ac";
+ emotion ET_CRY;
mes "[Poring]";
mes "Oh, guess I didn't expect they'd be turned into pets so easily!";
next;
@@ -5415,7 +5631,7 @@ izlude,102,150,5 script Wedding Secretary#iz 1_F_LIBRARYGIRL,{
next;
break;
case 4:
- emotion e_omg;
+ emotion ET_HUK;
mes "[Wedding Secretary]";
mes "Your mother didn't teach you right?";
mes "Mercy on you. You are ignorant of the beauty of love!!!";
@@ -5444,14 +5660,14 @@ izlude,95,146,5 script Mom#iz 4_F_CAVE1,{
mes "[Dad]";
mes "Nope~~";
next;
- emotion e_an;
+ emotion ET_FRET;
mes "[Mom]";
mes "He's out again? Never stays in the house!! Shall I use it?";
next;
mes "[Dad]";
mes "Leave him alone~ He may be playing somewhere.";
next;
- emotion e_an;
+ emotion ET_FRET;
mes "[Mom]";
mes "You spoil him too much!";
next;
@@ -5466,7 +5682,7 @@ izlude,95,146,5 script Mom#iz 4_F_CAVE1,{
mes "[Mom]";
mes "Here!";
next;
- emotion e_ag, 0, "Etinifni#"+strnpcinfo(2);
+ emotion ET_ANGER, getnpcid(0, "Etinifni#"+strnpcinfo(2));
mes "[Etinifni]";
mes "Ah... Again!! I have been out hunting Orcs.";
next;
@@ -5479,12 +5695,12 @@ izlude,95,146,5 script Mom#iz 4_F_CAVE1,{
mes "[Mom]";
mes "What? This moron?!";
next;
- emotion e_sigh, 0, "Etinifni#"+strnpcinfo(2);
+ emotion ET_OHNO, getnpcid(0, "Etinifni#"+strnpcinfo(2));
mes "[Etinifni]";
mes "OK. I will do it.";
next;
disablenpc "Etinifni#"+strnpcinfo(2);
- emotion e_sob, 0, "Dad#"+strnpcinfo(2);
+ emotion ET_CRY, getnpcid(0, "Dad#"+strnpcinfo(2));
mes "[Dad]";
mes "I am sorry... Dad has no power over your mom.";
close;
@@ -5537,23 +5753,23 @@ izlude_d,97,144,1 duplicate(Etinifni#iz) Etinifni#iz_d 4_M_DEWBOY
// - Romantic Male
// -----------------------------------------------------------------------------
izlude,99,138,3 script Romantic Male#iz 4_M_SITDOWN,{
- emotion e_ho;
+ emotion ET_DELIGHT;
mes "[Romantic Male]";
mes "Let's go~~ together hand in hand~~ Put everything aside ~~ in the dark blue night of Jawaii~~ under the stars~~";
next;
mes "[Romantic Male]";
mes "We are leaving for Jawaii-the place of our honeymoon to celebrate our 10th wedding anniversary!";
next;
- emotion e_lv;
+ emotion ET_THROB;
mes "[Romantic Male]";
mes "Are you lifting up our good old memories renting my wedding dress and your tuxedo!! It will strenghthen our relationship, won't it?";
next;
specialeffect EF_HEARTCASTING, AREA, "Romantic Female#"+strnpcinfo(2);
- emotion e_kis, 0, "Romantic Female#"+strnpcinfo(2);
+ emotion ET_CHUP, getnpcid(0, "Romantic Female#"+strnpcinfo(2));
mes "[Romantic Male]";
mes "Honey~~ I love you!! Sweetheart~";
next;
- emotion e_kis2;
+ emotion ET_CHUPCHUP;
mes "[Romantic Male]";
mes "No!! I love you more than you do!!";
close;
@@ -5570,7 +5786,7 @@ izlude,97,138,5 script Romantic Female#iz 4_F_SITDOWN,{
mes "[Romantic Female]";
mes "Shout like this when I miss you, honey!!";
next;
- emotion e_lv, 0, "Romantic Female#"+strnpcinfo(2);
+ emotion ET_THROB, getnpcid(0, "Romantic Female#"+strnpcinfo(2));
mes "[Romantic Female]";
mes "^0000cd[I miss you.]^000000";
next;
@@ -5584,7 +5800,7 @@ izlude,97,138,5 script Romantic Female#iz 4_F_SITDOWN,{
mes "You are tired of sitting, aren't you?";
next;
specialeffect EF_HEARTCASTING, AREA, "Romantic Female#"+strnpcinfo(2);
- emotion e_kis, 0, "Romantic Female#"+strnpcinfo(2);
+ emotion ET_CHUP, getnpcid(0, "Romantic Female#"+strnpcinfo(2));
mes "[Romantic Female]";
mes "My sweetheart!!! I love you!!!";
next;
@@ -5592,11 +5808,11 @@ izlude,97,138,5 script Romantic Female#iz 4_F_SITDOWN,{
mes "Yes, thank you for sharing your SP! You are also tired, aren't you?";
next;
specialeffect EF_HEARTCASTING, AREA, "Romantic Male#"+strnpcinfo(2);
- emotion e_kis2, 0, "Romantic Male#"+strnpcinfo(2);
+ emotion ET_CHUPCHUP, getnpcid(0, "Romantic Male#"+strnpcinfo(2));
mes "[Romantic Male]";
mes "My sweetheart!! I love you!!!";
next;
- emotion e_lv, 0, "Romantic Female#"+strnpcinfo(2);
+ emotion ET_THROB, getnpcid(0, "Romantic Female#"+strnpcinfo(2));
mes "[Romantic Female]";
mes "Kia~ You are Coolest!!!";
close;
@@ -5623,10 +5839,10 @@ izlude,93,143,3 script Manufacturing Maniac#0 -1,{
OnTimer30000:
if (rand(1,2) == 1) {
- emotion e_no1;
+ emotion ET_BEST;
specialeffect EF_PHARMACY_OK;
} else {
- emotion e_omg;
+ emotion ET_HUK;
specialeffect EF_PHARMACY_FAIL;
}
end;
@@ -6071,7 +6287,7 @@ iz_ac01,138,69,3 script Lady#ac 1_F_ORIENT_02,{
next;
mes "[Lady]";
mes "You have a pretty name... Anonymous... I am attacted by your work.";
- emotion e_lv;
+ emotion ET_THROB;
close;
}
@@ -6096,7 +6312,7 @@ iz_ac01_d,149,46,3 duplicate(Eclaire#ac) Eclaire#ac_d 4_F_KAFRA7
// - Mille Feuille
// -----------------------------------------------------------------------------
iz_ac01,150,50,3 script Mille Feuille#ac 4_F_KAFRA8,{
- emotion e_lv;
+ emotion ET_THROB;
mes "[Mille Feuille]";
mes "Ahh. Hey is Sir. Orleons doing well?";
close;
@@ -6135,7 +6351,7 @@ iz_ac01,159,32,3 script Hungry Trainee#ac 4_M_SIT_NOVICE,{
mes "Wonder when my order will get taken... it's already been an hour...";
mes "Look at the helpers lingering on the side...";
next;
- emotion e_an, 0, "Scholarship Trainee#"+strnpcinfo(2);
+ emotion ET_FRET, getnpcid(0, "Scholarship Trainee#"+strnpcinfo(2));
mes "[Scholarship Trainee]";
mes "Ugh... this guy...";
mes "I already told you eight hundred times! It's buffet style! Ah!";
@@ -6144,7 +6360,7 @@ iz_ac01,159,32,3 script Hungry Trainee#ac 4_M_SIT_NOVICE,{
mes "Buffet? What's that? Can you eat it?";
mes "You look down on me because I'm from the country, don't you?";
next;
- emotion e_ag;
+ emotion ET_ANGER;
mes "[Hungry Trainee]";
mes "Don't tell me it's not difficult to understand! Explain it to me!";
close;
@@ -6410,7 +6626,7 @@ pay_fild08,153,83,1 script Lady Harvesting Herbs#2 1_F_ORIENT_02,{
next;
mes "[Lady]";
mes "Payon is the wonderful city. There you can be transferred to an Archer or to a Taekwon. And a nice Dungeon there. If you have time, please make a visit.";
- emotion e_heh;
+ emotion ET_SMILE;
close;
}
@@ -6527,12 +6743,12 @@ iz_ac02_d,107,180,3 duplicate(ac_board) [Principal's Office]#ad 2_BULLETIN_BOARD
iz_ac02,143,55,3 script Cream Puff#ac 4_M_KID1,{
cutin "choucream_n.bmp", 2;
if (Class == Job_Novice) {
- emotion e_what;
+ emotion ET_QUESTION;
mes "[Cream Puff]";
mes "You are a novice? right?";
next;
} else {
- emotion e_sigh;
+ emotion ET_OHNO;
mes "[Cream Puff]";
mes "Class aptitude test is nonsense for those who already have a job.";
close2;
@@ -6544,7 +6760,7 @@ iz_ac02,143,55,3 script Cream Puff#ac 4_M_KID1,{
next;
if (select("No... how did you know?", "I decided.") == 2) {
cutin "choucream_d.bmp",2;
- emotion e_sigh;
+ emotion ET_OHNO;
mes "[Cream Puff]";
mes "Have you already decided? Ok then.";
next;
@@ -6555,7 +6771,7 @@ iz_ac02,143,55,3 script Cream Puff#ac 4_M_KID1,{
end;
}
cutin "choucream_e.bmp",2;
- emotion e_flash;
+ emotion ET_SPARK;
mes "[Cream Puff]";
mes "Oh, that is good.";
mes "What is the ^0000FFClass aptitude test^000000.";
@@ -6571,7 +6787,7 @@ iz_ac02,143,55,3 script Cream Puff#ac 4_M_KID1,{
mes "[Cream Puff]";
mes "It has 3 types of test and each one give 30 minutes to finish.";
next;
- emotion e_what;
+ emotion ET_QUESTION;
mes "[Cream Puff]";
mes "If you have free time and have not decided your job... how about taking this test?";
next;
@@ -6580,7 +6796,7 @@ iz_ac02,143,55,3 script Cream Puff#ac 4_M_KID1,{
break;
case 3:
cutin "choucream_d.bmp",2;
- emotion e_pif;
+ emotion ET_HNG;
mes "[Cream Puff]";
mes "All right. Good bye.";
close2;
@@ -7028,7 +7244,7 @@ iz_ac02,143,55,3 script Cream Puff#ac 4_M_KID1,{
end;
}
next;
- emotion e_no1;
+ emotion ET_BEST;
mes "[Cream Puff]";
mes "^8014EB"+.@job_name$+"^000000 is a good matching job for you.";
next;
@@ -7039,7 +7255,7 @@ iz_ac02,143,55,3 script Cream Puff#ac 4_M_KID1,{
mes "[Cream Puff]";
mes "You do not have to choose the job from Class aptitude test. That is only just for fun.";
next;
- emotion e_what;
+ emotion ET_QUESTION;
mes "[Cream Puff]";
mes "If you want, I will send it to the class that was recommended by the aptitude result.";
next;
@@ -7120,7 +7336,7 @@ iz_ac02,142,85,6 script Lusa#ac 4_F_GUNSLINGER,{
if (isequippedcnt(.@manuals[.@i]) || countitem(.@manuals[.@i]))
.@has_manual = 1;
}
- emotion e_awsm;
+ emotion ET_COOL;
mes "[Lusa]";
mes "Gosh Darnit! You are cuter then a piglet! Are ya trying ta learn to be a ^ff0000Gunslinger^000000?";
next;
@@ -7131,7 +7347,7 @@ iz_ac02,142,85,6 script Lusa#ac 4_F_GUNSLINGER,{
}
switch(select(.@menu$)) {
case 1:
- emotion e_lv;
+ emotion ET_THROB;
mes "[Lusa]";
mes "You're so cute! A ^ff0000Gunslinger^000000 who has true grit wield his weapons bringing justice in these wild times.";
next;
@@ -7226,7 +7442,7 @@ iz_ac02,142,85,6 script Lusa#ac 4_F_GUNSLINGER,{
end;
case 3:
if (Upper == 2) {
- emotion e_slur;
+ emotion ET_SEXY;
mes "[Lusa]";
mes "Oh, sorry! Children cannot become Gunslingers!";
next;
@@ -7375,7 +7591,7 @@ iz_ac02,142,85,6 script Lusa#ac 4_F_GUNSLINGER,{
cutin "", 255;
end;
} else if (nov_3_guns == 7) {
- emotion e_ok;
+ emotion ET_OK;
mes "[Lusa]";
mes "Ah you're back, and now wearing lovely Gunslinger clothing! It suits you well, congratulations!";
next;
@@ -8178,7 +8394,7 @@ iz_ac02_d,162,86,4 duplicate(Guild Staff#ac) Guild Staff#ac_d 4W_M_02
iz_ac02,70,85,5 script Arang#ac 4_F_TAEKWON,{
mes "[Arang]";
mes "Hi, Good morning!";
- emotion e_ho;
+ emotion ET_DELIGHT;
cutin "arang03.bmp", 0;
next;
if (Class == Job_Novice) {
@@ -8293,19 +8509,19 @@ iz_ac02,70,85,5 script Arang#ac 4_F_TAEKWON,{
mes "[Arang]";
mes "Is that so!? You are!? Yaho! Now I am a teacher! Now, ask me whatever!";
nov_3_taekwon = 1;
- emotion e_heh;
+ emotion ET_SMILE;
close2;
cutin "", 255;
end;
}
mes "[Arang]";
mes "Hahaha.. You are interested in me?";
- emotion e_an;
+ emotion ET_FRET;
cutin "arang03.bmp", 0;
next;
mes "Suddenly, you see Arang's foot flying towards you.";
specialeffect2 EF_TRIPLEATTACK;
- emotion e_wah, 1;
+ emotion ET_KEK, playerattached();
next;
cutin "", 255;
mes "All you see are stars...";
@@ -12036,7 +12252,7 @@ iz_ac02,156,169,5 script Acolyte Leader Alice#2 4_F_ACOLYTE,{
mes "[Alice Yisha]";
mes "Ask ^ff0000if you want to experience skills of an Acolyte, ask the sister next to you^000000.";
mes "Now I am reading an introductory skill.";
- emotion e_omg, 0, "A Nun#"+strnpcinfo(2);
+ emotion ET_HUK, getnpcid(0, "A Nun#"+strnpcinfo(2));
close2;
cutin "", 255;
end;
@@ -12417,7 +12633,7 @@ izlude,153,126,1 script Refinery Owner Han#iz 4_M_02,{
mes "Are you interested in ^3E86C3refining^000000 to make your items strong?";
next;
if (select("I have no interest.", "refining? Is it edible?") == 1) {
- emotion e_sry;
+ emotion ET_SORRY;
mes "[Refinery Owner Han]";
mes "Ah, I am sorry. I caught a busy man.";
close;
diff --git a/npc/re/jobs/novice/novice.txt b/npc/re/jobs/novice/novice.txt
index 11f9919ce6c..8cee1e61630 100644
--- a/npc/re/jobs/novice/novice.txt
+++ b/npc/re/jobs/novice/novice.txt
@@ -2273,7 +2273,7 @@ S_Warp:
end;
OnTouch:
- emotion e_gasp;
+ emotion ET_SURPRISE;
end;
}
new_1-3,97,50,4 duplicate(NvEden) Eden Group Officer#nv1 729,5,5
diff --git a/npc/re/jobs/novice/supernovice_ex.txt b/npc/re/jobs/novice/supernovice_ex.txt
index e2e5782554f..348cd9628c1 100644
--- a/npc/re/jobs/novice/supernovice_ex.txt
+++ b/npc/re/jobs/novice/supernovice_ex.txt
@@ -79,17 +79,17 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 567,{
mes "Why are you disrupting my fishing?";
next;
select("I have a delivery from Esseray...");
- emotion e_hmm;
+ emotion ET_SCRATCH;
mes "[Fishing Novice]";
mes "What? Esseray? Esseray?";
mes "Hmm! I know him...";
mes "Esseray... Esseray... hmm.";
next;
- emotion e_dots,1;
- emotion e_dots;
+ emotion ET_THINK, playerattached();
+ emotion ET_THINK;
mes "..................";
next;
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Fishing Novice]";
mes "Ahhhh --- !! ----- Ahhhh ---!!";
mes "Got it! --- Got it!";
@@ -108,8 +108,8 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 567,{
mes "What?! He isn't?";
mes "Then where is Esseray from?";
next;
- emotion e_dots,1;
- emotion e_dots;
+ emotion ET_THINK, playerattached();
+ emotion ET_THINK;
mes ".... .... .... ....";
next;
mes "[Fishing Novice]";
@@ -123,13 +123,13 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 567,{
next;
mes "- You explain why you're here. -";
next;
- emotion e_hmm;
+ emotion ET_SCRATCH;
mes "[Fishing Novice]";
mes "Hmm... it is an easy and hard question at the same time.";
next;
mes "- You hear a voice complaining about something. -";
next;
- emotion e_an;
+ emotion ET_FRET;
mes "[Fishing Novice]";
mes "Esseray! Such a son of a %@&$# spoiling my vacation...";
next;
@@ -138,7 +138,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 567,{
mes "My poor life~";
mes "Ahhh~ so many problems.";
next;
- emotion e_what;
+ emotion ET_QUESTION;
mes "[Fishing Novice]";
mes "Too ~ hard. Hey, little kid!";
mes "What's your name?";
@@ -216,7 +216,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 567,{
mes "You don't know how to be stronger. Right?";
next;
select("Yes, I can't get stronger.");
- emotion e_hmm;
+ emotion ET_SCRATCH;
mes "[Nodor]";
mes "Hhhmmm ~!";
mes "There's a way to do it...";
@@ -237,7 +237,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 567,{
mes "I will give you a tip.";
mes "You can't always be right.";
mes "Sometimes you need to check your ego and listen to others.";
- emotion e_an;
+ emotion ET_FRET;
close;
}
mes "[Nodor]";
@@ -274,7 +274,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 567,{
mes "["+strcharinfo(0)+"]";
mes "Hey, Nodor!";
next;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Nodor]";
mes "Oh my god!";
mes "So frightened... let me see?";
@@ -307,7 +307,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 567,{
close;
}
changequest 5094+.@i,5098;
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Nodor]";
mes "keheheheheheh~";
next;
@@ -332,7 +332,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 567,{
mes "you need to learn patience.";
close;
}
- emotion e_gg;
+ emotion ET_KIK;
mes "[Nodor]";
mes "Hhhhhhhhhh~";
next;
@@ -440,17 +440,17 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 567,{
mes "[Nodor]";
mes "Eh-hem! I was not just killing time after I sent you!!";
next;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Nodor]";
mes "What the? --- ah? --- !!";
next;
select("??????");
- emotion e_swt;
+ emotion ET_SWEAT;
mes "[Nodor]";
mes "Watch out!! A bunch of Golems are running after us!";
mes "We... have to run...!!!";
next;
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
if(select("What?!:Um?") == 2) {
mes "- You look around, and -";
mes "- there is nothing behind you. -";
@@ -480,14 +480,14 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 567,{
callfunc "F_ClearJobVar"; // -- Clears all job variables for the current player
jobchange roclass(eaclass()|EAJL_THIRD);
set EXSUPNOV_Q,5;
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Nodor]";
mes "Puhahahahahahahahahahah!!";
mes "Good! You scared yet?";
next;
select("... ... ...");
- emotion e_dots,1;
- emotion e_sry;
+ emotion ET_THINK, playerattached();
+ emotion ET_SORRY;
mes "[Nodor]";
mes "Sorry for scaring you!";
mes "I think our duty and mission as Novices is to make days joyful.";
@@ -498,11 +498,11 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 567,{
mes "Or more powerful?";
next;
select("...? ...? ...?");
- emotion e_what,1;
+ emotion ET_QUESTION, playerattached();
mes "[Nodor]";
mes "Oh--- My--- (tut,tut,tut)!!";
next;
- emotion e_hmm;
+ emotion ET_SCRATCH;
mes "[Nodor]";
mes "Mr. Sieu Ngu --";
mes "Not to be mean, but";
diff --git a/npc/re/kafras/kafras.txt b/npc/re/kafras/kafras.txt
index baad94b66d7..51a549b0b87 100644
--- a/npc/re/kafras/kafras.txt
+++ b/npc/re/kafras/kafras.txt
@@ -47,7 +47,7 @@ dewata,202,184,6 script Kafra Employee::kaf_dewata 117,{
// Glastheim
//============================================================
-glast_01,200,275,5 script Kafra Employee::kaf_glast 115,{
+glast_01,200,275,0 script Kafra Employee::kaf_glast 4_F_KAFRA3,{
cutin "kafra_03",2;
callfunc "F_Kafra",0,3,2,500,700;
savepoint "glast_01",200,272,1,1;
diff --git a/npc/re/mapflag/hidemobhpbar.txt b/npc/re/mapflag/hidemobhpbar.txt
index f7e4f8800ca..03928ecc542 100644
--- a/npc/re/mapflag/hidemobhpbar.txt
+++ b/npc/re/mapflag/hidemobhpbar.txt
@@ -32,3 +32,7 @@ gld2_pay mapflag hidemobhpbar
gld2_prt mapflag hidemobhpbar
teg_dun01 mapflag hidemobhpbar
teg_dun02 mapflag hidemobhpbar
+
+// Episode 15 - Phantasmagorica
+verus04 mapflag hidemobhpbar
+
\ No newline at end of file
diff --git a/npc/re/mapflag/nobranch.txt b/npc/re/mapflag/nobranch.txt
index 9d7af9fc211..6a3967ef829 100644
--- a/npc/re/mapflag/nobranch.txt
+++ b/npc/re/mapflag/nobranch.txt
@@ -23,6 +23,7 @@ job3_guil01 mapflag nobranch
job3_guil02 mapflag nobranch
job3_guil03 mapflag nobranch
job_ko mapflag nobranch
+job_gun mapflag nobranch
job3_rang01 mapflag nobranch
job3_rang02 mapflag nobranch
job3_rune01 mapflag nobranch
@@ -87,7 +88,6 @@ ecl_in04 mapflag nobranch
1@ecl mapflag nobranch
ecl_hub01 mapflag nobranch
que_avan01 mapflag nobranch
-1@xm_d mapflag nobranch
// Izlude duplicates ===========
izlude_a mapflag nobranch
@@ -95,15 +95,44 @@ izlude_b mapflag nobranch
izlude_c mapflag nobranch
izlude_d mapflag nobranch
-// Heroes' Trail Part 1 ========
-1@sara mapflag nobranch
+// Heroes' Trail - Part 1 ========
1@face mapflag nobranch
-1@gef mapflag nobranch
-1@gef_in mapflag nobranch
-1@ge_st mapflag nobranch
+1@sara mapflag nobranch
dali mapflag nobranch
dali02 mapflag nobranch
+// Heroes' Trail - Part 2 ========
+1@ge_st mapflag nobranch
+1@gef mapflag nobranch
+1@gef_in mapflag nobranch
+1@spa mapflag nobranch
+1@tnm1 mapflag nobranch
+1@tnm2 mapflag nobranch
+1@tnm3 mapflag nobranch
+
+// Horror Toy Factory Memorial Dungeon
+1@xm_d mapflag nobranch
+
+// Heroes' Trail - Part 3 ========
+1@glast mapflag nobranch
+1@air1 mapflag nobranch
+1@air2 mapflag nobranch
+
+// Decisive Battle - Part 1 ======
+1@dth1 mapflag nobranch
+1@dth2 mapflag nobranch
+1@dth3 mapflag nobranch
+1@rev mapflag nobranch
+
+// Decisive Battle - Part 2 ======
+1@eom mapflag nobranch
+1@jtb mapflag nobranch
+
+// Episode 15 - Phantasmagorica
+1@lab mapflag nobranch
+1@uns mapflag nobranch
+1@mcd mapflag nobranch
+
// WOE:TE Maps ===================
te_alde_gld mapflag nobranch
te_prt_gld mapflag nobranch
@@ -117,3 +146,7 @@ te_aldecas2 mapflag nobranch
te_aldecas3 mapflag nobranch
te_aldecas4 mapflag nobranch
te_aldecas5 mapflag nobranch
+
+// Episode 15
+1@lab mapflag nobranch
+1@uns mapflag nobranch
diff --git a/npc/re/mapflag/noicewall.txt b/npc/re/mapflag/noicewall.txt
index 2d70baacae6..d9c76c166d2 100644
--- a/npc/re/mapflag/noicewall.txt
+++ b/npc/re/mapflag/noicewall.txt
@@ -32,12 +32,41 @@
// Inside Eclage ===========
1@ecl mapflag noicewall
-// Horror Toy Factory
+// Heroes' Trail - Part 1 ========
+1@face mapflag noicewall
+1@sara mapflag noicewall
+
+// Heroes' Trail - Part 2 ========
+1@ge_st mapflag noicewall
+1@gef mapflag noicewall
+1@gef_in mapflag noicewall
+1@spa mapflag noicewall
+1@tnm1 mapflag noicewall
+1@tnm2 mapflag noicewall
+1@tnm3 mapflag noicewall
+
+// Horror Toy Factory Memorial Dungeon
1@xm_d mapflag noicewall
-// Heroes' Trail Part 1 =======
-1@sara mapflag noicewall
-1@face mapflag noicewall
+// Heroes' Trail - Part 3 ========
+1@glast mapflag noicewall
+1@air1 mapflag noicewall
+1@air2 mapflag noicewall
+
+// Decisive Battle - Part 1 ======
+1@dth1 mapflag noicewall
+1@dth2 mapflag noicewall
+1@dth3 mapflag noicewall
+1@rev mapflag noicewall
+
+// Decisive Battle - Part 2 ======
+1@eom mapflag noicewall
+1@jtb mapflag noicewall
+
+// Episode 15 - Phantasmagorica
+1@lab mapflag noicewall
+1@uns mapflag noicewall
+1@mcd mapflag noicewall
// WOE:TE Maps ===================
te_prtcas01 mapflag noicewall
@@ -50,3 +79,7 @@ te_aldecas2 mapflag noicewall
te_aldecas3 mapflag noicewall
te_aldecas4 mapflag noicewall
te_aldecas5 mapflag noicewall
+
+// Episode 15
+1@lab mapflag noicewall
+1@uns mapflag noicewall
diff --git a/npc/re/mapflag/nomemo.txt b/npc/re/mapflag/nomemo.txt
index 87be9e45416..337a87536e3 100644
--- a/npc/re/mapflag/nomemo.txt
+++ b/npc/re/mapflag/nomemo.txt
@@ -68,6 +68,7 @@ gld2_gef mapflag nomemo
gld2_pay mapflag nomemo
gld2_prt mapflag nomemo
job_ko mapflag nomemo
+job_gun mapflag nomemo
ma_scene01 mapflag nomemo
ma_in01 mapflag nomemo
ma_dun01 mapflag nomemo
@@ -129,6 +130,7 @@ gl_cas02_ mapflag nomemo
1@face mapflag nomemo
1@sara mapflag nomemo
1@gef_in mapflag nomemo
+1@glast mapflag nomemo
dali mapflag nomemo
dali02 mapflag nomemo
@@ -145,3 +147,9 @@ te_aldecas4 mapflag nomemo
te_aldecas5 mapflag nomemo
teg_dun01 mapflag nomemo
teg_dun02 mapflag nomemo
+
+// Episode 15
+1@lab mapflag nomemo
+1@uns mapflag nomemo
+un_bk_q mapflag nomemo
+un_myst mapflag nomemo
diff --git a/npc/re/mapflag/nopenalty.txt b/npc/re/mapflag/nopenalty.txt
index 2a6a741d358..e9426458df7 100644
--- a/npc/re/mapflag/nopenalty.txt
+++ b/npc/re/mapflag/nopenalty.txt
@@ -70,3 +70,4 @@ job3_gen01 mapflag nopenalty
// Ext --------------------
job3_sha01 mapflag nopenalty
job_ko mapflag nopenalty
+job_gun mapflag nopenalty
diff --git a/npc/re/mapflag/nopvp.txt b/npc/re/mapflag/nopvp.txt
index f4f0efb8e87..f3ae3ee79cf 100644
--- a/npc/re/mapflag/nopvp.txt
+++ b/npc/re/mapflag/nopvp.txt
@@ -28,12 +28,43 @@
1@def01 mapflag pvp off
1@def02 mapflag pvp off
1@def03 mapflag pvp off
-1@gef mapflag pvp off
+
+// Heroes' Trail - Part 1 ========
1@face mapflag pvp off
1@sara mapflag pvp off
+
+// Heroes' Trail - Part 2 ========
+1@ge_st mapflag pvp off
+1@gef mapflag pvp off
1@gef_in mapflag pvp off
+1@spa mapflag pvp off
+1@tnm1 mapflag pvp off
+1@tnm2 mapflag pvp off
+1@tnm3 mapflag pvp off
+
+// Horror Toy Factory Memorial Dungeon
1@xm_d mapflag pvp off
+// Heroes' Trail - Part 3 ========
+1@glast mapflag pvp off
+1@air1 mapflag pvp off
+1@air2 mapflag pvp off
+
+// Decisive Battle - Part 1 ======
+1@dth1 mapflag pvp off
+1@dth2 mapflag pvp off
+1@dth3 mapflag pvp off
+1@rev mapflag pvp off
+
+// Decisive Battle - Part 2 ======
+1@eom mapflag pvp off
+1@jtb mapflag pvp off
+
+// Episode 15 - Phantasmagorica
+1@lab mapflag pvp off
+1@uns mapflag pvp off
+1@mcd mapflag pvp off
+
// Cities ========================
moc_para01 mapflag pvp off
brasilis mapflag pvp off
diff --git a/npc/re/mapflag/nosave.txt b/npc/re/mapflag/nosave.txt
index 40675745faf..019ae3e433a 100644
--- a/npc/re/mapflag/nosave.txt
+++ b/npc/re/mapflag/nosave.txt
@@ -28,6 +28,7 @@ job3_gen01 mapflag nosave SavePoint
// Ext
job3_sha01 mapflag nosave SavePoint
job_ko mapflag nosave SavePoint
+job_gun mapflag nosave SavePoint
//Guild Dungeons ==============================
gld_dun01_2 mapflag nosave SavePoint
@@ -91,9 +92,6 @@ ma_zif09 mapflag nosave SavePoint
que_avan01 mapflag nosave SavePoint
1@ecl mapflag nosave SavePoint
-// Horror Toy Factory
-1@xm_d mapflag nosave SavePoint
-
// Glast Heim Memorial Dungeon ====
1@gl_k mapflag nosave SavePoint
2@gl_k mapflag nosave SavePoint
@@ -103,9 +101,39 @@ que_avan01 mapflag nosave SavePoint
1@def02 mapflag nosave SavePoint
1@def03 mapflag nosave SavePoint
-// Heroes' Trails - Part 1 ========
-1@gef mapflag nosave SavePoint
+// Heroes' Trail - Part 1 ========
1@face mapflag nosave SavePoint
1@sara mapflag nosave SavePoint
+
+// Heroes' Trail - Part 2 ========
+1@ge_st mapflag nosave SavePoint
+1@gef mapflag nosave SavePoint
1@gef_in mapflag nosave SavePoint
-dali mapflag nosave SavePoint
+1@spa mapflag nosave SavePoint
+1@tnm1 mapflag nosave SavePoint
+1@tnm2 mapflag nosave SavePoint
+1@tnm3 mapflag nosave SavePoint
+
+// Horror Toy Factory Memorial Dungeon
+1@xm_d mapflag nosave SavePoint
+
+// Heroes' Trail - Part 3 ========
+1@glast mapflag nosave SavePoint
+1@air1 mapflag nosave SavePoint
+1@air2 mapflag nosave SavePoint
+
+// Decisive Battle - Part 1 ======
+1@dth1 mapflag nosave SavePoint
+1@dth2 mapflag nosave SavePoint
+1@dth3 mapflag nosave SavePoint
+1@rev mapflag nosave SavePoint
+
+// Decisive Battle - Part 2 ======
+1@eom mapflag nosave SavePoint
+1@jtb mapflag nosave SavePoint
+
+// Episode 15 - Phantasmagorica
+1@lab mapflag nosave SavePoint
+1@uns mapflag nosave SavePoint
+un_myst mapflag nosave SavePoint
+1@mcd mapflag nosave SavePoint
diff --git a/npc/re/mapflag/noteleport.txt b/npc/re/mapflag/noteleport.txt
index f6ef879b980..30d8c009d95 100644
--- a/npc/re/mapflag/noteleport.txt
+++ b/npc/re/mapflag/noteleport.txt
@@ -58,6 +58,7 @@ ma_zif07 mapflag noteleport
ma_zif08 mapflag noteleport
ma_zif09 mapflag noteleport
job_ko mapflag noteleport
+job_gun mapflag noteleport
ecl_in01 mapflag noteleport
ecl_in02 mapflag noteleport
ecl_in03 mapflag noteleport
@@ -65,8 +66,6 @@ ecl_in04 mapflag noteleport
1@ecl mapflag noteleport
1@ecl mapflag monster_noteleport
ecl_hub01 mapflag noteleport
-1@xm_d mapflag monster_noteleport
-1@xm_d mapflag noteleport
// Glast Heim Memorial Dungeon ===
1@gl_k mapflag noteleport
@@ -93,9 +92,76 @@ gl_cas02_ mapflag noteleport
1@sara mapflag monster_noteleport
1@gef_in mapflag noteleport
1@gef_in mapflag monster_noteleport
+1@glast mapflag noteleport
+1@glast mapflag monster_noteleport
dali mapflag noteleport
dali02 mapflag noteleport
+// Heroes' Trail - Part 1 ========
+1@face mapflag noteleport
+1@face mapflag monster_noteleport
+1@sara mapflag noteleport
+1@sara mapflag monster_noteleport
+dali mapflag noteleport
+dali02 mapflag noteleport
+
+// Heroes' Trail - Part 2 ========
+1@ge_st mapflag noteleport
+1@ge_st mapflag monster_noteleport
+1@gef mapflag noteleport
+1@gef mapflag monster_noteleport
+1@gef_in mapflag noteleport
+1@gef_in mapflag monster_noteleport
+1@spa mapflag noteleport
+1@spa mapflag monster_noteleport
+1@tnm1 mapflag noteleport
+1@tnm1 mapflag monster_noteleport
+1@tnm2 mapflag noteleport
+1@tnm2 mapflag monster_noteleport
+1@tnm3 mapflag noteleport
+1@tnm3 mapflag monster_noteleport
+
+// Horror Toy Factory Memorial Dungeon
+1@xm_d mapflag monster_noteleport
+1@xm_d mapflag noteleport
+
+// Heroes' Trail - Part 3 ========
+1@glast mapflag noteleport
+1@air1 mapflag noteleport
+1@air2 mapflag noteleport
+1@glast mapflag monster_noteleport
+1@air1 mapflag monster_noteleport
+1@air2 mapflag monster_noteleport
+
+// Decisive Battle - Part 1 ======
+1@dth1 mapflag noteleport
+1@dth2 mapflag noteleport
+1@dth3 mapflag noteleport
+1@rev mapflag noteleport
+1@dth1 mapflag monster_noteleport
+1@dth2 mapflag monster_noteleport
+1@dth3 mapflag monster_noteleport
+1@rev mapflag monster_noteleport
+
+// Decisive Battle - Part 2 ======
+1@eom mapflag noteleport
+1@jtb mapflag noteleport
+1@eom mapflag monster_noteleport
+1@jtb mapflag monster_noteleport
+
+// Episode 15 - Phantasmagorica
+1@lab mapflag noteleport
+1@uns mapflag noteleport
+un_bk_q mapflag noteleport
+un_myst mapflag noteleport
+verus04 mapflag noteleport
+1@mcd mapflag noteleport
+1@lab mapflag monster_noteleport
+1@uns mapflag monster_noteleport
+un_bk_q mapflag monster_noteleport
+verus04 mapflag monster_noteleport
+1@mcd mapflag monster_noteleport
+
// WOE:TE Maps ===================
te_prtcas01 mapflag noteleport
te_prtcas02 mapflag noteleport
@@ -117,3 +183,13 @@ te_aldecas2 mapflag monster_noteleport
te_aldecas3 mapflag monster_noteleport
te_aldecas4 mapflag monster_noteleport
te_aldecas5 mapflag monster_noteleport
+
+// Episode 15
+1@lab mapflag noteleport
+1@uns mapflag noteleport
+un_bk_q mapflag noteleport
+un_myst mapflag noteleport
+verus04 mapflag noteleport
+1@lab mapflag monster_noteleport
+1@uns mapflag monster_noteleport
+un_bk_q mapflag monster_noteleport
diff --git a/npc/re/mapflag/nowarp.txt b/npc/re/mapflag/nowarp.txt
index f10fe079037..7d9a256198b 100644
--- a/npc/re/mapflag/nowarp.txt
+++ b/npc/re/mapflag/nowarp.txt
@@ -22,3 +22,11 @@ te_aldecas2 mapflag nowarp
te_aldecas3 mapflag nowarp
te_aldecas4 mapflag nowarp
te_aldecas5 mapflag nowarp
+
+// Episode 15
+1@lab mapflag nowarp
+1@uns mapflag nowarp
+un_bk_q mapflag nowarp
+un_myst mapflag nowarp
+
+job_gun mapflag nowarp
diff --git a/npc/re/mapflag/nowarpto.txt b/npc/re/mapflag/nowarpto.txt
index e409f3181d2..9651adb6b65 100644
--- a/npc/re/mapflag/nowarpto.txt
+++ b/npc/re/mapflag/nowarpto.txt
@@ -8,8 +8,21 @@
//===== Changelogs: ==========================================
//= 1.0 Renewal split. [Euphy]
//= 1.1 Added WOE:TE maps [Cydh]
+//= 1.2 Added Novice Island RE Maps. [mazvi]
//============================================================
+// Novice Island ===================
+int_land mapflag nowarpto
+int_land01 mapflag nowarpto
+int_land02 mapflag nowarpto
+int_land03 mapflag nowarpto
+int_land04 mapflag nowarpto
+iz_int mapflag nowarpto
+iz_int01 mapflag nowarpto
+iz_int02 mapflag nowarpto
+iz_int03 mapflag nowarpto
+iz_int04 mapflag nowarpto
+
// 14.1 Bifrost ==================
1@mist mapflag nowarpto
que_house_s mapflag nowarpto
@@ -31,7 +44,6 @@ que_lhz mapflag nowarpto
// 14.2 Eclage ===================
1@ecl mapflag nowarpto
-1@xm_d mapflag nowarpto
// Pyramids Basement Nightmare Mode
moc_prydn1 mapflag nowarpto
@@ -48,11 +60,44 @@ gl_cas02_ mapflag nowarpto
1@def02 mapflag nowarpto
1@def03 mapflag nowarpto
-// Heroes' Trails - Part 1 =======
-1@gef mapflag nowarpto
+// Heroes' Trail - Part 1 ========
1@face mapflag nowarpto
1@sara mapflag nowarpto
+
+// Heroes' Trail - Part 2 ========
+1@ge_st mapflag nowarpto
+1@gef mapflag nowarpto
1@gef_in mapflag nowarpto
+1@spa mapflag nowarpto
+1@tnm1 mapflag nowarpto
+1@tnm2 mapflag nowarpto
+1@tnm3 mapflag nowarpto
+
+// Horror Toy Factory Memorial Dungeon
+1@xm_d mapflag nowarpto
+
+// Heroes' Trail - Part 3 ========
+1@glast mapflag nowarpto
+1@air1 mapflag nowarpto
+1@air2 mapflag nowarpto
+
+// Decisive Battle - Part 1 ======
+1@dth1 mapflag nowarpto
+1@dth2 mapflag nowarpto
+1@dth3 mapflag nowarpto
+1@rev mapflag nowarpto
+moro_cav mapflag nowarpto
+
+// Decisive Battle - Part 2 ======
+1@eom mapflag nowarpto
+1@jtb mapflag nowarpto
+
+// Episode 15 - Phantasmagorica
+1@lab mapflag nowarpto
+1@uns mapflag nowarpto
+un_bk_q mapflag nowarpto
+un_myst mapflag nowarpto
+1@mcd mapflag nowarpto
// WOE:TE Maps ===================
te_prtcas01 mapflag nowarpto
@@ -65,3 +110,11 @@ te_aldecas2 mapflag nowarpto
te_aldecas3 mapflag nowarpto
te_aldecas4 mapflag nowarpto
te_aldecas5 mapflag nowarpto
+
+// Episode 15
+1@lab mapflag nowarpto
+1@uns mapflag nowarpto
+un_bk_q mapflag nowarpto
+un_myst mapflag nowarpto
+
+job_gun mapflag nowarpto
diff --git a/npc/re/mapflag/partylock.txt b/npc/re/mapflag/partylock.txt
index 4875f1c8991..bc57976eed2 100644
--- a/npc/re/mapflag/partylock.txt
+++ b/npc/re/mapflag/partylock.txt
@@ -52,6 +52,11 @@
1@face mapflag partylock
1@sara mapflag partylock
1@gef_in mapflag partylock
+1@glast mapflag partylock
// Horror Toy Factory
1@xm_d mapflag partylock
+
+// Central Laboratory Memorial ====
+1@lab mapflag partylock
+1@uns mapflag partylock
diff --git a/npc/re/mapflag/restricted.txt b/npc/re/mapflag/restricted.txt
index da2b4560237..518abd40c55 100644
--- a/npc/re/mapflag/restricted.txt
+++ b/npc/re/mapflag/restricted.txt
@@ -19,8 +19,42 @@
1@ma_c mapflag restricted 6
1@ma_b mapflag restricted 6
1@ecl mapflag restricted 6
-1@xm_d mapflag restricted 6
+
+// Heroes' Trail - Part 1 ========
1@face mapflag restricted 6
+1@sara mapflag restricted 6
+
+// Heroes' Trail - Part 2 ========
+1@ge_st mapflag restricted 6
+1@gef mapflag restricted 6
+1@gef_in mapflag restricted 6
+1@spa mapflag restricted 6
+1@tnm1 mapflag restricted 6
+1@tnm2 mapflag restricted 6
+1@tnm3 mapflag restricted 6
+
+// Horror Toy Factory Memorial Dungeon
+1@xm_d mapflag restricted 6
+
+// Heroes' Trail - Part 3 ========
+1@glast mapflag restricted 6
+1@air1 mapflag restricted 6
+1@air2 mapflag restricted 6
+
+// Decisive Battle - Part 1 ======
+1@dth1 mapflag restricted 6
+1@dth2 mapflag restricted 6
+1@dth3 mapflag restricted 6
+1@rev mapflag restricted 6
+
+// Decisive Battle - Part 2 ======
+1@eom mapflag restricted 6
+1@jtb mapflag restricted 6
+
+// Episode 15 - Phantasmagorica
+1@lab mapflag restricted 6
+1@uns mapflag restricted 6
+1@mcd mapflag restricted 6
// Towns =========================
brasilis mapflag restricted 7
diff --git a/npc/re/merchants/OldGlastHeim_merchants.txt b/npc/re/merchants/OldGlastHeim_merchants.txt
new file mode 100644
index 00000000000..1a1accbb158
--- /dev/null
+++ b/npc/re/merchants/OldGlastHeim_merchants.txt
@@ -0,0 +1,327 @@
+//===== rAthena Script =======================================
+//= Enchants NPCs.
+//===== Description: =========================================
+//= Temporal Boots enchants NPCs.
+//===== Changelogs: ==========================================
+//= 1.0 First Version merged from idathena.
+//= Credit exneval. [Capuche]
+//============================================================
+
+// Merchant
+//============================================================
+glast_01,210,273,5 script Hugin's butler#pa0829 1_F_04,{
+ disable_items;
+ if (MaxWeight - Weight < 1000) {
+ mes "Your bag is too heavy. Reduce some weight and come back.";
+ close;
+ }
+ mes "[Hugin's Buttler]";
+ mes "Bring Temporal Crystal items for various Temporal boots items. Pick something you want.";
+ next;
+ switch( select( "Cancel", "Buy Temporal Boots (Need 1 Temporal Crystal)", "Upgrade Temporal Boots (Need 5 Temporal Crystals)", "Upgrade Modified Boots (Need 5 Time Crystals)" ) ) {
+ case 1:
+ mes "[Hugin's Buttler]";
+ mes "Come back whenever you want.";
+ close;
+ case 2:
+ if (countitem(6607) > 0) {
+ mes "[Hugin's Buttler]";
+ mes "Take these Temporal Boots. We can upgrade your Temporal Boots with 5 Temporal Crystals.";
+ delitem 6607,1;// Temporal_Crystal
+ getitem 2499,1;// Temporal_Boots
+ close;
+ }
+ mes "[Hugin's Buttler]";
+ mes "You need more Temporal Crystals. Come back when you get some more Temporal Crystals during your travel through Old Glast Heim.";
+ close;
+ case 3:
+ setarray .@equip_type[0],
+ 22000, // Temporal_STR_Boots
+ 22001, // Temporal_INT_Boots
+ 22002, // Temporal_AGI_Boots
+ 22003, // Temporal_VIT_Boots
+ 22004, // Temporal_DEX_Boots
+ 22005; // Temporal_LUK_Boots
+ break;
+ case 4:
+ setarray .@equip_type[0],
+ 22107, // Modified_STR_Boots
+ 22108, // Modified_INT_Boots
+ 22109, // Modified_AGI_Boots
+ 22110, // Modified_VIT_Boots
+ 22111, // Modified_DEX_Boots
+ 22112; // Modified_LUK_Boots
+ break;
+ }
+ if (!getequipisequiped(EQI_SHOES)) {
+ mes "[Hugin's Buttler]";
+ mes "Only the item you are wearing can be upgraded.";
+ mes "Wear the ^0000FFTemporal Boots^000000 you want to upgrade, and then talk to me once again.";
+ close;
+ }
+ if (getequipid(EQI_SHOES) != 2499) {
+ mes "[Hugin's Buttler]";
+ mes "You are not wearing the Temporal Boots. Talk to me once you're wearing them.";
+ close;
+ }
+ if (countitem(6607) < 5) {
+ mes "[Hugin's Buttler]";
+ mes "Not enough Temporal Crystals. You need 5 Temporal Crystals to upgrade your item.";
+ close;
+ }
+ mes "[Hugin's Buttler]";
+ mes "You can trade ^0000FF1 Temporal Boots and 5 Temporal Crystals^000000 for 1 of the following items. ^FF0000Previous refine rate will not be retained with these new ones^000000.";
+ next;
+ .@s = select( "Cancel", "Str Boots", "Int Boots", "Agi Boots", "Vit Boots", "Dex Boots", "Luk Boots" ) - 2;
+ if (.@s == -1) {
+ mes "[Hugin's Buttler]";
+ mes "Come back anytime you want.";
+ close;
+ }
+ setarray .@type$[0], "Strength", "Intelligence", "Agility", "Vitality", "Dexterity", "Lucky";
+ mes "[Hugin's Buttler]";
+ mes "Are you sure about buying Temporal ^FF0000" + .@type$[.@s] + "^000000 Boots? There's no refunds.";
+ next;
+ if (select( "Think again", "Yes, I am sure." ) == 1) {
+ mes "[Hugin's Buttler]";
+ mes "Ok, come back again when you are sure.";
+ close;
+ }
+ mes "[Hugin's Buttler]";
+ mes "The boots have been upgraded as you want.";
+ delequip EQI_SHOES;
+ delitem 6607,5;// Temporal_Crystal
+ getitem .@equip_type[.@s],1;
+ close;
+}
+
+// Enchant and Socket NPC
+//============================================================
+glast_01,212,273,4 script Hugin's magic master#pa0829 1_F_01,{
+ disable_items;
+ if (MaxWeight - Weight < 1000) {
+ mes "Your bag is too heavy. Reduce some weight and come back.";
+ close;
+ }
+ mes "[Hugin's Magic Master]";
+ mes "So you came to enchant the Temporal Boots. Be aware that Boots with sockets cannot be enchanted, and this upgrade is only possible for the boots you are wearing.";
+ next;
+ if (select( "How does the enchanting work?", "Give effect to my Temporal Boots" ) == 1) {
+ mes "[Hugin's Magic Master]";
+ mes "You can keep obtain ^0000FFCoagulated Spell^000000 through your travel times.";
+ next;
+ mes "[Hugin's Magic Master]";
+ mes "I can enchant your Temporal Boots items depands on the amount of that item. ^0000FFNot normal type boots^000000. Only possible for those 6 expanded version boots.";
+ next;
+ mes "[Hugin's Magic Master]";
+ mes "But, once you put a socket into the item, you cannot enchant it. Make sure to remember that.";
+ next;
+ mes "[Hugin's Magic Master]";
+ mes "I don't give out effect randomly. You can pick which effect you want for the item.";
+ next;
+ mes "[Hugin's Magic Master]";
+ mes "Of course it is for 4th slot only. You can have small effect at the start, and then the effect gets stronger.";
+ next;
+ mes "[Hugin's Magic Master]";
+ mes "To get to the final option upgrade, it will require way more Coagulated Spell items. Don't forget that.";
+ next;
+ mes "[Hugin's Magic Master]";
+ mes "Once the 4th slot completes the best option, you get to have a random bonus effect to the 3rd slot. With.. certain payment~";
+ next;
+ mes "[Hugin's Magic Master]";
+ mes "Also, you don't lose the item even if the enchant fails, we also guarantee keeping card and refine rate. But we can't initialize enchanting.";
+ next;
+ mes "[Hugin's Magic Master]";
+ mes "Phew...";
+ mes "Anyways, that's all for basic enchant information. Now you should see for yourself.";
+ close;
+ }
+ if (!getequipisequiped(EQI_SHOES)) {
+ mes "[Hugin's Magic Master]";
+ mes "Are you wearing the item?";
+ close;
+ }
+ .@equip_id = getequipid(EQI_SHOES);
+
+ setarray .@enchant_1[0],4808,4832,4814,4741,4869,4752;// Fighting_Spirit4 Expert_Archer1 Spell2 Vitality2 DelayafterAttack1Lv Luck3
+ setarray .@enchant_2[0],4820,4833,4813,4742,4872,4753;// Fighting_Spirit5 Expert_Archer2 Spell3 Vitality3 DelayafterAttack2Lv Luck4
+ setarray .@enchant_3[0],4821,4834,4812,4861,4873,4754;// Fighting_Spirit6 Expert_Archer3 Spell4 MHP1 DelayafterAttack3Lv Luck5
+ setarray .@enchant_4[0],4822,4835,4826,4862,4881,4755;// Fighting_Spirit7 Expert_Archer4 Spell5 MHP2 DelayafterAttack4Lv Luck6
+ setarray .@enchant_cost[0],1,4,15,30,10;
+
+ switch(.@equip_id) {
+ case 22000: // Temporal_STR_Boots
+ case 22001: // Temporal_INT_Boots
+ case 22002: // Temporal_AGI_Boots
+ case 22003: // Temporal_VIT_Boots
+ case 22004: // Temporal_DEX_Boots
+ case 22005: // Temporal_LUK_Boots
+
+ case 22107: // Modified_STR_Boots
+ case 22108: // Modified_INT_Boots
+ case 22109: // Modified_AGI_Boots
+ case 22110: // Modified_VIT_Boots
+ case 22111: // Modified_DEX_Boots
+ case 22112: // Modified_LUK_Boots
+ .@equip_name$ = getequipname(EQI_SHOES);
+ .@card2 = getequipcardid(EQI_SHOES,2);
+ .@card3 = getequipcardid(EQI_SHOES,3);
+ .@equip_refine = getequiprefinerycnt(EQI_SHOES);
+
+ if (.@card2 > 0) {
+ mes "[Hugin's Magic master]";
+ mes "These boots have already passed the enchanting limit. We can't enchant them any more.";
+ close;
+ }
+ if (.@card3 == 0) {// 4th slot 1st try enchanting
+ .@cost = .@enchant_cost[0];
+ mes "[Hugin's Magic Master]";
+ mes "Want to enchant ^0000FF" + .@equip_name$ + "^000000?";
+ mes "For the 1st enchanting, you need ^0000FF" + .@cost + "^000000 Coagulated Spell items.";
+ next;
+ .@s = select( "Quit", "Fighting Spirit", "Archery", "Spell", "Vitality", "Attack Speed", "Lucky" ) - 2;
+ if (.@s == -1) {
+ mes "[Hugin's Magic Master]";
+ mes "Ok, come back when you are ready.";
+ close;
+ }
+ .@card3 = .@enchant_1[.@s];
+ .@string$ = "enchant number ^6300001^000000.";
+ }
+ else {
+ for ( .@enchant_num = 1; .@enchant_num < 5; .@enchant_num++ ) {
+ for ( .@enchant_type = 0; .@enchant_type < 6 && .@card3 != getd( ".@enchant_" + .@enchant_num + "[" + .@enchant_type + "]" ); .@enchant_type++ )
+ continue;
+ if (.@enchant_type < 6)
+ break;
+ }
+ if (.@enchant_num == 5) {
+ mes "[Hugin's Magic Master]";
+ mes "Something wrong happened.";
+ close;
+ }
+ .@cost = .@enchant_cost[.@enchant_num];
+
+ mes "[Hugin's Magic Master]";
+ if (.@enchant_num == 4) {
+ .@card2 = callfunc("F_Rand",4875,4876,4877,4878,4879,4880);// Bear's_Power, Runaway_Magic, Speed_Of_Light, Muscle_Fool, Hawkeye, Lucky_Day
+ .@string$ = "^990000Bonus effect ^000000 upgrade.";
+ mes "4th slot is already upgraded to the final option. Would you like a random bonus effect for the 3rd slot? You need ^0000ff" + .@cost + "^000000 Coagulated Spell items.";
+ }
+ else {
+ .@number = .@enchant_num + 1;
+ .@card3 = getd( ".@enchant_" + (.@enchant_num+1) + "[" + .@enchant_type + "]" );
+ .@string$ = "enchant number ^630000" + .@number + "^000000.";
+ mes "Enchanting ^0000FF" + .@equip_name$ + "^000000's 4th slot as ^0000FF" + .@number + "^000000 level effect. Requires ^0000FF" + .@cost + "^000000 Coagulated Spell items.";
+ }
+ next;
+ if (select("Quit","Effect Upgrade!") == 1) {
+ mes "[Hugin's Magic Master]";
+ mes "Ok, come back when you are ready.";
+ close;
+ }
+ }
+ if (countitem(6608) < .@cost) {
+ mes "[Hugin's Magic Master]";
+ mes "Hmm, you are missing " + (.@cost - countitem(6608)) + " Coagulated Spell items. Go get more, and then we can talk about more enchants.";
+ close;
+ }
+ specialeffect2 EF_REPAIRWEAPON;
+ delitem 6608,.@cost;// Coagulated_Spell
+ delequip EQI_SHOES;
+ mes "[Hugin's Magic Master]";
+ mes "Trying for " + .@string$;
+ getitem2 .@equip_id,1,1,.@equip_refine,0,0,0,.@card2,.@card3;
+ close;
+ default:
+ mes "[Hugin's Magic Master]";
+ mes "This is not the right item for this enchant.";
+ mes "Remember, only those 6 types of Temporal Boots are available for enchanting.";
+ close;
+ }
+}
+
+glast_01,210,270,0 script Hugin's Craftsman#pa0829 4_F_JOB_BLACKSMITH,{
+ disable_items;
+ if (MaxWeight - Weight < 1000) {
+ mes "Your bag is too heavy. Reduce some weight and come back.";
+ close;
+ }
+ mes "[Hugin's Craftsman]";
+ mes "That Magic Master always says that enchanting Temporal Boots is the best. But, I think quite different.";
+ next;
+ mes "[Hugin's Craftsman]";
+ mes "I think putting a slot into the item would be the best. Even with some risk of failing.";
+ next;
+ mes "[Hugin's Craftsman]";
+ mes "Bring me ^0000FF5 Temporal Crystals^000000, and I will try to put a slot into your advanced Temporal Boots. But, it's possible to ^FF0000fail and break the item^000000. Is that ok?";
+ next;
+ if (select( "Cancel", "Take the risk and try to add a slot" ) == 1) {
+ mes "[Hugin's Craftsman]";
+ mes "Ok, come back anytime you want.";
+ close;
+ }
+ if (!getequipisequiped(EQI_SHOES)) {
+ mes "[Hugin's Craftsman]";
+ mes "Are you sure you are wearing the item?";
+ close;
+ }
+ .@equip_id = getequipid(EQI_SHOES);
+ switch(.@equip_id) {
+ case 22000: callsub( S_Slot,22006 ); // Temporal_STR_Boots
+ case 22001: callsub( S_Slot,22009 ); // Temporal_INT_Boots
+ case 22002: callsub( S_Slot,22010 ); // Temporal_AGI_Boots
+ case 22003: callsub( S_Slot,22007 ); // Temporal_VIT_Boots
+ case 22004: callsub( S_Slot,22008 ); // Temporal_DEX_Boots
+ case 22005: callsub( S_Slot,22011 ); // Temporal_LUK_Boots
+
+ case 22107: callsub( S_Slot,22113 ); // Modified_STR_Boots
+ case 22108: callsub( S_Slot,22114 ); // Modified_INT_Boots
+ case 22109: callsub( S_Slot,22115 ); // Modified_AGI_Boots
+ case 22110: callsub( S_Slot,22116 ); // Modified_VIT_Boots
+ case 22111: callsub( S_Slot,22117 ); // Modified_DEX_Boots
+ case 22112: callsub( S_Slot,22118 ); // Modified_LUK_Boots
+ default:
+ mes "[Hugin's Craftsman]";
+ mes "This is not it! We need ^0000FFAdvanced Temporal Boots^000000 items! The item ^0000FFwith a stat effect and without a slot^000000!";
+ close;
+ }
+
+S_Slot:
+ mes "[Hugin's Craftsman]";
+ mes "And ^FF0000all enchant or refine rates will be lost if you fail this.^000000";
+ mes "Still want to risk it?";
+ next;
+ if (select( "Cancel", "I am ok with it!" ) == 1) {
+ mes "[Hugin's Craftsman]";
+ mes "Ok, come back anytime you want.";
+ close;
+ }
+ mes "[Hugin's Craftsman]";
+ mes "Once again, ^FF0000That Magic Master won't enchant any item with a slot.^000000";
+ mes "Still want to proceed?";
+ next;
+ if (select( "Cancel", "I understand. Try to slot it." ) == 1) {
+ mes "[Hugin's Craftsman]";
+ mes "Ok, come back anytime you want.";
+ close;
+ }
+ if (countitem(6607) < 5) {
+ mes "[Hugin's Craftsman]";
+ mes "You must bring ^0000FF5 Temporal Crystal items^000000. Nothing is free you know...";
+ close;
+ }
+ delitem 6607,5;// Temporal_Crystal
+ delequip EQI_SHOES;
+ if (rand(1,100) < 50) {
+ mes "[Hugin's Craftsman]";
+ mes "Arrggg, we failed. Better luck next time.";
+ specialeffect2 EF_PHARMACY_FAIL;
+ close;
+ }
+ mes "[Hugin's Craftsman]";
+ mes "Successful! Here you go.";
+ specialeffect2 EF_MAXPOWER;
+ getitem getarg(0),1;
+ close;
+}
diff --git a/npc/re/merchants/advanced_refiner.txt b/npc/re/merchants/advanced_refiner.txt
index a6ce065a17a..574ca760308 100644
--- a/npc/re/merchants/advanced_refiner.txt
+++ b/npc/re/merchants/advanced_refiner.txt
@@ -1,21 +1,12 @@
//===== rAthena Script =======================================
//= Advanced Refiner
-//===== By: ==================================================
-//= Euphy
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= rAthena Project
//===== Description: =========================================
//= [Official Conversion]
//= Refiner that uses Enriched ores to increase upgrade success.
-//= After a conversation with Doddler, it's been established that
-//= the advanced refiner works similar the the "Bubble Gum" item.
-//= The success percentage is not "increased" however, if it fails
-//= You get a second try. This tries twice at the same time,
-//= effectively giving you a re-roll on your attempt.
-//===== Additional Comments: =================================
+//===== Changelog: ===========================================
//= 1.0 Added Malangdo Refiner "Holink". [Euphy]
+//= 1.1 Removed re-roll behavior. [Secret]
+//= 1.2 Added db-based material ID [Secret]
//============================================================
// Main NPC :: mal_jerun
@@ -79,35 +70,32 @@ malangdo,221,174,6 script Holink#mal_cash 559,{
close;
}
mes "[Holink]";
+ // TODO: Price is different to Suhnbi of Payon. Intended? [Secret]
+ .@material = getequiprefinecost(.@part, REFINE_COST_ENRICHED, REFINE_MATERIAL_ID);
switch(getequipweaponlv(.@part)) {
default:
case 0: // Armor
set .@price,15000;
- set .@material,7619; //Enriched_Elunium
set .@type$,"armor";
mes "You have chosen an armor, meow~";
break;
case 1: // Level 1 Weapon
set .@price,500;
- set .@material,7620; //Enriched_Oridecon
set .@type$,"weapon";
mes "A level 1 weapon...?";
break;
case 2: // Level 2 Weapon
set .@price,2000;
- set .@material,7620; //Enriched_Oridecon
set .@type$,"weapon";
mes "Meow, a level 2 weapon...?";
break;
case 3: // Level 3 Weapon
set .@price,20000;
- set .@material,7620; //Enriched_Oridecon
set .@type$,"weapon";
mes "Meow Meow~~ A level 3 weapon~~";
break;
case 4: // Level 4 Weapon
set .@price,50000;
- set .@material,7620; //Enriched_Oridecon
set .@type$,"weapon";
mes "Me-Meow!... A level 4 weapon...!";
mes "I've only seen it twice while";
@@ -123,7 +111,7 @@ malangdo,221,174,6 script Holink#mal_cash 559,{
mes "You don't belive in refine master Holink, meow?~";
close;
}
- if (getequippercentrefinery(.@part) < 100) {
+ if (getequippercentrefinery(.@part, true) < 100) {
mes "[Holink]";
mes "Meow!!";
if (.@type$ == "armor")
@@ -160,12 +148,12 @@ malangdo,221,174,6 script Holink#mal_cash 559,{
}
delitem .@material,1;
set Zeny, Zeny-.@price;
- if (getequippercentrefinery(.@part) > rand(100) || getequippercentrefinery(.@part) > rand(100)) {
+ if (getequippercentrefinery(.@part, true) > rand(100)) {
successrefitem .@part;
mes "[Holink]";
mes "Me~ Me~ Meow! Fun fun refining~";
next;
- emotion e_kis;
+ emotion ET_CHUP;
mes "[Holink]";
mes "Perfect!! Perfect, meow!!";
mes "I am the disciple of the refining wizard Aragam~";
@@ -178,11 +166,11 @@ malangdo,221,174,6 script Holink#mal_cash 559,{
mes "Meo~ Meow~ Kyaaak!!";
next;
switch(rand(1,5)) {
- case 1: emotion e_sob; break;
- case 2: emotion e_swt2; break;
- case 3: emotion e_wah; break;
- case 4: emotion e_hmm; break;
- case 5: emotion e_lv2; break;
+ case 1: emotion ET_CRY; break;
+ case 2: emotion ET_PROFUSELY_SWEAT; break;
+ case 3: emotion ET_KEK; break;
+ case 4: emotion ET_SCRATCH; break;
+ case 5: emotion ET_BIGTHROB; break;
}
mes "[Holink]";
mes "Meow!! Aaaaakk~~!!!!";
diff --git a/npc/re/merchants/bio4_reward.txt b/npc/re/merchants/bio4_reward.txt
index ceef2d88a1b..325fe3fbbe2 100644
--- a/npc/re/merchants/bio4_reward.txt
+++ b/npc/re/merchants/bio4_reward.txt
@@ -370,7 +370,7 @@ L_Reward:
mes "Okay..";
close;
}
- emotion e_swt2, "Weird old man#Bio4Reward";
+ emotion ET_PROFUSELY_SWEAT;
progressbar "FF00FF", 2;
delitem 6469, .@amount[0]; //Will_Of_Warrior
delitem 6470, .@amount[1]; //Blood_Thirst
@@ -396,7 +396,7 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{
next;
switch(select("Umba umba humbaa", "What are you doing here?", "Which are the equipments found so far?", "Here you are, Sir.")) {
case 1:
- emotion e_an;
+ emotion ET_FRET;
mes "[Pudding]";
mes "Hey, excuse me, but I'm not from Umbala! You are so rude.";
close;
@@ -405,11 +405,11 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{
mes "As you can see, I'm a training Sorcerer, and my name is Pudding.";
next;
select("....?");
- emotion e_an;
+ emotion ET_FRET;
mes "[Pudding]";
mes "... What's that face? I'm starting to feel unpleasant..";
next;
- emotion e_ok;
+ emotion ET_OK;
mes "[Pudding]";
mes "Couple of days ago, while I was undergoing discipline, I felt a strange, bizzare tinge. So I followed that and it brought me here.";
next;
@@ -423,20 +423,20 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{
mes "[Pudding]";
mes "From those monsters, I could find rare items like '^F2766EWill of Warrior^000000' '^952420Thirst for Blood^000000' '^88C6F7Chill of the Dead^000000' which you cannot find from any other place.";
next;
- emotion e_what, "Sorcerer#Bio4Reward";
+ emotion ET_QUESTION;
mes "[Pudding]";
mes "And after many hours of research on my own, I finally figured out a way to use those items. Do you wanna know?";
next;
switch(select("Oh....pardon?!", "Of course, I really wanna know.")) {
case 1:
- emotion e_omg, 1;
- emotion e_an, "Sorcerer#Bio4Reward";
+ emotion ET_HUK, playerattached();
+ emotion ET_FRET;
mes "[Pudding]";
mes "Oh my! You fell asleep after you asked me something? Well, anyway I feel lazy to explain again so I will just continue.";
next;
break;
case 2:
- emotion e_heh, "Sorcerer#Bio4Reward";
+ emotion ET_SMILE;
mes "[Pudding]";
mes "Good, I am content that you are listening to my story carefully. Then I will keep explaining.";
next;
@@ -463,8 +463,8 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{
mes "Since those materials can only be found from the monsters in the Lab., the special power also can be dwelt into certain equipments which can be obtained from the Lab.";
next;
select("So what's the conclusion?");
- emotion e_what, 1;
- emotion e_an;
+ emotion ET_QUESTION, playerattached();
+ emotion ET_FRET;
mes "[Pudding]";
mes "Gee.. I told you not to cut while I talk, didn't I? Well, I will answer that becuase that's important.";
next;
@@ -536,7 +536,7 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{
}
close;
case 4:
- emotion e_flash;
+ emotion ET_SPARK;
mes "[Pudding]";
mes "Ohhhhh Have you brought them?";
next;
@@ -664,12 +664,12 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{
specialeffect2 EF_SPHERE;
progressbar "ffff00", 2;
specialeffect2 EF_SUI_EXPLOSION;
- emotion e_sob;
+ emotion ET_CRY;
mes "[Pudding]";
mes "Hm.... This equipment cannot accept the power of '^F2766EWill of Warrior^000000' or '^952420Thirst for Blood^000000'.";
close;
}
- emotion e_ho;
+ emotion ET_DELIGHT;
mes "[Pudding]";
mes "OHHH.. This equipment could accept the power of '^F2766EWill of Warrior^000000' or '^952420Thirst for Blood^000000'.";
next;
@@ -969,14 +969,14 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{
if (.@enchant == 0){
specialeffect2 EF_SUI_EXPLOSION;
- emotion e_otl;
+ emotion ET_OTL;
mes "[Pudding]";
mes "...Well....the equipment could not accept the power of "+((.@socket_type==3)?"'^952420Thirst for Blood^000000'":"'^F2766EWill of Warrior^000000'")+" and it got destroyed.";
close;
} else {
specialeffect2 EF_FIREHIT;
getitem2 .@equip_item, 1, 1, .@refine_count, 0, .@equip_card[0], .@equip_card[1], .@equip_card[2], .@equip_card[3];
- emotion e_ho;
+ emotion ET_DELIGHT;
mes "[Pudding]";
mes "Fortunately the power of "+((.@socket_type==3)?"'^952420Thirst for Blood^000000'":"'^F2766EWill of Warrior^000000'")+" has been dwelt well in your equipment...";
close;
diff --git a/npc/re/merchants/blessed_refiner.txt b/npc/re/merchants/blessed_refiner.txt
index 33d15be5443..a3736d4d3da 100644
--- a/npc/re/merchants/blessed_refiner.txt
+++ b/npc/re/merchants/blessed_refiner.txt
@@ -1,11 +1,5 @@
//===== rAthena Script =======================================
//= Blessed Refiner
-//===== By: ==================================================
-//= Euphy
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= rAthena Project
//===== Description: =========================================
//= [Official Conversion]
//= Refiners that use Blessed ores to refine equipment.
@@ -13,8 +7,9 @@
//= rate is identical to that for Enriched ores.
//= - "Blacksmith Dister" only refines from +6~12.
//= NOTE: This NPC is currently disabled on official servers.
-//===== Additional Comments: =================================
+//===== Changelog: ===========================================
//= 1.0 First version. [Euphy]
+//= 1.1 Removed re-roll behavior. [Secret]
//============================================================
// Main NPC :: new_smelting612
@@ -141,7 +136,7 @@
set Zeny, Zeny-.@price;
mes "[Blacksmith Dister]";
mes "Tac! Tac! Tac!";
- if (getequippercentrefinery(.@part) > rand(100) || getequippercentrefinery(.@part) > rand(100)) {
+ if (getequippercentrefinery(.@part, true) > rand(100)) {
specialeffect EF_BLESSING;
successrefitem .@part;
next;
@@ -155,7 +150,7 @@
specialeffect EF_CURSEATTACK;
specialeffect2 EF_SUI_EXPLOSION;
next;
- emotion (!rand(5))?e_ag:e_omg;
+ emotion (!rand(5))?ET_ANGER:ET_HUK;
mes "[Blacksmith Dister]";
mes "Oh my goodness!!!!";
next;
diff --git a/npc/re/merchants/card_separation.txt b/npc/re/merchants/card_separation.txt
index 8118dd66445..2a621db0444 100644
--- a/npc/re/merchants/card_separation.txt
+++ b/npc/re/merchants/card_separation.txt
@@ -105,7 +105,8 @@
break;
}
- setarray .@equip_card[0], getequipcardid(.@equip_num,0),getequipcardid(.@equip_num,1),getequipcardid(.@equip_num,2),getequipcardid(.@equip_num,3);
+ setarray .@check_equip_card[0], getequipcardid(.@equip_num,0),getequipcardid(.@equip_num,1),getequipcardid(.@equip_num,2),getequipcardid(.@equip_num,3);
+ setarray .@equip_card[0], .@check_equip_card[0], .@check_equip_card[1], .@check_equip_card[2], .@check_equip_card[3];
set .@mvp_list$,
"|4408|4128|4456|4168|4142"+ //Gloom_Under_Night_Card, Golden_Bug_Card, Nidhogg_Shadow_Card, Dark_Lord_Card, Doppelganger_Card
"|4134|4137|4386|4407|4357"+ //Dracula_Card, Drake_Card, Detale_Card, Randgris_Card, B_Seyren_Card
@@ -118,9 +119,9 @@
"|4363|4324|4361|4330|4342|"; //B_Magaleta_Card, Garm_Card, B_Harword_Card, Dark_Snake_Lord_Card, Rsx_0806_Card
if (.@Jeremy) {
- for(set .@i,0; .@i<4; set .@i,.@i+1) {
- if (.@equip_card[.@i] >= 4700) // Armor Enchant System
- set .@equip_card[.@i],0;
+ for ( .@i = 0; .@i < MAX_SLOTS; .@i++ ) {
+ if (callfunc("F_IsCharm",.@equip_card[.@i]) == true)
+ .@equip_card[.@i] = 0;// Armor Enchant System
}
if (!getarraysize(.@equip_card)) {
mes .@n$;
@@ -136,7 +137,7 @@
// Official "Richard" script uses a hardcoded list including every possible item.
//if (!getequipisequiped(.@equip_num)) {
// mes "[Richard]";
- // mes "I'm sorry. We don't provide that equipmnet yet.";
+ // mes "I'm sorry. We don't provide that equipment yet.";
// close;
//}
@@ -144,11 +145,12 @@
mes "Which number socket do you want to separate the card? From the left socket, they are sorted 1,2,3,4.";
next;
set .@menu$,"";
- for(set .@i,0; .@i<4; set .@i,.@i+1) {
- if (.@equip_card[.@i] && .@equip_card[.@i] < 4700) // Armor Enchant System
- set .@menu$, .@menu$+"Socket "+(.@i+1)+" - "+getitemname(.@equip_card[.@i])+":";
- else
- set .@menu$, .@menu$+"^777777Socket "+(.@i+1)+" - No card^000000:";
+ for ( .@i = 0; .@i < MAX_SLOTS; .@i++ ) {
+ if (.@equip_card[.@i] && callfunc("F_IsCharm",.@equip_card[.@i]) == false) // Armor Enchant System
+ .@menu$ = .@menu$ + "Socket " + (.@i+1) + " - " + getitemname(.@equip_card[.@i])+":";
+ else {
+ .@menu$ = .@menu$ + "^777777Socket " + (.@i+1) + " - No card^000000:";
+ }
}
set .@i, select("Stop the work:"+.@menu$);
switch(.@i) {
@@ -158,7 +160,7 @@
close;
default:
set .@slot, .@i-2;
- if (.@equip_card[.@slot] == 0 || .@equip_card[.@slot] >= 4700) {
+ if (.@equip_card[.@slot] == 0 || callfunc("F_IsCharm",.@equip_card[.@slot]) == true) {
mes .@n$;
mes "This socket is not equipped with any card. Why don't you check again?";
close;
@@ -287,7 +289,7 @@
set .@equip_refine, getequiprefinerycnt(.@equip_num);
// anti-hack
- if (callfunc("F_IsEquipCardHack", .@equip_num, .@equip_card[0], .@equip_card[1], .@equip_card[2], .@equip_card[3]))
+ if (callfunc("F_IsEquipCardHack", .@equip_num, .@check_equip_card[0], .@check_equip_card[1], .@check_equip_card[2], .@check_equip_card[3]))
close;
delequip .@equip_num;
@@ -314,12 +316,12 @@
}
} else {
set .@card, .@equip_card[.@slot];
- set .@equip_card[.@slot],0;
+ set .@check_equip_card[.@slot],0;
- // Chance of retaining equipment.
+ // Chance of retaining equipment (all enchantments are preserved).
if (rand(1,.@sf_w_num) < 61) {
set .@equip_safe,1;
- getitem2 .@equip_id,1,1,.@equip_refine,0,.@equip_card[0],.@equip_card[1],.@equip_card[2],.@equip_card[3];
+ getitem2 .@equip_id,1,1,.@equip_refine,0,.@check_equip_card[0],.@check_equip_card[1],.@check_equip_card[2],.@check_equip_card[3];
}
// Chance of retaining card.
diff --git a/npc/re/merchants/catalog.txt b/npc/re/merchants/catalog.txt
index 2a366329971..879549addc1 100644
--- a/npc/re/merchants/catalog.txt
+++ b/npc/re/merchants/catalog.txt
@@ -60,7 +60,7 @@ moc_para01,22,16,5 script Catalog Magician#catal01 704,{
mes "The trade has been stopped!";
mes "I don't know what to do next...";
mes "What should I do?";
- emotion e_swt2,1;
+ emotion ET_PROFUSELY_SWEAT, playerattached();
close;
} else if (.@input < 1 || .@input > 50) {
mes "It should be less than 50 pieces.";
@@ -88,7 +88,7 @@ moc_para01,22,16,5 script Catalog Magician#catal01 704,{
mes "explain again? I don't know";
mes "what to do next...";
mes "What should I do?";
- emotion e_swt2,1;
+ emotion ET_PROFUSELY_SWEAT, playerattached();
close;
case 3:
mes "[Catalog Magician]";
diff --git a/npc/re/merchants/coin_exchange.txt b/npc/re/merchants/coin_exchange.txt
index 5ecbe8ff4fb..73bc123a32a 100644
--- a/npc/re/merchants/coin_exchange.txt
+++ b/npc/re/merchants/coin_exchange.txt
@@ -953,13 +953,13 @@ ecl_in01,64,97,5 script Slot Expert Nattuer#ecl 436,{
delitem 6081,5; //Splendide_Coin
.@luckyday = rand(1,100);
if (.@luckyday % 20){
- emotion e_dots;
+ emotion ET_THINK;
delitem .@choice,1;
mes "Shoot, I'm sorry. It failed.";
mes "But I'm sure it will work next time. I have a feeling.";
close;
}
- emotion e_no1;
+ emotion ET_BEST;
delitem .@choice,1;
getitem (.@choice+6),1;
mes "My eyes feel like they're gonna pop out.";
@@ -1038,13 +1038,13 @@ ecl_in01,67,39,4 script Replication Expert Paltu 445,{
mes "You have too many items to continue.";
close;
}
- emotion e_lv;
+ emotion ET_THROB;
mes "[Paltu]";
mes "Woohoo- Greetings. What are you looking for? Lots of goods here.";
next;
switch (select("No thanks.:Replication?:I know you got lots up your sleeve!")) {
case 1:
- emotion e_an;
+ emotion ET_FRET;
mes "[Paltu]";
mes "Really? Hmm?";
close;
@@ -1056,20 +1056,20 @@ ecl_in01,67,39,4 script Replication Expert Paltu 445,{
mes "I'll give you a good price whatever it is. Just trust me.";
next;
select("Could you do something for me?");
- emotion e_no1;
+ emotion ET_BEST;
mes "[Paltu]";
mes "Hey, I like your attitude.";
next;
mes "[Paltu]";
mes "Ah- you know the hat you're wearing?";
next;
- emotion e_what;
+ emotion ET_QUESTION;
mes "[Paltu]";
mes "Don't you have any of those hats lying around in storage that are solid but too ugly to wear? You do, right?";
next;
select(".........");
- emotion e_dots,1;
- emotion e_heh;
+ emotion ET_THINK, playerattached();
+ emotion ET_SMILE;
mes "[Paltu]";
mes "See! I knew it. I knew it from the first minute.";
next;
@@ -1085,7 +1085,7 @@ ecl_in01,67,39,4 script Replication Expert Paltu 445,{
mes "I need 1 ^0571B0hat to replicate^000000 and";
mes "I need ^E1281E 4 Crystal Mirrors^000000 for magic resistance, ^E1281E 1 Fairy Magic Powder^000000 as the catalyst, and ^E1281E Emerald, Ruby, Sapphire, Topaz, and Zircon, 10 of each^000000, to be used for amplifying the magic power.";
next;
- emotion e_no;
+ emotion ET_STARE_ABOUT;
mes "[Paltu]";
mes "There's quite a lot of ingredients, right? Well, I can't do anything about that. Dealing with magic power is not a joke.";
next;
@@ -1102,7 +1102,7 @@ ecl_in01,67,39,4 script Replication Expert Paltu 445,{
mes "What do you think? I'll make it happen as long as I have the ingredients and the compensation.";
next;
if (select("I'll do it later.:Show me what you got!") == 1) {
- emotion e_dots;
+ emotion ET_THINK;
mes "[Paltu]";
mes "What? Are you kidding me? Please tell me you are!";
close;
@@ -1110,7 +1110,7 @@ ecl_in01,67,39,4 script Replication Expert Paltu 445,{
break;
}
disable_items;
- emotion e_lv2;
+ emotion ET_BIGTHROB;
mes "[Paltu]";
mes "Oh wow.";
mes "You made the right call. I thought I was going to starve to death because the Laphines have no interest in pretty hats.";
@@ -1136,7 +1136,7 @@ ecl_in01,67,39,4 script Replication Expert Paltu 445,{
mes "Is ^0571B0"+getitemname(.@items[.@i])+"^000000 what you wanted?";
next;
if (.@item_check == 0 || countitem(.@items[.@i]) == 0) {
- emotion e_sob;
+ emotion ET_CRY;
mes "[Paltu]";
mes "Ay... Credit purchases are difficult for me.";
next;
@@ -1148,17 +1148,17 @@ ecl_in01,67,39,4 script Replication Expert Paltu 445,{
mes "I'm in a tight spot myself. Please consider my situation also.";
close;
}
- emotion e_what;
+ emotion ET_QUESTION;
mes "[Paltu]";
mes "Yes, this is more than enough. Should I make it now?";
next;
if (select("Please make it now.:Oops, I have to take care of something...") == 2) {
- emotion e_omg;
+ emotion ET_HUK;
mes "[Paltu]";
mes "Hey.. Hey! Hey! Where you going?";
close;
}
- emotion e_omg;
+ emotion ET_HUK;
mes "[Paltu]";
mes "I got it. Oh right! Almost forgot again.";
next;
@@ -1176,17 +1176,17 @@ ecl_in01,67,39,4 script Replication Expert Paltu 445,{
mes "Yeah, please make sure!";
close;
}
- emotion e_gg;
+ emotion ET_KIK;
mes "[Paltu]";
mes "Woohoo- Got it.";
mes "It's finally time for me to use my skills again.";
next;
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
mes "[Paltu]";
mes "Do this thing here, and do that thing there, and then do this thing here again...";
next;
- emotion e_dots;
- emotion e_swt2;
+ emotion ET_THINK;
+ emotion ET_PROFUSELY_SWEAT;
mes "[Paltu]";
mes "... .. ...";
specialeffect EF_BEGINSPELL;
diff --git a/npc/re/merchants/diamond.txt b/npc/re/merchants/diamond.txt
index d182ab2093a..14789803797 100644
--- a/npc/re/merchants/diamond.txt
+++ b/npc/re/merchants/diamond.txt
@@ -36,7 +36,7 @@
mes "You can give the diamond as a gift to your lover.";
mes "The receiver of the ^FF82FF'17 Carat Diamond'^000000 will cherish it";
mes "and treasure you in their heart.";
- emotion e_loud;
+ emotion ET_BLABLA;
next;
mes .@npc$;
@@ -63,7 +63,7 @@
mes "is one of the highest quality 17 carat diamonds.";
mes "Comparing it to any pea-sized, colorless rock you may have";
mes "dug up from Morroc is unspeakable!";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes .@npc$;
@@ -143,7 +143,7 @@
mes "Calculating the price and service fee..";
mes "501,000,000 zeny.";
mes "Amount has been confirmed.";
- emotion e_loud;
+ emotion ET_BLABLA;
set Zeny, Zeny - 501000000;
getitem 6024, 1;
next;
@@ -152,7 +152,7 @@
mes "You may exchange the diamond back for zeny at any time.";
mes "However, there will be a 1,000,000z service fee.";
mes "Thank you for your business.";
- emotion e_thx;
+ emotion ET_THANKS;
close;
}
else {
@@ -161,7 +161,7 @@
mes "I'm sorry, but you don't have sufficient funds.";
mes "Including the service fee, a total of 501,000,000z is required.";
mes "Please check your zeny balance and try again.";
- emotion e_hmm;
+ emotion ET_SCRATCH;
close;
}
}
@@ -175,13 +175,13 @@
case 2:
mes .@npc$;
mes "AAH. You would like to exchange your ^FF82FF'17 Carat Diamond'^000000 for zeny?";
- emotion e_gasp;
+ emotion ET_SURPRISE;
next;
if (select("Yes:No") == 2) {
mes .@npc$;
mes "Then, what is it you desire?..";
mes ". . . . . ....";
- emotion e_dots;
+ emotion ET_THINK;
close;
}
@@ -222,7 +222,7 @@
mes "Thank you for your business.";
mes "Whenever you need a ^FF82FF'17 Carat Diamond'^000000,";
mes "come back anytime with 500 million zeny.";
- emotion e_thx;
+ emotion ET_THANKS;
delitem 6024, 1;
set Zeny, Zeny + 499000000;
close;
diff --git a/npc/re/merchants/enchan_ko.txt b/npc/re/merchants/enchan_ko.txt
index 23c3777791f..7f82e515fbf 100644
--- a/npc/re/merchants/enchan_ko.txt
+++ b/npc/re/merchants/enchan_ko.txt
@@ -258,15 +258,15 @@ que_ng,75,20,3 script Artisan Tene#ko 762,{
// Initialization
if (.@select == 2) {
- if (.@sot03_ck) {
- if (.@equip_card[2] < 4700) { // Armor Enchant System
+ if (.@sot03_ck) {// reset only 3rd slot
+ if (callfunc("F_IsCharm",.@equip_card[2]) == false) { // Armor Enchant System
mes "[Artisan Tene]";
mes "The third slot is is not enchanted. Please check again."; //custom translation
close;
}
set .@equip_card[2],0;
} else {
- if (.@equip_card[3] < 4700) { // Armor Enchant System
+ if (callfunc("F_IsCharm",.@equip_card[3]) == false) { // Armor Enchant System
mes "[Artisan Tene]";
mes "This equipment is is not enchanted. Please check again."; //custom translation
close;
@@ -294,8 +294,8 @@ que_ng,75,20,3 script Artisan Tene#ko 762,{
else set .@ko_type01,5;
//custom translations
- if (.@equip_card[3] >= 4700) { // Armor Enchant System
- if (.@equip_card[2] >= 4700) {
+ if (callfunc("F_IsCharm",.@equip_card[3]) == true) { // Armor Enchant System
+ if (callfunc("F_IsCharm",.@equip_card[2]) == true) {
mes "[Artisan Tene]";
mes "This equipment cannot be further enchanted.";
next;
diff --git a/npc/re/merchants/enchan_mal.txt b/npc/re/merchants/enchan_mal.txt
index 899714f459d..96b948a44b3 100644
--- a/npc/re/merchants/enchan_mal.txt
+++ b/npc/re/merchants/enchan_mal.txt
@@ -649,9 +649,9 @@ L_Socket:
delequip EQI_HAND_R;
// GetNonSlotItemSock2 .@equip_refine .@equip_id .@equip_card[0] .@equip_card[1] .@equip_card[2] .@equip_card[3]
- for(set .@i,0; .@i<4; set .@i,.@i+1) {
- if (.@equip_card[.@i] >= 4700) // Armor Enchant System
- set .@equip_card[.@i],0;
+ for ( .@i = getiteminfo(.@equip_id,10); .@i < MAX_SLOTS; .@i++ ) {
+ if (callfunc("F_IsCharm",.@equip_card[.@i]) == true)
+ .@equip_card[.@i] = 0;// Armor Enchant System
}
getitem2 .@equip_id,1,1,.@equip_refine,0,.@equip_card[0],.@equip_card[1],.@equip_card[2],.@equip_card[3];
diff --git a/npc/re/merchants/enchan_mora.txt b/npc/re/merchants/enchan_mora.txt
index 01b3a366121..91874543513 100644
--- a/npc/re/merchants/enchan_mora.txt
+++ b/npc/re/merchants/enchan_mora.txt
@@ -1150,9 +1150,9 @@ L_Socket:
delequip .@part;
// GetNonSlotItemSock2 .@equip_refine .@equip_id .@equip_card[0] .@equip_card[1] .@equip_card[2] .@equip_card[3]
- for(set .@i,0; .@i<4; set .@i,.@i+1) {
- if (.@equip_card[.@i] >= 4700) // Armor Enchant System
- set .@equip_card[.@i],0;
+ for ( .@i = getiteminfo(.@equip_id,10); .@i < MAX_SLOTS; .@i++ ) {
+ if (callfunc("F_IsCharm",.@equip_card[.@i]) == true)
+ .@equip_card[.@i] = 0;// Armor Enchant System
}
getitem2 .@equip_id,1,1,.@equip_refine,0,.@equip_card[0],.@equip_card[1],.@equip_card[2],.@equip_card[3];
@@ -1172,7 +1172,7 @@ mora,124,82,4 script Artifact Collector#blan 522,{
close;
}
disable_items;
- emotion e_ho;
+ emotion ET_DELIGHT;
mes "Those Mora Artifacts look so perfect!";
mes "But I know you want them to be even better!";
next;
@@ -1183,7 +1183,7 @@ mora,124,82,4 script Artifact Collector#blan 522,{
case 1:
break;
case 2:
- emotion e_ok;
+ emotion ET_OK;
mes "[Artifact Collector]";
mes "You seem like a pretty good judge of character.";
next;
@@ -1191,35 +1191,35 @@ mora,124,82,4 script Artifact Collector#blan 522,{
mes "For over 200 years I've been working with Artifacts here in Mora. Toiling to get the perfect +9!";
next;
select("Gulp... +9?!");
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
mes "[Artifact Collector]";
mes "My business is collecting the old relics and refining them to their essence!";
next;
- emotion e_sob;
+ emotion ET_CRY;
mes "[Artifact Collector]";
mes "Finding the perfect Artifact for me to experiment on is my life's work.";
mes "Plus seeing the wonder of our ancestor's legacy is also gratifying.";
next;
select("I can see how that could be fun.");
- emotion e_pat;
+ emotion ET_GOODBOY;
mes "[Artifact Collector]";
mes "Thank you human.";
next;
mes "[Artifact Collector]";
mes "I've been doing this for over 200 years, and honestly the readily available supply is gone, and Artificer and Artifact Crafter won't trade me anymore...";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "[Artifact Collector]";
mes "But maybe the Humans that are starting to visit can bring in some new stock!";
next;
select("Humans... Stock?");
- emotion e_what,1;
+ emotion ET_QUESTION, playerattached();
mes "[Artifact Collector]";
mes "Yes! If the humans can bring me new artifacts I can work on my ultimate achievement!";
next;
select("Ultimate Achievement?");
- emotion e_what,1;
- emotion e_ok;
+ emotion ET_QUESTION, playerattached();
+ emotion ET_OK;
mes "[Artifact Collector]";
mes "Patience, we'll get to that...";
next;
@@ -1230,24 +1230,24 @@ mora,124,82,4 script Artifact Collector#blan 522,{
mes "[Artifact Collector]";
mes "You might just be the human to help me complete my plan.";
next;
- emotion e_otl;
+ emotion ET_OTL;
mes "[Artifact Collector]";
mes "Oh how I love how fate works sometimes...";
next;
mes "[Artifact Collector]";
mes "+1, +2, +3, +4, +5, +6 those refinements are not strong enough to work on my craft.";
next;
- emotion e_otl,0;
+ emotion ET_OTL;
mes "[Artifact Collector]";
mes "But +7! +7 is rare and just barely strong enough to work in my crafting attempts.";
next;
select("I'm gonna be abused again...");
- emotion e_hmm,1;
+ emotion ET_SCRATCH, playerattached();
mes "[Artifact Collector]";
mes "Right you are! I know it is natural for you Humans to help a friend, even without the friend asking...";
next;
select("I'm not sure if...");
- emotion e_what,1;
+ emotion ET_QUESTION, playerattached();
mes "[Artifact Collector]";
mes "Of course I'll accept your help! Find me...";
next;
@@ -1259,7 +1259,7 @@ mora,124,82,4 script Artifact Collector#blan 522,{
mes "- Mace of Judgement -";
next;
select("Anything else?");
- emotion e_what,1;
+ emotion ET_QUESTION, playerattached();
mes "[Artifact Collector]";
mes "Well aside from the +7, there are very specific enchantments that need to be on the artifact that help catalyze the process.";
next;
@@ -1267,15 +1267,15 @@ mora,124,82,4 script Artifact Collector#blan 522,{
mes "If either the +7 or the specific enchantment is missing I can't do it.";
next;
select("So the Refining will be preserved?");
- emotion e_omg,1;
- emotion e_an;
+ emotion ET_HUK, playerattached();
+ emotion ET_FRET;
mes "[Artifact Collector]";
mes "No, but what you'll get back is so much better!";
next;
mes "[Artifact Collector]";
mes "By now you are wondering more about the artifacts I'm looking for?";
next;
- emotion e_what;
+ emotion ET_QUESTION;
mes "[Artifact Collector]";
mes "Go ahead and ask!";
next;
@@ -1284,7 +1284,7 @@ mora,124,82,4 script Artifact Collector#blan 522,{
while(1) {
set .@i, select("I don't think I'm interested:Staff of Mercy:Mace of Judgement:Golden Rod Staff:Aqua Staff:Crimson Staff:Forest Staff")-2;
if (.@i == -1) {
- emotion e_what;
+ emotion ET_QUESTION;
mes "[Artifact Collector]";
mes "Ok, well maybe someday you will be.";
close;
@@ -1320,12 +1320,12 @@ mora,124,82,4 script Artifact Collector#blan 522,{
mes "Have yourself a great day. Bye~";
close;
}
- emotion e_flash;
+ emotion ET_SPARK;
mes "[Artifact Collector]";
mes "Let me take a look at what you have brought me.";
next;
if (!getequipisequiped(EQI_HAND_R)) {
- emotion e_an;
+ emotion ET_FRET;
mes "[Artifact Collector]";
mes "I don't know what you are trying to do... I can't enhance what you don't have.";
close;
@@ -1354,29 +1354,29 @@ mora,124,82,4 script Artifact Collector#blan 522,{
set .@empowered,16018; //Mace_Of_Judgement2
break;
default:
- emotion e_an;
+ emotion ET_FRET;
mes "[Artifact Collector]";
mes "The weapon you have isn't one of the Artifacts I can work with.";
close;
}
if (getequiprefinerycnt(EQI_HAND_R) < 7) {
- emotion e_an;
+ emotion ET_FRET;
mes "[Artifact Collector]";
mes "I must insist that the refine level of the Artifact be at least +7!";
close;
}
if (!.@empowered) {
- emotion e_an;
+ emotion ET_FRET;
mes "[Artifact Collector]";
mes "These attributes just won't do for my research process, try re-randoming them.";
close;
}
- emotion e_slur;
+ emotion ET_SEXY;
mes "[Artifact Collector]";
mes "I'm tingling with excitement!";
mes "You've brought me everything I need!!";
next;
- emotion e_ok;
+ emotion ET_OK;
mes "[Artifact Collector]";
mes "If you are ready I am about to show you what I can do with your +"+getequiprefinerycnt(EQI_HAND_R)+" Artifact!";
next;
@@ -1385,7 +1385,7 @@ mora,124,82,4 script Artifact Collector#blan 522,{
next;
switch(select("NOOO!:Yes, I'm ready!:What will it be after?")) {
case 1:
- emotion e_an;
+ emotion ET_FRET;
mes "[Artifact Collector]";
mes "You've got to be kidding... you got my hopes up...";
close;
@@ -1397,14 +1397,14 @@ mora,124,82,4 script Artifact Collector#blan 522,{
mes "Surely you want to go on?";
next;
if(select("No, I don't.:Yes, do it!") == 1) {
- emotion e_an;
+ emotion ET_FRET;
mes "[Artifact Collector]";
mes "You've got to be kidding... you got my hopes up...";
close;
}
break;
}
- emotion e_heh;
+ emotion ET_SMILE;
delequip EQI_HAND_R;
getitem .@empowered,1;
mes "[Artifact Collector]";
diff --git a/npc/re/merchants/enchan_upg.txt b/npc/re/merchants/enchan_upg.txt
index 2abc3a79af4..acc4a55f687 100644
--- a/npc/re/merchants/enchan_upg.txt
+++ b/npc/re/merchants/enchan_upg.txt
@@ -250,7 +250,7 @@ prt_in,28,73,3 script Devil Enchant Master#prq 63,{
mes "You need to bring some money to initialize!!";
close;
}
- if (.@equip_card[3] < 4700) { // Armor Enchant System
+ if (callfunc("F_IsCharm",.@equip_card[3]) == false) {
mes "This item is not enchanted!";
close;
}
diff --git a/npc/re/merchants/hd_refiner.txt b/npc/re/merchants/hd_refiner.txt
index 61eaa7d4645..533bba6d362 100644
--- a/npc/re/merchants/hd_refiner.txt
+++ b/npc/re/merchants/hd_refiner.txt
@@ -1,11 +1,5 @@
//===== rAthena Script =======================================
//= HD Refiners
-//===== By: ==================================================
-//= Euphy
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= rAthena Project
//===== Description: =========================================
//= [Official Conversion]
//= Refiners that use HD ores to refine equipment. Upon
@@ -14,8 +8,9 @@
//= to that for Enriched ores.
//= - "Blacksmith Mighty Hammer" only refines from +7~9.
//= - "Basta" only refines from +10 and up.
-//===== Additional Comments: =================================
+//===== Changelog: ===========================================
//= 1.0 First version. [Euphy]
+//= 1.1 Removed re-roll behavior. [Secret]
//============================================================
// Blacksmith Mighty Hammer (+7~9) :: cash_smelting79
@@ -78,20 +73,10 @@
mes "I only handle items with refine levels from +7 to +9.";
close;
}
- switch(getequipweaponlv(.@part)) {
- default:
- case 0:
- set .@price,20000;
- set .@material,6241; //HD_Elunium
- break;
- case 1:
- case 2:
- case 3:
- case 4:
- set .@price,20000;
- set .@material,6240; //HD_Oridecon
- break;
- }
+
+ .@price = getequiprefinecost(.@part, REFINE_COST_HD, REFINE_ZENY_COST);
+ .@material = getequiprefinecost(.@part, REFINE_COST_HD, REFINE_MATERIAL_ID);
+
mes "[Blacksmith Mighty Hammer]";
mes "In order to refine the gear you selected you need ^ff9999"+getitemname(.@material)+"^000000 and 20,000 zeny as a fee.";
mes "Do you have them ready?";
@@ -122,10 +107,10 @@
set Zeny, Zeny-.@price;
mes "[Blacksmith Mighty Hammer]";
mes "Tac! Tac! Tac!";
- if (getequippercentrefinery(.@part) > rand(100) || getequippercentrefinery(.@part) > rand(100)) {
+ if (getequippercentrefinery(.@part, true) > rand(100)) {
successrefitem .@part;
next;
- emotion e_no1;
+ emotion ET_BEST;
mes "[Blacksmith Mighty Hammer]";
mes "The sound refreshes my mind everytime I hear it.";
mes "Here, have it. Refine succeeded flawlessly!";
@@ -133,7 +118,7 @@
}
downrefitem .@part;
next;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Blacksmith Mighty Hammer]";
mes "Oops!!";
next;
@@ -215,25 +200,23 @@ lhz_in02,280,19,3 duplicate(MightyHammer) Mighty Hammer#lhz 826
mes "This weapon is perfect, no need to refine it anymore~";
close;
}
+ .@price = getequiprefinecost(.@part, REFINE_COST_OVER10_HD, REFINE_ZENY_COST);
+ .@material = getequiprefinecost(.@part, REFINE_COST_OVER10_HD, REFINE_MATERIAL_ID);
switch(getequipweaponlv(.@part)) {
default:
case 0:
- set .@price,100000;
- set .@material,6225; //HD_Carnium
set .@type$,"armor";
break;
case 1:
case 2:
case 3:
case 4:
- set .@price,100000;
- set .@material,6226; //HD_Bradium
set .@type$,"weapon";
break;
}
mes "[Basta]";
mes "Hmm... is this the one you want to refine?";
- mes "To refine this equipment, I need 1 ^ff9999"+getitemname(.@material)+"^000000 and 100,000 zeny as a fee.";
+ mes "To refine this equipment, I need 1 ^ff9999"+getitemname(.@material)+"^000000 and " + callfunc("F_InsertComma",.@price) + " zeny as a fee.";
mes "Do you really want to refine this?";
next;
if(select("Yes:No") == 2) {
@@ -241,7 +224,7 @@ lhz_in02,280,19,3 duplicate(MightyHammer) Mighty Hammer#lhz 826
mes "Okay. If that's what you want...";
close;
}
- if (getequippercentrefinery(.@part) < 100) {
+ if (getequippercentrefinery(.@part, true) < 100) {
mes "[Basta]";
mes "This "+.@type$+" has already been refined pretty high.";
mes "If you try to refine it more, the refine level could decrease.";
@@ -271,10 +254,10 @@ lhz_in02,280,19,3 duplicate(MightyHammer) Mighty Hammer#lhz 826
delitem .@material,1;
set Zeny, Zeny-.@price;
mes "Pow! Pow! Pow! Pow!";
- if (getequippercentrefinery(.@part) > rand(100) || getequippercentrefinery(.@part) > rand(100)) {
+ if (getequippercentrefinery(.@part, true) > rand(100)) {
successrefitem .@part;
next;
- emotion e_no1;
+ emotion ET_BEST;
mes "[Basta]";
mes "Great! Nicely done!!";
mes "I really am the best blacksmith in the whole wide world!";
@@ -282,7 +265,7 @@ lhz_in02,280,19,3 duplicate(MightyHammer) Mighty Hammer#lhz 826
}
downrefitem .@part;
next;
- emotion (!rand(5))?e_cash:e_omg;
+ emotion (!rand(5))?ET_MONEY:ET_HUK;
mes "[Basta]";
mes "Aaaaaaaaaaak!!!";
next;
diff --git a/npc/re/merchants/refine.txt b/npc/re/merchants/refine.txt
index ad38d5aab1f..81d8a34e096 100644
--- a/npc/re/merchants/refine.txt
+++ b/npc/re/merchants/refine.txt
@@ -58,26 +58,26 @@ function script refinenew {
next;
setarray .@indices[1], EQI_HEAD_TOP, EQI_ARMOR, EQI_HAND_L, EQI_HAND_R, EQI_GARMENT, EQI_SHOES, EQI_ACC_L, EQI_ACC_R, EQI_HEAD_MID, EQI_HEAD_LOW;
- for(set .@i,1; .@i<=10; set .@i,.@i+1) {
+ for(.@i = 1; .@i<=10; ++.@i) {
if (getequipisequiped(.@indices[.@i])) {
- set .@menu$, .@menu$ + F_getpositionname(.@indices[.@i]) + "-[" + getequipname(.@indices[.@i]) + "]";
- set .@equipped,1;
+ .@menu$ = .@menu$ + F_getpositionname(.@indices[.@i]) + "-[" + getequipname(.@indices[.@i]) + "]";
+ .@equipped = 1;
}
- set .@menu$, .@menu$ + ":";
+ .@menu$ = .@menu$ + ":";
}
if (.@equipped == 0) {
mes "["+ .@npc_name$ +"]";
mes "I don't think I can refine any items you have...";
close;
}
- set .@part, .@indices[ select(.@menu$) ];
+ .@part = .@indices[ select(.@menu$) ];
if (!getequipisequiped(.@part)) { //custom check
mes "["+ .@npc_name$ +"]";
mes "You're not wearing";
mes "anything there that";
mes "I can refine.";
- emotion e_an;
+ emotion ET_FRET;
close;
}
if (!getequipisenableref(.@part)) {
@@ -98,27 +98,24 @@ function script refinenew {
mes "refined as it gets!";
close;
}
- set .@refineitemid, getequipid(.@part); // save id of the item
- set .@refinerycnt, getequiprefinerycnt(.@part); //save refinery count
+ .@refineitemid = getequipid(.@part); // save id of the item
+ .@refinerycnt = getequiprefinerycnt(.@part); //save refinery count
+ .@price = getequiprefinecost(.@part, REFINE_COST_OVER10, REFINE_ZENY_COST);
+ .@material = getequiprefinecost(.@part, REFINE_COST_OVER10, REFINE_MATERIAL_ID);
+ .@safe = 10;
+
if ((getequipweaponlv(.@part) >= 1) && (getequipweaponlv(.@part) <= 4)) {
- set .@type$,"weapon";
- set .@material,6224; //Bradium
- set .@price,100000;
- set .@safe,10;
- mes "["+ .@npc_name$ +"]";
- mes "Hmm a weapon, is that ok?";
- mes "If you want to refine this weapon,";
- mes "I will need 1 ^003366Bradium^000000 and 100,000 zeny.";
+ .@article$ = "a";
+ .@type$ = "weapon";
} else {
- set .@type$,"armor";
- set .@material,6223; //Carnium
- set .@price,100000;
- set .@safe,10;
- mes "["+ .@npc_name$ +"]";
- mes "Hmm an armor, is that ok?";
- mes "If you want to refine this armor,";
- mes "I will need 1 ^003366Carnium^000000 and 100,000 zeny.";
+ .@article$ = "an";
+ .@type$ = "armor";
}
+
+ mes "["+ .@npc_name$ +"]";
+ mes "Hmm " + .@article$ + " " + .@type$ + ", is that ok?";
+ mes "If you want to refine this armor,";
+ mes "I will need 1 ^003366" + getitemname(.@material) + "^000000 and " + callfunc("F_InsertComma",.@price) + " zeny.";
mes "Are you sure you want to continue?";
next;
if(select("Yes:No") == 2){
@@ -154,14 +151,14 @@ function script refinenew {
mes "Please come back when you have them.";
close;
}
- set Zeny,Zeny - .@price;
+ Zeny = Zeny - .@price;
delitem .@material,1;
// anti-hack
if (callfunc("F_IsEquipIDHack", .@part, .@refineitemid) ||
callfunc("F_IsEquipRefineHack", .@part, .@refinerycnt)) {
mes "["+ .@npc_name$ +"]";
- emotion e_an;
+ emotion ET_FRET;
mes "Wait a second...";
mes "Do you think I'm stupid?!";
mes "You switched the item while I wasn't looking! Get out of here!";
@@ -172,7 +169,7 @@ function script refinenew {
mes "Clang! Clang! Clang! Clang!";
successrefitem .@part;
next;
- emotion e_no1;
+ emotion ET_BEST;
mes "["+ .@npc_name$ +"]";
mes "Good! Succes!!!";
mes "I am the best Armsmith.";
@@ -183,7 +180,7 @@ function script refinenew {
mes "Clang! Clang! Clang! Clang!";
downrefitem .@part,3; // Failed refine attempts decrease the item's refine level by 3
next;
- emotion (!rand(5))?e_cash:e_omg;
+ emotion (!rand(5))?ET_MONEY:ET_HUK;
mes "["+ .@npc_name$ +"]";
mes "Ahhh!!!";
next;
@@ -195,7 +192,7 @@ function script refinenew {
mes "Clang! Clang! Clang!";
failedrefitem .@part;
next;
- emotion (!rand(5))?e_cash:e_omg;
+ emotion (!rand(5))?ET_MONEY:ET_HUK;
mes "["+ .@npc_name$ +"]";
mes "Hmmm!";
next;
@@ -216,26 +213,26 @@ function script refinenew {
mes "["+ .@npc_name$ +"]";
mes "I can refine this to the safe limit or a desired number of times. It's your choice.";
next;
- set .@menu2,select("To the safe limit, please.","I'll decide how many times.","I've changed my mind...");
+ .@menu2 = select("To the safe limit, please.","I'll decide how many times.","I've changed my mind...");
} else
- set .@menu2,2;
+ .@menu2 = 2;
switch(.@menu2){
case 1:
- set .@refinecnt,.@safe - getequiprefinerycnt(.@part);
+ .@refinecnt = .@safe - getequiprefinerycnt(.@part);
break;
case 2:
mes "["+ .@npc_name$ +"]";
mes "How many times would you like me to refine your item?";
next;
input .@refinecnt;
- set .@refinecheck,.@refinecnt + getequiprefinerycnt(.@part);
+ .@refinecheck = .@refinecnt + getequiprefinerycnt(.@part);
if (.@refinecnt < 1 || .@refinecheck > 20) {
mes "["+ .@npc_name$ +"]";
mes "I can't refine this item that many times.";
close;
}
if (.@refinecheck > .@safe) {
- set .@refinecheck,.@refinecheck - .@safe;
+ .@refinecheck = .@refinecheck - .@safe;
mes "["+ .@npc_name$ +"]";
mes "This will try to refine the equipment " + .@refinecheck + " times past the safe limit. Your equipment may be destroyed... is that ok?";
next;
@@ -251,7 +248,7 @@ function script refinenew {
mes "You said so... So be it.";
close;
}
- set .@fullprice,.@price * .@refinecnt;
+ .@fullprice = .@price * .@refinecnt;
mes "["+ .@npc_name$ +"]";
mes "That will cost you " + .@refinecnt + " " + getitemname(.@material) + " and " + .@fullprice + " Zeny. Is that ok?";
next;
@@ -266,7 +263,7 @@ function script refinenew {
mes "Please come back when you have them.";
close;
}
- set Zeny,Zeny - .@fullprice;
+ Zeny = Zeny - .@fullprice;
delitem .@material,.@refinecnt;
while(.@refinecnt){
if (getequipisequiped(.@part) == 0) {
@@ -284,7 +281,7 @@ function script refinenew {
if (getequippercentrefinery(.@part) > rand(100)) {
mes "Clang! Clang! Clang! Clang!";
successrefitem .@part;
- set .@refinecnt,.@refinecnt - 1;
+ .@refinecnt = .@refinecnt - 1;
next;
} else {
if (rand(100) < 80) {
@@ -292,7 +289,7 @@ function script refinenew {
mes "Clang! Clang! Clang! Clang!";
downrefitem .@part,3; // Failed refine attempts decrease the item's refine level by 3
next;
- emotion (!rand(5))?e_cash:e_omg;
+ emotion (!rand(5))?ET_MONEY:ET_HUK;
mes "["+ .@npc_name$ +"]";
mes "Ahhh!!!";
next;
@@ -304,7 +301,7 @@ function script refinenew {
mes "Clang! Clang! Clang!";
failedrefitem .@part;
next;
- emotion (!rand(5))?e_cash:e_omg;
+ emotion (!rand(5))?ET_MONEY:ET_HUK;
mes "["+ .@npc_name$ +"]";
mes "Hmmm!";
next;
@@ -320,7 +317,7 @@ function script refinenew {
close;
}
}
- emotion e_no1;
+ emotion ET_BEST;
mes "["+ .@npc_name$ +"]";
mes "Good! Succes!!!";
mes "I am the best Blacksmith.";
@@ -362,7 +359,7 @@ function script refinenew {
}
if (countitem(.@i[0]) >= .@i[1] && Zeny >= 50000) {
delitem .@i[0],.@i[1];
- set Zeny, Zeny - 50000;
+ Zeny = Zeny - 50000;
getitem .@i[2],1;
mes "[Austri]";
if (.@i[0] == 6090) {
@@ -396,9 +393,9 @@ malangdo,224,172,6 script Clink#mal_normal 544,{
mes "Yes!!! You!! You want to refine?";
next;
setarray .@indices[1], EQI_HEAD_TOP, EQI_ARMOR, EQI_HAND_L, EQI_HAND_R, EQI_GARMENT, EQI_SHOES, EQI_ACC_L, EQI_ACC_R, EQI_HEAD_MID, EQI_HEAD_LOW;
- for(set .@i,1; .@i<=10; set .@i,.@i+1)
- set .@menu$, .@menu$ + ( getequipisequiped(.@indices[.@i]) ? getequipname(.@indices[.@i]) : F_getpositionname(.@indices[.@i]) +"-[Empty]" ) +":";
- set .@part, .@indices[ select(.@menu$) ];
+ for(.@i = 1; .@i<=10; set .@i,.@i+1)
+ .@menu$ = .@menu$ + ( getequipisequiped(.@indices[.@i]) ? getequipname(.@indices[.@i]) : F_getpositionname(.@indices[.@i]) +"-[Empty]" ) +":";
+ .@part = .@indices[ select(.@menu$) ];
if (!getequipisequiped(.@part)) {
mes "[Clink]";
switch(.@part) {
@@ -441,38 +438,32 @@ malangdo,224,172,6 script Clink#mal_normal 544,{
mes "Perfect refining. Did I do this for you?";
close;
}
+
+ .@price = getequiprefinecost(.@part, REFINE_COST_NORMAL, REFINE_ZENY_COST);
+ .@material = getequiprefinecost(.@part, REFINE_COST_NORMAL, REFINE_MATERIAL_ID);
+
mes "[Clink]";
switch(getequipweaponlv(.@part)) {
default:
case 0: // Armor
- set .@price,2000;
- set .@material,985; //Elunium
- set .@type$,"armor";
+ .@type$ = "armor";
mes "Hmm, an armor refine? Someone like you?";
break;
case 1: // Level 1 Weapon
- set .@price,50;
- set .@material,1010; //Phracon
- set .@type$,"weapon";
+ .@type$ = "weapon";
mes "A level 1 weapon?";
mes "Urr... Annoying... Okay, let's try...";
break;
case 2: // Level 2 Weapon
- set .@price,200;
- set .@material,1011; //Emveretarcon
- set .@type$,"weapon";
+ .@type$ = "weapon";
mes "A level 2 weapon?";
break;
case 3: // Level 3 Weapon
- set .@price,20000;
- set .@material,984; //Oridecon
- set .@type$,"weapon";
+ .@type$ = "weapon";
mes "Woot!! A level 3 weapon? Impressive~";
break;
case 4: // Level 4 Weapon
- set .@price,50000;
- set .@material,984; //Oridecon
- set .@type$,"weapon";
+ .@type$ = "weapon";
mes "Wow!... A level 4 weapon~!!";
break;
}
@@ -510,18 +501,18 @@ malangdo,224,172,6 script Clink#mal_normal 544,{
close;
}
delitem .@material,1;
- set Zeny, Zeny-.@price;
+ Zeny = Zeny-.@price;
if (getequippercentrefinery(.@part) <= rand(100)) {
failedrefitem .@part;
mes "[Clink]";
mes "Cry Hammer!! Cry!!!";
next;
switch(rand(1,5)) {
- case 1: emotion e_sob; break;
- case 2: emotion e_swt2; break;
- case 3: emotion e_wah; break;
- case 4: emotion e_hmm; break;
- case 5: emotion e_lv2; break;
+ case 1: emotion ET_CRY; break;
+ case 2: emotion ET_PROFUSELY_SWEAT; break;
+ case 3: emotion ET_KEK; break;
+ case 4: emotion ET_SCRATCH; break;
+ case 5: emotion ET_BIGTHROB; break;
}
mes "[Clink]";
mes "Huh?! I failed?!";
@@ -539,7 +530,7 @@ malangdo,224,172,6 script Clink#mal_normal 544,{
mes "[Clink]";
mes "Cry Hammer!! Cry!!!";
next;
- emotion e_kis;
+ emotion ET_CHUP;
mes "[Clink]";
mes "Ok!! Perfect!!";
mes "There's nothing I can't refine";
diff --git a/npc/re/merchants/shadow_refiner.txt b/npc/re/merchants/shadow_refiner.txt
new file mode 100644
index 00000000000..0f30a819a59
--- /dev/null
+++ b/npc/re/merchants/shadow_refiner.txt
@@ -0,0 +1,152 @@
+//===== rAthena Script =======================================
+//= Shadow Blacksmith
+//===== Description: =========================================
+//= [Official Conversion]
+//= Shadow equipments refining NPC.
+//===== Changelog: ===========================================
+//= 1.0 First version [Aleos]
+//= 1.1 Removed re-roll behavior and fetch materials from db
+//= [Secret]
+//============================================================
+- script ::ShadowBlacksmith -1,{
+ .@zeny_cost = 200000; // Zeny cost is 200,000 according to official script [Secret]
+ disable_items;
+ mes "[Shadow Blacksmith]";
+ mes "Do you want to refine a shadow item? Pick yer poison!";
+ next;
+ setarray .@indices[1], EQI_SHADOW_ARMOR, EQI_SHADOW_WEAPON, EQI_SHADOW_SHIELD, EQI_SHADOW_SHOES, EQI_SHADOW_ACC_R, EQI_SHADOW_ACC_L;
+ .@indlen = getarraysize(.@indices) - 1;
+ for(.@i = 1; .@i <= .@indlen; .@i++)
+ .@menu$ = .@menu$ + (getequipisequiped(.@indices[.@i]) ? getequipname(.@indices[.@i]) : F_getpositionname(.@indices[.@i]) +"-[Not equipped]") +":";
+ .@menu$ = .@menu$ + "Refine info";
+ .@choice = select(.@menu$);
+ if (.@choice == .@indlen + 1) { // Refine info
+ mes "[Shadow Blacksmith]";
+ mes "When a shadow item is refined, it gains extra bonuses very much like normal items.";
+ next;
+ mes "[Shadow Blacksmith]";
+ mes "Weapon: ATK, MATK + 1 increase for each +1 refine success.";
+ mes "Etc: HP + 10 increase for each +1 refine success.";
+ next;
+ mes "[Shadow Blacksmith]";
+ mes "All types of Oridecon and Elunium can be used to refine shadow items. Each attempt will also cost 20,000 zeny.";
+ next;
+ mes "[Shadow Blacksmith]";
+ mes "HD ores can be used for gear that is at least refine level +7 and will prevent breaking as long as you stay talking to me.";
+ close;
+ }
+
+ .@part = .@indices[.@choice];
+
+ if (!getequipisequiped(.@part)) {
+ mes "[Shadow Blacksmith]";
+ mes "There's nothing here!";
+ close;
+ }
+
+ while(1) {
+ mes "[Shadow Blacksmith]";
+ mes "I require " + callfunc("F_InsertComma", .@zeny_cost) + " zeny as a fee for EACH refine attempt.";
+ mes "Choose your Ore and start refining.";
+ next;
+ .@isNormalEqp = 0;
+ if (.@part != EQI_SHADOW_WEAPON)
+ .@isNormalEqp = 1;
+
+ .@material[0] = getequiprefinecost(.@part, REFINE_COST_NORMAL, REFINE_MATERIAL_ID);
+ .@material[1] = getequiprefinecost(.@part, REFINE_COST_ENRICHED, REFINE_MATERIAL_ID);
+ .@material[2] = getequiprefinecost(.@part, REFINE_COST_HD, REFINE_MATERIAL_ID);
+
+ if (countitem(.@material[0]))
+ .@mate$[0] = getitemname(.@material[0]);
+ else {
+ .@mate$[0] = "^8C8C8C"+ getitemname(.@material[0]) +"^000000";
+ .@miss[0] = 1;
+ }
+ if (countitem(.@material[1]))
+ .@mate$[1] = getitemname(.@material[1]);
+ else {
+ .@mate$[1] = "^8C8C8C"+ getitemname(.@material[1]) +"^000000";
+ .@miss[1] = 1;
+ }
+ if (getequiprefinerycnt(.@part) > 6 && countitem(.@material[2]))
+ .@mate$[2] = getitemname(.@material[2]);
+ else {
+ .@mate$[2] = "^8C8C8C"+ getitemname(.@material[2]) +"^000000";
+ .@miss[2] = 1;
+ }
+
+ .@option = select(.@mate$[0],.@mate$[1],.@mate$[2],"Cancel");
+ if (.@option == 4) {
+ mes "[Shadow Blacksmith]";
+ mes "You've cancelled refining.";
+ close;
+ }
+ else if (.@option == 3) { // HD
+ if (getequiprefinerycnt(.@part) < 7) {
+ mes "[Shadow Blacksmith]";
+ mes "HD Ore can only used for +7 or higher refine level items.";
+ close;
+ }
+ .@hoihoi = 1;
+ }
+ .@choose = .@material[.@option-1];
+ if (!countitem(.@choose)) {
+ mes "[Shadow Blacksmith]";
+ mes "You do not have enough "+ getitemname(.@choose) +".";
+ close;
+ }
+ if (Zeny < .@zeny_cost) {
+ mes "[Shadow Blacksmith]";
+ mes "You do not have enough zeny.";
+ close;
+ }
+ if (getequiprefinerycnt(.@part) > 9) {
+ mes "[Shadow Blacksmith]";
+ mes "Shadow Equipment can be refined to the maximum of 10...";
+ close;
+ }
+ if (!getequipisenableref(.@part)) {
+ mes "[Shadow Blacksmith]";
+ mes "This item cannot be refined.";
+ close;
+ }
+ if (getequippercentrefinery(.@part) < 100) {
+ mes "[Shadow Blacksmith]";
+ mes "The safety refine level for Shadow Equipment is +4.";
+ if (!.@hoihoi)
+ mes "Shadow equipment may be destroyed in subsequent refinements. Want to get started?";
+ else
+ mes "The next refinement, if it fails, will degrade the refinement. Do you want to refine?";
+ next;
+ if (select("Proceed","Cancel") == 2) {
+ mes "[Shadow Blacksmith]";
+ mes "Heh, I knew it!";
+ close;
+ }
+ }
+
+ mes "[Shadow Blacksmith]";
+ mes "Well then.. here goes nothing!";
+ next;
+ delitem .@choose,1;
+ Zeny -= .@zeny_cost;
+ if (getequippercentrefinery(.@part, .@option > 1) > rand(100)) {
+ successrefitem .@part;
+ mes "[Shadow Blacksmith]";
+ mes "It worked! It worked!";
+ next;
+ } else {
+ if (.@hoihoi)
+ downrefitem .@part;
+ else
+ failedrefitem .@part;
+ mes "[Shadow Blacksmith]";
+ mes "Oh Odin No!";
+ close;
+ }
+ }
+}
+
+//moc_paraup,45,185,5 duplicate(ShadowBlacksmith) Shadow Blacksmith#eden1 4_F_JOB_BLACKSMITH // Commented out until it's added to the map index
+prt_in,61,54,3 duplicate(ShadowBlacksmith) Shadow Blacksmith#itemmall 4_F_JOB_BLACKSMITH
diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt
index 4101fde834f..3f81256497d 100644
--- a/npc/re/merchants/shops.txt
+++ b/npc/re/merchants/shops.txt
@@ -125,6 +125,7 @@ prt_in,109,68,4 shop Trap Specialist#prt 66,7940:-1,12341:-1
prt_in,175,137,4 shop Black Marketeer#prt 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
s_atelier,17,110,1 shop Part-Timer#sc_prt 67,6123:-1,6120:-1
prontera,96,209,4 shop Rebellion Accessories 564,13210:-1,13211:-1,13212:-1,7663:-1,7664:-1,7665:-1,7940:300,13200:-1,13201:-1,13202:-1,13203:-1,13204:-1,13205:-1,13206:-1,13207:-1
+//prontera,96,209,4 shop Rebellion Prop Vending 564,13210:-1,13211:-1,13212:-1,7663:-1,7664:-1,7665:-1,7940:300,13200:-1,13221:-1,13222:-1,13215:-1,13216:-1,13217:-1,13218:-1,13219:-1,13220:-1,13223:-1,13224:-1,13225:-1,13226:-1,13227:-1
prontera,92,209,4 shop Rebellion Weapons 564,13120:-1,13122:-1,13189:-1,13190:-1,13192:-1,13193:-1,13194:-1,13197:-1,13198:-1,28200:-1,28201:-1
//=======================================================
diff --git a/npc/re/merchants/ticket_refiner.txt b/npc/re/merchants/ticket_refiner.txt
index 73ea943f7c1..1e173135d43 100644
--- a/npc/re/merchants/ticket_refiner.txt
+++ b/npc/re/merchants/ticket_refiner.txt
@@ -44,7 +44,7 @@ prontera,184,177,6 script Refine Master 851,{
close;
}
}
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Refine Master]";
mes "Greetings!";
mes "I can refine an item up to the ^006400same level as your ticket^000000.";
@@ -70,7 +70,7 @@ prontera,184,177,6 script Refine Master 851,{
close;
}
if (!getequipisenableref(.@part)) {
- emotion e_otl;
+ emotion ET_OTL;
mes "[Refine Master]";
mes "Oh, I'm sorry.";
mes "This item is impossible to refine.";
@@ -95,7 +95,7 @@ prontera,184,177,6 script Refine Master 851,{
break;
}
if (!.@check) {
- emotion e_dots;
+ emotion ET_THINK;
mes "[Refine Master]";
mes "If you want to refine this ^006400"+.@type$+"^000000, please come along with ^006400"+.@type$+" Refine Ticket^000000.";
mes "See you later!";
@@ -111,7 +111,7 @@ prontera,184,177,6 script Refine Master 851,{
set .@ticket_lv, .@levels[.@select];
set .@ticket_id, .@tickets[.@select];
if (countitem(.@ticket_id) == 0) {
- emotion e_what;
+ emotion ET_QUESTION;
mes "[Refine Master]";
mes getitemname(.@ticket_id)+" is not in your inventory. Did you put it in your storage?";
mes "Please check again.";
@@ -119,7 +119,7 @@ prontera,184,177,6 script Refine Master 851,{
close;
}
if (getequiprefinerycnt(.@part) >= .@ticket_lv) {
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
mes "[Refine Master]";
mes "^8B4513This item is already refined as much as your deed.^000000";
mes "Please come along with an item refined less than your ticket.";
@@ -130,7 +130,7 @@ prontera,184,177,6 script Refine Master 851,{
mes "May I proceed?";
next;
if(select("No.:Yes.") == 1) {
- emotion e_dots;
+ emotion ET_THINK;
mes "[Refine Master]";
mes "Oh, you changed your mind.";
mes "Ok.";
@@ -153,7 +153,7 @@ prontera,184,177,6 script Refine Master 851,{
}
successrefitem .@part, .@ticket_lv - getequiprefinerycnt(.@part);
next;
- emotion e_ho;
+ emotion ET_DELIGHT;
mes "[Refine Master]";
mes "Alright, here it is~";
mes "Well, ^0000FF"+strcharinfo(0)+"^000000!";
diff --git a/npc/re/mobs/dungeons/yggdrasil.txt b/npc/re/mobs/dungeons/yggdrasil.txt
index 66beaac7a57..5af870f1102 100644
--- a/npc/re/mobs/dungeons/yggdrasil.txt
+++ b/npc/re/mobs/dungeons/yggdrasil.txt
@@ -7,7 +7,7 @@
//===== Compatible With: =====================================
//= rAthena Project
//===== Additional Comments: =================================
-//= 1.0 Splitted from Nifflheim fields [DracoRPG]
+//= 1.0 Splitted from Niflheim fields [DracoRPG]
//= 1.1 Official kRO 10.1 spawns [Playtester]
//============================================================
diff --git a/npc/re/mobs/fields/niflheim.txt b/npc/re/mobs/fields/niflheim.txt
index 6b1d06baf92..6ff579f5dd5 100644
--- a/npc/re/mobs/fields/niflheim.txt
+++ b/npc/re/mobs/fields/niflheim.txt
@@ -17,7 +17,7 @@
//============================================================
//==================================================
-// niflheim - Nifflheim, Realm of the Dead
+// niflheim - Niflheim, Realm of the Dead
//==================================================
niflheim,0,0 monster Lude 1509,20,5000
niflheim,0,0 monster Quve 1508,20,5000
@@ -26,7 +26,7 @@ niflheim,0,0 monster Heirozoist 1510,10,5000
niflheim,0,0 monster Dullahan 1504,5,5000
//==================================================
-// nif_fild01 - Skellington, a Solitary Village in Nifflheim
+// nif_fild01 - Skellington, a Solitary Village in Niflheim
//==================================================
nif_fild01,0,0 monster Disguise 1506,50,5000
nif_fild01,0,0 monster Quve 1508,30,5000
diff --git a/npc/re/mobs/fields/prontera.txt b/npc/re/mobs/fields/prontera.txt
index f52175da1cc..84a335f9556 100644
--- a/npc/re/mobs/fields/prontera.txt
+++ b/npc/re/mobs/fields/prontera.txt
@@ -90,29 +90,34 @@ prt_fild07,225,110,5,5 monster Black Mushroom 1084,3,360000,180000
// prt_fild08 - Prontera Field
//==================================================
prt_fild08,0,0 monster Poring 1002,110,5000
-prt_fild08,0,0 monster Lunatic 1063,100,5000
-prt_fild08,0,0 monster Fabre 1007,100,5000
-prt_fild08,0,0 monster Little Poring 2398,30,50000
+prt_fild08,0,0 monster Lunatic 1063,110,5000
+prt_fild08,0,0 monster Fabre 1007,88,5000
+prt_fild08,0,0 monster Little Poring 2398,33,50000
+prt_fild08,0,0 monster Pupa 1008,66,5000
//==================================================
// prt_fild08 - Duplicates
//==================================================
prt_fild08a,0,0 monster Poring 1002,110,5000
-prt_fild08a,0,0 monster Lunatic 1063,100,5000
-prt_fild08a,0,0 monster Fabre 1007,100,5000
-prt_fild08a,0,0 monster Little Poring 2398,30,50000
+prt_fild08a,0,0 monster Lunatic 1063,110,5000
+prt_fild08a,0,0 monster Fabre 1007,88,5000
+prt_fild08a,0,0 monster Little Poring 2398,33,50000
+prt_fild08a,0,0 monster Pupa 1008,66,5000
prt_fild08b,0,0 monster Poring 1002,110,5000
-prt_fild08b,0,0 monster Lunatic 1063,100,5000
-prt_fild08b,0,0 monster Fabre 1007,100,5000
-prt_fild08b,0,0 monster Little Poring 2398,30,50000
+prt_fild08b,0,0 monster Lunatic 1063,110,5000
+prt_fild08b,0,0 monster Fabre 1007,88,5000
+prt_fild08b,0,0 monster Little Poring 2398,33,50000
+prt_fild08b,0,0 monster Pupa 1008,66,5000
prt_fild08c,0,0 monster Poring 1002,110,5000
-prt_fild08c,0,0 monster Lunatic 1063,100,5000
-prt_fild08c,0,0 monster Fabre 1007,100,5000
-prt_fild08c,0,0 monster Little Poring 2398,30,50000
+prt_fild08c,0,0 monster Lunatic 1063,110,5000
+prt_fild08c,0,0 monster Fabre 1007,88,5000
+prt_fild08c,0,0 monster Little Poring 2398,33,50000
+prt_fild08c,0,0 monster Pupa 1008,66,5000
prt_fild08d,0,0 monster Poring 1002,110,5000
-prt_fild08d,0,0 monster Lunatic 1063,100,5000
-prt_fild08d,0,0 monster Fabre 1007,100,5000
-prt_fild08d,0,0 monster Little Poring 2398,30,50000
+prt_fild08d,0,0 monster Lunatic 1063,110,5000
+prt_fild08d,0,0 monster Fabre 1007,88,5000
+prt_fild08d,0,0 monster Little Poring 2398,33,50000
+prt_fild08d,0,0 monster Pupa 1008,66,5000
//==================================================
diff --git a/npc/re/mobs/int_land.txt b/npc/re/mobs/int_land.txt
new file mode 100644
index 00000000000..546c779de72
--- /dev/null
+++ b/npc/re/mobs/int_land.txt
@@ -0,0 +1,12 @@
+//===== rAthena Script =======================================
+//= Beginner Area Monster Spawn Script
+//===== Changelogs: ==========================================
+//= 1.0 First version. [Ridley]
+//= 1.1 Export from Hercules to rAthena. [Jenkijo]
+//============================================================
+
+int_land,0,0 monster Poring 2401,30,5000
+int_land01,0,0 monster Poring 2401,30,5000
+int_land02,0,0 monster Poring 2401,30,5000
+int_land03,0,0 monster Poring 2401,30,5000
+int_land04,0,0 monster Poring 2401,30,5000
diff --git a/npc/re/mobs/verus.txt b/npc/re/mobs/verus.txt
new file mode 100644
index 00000000000..e89398e587b
--- /dev/null
+++ b/npc/re/mobs/verus.txt
@@ -0,0 +1,34 @@
+//===== rAthena Script =======================================
+//= Verus Monster Spawn Script
+//===== Description: =========================================
+//= Spawns monsters around Verus.
+//===== Additional Comments: =================================
+//= 1.0 First version. [Capuche]
+//============================================================
+
+// ver_eju
+ver_eju,0,0,0,0 monster Recon Robot 3154,80,0,0,0
+ver_eju,0,0,0,0 monster Excavator Robot 3153,25,0,0,0
+// ver_tunn
+ver_tunn,0,0,0,0 monster Recon Robot 3154,5,0,0,0
+// verus01
+verus01,0,0,0,0 monster Green Cenere 3247,30,0,0,0
+verus01,0,0,0,0 monster Explorer Robot Turbo 3249,10,0,0,0
+verus01,0,0,0,0 monster Repair Robot Turbo 3248,10,0,0,0
+// verus02
+verus02,0,0,0,0 monster Repair Robot Turbo 3248,90,0,0,0
+verus02,0,0,0,0 monster Explorer Robot Turbo 3249,90,0,0,0
+// verus03
+verus03,0,0,0,0 monster Illegal Promotion 3159,40,0,0,0
+verus03,0,0,0,0 monster Explorer Robot 3156,80,0,0,0
+verus03,0,0,0,0 monster Repair Robot 3155,45,0,0,0
+verus03,0,0,0,0 monster Ruin Grace Believer 3158,10,0,0,0
+// un_bunker
+un_bunker,0,0,0,0 monster Thief Bug 1051,6,0,0,0
+un_bunker,0,0,0,0 monster Smelly Ghoul 3255,68,0,0,0
+un_bunker,0,0,0,0 monster Smelly Zombie 3256,80,0,0,0
+un_bunker,0,0,0,0 monster Machine Component 3250,28,0,0,0
+un_bunker,0,0,0,0 monster DR815 3252,14,0,0,0
+un_bunker,0,0,0,0 monster GC109 3251,10,0,0,0
+un_bunker,0,0,0,0 monster Black Mushroom 1084,1,0,0,0
+un_bunker,0,0,0,0 monster Chonchon 1011,2,0,0,0
diff --git a/npc/re/other/achievements.txt b/npc/re/other/achievements.txt
new file mode 100644
index 00000000000..4c1e2daf66b
--- /dev/null
+++ b/npc/re/other/achievements.txt
@@ -0,0 +1,289 @@
+//===== rAthena Script =======================================
+//= Adventure Achievements
+//===== Description: =========================================
+//= Spawns Adventure group type treasure chests.
+//===== Changelogs: ==========================================
+//= 1.0 Initial release. [Aleos]
+//============================================================
+
+- script ach_treasure#core -1,{
+ if (strnpcinfo(3) == "")
+ end;
+ achievementcomplete(atoi(strnpcinfo(3)));
+ classchange HIDDEN_WARP_NPC;
+ initnpctimer;
+ end;
+
+OnTouch:
+ if (getnpctimer(1)) // Don't trigger touch if the delay timer is active.
+ end;
+ if (achievementexists(atoi(strnpcinfo(3)))) // Don't trigger if the player has already completed.
+ end;
+ classchange 4_TREASURE_BOX,"",bc_self;
+ end;
+
+OnTimer5000:
+ stopnpctimer;
+ end;
+}
+
+//-----------------
+// --- Dungeons ---
+//-----------------
+
+// Abbey Underground
+abbey03,26,72,0 duplicate(ach_treasure#core) #abb_ach1::120110 HIDDEN_WARP_NPC,5,5
+
+// Abyss Lake
+abyss_03,86,55,0 duplicate(ach_treasure#core) #aby_ach1::120111 HIDDEN_WARP_NPC,5,5
+
+// Amatsu Dungeon
+ama_dun03,60,163,0 duplicate(ach_treasure#core) #ama_ach1::120113 HIDDEN_WARP_NPC,5,5
+
+// Ant Hell
+anthell02,253,41,0 duplicate(ach_treasure#core) #ant_ach1::120114 HIDDEN_WARP_NPC,5,5
+
+// Ayothaya Dungeon
+ayo_dun02,150,256,0 duplicate(ach_treasure#core) #ayo_ach1::120115 HIDDEN_WARP_NPC,5,5
+
+// Bifrost
+ecl_tdun04,37,37,0 duplicate(ach_treasure#core) #ecl_ach1::120121 HIDDEN_WARP_NPC,5,5
+
+// Brasilis Dungeon
+bra_dun02,171,121,0 duplicate(ach_treasure#core) #bra_ach1::120117 HIDDEN_WARP_NPC,5,5
+
+// Byalan Dungeon
+iz_dun05,64,223,0 duplicate(ach_treasure#core) #iz_ach2::120141 HIDDEN_WARP_NPC,5,5
+
+// Clock Tower
+c_tower4,37,158,0 duplicate(ach_treasure#core) #ct_ach1::120112 HIDDEN_WARP_NPC,5,5
+alde_dun04,90,107,0 duplicate(ach_treasure#core) #ct_ach2::120118 HIDDEN_WARP_NPC,5,5
+
+// Coal Mine
+mjo_dun03,76,220,0 duplicate(ach_treasure#core) #mjo_ach1::120136 HIDDEN_WARP_NPC,5,5
+
+// Comodo Dungeon
+beach_dun3,102,71,0 duplicate(ach_treasure#core) #bea_ach1::120116 HIDDEN_WARP_NPC,5,5
+
+// Einbech
+ein_dun02,31,255,0 duplicate(ach_treasure#core) #eind_ach1::120122 HIDDEN_WARP_NPC,5,5
+
+// Geffen Dungeon
+gef_dun02,222,163,0 duplicate(ach_treasure#core) #gefd_ach1::120123 HIDDEN_WARP_NPC,5,5
+
+// Glastheim
+gl_cas02,53,151,0 duplicate(ach_treasure#core) #gl_ach1::120124 HIDDEN_WARP_NPC,5,5
+gl_sew04,288,6,0 duplicate(ach_treasure#core) #gl_ach2::120125 HIDDEN_WARP_NPC,5,5
+gl_knt02,126,235,0 duplicate(ach_treasure#core) #gl_ach3::120126 HIDDEN_WARP_NPC,5,5
+gl_prison1,125,159,0 duplicate(ach_treasure#core) #gl_ach4::120127 HIDDEN_WARP_NPC,5,5
+
+// Gonryun Dungeon
+gon_dun03,167,232,0 duplicate(ach_treasure#core) #gon_ach1::120128 HIDDEN_WARP_NPC,5,5
+
+// Istana
+dew_dun02,87,272,0 duplicate(ach_treasure#core) #dew_ach1::120119 HIDDEN_WARP_NPC,5,5
+
+// Labyrinth
+prt_maze03,11,14,0 duplicate(ach_treasure#core) #maze_ach1::120140 HIDDEN_WARP_NPC,5,5
+
+// Louyang Dungeon
+lou_dun03,29,228,0 duplicate(ach_treasure#core) #lou_ach1::120134 HIDDEN_WARP_NPC,5,5
+
+// Nogg Road
+mag_dun02,192,72,0 duplicate(ach_treasure#core) #mag_ach1::120135 HIDDEN_WARP_NPC,5,5
+
+// Orc Dungeon
+orcsdun02,32,72,0 duplicate(ach_treasure#core) #orc_ach1::120138 HIDDEN_WARP_NPC,5,5
+
+// Payon Dungeon
+pay_dun04,120,124,0 duplicate(ach_treasure#core) #payd_ach1::120139 HIDDEN_WARP_NPC,5,5
+
+// Prontera Culvert
+prt_sewb4,19,183,0 duplicate(ach_treasure#core) #iz_ach1::120131 HIDDEN_WARP_NPC,5,5
+
+// Pyramid
+moc_pryd06,102,121,0 duplicate(ach_treasure#core) #pyr_ach1::120137 HIDDEN_WARP_NPC,5,5
+
+// Rachel Dungeon
+ice_dun03,44,261,0 duplicate(ach_treasure#core) #rad_ach1::120129 HIDDEN_WARP_NPC,5,5
+
+// Robot Factory
+kh_dun02,70,106,0 duplicate(ach_treasure#core) #jup_ach1::120132 HIDDEN_WARP_NPC,5,5
+
+// Scaraba Hall
+dic_dun03,216,211,0 duplicate(ach_treasure#core) #dic_ach1::120120 HIDDEN_WARP_NPC,5,5
+
+// Somatology Lab
+lhz_dun03,240,221,0 duplicate(ach_treasure#core) #lhzd_ach1::120133 HIDDEN_WARP_NPC,5,5
+
+// Sphinx
+in_sphinx5,154,107,0 duplicate(ach_treasure#core) #sph_ach1::120130 HIDDEN_WARP_NPC,5,5
+
+// Sunken Ship
+treasure02,18,142,0 duplicate(ach_treasure#core) #iz_ach3::120144 HIDDEN_WARP_NPC,5,5
+
+// Thanatos Tower
+tha_t06,150,176,0 duplicate(ach_treasure#core) #tha_ach1::120142 HIDDEN_WARP_NPC,5,5
+
+// Thors Volcano
+thor_v03,220,221,0 duplicate(ach_treasure#core) #thor_ach1::120143 HIDDEN_WARP_NPC,5,5
+
+// Toy Factory
+xmas_dun02,120,224,0 duplicate(ach_treasure#core) #xmas_ach1::120146 HIDDEN_WARP_NPC,5,5
+
+// Turtle Island Dungeon
+tur_dun04,134,130,0 duplicate(ach_treasure#core) #tur_ach1::120145 HIDDEN_WARP_NPC,5,5
+
+//---------------
+// --- Fields ---
+//---------------
+
+// Comodo
+cmd_fild01,112,200,0 duplicate(ach_treasure#core) #cmd_ach1::120044 HIDDEN_WARP_NPC,5,5
+cmd_fild02,86,94,0 duplicate(ach_treasure#core) #cmd_ach2::120045 HIDDEN_WARP_NPC,5,5
+cmd_fild03,144,190,0 duplicate(ach_treasure#core) #cmd_ach3::120046 HIDDEN_WARP_NPC,5,5
+cmd_fild04,151,191,0 duplicate(ach_treasure#core) #cmd_ach4::120047 HIDDEN_WARP_NPC,5,5
+cmd_fild06,221,108,0 duplicate(ach_treasure#core) #cmd_ach5::120048 HIDDEN_WARP_NPC,5,5
+cmd_fild07,269,322,0 duplicate(ach_treasure#core) #cmd_ach6::120049 HIDDEN_WARP_NPC,5,5
+cmd_fild08,181,136,0 duplicate(ach_treasure#core) #cmd_ach7::120050 HIDDEN_WARP_NPC,5,5
+cmd_fild09,211,266,0 duplicate(ach_treasure#core) #cmd_ach8::120051 HIDDEN_WARP_NPC,5,5
+
+// Einbroch
+ein_fild01,266,277,0 duplicate(ach_treasure#core) #ein_ach1::120067 HIDDEN_WARP_NPC,5,5
+ein_fild03,99,332,0 duplicate(ach_treasure#core) #ein_ach2::120068 HIDDEN_WARP_NPC,5,5
+ein_fild04,334,305,0 duplicate(ach_treasure#core) #ein_ach3::120069 HIDDEN_WARP_NPC,5,5
+ein_fild05,337,233,0 duplicate(ach_treasure#core) #ein_ach4::120070 HIDDEN_WARP_NPC,5,5
+ein_fild06,174,245,0 duplicate(ach_treasure#core) #ein_ach5::120071 HIDDEN_WARP_NPC,5,5
+ein_fild07,188,50,0 duplicate(ach_treasure#core) #ein_ach6::120072 HIDDEN_WARP_NPC,5,5
+ein_fild08,258,78,0 duplicate(ach_treasure#core) #ein_ach7::120073 HIDDEN_WARP_NPC,5,5
+ein_fild09,330,76,0 duplicate(ach_treasure#core) #ein_ach8::120074 HIDDEN_WARP_NPC,5,5
+
+// Geffen
+gef_fild00,74,119,0 duplicate(ach_treasure#core) #gef_ach1::120011 HIDDEN_WARP_NPC,5,5
+gef_fild01,223,223,0 duplicate(ach_treasure#core) #gef_ach2::120012 HIDDEN_WARP_NPC,5,5
+gef_fild05,202,292,0 duplicate(ach_treasure#core) #gef_ach3::120013 HIDDEN_WARP_NPC,5,5
+gef_fild06,279,104,0 duplicate(ach_treasure#core) #gef_ach4::120014 HIDDEN_WARP_NPC,5,5
+gef_fild07,181,250,0 duplicate(ach_treasure#core) #gef_ach5::120015 HIDDEN_WARP_NPC,5,5
+gef_fild09,170,73,0 duplicate(ach_treasure#core) #gef_ach6::120016 HIDDEN_WARP_NPC,5,5
+gef_fild11,238,249,0 duplicate(ach_treasure#core) #gef_ach7::120017 HIDDEN_WARP_NPC,5,5
+
+// Hugel
+hu_fild01,347,312,0 duplicate(ach_treasure#core) #hu_ach1::120062 HIDDEN_WARP_NPC,5,5
+hu_fild02,80,152,0 duplicate(ach_treasure#core) #hu_ach2::120063 HIDDEN_WARP_NPC,5,5
+hu_fild04,322,313,0 duplicate(ach_treasure#core) #hu_ach3::120064 HIDDEN_WARP_NPC,5,5
+hu_fild06,204,228,0 duplicate(ach_treasure#core) #hu_ach4::120065 HIDDEN_WARP_NPC,5,5
+hu_fild05,197,210,0 duplicate(ach_treasure#core) #hu_ach5::120066 HIDDEN_WARP_NPC,5,5
+
+// Laphine
+ecl_fild01,155,322,0 duplicate(ach_treasure#core) #ecl_ach1::120090 HIDDEN_WARP_NPC,5,5
+bif_fild01,147,64,0 duplicate(ach_treasure#core) #ecl_ach2::120091 HIDDEN_WARP_NPC,5,5
+bif_fild02,155,322,0 duplicate(ach_treasure#core) #ecl_ach3::120092 HIDDEN_WARP_NPC,5,5
+spl_fild01,335,315,0 duplicate(ach_treasure#core) #ecl_ach4::120093 HIDDEN_WARP_NPC,5,5
+spl_fild02,153,358,0 duplicate(ach_treasure#core) #ecl_ach5::120094 HIDDEN_WARP_NPC,5,5
+spl_fild03,61,286,0 duplicate(ach_treasure#core) #ecl_ach6::120095 HIDDEN_WARP_NPC,5,5
+
+// Lighthalzen
+lhz_fild01,118,73,0 duplicate(ach_treasure#core) #lhz_ach1::120075 HIDDEN_WARP_NPC,5,5
+lhz_fild02,239,243,0 duplicate(ach_treasure#core) #lhz_ach2::120076 HIDDEN_WARP_NPC,5,5
+lhz_fild03,313,132,0 duplicate(ach_treasure#core) #lhz_ach3::120077 HIDDEN_WARP_NPC,5,5
+
+// Manuk
+man_fild01,41,172,0 duplicate(ach_treasure#core) #man_ach1::120096 HIDDEN_WARP_NPC,5,5
+man_fild02,268,355,0 duplicate(ach_treasure#core) #man_ach2::120097 HIDDEN_WARP_NPC,5,5
+man_fild03,198,91,0 duplicate(ach_treasure#core) #man_ach3::120098 HIDDEN_WARP_NPC,5,5
+dic_fild01,227,82,0 duplicate(ach_treasure#core) #man_ach4::120099 HIDDEN_WARP_NPC,5,5
+dic_fild02,147,196,0 duplicate(ach_treasure#core) #man_ach5::120100 HIDDEN_WARP_NPC,5,5
+
+// Misc
+ama_fild01,187,337,0 duplicate(ach_treasure#core) #misc_ach1::120101 HIDDEN_WARP_NPC,5,5
+gon_fild01,171,332,0 duplicate(ach_treasure#core) #misc_ach2::120102 HIDDEN_WARP_NPC,5,5
+lou_fild01,104,232,0 duplicate(ach_treasure#core) #misc_ach3::120103 HIDDEN_WARP_NPC,5,5
+ayo_fild01,289,70,0 duplicate(ach_treasure#core) #misc_ach4::120104 HIDDEN_WARP_NPC,5,5
+mosk_fild02,176,77,0 duplicate(ach_treasure#core) #misc_ach5::120105 HIDDEN_WARP_NPC,5,5
+bra_fild01,99,193,0 duplicate(ach_treasure#core) #misc_ach6::120106 HIDDEN_WARP_NPC,5,5
+dew_fild01,175,287,0 duplicate(ach_treasure#core) #misc_ach7::120107 HIDDEN_WARP_NPC,5,5
+ma_fild01,308,206,0 duplicate(ach_treasure#core) #misc_ach8::120108 HIDDEN_WARP_NPC,5,5
+ma_fild02,176,77,0 duplicate(ach_treasure#core) #misc_ach9::120109 HIDDEN_WARP_NPC,5,5
+
+// Mjolnir
+mjolnir_01,47,60,0 duplicate(ach_treasure#core) #nmjo_ach1::120032 HIDDEN_WARP_NPC,5,5
+mjolnir_02,77,49,0 duplicate(ach_treasure#core) #nmjo_ach2::120033 HIDDEN_WARP_NPC,5,5
+mjolnir_03,190,200,0 duplicate(ach_treasure#core) #nmjo_ach3::120034 HIDDEN_WARP_NPC,5,5
+mjolnir_04,201,146,0 duplicate(ach_treasure#core) #nmjo_ach4::120035 HIDDEN_WARP_NPC,5,5
+mjolnir_05,43,327,0 duplicate(ach_treasure#core) #nmjo_ach5::120036 HIDDEN_WARP_NPC,5,5
+mjolnir_06,162,290,0 duplicate(ach_treasure#core) #smjo_ach1::120037 HIDDEN_WARP_NPC,5,5
+mjolnir_07,321,127,0 duplicate(ach_treasure#core) #smjo_ach2::120038 HIDDEN_WARP_NPC,5,5
+mjolnir_08,175,225,0 duplicate(ach_treasure#core) #smjo_ach3::120039 HIDDEN_WARP_NPC,5,5
+mjolnir_09,299,123,0 duplicate(ach_treasure#core) #smjo_ach4::120040 HIDDEN_WARP_NPC,5,5
+mjolnir_10,353,371,0 duplicate(ach_treasure#core) #smjo_ach5::120041 HIDDEN_WARP_NPC,5,5
+mjolnir_11,329,182,0 duplicate(ach_treasure#core) #smjo_ach6::120042 HIDDEN_WARP_NPC,5,5
+mjolnir_12,110,298,0 duplicate(ach_treasure#core) #smjo_ach7::120043 HIDDEN_WARP_NPC,5,5
+
+// Morocc
+moc_fild11,188,218,0 duplicate(ach_treasure#core) #moc_ach1::120018 HIDDEN_WARP_NPC,5,5
+moc_fild12,234,96,0 duplicate(ach_treasure#core) #moc_ach2::120019 HIDDEN_WARP_NPC,5,5
+moc_fild13,290,207,0 duplicate(ach_treasure#core) #moc_ach3::120020 HIDDEN_WARP_NPC,5,5
+moc_fild16,196,108,0 duplicate(ach_treasure#core) #moc_ach4::120021 HIDDEN_WARP_NPC,5,5
+moc_fild17,269,105,0 duplicate(ach_treasure#core) #moc_ach5::120022 HIDDEN_WARP_NPC,5,5
+moc_fild18,54,284,0 duplicate(ach_treasure#core) #moc_ach6::120023 HIDDEN_WARP_NPC,5,5
+
+// Payon
+pay_fild01,167,243,0 duplicate(ach_treasure#core) #pay_ach1::120024 HIDDEN_WARP_NPC,5,5
+pay_fild02,105,240,0 duplicate(ach_treasure#core) #pay_ach2::120025 HIDDEN_WARP_NPC,5,5
+pay_fild03,144,97,0 duplicate(ach_treasure#core) #pay_ach3::120026 HIDDEN_WARP_NPC,5,5
+pay_fild04,257,95,0 duplicate(ach_treasure#core) #pay_ach4::120027 HIDDEN_WARP_NPC,5,5
+pay_fild07,365,37,0 duplicate(ach_treasure#core) #pay_ach5::120028 HIDDEN_WARP_NPC,5,5
+pay_fild08,237,345,0 duplicate(ach_treasure#core) #pay_ach6::120029 HIDDEN_WARP_NPC,5,5
+pay_fild09,251,42,0 duplicate(ach_treasure#core) #pay_ach7::120030 HIDDEN_WARP_NPC,5,5
+pay_fild10,196,38,0 duplicate(ach_treasure#core) #pay_ach8::120031 HIDDEN_WARP_NPC,5,5
+
+// Prontera
+prt_fild01,147,126,0 duplicate(ach_treasure#core) #prt_ach1::120001 HIDDEN_WARP_NPC,5,5
+prt_fild02,140,219,0 duplicate(ach_treasure#core) #prt_ach2::120002 HIDDEN_WARP_NPC,5,5
+prt_fild03,172,139,0 duplicate(ach_treasure#core) #prt_ach3::120003 HIDDEN_WARP_NPC,5,5
+prt_fild04,119,291,0 duplicate(ach_treasure#core) #prt_ach4::120004 HIDDEN_WARP_NPC,5,5
+prt_fild05,190,291,0 duplicate(ach_treasure#core) #prt_ach5::120005 HIDDEN_WARP_NPC,5,5
+prt_fild06,296,303,0 duplicate(ach_treasure#core) #prt_ach6::120006 HIDDEN_WARP_NPC,5,5
+prt_fild07,45,104,0 duplicate(ach_treasure#core) #prt_ach7::120007 HIDDEN_WARP_NPC,5,5
+prt_fild08,203,223,0 duplicate(ach_treasure#core) #prt_ach8::120008 HIDDEN_WARP_NPC,5,5
+prt_fild09,37,354,0 duplicate(ach_treasure#core) #prt_ach9::120009 HIDDEN_WARP_NPC,5,5
+prt_fild10,177,206,0 duplicate(ach_treasure#core) #prt_ach10::120010 HIDDEN_WARP_NPC,5,5
+
+// Rachel
+ra_fild01,138,166,0 duplicate(ach_treasure#core) #ra_ach1::120078 HIDDEN_WARP_NPC,5,5
+ra_fild03,224,275,0 duplicate(ach_treasure#core) #ra_ach2::120079 HIDDEN_WARP_NPC,5,5
+ra_fild08,326,45,0 duplicate(ach_treasure#core) #ra_ach3::120080 HIDDEN_WARP_NPC,5,5
+ra_fild12,352,165,0 duplicate(ach_treasure#core) #ra_ach4::120081 HIDDEN_WARP_NPC,5,5
+ra_fild04,92,302,0 duplicate(ach_treasure#core) #ra_ach5::120082 HIDDEN_WARP_NPC,5,5
+ra_fild05,59,59,0 duplicate(ach_treasure#core) #ra_ach6::120083 HIDDEN_WARP_NPC,5,5
+ra_fild06,362,230,0 duplicate(ach_treasure#core) #ra_ach7::120084 HIDDEN_WARP_NPC,5,5
+
+// Veins
+ve_fild01,180,234,0 duplicate(ach_treasure#core) #ve_ach1::120085 HIDDEN_WARP_NPC,5,5
+ve_fild02,65,194,0 duplicate(ach_treasure#core) #ve_ach2::120086 HIDDEN_WARP_NPC,5,5
+ve_fild03,197,242,0 duplicate(ach_treasure#core) #ve_ach3::120087 HIDDEN_WARP_NPC,5,5
+ve_fild04,288,279,0 duplicate(ach_treasure#core) #ve_ach4::120088 HIDDEN_WARP_NPC,5,5
+ve_fild07,33,113,0 duplicate(ach_treasure#core) #ve_ach5::120089 HIDDEN_WARP_NPC,5,5
+
+// Yuno
+yuno_fild01,284,138,0 duplicate(ach_treasure#core) #yuno_ach1::120052 HIDDEN_WARP_NPC,5,5
+yuno_fild12,76,268,0 duplicate(ach_treasure#core) #yuno_ach2::120053 HIDDEN_WARP_NPC,5,5
+yuno_fild02,142,191,0 duplicate(ach_treasure#core) #yuno_ach3::120054 HIDDEN_WARP_NPC,5,5
+yuno_fild03,135,329,0 duplicate(ach_treasure#core) #yuno_ach4::120055 HIDDEN_WARP_NPC,5,5
+yuno_fild04,35,369,0 duplicate(ach_treasure#core) #yuno_ach5::120056 HIDDEN_WARP_NPC,5,5
+yuno_fild06,262,220,0 duplicate(ach_treasure#core) #yuno_ach6::120057 HIDDEN_WARP_NPC,5,5
+yuno_fild07,113,339,0 duplicate(ach_treasure#core) #yuno_ach7::120058 HIDDEN_WARP_NPC,5,5
+yuno_fild08,179,209,0 duplicate(ach_treasure#core) #yuno_ach8::120059 HIDDEN_WARP_NPC,5,5
+yuno_fild09,166,228,0 duplicate(ach_treasure#core) #yuno_ach9::120060 HIDDEN_WARP_NPC,5,5
+yuno_fild11,141,357,0 duplicate(ach_treasure#core) #yuno_ach10::120061 HIDDEN_WARP_NPC,5,5
+
+// If the feature is turned off these NPCs are useless
+- script AchievementInit -1,{
+ end;
+
+OnInit:
+ if( !getbattleflag( "feature.achievement" ) ){
+ unloadnpc "ach_treasure#core";
+ }
+ end;
+}
diff --git a/npc/re/other/adven_boards.txt b/npc/re/other/adven_boards.txt
index 79d6bb37948..73b0679a00f 100644
--- a/npc/re/other/adven_boards.txt
+++ b/npc/re/other/adven_boards.txt
@@ -2490,7 +2490,7 @@ tha_t01,142,78,0 script Guide#Thanatos1 CLEAR_NPC,{
next;
mes "[Public Announcement]";
mes "Please don't touch it. Only those that have a contract with '^0000FFRenkenber^000000' can progress.";
- emotion 23;
+ emotion ET_HUK;
close;
}
mes "Thanatos Tower is comprised of 12 floors, but only 3 floors are open to the public. If you wish to progress, you must have signed a contract with'^0000FFRenkenber^000000'.";
diff --git a/npc/re/other/dimensional_gap.txt b/npc/re/other/dimensional_gap.txt
index 22263628d76..6b9e5f4b9bd 100644
--- a/npc/re/other/dimensional_gap.txt
+++ b/npc/re/other/dimensional_gap.txt
@@ -172,7 +172,7 @@ OnTimer18000:
npctalk "I just saw a street trader passing by... Where is he?", "Party Member#GUILL";
end;
OnTimer19500:
- emotion e_yawn, 0, "Party Member#SURA";
+ emotion ET_SLEEPY, getnpcid(0, "Party Member#SURA");
npctalk "Huh? What is this? You still haven't entered?", "Party Member#SURA";
end;
OnTimer20000:
@@ -186,7 +186,7 @@ OnTimer22500:
npctalk "Are you awake?", "Party Member#SHADOW";
end;
OnTimer24000:
- emotion e_an, 0, "Party Member#SURA";
+ emotion ET_FRET, getnpcid(0, "Party Member#SURA");
npctalk "Why are you still here?", "Party Member#SURA";
end;
OnTimer24500:
@@ -211,18 +211,18 @@ OnTimer32000:
npctalk "Cough~ Cough~", "Party Member#EINOLD";
end;
OnTimer33000:
- emotion e_an, 0, "Party Member#SURA";
+ emotion ET_FRET, getnpcid(0, "Party Member#SURA");
end;
OnTimer34000:
npctalk "Damn! I am pissed off! I came here because I heard only a party is allowed to get in!", "Party Member#SURA";
end;
OnTimer36000:
npctalk "Are you going to hit me? Do it!", "Party Member#MONK";
- emotion e_ag, 0, "Party Member#MONK";
+ emotion ET_ANGER, getnpcid(0, "Party Member#MONK");
npctalk "You pay for your food.", "Party Member#CRU";
end;
OnTimer37500:
- emotion e_an, 0, "Party Member#SURA";
+ emotion ET_FRET, getnpcid(0, "Party Member#SURA");
end;
OnTimer39000:
npctalk "Whatever, I'm not eating.", "Party Member#WANDERER";
@@ -230,22 +230,22 @@ OnTimer39000:
npctalk "Right.. I should have entered with another group!", "Party Member#SHADOW";
end;
OnTimer40500:
- emotion e_gg, 0, "Party Member#CRU::OnChat24";
+ emotion ET_KIK, getnpcid(0, "Party Member#CRU::OnChat24");
npctalk "Hey. Are you pissed off?", "Party Member#CRU::OnChat24";
end;
OnTimer42000:
npctalk "Not at all.", "Party Member#GUILL";
end;
OnTimer43500:
- emotion e_gg, 0, "Party Member#MONK";
+ emotion ET_KIK, getnpcid(0, "Party Member#MONK");
npctalk "Look at him snoozing. Hehe.", "Party Member#MONK";
end;
OnTimer45000:
- emotion e_yawn, 0, "Party Member#SURA";
+ emotion ET_SLEEPY, getnpcid(0, "Party Member#SURA");
npctalk "Bah, I don't care. I'm gonna take a nap, so wake me up when we're ready.";
end;
OnTimer46500:
- emotion e_gg, 0, "Party Member#CRU";
+ emotion ET_KIK, getnpcid(0, "Party Member#CRU");
npctalk "You are upset!!", "Party Member#CRU";
npctalk "Can I get back before I die...", "Party Member#WANDERER";
npctalk "What? You, we gotta talk! I've been too nice to you!", "Party Member#EINOLD";
@@ -254,12 +254,12 @@ OnTimer48000:
npctalk "Excuse me..... everyone.............?", "Party Leader#dali2";
end;
OnTimer49500:
- emotion e_ag, 0, "Party Member#GUILL";
+ emotion ET_ANGER, getnpcid(0, "Party Member#GUILL");
npctalk "No!!!!!!!!!", "Party Member#GUILL";
npctalk "Whatever~", "Party Member#MONK";
end;
OnTimer51000:
- emotion e_sob, 0, "Party Leader#dali2";
+ emotion ET_CRY, getnpcid(0, "Party Leader#dali2");
npctalk "Please listen to me....", "Party Leader#dali2";
npctalk "He's angry all right....", "Party Member#WANDERER";
npctalk "Take a nap. I am sleepy too, so we'll take shifts.", "Party Member#SHADOW";
diff --git a/npc/re/quests/eden/26-40.txt b/npc/re/quests/eden/26-40.txt
index a9a511deb2e..fe571f1d33f 100644
--- a/npc/re/quests/eden/26-40.txt
+++ b/npc/re/quests/eden/26-40.txt
@@ -114,7 +114,7 @@ geffen,103,42,5 script Sponiac 99,{
mes "[Sponiac]";
mes "Wow, you must be a beginner, right?";
mes "What an innocent face! Ha~ hahaha.";
- emotion e_gg;
+ emotion ET_KIK;
next;
mes "[Sponiac]";
mes "Why don't you do some hunting outside instead of walking around and wasting your time?";
@@ -667,7 +667,7 @@ L_Reward:
next;
mes "[Dashia]";
mes "Thank you very much. God bless you!";
- emotion e_heh;
+ emotion ET_SMILE;
next;
mes "[Dashia]";
mes "Ha~! Ha~!";
diff --git a/npc/re/quests/eden/91-99.txt b/npc/re/quests/eden/91-99.txt
index 2390fd5b658..df557035583 100644
--- a/npc/re/quests/eden/91-99.txt
+++ b/npc/re/quests/eden/91-99.txt
@@ -154,7 +154,7 @@ moc_para01,48,177,3 script 91-99 Mission Board 857,{
case 2: callsub L_Quest,4193,"Mineral",138000,"�̳�","There is a monster only found in ^8B4513Einbech Dungeon^000000.";
case 3: callsub L_Quest,4194,"Kaho",118000,"īȣī��","There is a monster found in ^8B4513Nogg Road Magma 1^000000.";
case 4: callsub L_Quest,4195,"Neraid",96000,"���̵�ī��","There is a monster only found in ^8B4513Comodo Dungeon^000000.";
- case 5: callsub L_Quest,4196,"Disguise",134000,"������ī��","There is a monster only found in ^8B4513Nifflheim^000000.";
+ case 5: callsub L_Quest,4196,"Disguise",134000,"������ī��","There is a monster only found in ^8B4513Niflheim^000000.";
}
}
end;
diff --git a/npc/re/quests/eden/eden_100_111.txt b/npc/re/quests/eden/eden_100_111.txt
index c76ef11cf29..98238bfaaac 100644
--- a/npc/re/quests/eden/eden_100_111.txt
+++ b/npc/re/quests/eden/eden_100_111.txt
@@ -42,7 +42,7 @@ moc_para01,37,95,5 script Gelkah#1 4_F_GELKA,{
else if (BaseLevel < 111) {
if (para_100lv01 == 0) {
mes "Adventurers!";
- emotion e_heh;
+ emotion ET_SMILE;
next;
cutin "gelca03",2;
mes "[Gelkah]";
@@ -117,7 +117,7 @@ moc_para01,37,95,5 script Gelkah#1 4_F_GELKA,{
cutin "rote01",2;
mes "[Rohtert]";
mes "Hmm...";
- emotion e_pif,0,"Rohtert#12";
+ emotion ET_HNG, getnpcid(0, "Rohtert#12");
next;
cutin "gelca01",2;
mes "[Gelkah]";
@@ -199,7 +199,7 @@ moc_para01,37,95,5 script Gelkah#1 4_F_GELKA,{
}
else if (checkquest(13005,HUNTING) == 2) {
mes "You did a great job.";
- emotion e_no1;
+ emotion ET_BEST;
callsub S_Quest,13005,13006,106000,148000;
}
else {
@@ -521,7 +521,7 @@ moc_para01,37,95,5 script Gelkah#1 4_F_GELKA,{
case 5:
mes "Here is a list of other requests from all over Rune Midgard.";
next;
- switch( select( "Loli Ruri Hunting - Nifflheim", "Medusa Hunting - Comodo", "Anubis Hunting - Sphinx" ) ) {
+ switch( select( "Loli Ruri Hunting - Niflheim", "Medusa Hunting - Comodo", "Anubis Hunting - Sphinx" ) ) {
mes "[Gelkah]";
case 1:
if (checkquest(13041,PLAYTIME) == 0)
@@ -534,7 +534,7 @@ moc_para01,37,95,5 script Gelkah#1 4_F_GELKA,{
mes "I wonder why they are scheming this kind of ^FF0000nonsense^000000... makes me wonder if they even know anything about adventuring.";
next;
mes "[Gelkah]";
- mes "We should accept this simple request before we start getting even more nonsense ones. Please clear ^FF000030 Loli Ruri^000000 in Nifflheim.";
+ mes "We should accept this simple request before we start getting even more nonsense ones. Please clear ^FF000030 Loli Ruri^000000 in Niflheim.";
next;
cutin "gelca02",2;
mes "[Gelkah]";
@@ -553,7 +553,7 @@ moc_para01,37,95,5 script Gelkah#1 4_F_GELKA,{
mes "They said that they would heal Eden Group adventurers who are exhausted in exchange for the request but we're not sure they'll follow through.";
next;
mes "[Gelkah]";
- mes "We should accept the simple request anyways. Please clear ^FF000030 Loli Ruri^000000 in Nifflheim.";
+ mes "We should accept the simple request anyways. Please clear ^FF000030 Loli Ruri^000000 in Niflheim.";
callsub S_Quest,13041,13040;
}
break;
@@ -679,7 +679,7 @@ moc_para01,37,95,5 script Gelkah#1 4_F_GELKA,{
next;
mes "[Gelkah]";
mes "He was almost crying when I first met him. It was difficult to pretend to lose to him. Please keep it a secret.";
- emotion e_heh;
+ emotion ET_SMILE;
break;
case 2:
if (Sex == SEX_MALE)
@@ -690,7 +690,7 @@ moc_para01,37,95,5 script Gelkah#1 4_F_GELKA,{
case 3:
cutin "gelca04",2;
mes "Oh no... Please don't do that. I am sorry please keep it as a secret to a master. I was careless.";
- emotion e_shy;
+ emotion ET_SHY;
break;
}
next;
@@ -719,7 +719,7 @@ moc_para01,37,95,5 script Gelkah#1 4_F_GELKA,{
cutin "gelca02",2;
mes "[Gelkah]";
mes "I am sorry... It must be popular only in our village. Throw, heat and let it fly it.";
- emotion e_sry;
+ emotion ET_SORRY;
next;
}
cutin "gelca01",2;
@@ -824,8 +824,8 @@ moc_para01,37,95,5 script Gelkah#1 4_F_GELKA,{
mes "One time, master and I went to the cave west of Comodo and when we saw the Medusa monster...";
next;
mes "Oh boy the look on his face was priceless!";
- emotion e_lv2;
- emotion e_dots,1;
+ emotion ET_BIGTHROB;
+ emotion ET_THINK, playerattached();
.@exp = 180000;
.@jexp = 168000;
}
@@ -853,7 +853,7 @@ moc_para01,37,95,5 script Gelkah#1 4_F_GELKA,{
mes "Once I found a secret route to get to Jawaii... It's only for couples but some of us know how to get there still.";
next;
mes "Kind of useless to be there without a partner but oh well.";
- emotion e_lv;
+ emotion ET_THROB;
.@exp = 550000;
.@jexp = 340000;
}
@@ -1165,7 +1165,7 @@ moc_para01,41,95,5 script Rohtert#12 4_M_ROTERT,{
cutin "rote04",2;
mes "[Rohtert]";
mes "Yeah yeah potato po-tah-toh!";
- emotion e_pif;
+ emotion ET_HNG;
next;
cutin "gelca02",2;
mes "[^FF0000Gelkah^000000]";
@@ -1174,7 +1174,7 @@ moc_para01,41,95,5 script Rohtert#12 4_M_ROTERT,{
cutin "rote04",2;
mes "[Rohtert]";
mes "We realized when we faced the eyes of the beast that it looked like a lion but it isn't any normal animal.";
- emotion e_pif;
+ emotion ET_HNG;
next;
mes "[Rohtert]";
mes "^8008F8I knew that it was kill or be killed.^000000";
diff --git a/npc/re/quests/eden/eden_111_120.txt b/npc/re/quests/eden/eden_111_120.txt
index e73ca43e6f6..d4a1ff54fe7 100644
--- a/npc/re/quests/eden/eden_111_120.txt
+++ b/npc/re/quests/eden/eden_111_120.txt
@@ -25,7 +25,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{
else if (para_110lv01 == 0) {
cutin "min02",0;
mes "......";
- emotion e_dot;
+ emotion ET_THINK;
next;
mes "[Mingmin]";
mes "(Wow...)";
@@ -43,17 +43,17 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{
next;
mes "["+ strcharinfo(0) +"]";
mes "(What's this lady talking about?)";
- emotion e_dot,1;
+ emotion ET_THINK, playerattached();
next;
mes "[Mingmin]";
mes "Answer me!";
mes "Art thou my servant?";
- emotion e_dot;
+ emotion ET_THINK;
next;
select( "I am not.", "You be trippin'?" );
mes "[Mingmin]";
mes "Thou art not? Splendid...because I deigned that any servant of mine would have more dignity.";
- emotion e_sigh;
+ emotion ET_OHNO;
next;
mes "[Mingmin]";
mes "Well, non-servant...What are you looking for here?";
@@ -61,7 +61,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{
if (select( "Nothing in particular.", "Quests! Who are you?" ) == 1) {
mes "[Mingmin]";
mes "That is acceptable, I hope ye find what ye seek.";
- emotion e_ok;
+ emotion ET_OK;
}
else {
mes "[Mingmin]";
@@ -85,11 +85,11 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{
select("No~ I'm "+ strcharinfo(0) +" remember?");
mes "[Mingmin]";
mes "Oh I have met you before, living in a house full of fungus seems to cause memory loss.";
- emotion e_gasp;
+ emotion ET_SURPRISE;
next;
mes "[Mingmin]";
mes "Who were you again?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
select("Eden Group requests and research");
mes "[Mingmin]";
@@ -112,7 +112,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{
next;
mes "[Mingmin]";
mes "Well, after all this talking I need to take a rest. My feet are rather tired.";
- emotion e_yawn;
+ emotion ET_SLEEPY;
para_110lv01 = 2;
}
else if (para_110lv01 == 2) {
@@ -131,7 +131,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{
select("Sounds dangerous... when can I start?");
mes "[Mingmin]";
mes "Talk to me in a second and we'll get going.";
- emotion e_yawn;
+ emotion ET_SLEEPY;
para_110lv01 = 3;
}
else if (para_110lv01 == 3) {
@@ -142,7 +142,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{
mes "[Mingmin]";
mes "Oh...sorry, I meant squire...";
mes "I mean adventurer...";
- emotion e_gasp;
+ emotion ET_SURPRISE;
next;
mes "[Mingmin]";
mes "Sorry, the fungus in my home has been getting quite rampant.";
@@ -173,7 +173,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{
cutin "min02",0;
mes "[Mingmin]";
mes " For some reason there aren't many people lining up to assist me yet.";
- emotion e_dot,1;
+ emotion ET_THINK, playerattached();
next;
mes "[Mingmin]";
mes "I think it requires ^ff0000bravery^000000 to take a new request.";
@@ -218,19 +218,19 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{
while(select( "Make a heart with two hands.", "Dance around like a crazy person", "Wink at her", "Whistle at her." ) != 2) {
mes "[Mingmin]";
mes "What's that for?";
- emotion e_hmm;
+ emotion ET_SCRATCH;
next;
mes "Hmm, she didn't go for that.";
next;
}
mes "[Mingmin]";
mes "This signal!?";
- emotion e_flash;
+ emotion ET_SPARK;
next;
cutin "min01",0;
mes "[Mingmin]";
mes "^FF0000..................now?^000000";
- emotion e_flash;
+ emotion ET_SPARK;
next;
select("Say nothing and nod...");
mes "[Mingmin]";
@@ -279,7 +279,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{
cutin "min03",0;
mes "[Mingmin]";
mes "Haha! I feel much better now.";
- emotion e_loud;
+ emotion ET_BLABLA;
next;
mes "[Mingmin]";
mes "Thank you for accepting the strange contract. Looking forward to working with thee.";
@@ -415,7 +415,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{
if (select( "Take the request.", "Quit" ) == 1) {
mes "[Mingmin]";
mes "Please tell me the story after dealing with them one by one. They will be important documents...";
- emotion e_no1;
+ emotion ET_BEST;
callsub S_Quest,13072,13071;
}
}
@@ -456,7 +456,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{
if (select( "Take the request.", "Quit" ) == 1) {
mes "[Mingmin]";
mes "If you possibly get a good drop from them, you know right? Do not forget about me!";
- emotion e_flash;
+ emotion ET_SPARK;
callsub S_Quest,13074,13073;
}
}
@@ -674,7 +674,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{
cutin "��Ƽ�䵥����ī��",3; //centipede_larva_card
mes "Oh... No Lets take a deep breath. For me, I want to exterminate more than 20 for research.";
next;
- emotion e_sob;
+ emotion ET_CRY;
mes "[Mingmin]";
mes "Be careful. And they're east of the expedition station.";
cutin "min02",0;
@@ -682,7 +682,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{
else if (checkquest(13087,HUNTING) == 2) {
cutin "min02",0;
mes "Oh. Okay. You do not need to explain.";
- emotion e_otl;
+ emotion ET_OTL;
callsub S_Quest,13087,13088,700000,180000;
}
else {
@@ -738,7 +738,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{
if (countitem(6023) > 19) {// Mystic_Horn
cutin "min03",0;
mes "Yes this one! It is worth doing. Thank you for taking this request.";
- emotion e_thx;
+ emotion ET_THANKS;
delitem 6023,20;
callsub S_Quest,13091,13092,700000,180000;
}
@@ -851,7 +851,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{
else if (checkquest(13097,HUNTING) == 2) {
cutin "min03",0;
mes "You are not confused? I still do not know yet. What is the difference? Anyway good job.";
- emotion e_loud;
+ emotion ET_BLABLA;
callsub S_Quest,13097,13098,700000,300000;
}
else {
@@ -879,7 +879,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{
if (countitem(7094) > 9 && countitem(7317) > 19) {
cutin "min03",0;
mes "Thank you. You will appreciate me if my research is completed.";
- emotion e_loud;
+ emotion ET_BLABLA;
delitem 7094,10;// Mystery_Piece
delitem 7317,20;// Screw
callsub S_Quest,13099,13100,700000,200000;
@@ -954,7 +954,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{
cutin "min03",0;
mes "[Mingmin]";
mes "Do not worry, I will treat you like a slave if we meet outside of Eden Group or if you tell anyone I was nice to you.";
- emotion e_loud;
+ emotion ET_BLABLA;
next;
cutin "min01",0;
mes "[Mingmin]";
@@ -1056,7 +1056,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{
cutin "min03",0;
mes "[Mingmin]";
mes "...hee hee...";
- emotion e_heh;
+ emotion ET_SMILE;
next;
mes "[Mingmin]";
mes "Hmmph, You are so naive. Did you believe it? Sticky.. some kind of mushroom is growing in your body? Hahaha";
@@ -1067,7 +1067,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{
mes "[Mingmin]";
mes "I am sorry if you are upset. You made it too easy...";
next;
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Mingmin]";
mes "You are funnier than I thought. Do not worry. That mushroom does not exist.";
}
diff --git a/npc/re/quests/eden/eden_121_130.txt b/npc/re/quests/eden/eden_121_130.txt
index ac08c6b4ff0..213281c1b23 100644
--- a/npc/re/quests/eden/eden_121_130.txt
+++ b/npc/re/quests/eden/eden_121_130.txt
@@ -191,7 +191,7 @@ moc_para01,44,81,3 script Melody-Jack#1 4_M_MELODY,8,8,{
if (select( "Take the request.", "Stop." ) == 1) {
mes "[Melody-Jack]";
mes "Dying flowers fall down by rain and wind. That is what you have to do.";
- emotion e_no1;
+ emotion ET_BEST;
callsub S_Quest,13124,13123;
}
}
@@ -264,7 +264,7 @@ moc_para01,44,81,3 script Melody-Jack#1 4_M_MELODY,8,8,{
if (select( "Take the request.", "Stop." ) == 1) {
mes "[Melody-Jack]";
mes "Clear all as quickly as you can.";
- emotion e_flash;
+ emotion ET_SPARK;
callsub S_Quest,13128,13127;
}
}
@@ -554,7 +554,7 @@ S_Erasequest:
return;
OnTouch_:
if (para_120lv01 == 1) {
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Melody-Jack]";
mes "Hey there! ... Wait.?";
close;
diff --git a/npc/re/quests/eden/eden_131_140.txt b/npc/re/quests/eden/eden_131_140.txt
index aa11618f5bd..a57bced8ed0 100644
--- a/npc/re/quests/eden/eden_131_140.txt
+++ b/npc/re/quests/eden/eden_131_140.txt
@@ -148,7 +148,7 @@ moc_para01,41,76,3 script Ragi#1 4_M_RAGI,{
if (select( "Take the request", "Quit." ) == 1) {
mes "[Ragi]";
mes "It will be more dangerous than you think. But the story must be conveyed.";
- emotion e_no1;
+ emotion ET_BEST;
callsub S_Quest,13148,13147;
}
}
@@ -287,7 +287,7 @@ moc_para01,41,76,3 script Ragi#1 4_M_RAGI,{
if (select( "Take the request", "Quit." ) == 1) {
mes "[Ragi]";
mes "Be sure to get at least 30 Angel looking Incarnations of Morocc.";
- emotion e_wah;
+ emotion ET_KEK;
callsub S_Quest,13156,13155;
}
}
diff --git a/npc/re/quests/eden/eden_common.txt b/npc/re/quests/eden/eden_common.txt
index 6e167708d3c..d7133b9d1d7 100644
--- a/npc/re/quests/eden/eden_common.txt
+++ b/npc/re/quests/eden/eden_common.txt
@@ -25,7 +25,7 @@
// Common NPCs :: lv_tre
//============================================================
-moc_para01,27,35,5 script Secretary Lime Evenor 952,{
+moc_para01,27,35,5 script Secretary Lime Evenor 4_F_EDEN_OFFICER,{
if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 2000) {
mes "- Wait a minute !! -";
mes "- Currently you're carrying -";
@@ -96,7 +96,7 @@ moc_para01,27,35,5 script Secretary Lime Evenor 952,{
mes "Your name is ^3131FFBo"+.@input$+"Ba^000000...? Is that right?";
mes "Huh? Isn't it??";
next;
- emotion e_swt;
+ emotion ET_SWEAT;
mes "[Lime Evenor]";
mes "Hmm, that isn't what you wrote?";
mes "Ok, hmm, it seems a bit hard to read.";
@@ -109,7 +109,7 @@ moc_para01,27,35,5 script Secretary Lime Evenor 952,{
mes "Ah~ ha. You are ^3131FF"+strcharinfo(0)+"^000000.";
mes "I got it right this time.";
next;
- emotion e_no1;
+ emotion ET_BEST;
mes "[Lime Evenor]";
mes "We already put your name on the list.";
mes "Welcome to Eden's group new member!";
@@ -168,11 +168,11 @@ moc_para01,27,35,5 script Secretary Lime Evenor 952,{
mes "[Lime Evenor]";
mes "Hum.. huh??..................";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "[Lime Evenor]";
mes "I think you should complete one of our missions first before you take up a new mission.";
next;
- emotion e_pif;
+ emotion ET_HNG;
mes "[Lime Evenor]";
mes "^3131FFClient: Lime Evenor^000000";
mes "^3131FFMission: Practice your handwriting for one month.^000000";
@@ -274,6 +274,7 @@ izlude_c,131,148,4 duplicate(eto) Eden Teleport Officer#30::eto_iz_c 729
izlude_d,131,148,4 duplicate(eto) Eden Teleport Officer#30::eto_iz_d 729
umbala,105,158,3 duplicate(eto) Eden Teleport Officer#31 729
malaya,238,206,6 duplicate(eto) Eden Teleport Officer#32 729
+verus04,116,243,0 duplicate(eto) Eden Teleport Officer#33 729
moc_para01,30,10,0 script #eden_out 45,1,1,{
OnTouch:
@@ -310,6 +311,7 @@ OnTouch:
case 30: warp "izlude",134,118; end; // Old coordinates: (127,142)
case 31: warp "umbala",94,154; end;
case 32: warp "malaya",234,199; end;
+ case 33: warp "verus04",115,243; end;
default: warp "prontera",116,72; end;
}
end;
@@ -357,16 +359,16 @@ moc_para01,182,48,3 script Eden's Chief#eden 886,{
mes "[Eden's Chief]";
mes ""+.@eggf+".. "+.@eggf_1+"... "+.@eggf_2+".... "+.@eggf_6+"..?";
next;
- emotion e_sob;
+ emotion ET_CRY;
mes "[Eden's Chief]";
mes "Oh, Shoot! How many eggs have I done?";
mes "Aww!!! I totally forgot! I have to count again!";
next;
- emotion e_sob;
+ emotion ET_CRY;
mes "[Eden's Chief]";
mes "Why have you asked me to do this? What kind of mission is that?";
next;
- emotion e_sob;
+ emotion ET_CRY;
mes "[Eden's Chief]";
mes "What are you going to with all of those fried eggs? I am sure you can't eat all of them. You just want to bother me, right?";
close;
@@ -402,7 +404,7 @@ moc_para01,20,35,5 script Office Assistant Neede 814,{
mes "[Neede]";
mes "And, do you see the ^3131FFgymnasium^000000 on the cross of ^3131FFthe north side of the lobby^000000? They always shout when they exercise, I can even hear them from here!";
next;
- emotion e_ag;
+ emotion ET_ANGER;
mes "[Neede]";
mes "Besides, the weird girl from ^3131FFthe second floor^000000 is crying all the time. Her cries drive me crazy.";
next;
@@ -412,20 +414,20 @@ moc_para01,20,35,5 script Office Assistant Neede 814,{
mes "[Neede]";
mes "I don't know what she has been up to. But she cries and shouts all the time. Oh, sometimes I hear 'Bang!', loud booming sounds... I don't know where it came from.";
next;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Neede]";
mes "Wait!";
mes "Shh! It is a secret, you can't tell anybody!";
next;
mes "[Neede]";
- emotion e_sigh;
+ emotion ET_OHNO;
mes "I don't trust Evenor. She never shows her feelings... she's going to snitch on me to my boss.";
next;
- emotion e_pif,0,"Secretary Lime Evenor";
+ emotion ET_HNG, getnpcid(0, "Secretary Lime Evenor");
mes "[Lime Evenor]";
mes "I am not that kind of guy.";
next;
- emotion e_wah;
+ emotion ET_KEK;
mes "[Neede]";
mes "Huh? Did you hear that? Gosh~!";
close;
diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt
index 3e85cfb3ef9..3904ed09595 100644
--- a/npc/re/quests/eden/eden_iro.txt
+++ b/npc/re/quests/eden/eden_iro.txt
@@ -30,7 +30,7 @@ moc_para01,14,32,5 script Aperture#acolytewarp 90,{
mes "[Aperture]";
mes "I am the one and only Acolyte that has attained the Level 10 Warp Portal skill!";
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
next;
mes "[Aperture]";
mes "That's right! And...";
diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt
index 8d773e6daff..04ede672e7c 100644
--- a/npc/re/quests/eden/eden_quests.txt
+++ b/npc/re/quests/eden/eden_quests.txt
@@ -4116,6 +4116,8 @@ moc_para01,112,79,3 script Weapons Expert BK#2nd11 4_M_REPAIR,{
1831, // P_Knuckle1
13310, // P_Huuma_Shuriken1
26101; // P_Foxtail III
+ .@wplist_size = getarraysize(.@wplist);
+
.@menu$ = "Eden Group Slayer III:" +
"Eden Group Saber III:" +
"Eden Group Dagger III:" +
@@ -4253,7 +4255,7 @@ moc_para01,112,79,3 script Weapons Expert BK#2nd11 4_M_REPAIR,{
setarray .@arg[0],4805,4805,161;// Heal_Amount2
}
mes "[BK]";
- for ( .@i = 0; .@i < 15; .@i++ ) {
+ for ( .@i = 0; .@i < .@wplist_size; .@i++ ) {
if (countitem(.@wplist[.@i]) > 0) {
if (.@arg[0] == 4805)
mes "Good. Your weapon will now increase Heal effectiveness.";
diff --git a/npc/re/quests/homun_s.txt b/npc/re/quests/homun_s.txt
index b0a577ea9b7..0b370318077 100644
--- a/npc/re/quests/homun_s.txt
+++ b/npc/re/quests/homun_s.txt
@@ -43,7 +43,7 @@ job3_gen01,12,44,3 script Viorel#job3_gen01 542,{
}
enable_items;
} else if (Class == Job_Novice_High || Class == Job_Merchant_High || Class == Job_Alchemist || Class == Job_Creator) {
- emotion e_what;
+ emotion ET_QUESTION;
mes "[Viorel]";
mes "I don't know what's going on, but the way I remember it you were supposed to be qualified to research ^FF4800Homunculus^000000.";
next;
@@ -164,21 +164,21 @@ job3_gen01,12,44,3 script Viorel#job3_gen01 542,{
next;
switch(select("Nope. Good bye.:Please, I'm busy.:That's exactly what I wanted to hear.:Why are you always standing there?")) {
case 1:
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Viorel]";
mes "Okay.";
mes "Good seeing you.";
mes "Good bye then~!";
close;
case 2:
- emotion e_omg;
+ emotion ET_HUK;
mes "[Viorel]";
mes "!!!!";
mes "I... I see.";
mes "I thought you were here to see me.";
close;
case 3:
- emotion e_ic;
+ emotion ET_AHA;
mes "[Viorel]";
mes "Just as I thought.";
mes "Let's have a look at the notes my dear friend Jeyna left.";
@@ -193,7 +193,7 @@ job3_gen01,12,44,3 script Viorel#job3_gen01 542,{
playbgm "08.mp3"; // Theme of Prontera
end;
case 4:
- emotion e_swt;
+ emotion ET_SWEAT;
mes "[Viorel]";
mes "No, I do not stand here every day.";
mes "But why do YOU stand there every day?";
@@ -242,7 +242,7 @@ job3_gen01,12,44,3 script Viorel#job3_gen01 542,{
mes "Now, if you'll excuse me~!";
close;
case 3:
- emotion e_swt;
+ emotion ET_SWEAT;
mes "[Viorel]";
mes "What, is it so strange to see an Alchemist in their own lab?";
mes "How so?";
@@ -261,7 +261,7 @@ L_CheckHomunculus:
mes " ";
mes "(Seems to be thinking about something.)";
next;
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Viorel]";
mes "Ha ha~";
mes "I think I've mistaken you for someone else.";
@@ -273,7 +273,7 @@ L_CheckHomunculus:
que_house_s,24,47,3 script Viorel#homun_s 542,{
if (checkquest(4155) > -1) {
- emotion e_dum;
+ emotion ET_HUM;
mes "[Viorel]";
mes "Good.";
mes "I see that you mean business.";
@@ -292,7 +292,7 @@ que_house_s,24,47,3 script Viorel#homun_s 542,{
next;
switch(select("Like, biological experiments...?!:Well, yeah, naturally.:I don't want to hurt my Homunculus!")) {
case 1:
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
mes "[Viorel]";
mes "Don't look so surprised.";
mes "Ethics in biology are kind of blurry right now, right?";
@@ -306,7 +306,7 @@ que_house_s,24,47,3 script Viorel#homun_s 542,{
next;
break;
case 2:
- emotion e_sigh;
+ emotion ET_OHNO;
mes "[Viorel]";
mes "Yes.";
mes "I'm glad you're not upset.";
@@ -323,7 +323,7 @@ que_house_s,24,47,3 script Viorel#homun_s 542,{
next;
break;
case 3:
- emotion e_swt;
+ emotion ET_SWEAT;
mes "[Viorel]";
mes "I understand your concern.";
mes "But I want to assure you that this Mutation does not harm or hurt your ^FF4800Homunculus^000000.";
@@ -356,14 +356,14 @@ que_house_s,24,47,3 script Viorel#homun_s 542,{
mes "^006400The truth is not in a single form~!^000000";
mes "Ha ha.";
next;
- emotion e_flash;
+ emotion ET_SPARK;
mes "[Viorel]";
mes "I know it's a little abrupt, but...";
mes "How about changing your ^FF4800Homunculus^000000 into something incredible with my marvelous achievement, the ^006400Homunculus Mutation System^000000?";
next;
switch(select("Explore the ^006400Homunculus Mutation System^000000.:Cancel.")) {
case 1:
- emotion e_no1;
+ emotion ET_BEST;
mes "[Viorel]";
mes "Good choice.";
mes "Success lurks outside the box of conventional thinking, right?";
@@ -378,7 +378,7 @@ que_house_s,24,47,3 script Viorel#homun_s 542,{
warp "que_house_s",63,41;
end;
case 2:
- emotion e_dots;
+ emotion ET_THINK;
mes "[Viorel]";
mes "I don't see why you hesitate.";
mes "I am not trying to deceive you.";
@@ -390,7 +390,7 @@ que_house_s,24,47,3 script Viorel#homun_s 542,{
mes "We'll talk in a bit then.";
close;
case 2:
- emotion e_otl;
+ emotion ET_OTL;
mes "[Viorel]";
mes "Shame.";
mes "However, I respect your opinion.";
@@ -457,7 +457,7 @@ que_house_s,24,47,3 script Viorel#homun_s 542,{
end;
}
}
- emotion e_no1;
+ emotion ET_BEST;
playbgm "19.mp3"; // Under the Ground
mes "[Viorel]";
mes "Good choice.";
@@ -516,7 +516,7 @@ que_house_s,24,47,3 script Viorel#homun_s 542,{
hommutate .@Homunculus;
break;
case 2:
- emotion e_hmm;
+ emotion ET_SCRATCH;
mes "[Viorel]";
mes "So, your choice is the Unstable Mutation Process.";
mes "You believe in destiny?";
@@ -531,14 +531,14 @@ que_house_s,24,47,3 script Viorel#homun_s 542,{
mes "Give it more time to think.";
close;
}
- emotion e_dots;
+ emotion ET_THINK;
mes "[Viorel]";
mes "Hmm...";
mes "The exploration of knowledge";
mes "is full of surprises.";
mes ".......";
next;
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Viorel]";
mes "Ha ha.";
mes "Hey, I feel like a Blacksmith!";
@@ -564,7 +564,7 @@ que_house_s,24,47,3 script Viorel#homun_s 542,{
}
erasequest 4160;
erasequest 4154;
- emotion e_ho;
+ emotion ET_DELIGHT;
playbgm "64.mp3"; // One Fine Day
mes "[Viorel]";
mes "Okay, Mutation Complete.";
@@ -609,12 +609,12 @@ que_house_s,24,47,3 script Viorel#homun_s 542,{
que_house_s,80,42,3 script Jeyna#homun_s 558,{
if (checkquest(4156) > -1) {
playbgm "28.mp3"; // You're in Ruins
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Jeyna]";
mes "Welcome.";
mes "I just got word from ^005DFFViorel^000000 that you were coming.";
next;
- emotion e_hmm;
+ emotion ET_SCRATCH;
mes "[Jeyna]";
mes "By the way...";
mes "Did he convince you to do something...?";
@@ -622,13 +622,13 @@ que_house_s,80,42,3 script Jeyna#homun_s 558,{
next;
mes "[Jeyna]";
mes "He needs them because Alchemists are such awkward people.";
- emotion e_sigh;
+ emotion ET_OHNO;
next;
mes "[Jeyna]";
mes "Anyways~";
mes "^0000FF"+strcharinfo(0)+"^000000 and ^005DFFViorel^000000 seem like two peas in a pod.";
next;
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Jeyna]";
mes "Hahaha~ No offense.";
mes "I think it's a good thing.";
@@ -640,11 +640,11 @@ que_house_s,80,42,3 script Jeyna#homun_s 558,{
mes "why don't you take a look at that board?";
mes "The ^006400Homunculus Mutation System^000000 has ^0000FF5 different types^000000 of new mutations.";
next;
- emotion e_gasp,0,"Magic Board#homun_s";
+ emotion ET_SURPRISE, getnpcid(0, "Magic Board#homun_s");
mes "[Jeyna]";
mes "Your ^FF4800Homunculus^000000 can mutate into any of the 5 different forms.";
next;
- emotion e_ic;
+ emotion ET_AHA;
mes "[Jeyna]";
mes "Let's see...";
mes "The ^006400Homunculus Mutation System^000000 includes new evolutions of the normal ^0000FFHomunculus^000000.";
@@ -656,7 +656,7 @@ que_house_s,80,42,3 script Jeyna#homun_s 558,{
mes "skills such as Caprice will be";
mes "^006400retained and usable even after Mutation^000000.";
next;
- emotion e_gasp,0,"Magic Board#homun_s";
+ emotion ET_SURPRISE, getnpcid(0, "Magic Board#homun_s");
mes "[Jeyna]";
mes "Take a look at the Magic Board behind me and decide for yourself.";
close2;
@@ -664,11 +664,11 @@ que_house_s,80,42,3 script Jeyna#homun_s 558,{
erasequest 4156;
end;
} else if (checkquest(4157) > -1) {
- emotion e_what;
+ emotion ET_QUESTION;
mes "[Jeyna]";
mes "Take a look at the board behind me, on the right.";
close2;
- emotion e_gasp,0,"Magic Board#homun_s";
+ emotion ET_SURPRISE, getnpcid(0, "Magic Board#homun_s");
end;
} else if (checkquest(4158) > -1) {
playbgm "28.mp3"; // You're in Ruins
@@ -720,7 +720,7 @@ que_house_s,80,42,3 script Jeyna#homun_s 558,{
mes "Come back after you've done that.";
close;
}
- emotion e_no1;
+ emotion ET_BEST;
mes "[Jeyna]";
mes "Good thinking.";
mes "It is unacceptable for Alchemists like us to fear challenge.";
@@ -748,12 +748,12 @@ que_house_s,80,42,3 script Jeyna#homun_s 558,{
morphembryo;
setquest 4159;
erasequest 4158;
- emotion e_ho;
+ emotion ET_DELIGHT;
mes "[Jeyna]";
mes "Phew~ All done.";
mes "Hmm, its state is a little strange.";
next;
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Jeyna]";
mes "I guess it'll be just fine.";
mes "Don't lose that ^0000FFStrange Embryo^000000.";
@@ -769,7 +769,7 @@ que_house_s,80,42,3 script Jeyna#homun_s 558,{
close;
case 2:
playbgm "28.mp3"; // You're in Ruins
- emotion e_sigh;
+ emotion ET_OHNO;
mes "[Jeyna]";
mes "Maybe I shouldn't have asked in the first place.";
close;
@@ -1315,10 +1315,10 @@ OnInit:
initnpctimer;
end;
OnTimer6000:
- emotion e_gasp;
+ emotion ET_SURPRISE;
end;
OnTimer7000:
- emotion e_gasp,0,"#04homun_s";
+ emotion ET_SURPRISE, getnpcid(0, "#04homun_s");
stopnpctimer;
initnpctimer;
end;
@@ -1335,7 +1335,7 @@ que_house_s,24,46,3 script Jonathan#homun_s 6002,{
}
que_house_s,23,46,3 script #05homun_s 111,{
- emotion e_no,0,"Jonathan#homun_s";
+ emotion ET_STARE_ABOUT, getnpcid(0, "Jonathan#homun_s");
if (gethominfo(1) < 6048 || gethominfo(1) > 6052) { // Not mutated Homunculus-S
mes "[Jonathan]";
mes "Hwang~ Hwang!";
@@ -1350,7 +1350,7 @@ que_house_s,23,46,3 script #05homun_s 111,{
mes "[Jonathan]";
mes "Hwang~?!";
next;
- emotion e_swt2,0,"Jonathan#homun_s";
+ emotion ET_PROFUSELY_SWEAT, getnpcid(0, "Jonathan#homun_s");
mes "[Jonathan]";
mes "*Sniff* ...";
next;
diff --git a/npc/re/quests/newgears/2010_headgears.txt b/npc/re/quests/newgears/2010_headgears.txt
index 63c139f8808..15605ca5ec9 100644
--- a/npc/re/quests/newgears/2010_headgears.txt
+++ b/npc/re/quests/newgears/2010_headgears.txt
@@ -59,7 +59,7 @@ gonryun,149,189,0 script Yotang#Flower_Of_Fairy 50,{
mes "You're speedy!";
mes "You deserve to be a master of the fanclub for the next term.";
next;
- emotion e_swt;
+ emotion ET_SWEAT;
mes "Combining... ... ...";
next;
if (countitem(7165) > 99 && countitem(7166) > 99 && countitem(745) > 0 && countitem(981) > 0 && countitem(2211) > 0) {
@@ -72,7 +72,7 @@ gonryun,149,189,0 script Yotang#Flower_Of_Fairy 50,{
delitem 981,1; //Violet_Dyestuffs
delitem 2211,1; //Bandana
getitem 5437,1; //Flower_Of_Fairy
- emotion e_no1;
+ emotion ET_BEST;
next;
mes "[Yotang]";
mes "See you on the fan meeting!";
@@ -172,7 +172,7 @@ lhz_in02,276,281,1 script Drunken Man#Necktie 748,{
mes "[Drunken Man]";
mes "What... you're weaker than me.";
mes "Go and reach the higher level!";
- emotion e_go;
+ emotion ET_GO;
close;
}
mes "[Drunken Man]";
@@ -200,11 +200,11 @@ lhz_in02,276,281,1 script Drunken Man#Necktie 748,{
mes "Great, wait for a moment!";
next;
mes "Combining... ch...ch... ...";
- emotion e_swt;
+ emotion ET_SWEAT;
next;
mes "[Drunken Man]";
mes "Drunk...drunk.... Zzzzz...";
- emotion e_what,1;
+ emotion ET_QUESTION, playerattached();
next;
if (countitem(978) > 0 && countitem(7151) > 29 && countitem(1059) > 99 && countitem(7217) > 19) {
callsub L_CheckWeight;
@@ -243,7 +243,7 @@ lhz_in02,276,281,1 script Drunken Man#Necktie 748,{
mes "[Drunken Man]";
mes "^FF00001 Cobaltblue Dyestuff, 30 Oil Papers, 100 Fabrics, 20 Spools^000000!";
mes "Hurry! I'll be futzing around with others.";
- emotion e_go;
+ emotion ET_GO;
close;
L_CheckWeight:
@@ -271,7 +271,7 @@ comodo,236,164,0 script Hat Girl#Hair_Brush 69,{
if(select("I still prefer hairbands!:Hat is the best!") == 1) {
mes "[Hat Girl]";
mes "Wear your boring hairband for the whole lifetime!";
- emotion e_pif;
+ emotion ET_HNG;
close;
}
mes "[Hat Girl]";
@@ -292,7 +292,7 @@ comodo,236,164,0 script Hat Girl#Hair_Brush 69,{
if(select("I think the hairband is better...:Yes, please make it!") == 1) {
mes "[Hat Girl]";
mes "Wear your boring hairband for the whole lifetime!";
- emotion e_pif;
+ emotion ET_HNG;
close;
}
callsub L_CheckWeight;
@@ -300,7 +300,7 @@ comodo,236,164,0 script Hat Girl#Hair_Brush 69,{
mes "Okay, I'll do it right away!";
next;
mes "Ch ch ch... combining...ch ch.";
- emotion e_swt2,1;
+ emotion ET_PROFUSELY_SWEAT, playerattached();
next;
mes "[Hat Girl]";
mes "Here, it's done!";
@@ -395,7 +395,7 @@ alberta,151,78,0 script Bebete#Baby_Angel 96,{
callsub L_CheckWeight;
mes "[Bebete]";
mes "Wow, you already know all the materials, angel.";
- emotion e_lv2;
+ emotion ET_BIGTHROB;
next;
mes "[Bebete]";
mes "You're lucky. I have one statue on going.";
@@ -413,7 +413,7 @@ alberta,151,78,0 script Bebete#Baby_Angel 96,{
next;
mes "[Bebete]";
mes "See you again, my angel~!";
- emotion e_thx;
+ emotion ET_THANKS;
next;
mes "[" + strcharinfo(0) + "]";
mes "... ...";
@@ -425,7 +425,7 @@ alberta,151,78,0 script Bebete#Baby_Angel 96,{
mes "[Bebete]";
mes "Hey, I don't see";
mes "any materials in your bag..";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
mes "[Bebete]";
@@ -433,7 +433,7 @@ alberta,151,78,0 script Bebete#Baby_Angel 96,{
next;
mes "[Bebete]";
mes "Wow, the angel!";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Bebete]";
mes "Are you a real angel? Have you been to heaven?";
@@ -444,11 +444,11 @@ alberta,151,78,0 script Bebete#Baby_Angel 96,{
next;
mes "[" + strcharinfo(0) + "]";
mes "There's nothing. Everything is lie!";
- emotion e_gg,1;
+ emotion ET_KIK, playerattached();
next;
mes "[Bebete]";
mes "You're a devil! a monster! an idiot!";
- emotion e_sigh;
+ emotion ET_OHNO;
close;
}
mes "[" + strcharinfo(0) + "]";
@@ -584,7 +584,7 @@ gef_fild07,108,161,4 script Roda Frog#Frog_Cap 1012,1,1,{
next;
mes "[King Froggie VII]";
mes "Thank you so much, " + strcharinfo(0) + ".";
- emotion e_thx;
+ emotion ET_THANKS;
next;
mes "[King Froggie VII]";
mes "By the way, we have another urgent matter. So I would ask you one more help.";
@@ -629,7 +629,7 @@ gef_fild07,108,161,4 script Roda Frog#Frog_Cap 1012,1,1,{
next;
mes "[King Froggie VII]";
mes "You became an example for the young frogs. Thank you again.";
- emotion e_thx;
+ emotion ET_THANKS;
next;
mes "[King Froggie VII]";
mes "Therefore, I'm considering adding your outstanding exploit to our frog's history book. But I need your evidence for your work.";
@@ -782,7 +782,7 @@ gef_fild07,108,161,4 script Roda Frog#Frog_Cap 1012,1,1,{
} else if (hat_2009 == 6) {
mes "[King Froggie VII]";
mes "All the frogs in the world, praise " + strcharinfo(0) + ", our eternal hero!";
- emotion e_thx;
+ emotion ET_THANKS;
close2;
donpcevent "Roda Frog#Frog_Cap::OnDisable";
end;
@@ -820,13 +820,13 @@ OnTouch:
case 2:
donpcevent "Roda Frog#Frog_Cap::OnEnable";
if (hat_2009 > 0) {
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
mes "[" + strcharinfo(0) + "]";
mes "It's so amazing to see";
mes "the frog which transforms itself.";
close;
} else {
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
mes "[" + strcharinfo(0) + "]";
mes "Oh my.. the frog transformed into a child...";
close;
@@ -1078,7 +1078,7 @@ alberta,120,206,3 script Alonie#Solo_Play_Box 787,{
mes "you're the best lonely being!";
next;
mes "[Alonie]";
- emotion e_no1;
+ emotion ET_BEST;
mes "Fight back your tears!";
mes "Huhu, Yapyap!";
completequest 1106;
diff --git a/npc/re/quests/quests_14_3.txt b/npc/re/quests/quests_14_3.txt
new file mode 100644
index 00000000000..130696442e7
--- /dev/null
+++ b/npc/re/quests/quests_14_3.txt
@@ -0,0 +1,1296 @@
+//===== rAthena Script =======================================
+//= Quest NPCs related to episode 14.3
+//===== Description: =========================================
+//= [Walkthrough Conversion]
+//- Dimensional Travel Quest (access to Flame Basin / Flame Cave)
+//- Others NPCs related to ep14.3
+//===== Changelogs: ==========================================
+//= 1.0 First version. [Capuche]
+//============================================================
+
+// Dimensional Travel Quest
+morocc,138,238,4 script Piled Rags#ep14bs 4_M_DIEMAN,{
+ if (checkweight(501,1) == 0 || (MaxWeight - Weight) < 1000) {
+ mes "- You are carrying too many items to proceed with the quest. -";
+ close;
+ }
+ if (BaseLevel < 140) {
+ mes "- There is a pile of dirty rags. -";
+ close;
+ }
+ if (ep14_3_dimensional_travel == 0) {
+ mes "- There is a pile of dirty rags. -";
+ next;
+ if (select( "Leave it.", "Remove it." ) == 1) {
+ mes "- You left the pile of dirty rags where it is. -";
+ close;
+ }
+ mes "[???]";
+ mes "Ugh...";
+ next;
+ mes "- A moan is heard underneath the pile of rags. -";
+ next;
+ if (select( "Run.", "Shake the rags." ) == 1) {
+ mes "- Startled, you ran. -";
+ close;
+ }
+ mes "[" + strcharinfo(0) + "]";
+ mes "Hey,";
+ mes "wake up!";
+ next;
+ mes "[???]";
+ mes "Ugh...";
+ next;
+ mes "[" + strcharinfo(0) + "]";
+ mes "Are you all right?";
+ next;
+ mes "[???]";
+ mes "Ugh...";
+ mes "I n-need food...";
+ mes "I could even eat ^0000FFMonster's Feed^000000. Please...";
+ next;
+ mes "- Again he lost consciousness, exhausted just from talking.";
+ mes "You should feed him ^0000FFMonster's Feed^000000. -";
+ setquest 11349;// Dimensional Travel
+ ep14_3_dimensional_travel = 1;
+ close;
+ }
+ if (ep14_3_dimensional_travel < 3) {
+ if (ep14_3_dimensional_travel == 2)
+ cutin "ep143_tadir.bmp",2;
+ else {
+ if (countitem(528) < 1) {
+ mes "- Again he lost consciousness, exhausted just from talking.";
+ mes "You should feed him ^0000FFMonster's Feed^000000. -";
+ close;
+ }
+ mes "[???]";
+ mes "Ugh...";
+ next;
+ if (select( "Leave it.", "Give Monster's Feed." ) == 1) {
+ mes "[???]";
+ mes "Ugh... H-help...";
+ close;
+ }
+ mes "[???]";
+ mes "Ugh...";
+ mes "Yuck!";
+ cutin "ep143_tadir.bmp",2;
+ delitem 528,1;// Monster's Feed
+ completequest 11349;// Dimensional Travel
+ setquest 11350;// Dimensional Travel
+ ep14_3_dimensional_travel = 2;
+ next;
+ mes "[???]";
+ mes "*Chomp Chomp*";
+ mes "*Barf*";
+ next;
+ mes "[???]";
+ mes "Phew...";
+ next;
+ mes "[" + strcharinfo(0) + "]";
+ mes "Are you all right?";
+ next;
+ mes "[???]";
+ mes "*Retch* Oh, yes, thanks to you.";
+ mes "*Retch*";
+ next;
+ mes "[???]";
+ mes "I thought I was going to die. I'm lucky to be alive.";
+ next;
+ mes "[???]";
+ mes "I've been having nothing but bad luck lately.";
+ next;
+ mes "[???]";
+ mes "I got sucked into some strange place, separated from the rest of my party. The place I arrived was terrible. There was no sign of Human habitation.";
+ next;
+ mes "[???]";
+ mes "It's a miracle that I'm here.";
+ next;
+ mes "[???]";
+ mes "I lucked out.";
+ mes "Still alive.";
+ mes "Hah hah hah!";
+ next;
+ mes "[???]";
+ mes "Oh!";
+ mes "Where are my manners? I forgot to thank you properly.";
+ next;
+ mes "[???]";
+ mes "Thank you";
+ mes "for feeding me, though the feed tasted horrible.";
+ next;
+ mes "[???]";
+ mes "I'm glad I didn't die on the street. The world is still a beautiful place.";
+ mes "I'm moved.";
+ next;
+ mes "[Tamarin]";
+ mes "My name is ^0000FFTamarin^000000.";
+ mes "I'm an adventurer, and no, this isn't my preferred attire.";
+ next;
+ select("Introduce yourself.");
+ mes "[Tamarin]";
+ mes "" + strcharinfo(0) + ", huh? That's a good name.";
+ next;
+ }
+ mes "[Tamarin]";
+ mes "Ah,";
+ mes "I'd better do something before people start asking if I'm homeless.";
+ next;
+ mes "[Tamarin]";
+ mes "Do you know a place where I can wash myself?";
+ next;
+ if (select( "Tell him the place.", "Say you don't know." ) == 2) {
+ mes "[Tamarin]";
+ mes "Water is scarce in the desert, huh?";
+ close3;
+ }
+ mes "[Tamarin]";
+ mes "Ah,";
+ mes "do you mean the ^0000FFoasis near the northwestern sphinx^000000?";
+ next;
+ mes "[Tamarin]";
+ mes "I've been in Morroc, but this is my first time inside the village.";
+ mes "I remember hearing that the place holds special water.";
+ next;
+ mes "[Tamarin]";
+ mes "I feel excited to wash myself with the special water!";
+ mes "I'm going to the oasis now. Could you wait for me?";
+ next;
+ mes "[Tamarin]";
+ mes "It'll take a while before I feel strong again, but at least I can walk on my own.";
+ mes "Hah hah hah!";
+ next;
+ if (select( "Watch him.", "Accompany him." ) == 1) {
+ mes "[Tamarin]";
+ mes "(Braces himself and inhales.)";
+ mes "Wait, wait.";
+ mes "I can stand up on my own.";
+ next;
+ mes "[Tamarin]";
+ mes "Wait, wait!";
+ close3;
+ }
+ mes "[Tamarin]";
+ mes "How kind of you!";
+ mes "The world is still an okay place to live.";
+ next;
+ mes "[Tamarin]";
+ mes "Then, let's go to the ^0000FFoasis near the northwestern sphinx^000000.";
+ erasequest 11350;// Dimensional Travel
+ setquest 11351;// Dimensional Travel
+ ep14_3_dimensional_travel = 3;
+ close3;
+ }
+ if (ep14_3_dimensional_travel == 3) {
+ mes "[Tamarin]";
+ mes "How kind of you!";
+ mes "The world is still an okay place to live.";
+ cutin "ep143_tadir.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "Then, let's go to the ^0000FFoasis near the northwestern sphinx^000000.";
+ close3;
+ }
+ mes "- There is a pile of dirty rags. -";
+ close;
+
+OnInit:
+ questinfo 11349, QTYPE_QUEST, 1;
+ setquestinfo_level 11349,140,175;
+ end;
+}
+
+moc_ruins,106,140,4 script Tamarin#ep14bs_ru 4_M_TAMARIN,{
+ if (ep14_3_dimensional_travel == 3 || ep14_3_dimensional_travel == 4) {
+ if (ep14_3_dimensional_travel == 3) {
+ mes "[Tamarin]";
+ mes "Pah!";
+ mes "This feels great!";
+ cutin "ep143_tasmi.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "The water feels too warm for my liking, but beggars can't be choosers.";
+ cutin "ep143_tasta.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "You saved me from starvation, and took me to this great place. I must have been a great person in the past life";
+ mes "to deserve such kindness.";
+ cutin "ep143_tahuk.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "I want to repay you, fellow adventurer.";
+ mes "I lost all my belongings when I fell into that strange hole and got separated from my party,";
+ cutin "ep143_tasta.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "but at least I can tell you an ^0000FFinteresting story^000000.";
+ cutin "ep143_tasmi.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "It's about the strange place I've been to.";
+ cutin "ep143_tahuk.bmp",2;
+ next;
+ if (select( "Not interested.", "I'm listening." ) == 1) {
+ mes "[Tamarin]";
+ mes "All right, then.";
+ mes "I thought you were serious about adventuring.";
+ cutin "ep143_tahuk.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "Then";
+ mes "do you want your Monster's Feed back?";
+ cutin "ep143_tasta.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "*Retch*";
+ cutin "ep143_taang.bmp",2;
+ close3;
+ }
+ ep14_3_dimensional_travel = 4;
+ mes "[Tamarin]";
+ mes "I knew you'd be interested!";
+ mes "Nothing piques adventurers' interest like the story of a strange place, right?";
+ cutin "ep143_tasmi.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "Ahem.";
+ mes "The story begins with my journey to the ^0000FFOther World^000000, the latest hot spot for adventurers.";
+ cutin "ep143_tahuk.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "Adventurer Tamarin and his party went on a journey to the land of the unknown, Other World.";
+ cutin "ep143_tasmi.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "Their journey was perilous, but they bravely moved forward.";
+ cutin "ep143_taang.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "Oh,";
+ mes "why am I speaking in the third-person perspective?";
+ cutin "ep143_tahuk.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "My original inspiration was Bard, but then I became a Hunter because my friends thought that suited me better.";
+ cutin "ep143_tasmi.bmp",2;
+ next;
+ select("Ask him to be more straightforward.");
+ mes "[Tamarin]";
+ mes "Yes.";
+ cutin "ep143_tahuk.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "A while ago, my friends and I decided to explore the Other World together.";
+ cutin "ep143_tasta.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "Since it'd be our first visit to the Other World, we wanted to go to a more popular spot, but one of us wouldn't have it--he was so excited that he started acting out of control.";
+ cutin "ep143_taang.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "When I came back to my senses, I was alone in a strange place.";
+ cutin "ep143_tahuk.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "The ^0000FFland was burning with perpetual flames^000000 that weren't too hot to touch, and ^0000FFstrange-looking plants and insects^000000 were crawling all over the place.";
+ next;
+ mes "[Tamarin]";
+ mes "At first I yelled for help and moved around hoping to find others, but all to no avail.";
+ next;
+ mes "[Tamarin]";
+ mes "After a few days of having nothing to eat, I started to eat anything I saw off the ground, and I had the worst diarrhea ever.";
+ cutin "ep143_taang.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "I didn't know how many days had passed before I saw a group of some entities that I thought were men at a glance.";
+ cutin "ep143_tahuk.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "But ^0000FFthey looked too strange to pass as human^000000.";
+ mes "I couldn't talk to them, so I just jumped into the Crack that they came through.";
+ next;
+ mes "[Tamarin]";
+ mes "My knees gave way and I rolled on my side. When I looked around, I was back at the ^0000FFDimensional Crack^000000 where my friends and I first arrived.";
+ next;
+ mes "[Tamarin]";
+ mes "I came out through the ^0000FFMorroc Dimensional Teleporter^000000 and used every ounce of my energy to get to Morroc.";
+ next;
+ mes "[Tamarin]";
+ mes "Sigh...";
+ mes "I wonder if my friends are safe.";
+ cutin "ep143_tasta.bmp",2;
+ next;
+ }
+ mes "[Tamarin]";
+ mes "I should seek them out,";
+ mes "but first I want to go back to that strange place when I get my full strength back. Not many people have a chance to see such a special place, you know.";
+ cutin "ep143_tasmi.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "Fortunately for me, with the ^0000FFMorroc restoration work^000000 underway, I shouldn't have a problem making money through some part-time jobs.";
+ next;
+ if (select( "Tell him have safe travel.", "Tell him you want to tag along." ) == 1) {
+ mes "[Tamarin]";
+ mes "I will.";
+ mes "Thank you for saving me.";
+ cutin "ep143_tahuk.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "This is the beauty of adventuring:";
+ mes "making new friends!";
+ cutin "ep143_tasmi.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "I'll be in Morroc for a while, making some money and getting ready for another adventure. I hope I can see you again before I leave.";
+ close3;
+ }
+ mes "[Tamarin]";
+ mes "!!";
+ cutin "ep143_tahuk.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "Do you mean it?";
+ next;
+ mes "[Tamarin]";
+ mes "By the gods I'm a lucky bastard!";
+ mes "*Sob*";
+ cutin "ep143_taang.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "Then meet me at the ^0000FFDimensional Crack^000000. I need to replenish myself first.";
+ cutin "ep143_tasta.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "It may take a while for me to get everything packed, so get your other business done in the meantime.";
+ erasequest 11351;// Dimensional Travel
+ setquest 11352;// Dimensional Travel
+ ep14_3_dimensional_travel = 5;
+ close3;
+ }
+ if (ep14_3_dimensional_travel == 5) {
+ mes "[Tamarin]";
+ mes "Then meet me at the ^0000FFDimensional Crack^000000. I need to replenish myself first.";
+ cutin "ep143_tasta.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "It may take a while for me to get everything packed, so get your other business done in the meantime.";
+ close3;
+ }
+ mes "[Tamarin]";
+ mes "Pah!";
+ mes "This feels great!";
+ cutin "ep143_tasmi.bmp",2;
+ close3;
+}
+
+dali,112,69,4 script Tamarin#ep14bs_cha 4_M_TAMARIN,{
+ if (ep14_3_dimensional_travel == 5) {
+ mes "[Tamarin]";
+ mes "" + strcharinfo(0) + ", over here!";
+ mes "You're early.";
+ cutin "ep143_tasta.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "(Glancing around surreptitiously)";
+ mes "I hope no one's watching us.";
+ cutin "ep143_tahuk.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "I've hidden the opening to that place: I didn't want anyone to get there before me.";
+ cutin "ep143_tasmi.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "At that time, I was too distracted to remember where the opening was, but I think it's definitely ^0000FFsomewhere on the 2nd floor^000000.";
+ cutin "ep143_tasta.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "Meet me in front of the ^0000FFHidden Crack^000000. Make sure no one follows you there.";
+ mes "I've ^0000FFcovered the opening with dirt^000000. I hope no one dug it open.";
+ erasequest 11352;// Dimensional Travel
+ setquest 11353;// Dimensional Travel
+ ep14_3_dimensional_travel = 6;
+ close3;
+ }
+ if (ep14_3_dimensional_travel == 6) {
+ mes "[Tamarin]";
+ mes "I've hidden the opening to that place: I didn't want anyone to get there before me.";
+ cutin "ep143_tasmi.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "At that time, I was too distracted to remember where the opening was, but I think it's definitely ^0000FFsomewhere on the 2nd floor^000000.";
+ cutin "ep143_tasta.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "Meet me in front of the ^0000FFHidden Crack^000000. Make sure no one follows you there.";
+ mes "I've ^0000FFcovered the opening with dirt^000000. I hope no one dug it open.";
+ close3;
+ }
+ mes "[Tamarin]";
+ mes "Hm, my mark had better stay where I left it.";
+ cutin "ep143_tahuk.bmp",2;
+ close3;
+}
+
+dali02,90,62,0 script Sand Mound#ep14bs 4_SOIL,{
+ if (ep14_3_dimensional_travel < 6) {
+ mes "- A mound of sand stands awkwardly, looking out of place. -";
+ close;
+ }
+ if (ep14_3_dimensional_travel == 6) {
+ mes "- A mound of sand stands awkwardly, looking out of place. -";
+ next;
+ mes "[Tamarin]";
+ mes "Whew!";
+ mes "I'm glad you've found me.";
+ cutin "ep143_tasmi.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "Let me clear the dirt...";
+ mes "Be mindful of the opening. It's quite narrow.";
+ cutin "ep143_tasta.bmp",2;
+ next;
+ if (select( "Enter.", "Quit." ) == 2) {
+ mes "[Tamarin]";
+ mes "Aren't you going in?";
+ cutin "ep143_tahuk.bmp",2;
+ close3;
+ }
+ mes "- The passage is barely wide enough to contain one person. -";
+ completequest 11353;// Dimensional Travel
+ ep14_3_dimensional_travel = 7;
+ close2;
+ warp "moro_vol",136,135;
+ end;
+ }
+ mes "- A mound of sand stands awkwardly, looking out of place. -";
+ next;
+ if (select( "Enter.", "Quit." ) == 2) {
+ mes "You decided not to enter.";
+ close;
+ }
+ mes "- The passage is barely wide enough to contain one person. -";
+ close2;
+ warp "moro_vol",136,135;
+ end;
+}
+
+moro_vol,137,136,0 script Sand Mound#ep14bs_ 4_SOIL,{
+ mes "- A mound of sand stands awkwardly, looking out of place. -";
+ next;
+ if (select( "Return to the Dimensional Crack.", "Quit." ) == 2) {
+ mes "You decided not to enter.";
+ close;
+ }
+ mes "- The passage is barely wide enough to contain one person. -";
+ close2;
+ warp "dali02",91,63;
+ end;
+}
+
+moro_vol,91,105,1 script Eclage Teleporter#143_1 PORTAL,{
+ mes "[Dophe]";
+ mes "This teleporter is connected to Eclage.";
+ mes "It'll be destroyed once our operation is over, but for now it's something we cannot live without.";
+ next;
+ mes "Use the teleporter to move to Eclage.";
+ next;
+ if (select( "Move to Eclage.", "Cancel." ) == 2) {
+ mes "Do not use the teleporter.";
+ close;
+ }
+ mes "Move to Eclage.";
+ close2;
+ warp "ecl_in01",38,96;
+ end;
+}
+
+ecl_in01,38,98,1 script Interdimensional Device#ecl PORTAL,{
+ if (ep14_3_dimensional_travel < 8) {
+ mes "[Eclage Guard]";
+ mes "This teleporter is connected to the recently discovered hideout of the Demon God.";
+ mes "Only those allowed to enter the hideout can use this teleporter.";
+ close;
+ }
+ mes "This teleporter is connected to the recently discovered hideout of the Demon God.";
+ mes "Do you want to use it?";
+ next;
+ if (select( "Move to the Demon God's hideout.", "Quit." ) == 2) {
+ mes "Do not use the teleporter.";
+ close;
+ }
+ mes "Use the teleporter to move to the Demon God's hideout.";
+ close2;
+ warp "moro_vol",91,102;
+ end;
+}
+
+ecl_in01,40,96,3 script Eclage Guard#143_6 4_M_FAIRYSOLDIER,{
+ mes "[Eclage Guard]";
+ mes "How may I help you?";
+ next;
+ switch( select( "What's that teleporter?", "Why is it so crowded in here?", "Demon God's hideout?", "Goodbye." ) ) {
+ case 1:
+ mes "[Eclage Guard]";
+ mes "It's connected to the recently discovered hideout the of Demon God.";
+ mes "It's scientifically designed to send its user directly to the Dimensional Crack where his hideout is.";
+ next;
+ mes "[Eclage Guard]";
+ mes "Many a warrior already left to the hideout.";
+ mes "So long as Morroc exists, Yggdrasil is not safe. I'm going to join the Expedition.";
+ close;
+ case 2:
+ mes "[Eclage Guard]";
+ mes "It turns out Demon God ran from Morroc to hide out in our dimension.";
+ mes "He has to be dealt with, either banished back to his realm or destroyed.";
+ next;
+ mes "[Eclage Guard]";
+ mes "If you want to join the Expedition to defeat the Demon God, then use this teleporter.";
+ mes "It'll send you directly to the Expedition Camp.";
+ close;
+ case 3:
+ mes "[Eclage Guard]";
+ mes "You know the Dimensional Crack, don't you? Recently it's been revealed that the Crack is made up of dimensional passageways.";
+ mes "We can now use those passageways to explore inside the Crack.";
+ next;
+ mes "[Eclage Guard]";
+ mes "Originally the Crack was created by the Demon God to aid in his escape,";
+ mes "so it'd been thought investigating the Crack could locate him.";
+ next;
+ mes "[Eclage Guard]";
+ mes "And it was; finally his hideout has been discovered.";
+ mes "His traces and his demon soldiers are sighted mainly around the giant hill in the center.";
+ next;
+ mes "[Eclage Guard]";
+ mes "If you want more details, then you should visit the actual site.";
+ mes "Just use the teleporter over there.";
+ close;
+ case 4:
+ mes "[Eclage Guard]";
+ mes "May Yggdrasil bless you.";
+ close;
+ }
+}
+
+moro_vol,132,140,4 script Tamarin#ep14bs_ju 4_M_TAMARIN,{
+ if (ep14_3_dimensional_travel == 7) {
+ mes "[Tamarin]";
+ mes "Whoa!";
+ mes "I didn't expect to see so many people.";
+ cutin "ep143_tahuk.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "I'm disappointed that I'm not the first one to discover the place, and am glad that I'm not alone in this dismal place.";
+ cutin "ep143_taang.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "I see more of those entities that look sort of like men.";
+ mes "This place might be much more than I thought it was!";
+ cutin "ep143_tasmi.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "Look!";
+ mes "Walking trees!";
+ mes "Grrr-!";
+ cutin "ep143_tahuk.bmp",2;
+ next;
+ mes "[Barget Tiblack]";
+ mes "HEY!";
+ mes "What the hell do you think you're doing?!";
+ cutin "",255;
+ setquest 11354;// Specimen Collection
+ ep14_3_dimensional_travel = 8;
+ close;
+ }
+ if (ep14_3_dimensional_travel == 8) {
+ mes "[Tamarin]";
+ mes "Look!";
+ mes "Walking trees!";
+ mes "Grrr-!";
+ cutin "ep143_tahuk.bmp",2;
+ next;
+ mes "[Barget Tiblack]";
+ mes "HEY!";
+ mes "What the hell do you think you're doing?!";
+ cutin "",255;
+ close;
+ }
+ if (ep14_3_dimensional_travel == 9) {
+ mes "[Tamarin]";
+ mes "They might kick us out if they know we sneaked in.";
+ mes "Let's do what they ask for now, yeah?";
+ cutin "ep143_taang.bmp",2;
+ close3;
+ }
+ if (ep14_3_dimensional_travel == 10 || ep14_3_dimensional_travel == 11) {
+ mes "[Tamarin]";
+ mes "Collecting the plant specimens doesn't sound too difficult. We can split them between us.";
+ cutin "ep143_tasta.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "^0000FFWhen you collect 25 Sonia stems, meet me by the big rock in the center of this place^000000.";
+ if (ep14_3_dimensional_travel == 10) {
+ erasequest 11356;// Specimen Collection
+ setquest 11357;// Specimen Collection
+ ep14_3_dimensional_travel = 11;
+ }
+ close3;
+ }
+ if (ep14_3_dimensional_travel == 12) {
+ if (countitem(6690) < 25) {
+ mes "[Tamarin]";
+ mes "Ooh! (Wincing)";
+ mes "You don't have enough stems.";
+ mes "Get more and take them to Barget.";
+ cutin "ep143_tahuk.bmp",2;
+ close3;
+ }
+ mes "[Tamarin]";
+ mes "Let's report to Barget first.";
+ cutin "ep143_tahuk.bmp",2;
+ close3;
+ }
+ if (ep14_3_dimensional_travel == 14 || ep14_3_dimensional_travel == 15) {
+ mes "[Tamarin]";
+ mes "Come on,";
+ mes "hurry over to ^0000FFInstructor Rugen^000000!";
+ cutin "ep143_tahuk.bmp",2;
+ close3;
+ }
+ if (ep14_3_dimensional_travel == 16) {
+ mes "[Tamarin]";
+ mes "Thank the gods, who knew that thing I ate out of hunger would save me?";
+ mes "Let's report to Barget.";
+ cutin "ep143_tahuk.bmp",2;
+ close3;
+ }
+ if (ep14_3_dimensional_travel > 16) {
+ mes "[Tamarin]";
+ mes "Arrgh!";
+ mes "" + strcharinfo(0) + " Get in the cave before everyone else explores it!";
+ cutin "ep143_tahuk.bmp",2;
+ close3;
+ }
+ mes "[Tamarin]";
+ mes "Ugh...";
+ mes "I was the first to come to this place!";
+ cutin "ep143_taang.bmp",2;
+ close3;
+}
+
+moro_vol,142,131,5 script Barget Tiblack#ep14bs 4_M_ALCHE_D,{
+ if (checkweight(501,1) == 0 || (MaxWeight - Weight) < 1000) {
+ mes "- You are carrying too many items to proceed with the quest. -";
+ close;
+ }
+ if (ep14_3_dimensional_travel < 8) {
+ mes "[Barget Tiblack]";
+ mes "Ugh, I'm exhausted.";
+ mes "I understand the urgency, but that doesn't mean I like being bossed around.";
+ close;
+ }
+ if (ep14_3_dimensional_travel == 8) {
+ mes "[Barget Tiblack]";
+ mes "You've ruined my precious samples!";
+ mes "I've asked people of your ilk to steer clear of my work zone. Didn't your superiors tell you that?";
+ next;
+ mes "[Barget Tiblack]";
+ mes "I haven't even finished the research at the camp, and they dragged me away for yet another burdening project.";
+ next;
+ mes "[Barget Tiblack]";
+ mes "I demand an assistant!";
+ mes "Enough with that budget problem!";
+ mes "Argh!";
+ next;
+ mes "[Barget Tiblack]";
+ mes "...";
+ mes "...";
+ next;
+ mes "[Barget Tiblack]";
+ mes "All right.";
+ mes "You two over there!";
+ mes "You must have too much time on your hands, loitering about aimlessly. Make yourself useful and help me collect samples.";
+ next;
+ mes "[Barget Tiblack]";
+ mes "You've ruined my existing samples, after all.";
+ next;
+ mes "[Barget Tiblack]";
+ mes "First, I want to collect animal specimens.";
+ mes "It's not uncommon to see mutant animals around here. Recently, one of them was confirmed as a ^0000FFcompletely new species^000000.";
+ next;
+ mes "[Barget Tiblack]";
+ mes "^0000FFThis new species of insect is called the Firebugs because they're surrounded by flames and live in fire pits like that over there^000000.";
+ next;
+ mes "[Barget Tiblack]";
+ mes "Firebugs that crawl out of their pits die soon after.";
+ next;
+ mes "[Barget Tiblack]";
+ mes "Please investigate ^0000FF20 fire pits and collect 50 Burning Insect Shells from Firebugs^000000.";
+ mes "Be careful not to burn yourself in the process.";
+ erasequest 11354;// Specimen Collection
+ setquest 11355;// Specimen Collection
+ ep14_3_dimensional_travel = 9;
+ close;
+ }
+ if (ep14_3_dimensional_travel < 12) {
+ if (ep14_3_dimensional_travel == 9) {
+ if (countitem(6689) < 50 || checkquest(11355,HUNTING) != 2) {
+ mes "[Barget Tiblack]";
+ mes "First, I want to collect animal specimens.";
+ mes "It's not uncommon to see mutant animals around here. Recently, one of them was confirmed as a ^0000FFcompletely new species^000000.";
+ next;
+ mes "[Barget Tiblack]";
+ mes "^0000FFThis new species of insect is called the Firebugs because they're surrounded by flames and live in fire pits like that over there^000000.";
+ next;
+ mes "[Barget Tiblack]";
+ mes "Firebugs that crawl out of their pits die soon after.";
+ next;
+ mes "[Barget Tiblack]";
+ mes "Please investigate ^0000FF20 fire pits and collect 50 Burning Insect Shells from Firebugs^000000.";
+ mes "Be careful not to burn yourself in the process.";
+ close;
+ }
+ mes "[Barget Tiblack]";
+ mes "Oh,";
+ mes "well done!";
+ mes "You finished your task more quickly than I anticipated.";
+ delitem 6689,50;// Burning Bug Skin
+ erasequest 11355;// Specimen Collection
+ setquest 11356;// Specimen Collection
+ ep14_3_dimensional_travel = 10;
+ next;
+ mes "[Barget Tiblack]";
+ mes "Ouch, HOT!";
+ mes "*Huffing Puffing*";
+ mes "Let me bottle them before they get cold, and send them to the lab.";
+ next;
+ }
+ mes "[Barget Tiblack]";
+ mes "Now, it's time for plant specimens.";
+ mes "Our target plant is called Sonia, a very primitive type of plant.";
+ next;
+ mes "[Barget Tiblack]";
+ mes "At a glance, Sonias look like plastic tubes, but their structure is very minimal.";
+ next;
+ mes "[Barget Tiblack]";
+ mes "They're not difficult to gather. Please ^0000FFpick 50 Sonias and bring me 50 stems^000000.";
+ next;
+ mes "[Barget Tiblack]";
+ mes "Sonia specimens are the last of my specimen collection. If you happen to ^0000FFsee peculiar Sonias^000000, please don't hesitate to let me know.";
+ next;
+ mes "[Barget Tiblack]";
+ mes "Try not to stray too far away from the base. It's too dangerous out there.";
+ mes "Come back safely.";
+ next;
+ mes "[Tamarin]";
+ mes "Hm...";
+ mes "" + strcharinfo(0) + ", wait!";
+ cutin "ep143_tahuk.bmp",2;
+ close3;
+ }
+ if (ep14_3_dimensional_travel == 12) {
+ if (countitem(6690) < 25) {
+ mes "[Barget Tiblack]";
+ mes "How are you doing with collecting Sonias?";
+ close;
+ }
+ mes "[Barget Tiblack]";
+ mes "Ah,";
+ mes "welcome back!";
+ mes "I forgot to tell you ^0000FFnot to go near the rock in the center of this place^000000.";
+ next;
+ mes "[Barget Tiblack]";
+ mes "When I realized my mistake, I called a rescue party, so worried for your safety. I'm glad you're back unscathed.";
+ next;
+ mes "[Barget Tiblack]";
+ mes "I apologize for being a total jerk.";
+ mes "I was stressed out about my heavy workload.";
+ next;
+ mes "[Barget Tiblack]";
+ mes "I still have so many things to do... Sigh...";
+ next;
+ select("Tell her about the central rock.");
+ mes "[Barget Tiblack]";
+ mes "Say WHAT?!";
+ mes "You went there?!";
+ mes "And you came back unscathed? How?";
+ next;
+ mes "[Barget Tiblack]";
+ mes "Everyone else who went there ^0000FFfell into a coma due to the noxious gas released from the rock^000000.";
+ next;
+ mes "[Barget Tiblack]";
+ mes "What did you do?";
+ mes "This is a great discovery!";
+ next;
+ select("Relay what happened.");
+ mes "[Barget Tiblack]";
+ mes "You ate a Sonia stem.";
+ mes "Okay, I've known the stem is nontoxic, but I haven't finished its substance research yet. Did you experience any side effect?";
+ next;
+ mes "[Barget Tiblack]";
+ mes "Wow!";
+ mes "This really is a great discovery!";
+ next;
+ mes "[Barget Tiblack]";
+ mes "I'd better get back to the research...";
+ mes "No, we first must ^0000FFtreat those patients who need Sonia stems. Please bring them to me.^000000";
+ next;
+ mes "[Barget Tiblack]";
+ mes "^0000FFInstructor Rugen manages them^000000, so you can bring them to him.";
+ mes "Please hand me the document. I'll sign it for you.";
+ next;
+ mes "[Barget Tiblack]";
+ mes "I'd better get back to my stem research. I'll ask someone else for assistance.";
+ mes "You lucked out this time. Better not make a habit of eating things off the ground.";
+ erasequest 11358;// Specimen Collection
+ setquest 11359;// Antidote
+ ep14_3_dimensional_travel = 13;
+ close;
+ }
+ if (ep14_3_dimensional_travel == 13) {
+ mes "[Barget Tiblack]";
+ mes "I'd better get back to the research...";
+ mes "No, we first must ^0000FFtreat those patients who need Sonia stems. Please bring them to me.^000000";
+ next;
+ mes "[Barget Tiblack]";
+ mes "^0000FFInstructor Rugen manages them^000000, so you can bring them to him.";
+ mes "Please hand me the document. I'll sign it for you.";
+ next;
+ mes "[Barget Tiblack]";
+ mes "I'd better get back to my stem research. I'll ask someone else for assistance.";
+ mes "You lucked out this time. Better not make a habit of eating things off the ground.";
+ close;
+ }
+ if (ep14_3_dimensional_travel < 16) {
+ mes "[Barget Tiblack]";
+ mes "Did you see Instructor Rugen?";
+ close;
+ }
+ if (ep14_3_dimensional_travel == 16) {
+ mes "[Barget Tiblack]";
+ mes "Hah hah hah!";
+ mes "How did it go?";
+ mes "They worked, didn't they?";
+ next;
+ mes "[Barget Tiblack]";
+ mes "I have high hopes for my research.";
+ mes "Your seemingly reckless decision has saved many lives.";
+ next;
+ mes "[Barget Tiblack]";
+ mes "With this, we'll soon be able to investigate that ^0000FFsuspicious cave^000000 from the inside out!";
+ next;
+ select("What cave?");
+ mes "[Barget Tiblack]";
+ mes "Oh, the cave that releases the noxious gas.";
+ mes "The gas is ^0000FFso thick in the air, you can't see the cave entrance clearly^000000.";
+ next;
+ mes "[Barget Tiblack]";
+ mes "Those who we gave the first batch of the vaccine already left to the cave.";
+ mes "We haven't heard from them yet. I'd like to believe it's a good sign.";
+ next;
+ mes "[Barget Tiblack]";
+ mes "If it weren't two of you, I could have pulled all my hair out in frustration.";
+ mes "Good job, you guys!";
+ getexp 0,1500000;
+ completequest 11362;// Antidote
+ ep14_3_dimensional_travel = 17;
+ close;
+ }
+ mes "[Barget Tiblack]";
+ mes "Those who we gave the first batch of the vaccine already left to the cave.";
+ mes "We haven't heard from them yet. I'd like to believe it's a good sign.";
+ next;
+ mes "[Barget Tiblack]";
+ mes "If it weren't two of you, I could have pulled all my hair out in frustration.";
+ mes "Good job, you guys!";
+ close;
+}
+
+moro_vol,101,74,4 script Patient#ep14bs2 4_F_FAIRYKID6,{
+ mes "[Patient]";
+ mes "*Moan*";
+ close;
+}
+
+moro_vol,101,72,4 script Patient#ep14bs1 4_M_PATIENT,{
+ mes "[Patient]";
+ mes "Ugh...";
+ close;
+}
+
+moro_vol,103,71,6 script Patient#ep14bs3 4_F_PATIENT,{
+ mes "[Patient]";
+ mes "*Groan*";
+ close;
+}
+
+moro_vol,106,69,4 script Patient#ep14bs4 4_M_PATIENT,{
+ mes "[Patient]";
+ mes "Aww... Ugh...";
+ close;
+}
+
+moro_vol,104,70,4 script Intoxicated Patient#ep1 4_M_LIEMAN,{
+ if (ep14_3_dimensional_travel == 14) {
+ mes "[Poisoned Patient]";
+ mes "Ugh...";
+ next;
+ mes "- You feed him a Sonia stem. The color instantly returns to his face. -";
+ erasequest 11360;// Antidote
+ setquest 11361;// Antidote
+ ep14_3_dimensional_travel = 15;
+ close;
+ }
+ if (ep14_3_dimensional_travel == 15) {
+ mes "[Poisoned Patient]";
+ mes "Ugh...";
+ next;
+ mes "- You feed him a Sonia stem. The color instantly returns to his face. -";
+ mes "- Talk to Instructor Rugen. -";
+ close;
+ }
+ mes "[Poisoned Patient]";
+ mes "Ugh...";
+ close;
+}
+
+moro_vol,105,71,5 script Instructor Rugen#ep14bs 4_M_YOUNGKNIGHT,{
+ if (ep14_3_dimensional_travel < 13) {
+ mes "[Instructor Rugen]";
+ mes "Phew...";
+ mes "Why were you so reckless?";
+ next;
+ mes "[Instructor Rugen]";
+ mes "Is this worth it?";
+ mes "...";
+ close;
+ }
+ if (ep14_3_dimensional_travel == 13) {
+ mes "[Instructor Rugen]";
+ mes "Phew...";
+ mes "Why were you so reckless?";
+ next;
+ mes "[Instructor Rugen]";
+ mes "Is this worth it?";
+ mes "...";
+ next;
+ if (select( "Talk to him.", "No, he looks too upset to talk." ) == 2) {
+ mes "[Instructor Rugen]";
+ mes "Sigh...";
+ mes "This is just...";
+ close;
+ }
+ mes "[Instructor Rugen]";
+ mes "How may I help you?";
+ mes "If you're seeking medical assistance, then please describe your symptoms at the reception desk and wait until help arrives.";
+ next;
+ select("Give Sonia stems.");
+ if (countitem(6690) < 25) {
+ mes "[Instructor Rugen]";
+ mes "These aren't enough.";
+ mes "Could you check the number of your Sonia stems?";
+ close;
+ }
+ mes "[Instructor Rugen]";
+ mes "Are you serious?";
+ mes "Dr. Tiblack sent you, so I should believe you.";
+ mes "I'll feed these to the patients.";
+ delitem 6690,25;// Yummy Stem
+ erasequest 11359;// Antidote
+ setquest 11360;// Antidote
+ ep14_3_dimensional_travel = 14;
+ close;
+ }
+ if (ep14_3_dimensional_travel == 14) {
+ mes "[Instructor Rugen]";
+ mes "Are you serious?";
+ mes "Dr. Tiblack sent you, so I should believe you.";
+ mes "I'll feed these to the patients.";
+ close;
+ }
+ if (ep14_3_dimensional_travel == 15) {
+ mes "[Instructor Rugen]";
+ mes "Oh!";
+ mes "Otto!";
+ mes "Can you see me?";
+ next;
+ mes "[Otto]";
+ mes "Ugh...";
+ next;
+ mes "[Instructor Rugen]";
+ mes "Oh!";
+ mes "It worked!";
+ next;
+ mes "[Instructor Rugen]";
+ mes "The patients are showing remarkable improvements, though they need to stay in bed for now.";
+ mes "I'll feed the stems to the most critical patients, and wait for Dr. Tiblack to finish her research.";
+ next;
+ mes "[Instructor Rugen]";
+ mes "I'll give you a report on the patients' responses to the stem. Please bring the report to ^0000FFDr. Tiblack^000000.";
+ mes "Hah hah.";
+ mes "It worked!";
+ erasequest 11361;// Antidote
+ setquest 11362;// Antidote
+ ep14_3_dimensional_travel = 16;
+ close;
+ }
+ if (ep14_3_dimensional_travel == 16) {
+ mes "[Instructor Rugen]";
+ mes "The patients are showing remarkable improvements, though they need to stay in bed for now.";
+ mes "I'll feed the stems to the most critical patients, and wait for Dr. Tiblack to finish her research.";
+ next;
+ mes "[Instructor Rugen]";
+ mes "I'll give you a report on the patients' responses to the stem. Please bring the report to ^0000FFDr. Tiblack^000000.";
+ mes "Hah hah.";
+ mes "It worked!";
+ close;
+ }
+ mes "[Instructor Rugen]";
+ mes "I'm glad that the research resulted in our favor.";
+ mes "My comrades are well on their way to a full recovery.";
+ mes "Thank to you.";
+ close;
+}
+
+// Flame Cave entrance
+moro_vol,198,179,4 script Tamarin#ep14bs_st 4_M_TAMARIN,{
+ if (ep14_3_dimensional_travel < 11) {
+ mes "[Tamarin]";
+ mes "Hm...";
+ mes "We don't have time for this!";
+ cutin "ep143_taang.bmp",2;
+ close3;
+ }
+ if (ep14_3_dimensional_travel == 11) {
+ if (countitem(6690) < 25 || checkquest(11357,HUNTING) != 2) {
+ mes "[Tamarin]";
+ mes "^0000FFWhen you collect 25 Sonia stems, meet me here^000000.";
+ cutin "ep143_tasta.bmp",2;
+ close3;
+ }
+ mes "[Tamarin]";
+ mes "I don't remember this rock was so big.";
+ mes "Or seeing these strange things around it.";
+ mes "I also smell ^0000FFsmoke^000000.";
+ cutin "ep143_tahuk.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "Again,";
+ mes "I don't remember seeing ^0000FFso many strange animals and plants^000000 either.";
+ mes "These are Sonias, right? They weren't so many before.";
+ next;
+ mes "[Tamarin]";
+ mes "If they were, I wouldn't have had to starve.";
+ mes "Sonias were the most delicious and least toxic among all the plants I tried.";
+ cutin "ep143_taang.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "" + strcharinfo(0) + ", do you want to taste it?";
+ mes "I brought a few stems for memories' sake.";
+ cutin "ep143_tasmi.bmp",2;
+ next;
+ cutin "",255;
+ mes "- Taste of Sonia -";
+ mes "Its thick, tongue-warming sap fills your mouth with delicious aroma.";
+ next;
+ mes "[Tamarin]";
+ mes "What do you think?";
+ mes "Delicious, huh?";
+ cutin "ep143_tahuk.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "I've got only a few left. Let's take turns to gather some more.";
+ cutin "ep143_tasmi.bmp",2;
+ erasequest 11357;// Specimen Collection
+ setquest 11358;// Specimen Collection
+ ep14_3_dimensional_travel = 12;
+ close3;
+ }
+ if (ep14_3_dimensional_travel == 12) {
+ mes "[Tamarin]";
+ mes "I've got only a few left. Let's take turns to gather some more.";
+ cutin "ep143_tasmi.bmp",2;
+ close3;
+ }
+ if (ep14_3_dimensional_travel < 16) {
+ mes "[Tamarin]";
+ mes "Come on,";
+ mes "hurry over to ^0000FFInstructor Rugen^000000!";
+ cutin "ep143_tahuk.bmp",2;
+ close3;
+ }
+ if (ep14_3_dimensional_travel == 16) {
+ mes "[Tamarin]";
+ mes "Thank the gods, who knew that thing I ate out of hunger would save me?";
+ mes "Let's report to Barget.";
+ cutin "ep143_tahuk.bmp",2;
+ close3;
+ }
+ mes "[Tamarin]";
+ mes "Arrgh!";
+ mes "" + strcharinfo(0) + " get in there before everyone else explores it!";
+ cutin "ep143_tahuk.bmp",2;
+ next;
+ if (select( "Enter.", "Quit." ) == 2) {
+ mes "[Tamarin]";
+ mes "Ah...";
+ cutin "ep143_taang.bmp",2;
+ close3;
+ }
+ mes "[Tamarin]";
+ mes "The floor is dark. Watch your step!";
+ close2;
+ warp "moro_cav",40,50;
+ end;
+}
+
+// Others
+ecl_in01,44,99,1 script Combat Laphine#143_4 4_M_FAIRYSOLDIER2,{
+ mes "[Combat Laphine]";
+ mes "I'm nervous.";
+ close;
+}
+
+ecl_in01,46,99,1 script Combat Laphine#143_5 4_M_FAIRYSOLDIER2,{
+ mes "[Combat Laphine]";
+ mes "I hope I can return in one piece.";
+ close;
+}
+
+ecl_in01,48,99,1 script Combat Laphine#143_6 4_M_FAIRYSOLDIER2,{
+ mes "[Combat Laphine]";
+ mes "Hmm...";
+ close;
+}
+ecl_in01,44,97,1 script Combat Laphine#143_7 4_F_FAIRYSOLDIER,{
+ mes "[Combat Laphine]";
+ mes "Shush.";
+ close;
+}
+
+ecl_in01,46,97,1 script Combat Laphine#143_8 4_F_FAIRYSOLDIER,{
+ mes "[Combat Laphine]";
+ mes "Mwa hah hah, it's time for me to shine!";
+ close;
+}
+
+ecl_in01,48,97,1 script Combat Laphine#143_9 4_F_FAIRYSOLDIER,{
+ mes "[Combat Laphine]";
+ mes "I must have been out of my mind when I decided to join the army. Sigh, why does the Door to Verities have to be so high up there?";
+ close;
+}
+
+ecl_in01,46,102,3 script Commander Laphine#143_1 4_M_FAIRYSOLDIER,5,5,{
+ mes "[Commander Laphine]";
+ mes "Evil must be nipped in the butt.";
+ mes "You're unexpected visitors from the Midgard Continent.";
+ next;
+ mes "[Commander Laphine]";
+ mes "If you are the cause doom to ourselves OR Yggdrasil, then we won't hesitate to fight you.";
+ close;
+
+OnTouch_:
+ if (.talk == 0) {
+ .talk = 1;
+ npctalk "Commander: Soldiers, finally it's time to put your training to use!";
+ sleep 2000;
+ npctalk "Argh!", "Combat Laphine#143_4";
+ npctalk "Argh!", "Combat Laphine#143_5";
+ npctalk "Argh!", "Combat Laphine#143_6";
+ npctalk "Ah!", "Combat Laphine#143_7";
+ npctalk "Argh!", "Combat Laphine#143_8";
+ npctalk "Argh!", "Combat Laphine#143_9";
+ sleep 2000;
+ npctalk "Commander: Did someone just whimper?";
+ sleep 3000;
+ npctalk "Commander: Don't disappoint your comrades at the Splendide advance base!";
+ sleep 3000;
+ npctalk "Commander: Stay focused! We're going to finish off the Demon God!";
+ sleep 2000;
+ npctalk "Yeah, yeah.", "Combat Laphine#143_7";
+ sleep 2000;
+ npctalk "...", "Combat Laphine#143_4";
+ npctalk "Ah...", "Combat Laphine#143_5";
+ npctalk "...", "Combat Laphine#143_6";
+ npctalk "...", "Combat Laphine#143_8";
+ sleep 3000;
+ npctalk "Commander: Ah, suddenly I can't see...";
+ .talk = 0;
+ }
+ end;
+}
+
+ecl_in01,37,90,3 script Magic Scholar Lemony#14 4_F_FAIRY2,{
+ mes "[Lemony]";
+ mes "Did you read the latest issue of the Door to Verities magazine?";
+ mes "Was Avant's new teleporter really featured in it?";
+ next;
+ mes "[Armandi]";
+ mes "Yes, just the basic principles and the information relevant to the Humans.";
+ mes "I didn't quite understand it all.";
+ next;
+ mes "[Lemony]";
+ mes "I wonder if this means Avant has finally decided to pursue his interest in research activities.";
+ next;
+ mes "[Lemony]";
+ mes "Hey, Human.";
+ mes "Were you eavesdropping on us? Well, though it wasn't like we're discussing secrets.";
+ next;
+ mes "[Lemony]";
+ mes "Oh, right. Are you too going there?";
+ mes "You know, the hideout of the Demon God who created some of the Space Time Dimensional Cracks has recently been discovered.";
+ next;
+ mes "[Lemony]";
+ mes "If you're curious, then use that teleporter to the hideout over there.";
+ mes "There will be quite a spectacle to watch.";
+ mes "Oh, just so you know, you might be throwing away your life. *Giggle*";
+ next;
+ mes "[Armandi]";
+ mes "Lemony, you really need to work on improving your personality.";
+ mes "Tsk, tsk.";
+ close;
+}
+
+ecl_in01,35,89,6 script Magic Scholar Armandi#1 4_M_FAIRYKID6,{
+ mes "[Armandi]";
+ mes "I hope the Interdimensional Device won't take a heavy toll on the world.";
+ mes "By the way, Avant never fails to amaze me.";
+ next;
+ mes "[Lemony]";
+ mes "Ack, I hate that guy.";
+ next;
+ mes "[Armandi]";
+ mes "Avant may be repulsive,";
+ mes "but he's the best at what he does.";
+ next;
+ mes "[Lemony]";
+ mes "That, I agree.";
+ mes "Only he could pull off this kind of teleporter.";
+ mes "Why is he helping the Mayor, anyway?";
+ next;
+ mes "[Armandi]";
+ mes "When I asked him, he mumbled something about repentance.";
+ mes "I can only guess it has something to do with the Mayor's birth.";
+ next;
+ mes "[Armandi]";
+ mes "I wanted to ask more, but he looked down his nose at me.";
+ mes "Sigh, it's unfair such a jerk is considered the best in magical science.";
+ next;
+ mes "[Lemony]";
+ mes "You can always study hard to beat him.";
+ close;
+}
+
+// Warps
+moro_cav,64,13,0 warp #flame_cave_out 3,3,moro_vol,198,176
+
+// Merchants
+moro_vol,95,96,6 shop Tool Merchant 4_CAT_DOWN,611:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1
+
+// Placeholder (unknown scripts)
+// ecl_in01,47,92,0 script #ecl_buff_N HIDDEN_WARP_NPC
+// ecl_in01,48,44,0 script #ecl_buff_S HIDDEN_WARP_NPC
+// ecl_in01,23,68,0 script #ecl_buff_W HIDDEN_WARP_NPC
+// ecl_in01,48,67,0 script #ecl_orb_buff HIDDEN_WARP_NPC
+// ecl_in01,71,67,0 script #ecl_buff_E HIDDEN_WARP_NPC
+// ecl_in01,47,27,0 script #mgate03 HIDDEN_WARP_NPC
diff --git a/npc/re/quests/quests_15_1.txt b/npc/re/quests/quests_15_1.txt
new file mode 100644
index 00000000000..4dbbde5a0d0
--- /dev/null
+++ b/npc/re/quests/quests_15_1.txt
@@ -0,0 +1,9070 @@
+//===== rAthena Script =======================================
+//= Phantasmagorika Quests.
+//===== Description: =========================================
+//= [Walkthrough Conversion]
+//--- Quests list:
+//- Phantasmagorika Main Quests
+//- Wandering Bard Quest
+//- Police Quests
+//- New Power Source
+//- Krotzel's Request
+//- To Phantasmagorika!
+//- Looking for the Traces
+//- Vestige
+//===== Changelogs: ==========================================
+//= 1.0 First version. [Capuche]
+//============================================================
+
+prontera,121,77,3 script Phantasmagorika Spokesperson 4_F_ZONDAGIRL,{
+ mes "[Spokesperson]";
+ mes "Good day.";
+ mes "Rekenber is recruiting adventurers for an excavation project that takes place in Phantasmagorika, the newly discovered ruins in Juperos.";
+ next;
+ mes "[Spokesperson]";
+ mes "If you're interested, just come as you are.";
+ mes "Everything you need for the excavation will be provided by Rekenber.";
+ next;
+ mes "[Spokesperson]";
+ mes "Join us for adventure at the newly discovered ruins in Juperos,";
+ mes "an ancient city whose scientific knowledge has fueled the development of modern civilization.";
+ next;
+ mes "[Spokesperson]";
+ mes "If you'd like to join, then form an excavation team and fill out your application.";
+ next;
+ switch( select( "Excavation team? Application?", "Phantasmagorika?", "Bye." ) ) {
+ case 1:
+ mes "[Spokesperson]";
+ mes "We're recruiting teams of excavators for the research of Phantasmagorika, the newly discovered ruins.";
+ mes "This project requires expertise in various fields, so we've decided to recruit";
+ mes "teams of excavators instead of individuals.";
+ next;
+ mes "[Spokesperson]";
+ mes "You can register for the excavation project,";
+ mes "and help us however you can.";
+ mes "Registered excavators receive special benefits and commodities";
+ next;
+ mes "[Spokesperson]";
+ mes "in exchange for information that they discover in the ruins. We'll use the information to research the ruins.";
+ mes "Even if you fail to find useful information, we'll reward you just for your participation.";
+ next;
+ mes "[Spokesperson]";
+ mes "If you want to join the project, please go submit your application to the Eden Group.";
+ close;
+ case 2:
+ mes "[Spokesperson]";
+ mes "An ancient site was just discovered in Juperos.";
+ mes "It was hidden at the end of a long tunnel.";
+ next;
+ mes "[Spokesperson]";
+ mes "Rekenber has named the site ^4d4dffPhantasmagorika^000000";
+ mes "and commenced an excavation.";
+ next;
+ mes "[Spokesperson]";
+ mes "We're hoping to find more advanced magic gears and a higher level of scientific knowledge than what was ever discovered in the Juperos region.";
+ close;
+ case 3:
+ mes "[Spokesperson]";
+ mes "Rekenber is looking for talented adventurers for the excavation of Phantasmagorika.";
+ mes "Feel free to join us anytime!";
+ mes "We need you!";
+ close;
+ }
+
+OnInit:
+ questinfo 7610, QTYPE_QUEST, 1;
+ setquestinfo_level 7610, 140,175;
+ end;
+}
+geffen,135,64,3 duplicate(Phantasmagorika Spokesperson) Phantasmagorika Spokesperson#2 4_F_ZONDAGIRL
+
+moc_para01,31,14,0 script #atnevt01 HIDDEN_WARP_NPC,2,2,{
+ end;
+OnTouch:
+ if (VER_MAIN == 0 && BaseLevel >= 140) {
+ cutin "laime_evenor01.bmp",2;
+ mes "[Secretary Lime Evenor]";
+ mes "Welcome back,";
+ mes "" + strcharinfo(0) + ". I don't know how we can survive without you.";
+ next;
+ mes "[Secretary Lime Evenor]";
+ mes "Have you heard?";
+ mes "An ancient site was just discovered in Juperos.";
+ mes "Rekenber is recruiting adventurers for the excavation of the place,";
+ next;
+ mes "[Secretary Lime Evenor]";
+ mes "and we've decided to join it.";
+ mes "The Captain wants to see you about that.";
+ next;
+ select("I didn't know you had a captain.");
+ cutin "laime_evenor02.bmp",2;
+ mes "[Secretary Lime Eveno]";
+ mes "What, did you think I was running this gig alone?";
+ mes "The Mistre--I mean, the Captain is rarely excited about anything, and this is one of those rare occasions. You should meet her.";
+ next;
+ cutin "laime_evenor01.bmp",2;
+ mes "[Secretary Lime Eveno]";
+ mes "Her office is to the far left on the second floor.";
+ VER_MAIN = 1;
+ setquest 7607;// Eden Group Leader
+ close2;
+ cutin "",255;
+ }
+ end;
+}
+
+moc_para01,38,175,5 script Lime Eveno#evtat01 4_F_EDEN_OFFICER,{
+ if (checkweight(1301,1) == 0) {
+ mes "- You are carrying too many items to proceed with the quest. -";
+ close;
+ }
+ mes "[Secretary Lime Evenor]";
+ if (BaseLevel < 140) {
+ cutin "laime_evenor01.bmp",2;
+ mes "I also come up here sometimes to attend some business.";
+ mes "Actually the central room is mine.";
+ close3;
+ }
+ switch(VER_MAIN) {
+ case 0:
+ cutin "laime_evenor01.bmp",2;
+ mes "Welcome back,";
+ mes "" + strcharinfo(0) + ". I don't know how we can survive without you.";
+ next;
+ mes "[Secretary Lime Evenor]";
+ mes "Have you heard?";
+ mes "An ancient site was just discovered in Juperos.";
+ mes "Rekenber is recruiting adventurers for the excavation of the place,";
+ next;
+ mes "[Secretary Lime Evenor]";
+ mes "and we've decided to join it.";
+ mes "The Captain wants to see you about that.";
+ next;
+ select("I didn't know you had a captain.");
+ cutin "laime_evenor02.bmp",2;
+ mes "[Secretary Lime Eveno]";
+ mes "What, did you think I was running this gig alone?";
+ mes "The Mistre--I mean, the Captain is rarely excited about anything, and this is one of those rare occasions. You should meet her.";
+ next;
+ cutin "laime_evenor01.bmp",2;
+ mes "[Secretary Lime Eveno]";
+ mes "Her office is to the far left on the second floor.";
+ VER_MAIN = 1;
+ setquest 7607;// Eden Group Leader
+ close3;
+ case 1:
+ case 2:
+ cutin "laime_evenor03.bmp",2;
+ mes "The Captain is waiting for you.";
+ mes "Her office is to the far left from here.";
+ mes "I'll see you again later.";
+ close3;
+ case 3:
+ cutin "laime_evenor03.bmp",2;
+ mes "It seems everything went smoothly with the Captain.";
+ mes "Let's move to the central room, shall we?";
+ mes "We have a guest waiting";
+ mes "to talk us about something.";
+ close3;
+ case 4:
+ cutin "laime_evenor01.bmp",2;
+ mes "I'll be here rooting for you.";
+ mes "Don't worry about support.";
+ mes "I'll see that you get everything you need.";
+ close3;
+ default:
+ cutin "laime_evenor01.bmp",2;
+ mes "The excavation seems to be going well so far.";
+ mes "The item Dr. Atnard was interested in is also on Rekenber's radar; it should be appraised highly.";
+ next;
+ mes "[Secretary Lime Evenor]";
+ mes "Thank you for helping the doctors focus on their work.";
+ mes "Keep up the good work.";
+ close3;
+ }
+
+OnInit:
+ questinfo 7607, QTYPE_QUEST, 1;
+ setquestinfo_level 7607,140,175;
+ end;
+}
+
+moc_para01,174,165,3 script Lime Evenor#atnd02 4_F_EDEN_OFFICER,{
+ if (checkweight(1301,1) == 0) {
+ mes "- You are carrying too many items to proceed with the quest. -";
+ close;
+ }
+ mes "[Lime]";
+ switch(VER_MAIN) {
+ case 0:
+ cutin "laime_evenor01.bmp",2;
+ mes "This room is for employees only.";
+ mes "If you need a place to rest, please use the next room.";
+ break;
+ case 1:
+ case 2:
+ cutin "laime_evenor01.bmp",2;
+ mes "The Captain is in the next room.";
+ mes "It's to the left.";
+ mes "Please talk to the Captain first.";
+ break;
+ case 3:
+ cutin "laime_evenor01.bmp",2;
+ mes "" + strcharinfo(0) + ". Please come this way.";
+ mes "Let me introduce you to";
+ mes "Archaeologist Aures of the Atnad Excavation Team.";
+ next;
+ mes "[Lime]";
+ mes "Dr. Aures, this is " + strcharinfo(0) + ", who will assist you in Phantasmagorika.";
+ next;
+ cutin "verus_aures.bmp",0;
+ mes "[Aures]";
+ mes "Nice to meet you. My name is Aures.";
+ mes "Every member of my team is old and feeble. We really can use some young blood like you.";
+ mes "Welcome to the team.";
+ next;
+ cutin "laime_evenor01.bmp",2;
+ mes "[Lime]";
+ mes "It seems everything went smoothly with the Captain.";
+ mes "Your job is simple:";
+ mes "just help Dr. Aures and his Atnad Excavation Team.";
+ next;
+ mes "[Lime]";
+ mes "I expect you'll spend most of your time running errands";
+ mes "and doing things that require physical stamina since all the members of the team are past their prime.";
+ next;
+ cutin "verus_aures.bmp",0;
+ mes "[Aures]";
+ mes "That's right. All of us retired a long time ago.";
+ mes "This excavation will probably be the last excavation we do before we die.";
+ next;
+ mes "[Aures]";
+ mes "If Lime didn't help us, we would have changed our minds at the entrance to that place.";
+ next;
+ cutin "laime_evenor01.bmp",2;
+ mes "[Lime]";
+ mes "Please don't say that.";
+ mes "You're the most experienced archaeologists I've met.";
+ mes "By the way, how's Dr. Atnad?";
+ next;
+ cutin "verus_aures.bmp",0;
+ mes "[Aures]";
+ mes "Arnard? Don't get me started.";
+ mes "He's as stubborn as his daughter, if not more.";
+ mes "She liquidated her inheritance and left when she couldn't hear from her father.";
+ next;
+ mes "[Aures]";
+ mes "He didn't keep touch with his family for years. When he found out his house was sold,";
+ mes "he lashed out and went off the grid,";
+ mes "and he's still angry at her.";
+ next;
+ cutin "laime_evenor01.bmp",2;
+ mes "[Lime]";
+ mes "And we're stuck in the middle of their mind game.";
+ next;
+ switch( select( "Who are they?", "Cut to the chase, please." ) ) {
+ case 1:
+ cutin "verus_aures.bmp",0;
+ mes "[Aures]";
+ mes "Let me tell you. When Lime came to us,";
+ mes "we all wondered why a famous company like Eden Group would support a ragtag bunch of old men like us.";
+ mes "Then we found out they're father and daughter.";
+ next;
+ select("Father and daughter? Who?");
+ cutin "laime_evenor03.bmp",2;
+ mes "[Lime]";
+ mes "Oh, didn't the Captain tell you?";
+ mes "Her father is the leader of the Atnad Excavation Team.";
+ next;
+ mes "[Lime]";
+ mes "When I first suggested we should join the project,";
+ mes "she wanted to support the Arnard Excavation Team.";
+ mes "At first I was thinking more along the lines of merging the team.";
+ next;
+ mes "[Lime]";
+ mes "Rekenber takes care of the financial aspects of the project, while we handle the manpower.";
+ mes "Then I realized the leader of the team is the father of my boss's.";
+ next;
+ cutin "laime_evenor04.bmp",2;
+ mes "[Lime]";
+ mes "I want to support the team to the best of my ability,";
+ mes "but their rocky relationship is getting in the way.";
+ next;
+ cutin "verus_aures.bmp",0;
+ mes "[Aureth]";
+ mes "Ian, I mean the old Arnard, welcomed your proposal with open arms.";
+ mes "Then he hit the roof when he realized your captain was his daughter.";
+ next;
+ mes "[Aureth]";
+ mes "I don't understand the hangup.";
+ mes "I mean she's his daughter, for the goodness's sake.";
+ mes "I think you should mediate between the two.";
+ next;
+ cutin "laime_evenor01.bmp",2;
+ mes "[Lime]";
+ mes "I hope this collaboration will be a chance for them to reconcile with each other.";
+ mes "Well, we should move to the site now.";
+ break;
+ case 2:
+ cutin "laime_evenor03.bmp",2;
+ mes "[Lime]";
+ mes "Indeed. Before we go, let's talk about what we can expect at the site.";
+ break;
+ }
+ next;
+ cutin "laime_evenor03.bmp",2;
+ mes "[Lime]";
+ mes "Aures, Luke will come with you.";
+ mes "" + strcharinfo(0) + ", you can go to Phantasmagorika whenever you're ready.";
+ next;
+ mes "[Lime]";
+ mes "It's accessible through Juperos,";
+ mes "so move to Juno first, then get to the entrance to Juperos from there.";
+ next;
+ cutin "verus_aures.bmp",0;
+ mes "[Aures]";
+ mes "Rekenber has been promoting this project across the continent,";
+ mes "and has succeeded in bringing in more people than you can imagine.";
+ mes "Just look for a big crowd, and you won't miss the place. See you when you get there.";
+ next;
+ cutin "laime_evenor01.bmp",2;
+ mes "[Lime]";
+ mes "Everything should be easy enough for you,";
+ mes "though you'll have to register with Rekenber for the excavation.";
+ mes "You can register as an individual excavator, but I'd prefer if you do it as a member of the Arnard Excavation Team instead.";
+ next;
+ mes "[Lime]";
+ mes "Once your registration goes through, you can start working for the Arnard Excavation Team,";
+ mes "and everything else will take care of itself.";
+ mes "Thank you for doing this.";
+ erasequest 7608;// Artnard Excavation Team 1
+ setquest 7609;// Artnard Excavation Team 2
+ VER_MAIN = 4;
+ break;
+ case 4:
+ cutin "laime_evenor01.bmp",2;
+ mes "The excavation site is connected to Juperos,";
+ mes "so you should move to Juperos first.";
+ mes "The excavation project has been promoted widely, so you won't have a problem finding the representative.";
+ break;
+ default:
+ cutin "laime_evenor02.bmp", 2;
+ mes "How's the situation at the excavation site?";
+ mes "Sigh, why can't Ian just forgive his daughter?";
+ break;
+ }
+ close3;
+}
+
+moc_para01,172,164,5 script Archaeologist Aureth#atnd02 4_M_OLDSCHOLAR,{
+ if (VER_MAIN < 4) {
+ cutin "laime_evenor01.bmp",2;
+ mes "[Lime]";
+ mes "I'm sorry, but he's our guest.";
+ mes "And this office is for Eden Group employees only.";
+ mes "The dormitory is the next room.";;
+ }
+ else if (VER_MAIN == 4) {
+ cutin "verus_aures.bmp",0;
+ mes "[Aures]";
+ mes "I'll see you again at the excavation site, yeah?";
+ mes "The Eden Group has hired an escort for me, so I'll be traveling with him.";
+ mes "See you at the site.";
+ }
+ else {
+ cutin "verus_aures.bmp",0;
+ mes "[Aures]";
+ mes "Oh, you came.";
+ mes "I came here often.";
+ mes "I feel sorry for Luke, for he has to travel so often because of me.";
+ next;
+ mes "[Aures]";
+ mes "It's great to have a place where I can come anytime I want. It's been years since I had a place I could call home.";
+ mes "Hah hah hah!";
+ mes "I'll see you at the excavation site.";
+ }
+ close3;
+}
+
+moc_para01,178,167,3 script Luke Lapez#atnd03 4_M_EDEN_GUARDER,{
+ mes "[Luke]";
+ if (VER_MAIN < 4) {
+ cutin "looke_rapez02.bmp",0;
+ mes "Hey, Lime.";
+ mes "We have a guest.";
+ mes "...";
+ }
+ else if (VER_MAIN == 4) {
+ cutin "looke_rapez02.bmp",0;
+ mes "...";
+ mes "I've got nothing to say to you.";
+ }
+ else {
+ cutin "looke_rapez03.bmp",0;
+ mes "Hmm...";
+ }
+ close3;
+}
+
+moc_para01,133,170,4 script Commander Arquien#e152a1 4_F_EDEN_MASTER,{
+ if (checkweight(1301,1) == 0) {
+ mes "- Cannot progress quest because you have too many items in your possession. -";
+ close;
+ }
+ switch(VER_MAIN) {
+ case 0:
+ cutin "Arquien_n_atnad02.bmp",2;
+ mes "[Commander Arquien]";
+ mes "Huh? I don't know who you are but don't come in here without asking.";
+ mes "I would like it if you left immediately.";
+ break;
+ case 1:
+ case 2:
+ if (VER_MAIN == 1) {
+ mes "[Commander Arquien]";
+ cutin "Arquien_n_atnad01.bmp",2;
+ mes "Oh, you're that famous " + strcharinfo(0) + "?";
+ mes "I should offer you some tea or something but I don't have any tea.";
+ mes "Sorry about that.";
+ next;
+ mes "[Commander Arquien]";
+ mes "I will introduce myself first. I am the founder of the Paradise Squad and its Commander Arquien Nile Atnad.";
+ mes "My name is complicated so you can just call me Nile.";
+ next;
+ switch( select( "What brings you to see me?", "Your middle name?" ) ) {
+ case 1:
+ cutin "Arquien_n_atnad03.bmp",2;
+ mes "[Nile]";
+ mes "Huh, right to the point?";
+ mes "I welcome it.";
+ mes "You know what is the biggest rumor going around town these days?";
+ break;
+ case 2:
+ mes "[Nile]";
+ mes "It's childhood name my mother gave me when I was young..";
+ mes "It feels better to hear than the name given to me by my damn father, okay?";
+ next;
+ mes "[Nile]";
+ mes "Instead of being entertained by other people's personal life, why don't you focus on something else?";
+ mes "They are talking about it a lot these days.";
+ break;
+ }
+ next;
+ cutin "Arquien_n_atnad01.bmp",2;
+ mes "[Nile]";
+ mes "Right. About the extended excavation of juperos.";
+ mes "They already excavated as much as they could..";
+ mes "Hasn't it been awhile since people have been turning it over claiming it as some kind of unknown mechanical civilization, a product of scientific power?";
+ next;
+ mes "[Nile]";
+ mes "So.. Why are they promoting and recruiting for the excavation now?";
+ mes "Didn't you see the recruitment notice posted on the squad office?";
+ next;
+ mes "[Nile]";
+ mes "First this is the information we have.";
+ mes "A new passage is discovered in the juperos area.";
+ mes "So we thought it was another area of juperos...";
+ next;
+ mes "[Nile]";
+ mes "Surprisingly the newly discovered area is connected to juperos but it is another site with a different form.";
+ mes "This excavation's goal is that newly discovered area.";
+ next;
+ cutin "Arquien_n_atnad04.bmp",2;
+ mes "[Nile]";
+ mes "What.. was.. the name. Ah.. I don't know.";
+ mes "It is commonly being referred to as the 'Fantasmagorica' plan.";
+ mes "Rekenber of Lighthalzen is the sponser of the excavation recruitment and support.";
+ next;
+ select("So?");
+ mes "[Nile]";
+ mes "Huh? Not that interesting?";
+ mes "Should I stop here?";
+ mes "I was prepared because Rahim recommended you.";
+ next;
+ if (select( "Please continue.", "Please stop." ) == 2) {
+ cutin "Arquien_n_atnad02.bmp",2;
+ mes "[Nile]";
+ mes "Well, I'm not interested in telling more to somebody who's not interested either.";
+ mes "You're not the only one registered with the Paradise Squad.";
+ next;
+ mes "[Nile]";
+ mes "I should ask Rahim to recommend me someone else.";
+ mes "I get it so go on along now.";
+ VER_MAIN = 2;
+ break;
+ }
+ cutin "Arquien_n_atnad01.bmp",2;
+ mes "[Nile]";
+ mes "Sure. We also wanted to participate in the Fantasmagorica.";
+ }
+ else {
+ cutin "Arquien_n_atnad02.bmp",2;
+ mes "[Nile]";
+ mes "... What, you're interested again now?";
+ next;
+ if (select("Yes","No.") == 2) {
+ cutin "Arquien_n_atnad01.bmp",2;
+ mes "[Nile]";
+ mes "As you wish.";
+ break;
+ }
+ cutin "Arquien_n_atnad01.bmp",2;
+ mes "[Nile]";
+ mes "Should I continue talking?";
+ mes "We also wanted to participate in the Fantasmagorica.";
+ }
+ mes "Of course under the name of Paradise Squad.";
+ next;
+ mes "[Nile]";
+ mes "Although we operated mostly as a broker between clients and implementers";
+ mes "we can't be stuck with Morroc forever.";
+ next;
+ mes "[Nile]";
+ mes "Rahim argued that we can advance further by using this as an opportunity.";
+ mes "Through this work we have during that time become acquainted and networked with many adventurers and strong warriors like you..";
+ next;
+ cutin "Arquien_n_atnad03.bmp",2;
+ mes "[Nile]";
+ mes "I'm saying we want to use your manpower. Aren't we pros at introducing human resources? Ahahahahaha~";
+ next;
+ cutin "Arquien_n_atnad01.bmp",2;
+ mes "[Nile]";
+ mes "Truthfully the infamously haughty Rekenber requested us.";
+ mes "They are in need to a lot of manpower so they need us to broker.";
+ next;
+ mes "[Nile]";
+ mes "Not a bad proposition. Honestly it's a good opportunity.";
+ mes "We introduce people and get paid, you work and get paid.";
+ next;
+ select("Wanting to participate in Fantasmagorica?");
+ mes "[Nile]";
+ mes "It can be summarized as such.";
+ mes "Basically you're participating in the site excavation work but";
+ mes "you can help with a personal favor as well.";
+ next;
+ mes "[Nile]";
+ mes "If you participate in the excavation team can you confirm something for me?";
+ mes "You will hear more details from Rahim..";
+ next;
+ mes "[Nile]";
+ mes "I want one thing.";
+ mes "There are several excavation teams and organizations currently participating in the Fantasmagorica excavation.";
+ mes "I would like you to work in an excavation team Rahim introduces.";
+ next;
+ cutin "Arquien_n_atnad02.bmp",2;
+ mes "[Nile]";
+ mes "And, as your working with the excavation team ^4d4dffask about the Last Exploration.^000000";
+ mes "Rahim will give you the details.";
+ next;
+ cutin "Arquien_n_atnad01.bmp",2;
+ mes "[Nile]";
+ mes "It's the next room so you can get the details there.";
+ mes "Also, if you find out anything let me know. You don't need to tell anybody else.";
+ mes "Come right back here. Got it?";
+ completequest 7607;// Eden Group Leader
+ setquest 7608;// Artnard Excavation Team 1
+ VER_MAIN = 3;
+ break;
+ case 3:
+ cutin "Arquien_n_atnad04.bmp",2;
+ mes "[Nile]";
+ mes "Rahim is waiting in the next room.";
+ mes "He is the one who started this work first so get the details from him.";
+ break;
+ case 4:
+ cutin "Arquien_n_atnad01.bmp",2;
+ mes "[Nile]";
+ mes "Hey, are you beginning in earnest now?";
+ mes "Then what are you doing here? Run off now!";
+ next;
+ cutin "Arquien_n_atnad04.bmp",2;
+ mes "[Nile]";
+ mes "Run off and look at that stuck-up doctor for me.";
+ mes "Ah....He's not starving and being weak is he? Huh?";
+ mes "Observe and tell me.";
+ next;
+ mes "[Nile]";
+ mes "Now-! Go now!";
+ break;
+ case 21:
+ cutin "Arquien_n_atnad03.bmp",2;
+ mes "[Nile]";
+ mes "Huh? What's going on?";
+ mes "If it's about reports, I am getting them through Looke.";
+ mes "I heard you are working pretty hard?";
+ next;
+ mes "[Nile]";
+ mes "Thanks to that your position with the Atnad excavator and Paradise Squad are getting better so it is great.";
+ mes "... It would better if it wasn't for my damn father.";
+ next;
+ cutin "Arquien_n_atnad01.bmp",2;
+ mes "[Nile]";
+ mes "Anyway, why did you come?";
+ mes "Did you find out about the Last Exploration?";
+ next;
+ mes "[Nile]";
+ mes "He told you to being something back?";
+ mes "What, is that?";
+ next;
+ input .@string$;
+ while(.@string$ != "Record Player") {
+ cutin "Arquien_n_atnad01.bmp",2;
+ mes "[Nile]";
+ mes "I am not sure what you're talking about but..";
+ mes "He told you to bring it back?";
+ mes "Why would I?";
+ next;
+ mes "[Nile]";
+ mes "Tell me exactly what it is you have to take back.";
+ next;
+ input .@string$;
+ }
+ cutin "Arquien_n_atnad02.bmp",2;
+ mes "[Nile]";
+ mes "Hum...Record Player?";
+ mes "He actually remembers there was something like that in the house?";
+ next;
+ cutin "Arquien_n_atnad04.bmp",2;
+ mes "[Nile]";
+ mes "I don't know how this will affect your position but...";
+ mes "I don't think so?";
+ mes "Reject!";
+ VER_MAIN = 22;
+ break;
+ case 22:
+ cutin "Arquien_n_atnad02.bmp",2;
+ mes "[Nile]";
+ mes "......";
+ next;
+ mes "[Nile]";
+ mes "......";
+ mes "........";
+ next;
+ cutin "Arquien_n_atnad04.bmp",2;
+ mes "[Nile]";
+ mes "Darn it.";
+ mes "Okay. I got it.";
+ mes "I have the record player.";
+ mes "Give me Memory Records if you have them!";
+ next;
+ cutin "Arquien_n_atnad01.bmp",2;
+ mes "[Nile]";
+ mes "Hm.. is this it?";
+ mes "Looks like it will fit.";
+ mes "You mean this came out of that place?";
+ mes "But this might be a bit tough.";
+ next;
+ mes "[Nile]";
+ mes "My stupid father didn't care about the things in the house because he was too busy outside.";
+ mes "Can't he didn't notice something like this.";
+ next;
+ mes "[Nile]";
+ mes "Humph. Unfortunately I think somebody took this Memory Record apart on purpose.";
+ mes "It won't run with just one piece.";
+ mes "I need at least five.";
+ next;
+ mes "[Nile]";
+ mes "Hm..";
+ mes "Okay. Then let's do this.";
+ mes "I will go to the excavation site with the record player.";
+ next;
+ mes "[Nile]";
+ mes "You collect the remaining Memory Records during that time.";
+ mes "Somebody probably did it on purpose so pieces will be scattered around.";
+ next;
+ mes "[Nile]";
+ mes "You understood, what I said?";
+ mes "Then let's see each other in Verus.";
+ erasequest 7644;// Record Player
+ setquest 7645;// Piece of Memory Record
+ VER_MAIN = 23;
+ break;
+ case 23:
+ cutin "Arquien_n_atnad01.bmp",2;
+ mes "[Nile]";
+ mes "Collect ^4d4dff5 things like memory records^000000.";
+ mes "They will be hidden in places around Verus somewhere, so good luck.";
+ next;
+ mes "[Nile]";
+ mes "..You.. Me going to the excavation site..";
+ mes "Keep it a secret from my father..";
+ mes "..Hm..";
+ mes "Well, no special reason to keep it a secret.";
+ mes "Do as you wish.";
+ break;
+ default:
+ cutin "Arquien_n_atnad01.bmp",2;
+ mes "[Nile]";
+ if (VER_MAIN < 21) {
+ mes "How is work on the excavation team?";
+ mes "..Rahim is doing well right?";
+ next;
+ cutin "Arquien_n_atnad02.bmp",2;
+ mes "[Nile]";
+ mes "... The old man. He's doing well? What? Is he? Maybe it's funny and childish to be like this at this point.";
+ mes "Darn! I don't know. Get out!";
+ }
+ else {
+ mes "I'm not going there myself because of curiosity.";
+ mes "I am a busy person myself.";
+ }
+ break;
+ }
+ close3;
+}
+
+ver_eju,114,40,4 script Manager Michelle#atnd05 4_M_LGTGUARD,{
+ mes "[Manager Michelle]";
+ if (VER_MAIN < 4) {
+ mes "Wait. Which excavation team are you from?";
+ mes "...You're independent.";
+ mes "Did you register independently? Do you have a referral?";
+ next;
+ mes "[Manager Michelle]";
+ mes "I didn't think so.";
+ mes "I'm sorry, but you have to have a referral or belong to an excavation team.";
+ mes "All sorts of people came looking for a job at the excavation site.";
+ next;
+ mes "[Manager Michelle]";
+ mes "Oh, yes. The ^4d4dffEden Group^000000 is the easiest place to get a referral.";
+ mes "If you're qualified, then the Group will recommend you to us for the excavation project.";
+ next;
+ mes "[Manager Michelle]";
+ mes "Now, please step back for your safety.";
+ close;
+ }
+ if (VER_MAIN == 4) {
+ if (checkquest(7611,HUNTING) == -1) {
+ mes "Wait.";
+ mes "Are you a participant of the Phantasmagorika excavation project?";
+ next;
+ select("Yes.");
+ mes "[Manager Michelle]";
+ mes "Let me check the roster.";
+ mes "Your name is... " + strcharinfo(0) + ". Ah, there you are.";
+ mes "You're from the Eden Group, all right.";
+ next;
+ mes "[Manager Michelle]";
+ mes "The excavation site is at the other end of this tunnel.";
+ mes "Once you're in, you're required to formally register yourself at the Central Command Center.";
+ next;
+ mes "[Manager Michelle]";
+ mes "Oh, and do me a favor.";
+ mes "Monsters from Juperos Ruins have migrated into the tunnel,";
+ mes "and they're getting out of hand.";
+ next;
+ mes "[Manager Michelle]";
+ mes "Could you help us take care of them? Including the ones around here.";
+ mes "I'll write a letter of recommendation for you, so you can claim your rewards at the Central Command Center.";
+ setquest 7611;// Passage Cleaning
+ close;
+ }
+ mes "Just clear the tunnel of monsters,";
+ mes "and report to the Central Command Center.";
+ mes "Thank you for your help.";
+ close;
+ }
+ switch( checkquest(7612,PLAYTIME) ) {
+ case -1:
+ switch( checkquest(7611,HUNTING) ) {
+ case -1:
+ mes "Can you help me again?";
+ mes "You know, exterminate monsters in the tunnel and around this area.";
+ mes "This time, you can just report back to me instead of making a trip to the Central Command Center.";
+ mes "Thank you for your help.";
+ setquest 7611;// Passage Cleaning
+ close;
+ case 0:
+ case 1:
+ mes "Just get rid of some in the tunnel and around here.";
+ mes "I'm glad you like the job.";
+ next;
+ mes "[Manager Michelle]";
+ mes "When you're done, you can report back to me,";
+ mes "or go to Louis at the Central Command Center.";
+ mes "Thank you for your help.";
+ close;
+ case 2:
+ mes "Oh, good job wiping out monsters.";
+ mes "Our soldiers will be grateful for your help.";
+ mes "Please take this small token of appreciation.";
+ mes "I hope it'll be useful for you.";
+ erasequest 7611;// Passage Cleaning
+ setquest 7612;// Passage Cleaning - Down
+ getexp 1500000,1000000;
+ close;
+ }
+ case 0:
+ case 1:
+ mes "Thank you for clearing the tunnel of monsters.";
+ mes "I'll appreciate it if you can keep doing it.";
+ close;
+ case 2:
+ mes "Are you looking for a new job?";
+ mes "If you prefer physical labor,";
+ mes "you can always exterminate monsters for me.";
+ close;
+ }
+
+OnInit:
+ questinfo 7611,QTYPE_QUEST,1;
+ setquestinfo_req 7611,7612,0;
+ // questinfo 7612,QTYPE_QUEST,1;
+ // setquestinfo_req 7612,7611,2;// todo : display when HUNTING completed
+ end;
+}
+
+verus04,182,168,5 script Receptionist Nara#atnd06 4_F_HUWOMAN,{
+ mes "[Nara]";
+ if (VER_MAIN < 4) {
+ mes "Hello.";
+ mes "Thank you for using the Phantasmagorika excavation reception desk.";
+ mes "Do you have a referral? Or are you a member of an excavation team?";
+ next;
+ mes "[Nara]";
+ mes "Oh, neither.";
+ mes "I'm sorry, but I can't let you register.";
+ mes "We do need excavators, but we have standards.";
+ next;
+ switch( select( "I want to register now.", "I'll come back later." ) ) {
+ case 1:
+ mes "[Nara]";
+ mes "Come back with an official excavation team, or bring a referral.";
+ close;
+ case 2:
+ mes "[Nara]";
+ mes "Hm...";
+ mes "I'm sorry, but my hands are tied.";
+ mes "This place is too dangerous for you at this moment.";
+ next;
+ mes "[Nara]";
+ mes "Please come back when you become more experienced.";
+ mes "You must be at least Level 140 to register with us.";
+ mes "This is necessary, or we'll just have a ragtag bunch of novices for the excavators.";
+ mes "Sorry.";
+ close;
+ }
+ }
+ if (VER_MAIN == 4) {
+ mes "Hello.";
+ mes "Thank you for using the Phantasmagorika excavation reception desk.";
+ mes "Do you have a referral? Or are you a member of an excavation team?";
+ next;
+ select("I'm from the Eden Group.");
+ mes "[Nara]";
+ mes "From the Eden Group, got it.";
+ mes "May I have your name? " + strcharinfo(0) + "...";
+ mes "Ah, there you are.";
+ next;
+ mes "[Nara]";
+ mes "You're a member of a separate excavation team.";
+ mes "Which excavation team do you belong?";
+ next;
+ input .@string$;
+ mes "[Nara]";
+ if (.@string$ != "Atnad") {
+ mes "..." + .@string$ + "...?";
+ mes "Are you sure that's correct?";
+ mes "Because I can't find that name on the list.";
+ next;
+ mes "[Nara]";
+ mes "Please check again.";
+ close;
+ }
+ mes "Atnad... Atnad...";
+ mes "Oh, I've found it.";
+ mes "With you " + strcharinfo(0) + ", the team barely passed the minimum member requirement.";
+ mes "Oh, we don't discriminate against small groups. Don't worry.";
+ next;
+ mes "[Nara]";
+ mes "While following the command of your excavation team leader,";
+ mes "you can also take on tasks available at the Central Command Center.";
+ next;
+ mes "[Nara]";
+ mes "We'll inform you in case of special events.";
+ mes "If you're wounded or exhausted, you can always use healers on standby at the Command Center.";
+ next;
+ mes "[Nara]";
+ mes "Rekenber provides you with everything you need while working at the excavation site.";
+ mes "In return, we expect you to focus on uncovering secrets buried within Phantasmagorika.";
+ mes "Good luck with your excavation.";
+ erasequest 7609;// Artnard Excavation Team 2
+ setquest 7610;// Registered Excavator
+ completequest 7610;// Registered Excavator
+ VER_MAIN = 5;
+ getexp 300000,300000;
+ close;
+ }
+ if (VER_MAIN == 5) {
+ mes "Now you have unlimited access to this area.";
+ mes "Feel free to let us know if you experience problems excavating or exploring.";
+ next;
+ mes "[Nara]";
+ mes "Your registration has been processed. If you need help or instructions, please talk to Commander Louis.";
+ mes "He'll also have some monster subjugation tasks available for you.";
+ next;
+ mes "[Nara]";
+ mes "Good luck!";
+ close;
+ }
+ mes "How are you today?";
+ mes "Keep up the good work.";
+ close;
+
+OnInit:
+ questinfo 7610, QTYPE_QUEST, 1;
+ setquestinfo_level 7610,140,175;
+ end;
+}
+
+verus04,179,165,5 script Commander Louis#atnd07 4_M_LGTGUARD,{
+ if (checkweight(1301,1) == 0) {
+ mes "- You are carrying too many items to proceed with the quest. -";
+ close;
+ }
+ mes "[Louis]";
+ if (VER_MAIN < 5) {
+ mes "Register yourself as an official excavator, or you'll be escorted off the premises.";
+ mes "You can register at the Reception Desk.";
+ close;
+ }
+ mes "You're in the Arnard Excavation Team.";
+ mes "How may I help you?";
+ next;
+ switch( select( "Report excavation results.", "About cleaning the tunnel.", "About monster subjugation.", "Nothing." ) ) {
+ case 1:
+ mes "[Louis]";
+ if (VER_MAIN == 12) {
+ mes "Ah, the excavation results of your team.";
+ mes "I can see your team has been focusing on the Core.";
+ next;
+ mes "[Louis]";
+ mes "The Chairman has taken a special interest in your team.";
+ mes "Keep up the good work, and you'll hear from him.";
+ next;
+ mes "[Louis]";
+ mes "Thank you for your hard work today.";
+ mes "See you tomorrow.";
+ next;
+ mes "[Louis]";
+ mes "Oh, wait.";
+ mes "Your team is on the radio.";
+ mes "Let me put you on the line.";
+ next;
+ mes "[Ian Atnad's Voice]";
+ mes "*Crackle* Hey... *Crackle* rookie...";
+ mes "*Crackle* What's wrong... with this...";
+ mes "*Crackle* I can't hear...";
+ mes "Rookie... *Crackle* Get your butt over here... *Crackle*";
+ mes "Hmpf! *Beep*";
+ next;
+ mes "[Louis]";
+ mes "I'm sorry, the signals aren't usually so bad.";
+ mes "I guess the doctor is looking for you.";
+ mes "You should go.";
+ delitem 6748,1;// Daily_Report_He_And_His_Team
+ erasequest 7617;// Turning In Excavation Report
+ setquest 7623;// Artnard's Summon
+ VER_MAIN = 13;
+ getexp 300000,300000;
+ }
+ else if (VER_MAIN == 13) {
+ mes "It was a brief investigation, yet your team has accomplished so much.";
+ next;
+ mes "[Louis]";
+ mes "While other scholars and excavators were only able to make superficial observations,";
+ mes "your team made some technical discoveries.";
+ next;
+ mes "[Louis]";
+ mes "I'll report this to the Chairman, and see that your team will receive special benefits.";
+ mes "I'll look forward to your next report.";
+ }
+ else if (VER_MAIN == 33) {
+ mes "Ah, the excavation results of your team.";
+ mes "I can see your team has been focusing on the Core.";
+ next;
+ mes "[Louis]";
+ mes "The Chairman has taken a special interest in your team.";
+ mes "Keep up the good work, and you'll hear from him.";
+ next;
+ mes "[Louis]";
+ mes "Thank you for your hard work today.";
+ mes "See you tomorrow.";
+ delitem 6748,1;// Daily_Report_He_And_His_Team
+ erasequest 7617;// Turning In Excavation Report
+ setquest 7618;// Reporting the Results - Down
+ getexp 300000,300000;
+ VER_MAIN = 34;
+ }
+ else if (VER_MAIN == 34) {
+ mes "The upper management is interested in";
+ mes "hearing more about your findings.";
+ mes "I hope you'll continue to surprise us.";
+ }
+ else {
+ mes "Are you here to report your daily results?";
+ mes "Please bring me a report with your leader's signature on it.";
+ next;
+ mes "[Louis]";
+ mes "It's always safe to leave a record.";
+ mes "Bring your report as soon as it's ready.";
+ mes "It always excites me to read your report.";
+ }
+ close;
+ case 2:
+ mes "[Louis]";
+ switch( checkquest(7612,PLAYTIME) ) {
+ case -1:
+ switch( checkquest(7611,HUNTING) ) {
+ case -1:
+ mes "Ah, you came at the right time.";
+ mes "Monsters are growing more numerous in the tunnel and the ruins.";
+ mes "The mercenaries have requested reinforcements.";
+ next;
+ if (select( "I'll go.", "Decline." ) == 2) {
+ mes "[Louis]";
+ mes "Of course, your priority is the excavation.";
+ mes "I'll look for someone else.";
+ close;
+ }
+ mes "[Louis]";
+ mes "Good.";
+ mes "Thank you in advance.";
+ mes "When you're done, you can report the results to Manager Michell in the eastern ruins.";
+ mes "Happy hunting.";
+ setquest 7611;// Passage Cleaning
+ close;
+ case 0:
+ case 1:
+ mes "Thank you.";
+ mes "Move through the tunnel and get rid of monsters in there.";
+ mes "When you're done, please report the results to Manager Michell in the eastern ruins.";
+ close;
+ case 2:
+ mes "Did you take care of monsters in the tunnel and the ruins?";
+ mes "Our mercenaries will be happy.";
+ mes "They've been demanding reinforcements for a while now. Hah hah!";
+ next;
+ mes "[Louis]";
+ mes "Thank you for your hard work.";
+ mes "Please go rest, so that you can get back on the excavation task.";
+ erasequest 7611;// Passage Cleaning
+ setquest 7612;// Passage Cleaning - Down
+ getexp 1500000,1000000;
+ close;
+ }
+ case 0:
+ case 1:
+ mes "Our mercenaries can take care of monsters in the tunnel and the ruins.";
+ mes "But thank you for your concern for the safety of the site.";
+ close;
+ case 2:
+ erasequest 7612;// Passage Cleaning - Down
+ mes "Are you concerned about monsters in the tunnel and the ruins?";
+ mes "If you're fully rested, then I can put you on the subjugation task.";
+ next;
+ mes "[Louis]";
+ mes "If you're planning to go outside, you might as well take the task, killing two birds with one stone.";
+ mes "And you can report the results to Manager Michell in the eastern ruins.";
+ close;
+ }
+ case 3:
+ mes "[Louis]";
+ switch( checkquest(7614,PLAYTIME) ) {
+ case -1:
+ switch( checkquest(7613,HUNTING) ) {
+ case -1:
+ mes "Ah, you came at the right time.";
+ mes "Threatening machines have appeared at the Plaza.";
+ mes "The workers have requested a combat unit.";
+ next;
+ if (select( "I'll go.", "Decline." ) == 2) {
+ mes "[Louis]";
+ mes "Of course, your priority is the excavation.";
+ mes "I'll look for someone else.";
+ close;
+ }
+ mes "[Louis]";
+ mes "Good.";
+ mes "Thank you in advance.";
+ mes "Please be careful!";
+ setquest 7613;// Eliminating Risks
+ close;
+ case 0:
+ case 1:
+ mes "Thank you.";
+ mes "The Plaza is where most of the excavation work is being done.";
+ mes "It'll be great if you can find something from machines you destroy.";
+ close;
+ case 2:
+ mes "Things seems to have settled.";
+ mes "The workers will resume their work soon.";
+ mes "They're not fighters, so they're usually passive in times like this.";
+ next;
+ mes "[Louis]";
+ mes "Thank you for your hard work.";
+ mes "Our workers will be grateful to you for keeping them safe.";
+ erasequest 7613;// Eliminating Risks
+ setquest 7614;// Eliminating Risks - Down
+ getexp 1500000,1000000;
+ close;
+ }
+ case 0:
+ case 1:
+ mes "I have other volunteers to take care of monsters at the Plaza, the main excavation point.";
+ mes "You should rest.";
+ close;
+ case 2:
+ erasequest 7614;// Eliminating Risks - Down
+ mes "Are you concerned about the machines at the main excavation point?";
+ mes "It's true that some of them are hypersensitive and aggressive,";
+ mes "and I agree they are threatening to our work.";
+ next;
+ mes "[Louis]";
+ mes "If you can take care of them, then I can officially put you on the task,";
+ mes "so you'll be rewarded accordingly. Rekenber never takes your service for granted.";
+ close;
+ }
+ case 4:
+ mes "[Louis]";
+ mes "Is that so?";
+ mes "Let me know if you notice anything peculiar.";
+ close;
+ }
+
+OnInit:
+ questinfo 7611,QTYPE_QUEST,1;
+ setquestinfo_req 7611,7612,0;
+ // questinfo 7612,QTYPE_QUEST,1;
+ // setquestinfo_req 7612,7611,2;// todo : display when HUNTING completed
+
+ questinfo 7613,QTYPE_QUEST,1;
+ setquestinfo_req 7613,7614,0;
+ // questinfo 7614,QTYPE_QUEST,1;
+ // setquestinfo_req 7614,7613,2;// todo : display when HUNTING completed
+ end;
+}
+
+verus04,176,161,5 script Healer Miyo#atnd08 4_F_ACOLYTE,{
+ mes "[Miyo]";
+ mes "Please come in.";
+ mes "Where do you hurt?";
+ next;
+ .@s = select( "HP/SP full recovery 5,000 z", "HP/SP half recovery 2,000 z" );
+ if (VER_MAIN > 4)
+ setarray .@cost[1],4500,1800;
+ else
+ setarray .@cost[1],5000,2000;
+ Zeny = Zeny - .@cost[.@s];
+ percentheal (100 / .@s), (100 / .@s);
+ mes "[Miyo]";
+ mes "Oh, you're exhausted.";
+ mes "Let me restore " + ( .@s == 1 ? "your full" : "some of your" ) + " energy.";
+ mes "I'm offering a 10% discount to the official excavators.";
+ mes "Smile, and you'll feel better.";
+ close;
+}
+
+verus04,172,149,3 script Commander Arquien#e152v0 4_F_EDEN_MASTER,{
+ mes "[Nile]";
+ if (VER_MAIN < 23) {
+ cutin "Arquien_n_atnad01.bmp",2;
+ mes "I just.. Don't want to let it be known I am there..";
+ mes "If you have business, let's meet officially in the Squad office.";
+ close3;
+ }
+ switch(VER_MAIN) {
+ case 23:
+ if (countitem(6757) < 5) {// The_Memory_Recorder
+ cutin "Arquien_n_atnad04.bmp",2;
+ mes "Do you not remember what I told you at the office?";
+ mes "I said if you want to play it, you need at least five.";
+ next;
+ cutin "Arquien_n_atnad01.bmp",2;
+ mes "[Nile]";
+ mes "The other pieces should be at the place you first found the 'Memory Record.'";
+ mes "So go there and thoroughly search the area.";
+ }
+ else {
+ cutin "Arquien_n_atnad01.bmp",2;
+ mes "Did you bring it?";
+ mes "Good. Put them together like this...";
+ mes "Put it here...";
+ next;
+ mes "[Nile]";
+ mes "Alright, all ready.";
+ mes "You push the play switch youself.";
+ delitem 6757,5;// The_Memory_Recorder
+ erasequest 7645;// Piece of Memory Record
+ setquest 7646;// Play Memory Record
+ VER_MAIN = 24;
+ emotion ET_SURPRISE, getnpcid(0,"Record player#e152a01");
+ }
+ break;
+ case 24:
+ cutin "Arquien_n_atnad01.bmp",2;
+ mes "It's the table right here.";
+ mes "I set it up so you can operate it.";
+ mes "You just have to play it.";
+ break;
+ case 25:
+ cutin "Arquien_n_atnad02.bmp",2;
+ mes "...The content is not a big deal.";
+ mes "Why.. is the name Atnad mentioned?";
+ mes "Does the old man know too?";
+ next;
+ cutin "Arquien_n_atnad01.bmp",2;
+ mes "[Nile]";
+ mes "No, no. He probably doesn't know.";
+ mes "Still feels like there is something to this.";
+ mes "..Ah thinking like this isn't my thing.";
+ next;
+ mes "[Nile]";
+ mes "You go and tell him about the content.";
+ mes "And this Memory Record.. Oh..?";
+ specialeffect EF_SPELLBREAKER,AREA,"Record player#e152a01";
+ next;
+ select("What just happened..");
+ mes "[Nile]";
+ mes "What is this..? Is it static?";
+ mes "The content won't be erased, right?";
+ mes "What do you call this type. Was it physical record.";
+ mes "I am not sure but the content itself should be fine.";
+ mes "It would be problematic if this much disappears.";
+ next;
+ mes "[Nile]";
+ mes "Recite the general idea to the old man, and ask him why the name Atnad is mentioned.";
+ erasequest 7646;// Play Memory Record
+ setquest 7647;// Report Memory Record
+ VER_MAIN = 26;
+ getexp 750000,500000;
+ break;
+ case 26:
+ cutin "Arquien_n_atnad04.bmp",2;
+ mes "You remember the gist right?";
+ mes "Just go and report it.";
+ mes "Tell him I will collect the items myself.";
+ mes "He will probably have no problem.";
+ mes "Since the old man is soooooo superior.";
+ break;
+ case 27:
+ if (countitem(6824) < 5) {// // Experimental_Dong_Memory_Record
+ cutin "Arquien_n_atnad04.bmp",2;
+ mes "Ha. That old man..";
+ mes "He will never come here himself, will he?";
+ mes "So this time it's the laboratories Memory Records?";
+ next;
+ cutin "Arquien_n_atnad03.bmp",2;
+ mes "[Nile]";
+ mes "I can press the record player switch for you.";
+ mes "Am I not generous?";
+ next;
+ mes "[Nile]";
+ mes "Bring back the Memory Records of the laboratories you want to play.";
+ mes "You know 5 have to be collected, right?";
+ }
+ else {
+ cutin "Arquien_n_atnad01.bmp",2;
+ mes "So it's these things.";
+ mes "Okay.";
+ mes "I don't feel that great but work is work.";
+ next;
+ mes "[Nile]";
+ mes "It's done.";
+ mes "You'll get what you want just by playing it.";
+ mes "Record the message properly and pass it along to the doctor. Got it?";
+ delitem 6824,5;// Experimental_Dong_Memory_Record
+ VER_MAIN = 28;
+ }
+ break;
+ case 28:
+ cutin "Arquien_n_atnad01.bmp",2;
+ mes "The record player is next to me.";
+ mes "Listen to it yourself, record the messages yourself.";
+ break;
+ case 29:
+ cutin "Arquien_n_atnad02.bmp",2;
+ mes "So that crunching noise, wasn't static but the sound of the connecting part cracking?";
+ mes "You can play it if you connect them into 5 again, the content will be preserved...";
+ mes "Anyway...";
+ next;
+ mes "[Nile]";
+ mes "..The content this time again is peculiar.";
+ mes "The experimental work, is it talking about the experiment that turned this place like this?";
+ mes "I mean the laboratories Memory Records.";
+ next;
+ cutin "Arquien_n_atnad04.bmp",2;
+ mes "[Nile]";
+ mes "It may perhaps play a big role in revealing the secrets of this area?";
+ mes "Although some of these findings are repeating the same content.";
+ next;
+ select("Show piece.");
+ cutin "Arquien_n_atnad02.bmp",2;
+ mes "[Nile]";
+ mes "Ho..this is interesting.";
+ mes "Was there an empty space in the middle of the record?";
+ mes "This part was breaking.";
+ mes "I feel a great evil design from this piece.";
+ mes "Make sure to handle this carefully.";
+ mes "You don't know what can happen.";
+ next;
+ cutin "Arquien_n_atnad03.bmp",2;
+ mes "[Nile]";
+ mes "Talking about these Memory Records.";
+ mes "It is interesting to listen to.";
+ mes "I'm going to participate so bring the Memory Records to me next time.";
+ next;
+ mes "[Nile]";
+ mes "You understand what I am saying?";
+ mes "Then, go to the old man and report this news.";
+ erasequest 7648;// Memory Records of the Laboratories
+ setquest 7649;// Report Memory Record Content
+ VER_MAIN = 30;
+ getexp 750000,500000;
+ next;
+ mes "^4d4dffYou can now receive daily quests for collecting Memory Records through Arquien Nile Atnad.^000000";
+ break;
+ default:
+ cutin "Arquien_n_atnad01.bmp",2;
+ mes "What's going on?";
+ next;
+ switch( select( "Research facilities Memory Records", "Laboratories Memory Records", "Converse", "I just stopped by." ) ) {
+ case 1:
+ mes "[Nile]";
+ switch( checkquest(7651,PLAYTIME) ) {
+ case -1:
+ if (isbegin_quest(7650) > 0) {
+ if (countitem(6757) < 5) {
+ mes "5 Research facilities Memory Records.";
+ mes "I'm looking forward to hear about my ancestors again.";
+ close3;
+ }
+ mes "You obtained all the Memory Records.";
+ mes "I wonder how many Memory Records are out there with this content?";
+ next;
+ mes "[Nile]";
+ mes "I guess we have no choice to gather as much information as possible?";
+ mes "Preparations for playing the record is finished.";
+ mes "Just have to play it now.";
+ delitem 6757,5;// The_Memory_Recorder
+ if (isbegin_quest(7654) == 0)
+ setquest 7654;// Play Research facilities Memory Records
+ close3;
+ }
+ mes "Are you here to collect Research facilities Memory Records?";
+ mes "Let's do what we have been doing.";
+ mes "Collecting 5 Research facilities Memory Records.";
+ next;
+ mes "[Nile]";
+ mes "In the meantime I will be preparing the record player to play it right away.";
+ mes "I wonder what the content will be this time.";
+ next;
+ if (select( "Accept.","Reject." ) == 2) {
+ mes "[Nile]";
+ mes "Well, what can I do.";
+ mes "You are probably busy too from everybody you have to answer to.";
+ mes "Then see you later.";
+ close3;
+ }
+ mes "[Nile]";
+ mes "I knew you'd say that.";
+ mes "You're curious about the content too, right?";
+ mes "I will be looking forward to it as well.";
+ setquest 7650;// Collect Memory Records of Research facilities
+ close3;
+ case 0:
+ case 1:
+ mes "As for collecting the Research Facilities Memory Records, we decided to do it only once a day, right?";
+ mes "Should we drive the old man into anxiety by working slowly and roughly?";
+ next;
+ mes "[Nile]";
+ mes "So, come back if the time I suggested is passed.";
+ mes "And you will be tired as well.";
+ mes "I am not the type to shove people around.";
+ close3;
+ case 2:
+ erasequest 7651;// One Memory a Day
+ mes "Hm.. Should we start to gather Memory Records again?";
+ mes "Let me know if you want to.";
+ mes "I will be tuning the record player in the meanwhile.";
+ close3;
+ }
+ case 2:
+ mes "[Nile]";
+ switch( checkquest(7653,PLAYTIME) ) {
+ case -1:
+ if (isbegin_quest(7652) > 0) {
+ if (countitem(6824) < 5) {
+ mes "5 laboratories area's Memory Records.";
+ mes "I wonder what that Dorothy lady will talk about this time.";
+ close3;
+ }
+ mes "I see you have obtained all the laboratories Memory Records.";
+ mes "I wonder how many Memory Records are out there with this content?";
+ next;
+ mes "[Nile]";
+ mes "I guess we have no choice to gather as much information as possible?";
+ mes "Preparations for playing the record is finished.";
+ mes "Just have to play it now.";
+ delitem 6824,5;// Experimental_Dong_Memory_Record
+ if (isbegin_quest(7655) == 0)
+ setquest 7655;// Play Laboratories Memory Records
+ close3;
+ }
+ mes "Are you here to collect Research facilities Memory Records?";
+ mes "Let's do what we have been doing.";
+ mes "I mean ^4d4dffcollecting 5 laboratories Memory Records in the underground facility of laboratories^000000.";
+ next;
+ mes "[Nile]";
+ mes "In the meantime I will be preparing the record player to play it right away.";
+ mes "I wonder what the content will be this time.";
+ next;
+ if (select( "Accept.", "Reject." ) == 2) {
+ mes "[Nile]";
+ mes "Well, what can I do.";
+ mes "You are probably busy too from everybody you have to answer to.";
+ mes "Then see you later.";
+ close3;
+ }
+ mes "[Nile]";
+ mes "I knew you'd say that.";
+ mes "You're curious about the content too, right?";
+ mes "I will be looking forward to it as well.";
+ setquest 7652;// Collect Memory Records of Laboratories
+ close3;
+ case 0:
+ case 1:
+ cutin "Arquien_n_atnad01.bmp",2;
+ mes "As for collecting the laboratories Memory Records, we decided to do it only once a day, right?";
+ mes "Should we drive the old man into anxiety by working slowly and roughly?";
+ next;
+ mes "[Nile]";
+ mes "So, come back if the time I suggested is passed.";
+ mes "And you will be tired as well.";
+ mes "I am not the type to shove people around.";
+ close3;
+ case 2:
+ erasequest 7653;// One Memory a Day 2
+ mes "Hm.. Should we start to gather Memory Records again?";
+ mes "Let me know if you want to.";
+ mes "I will be tuning the record player in the meanwhile.";
+ close3;
+ }
+ case 3:
+ mes "[Nile]";
+ if (VER_MAIN >= 37) {
+ cutin "Arquien_n_atnad02.bmp",2;
+ mes "The truth is I didn't really have hard feelings forward my father.";
+ mes "I just wanted to hear one apology...";
+ close3;
+ }
+ if (VER_MAIN == 36) {
+ mes "Wait, something is going on?";
+ mes "That tent there is where the excavation team is, right?";
+ mes "It seems someone is visiting?";
+ mes "Go along now!";
+ cutin "",255;
+ close;
+ }
+ mes "What do you want to say?";
+ next;
+ select("About the Last Exploration");
+ mes "[Nile]";
+ mes "Ah, that..?";
+ mes "Forget about that.";
+ mes "Now that I think about it I need to hear it from him directly.";
+ next;
+ mes "[Nile]";
+ mes "According to Aures he blindly clung onto juperos..";
+ mes "I think I might know why he did that now.";
+ next;
+ select("Perhaps for the contents in the Memory Records?");
+ mes "[Nile]";
+ mes "That's right.";
+ mes "The old man. My father probably vaguely knows as well.";
+ mes "He's looking for his roots.";
+ mes "Although it is my childhood memories, the grandfathers had a lot of secrets.";
+ next;
+ cutin "Arquien_n_atnad03.bmp",2;
+ mes "[Nile]";
+ mes "Even so... haha. Can I really be a descendant of this area of Verus?";
+ mes "It's probably just the same name. Hahaha...";
+ close3;
+ case 4:
+ mes "[Nile]";
+ cutin "Arquien_n_atnad01.bmp",2;
+ mes "Hey. I don't have that much time to spare okay?";
+ close3;
+ }
+ }
+}
+
+// Note : 2 players can use the npc at the same time
+verus04,170,150,3 script Record player#e152a01 CLEAR_NPC,{
+ if (VER_MAIN == 24) {
+ mes "Playing audible information of the Memory Record.";
+ sleep2 1000;
+ npctalk "Whirr------ Zizip---";
+ sleep2 3000;
+ npctalk "Zizip-- Hey! What are you doing? Hey, are you listening?";
+ sleep2 3000;
+ npctalk "I'm listening. Zerter. .. Ah! You. Your voice got in this!";
+ sleep2 3000;
+ npctalk "What? You were recording? For what?";
+ sleep2 3000;
+ npctalk "For.. Zizizip--- Installing. Ah.. It's going to -zizizip.";
+ sleep2 3000;
+ npctalk "Hahahahaha that's what you are thinking? No one is like you Atnad. Aren't you --zizzip.";
+ sleep2 1000;
+ npctalk "..Atnad?";
+ sleep2 3000;
+ npctalk "Zizizip-- zizip..It's going to..criing---.. Bzz----";
+ sleep2 3000;
+ next;
+ VER_MAIN = 25;
+ mes "All audible information in the Memory Record has been played.";
+ close;
+ }
+ if (VER_MAIN == 28) {
+ mes "Playing audible information of the Memory Record.";
+ sleep2 1000;
+ npctalk "I am Dorothy Florence. I picked up a Memory Record in the Monitoring room today.";
+ sleep2 4000;
+ npctalk "It could be a black box recorded on the day of the experiment. I will play it!";
+ sleep2 4000;
+ npctalk "Zizip-- Ah.. static noise first... Ah. There it is.";
+ sleep2 4000;
+ npctalk "Goodluck..";
+ sleep2 4000;
+ npctalk "(Female Voice) Ha.. I regret never having dated.";
+ sleep2 4000;
+ npctalk "(Another Female Voice) Ah...... I should be seeing this while having chicken and beer.... zizizip--";
+ sleep2 4000;
+ npctalk "Huh? Is this all? But this voice. Ahhhhhh Artemia who checked her laundry!";
+ sleep2 4000;
+ npctalk "..Hum.. I see. That day. This is what happened.....";
+ sleep2 4000;
+ npctalk "Click";
+ sleep2 3000;
+ next;
+ mes "All audible information in the Memory Record has been played.";
+ getitem 22691,1;// Record_Fragment1
+ setquest 7653;// One Memory a Day 2
+ VER_MAIN = 29;
+ next;
+ mes "As you try to eject the Memory Record, the connecting part breaks with a cracking sound and returns to it's disassembled form.";
+ close;
+ }
+ .@quest_7654 = isbegin_quest(7654);// Play Research facilities Memory Records
+ .@quest_7655 = isbegin_quest(7655);// Play Laboratories Memory Records
+
+ if (.@quest_7654 > 0 || .@quest_7655 > 0) {
+ mes "Playing audible information of the Memory Record.";
+ sleep2 1000;
+ if (.@quest_7654 > 0) {
+ switch( rand(1,13) ) {// inaccurate (maybe more texts)
+ case 1:
+ npctalk "printf(Hello, World!)";
+ sleep2 4000;
+ npctalk "return 0";
+ sleep2 4000;
+ npctalk "Finished coding up to this point and shot 10 arrows.";
+ sleep2 4000;
+ npctalk "Ferdinando";
+ break;
+ case 2:
+ npctalk "Hello, Tatio";
+ sleep2 4000;
+ npctalk "I don't know how many years it has been.";
+ sleep2 4000;
+ npctalk "I guess I did a good thing by giving you eternal life.";
+ sleep2 4000;
+ npctalk "I guess you know the results of the outside exploration team? I am going to live outside.";
+ sleep2 4000;
+ npctalk "In this land where scientific civilization is a myth, I am going to live like primal man.";
+ sleep2 4000;
+ npctalk "Should I quit science and learn this thing called magic? Hahahahaha";
+ sleep2 4000;
+ npctalk "Smack! Stop saying stupid stuff!";
+ sleep2 4000;
+ npctalk "Ah.. Got hit again. My..zizizip.. hurts... zizizip";
+ break;
+ case 3:
+ npctalk "Hello, Tatio. Can you collect these and pick them up?";
+ sleep2 4000;
+ npctalk "I am playing around for you left alone in the city.";
+ sleep2 4000;
+ npctalk "Sorry for dumping all our hope and despair on you.";
+ sleep2 4000;
+ npctalk "How long do you have to stay in this grave of a city in solitude?";
+ sleep2 4000;
+ npctalk "I've decided to hide Memory Records for you.";
+ sleep2 4000;
+ npctalk "Of course I didn't even forget about the tiny parcels~!";
+ sleep2 4000;
+ npctalk "I was hoping to find the luxury to find and listen to these.";
+ sleep2 4000;
+ npctalk "...Your companion forever. Lasse Atnad.";
+ break;
+ case 4:
+ npctalk "Ah test test.. oh.. it works?";
+ sleep2 4000;
+ npctalk "Hello I am software engineer Sukurita.";
+ sleep2 4000;
+ npctalk "Today I am here to inform you of the points to note on Sukuta language used in the Sukuta engine.";
+ sleep2 4000;
+ npctalk "Skuta language can use both global and local variables..";
+ sleep2 4000;
+ npctalk "The global variable is like the devil and if you fall for the sweet allurement of";
+ sleep2 4000;
+ npctalk "the global variable you will suffer a heart palpitating and";
+ sleep2 4000;
+ npctalk "cold sweat inducing epilepsy over 1 byte of space or special syntax.";
+ sleep2 4000;
+ npctalk "Next time I will explain the alternative to Skuta language mhm mhm";
+ sleep2 4000;
+ npctalk "Sukurita language invented by I, Sukurita. Heeheeheehee";
+ break;
+ case 5:
+ npctalk "Click-zizip don't stop me Puhahaha I will leave this on record!";
+ sleep2 4000;
+ npctalk "Puhahahahahahahahaha";
+ sleep2 4000;
+ npctalk "I am not crazy, this is funny! It's because it's funny.";
+ sleep2 4000;
+ npctalk "This is a time to be laughing?";
+ sleep2 4000;
+ npctalk "Ah, of course not. It's not but hehehehe";
+ sleep2 4000;
+ npctalk "...Then should I cry? Huh? Hasn't this given you hope?";
+ sleep2 4000;
+ npctalk "Our hope!";
+ sleep2 4000;
+ npctalk "Clack-! Ah... this.. this smashing is Ze..Zerte.....";
+ sleep2 4000;
+ npctalk "Ugh. Blimey. You're a lot to handle.";
+ sleep2 4000;
+ npctalk "Huh? This was still recording?";
+ break;
+ case 6:
+ npctalk "Today is the last experiment and 4885th project of Verus city.";
+ sleep2 4000;
+ npctalk "Everybody wished to see the experiment succeed and went to the laboratories to observe.";
+ sleep2 4000;
+ npctalk "Except for me who is on shift in the Research facilities. Hahahaha";
+ sleep2 4000;
+ npctalk "Aha. Now I think Tatio is also not a member of the main project so is here with me in the Research facilities.";
+ sleep2 4000;
+ npctalk "It is lonely work.... Only if something good happened..";
+ sleep2 4000;
+ npctalk "Didn't something just flash? Hey!";
+ sleep2 4000;
+ npctalk "Booom! Zizizizip";
+ break;
+ case 7:
+ npctalk "Measurements for the survivors in the panic room are no longer being shown on the disaster system screen.";
+ sleep2 4000;
+ npctalk "What in the world happened?";
+ sleep2 4000;
+ npctalk "What is going on? Is it a system error?";
+ sleep2 4000;
+ npctalk "Tatio says Dr. Fresa is still alive.";
+ sleep2 4000;
+ npctalk "I pray that his heart is okay...";
+ break;
+ case 8:
+ npctalk "Hello, I am Lasse Atnad. I am on Research facility night duty again today.";
+ sleep2 4000;
+ npctalk "Huh? What is this? What are you doing now Atnad?";
+ sleep2 4000;
+ npctalk "Ey, can't you tell? I am voice recording!";
+ sleep2 4000;
+ npctalk "You're using an outdated recorder in this day and age? Record video. Video.";
+ sleep2 4000;
+ npctalk "That's my choice! Please don't disrupt me. Argh You attacked my weak spot Ahahaha";
+ sleep2 4000;
+ npctalk "...Zizip..click";
+ break;
+ case 9:
+ npctalk "Hey, Lasse. I am curious about something. Can you answer?";
+ sleep2 4000;
+ npctalk "What is it? What is it that you're pushing my recorder into my face?";
+ sleep2 4000;
+ npctalk "Since this is an interview. I am Zete, striving to reach the pinnacle of bioengineering..";
+ sleep2 4000;
+ npctalk "Enough with bragging. What are you curious about? What is it?";
+ sleep2 4000;
+ npctalk "It's just about Tatio, but he is mostly metameres. I heard that is Dr. Fresa's work, right?";
+ sleep2 4000;
+ npctalk "Yes. Dr. Fresa did research on mechanical substitution for the nervous system before coming to Verus city...";
+ sleep2 4000;
+ npctalk "Oh lala, then that couple came to meet because of that work?";
+ sleep2 4000;
+ npctalk "That's probably right? Tatio himself agreed to the human experiment without hesitation, so it was meant to be.";
+ sleep2 4000;
+ npctalk "Mhm.. So was it the fruit of an one-sided crush?";
+ sleep2 4000;
+ npctalk "Eh? What are you talking about? How did you conclude that? Others' personal life at that...";
+ sleep2 4000;
+ npctalk "Noo look. Fresa who distinguishes people into those useful for research, and to those useless..";
+ sleep2 4000;
+ npctalk "Then one day brings a husband so you know how surprised I was?!?!?!";
+ sleep2 4000;
+ npctalk "So, what you were interested in wasn't biotechnology but Dr. Fresa's love life. Ugh..";
+ sleep2 4000;
+ npctalk "Right! The Fresa! That stone of a woman has a lover..!! Can you believe it?";
+ sleep2 4000;
+ npctalk "I am sorry but. Isn't that enough?";
+ sleep2 4000;
+ npctalk "Heeek! Tatio, when. Did. You come hahahahaha !!! This. This isn't anything!";
+ sleep2 4000;
+ npctalk "Crash---! Click!";
+ break;
+ case 10:
+ npctalk "Explosion Day 32, voice record Lasse Atnad.";
+ sleep2 4000;
+ npctalk "The explosions inside the laboratories are not stopping.";
+ sleep2 4000;
+ npctalk "The condition of the researchers participating or observing the experiment is unknown";
+ sleep2 4000;
+ npctalk "except through the system vitals connected to the panic room.";
+ sleep2 4000;
+ npctalk "The plaza and research facilities have only been partially damaged by the explosion aftermath.";
+ sleep2 4000;
+ npctalk "However.. Some of the researchers and citizens have been killed by an unknown shock wave..";
+ sleep2 4000;
+ npctalk "We are currently assembling an exploration robot using the research facilities.";
+ sleep2 4000;
+ npctalk "Verus city main power source has stopped so minimal facilities are being powered by a secondary energy cube.";
+ sleep2 4000;
+ npctalk "Energy storms are still making accessing pass the laboratories partition impossible.";
+ sleep2 4000;
+ npctalk "The majority of the researchers are sick of being isolated in the city and are arguing for research on Time Sleep.";
+ sleep2 4000;
+ npctalk "..Within this grave we can't escape, we dream of going back in time.";
+ break;
+ case 11:
+ npctalk "Which side, I am on the side of being useful to research.";
+ sleep2 4000;
+ npctalk "That is the worth of my existence when it comes to her. This a fact I knew well.";
+ sleep2 4000;
+ npctalk "The reason I could not refuse, the reason I could not help but follow her as if I was lured by a mirage...";
+ sleep2 4000;
+ npctalk "Because she already was the owner of my heart...";
+ sleep2 4000;
+ npctalk "Rustle";
+ sleep2 4000;
+ npctalk "Hurk.. You. So it was true. It was a one way crush as ever.";
+ sleep2 4000;
+ npctalk "Huh? What are you looking at.. Urk isn't that Tatio's diary?";
+ sleep2 4000;
+ npctalk "Be quiet! Idiot! What if we get caught!";
+ sleep2 4000;
+ npctalk "What, you are reading this while recording it?!?!?!?!";
+ break;
+ case 12:
+ npctalk "Hello, Tatio.";
+ sleep2 4000;
+ npctalk "Most of the people are dead.";
+ sleep2 4000;
+ npctalk "I do not feel guilt even though I turned all those people into dust in order to survive.";
+ sleep2 4000;
+ npctalk "Above all I worry about you being left alone.";
+ sleep2 4000;
+ npctalk "So I have decided to stop despairing.";
+ sleep2 4000;
+ npctalk "It is tomorrow. The day all of us leave this place with you here...";
+ sleep2 4000;
+ npctalk "Until we can see each other again, good bye.";
+ break;
+ case 13:
+ npctalk "Hello. This is Silvia Loren.";
+ sleep2 4000;
+ npctalk "My hobby is chicken. I like beer~.";
+ sleep2 4000;
+ npctalk "Eh... Kind of went overboard by taking on a project today.";
+ sleep2 4000;
+ npctalk "Honestly it isn't a subject I was interested in.";
+ sleep2 4000;
+ npctalk "Vincent was participating in it.";
+ sleep2 4000;
+ npctalk "Ah.......";
+ sleep2 4000;
+ npctalk "No wait wait. I didn't mean to explain that. Oh now!! Cancel it!! - Zizipzizip";
+ break;
+ }
+ sleep2 3000;
+ next;
+ mes "All audible information in the Memory Record has been played.";
+ erasequest 7650;// Collect Memory Records of Research facilities
+ erasequest 7654;// Play Research facilities Memory Records
+ setquest 7651;// One Memory a Day
+ if (VERUS_DAILY_QUEST < 10) {// inaccurate
+ if (VER_MAIN != 32)
+ VERUS_DAILY_QUEST++;
+ if (VER_MAIN == 35 && VERUS_DAILY_QUEST == 10)
+ VER_MAIN = 36;
+ else if (VER_MAIN == 31 && VERUS_DAILY_QUEST > 4)
+ VER_MAIN = 32;
+ }
+ }
+ else {
+ switch( rand(1,14) ) {
+ case 1:
+ npctalk "This is Dorothy Florence. Dorothy who only knows how to do laundry.";
+ sleep2 4000;
+ npctalk "I want to save the remains of the people with the only things I have.";
+ sleep2 4000;
+ npctalk "This place has a lot of people. They are still alive.";
+ sleep2 4000;
+ npctalk "I hope to save as many stories of the people as I can.";
+ sleep2 4000;
+ npctalk "As I hope somebody will remember how we were instead.";
+ sleep2 4000;
+ npctalk "Okay.. then.. who should I interview first?";
+ break;
+ case 2:
+ npctalk "This is Dorothy Florence.";
+ sleep2 4000;
+ npctalk "Individual assignments have been established under Dr. Fresa's command.";
+ sleep2 4000;
+ npctalk "We have to survive here until the energy storm outside stops.";
+ sleep2 4000;
+ npctalk "We have decided to consult the former cafeteria owner Yangsang on the food problem.";
+ sleep2 4000;
+ npctalk "They say we can last about 40 days.";
+ sleep2 4000;
+ npctalk "This panic room is amazing.";
+ break;
+ case 3:
+ npctalk "This is Dorothy Florence.";
+ sleep2 4000;
+ npctalk "We had a small party today";
+ sleep2 4000;
+ npctalk "We had the first harvest of the plants being cultivated!";
+ sleep2 4000;
+ npctalk "According to the biotechnology managers harvest is possible at least once every 2 weeks";
+ sleep2 4000;
+ npctalk "due to a growth acceleration technology.";
+ sleep2 4000;
+ npctalk "I can taste fresh grapes again today.";
+ break;
+ case 4:
+ npctalk "This is Dorothy Florence. This is the 3rd night.";
+ sleep2 4000;
+ npctalk "People are looking to Dr. Fresa as the leader of this current situation and rendering yesterday's criticism meaningless.";
+ sleep2 4000;
+ npctalk "Biotechnology engineers, mechanical engineers, facility managers.. we have everybody we need.";
+ sleep2 4000;
+ npctalk "There are also lowly kitchen maids like myself as well.";
+ sleep2 4000;
+ npctalk "I was here just to deliver some laundry.";
+ sleep2 4000;
+ npctalk "How did I get caught up in something like this?";
+ break;
+ case 5:
+ npctalk "I am Dorothy Florence. I picked up a Memory Record in the Monitoring room today.";
+ sleep2 4000;
+ npctalk "It could be a black box recorded on the day of the experiment. I will play it!";
+ sleep2 4000;
+ npctalk "Zizip-- Ah.. static noise first... Ah. There it is.";
+ sleep2 4000;
+ npctalk "Goodluck..";
+ sleep2 4000;
+ npctalk "(Female Voice) Ha.. I regret never having dated.";
+ sleep2 4000;
+ npctalk "(Another Female Voice) Ah...... I should be seeing this while having chicken and beer.... zizizip--";
+ sleep2 4000;
+ npctalk "Huh? Is this all? But this voice. Ahhhhhh Artemia who checked her laundry!";
+ sleep2 4000;
+ npctalk "..Hum.. I see. That day. This is what happened.....";
+ sleep2 4000;
+ npctalk "Click";
+ break;
+ case 6:
+ npctalk "This is Dorothy Florence.";
+ sleep2 4000;
+ npctalk "The plants cultivated by the biologist have sprouted shoots one day.";
+ sleep2 4000;
+ npctalk "Should I be happy?";
+ sleep2 4000;
+ npctalk "It is something to be happy about but, there is still no contact with the outside world.";
+ sleep2 4000;
+ npctalk "A week has passed, and the only joy of the people in the panic room...";
+ sleep2 4000;
+ npctalk "Is watching the germination of the plants.";
+ break;
+ case 7:
+ npctalk "This is Dorothy Florence. It has been a month of panic room life.";
+ sleep2 4000;
+ npctalk "People were busy since the morning due to the Air cleaner being broken.";
+ sleep2 4000;
+ npctalk "I can only watch on since the only thing I know how to do is wash clothes.";
+ sleep2 4000;
+ npctalk "Fortunately the machine manias have already made a new air cleaner";
+ sleep2 4000;
+ npctalk "so there will be no problem breathing.";
+ sleep2 4000;
+ npctalk "What a relief, isn't it?";
+ break;
+ case 8:
+ npctalk "This is Dorothy. This is the last recording.";
+ sleep2 4000;
+ npctalk ".I don't want to die. Whimper..";
+ sleep2 4000;
+ npctalk "I don't want to be like them!!";
+ sleep2 4000;
+ npctalk "...I want to live...";
+ break;
+ case 9:
+ npctalk "This is Dorothy Florence. I am recording this";
+ sleep2 4000;
+ npctalk "because someone has to leave behind the memories of this terrible accident.";
+ sleep2 4000;
+ npctalk "The outside has been completely cut off from the explosion that occurred with the experiment.";
+ sleep2 4000;
+ npctalk "Most of the people have currently evacuated to the panic room.";
+ sleep2 4000;
+ npctalk "There is no contact with the outside world.";
+ sleep2 4000;
+ npctalk "Going out side will be difficult for the time being.";
+ break;
+ case 10:
+ npctalk "Hello, I am Ate. The assistant engineer of Verus city.";
+ sleep2 4000;
+ npctalk "Haha.. isn't this awkward?";
+ sleep2 4000;
+ npctalk "I.. fermented alcohol a while ago with the grapes in the bunker.";
+ sleep2 4000;
+ npctalk "Life in the bunker is becoming more impoverished the more we lose life on the surface.";
+ sleep2 4000;
+ npctalk "I didn't share that much but the guy next to me must be drunk because he keeps clinging on to me.";
+ sleep2 4000;
+ npctalk "Doesn't this guy have something better to do than to cling onto me.";
+ sleep2 4000;
+ npctalk "I'm kind of on the popular side. Haha.";
+ sleep2 4000;
+ npctalk "But, seeing that clingy guy reminded me of the kid somehow.";
+ sleep2 4000;
+ npctalk "Long black braided hair and face full of freckles...";
+ sleep2 4000;
+ npctalk "..Ate! Can you check this for a minute?";
+ sleep2 4000;
+ npctalk "Ah.. sorry. I have to go to work. I will do more when I have the chance.";
+ sleep2 4000;
+ npctalk "Eh, Ate's interview will be continued next time! This has been Dorothy!";
+ break;
+ case 11:
+ npctalk "This is Dorothy Florence. Day 50 of the explosion.";
+ sleep2 4000;
+ npctalk "After a long discussion, the research staff of Dr. Fresa seem to have decided to";
+ sleep2 4000;
+ npctalk "go through part of the partition where these is no energy storm.";
+ sleep2 4000;
+ npctalk "They are leaving by digging an underground tunnel.. !";
+ sleep2 4000;
+ npctalk "I thought we were trapped by the protective wall?";
+ break;
+ case 12:
+ npctalk "Hello! Ate! Do you have time?";
+ sleep2 4000;
+ npctalk "Hello, Dorothy. Is this that thing last time? Did I really have to continue?";
+ sleep2 4000;
+ npctalk "I did promise. No choice. Where was I?";
+ sleep2 4000;
+ npctalk "The kid with long black braided hair and face full of freckles!";
+ sleep2 4000;
+ npctalk "Ah, yes. That kid. He would follow me around annoyingly.";
+ sleep2 4000;
+ npctalk "A time when he was a even more of a kid. .. Haa..";
+ sleep2 4000;
+ npctalk "I was relieved to think I was finally rid of him in Verus city.";
+ sleep2 4000;
+ npctalk "Until I ran into him at the laboratories. Haha, isn't he quite the kid?";
+ sleep2 4000;
+ npctalk "Always honest in his feelings, unchanging....";
+ sleep2 4000;
+ npctalk "But the kid, never told me he liked me because his stubbornness.";
+ sleep2 4000;
+ npctalk "Even though it was written on his face.";
+ sleep2 4000;
+ npctalk "Chasing me around like a stalker. Humph... Hahaha";
+ sleep2 4000;
+ npctalk "But today I am missing you kid. .. Hoho.";
+ sleep2 4000;
+ npctalk ".....But that day you probably, hm.. that day....";
+ sleep2 4000;
+ npctalk ".................Dorothy . ..Let's stop.";
+ break;
+ case 13:
+ npctalk "This is Dorothy Florence. A month and a week has passed.";
+ sleep2 4000;
+ npctalk "There is bad news today.";
+ sleep2 4000;
+ npctalk "The people who went outside the multiplex protective wall to measure the atmosphere have not come back.";
+ sleep2 4000;
+ npctalk "Maybe.. They were swallowed up by the energy storm.";
+ sleep2 4000;
+ npctalk "I hope they find freedom again.";
+ break;
+ case 14:
+ npctalk "This is Dorothy Florence. Day 44 of the explosion.";
+ sleep2 4000;
+ npctalk "I hear a portion of the people within the protective wall have changed strangely.";
+ sleep2 4000;
+ npctalk "Apparently it is related to having gone outside.";
+ sleep2 4000;
+ npctalk "People are scrambling to check the wall.";
+ sleep2 4000;
+ npctalk "What is going to happen to us...?";
+ break;
+ case 15:
+ npctalk "--------Bang-----";
+ sleep2 4000;
+ npctalk "Urk..";
+ sleep2 4000;
+ npctalk "Sob sob...";
+ sleep2 4000;
+ npctalk "Why! Why did it happen like this!!!";
+ sleep2 4000;
+ npctalk "Sob sob..";
+ sleep2 4000;
+ npctalk "-------Baang-----";
+ sleep2 4000;
+ npctalk "--Zizip-Ah --doctor --before --zizizip-- he zizip- look zizip--for..";
+ sleep2 4000;
+ npctalk "--Zizizip--here.";
+ sleep2 4000;
+ npctalk "-Click-";
+ sleep2 4000;
+ npctalk "Hm. The doctor looks very tired as well.";
+ sleep2 4000;
+ npctalk "Ah! This was on? I'm going to get in trouble for leaving it on too long..";
+ sleep2 4000;
+ npctalk "Umph! Hm! This is Vanilla Luide. I am tired a lot these days for some reason.";
+ sleep2 4000;
+ npctalk "I guess looking at the situation it's not a shock to see everybody's state.";
+ sleep2 4000;
+ npctalk "Hoo...";
+ sleep2 4000;
+ npctalk "Bzz..";
+ break;
+ }
+ sleep2 3000;
+ next;
+ mes "All audible information in the Memory Record has been played.";
+ erasequest 7652;// Collect Memory Records of Laboratories
+ erasequest 7655;// Play Laboratories Memory Records
+ setquest 7653;// One Memory a Day 2
+ // memory record daily quests
+ if (countitem(22691) < 1 && countitem(22692) < 1 && countitem(22693) < 1 && countitem(22694) < 1 && countitem(22695) < 1)
+ getitem rand(22691,22695),1;// Record_Fragment
+ }
+ getexp 1500000,1000000;
+ next;
+ specialeffect EF_SPELLBREAKER;
+ mes "As you try to eject the Memory Record, the connecting part breaks with a cracking sound and returns to it's disassembled form.";
+ next;
+ cutin "Arquien_n_atnad01.bmp",2;
+ mes "[Nile]";
+ mes "Darn. There's only one content but it annoyingly breaks every time it doesn't play.";
+ mes "I'm starting to think it's made like this on purpose.";
+ mes "Annoying to clean up..";
+ next;
+ mes "[Nile]";
+ mes "Why make things like this with all that science and talent and whatnot?";
+ mes "Not to mention there is the occasional overlap..";
+ mes "It feels like someone is coaxing us to find out about the past no matter what.";
+ next;
+ mes "[Nile]";
+ mes "Anyway I will record this content separately and deliver it to the old man.";
+ mes "Good work today.";
+ next;
+ mes "[Nile]";
+ if (VERUS_DAILY_QUEST < 10)
+ mes "Then come back tomorrow.";
+ else {
+ mes "Wait, something is going on?";
+ mes "That tent there is where the excavation team is, right?";
+ mes "It seems someone is visiting?";
+ mes "Go along now!";
+ }
+ close3;
+ }
+ if (VER_MAIN < 30) {
+ cutin "Arquien_n_atnad01.bmp",2;
+ mes "[Nile]";
+ mes "Can you, not touch things without asking?";
+ close3;
+ }
+ mes "There are no more Memory Records to play.";
+ close;
+}
+
+verus04,141,193,5 script Archaeologist Aureth#atnd09 4_M_OLDSCHOLAR,{
+ if (checkweight(1301,1) == 0) {
+ mes "- You are carrying too many items to proceed with the quest. -";
+ close;
+ }
+ switch(VER_MAIN) {
+ case 0:
+ case 1:
+ case 2:
+ case 3:
+ mes "The old archaeologist has his back toward you, working on something.";
+ mes "You shouldn't disturb him.";
+ close;
+ case 4:
+ cutin "verus_aures.bmp",0;
+ mes "[Aureth]";
+ mes "Ah, welcome.";
+ mes "I've been waiting for you.";
+ mes "First things first: you should go register with the Central Command Center.";
+ next;
+ mes "[Aureth]";
+ mes "Your name is already on the list. Just go check in with the center.";
+ mes "Or you won't have full access to this area.";
+ next;
+ mes "[Aureth]";
+ mes "Come back when you're done. I'll introduce you to the other members.";
+ mes "Go on.";
+ close3;
+ case 5:
+ cutin "verus_aures.bmp",0;
+ mes "[Aureth]";
+ mes "Ah, you're back.";
+ mes "Say hello to our leader, Ian Atnad.";
+ next;
+ cutin "verus_ian03.bmp",2;
+ mes "[Ian Atnad]";
+ mes "...Rookie.";
+ mes "I don't have time for rookies. Send them back!";
+ next;
+ cutin "verus_aures.bmp",0;
+ mes "[Aureth]";
+ mes "You're doing it again.";
+ mes "We're old now. We need help!";
+ mes "Stop being so stubborn.";
+ next;
+ cutin "verus_ian03.bmp",2;
+ mes "[Ian Atnad]";
+ mes "...Hey, rookie.";
+ mes "Did my daughter send you to spy on me?";
+ mes "Tell me!";
+ next;
+ if (select( "I came to help.", "I don't know what you're talking about." ) == 2) {
+ cutin "verus_ian02.bmp",2;
+ mes "[Ian Atnad]";
+ mes "Hm? Don't you know who my daughter is?";
+ mes "Well, we should leave it that way.";
+ }
+ next;
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "That means you know who my daughter is.";
+ mes "Do you really think you can work with me?";
+ mes "Knowing who I am?";
+ next;
+ mes "[Ian Atnad]";
+ mes "Well, fine.";
+ mes "Let's get to work.";
+ mes "I want to know if you can follow my orders.";
+ next;
+ cutin "verus_aures.bmp",0;
+ mes "[Aureth]";
+ mes "Ian, you're helpless.";
+ mes "Well, welcome to the team, young adventurer.";
+ mes "Some of the things we're planning are physically challenging, not to mention dangerous.";
+ next;
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "Enough. Rookie, come over here.";
+ next;
+ cutin "verus_aures.bmp",0;
+ mes "[Aureth]";
+ mes "I'm sorry.";
+ mes "You'd better go.";
+ mes "Don't let him get on your nerves.";
+ VER_MAIN = 6;
+ close3;
+ case 6:
+ case 7:
+ cutin "verus_aures.bmp",0;
+ mes "[Aureth]";
+ mes "Thank you for your patience with Ian.";
+ mes "He wasn't always like that.";
+ mes "He's doing it on purpose.";
+ close3;
+ case 8:
+ cutin "verus_aures.bmp",0;
+ mes "[Aureth]";
+ mes "If you're done with him, I can use your help.";
+ mes "We have one more member in the team.";
+ next;
+ mes "[Aureth]";
+ mes "He went to the Plaza to investigate the remains.";
+ mes "He's a young fellow named ^4d4dffLloyd^000000.";
+ mes "I sent Luke with him to keep him safe,";
+ next;
+ mes "[Aureth]";
+ mes "but I want to know how much progress Lloyd has made with his investigation.";
+ mes "Could you go check up on him?";
+ mes "Thank you.";
+ erasequest 7619;// Assisting the Excavation Team
+ setquest 7620;// Young Blood?
+ VER_MAIN = 9;
+ close3;
+ case 9:
+ cutin "verus_aures.bmp",0;
+ mes "[Aureth]";
+ mes "Lloyd must be somewhere in the Verus Central Plaza.";
+ mes "Look for Luke. He should be near Lloyd.";
+ next;
+ mes "[Aureth]";
+ mes "He's the only young member aside from you.";
+ mes "The rest of the members of our team are as old as me, and couldn't make the trip.";
+ next;
+ mes "[Aureth]";
+ mes "Please take good care of";
+ mes "Lloyd.";
+ close3;
+ case 10:
+ cutin "verus_aures.bmp",0;
+ mes "[Aureth]";
+ mes "How's Lloyd doing?";
+ mes "Ah, so you're helping him.";
+ next;
+ mes "[Aureth]";
+ mes "Thank you";
+ mes "for your hard work.";
+ next;
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "They're here to work for us.";
+ mes "Stop thanking them.";
+ mes "They're spoiled as it is.";
+ next;
+ cutin "verus_aures.bmp",0;
+ mes "[Aureth]";
+ mes "Sigh, would you stop?";
+ mes "*Shaking his head*";
+ close3;
+ case 11:
+ cutin "verus_aures.bmp",0;
+ mes "[Aureth]";
+ mes "Ah, you're back.";
+ mes "How's Lloyd doing?";
+ mes "He wants to camp there.";
+ mes "Wouldn't it be too dangerous? I guess Luke can keep him safe.";
+ next;
+ mes "[Aureth]";
+ mes "Please come this way.";
+ mes "I wrote a report while waiting for you.";
+ mes "I want you to take it to Commander Louis at the Central Command Center.";
+ next;
+ mes "[Aureth]";
+ mes "This may be a simple errand,";
+ mes "but it gives you an opportunity to get acquainted with the Commander.";
+ next;
+ mes "[Aureth]";
+ mes "We're old, so we don't care about fame. You're different.";
+ mes "Winning favor with Rekenber";
+ mes "can go a long way.";
+ erasequest 7622;// Good News!
+ setquest 7617;// Turning In Excavation Report
+ VER_MAIN = 12;
+ getitem 6748,1;// Daily_Report_He_And_His_Team
+ close3;
+ case 12:
+ cutin "verus_aures.bmp",0;
+ mes "[Aureth]";
+ mes "Please take that report to Commander Louis.";
+ mes "Writing a report every day is a chore, but an important chore nonetheless.";
+ next;
+ mes "[Aureth]";
+ mes "I've noticed Louis has been watching us. I hope that's a good sign.";
+ close3;
+ case 13:
+ cutin "verus_aures.bmp",0;
+ mes "[Aureth]";
+ mes "Did you deliver the report?";
+ mes "Good.";
+ mes "You can take a break now.";
+ next;
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "No, you can't!";
+ mes "You've got work to do!";
+ mes "Come over here, now!";
+ close3;
+ case 14:
+ cutin "verus_aures.bmp",0;
+ mes "[Aureth]";
+ mes "I don't understand him sometimes.";
+ mes "I feel sorry for you.";
+ mes "I wish I could help.";
+ next;
+ mes "[Aureth]";
+ mes "Maybe the other youngsters can give you better advice.";
+ mes "^4d4dffWhy don't you consult Lloyd or Luke?^000000";
+ next;
+ mes "[Aureth]";
+ mes "Sigh, he's as stubborn as a mule.";
+ next;
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "I heard that.";
+ next;
+ cutin "verus_aures.bmp",0;
+ mes "[Aureth]";
+ mes "Then stop it";
+ mes "and stop harassing them.";
+ mes "The Eden Group won't be happy if it knows about this.";
+ next;
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "The Eden Group? *Snort* Who cares?";
+ next;
+ cutin "verus_aures.bmp",0;
+ mes "[Aureth]";
+ mes "You're helpless.";
+ mes "I'm really, really sorry about him.";
+ mes "You really should talk to those two.";
+ close3;
+ case 15:
+ case 16:
+ cutin "verus_aures.bmp",0;
+ mes "[Aureth]";
+ mes "So you've found some clues, eh?";
+ mes "Hm, even I'm excited.";
+ close3;
+ case 32:
+ cutin "verus_aures.bmp",0;
+ mes "[Aureth]";
+ mes "You came back at the right time.";
+ mes "I've made some progress with my research with the Power Control Devices you brought.";
+ next;
+ mes "[Aureth]";
+ mes "I just finished writing a report about it";
+ mes "along with the energy source that Lloyd is studying.";
+ next;
+ mes "[Aureth]";
+ mes "Here's the report.";
+ mes "Please ^4d4dffbring it to Louis";
+ mes "at the Command Center^000000.";
+ setquest 7617;// Turning In Excavation Report
+ getitem 6748,1;// Daily_Report_He_And_His_Team
+ VER_MAIN = 33;
+ close3;
+ case 33:
+ cutin "verus_aures.bmp",0;
+ mes "[Aureth]";
+ mes "Please take that report to Commander Louis.";
+ mes "Writing a report every day is a chore, but an important chore nonetheless.";
+ next;
+ mes "[Aureth]";
+ mes "I've noticed Louis has been watching us. I hope that's a good sign.";
+ close3;
+ case 34:
+ if (checkquest(7618,PLAYTIME) == 2) {
+ erasequest 7618;// Reporting the Results - Down
+ VER_MAIN = 35;
+ mes "[Aureth]";
+ mes "It's time we write another report.";
+ mes "I'll do it after I'm done studying Power Control Devices.";
+ close3;
+ }
+ cutin "verus_aures.bmp",0;
+ mes "[Aureth]";
+ mes "Did you deliver the report?";
+ mes "It may be a simple errand,";
+ mes "but it gives you an opportunity to get acquainted with the Commander.";
+ next;
+ mes "[Aureth]";
+ mes "We're old, so we don't care about fame. You're different.";
+ mes "Winning favor with Rekenber can go a long way.";
+ next;
+ mes "[Aureth]";
+ mes "So let's have you submit reports from now on.";
+ close3;
+ default:
+ cutin "verus_aures.bmp",0;
+ mes "[Aureth]";
+ mes "Ian is working on Power Control Devices.";
+ mes "Lloyd is working on the power supply for the devices.";
+ next;
+ mes "[Aureth]";
+ mes "Well, that leaves me with the menial task of organizing documents.";
+ mes "Could you help those two?";
+ next;
+ mes "[Aureth]";
+ mes "The quicker we gather research materials, the quicker we can report.";
+ close3;
+ }
+
+OnInit:
+ questinfo 7615,QTYPE_QUEST,1;// inaccurate
+ end;
+}
+
+verus04,144,193,3 script Ian Atnad#ep152 4_M_IAN,{
+ if (checkweight(1301,1) == 0) {
+ mes "- Cannot progress quest because you have too many items in your possession. -";
+ close;
+ }
+ mes "[Ian Atnad]";
+ switch(VER_MAIN) {
+ case 0:
+ case 1:
+ case 2:
+ case 3:
+ case 4:
+ cutin "verus_ian01.bmp",2;
+ mes "...that's distracting.";
+ close3;
+ case 5:
+ cutin "verus_ian01.bmp",2;
+ mes "What have you been loafing around for?";
+ mes "Who the hell is this?";
+ next;
+ cutin "verus_aures.bmp",0;
+ mes "[Aures]";
+ mes "Ian, why are you like this?";
+ mes "This young adventurer was dispatched here from the paradise squad.";
+ mes "He is here to help us.";
+ next;
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "..Hm... Rookie.";
+ mes "I do not need such favors, send them back!";
+ next;
+ cutin "verus_aures.bmp",0;
+ mes "[Aures]";
+ mes "I see he is acting like this again..";
+ mes "Do you think a bunch of old men can do this task easily?";
+ mes "Stop being so stubborn for a change.";
+ next;
+ cutin "verus_ian03.bmp",2;
+ mes "[Ian Atnad]";
+ mes "..Hey, Rookie.";
+ mes "Are you here to monitor me on my daughter's orders?";
+ mes "Is that it?";
+ next;
+ if (select( "Just here to help.", "That is news to me." ) == 2) {
+ cutin "verus_ian02.bmp",2;
+ mes "[Ian Atnad]";
+ mes "Hum? You did not hear about my daughter?";
+ mes "Then I don't need to bring up such idle talk.";
+ }
+ next;
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "...so you know about my relationship with my daughter?";
+ mes "So are you trying to stay silent and just do your work?";
+ mes "You are trying not to involve yourself?";
+ next;
+ mes "[Ian Atnad]";
+ mes "Good.";
+ mes "Then I will order you to do something you really need right away.";
+ mes "Let's see how well you can follow my instructions.";
+ next;
+ cutin "verus_aures.bmp",0;
+ mes "[Aures]";
+ mes "This fellow.. He is like this to the end.";
+ mes "Anyway, since we are here, I am at your service as well.";
+ mes "I'm afraid the work we want to do is a bit dangerous.";
+ next;
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "Stop talking nonsense and come here, Rookie.";
+ next;
+ cutin "verus_aures.bmp",0;
+ mes "[Aures]";
+ mes "Sorry for this.";
+ mes "Let's us go first.";
+ mes "I have your back.";
+ VER_MAIN = 6;
+ close3;
+ case 6:
+ cutin "verus_ian01.bmp",2;
+ mes "So, you said you will help us with our work?";
+ mes "Then let's see how well you do.";
+ mes "There is a plaza if you leave this area and go further inside.";
+ next;
+ mes "[Ian Atnad]";
+ mes "There will be machines from a highly advanced civilization.";
+ mes "There is an essential device to make the machines run.";
+ next;
+ mes "[Ian Atnad]";
+ mes "For now, there is something temporarily called the ^4d4dffOperation Control Device^000000 because it is still under investigation.";
+ mes "Investigate the machine and collect 20 of the Operation Control Devices.";
+ next;
+ mes "[Ian Atnad]";
+ mes "I will see how well you work.";
+ setquest 7615;// Core Collection
+ VER_MAIN = 7;
+ close3;
+ case 7:
+ if (countitem(6749) < 20) {// Operation_Control_Device
+ cutin "verus_ian01.bmp",2;
+ mes "20 Power Control Devices.";
+ mes "Should be no problem for one who is recommended by that supposedly great person, should it?";
+ mes "Hm.";
+ close3;
+ }
+ cutin "verus_ian02.bmp",2;
+ mes ".. Hm..";
+ mes "Don't get smug because of this!";
+ mes "We will use that for research.";
+ mes "Hand over everything you have.";
+ next;
+ cutin "verus_aures.bmp",0;
+ mes "[Aures]";
+ mes "Haha.. This guy is stiff as always.";
+ mes "Is it that hard to say one word of thanks for a job well done?";
+ next;
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "Away with you!";
+ mes "Why do you keep interfering.";
+ next;
+ cutin "verus_aures.bmp",0;
+ mes "[Aures]";
+ mes "It is one of the few joys this old man has, so what can you do.";
+ mes "I will thank you instead.";
+ mes "Anyway, thanks for your trouble.";
+ next;
+ cutin "verus_aures.bmp",0;
+ mes "[Aures]";
+ mes "You will probably focus on this kind of work in the future.";
+ mes "We wanted to study these operation devices butwe didn't know how terrifying those machines were.";
+ next;
+ mes "[Aures]";
+ mes "I will write the report soon so I will ask for you help then as well.";
+ delitem 6749, countitem(6749);// Operation_Control_Device
+ erasequest 7615;// Core Collection
+ setquest 7619;// Assisting the Excavation Team
+ getexp 750000,500000;
+ VER_MAIN = 8;
+ next;
+ cutin "verus_ian03.bmp",2;
+ mes "[Ian Atnad]";
+ mes "You two are getting along well.";
+ mes "Go away!";
+ close3;
+ case 8:
+ cutin "verus_ian01.bmp",2;
+ mes "...I still don't trust you.";
+ mes "There's a thing called a contract so I'd like it you just quietly keep working.";
+ next;
+ mes "[Ian Atnad]";
+ mes "You're expecting a word of thanks to come out of me...";
+ next;
+ cutin "verus_aures.bmp",0;
+ mes "[Aures]";
+ mes "Hey. Leave that stubborn fellow and come here for a minute!";
+ next;
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "...... huh.. what are you doing? Go!";
+ close3;
+ case 9:
+ case 10:
+ case 11:
+ case 12:
+ cutin "verus_ian01.bmp",2;
+ mes "....you..";
+ mes "Why don't you go find something to work on instead of playing around?";
+ next;
+ mes "[Ian Atnad]";
+ mes "I am saying this once more,";
+ mes "I don't think you are here just to help us.";
+ mes "I am sure Arquien is up to something.";
+ next;
+ mes "[Ian Atnad]";
+ mes ".....hm.";
+ mes "Quickly come back to me after you are done with what you are doing.";
+ close3;
+ case 13:
+ cutin "verus_ian01.bmp",2;
+ mes "Are you coming back from sending the report?";
+ mes "Good timing.";
+ mes "Bring me something to snack on.";
+ next;
+ mes "[Ian Atnad]";
+ mes "Not the rations supplies here.. what is that?";
+ mes "Find some delicacy to stimulate my appetite since it's hot and stuffy.";
+ next;
+ cutin "verus_aures.bmp",0;
+ mes "[Aures]";
+ mes "Hey buddy. What kind of delicacy are you looking for here?";
+ mes "Just take what Louis brought.";
+ next;
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "Ah, you stay out of this.";
+ mes "This is for the rookie to handle by themself.";
+ mes "Find me a ^4d4dffdelicacy that is simple to eat yet juicy and refreshing and has a neat finish^000000!";
+ next;
+ mes "[Ian Atnad]";
+ mes "If you find what I want then I will listen to one wish of yours.";
+ mes "Are you not here in hopes of getting something?";
+ next;
+ cutin "",255;
+ mes "In order to ask Ian Atnad about the ^4d4dffLast Exploration^000000";
+ mes "it seems a ^4d4dffdelicacy that is simple to eat yet juicy and refreshing and has a neat finish^000000 has to be found.";
+ erasequest 7623;// Artnard's Summon
+ setquest 7624;// In Search of a Delicacy
+ VER_MAIN = 14;
+ close;
+ case 14:
+ case 15:
+ cutin "verus_ian03.bmp",2;
+ mes "Are you going to make me repeat myself?";
+ mes "Find me a ^4d4dffdelicacy that is simple to eat yet juicy and refreshing and has a neat finish^000000";
+ mes "and I will grant you what you want.";
+ next;
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "If it's hard for you find it with that dimwitted head of yours then try to ask others at least!";
+ mes "Something that will suit my taste.";
+ close3;
+ case 16:
+ cutin "verus_ian01.bmp",2;
+ if (countitem(11519) < 1) {// Beef_Toast
+ mes "..Hm.";
+ mes "Giving up?";
+ mes "Are you really?";
+ mes "I didn't see you as someone who would give up so easily..?";
+ next;
+ mes "[Ian Atnad]";
+ mes "If what I requested is that difficult I will take it back.";
+ mes "However, you must leave this excavation team.";
+ next;
+ cutin "",255;
+ mes "I must find the lost Beef Toast somewhere.";
+ close;
+ }
+ mes "Hm.. is this it?";
+ mes "......Can I indeed eat this conveniently during work without separate silverware.";
+ mes "..Smells of freshly cooked meat.";
+ next;
+ mes "Ian wipes his hands and slowly starts to eat the Beef Toast.";
+ next;
+ cutin "verus_ian03.bmp",2;
+ mes "[Ian Atnad]";
+ mes "Um...";
+ mes ".....!";
+ mes "This... this flavor!";
+ mes "Packed with the juiciness of finely ground beef!";
+ mes "I can taste the flavor of direct fire..!";
+ next;
+ cutin "verus_ian02.bmp",2;
+ mes "[Ian Atnad]";
+ mes "Exotic fruit and vegetables reel in the subtle greasiness of the oil!";
+ mes "...!";
+ next;
+ select("Try the leaves that are wrapped around the outside.");
+ cutin "verus_ian04.bmp",2;
+ mes "[Ian Atnad]";
+ mes "Indeed.. this can be consumed as well.";
+ mes "Rich juiciness and fresh salad.. sweet fruit..";
+ mes "A fresh finishing flavor to wrap all of it up..!";
+ next;
+ mes "[Ian Atnad]";
+ mes "...Kid..";
+ mes "Not bad.";
+ mes "You have satisfied all the conditions I have laid out.";
+ next;
+ mes "[Ian Atnad]";
+ mes "I have no choice.";
+ mes "Alright. I predicted there was something you wanted.";
+ mes "A promise is a promise. What do you want from me?";
+ next;
+ select("To know about the Last Exploration");
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "... so that was it.";
+ mes "I see....";
+ mes "To talk about that..give me some time to think.";
+ mes "....";
+ next;
+ mes "[Ian Atnad]";
+ mes "I need time to organize it as well.";
+ mes ".......";
+ mes "Come back later.";
+ mes "Please.";
+ delitem 11519,1;// Beef_Toast
+ erasequest 7626;// Delicacy for Him
+ setquest 7627;// Last Exploration
+ VER_MAIN = 17;
+ close3;
+ case 17:
+ case 18:
+ case 19:
+ cutin "verus_ian01.bmp",2;
+ mes "Have you arrived?";
+ mes "Have you adjusted to the excavation site?";
+ mes "So what is it this time.";
+ next;
+ switch( select( "About the excavation project", "Converse", "Cancel" ) ) {
+ case 1:
+ callsub S_Daily, 0;
+ close3;
+ case 2:
+ cutin "verus_ian04.bmp",2;
+ mes "[Ian Atnad]";
+ if (VER_MAIN == 17) {
+ mes "It's good that you're here.";
+ mes "The access permit for the Laboratories and Research facilities dropped apparently.";
+ mes "So we plan to expand the investigation area..";
+ next;
+ select("What about the Last Exploration!");
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "..the Last Exploration, it wasn't much.";
+ mes "The exploration site was Juperos.";
+ mes "There were various goals but..";
+ next;
+ mes "[Ian Atnad]";
+ mes "I know well that it was a major turning point for my life.";
+ mes "I feel like there is fog in my head.";
+ mes "And I think I will find another turning point here.";
+ next;
+ mes "[Ian Atnad]";
+ mes "It is just a feeling though.";
+ mes "I don't think the place I've been looking for and this place are related.";
+ next;
+ mes "[Ian Atnad]";
+ mes "So won't you help me for the time being?";
+ mes "....";
+ next;
+ select("I have no choice.");
+ mes "[Ian Atnad]";
+ mes "Yes, this is the last task.";
+ mes "Arquien has to know, too.";
+ mes "We will start soon so come back when you're ready.";
+ VER_MAIN = 18;
+ close3;
+ }
+ if (VER_MAIN == 18) {
+ cutin "verus_ian01.bmp",2;
+ mes "The position of our excavation team has improved quite a bit due to your actions.";
+ mes "Thanks to you we received permission to explore closed areas.";
+ next;
+ mes "[Ian Atnad]";
+ mes "So we are trying to expand the investigating area.";
+ mes "But it seems there was a reason it was shut down.";
+ next;
+ mes "[Ian Atnad]";
+ mes "It seems there are a lot of machines in that area that react sensitively to organisms.";
+ mes "Furthermore there was a veil of peculiar energy..";
+ next;
+ mes "[Ian Atnad]";
+ mes "Check out the Research facilities area first.";
+ mes "Let me know if there is anything peculiar.";
+ completequest 7627;// Last Exploration
+ setquest 7641;// Access Permitted
+ setquest 7642;// Explore Research facilities
+ VER_MAIN = 19;
+ close3;
+ }
+ cutin "verus_ian01.bmp",2;
+ mes "They say the Research facilities area is connected to the road going up from the right side of the plaza.";
+ mes "Well, if you get up there the corporate bastards will be there restricting access.";
+ next;
+ mes "[Ian Atnad]";
+ mes "If you find something worth risking danger for come back right away and tell me!";
+ close3;
+ case 3:
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "Let's look around as well instead of just working.";
+ mes "These kind of opportunities are rare.";
+ close3;
+ }
+ case 20:
+ cutin "verus_ian01.bmp",2;
+ mes "You're finally here.";
+ mes "So, did you get any results?";
+ next;
+ cutin "verus_ian02.bmp",2;
+ mes "[Ian Atnad]";
+ mes "Hm...? Wh..what. What is that in your hand?!";
+ mes "How...can this be.";
+ mes "I didn't imagine I would see this here...?";
+ next;
+ cutin "verus_aures.bmp",0;
+ mes "[Aures]";
+ mes "Huh? What is it?";
+ mes "It looks like your eyes are going to pop out.";
+ mes "Let me share in the surprise.";
+ next;
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "This..this is.";
+ mes "Is a Memory Record.. Didn't you talk about this to me once?";
+ next;
+ mes "[Ian Atnad]";
+ mes "My great-grandparents had something that looked like this...";
+ mes "It is a type of recording medium that records voices and sounds.";
+ next;
+ cutin "verus_aures.bmp",0;
+ mes "[Aures]";
+ mes "Ooh... Is it magic?";
+ mes "I know a bit of picture magic that can preserve images seen by the eye..";
+ mes "Is it something similar?";
+ next;
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "No. This is not an application of magic.";
+ mes "This is purely a product of science. I've seen my great-grandparents use this to listen to songs or record voices.";
+ next;
+ mes "[Ian Atnad]";
+ mes "In my youth I thought it was merely a toy-like invention of my great-grandparents....";
+ mes "Now I wonder why they did not announce that technology.";
+ next;
+ mes "[Ian Atnad]";
+ mes "It is a memory when I was very young but it looks just like this.";
+ mes "..can we know the contents of the Memory Record with that.";
+ next;
+ cutin "verus_ian02.bmp",2;
+ mes "[Ian Atnad]";
+ mes "I need that! I see!";
+ mes "That..";
+ mes "...Ah....";
+ next;
+ cutin "verus_aures.bmp",0;
+ mes "[Aures]";
+ mes "Hey, there. Are you okay?";
+ mes "Isn't the device that can decipher it in your house?";
+ next;
+ mes "[Aures]";
+ mes "You.. ah...";
+ mes "I see. Ahahahahaha..";
+ mes "This guy. You don't know where your house is?";
+ mes "Ahahahahaha!";
+ next;
+ cutin "verus_ian03.bmp",2;
+ mes "[Ian Atnad]";
+ mes ".... Didn't you say Arquien disposed of the house..?";
+ mes "We can easily figure it out if only we had the record player.";
+ next;
+ select("..What? Why are you looking at me?");
+ mes "[Ian Atnad]";
+ mes "You're that child's informant!";
+ mes "So go there and bring back the ^4d4dffrecord player^000000.";
+ next;
+ cutin "verus_aures.bmp",0;
+ mes "[Aures]";
+ mes "I see. The one who can easily talk to her right now is you.";
+ mes "If it's okay we would like to ask you to do so.";
+ erasequest 7643;// Mysterious Piece
+ setquest 7644;// Record Player
+ VER_MAIN = 21;
+ close3;
+ case 21:
+ cutin "verus_ian01.bmp",2;
+ mes "Find that child Arquien, and bring back the record player.";
+ mes "She must give me at least that much.";
+ close3;
+ case 22:
+ case 23:
+ case 24:
+ case 25:
+ cutin "verus_ian03.bmp",2;
+ mes "I cannot tell what that child is up to.";
+ mes "If she has a problem with me tell her to come and say it to me directly!";
+ next;
+ mes "[Ian Atnad]";
+ mes "...Why in the world is she not going to give it!";
+ mes "Then are you going to go and listen to it every time?";
+ next;
+ cutin "verus_aures.bmp",0;
+ mes "[Aures]";
+ mes "Well, that's not bad either.";
+ next;
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "Yeah, not bad.";
+ mes "Not!";
+ mes "Anyway.. Since it turned out like this you make sure to bring it. Okay?";
+ close3;
+ case 26:
+ cutin "verus_ian01.bmp",2;
+ mes "Did you see some results this time?";
+ next;
+ select("Tell him the contents of the Memory Record.");
+ cutin "verus_ian02.bmp",2;
+ mes "[Ian Atnad]";
+ mes "...Any chance you misheard it?";
+ mes "Why is Atnad mentioned there?";
+ next;
+ cutin "verus_aures.bmp",0;
+ mes "[Aures]";
+ mes "You never know.";
+ mes "Since you had the record thing in your house, could it be you are a descendant of this city?";
+ next;
+ cutin "verus_ian02.bmp",2;
+ mes "[Ian Atnad]";
+ mes "I am... a descendant of this city..Verus?";
+ mes "Then why has this place been uncovered now?";
+ mes "Shouldn't we have known of this place much sooner?";
+ next;
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "No no. It was strange.";
+ mes "That's why Juperos.. That's why Juperos wasn't unfamiliar to me so I latched on.";
+ next;
+ mes "[Ian Atnad]";
+ mes "If my ancestors are of this city.. why did they keep it a secret?";
+ next;
+ select("That we don't know.");
+ mes "[Ian Atnad]";
+ mes "Yes.. yes. Of course we do not know.";
+ mes "It seems we will have to find more of those Memory Records to know more.";
+ next;
+ mes "[Ian Atnad]";
+ mes "I am sorry, but.. you went to the Research facilities, right?";
+ mes "Do you know of the enormous underground facility discovered near the laboratories?";
+ next;
+ mes "[Ian Atnad]";
+ mes "First time hearing of it?";
+ mes ".. It seems things like Memory Records are being found in that underground facility as well.";
+ next;
+ mes "[Ian Atnad]";
+ mes "Let's take the initiative before the others start to get interested.";
+ mes "The others can't decipher the messages anyway.";
+ next;
+ cutin "verus_ian03.bmp",2;
+ mes "[Ian Atnad]";
+ mes "And, if we gather enough Memory Records.....";
+ mes "Go to Arquien and find out the... ugh... contents.";
+ mes "Do you understand?";
+ erasequest 7647;// Report Memory Record
+ setquest 7648;// Memory Records of the Laboratories
+ VER_MAIN = 27;
+ close3;
+ case 27:
+ cutin "verus_ian01.bmp",2;
+ mes "You will find the restricted area if you go to the connected path North-west of the plaza area.";
+ mes "We have an excavation permit so you can enter.";
+ next;
+ mes "[Ian Atnad]";
+ mes "But I hear there are strange robots that are acting aggressively so be careful.";
+ next;
+ mes "[Ian Atnad]";
+ mes "Come back after you find the entry path to the underground facility there.";
+ mes "Remember ^4d4dffcollecting Memory Records from the laboratories is the goal^000000.";
+ next;
+ mes "[Ian Atnad]";
+ mes "At least five? We need five to decipher it right?";
+ mes "Collect them and go to Arquien.";
+ close3;
+ case 28:
+ case 29:
+ cutin "verus_ian03.bmp",2;
+ mes "This time too!";
+ mes "Why.. why is that child acting like this!";
+ next;
+ cutin "verus_ian02.bmp",2;
+ mes "[Ian Atnad]";
+ mes "What? She wants to participate in this project too?";
+ mes "She will regularly decipher the Memory Records and send the results..?";
+ next;
+ mes "[Ian Atnad]";
+ mes "...Why is she doing this. And so suddenly..?";
+ next;
+ cutin "verus_aures.bmp",0;
+ mes "[Aures]";
+ mes "It seems she's become aware of something as well.";
+ mes "Is this not a good thing?";
+ mes "Father and daughter can get along and figure out their ancestors' past.";
+ next;
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "...Is it?. Is there no other way?";
+ mes "Anyway, you go and see the results.";
+ mes "You have to check if Arquien is doing it correctly.";
+ next;
+ cutin "verus_aures.bmp",0;
+ mes "[Aures]";
+ mes "We need somebody to collect the Memory Records as well?";
+ mes "Ahahahahaha";
+ next;
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "Well, that's not untrue...";
+ mes "Anyway go along.";
+ close3;
+ case 36:
+ cutin "verus_ian01.bmp",2;
+ mes "Have you arrived?";
+ mes "In fact I have been waiting.";
+ next;
+ select("Is there something wrong?");
+ mes "[Ian Atnad]";
+ mes "Something wrong? Something is wrong.";
+ mes "Something is very wrong.";
+ next;
+ cutin "ep15_tatio01.bmp",0;
+ mes "[Rekenber Chief secretary]";
+ mes "Hello?";
+ mes "I am the Chief Secretary of Rekenber's Secretariat, W.H.";
+ mes "I have been waiting.";
+ next;
+ select("Chairman Rekenber's secretary?");
+ mes "[Rekenber Chief secretary]";
+ mes "That is right.";
+ mes "I serve Chairman Rekenber.";
+ next;
+ cutin "verus_ian02.bmp",2;
+ mes "[Ian Atnad]";
+ mes "So, what's the mighty Chairman's secretary doing in a place like this?";
+ mes "I thought there were reports on the excavation being separately sent?";
+ next;
+ cutin "ep15_tatio01.bmp",0;
+ mes "[Rekenber Chief secretary]";
+ mes "The chairman wants to meet all of you.";
+ mes "Come and visit the headquarters in Rihrtarzen anytime.";
+ next;
+ mes "[Rekenber Chief secretary]";
+ mes "It would be better if you could visit as soon as possible..";
+ mes "We request the Memory Record content be left undisclosed for the time being.";
+ next;
+ cutin "verus_ian03.bmp",2;
+ mes "[Ian Atnad]";
+ mes "Why is that?";
+ mes "Why should we do that?";
+ next;
+ cutin "ep15_tatio01.bmp",0;
+ mes "[Rekenber Chief secretary]";
+ mes "Hm.. I think I know what you are going to say but...";
+ mes "Let's just say the time is not right yet.";
+ next;
+ mes "[Rekenber Chief secretary]";
+ mes "We invited you to discuss the details of that issue as well.";
+ mes "So it would better to visit soon, would it not?";
+ mes "We will be waiting.";
+ next;
+ cutin "verus_aures.bmp",0;
+ mes "[Aures]";
+ mes "What..is.. going on here..";
+ mes "Hey Ian, did you get on the wrong side of the corporation?";
+ next;
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "I don't know!";
+ mes "We should go anyway since they told us to.";
+ mes "Hey you.";
+ next;
+ select("Me?");
+ mes "[Ian Atnad]";
+ mes "Yes. You.";
+ mes "They say you have to accompany us.";
+ mes "Let's meet at the Rekenber Corporation Headquarters.";
+ mes "It's better to take care of things like this at once.";
+ VER_MAIN = 37;
+ close3;
+ case 37:
+ case 38:
+ case 39:
+ cutin "verus_ian01.bmp",2;
+ mes "What are you doing? Hurry up.";
+ mes "^4d4dffRekenber Headquarters is in Lighthalzen^000000.";
+ mes "You go on ahead. Let's meet there.";
+ close3;
+ default:
+ cutin "verus_ian01.bmp",2;
+ if (VER_MAIN < 36) {
+ mes "I will leave deciphering the Memory Records up to you and Arquien for the time being.";
+ mes "Since you say you won't ask about the Last Exploration any more..";
+ .@string$ = "About the Memory Records";
+ .@daily_variable = 1;
+ }
+ else {
+ mes "You can never know what will happen.";
+ mes "I guess I should be happy with exclusive rights to the Memory Records.";
+ }
+ mes "What is it today?";
+ next;
+ if (select( "About the excavation project", .@string$ ) == 1)
+ callsub S_Daily, .@daily_variable;
+ else {
+ mes "[Ian Atnad]";
+ if (VER_MAIN >= 31) {
+ cutin "verus_ian01.bmp",2;
+ mes "If I think about it this kind of structure isn't bad either.";
+ mes "The content recorded in the Memory Records is what is important.";
+ next;
+ mes "[Ian Atnad]";
+ mes "Since I am getting results without moving a finger..";
+ mes "......Good.. I will think positively. Yeah.";
+ close3;
+ }
+ cutin "verus_ian01.bmp",2;
+ mes "I cannot figure out what Arquien is thinking.";
+ mes "It would be so much better for me to bring back the Record player.";
+ next;
+ cutin "verus_ian02.bmp",2;
+ mes "[Ian Atnad]";
+ mes "What? She wants to participate in this project too?";
+ mes "She will regularly decipher the Memory Records and send the results..?";
+ next;
+ mes "[Ian Atnad]";
+ mes "It's odd she's like this now when she used to hate even dreaming of working.";
+ next;
+ cutin "verus_aures.bmp",0;
+ mes "[Aures]";
+ mes "It seems she's become aware of something as well.";
+ mes "Is this not a good thing?";
+ mes "Father and daughter can get along and figure out their ancestors' past.";
+ next;
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "...Is that so? Is there no other way?";
+ mes "Anyway, it seems we need your help.";
+ mes "You have to check if Arquien is doing it correctly.";
+ next;
+ cutin "verus_aures.bmp",0;
+ mes "[Aures]";
+ mes "We need somebody to collect the Memory Records as well?";
+ mes "Ahahahahaha";
+ next;
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "Well, that's not untrue...";
+ mes "^4d4dffWork with Arquien for the time being.^000000";
+ completequest 7649;// Report Memory Record Content
+ VER_MAIN = 31;
+ }
+ close3;
+ }
+
+S_Daily:
+ mes "[Ian Atnad]";
+ mes "The excavation project?";
+ mes ".. do you mean the Power Control Device?";
+ next;
+ mes "[Ian Atnad]";
+ switch( checkquest(7616,PLAYTIME) ) {// Core Collection - Down
+ case -1:
+ if (isbegin_quest(7615) == 0) {// Core Collection
+ cutin "verus_ian01.bmp",2;
+ mes "Are you talking about today's work?";
+ mes "It may be obvious but it is to look for Power Control Devices.";
+ mes "...";
+ mes "..You don't have to do it if you don't want to.";
+ next;
+ if (select( "I will look for Power Control Devices.", "It is too hard." ) == 1) {
+ mes "[Ian Atnad]";
+ mes "You? You definitely said you will find them yourself?";
+ mes "I have no reason to reject this offer.";
+ mes "Since you said you will do it yourself.";
+ next;
+ mes "[Ian Atnad]";
+ mes "Collect 20 Power Control Devices this time as well.";
+ mes "If we can unravel the secret of Power Control Devices...";
+ mes "We should be able to fix the broken ones and use them ourselves, right?";
+ mes "It will be fun.";
+ next;
+ mes "[Ian Atnad]";
+ mes "... And.. I feel like I've seen it.. feels like I will know it.";
+ mes "Like I will remember. If I research and research until it is stuck in my brain I am sure something will come of it.";
+ setquest 7615;// Core Collection
+ return;
+ }
+ mes "[Ian Atnad]";
+ mes "If you aren't here to work then go away.";
+ mes "You're distracting me.";
+ return;
+ }
+ if (countitem(6749) < 20) {// Operation_Control_Device
+ mes "It's always the same.";
+ mes "It's ^4d4dff20 Power Control Devices^000000.";
+ mes "Since we're already here, I want to do this right so try not to mess up.";
+ return;
+ }
+ mes "You got it right again.";
+ mes "....";
+ mes "What are you looking at?";
+ mes "Drop what you brought and leave.";
+ next;
+ mes "[Ian Atnad]";
+ mes "......This time I will use it well without breaking it.";
+ mes "Let's slowly get into restoration as well.";
+ delitem 6749, countitem(6749);// Operation_Control_Device
+ erasequest 7615;// Core Collection
+ setquest 7616;// Core Collection - Down
+ getexp 1500000,1000000;
+ if (getarg(0) && VERUS_DAILY_QUEST < 10) {// inaccurate
+ if (VER_MAIN != 32)
+ VERUS_DAILY_QUEST++;
+ if (VER_MAIN == 35 && VERUS_DAILY_QUEST == 10)
+ VER_MAIN = 36;
+ else if (VER_MAIN == 31 && VERUS_DAILY_QUEST >= 4)
+ VER_MAIN = 32;
+ }
+ return;
+ case 0:
+ case 1:
+ mes "We are researching it now.";
+ mes "It's possible we will render it useless from the experiments.";
+ mes "Anyway I am busy now so leave me alone.";
+ return;
+ case 2:
+ erasequest 7616;// Core Collection - Down
+ mes "The Power Control Devices we recovered in the past are all broken.";
+ mes "They couldn't withstand all the experiments.";
+ mes "Just like the ones now.";
+ next;
+ cutin "verus_ian04.bmp",2;
+ mes "[Ian Atnad]";
+ mes "Arquien is like that too.";
+ mes "......Because she couldn't withstand it... ..";
+ mes "...Hoo..";
+ return;
+ }
+
+OnInit:
+ questinfo 7615,QTYPE_QUEST,1;// inaccurate
+ setquestinfo_req 7615,7616,0;
+ end;
+}
+
+verus03,167,257,5 script Access Controller Damhw#atnd 4_M_LGTGUARD,{
+ .@visible_name$ = strnpcinfo(1);
+ if (.@visible_name$ == "Access Controller Damhw")
+ .@npc_name$ = "Damhwa";
+ else if (.@visible_name$ == "Access Controller Geuma")
+ .@npc_name$ = "Geuman";
+ else
+ .@npc_name$ = "Gyuhwa";
+
+ mes "[" + .@npc_name$ + "]";
+ if (VER_MAIN < 19) {
+ mes "I am sorry, only permitted excavation team members are permitted access.";
+ mes "If you work hard with your current excavation team the permit will come.";
+ close;
+ }
+ if (isbegin_quest(7641) == 2) {
+ mes "How is the research and investigation going?";
+ mes "The machines in the restricted area are quite dangerous so please be careful.";
+ close;
+ }
+ mes "This place can only be accessed by permitted members.";
+ mes "Where are you coming from?";
+ next;
+ if (select("I am coming from the atnad excavation", "Why am I prohibited?") == 1) {
+ mes "[" + .@npc_name$ + "]";
+ mes "Ah. You are a member of the Atnad excavation team.";
+ mes "Yes I have confirmed you on the list.";
+ mes "Atnad excavators are permitted access.";
+ next;
+ select("Why is access prohibited?");
+ }
+ mes "[" + .@npc_name$ + "]";
+ mes "Verus City is divided into four large sections.";
+ mes "Did you know?";
+ next;
+ mes "[" + .@npc_name$ + "]";
+ mes "The area currently open are the town and plaza.";
+ mes "While the reason is unknown this place has been closed off and prohibited.";
+ next;
+ mes "[" + .@npc_name$ + "]";
+ mes "During independent corporate investigations before excavator recruitment,";
+ mes "we found that there was a large explosion here and to check the safety of the area,";
+ mes "an inspection period was needed.";
+ next;
+ mes "[" + .@npc_name$ + "]";
+ mes "This is place currently not seen as a great risk other than the dangerous terrain and possibility of";
+ mes "being attacked by machines like the plaza, so access is limited only to the excavation team.";
+ next;
+ mes "[" + .@npc_name$ + "]";
+ mes "Please note that the permit also includes the zone connected in the West.";
+ next;
+ mes "[" + .@npc_name$ + "]";
+ mes "Anyway, since you are permitted you may enter freely from now on.";
+ mes "Then I expect there to be good results!";
+ completequest 7641;// Access Permitted (note : player can enter in verus01 without this quest)
+ close;
+}
+verus03,172,257,3 duplicate(Access Controller Damhw#atnd) Access Controller Gyuhw#atnd 4_M_LGTGUARD
+verus03,52,250,5 duplicate(Access Controller Damhw#atnd) Access Controller Geuma#atnd 4_M_LGTGUARD
+
+verus03,52,254,0 script verus03_to_verus01 WARPNPC,1,1,{
+ if (VER_MAIN < 19) {
+ mes "[Access Controller]";
+ mes "I am sorry but only permitted members can enter from this point.";
+ close;
+ }
+ warp "verus01",243,62;
+ end;
+}
+
+verus03,169,259,0 script verus03_to_verus02 WARPNPC,1,1,{
+ if (VER_MAIN < 19) {
+ mes "[Access Controller]";
+ mes "I am sorry but only permitted members can enter from this point.";
+ close;
+ }
+ warp "verus02",72,19;
+ end;
+}
+
+
+verus02,60,30,1 script Strewn paper#e152a01 4_ENERGY_BLUE,{
+ if (checkweight(1301,1) == 0) {
+ mes "- Cannot progress quest because you have too many items in your possession. -";
+ close;
+ }
+ if (VER_MAIN == 20) {
+ mes "Decided to deliver the 'Memory Record' found in the heap to Dr. Ian Atnad.";
+ mes "Right now a piece of paper hard to read is left.";
+ close;
+ }
+ if (isbegin_quest(7645) == 0 && isbegin_quest(7650) == 0 && VER_MAIN != 19) {
+ mes "Nothing special is found.";
+ close;
+ }
+ if (countitem(6757) > 4) {
+ mes "Enough Memory Records are collected.";
+ mes "No more need to go through the heap of garbage.";
+ close;
+ }
+ if (VER_MAIN == 19) {
+ mes "All sorts of documents and office supplies are piled up in a heap.";
+ mes "Most of the writing is damaged and hard to read.";
+ }
+ else
+ mes "Something may come out by a search.";
+ next;
+ if (select("Check adequately.", "Quit.") == 2) {
+ mes "Decided to investigate something else.";
+ close;
+ }
+ progressbar "00ff00",3;
+ hideonnpc strnpcinfo(0);
+ getitem 6757,1;// The_Memory_Recorder
+ if (VER_MAIN == 19) {
+ mes "You find a object never seen before as you go through the clutter of documents and office supplies.";
+ mes "^4d4dffThis needs to be checked if it has enough research value to be brought back to Dr. Ian Atnad.^000000";
+ erasequest 7642;// Explore Research facilities
+ setquest 7643;// Mysterious Piece
+ VER_MAIN = 20;
+ }
+ else {
+ mes "Found a Memory Record between the piles of documents.";
+ mes "Seems like someone hid it there on purpose.";
+ }
+ initnpctimer;
+ close;
+
+OnTimer60000:
+ hideoffnpc strnpcinfo(0);
+ end;
+}
+verus02,178,32,3 duplicate(Strewn paper#e152a01) Strewn paper#e152a02 4_ENERGY_BLUE
+verus02,102,135,3 duplicate(Strewn paper#e152a01) Strewn paper#e152a03 4_ENERGY_BLUE
+verus02,42,37,3 duplicate(Strewn paper#e152a01) Strewn paper#e152a04 4_ENERGY_BLUE
+verus02,155,64,3 duplicate(Strewn paper#e152a01) Strewn paper#e152a05 4_ENERGY_BLUE
+verus02,80,129,3 duplicate(Strewn paper#e152a01) Strewn paper#e152a06 4_ENERGY_BLUE
+verus02,29,129,3 duplicate(Strewn paper#e152a01) Strewn paper#e152a07 4_ENERGY_BLUE
+verus02,125,85,3 duplicate(Strewn paper#e152a01) Strewn paper#e152a08 4_ENERGY_BLUE
+verus02,51,237,3 duplicate(Strewn paper#e152a01) Strewn paper#e152a09 4_ENERGY_BLUE
+verus02,160,150,3 duplicate(Strewn paper#e152a01) Strewn paper#e152a10 4_ENERGY_BLUE
+
+verus01,123,181,3 script Verity#Warper 4_F_BERRYTEA,{
+ mes "[Verity]";
+ mes "Hello.";
+ mes "Are you here for the underground bunker investigation?";
+ cutin "EP15_2_brt_2.bmp", 2;
+ next;
+ switch( select( "Yes", "No.", "Use gravity safety device" ) ) {
+ case 1:
+ mes "[Verity]";
+ mes "It seems very dangerous below so please be careful.";
+ cutin "EP15_2_brt_1.bmp",2;
+ next;
+ mes "[Verity]";
+ mes "If you consider the appearance of monsters not seen in other areas, something is...";
+ cutin "EP15_2_brt_3.bmp",2;
+ close2;
+ warp "un_bunker",98,91;
+ end;
+ case 2:
+ break;
+ case 3:
+ mes "[Verity]";
+ mes "You can easily reach the entrance of the last room by using the gravity safety device.";
+ cutin "EP15_2_brt_1.bmp",2;
+ next;
+ if (select( "Use.", "Quit." ) == 1) {
+ mes "[Verity]";
+ if (countitem(6828) < 1) {
+ mes "I see you do not have the gravity safety device with you.";
+ close2;
+ cutin "",255;
+ end;
+ }
+ delitem 6828,1;// Gravity_Safety_Device
+ close2;
+ warp "un_myst",142,38;
+ @weird_piece = 0;
+ end;
+ }
+ break;
+ }
+ mes "[Verity]";
+ mes "Is that so?";
+ mes "Hm...";
+ cutin "EP15_2_brt_1.bmp",2;
+ close3;
+}
+
+un_bunker,382,335,3 script Box#e152p00 4_ENERGY_BLUE,{
+ if (checkweight(1301,1) == 0) {
+ mes "- Cannot progress quest because you have too many items in your possession. -";
+ close;
+ }
+ if (VER_MAIN == 27 || isbegin_quest(7652) > 0) {// Collect Memory Records of Laboratories
+ if (countitem(6824) < 5) {
+ mes "Enough Memory Records are collected.";
+ mes "No need to keep on crawling and searching.";
+ close;
+ }
+ if (VER_MAIN == 27)
+ mes "Something shiny is seen under the desk.";
+ else
+ mes "Something may come out by a search.";
+ next;
+ if (select( "Check below.", "Quit." ) == 1) {
+ progressbar "00ff00",3;
+ mes "Found a Memory Record under the desk.";
+ hideonnpc strnpcinfo(0);
+ getitem 6824,1;// Experimental_Dong_Memory_Record
+ }
+ close;
+ }
+ mes "Nothing special is found.";
+ close;
+}
+un_bunker,87,167,3 duplicate(Box#e152p00) Under desk#e152p01 4_ENERGY_BLUE
+un_bunker,316,243,3 duplicate(Box#e152p00) Under desk#e152p02 4_ENERGY_BLUE
+un_bunker,103,175,3 duplicate(Box#e152p00) Under desk#e152p03 4_ENERGY_BLUE
+un_bunker,50,292,3 duplicate(Box#e152p00) Machine Remains#e152p04 4_ENERGY_BLUE
+un_bunker,57,314,3 duplicate(Box#e152p00) Machine Remains#e152p05 4_ENERGY_BLUE
+un_bunker,128,314,3 duplicate(Box#e152p00) Machine Remains#e152p06 4_ENERGY_BLUE
+un_bunker,143,308,3 duplicate(Box#e152p00) Machine Remains#e152p07 4_ENERGY_BLUE
+un_bunker,147,287,3 duplicate(Box#e152p00) Machine Remains#e152p08 4_ENERGY_BLUE
+un_bunker,245,360,3 duplicate(Box#e152p00) Thicket#e152p09 4_ENERGY_BLUE
+un_bunker,286,348,3 duplicate(Box#e152p00) Thicket#e152p10 4_ENERGY_BLUE
+un_bunker,331,375,3 duplicate(Box#e152p00) Thicket#e152p11 4_ENERGY_BLUE
+un_bunker,288,263,3 duplicate(Box#e152p00) Document pile#e152p14 4_ENERGY_BLUE
+un_bunker,280,243,3 duplicate(Box#e152p00) Document pile#e152p15 4_ENERGY_BLUE
+un_bunker,287,304,3 duplicate(Box#e152p00) Organized food tray#e15 4_ENERGY_BLUE
+un_bunker,321,305,3 duplicate(Box#e152p00) Organized food tray#e152 4_ENERGY_BLUE
+
+un_bunker,103,95,4 script Mysterious Device#EP15.?_1 2_BOARD2,{
+ end;
+}
+un_bunker,102,161,4 duplicate(Mysterious Device#EP15.?_1) Mysterious Device#EP15.?_2 2_BOARD2
+un_bunker,51,272,4 duplicate(Mysterious Device#EP15.?_1) Mysterious Device#EP15.?_3 2_BOARD2
+un_bunker,295,234,4 duplicate(Mysterious Device#EP15.?_1) Mysterious Device#EP15.?_4 2_BOARD2
+un_bunker,279,297,4 duplicate(Mysterious Device#EP15.?_1) Mysterious Device#EP15.?_5 2_BOARD2
+
+//- Wandering Bard Quest
+verus03,129,21,5 script Wandering Bard#ep15 1_M_BARD,{
+function checkstatusquest;
+
+ mes "[Wandering Bard]";
+ if (isbegin_quest(4295) == 2) {// Wandering Bard
+ mes "I've told you";
+ mes "everything I wanted to tell you.";
+ mes "I hope we'll meet again someplace else.";
+ next;
+ mes "[Wandering Bard]";
+ mes "Until then,";
+ mes "stay safe.";
+ mes "I'm leaving for someplace else";
+ mes "in search of new stories to tell.";
+ mes "You'll be on your way, I'll be on my.";
+ close;
+ }
+
+ switch( checkquest(4296,PLAYTIME) ) {
+ case -1:
+ break;
+ case 0:
+ case 1:
+ mes "I don't have a story to tell you at this moment.";
+ mes "I'm trying to rest my mind.";
+ mes "Why don't you go";
+ mes "rest for a while?";
+ close;
+ case 2:
+ erasequest 4296;
+ break;
+ }
+
+ setarray .@quest_id[0],
+ 4297, // Bard's Story: Some Corporation
+ 4298, // Bard's Story: The President
+ 4299, // Bard's Story: a Scholar in Juno
+ 4300, // Bard's Story: a Mad Scientist
+ 4301, // Bard's Story: Hugel
+ 4302; // Bard's Story: Odin Temple
+ .@size_quest_id = getarraysize(.@quest_id);
+
+ for ( .@i = 0; .@i < .@size_quest_id; .@i++ ) {
+ switch( isbegin_quest(.@quest_id[.@i]) ) {
+ case 0:
+ .@quest_undone[.@size_undone] = .@quest_id[.@i];
+ .@size_undone++;
+ continue;
+ case 1:
+ break;
+ case 2:
+ .@total += 2;
+ continue;
+ }
+ break;
+ }
+
+ if (.@i < .@size_quest_id) {
+ mes "Adventurer,";
+ mes "what story";
+ mes "did you bring me?";
+ next;
+ if (checkstatusquest(.@quest_id[.@i]) == 0) {
+ mes "^ff0000You have not yet met the requirements to complete the quest.^000000";
+ next;
+ if (select( "Return the quest.", "End conversation." ) == 2) {
+ mes "[Wandering Bard]";
+ mes "Please be safe.";
+ close;
+ }
+ mes "[Wandering Bard]";
+ mes "Maybe you're not ready";
+ mes "for that task just yet.";
+ next;
+ mes "[Wandering Bard]";
+ mes "Come back later,";
+ mes "and I'll have a new story ready for you.";
+ mes "Bye for now.";
+ erasequest .@quest_id[.@i];
+ wandering_bard_quest++;
+ if (wandering_bard_quest >= 2) {
+ setquest 4296;// Take a Break
+ wandering_bard_quest = 0;
+ }
+ close;
+ }
+ mes "- Tell your story. -";
+ next;
+ mes "[Wandering Bard]";
+ switch( .@quest_id[.@i] ) {
+ case 4297:
+ mes "Maybe there's";
+ mes "more to it than that,";
+ mes "but we wouldn't know";
+ mes "because it's too late.";
+ next;
+ mes "[Wandering Bard]";
+ mes "Your story dampens my mood,";
+ mes "and I wasn't in a good mood to begin with.";
+ mes "Well, at least I'm glad to see you back in one piece.";
+ break;
+ case 4298:
+ mes "Schwarzwald seems to be";
+ mes "split into";
+ mes "various political factions.";
+ mes "Political intrigues don't mean much";
+ mes "to wandering artists like me.";
+ next;
+ mes "[Wandering Bard]";
+ mes "I'm proud of you, though:";
+ mes "you've become acquainted with the president";
+ mes "and carried out a secret mission for him.";
+ mes "And I'm also glad to see you back in one piece.";
+ break;
+ case 4299:
+ mes "Scholars are such a strange kind.";
+ mes "I can't fathom what joy they'd feel";
+ mes "in studying such a thing.";
+ next;
+ mes "[Wandering Bard]";
+ mes "Of course, to some people";
+ mes "my search for new stories";
+ mes "sounds meaningless.";
+ mes "I don't care, so long as I have";
+ mes "curious adventurers like you with whom to pass the time.";
+ next;
+ mes "[Wandering Bard]";
+ mes "Welcome back.";
+ mes "I really enjoyed this story of yours.";
+ break;
+ case 4300:
+ mes "Only the gods know";
+ mes "who's right";
+ mes "and who's wrong.";
+ mes "I believe that applies to those scientists as well.";
+ next;
+ mes "[Wandering Bard]";
+ mes "If you ask me,";
+ mes "I can't say which side is right or wrong.";
+ mes "Can you?";
+ next;
+ mes "[Wandering Bard]";
+ mes "Welcome back.";
+ mes "I really enjoyed this story of yours.";
+ break;
+ case 4301:
+ mes "The advancement of technology doesn't always mean";
+ mes "the destruction of the old.";
+ mes "Technology cannot advance by itself.";
+ mes "Neither can medical science";
+ mes "and life research.";
+ next;
+ mes "[Wandering Bard]";
+ mes "Um,";
+ mes "at least that's what I've heard.";
+ mes "...Just forget I said that.";
+ next;
+ mes "[Wandering Bard]";
+ mes "The general populace";
+ mes "only likes to hear about happy endings,";
+ mes "so let's focus on";
+ mes "the positive aspects of the story,";
+ next;
+ mes "[Wandering Bard]";
+ mes "Welcome back.";
+ mes "instead of";
+ mes "the dark,";
+ mes "depressing ones.";
+ break;
+ case 4302:
+ mes "I'm not sure if the same thing";
+ mes "won't happen";
+ mes "in this excavation site";
+ mes "because even I can sense a dangerous shadow looming over it.";
+ next;
+ mes "[Wandering Bard]";
+ mes "And about the last person you've met,";
+ mes "um...";
+ next;
+ mes "[Wandering Bard]";
+ mes "Never mind. I shouldn't even have said that.";
+ next;
+ mes "[Wandering Bard]";
+ mes "We can only watch";
+ mes "the factions conspire against each other";
+ mes "and hope for";
+ mes "the best.";
+ mes "As a bard, my duty is simply to spread the word to the public.";
+ next;
+ mes "[Wandering Bard]";
+ mes "I'm glad to see you back in one piece.";
+ mes "And thank you";
+ mes "for such a valuable story.";
+ break;
+ }
+ next;
+ mes "[Wandering Bard]";
+ if (.@total == 10) {
+ mes "Sigh, I hate to say this,";
+ mes "but this will have to be the last time";
+ mes "we share stories with each other.";
+ mes "Thank you for telling me all those interesting tales.";
+ next;
+ mes "[Wandering Bard]";
+ mes "Please take this.";
+ mes "I hope";
+ mes "it'll be useful for you.";
+ mes "I hope we'll meet again someplace else.";
+ completequest .@quest_id[.@i];
+ setquest 4295;// Wandering Bard
+ completequest 4295;
+ getitem 12263,5;// Comp_Battle_Manual
+ wandering_bard_quest = 0;
+ next;
+ mes "[Wandering Bard]";
+ mes "I have to leave";
+ mes "in search of new stories.";
+ mes "You'll be on your way, I'll be on my.";
+ mes "Be safe.";
+ close;
+ }
+ completequest .@quest_id[.@i];
+ setquest 4296;// Take a Break
+ wandering_bard_quest = 0;
+ mes "Please give me some time.";
+ mes "I want to make a new song";
+ mes "based on the story you've just told me.";
+ next;
+ mes "[Wandering Bard]";
+ mes "You should rest and regroup in the meantime.";
+ close;
+ }
+ .@r = rand(.@size_undone);
+ setquest .@quest_undone[.@r];
+ mes "Listen to my story.";
+ next;
+ mes "[Wandering Bard]";
+ switch( .@quest_undone[.@r] ) {
+ case 4297:
+ mes "In the Republic of Schwarzwald,";
+ mes "where science prevails over magic,";
+ mes "a giant corporation of men";
+ next;
+ mes "[Wandering Bard]";
+ mes "is rumored to conduct research";
+ mes "whose purpose is noble and questionable at the same time.";
+ mes "Do you know";
+ mes "what's going on behind the closed doors of the corporation?";
+ next;
+ mes "[Wandering Bard]";
+ mes "You should";
+ mes "look further into what that corporation is doing.";
+ mes "Please be careful.";
+ close;
+ case 4298:
+ mes "Do you know the president of";
+ mes "the Republic of Schwarzwald?";
+ mes "Usually, commoners like you and me";
+ mes "could never dream of meeting such a prominent figure,";
+ next;
+ mes "[Wandering Bard]";
+ mes "but rumor has it you can";
+ mes "if you can find his contact in Lighthalzen.";
+ mes "Not only can you meet the president,";
+ mes "but you can unlock some new adventure.";
+ next;
+ mes "[Wandering Bard]";
+ mes "Look for his contact,";
+ mes "and everything else will take care of itself.";
+ mes "Who knows?";
+ mes "The adventure of your life might await you.";
+ close;
+ case 4299:
+ mes "I wonder where all these researchers";
+ mes "have come from.";
+ mes "They must be";
+ mes "from all over the globe,";
+ mes "seeking the thrills of discovering the unknown.";
+ next;
+ mes "[Wandering Bard]";
+ mes "I think the most daring kind of people are";
+ mes "scholars and researchers,";
+ mes "like those at the Juno Library...";
+ next;
+ mes "[Wandering Bard]";
+ mes "Oh, speaking of the Juno Library,";
+ mes "I know there's a scholar";
+ mes "who does the same kind of research,";
+ mes "you know,";
+ mes "looking at odd-looking things all day.";
+ next;
+ mes "[Wandering Bard]";
+ mes "You should";
+ mes "talk to that scholar.";
+ mes "He may open your eyes to a whole new world.";
+ close;
+ case 4300:
+ mes "Are these people";
+ mes "helping each other?";
+ next;
+ mes "[Wandering Bard]";
+ mes "Rumor has it there's a mad scientist";
+ mes "in Juno, and a group of people are";
+ mes "trying to thwart his dangerous research.";
+ next;
+ mes "[Wandering Bard]";
+ mes "I'd say the statement is biased.";
+ mes "Maybe the scientist is sound,";
+ mes "and those people are dangerous.";
+ mes "Who knows? I would steer clear of both of them, though, if I were you.";
+ close;
+ case 4301:
+ mes "Scholars. Where do they draw the line at their research?";
+ mes "Drifters like you and me";
+ mes "have no care for the world, and I'm glad for that.";
+ next;
+ mes "[Wandering Bard]";
+ mes "In Hugel, there's a scholar";
+ mes "who's rumored to be obsessed with a dangerous experiment.";
+ mes "I want you to go find out";
+ mes "what it is he's after:";
+ mes "happiness or hollow ambition.";
+ close;
+ case 4302:
+ mes "I've seen the same scenery";
+ mes "a long time ago,";
+ mes "when Odin Temple";
+ mes "was first discovered.";
+ next;
+ mes "[Wandering Bard]";
+ mes "Oh, that reminds me";
+ mes "of the story about";
+ mes "the two--no, three people related to Odin Temple.";
+ next;
+ mes "[Wandering Bard]";
+ mes "I wonder if Hugel still has the signboard";
+ mes "to recruit excavators.";
+ mes "Would you go check it out?";
+ mes "I want to hear the story behind those excavators when you get back.";
+ close;
+ }
+
+function checkstatusquest {
+ switch( getarg(0) ) {
+ case 4297:
+ if (lhz_curse >= 31)// Cursed Spirit Quest
+ return true;
+ break;
+ case 4298:
+ if (lhz_boss >= 43)// President Quest
+ return true;
+ break;
+ case 4299:
+ if (yuno_hist >= 10)// Juperos Ruins History Quest
+ return true;
+ break;
+ case 4300:
+ if (metto_q >= 9)// Metto Quest
+ return true;
+ break;
+ case 4301:
+ if (hg_bio >= 9)// Biological Weapon Quest
+ return true;
+ break;
+ case 4302:
+ if (hg_odin >= 60)// Odin Temple Excavation Quest
+ return true;
+ break;
+ }
+ return false;
+}
+}
+
+//- Police Quests
+verus04,133,212,4 script Police Chief Kesler#EP15_1 2_M_SWORDMASTER,{
+ if (checkweight(1301,1) == 0) {
+ mes "- You are carrying too many items to continue. -";
+ close;
+ }
+ .@playtime_5318 = checkquest(5318,PLAYTIME);
+ .@quest_5309 = isbegin_quest(5309);
+ mes "[Police Chief Kesler]";
+ if (VER_MAIN < 5 || .@playtime_5318 == 2) {
+ emotion ET_DELIGHT;
+ mes "Nice to meet you. I'm Kesler, chief of the Phantasmagorika Police.";
+ }
+ else {
+ emotion ET_PROFUSELY_SWEAT;
+ mes "Welcome to the Phantasmagorika Police.";
+ }
+ if (.@playtime_5318 == 2)
+ erasequest 5318;
+ next;
+ if (countitem(6753) > 0)// Token_Of_Destruction
+ .@string$ = "I brought Doom Tokens.";
+ else
+ .@string$ = "What should I beware while in Phantasmagorika";
+ switch( select( "The Phantasmagorika Police?", "Is there anything I can do to help?", .@string$, "Nothing." ) ) {
+ case 1:
+ emotion ET_SCRATCH;
+ mes "[Police Chief Kesler]";
+ mes "Oh, do you want to know about us at the ^4E9867Phantasmagorika Police^000000? Why, thank you. Not many people are interested in what we do.";
+ next;
+ mes "[Police Chief Kesler]";
+ mes "You may wonder why such a fresh site needs a policing unit. Well, there's a valid reason.";
+ next;
+ select("What's that?");
+ mes "[Police Chief Kesler]";
+ mes "Have you heard of the ^F8081EDoom Prayers^000000?";
+ next;
+ emotion ET_FRET;
+ mes "[Police Chief Kesler]";
+ mes "They're a cult group propagating the end of the world. They vandalize in the name of their god.";
+ next;
+ mes "[Police Chief Kesler]";
+ mes "It's only recent that they appeared in Phantasmagorika, but they've done so much damage already that scholars and mercenaries have organized this policing unit.";
+ next;
+ mes "[Police Chief Kesler]";
+ mes "The ^F8081EDoom Prayers^000000 are mainly sighted around the ^82ABE9Verus Central Plaza^000000. If you encounter them, feel free to teach them a lesson or two.";
+ next;
+ emotion ET_SMILE;
+ mes "[Police Chief Kesler]";
+ mes "Hah hah, we're short-staffed.";
+ close;
+ case 2:
+ mes "[Police Chief Kesler]";
+ if (BaseLevel < 140) {
+ mes "I understand your enthusiasm, but you should focus on your training for now.";
+ next;
+ emotion ET_SORRY;
+ mes "[Police Chief Kesler]";
+ mes "Phantasmagorika is more dangerous than you think.";
+ close;
+ }
+ if (.@playtime_5318 == 0 || .@playtime_5318 == 1) {
+ mes "Thank you for offering to help, but we can manage on our own.";
+ close;
+ }
+ if (.@quest_5309 != 1) {
+ if (.@quest_5309 == 0) {
+ emotion ET_HUK;
+ mes "I'm sorry, what did you say?";
+ next;
+ select("Is there anything I can do to help?");
+ }
+ mes "[Police Chief Kesler]";
+ mes "Wow, you're the first person to ever offer help. We're spread thin, dealing with the Doom Prayers and everything else at the same time.";
+ next;
+ mes "[Police Chief Kesler]";
+ mes "I haven't had time to hear about the work-related difficulties trat the members of my unit may be experiencing.";
+ next;
+ mes "[Police Chief Kesler]";
+ mes "Could you make a tour around Phantasmagorika and talk to the police officers?";
+ next;
+ if (select( "Sure.", "Maybe later." ) == 2) {
+ emotion ET_CRY;
+ mes "[Police Chief Kesler]";
+ mes "Oh, I thought you wanted to help.";
+ close;
+ }
+ if (.@quest_5309 == 2)
+ erasequest 5309;
+ setquest 5309;
+ mes "[Police Chief Kesler]";
+ mes "Thank you.";
+ close;
+ }
+ if (isbegin_quest(5310) == 0 || isbegin_quest(5311) == 0 || isbegin_quest(5312) == 0 || isbegin_quest(5313) == 0) {
+ emotion ET_QUESTION;
+ mes "You haven't met with all the members.";
+ next;
+ mes "[Police Chief Kesler]";
+ mes "Please come back when you have.";
+ close;
+ }
+ mes "You've met with all my members. Thank you.";
+ next;
+ mes "[Police Chief Kesler]";
+ mes "I'm glad none of them--Salgran, Gerev, Seiden, and Piffs--are having problems.";
+ next;
+ mes "[Police Chief Kesler]";
+ mes "Please take this small token of my appreciation.";
+ next;
+ completequest 5309;
+ for ( .@quest_id = 5310; .@quest_id <= 5313; .@quest_id++ )
+ erasequest .@quest_id;
+ for ( .@quest_id = 5314; .@quest_id <= 5317; .@quest_id++ ) {
+ if (isbegin_quest(.@quest_id) == 2) {
+ erasequest .@quest_id;
+ .@success++;
+ }
+ }
+ setquest 5318;// Come Back Tomorrow
+ getexp 200000 + (200000 * .@success),0;
+ mes "[Police Chief Kesler]";
+ mes "If you are not busy tomorrow, could you come back and help me again?";
+ close;
+ case 3:
+ if (isbegin_quest(5304) == 2) {
+ mes "[Police Chief Kesler]";
+ mes "Oh, didn't you bring some Doom Tokens a while ago?";
+ next;
+ mes "[Police Chief Kesler]";
+ mes "I guess you haven't left? You must like being here. So do I. Hah hah hah!";
+ while(1) {
+ next;
+ switch( select( "What can I get in exchange for Doom", "Give Doom Tokens.", "Nothing." ) ) {
+ case 1:
+ mes "[Police Chief Kesler]";
+ mes "I remember telling you this when you first brought Doom Tokens, but all right, I don't mind telling you again.";
+ next;
+ mes "[Police Chief Kesler]";
+ mes "Doom Tokens are exchangeable with Packing Envelope that is often found in the excavation site.";
+ next;
+ mes "[Police Chief Kesler]";
+ mes "Scholars have found out the envelop activates various effects when opened.";
+ next;
+ mes "[Police Chief Kesler]";
+ mes "The duration of the effects is short, but it's still better than nothing.";
+ continue;
+ case 2:
+ .@amount = countitem(6753);// Token_Of_Destruction
+ delitem 6753, .@amount;
+ getitem 22611, .@amount;// Packed_Envelope
+ mes "[Police Chief Kesler]";
+ mes "You've brought " + .@amount + " Doom Tokens. I can give you " + .@amount + " Packing Envelopes.";
+ next;
+ mes "[Police Chief Kesler]";
+ mes "Thank you, and keep up the good work.";
+ close;
+ case 3:
+ emotion ET_SCRATCH;
+ mes "[Police Chief Kesler]";
+ mes "Um, didn't you say you had Doom Tokens?";
+ close;
+ }
+ }
+ }
+ if (countitem(6753) > 0) {// Token_Of_Destruction
+ emotion ET_HUK;
+ mes "[Police Chief Kesler]";
+ mes "Oh, the Doom Prayers carry this ^F8081EDoom Token^000000.";
+ next;
+ mes "[Police Chief Kesler]";
+ mes "Where did you find this?";
+ next;
+ select("Tell him where you found it.");
+ emotion ET_THANKS;
+ mes "[Police Chief Kesler]";
+ mes "Thank you so much for helping us to maintain public peace.";
+ next;
+ mes "[Police Chief Kesler]";
+ mes "You deserve a reward, but I can't think of anything good.";
+ next;
+ mes "[Police Chief Kesler]";
+ mes "Hm...";
+ next;
+ emotion ET_SURPRISE;
+ mes "[Police Chief Kesler]";
+ mes "Oh, I've got an idea! Bring me ^F8081EDoom Tokens^000000, and I'll exchange them with ^4E9867Packing Envelope^000000.";
+ next;
+ select("Packing Envelope?");
+ mes "[Police Chief Kesler]";
+ mes "It's an envelope often discovered in the excavation site.";
+ next;
+ mes "[Police Chief Kesler]";
+ mes "Scholars have found out the envelope activates various effects when opened.";
+ next;
+ mes "[Police Chief Kesler]";
+ mes "Would you like to exchange your Doom Tokens with Packing Envelope now? Or you can do it later.";
+ next;
+ if (select( "Exchange now.", "Do it later." ) == 2) {
+ mes "[Police Chief Kesler]";
+ mes "Sure, no problem. It's not like Doom Tokens have an expiration date.";
+ }
+ else {
+ .@amount = countitem(6753);// Token_Of_Destruction
+ delitem 6753, .@amount;
+ getitem 22611, .@amount;// Packed_Envelope
+ mes "[Police Chief Kesler]";
+ mes "In exchange for your " + .@amount + " Doom Tokens, I've given you " + .@amount + " Packing Envelopes.";
+ }
+ setquest 5304;// Police Chief Kesler
+ completequest 5304;
+ next;
+ mes "[Police Chief Kesler]";
+ mes "Thank you for your continue support in the subjugation of the Doom Prayers.";
+ close;
+ }
+ emotion ET_HUK;
+ mes "[Police Chief Kesler]";
+ mes "Oh, is this your first time in Phantasmagorika?";
+ next;
+ mes "[Police Chief Kesler]";
+ mes "This site was only recently discovered, and therefore fairly safe. I can't think of anything you should be worried about...";
+ next;
+ emotion ET_HUK;
+ mes "[Police Chief Kesler]";
+ mes "Oh, strike that--there's one thing.";
+ next;
+ mes "[Police Chief Kesler]";
+ mes "This ^82ABE9Verus Excavation Site^000000 is safe, but if you're planning to move to the ^82ABE9Verus Central Plaza^000000, then make sure you're prepared for the worst.";
+ next;
+ mes "[Police Chief Kesler]";
+ mes "By the way the excavation of this site just has begun, and everything in it must be kept in place until the excavation is over.";
+ next;
+ emotion ET_FRET;
+ mes "[Police Chief Kesler]";
+ mes "But those Doom Payers are making it impossible. Bah! %$#@#$#@";
+ next;
+ mes "[Police Chief Kesler]";
+ mes "I'm going bald, worrying over them so much. I didn't have much hair to begin with.";
+ next;
+ mes "[Police Chief Kesler]";
+ mes "...";
+ next;
+ mes "[Police Chief Kesler]";
+ mes "Um, didn't mean to rant about my hair.";
+ next;
+ emotion ET_OK;
+ mes "[Police Chief Kesler]";
+ mes "Just be careful not to break anything that has been discovered in this site.";
+ close;
+ case 4:
+ emotion ET_STARE_ABOUT;
+ mes "[Police Chief Kesler]";
+ mes "This is the first thing I tell every new visitor: if you see the ^F8081EDoom Prayers^000000, don't hesitate to report to the nearest police station.";
+ close;
+ }
+}
+
+verus03,36,113,4 script Police Officer Salgran#EP15 2_M_THIEFMASTER,{
+ if (checkweight(1301,1) == 0) {
+ mes "- You are carrying too many items to continue. -";
+ close;
+ }
+ .@quest_5305 = isbegin_quest(5305);// Police Officer Salgran
+ .@quest_5309 = isbegin_quest(5309);// Police Chief's Request
+ .@quest_5310 = isbegin_quest(5310);// Salgran's Problem
+ .@quest_5314 = isbegin_quest(5314);// Salgran's Request
+ .@quest_5315 = isbegin_quest(5315);// Gerev's Request
+ .@quest_5316 = isbegin_quest(5316);// Seiden's Request
+ .@quest_5317 = isbegin_quest(5317);// Piffs's Request
+ .@playtime_5318 = checkquest(5318,PLAYTIME);
+
+ if (.@quest_5309 != 1) {
+ specialeffect EF_SLEEPATTACK;
+ mes "[Police Officer Salgran]";
+ mes "Zzz... Zzz...";
+ next;
+ emotion ET_PROFUSELY_SWEAT;
+ mes "[Police Officer Salgran]";
+ mes "Ch-Chief, I'm sorry!";
+ next;
+ mes "He's talking in his sleep.";
+ close;
+ }
+ if (.@quest_5315 == 1 || .@quest_5316 == 1 || .@quest_5317 == 1) {
+ mes "[Police Officer Salgran]";
+ mes "You're working a different sector at this moment. Come back when you're done there.";
+ close;
+ }
+ if (.@quest_5310 == 0 && .@playtime_5318 < 2) {
+ switch(.@quest_5314) {
+ case 0:
+ if (.@quest_5305 == 0) {
+ specialeffect EF_SLEEPATTACK;
+ select("Excuse me.");
+ emotion ET_HUK;
+ mes "[Police Officer Salgran]";
+ mes "Ch-Chief Kesler! I-I wasn't dozing off!";
+ next;
+ emotion ET_THINK;
+ mes "[Police Officer Salgran]";
+ mes "...";
+ next;
+ mes "[Police Officer Salgran]";
+ mes "Whew, you're not the Chief. Who are you?";
+ next;
+ mes "[" + strcharinfo(0) + "]";
+ mes "Your chief in the middle of Phantasmagorika sent me.";
+ next;
+ emotion ET_SEXY;
+ mes "[Police Officer Salgran]";
+ mes "Thank goodness, he didn't come himself. He must be busy, eh? Welcome. Could you help me out with something?";
+ next;
+ if (select( "Help.", "Maybe next time." ) == 2) {
+ emotion ET_OHNO;
+ if (isbegin_quest(5305) == 0) {
+ setquest 5305;// Police Officer Salgran
+ completequest 5305;// Police Officer Salgran
+ }
+ setquest 5310;// Salgran's Problem
+ mes "[Police Officer Salgran]";
+ mes "You must be busy. All right, then tell the Chief that everything's good in my sector.";
+ close;
+ }
+ mes "[Police Officer Salgran]";
+ mes "Thanks! I've been saddled with some tiresome duties, and I could use your help.";
+ next;
+ mes "[Police Officer Salgran]";
+ mes "You know the Doom Prayers are in our midst, don't you?";
+ next;
+ mes "[Police Officer Salgran]";
+ mes "They've been leaving illegal promotional leaflets all over the place, and whatever paper they used, it sticks to the ground like gum.";
+ next;
+ mes "[Police Officer Salgran]";
+ mes "I need to get rid of the leaflets before they permanently glue themselves.";
+ next;
+ mes "[Police Officer Salgran]";
+ mes "Could you get rid of them if you see them in the site? They're giving me a headache.";
+ next;
+ if (select( "OK", "Maybe next time." ) == 2) {
+ // inaccurate
+ emotion ET_OHNO;
+ if (isbegin_quest(5305) == 0) {
+ setquest 5305;// Police Officer Salgran
+ completequest 5305;// Police Officer Salgran
+ }
+ setquest 5310;// Salgran's Problem
+ mes "[Police Officer Salgran]";
+ mes "You must be busy. All right, then tell the Chief that everything's good in my sector.";
+ close;
+ }
+ setquest 5314;
+ mes "[Police Officer Salgran]";
+ mes "Thank you. Come back when you get rid of 10 Illegal Leaflets.";
+ close;
+ }
+ emotion ET_WRAP;
+ mes "[Police Officer Salgran]";
+ mes "Welcome back. Did the Chief send you again?";
+ next;
+ emotion ET_QUESTION;
+ mes "[Police Officer Salgran]";
+ mes "Great, can you help me again to get rid of those illegal leaflets?";
+ next;
+ if (select( "Help.", "Maybe next time." ) == 1) {
+ setquest 5314;
+ mes "[Police Officer Salgran]";
+ mes "Thank you. Come back when you get rid of 10 Illegal Leaflets.";
+ close;
+ }
+ setquest 5310;// Salgran's Problem
+ mes "[Police Officer Salgran]";
+ mes "You must be busy. All right, then tell the Chief that everything's good in my sector.";
+ close;
+ case 1:
+ mes "[Police Officer Salgran]";
+ mes "Wow, I thought you left a minute ago, and you're already back. Did you get rid of the Illegal Leaflets?";
+ next;
+ switch( select( "I did.", "Where can I find them?", "Can I not do this?", "Never mind." ) ) {
+ case 1:
+ mes "[Police Officer Salgran]";
+ if (checkquest(5314,HUNTING) == 2) {
+ mes "Oh, good job! The Chief never forgets a favor. He might reward you more handsomely depending on his mood.";
+ completequest 5314;
+ setquest 5310;
+ close;
+ }
+ emotion ET_OHNO;
+ mes "Hmpf, of course no one can be so quick. I asked you to get rid of at least 10 Illegal Leaflets.";
+ close;
+ case 2:
+ emotion ET_HUK;
+ mes "[Police Officer Salgran]";
+ mes "They're everywhere in Phantasmagorika. You can't not see them.";
+ next;
+ emotion ET_SCRATCH;
+ mes "[Police Officer Salgran]";
+ mes "Do you have some sort of vision problem? There's no way you can miss them.";
+ close;
+ case 3:
+ erasequest 5314;
+ if (isbegin_quest(5305) == 0) {
+ setquest 5305;
+ completequest 5305;
+ }
+ setquest 5310;
+ mes "[Police Officer Salgran]";
+ mes "I want to say no, but I can't force you. Just go tell the Chief that everything's good in my sector.";
+ close;
+ case 4:
+ emotion ET_SCRATCH;
+ mes "[Police Officer Salgran]";
+ mes "You're silly.";
+ close;
+ }
+ case 2:
+ break;
+ }
+ }
+ mes "[Police Officer Salgran]";
+ mes "Haven't you reported to the Captain yet? I told you everything's fine in my sector.";
+ close;
+}
+
+
+verus03,116,36,6 script Police Officer Gerev#EP15_1D 4_M_ALCHE_A,{
+ if (checkweight(1301,1) == 0) {
+ mes "- You are carrying too many items to continue. -";
+ close;
+ }
+ .@quest_5306 = isbegin_quest(5306);// Police Officer Gerev
+ .@quest_5309 = isbegin_quest(5309);// Police Chief's Request
+ .@quest_5311 = isbegin_quest(5311);// Gerev's Problem
+ .@quest_5314 = isbegin_quest(5314);// Salgran's Request
+ .@quest_5315 = isbegin_quest(5315);// Gerev's Request
+ .@quest_5316 = isbegin_quest(5316);// Seiden's Request
+ .@quest_5317 = isbegin_quest(5317);// Piffs's Request
+ .@playtime_5318 = checkquest(5318,PLAYTIME);
+
+ mes "[Police Officer Gerev]";
+ if (.@quest_5309 != 1) {
+ emotion ET_OTL;
+ mes "Ugh, I can feel the stress building up inside... Argh, this place is giving me an ulcer!";
+ next;
+ mes "He's pulling his hair in agony.";
+ close;
+ }
+ if (.@quest_5314 == 1 || .@quest_5316 == 1 || .@quest_5317 == 1) {
+ emotion ET_PROFUSELY_SWEAT;
+ mes "Ugh, I'm having stomach cramps. Come back when you're done with your current assignment.";
+ close;
+ }
+ if (.@quest_5311 == 0 && .@playtime_5318 < 2) {
+ switch(.@quest_5315) {
+ case 0:
+ if (.@quest_5306 == 0) {
+ emotion ET_CONFUSE;
+ mes "Argh, where's my pen? I had it when I left the station. Did those robots steal it from me?";
+ next;
+ mes "[" + strcharinfo(0) + "]";
+ mes "Check behind your ear.";
+ next;
+ emotion ET_HUK;
+ mes "[Police Officer Gerev]";
+ mes "Err? I don't remember putting it there.";
+ next;
+ emotion ET_QUESTION;
+ mes "[Police Officer Gerev]";
+ mes "Oops, sorry. How may I help you?";
+ next;
+ mes "[" + strcharinfo(0) + "]";
+ mes "Your chief in the middle of Phantasmagorika sent me.";
+ next;
+ emotion ET_FRET;
+ mes "[Police Officer Gerev]";
+ mes "Ah, Chief Kesler sent you. If I didn't know him, I'd have thought he was too busy to come see me. I bet I'm busier than him, though.";
+ next;
+ if (select( "I can help.", "Sorry I can't be of help." ) == 2) {
+ if (isbegin_quest(5306) == 0) {
+ setquest 5306;
+ completequest 5306;
+ }
+ setquest 5311;// Gerev's Problem
+ mes "[Police Officer Gerev]";
+ mes "You're willing to help the Chief, but not me. Why not because I'm not a chief?";
+ next;
+ emotion ET_STARE;
+ mes "[Police Officer Gerev]";
+ mes "*Snort* Just go tell Chief Kesler everything's quiet in my sector.";
+ close;
+ }
+ emotion ET_BIGTHROB;
+ mes "[Police Officer Gerev]";
+ mes "Are you sure? Because I really hate to be disappointed.";
+ next;
+ mes "[Police Officer Gerev]";
+ mes "As you know, the Doom Prayers are among us. Grr, just thinking about them makes me grind me teeth.";
+ next;
+ mes "[Police Officer Gerev]";
+ mes "Yesterday I walked over one of their traps and sprained my ankle,";
+ next;
+ mes "[Police Officer Gerev]";
+ mes "on top of everything else that's happened to me.";
+ next;
+ mes "[Police Officer Gerev]";
+ mes "Sigh, could you disarm their traps?";
+ next;
+ if (select( "Sure thing.", "Maybe next time." ) == 2) {
+ emotion ET_FRET;
+ if (isbegin_quest(5306) == 0) {
+ setquest 5306;
+ completequest 5306;
+ }
+ setquest 5311;
+ mes "[Police Officer Gerev]";
+ mes "*Snort* I knew it. Just go tell Chief Kesler everything's quiet in my sector.";
+ close;
+ }
+ setquest 5315;
+ mes "[Police Officer Gerev]";
+ mes "Thank you. Please disarm 10 traps installed in Phantasmagorika.";
+ next;
+ mes "[Police Officer Gerev]";
+ mes "I appreciate it if you can get rid of those in my vicinity first.";
+ close;
+ }
+ mes "Hello again. Did the Chief send you?";
+ next;
+ mes "[Police Officer Gerev]";
+ mes "If you're not busy, could you disarm the Doom Prayers' traps scattered across Phantasmagorika?";
+ next;
+ if (select( "Sure.", "Maybe next time." ) == 1) {
+ setquest 5315;
+ trap_doom_prayers = 0;
+ mes "[Police Officer Gerev]";
+ mes "Thank you. Please disarm 10 traps installed in Phantasmagorika.";
+ close;
+ }
+ emotion ET_SCRATCH;
+ setquest 5311;
+ mes "[Police Officer Gerev]";
+ mes "You're just as busy, eh? No worries. I have other adventurers helping me. Please tell Chief Kesler everything's good in my sector.";
+ close;
+ case 1:
+ emotion ET_HUK;
+ mes "Wow, did you already disarm all the traps?";
+ next;
+ switch( select( "I did!", "Where are the traps?", "I have a more pressing matter at hand.", "Never mind." ) ) {
+ case 1:
+ if (trap_doom_prayers >= 10) {
+ completequest 5315;// Gerev's Request
+ setquest 5311;// Gerev's Problem
+ trap_doom_prayers = 0;
+ mes "[Police Officer Gerev]";
+ mes "Thank you. I feel much better, knowing there are fewer traps around me. Please tell Chief Kesler that everything's well in my sector.";
+ close;
+ }
+ emotion ET_OTL;
+ mes "[Police Officer Gerev]";
+ mes "I'm already on the verge of a breakdown. You don't have to push.";
+ next;
+ mes "[Police Officer Gerev]";
+ mes "You haven't finished disarming 10 traps. I can see one in front of me. Why don't you start with that?";
+ close;
+ case 2:
+ emotion ET_STARE;
+ mes "[Police Officer Gerev]";
+ mes "Oh no, haven't you seen any trap at all?";
+ next;
+ mes "[Police Officer Gerev]";
+ mes "Look for ??? written on the ground. That's the Doom Prayers' signature.";
+ next;
+ mes "[Police Officer Gerev]";
+ mes "I can see one right in front of me. Ugh, my stomach...";
+ next;
+ mes "[Police Officer Gerev]";
+ mes "I must be stressed out again. I feel my stomach tightening...";
+ close;
+ case 3:// can redo
+ erasequest 5315;// Gerev's Request
+ trap_doom_prayers = 0;
+ if (isbegin_quest(5306) == 0) {
+ setquest 5306;
+ completequest 5306;
+ }
+ close;
+ case 4:
+ emotion ET_OTL;
+ mes "[Police Officer Gerev]";
+ mes "...W-what? Ugh... M-my stomach...";
+ close;
+ }
+ case 2:
+ break;
+ }
+ }
+ emotion ET_DELIGHT;
+ mes "I feel much better now. Please tell Chief Kesler that everything's good in my sector.";
+ close;
+}
+
+verus03,81,241,6 script Police Officer Seiden#EP15_1 4_M_ORIENT02,{
+ if (checkweight(1301,1) == 0) {
+ mes "- You are carrying too many items to continue. -";
+ close;
+ }
+ .@quest_5307 = isbegin_quest(5307);// Police Officer Seiden
+ .@quest_5309 = isbegin_quest(5309);// Police Chief's Request
+ .@quest_5312 = isbegin_quest(5312);// Seiden's Problem
+ .@quest_5314 = isbegin_quest(5314);// Salgran's Request
+ .@quest_5315 = isbegin_quest(5315);// Gerev's Request
+ .@quest_5316 = isbegin_quest(5316);// Seiden's Request
+ .@quest_5317 = isbegin_quest(5317);// Piffs's Request
+ .@playtime_5318 = checkquest(5318,PLAYTIME);
+
+ emotion ET_KIK;
+ mes "[Police Officer Seiden]";
+ if (.@quest_5309 != 1) {
+ mes "*Chuckle* I know who you are, but I don't want to talk to you.";
+ next;
+ mes "He's creepy.";
+ close;
+ }
+ if (.@quest_5314 == 1 || .@quest_5315 == 1 || .@quest_5317 == 1) {
+ mes "*Chuckle* Try one thing at a time, or Phantasmagorika's curse will be upon you.";
+ close;
+ }
+ if (.@quest_5312 == 0 && .@playtime_5318 < 2) {
+ switch(.@quest_5316) {
+ case 0:
+ if (.@quest_5307 == 0) {
+ mes "*Chuckle* The Chief sent you. I know because I've been waiting.";
+ next;
+ emotion ET_SURPRISE, playerattached();
+ mes "[" + strcharinfo(0) + "]";
+ mes "?!";
+ next;
+ mes "[Police Officer Seiden]";
+ mes "Don't ask me how--I have my sources. Let's cut to the chase.";
+ next;
+ mes "[Police Officer Seiden]";
+ mes "I could use your help, if you're willing and not busy.";
+ next;
+ if (select( "Sure.", "Not now." ) == 2) {
+ emotion ET_SCRATCH;
+ if (isbegin_quest(5307) == 0) {
+ setquest 5307;
+ completequest 5307;
+ }
+ setquest 5312;// Seiden's Problem
+ mes "[Police Officer Seiden]";
+ mes "I don't understand. My friend swore this never failed on people, hm... Oh well, tell Chief Kesler everything's good on my end.";
+ close;
+ }
+ emotion ET_KIK;
+ mes "[Police Officer Seiden]";
+ mes "*Chuckle* I knew it. Ah, just forget I said that.";
+ next;
+ mes "[Police Officer Seiden]";
+ mes "I'm having a bit of difficulty doing my job.";
+ next;
+ mes "[Police Officer Seiden]";
+ mes "The Doom Prayers throw stones at us, and I'm worried they might hurt innocent people.";
+ next;
+ mes "[Police Officer Seiden]";
+ mes "Could you pick up the stones you see in Phantasmagorika? 10 stones should suffice for now. Keep doing that and we'll get to all of them one day.";
+ next;
+ if (select( "I'll be back.", "Maybe next time." ) == 2) {
+ emotion ET_SCRATCH;
+ if (isbegin_quest(5307) == 0) {
+ setquest 5307;
+ completequest 5307;
+ }
+ setquest 5312;// Seiden's Problem
+ mes "[Police Officer Seiden]";
+ mes "I don't understand. My friend swore this never failed on people, hm... Oh well, tell Chief Kesler everything's good on my end.";
+ close;
+ }
+ emotion ET_KIK;
+ setquest 5316;
+ count_stone_seiden = 0;
+ mes "[Police Officer Seiden]";
+ mes "*Chuckles* Pebbles don't count. Please bring 10 stones big enough to fit your hand.";
+ close;
+ }
+ mes "*Chuckle* I thought it's about time.";
+ next;
+ mes "[Police Officer Seiden]";
+ mes "*Chuckle* Please clear Phantasmagorika of stones, just like the last time.";
+ next;
+ if (select( "Sure.", "Maybe next time." ) == 1) {
+ setquest 5316;
+ count_stone_seiden = 0;
+ mes "[Police Officer Seiden]";
+ mes "Pebbles don't count. Please bring 10 stones big enough to fit your hand.";
+ close;
+ }
+ setquest 5312;
+ mes "[Police Officer Seiden]";
+ mes "You're still busy, huh? No worries. Just tell Chief Kesler that everything's quiet in my sector.";
+ close;
+ case 1:
+ mes "*Chuckle* Did you pick up all the stones?";
+ next;
+ switch( select( "I did.", "Where are they?", "I don't have time for them.", "Never mind." ) ) {
+ case 1:
+ emotion ET_KIK;
+ mes "[Police Officer Seiden]";
+ if (count_stone_seiden < 10) {
+ if (countitem(7049) < 10)
+ mes "*Chuckle* Where are they? Pick them up, or the spirits of the victims will haunt you forever.";
+ else
+ mes "*Chuckle* Look around--there are stones everywhere. Where did you find this stone, then?";
+ close;
+ }
+ if (countitem(7049) < 10) {
+ mes "*Chuckle* Where are the stones? Please bring them to me.";
+ close;
+ }
+ delitem 7049,10;// Stone
+ count_stone_seiden = 0;
+ completequest 5316;
+ if (isbegin_quest(5307) == 0) {
+ setquest 5307;
+ completequest 5307;
+ }
+ setquest 5312;
+ mes "[Police Officer Seiden]";
+ mes "*Chuckle* Thank you. The spirits of the victims are appeased for now.";
+ close;
+ case 2:
+ emotion ET_KIK;
+ mes "[Police Officer Seiden]";
+ mes "*Chuckle* Stones are everywhere.";
+ next;
+ mes "[Police Officer Seiden]";
+ mes "Search the ground. *Chuckle* Do I really have to tell you that?";
+ close;
+ case 3:
+ emotion ET_KIK;
+ erasequest 5316;
+ count_stone_seiden = 0;
+ if (isbegin_quest(5307) == 0) {
+ setquest 5307;
+ completequest 5307;
+ }
+ setquest 5312;
+ mes "[Police Officer Seiden]";
+ mes "*Chuckle* Please leave your stones somewhere away from traffic. Beware the spirits of the victims!";
+ close;
+ case 4:
+ emotion ET_KIK;
+ mes "[Police Officer Seiden]";
+ mes "*Chuckle* Got it. Keep up the good work.";
+ close;
+ }
+ case 2:
+ break;
+ }
+ }
+ mes "*Chuckle* Be careful not to incur anyone's wrath.";
+ close;
+}
+
+verus03,127,36,4 script ???#EP15_1D_01 4_CRACK,{
+ if (checkweight(1301,1) == 0) {
+ mes "- You are carrying too many items to continue. -";
+ close;
+ }
+ .@quest_5315 = isbegin_quest(5315);// Gerev's Request
+ .@quest_5316 = isbegin_quest(5316);// Seiden's Request
+ if (.@quest_5315 == 1 || .@quest_5316 == 1) {
+ if (.@quest_5315 == 1) {
+ if (trap_doom_prayers >= 10) {
+ mes "You disarmed all the traps you had to.";
+ close;
+ }
+ emotion ET_SURPRISE;
+ mes "The ??? on the ground looks suspicious. What do you want to do?";
+ next;
+ if (select( "Examine.", "Leave it." ) == 2) {
+ mes "You've decided not to touch the suspicious object.";
+ close;
+ }
+ progressbar "00ff00",2;
+ if (rand(2))
+ mes "You've decided it's nothing.";
+ else {
+ mes "You disarmed all the traps of the Doom Prayers.";
+ trap_doom_prayers++;
+ }
+ }
+ else {
+ if (count_stone_seiden > 9) {
+ mes "You picked up 10 large stones. Take them to the police officer.";
+ close;
+ }
+ mes "You found a stone half-buried in the ground. Do you want to pick it up?";
+ next;
+ if (select( "Pick it up.", "Leave it." ) == 2) {
+ mes "You've decided to leave the pebble.";
+ close;
+ }
+ if (rand(2))
+ mes "This pebble is too small to inflict serious damage when thrown.";
+ else {
+ mes "You picked up a dangerously large stone.";
+ getitem 7049,1;
+ count_stone_seiden++;
+ }
+ }
+ initnpctimer;
+ disablenpc strnpcinfo(0);
+ close;
+ }
+ end;
+
+OnTimer30000:
+ stopnpctimer;
+ enablenpc strnpcinfo(0);
+ end;
+}
+verus03,119,17,4 duplicate(???#EP15_1D_01) ???#EP15_1D_02 4_CRACK
+verus03,163,33,4 duplicate(???#EP15_1D_01) ???#EP15_1D_03 4_CRACK
+verus03,207,47,4 duplicate(???#EP15_1D_01) ???#EP15_1D_04 4_CRACK
+verus03,225,245,4 duplicate(???#EP15_1D_01) ???#EP15_1D_05 4_CRACK
+verus03,169,181,4 duplicate(???#EP15_1D_01) ???#EP15_1D_06 4_CRACK
+verus03,122,139,4 duplicate(???#EP15_1D_01) ???#EP15_1D_07 4_CRACK
+verus03,80,230,4 duplicate(???#EP15_1D_01) ???#EP15_1D_08 4_CRACK
+verus03,42,105,4 duplicate(???#EP15_1D_01) ???#EP15_1D_09 4_CRACK
+verus03,99,235,4 duplicate(???#EP15_1D_01) ???#EP15_1D_10 4_CRACK
+verus03,81,207,4 duplicate(???#EP15_1D_01) ???#EP15_1D_11 4_CRACK
+verus03,226,243,4 duplicate(???#EP15_1D_01) ???#EP15_1D_12 4_CRACK
+verus03,148,144,4 duplicate(???#EP15_1D_01) ???#EP15_1D_13 4_CRACK
+verus03,74,44,4 duplicate(???#EP15_1D_01) ???#EP15_1D_14 4_CRACK
+verus03,20,54,4 duplicate(???#EP15_1D_01) ???#EP15_1D_15 4_CRACK
+verus03,74,212,4 duplicate(???#EP15_1D_01) ???#EP15_1D_16 4_CRACK
+verus03,42,47,4 duplicate(???#EP15_1D_01) ???#EP15_1D_17 4_CRACK
+verus03,80,195,4 duplicate(???#EP15_1D_01) ???#EP15_1D_18 4_CRACK
+verus03,134,72,4 duplicate(???#EP15_1D_01) ???#EP15_1D_19 4_CRACK
+verus03,45,45,4 duplicate(???#EP15_1D_01) ???#EP15_1D_20 4_CRACK
+verus03,115,235,4 duplicate(???#EP15_1D_01) ???#EP15_1D_21 4_CRACK
+verus03,76,194,4 duplicate(???#EP15_1D_01) ???#EP15_1D_22 4_CRACK
+verus03,166,32,4 duplicate(???#EP15_1D_01) ???#EP15_1D_23 4_CRACK
+verus03,121,42,4 duplicate(???#EP15_1D_01) ???#EP15_1D_24 4_CRACK
+verus03,141,36,4 duplicate(???#EP15_1D_01) ???#EP15_1D_25 4_CRACK
+
+verus04,202,258,4 script Police Officer Piffs#EP15_1 4_M_SAGE_C,{
+ if (checkweight(1301,1) == 0) {
+ mes "- You are carrying too many items to continue. -";
+ close;
+ }
+ .@quest_5308 = isbegin_quest(5308);// Police Officer Piffs
+ .@quest_5309 = isbegin_quest(5309);// Police Chief's Request
+ .@quest_5313 = isbegin_quest(5313);// Piffs's Problem
+ .@quest_5314 = isbegin_quest(5314);// Salgran's Request
+ .@quest_5315 = isbegin_quest(5315);// Gerev's Request
+ .@quest_5316 = isbegin_quest(5316);// Seiden's Request
+ .@quest_5317 = isbegin_quest(5317);// Piffs's Request
+ .@playtime_5318 = checkquest(5318,PLAYTIME);
+
+ mes "[Police Officer Piffs]";
+ if (.@quest_5309 != 1) {
+ emotion ET_HUNGRY;
+ mes "*Yum Yum*";
+ mes "Um, this meat is delicious!";
+ next;
+ mes "He's chewing on meat.";
+ close;
+ }
+ if (.@quest_5314 == 1 || .@quest_5315 == 1 || .@quest_5316 == 1) {
+ emotion ET_BEST;
+ mes "Geez, are you working multiple sectors at the same time? You're superhuman.";
+ close;
+ }
+ if (.@quest_5313 == 0 && .@playtime_5318 < 2) {
+ switch(.@quest_5317) {
+ case 0:
+ if (.@quest_5308 == 0) {
+ emotion ET_HUNGRY;
+ mes "*Yum Yum* Delish!";
+ next;
+ mes "[" + strcharinfo(0) + "]";
+ mes "Excuse me.";
+ next;
+ emotion ET_HUK;
+ mes "[Police Officer Piffs]";
+ mes "Oops.";
+ mes "My apologies; I shouldn't have been snacking in public.";
+ next;
+ mes "[Police Officer Piffs]";
+ mes "Hello. My name is Piffs, and I'm a Sage. I came to study Phantasmagorika.";
+ next;
+ mes "[Police Officer Piffs]";
+ mes "Did the Chief send you? This is great.";
+ next;
+ emotion ET_QUESTION;
+ mes "[Police Officer Piffs]";
+ mes "I'm running short on some supplies, but I can't leave my post unattended. Can you help me?";
+ next;
+ if (select("Sure thing.", "Not now.") == 2) {
+ if (isbegin_quest(5308) == 0) {
+ setquest 5308;// Police Officer Piffs
+ completequest 5308;
+ }
+ setquest 5313;// Piffs's Problem
+ mes "[Police Officer Piffs]";
+ mes "I understand. If you change your mind, though, come back to me.";
+ close;
+ }
+ mes "[Police Officer Piffs]";
+ mes "Hah hah hah, thank you.";
+ next;
+ mes "[Police Officer Piffs]";
+ mes "This area is fairly safe, but my colleagues stationed at the Plaza are prone to injury caused by the Doom Prayers.";
+ next;
+ mes "[Police Officer Piffs]";
+ mes "I need to gather herbs for them, but like I said I can't leave my post unattended.";
+ next;
+ mes "[Police Officer Piffs]";
+ mes "I know where some good herbs grow in this place. Could you gather them for me?";
+ }
+ else {
+ mes "Hah hah! Hello again. Did the Chief send you?";
+ next;
+ mes "[Police Officer Piffs]";
+ mes "If you're not busy, I'd like to ask you to gather some more herbs. Is that okay?";
+ }
+ next;
+ if (select( "Sure.", "Maybe next time." ) == 1) {
+ setquest 5317;// Piffs's Request
+ mes "[Police Officer Piffs]";
+ mes "Thank you. Look around thickets, and you'll see some herbs. I won't need more than 10.";
+ close;
+ }
+ if (isbegin_quest(5308) == 0) {
+ setquest 5308;// Police Officer Piffs
+ completequest 5308;
+ }
+ setquest 5313;// Piffs's Problem
+ mes "[Police Officer Piffs]";
+ mes "I understand. If you change your mind, though, come back to me.";
+ close;
+ case 1:
+ emotion ET_QUESTION;
+ mes "Welcome back. Did you find all the herbs?";
+ next;
+ switch( select( "There you go.", "Where can I find them?", "I have a more pressing matter at hand.", "Never mind." ) ) {
+ case 1:
+ mes "[Police Officer Piffs]";
+ if (countitem(6754) > 9) {
+ delitem 6754,10;// Collected_Medicinal_Herbs
+ completequest 5317;
+ setquest 5313;
+ if (isbegin_quest(5308) == 0) {
+ setquest 5308;
+ completequest 5308;
+ }
+ mes "Thank you for helping me stock up on herbs.";
+ next;
+ mes "[Police Officer Piffs]";
+ mes "This herb smells good. I think it'll make good garnish for meat... *Ahem* I'm not saying I want to eat it.";
+ }
+ else {
+ mes "Where are the herbs you said you gathered?";
+ next;
+ mes "[Police Officer Piffs]";
+ mes "No, I don't eat herbs. I just want to keep them in stock for my colleagues.";
+ }
+ close;
+ case 2:
+ mes "[Police Officer Piffs]";
+ mes "Where can you find herbs?";
+ next;
+ mes "[Police Officer Piffs]";
+ mes "Look around thickets, and you'll see some herbs.";
+ close;
+ case 3:
+ changequest 5317,5313;
+ if (isbegin_quest(5308) == 0) {
+ setquest 5308;
+ completequest 5308;
+ }
+ if (countitem(6754))
+ delitem 6754, countitem(6754);// Collected_Medicinal_Herbs
+ mes "[Police Officer Piffs]";
+ mes "You can leave now. I'll send word to the Chief.";
+ close;
+ case 4:
+ mes "[Police Officer Piffs]";
+ mes "Don't forget I need 10 herbs.";
+ close;
+ }
+ case 2:
+ break;
+ }
+ }
+ emotion ET_BEST;
+ mes "Don't you worry. I'll keep this area safe.";
+ close;
+}
+
+verus04,187,219,4 script Thicket#EP15_1D_01 4_CREEPER,{
+ if (checkweight(1301,1) == 0) {
+ mes "- You are carrying too many items to continue. -";
+ close;
+ }
+ if (isbegin_quest(5317) == 1) {// Piffs's Request
+ if (countitem(6754) > 9) {
+ mes "This kind of thicket grows everywhere in Phantasmagorika.";
+ close;
+ }
+ mes "This thicket looks like it's hiding some herbs. What do you want to do?";
+ next;
+ if (select( "Gather the herb.", "Leave it." ) == 2) {
+ mes "You've decided to forget about it.";
+ close;
+ }
+ if (rand(2)) {
+ progressbar "00ff00",2;
+ mes "No herbs were found in the thicket.";
+ }
+ else {
+ getitem 6754,1;// Collected_Medicinal_Herbs
+ mes "Gathered the herb.";
+ }
+ disablenpc strnpcinfo(0);
+ initnpctimer;
+ close;
+ }
+ end;
+
+OnTimer60000:
+ enablenpc strnpcinfo(0);
+ stopnpctimer;
+ end;
+}
+verus04,167,206,4 duplicate(Thicket#EP15_1D_01) Thicket#EP15_1D_02 4_CREEPER
+verus04,198,198,4 duplicate(Thicket#EP15_1D_01) Thicket#EP15_1D_03 4_CREEPER
+verus04,143,205,4 duplicate(Thicket#EP15_1D_01) Thicket#EP15_1D_04 4_CREEPER
+verus04,125,265,4 duplicate(Thicket#EP15_1D_01) Thicket#EP15_1D_05 4_CREEPER
+verus04,92,203,4 duplicate(Thicket#EP15_1D_01) Thicket#EP15_1D_06 4_CREEPER
+verus04,97,204,4 duplicate(Thicket#EP15_1D_01) Thicket#EP15_1D_07 4_CREEPER
+verus04,85,189,4 duplicate(Thicket#EP15_1D_01) Thicket#EP15_1D_08 4_CREEPER
+verus04,64,191,4 duplicate(Thicket#EP15_1D_01) Thicket#EP15_1D_09 4_CREEPER
+verus04,55,185,4 duplicate(Thicket#EP15_1D_01) Thicket#EP15_1D_10 4_CREEPER
+verus04,42,185,4 duplicate(Thicket#EP15_1D_01) Thicket#EP15_1D_11 4_CREEPER
+verus04,29,189,4 duplicate(Thicket#EP15_1D_01) Thicket#EP15_1D_12 4_CREEPER
+verus04,40,223,4 duplicate(Thicket#EP15_1D_01) Thicket#EP15_1D_13 4_CREEPER
+verus04,32,240,4 duplicate(Thicket#EP15_1D_01) Thicket#EP15_1D_14 4_CREEPER
+verus04,27,243,4 duplicate(Thicket#EP15_1D_01) Thicket#EP15_1D_15 4_CREEPER
+verus04,34,248,4 duplicate(Thicket#EP15_1D_01) Thicket#EP15_1D_16 4_CREEPER
+verus04,52,251,4 duplicate(Thicket#EP15_1D_01) Thicket#EP15_1D_17 4_CREEPER
+verus04,72,247,4 duplicate(Thicket#EP15_1D_01) Thicket#EP15_1D_18 4_CREEPER
+verus04,75,243,4 duplicate(Thicket#EP15_1D_01) Thicket#EP15_1D_19 4_CREEPER
+verus04,81,252,4 duplicate(Thicket#EP15_1D_01) Thicket#EP15_1D_20 4_CREEPER
+
+//- New Power Source
+verus03,107,177,3 script Luke Lapez#atnd09 4_M_EDEN_GUARDER,{
+ if (checkweight(1301,1) == 0) {
+ mes "- You are carrying too many items to proceed with the quest. -";
+ close;
+ }
+ mes "[Luke]";
+ if (VER_MAIN < 14) {
+ cutin "looke_rapez04.bmp",0;
+ mes "Don't worry about him.";
+ mes "He knows what he's doing.";
+ close3;
+ }
+ if (VER_MAIN == 14) {
+ cutin "looke_rapez02.bmp",0;
+ mes "...?";
+ mes "Interesting.";
+ mes "He wants something ready to eat, juicy, refreshing, and clean-tasting?";
+ next;
+ cutin "looke_rapez03.bmp",0;
+ mes "[Luke]";
+ mes "Well, I've got an idea. Bring me some ingredients, and I'll cook something for you.";
+ mes "I'm pretty sure it'll fit the bill.";
+ next;
+ mes "[Luke]";
+ mes "The problem is";
+ mes "the ingredients are difficult to find.";
+ mes "I've learned this recipe while traveling across dimensions.";
+ next;
+ cutin "looke_rapez04.bmp",0;
+ mes "[Luke]";
+ mes "Well, it'll be you who has to find the ingredients:";
+ mes "2 Meats, 1 Mora Mandarin, and 1 Banana. Can you get them?";
+ next;
+ cutin "looke_rapez02.bmp",0;
+ mes "[Luke]";
+ mes "Some of the fruits grow near the ^4d4dffMisty Forest Labyrinth^000000.";
+ mes "You'll have to look hard for them.";
+ erasequest 7624;// In Search of a Delicacy
+ setquest 7625;// Count On Me
+ VER_MAIN = 15;
+ close3;
+ }
+ if (VER_MAIN == 15) {
+ if (countitem(517) < 2 || countitem(11520) < 1 || countitem(513) < 1) {
+ cutin "looke_rapez04.bmp",0;
+ mes "Did you forget the ingredients?";
+ mes "2 Meats, 1 Mora Mandarin, and 1 Banana.";
+ next;
+ mes "[Luke]";
+ mes "Some of the fruits grow near the ^4d4dffMisty Forest Labyrinth^000000.";
+ mes "...";
+ close3;
+ }
+ cutin "looke_rapez02.bmp",0;
+ mes "This should suffice.";
+ mes "I haven't cooked it in a while, but the recipe is in my head.";
+ next;
+ mes "[Luke]";
+ mes "Done.";
+ mes "This food should fit all the conditions you told me.";
+ next;
+ cutin "",255;
+ mes "Luke gave you Mora's specialty food, Beef Toast.";
+ mes "It perfectly fits everything Ian said he wanted.";
+ delitem 517,2; // Meat
+ delitem 11520,1;// Mora_Mandarin
+ delitem 513,1; // Banana
+ getitem 11519,1;// Beef_Toast
+ erasequest 7625;// Count On Me
+ setquest 7626;// Delicacy for Him
+ VER_MAIN = 16;
+ close;
+ }
+ if (VER_MAIN == 16) {
+ cutin "looke_rapez01.bmp",0;
+ mes "*Chuckle*";
+ mes "If you need more, it'll be easier to buy it from the Mora Village.";
+ mes "Do whatever it takes to win favor with that old man.";
+ next;
+ mes "[Luke]";
+ mes "Or you won't find the answer the Captain wanted.";
+ mes "Good luck.";
+ close3;
+ }
+ cutin "looke_rapez03.bmp",0;
+ mes "This place is boring, just like everywhere else.";
+ mes "Aren't there stronger monsters?";
+ next;
+ cutin "",255;
+ mes "[Lloyd]";
+ mes "Don't say that.";
+ mes "You'll jinx us.";
+ mes "I'm a brave Cat, but my claws can't even scratch those.";
+ next;
+ cutin "looke_rapez01.bmp",0;
+ mes "[Luke]";
+ mes "Alright, alright.";
+ mes "But don't worry.";
+ mes "I'm not stupid.";
+ mes "I'll never put my charges in danger.";
+ close3;
+}
+
+verus03,103,177,5 script Machinist Lloyd#atnd09 4_M_BOSSCAT,{
+ if (checkweight(1301,1) == 0) {
+ mes "- You are carrying too many items to proceed with the quest. -";
+ close;
+ }
+ mes "[Lloyd]";
+ if (VER_MAIN < 9) {
+ mes "You're";
+ mes "looking down your nose at me because I'm a Cat.";
+ mes "Tsk, tsk.";
+ mes "You Humans are so superficial.";
+ next;
+ mes "[Lloyd]";
+ mes "Just keep your distance and mind your own business.";
+ mes "You and I will be fine so long as you don't steal my hard work.";
+ close;
+ }
+ if (VER_MAIN == 9) {
+ mes "You're looking down your nose at me because I'm a Cat.";
+ next;
+ select("Are you Lloyd?");
+ mes "[Lloyd]";
+ mes "Yeah. What's up?";
+ mes "Huh? Aureth sent you?";
+ mes "To check up on my progress?";
+ next;
+ mes "[Lloyd]";
+ mes "Oh, I'm in trouble.";
+ mes "I must live up to his expectations,";
+ mes "but my research has been stagnant.";
+ next;
+ mes "[Lloyd]";
+ mes "Hey, could you help";
+ mes "me with something?";
+ next;
+ switch( select( "Sure.", "What is a Cat doing here?", "No." ) ) {
+ case 1:
+ break;
+ case 2:
+ mes "[Lloyd]";
+ mes "Unlike many from Malangdo Island, I've always been interested in new technologies and cultures.";
+ mes "I worked at companies, and I've learned alchemy.";
+ next;
+ mes "[Lloyd]";
+ mes "I came to Verus City when I heard the news of its discovery. I was told that I must be in an excavation team to be in the city.";
+ next;
+ mes "[Lloyd]";
+ mes "Aureth helped me to get in.";
+ mes "I'm also a member of the Arnard Excavation Team.";
+ next;
+ break;
+ case 3:
+ cutin "looke_rapez04.bmp",0;
+ mes "[Luke]";
+ mes "Sorry to interrupt,";
+ mes "but you're from the Eden Group to help the excavation team.";
+ next;
+ mes "[Luke]";
+ mes "Your job is to help Lloyd.";
+ mes "You can't say no.";
+ next;
+ cutin "",255;
+ mes "[Lloyd]";
+ mes "He's right!";
+ mes "You're obligated to help me with my research!";
+ next;
+ break;
+ }
+ mes "[Lloyd]";
+ mes "Let's cut to the chase.";
+ mes "Hey, Human help.";
+ mes "Get 10 empty glass bottles,";
+ mes "and collect condensed energy found around the remnants of robots.";
+ next;
+ mes "[Lloyd]";
+ mes "This place is littered with broken robots and machines.";
+ mes "Clouds of physical energy are discovered near them.";
+ next;
+ mes "[Lloyd]";
+ mes "Just bring empty bottles close to the energy, and it'll enter the bottles.";
+ mes "Bring me 10 bottles.";
+ next;
+ mes "[Lloyd]";
+ mes "I'll be waiting.";
+ erasequest 7620;// Young Blood?
+ setquest 7621;// Bottling the Energy
+ VER_MAIN = 10;
+ close;
+ }
+ if (VER_MAIN == 10) {
+ if (countitem(6756) < 10) {// Cohesive_Energy
+ mes "This place is littered with broken robots and machines.";
+ mes "Clouds of physical energy are discovered near them.";
+ next;
+ mes "[Lloyd]";
+ mes "Just bring empty bottles close to the energy, and it'll enter the bottles.";
+ mes "Bring me 10 bottles.";
+ next;
+ mes "[Lloyd]";
+ mes "You must be dumber than you look if you have to ask twice.";
+ close;
+ }
+ mes "Oh, this is enough.";
+ mes "You're good.";
+ mes "My estimation of you went up a notch.";
+ next;
+ mes "[Lloyd]";
+ mes "You've made my job easier.";
+ mes "Finally, I can be useful to Aureth.";
+ mes "If I find the cause of the condensation of energy and its possible applications, maybe";
+ next;
+ mes "[Lloyd]";
+ mes "Ian and I can reactivate the robots in this place.";
+ mes "That's what we've wanted all along.";
+ next;
+ mes "[Lloyd]";
+ mes "Tell Aureth I'm making progress.";
+ mes "Good job, Human.";
+ mes "I'll look forward to using your service again.";
+ delitem 6756,10;// Cohesive_Energy
+ erasequest 7621;// Bottling the Energy
+ setquest 7622;// Good News!
+ VER_MAIN = 11;
+ close;
+ }
+ if (VER_MAIN > 10 && VER_MAIN < 17) {
+ mes "Soon I'll need your service on a daily basis.";
+ mes "Don't fret and take one for the team.";
+ close;
+ }
+ switch( checkquest(7629,PLAYTIME) ) {
+ case -1:
+ if (isbegin_quest(7628) == 0) {
+ mes "You know the drill: collect condensed energy.";
+ mes "You'll do that for me, won't you?";
+ next;
+ if (select( "Sure.","Decline." ) == 2) {
+ mes "[Lloyd]";
+ mes "Why, do you have something else to do?";
+ mes "All right then,";
+ mes "I'll ask Luke to take me around.";
+ next;
+ cutin "looke_rapez01.bmp",0;
+ mes "[Luke]";
+ mes "I thought you'd never ask!";
+ mes "I've been itching for some action.";
+ close3;
+ }
+ mes "[Lloyd]";
+ mes "All you have to do is collect energy that naturally gathers around the remnants of robots and machines.";
+ mes "I need 10 bottles every day.";
+ setquest 7628;// New Power Source
+ close;
+ }
+ if (countitem(6756) < 10) {
+ mes "All you have to do is collect energy that naturally gathers around the remnants of robots and machines.";
+ mes "I need 10 bottles every day.";
+ close;
+ }
+ mes "I think I like you!";
+ mes "Not as much as Aureth and Luke, though.";
+ mes "All right, I'll make good use of this energy.";
+ next;
+ mes "[Lloyd]";
+ mes "Come back tomorrow.";
+ mes "Well, you might as well come back every day at this time.";
+ mes "You can't say no.";
+ mes "I need you.";
+ delitem 6756,10;// Cohesive_Energy
+ changequest 7628,7629;// Tomorrow for Tomorrow's Energy
+ getexp 150000,1000000;
+ close;
+ case 0:
+ case 1:
+ mes "I'm analyzing the collected energy.";
+ mes "...";
+ next;
+ mes "[Lloyd]";
+ mes "Are you dense?";
+ mes "That means I want to be left alone!";
+ close;
+ case 2:
+ erasequest 7629;
+ mes "Hm, maybe I need to find a special storage method.";
+ mes "The energy dissipates so easily.";
+ next;
+ mes "[Lloyd]";
+ mes "I'll need more bottles of the energy.";
+ mes "How are you?";
+ mes "Are you ready to take one for the team?";
+ close;
+ }
+}
+verus03,127,145,0 script Machine Remnant#atnd01 4_ENERGY_RED,{
+ if (checkweight(1301,1) == 0) {
+ mes "- You are carrying too many items to proceed with the quest. -";
+ close;
+ }
+ if (isbegin_quest(7628) == 0 && VER_MAIN != 10) {
+ mes "You don't have to collect more energy at this moment.";
+ close;
+ }
+ if (countitem(6756) > 9)// Cohesive_Energy
+ mes "You have enough ^4d4dffCondensed Energy^000000.";
+ else if (countitem(713) < 1)
+ mes "^4d4dffEmpty Bottle^000000 is required to collect Condensed Energy.";
+ else {
+ mes "A thick cloud of energy is visible between the broken pieces of metal.";
+ mes "Bring an empty bottle close to the waving edges of the cloud to collect the energy.";
+ next;
+ progressbar "00ff00",3;
+ delitem 713,1;// Empty Bottle
+ getitem 6756,1;// Cohesive_Energy
+ mes "Collected Condensed Energy!";
+ initnpctimer;
+ hideonnpc strnpcinfo(0);
+ }
+ close;
+
+OnTimer30000:
+ stopnpctimer;
+ hideoffnpc strnpcinfo(0);
+ end;
+}
+verus03,84,152,3 duplicate(Machine Remnant#atnd01) Machine Remnant#atnd02 4_ENERGY_RED
+verus03,104,181,3 duplicate(Machine Remnant#atnd01) Machine Remnant#atnd03 4_ENERGY_RED
+verus03,204,202,3 duplicate(Machine Remnant#atnd01) Machine Remnant#atnd04 4_ENERGY_RED
+verus03,219,199,3 duplicate(Machine Remnant#atnd01) Machine Remnant#atnd05 4_ENERGY_RED
+verus03,260,194,3 duplicate(Machine Remnant#atnd01) Machine Remnant#atnd06 4_ENERGY_RED
+verus03,198,181,3 duplicate(Machine Remnant#atnd01) Machine Remnant#atnd07 4_ENERGY_RED
+verus03,207,115,3 duplicate(Machine Remnant#atnd01) Machine Remnant#atnd08 4_ENERGY_RED
+verus03,54,78,3 duplicate(Machine Remnant#atnd01) Machine Remnant#atnd09 4_ENERGY_RED
+verus03,24,74,3 duplicate(Machine Remnant#atnd01) Machine Remnant#atnd10 4_ENERGY_RED
+verus03,41,121,3 duplicate(Machine Remnant#atnd01) Machine Remnant#atnd11 4_ENERGY_RED
+verus03,62,120,3 duplicate(Machine Remnant#atnd01) Machine Remnant#atnd12 4_ENERGY_RED
+verus03,44,195,3 duplicate(Machine Remnant#atnd01) Machine Remnant#atnd13 4_ENERGY_RED
+verus03,124,61,3 duplicate(Machine Remnant#atnd01) Machine Remnant#atnd14 4_ENERGY_RED
+verus03,168,229,3 duplicate(Machine Remnant#atnd01) Machine Remnant#atnd15 4_ENERGY_RED
+
+
+//- Krotzel's Request
+verus02,79,31,4 script Krotzel#1 4_F_HUWOMAN,{
+ if (VER_MAIN < 19)
+ end;
+ mes "[Krotzel]";
+ switch(VER_REPORTER) {
+ case 0:
+ mes "I am Monthly Brigan's senior reporter Krotzel! As this place is revealed to the many, many Adventurers are gathering here.";
+ next;
+ mes "[Krotzel]";
+ mes "Not a lot of information has been relayed to general Adventurers. So we are interviewing Adventurers ourselves! Doing the legwork and gathering information.";
+ next;
+ mes "[Krotzel]";
+ mes "Please give us good information if you have it. If it is a good piece of info we can give you a small reward.";
+ next;
+ mes "[Krotzel]";
+ mes "Who are we? We are Monthly Brigan's Adventure team 2...";
+ next;
+ mes "[Krotzel]";
+ mes "...?";
+ next;
+ mes "[Krotzel]";
+ mes "Where did everybody go? Ha these pains in the butt! Adventure team 2 consists of two senior reporters, one veteran and one Probationary reporter for a total of four.";
+ next;
+ mes "[Krotzel]";
+ mes "I am in charge of interviews and arranging stories and my colleague is photographs. Veteran senior acts as a guide. As a magazine specializing in Adventure we go to cover dangerous places a lot.";
+ next;
+ mes "[Krotzel]";
+ mes "While I am not completely lacking combat experience my forte is reporting! But where did everybody really go? One might think we're on a picnic!";
+ VER_REPORTER = 1;
+ close;
+ case 1:
+ mes "I am most worried about the Probationary member. He is still new so won't know anything. It is highly possible he followed the veteran senior. If it is okay, can you find him?";
+ next;
+ if (select( "Look for Probationary reporter", "Too busy" ) == 1) {
+ mes "[Krotzel]";
+ mes "Thank you so much. If he followed the veteran senior he might have gone to the ruined area. I saw his limpid eyes looking at the senior.";
+ next;
+ mes "[Krotzel]";
+ mes "I will look around in this area. You don't have to bring him. Even though it's the Probationary period he should know how to work by himself! Just let me know where he is when you find him.";
+ close2;
+ setquest 13195;// Monthly Brigan
+ VER_REPORTER = 2;
+ end;
+ }
+ close;
+ case 2:
+ mes "If she followed the veteran senior she might have gone to the ruined area. If you find her please let me know where she is.";
+ close;
+ case 3:
+ mes "As I thought. I am glad he is at least safe. If it's okay can you find my colleague Sunny Kim as well?";
+ next;
+ mes "[Krotzel]";
+ mes "We got along well since joining and eventually made a team together so I cannot help but be worried.";
+ next;
+ mes "[Krotzel]";
+ mes "She started singing about the architecture style as soon as she came here so she will be around this area.";
+ close2;
+ setquest 13196;// Monthly Brigan
+ VER_REPORTER = 4;
+ end;
+ case 4:
+ mes "We got along well since joining and eventually made a team together so I cannot help but be worried.";
+ next;
+ mes "[Krotzel]";
+ mes "He started to sing about the architecture style as soon as he came here so he will be around this area. I beg you.";
+ close;
+ case 5:
+ mes "I don't think it can be helped that people will worry. The last veteran reporter, Grizzly Grylls! Designated survival reporter!";
+ next;
+ mes "[Krotzel]";
+ mes "The nickname stuck because he survived anywhere but honestly he has no talent in combat. He is just lucky.";
+ next;
+ mes "[Krotzel]";
+ mes "Although I think he will be safe... can you find out where about he is? He probably ran to the ruins there...";
+ close2;
+ setquest 13197;// Monthly Brigan
+ VER_REPORTER = 6;
+ end;
+ case 6:
+ mes "Find me Grizzly Grylls, veteran reporter who can survive anywhere. I think he may be in the ruins to the east...";
+ next;
+ mes "[Krotzel]";
+ mes "Come to think of it he's similar to a guild master I interviewed a while back. The fact that he jumps into danger and comes back no matter what... Easier to avoid danger in the first place!";
+ close;
+ case 7:
+ mes "Good! So everybody is safe. Everybody will create a news item on their own, right?";
+ next;
+ mes "[Krotzel]";
+ mes "If they don't return tomorrow I should look for them.";
+ close2;
+ setquest 13199;// Krotzel's Request - Complete
+ getexp 1500000,1000000;
+ VER_REPORTER = 8;
+ end;
+ default:
+ break;
+ }
+ switch( checkquest(13199,PLAYTIME) ) {
+ case -1:
+ case 2:
+ if (isbegin_quest(13198) == 0) {// Monthly Brigan : Krotzel's Request
+ mes "You're the adventurer I met last time! Our team members still haven't returned so I am worried. If it's okay, can you check if they are safe?";
+ next;
+ switch( select( "Look for team members", "Right now is not a good time", "Converse" ) ) {
+ case 1:
+ mes "[Krotzel]";
+ mes "They all have a professional mindset so if they haven't finished working just see if they are safe.";
+ if (isbegin_quest(13198) > 0)
+ erasequest 13199;// Krotzel's Request - Complete
+ setquest 13195;// Monthly Brigan
+ setquest 13196;// Monthly Brigan
+ setquest 13197;// Monthly Brigan
+ setquest 13198;// Monthly Brigan : Krotzel's Request
+ close;
+ case 2:
+ mes "[Krotzel]";
+ mes "I will wait for you.";
+ close;
+ case 3:
+ mes "[Krotzel]";
+ mes "What is monthly Brigan? You know. Booty that can be obtained from monsters. It is not a jewel but it can provide quite an income. It is like sweet rain to an Adventurer.";
+ next;
+ mes "[Krotzel]";
+ mes "The boss' goal is that. Not the jackpot for an Adventurer but let's make a magazine that can provide sweet info! That's kind of the purpose apparently.";
+ close;
+ }
+ }
+ if (isbegin_quest(13195) > 0 || isbegin_quest(13196) > 0 || isbegin_quest(13197) > 0) {
+ mes "I should check if everybody is safe. Please find and see if all three are working hard.";
+ close;
+ }
+ mes "Well we are all safe today. Because we are Adventure team 2! Thank you for helping!";
+ close2;
+ erasequest 13198;// Monthly Brigan : Krotzel's Request
+ setquest 13199;// Krotzel's Request - Complete
+ getexp 1000000,500000;
+ end;
+ case 0:
+ case 1:
+ mes "It seems they are still working. I'm worried but I should be focusing on my work! We are the monthly Brigan Adventure team 2!";
+ close;
+ }
+}
+
+verus02,134,169,4 script Photo Journalist#1 4_F_GON,{
+ if (VER_REPORTER < 4 || VER_REPORTER == 6 || VER_REPORTER == 7) {
+ mes "[Sunny Kim]";
+ mes "Monthly Brigan's senior photo journalist...Ahah! Monsters keep coming! It's dangerous!";
+ close;
+ }
+ if (VER_REPORTER == 4) {
+ mes "[Sunny Kim]";
+ mes "Krotzel? Ah you mean my partner. I still have to capture the cool architecture style and monsters. Tell her I am fine.";
+ close2;
+ erasequest 13196;// Monthly Brigan
+ VER_REPORTER = 5;
+ end;
+ }
+ if (VER_REPORTER == 5) {
+ mes "[Sunny Kim]";
+ mes "I thought I worked a lot on the ground but I am impressed! I will capture all of it in my palm!";
+ close;
+ }
+ switch( select( "Ask if safe", "Is there anything to help with?", "Converse" ) ) {
+ case 1:
+ mes "[Sunny Kim]";
+ if (isbegin_quest(13196) == 0) {
+ mes "How is this incredible architecture underground? The more I know the more curious I am.";
+ close;
+ }
+ mes "Of course! I have struggled a lot at the bottom! I am still taking photos. Tell her I will go when I am ready.";
+ close2;
+ erasequest 13196;
+ end;
+ case 2:
+ mes "[Sunny Kim]";
+ switch( checkquest(13203,PLAYTIME) ) {
+ case -1:
+ case 2:
+ switch( checkquest(13202,HUNTING) ) {
+ case -1:
+ mes "Do you have any thoughts on helping me as a righteous Adventurer?";
+ next;
+ if (select( "Help Photo Journalist Sunny Kim", "Decline" ) == 1) {
+ mes "[Sunny Kim]";
+ mes "Photographing cool structures, dynamic monsters and an Adventurer! I am taking photos with two themes but you can help me with one!";
+ next;
+ mes "[Sunny Kim]";
+ mes "Take care of the surrounding monsters for me. I will capture it in photos! Then I can photograph the area in peace!";
+ if (isbegin_quest(13203))
+ erasequest 13203;// Photo Journalist's Request - Complete
+ setquest 13202;// Monthly Brigan : Photo Journalist's Request
+ }
+ close;
+ case 0:
+ case 1:
+ mes "So you have to stand there and take care of the monsters! With dynamic and large movements if possible! Photographs need a proper concept.";
+ close;
+ case 2:
+ mes "Thanks to you, I think a great piece of work will be produced! I will go back to taking building photos.";
+ erasequest 13202;// Monthly Brigan : Photo Journalist's Request
+ setquest 13203;// Photo Journalist's Request - Complete
+ getexp 1000000,500000;
+ close;
+ }
+ case 0:
+ case 1:
+ mes "I took a lot of photos but I need time to confirm them. Some of them may be out of focus or I may need better photos, so next time.";
+ close;
+ }
+ case 3:
+ mes "[Sunny Kim]";
+ mes "I can't always take great photos. Photography is about instants. But you can save the moment for a long time. That is the beauty of photography!";
+ close;
+ }
+}
+
+verus01,41,103,4 script Exhausted Journalist#1 52,{
+ if (VER_REPORTER < 6) {
+ mes "[Grylls]";
+ mes "Haha are you an Adventurer? I am Grizzly Grylls! A reporter who likes adventure.";
+ close;
+ }
+ if (VER_REPORTER == 6) {
+ mes "[Grylls]";
+ mes "Krotzel is concerned? Don't joke. I am veteran reporter Grizzly Grylls! I am enjoying an adventure! Tell her to not worry.";
+ close2;
+ erasequest 13197;// Monthly Brigan
+ VER_REPORTER = 7;
+ end;
+ }
+ if (VER_REPORTER == 7) {
+ mes "[Grylls]";
+ mes "Now I am confused whether I am a reporter or an adventurer. I even got the nickname survival king for being able to survive anywhere!";
+ close;
+ }
+ switch( select( "Ask if safe", "Is there anything to help with?", "Converse" ) ) {
+ case 1:
+ mes "[Grylls]";
+ if (isbegin_quest(13197) == 0) {
+ mes "Other than this place being more dangerous than I thought! I am hungry from diligently running away. I wish there was something to eat.";
+ close;
+ }
+ mes "I am enjoying an adventure! Tell her to not worry. I am a little hungry though...";
+ close2;
+ erasequest 13197;// Monthly Brigan
+ end;
+ case 2:
+ mes "[Grylls]";
+ switch( checkquest(13205,PLAYTIME) ) {
+ case -1:
+ case 2:
+ if (isbegin_quest(13204) == 0) {
+ mes "This isn't a big deal but do you have some time?";
+ next;
+ if (select( "Help survival reporter Grylls", "Decline" ) == 1) {
+ mes "[Grylls]";
+ mes "I haven't been able to eat at all from all the running away. All day! I noticed these bugs that eat metal.";
+ next;
+ mes "[Grylls]";
+ mes "I need to taste these bugs. I think it will be a good news story as well! The survival king's roasted metal bugs! That's the headline!";
+ setquest 13204;// Monthly Brigan : Grylls' Request
+ }
+ close;
+ }
+ if (countitem(11597) < 30) {
+ mes "A bug that gnaws away metal. I wonder how it tastes. I am so curious! This is why I can't quit being a reporter.";
+ close;
+ }
+ mes "I will cook now! I am salivating at the thought of the flavor!";
+ delitem 11597,30;// Metalbug
+ erasequest 13204;// Monthly Brigan : Grylls' Request
+ if (isbegin_quest(13205) > 0)
+ erasequest 13205;
+ setquest 13205;// Grylls' Request - Complete
+ getexp 1000000,500000;
+ close;
+ case 0:
+ case 1:
+ mes "I am a little busy cooking these bugs. You want a bite as well?";
+ close;
+ }
+ case 3:
+ mes "[Grylls]";
+ mes "Amazing that there are bugs that gnaw at metal! But they must be a good source of precious protein and high in nutrition!";
+ close;
+ }
+}
+
+verus01,172,146,4 script Lame Journalist#1 4_M_HUBOY,{
+ if (VER_REPORTER < 2 || VER_REPORTER > 3 && VER_REPORTER < 8) {
+ mes "[Rookie Reporter]";
+ mes "Hello! I am Rookie reporter Trapp! Of Monthly Brigan's Adventure Team 2! I will cover the stories even through danger!";
+ close;
+ }
+ if (VER_REPORTER == 2) {
+ mes "[Rookie Reporter]";
+ mes "Hello! I am Trapp! The newest member of Monthly Brigan's Adventure team 2! My senior is worried? I will cover this story and return!";
+ close2;
+ erasequest 13195;// Monthly Brigan
+ VER_REPORTER = 3;
+ end;
+ }
+ if (VER_REPORTER == 3) {
+ mes "[Rookie Reporter]";
+ mes "Please tell her to not worry so much! I am a reporter too now! However if you have the time I would like you to help me with something. I mean later.";
+ close;
+ }
+ switch( select( "Ask if safe", "Is there anything to help with?", "Converse" ) ) {
+ case 1:
+ mes "[Rookie Reporter]";
+ if (isbegin_quest(13195) == 0) {
+ mes "Grylls is nicknamed survival king! Because he survives even in the most extreme areas! I want to become a cool reporter like that.";
+ close;
+ }
+ mes "She is really concerned about me! Tell her as soon as Grylls' work is done I will follow!";
+ close2;
+ erasequest 13195;// Monthly Brigan
+ end;
+ case 2:
+ mes "[Rookie Reporter]";
+ switch( checkquest(13201,PLAYTIME) ) {
+ case -1:
+ case 2:
+ switch( checkquest(13200,HUNTING) ) {
+ case -1:
+ mes "I mustered some courage and followed him but it was dangerous. If it's okay can you help me?";
+ next;
+ if (select( "Help Rookie reporter Trapp", "Decline" ) == 1) {
+ mes "[Rookie Reporter]";
+ mes "Please eradicate the monsters for me! I am trying my best but I am still not used to this. I beg of you.";
+ if (isbegin_quest(13201))
+ erasequest 13201;
+ setquest 13200;
+ }
+ close;
+ case 0:
+ case 1:
+ mes "Because of the nickname survival king, I thought Grizzly was good in combat but he is really just good at surviving. As soon as monsters showed up he disappeared like the wind.";
+ close;
+ case 2:
+ mes "Did you eradicate that much already? I am not done yet but thank you!";
+ erasequest 13200;// Monthly Brigan : Rookie's Request
+ setquest 13201;// Rookie's Request - Complete
+ getexp 1000000,500000;
+ close;
+ }
+ case 0:
+ case 1:
+ mes "I am fighting hard to become a specialized survival reporter! Even though...not now but please come back later, if that's okay with you!";
+ close;
+ }
+ case 3:
+ mes "[Rookie Reporter]";
+ mes "Realizing the world's truth and justice is the mission of the reporter! We have to protect those two despite any hardship and environment!";
+ close;
+ }
+}
+
+ver_eju,116,43,5 script Rekenber Mercenary#atd01 4_GEFFEN_09,{
+ switch( rand(0,2) ) {
+ case 0: npctalk "They don't stop coming."; end;
+ case 1: npctalk "Please be careful."; end;
+ case 2: npctalk "..."; end;
+ }
+}
+
+ver_eju,125,40,1 script Rekenber Mercenary#atd02 4_GEFFEN_03,{
+ switch( rand(0,2) ) {
+ case 0: npctalk "Where are reinforcements?"; end;
+ case 1: npctalk "Ugh, I really need a break."; end;
+ case 2: npctalk "Grr, these abominations!"; end;
+ }
+}
+
+ver_eju,117,35,7 script Rekenber Mercenary#atd03 4_GEFFEN_08,{
+ switch( rand(0,2) ) {
+ case 0: npctalk "This is boring."; end;
+ case 1: npctalk "If you're an excavator, move through the tunnel."; end;
+ case 2: npctalk "You'd better watch out."; end;
+ }
+}
+
+ver_eju,15,151,3 script Rekenber Guard#atd04 4_M_LGTGUARD,{
+ mes "[Rekenber Guard]";
+ mes "Are you heading for Phantasmagorika?";
+ mes "It may be difficult to find. Let me give you some directions.";
+ next;
+ mes "[Rekenber Guard]";
+ mes "Follow the road all the way up, and then head southwest.";
+ mes "Let me mark the location on your mini-map.";
+ viewpoint 1,113,36,0,0x4DFF00;
+ next;
+ mes "[Rekenber Guard]";
+ mes "This place is fraught with formidable monsters, just like the other parts of the old Juperos.";
+ mes "Be safe in your travels.";
+ close;
+}
+
+juperos_01,48,243,5 script Rekenber Guard#atd05 4_M_LGTGUARD,{
+ mes "[Rekenber Guard]";
+ mes "Are you heading for Phantasmagorika?";
+ mes "It may be difficult to find. Let me give you some directions.";
+ next;
+ mes "[Rekenber Guard]";
+ mes "Go straight east, then follow the road south. You'll see a giant status at a corner.";
+ mes "Let me mark the location on your mini-map.";
+ viewpoint 1,242,87,0,0x4DFF00;
+ next;
+ mes "[Rekenber Guard]";
+ mes "Who knew there's a hidden place behind a statue? It was pure luck that we found it.";
+ mes "The road to the place is dangerous. Please have safe travel.";
+ close;
+}
+
+juperos_01,242,91,3 script Rekenber Guard#atd06 4_M_LGTGUARD,{
+ mes "[Rekenber Guard]";
+ mes "Are you a participant of the Phantasmagorika project?";
+ mes "This is the entrance to the newly discovered ruins in the east.";
+ next;
+ mes "[Rekenber Guard]";
+ mes "There's a guide on the other side of the entrance to guide you to the excavation site.";
+ mes "Please get in before some monsters pounce on you.";
+ next;
+ mes "[Rekenber Guard]";
+ mes "Oh, the other side of the entrance is teeming with aggressive robots.";
+ mes "You'd better brace yourself.";
+ close;
+
+OnInit:
+ questinfo 7610, QTYPE_QUEST, 1;
+ setquestinfo_level 7610, 140,175;
+ end;
+}
+
+yuno_fild07,211,179,5 script Excavator Guide#atd07 4_M_LGTGUARD,{
+ mes "[Excavator Guide]";
+ mes "Are you a participant of the Phantasmagorika project?";
+ mes "As you know, you're at the entrance to Juperos.";
+ next;
+ mes "[Excavator Guide]";
+ mes "I'm here to guide you to the excavation site connected to the inside of Juperos.";
+ next;
+ mes "[Excavator Guide]";
+ mes "There are more guides spread across the inside,";
+ mes "so you can find them easily in case you get lost.";
+ next;
+ mes "[Excavator Guide]";
+ mes "Thank you for your contribution to the development of mankind. Good luck.";
+ close;
+
+OnInit:
+ questinfo 7610, QTYPE_QUEST, 1;
+ setquestinfo_level 7610, 140,175;
+ end;
+}
+
+verus03,55,245,3 script Rekenber scholar#e152a0 2_M_MOLGENSTEIN,{
+ mes "[Rekenber scholar]";
+ mes "Hm.. This machine seems to be have been used for tracking something.";
+ mes "What do you think?";
+ next;
+ mes "[Rekenber Technician]";
+ mes "I think so as well.";
+ mes "This screen probably indicates the position or condition of what it is tracking or detecting.";
+ next;
+ mes "[Rekenber scholar]";
+ mes "Was it showing the situation of this closed area, perhaps?";
+ mes "It is presumed that it was impossible to directly enter based on the interior situation a while ago.";
+ next;
+ mes "[Rekenber Technician]";
+ mes "Probably so.";
+ mes "We can assume there was a large explosion just by observation with our eyes..";
+ mes "Then the reason for the people outside to install something like this ....";
+ next;
+ mes "[Rekenber scholar]";
+ mes "Yes. It is to find out the interior situation.";
+ mes "Maybe.. there was a big accident so it might be for searching for survivors..";
+ next;
+ mes "[Rekenber Technician]";
+ mes "Indeed. You are probably right.";
+ mes "And our role is to find out the secrets of what happened here.";
+ close;
+
+}
+verus03,55,243,3 duplicate(Rekenber scholar#e152a0) Rekenber technician#e152a1 4_M_REPAIR
+
+verus03,59,250,7 script Coral Excavation team C#e152 2_M_SAGE_B,{
+ mes "[Cecil]";
+ mes "Hey, Kobell. If we want to be chosen as an outstanding excavation team...!";
+ next;
+ mes "[Kobell]";
+ mes "To be..?";
+ next;
+ mes "[Cecil]";
+ mes "Is to figure out the identity of these unknown mechanical devices!";
+ next;
+ mes "[Kobell]";
+ mes "Whaat? How did this happen?";
+ mes "We didn't even major in engineering!";
+ next;
+ mes "[Cecil]";
+ mes "This place if full of machines! We can receive recognition like the Atnad excavators if we analyze them!";
+ next;
+ mes "[Kobell]";
+ mes "Aha! Indeed so.";
+ mes "But I think the Atnad excavators are around here...?";
+ next;
+ mes "[Cecil]";
+ mes "Hah! Our research goals cannot be discovered. This is a secret between you and I!";
+ next;
+ mes "[Kobell]";
+ mes "Let's do that~";
+ close;
+}
+verus03,61,250,7 duplicate(Coral Excavation team C#e152) Coral Excavation team C#e152_ 4_M_ALCHE_C
+
+verus04,1,1,0 script #verus04_invade HIDDEN_WARP_NPC,{
+ end;
+OnInit:
+ initnpctimer;
+ end;
+OnTimer1000:
+ mapannounce "verus04", "Police Officer Piffs: The Doom Prayers have stricken!", bc_map;
+ monster "verus04",0,0,"Ruin Grace Believer",3158,20, "#verus04_invade::OnMobDead";
+ end;
+OnTimer3000:
+ mapannounce "verus04", "Police Chief Kesler: Attention all police officers, stop the Doom Prayers before they destroy the excavation site!", bc_map;
+ end;
+OnTimer30000:
+ mapannounce "verus04", "Doom Prayers Executive: Destroy and bring the end of the world! Destroy and be saved!", bc_map;
+ end;
+OnTimer60000:
+ mapannounce "verus04", "Police Officer Piffs: Argh, Doom Prayers! Where do they keep coming from?!", bc_map;
+ end;
+OnTimer120000:
+ mapannounce "verus04", "Police Chief Kesler: Everyone, do not retreat! Don't let them destroy the excavation site!", bc_map;
+ end;
+OnTimer180000:
+ mapannounce "verus04", "Police Chief Kesler: Those Doom Prayers underestimate us.", bc_map;
+ end;
+OnTimer240000:
+ mapannounce "verus04", "Police Chief Kesler: Adventurers, the Doom Prayers have been driven out of Phantasmagorika. They're no longer a threat to your safety.", bc_map;
+ killmonster "verus04", "#verus04_invade::OnMobDead";
+ end;
+OnTimer3600000:
+ initnpctimer;
+ end;
+OnMobDead:
+ end;
+}
+
+verus04,194,165,5 script Rekenber Guard#ver01 4_M_LGTGUARD,{
+ mes "[Rekenber Guard]";
+ mes "Are you a member of the Excavation Group?";
+ mes "Our chairman has personally ordered us to see to your safety so that you can focus on your excavation work.";
+ close;
+}
+verus04,203,171,3 script Rekenber Guard#ver02 4_M_LGTGUARD,{
+ mes "[Rekenber Guard]";
+ mes "We're here to support your excavation of Verus City.";
+ mes "Let us know if you experience any problems.";
+ close;
+}
+verus04,171,267,3 script Rekenber Guard#ver03 4_M_LGTGUARD2,{
+ mes "[Rekenber Guard]";
+ if (rand(2))// inaccurate
+ mes "I hate using portable johns, but my bladder can't seem to hold very much. What about you?";
+ else
+ mes "Ack! Shoo! Don't come close! I'm saving myself for my future bride!";
+ close;
+}
+verus04,218,217,5 script Geologist#ver04 4_M_HUGRANFA,{
+ mes "[Geologist]";
+ mes "Hm, the building was crushed by the stone wall.";
+ mes "The rest is almost pulverized to dust.";
+ next;
+ mes "[Assistant]";
+ mes "Yes, Professor.";
+ next;
+ mes "[Geologist]";
+ mes "The terrain on which the village stands was formed in a different period, compared to this stone wall. At least that's my initial assessment.";
+ next;
+ mes "[Assistant]";
+ mes "Yes, Professor.";
+ next;
+ mes "[Geologist]";
+ mes "The underground village doesn't seem to be artificial, though I can't imagine how it can be formed naturally. What do you think?";
+ next;
+ mes "[Assistant]";
+ mes "Yes, Professor.";
+ next;
+ mes "[Geologist]";
+ mes "...Are you even listening to me?";
+ next;
+ mes "[Assistant]";
+ mes "Yes, Professor.";
+ next;
+ mes "[Geologist]";
+ mes "Sigh.";
+ mes "Let's go have lunch.";
+ next;
+ mes "[Assistant]";
+ mes "Yes, Professor!";
+ close;
+}
+verus04,217,216,5 duplicate(Geologist#ver04) Student#ver05 4_M_HUMAN_01
+
+verus04,50,193,3 script Scholar#ver06 4_M_HUMERCHANT,{
+ mes "[Scholar]";
+ mes "Schwarzwald may be the most scientifically advanced among the three states of Midgard, but it still doesn't hold a candle to this place.";
+ next;
+ mes "[Scholar]";
+ mes "The same goes for Juperos. If the scientific knowledge of this place passed down to Schwarzwald, it could have been much more powerful.";
+ next;
+ mes "[Scholar]";
+ mes "Of course, that's based on my theory that the residents of this place were also Schwarzwaldians.";
+ close;
+}
+verus04,127,243,3 script Pierrot#ver07 4_M_PIERROT,{
+ mes "[Pierrot]";
+ mes "I feel like I'm going insane, stuck in this confined space.";
+ mes "Hey, how about I read your fortune for the day with my juggling balls?";
+ next;
+ if (select( "Sure.", "No, thanks." ) == 2)
+ close;
+ mes "[Pierrot]";
+ mes "Good, choose a color you like.";
+ mes "The color you choose will tell me your fortune.";
+ next;
+ .@s = select( "Red", "Blue", "Yellow", "Green" );
+ mes "[Pierrot]";
+ mes "Dum, dum, dum! Your fortune for the day!";
+ mes "Let's me get the fortune paper inside the ball...";
+ next;
+ mes "[Pierrot]";
+ mes "Today is...";
+ next;
+ mes "[Pierrot]";
+ switch(.@s) {
+ case 1:
+ mes "The same boring day, like yesterday and the day before.";
+ mes "Only positive thinking will get you out of this funk. Smile and be nice to others, and maybe Lady Luck will brighten your day.";
+ break;
+ case 2:
+ mes "Ack, you shouldn't have gotten out of bed. Wherever you go, trouble follows.";
+ mes "I strongly recommend you stay at the Shelter for the day. Sleep off bad luck.";
+ break;
+ case 3:
+ mes "Not a bad day, but you'll have to work to enjoy some good luck.";
+ mes "Go to the Excavation Site and dig up some dirt. You may find some treasure.";
+ break;
+ case 4:
+ mes "The luckiest day of your life! Wherever you go, you'll find wealth and friends.";
+ mes "Maybe you'll find some historic artifacts buried in this place. That'll be awesome, huh?";
+ break;
+ }
+ next;
+ mes "[Pierrot]";
+ mes "Do you like my reading? Or do you hate it?";
+ mes "Your future is pliable--you can shape it however you want.";
+ mes "Don't get too excited or depressed. Just stay focused on your goal.";
+ next;
+ mes "[Pierrot]";
+ mes "All right, come back if you want another reading.";
+ close;
+}
+
+verus04,180,209,3 script Excavator#tre01 4_M_HUMAN_01,{
+ mes "[Excavator]";
+ mes "The owner of this house must have been an important figure in Verus City.";
+ mes "Piles of official documents are discovered in this room.";
+ next;
+ mes "[Excavator]";
+ mes "Most of the documents contain petty civil complaints, like water problems and neighbor disputes.";
+ mes "All the documents, however, contain the initials, OX. I don't know if they're of a name or an abbreviation of some sort.";
+ close;
+}
+verus04,202,181,3 script #tre02 CLEAR_NPC,{
+ mes "- The building entrance shows distinctive wear and tear, indicating abuse by a steady stream of traffic. YHT and DO NOT YELL are written on the door. -";
+ close;
+}
+// tre03 ?
+verus04,121,188,3 script Excavator#tre04 4_M_HUMAN_01,{
+ mes "[Excavator]";
+ mes "This building is fully furnished, yet there is no sign of habitation.";
+ mes "Maybe the owner lived somewhere else, like in a summer house or something.";
+ close;
+}
+verus04,119,177,3 script #tre05 CLEAR_NPC,{
+ mes "- ZERT... is written on the door. The rest of the writing looks like it was scratched off with a stone.-";
+ close;
+}
+verus04,85,145,3 script #tre06 CLEAR_NPC,{
+ mes "- +1 is written on the door. What could it mean? -";
+ close;
+}
+verus04,83,131,3 script Excavator#tre07 4_M_HUMAN_01,{
+ mes "[Excavator]";
+ mes "The owner of this house must have been a dancer. Her wardrobe is full of glittery stage clothes.";
+ mes "Judging by their size, she must have been very tall for a woman. I wonder how she looked like.";
+ close;
+}
+verus04,71,118,3 script #tre08 CLEAR_NPC,{
+ mes "- KDY is written on the door. Sooty streaks that spread outward from the inside to the entrance indicate frequent explosions. -";
+ close;
+}
+verus04,71,131,3 script #tre09 CLEAR_NPC,{
+ mes "- KJH is written on the door. The entrance wall is dotted with tiny squares of paper containing time and numbers. -";
+ close;
+}
+verus04,71,145,3 script #tre10 CLEAR_NPC,{
+ mes "- PKY is written on the door. Empty liquor bottles are littered around the house. -";
+ close;
+}
+verus04,39,123,3 script #tre11 CLEAR_NPC,{
+ mes "- DGDG'S BOARD is written on the door. What does that mean? -";
+ close;
+}
+verus04,17,145,3 script #tre12 CLEAR_NPC,{
+ mes "- THE SUNS is written on the door. -";
+ close;
+}
+verus04,16,166,5 script Excavator#tre13 4_M_HUMAN_01,{
+ mes "[Excavator]";
+ mes "*Cough Cough* The owner of this house was a hoarder.";
+ mes "Lots of books. Lots of cat furballs. Lots of Assassin pictures. *Cough Cough*";
+ close;
+}
+verus04,118,159,5 script Excavator#tre14 4_M_HUMAN_01,{
+ mes "[Excavator]";
+ mes "This house is full of red mushrooms. Are they edible? Why are they only found inside this house? Was the owner farming them?";
+ close;
+}
+verus04,123,143,3 script #tre15 CLEAR_NPC,{
+ mes "- MARES is written on the door, along with various drawings that seem to symbolize pirates. -";
+ close;
+}
+verus04,72,168,3 script #tre16 CLEAR_NPC,{
+ mes "- LMH is written on the door, along with a flurry of hearts drawn on an edge. -";
+ close;
+}
+verus04,91,168,3 script #tre17 CLEAR_NPC,{
+ mes "- MISA is written on the door. Various toy weapons are littered around the building. -";
+ close;
+}
+verus04,50,197,3 script Excavator#tre18 4_M_HUMAN_01,{
+ mes "[Excavator]";
+ mes "...";
+ next;
+ mes "[Excavator]";
+ mes "Various pictures are found in this house, all of them featuring the owner with different men.";
+ mes "I find that curious.";
+ close;
+}
+verus04,34,197,3 script #tre19 CLEAR_NPC,{
+ mes "- ELTOHC is written on the door. In the center of the door is a W drawn in a circle. It could have been the owner's favorite letter. -";
+ close;
+}
+verus04,17,245,3 script #tre20 CLEAR_NPC,{
+ mes "- LEONA'S BIRD HEAVEN is written on the door. Unsurprisingly, bird feathers are littered around the house. -";
+ close;
+}
+verus04,13,262,3 script #tre21 CLEAR_NPC,{
+ mes "- KURAT is written on the door. The building wall is littered with hand-drawn skulls. -";
+ close;
+}
+verus04,28,262,3 script #tre22 CLEAR_NPC,{
+ mes "- KSY is written on the door. A poster with The Performance of the Century! boldly printed across it is hung on the entrance wall. -";
+ close;
+}
+verus04,54,256,3 script #tre23 CLEAR_NPC,{
+ mes "- BIBIC & MORZIP'S LOVE HOUSE is written on the door. A couple must have lived in this house. -";
+ close;
+}
+verus04,31,236,3 script Excavator#tre24 4_M_HUMAN_01,{
+ mes "[Excavator]";
+ mes "The owner of this house must have been a collector of some sort. There are many pictures of women in strange-looking dresses.";
+ next;
+ mes "[Excavator]";
+ mes "Did you see the SKM drawn on the door? That reminds me of the other house with hearts drawn on its door.";
+ mes "I hope it's not one of those childish customs. You know, to mark someone as theirs.";
+ close;
+}
+verus04,62,230,3 script #tre25 CLEAR_NPC,{
+ mes "- HDY is written on the door. -";
+ close;
+}
+verus04,80,230,3 script #tre26 CLEAR_NPC,{
+ mes "- BRAN is written on the door. Rows of empty bottles are standing on a side of the house. -";
+ close;
+}
+verus04,79,265,3 script #tre27 CLEAR_NPC,{
+ mes "- KYH is written on the door. This building is in better condition than the rest in the neighborhood.-";
+ close;
+}
+verus04,96,267,3 script #tre28 CLEAR_NPC,{
+ mes "- YAOB is written on the door, along with drawings of round, furry animals. -";
+ close;
+}
+verus04,133,267,3 script Excavator#tre29 4_M_HUMAN_01,{
+ mes "[Excavator]";
+ mes "This house is suspected to belong to a couple named SSUL and SINYC.";
+ mes "The house is filled with incredible things. Everything in it is just gorgeous.";
+ close;
+}
+verus04,152,267,3 script #tre30 CLEAR_NPC,{
+ mes "- LMS is written on the door, along with Composition Specialist on an edge. -";
+ close;
+}
+verus04,168,267,3 script #tre31 CLEAR_NPC,{
+ mes "- KJK is written on the door. -";
+ close;
+}
+verus04,190,265,3 script #tre32 CLEAR_NPC,{
+ mes "- LJH is written on the door. The building wall is covered with numerous grocery store stickers. -";
+ close;
+}
+verus04,172,234,3 script #tre33 CLEAR_NPC,{
+ mes "- YG is written on the door. A large picture of a smiling baby is visible through a window. -";
+ close;
+}
+verus04,204,235,3 script #tre34 CLEAR_NPC,{
+ mes "- CHJ is written on the door. -";
+ close;
+}
+
+verus04,91,252,5 script Archaeologist#tevt01 4_M_6THPRIN1,10,10,{
+ mes "[Archaeologist]";
+ mes "Sometimes, we gather around to talk.";
+ mes "Sharing information is a part of the job.";
+ close;
+
+OnTouch_:
+ if (.ontalk == 0) {
+ .ontalk = 1;
+ initnpctimer;
+ }
+ end;
+OnTimer2000:
+ npctalk "I suspect this Verus City serves a special purpose.", "Archaeologist#tevt01";
+ end;
+OnTimer7000:
+ npctalk "How did you know this place is called Verus?", "New Excavator#tevt03";
+ end;
+OnTimer12000:
+ npctalk "Oh, the name was found written on various milestones and walls at the Plaza.", "Civilization Researcher";
+ end;
+OnTimer17000:
+ npctalk "Verus City, Verus Town, Verus Plaza...", "Civilization Researcher";
+ end;
+OnTimer22000:
+ npctalk "There are two districts that remain unaccessible.", "Civilization Researcher";
+ end;
+OnTimer27000:
+ npctalk "Oh, those two that require permission. You know a lot.", "New Excavator#tevt03";
+ end;
+OnTimer32000:
+ npctalk "I've just figured that out from on a map I've found in a house in the Town.", "Historian#tevt02";
+ end;
+OnTimer37000:
+ npctalk "This place consists of four districts, and only the Town and the Plaza are explorable at this point.", "Archaeologist#tevt01";
+ end;
+OnTimer42000:
+ npctalk "We'd better work harder, or our exploration might become limited to this very area.", "Archaeologist#tevt01";
+ end;
+OnTimer47000:;
+ npctalk "If it really was a planned city, then what was the plan?", "New Excavator#tevt03";
+ end;
+OnTimer52000:
+ npctalk "Einbech is built purely for mining purposes. This city probably served a special purpose like that.", "Scientist#tevt05";
+ end;
+OnTimer57000:
+ npctalk "It must have something to do with technological research and experimentation.", "Scientist#tevt05";
+ end;
+OnTimer62000:
+ npctalk "I've deduced it from journals and diaries found in the Town.", "Historian#tevt02";
+ end;
+OnTimer67000:
+ npctalk "Most of these journals and diaries belonged to scholars and scientists.", "Historian#tevt02";
+ end;
+OnTimer72000:
+ npctalk "The point is this ancient civilization had some really advanced science.", "Civilization Researcher";
+ end;
+OnTimer77000:
+ npctalk "It may not be ancient at all. It could be something unfathomable.", "Civilization Researcher";
+ end;
+OnTimer82000:
+ npctalk "We're here to solve the mystery for a better future for mankind!", "New Excavator#tevt03";
+ end;
+OnTimer87000:
+ npctalk "*Snort* In the end Rekenber takes all.", "Scientist#tevt05";
+ end;
+OnTimer92000:
+ npctalk "But the core discoveries and the excavation efforts are shared by all the organizations involved.", "New Excavator#tevt03";
+ end;
+OnTimer97000:
+ npctalk "What we can do is just do what we can do best in the moment.", "Civilization Researcher";
+ end;
+OnTimer102000:
+ npctalk "But I can't help but think Rekenber has a hidden agenda. I'm not trying to be unappreciative, but...", "Historian#tevt02";
+ end;
+OnTimer107000:
+ npctalk "Let's focus on the present for now.", "Historian#tevt02";
+ end;
+OnTimer112000:
+ npctalk "Why don't we share all the information we find except for our individual research subjects?", "Archaeologist#tevt01";
+ end;
+OnTimer117000:
+ npctalk "I agree.", "Civilization Researcher";
+ end;
+OnTimer122000:
+ npctalk "All right.", "Scientist#tevt05";
+ end;
+OnTimer127000:
+ npctalk "Um, do you know what's for lunch today?", "Scientist#tevt05";
+ end;
+OnTimer130000:
+ npctalk "Um...", "Archaeologist#tevt01";
+ end;
+OnTimer135000:
+ npctalk "Some frozen food. I'm just going to eat the bread I saved yesterday.", "Civilization Researcher";
+ end;
+OnTimer140000:
+ npctalk "Sigh, Rekenber can be stingy if it wants to.", "Historian#tevt02";
+ end;
+OnTimer145000:
+ npctalk "Why? What's wrong with frozen food?", "New Excavator#tevt03";
+ end;
+OnTimer150000:
+ npctalk "Here, try mine.", "Historian#tevt02";
+ end;
+OnTimer155000:
+ npctalk "You can take mine, too.", "Archaeologist#tevt01";
+ end;
+OnTimer160000:
+ npctalk "Or mine.", "Scientist#tevt05";
+ end;
+OnTimer163000:
+ npctalk "...", "New Excavator#tevt03";
+ end;
+OnTimer168000:
+ npctalk "Um, aren't you guys hungry?", "New Excavator#tevt03";
+ end;
+OnTimer178000:
+ npctalk "Is it possible it's frozen because it tastes bad otherwise?", "New Excavator#tevt03";
+ .ontalk = 0;
+ stopnpctimer;
+ end;
+}
+
+verus04,89,251,5 script Historian#tevt02 4_TOWER_07,{
+ mes "[Historian]";
+ mes "What's the hardest thing about my job?";
+ mes "When I'm forced to eat a terrible lunch provided by my sponsor.";
+ next;
+ mes "[Historian]";
+ mes "In fact, it's been that way since I arrived in Verus City.";
+ mes "Today was not an exception.";
+ close;
+}
+
+verus04,91,248,7 script New Excavator#tevt03 4_TOWER_04,{
+ mes "[New Excavator]";
+ mes "I have a lot to learn, and I'm a fast learner.";
+ mes "For now, I'm doing mostly physical tasks.";
+ next;
+ mes "[New Excavator]";
+ mes "I'm given free food, a place to sleep, and money. What else can I ask for?";
+ close;
+}
+
+verus04,94,251,3 script Civilization Researcher 4_TOWER_16,{
+ mes "[Civilization Researcher]";
+ mes "I thought this was a part of Juperos.";
+ mes "I'm now reconsidering that theory.";
+ next;
+ mes "[Civilization Researcher]";
+ mes "Verus is similar to Juperos, yet different.";
+ mes "Everything about it is more refined and sophisticated somehow.";
+ close;
+}
+
+verus04,94,248,1 script Scientist#tevt05 4_M_SAGE_C,{
+ mes "[Scientist]";
+ mes "This city's level of mechanical engineering is astonishing.";
+ mes "There's no trace of magic.";
+ next;
+ mes "[Scientist]";
+ mes "But I'm concerned:";
+ mes "rapid development and sudden introduction of advanced technology could do more harm than good.";
+ close;
+}
+
+verus04,116,220,0 script #ep15_1elb PORTAL,{
+ mes "- Caution -";
+ mes "- For your safety, -";
+ mes "- avoid running -";
+ mes "- or jumping -";
+ mes "- while inside. -";
+ close;
+}
+
+verus04,153,193,8 script Merchant#ep15_1el10 4_F_CAPEGIRL,{
+ mes "[Merchant]";
+ mes "Ho ho ho!";
+ mes "I came first, so I took the best spot!";
+ close;
+}
+
+verus04,155,197,5 script Adventurer ?#ep15_1el11 4_M_LGTPOOR,{
+ mes "[Adventurer ?]";
+ mes "*Stomach rumbles*";
+ mes "Aww, I'm hungry...";
+ next;
+ mes "[Adventurer]";
+ mes "But I have no money to buy food...";
+ close;
+}
+
+verus04,150,193,3 script Adventurer#ep15_1el12 4_M_DIEMAN,{
+ mes "[Jean Baljean]";
+ mes "Ugh, I was struck 19 times for a piece of bread.";
+ close;
+}
+
+verus04,102,246,3 script Adventurer#ep15_1el13 4_M_RACHMAN2,{
+ mes "[Adventurer]";
+ mes "Mushrooms growing out of rocks.";
+ mes "How resilient!";
+ close;
+}
+
+verus04,16,157,3 script Adventurer#ep15_1el14 4_M_MIDDLE1,{
+ mes "[Adventurer]";
+ mes "Argh!";
+ mes "So many paths are blocked!";
+ close;
+}
+
+// missing #ep15_1el15 - 18
+verus04,104,120,3 script Cow#ep15_1el19 4_BULL,{
+ mes "[Cow]";
+ mes "*Moo*";
+ close;
+}
+
+verus04,111,215,5 script Adventurer#ep15_1el20 4_F_SHABBY,{
+ mes "[Adventurer]";
+ mes "Heh. *Drool*";
+ mes "This place is incredible!";
+ close;
+}
+
+verus04,111,211,3 script Adventurer#ep15_1el21 4_F_KHGIRL,{
+ mes "[Adventurer]";
+ mes "This site is amazing.";
+ mes "No wonder why Rekenber called dibs on it.";
+ close;
+}
+
+verus04,113,235,5 script Adventurer#ep15_1el22 4_M_PECOKNIGHT,{
+ mes "[Adventurer]";
+ mes "I want to find something awesome!";
+ close;
+}
+
+verus04,124,220,8 script Adventurer#ep15_1el23 4_M_HUMERCHANT,{
+ mes "[Adventurer]";
+ mes "The coming era will be yours.";
+ close;
+}
+
+verus04,135,213,4 script Sign#EP15_1DCenter 4_BOARD3,{
+ mes "[Warning]";
+ mes "Attention visitors of Phantasmagorika,";
+ next;
+ mes "[Warning]";
+ mes "a cult group called the Doom Prayers has been frequently sighted in this area.";
+ next;
+ mes "[Warning]";
+ mes "If you're a victim or a witness to the group's harassment, please report to the Phantasmagorika Police.";
+ mes "- Phantasmagorika Police Chief -";
+ close;
+}
+verus04,204,260,4 duplicate(Sign#EP15_1DCenter) Sign#EP15_1DNorth 4_BOARD3
+verus03,83,241,4 duplicate(Sign#EP15_1DCenter) Sign#EP15_1DSouth 4_BOARD3
+verus03,38,114,4 duplicate(Sign#EP15_1DCenter) Sign#EP15_1DEast 4_BOARD3
+verus03,116,39,4 duplicate(Sign#EP15_1DCenter) Sign#EP15_1DWest 4_BOARD3
+
+
+verus04,96,195,5 script Adventurer Cat#ep15_1el_1 4_CAT_REST,{
+ mes "[Adventurer Cat]";
+ mes "I must investi... ga... te...";
+ mes "Zzz... Zzz...";
+ close;
+}
+verus04,96,194,5 script Adventurer Cat#ep15_1el_2 4_CAT_REST,{
+ mes "[Adventurer Cat]";
+ mes "*Purr*";
+ mes "*Meow*";
+ close;
+}
+verus04,96,193,5 script Adventurer Cat#ep15_1el_3 4_CAT_REST,{
+ mes "[Adventurer Cat]";
+ mes "For some reason, I can't stand up.";
+ mes "*Meow*";
+ close;
+}
+verus04,96,192,5 script Adventurer Cat#ep15_1el_4 4_CAT_REST,{
+ mes "[Adventurer Cat]";
+ mes "I've got a good spot.";
+ mes "*Purr*";
+ close;
+}
+
+yuno_fild07,218,154,3 script Adventurer#ep15_1el01 4_M_ARUNA_NFM1,{
+ mes "[Adventurer]";
+ mes "Ah!";
+ mes "I want to see!";
+ mes "Why can't I go in?!";
+ close;
+}
+yuno_fild07,218,159,5 script Adventurer#ep15_1el02 4_M_KHBOY,{
+ mes "[Adventurer]";
+ mes "All right!";
+ mes "This time, I'm going to write a report on a field trip to Phantasmagorika.";
+ next;
+ mes "[Adventurer]";
+ mes "Professor Jones will be so impressed he'll give me A+. *Chuckle*";
+ close;
+}
+yuno_fild07,221,157,3 script Adventurer#ep15_1el03 4_M_CHN8GUEK,{
+ mes "[Adventurer]";
+ mes "Toh!";
+ mes "Sound mind, sound body!";
+ close;
+}
+yuno_fild07,221,155,8 script Adventurer#ep15_1el04 4_M_ALCHE_B,{
+ mes "[Adventurer]";
+ mes "I'd better pack enough potions for the trip to Phantasmagorika.";
+ close;
+}
+yuno_fild07,217,155,5 script Adventurer#ep15_1el05 4_F_ROGUE,{
+ mes "[Adventurer]";
+ mes "I'm impressed by Rekenber's support.";
+ mes "Um...";
+ close;
+}
+yuno_fild07,225,166,3 script Merchant#ep15_1el06 4_CAT_DOWN,{
+ mes "[Merchant]";
+ mes "Ooooh!";
+ mes "I've found a perfect spot for my business!";
+ close;
+}
+yuno_fild07,225,144,1 script Adventurer#ep15_1el07 1_M_ORIENT01,{
+ mes "[Adventurer]";
+ mes "Elevator? The scientific advancement of Schwarzwald is astonishing!";
+ close;
+}
+yuno_fild07,217,149,3 script Adventurer#ep15_1el08 4_F_JOB_BLACKSMITH,{
+ mes "[Adventurer]";
+ mes "An ancient civilization. Doesn't that sound incredible?";
+ mes "I feel like I can hear ancient machines moving with loud clanking noises.";
+ next;
+ mes "[Adventurer]";
+ mes "*Dreamy eyes*";
+ mes "*Gaping mouth*";
+ close;
+}
+yuno_fild07,224,152,3 script Adventurer#ep15_1el09 4_M_SITDOWN,{
+ mes "[Adventurer]";
+ mes "Geez, this place is already crammed!";
+ mes "Just looking at these people makes me tired.";
+ close;
+}
+
+lhz_in01,277,234,3 script Rekenber Guard#e152i01 4_M_LGTGUARD,{
+ mes "[Rekenber Guard]";
+ if (VER_MAIN < 37) {
+ mes "I am sorry but you cannot enter further without approval.";
+ close;
+ }
+ mes "You are a member of the Atnad excavation team.";
+ mes "I will guide you inside.";
+ close2;
+ warp "lhz_in01",275,241;
+ end;
+}
+
+lhz_in01,275,251,3 script Luke Lapez#ep152i01 4_M_EDEN_GUARDER,{
+ cutin "looke_rapez04.bmp", 0;
+ mes "[Luke]";
+ mes "Sh. I'm just here as escort.";
+ close2;
+ cutin "",255;
+ npctalk "So much for the damn escort...", "Luke Lapez#ep152i01";
+ sleep 400;
+ emotion ET_FRET, getnpcid(0, "Commander Arquien#ep152");
+ sleep 200;
+ emotion ET_THINK, getnpcid(0, "Luke Lapez#ep152i01");
+ end;
+}
+
+lhz_in01,270,257,4 script Rekenber Chairman#e152i 4_M_REKENBER,{
+ if (VER_MAIN < 37)
+ end;
+ if (VER_MAIN == 37) {
+ cutin "ep15_rekenber01.bmp",0;
+ mes "[Rekenber Chairman]";
+ mes "I am the chairman of Rekenber.";
+ mes "I invited you to come.";
+ next;
+ mes "[Rekenber Chairman]";
+ mes "I have heard a lot and am familiar with the activities of the Atnad excavation team.";
+ mes "A lot of big results are being achieved as a corporation.";
+ mes "Thanks to you.";
+ next;
+ mes "[Rekenber Chairman]";
+ mes "The reason I have invited you....";
+ mes "You may already know as team leader Dr. Atnad.";
+ next;
+ cutin "verus_ian02.bmp",2;
+ mes "[Ian Atnad]";
+ mes "Could it be......";
+ next;
+ cutin "ep15_rekenber01.bmp",0;
+ mes "[Rekenber Chairman]";
+ mes "It is what you are predicting.";
+ mes "It's about the Memory Records contents you have been working so hard to collect.";
+ next;
+ mes "[Rekenber Chairman]";
+ mes "We plan to dispose of the content known through the Memory Records and the word of the Memory Records themselves as if it never happened.";
+ mes "I hope you will cooperate with this.";
+ next;
+ select("What did you say?");
+ mes "[Rekenber Chairman]";
+ mes "If this information is leaked outside, the corporation is willing to treat your excavation team with courtesy.";
+ next;
+ cutin "verus_ian03.bmp",2;
+ mes "[Ian Atnad]";
+ mes "Treatment? Courtesy?";
+ mes "What are you trying to sell!";
+ next;
+ mes "[Ian Atnad]";
+ mes "What is the reason people can't know about the past of the city buried underground!";
+ mes "Who are you to act like this!";
+ next;
+ mes "[Ian Atnad]";
+ mes "We are people who look to truth and fact through the past.";
+ mes "Are you trying to block your eyes and ears now?";
+ next;
+ cutin "ep15_tatio01.bmp",0;
+ mes "[Chief secretary]";
+ mes "Instead we will give you sole rights to everything related to the Memory Records.";
+ next;
+ cutin "verus_ian02.bmp",2;
+ mes "[Ian Atnad]";
+ mes "What are you talking about now?";
+ next;
+ cutin "ep15_tatio01.bmp",0;
+ mes "[Chief secretary]";
+ mes "We do not mean cease your work.";
+ mes "We are not saying discard all the information you have found.";
+ mes "However, what we want is...";
+ next;
+ mes "[Chief secretary]";
+ mes "I want to bury the story between myself, and you.";
+ mes "Do you not remember?";
+ mes "We are probably acquainted.";
+ mes "Although I did make some preparations.";
+ next;
+ cutin "verus_ian02.bmp",2;
+ mes "[Ian Atnad]";
+ mes "... Now that I think you do look familiar..";
+ mes "Juperos!";
+ mes "Yes, I saw you at juperos.";
+ next;
+ cutin "verus_ian03.bmp",2;
+ mes "[Ian Atnad]";
+ mes "That time you did.. in the crack that looked like a passage...";
+ mes "......You attacked me!";
+ mes "You bastard.. Because of you..!!";
+ next;
+ cutin "verus_aures.bmp",0;
+ mes "[Aures]";
+ mes "Hoho. I meet the main culprit of my family's destruction.";
+ mes "Is this meant to be?";
+ next;
+ select("What do you mean family's destruction?");
+ mes "[Aures]";
+ mes "The time, that accident or whatever you call it.";
+ mes "When I found a seemingly artificial obstacle during the juperos excavation..";
+ mes "Ian suddenly disappeared.";
+ emotion ET_SURPRISE, getnpcid(0, "Commander Arquien#ep152");
+ next;
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "I found myself in a motel room in Yuno when I came to.";
+ mes "I didn't even know how much time has passed.";
+ next;
+ cutin "verus_aures.bmp",0;
+ mes "[Aures]";
+ mes "The man went to look around the excavation site and didn't return in over a week...";
+ mes "What do you think we thought?";
+ mes "We wondered if he suffered an unfortunate accident.";
+ next;
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "My teeth gnash whenever I think of that time.";
+ mes "Because of the vague memories of that time..";
+ mes "I clung to juperos like a mad man.";
+ next;
+ cutin "ep15_tatio02.bmp",0;
+ mes "[Chief secretary]";
+ mes "......I am sorry about that.";
+ next;
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "You're the one who attacked me, right?";
+ mes "What happened to the week I lost.";
+ mes "...After that, I chased after an illusion I wasn't sure was a dream or hallucination.";
+ next;
+ mes "[Ian Atnad]";
+ mes "I blindly went around Juperos.";
+ mes "Lost my team members.. even forgot that I had a family and a home to go back to.";
+ next;
+ cutin "Arquien_n_atnad01.bmp",0;
+ mes "[Arquien]";
+ mes "...Why did you?";
+ mes "Please tell me. Chief Secretary.";
+ mes "Why did you attack father?";
+ next;
+ cutin "ep15_tatio03.bmp",0;
+ mes "[Chief secretary]";
+ mes "That is.. because the doctor saw something he shouldn't have at the time.";
+ mes "Verus city was not ready to be revealed.";
+ next;
+ cutin "verus_ian02.bmp",2;
+ mes "[Ian Atnad]";
+ mes "What?! Verus!!!";
+ mes "So what I found then was a passage to Verus?!";
+ next;
+ cutin "Arquien_n_atnad02.bmp",0;
+ mes "[Arquien]";
+ mes "No no wait wait.";
+ mes "Father, speak to me for a moment.";
+ mes "I just need a moment.";
+ next;
+ mes "I don't know what is happening.";
+ mes "Should we listen to the Atnads first?";// cross line?
+ VER_MAIN = 38;
+ close3;
+ }
+ if (VER_MAIN == 38) {
+ cutin "ep15_rekenber02.bmp",0;
+ mes "[Rekenber]";
+ mes ".... What can we do.";
+ mes "We will wait. Please speak.";
+ close3;
+ }
+ cutin "ep15_rekenber01.bmp",0;
+ mes "[Rekenber]";
+ mes "A chairman's job is to do nothing in times like this.";
+ mes "... That is it.";
+ close3;
+}
+
+lhz_in01,267,257,5 script Chief secretary#e152i01 4_M_TATIO,{
+ if (VER_MAIN < 37)
+ end;
+ if (VER_MAIN == 37) {
+ mes "[Chief secretary]";
+ cutin "ep15_tatio01.bmp",0;
+ mes "The chairman has waited for a long time.";
+ mes "I as well.";
+ close3;
+ }
+ if (VER_MAIN == 38) {
+ mes "[Chief secretary]";
+ cutin "ep15_tatio01.bmp",0;
+ mes "Are you taken aback?";
+ mes "So have I. I did not think people's lives to be tied together as so.";
+ mes "Anyway that young lady...";
+ next;
+ cutin "ep15_tatio03.bmp",0;
+ mes "[Chief secretary]";
+ mes ".. has a good strong attitude.";
+ mes "True.";
+ mes "Please speak.";
+ mes "I will wait.";
+ close3;
+ }
+ if (VER_MAIN == 39) {
+ mes "[Chief secretary]";
+ cutin "ep15_tatio01.bmp",0;
+ mes "I see it is my turn again.";
+ mes "I will formally introduce you.";
+ mes "The last survivor of Verus City, Tatio.W.00H-1.";
+ mes "Simply call him Tatio.";
+ next;
+ npctalk "What?!", "Ian Atnad#ep152i01";
+ mes "[Tatio]";
+ mes "Not revealing the contents of the Memory Records by the corporation.";
+ mes "Attacking you at Juperos was all because I wanted to.";
+ next;
+ cutin "ep15_tatio02.bmp",0;
+ mes "[Tatio]";
+ mes "To tell you this I have no choice but to reveal my identity.";
+ mes "I have prepared for this but.. it does not feel great.";
+ next;
+ cutin "",255;
+ mes "Everybody seems frozen by the massive news.";
+ next;
+ cutin "ep15_tatio01.bmp",0;
+ mes "[Tatio]";
+ mes "I am the Tatio in the Memory Records you have discovered.";
+ mes "And Atnad is Lasse Atnad, the great-grandfather of Dr. Atnad.";
+ next;
+ cutin "ep15_tatio03.bmp",0;
+ mes "[Tatio]";
+ mes "Lasse is one of the people who made me, and a friend.";
+ mes "I wanted to protect Verus, which is home to my undead machine body...";
+ next;
+ mes "[Tatio]";
+ mes "I have committed that discourtesy that the time.";
+ mes "And on top of that, I had a hand on hiding what the doctor saw........";
+ mes "I manipulated his memory a bit.";
+ next;
+ cutin "ep15_tatio01.bmp",0;
+ mes "[Tatio]";
+ mes "That is why you have that one week gap.";
+ mes "I took care of you for four days and sent you to the motel in Yuno.";
+ next;
+ cutin "ep15_tatio02.bmp",0;
+ mes "[Tatio]";
+ mes "I would not have done that if I knew you were a descendant of Lasse.";
+ next;
+ cutin "ep15_tatio01.bmp",0;
+ mes "[Tatio]";
+ mes "Verus city a long.. long. Time ago was once side by side with Juperos..";
+ mes "No surpassed it as a great city of science with a scientific civilization.";
+ next;
+ mes "[Tatio]";
+ mes "Although an unfortunate accident turned it the way it is now.";
+ mes "I did not die because I was made of machines so I just watched over Verus.";
+ next;
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "This story. Does the chairman know?";
+ mes "Wait. He already knows I bet. Isn't that why he called us here.";
+ next;
+ cutin "ep15_tatio01.bmp",0;
+ mes "[Tatio]";
+ mes "That is right.";
+ mes "The chairman knows of me and the Verus City secrets.";
+ mes "Only two in the whole world knew of this secret.";
+ next;
+ mes "[Tatio]";
+ mes "Ah, No. One of the founders, Janet Zerter knows of this as well.";
+ mes "Also one of the descendants of Verus City.";
+ next;
+ cutin "ep15_tatio02.bmp",0;
+ mes "[Tatio]";
+ mes ".....Do you now understand my previous proposal?";
+ next;
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "Oh oh well...";
+ mes "Although open, Verus City is still something you want to protect ..I see.";
+ mes "That is why the Memory Records...";
+ next;
+ mes "[Ian Atnad]";
+ mes "Then this doesn't apply to the other data in the city?";
+ mes "You're trying to hide it to prevent your's and my name being revealed and becoming a public issue, right?";
+ next;
+ cutin "ep15_tatio01.bmp",0;
+ mes "[Tatio]";
+ mes "The quantum level core technology unsuitable for this world's civilization has already been discarded.";
+ mes "Just like how lethal weapons are not put in the hands of children.";
+ next;
+ mes "[Tatio]";
+ mes "Although most of the data has been lost by accident...";
+ mes "You will probably gain plenty with what is now remaining.";
+ next;
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "Why did you reveal it?";
+ mes "Should have wrapped it tightly instead.";
+ mes "Like you did to me.";
+ next;
+ cutin "ep15_tatio01.bmp",0;
+ mes "[Tatio]";
+ mes "..To be honest, the first reason is that I could not easily approach the laboratories because of the energy storms during the time";
+ next;
+ mes "[Tatio]";
+ mes "And because although I do not know the reason the energy storms disappeared and";
+ mes "I assessed it as not being too dangerous.";
+ next;
+ mes "[Tatio]";
+ mes "The right time to reveal it has came.";
+ mes "This place has also come to understand what is science and engineering.";
+ next;
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes ".. Something is doubtful, but okay.";
+ mes "I guess I should be satisfied at even having this kind of opportunity.";
+ next;
+ cutin "ep15_tatio01.bmp",0;
+ mes "[Tatio]";
+ mes "I thank you for understanding.";
+ mes "I will give you sole rights to the Memory Records.";
+ mes "However the revealing of information and timing must be decided here.";
+ next;
+ mes "[Tatio]";
+ mes "And... In order to avoid affecting our descendants";
+ mes "we should keep it a secret between us as well.";
+ next;
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "I understand that.";
+ mes "Then I will handle the collecting of the Memory Records as I have been until now.";
+ mes "I will decide to report directly or not through you.";
+ next;
+ mes "[Ian Atnad]";
+ mes "That is it, right?";
+ next;
+ cutin "ep15_tatio01.bmp",0;
+ mes "[Tatio]";
+ mes "That is right.";
+ mes "In reality there is not much change to the actual work.";
+ mes "Ah also...";
+ mes "For working diligently as a member of the Atnad excavation team..";
+ mes "" + strcharinfo(0) + " I will give you a small reward.";
+ getexp 4500000,3000000;
+ VER_MAIN = 40;
+ next;
+ mes "[Tatio]";
+ mes "The contents of the Memory Records are precious memories to me.";
+ mes "...It is like going through my diary. So I hope you take care in the future.";
+ close3;
+ }
+ cutin "ep15_tatio03.bmp",0;
+ mes "[Tatio]";
+ mes "...I hope everything goes smoothly with this...";
+ close3;
+}
+
+lhz_in01,272,255,3 script Ian Atnad#ep152i01 4_M_IAN,{
+ if (VER_MAIN < 37)
+ end;
+ mes "[Ian Atnad]";
+ if (VER_MAIN == 37) {
+ cutin "verus_ian01.bmp",2;
+ mes "Have you arrived now?";
+ mes "It seems everybody has gathered.";
+ mes "So, let's see what it was you had to say to everybody.";
+ close3;
+ }
+ if (VER_MAIN == 38) {
+ cutin "verus_ian01.bmp",2;
+ mes "So, what do you want to say?";
+ mes "What is it that you cut me off in this important moment.";
+ next;
+ cutin "Arquien_n_atnad01.bmp",0;
+ mes "[Arquien]";
+ mes "What that man just said, was the incident of your disappearance?";
+ mes "The reason why you were running around outside for years.";
+ next;
+ cutin "ep15_tatio01.bmp",0;
+ mes "[Chief secretary]";
+ mes "No.. it's not that..";
+ mes "The time I was with the doctor was only four days.";
+ next;
+ cutin "Arquien_n_atnad04.bmp",0;
+ mes "[Arquien]";
+ mes "Before you said you were stuck somewhere for a week!";
+ mes "And running around like you were possessed by a ghost!";
+ next;
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "That.. that..!";
+ mes "Don't treat my passion for my field like a runaway ghost!";
+ mes "At the time I thought I was going to find something about my grand-grandfather..";
+ next;
+ mes "[Ian Atnad]";
+ mes "The place I saw.. The memory I had of that place...";
+ mes ".....";
+ mes "...?";
+ next;
+ mes "[Ian Atnad]";
+ mes "Wait a minute. Are you blaming me now?";
+ mes "I sent letters home, but you were the one who didn't reply!";
+ next;
+ cutin "Arquien_n_atnad04.bmp",0;
+ mes "[Arquien]";
+ mes "All the letters were sent back because the address wasn't clear!";
+ mes "Why are you talking big!";
+ next;
+ cutin "verus_ian03.bmp",2;
+ mes "[Ian Atnad]";
+ mes "And didn't you sell the house and sent all my letters back!";
+ mes "You couldn't wait a few years so sell the house and disappear?!";
+ mes "What do you have to say for yourself!";
+ next;
+ mes "The situation is overheating due to the fight between father and daughter.";
+ mes "Aures and the secretary giving embarrassed looks.";
+ next;
+ select("Should the table be turned over?");
+ cutin "Arquien_n_atnad01.bmp",0;
+ mes "[Arquien]";
+ mes "What's that sound..";
+ mes "An..anyway isn't that secretary the main instigator of this whole incident?";
+ mes "What happened?";
+ VER_MAIN = 39;
+ close3;
+ }
+ if (VER_MAIN == 39) {
+ cutin "verus_ian01.bmp",2;
+ mes "We keep losing the point.";
+ mes "Shouldn't you ask why he attacked me first.";
+ mes "Let's please listen to what he has to say. Daughter.";
+ close3;
+ }
+ cutin "verus_ian01.bmp",2;
+ mes "It is confusing to hear a surprising story at once but";
+ mes "At the same time it's cathartic.";
+ mes "Hm.. I see. I see.";
+ close3;
+}
+
+lhz_in01,267,255,7 script Aures#ep152i01 4_M_OLDSCHOLAR,{
+ if (VER_MAIN < 37)
+ end;
+ cutin "verus_aures.bmp",0;
+ mes "[Aures]";
+ if (VER_MAIN == 37) {
+ mes "Now you are here.";
+ mes "Sit here comfortably.";
+ mes "Although it might uncomfortable to sit on the corporation toilet.";
+ next;
+ mes "[Aures]";
+ mes "It is amusing to see those two together.";
+ mes "Seems you cannot trick blood.";
+ mes "Seeing how they talk alike.";
+ }
+ else if (VER_MAIN == 38)
+ mes "I loathe fighting but.. It is fun to see them together. Yes.";
+ else if (VER_MAIN > 38) {
+ cutin "verus_aures.bmp",0;
+ mes "[Aures]";
+ mes "I loathe fighting but.. It is fun to see them together. Yes.";
+ }
+ close3;
+}
+
+lhz_in01,272,251,3 script Commander Arquien#ep152i 4_F_EDEN_MASTER,{
+ if (VER_MAIN < 37)
+ end;
+ if (VER_MAIN == 37) {
+ mes "[Arquien]";
+ cutin "Arquien_n_atnad01.bmp",2;
+ mes "Let's see if you gathered all of us to give us some bombastic story.";
+ close3;
+ }
+ if (VER_MAIN == 38) {
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "So, what do you want to say?";
+ mes "What is it that you cut me off in this important moment.";
+ next;
+ cutin "Arquien_n_atnad01.bmp",0;
+ mes "[Arquien]";
+ mes "What that man just said, was the incident of your disappearance?";
+ mes "The reason why you were running around outside for years.";
+ next;
+ cutin "ep15_tatio01.bmp",0;
+ mes "[Chief secretary]";
+ mes "No.. it's not that..";
+ mes "The time I was with the doctor was only four days.";
+ next;
+ cutin "Arquien_n_atnad04.bmp",0;
+ mes "[Arquien]";
+ mes "Before you said you were stuck somewhere for a week!";
+ mes "And running around like you were possessed by a ghost!";
+ next;
+ cutin "verus_ian01.bmp",2;
+ mes "[Ian Atnad]";
+ mes "That.. that..!";
+ mes "Don't treat my passion for my field like a runaway ghost!";
+ mes "At the time I thought I was going to find something about my grandfather..";
+ next;
+ mes "[Ian Atnad]";
+ mes "The place I saw.. The memory I had of that place...";
+ mes ".....";
+ mes "...?";
+ next;
+ mes "[Ian Atnad]";
+ mes "Wait a minute. Are you blaming me now?";
+ mes "I sent letters home, but you were the one who didn't reply!";
+ next;
+ cutin "Arquien_n_atnad04.bmp",0;
+ mes "[Arquien]";
+ mes "All the letters were sent back because the address wasn't clear!";
+ mes "Why are you talking big!";
+ next;
+ cutin "verus_ian03.bmp",2;
+ mes "[Ian Atnad]";
+ mes "And didn't you sell the house and sent all my letters back!";
+ mes "You couldn't wait a few years so sell the house and disappear?!";
+ mes "What do you have to say for yourself!";
+ next;
+ mes "The situation is overheating due to the fight between father and daughter.";
+ mes "Aures and the secretary giving embarrassed looks.";
+ next;
+ select("Should the table be turned over?");
+ cutin "Arquien_n_atnad04.bmp",2;
+ mes "[Arquien]";
+ mes "What's that sound..";
+ mes "An..anyway isn't that secretary the main instigator of this whole incident?";
+ mes "What happened?";
+ VER_MAIN = 39;
+ close3;
+ }
+ if (VER_MAIN == 39) {
+ mes "[Arquien]";
+ mes ".......Let's keep listening to that secretary guy.";
+ mes "If give me nonsense I'm going to flip this company over.";
+ close3;
+ }
+ cutin "Arquien_n_atnad02.bmp",2;
+ mes "[Arquien]";
+ mes "So he means we can know the embarrassing past of the secretary by collecting and listening to the Memory Records?";
+ mes "That is kind of interesting.";
+ next;
+ cutin "Arquien_n_atnad03.bmp",2;
+ mes "[Arquien]";
+ mes "What are you doing?";
+ mes "Let's go back now.";
+ mes "To the city that was too good for its own good.";
+ close3;
+}
+
+//- To Phantasmagorika!
+yuno_fild07,216,157,5 script Guide Elisha#ep15_1bs2 4_F_ZONDAGIRL,{
+ if (VER_MAIN >= 4) {
+ mes "[Elisha]";
+ mes "Good day.";
+ mes "Please say your name, so I can check your registration.";
+ emotion ET_THROB;
+ next;
+ switch( select( "Say your name.", "Ask about the registration.", "End conversation." ) ) {
+ case 1:
+ mes "[Elisha]";
+ switch(VER_ELEVATOR) {
+ case 0:
+ case 1:
+ mes "Um, let's see...";
+ mes "I'm sorry, but you're not on the list. Could you check your registration status?";
+ emotion ET_PROFUSELY_SWEAT;
+ close;
+ case 2:
+ mes "You're back already.";
+ emotion ET_THROB;
+ next;
+ mes "[Elisha]";
+ mes "Let's see...";
+ mes "Ah, I've found your name.";
+ mes "Would you like to ^0000FFmove to Phantasmagorika^000000 now?";
+ next;
+ if (select( "No.", "Yes." ) == 1) {
+ mes "[Elisha]";
+ mes "Have a good day.";
+ emotion ET_THROB;
+ close;
+ }
+ mes "[Elisha]";
+ mes "Let me send you to Phantasmagorika.";
+ next;
+ mes "[Elisha]";
+ mes "For your safety, please avoid running or jumping while inside.";
+ next;
+ mes "[Elisha]";
+ mes "Ready?";
+ mes "Have a safe exploration!";
+ emotion ET_THROB;
+ next;
+ mes "^FF0000- BEEP-! -";
+ mes "- Service temporarily unavailable. -^000000";
+ emotion ET_HUK, playerattached();
+ next;
+ mes "[Elisha]";
+ mes "Um?";
+ mes "Could you hold on a moment?";
+ emotion ET_PROFUSELY_SWEAT;
+ next;
+ mes "^FF0000- BEEP-! -";
+ mes "- Service temporarily unavailable. -^000000";
+ emotion ET_HUK, playerattached();
+ next;
+ mes "[Elisha]";
+ mes "Um...";
+ mes "What's wrong with it?";
+ mes "Please give me a moment.";
+ emotion ET_PROFUSELY_SWEAT;
+ next;
+ mes "^FF0000- BEEP-! -";
+ mes "- Service temporarily unavailable. -^000000";
+ emotion ET_HUK, playerattached();
+ next;
+ mes "[Elisha]";
+ mes "Uh-oh.";
+ mes "Is it out of order?";
+ mes "It can't be!";
+ emotion ET_HUK;
+ next;
+ mes "^FF0000- BEEP-! -";
+ mes "- Service temporarily unavailable. -^000000";
+ emotion ET_HUK, playerattached();
+ next;
+ mes "[Elisha]";
+ mes "I'm sorry, " + strcharinfo(0) + ".";
+ mes "I know you're registered for the service, but it's out of order at this moment.";
+ mes "I'm sorry for this inconvenience.";
+ emotion ET_PROFUSELY_SWEAT;
+ emotion ET_HUK, playerattached();
+ next;
+ mes "[Elisha]";
+ mes "It was working fine just a moment ago.";
+ mes "I'm sorry.";
+ mes "I'll have to call in a technician. Please use the stairs instead.";
+ next;
+ mes "[Elisha]";
+ mes "^0000FFPhantasmagorika is past the tunnel to the south from the southeast gate outside Juperos Ruins.^000000";
+ next;
+ mes "[Elisha]";
+ mes "There are elevator doors near the fountain in the center of the place. Could you check what happened to the elevator?";
+ mes "I'm so sorry for all this.";
+ emotion ET_CRY;
+ changequest 11364,11365;// To Phantasmagorika!
+ VER_ELEVATOR = 3;
+ close;
+ case 3:
+ mes "It was working fine just a moment ago.";
+ mes "I'm sorry.";
+ mes "I'll have to call in a technician. Please use the stairs instead.";
+ next;
+ mes "[Elisha]";
+ mes "^0000FFPhantasmagorika is past the tunnel to the south from the southeast gate outside Juperos Ruins.^000000";
+ next;
+ mes "[Elisha]";
+ mes "There are elevator doors near the fountain in the center of the place. Could you check what happened to the elevator?";
+ mes "I'm so sorry for all this.";
+ emotion ET_CRY;
+ close;
+ case 4:
+ mes "I'm sorry.";
+ mes "The elevator is currently out of order.";
+ close;
+ default:
+ mes "Let's see...";
+ mes "A... B... C... D... E... F... Ah, there it is!";
+ emotion ET_PROFUSELY_SWEAT;
+ next;
+ mes "[Elisha]";
+ mes "" + strcharinfo(0) + ", your registration has been confirmed.";
+ mes "Would you like to move to Phantasmagorika?";
+ emotion ET_THROB;
+ next;
+ if (select( "No.", "Yes." ) == 1) {
+ mes "[Elisha]";
+ mes "Have a good day.";
+ close;
+ }
+ mes "[Elisha]";
+ mes "Let me send you to Phantasmagorika.";
+ next;
+ mes "[Elisha]";
+ mes "For your safety, please avoid running or jumping while inside.";
+ next;
+ mes "[Elisha]";
+ mes "Ready?";
+ mes "Have a safe exploration!";
+ close2;
+ warp "verus04",122,217;
+ end;
+ }
+ case 2:
+ mes "[Elisha]";
+ mes "*Clears her throat*";
+ mes "This facility is provided by ^0000FFRekenber^000000";
+ next;
+ mes "[Elisha]";
+ mes "to ^0000FFthe members of the Eden Group^000000 for their safe transportation to ^0000FFPhantasmagorika^000000.";
+ next;
+ mes "[Elisha]";
+ mes "To use this facility, you must be ^0000FFa member of the Eden Group who is registered for the Phantasmagorika excavation project^000000.";
+ next;
+ mes "[Elisha]";
+ mes "You can register for the use of the facility at ^0000FFRekenber Corporation Headquarters^000000, so long as you're a registered excavator of the Eden Group.";
+ if (VER_ELEVATOR >= 2)
+ close;
+ next;
+ if (select( "End conversation.", "Ask for directions." ) == 2) {
+ mes "[Elisha]";
+ mes "To register for the use of the facility, please visit ^0000FFRekenber Corporation Headquarters in Lighthalzen and talk to Leitner at the information desk to the west from the main entrance on the first floor^000000.";
+ next;
+ mes "[Elisha]";
+ mes "The whole registration process may sound cumbersome, but using the elevator is worth the trouble.";
+ if (VER_ELEVATOR == 0) {
+ setquest 11363;// To Phantasmagorika!
+ VER_ELEVATOR = 1;
+ }
+ close;
+ }
+ break;
+ case 3:
+ break;
+ }
+ }
+ mes "[Elisha]";
+ mes "My company Rekenber is in partnership with the Eden Group";
+ mes "for the ^0000FFPhantasmagorika excavation project^000000.";
+ next;
+ mes "[Elisha]";
+ mes "The newly discovered legacy of the ancients: Phantasmagorika!";
+ mes "Contact the ^0000FFEden Group^000000 to join its Phantasmagorika excavation project!";
+ close;
+
+OnInit:
+ questinfo 11363,QTYPE_QUEST,1;
+ setquestinfo_req 11363,11364,0,11365,0,11366,0;
+ end;
+}
+
+lhz_in01,75,209,3 script Leitner#ep15_1bs 4_LGTSCIENCE,{
+ mes "[Leitner]";
+ switch(VER_ELEVATOR) {
+ case 0:
+ mes "Heya!";
+ mes "What brings you here, sweetheart?";
+ mes "If you're looking for a shoulder to cry on, I'm here.";
+ emotion ET_CHUP;
+ close;
+ case 1:
+ mes "Heya!";
+ mes "What brings you here, sweetheart?";
+ mes "If you're looking for a shoulder to cry on, I'm here.";
+ emotion ET_CHUP;
+ next;
+ select("Ask about the registration process.");
+ mes "[Leitner]";
+ mes "Oh.";
+ mes "I should have known.";
+ mes "You mean the elevator to Phantasmagorika, eh?";
+ emotion ET_THINK;
+ next;
+ mes "[Leitner]";
+ mes "When I first got this job, the elevator was private and I did diddly-squat.";
+ next;
+ mes "[Leitner]";
+ mes "Then, the management opened it to the public and my life went straight to hell.";
+ next;
+ mes "[Leitner]";
+ mes "Ah, why me?!";
+ mes "Goodbye, peaceful days!";
+ mes "I'm so busy that I barely have time for the ladies.";
+ emotion ET_HELP;
+ next;
+ mes "[Leitner]";
+ mes "Anyway, let's get you registered. I want to get back to my break.";
+ mes "Err... Write down your name here, and put your fingerprint next to it.";
+ mes "Done. Easy, huh?";
+ next;
+ mes "[Leitner]";
+ mes "I know, I know; why the extra step when the elevator is open to the public?";
+ next;
+ mes "^0000FF- BEEP-! -";
+ mes "- The following users -";
+ mes "- have been registered. -^000000";
+ next;
+ mes "[Leitner]";
+ mes "Alright,";
+ mes "you're good to go.";
+ mes "Now you can use the elevator.";
+ changequest 11363,11364;// To Phantasmagorika!
+ VER_ELEVATOR = 2;
+ close;
+ case 2:
+ mes "I know, I know; why the extra step when the elevator is open to the public?";
+ next;
+ mes "[Leitner]";
+ mes "Now you can use the elevator.";
+ close;
+ default:
+ mes "The elevator breaks almost every day, probably from carrying too many people.";
+ mes "Ah, I need rest. Sigh.";
+ emotion ET_HELP;
+ close;
+ }
+}
+
+verus04,119,220,3 script Guide Scarlet#ep15_1bs 4_M_TELEPORTER,{
+ mes "[Scarlet]";
+ switch(VER_ELEVATOR) {
+ case 0:
+ case 1:
+ case 2:
+ mes "*Clears her throat*";
+ mes "This facility is provided by ^0000FFRekenber^000000";
+ next;
+ mes "[Scarlet]";
+ mes "to ^0000FFthe members of the Eden Group^000000 for their safe transportation to ^0000FFPhantasmagorika^000000.";
+ next;
+ mes "[Scarlet]";
+ mes "To use this facility, you must be ^0000FFa member of the Eden Group who is registered for the Phantasmagorika excavation project^000000.";
+ next;
+ mes "[Scarlet]";
+ mes "You can register for the use of the facility at ^0000FFRekenber Corporation Headquarters^000000, so long as you're a registered excavator of the Eden Group.";
+ next;
+ mes "[Scarlet]";
+ mes "Once you are registered, please double-check your registration status before using the facility.";
+ close;
+ case 3:
+ mes "What did you do in the elevator?";
+ emotion ET_FRET;
+ next;
+ mes "[Scarlet]";
+ mes "I told you not to run or jump inside the elevator!";
+ next;
+ mes "[Scarlet]";
+ mes "I can't believe you crushed the doors!";
+ next;
+ mes "[Mark]";
+ mes "It's my fault.";
+ mes "I should have kept a tight rein on him.";
+ emotion ET_PROFUSELY_SWEAT, getnpcid(0, "Mark#ep15_1elb");
+ cutin "bu_mark3.bmp",0;
+ next;
+ mes "[Deu]";
+ mes "How do you expect me to trust myself to such a shoddy machine?";
+ emotion ET_HUK, getnpcid(0, "Deu#ep15_1elb");
+ cutin "bu_du3.bmp",2;
+ next;
+ mes "[Mark]";
+ mes "Enough!";
+ mes "Apologize to the lady!";
+ emotion ET_FRET, getnpcid(0, "Mark#ep15_1elb");
+ cutin "bu_mark4.bmp",0;
+ next;
+ mes "[Deu]";
+ mes "But he started it...";
+ cutin "bu_du3.bmp",2;
+ next;
+ mes "[Mark]";
+ mes "...";
+ emotion ET_FRET, getnpcid(0, "Mark#ep15_1elb");
+ cutin "bu_mark4.bmp",0;
+ next;
+ mes "[Tamarin]";
+ mes "I told you stop jumping!";
+ emotion ET_HUK, getnpcid(0, "Tamarin#ep15_1elb");
+ cutin "ep143_taang.bmp",2;
+ next;
+ mes "[Alf]";
+ mes "You guys,";
+ mes "stop fighting.";
+ mes "The floor feels dangerously unstable.";
+ emotion ET_PROFUSELY_SWEAT, getnpcid(0, "Alf#ep15_1elb");
+ cutin "bu_alp2.bmp",2;
+ next;
+ mes "[Scarlet]";
+ mes "We all should get off and call in a techni...";
+ cutin "",255;
+ next;
+ mes "^FF0000- THUD -^000000";
+ emotion ET_HUK;
+ emotion ET_HUK, getnpcid(0, "Deu#ep15_1elb");
+ emotion ET_HUK, getnpcid(0, "Mark#ep15_1elb");
+ emotion ET_HUK, getnpcid(0, "Tamarin#ep15_1elb");
+ emotion ET_HUK, getnpcid(0, "Alf#ep15_1elb");
+ emotion ET_HUK, getnpcid(0, "Magi#ep15_1elb");
+ next;
+ mes "[Magi]";
+ mes "Kyaaaaah-!";
+ emotion ET_HUK, getnpcid(0, "Magi#ep15_1elb");
+ cutin "bu_maggi4.bmp",2;
+ next;
+ mes "[Deu]";
+ mes "Wah!";
+ mes "The floor rattled!";
+ emotion ET_PROFUSELY_SWEAT, getnpcid(0, "Deu#ep15_1elb");
+ cutin "bu_du5.bmp",2;
+ next;
+ mes "[Scarlet]";
+ mes "Stop!";
+ mes "Everyone, stay still!";
+ mes "Or we might plummet to the bottom!";
+ emotion ET_HUK;
+ cutin "",255;
+ next;
+ mes "[Scarlet]";
+ mes "Hey,";
+ mes "you!";
+ mes "Help!";
+ emotion ET_HELP;
+ next;
+ mes "[Scarlet]";
+ mes "This elevator is so unstable that none of us can move.";
+ mes "Could you bring us something to ^0000FFsupport the floor^000000?";
+ next;
+ mes "[Scarlet]";
+ mes "We don't have time to wait for a technician!";
+ mes "We just need ^FF000030 Used Iron Plates from Dimiks^000000 in Juperos!";
+ next;
+ mes "[Scarlet]";
+ mes "Please help us!";
+ changequest 11365,11366;// To Phantasmagorika!
+ VER_ELEVATOR = 4;
+ close;
+ case 4:
+ mes "Careful!";
+ mes "Everyone, stop moving!";
+ next;
+ mes "[Deu]";
+ mes "WAH-!";
+ mes "We're going to crash to the ground!";
+ emotion ET_HUK, getnpcid(0, "Deu#ep15_1elb");
+ cutin "bu_du5.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "Don't say that!";
+ mes "This is your fault!";
+ emotion ET_FRET, getnpcid(0, "Tamarin#ep15_1elb");
+ cutin "ep143_taang.bmp",2;
+ next;
+ mes "[Scarlet]";
+ mes "Quiet, both of you!";
+ mes "If you move an inch, we are all going to die!";
+ emotion ET_HUK;
+ cutin "",255;
+ next;
+ mes "[Scarlet]";
+ if (countitem(7319) < 30) {// Used_Iron_Plate
+ mes "This elevator is so unstable that none of us can move.";
+ mes "Could you bring us something to ^0000FFsupport the floor^000000?";
+ next;
+ mes "[Scarlet]";
+ mes "We don't have time to wait for a technician!";
+ mes "We just need ^FF000030 Used Iron Plates from Dimiks^000000 in Juperos!";
+ next;
+ mes "[Scarlet]";
+ mes "Please help us!";
+ close;
+ }
+ mes "Did you bring Used Iron Plates?";
+ mes "Please push them in here carefully, one by one.";
+ delitem 7319,30;// Used_Iron_Plate
+ completequest 11366;// To Phantasmagorika!
+ VER_ELEVATOR = 5;
+ next;
+ mes "[Scarlet]";
+ mes "They might not hold for long, but that should still be enough us to get out.";
+ next;
+ select("Push in Used Iron Plates.");
+ mes "[Scarlet]";
+ mes "Now, get off!";
+ mes "The plates won't hold for long!";
+ next;
+ mes "[Deu]";
+ mes "Thank the gods!";
+ mes "Here, Magi!";
+ mes "Take my hand and get down.";
+ cutin "bu_du4.bmp",2;
+ next;
+ mes "[Scarlet]";
+ mes "Whew...";
+ mes "I'm glad no one's hurt.";
+ mes "I'll let this go,";
+ mes "but never again!";
+ cutin "",255;
+ next;
+ mes "[Scarlet]";
+ mes "And " + strcharinfo(0) + ", thank you so much.";
+ mes "We could have been in big trouble if it weren't for you.";
+ emotion ET_THANKS;
+ next;
+ mes "[Scarlet]";
+ mes "I've just heard from Elisha.";
+ mes "You had to walk because the elevator was broken, right?";
+ next;
+ mes "[Scarlet]";
+ mes "I'm sorry for the inconvenience.";
+ mes "The elevator is back in operation now. Let me know if you want to go up.";
+ next;
+ mes "[Mark]";
+ mes "Whew! " + strcharinfo(0) + ", you've saved us.";
+ mes "Sigh, I don't know when he's going to grow up.";
+ emotion ET_THANKS, getnpcid(0, "Mark#ep15_1elb");
+ cutin "bu_mark2.bmp",0;
+ next;
+ mes "[Magi]";
+ mes "*Sob* *Hiccup*";
+ mes "Th-thanks... *Sob* *Hiccup*";
+ mes "I was so scared! Wah-!";
+ emotion ET_THANKS, getnpcid(0, "Magi#ep15_1elb");
+ cutin "bu_maggi4.bmp",2;
+ next;
+ mes "[Deu]";
+ mes "...Sorry.";
+ cutin "bu_du5.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "Thank you.";
+ mes "Sigh, I don't want to imagine what might have happened if you, " + strcharinfo(0) + ", didn't pass by at that moment.";
+ emotion ET_THANKS, getnpcid(0, "Tamarin#ep15_1elb");
+ cutin "ep143_tasmi.bmp",2;
+ next;
+ mes "[Alf]";
+ mes "...Thank you.";
+ cutin "bu_alp1.bmp",2;
+ emotion ET_THANKS, getnpcid(0, "Alf#ep15_1elb");
+ next;
+ mes "[Tamarin]";
+ mes "By the way, don't you think it's strange";
+ mes "that an elevator is set up and running in the newly discovered ruins?";
+ cutin "ep143_tasta.bmp",2;
+ next;
+ mes "[Mark]";
+ mes "Well,";
+ mes "Rekenber is sponsoring the excavation, and that's a good enough reason for me.";
+ cutin "bu_mark1.bmp",0;
+ next;
+ mes "[???]";
+ mes "The ruins under Juperos. Isn't that exciting?";
+ cutin "",255;
+ next;
+ mes "[Deu]";
+ mes "It is!";
+ mes "No one hasn't figured out when the ruins were built.";
+ mes "Let's go! I want to be the first to know!";
+ cutin "bu_du2.bmp",2;
+ next;
+ mes "[Mark]";
+ mes "Calm down!";
+ mes "Haven't you learned? You almost broke the elevator!";
+ emotion ET_FRET, getnpcid(0, "Mark#ep15_1elb");
+ cutin "bu_mark3.bmp",0;
+ next;
+ mes "[Scarlet]";
+ mes "Be careful!";
+ mes "The floor is still unstable!";
+ cutin "",255;
+ close;
+ default:
+ mes "Good day.";
+ mes "Please say your name, so I can check your registration.";
+ next;
+ if (select( "Say your name.", "End conversation." ) == 1) {
+ mes "[Scarlet]";
+ mes "Hm...";
+ mes "Yes, " + strcharinfo(0) + ", your registration has been confirmed.";
+ mes "Would you like to move to the entrance to Juperos?";
+ next;
+ if (select( "No.", "Yes." ) == 2) {
+ mes "[Scarlet]";
+ mes "Ready?";
+ mes "Have a safe exploration!";
+ close2;
+ warp "yuno_fild07",230,156;
+ end;
+ }
+ }
+ mes "[Scarlet]";
+ mes "Have a good day.";
+ close;
+ }
+}
+
+function script excavator_part2 {
+ mes "[Deu]";
+ mes "Hm...";
+ mes "This place doesn't look as exciting as I thought.";
+ cutin "bu_du3.bmp",2;
+ next;
+ mes "[Mark]";
+ mes "What did you expect?";
+ emotion ET_THINK, getnpcid(0, "Mark#ep15_1elb");
+ cutin "bu_mark1.bmp",0;
+ next;
+ mes "[Deu]";
+ mes "You know,";
+ mes "I thought it'd be filled with amazing treasures.";
+ cutin "bu_du2.bmp",2;
+ next;
+ mes "[Mark]";
+ mes "It it were, other people probably beat us to it.";
+ cutin "bu_mark2.bmp",0;
+ next;
+ mes "[Alf]";
+ mes "Um...";
+ mes "The place may not look like much, but the building styles and materials are not like what I've seen in Midgard.";
+ cutin "bu_alp1.bmp",2;
+ next;
+ mes "[Alf]";
+ mes "Or in Juperos.";
+ next;
+ mes "[Deu]";
+ mes "Whoa!";
+ mes "Guys, come look at this fountain!";
+ emotion ET_HUK, getnpcid(0, "Fountain#ep15_1elb");
+ cutin "bu_du2.bmp",2;
+ setquest 11367;// Looking for the Traces
+ VER_ELEVATOR = 100;
+ return;
+}
+
+verus04,117,219,0 script Alf#ep15_1elb 4_M_BLACKMAN,{
+ switch(VER_ELEVATOR) {
+ case 0:
+ case 1:
+ case 2:
+ mes "[Alf]";
+ mes "Excavation, that's a good subject.";
+ emotion ET_THINK;
+ cutin "bu_alp4.bmp",2;
+ break;
+ case 3:
+ mes "[Alf]";
+ mes "...";
+ mes "S-stop moving.";
+ emotion ET_PROFUSELY_SWEAT;
+ cutin "bu_alp2.bmp",2;
+ next;
+ mes "[Deu]";
+ mes "WAAAAAHH-!";
+ emotion ET_HUK, getnpcid(0, "Deu#ep15_1elb");
+ cutin "bu_du5.bmp",2;
+ next;
+ mes "[Scarlet]";
+ mes "What did you do in the elevator?";
+ mes "I told you not to run or jump inside the elevator!";
+ emotion ET_HUK, getnpcid(0, "Guide Scarlet#ep15_1bs");
+ cutin "",255;
+ close;
+ case 4:
+ mes "[Alf]";
+ mes "S-stop moving.";
+ mes "Th-the f-floor...";
+ emotion ET_PROFUSELY_SWEAT;
+ cutin "bu_alp2.bmp",2;
+ break;
+ case 5:
+ excavator_part2();
+ break;
+ case 100:
+ mes "[Alf]";
+ mes "What about the fountain?";
+ emotion ET_HUK, getnpcid(0, "Fountain#ep15_1elb");
+ cutin "bu_alp1.bmp",2;
+ break;
+ default:
+ mes "[Alf]";
+ mes "...Thank you.";
+ cutin "bu_alp1.bmp",2;
+ break;
+ }
+ close3;
+}
+verus04,115,220,5 script Deu#ep15_1elb 4_M_REDMAN,{
+ switch(VER_ELEVATOR) {
+ case 0:
+ case 1:
+ case 2:
+ mes "[Deu]";
+ mes "Adventurers,";
+ mes "let's go!";
+ cutin "bu_du2.bmp", 2;
+ break;
+ case 3:
+ mes "[Deu]";
+ mes "WAAAAAHH-!";
+ cutin "bu_du5.bmp",2;
+ next;
+ mes "[Deu]";
+ mes "Someone please do something!";
+ next;
+ mes "[Scarlet]";
+ mes "What did you do in the elevator?";
+ mes "I told you not to run or jump inside the elevator!";
+ emotion ET_HUK, getnpcid(0, "Guide Scarlet#ep15_1bs");
+ cutin "",255;
+ close;
+ case 4:
+ mes "[Deu]";
+ mes "WAH-!";
+ mes "We're going to crash to the ground!";
+ emotion ET_HUK;
+ cutin "bu_du5.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "Don't say that!";
+ mes "This is your fault!";
+ emotion ET_HUK, getnpcid(0, "Tamarin#ep15_1elb");
+ cutin "ep143_tahuk.bmp",2;
+ next;
+ mes "[Scarlet]";
+ mes "Quiet, both of you!";
+ mes "If you move an inch, we are all going to die!";
+ emotion ET_HUK, getnpcid(0, "Guide Scarlet#ep15_1bs");
+ cutin "",255;
+ close;
+ case 5:
+ excavator_part2();
+ break;
+ case 100:
+ mes "[Deu]";
+ mes "Whoa!";
+ mes "Guys, come look at this fountain!";
+ emotion ET_HUK, getnpcid(0, "Fountain#ep15_1elb");
+ cutin "bu_du2.bmp",2;
+ break;
+ default:
+ mes "[Deu]";
+ mes "Adventuring is all about bravery and curiosity!";
+ cutin "bu_du2.bmp",2;
+ }
+ close3;
+}
+verus04,117,220,3 script Magi#ep15_1elb 4_F_PINKWOMAN,{
+ switch(VER_ELEVATOR) {
+ case 0:
+ case 1:
+ case 2:
+ mes "[Magi]";
+ mes "Phantasmagorika. What a pretty name!";
+ cutin "bu_maggi2.bmp", 2;
+ break;
+ case 3:
+ mes "[Magi]";
+ mes "Kyaaaahhh-!";
+ emotion ET_HUK;
+ cutin "bu_maggi4.bmp",2;
+ next;
+ mes "[Deu]";
+ mes "WAAAAAHH-!";
+ emotion ET_HUK, getnpcid(0, "Deu#ep15_1elb");
+ cutin "bu_du5.bmp",2;
+ next;
+ mes "[Scarlet]";
+ mes "What did you do in the elevator?";
+ mes "I told you not to run or jump inside the elevator!";
+ emotion ET_HUK, getnpcid(0, "Guide Scarlet#ep15_1bs");
+ cutin "",255;
+ close;
+ case 4:
+ mes "[Magi]";
+ mes "Kyaaaaah-!";
+ emotion ET_HUK;
+ cutin "bu_maggi4.bmp",2;
+ break;
+ case 5:
+ excavator_part2();
+ break;
+ case 100:
+ mes "[Magi]";
+ mes "Deu is full of bile and vinegar.";
+ mes "What's so interesting about the fountain?";
+ emotion ET_HUK, getnpcid(0, "Fountain#ep15_1elb");
+ cutin "bu_maggi1.bmp",2;
+ break;
+ default:
+ mes "[Magi]";
+ mes "*Sob* *Hiccup*";
+ mes "Th-thanks... *Sob* *Hiccup*";
+ mes "I was so scared! Wah-!";
+ emotion ET_CRY;
+ cutin "bu_maggi4.bmp",2;
+ }
+ close3;
+}
+verus04,115,221,5 script Mark#ep15_1elb 4_M_BLUEMAN,{
+ switch(VER_ELEVATOR) {
+ case 0:
+ case 1:
+ case 2:
+ mes "[Mark]";
+ mes "Phantasmagorika.";
+ mes "I can't wait to know more about this place.";
+ cutin "bu_mark1.bmp",0;
+ next;
+ mes "[Mark]";
+ mes "It's discovered near Juperos, but believed to belong to a different civilization.";
+ cutin "bu_mark2.bmp",0;
+ break;
+ case 3:
+ mes "[Mark]";
+ mes "Watch out!";
+ emotion ET_HUK;
+ cutin "bu_mark4.bmp",0;
+ next;
+ mes "[Deu]";
+ mes "WAAAAAHH-!";
+ emotion ET_HUK, getnpcid(0, "Deu#ep15_1elb");
+ cutin "bu_du5.bmp",2;
+ next;
+ mes "[Scarlet]";
+ mes "What did you do in the elevator?";
+ mes "I told you not to run or jump inside the elevator!";
+ emotion ET_HUK, getnpcid(0, "Guide Scarlet#ep15_1bs");
+ cutin "",255;
+ close;
+ case 4:
+ mes "[Mark]";
+ mes "By the gods, Deu!";
+ mes "You're going to give me a heart attack!";
+ emotion ET_FRET;
+ cutin "bu_mark3.bmp",0;
+ break;
+ case 5:
+ excavator_part2();
+ break;
+ case 100:
+ mes "[Mark]";
+ mes "What about the fountain?";
+ emotion ET_HUK, getnpcid(0, "Fountain#ep15_1elb");
+ cutin "bu_mark3.bmp",0;
+ break;
+ default:
+ mes "[Mark]";
+ mes "Whew! " + strcharinfo(0) + ", you've saved us.";
+ mes "Sigh, I don't know when he's going to grow up.";
+ cutin "bu_mark3.bmp",0;
+ }
+ close3;
+}
+verus04,116,219,5 script Tamarin#ep15_1elb 4_M_TAMARIN,{
+ switch(VER_ELEVATOR) {
+ case 0:
+ case 1:
+ case 2:
+ mes "[Tamarin]";
+ mes "An excavation project of this scale should attract throngs of people.";
+ cutin "ep143_tasta.bmp",2;
+ break;
+ case 3:
+ mes "[Tamarin]";
+ mes "I told you stop jumping!";
+ emotion ET_HUK;
+ cutin "ep143_tahuk.bmp",2;
+ next;
+ mes "[Deu]";
+ mes "WAAAAAHH-!";
+ emotion ET_HUK, getnpcid(0, "Deu#ep15_1elb");
+ cutin "bu_du5.bmp",2;
+ next;
+ mes "[Scarlet]";
+ mes "What did you do in the elevator?";
+ mes "I told you not to run or jump inside the elevator!";
+ emotion ET_HUK, getnpcid(0, "Guide Scarlet#ep15_1bs");
+ cutin "",255;
+ close;
+ case 4:
+ mes "[Tamarin]";
+ mes "Argh,";
+ mes "nothing is going in my favor!";
+ emotion ET_CRY;
+ cutin "ep143_tahuk.bmp",2;
+ break;
+ case 5:
+ excavator_part2();
+ break;
+ case 100:
+ mes "[Tamarin]";
+ mes "Hm, did Deu find something in the fountain?";
+ emotion ET_HUK, getnpcid(0, "Fountain#ep15_1elb");
+ cutin "ep143_tasmi.bmp",2;
+ break;
+ default:
+ mes "[Tamarin]";
+ mes "Thank you.";
+ mes "Sigh, I don't want to imagine what might have happened if you, " + strcharinfo(0) + ", didn't pass by at that moment.";
+ cutin "ep143_tasmi.bmp",2;
+ }
+ close3;
+}
+
+verus04,116,226,0 script Fountain#ep15_1elb 4_ENERGY_BLUE,{
+ if (VER_ELEVATOR == 100) {
+ mes "[Deu]";
+ mes "Look, I wiped it, and it sparkles!";
+ cutin "bu_du2.bmp",2;
+ next;
+ mes "[Alf]";
+ mes "Why can't you just listen to us?";
+ cutin "bu_alp1.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "Stop wasting your time on something so stupid!";
+ cutin "ep143_taang.bmp",2;
+ next;
+ mes "[Alf]";
+ mes "Um...";
+ mes "Wait.";
+ cutin "bu_alp3.bmp",2;
+ next;
+ mes "[Alf]";
+ mes "Look, it doesn't look like it's been buried deep underground for centuries.";
+ cutin "bu_alp1.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "You're right. It looks too clean underneath all the dirt and grime.";
+ cutin "ep143_tasta.bmp",2;
+ next;
+ mes "[Alf]";
+ mes "Let's see...";
+ cutin "bu_alp1.bmp",2;
+ next;
+ mes "[Alf]";
+ mes "Um...";
+ mes "It's too clean. I can't tell anything about it.";
+ cutin "bu_alp2.bmp",2;
+ next;
+ mes "[Alf]";
+ mes "If this fountain was ever used, it should have some sort of deposit left on the bottom, but there's none at all. It's almost as if the water was drained out of it at once.";
+ cutin "bu_alp1.bmp",2;
+ next;
+ mes "[Alf]";
+ mes "The deposit could have been wiped off naturally after a long time.";
+ next;
+ mes "[Alf]";
+ mes "Let's look around for something else.";
+ next;
+ mes "[Tamarin]";
+ mes "How about those sundries on the left side?";
+ emotion ET_HUK, getnpcid(0, "Sundries#ep15_1elb");
+ cutin "ep143_tasta.bmp",2;
+ changequest 11367,11368;// Looking for the Traces
+ VER_ELEVATOR = 101;
+ }
+ else if (VER_ELEVATOR == 101) {
+ mes "[Alf]";
+ mes "Let's look around for something else.";
+ cutin "bu_alp1.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "How about those sundries on the left side?";
+ emotion ET_HUK, getnpcid(0, "Sundries#ep15_1elb");
+ cutin "ep143_tasta.bmp",2;
+ }
+ else {
+ mes "- Ordinary-looking Fountain -";
+ mes "- There's nothing in it. -";
+ }
+ close3;
+}
+
+verus04,95,238,0 script Sundries#ep15_1elb 4_ENERGY_BLUE,{
+ if (VER_ELEVATOR == 101) {
+ mes "[Alf]";
+ mes "Hm...";
+ mes "Everything looks too clean.";
+ mes "This site doesn't look like it's as old as we thought it was.";
+ cutin "bu_alp1.bmp",2;
+ next;
+ mes "[Alf]";
+ mes "Aside from those piles of broken machines, nothing looks too special.";
+ next;
+ mes "[Alf]";
+ mes "And look at the tree on the left side.";
+ emotion ET_HUK, getnpcid(0, "Tree#ep15_1elb");
+ changequest 11368,11369;// Looking for the Traces
+ VER_ELEVATOR = 102;
+ }
+ else if (VER_ELEVATOR == 102) {
+ mes "[Alf]";
+ mes "Look at the tree on the left side.";
+ cutin "bu_alp1.bmp",2;
+ emotion ET_HUK, getnpcid(0, "Tree#ep15_1elb");
+ }
+ else
+ mes "- The ground is littered with sundries. -";
+ close3;
+}
+
+verus04,79,249,0 script Tree#ep15_1elb 4_ENERGY_BLUE,{
+ if (VER_ELEVATOR == 102) {
+ mes "[Deu]";
+ mes "I've been wondering since we arrived: don't trees need sunlight to grow?";
+ cutin "bu_du1.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "*Gasp*";
+ mes "Deu, that's the smartest thing I've ever heard you say.";
+ cutin "ep143_tahuk.bmp",2;
+ next;
+ mes "[Deu]";
+ mes "What did you say?";
+ cutin "bu_du5.bmp",2;
+ next;
+ mes "[Mark]";
+ mes "How did this tree grow underground?";
+ mes "There's no sunlight.";
+ cutin "bu_mark1.bmp",0;
+ next;
+ mes "[Magi]";
+ mes "It doesn't look like it's enchanted.";
+ cutin "bu_maggi1.bmp",2;
+ next;
+ mes "[Deu]";
+ mes "Oh, look here!";
+ mes "Something strange is standing in front of the door!";
+ emotion ET_HUK, getnpcid(0, "Signboard#ep15_1elb");
+ cutin "bu_du2.bmp",2;
+ changequest 11369,11370;// Looking for the Traces
+ VER_ELEVATOR = 103;
+ }
+ else if (VER_ELEVATOR == 103) {
+ mes "[Deu]";
+ mes "Oh, look here!";
+ mes "Something strange is standing in front of the door!";
+ emotion ET_HUK, getnpcid(0, "Signboard#ep15_1elb");
+ cutin "bu_du2.bmp",2;
+ }
+ else {
+ mes "A tall, verdant tree.";
+ mes "Nothing looks special about it, except that it's growing underground.";
+ }
+ close3;
+}
+
+verus04,62,255,0 script Signboard#ep15_1elb 4_ENERGY_BLUE,{
+ if (VER_ELEVATOR == 103 || VER_ELEVATOR == 104) {
+ if (VER_ELEVATOR == 103) {
+ mes "[Mark]";
+ mes "Hey!";
+ mes "Stop wandering off! This place can be dangerous!";
+ cutin "bu_mark3.bmp",0;
+ next;
+ mes "[Deu]";
+ mes "Adventuring is all about bravery and curiosity!";
+ cutin "bu_du2.bmp",2;
+ next;
+ mes "[Deu]";
+ mes "And I'm not going to let other people take all the treasures!";
+ cutin "bu_du1.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "Last time you said that, you were hospitalized for a month.";
+ cutin "ep143_taang.bmp",2;
+ next;
+ mes "[Deu]";
+ mes "This time, it's different!";
+ mes "Plus, what doesn't kill me only makes me stronger. It did!";
+ cutin "bu_du5.bmp",2;
+ next;
+ mes "[Mark]";
+ mes "You're delusional.";
+ cutin "bu_mark4.bmp",0;
+ next;
+ mes "[Alf]";
+ mes "Oh,";
+ mes "wait.";
+ cutin "bu_alp1.bmp",2;
+ next;
+ }
+ mes "[Alf]";
+ mes "Look behind the building.";
+ mes "There's a path that leads upward.";
+ cutin "bu_alp3.bmp",2;
+ next;
+ mes "[Deu]";
+ mes "I go";
+ mes "wherever my instinct leads me!";
+ mes "Mwah hah hah!";
+ cutin "bu_du2.bmp",2;
+ next;
+ mes "[Mark]";
+ mes "Deu, stop!";
+ mes "Did you not hear me?!";
+ cutin "bu_mark3.bmp",0;
+ next;
+ mes "[Mark]";
+ mes "Grr!";
+ mes "He's out of control.";
+ next;
+ mes "[Magi]";
+ mes "Mark,";
+ mes "Deu's managed to get that far already.";
+ cutin "bu_maggi1.bmp",2;
+ next;
+ mes "[Mark]";
+ mes "Grr!";
+ mes "That knucklehead!";
+ cutin "bu_mark3.bmp",0;
+ next;
+ mes "[Mark]";
+ mes "We'd better follow him before we lose him.";
+ cutin "bu_mark1.bmp",0;
+ if (VER_ELEVATOR == 103) {
+ changequest 11370,11371;// Looking for the Traces
+ VER_ELEVATOR = 104;
+ }
+ close3;
+ }
+ mes "- The door is blocked. -";
+ close;
+}
+
+verus03,46,23,3 script Deu#ep15_1elb03 4_M_REDMAN,{
+ mes "[Deu]";
+ if (VER_ELEVATOR == 104) {
+ mes "Whoa...";
+ mes "I thought this place would be the same as the last one, but it's overrun with machines.";
+ emotion ET_HUK;
+ cutin "bu_du5.bmp",2;
+ next;
+ mes "[Deu]";
+ mes "Are these the same as those in Juperos?";
+ cutin "bu_du1.bmp",2;
+ next;
+ mes "[Deu]";
+ mes "What does this place have to do with Juperos?";
+ next;
+ mes "[Deu]";
+ mes "Up there, I saw another fountain looking similar to the last one.";
+ mes "Do you want to go check it out?";
+ cutin "bu_du2.bmp",2;
+ changequest 11371,11372;// Looking for the Traces
+ VER_ELEVATOR = 105;
+ }
+ else if (VER_ELEVATOR == 105) {
+ mes "Up there, I saw another fountain looking similar to the last one.";
+ mes "Do you want to go check it out?";
+ cutin "bu_du2.bmp",2;
+ }
+ else {
+ mes "What does this place have to do with Juperos?";
+ cutin "bu_du5.bmp",2;
+ }
+ close3;
+}
+
+verus03,44,65,0 script Fountain#ep15_1elb03 4_ENERGY_BLUE,{
+ if (VER_ELEVATOR == 105) {
+ mes "[Alf]";
+ mes "Hm...";
+ mes "This place is disturbingly clean.";
+ cutin "bu_alp1.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "All the buildings are well preserved. What do you think happened to the owners?";
+ cutin "ep143_tasta.bmp",2;
+ next;
+ mes "[Alf]";
+ mes "If they're dead, they're not buried or left to rot in here. If they left... well, I don't think they did.";
+ cutin "bu_alp3.bmp",2;
+ next;
+ mes "[Magi]";
+ mes "I tried to read with magic,";
+ mes "but to no avail.";
+ cutin "bu_maggi1.bmp",2;
+ next;
+ mes "[Deu]";
+ mes "So the trail of clues went cold.";
+ cutin "bu_du5.bmp",2;
+ next;
+ mes "[Mark]";
+ mes "...";
+ cutin "bu_mark3.bmp",0;
+ next;
+ mes "[Deu]";
+ mes "Ouch! Why did you hit me?";
+ cutin "bu_du4.bmp",2;
+ next;
+ mes "[Mark]";
+ mes "I'll take the path north. Meet me up there later.";
+ cutin "bu_mark2.bmp",0;
+ next;
+ mes "[Mark]";
+ mes "Keep an eye on Deu; he wanders off easily.";
+ cutin "bu_mark4.bmp",0;
+ changequest 11372,11373;// Looking for the Traces
+ VER_ELEVATOR = 106;
+ }
+ else if (VER_ELEVATOR == 106) {
+ mes "[Mark]";
+ mes "I'll take the path north. Meet me up there later.";
+ cutin "bu_mark2.bmp",0;
+ next;
+ mes "[Mark]";
+ mes "Keep an eye on Deu; he wanders off easily.";
+ cutin "bu_mark4.bmp",0;
+ }
+ else {
+ mes "- Ordinary-looking Fountain -";
+ mes "- There's nothing in it. -";
+ }
+ close3;
+}
+
+verus03,88,237,3 script Mark#ep15_1elb03 4_M_BLUEMAN,{
+ mes "[Mark]";
+ if (VER_ELEVATOR == 106) {
+ mes "Do you see the giant machine ahead of us?";
+ mes "Unlike the first place, this place is filled with giant machines.";
+ cutin "bu_mark1.bmp",0;
+ next;
+ mes "[Mark]";
+ mes "Buildings are crumbled. The ground is caved in here and there.";
+ next;
+ mes "[Mark]";
+ mes "I've found a path over there, though it's blocked.";
+ next;
+ mes "[Mark]";
+ mes "That doesn't bode well.";
+ cutin "bu_mark4.bmp",0;
+ next;
+ mes "[Mark]";
+ mes "Oh, Tamarin!";
+ mes "Don't go over there!";
+ cutin "bu_mark1.bmp",0;
+ emotion ET_HUK;
+ changequest 11373,11374;// Looking for the Traces
+ VER_ELEVATOR = 107;
+ }
+ else if (VER_ELEVATOR == 107) {
+ mes "Oh, Tamarin!";
+ mes "Don't go over there!";
+ cutin "bu_mark1.bmp",0;
+ emotion ET_HUK;
+ }
+ else {
+ mes "Do you see the giant machine ahead of us?";
+ mes "Unlike the first place, this place is filled with giant machines.";
+ cutin "bu_mark3.bmp", 0;
+ }
+ close3;
+}
+
+verus03,51,256,3 script Tamarin#ep15_1elb03 4_M_TAMARIN,{
+ mes "[Tamarin]";
+ mes "Look over there.";
+ mes "That part of the place is completely destroyed.";
+ cutin "ep143_tahuk.bmp",2;
+ if (VER_ELEVATOR == 107 || VER_ELEVATOR == 108) {
+ next;
+ mes "[Tamarin]";
+ mes "Magi, how's it like over there?";
+ cutin "ep143_tasta.bmp",2;
+ emotion ET_HUK, getnpcid(0, "Magi#ep15_1elb03");
+ if (VER_ELEVATOR == 107) {
+ changequest 11374,11375;// Looking for the Traces
+ VER_ELEVATOR = 108;
+ }
+ }
+ close3;
+}
+
+verus03,35,254,3 script Magi#ep15_1elb03 612,{
+ if (VER_ELEVATOR < 108) {
+ mes "[Magi]";
+ mes "Danger is in the air. I can feel it in my bones.";
+ cutin "bu_maggi3.bmp",2;
+ }
+ else if (VER_ELEVATOR == 108) {
+ mes "[Magi]";
+ mes "Oh.";
+ mes "The path over here is also blocked.";
+ cutin "bu_maggi1.bmp",2;
+ next;
+ mes "[Magi]";
+ mes "I'm sensing some kind of current on the other side,";
+ mes "but I can't tell exactly what.";
+ cutin "bu_maggi3.bmp",2;
+ next;
+ mes "[Magi]";
+ mes "It doesn't feel like a living thing,";
+ mes "but it's strong just the same.";
+ cutin "bu_maggi1.bmp",2;
+ next;
+ mes "[Deu]";
+ mes "Um.";
+ mes "I really don't want to go over there.";
+ cutin "bu_du3.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "...!";
+ mes "That's a first. You earned the nickname Red-haired Boar because you never stop running.";
+ cutin "ep143_tahuk.bmp",2;
+ next;
+ mes "[Deu]";
+ mes "No one calls me that!";
+ cutin "bu_du5.bmp",2;
+ next;
+ mes "[Deu]";
+ mes "I've got cooler nicknames! Call me those!";
+ next;
+ mes "[Alf]";
+ mes "Deu.";
+ mes "Don't insult boars.";
+ mes "All their parts, from head to toe, are useful.";
+ cutin "bu_alp1.bmp",2;
+ next;
+ mes "[Alf]";
+ mes "Delicious, too.";
+ cutin "bu_alp4.bmp",2;
+ next;
+ mes "[Deu]";
+ mes "That's not the point!";
+ cutin "bu_du5.bmp",2;
+ next;
+ mes "[Mark]";
+ mes "Deu's instinct has never betrayed us. We should steer clear of that path.";
+ mes "Right, Boar?";
+ cutin "bu_mark2.bmp",0;
+ next;
+ mes "[Deu]";
+ mes "Grr!";
+ mes "I said";
+ mes "don't call me that!";
+ cutin "bu_du5.bmp",2;
+ next;
+ mes "[Alf]";
+ mes "The path is blocked, and if the Phantasmagorika Excavation Team hasn't cleared it, then there must be a reason. Let's steer clear of it until we find out more about it.";
+ cutin "bu_alp1.bmp",2;
+ next;
+ mes "[Deu]";
+ mes "Don't you make fun of me!";
+ cutin "bu_du5.bmp",2;
+ next;
+ mes "[Mark]";
+ mes "I agree.";
+ mes "Let's check the other places first.";
+ completequest 11375;// Looking for the Traces
+ getexp 1000000,0;
+ cutin "bu_mark2.bmp",0;
+ VER_ELEVATOR = 109;
+ }
+ else {
+ mes "[Alf]";
+ mes "The path is blocked, and if the Phantasmagorika Excavation Team hasn't cleared it, then there must be a reason. Let's steer clear of it until we find out more about it.";
+ cutin "bu_alp1.bmp",2;
+ next;
+ mes "[Mark]";
+ mes "I agree.";
+ mes "Let's check the other places first.";
+ cutin "bu_mark2.bmp",0;
+ }
+ close3;
+}
+
+// Part 3 : Vestige
+verus01,221,65,5 script Due#Verus 4_M_REDMAN,{
+ if (VER_MAIN < 19)
+ end;
+ mes "[Due]";
+ if (VER_ELEVATOR == 109 || VER_ELEVATOR == 1000) {
+ if (VER_ELEVATOR == 109) {
+ mes "Isn't this a complete mess?";
+ mes "Whew, barely got in!";
+ mes "I hate these access protocols.";
+ cutin "bu_du3.bmp",2;
+ next;
+ mes "[Mark]";
+ mes "I think it's an essential protocol needed for safety.";
+ cutin "bu_mark3.bmp",0;
+ next;
+ mes "[Due]";
+ mes "You guys, look at this!";
+ cutin "bu_du2.bmp",2;
+ next;
+ mes "[Due]";
+ mes "Isn't this a complete mess?";
+ next;
+ mes "[Mark]";
+ mes "Hey...";
+ mes "Didn't you just say that?";
+ cutin "bu_mark3.bmp",0;
+ next;
+ mes "[Alp]";
+ mes "Hey.";
+ mes "Forget about that and let's start on the investigation instead.";
+ cutin "bu_alp1.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "By the way I think I know why only this place was sealed off.";
+ cutin "ep143_tasta.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "There are no intact buildings and the cracks on the ground are much more severe compared to other areas...";
+ next;
+ mes "[Tamarin]";
+ mes "Not to mention these monsters...";
+ cutin "ep143_tahuk.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "It seems they are only found here so something is wrong...";
+ next;
+ mes "[Due]";
+ }
+ mes "Right!";
+ mes "Our job is to investigate that!";
+ cutin "bu_du2.bmp",2;
+ next;
+ mes "[Alp]";
+ mes "Come to think of it the people passing by earlier did say there is an incredible device in the center...";
+ cutin "bu_alp3.bmp",2;
+ next;
+ mes "[Mark]";
+ mes "Then let's investigate that part first.";
+ cutin "bu_mark1.bmp",0;
+ if (VER_ELEVATOR == 109) {
+ setquest 11381;// Vestige
+ VER_ELEVATOR = 1000;
+ }
+ close3;
+ }
+ mes "Investigations are supposed to be done calmly...";
+ cutin "bu_du3.bmp",2;
+ close3;
+}
+
+verus01,151,173,3 script Fruit#Verus 4_F_FRUIT,{
+ mes "[Fruit]";
+ if (VER_ELEVATOR < 110) {
+ mes "Coooooooooolll!!!!";
+ mes "See this?";
+ mes "Right here!!!!";
+ cutin "EP15_2_fru_2.bmp",2;
+ next;
+ mes "[Fruit]";
+ mes "Doesn't it look like something will go swirly?!";
+ mes "Haaa!";
+ close3;
+ }
+ if (VER_ELEVATOR == 1000 || VER_ELEVATOR == 1001) {
+ if (VER_ELEVATOR == 1000) {
+ mes "Coooooooooolll!!!!";
+ mes "See this?";
+ mes "Right here!!!!";
+ cutin "EP15_2_fru_2.bmp",2;
+ next;
+ mes "[Fruit]";
+ mes "Doesn't it look like something will go swirly?!";
+ mes "Haaa!";
+ next;
+ mes "[Fruit]";
+ mes "I wish I could take the whole thing to my laboratory!";
+ mes "I can only watch on...";
+ cutin "EP15_2_fru_3.bmp",2;
+ next;
+ mes "[Fruit]";
+ mes "So I was thinking...";
+ mes "I was busy here so I haven't been able to go down to the underground bunker they say is right underneath.";
+ cutin "EP15_2_fru_2.bmp",2;
+ next;
+ mes "[Fruit]";
+ mes "Do you want to go?";
+ next;
+ mes "[Fruit]";
+ mes "It isn't common to have someone tell you all the investigation points, right?";
+ next;
+ mes "[Fruit]";
+ mes "I am not asking you to work for free either!";
+ mes "If you bring back interesting results there will be rewards!";
+ next;
+ mes "[Fruit]";
+ mes "What do you think?";
+ next;
+ if (select( "Quit.", "Do it." ) == 1) {
+ mes "[Fruit]";
+ mes "Eh...";
+ cutin "EP15_2_fru_1.bmp",2;
+ close2;
+ cutin "",255;
+ end;
+ }
+ }
+ mes "Yahoo!!!";
+ mes "If you go in a little ways there will probably be someone to guide you.";
+ next;
+ mes "[Fruit]";
+ mes "I will be expecting you to bring back lots of fun stuff.";
+ if (VER_ELEVATOR == 1000) {
+ erasequest 11381;// Vestige
+ setquest 11382;// Vestige
+ VER_ELEVATOR = 1001;
+ }
+ close3;
+ }
+ if (checkquest(11380,HUNTING) == 2) {
+ mes "[Fruit]";
+ mes "Aarrghhhh!!!";
+ mes "Amazing!!!";
+ cutin "EP15_2_fru_2.bmp",2;
+ next;
+ mes "[Fruit]";
+ mes "So? So? Then what?";
+ mes "Come on! Tell me more!!!";
+ erasequest 11380;// Final Room
+ getitem 6827,1;// Intact Machine Component
+ getitem 6828,1;// Gravity Safety Device
+ close3;
+ }
+ mes "Hm... Is there anything more interesting?";
+ cutin "EP15_2_fru_1.bmp",2;
+ next;
+ if (select( "Trade goods.", "Quit." ) == 1) {
+ mes "[Fruit]";
+ mes "I will give you equipment in return for 17 intact machine components!";
+ next;
+ switch( select( "Runaway Chip", "Broken Chip 1", "Broken Chip 2" ) ) {
+ case 1:
+ mes "[Fruit]";
+ mes "Runaway Chip is HIT + 50, FLEE + 50, MSP - 50%";
+ next;
+ mes "[Fruit]";
+ mes "When equipped together with Broken Chip 1 and Broken Chip 2, you get unlimited movement acceleration.";
+ next;
+ mes "[Fruit]";
+ mes "ATK and MATK + 50. If helmet refinement is at 9, it has an affect of MSP + 50%, MHP + 10%.";
+ .@item_id = 18997;
+ break;
+ case 2:
+ mes "[Fruit]";
+ mes "Broken Chip 1 has STR + 4. If equipped with Broken Chip 2, it has a STR + 8, INT+ 8 affect.";
+ .@item_id = 28326;
+ break;
+ case 3:
+ mes "[Fruit]";
+ mes "Broken Chip 2 has INT + 4. If equipped with Broken Chip 1, it has a STR + 8, INT+ 8 affect.";
+ .@item_id = 28327;
+ break;
+ }
+ next;
+ if (select( "Exchange", "Quit." ) == 1) {
+ if (countitem(6827) < 17) {
+ mes "[Fruit]";
+ mes "Not enough!!!";
+ close3;
+ }
+ delitem 6827,17;// Intact Machine Component
+ getitem .@item_id,1;// Runaway Chip
+ close3;
+ }
+ // continue
+ }
+ mes "[Fruit]";
+ mes "Is this not what you wanted?";
+ close3;
+}
+
+un_bunker,100,96,3 script Mark#Bunker Entrance 4_M_BLUEMAN,{
+ mes "[Mark]";
+ if (VER_ELEVATOR == 1001 || VER_ELEVATOR == 1002) {
+ if (VER_ELEVATOR == 1001) {
+ mes "This part is very pristinely preserved compared to the upper parts.";
+ mes "But this disgusting smell....";
+ cutin "bu_mark4.bmp",0;
+ next;
+ mes "[Mark]";
+ mes "The Undead not seen in other areas can be easily seen in this zone.";
+ next;
+ mes "[Mark]";
+ mes "If you look at the structure of this place...";
+ mes "Or the condition, I think this place was built to be used as a bunker.";
+ next;
+ mes "[Tamarin]";
+ mes "Then that means... The Undead...";
+ cutin "ep143_tahuk.bmp",2;
+ next;
+ mes "[Maggi]";
+ mes "Eeeeeeeeeeek!!!!!";
+ cutin "bu_maggi4.bmp",2;
+ next;
+ mes "[Mark]";
+ }
+ mes "It might be a good idea to calm down first...and look around thoroughly.";
+ cutin "bu_mark1.bmp",0;
+ next;
+ mes "[Due]";
+ mes "O...o...o...okay!";
+ mes "Thi...thi...this stuff..... is...is nothing...";
+ cutin "bu_du5.bmp",2;
+ next;
+ mes "[Alp]";
+ mes "Then let's look around individually and send a signal when something of value is found.";
+ cutin "bu_alp1.bmp",2;
+ next;
+ mes "[Due]";
+ mes "Wa...wait!!";
+ mes "Wouldn't it be better to move together since it's dangerous?";
+ cutin "bu_du5.bmp",2;
+ next;
+ mes "[Due]";
+ mes "Hey!";
+ mes "Look!";
+ mes "Don't leave me!";
+ mes "Hey!!!";
+ next;
+ mes "[Due]";
+ mes "Wait for me!!!!!";
+ if (VER_ELEVATOR == 1001) {
+ changequest 11382,11383;// Vestige
+ VER_ELEVATOR = 1002;
+ }
+ close3;
+ }
+ mes "What is this disgusting smell?";
+ cutin "bu_mark4.bmp",0;
+ close3;
+}
+
+un_bunker,363,171,3 script Alp#Entrance 4_M_BLACKMAN,{
+ mes "[Alp]";
+ if (VER_ELEVATOR < 1002) {
+ mes "There are too many suspicious places...";
+ cutin "bu_alp3.bmp",2;
+ close3;
+ }
+ if (VER_ELEVATOR == 1002) {
+ mes "Um...";
+ mes "You're here...";
+ cutin "bu_alp3.bmp",2;
+ next;
+ mes "[Alp]";
+ mes "I didn't send the signal yet but did you come here because you also got a strange feeling?";
+ cutin "bu_alp1.bmp",2;
+ next;
+ mes "[Alp]";
+ mes "A long time ago...";
+ mes "...";
+ next;
+ mes "[Alp]";
+ mes "No...no.";
+ mes "Let's call the others and start the investigation.";
+ cutin "bu_alp2.bmp",2;
+ next;
+ switch( select( "Quit.", "Investigate." ) ) {
+ case 1:
+ mes "[Alp]";
+ mes "...";
+ mes "Don't forget our goal is to investigate...";
+ cutin "bu_alp1.bmp",2;
+ break;
+ case 2:
+ mes "[Alp]";
+ mes "I just sent out the signal so the others will arrive soon.";
+ cutin "bu_alp1.bmp",2;
+ next;
+ mes "[Due]";
+ mes "Aaarghhhh!!!!";
+ mes "Get away you unctuous bastards!!!!!";
+ cutin "bu_du5.bmp",2;
+ next;
+ mes "[Mark]";
+ mes "Be quiet...";
+ cutin "bu_mark3.bmp",0;
+ next;
+ mes "[Verity]";
+ mes "Is there something special about this room?";
+ cutin "EP15_2_brt_3.bmp",2;
+ next;
+ mes "[Due]";
+ mes "Oh! The woman at the entrance earlier?";
+ mes "Why are you at a dangerous place like this?";
+ cutin "bu_du5.bmp",2;
+ next;
+ mes "[Verity]";
+ mes "Oh?";
+ mes "Did you not hear?";
+ mes "That..";
+ cutin "EP15_2_brt_5.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "Come to think of it that girl did say there would probably be a guide.";
+ cutin "ep143_tasmi.bmp",2;
+ next;
+ mes "[Alp]";
+ mes "....Um...";
+ mes "Was there...";
+ cutin "bu_alp1.bmp",2;
+ next;
+ mes "[Mark]";
+ mes "Anyway it seems everybody is here so let's go in.";
+ cutin "bu_mark1.bmp",0;
+ next;
+ mes "[Alp]";
+ mes "Right...";
+ mes "There's a bad energy so be careful...";
+ cutin "bu_alp1.bmp",2;
+ erasequest 11383;// Vestige
+ setquest 11384;// Vestige
+ VER_ELEVATOR = 1003;
+ close2;
+ warp "un_bunker",385,83;
+ end;
+ }
+ }
+ mes "Is there more left to investigate in this room?";
+ cutin "bu_alp1.bmp",2;
+ next;
+ if (select( "Quit.", "Go in." ) == 1) {
+ mes "[Alp]";
+ mes "...";
+ mes "Don't forget our goal is to investigate...";
+ close3;
+ }
+ mes "[Alp]";
+ mes "Right...";
+ mes "There's a bad energy so be careful...";
+ close2;
+ warp "un_bunker",385,83;
+ end;
+}
+
+un_bunker,388,86,3 script Alp#Entrance2 4_M_BLACKMAN,{
+ if (VER_ELEVATOR < 1003)// inaccurate
+ end;
+ if (VER_ELEVATOR == 1003) {
+ mes "[Alp]";
+ mes "As expected..";
+ mes "Only this room has a different lay out than the rest...";
+ cutin "bu_alp3.bmp",2;
+ next;
+ mes "[Mark]";
+ mes "I see.";
+ mes "There's a door that doesn't seem to belong in a very unnatural location.";
+ cutin "bu_mark1.bmp",0;
+ next;
+ mes "[Tamarin]";
+ mes "...There is no other way but to go in and investigate ourselves?";
+ cutin "ep143_taang.bmp",2;
+ next;
+ mes "[Due]";
+ mes "Charge!!!!!";
+ cutin "bu_du5.bmp",2;
+ erasequest 11384;// Vestige
+ setquest 11385;// Vestige
+ VER_ELEVATOR = 1004;
+ close2;
+ warp "un_myst",11,206;
+ end;
+ }
+ mes "[Alp]";
+ mes "Unnatural room... Unnatural door...";
+ cutin "bu_alp1.bmp",2;
+ next;
+ if (select( "Quit.", "Go in." ) == 1) {
+ mes "[Alp]";
+ mes "...";
+ close3;
+ }
+ mes "[Alp]";
+ mes "Haa...";
+ close2;
+ warp "un_myst",11,206;
+ end;
+}
+
+un_myst,27,208,5 script Verity#Myst 4_F_BERRYTEA,{
+ mes "[Verity]";
+ mes "This space is suffocating.";
+ mes "My head is starting to throb already.";
+ cutin "EP15_2_brt_3.bmp",2;
+ next;
+ if (VER_ELEVATOR == 1004 || VER_ELEVATOR == 1005) {
+ mes "[Tamarin]";
+ mes "What is this space?";
+ mes "It seems to be poorly built for it to be used as a bunker...";
+ cutin "ep143_tasta.bmp",2;
+ next;
+ mes "[Alp]";
+ mes "The disgusting smell has gotten worse...";
+ cutin "bu_alp5.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "There looks to be another door there so let's check it out.";
+ cutin "ep143_tasta.bmp",2;
+ if (VER_ELEVATOR == 1004) {
+ changequest 11385,11386;// Vestige
+ VER_ELEVATOR = 1005;
+ close2;
+ cutin "",255;
+ end;
+ }
+ next;
+ }
+ if (VER_ELEVATOR == 1005)
+ .@string$ = "Move to the door.";
+ else
+ .@string$ = "Quit.";
+ if (select( .@string$, "Leave." ) == 1) {
+ mes "[Verity]";
+ mes "...Should have brought some painkillers for headaches.";
+ cutin "EP15_2_brt_4.bmp",2;
+ close3;
+ }
+ mes "[Verity]";
+ mes "Are you quitting the investigation?";
+ cutin "EP15_2_brt_4.bmp",2;
+ close2;
+ warp "un_bunker",300,166;
+ end;
+}
+
+un_myst,56,206,0 script warp_un_myst WARPNPC,1,1,{
+ end;
+OnTouch:
+ if (VER_ELEVATOR == 1005) {
+ mes "- Does not seem locked but blocked by something.-";
+ next;
+ if (select( "Break it.", "Quit." ) == 2) {
+ mes "[Due]";
+ mes "You want to leave a place like this alone?";
+ cutin "bu_du1.bmp",2;
+ close3;
+ }
+ mes "[Due]";
+ mes "Alright then....";
+ mes "One!";
+ mes "Two!";
+ mes "Three!";
+ cutin "bu_du5.bmp",2;
+ erasequest 11386;// Vestige
+ setquest 11387;// Vestige
+ VER_ELEVATOR = 1006;
+ close2;
+ }
+ warp "un_myst",81,190;
+ end;
+}
+
+un_myst,100,190,3 script Due#Hall 4_M_REDMAN,{
+ if (VER_ELEVATOR == 1006 || VER_ELEVATOR == 1007) {
+ if (VER_ELEVATOR == 1006) {
+ mes "[Due]";
+ mes "Wow...What is this place?";
+ cutin "bu_du1.bmp",2;
+ next;
+ mes "[Mark]";
+ mes "It is a really suspicious place...";
+ mes "I didn't think such a space would exist inside a bunker...";
+ cutin "bu_mark1.bmp",0;
+ next;
+ mes "[Maggi]";
+ mes "Ah...Ah...";
+ cutin "bu_maggi3.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "It seems to be haphazardly made considering its use... Hm...";
+ cutin "ep143_tasta.bmp",2;
+ next;
+ mes "[Maggi]";
+ mes "The...door....";
+ cutin "bu_maggi3.bmp",2;
+ next;
+ mes "[Alp]";
+ mes "There is a kind of subtlety for it be a secret space...";
+ cutin "bu_alp3.bmp",2;
+ next;
+ mes "[Maggi]";
+ mes "Door...door....";
+ cutin "bu_maggi3.bmp",2;
+ next;
+ mes "[Due]";
+ mes "Maggi what are you gaping about?";
+ cutin "bu_du2.bmp",2;
+ next;
+ mes "[Maggi]";
+ mes "The...door is stuck.";
+ cutin "bu_maggi4.bmp",2;
+ next;
+ mes "[Due]";
+ mes "Eh?";
+ cutin "bu_du5.bmp",2;
+ next;
+ mes "[Mark]";
+ mes "What?!?!?";
+ cutin "bu_mark4.bmp",0;
+ next;
+ mes "[Due]";
+ mes "Argh!!!";
+ mes "It's true?!";
+ cutin "bu_du5.bmp",2;
+ next;
+ }
+ mes "[Due]";
+ mes "Are we all trapped here?!";
+ next;
+ mes "[Mark]";
+ mes "Wa..wait let's think about this stoically.";
+ cutin "bu_mark4.bmp",0;
+ next;
+ mes "[Verity]";
+ mes "Oh no what do we do...";
+ cutin "EP15_2_brt_5.bmp",2;
+ next;
+ mes "[Alp]";
+ mes "Ah...";
+ cutin "bu_alp2.bmp",2;
+ next;
+ mes "[Verity]";
+ mes "Since there is no way to get out, should we go further inside?";
+ cutin "EP15_2_brt_4.bmp",2;
+ next;
+ mes "[Due]";
+ mes "Wait... Come to think Verity!";
+ mes "You say you are a guide and you don't know the way out?";
+ cutin "bu_du5.bmp",2;
+ next;
+ mes "[Verity]";
+ mes "This is the first time for me go in this deep...";
+ mes "There is no other way!";
+ cutin "EP15_2_brt_6.bmp",2;
+ if (VER_ELEVATOR == 1006) {
+ erasequest 11387;// Vestige
+ setquest 11388;// Vestige
+ VER_ELEVATOR = 1007;
+ }
+ close3;
+ }
+ mes "[Due]";
+ mes "Wow...What is this place?";
+ cutin "bu_du1.bmp",2;
+ next;
+ mes "[Mark]";
+ mes "It is a really suspicious place...";
+ mes "I didn't think such a space would exist inside a bunker...";
+ cutin "bu_mark1.bmp",0;
+ close3;
+}
+
+un_myst,333,206,3 script Weird piece#01 4_GC109,{
+ if (isbegin_quest(11388) == 0 && isbegin_quest(11389) == 0) {
+ mes "There is a weird piece.";
+ close;
+ }
+ if (@weird_piece == 1) {// A
+ mes "I cannot tell how long it has been since I entered this place.";
+ mes "In this darkness my sense of time grows dull and the people are quickly growing tired.";
+ next;
+ mes "They talk of escaping without knowing the outside situation... Is this the right choice?";
+ next;
+ mes "But we have already lost our way back.";
+ mes "Yes.... This was not an escape.";
+ mes "Merely fleeing to survive...";
+ next;
+ mes "How long can we keep running?";
+ close2;
+ erasequest 11388;// Vestige
+ setquest 11389;// Vestige
+ warp "un_myst",260,204;
+ @weird_piece = 2;
+ end;
+ }
+ if (@weird_piece == 2) {
+ mes "Even though I was ready for this, the situation is deteriorating.";
+ mes "I can only say I would not have survived if I stayed at that place.";
+ next;
+ mes "Hope...";
+ next;
+ mes "Many have already become incapable of hope...";
+ close2;
+ warp "un_myst",260,204;
+ @weird_piece = 3;
+ end;
+ }
+ if (@weird_piece == 3) {
+ mes "We should have been out by now according to the calculations but there is only dirt still.";
+ next;
+ mes "The calculations could be wrong and we may be going in circles.";
+ mes "It doesn't feel right.";
+ next;
+ mes "No..";
+ mes "I haven't felt at ease since that day.";
+ close2;
+ warp "un_myst",347,138;
+ @weird_piece = 4;
+ end;
+ }
+}
+
+un_myst,182,137,3 script Weird piece#02 4_GC109,{
+ if (@weird_piece == 4) {// B
+ mes "I may have reached my limits.";
+ mes "I must blame my overtaxed body for not listening to me now.";
+ next;
+ mes "The numbers of survivors are dwindling.";
+ next;
+ mes "Like this...";
+ mes "I thought it was karma that I am witnessing the end...";
+ mes "Perhaps it is my selfishness.";
+ mes "I don't think there is no such time left for me..";
+ close2;
+ warp "un_myst",86,136;
+ @weird_piece = 5;
+ end;
+ }
+ if (@weird_piece == 5) {
+ mes "Even walking is difficult now.";
+ next;
+ mes "Once I confidently claimed I will lead all of us...";
+ mes "I find myself pathetic for becoming a burden much less of help.";
+ next;
+ mes "Everything is regretful.";
+ mes "Everything I started...";
+ mes "Everything of mine...";
+ close2;
+ warp "un_myst",86,136;
+ @weird_piece = 6;
+ end;
+ }
+ if (@weird_piece == 6) {
+ mes "It would be better to abandon me...";
+ close2;
+ warp "un_myst",86,136;
+ @weird_piece = 7;
+ end;
+ }
+ if (@weird_piece == 7) {
+ mes "The days I am asleep are outnumbering the days I am awake now.";
+ next;
+ mes "I suddenly picture his face in my increasingly hazy consciousness.";
+ next;
+ mes "Tatio...";
+ next;
+ mes "A person sweet to me even though all I only cared about was my work.";
+ next;
+ mes "Ha... person...";
+ mes "I cannot endure the shame of my past for considering him a mere successful project.'";
+ next;
+ mes "Though I cannot help that I may die here...";
+ mes "If only to apologize to him...";
+ mes "If only to muster one sweet word, I have thoughts of survival.";
+ next;
+ mes "..Is it possible?";
+ close2;
+ warp "un_myst",14,92;
+ @weird_piece = 8;
+ end;
+ }
+}
+
+un_myst,214,86,3 script Weird piece#03 4_GC109,{
+ if (@weird_piece > 7 && @weird_piece < 17) {
+ if (@weird_piece == 8)// C
+ mes "01001000010001010100110001001100010011110101011101001111010100100100110001000100";
+ else if (@weird_piece == 9)
+ mes "s o g g g o h o h h h h h h h h h h h h";
+ else if (@weird_piece == 10)
+ mes "debugging";
+ else if (@weird_piece == 11) {
+ mes "File...error...restore...";
+ mes "Operation...range...25%...30%...35%.......";
+ }
+ else if (@weird_piece == 12)
+ mes "45%...50%... Minimal normal operations possible start safety mode operations";
+ else if (@weird_piece == 13)
+ mes "60% movement speed normal. Bodily functions normal.";
+ else if (@weird_piece == 14)
+ mes "70% Most language function restored. Slight symptoms of septic anemia but it seems it will be fixed soon.";
+ else if (@weird_piece == 15) {
+ mes "80% Surgery was fairly successful despite having had no proper preparations.";
+ mes "Planning to apply treatment to the rest of the survivors based on this success.";
+ }
+ else if (@weird_piece == 16) {
+ mes "98% Corrupt sector detected.";
+ mes "For more effective operations I have copied the memory chip and constructed 'T_W_O_002b.'";
+ mes "There seems to have been some loss of data during the copying process...";
+ close2;
+ warp "un_myst",209,33;
+ @weird_piece = 17;
+ end;
+ }
+ close2;
+ warp "un_myst",160,89;
+ @weird_piece++;
+ end;
+ }
+}
+
+un_myst,209,42,3 script Tamarin#Lastroom Entrance 4_M_TAMARIN,{
+ if (VER_ELEVATOR < 1007)
+ end;
+ mes "[Tamarin]";
+ mes "... It seems the last survivors have lingered here...";
+ cutin "ep143_taang.bmp",2;
+ next;
+ mes "[Tamarin]";
+ mes "I feel scared to open the next door for some reason.";
+ next;
+ if (VER_ELEVATOR == 1007 && @weird_piece == 17) {
+ select("Open door.");
+ completequest 11389;// Vestige
+ VER_ELEVATOR = 1008;
+ getexp 0,1000000;
+ @weird_piece = 0;
+ getitem 6827,1;// Complete_Machine_Parts
+ getitem 6828,1;// Gravity_Safety_Device
+ }
+ else {
+ if (@weird_piece == 0) // can't go outside following path weird piece
+ .@string$ = "Go outside.";
+ .@s = select( "Open door.", .@string$ ) - 1;
+ }
+ mes "[Tamarin]";
+ mes "There is a bitter feeling of sorts...";
+ close2;
+ if (.@s == 0)
+ warp "un_myst",142,38;
+ else {
+ warp "un_bunker",98,91;
+ @weird_piece = 0;
+ }
+ end;
+}
+
+verus04,144,239,3 shop Tool Merchant#verus 4_M_DEWMAN,611:-1,504:-1,656:-1,601:-1,602:-1,610:-1
diff --git a/npc/re/quests/quests_15_2.txt b/npc/re/quests/quests_15_2.txt
new file mode 100644
index 00000000000..7d7ec96f479
--- /dev/null
+++ b/npc/re/quests/quests_15_2.txt
@@ -0,0 +1,2579 @@
+//===== rAthena Script =======================================
+//= Phantasmagorika Quests.
+//===== Description: =========================================
+//--- Memory Record Daily Quests:
+//- Help Her
+//- Air Purifier
+//- Grape Harvest
+//- Subdue Hysterical Patients
+//- Daily Necessities Transport
+//===== Changelogs: ==========================================
+//= 1.0 First version. [Capuche]
+//============================================================
+
+// Return 0 if a time limit of "Restriction on the Journey" quests has been reached.
+function script F_time_limit_recorder {
+ return (checkquest(5341,PLAYTIME) != 2 && checkquest(5351,PLAYTIME) != 2 && checkquest(5358,PLAYTIME) != 2 && checkquest(5363,PLAYTIME) != 2 && checkquest(5366,PLAYTIME) != 2);
+}
+
+// Erase datas if a time limit of "Restriction on the Journey" quests has been reached.
+function script F_erase_datas_recorder {
+ if (callfunc("F_time_limit_recorder") == 1)
+ return;
+ mes "";
+ mes "Your whole body suddenly becomes heavy and time seems to be passing faster around you.";
+ mes "";
+ for ( .@quest_id = 5341; .@quest_id < 5371; .@quest_id++ ) {
+ if (isbegin_quest(.@quest_id) > 0)
+ erasequest .@quest_id;
+ }
+ delitem 6825, countitem(6825);// Air Purifier Box
+ delitem 6826, countitem(6826);// Fresh Grape
+ recorder_quest_type = 0;
+ recorder_quest_status = 0;
+ mes "Ah- This cozy and snug fe...el.....ling";
+ warp "un_bunker",98,91;
+ close;
+}
+
+// Monitoring room
+un_bk_q,97,141,0 script Monitoring room#A-0 WARPNPC,1,1,{
+ end;
+OnTouch:
+ callfunc("F_time_limit_recorder");
+ if (recorder_quest_type == 1 && recorder_quest_status == 0) {
+ mes "[Bunker Sayhu]";
+ mes "Hey!! Where do you think you're going when we're trying to get a headcount? Get over here.";
+ close;
+ }
+ warp "un_bk_q",98,121;
+ end;
+}
+
+un_bk_q,69,167,0 script Monitoring room#L-1 WARPNPC,1,1,{
+ end;
+OnTouch:
+ if (recorder_quest_type == 1 && recorder_quest_status == 0) {
+ mes "[Bunker Sayhu]";
+ mes "Hey!! Where do you think you're going when we're trying to get a headcount? Get over here.";
+ close;
+ }
+ warp "un_bk_q",57,168;
+ end;
+}
+
+un_bk_q,126,168,0 script Monitoring room#L-2 WARPNPC,1,1,{
+ end;
+OnTouch:
+ callfunc("F_time_limit_recorder");
+ if (recorder_quest_type == 1 && recorder_quest_status == 0) {
+ mes "[Bunker Sayhu]";
+ mes "Hey!! Where do you think you're going when we're trying to get a headcount? Get over here.";
+ close;
+ }
+ warp "un_bk_q",140,167;
+ end;
+}
+
+un_bk_q,103,147,4 script Bunker Sayhu#EP15.2MR 4_M_ALCHE_C,{
+ callfunc("F_time_limit_recorder");
+ switch( recorder_quest_type ) {
+ case 1:
+ switch( recorder_quest_status ) {
+ case 0:
+ emotion ET_CONGRATULATION;
+ mes "[Bunker Sayhu]";
+ mes "First congratulations on surviving. I'm glad you got into the air-raid shelter. If you were outside..";
+ next;
+ mes "[Bunker Sayhu]";
+ mes "...";
+ next;
+ mes "[Bunker Sayhu]";
+ mes "Whew.. even thinking about it makes me dizzy. Both of us were lucky. Don't you think so?";
+ next;
+ select("I think so too.");
+ emotion ET_CRY;
+ mes "[Bunker Sayhu]";
+ mes "I feel a lot of sympathy though. It looks like a lot of people are blaming this explosion on Fresa.";
+ next;
+ mes "[Bunker Sayhu]";
+ mes "The explosion can't be only Lona's responsibility.";
+ next;
+ select("Lona?");
+ emotion ET_QUESTION, playerattached();
+ mes "[Bunker Sayhu]";
+ mes "A great person for sure despite failing the experiment.";
+ next;
+ mes "[Bunker Sayhu]";
+ mes "She took charge of figuring out the number of survivors in that confusing mess of a situation.";
+ next;
+ mes "[Bunker Sayhu]";
+ mes "If it was me...";
+ next;
+ mes "[Bunker Sayhu]";
+ mes "I would probably be wandering around without knowing what do to right about now..";
+ next;
+ mes "[Bunker Sayhu]";
+ mes "Ugh- I guess even I should go and help. Want to help?";
+ next;
+ select("Agree to help.");
+ emotion ET_THANKS;
+ mes "[Bunker Sayhu]";
+ mes "Really? You will help? What a relief because I wasn't confident about going by myself.";
+ next;
+ mes "[Bunker Sayhu]";
+ mes "There is a researcher with a cold demeanor in the center of this room, right?";
+ next;
+ mes "[Bunker Sayhu]";
+ mes "She is the head of the experiment, Lona Fresa. People usually call her Dr. Fresa.";
+ next;
+ setquest 5341;// Limits of Journeys
+ setquest 5342;// Help Her
+ recorder_quest_status = 1;
+ mes "[Bunker Sayhu]";
+ mes "Do you want to go and ask her if she needs any help?";
+ close;
+ case 1:
+ mes "[Bunker Sayhu]";
+ mes "There is a researcher with a cold demeanor in the center of this room, right?";
+ next;
+ mes "[Bunker Sayhu]";
+ mes "Do you want to go and ask her if she needs any help?";
+ close;
+ case 3:
+ case 5:
+ case 9:
+ case 17:
+ mes "[Bunker Sayhu]";
+ mes "I was asked to find out how many are capable of cooking.";
+ next;
+ mes "[Bunker Sayhu]";
+ mes "We have to try hard even though the air-raid shelter is complex and wide.";
+ close;
+ case 100:
+ mes "[Bunker Sayhu]";
+ mes "Thanks for helping her.";
+ next;
+ mes "[Bunker Sayhu]";
+ mes "Is it because we helped? I thought I saw a faint smile on her face.";
+ close;
+ }
+ end;
+ case 2:
+ emotion ET_QUESTION;
+ mes "[Bunker Sayhu]";
+ mes "Uh?! I don't think I've seen you before in the air-raid shelter?";
+ next;
+ mes "[Bunker Sayhu]";
+ mes "Ah! Are you the Adventurer who's helping with moving the newly made air cleaning unit?";
+ next;
+ mes "[Bunker Sayhu]";
+ mes "You are working a lot because of those thoughtless Mechanicians.";
+ close;
+ case 3:
+ mes "[Bunker Sayhu]";
+ mes "The Bioengineers succeeded in cultivating grapes right?";
+ next;
+ mes "[Bunker Sayhu]";
+ mes "They say at least one grape harvest every 2 weeks is possible? The harvest day is probably either today or tomorrow.";
+ next;
+ mes "[Bunker Sayhu]";
+ mes "I want to taste fresh grapes soon. I've been eating only dry food for the past few days.";
+ close;
+ case 4:
+ mes "[Bunker Sayhu]";
+ mes "There's a rumor going around in the air-raid shelter.";
+ next;
+ mes "[Bunker Sayhu]";
+ mes "A while ago the Chemical Substance Specialist and a few others went outside the air-raid shelter.";
+ next;
+ mes "[Bunker Sayhu]";
+ mes "Apparently some contaminated substance got inside the air-raid shelter.";
+ next;
+ mes "[Bunker Sayhu]";
+ mes "I heard the number of convulsing patients are rapidly increasing because of the contaminant.";
+ next;
+ mes "[Bunker Sayhu]";
+ mes "Ah! It's just a rumor! A Rumor!!";
+ close;
+ case 5:
+ mes "[Bunker Sayhu]";
+ mes "It seems the rumor going around was true.";
+ next;
+ mes "[Bunker Sayhu]";
+ mes "I hear they are moving supplies to the clean Zone Z-2 even though it's newly opened because of the contaminant.";
+ next;
+ mes "[Bunker Sayhu]";
+ mes "I think I will lend a hand even just a little.";
+ close;
+ }
+}
+
+un_bk_q,93,168,4 script Dr.Fresa#EP15.2MR 4_F_BERRYTEA,{
+ callfunc("F_time_limit_recorder");
+ switch( recorder_quest_type ) {
+ case 1:
+ switch( recorder_quest_status ) {
+ case 0:
+ mes "[Lona Fresa]";
+ emotion ET_SORRY;
+ mes "I am sorry. Right now I am a little busy with several problems. Can we speak later?";
+ close;
+ case 1:
+ mes "[Lona Fresa]";
+ emotion ET_SORRY;
+ mes "I am sorry. Right now I am a little busy with several problems. Can we speak later?";
+ next;
+ select("No! What I mean..");
+ emotion ET_SURPRISE;
+ emotion ET_QUESTION;
+ mes "[Lona Fresa]";
+ mes "What?! The Adventurer wants to help me?";
+ next;
+ mes "[Lona Fresa]";
+ mes "Good. The people are uncontrollable because they are shocked and confused.";
+ next;
+ mes "[Lona Fresa]";
+ mes "If the intimidating Adventurer helps out it will be easier to control the confused masses.";
+ next;
+ mes "[Lona Fresa]";
+ mes "Good!! I approve. Just in time for a troublesome problem as well.";
+ next;
+ select("Troublesome problem?");
+ emotion ET_QUESTION, playerattached();
+ mes "[Lona Fresa]";
+ mes "The personnel with various specialties such as yourself have not changed their positions and are easy to grasp, but the other employees are the problem.";
+ next;
+ mes "[Lona Fresa]";
+ mes "Surely they are moving according to the Emergency Situation Guidelines of their respective teams.";
+ next;
+ emotion ET_SCRATCH;
+ mes "[Lona Fresa]";
+ mes "I cannot figure out from here where they are and what they are doing.";
+ next;
+ mes "[Lona Fresa]";
+ mes "So I was thinking if you";
+ next;
+ mes "[Lona Fresa]";
+ .@r = rand(1,4);
+ switch(.@r) {
+ case 1:
+ setquest 5343;// Headcount
+ mes "Can you figure out the number of ^0000FFBioengineers ^000000?";
+ break;
+ case 2:
+ setquest 5344;// Headcount
+ mes "Can you figure out the number of ^0000FFMechanicians^000000?";
+ break;
+ case 3:
+ setquest 5345;// Headcount
+ mes "Can you figure out the number of ^0000FFFacilities managers^000000?";
+ break;
+ case 4:
+ setquest 5346;// Headcount
+ mes "Can you figure out the number of ^0000FFChemical Substance Specialists^000000?";
+ break;
+ }
+ recorder_quest_status = recorder_quest_status | pow(2,.@r);
+ next;
+ mes "[Lona Fresa]";
+ mes "I ask you for this favor even though it won't be easy in this large and complex shelter.";
+ close;
+ case 3:
+ callsub( S_Num, 22, 5343, "Bioengineers" );
+ case 5:
+ callsub( S_Num, 18, 5344, "Mechanicians" );
+ case 9:
+ callsub( S_Num, 28, 5345, "Facilities managers" );
+ case 17:
+ callsub( S_Num, 11, 5346, "Chemical Substance Specialists" );
+ case 100:
+ mes "[Lona Fresa]";
+ mes "I know it is frustrating but I hope you will adjust to life inside the air-raid shelter until the outside situation becomes safer.";
+ close;
+ }
+ end;
+ case 2:
+ emotion ET_SORRY;
+ mes "[Lona Fresa]";
+ mes "I am sorry. Right now I am a little busy with several problems. It would be better if we speak later.";
+ close;
+ case 4:
+ if (recorder_quest_status == 2) {
+ emotion ET_SORRY;
+ mes "[Lona Fresa]";
+ mes "I am sorry. Right now I am a little busy with several problems. It would be better if we speak later.";
+ next;
+ select("I have something urgent to tell you.");
+ mes "[Lona Fresa]";
+ mes "What?! What is going on?";
+ next;
+ mes "Explain current situation at the temporary clinic.";
+ next;
+ emotion ET_HUK;
+ mes "[Lona Fresa]";
+ mes "Patients are convulsing simultaneously.. this is not good.";
+ next;
+ mes "[Lona Fresa]";
+ mes "I got it. We need to take measures.";
+ next;
+ erasequest 5364;// Convulsing Patient Suppression
+ erasequest 5365;// Urgent News
+ setquest 5370;// Memory Record
+ getexp 750000,750000;
+ recorder_quest_status = 3;
+ mes "The small round capsule has percolated through the skin. It feels like experience has accumulated.";
+ next;
+ mes "[Lona Fresa]";
+ mes "Thank you for informing me.";
+ close;
+ }
+ emotion ET_PROFUSELY_SWEAT;
+ mes "[Lona Fresa]";
+ mes "This situation is grave so we need to quickly take measures.";
+ close;
+ case 5:
+ emotion ET_SORRY;
+ mes "[Lona Fresa]";
+ mes "I am sorry. Right now I am a little busy with several problems. It would be better if we speak later.";
+ close;
+ }
+ end;
+
+S_Num:
+ .@bon_nombre = getarg(0);
+ .@quest_id = getarg(1);
+ .@headcount_complete = isbegin_quest(getarg(1)+4);
+
+ mes "[Lona Fresa]";
+ if (.@headcount_complete > 0)
+ mes "Ah! You are here. Isn't the interior of the shelter a bit complicated? The favor I asked of you..";
+ else {
+ emotion ET_QUESTION;
+ mes "Huh?! You're already back? You came back earlier than I thought.";
+ next;
+ mes "[Lona Fresa]";
+ mes "The favor that I asked.. ah?! Ah!!";
+ }
+ next;
+ mes "[Lona Fresa]";
+ mes "The number of ^0000FF" + getarg(2) + "^000000? How many do they say have survived?";
+ next;
+ input .@num;
+ mes "[Lona Fresa]";
+ if (.@num != .@bon_nombre || .@headcount_complete == 0) {
+ mes "" + .@num + " people you say?";
+ next;
+ emotion ET_SCRATCH;
+ mes "[Lona Fresa]";
+ mes "That's strange? According to the list they have never been that number.";
+ next;
+ mes "[Lona Fresa]";
+ mes "Can you check again?";
+ close;
+ }
+ mes "Really? It is roughly the same as the number on the list. Good work.";
+ next;
+ mes "[Lona Fresa]";
+ mes "Sayhu says Adventurers like this kind of stuff. This is compensation for your help.";
+ next;
+ mes "The small round capsule has percolated through the skin. It feels like experience has accumulated.";
+ next;
+ erasequest 5342;// Help Her
+ erasequest .@quest_id;// Headcount
+ erasequest (.@quest_id + 4);// Headcount Complete
+ setquest 5370;// Memory Record
+ getexp 750000,750000;
+ recorder_quest_status = 100;
+ mes "[Lona Fresa]";
+ mes "Good work. I know it is frustrating but I hope you will adjust to the life inside the air-raid shelter until the outside situation becomes safer.";
+ close;
+}
+
+un_bk_q,76,175,4 script Researcher Grum#EP15.2M 4_F_SCIENCE,{
+ callfunc("F_time_limit_recorder");
+ switch( recorder_quest_type ) {
+ case 1:
+ if (recorder_quest_status == 0) {
+ mes "[Researcher Grum]";
+ mes "I really don't like self-righteous and hypocritical Fresa.";
+ close;
+ }
+ mes "[Researcher Grum]";
+ mes "Who is that woman to conduct a headcount as if she's the leader?";
+ next;
+ mes "[Researcher Grum]";
+ mes "There wouldn't have been an explosion if there was no experiment the first place? Right?";
+ close;
+ case 2:
+ mes "[Researcher Grum]";
+ mes "I think the self-righteous and haggardly Fresa has changed.";
+ next;
+ mes "[Researcher Grum]";
+ mes "She's become more warm compared to the past, right?";
+ close;
+ case 3:
+ mes "[Researcher Grum]";
+ mes "Fresa has definitely changed a lot.";
+ next;
+ mes "[Researcher Grum]";
+ mes "Today she is handing out grapes to people. In the past that would have been unimaginable.";
+ close;
+ case 4:
+ mes "[Researcher Grum]";
+ mes "Why is that Fresa acting like the leader alone but still hasn't taken measures?";
+ next;
+ mes "[Researcher Grum]";
+ mes "Measures need to taken about the convulsing patients. Are you going to cover this up like in the past?";
+ close;
+ case 5:
+ mes "[Researcher Grum]";
+ mes "So this is what's happening?";
+ next;
+ mes "[Researcher Grum]";
+ mes "I should have known when she tried to half-ass things.";
+ close;
+ }
+}
+
+// Corridor Monitoring room
+un_bk_q,86,121,4 script Chemical Substance Specialist Karsten 4_M_ALCHE_B,{
+ callfunc("F_time_limit_recorder");
+ switch( recorder_quest_type ) {
+ case 1:
+ if (recorder_quest_status == 17) {
+ if (isbegin_quest(5350) == 0) {
+ mes "[Chemical Substance Specialist Karsten]";
+ emotion ET_QUESTION;
+ mes "Who are you?";
+ next;
+ select("I am...");
+ emotion ET_SURPRISE;
+ mes "[Chemical Substance Specialist Karsten]";
+ mes "Ah! Ah! Fresa? I have met her a few times at plenary sessions.";
+ next;
+ mes "[Chemical Substance Specialist Karsten]";
+ mes "If I recall she is the one in charge of this failed project?";
+ next;
+ mes "[Chemical Substance Specialist Karsten]";
+ mes "Anyway!!";
+ next;
+ mes "[Chemical Substance Specialist Karsten]";
+ mes "Not everybody is fit to be director. A headcount in this hectic situation.";
+ next;
+ emotion ET_PROFUSELY_SWEAT;
+ mes "[Chemical Substance Specialist Karsten]";
+ mes "Wait a minute. I did a headcount and wrote it down somewhere..";
+ next;
+ mes "[Chemical Substance Specialist Karsten]";
+ mes "Was it this number? That number? Ah?! This number.";
+ next;
+ setquest 5350;// Headcount Complete
+ mes "[Chemical Substance Specialist Karsten]";
+ mes "Total number of Chemical Substance Specialists is ^FF000011^000000. Damn a lot less.";
+ next;
+ mes "[Chemical Substance Specialist Karsten]";
+ mes "Ah! Tell Fresa on your way that we are checking for hazardous substances within the air-raid shelter according to emergency protocol.";
+ next;
+ mes "[Chemical Substance Specialist Karsten]";
+ mes "We have to do our job even if there aren't many of us left.";
+ close;
+ }
+ mes "[Chemical Substance Specialist Karsten]";
+ mes "Total number of Chemical Substance Specialists is ^FF000011^000000.";
+ next;
+ mes "[Chemical Substance Specialist Karsten]";
+ mes "Tell Fresa that although there are only a few left but, we are checking for hazardous substances within the air-raid shelter.";
+ close;
+ }
+ mes "[Chemical Substance Specialist Karsten]";
+ mes "We are checking for hazardous substances within the air-raid shelter according to emergency protocol.";
+ close;
+ case 3:
+ if (recorder_quest_status == 2) {
+ mes "[Chemical Substance Specialist Karsten]";
+ mes "Is that the first grape harvested by the Bioengineers?";
+ next;
+ emotion ET_QUESTION;
+ mes "[Chemical Substance Specialist Karsten]";
+ mes "The rumors say a grape tree got smashed because of the Mechanicians but it seems it hasn't affected the harvest.";
+ next;
+ mes "[Chemical Substance Specialist Karsten]";
+ mes "Anyway thanks. I prepared this for compensation.";
+ next;
+ erasequest 5359;// Grape Harvest
+ erasequest 5362;// Grape Delivery
+ setquest 5370;// Memory Record
+ getexp 1000000,1000000;
+ recorder_quest_status = 3;
+ mes "- The small round capsule has percolated through skin. It feels like experience has accumulated.";
+ next;
+ emotion ET_CRY;
+ mes "[Chemical Substance Specialist Karsten]";
+ mes "I've been eating nothing but dried food for the past few days so it moves me to eat fresh grape.";
+ close;
+ }
+ mes "[Chemical Substance Specialist Karsten]";
+ mes "I've been eating nothing but dried food so eating fresh grape makes me feel fresh.";
+ close;
+ case 2:
+ case 4:
+ case 5:
+ emotion ET_SMILE;
+ mes "[Chemical Substance Specialist Karsten]";
+ mes "Us Chemical Substance Specialists are living like we always do. It's not like we can do chemical experiments in a place like this.";
+ close;
+ }
+}
+
+// Control Room
+un_bk_q,98,246,8 script Facilities manager Jiko 4_M_EINMAN2,{
+ callfunc("F_time_limit_recorder");
+ switch( recorder_quest_type ) {
+ case 1:
+ mes "[Facilities manager Jiko]";
+ mes "Aah- I don't know the reason but the control room is";
+ next;
+ mes "[Facilities manager Jiko]";
+ mes "is damaged a lot. At this point it isn't a control room but a warehouse.";
+ close;
+ case 2:
+ mes "[Facilities manager Jiko]";
+ mes "Ah the air cleaning unit doesn't belong here.";
+ next;
+ mes "[Facilities manager Jiko]";
+ mes "If my memory is correct, you have to deliver them to Zones C-0, F-1, F-2, I-0, Z-0.";
+ close;
+ case 3:
+ mes "[Facilities manager Jiko]";
+ mes "Haa- I have been cleaning the Control room for several days now";
+ next;
+ mes "[Facilities manager Jiko]";
+ mes "This place cannot be organized no matter how I much organize it. I guess we should just use it for storage.";
+ close;
+ case 4:
+ mes "[Facilities manager Jiko]";
+ mes "Come on in. Welcome to the Warehouse.";
+ next;
+ mes "[Facilities manager Jiko]";
+ mes "Urrghh";
+ close;
+ case 5:
+ mes "[Facilities manager Jiko]";
+ mes "This is not the control room.";
+ next;
+ mes "[Facilities manager Jiko]";
+ mes "It's the warehouse!!";
+ close;
+ }
+}
+
+un_bk_q,108,243,4 script Discarded Mechanical Device 4_ENERGY_BLUE,{
+ callfunc("F_time_limit_recorder");
+ if (recorder_quest_type == 1) {
+ mes "The mechanical device thrown on the floor cannot be determined if it is still operable.";
+ close;
+ }
+ for ( .@i = 0; .@i < (recorder_quest_type - 1); .@i++ )
+ .@listen_continue$[.@i] = "Continue listening.";
+ .@listen_again$[.@i] = "Listen again.";
+
+ mes "There is a Memory Record somebody is recording.";
+ next;
+ if (select( "Listen.", "Quit." ) == 2)
+ close;
+ while(true) {
+ mes "Oh- Is this a memory record? Does it work? Oh it works. Works! Should I try it since I'm bored?";
+ next;
+ mes "My name is Maso an Adventurer traveling the world. Today is 4th day of entering the air-raid shelter? 3rd day? The vibe here is weird and hard to adjust to.";
+ next;
+ mes "Verus city has Adventurers amongst its original population but the treatment towards Adventurers is strangely good.";
+ next;
+ mes "The mood is that Adventurers are people caught up in an uncontrollable accident and need to be treated well.";
+ next;
+ mes "As an Adventurer who eats and plays as much as he works, I cannot stand the itching for action. Urgh";
+ next;
+ if (select( "Continue listening.", "Stop listening." ) == 2)
+ close;
+ mes "Is today day 6? Details aren't told to Adventurers so I am not sure but the people of Verus city seem very gloomy.";
+ next;
+ mes "The Adventurer's blood is boiling and wanting to explore places but there isn't much to do.";
+ next;
+ mes "I looked around the air-raid shelter but whoever designed it has not one artistic hair on him.";
+ next;
+ mes "It is no fun to keep looking at the same hallways and same room lay outs.";
+ next;
+ if (select( "Continue listening.", "Stop listening." ) == 2)
+ close;
+ mes "Is today day 21? The Verus City people look happy to have solved the food problem.";
+ next;
+ mes "It is cute to see the mild looking researchers going around cheering and screaming.";
+ next;
+ if (select( "Continue listening.", "Stop listening." ) == 2)
+ close;
+ mes "The 30th night but because it's always dark I don't really know if it's night or day. I just ate supper so it must be night.";
+ next;
+ mes "Today I moved the really heavy air cleaning units made by the Mechanicians with the other Adventurers.";
+ next;
+ mes "The air-raid shelter is so large that I had no idea where they were but thanks to that I became friends with some of the Adventurers, especially Castle and Blat.";
+ next;
+ mes "By the way the Mechanicians seem to have mental problems. They make a ruckus for not being able to make machines and got dragged out by the guards.";
+ next;
+ mes "The Mechanicians are definitely going to cause trouble someday.";
+ next;
+ switch( select( .@listen_again$[1], .@listen_continue$[1], "Stop listening." ) ) {
+ case 1:
+ continue;
+ case 2:
+ break;
+ case 3:
+ close;
+ }
+ mes "Today is day 32 and I worked on the grape harvest.";
+ next;
+ mes "I ate fresh grapes and since I don't have anything to do anything to do, I'm going to sleep early.";
+ next;
+ mes "Ah.. the grape was good, I want it again. Did they say harvest was possible once every 2 weeks?";
+ next;
+ switch( select( .@listen_again$[2], .@listen_continue$[2], "Stop listening." ) ) {
+ case 1:
+ continue;
+ case 2:
+ break;
+ case 3:
+ close;
+ }
+ mes "Today is the 38th day of being in the shelter and there is a fuss since the morning.";
+ next;
+ mes "This morning the recruited Adventurers to join the Chemical Substance Specialists for an investigation outside the air-raid shelter, many volunteered despite the dangers.";
+ next;
+ mes "I am of the belief danger should be avoided but my friends Castle and Blat volunteered.";
+ next;
+ mes "Well I understand that they were sick of living in the shelter for a while.";
+ next;
+ mes "They have not returned past the afternoon. Verus City leader Fresa has concluded that the people who left are dead.";
+ next;
+ mes "Everybody had a moment of silence at dawn. They were good people so it is sad to part like this.";
+ next;
+ if (select( "Continue listening.", "Stop listening." ) == 2)
+ close;
+ mes "Is it since the morning of the 40th day? There is a mysterious infectious disease going around the shelter.";
+ next;
+ mes "A few people have suddenly attacked those near them and convulsed";
+ next;
+ mes "And Adventurers have been deployed to suppress the convulsing people because a lot of the weak researchers are wounded.";
+ next;
+ mes "There is a rumor saying a contaminant came in because of the people who went outside the shelter a while go.";
+ next;
+ switch( select( .@listen_again$[3], .@listen_continue$[3], "Stop listening." ) ) {
+ case 1:
+ continue;
+ case 2:
+ break;
+ case 3:
+ close;
+ }
+ mes "Lunch during day 44 the air-raid shelter leader Fresa gathered the Adventurers and had a presentation.";
+ next;
+ mes "The rumor has been confirmed true and a safety partition will be built in Zone Z-0";
+ next;
+ mes "A decision has been made to move necessities to Zone Z-2 tomorrow and I heard they need the help of Adventurers.";
+ next;
+ mes "I have to work tomorrow so I am doing to sleep early.";
+ next;
+ mes "There is no more recorded content.";
+ next;
+ switch( select( .@listen_again$[4], .@listen_continue$[4], "Stop listening." ) ) {
+ case 1:
+ continue;
+ case 2:
+ break;
+ case 3:
+ close;
+ }
+ }
+}
+
+// Corridor Control Room
+un_bk_q,56,192,4 script Chemical Substance Specialist Kori 4_M_ALCHE_B,{
+ callfunc("F_time_limit_recorder");
+ switch( recorder_quest_type ) {
+ case 1:
+ mes "[Chemical Substance Specialist Kori]";
+ mes "We are seeing if there are hazardous substances within the air-raid shelter according to emergency protocol.";
+ next;
+ mes "[Chemical Substance Specialist Kori]";
+ mes "You want to know how many Chemical Substance Specialists there are? Go to Karsten then. Should be here somewhere.";
+ close;
+ case 2:
+ mes "[Chemical Substance Specialist Kori]";
+ mes "This next room is temporarily being used by the Chemical Substance Specialist.";
+ next;
+ mes "[Chemical Substance Specialist Kori]";
+ mes "We tightly hid away dangerous things but don't touch anything just in case.";
+ close;
+ case 3:
+ mes "[Chemical Substance Specialist Kori]";
+ mes "Karsten gave me grapes.";
+ next;
+ mes "[Chemical Substance Specialist Kori]";
+ mes "How fresh and tasty it was.";
+ close;
+ case 4:
+ mes "[Chemical Substance Specialist Kori]";
+ mes "My colleagues left the air-raid shelter to investigate and haven't come back.";
+ next;
+ mes "[Chemical Substance Specialist Kori]";
+ mes "It was concluded they are dead but are they really all dead? I want to see my colleagues.";
+ close;
+ case 5:
+ mes "[Chemical Substance Specialist Kori]";
+ mes "Good work.";
+ next;
+ mes "[Chemical Substance Specialist Kori]";
+ mes "We are working to find a solution for the contaminant.";
+ close;
+ }
+}
+
+// Corridor K-0
+un_bk_q,161,193,6 script Adventurer Bamdaku#EP15.2MR 4_M_ALCHE_C,{
+ callfunc("F_time_limit_recorder");
+ switch( recorder_quest_type ) {
+ case 1:
+ mes "[Adventurer Bamdaku]";
+ mes "I found this while looking around the air-raid shelter";
+ next;
+ mes "[Adventurer Bamdaku]";
+ mes "but there is a lot of this on the wall. What can it be?";
+ close;
+ case 2:
+ mes "[Adventurer Bamdaku]";
+ mes "I have been investigating this for 30 days already but I do not know what it is.";
+ next;
+ mes "[Adventurer Bamdaku]";
+ mes "I am too proud to ask somebody.";
+ close;
+ case 3:
+ mes "[Adventurer Bamdaku]";
+ mes "I have been investigating this for 32 days already but I do not know what it is.";
+ next;
+ mes "[Adventurer Bamdaku]";
+ mes "Ugh what to do.. Should I just ask somebody?";
+ close;
+ case 4:
+ mes "[Adventurer Bamdaku]";
+ mes "I have been investigating this for 40 days already.";
+ next;
+ mes "[Adventurer Bamdaku]";
+ mes "My pride won't let me quit now.";
+ close;
+ case 5:
+ mes "[Adventurer Bamdaku]";
+ mes "45 days have passed since I started investigating this unknown thing.";
+ next;
+ mes "[Adventurer Bamdaku]";
+ mes "How did I come to investigate this?";
+ close;
+ }
+}
+
+un_bk_q,103,393,4 script Memory_Record#EP15.2MR 4_ENERGY_BLUE,{
+ callfunc("F_time_limit_recorder");
+
+ for ( .@i = 0; .@i < (recorder_quest_type - 1); .@i++ )
+ .@listen_continue$[.@i] = "Continue listening.";
+ .@listen_again$[.@i] = "Listen again.";
+
+ mes "There is a Memory Record somebody is recording.";
+ next;
+ if (select( "Listen.", "Quit." ) == 2)
+ close;
+ while(true) {
+ mes "Ah ah- One two three test- test-";
+ next;
+ mes "To distinguish survival days in the air-raid shelter, today will be designated Explosion Day 1 after the experiment explosion.";
+ next;
+ mes "Everybody fell into panic after seeing the outside situation on the monitor after the explosion.";
+ next;
+ mes "But chief researcher Dr. Fresa calmly consoled everybody and checked how many survived.";
+ next;
+ mes "The final number of survivors including adventurers seems to be 326.";
+ next;
+ mes "The camera showing outside was damaged in the afternoon. It seems we cannot see the situation outside anymore.";
+ next;
+ mes "There is no more recorded content.";
+ next;
+ switch( select( .@listen_again$[0], .@listen_continue$[0], "Stop listening." ) ) {
+ case 1:
+ continue;
+ case 2:
+ break;
+ case 3:
+ close;
+ }
+ mes "Explosion Day 2";
+ next;
+ mes "A witch hunt against the director and chief researcher Fresa began.";
+ next;
+ mes "My opinion is different. The research and experiment was conducted under her direction but this is an accident.";
+ next;
+ mes "If not Fresa, they would have made somebody else to blame.";
+ next;
+ mes "But she is handling it in a dignified manner despite concerns.";
+ next;
+ mes "She says problem solving is more important than blame and is checking assignments of survivors before the accident.";
+ next;
+ if (select( "Continue listening.", "Stop listening." ) == 2)
+ close;
+ mes "Explosion Day 3";
+ next;
+ mes "Fresa.. She naturally became the leader of the survivors.";
+ next;
+ mes "There was no vote of sorts, but nobody is complaining about her being the leader.";
+ next;
+ mes "The day before she had a briefing on the situation of the total survivors.";
+ next;
+ mes "20 Bioengineers";
+ mes "16 Mechanicians";
+ mes "27 Facilities managers";
+ mes "10 Chemical Substance Specialists";
+ mes "Other than specialists the assignments of survivors such as cafeteria staff, janitors, gardeners, distribution directors, health professionals, adventurers caught in the accident have been assessed.";
+ next;
+ if (select( "Continue listening.", "Stop listening." ) == 2)
+ close;
+ mes "Explosion Day 4";
+ next;
+ mes "Everybody's work has been decided based on Fresa's briefing the day before.";
+ next;
+ mes "It was decided that researchers including myself know nothing much research and must continue our lives in the air-raid shelter under the guidance of those who have technical skill needed for survival.";
+ next;
+ mes "First the Chemical Substance Specialists and Facilities managers started to install Air Contamination Gauge Sensors in the air-raid shelter.";
+ next;
+ mes "After evaluating that oxygen levels were low the Mechanicians have started to assemble Air cleaning units.";
+ next;
+ mes "Lora, a former cafeteria employee was consulted on the important problem of food.";
+ next;
+ mes "We assessed that about 40 days of survival is possible based on the food in the warehouse and the number of survivors.";
+ next;
+ mes "This prompted the Bioengineers to cultivate plants that can self-produce.";
+ next;
+ mes "Other miscellaneous assignments were issued under Fresa's direction.";
+ next;
+ if (select( "Continue listening.", "Stop listening." ) == 2)
+ close;
+ mes "Explosion Day 5";
+ next;
+ mes "I don't know the details but the air pollution level outside of the shelter was measured.";
+ next;
+ mes "According to the Chemical Substance Specialists the situation is hopeless.";
+ next;
+ mes "It seems life in the air-raid shelter has to continue longer. Just can quietly keep working..";
+ next;
+ if (select( "Continue listening.", "Stop listening." ) == 2)
+ close;
+ mes "Explosion Day 21";
+ next;
+ mes "After silently working for several days the Bioengineers have good news.";
+ next;
+ mes "They have succeeded in artificially germinating a plant that can self-produce.";
+ next;
+ mes "Fortunately the air-raid shelter has a warehouse spacious enough to grow plants in.";
+ next;
+ mes "It seems we can forget about our food problem now.";
+ next;
+ if (select( "Continue listening.", "Stop listening." ) == 2)
+ close;
+ mes "Explosion Day 30";
+ next;
+ mes "A small problem has occurred in the air-raid shelter. The air cleaning units made in the beginning are broken.";
+ next;
+ mes "Fortunately there will be no problem maintaining oxygen concentration levels thanks to the air cleaning units the Mechanicians made without approval.";
+ next;
+ mes "They are too heavy so adventurers were deployed because nobody else is able to move them.";
+ next;
+ switch( select( .@listen_again$[1], .@listen_continue$[1], "Stop listening." ) ) {
+ case 1:
+ continue;
+ case 2:
+ break;
+ case 3:
+ close;
+ }
+ mes "Explosion Day 32";
+ next;
+ mes "Today is the first harvest of the grape tree cultivated by the Bioengineers.";
+ next;
+ mes "Although there was a small problem of the Mechanicians destroying one grape tree";
+ next;
+ mes "The air-raid shelter residents are throwing a small party to celebrate the successful harvest.";
+ next;
+ mes "There is no more recorded content.";
+ next;
+ switch( select( .@listen_again$[2], .@listen_continue$[2], "Stop listening." ) ) {
+ case 1:
+ continue;
+ case 2:
+ break;
+ case 3:
+ close;
+ }
+ mes "Explosion Day 38";
+ next;
+ mes "Chemical Substance Specialists and some Adventurers sick of living in the air-raid shelter have left the shelter to measure the air.";
+ next;
+ mes "They have not returned by evening.";
+ next;
+ mes "Was the freedom of outside better than the life in the dark air-raid shelter?";
+ next;
+ mes "After midnight the remaining Chemical Substance Specialists assessed that they were dead and everybody had a brief moment of silence.";
+ next;
+ if (select( "Continue listening.", "Stop listening." ) == 2)
+ close;
+ mes "Explosion Day 40";
+ next;
+ mes "A dark rumor is going around the shelter.";
+ next;
+ mes "There is a rumor that a contaminant from the outside has invaded the air-raid shelter because of the people who left a while ago.";
+ next;
+ mes "Is it because of the contaminant? There are patients who suddenly convulse and attack others.";
+ next;
+ mes "Under the leader Fresa's decision, everybody was checked and those found with transfectants were quarantined in the temporary clinic.";
+ next;
+ switch( select( .@listen_again$[3], .@listen_continue$[3], "Stop listening." ) ) {
+ case 1:
+ continue;
+ case 2:
+ break;
+ case 3:
+ close;
+ }
+ mes "Explosion Day 43";
+ next;
+ mes "The rumor in the air-raid shelter has come true.";
+ next;
+ mes "The remaining Chemical Substance Specialists have confirmed that the contaminant is eroding into the air-raid shelter";
+ next;
+ mes "And Fresa and experts have started taking measures.";
+ next;
+ if (select( "Continue listening.", "Stop listening." ) == 2)
+ close;
+ mes "Explosion Day 45";
+ next;
+ mes "The invading contaminant will not stop.";
+ next;
+ mes "It has been decided to move all equipment and necessities to the less contaminated Zone Z-2";
+ next;
+ mes "And facility managers have started to install a partition in Zone Z-0 to prevent the contaminant from coming in further.";
+ next;
+ mes "There is no more recorded content.";
+ next;
+ if (select( "Listen again.", "Stop listening." ) == 2)
+ close;
+ }
+}
+
+// Machine Warehouse
+un_bk_q,41,275,0 script Machine Warehouse#J-0 WARPNPC,1,1,{
+ end;
+OnTouch:
+ callfunc("F_time_limit_recorder");
+ if (recorder_quest_type == 2 && recorder_quest_status == 0) {
+ emotion ET_O, getnpcid(0, "Mechanician Mugeosi#EP1");
+ mes "[Mechanician Mugeosi]";
+ mes "Ah! You're the adventurer send to deliver air cleaners. You are at the right place. Come this way.";
+ close;
+ }
+ warp "un_bk_q",21,276;
+ end;
+}
+
+un_bk_q,56,286,4 script Mechanician Mugeosi#EP1 4_M_REPAIR,{
+ callfunc("F_time_limit_recorder");
+ switch( recorder_quest_type ) {
+ case 1:
+ mes "[Mechanician Mugeosi]";
+ mes "Are you an Adventurer? This is the machine warehouse.";
+ next;
+ mes "[Mechanician Mugeosi]";
+ mes "It was originally a warehouse but it is now being used by Mechanicians to assemble machines for the air-raid shelter.";
+ next;
+ emotion ET_FRET;
+ mes "[Mechanician Mugeosi]";
+ mes "You want to know the total number of Mechanicians? I don't think I know?";
+ next;
+ mes "[Mechanician Mugeosi]";
+ mes "Ah! Al up there might know. Go to Al.";
+ close;
+ case 2:
+ if (recorder_quest_status == 0) {
+ mes "[Mechanician Mugeosi]";
+ mes "An adventure to move the air cleaner?";
+ next;
+ mes "[Mechanician Mugeosi]";
+ mes "You look solid just like the other researchers mentioned. I bet you can lift the air cleaner like nothing!!";
+ next;
+ mes "[Mechanician Mugeosi]";
+ mes "We shouldn't be ordering people like you who got caught up in an accident, but the situation is urgent.";
+ next;
+ mes "[Mechanician Mugeosi]";
+ mes "We made a new air cleaning unit because the one operating previously broke down a while ago.";
+ next;
+ mes "[Mechanician Mugeosi]";
+ mes "We should have made it in modular form. Made it as one solid piece by mistake.";
+ next;
+ emotion ET_SMILE;
+ mes "[Mechanician Mugeosi]";
+ mes "Didn't think of it when we were making it!!";
+ next;
+ mes "[Mechanician Mugeosi]";
+ mes "It happens. Right?";
+ next;
+ mes "[Mechanician Mugeosi]";
+ mes "Facilities managers are making a fuss about needing the air cleaning unit soon.";
+ next;
+ mes "[Mechanician Mugeosi]";
+ mes "We can't move the air cleaning unit with the equipment we have now..";
+ next;
+ mes "[Mechanician Mugeosi]";
+ mes "We could make the machine that can transport it if we had more time..";
+ next;
+ mes "[Mechanician Mugeosi]";
+ mes "So we ended up asking the strong Adventurer.";
+ next;
+ select("Yes sir.");
+ emotion ET_SMILE;
+ mes "[Mechanician Mugeosi]";
+ mes "Aren't you refreshing!!";
+ next;
+ setquest 5351;// Limits of Journeys
+ setquest 5352;// Air Cleaning Unit
+ recorder_quest_status = 1;
+ mes "[Mechanician Mugeosi]";
+ mes "We are counting on you. Take five air cleaning units to areas C-0, F-1, F-2, I-0, Z-0. Talk to me when you're ready.";
+ close;
+ }
+ if (recorder_quest_status == 1) {
+ .@total = isbegin_quest(5353) + isbegin_quest(5354) + isbegin_quest(5355) + isbegin_quest(5356) + isbegin_quest(5357);
+ if (.@total < 5) {
+ emotion ET_QUESTION;
+ mes "[Mechanician Mugeosi]";
+ mes "Are you ready to move heavy objects?";
+ next;
+ select("Give it to me.");
+ if (checkweight(6825,1) == 0) {
+ mes "[Mechanician Mugeosi]";
+ mes "You look strong but seems you are weak. You can't lift the air cleaning unit like that.";
+ close;
+ }
+ getitem 6825,1;// Air Purifier Box
+ mes "[Mechanician Mugeosi]";
+ mes "Deliver them to zones C-0, F-1, F-2, I-0, Z-0. The order doesn't matter and please be careful since they are precise machines.";
+ close;
+ }
+ emotion ET_BEST;
+ mes "[Mechanician Mugeosi]";
+ mes "Good work. The air cleaning units are heavy, right?";
+ next;
+ mes "[Mechanician Mugeosi]";
+ mes "Sayhu says Adventurers like this kind of stuff and I should use this as compensation after giving you work.";
+ next;
+ erasequest 5352;// Air Cleaning Unit
+ erasequest 5353;// C-0 Delivery Complete
+ erasequest 5354;// F-1 Delivery Complete
+ erasequest 5355;// F-2 Delivery Complete
+ erasequest 5356;// I-0 Delivery Complete
+ erasequest 5357;// Z-0 Delivery Complete
+ setquest 5370;// Memory Record
+ getexp 1000000,1000000;
+ recorder_quest_status = 2;
+ mes "The small round capsule has percolated through skin. It feels like experience has accumulated.";
+ next;
+ mes "[Mechanician Mugeosi]";
+ mes "Thanks to you we overcame a crisis. I need to make a machine that can move heavy objects in case this happens again.";
+ close;
+ }
+ mes "[Mechanician Mugeosi]";
+ mes "Good work. Let's relax for now.";
+ close;
+ case 3:
+ mes "[Mechanician Mugeosi]";
+ mes "Have you tried the grapes made by the Bioengineers using that growth thingy?";
+ next;
+ mes "[Mechanician Mugeosi]";
+ mes "We can now eat fresh fruit in this dull and dark air-raid shelter.";
+ close;
+ case 4:
+ mes "[Mechanician Mugeosi]";
+ mes "Are you worried because people are suddenly attacking? What? You aren't infected right?";
+ close;
+ case 5:
+ mes "[Mechanician Mugeosi]";
+ mes "Why is everybody rejecting us making a machine that can make shipping easier? Pssh!!";
+ close;
+ }
+}
+
+un_bk_q,82,323,2 script Mechanician Al#EP15.2MR 4_M_REPAIR,{
+ callfunc("F_time_limit_recorder");
+ switch( recorder_quest_type ) {
+ case 1:
+ switch( recorder_quest_status ) {
+ case 3:
+ case 9:
+ case 17:
+ mes "[Mechanician Al]";
+ mes "So busy. This is why I asked for additional manpower in the first place. No use now I guess.";
+ close;
+ case 5:
+ if (isbegin_quest(5348) == 0) {
+ mes "[Mechanician Al]";
+ emotion ET_DELIGHT;
+ mes "You are?";
+ next;
+ select("I am...");
+ emotion ET_SCRATCH;
+ mes "[Mechanician Al]";
+ mes "Fresa? Hm? Who is Fresa?";
+ next;
+ mes "[Mechanician Al]";
+ mes "Ah?! Ah!! The chief director of the experiment was ^0000FF Lona Fresa^000000.";
+ next;
+ mes "[Mechanician Al]";
+ mes "OK Adventurer man, identity confirmation complete!!";
+ next;
+ mes "[Mechanician Al]";
+ mes "Was it your business to check the Mechanician survivor headcount?";
+ next;
+ setquest 5348;// Headcount Complete
+ mes "[Mechanician Al]";
+ mes "There weren't many in the first place, and too bad for the poor bastards who didn't make it into the shelter.";
+ next;
+ mes "[Mechanician Al]";
+ mes "Tell Fresa, Fress or whatever her name is, that the Mechanicians are inspecting";
+ next;
+ mes "[Mechanician Al]";
+ mes "the mechanical systems in the air-raid shelter according to the emergency protocols. Thanks~";
+ close;
+ }
+ mes "[Mechanician Al]";
+ mes "^FF000018^000000 Mechanicians have survived.";
+ next;
+ mes "[Mechanician Al]";
+ mes "Tell Fresa, Fress or whatever her name is, that the Mechanicians are inspecting the mechanical systems in the air-raid shelter.";
+ close;
+ default:
+ mes "[Mechanician Al]";
+ mes "The Mechanicians are checking for irregularities in the internal mechanical systems according to Emergency Situation Guidelines.";
+ next;
+ emotion ET_FRET;
+ mes "[Mechanician Al]";
+ mes "Darn it- Why am I even explaining this? You're bothering me so go away.";
+ close;
+ }
+ case 2:
+ mes "[Mechanician Al]";
+ mes "So busy. This is why I asked for additional manpower in the first place. No use now I guess.";
+ close;
+ case 3:
+ mes "[Mechanician Al]";
+ mes "Is that grape for me? It's not? Pssh!!";
+ close;
+ case 4:
+ mes "[Mechanician Al]";
+ mes "So busy. This is why I asked for additional manpower in the first place. No use now I guess.";
+ close;
+ case 5:
+ switch( recorder_quest_status ) {
+ case 0:
+ end;
+ case 1:
+ mes "[Mechanician Al]";
+ mes "Huh? What's going on?";
+ next;
+ mes "[Mechanician Al]";
+ mes "What, shouldn't the items be moved to Zone Z-2 and not here? Take them there.";
+ close;
+ case 2:
+ mes "[Mechanician Al]";
+ mes "Huh? What's going on? I heard the Adventurers are being used to move the supplies?";
+ next;
+ select("The message from Ernon..");
+ mes "[Mechanician Al]";
+ mes "Ernon? Goods manager Ernon? He has a message for me? What is it?";
+ next;
+ input .@string$;
+ setquest 5369;// Message Delivery Complete
+ recorder_quest_status = 3;
+ mes "[" + strcharinfo(0) + "]";
+ mes .@string$;
+ next;
+ emotion ET_OTL;
+ mes "[Mechanician Al]";
+ mes "Huh.. uh.. buh.. buh..";
+ next;
+ mes "He seems shocked and out of it. Go back to Ernon since the message has been delivered.";
+ close;
+ case 3:
+ emotion ET_OTL;
+ mes "[Mechanician Al]";
+ mes "Huh.. uh.. buh.. buh..";
+ next;
+ mes "He is out of it. Go back to Ernon since the message has been delivered.";
+ close;
+ case 4:
+ emotion ET_OTL;
+ mes "[Mechanician Al]";
+ mes "Er.. non.. ar.. argh!!";
+ next;
+ mes "He is convulsing like an infected patient.";
+ close;
+ }
+ }
+}
+
+un_bk_q,100,312,6 script Mechanician Bukal#EP15. 4_M_REPAIR,{
+ callfunc("F_time_limit_recorder");
+ switch( recorder_quest_type ) {
+ case 1:
+ mes "[Mechanician Bukal]";
+ mes "You're conducting a headcount?";
+ next;
+ mes "[Mechanician Bukal]";
+ mes "I am not sure. Maybe you can ask Al over there?";
+ close;
+ case 2:
+ if (recorder_quest_status == 0) {
+ mes "[Mechanician Bukal]";
+ mes "Ugh.. I want to make something.";
+ close;
+ }
+ mes "[Mechanician Bukal]";
+ mes "I mean the air cleaning unit you are moving now.";
+ next;
+ mes "[Mechanician Bukal]";
+ mes "I made that. Isn't it awesome?";
+ close;
+ case 3:
+ mes "[Mechanician Bukal]";
+ mes "Ah!! You're the adventurer. You could check out the farm.";
+ next;
+ mes "[Mechanician Bukal]";
+ mes "Isn't the farm good because it's warm? I made the temperature control device there. Isn't it awesome?";
+ close;
+ case 4:
+ mes "[Mechanician Bukal]";
+ mes "I am worried of the people suddenly attacking.";
+ next;
+ mes "[Mechanician Bukal]";
+ mes "Since we're already here should I make something like a patient suppression device?";
+ close;
+ case 5:
+ mes "[Mechanician Bukal]";
+ mes "I don't know why everybody is rejecting a device that can move heavy objects.";
+ next;
+ mes "[Mechanician Bukal]";
+ mes "I should have made one when they were making new air cleaning units..";
+ close;
+ }
+}
+
+un_bk_q,91,283,2 script Guard#EP15.2MR 4_M_HUMAN_02,{
+ callfunc("F_time_limit_recorder");
+ switch( recorder_quest_type ) {
+ case 1:
+ mes "[Guard]";
+ mes "Hello adventurer?";
+ next;
+ mes "[Guard]";
+ mes "I don't know the reason, but Fresa assigned me here.";
+ close;
+ case 2:
+ if (recorder_quest_status == 0) {
+ mes "[Guard]";
+ mes "Hello adventurer?";
+ close;
+ }
+ mes "[Guard]";
+ mes "I always wondered why I was assigned here but now I think I know the reason.";
+ next;
+ mes "[Guard]";
+ mes "It is to watch if the Mechanicians make useless things.";
+ close;
+ case 3:
+ mes "[Guard]";
+ mes "The Mechanicians occasionally want to make something.";
+ next;
+ mes "[Guard]";
+ mes "My job is to stop them.";
+ close;
+ case 4:
+ mes "[Guard]";
+ mes "I hear patients these days are convulsing and attacking the people around them?";
+ next;
+ mes "[Guard]";
+ mes "The Mechanician constantly convulse saying they want to make something so it's not weird to me.";
+ close;
+ case 5:
+ mes "[Guard]";
+ mes "The convulsion of Mechanicians are reaching extremes.";
+ next;
+ mes "[Guard]";
+ mes "They are convulsing so much I may need to call back up.";
+ close;
+ }
+}
+
+un_bk_q,212,294,6 script Zone C-0 Facilities man#1 4_M_EINMAN2,{
+ callfunc("F_time_limit_recorder");
+ switch( recorder_quest_type ) {
+ case 1:
+ mes "[Facilities manager]";
+ mes "We are inspecting the interior facilities of the air-raid shelter according to emergency regulations.";
+ close;
+ case 2:
+ .@npc_num = strnpcinfo(2);
+ switch(.@npc_num) {
+ case 1:
+ if (isbegin_quest(5353) == 0 && recorder_quest_status == 1) {
+ emotion ET_DELIGHT;
+ mes "[Facilities manager]";
+ mes "Oh- You're here? I was waiting.";
+ next;
+ mes "[Facilities manager]";
+ mes "I have heard Adventurers are all strong as oxen but it is still impressive.";
+ next;
+ if (countitem(6825) < 1) {
+ mes "[Facilities manager]";
+ mes "But where is the air cleaning unit? You didn't bring the most important thing. Bring it here.";
+ close;
+ }
+ delitem 6825,1;// Air Purifier Box
+ setquest 5353;// C-0 Delivery Complete
+ mes "[Facilities manager]";
+ mes "Good work. Good work. We have received the air cleaning unit.";
+ close;
+ }
+ mes "[Facilities manager]";
+ mes "Good work. Good work. We have received the air cleaning unit.";
+ close;
+ case 2:
+ if (isbegin_quest(5354) == 0 && recorder_quest_status == 1) {
+ emotion ET_THANKS;
+ mes "[Facilities manager]";
+ mes "Oh my you are working hard. You can place the item over here.";
+ next;
+ mes "[Facilities manager]";
+ mes "Whoa- I heard the rumors but you are really strong.";
+ next;
+ mes "[Facilities manager]";
+ mes "It's hard for even four of us Facilities managers to lift it for a moment..";
+ next;
+ if (countitem(6825) < 1) {
+ mes "[Facilities manager]";
+ mes "But where is the air cleaning unit? You didn't bring the most important thing. Bring it here.";
+ close;
+ }
+ delitem 6825,1;// Air Purifier Box
+ setquest 5354;// F-1 Delivery Complete
+ mes "[Facilities manager]";
+ mes "Anyway we have received the air cleaning unit.";
+ close;
+ }
+ mes "[Facilities manager]";
+ mes "Anyway we have received the air cleaning unit.";
+ close;
+ case 3:
+ if (isbegin_quest(5355) == 0 && recorder_quest_status == 1) {
+ emotion ET_QUESTION;
+ mes "[Facilities manager]";
+ mes "Ah?! Are you the Adventurer who's delivering air cleaning units?";
+ next;
+ if (countitem(6825) < 1) {
+ mes "[Facilities manager]";
+ mes "But where is the air cleaning unit? Did you not bring it?";
+ close;
+ }
+ delitem 6825,1;// Air Purifier Box
+ setquest 5355;// F-2 Delivery Complete
+ mes "[Facilities manager]";
+ mes "We need to work fast so place the item here.";
+ close;
+ }
+ mes "[Facilities manager]";
+ mes "We have received the air cleaning unit.";
+ close;
+ case 4:
+ if (isbegin_quest(5356) == 0 && recorder_quest_status == 1) {
+ emotion ET_QUESTION;
+ mes "[Facilities manager]";
+ mes "Has the adventurer not delivered the air cleaning unit yet? Uh?! It's here. Hurry.. the air cleaning unit..";
+ next;
+ if (countitem(6825) < 1) {
+ mes "[Facilities manager]";
+ mes "Arwhat!! Why didn't you bring it. Bring it now, okay?";
+ close;
+ }
+ delitem 6825,1;// Air Purifier Box
+ setquest 5356;// I-0 Delivery Complete
+ mes "[Facilities manager]";
+ mes "It's urgent. I'll thank you later..";
+ close;
+ }
+ mes "[Facilities manager]";
+ mes "Don't talk to me. Every hour is precious.";
+ close;
+ case 5:
+ if (isbegin_quest(5357) == 0 && recorder_quest_status == 1) {
+ emotion ET_BEST;
+ mes "[Facilities manager]";
+ mes "Oh- You're here? I was waiting.";
+ next;
+ mes "[Facilities manager]";
+ mes "I have heard Adventurers are all strong as oxen but it is still impressive.";
+ next;
+ if (countitem(6825) < 1) {
+ mes "[Facilities manager]";
+ mes "But where is the air cleaning unit? You didn't bring the most important thing. Bring it here.";
+ close;
+ }
+ delitem 6825,1;// Air Purifier Box
+ setquest 5357;// Z-0 Delivery Complete
+ mes "[Facilities manager]";
+ mes "Good work. Good work. We have received the air cleaning unit.";
+ close;
+ }
+ mes "[Facilities manager]";
+ mes "Good work. Good work. We have received the air cleaning unit.";
+ close;
+ }
+ end;
+ case 3:
+ mes "[Facilities manager]";
+ mes "Have you tried the grape made by the Bioengineers?";
+ next;
+ mes "[Facilities manager]";
+ mes "Science is truly amazing to have us enjoy fresh grapes in this underground air-raid shelter.";
+ close;
+ case 4:
+ mes "[Facilities manager]";
+ mes "I think the air cleaner might be useless because the contaminant has already infiltrated the air-raid shelter.";
+ close;
+ case 5:
+ mes "[Facilities manager]";
+ mes "You are going through a lot.";
+ close;
+ }
+}
+
+un_bk_q,223,217,4 duplicate(Zone C-0 Facilities man#1) Zone F-1 Facilities man#2 4_M_EINMAN2
+un_bk_q,372,217,6 duplicate(Zone C-0 Facilities man#1) Zone F-2 Facilities man#3 4_M_EINMAN2
+un_bk_q,389,276,6 duplicate(Zone C-0 Facilities man#1) Zone I-0 Facilities man#4 4_M_EINMAN2
+un_bk_q,291,158,4 duplicate(Zone C-0 Facilities man#1) Zone Z-0 Facilities man#5 4_M_EINMAN2
+
+// Corridor Farm
+un_bk_q,213,303,4 script Bioengineer Touring#EP1 4W_M_02,{
+ callfunc("F_time_limit_recorder");
+ switch( recorder_quest_type ) {
+ case 1:
+ if (recorder_quest_status == 3) {
+ if (isbegin_quest(5347) == 0) {
+ mes "[Bioengineer Touring]";
+ emotion ET_QUESTION;
+ mes "Huh?! Who are you?";
+ next;
+ select("I am...");
+ emotion ET_SURPRISE;
+ mes "[Bioengineer Touring]";
+ mes "Ah! Dr. Fresa sent you to check the conditions of survivor assignments?";
+ next;
+ mes "[Bioengineer Touring]";
+ mes "What a relief. The disaster network came on a bit ago and we just confirmed how many Bioengineers have survived.";
+ next;
+ setquest 5347;// Headcount
+ mes "[Bioengineer Touring]";
+ mes "We have confirmed ^FF000022 ^000000Bioengineers have survived including myself.";
+ next;
+ mes "[Bioengineer Touring]";
+ mes "Oh yeah! Tell Dr. Fresa that the Bioengineers are using growth acceleration technology for food production according to the Emergency Situation Guidelines.";
+ next;
+ emotion ET_THANKS;
+ mes "[Bioengineer Touring]";
+ mes "I will count on you.";
+ close;
+ }
+ mes "[Bioengineer Touring]";
+ mes "We have confirmed ^FF000022 ^000000Bioengineers have survived including myself.";
+ next;
+ mes "[Bioengineer Touring]";
+ mes "Oh yeah! Tell Dr. Fresa that the Bioengineers are using growth acceleration technology for food production according to the Emergency Situation Guidelines.";
+ next;
+ emotion ET_THANKS;
+ mes "[Bioengineer Touring]";
+ mes "I will count on you.";
+ close;
+ }
+ mes "[Bioengineer Touring]";
+ mes "We Bioengineers are doing all we can to produce food for the people inside the air-raid shelter.";
+ close;
+ case 2:
+ mes "[Bioengineer Touring]";
+ mes "Wait a minute. You cannot enter the farm right now.";
+ close;
+ case 3:
+ mes "[Bioengineer Touring]";
+ mes "We have just finished the last grape harvest and are getting ready for the next one.";
+ next;
+ emotion ET_SORRY;
+ mes "[Bioengineer Touring]";
+ mes "If people come and go often, it may interfere with the work so access is prohibited.";
+ close;
+ case 4:
+ mes "[Bioengineer Touring]";
+ mes "We Bioengineers are doing all we can to produce food for the people inside the air-raid shelter.";
+ next;
+ emotion ET_SORRY;
+ mes "[Bioengineer Touring]";
+ mes "If people come and go often, it may interfere with the work for the next harvest so access will be prohibited.";
+ close;
+ case 5:
+ mes "[Bioengineer Touring]";
+ mes "We Bioengineers are doing all we can to produce food for the people inside the air-raid shelter.";
+ next;
+ emotion ET_SORRY;
+ mes "[Bioengineer Touring]";
+ mes "If people come and go often, it may interfere with the work for the next harvest so access will be prohibited.";
+ close;
+ }
+}
+
+// Farm
+un_bk_q,216,300,0 script C-0#farm WARPNPC,1,1,{
+ end;
+OnTouch:
+ callfunc("F_time_limit_recorder");
+ mes "[Bioengineer Touring]";
+ mes "Wait a minute. You cannot enter the farm right now.";
+ close;
+}
+
+un_bk_q,213,346,0 script farm#C-0 WARPNPC,1,1,{
+ end;
+OnTouch:
+ callfunc("F_time_limit_recorder");
+ if (recorder_quest_type == 3 && recorder_quest_status == 0) {
+ emotion ET_BIGTHROB, getnpcid(0, "Bioengineer Ebrik#EP15.2MR");
+ mes "[Bioengineer Ebrik]";
+ mes "Are you the Adventurer here to help us with the grape harvest? Right here!!";
+ close;
+ }
+ warp "un_bk_q",213,299;
+ end;
+}
+
+un_bk_q,220,350,4 script Bioengineer Ebrik#EP15.2MR 4_M_01,{
+ callfunc("F_time_limit_recorder");
+ if (recorder_quest_type != 3)
+ end;
+ switch( recorder_quest_status ) {
+ case 0:
+ emotion ET_QUESTION;
+ mes "[Bioengineer Ebrik]";
+ mes "Are you the Adventurer here to help us with the grape harvest? Nice to meet you.";
+ next;
+ mes "[Bioengineer Ebrik]";
+ mes "Bioengineers alone do not have enough hands to harvest the amount of grapes we need to provide all the people inside the air-raid shelter.";
+ next;
+ mes "[Bioengineer Ebrik]";
+ mes "So we ended up asking the Adventurers.";
+ next;
+ select("Are there others who can help?");
+ mes "[Bioengineer Ebrik]";
+ mes "Don't even mention it. We gave the task of harvesting grapes to the meandering Mechanicians and..";
+ next;
+ emotion ET_KEK;
+ mes "[Bioengineer Ebrik]";
+ mes "They ended up smashing one of the grape trees!!";
+ next;
+ mes "[Bioengineer Ebrik]";
+ mes "We were lucky to have found out and stopped them before they destroyed the other trees. The thought of it is horrible.";
+ next;
+ mes "[Bioengineer Ebrik]";
+ mes "Ah! That is not what's important.";
+ next;
+ mes "[Bioengineer Ebrik]";
+ mes "We used growth acceleration to make ripe grapes drop periodically.";
+ next;
+ mes "[Bioengineer Ebrik]";
+ mes "It would be nice if you can wait in front of the grape tree and collect 30 bunches of grapes.";
+ next;
+ mes "[Bioengineer Ebrik]";
+ mes "You can collect more, but the remaining ones from the harvest will naturally decompose and disappear.";
+ next;
+ setquest 5358;// Limits of Journeys
+ setquest 5359;// Grape Harvest
+ recorder_quest_status = 1;
+ mes "[Bioengineer Ebrik]";
+ mes "Then the soil fertility will recover partially. Good luck.";
+ close;
+ case 1:
+ if (countitem(6826) < 30) {
+ mes "[Bioengineer Ebrik]";
+ mes "We have decided to give out one grape box per team.";
+ next;
+ mes "[Bioengineer Ebrik]";
+ mes "One box can hold 30~32 bunches so collect accordingly.";
+ close;
+ }
+ emotion ET_BEST;
+ mes "[Bioengineer Ebrik]";
+ mes "Whoa good job. As I thought Adventurers are so much more capable than Mechanicians.";
+ next;
+ mes "[Bioengineer Ebrik]";
+ mes "Since the grapes are harvested should we deliver them to each team?";
+ next;
+ mes "[Bioengineer Ebrik]";
+ mes "I will be rude and ask you another favor on top of your hard work.";
+ next;
+ mes "[Bioengineer Ebrik]";
+ mes "Let's see.. the grapes you just harvested";
+ next;
+ delitem 6826, countitem(6826);// Fresh Grape
+ setquest 5362;// Grape Delivery
+ recorder_quest_status = 2;
+ mes "[Bioengineer Ebrik]";
+ mes "This should be delivered to the Chemical Substance team. You can deliver this to Karsten.";
+ next;
+ mes "[Bioengineer Ebrik]";
+ mes "Oh! You do not have to come back after the deliveries. We will be busy starting the next project.";
+ next;
+ mes "[Bioengineer Ebrik]";
+ mes "The people receiving the deliveries will probably give you compensation. If they don't, you can nag them.";
+ close;
+ case 2:
+ mes "[Bioengineer Ebrik]";
+ mes "That grape box you are holding";
+ next;
+ mes "[Bioengineer Ebrik]";
+ mes "Has to be delivered to Karsten of the Chemical substance team.";
+ next;
+ mes "[Bioengineer Ebrik]";
+ mes "Compensation will be paid by the people receiving the deliveries so you do not have to come back here.";
+ close;
+ }
+ end;
+
+OnInit:
+ freeloop 1;
+ setarray .amount[0],1,1,2;
+ setarray .grap_num[0],1,2,3,4,5;
+ setarray .coord[0],
+ 242,391, // Grape tree 1
+ 274,391, // Grape tree 2
+ 333,360, // Grape tree 3
+ 316,344, // Grape tree 4
+ 241,343; // Grape tree 5
+
+ while(true) {
+ sleep 60000;
+ callsub( S_Random_Grap, 0 );
+ callsub( S_Random_Grap, 1 );
+ }
+
+S_Random_Grap:
+ .@end = 4 - getarg(0);
+ .@r = rand(3);
+ .@tmp = .grap_num[.@r];
+ .@index = (.@tmp - 1) * 2;
+ .grap_num[.@r] = .grap_num[.@end];
+ .grap_num[.@end] = .@tmp;
+
+ for ( .@i = 0; .@i < 3; .@i++ ) {
+ do {
+ .@x = .coord[.@index] + rand(-2,2);
+ .@y = .coord[.@index+1] + rand(-2,2);
+ }
+ while( !checkcell("un_bk_q",.@x,.@y,cell_chkpass) );
+ makeitem 6826, .amount[.@i], "un_bk_q",.@x,.@y;
+ }
+ return;
+}
+
+un_bk_q,240,380,8 script Bioengineer#EP15.2MR1 4_M_ALCHE_C,{
+ callfunc("F_time_limit_recorder");
+ mes "[Bioengineer]";
+ mes "It seems we can harvest grape tree number 1 without problems. What a relief.";
+ next;
+ mes "[Bioengineer]";
+ mes "My heart sank when the Mechanicians destroyed a tree..";
+ close;
+}
+
+un_bk_q,274,380,8 script Bioengineer#EP15.2MR2 4_M_ALCHE_C,{
+ callfunc("F_time_limit_recorder");
+ mes "[Bioengineer]";
+ mes "The soil grape tree number 2 is in seems to be lacking nutrition.";
+ next;
+ mes "[Bioengineer]";
+ mes "We need to prepare fertilizer to provide the soil more nutrition.";
+ close;
+}
+
+un_bk_q,327,360,6 script Bioengineer#EP15.2MR3 4_M_ALCHE_C,{
+ callfunc("F_time_limit_recorder");
+ mes "[Bioengineer]";
+ mes "I worried because a lot of weird stuff was growing around grape tree number 3.";
+ next;
+ mes "[Bioengineer]";
+ mes "It seems the harvest will have no problem.";
+ close;
+}
+
+un_bk_q,316,351,4 script Bioengineer#EP15.2MR4 4_M_ALCHE_C,{
+ callfunc("F_time_limit_recorder");
+ mes "[Bioengineer]";
+ mes "Grape tree number 4 has no particular problem.";
+ next;
+ mes "[Bioengineer]";
+ mes "Nutrition state good. Harvest state good.";
+ close;
+}
+
+un_bk_q,249,344,2 script Bioengineer#EP15.2MR5 4_M_ALCHE_C,{
+ callfunc("F_time_limit_recorder");
+ mes "[Bioengineer]";
+ mes "The nutrition of grape tree number 5 is too good.";
+ next;
+ mes "[Bioengineer]";
+ mes "That doesn't mean there will be a higher harvest yield..";
+ close;
+}
+
+// Clinic
+un_bk_q,269,236,0 script Clinic#G-1 WARPNPC,1,1,{
+ end;
+OnTouch:
+ callfunc("F_time_limit_recorder");
+ if (recorder_quest_type == 4 && recorder_quest_status == 0) {
+ mes "[Nurse Lapplad]";
+ mes "Look here?! Where are you trying to go? We have to do some tests so don't leave and wait here!!";
+ close;
+ }
+ warp "un_bk_q",255,235;
+ end;
+}
+
+un_bk_q,297,221,0 script Clinic#H-0 WARPNPC,1,1,{
+ end;
+OnTouch:
+ callfunc("F_time_limit_recorder");
+ if (recorder_quest_type == 4 && recorder_quest_status == 0) {
+ mes "[Nurse Lapplad]";
+ mes "Look here?! Where are you trying to go? We have to do some tests so don't leave and wait here!!";
+ close;
+ }
+ warp "un_bk_q",298,203;
+ end;
+}
+
+un_bk_q,326,236,0 script Clinic#G-2 WARPNPC,1,1,{
+ end;
+OnTouch:
+ callfunc("F_time_limit_recorder");
+ if (recorder_quest_type == 4 && recorder_quest_status == 0) {
+ mes "[Nurse Lapplad]";
+ mes "Look here?! Where are you trying to go? We have to do some tests so don't leave and wait here!!";
+ close;
+ }
+ warp "un_bk_q",340,235;
+ end;
+}
+
+un_bk_q,276,243,4 script Nurse Lapplad#EP15.2MR 4_F_BRZ_WOMAN,{
+ callfunc("F_time_limit_recorder");
+ switch( recorder_quest_type ) {
+ case 4:
+ switch( recorder_quest_status ) {
+ case 0:
+ emotion ET_SORRY;
+ mes "[Nurse Lapplad]";
+ mes "Sorry. Did you wait long? There are a lot of suspected infection patients as you can see..";
+ next;
+ select("Not really..");
+ emotion ET_HUK;
+ mes "[Nurse Lapplad]";
+ mes "Eh?! You didn't wait? That's strange? Did you cut in line? Cutting is bad.";
+ next;
+ mes "[Nurse Lapplad]";
+ mes "As you know there are infectees who are suddenly showing strange phenomena..";
+ next;
+ emotion ET_SCISSOR;
+ mes "[Nurse Lapplad]";
+ mes "Um...";
+ next;
+ mes "[Nurse Lapplad]";
+ mes "...Ah...";
+ next;
+ emotion ET_SURPRISE;
+ mes "[Nurse Lapplad]";
+ mes "...Oh!!";
+ next;
+ mes "[Nurse Lapplad]";
+ mes "I don't see any problematic symptoms. Fortunate.";
+ next;
+ mes "[Nurse Lapplad]";
+ mes "We are having trouble because of the suddenly convulsing patients.";
+ next;
+ mes "[Nurse Lapplad]";
+ mes "Look here. My skin is getting crispy from not being able to sleep for days~";
+ next;
+ mes "Thudunk!! Babang!! Crash!!";
+ if (mobcount( "un_bk_q", "Nurse Lapplad#EP15.2MR::OnMobDead" ) < 1)
+ callsub S_Random, 1; // always starts on Patient 1
+ next;
+ emotion ET_SMILE;
+ mes "[Nurse Lapplad]";
+ mes "Yes.. Just like that";
+ next;
+ emotion ET_SCISSOR;
+ mes "[Nurse Lapplad]";
+ mes ". .";
+ next;
+ mes "[Nurse Lapplad]";
+ mes "Argh!! Another convulsing patient.";
+ next;
+ mes "[Nurse Lapplad]";
+ mes "Hey. Aren't you an adventurer? You must be really strong.";
+ next;
+ setquest 5363;// Limits of Journeys
+ setquest 5364;// Convulsing Patient Suppression
+ recorder_quest_status = 1;
+ mes "[Nurse Lapplad]";
+ mes "Can you suppress that convulsing patient? I am counting on you.";
+ close;
+ case 1:
+ if (mobcount( "un_bk_q", "Nurse Lapplad#EP15.2MR::OnMobDead" ) > 0) {
+ emotion ET_CRY;
+ mes "[Nurse Lapplad]";
+ mes "Ee~~ ee~ ek~~~~~~~~~!!";
+ next;
+ emotion ET_CRY;
+ mes "[Nurse Lapplad]";
+ mes "Take those patients down quickly! You're an adventurer!!";
+ close;
+ }
+ mes "[Nurse Lapplad]";
+ mes "You didn't get bit or scratched by the convulsing patient, did you?";
+ next;
+ select("Why?");
+ mes "[Nurse Lapplad]";
+ mes "Hmm~ I don't see any particular wounds.";
+ next;
+ mes "[Nurse Lapplad]";
+ mes "Since I can't figure out the infection route...";
+ next;
+ mes "[Nurse Lapplad]";
+ mes "We have to prepare for a possible disaster...";
+ next;
+ mes "[Nurse Lapplad]";
+ mes "Anyway, Adventurer~ Assuring and the best!";
+ next;
+ mes "[Nurse Lapplad]";
+ mes "I haven't been that bewildered by simultaneously convulsing patients before..";
+ next;
+ mes "[Nurse Lapplad]";
+ mes "Lucky you were here to suppress it with ease.";
+ next;
+ mes "[Nurse Lapplad]";
+ mes "I am sorry but can you report this to Fresa on your way? You know who Fresa is?";
+ next;
+ setquest 5365;// Urgent News
+ recorder_quest_status = 2;
+ mes "[Nurse Lapplad]";
+ mes "It is a situation so I am asking you a favor.";
+ close;
+ case 2:
+ mes "[Nurse Lapplad]";
+ mes "I am sorry but can you report this to Fresa on your way? This is a favor.";
+ close;
+ }
+ }
+ end;
+
+S_Random:
+ .rand_npc = getarg(0);
+ getmapxy .@map$,.@x,.@y, UNITTYPE_NPC, "Patient#EP15.2MR_0" + .rand_npc;
+ disablenpc "Patient#EP15.2MR_0" + .rand_npc;
+ monster .@map$,.@x,.@y, "Convulsing Patient",1015,1,"Nurse Lapplad#EP15.2MR::OnMobDead";
+ .mob_id = $@mobid[0];
+ initnpctimer;
+ return;
+
+OnMobDead:
+ enablenpc "Patient#EP15.2MR_0" + .rand_npc;
+ stopnpctimer;
+ if (rand(7) > 0) // inaccurate
+ callsub S_Random, rand(1,7);
+ end;
+
+OnTimer3000:
+ if (rand(100) < 50) {
+ if (.rand_npc == 1) unittalk .mob_id, "Woouuu~";
+ else if (.rand_npc == 2) unittalk .mob_id, "Wooaa~";
+ else if (.rand_npc == 3) unittalk .mob_id, "Eh~";
+ else if (.rand_npc == 4) unittalk .mob_id, "Ha-ak-ha-ak~";
+ else if (.rand_npc == 5) unittalk .mob_id, "Uh- Ugh~";
+ else if (.rand_npc == 6) unittalk .mob_id, "Eh~";
+ else if (.rand_npc == 7) unittalk .mob_id, "Kur..urk..kekek..";
+ }
+ initnpctimer;
+ end;
+}
+
+// Patients
+un_bk_q,286,254,4 script Patient#EP15.2MR_01 4_M_LIEMAN,{
+ callfunc("F_time_limit_recorder");
+ emotion ET_PROFUSELY_SWEAT;
+ mes "[Patient]";
+ mes "Hurts.. It hurts..";
+ close;
+}
+
+un_bk_q,296,252,4 script Patient#EP15.2MR_02 4_M_DSTMANDEAD,{
+ callfunc("F_time_limit_recorder");
+ mes "[Patient]";
+ mes "I'm fine. They're making a fuss for no reason.";
+ close;
+}
+
+un_bk_q,316,231,4 script Patient#EP15.2MR_03 4_M_DIEMAN,{
+ callfunc("F_time_limit_recorder");
+ emotion ET_SLEEPY;
+ mes "[Patient]";
+ mes "I keep feeling sleepy for some reason. Is it because I'm sick?";
+ close;
+}
+un_bk_q,281,226,4 script Patient#EP15.2MR_04 4_F_PATIENT,{
+ callfunc("F_time_limit_recorder");
+ emotion ET_OHNO;
+ mes "[Patient]";
+ mes "My head feels blank.. Uh? Did you say something?";
+ close;
+}
+
+un_bk_q,320,249,4 script Patient#EP15.2MR_05 4_M_PATIENT,{
+ callfunc("F_time_limit_recorder");
+ emotion ET_CONFUSE;
+ mes "[Patient]";
+ mes "Ugh.. Feels like my whole body is cramped.";
+ close;
+}
+
+un_bk_q,306,233,4 script Patient#EP15.2MR_06 4_M_DIEMAN,{
+ callfunc("F_time_limit_recorder");
+ emotion ET_SEXY;
+ mes "[Patient]";
+ mes "Urk.. I feel sick even though I didn't drink.";
+ close;
+}
+
+un_bk_q,310,261,4 script Patient#EP15.2MR_07 4_M_LIEMAN,{
+ callfunc("F_time_limit_recorder");
+ emotion ET_OTL;
+ mes "[Patient]";
+ mes "Oh no is there a transfectant found in me..";
+ close;
+}
+
+// Nurses
+un_bk_q,313,261,2 script Nurse#EP15.2MR1 4_F_NURSE,{
+ callfunc("F_time_limit_recorder");
+ mes "[Nurse]";
+ mes "Patient~ That chair is quite high.. doesn't your head ache?";
+ close;
+}
+
+un_bk_q,322,249,2 script Nurse#EP15.2MR2 4_F_NURSE,{
+ callfunc("F_time_limit_recorder");
+ mes "[Nurse]";
+ mes "Why does he say he has a cramp? The other patients didn't have that problem.";
+ close;
+}
+
+un_bk_q,316,233,4 script Nurse#EP15.2MR3 4_F_NURSE,{
+ callfunc("F_time_limit_recorder");
+ mes "[Nurse]";
+ mes "Argh- I told you not to scribble on the floor while pretending to sleep.";
+ close;
+}
+
+un_bk_q,304,233,4 script Nurse#EP15.2MR4 4_F_NURSE,{
+ callfunc("F_time_limit_recorder");
+ mes "[Nurse]";
+ mes "You ran around the elephant trunk thirty times so you must be sick. Claiming he can't feel dizziness. Quite the bluffer.";
+ close;
+}
+
+un_bk_q,283,226,2 script Nurse#EP15.2MR5 4_F_NURSE,{
+ callfunc("F_time_limit_recorder");
+ emotion ET_CRY;
+ mes "[Nurse]";
+ mes "Ah geez! There is no other issues yet but why is he saying he's dizzy?";
+ close;
+}
+
+un_bk_q,284,255,4 script Nurse#EP15.2MR6 4_F_NURSE,{
+ callfunc("F_time_limit_recorder");
+ mes "[Nurse]";
+ mes "So what do you mean!! Where does it hurt!!";
+ close;
+}
+
+un_bk_q,296,254,4 script Nurse#EP15.2MR7 4_F_NURSE,{
+ callfunc("F_time_limit_recorder");
+ emotion ET_CRY;
+ mes "[Nurse]";
+ mes "What do you mean nothing is wrong, your face has gone purple.";
+ close;
+}
+
+// Cafeteria
+un_bk_q,271,290,0 script Cafeteria#G-1 WARPNPC,1,1,{
+ end;
+OnTouch:
+ callfunc("F_time_limit_recorder");
+ if (recorder_quest_type == 5 && recorder_quest_status == 0) {
+ emotion ET_FRET, getnpcid(0, "Transportation Executive Ernon");
+ mes "[Transportation Executive Ernon]";
+ mes "Hey~ This is a time to borrow even the hands of small children. Stop goofing around and come here.";
+ close;
+ }
+ warp "un_bk_q",255,261;
+ end;
+}
+
+un_bk_q,324,290,0 script Cafeteria#G-2 WARPNPC,1,1,{
+ end;
+OnTouch:
+ callfunc("F_time_limit_recorder");
+ if (recorder_quest_type == 5 && recorder_quest_status == 0) {
+ mes "[Transportation Executive Ernon]";
+ mes "Hey~ This is a time to borrow even the hands of small children. Stop goofing around and come here.";
+ close;
+ }
+ warp "un_bk_q",340,261;
+ end;
+}
+
+un_bk_q,279,294,4 script Transportation Executive Ernon 4_M_LGTMAN,{
+ callfunc("F_time_limit_recorder");
+ switch( recorder_quest_type ) {
+ case 1:
+ mes "[Transportation Executive Ernon]";
+ mes "We used to deliver things like daily necessities or research tools here before the accident.";
+ next;
+ mes "[Transportation Executive Ernon]";
+ mes "Work that involved going out to other places a lot more even as a staff member here.";
+ close;
+ case 2:
+ emotion ET_QUESTION;
+ mes "[Transportation Executive Ernon]";
+ mes "What?! Is something going on? The Mechanicians and Facilities managers look busy.";
+ close;
+ case 3:
+ emotion ET_BEST;
+ mes "[Transportation Executive Ernon]";
+ mes "Yaa~ Did you try the grapes?";
+ next;
+ mes "[Transportation Executive Ernon]";
+ mes "Isn't it great that we can grow fresh grapes in an underground evacuation facility like this?";
+ close;
+ case 4:
+ mes "[Transportation Executive Ernon]";
+ mes "Some people are suddenly attacking others.";
+ next;
+ mes "[Transportation Executive Ernon]";
+ mes "What in the hell is going on?";
+ close;
+ case 5:
+ switch( recorder_quest_status ) {
+ case 0:
+ emotion ET_QUESTION;
+ mes "[Transportation Executive Ernon]";
+ mes "They were talking about it in the broadcast since yesterday so you know the gist of the situation, right?";
+ next;
+ mes "[Transportation Executive Ernon]";
+ mes "The contaminant is getting to the interior of the air-raid shelter so the decision has been made to move all supplies to the uncontaminated zone Z-2 that the Chemical Substance Specialists found.";
+ next;
+ mes "[Transportation Executive Ernon]";
+ mes "There was a request to move the cargo with the Adventurers since the scrawny researchers won't be of help.";
+ next;
+ mes "[Transportation Executive Ernon]";
+ mes "Alright- let's move the cargo to Zone Z-2 first.";
+ next;
+ mes "[Transportation Executive Ernon]";
+ mes "If you go to the machine Warehouse on your way back there will a person called Al. Tell him";
+ next;
+ emotion ET_KIK;
+ mes "[Transportation Executive Ernon]";
+ mes "^0000FF You idiots!! Stop wasting material with stupid machines!!^000000 for me and come back.";
+ next;
+ select("Eh?");
+ mes "[Transportation Executive Ernon]";
+ mes "Don't understand? Tell Al in the machine Warehouse";
+ next;
+ emotion ET_KIK;
+ mes "[Transportation Executive Ernon]";
+ mes "^0000FF You idiots!! Stop wasting material with stupid machines!!^000000 and come back.";
+ next;
+ setquest 5366;// Limits of Journeys
+ setquest 5367;// Transport Necessities
+ recorder_quest_status = 1;
+ mes "[Transportation Executive Ernon]";
+ mes "Remember to get every postposition right and convey my feeling 100%.";
+ close;
+ case 1:
+ case 2:
+ mes "[Transportation Executive Ernon]";
+ mes "Transport the cargo to Zone Z-2 first.";
+ next;
+ mes "[Transportation Executive Ernon]";
+ mes "On your way back go to the machine Warehouse and tell Al";
+ next;
+ emotion ET_KIK;
+ mes "[Transportation Executive Ernon]";
+ mes "??^0000FF You idiots!! Stop wasting material with stupid machines!!^000000?? for me and come back.";
+ close;
+ case 3:
+ mes "[Transportation Executive Ernon]";
+ mes "You conveyed my feeling right?";
+ next;
+ mes "[Transportation Executive Ernon]";
+ mes "They should be smartened up by now. They wouldn't waste precious components again, right?";
+ next;
+ mes "[Transportation Executive Ernon]";
+ mes "Here! This is compensation for the job.";
+ next;
+ erasequest 5367;// Transport Necessities
+ erasequest 5368;// Goods delivery Complete
+ erasequest 5369;// Message Delivery Complete
+ setquest 5370;// Memory Record
+ getexp 750000,500000;
+ recorder_quest_status = 4;
+ mes "- The small round capsule has percolated through skin. It feels like experience has accumulated.";
+ next;
+ mes "[Transportation Executive Ernon]";
+ mes "Though our survival isn't sure because of the contaminant,";
+ next;
+ mes "[Transportation Executive Ernon]";
+ mes "The chief researcher told us to adequately compensate the adventurers who were caught up in the explosion.";
+ next;
+ mes "[Transportation Executive Ernon]";
+ mes "Don't worry about it though.";
+ close;
+ case 4:
+ mes "[Transportation Executive Ernon]";
+ mes "Though our survival isn't sure because of the contaminant,";
+ next;
+ mes "[Transportation Executive Ernon]";
+ mes "The chief researcher told us to adequately compensate the adventurers who were caught up in the explosion.";
+ next;
+ mes "[Transportation Executive Ernon]";
+ mes "Don't worry about it though.";
+ close;
+ }
+ }
+}
+
+un_bk_q,297,287,6 script Adventurer Jean#EP15.2M 4_M_HUBOY,{
+ callfunc("F_time_limit_recorder");
+ switch( recorder_quest_type ) {
+ case 1:
+ mes "[Adventurer Jean]";
+ mes "Uh?! You're an adventurer too?";
+ next;
+ mes "[Adventurer Jean]";
+ mes "Ugh.. It seems you are unlucky as well.";
+ close;
+ case 2:
+ mes "[Adventurer Jean]";
+ mes "Don't you think this place is trying to exploit us Adventurers?";
+ next;
+ mes "[Adventurer Jean]";
+ mes "The Cafeteria food is good though.";
+ close;
+ case 3:
+ mes "[Adventurer Jean]";
+ mes "Grapes were served on the side today.";
+ next;
+ mes "[Adventurer Jean]";
+ mes "I like grapes. I want to eat more.";
+ close;
+ case 4:
+ mes "[Adventurer Jean]";
+ mes "A friend I made here is confined in the temporary clinic. They found a transfectant or something.";
+ next;
+ mes "[Adventurer Jean]";
+ mes "To us adventurers a healthy body is an asset.";
+ close;
+ case 5:
+ mes "[Adventurer Jean]";
+ mes "I ate a lot of different things from adventuring places.";
+ next;
+ mes "[Adventurer Jean]";
+ mes "I think the food here is one of the best.";
+ close;
+ }
+}
+
+un_bk_q,318,299,2 script Cafeteria Lady#EP15.2MR 4_F_CAVE1,{
+ callfunc("F_time_limit_recorder");
+ switch( recorder_quest_type ) {
+ case 1:
+ mes "[Cafeteria Lady]";
+ mes "Sorry. We aren't ready to distribute food yet.";
+ close;
+ case 2:
+ mes "[Cafeteria Lady]";
+ mes "Grab a plate or tray and wait in line.";
+ close;
+ case 3:
+ mes "[Cafeteria Lady]";
+ mes "Oh no what should we do? We ran out of grapes.";
+ next;
+ mes "[Cafeteria Lady]";
+ mes "New grapes should be delivered from the farm soon. Do you want to wait?";
+ close;
+ case 4:
+ mes "[Cafeteria Lady]";
+ mes "Do you know that's the temporary clinic? You cannot go that way now.";
+ next;
+ mes "[Cafeteria Lady]";
+ mes "The passage is blocked because of convulsing patients.";
+ close;
+ case 5:
+ mes "[Cafeteria Lady]";
+ mes "You are working hard.";
+ close;
+ }
+}
+
+// Corridor
+un_bk_q,280,280,8 script Access Control Guard#EP_clinic1 4_M_HUMAN_02,{
+ callfunc("F_time_limit_recorder");
+ switch( recorder_quest_type ) {
+ case 1:
+ case 2:
+ case 3:
+ mes "[Access Control Guard]";
+ mes "You cannot enter this area because it is under construction.";
+ next;
+ mes "[Access Control Guard]";
+ mes "According to the Facilities managers it will be later used as a Clinic.";
+ close;
+ case 4:
+ mes "[Access Control Guard]";
+ mes "Access to the temporary clinic is restricted to quarantine convulsing patients.";
+ next;
+ mes "[Access Control Guard]";
+ mes "I ask for your understanding.";
+ close;
+ case 5:
+ mes "[Access Control Guard]";
+ mes "Movement in this area is currently prohibited.";
+ next;
+ mes "[Access Control Guard]";
+ mes "I ask for your understanding.";
+ close;
+ }
+}
+un_bk_q,313,280,8 duplicate(Access Control Guard#EP_clinic1) Access Control Guard#EP_clinic2 4_M_HUMAN_02
+un_bk_q,340,235,6 duplicate(Access Control Guard#EP_clinic1) Access Control Guard#EP_clinic3 4_M_HUMAN_02
+un_bk_q,298,203,4 duplicate(Access Control Guard#EP_clinic1) Access Control Guard#EP_clinic4 4_M_HUMAN_02
+un_bk_q,255,236,2 duplicate(Access Control Guard#EP_clinic1) Access Control Guard#EP_clinic5 4_M_HUMAN_02
+
+un_bk_q,248,258,2 script Adventurer Dally#EP15.2 4_F_SITDOWN,{
+ callfunc("F_time_limit_recorder");
+ mes "[Adventurer Dally]";
+ mes "Darn it!! Frustrating";
+ next;
+ sc_start SC_INCREASEAGI,240000,10;
+ mes "[Adventurer Dally]";
+ mes "Sister- Run~";
+ close;
+}
+
+// Z-2 Zone
+un_bk_q,72,53,4 script Distribution Chief Avrandi 4_M_TWTEAMAN,{
+ callfunc("F_time_limit_recorder");
+ switch( recorder_quest_type ) {
+ case 1:
+ emotion ET_OHNO;
+ mes "[Distribution Chief Avrandi]";
+ mes "It is a relief we were able to evacuate to the air-raid shelter interior in advance.";
+ next;
+ mes "[Distribution Chief Avrandi]";
+ mes "If we weren't able to evacuate..? We probably won't be here.";
+ close;
+ case 2:
+ emotion ET_QUESTION;
+ mes "[Distribution Chief Avrandi]";
+ mes "Is there something wrong?";
+ next;
+ mes "[Distribution Chief Avrandi]";
+ mes "A while ago the Facilities managers were running around in haste.";
+ close;
+ case 3:
+ emotion ET_HUK;
+ mes "[Distribution Chief Avrandi]";
+ mes "What in the world?! You ate fresh grapes? Why didn't I get to eat them? Why?";
+ close;
+ case 4:
+ emotion ET_SHY;
+ mes "[Distribution Chief Avrandi]";
+ mes "This place is sure quiet. Why you ask?";
+ next;
+ mes "[Distribution Chief Avrandi]";
+ mes "Not many people come this far.";
+ close;
+ case 5:
+ if (recorder_quest_status == 1) {
+ mes "[Distribution Chief Avrandi]";
+ mes "Ah! Come on in. It seems there are a lot of visitors today because of the broadcast this morning.";
+ next;
+ mes "[Distribution Chief Avrandi]";
+ mes "You're here because Ernon sent you right?";
+ next;
+ mes "[Distribution Chief Avrandi]";
+ mes "I have received the item you have brought.";
+ next;
+ setquest 5368;// Goods delivery Complete
+ recorder_quest_status = 2;
+ mes "[Distribution Chief Avrandi]";
+ mes "Eh-? Are you taking it back? That is a lot of work.";
+ close;
+ }
+ mes "[Distribution Chief Avrandi]";
+ mes "Good luck. You are working hard.";
+ close;
+ }
+}
+
+// B-1 Warehouse
+un_bk_q,34,138,4 script Warehouse Keeper Pik#EP 4W_M_03,{
+ callfunc("F_time_limit_recorder");
+ switch( recorder_quest_type ) {
+ case 1:
+ mes "[Warehouse Keeper Pik]";
+ mes "I don't know what brings you here but please don't touch anything.";
+ next;
+ mes "[Warehouse Keeper Pik]";
+ mes "I haven't finished checking the stock and it would be annoying if anything went missing.";
+ close;
+ case 2:
+ mes "[Warehouse Keeper Pik]";
+ mes "You're an adventurer. You don't have to deliver air cleaners here.";
+ next;
+ mes "[Warehouse Keeper Pik]";
+ mes "It's a warehouse anyway. The independent air circulation system is enough.";
+ close;
+ case 3:
+ mes "[Warehouse Keeper Pik]";
+ mes "Aahh- Looking after the warehouse is annoying.";
+ next;
+ mes "[Warehouse Keeper Pik]";
+ mes "There is nobody to rotate my shift";
+ close;
+ case 4:
+ mes "[Warehouse Keeper Pik]";
+ mes "Wha- wha- wait stop!!";
+ next;
+ mes "[Warehouse Keeper Pik]";
+ mes "You're not here to ambush me right? It's alright if not.";
+ close;
+ case 5:
+ mes "[Warehouse Keeper Pik]";
+ mes "Are you here to move items?";
+ next;
+ mes "[Warehouse Keeper Pik]";
+ mes "The goods in this warehouse should not be today I think? From what I know today we are moving necessities first.";
+ close;
+ }
+}
+
+// Corridor F-2
+un_bk_q,347,217,4 script Facilities manager Remodeling 4_M_EINMAN,{
+ callfunc("F_time_limit_recorder");
+ switch( recorder_quest_type ) {
+ case 1:
+ if (recorder_quest_status == 9) {
+ if (isbegin_quest(5349) == 0) {
+ emotion ET_QUESTION;
+ mes "[Facilities manager Remodeling]";
+ mes "Uh?! Hello. First time meeting you. What brings you here?";
+ next;
+ select("Explain situation.");
+ mes "[Facilities manager Remodeling]";
+ mes "Ah! Is that so? Fresa you say? It hasn't been long since my department was placed here.";
+ next;
+ mes "[Facilities manager Remodeling]";
+ mes "I only heard of the name Fresa.";
+ next;
+ setquest 5349;// Headcount Complete
+ mes "[Facilities manager Remodeling]";
+ mes "Anyway the current number of us facilities managers is ^FF000028^000000.";
+ next;
+ mes "[Facilities manager Remodeling]";
+ mes "There might be some others who are hiding somewhere but as of right now there are ^FF000028^000000.";
+ next;
+ mes "[Facilities manager Remodeling]";
+ mes "Tell Fresa on your way that Facilities managers are inspecting facilities in their assigned areas because the air-raid shelter facilities have not really been used.";
+ close;
+ }
+ mes "[Facilities manager Remodeling]";
+ mes "The current number of facilities managers is ^FF000028^000000.";
+ next;
+ mes "[Facilities manager Remodeling]";
+ mes "Tell Fresa that Facilities managers are inspecting facilities in their assigned areas because the air-raid shelter facilities have not really been used.";
+ close;
+ }
+ mes "[Facilities manager Remodeling]";
+ mes "I don't know who equipped the air-raid shelter. But it surely is well made and sturdy.";
+ close;
+ case 2:
+ mes "[Facilities manager Remodeling]";
+ mes "I don't know who equipped the air-raid shelter. But it surely is well made and sturdy.";
+ close;
+ case 3:
+ mes "[Facilities manager Remodeling]";
+ mes "What!! That grape!! I had some already so I am guessing it's not mine.";
+ close;
+ case 4:
+ mes "[Facilities manager Remodeling]";
+ mes "I don't know who equipped the air-raid shelter. But it surely is well made and sturdy.";
+ close;
+ case 5:
+ mes "[Facilities manager Remodeling]";
+ mes "I don't know who equipped the air-raid shelter. But it surely is well made and sturdy.";
+ close;
+ }
+}
+
+// Off Limits
+un_bk_q,102,97,2 script Adventurer Breezin#EP15.2MR 4_F_BRZ_INDOLD,{
+ callfunc("F_time_limit_recorder");
+ switch( recorder_quest_type ) {
+ case 1:
+ mes "[Adventurer Breezin]";
+ mes "Ahh.. Why did I travel here..";
+ next;
+ mes "[Adventurer Breezin]";
+ mes "Hey don't think of going out that way. It's going to be dangerous because of the explosion.";
+ close;
+ case 2:
+ mes "[Adventurer Breezin]";
+ mes "Today is strange. Hey do you see the mysterious device over there too?";
+ close;
+ case 3:
+ mes "[Adventurer Breezin]";
+ mes "I think I said it 30 times today alone but there is no device at the door.";
+ next;
+ mes "[Adventurer Breezin]";
+ mes "I am itching for an adventure but safety outside isn't confirmed so don't think of going outside.";
+ close;
+ case 4:
+ mes "[Adventurer Breezin]";
+ mes "A while I ago I couldn't stop the Chemical Substance Specialists from going outside.";
+ next;
+ mes "[Adventurer Breezin]";
+ mes "Seeing how they didn't return, they must be dead, right?";
+ close;
+ case 5:
+ mes "[Adventurer Breezin]";
+ mes "The situation has grown out of control.";
+ next;
+ mes "[Adventurer Breezin]";
+ mes "Haa- Should have I stopped those people leaving the air-raid shelter?";
+ close;
+ }
+}
+
+// Bulletin Board
+un_bk_q,101,92,8 script Off Limits#01 4_BULLETIN_BOARD2,{ end; }
+un_bk_q,94,92,8 duplicate(Off Limits#01) Off Limits#02 4_BULLETIN_BOARD2
+un_bk_q,22,279,4 duplicate(Off Limits#01) Machine Warehouse 4_BULLETIN_BOARD2
+un_bk_q,215,303,4 duplicate(Off Limits#01) farm#C0 4_BULLETIN_BOARD2
+
+un_bk_q,58,185,4 duplicate(Off Limits#01) Control room#Left 4_BULLETIN_BOARD2
+un_bk_q,139,187,4 duplicate(Off Limits#01) Control room#Right 4_BULLETIN_BOARD2
+
+un_bk_q,101,122,4 duplicate(Off Limits#01) Monitoring room#A0Center 4_BULLETIN_BOARD2
+un_bk_q,58,171,4 duplicate(Off Limits#01) Monitoring room#L1Left 4_BULLETIN_BOARD2
+un_bk_q,139,171,4 duplicate(Off Limits#01) Monitoring room#L2Right 4_BULLETIN_BOARD2
+
+un_bk_q,256,239,4 duplicate(Off Limits#01) Temporary Clinic#G1 4_BULLETIN_BOARD2
+un_bk_q,301,204,4 duplicate(Off Limits#01) Temporary Clinic#H0 4_BULLETIN_BOARD2
+
+un_bk_q,58,121,4 duplicate(Off Limits#01) A-0 Zone#L1 4_BULLETIN_BOARD2
+un_bk_q,141,115,4 duplicate(Off Limits#01) A-0 Zone#L2 4_BULLETIN_BOARD2
+un_bk_q,278,193,4 duplicate(Off Limits#01) A-0 Zone#H0Left 4_BULLETIN_BOARD2
+un_bk_q,317,193,4 duplicate(Off Limits#01) A-0 Zone#H0Right 4_BULLETIN_BOARD2
+
+un_bk_q,49,137,4 duplicate(Off Limits#01) B-1 Warehouse 4_BULLETIN_BOARD2
+
+un_bk_q,219,265,4 duplicate(Off Limits#01) C-0 Zone#G1 4_BULLETIN_BOARD2
+
+un_bk_q,247,217,4 duplicate(Off Limits#01) F-1 Zone#G1 4_BULLETIN_BOARD2
+un_bk_q,349,217,4 duplicate(Off Limits#01) F-2 Zone#G2 4_BULLETIN_BOARD2
+
+un_bk_q,214,283,4 duplicate(Off Limits#01) G-1 Zone#C0 4_BULLETIN_BOARD2
+un_bk_q,228,217,4 duplicate(Off Limits#01) G-1 Zone#F1 4_BULLETIN_BOARD2
+un_bk_q,273,203,4 duplicate(Off Limits#01) G-1 Zone#H0 4_BULLETIN_BOARD2
+un_bk_q,322,203,4 duplicate(Off Limits#01) G-2 Zone#H0 4_BULLETIN_BOARD2
+un_bk_q,388,266,4 duplicate(Off Limits#01) G-2 Zone#I0 4_BULLETIN_BOARD2
+
+un_bk_q,122,125,4 duplicate(Off Limits#01) H-0 Zone#Right 4_BULLETIN_BOARD2
+un_bk_q,78,125,4 duplicate(Off Limits#01) H-0 Zone#Left 4_BULLETIN_BOARD2
+un_bk_q,340,203,4 duplicate(Off Limits#01) H-0 Zone#H0 4_BULLETIN_BOARD2
+un_bk_q,300,184,4 duplicate(Off Limits#01) H-0 Zone#Z0 4_BULLETIN_BOARD2
+
+un_bk_q,368,267,4 duplicate(Off Limits#01) I-0 Zone#G2 4_BULLETIN_BOARD2
+
+un_bk_q,25,193,4 duplicate(Off Limits#01) J-0 Zone#L1 4_BULLETIN_BOARD2
+
+un_bk_q,173,193,4 duplicate(Off Limits#01) K-0 Zone#L2 4_BULLETIN_BOARD2
+
+un_bk_q,71,121,4 duplicate(Off Limits#01) L-1 Zone#A0 4_BULLETIN_BOARD2
+un_bk_q,22,259,4 duplicate(Off Limits#01) L-1 Zone#J0 4_BULLETIN_BOARD2
+un_bk_q,126,121,4 duplicate(Off Limits#01) L-2 Zone#A0 4_BULLETIN_BOARD2
+un_bk_q,171,233,4 duplicate(Off Limits#01) L-2 Zone#K0 4_BULLETIN_BOARD2
+
+un_bk_q,300,194,4 duplicate(Off Limits#01) Z-0 Zone#H0 4_BULLETIN_BOARD2
+un_bk_q,164,55,4 duplicate(Off Limits#01) Z-0 Zone#Z1 4_BULLETIN_BOARD2
+un_bk_q,27,55,4 duplicate(Off Limits#01) Z-0 Zone#Z2 4_BULLETIN_BOARD2
+un_bk_q,230,167,4 duplicate(Off Limits#01) Z-1 Zone#Z0 4_BULLETIN_BOARD2
+un_bk_q,365,167,4 duplicate(Off Limits#01) Z-2 Zone#Z0 4_BULLETIN_BOARD2
+
+un_bk_q,97,84,4 script Dimension move Portal#E PORTAL,{
+ callfunc("F_time_limit_recorder");
+ mes "[Dimension-mover]";
+ mes "Do you want finish your travels and";
+ mes "go back to your original time?";
+ mes "^FF0000All traces in this place will be erased if you go back to your original time.^000000";
+ next;
+ if (select( "Stay here.", "Go back." ) == 2) {
+ mes "[Dimension-mover]";
+ delitem 6825, countitem(6825);// Air Purifier Box
+ delitem 6826, countitem(6826);// Fresh Grape
+ for ( .@quest_id = 5341; .@quest_id < 5371; .@quest_id++ ) {
+ if (isbegin_quest(.@quest_id) > 0)
+ erasequest .@quest_id;
+ }
+ recorder_quest_type = 0;
+ recorder_quest_status = 0;
+ mes "Your whole body becomes heavy and time seems to be passing faster around you.";
+ close2;
+ warp "un_bunker",98,91;
+ }
+ end;
+}
diff --git a/npc/re/quests/quests_aldebaran.txt b/npc/re/quests/quests_aldebaran.txt
index baa609ff2f7..a8ce459a396 100644
--- a/npc/re/quests/quests_aldebaran.txt
+++ b/npc/re/quests/quests_aldebaran.txt
@@ -62,7 +62,7 @@ c_tower1,232,222,5 script Belljamin Button#ct 968,{
case 3:
mes "[Belljamin Button]";
mes "I am here all day for the safety of adventurers. I always alert them about the danger. That's why I need some form of payment.";
- emotion e_swt;
+ emotion ET_SWEAT;
close;
}
break;
diff --git a/npc/re/quests/quests_brasilis.txt b/npc/re/quests/quests_brasilis.txt
index 248a18b807f..311383da654 100644
--- a/npc/re/quests/quests_brasilis.txt
+++ b/npc/re/quests/quests_brasilis.txt
@@ -86,7 +86,7 @@ OnTimer10000:
end;
OnGo:
- emotion e_gasp;
+ emotion ET_SURPRISE;
initnpctimer;
end;
}
@@ -165,7 +165,7 @@ brasilis,192,133,6 script Lucia#brasilis 4_F_BRZ_WOMAN,{
mes "the south beach.";
mes "I hope some experienced adventurers";
mes "will come to help.";
- emotion e_sigh;
+ emotion ET_OHNO;
close;
}
.@nQState1 = checkquest(9028);
@@ -211,7 +211,7 @@ brasilis,192,133,6 script Lucia#brasilis 4_F_BRZ_WOMAN,{
mes "volunteer for this job.";
mes " ";
mes "I really hate Hydra!";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
}
@@ -308,7 +308,7 @@ OnInit:
end;
OnTimer7000:
- emotion e_gasp;
+ emotion ET_SURPRISE;
stopnpctimer;
initnpctimer;
end;
@@ -716,7 +716,7 @@ brasilis,203,64,3 script Strange Kid#bra 4_M_KID1,{
next;
mes "- You get closer and pretend to take caution. -";
next;
- emotion e_kis;
+ emotion ET_CHUP;
mes "(kiss~)";
next;
mes "- The kid laughs again lightly then puts something in your hand. -";
@@ -729,8 +729,8 @@ brasilis,203,64,3 script Strange Kid#bra 4_M_KID1,{
mes "["+strcharinfo(0)+"]";
mes "Oops, guarana berry?";
mes "Ah! Thank you very much!";
- emotion e_kis2,1;
- emotion e_heh;
+ emotion ET_CHUPCHUP, playerattached();
+ emotion ET_SMILE;
next;
mes "["+strcharinfo(0)+"]";
mes "If I have this, I can make a guarana candy.";
@@ -874,7 +874,7 @@ OnTouch_:
mes "Somewhere, a human!";
mes "I got it. You are!!!";
specialeffect EF_HIT1,AREA,"Jaguar#bra";
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
next;
mes "[Jaguar]";
mes "Don't be afraid human.";
@@ -1275,7 +1275,7 @@ brasilis,270,145,5 script Brasilis Girl#bra 4_F_BRZ_INDIAN,5,5,{
mes "who is Jasi?";
mes "Your.... lover?";
next;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Jasira]";
mes "l...o...v...e...lover??!!";
mes "No way~";
@@ -1301,7 +1301,7 @@ brasilis,270,145,5 script Brasilis Girl#bra 4_F_BRZ_INDIAN,5,5,{
mes "[Jasira]";
mes "Cuz' Jasi is really gorgeous and the most important thing is he is taking care of the water lily in Brasilis.";
next;
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
mes "["+strcharinfo(0)+"]";
mes "Brasilis water lily??!!";
mes "Isn't it the uniqe flower?";
@@ -1486,7 +1486,7 @@ brasilis,270,145,5 script Brasilis Girl#bra 4_F_BRZ_INDIAN,5,5,{
OnTouch:
if (brazil_regia == 2)
- emotion e_an;
+ emotion ET_FRET;
end;
}
@@ -1659,7 +1659,7 @@ bra_dun02,71,200,3 script Water lily#bra HIDDEN_NPC,{
mes "[Jasi]";
mes "It makes me miss my childhood.";
next;
- emotion e_omg,0,"Recluse#bra";
+ emotion ET_HUK, getnpcid(0, "Recluse#bra");
mes "[Jasi]";
mes "Hoho!!!!";
mes "I've been here for as long as I can remember...";
@@ -1836,7 +1836,7 @@ brasilis,185,246,5 script Pedro#bra 1_M_SIZ,{
mes "[Pedro]";
mes "What else are we supposed to do? If we don't do it someone else will.";
next;
- emotion e_an,0,"Mariana#bra";
+ emotion ET_FRET, getnpcid(0, "Mariana#bra");
mes "[Mariana]";
mes "Argh~ Boys are so frustrating sometimes.";
next;
@@ -2361,7 +2361,7 @@ bra_in01,151,180,3 script Mirror#bra CLEAR_NPC,{
mes "Behind you...";
enablenpc "Ghost#bra";
next;
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
mes "["+strcharinfo(0)+"]";
mes "The stories about the ghost are true~!";
next;
@@ -2390,8 +2390,8 @@ bra_in01,151,180,3 script Mirror#bra CLEAR_NPC,{
.@cpudice = rand(1,6);
.@pcdice = rand(1,6);
if (.@cpudice != .@pcdice) {
- emotion (57+.@cpudice),0,"Ghost#bra";
- emotion (57+.@cpudice),1;
+ emotion (ET_OTL+.@cpudice), getnpcid(0, "Ghost#bra");
+ emotion (ET_OTL+.@pcdice), playerattached();
break;
}
}
@@ -2408,7 +2408,7 @@ bra_in01,151,180,3 script Mirror#bra CLEAR_NPC,{
end;
}
else {
- emotion e_bzz,1;
+ emotion ET_STARE, playerattached();
mes "[Ghost]";
mes "^FF0000Ahh!^000000";
mes "The Ghost disappeared into the toilet.";
diff --git a/npc/re/quests/quests_dewata.txt b/npc/re/quests/quests_dewata.txt
index 9c5b7be64e1..6ba12f2fe95 100644
--- a/npc/re/quests/quests_dewata.txt
+++ b/npc/re/quests/quests_dewata.txt
@@ -778,19 +778,19 @@ dewata,109,262,4 script Memo#dew_drink 534,{
if (rand(3)) {
mes "[Memo]";
mes "Oh god! We don't have a message from the Jaty tribe yet.";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Memo]";
mes "They have never broken a promise for 10 years, I do not know the reason. What's happening?";
next;
mes "[Memo]";
mes "I might spoil all the liquid if it is going on like this.";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
mes "[Memo]";
mes "What should I do? I still don't have any news from the Jaty tribe.";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Memo]";
mes "Oh no~ All the liquid is going to spoil...";
@@ -798,7 +798,7 @@ dewata,109,262,4 script Memo#dew_drink 534,{
select("What happened?");
mes "[Memo]";
mes "Who are you?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
mes "[Memo]";
mes "You are an adventurer, right?";
@@ -821,9 +821,9 @@ dewata,109,262,4 script Memo#dew_drink 534,{
next;
mes "[Memo]";
mes "... ...";
- emotion e_dots;
+ emotion ET_THINK;
next;
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Memo]";
mes "Ah, right! Are you busy now?";
next;
@@ -831,7 +831,7 @@ dewata,109,262,4 script Memo#dew_drink 534,{
mes "[Memo]";
mes "Hmm, I have no choice.";
mes "You don't care that others are in trouble. What has this world come to?";
- emotion e_pif;
+ emotion ET_HNG;
close;
}
mes "[Memo]";
@@ -859,7 +859,7 @@ dewata,109,262,4 script Memo#dew_drink 534,{
next;
mes "[Memo]";
mes "... ... ... ...";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "[Memo]";
mes "You didn't find out what happened?";
@@ -918,7 +918,7 @@ dewata,109,262,4 script Memo#dew_drink 534,{
if (checkquest(5043,PLAYTIME) == 0) {
mes "[Memo]";
mes "... ... ...";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "- Memo is making an ark. -";
close;
@@ -956,7 +956,7 @@ dewata,109,262,4 script Memo#dew_drink 534,{
mes "[Memo]";
mes "In other words, it's easy to say that we'll help others but it's hard to actually do the action.";
next;
- emotion e_thx;
+ emotion ET_THANKS;
mes "[Memo]";
mes "You really did a great job. I like you because you are different from today's youngins.";
changequest 5043,5044;
@@ -1080,18 +1080,18 @@ dew_fild01,114,275,4 script Lero#dew_drink 536,{
mes "[Lero]";
mes "Oh no! I have so many orders and I'm running out of ingredients.";
mes "Not yet? What's going on, Poby? Where did he go?";
- emotion e_an;
+ emotion ET_FRET;
next;
select("Excuse me, but are you Lero?");
mes "[Lero]";
mes "When Poby gets back here, I'm gonna give him a beating he'll never forget!";
- emotion e_ag;
+ emotion ET_ANGER;
next;
mes "- Lero seems pretty mad at someone and ignores you -";
next;
mes "[Lero]";
mes "Oops. Who are you?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
select("Memo sent me here.");
mes "[Lero]";
@@ -1123,7 +1123,7 @@ dew_fild01,114,275,4 script Lero#dew_drink 536,{
} else if (dew_drink == 2) {
mes "[Lero]";
mes "Did you find Poby?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
mes "[Lero]";
mes "... ... ...";
@@ -1135,7 +1135,7 @@ dew_fild01,114,275,4 script Lero#dew_drink 536,{
mes "[Lero]";
mes "You're back... and... Poby...";
mes "How is Poby?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
select("Poby.....");
mes "[Lero]";
@@ -1196,7 +1196,7 @@ dew_fild01,114,275,4 script Lero#dew_drink 536,{
mes "[Lero]";
mes "60 pieces of nuts, exactly. I will press the oil right now.";
next;
- emotion e_sry;
+ emotion ET_SORRY;
mes "[Lero]";
mes "It takes some time, so go back to Mr. Memo and tell him the situation. Also tell him that I'm sorry for the delay.";
delitem 6402,60; //Oil_Palm_F
@@ -1220,7 +1220,7 @@ dew_fild01,114,275,4 script Lero#dew_drink 536,{
mes "[Lero]";
mes "It is heavier than you might think, so be careful when carrying it.";
next;
- emotion e_sry;
+ emotion ET_SORRY;
mes "[Lero]";
mes "Oh, tell Mr. Memo that I'm sorry for the late delivery, and explain that it wasn't my fault.";
changequest 5041,5042;
@@ -1232,7 +1232,7 @@ dew_fild01,114,275,4 script Lero#dew_drink 536,{
mes "[Lero]";
mes "It is heavier than you might think, so be careful when carrying it.";
next;
- emotion e_sry;
+ emotion ET_SORRY;
mes "[Lero]";
mes "Oh, tell Mr. Memo that I'm sorry for the late delivery, and explain that it wasn't my fault.";
close;
@@ -1247,7 +1247,7 @@ dew_fild01,114,275,4 script Lero#dew_drink 536,{
mes "I clearly remembered giving you 30 bottles of palm tree oil, did you lose it all?";
next;
select("Sorry, it's my fault...");
- emotion e_an;
+ emotion ET_FRET;
mes "[Lero]";
mes "This is the palm tree oil which was in short supply. Be careful pease. It was really hard to get this...";
getitem 6401,.@num; //Palm_O
@@ -1256,15 +1256,15 @@ dew_fild01,114,275,4 script Lero#dew_drink 536,{
} else if (dew_drink == 8) {
mes "[Lero]";
mes "What did Mr. Memo say?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
mes "["+strcharinfo(0)+"]";
- emotion e_loud,1;
+ emotion ET_BLABLA, playerattached();
mes "... ... ... ...";
next;
mes "[Lero]";
mes "Ah... I understand...";
- emotion e_ok;
+ emotion ET_OK;
close;
} else if (dew_drink == 10) {
for(set .@i,0; .@i<7; set .@i,.@i+1)
@@ -1346,7 +1346,7 @@ dew_fild01,259,48,4 script Poby#dew_drink 538,{
if (dew_drink == 2) {
mes "[Poby]";
mes "Ah~ backache...";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
select("Are you Poby?");
mes "[Poby]";
@@ -1359,7 +1359,7 @@ dew_fild01,259,48,4 script Poby#dew_drink 538,{
next;
mes "[Poby]";
mes "You here for my autograph?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
select("Lero made me come here.");
mes "[Poby]";
@@ -1367,14 +1367,14 @@ dew_fild01,259,48,4 script Poby#dew_drink 538,{
next;
mes "[Poby]";
mes "!#@$*&%!@$&!$%!$#*&!@#$";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Poby]";
mes "And I've still never had a girlfriend...";
next;
mes "[Poby]";
mes "!#@$*&%!@$&!$%!$#*&!@#$";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Poby]";
mes "Ah! Sorry. Tell Mr. Lero that I will go back if I can find a way to move.";
@@ -1390,7 +1390,7 @@ dew_fild01,259,48,4 script Poby#dew_drink 538,{
next;
mes "[Poby]";
mes "I can't move at all 'cuz of this backache...";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
close;
} else if (dew_drink == 4) {
if (checkquest(5039) > -1) {
@@ -1412,14 +1412,14 @@ dew_fild01,259,48,4 script Poby#dew_drink 538,{
}
mes "[Poby]";
mes "Ah~ backache...";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Poby]";
mes "Oh!! You're-- Let me guess...";
next;
mes "[Poby]";
mes "... ... ... ...";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "[Poby]";
mes "...you're back! You plan to catch ^0000FFPalm Oil Fruit^000000 instead of me, right?";
@@ -1436,7 +1436,7 @@ dew_fild01,259,48,4 script Poby#dew_drink 538,{
next;
mes "[Poby]";
mes "Ok! Gather ^FF000060^0000FF ^0000FFPalm Oil Fruit^000000 and bring that amount to Mr. Lero.";
- emotion e_gasp;
+ emotion ET_SURPRISE;
close;
} else if (dew_drink == 10) {
mes "[Poby]";
@@ -1493,7 +1493,7 @@ dew_fild01,259,48,4 script Poby#dew_drink 538,{
}
mes "[Poby]";
mes "Ah~ my freakin' back is killing me.";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
@@ -1573,7 +1573,7 @@ dew_fild01,259,48,4 script Poby#dew_drink 538,{
specialeffect2 EF_BASH;
if (isequipped(5009)) { //Safety_Helmet
mes "something falls on your head, but since you're wearing a Safety Helmet you're safe and sound.";
- emotion e_no1,1;
+ emotion ET_BEST, playerattached();
break;
} else {
mes "something smashes down on your head, right where that soft spot is, $#*@! that's a one in a million shot.";
@@ -1988,7 +1988,7 @@ dew_fild01,127,240,4 script Gatti#weapon 813,{
next;
specialeffect2 EF_REPAIRWEAPON;
next;
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Gatti]";
mes "I finished making the weapon. This is called Caress according to the blueprint.";
@@ -2032,7 +2032,7 @@ dew_fild01,127,240,4 script Gatti#weapon 813,{
next;
specialeffect2 EF_REPAIRWEAPON;
next;
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Gatti]";
mes "Here is the Caress! Ask me any time.";
@@ -2207,7 +2207,7 @@ dew_fild01,127,240,4 script Gatti#weapon 813,{
if (.@s3 == 0 && .@s4 == 0) {
mes "[Gatti]";
mes "Oh my~~ Almost succeeded... But failed. Sorry, sorry...";
- emotion e_omg;
+ emotion ET_HUK;
close;
}
getitem2 13067,1,1,0,0,0,0,.@s3,.@s4;
diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt
index 0fb285c3c35..bd7bc0337e4 100644
--- a/npc/re/quests/quests_dicastes.txt
+++ b/npc/re/quests/quests_dicastes.txt
@@ -1333,7 +1333,7 @@ OnTouch:
mes "You hold up your head at the sound of Ahat's voice";
mes "But you see a human in high-ranking Sapha clothing in front of you.";
sc_end SC_Blind;
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
set ep13_3_secret, 14;
erasequest 7198;
close2;
@@ -1538,7 +1538,7 @@ dic_in01,300,280,5 script Minister Ahat#ep133_21 493,{
mes "You hold up your head at the sound of Ahat's voice";
mes "But you see a human in high-ranking Sapha clothing in front of you.";
SC_End SC_Blind;
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
set ep13_3_secret, 14;
erasequest 7198;
close2;
@@ -4594,7 +4594,7 @@ dic_fild01,231,174,5 script BK#ep133_18 496,{
mes "What do you want.";
mes "Why are you harassing me.";
mes "Bully... sob";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[BK]";
mes "Okay. I will cooperate.";
@@ -5073,7 +5073,7 @@ dic_in01,165,104,0 script Frede#13_3_in 454,{
mes "[Frede]";
mes "Oh my!! Why are you sweating so much!";
mes "You look a little pale too......";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[" + strcharinfo(0) + "]";
mes "No, it's nothing.";
@@ -6424,7 +6424,7 @@ function script eldicastes_c {
mes "Commander!";
mes "You've come at such short notice.";
mes "Is there a situation?";
- emotion e_omg,0,"Hound#ep133_is06";
+ emotion ET_HUK, getnpcid(0, "Hound#ep133_is06");
next;
mes "[Hibba Agip]";
mes "Huh? Nothing.";
@@ -6489,8 +6489,8 @@ function script eldicastes_c {
setquest 7185;
next;
disablenpc "Hibba Agip#ep133_is07";
- emotion e_swt2,0,"Hound#ep133_is06";
- emotion e_swt2,0,"Sapha from Manuk";
+ emotion ET_PROFUSELY_SWEAT, getnpcid(0, "Hound#ep133_is06");
+ emotion ET_PROFUSELY_SWEAT, getnpcid(0, "Sapha from Manuk");
mes "Commander Hibba Agip quickly left the room after saying what he wanted to say.";
mes "First, let's listen to Vyhannus's story.";
close;
@@ -7471,7 +7471,7 @@ moc_para01,44,19,3 script Cat Hand Agent#gekk 496,{
mes "It breaks my heart to think my colleagues will be shivering in the blizzard. I hope I don't get into trouble since I can't do anything about it, right?";
next;
if (select ("Why don't you collect it yourself?:I'm sorry to hear that.") == 1) {
- emotion e_omg;
+ emotion ET_HUK;
mes "[Cat Hand Agent]";
mes "Human!! You're a genius!!";
mes "How did you come up with that?";
@@ -7598,7 +7598,7 @@ moc_fild20,368,197,3 script Cat#to22 876,{
mes "The small body isn't as tall as your ankle and its small but thick paws look like little cushions. The ears that bent backwards when it looked at how big you were stirred up your protective instinct.";
next;
mes "You don't seem to have the nerve to step on the Cat Hand Agent.";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
mes "You look at the Cat Hand Agent's small back and climb over the wall as quick as possible so that it wouldn't notice your weight.";
diff --git a/npc/re/quests/quests_eclage.txt b/npc/re/quests/quests_eclage.txt
index 4aac99ca2a0..a4e3be60c49 100644
--- a/npc/re/quests/quests_eclage.txt
+++ b/npc/re/quests/quests_eclage.txt
@@ -183,17 +183,17 @@ ecl_fild01,111,320,3 script Immigration Officer#ep14 4_M_FAIRYKID4,{
if (ep14_2_oliver == 0) {
mes "What do you need?";
mes "As you can see, I'm really busy here, so unless you need something, please don't bother me.";
- emotion e_an;
+ emotion ET_FRET;
} else if (ep14_2_oliver == 1) {
if (checkquest(11310,PLAYTIME) != 2) {
mes "There's still a lot of people before you. Could you please wait until your turn?";
mes "It won't be too long.";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
mes "Whew! I'm sorry to have kept you waiting.";
mes "There are just too many visitors.";
- emotion e_wah;
+ emotion ET_KEK;
next;
mes "[Immigration Officer]";
mes "So if you will place your forms here...";
@@ -203,12 +203,12 @@ ecl_fild01,111,320,3 script Immigration Officer#ep14 4_M_FAIRYKID4,{
mes "This time it's all good, right?";
mes "Let me through quick!";
cutin "bu_du1",2;
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
next;
cutin "",255;
mes "[Immigration Officer]";
mes "I'm taking care of visitors in the order they arrived, so please wait for your turn.";
- emotion e_swt;
+ emotion ET_SWEAT;
next;
mes "[???]";
mes "What are you talking about!";
@@ -218,7 +218,7 @@ ecl_fild01,111,320,3 script Immigration Officer#ep14 4_M_FAIRYKID4,{
cutin "",255;
mes "[Immigration Officer]";
mes "Well, your turn was delayed because you had to fill out your forms, so you have to wait until later.";
- emotion e_ag;
+ emotion ET_ANGER;
next;
mes "[???]";
mes "What?! You just said you take care of visitors in the order they arrived!!!";
@@ -285,7 +285,7 @@ ecl_fild01,111,320,3 script Immigration Officer#ep14 4_M_FAIRYKID4,{
mes "Oh wow, this is just so crazy.";
mes strcharinfo(0) +" Here, your documents are processed.";
mes "You may enter the city when you go talk to the security guard.";
- emotion e_go;
+ emotion ET_GO;
next;
mes "[???]";
mes "Shuffle, shuffle";
@@ -294,7 +294,7 @@ ecl_fild01,111,320,3 script Immigration Officer#ep14 4_M_FAIRYKID4,{
cutin "",255;
mes "[Immigration Officer]";
mes "And Mr. Deu Lean, please take your group and enter. It's just way too noisy.";
- emotion e_an;
+ emotion ET_FRET;
next;
mes "[Du Lian]";
mes "Mwahah!!";
@@ -329,7 +329,7 @@ ecl_fild01,111,320,3 script Immigration Officer#ep14 4_M_FAIRYKID4,{
next;
mes "[Mark Esha]";
mes "My goodness......";
- emotion e_swt2,1;
+ emotion ET_PROFUSELY_SWEAT, playerattached();
ep14_2_oliver = 2;
changequest 11310,11311;
close2;
@@ -340,7 +340,7 @@ ecl_fild01,111,320,3 script Immigration Officer#ep14 4_M_FAIRYKID4,{
mes "Oh wow, this is just so crazy.";
mes strcharinfo(0) +" Here, your documents are processed.";
mes "You may enter the city when you go talk to the security guard.";
- emotion e_go;
+ emotion ET_GO;
}
else {
mes "Alright, next person in line please!";
@@ -350,7 +350,7 @@ ecl_fild01,111,320,3 script Immigration Officer#ep14 4_M_FAIRYKID4,{
mes "[Immigration Officer]";
mes "Ack...";
mes "I don't think it's all for the best to have so many visitors.";
- emotion e_sob;
+ emotion ET_CRY;
}
close;
}
@@ -359,20 +359,20 @@ ecl_fild01,92,316,5 script Tourist#ep14_2f2 4_CAT_SAILOR2,{
mes "[Tourist]";
mes "I can't believe I have to wait this long......";
mes "When is it going to be my turn?";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
ecl_fild01,106,312,5 script Tourist#ep14_2f3 4_F_RAFLE_VI,{
mes "[Tourist]";
mes "I'm actually done with my documentation, but I'm just sticking around to appreciate all of these flowers.";
- emotion e_lv2;
+ emotion ET_BIGTHROB;
next;
mes "[Tourist]";
mes "I'm just getting through the night with my sleeping bag!";
mes "It's alright as long as you can withstand the security guard's annoyance with you.";
- emotion e_swt,0,"Security Guard#ep14_2";
- emotion e_swt,0,"Security Guard#ep14_2_2";
+ emotion ET_SWEAT, getnpcid(0, "Security Guard#ep14_2");
+ emotion ET_SWEAT, getnpcid(0, "Security Guard#ep14_2_2");
close;
}
@@ -380,18 +380,18 @@ ecl_fild01,108,320,7 script Tourist#ep14_2f4 4_F_DST_CHILD,{
mes "[Tourist]";
mes "I wonder how beautiful of a city Eclage would be.";
mes "It just makes my heart beat thinking about it.";
- emotion e_lv;
+ emotion ET_THROB;
close;
}
ecl_fild01,105,320,2 script Tourist#ep14_2f5 4_F_FAIRYKID,{
mes "[Tourist]";
mes "No, I'm not a visitor. I'm an Eclage citizen!";
- emotion e_an;
+ emotion ET_FRET;
next;
mes "[Tourist]";
mes "I can't believe I can't even enter because of all these tourists!";
- emotion e_omg;
+ emotion ET_HUK;
close;
}
@@ -401,7 +401,7 @@ ecl_fild01,103,319,5 script Tourist#ep14_2f6 4_M_HUMERCHANT,{
next;
mes "[Tourist]";
mes "You could probably make the world's best acorn jello.";
- emotion e_no1;
+ emotion ET_BEST;
close;
}
@@ -414,7 +414,7 @@ ecl_fild01,110,316,3 script Tourist#ep14_2f7 4_M_HUBOY,{
next;
mes "[Tourist]";
mes "Perhaps you could consider it as the weight of life?";
- emotion e_awsm;
+ emotion ET_COOL;
close;
}
@@ -431,7 +431,7 @@ ecl_fild01,93,318,5 script Tourist#ep14_2f9 1_M_PAY_ELDER,{
mes "[Tourist]";
mes "Err.... No.....";
mes "Curry.... Curry rice.... Snorrreeeee";
- emotion e_hlp;
+ emotion ET_HELP;
close;
}
@@ -441,7 +441,7 @@ ecl_fild01,94,313,5 script Tourist#ep14_2f10 4_M_PIERROT,{
next;
mes "[Tourist]";
mes "It's encouraging to see so many Midgard people nowadays.";
- emotion e_com;
+ emotion ET_COMEON;
close;
}
@@ -449,7 +449,7 @@ ecl_fild01,101,320,5 script Tourist#ep14_2f11 4_M_RAFLE_OR,{
mes "[Tourist]";
mes "Ow.... My legs...";
mes "You're saying I have to wait after all this traveling through Bifrost?!";
- emotion e_an;
+ emotion ET_FRET;
close;
}
@@ -460,7 +460,7 @@ ecl_fild01,88,315,5 script Tourist#ep14_2f12 4_WHITE_COW,{
next;
mes "[Tourist]";
mes "I want to be alone......Sniff!";
- emotion e_otl;
+ emotion ET_OTL;
close;
}
@@ -475,7 +475,7 @@ OnTouch:
mes "[Fairy Carpenter]";
mes "Hey!!!!!!!";
mes "Be careful over there!!";
- emotion e_omg,0,"Fairy Carpenter#ep14_2";
+ emotion ET_HUK, getnpcid(0, "Fairy Carpenter#ep14_2");
close;
}
if (ep14_2_oliver <= 6) {
@@ -492,11 +492,11 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{
mes "Wait!!!!!";
mes "That's an unregistered visitor!!!!!!!";
mes "Security!!! Security!!!";
- emotion e_omg;
+ emotion ET_HUK;
}
else {
mes "Did you talk to the security guard before coming into the city?";
- emotion e_go;
+ emotion ET_GO;
}
close2;
warp "ecl_fild01",100,317;
@@ -505,7 +505,7 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{
if (BaseLevel < 120) {
mes "[Fairy Carpenter]";
mes "The bridge is kind of broken so please be careful.";
- emotion e_sob;
+ emotion ET_CRY;
}
else if (ep14_2_oliver == 3) {
mes "[Fairy Carpenter]";
@@ -523,7 +523,7 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{
close;
case 2:
mes "Oh, just a minute ago, there was a human being who took a misstep and broke a tree branch while falling.";
- emotion e_an;
+ emotion ET_FRET;
next;
mes "[Fairy Carpenter]";
mes "Being close to the entrance and all, this really needs to be fixed soon.";
@@ -538,16 +538,16 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{
mes "Wow!!!";
mes "You are going to help me?!";
mes "So... so kind...";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Fairy Carpenter]";
mes "I can't believe there's still this kind of kindness left in the world... Hmm, sweaty eyes...";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Fairy Carpenter]";
mes "Would you then bring me a new bridge to use for repair?";
mes "Since other people can get hurt, I'll use my magic to maintain this bridge in the meantime.";
- emotion e_go;
+ emotion ET_GO;
ep14_2_oliver = 4;
setquest 11312;
close;
@@ -575,32 +575,32 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{
next;
mes "[Fairy Carpenter]";
mes "and this broken bridge... from here to there it's about 19 meters and the prepieces come in 3 meters = 5 meters, and 10 meters......";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Fairy Carpenter]";
mes "Hmm.......";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Fairy Carpenter]";
mes "Hmm......";
mes "......";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Fairy Carpenter]";
mes "......Hmm.........";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "- It's probably just my imagination that smoke is coming out of his head, right? -";
- emotion e_swt2,1;
+ emotion ET_PROFUSELY_SWEAT, playerattached();
next;
mes "[Fairy Carpenter]";
mes "Oh ho!";
mes "What do you think?";
- emotion e_heh;
+ emotion ET_SMILE;
next;
mes "[Fairy Carpenter]";
mes "To make a bridge of 19 meters in length with the fewest number of pieces possible, how many of each 3, 5, or 10 meter length pieces would I need?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
mes "[Fairy Carpenter]";
mes "Please write the number of pieces necessary for each length. If no pieces for that length are necessary, please write 0.";
@@ -610,13 +610,13 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{
mes "[Fairy Carpenter]";
mes "Hmm that's kind of....";
mes "Would there be a better way?";
- emotion e_swt;
+ emotion ET_SWEAT;
close;
}
mes "[Fairy Carpenter]";
mes "Yeah, that sounds good, right?";
mes "Especially since there wouldn't be a need to make them so straight.";
- emotion e_ic;
+ emotion ET_AHA;
next;
mes "[Fairy Carpenter]";
mes "Okay, if you talk to [Golie] who works outside the city near the tower, he will give you the new bridge pieces.";
@@ -643,8 +643,8 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{
mes "[Du Lian]";
mes "Ah!";
mes "Thank goodness!";
- emotion e_omg,1;
- emotion e_omg;
+ emotion ET_HUK, playerattached();
+ emotion ET_HUK;
cutin "bu_du2",2;
next;
mes "[Du Lian]";
@@ -658,11 +658,11 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{
cutin "",255;
mes "[Carpenter Fon]";
mes "...";
- emotion e_swt;
+ emotion ET_SWEAT;
next;
mes "["+ strcharinfo(0) +"]";
mes "...";
- emotion e_swt,1;
+ emotion ET_SWEAT, playerattached();
next;
mes "[Du Lian]";
mes "No way!";
@@ -680,7 +680,7 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{
mes "[Carpenter Fon]";
mes "Well, I'm going to let it pass this time around, but if you break the bridge again, I'm going to put you in jail!";
mes "You should know that I am pretty busy myself.";
- emotion e_an;
+ emotion ET_FRET;
next;
mes "[Mark Esha]";
mes "I'm sorry.";
@@ -694,12 +694,12 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{
next;
cutin "",255;
mes "- SNAP -";
- emotion e_omg;
- emotion e_omg,1;
+ emotion ET_HUK;
+ emotion ET_HUK, playerattached();
next;
mes "[Carpenter Fon]";
mes "......";
- emotion e_otl;
+ emotion ET_OTL;
next;
mes "[Mark Esha]";
mes "Oh dear....";
@@ -725,21 +725,21 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{
cutin "",255;
mes "[Carpenter Fon]";
mes "......";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "[Carpenter Fon]";
mes "Sigh...";
- emotion e_an;
+ emotion ET_FRET;
next;
mes "[Carpenter Fon]";
mes "Shoot.................................";
mes "....................................";
mes "............";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Carpenter Fon]";
mes "Get out of here you troublemaker!!!!";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Mark Esha]";
mes "I am so sorry.";
@@ -750,23 +750,23 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{
mes "[Carpenter Fon]";
mes "Don't come back!";
mes "Don't EVER come back!!!";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Carpenter Fon]";
mes "Oy........";
mes "I thought today I might be able to see my friends after finishing up my work.....";
mes "Looks like a long night again.";
- emotion e_otl;
+ emotion ET_OTL;
next;
mes "[Carpenter Fon]";
mes "Since it's not a big fix, I'm sure I can take care of this somehow.";
mes "Sigh...";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Carpenter Fon]";
mes strcharinfo(0) +" Well, you should get going to Eclage.";
mes "You just need to follow this path to the northern part of the city.";
- emotion e_sigh;
+ emotion ET_OHNO;
next;
mes "[Carpenter Fon]";
mes "You'll find the main plaza as soon as you enter Eclage, and I'm sure you'll have easy time getting information from all the people there.";
@@ -782,7 +782,7 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{
}
mes "[Carpenter Fon]";
mes "I really ask you this favor because I'm supposed to meet with my friends to discuss a birthday coming up, but I can't just keep them waiting.";
- emotion e_sry;
+ emotion ET_SORRY;
delitem 6553,2;// Leaf_Made_Wood
ep14_2_oliver = 7;
changequest 11314,11315;
@@ -793,12 +793,12 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{
next;
mes "[Carpenter Fon]";
mes "I really ask you this favor because I'm supposed to meet with my friends to discuss a birthday coming up, but I can't just keep them waiting.";
- emotion e_sry;
+ emotion ET_SORRY;
}
else {
mes "[Carpenter Fon]";
mes "I wanna see my friends real soon.";
- emotion e_sob;
+ emotion ET_CRY;
}
close;
}
@@ -891,7 +891,7 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{
mes "Why... why do I have so much time at hand...?";
mes "Am I the only one with so much free time?";
mes "Am I really the only one?";
- emotion e_omg;
+ emotion ET_HUK;
}
else if (ep14_2_oliver == 7) {
mes "Hmm...";
@@ -909,11 +909,11 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{
next;
mes "[Glaces]";
mes "Um... This is sort of awkward for me...";
- emotion e_wah,1;
+ emotion ET_KEK, playerattached();
next;
mes "["+ strcharinfo(0) +"]";
mes "No, that's not what I mean...";
- emotion e_swt,1;
+ emotion ET_SWEAT, playerattached();
next;
mes "[Glaces]";
mes "Hmm...";
@@ -922,26 +922,26 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{
next;
mes "[Glaces]";
mes "This is why I don't like to be kept waiting for long. My popularity just doesn't let me go anywhere without being noticed.";
- emotion e_an;
- emotion e_swt2,1;
+ emotion ET_FRET;
+ emotion ET_PROFUSELY_SWEAT, playerattached();
next;
mes "["+ strcharinfo(0) +"]";
mes "No, I mean... Mr. Fon told me to let you know that he won't be able to make it because of his work...";
next;
mes "[Glaces]";
mes "...";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "[Glaces]";
mes "Oh, I see.";
next;
mes "[Glaces]";
mes "Yeah, I feel like I should hide somewhere.";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "[Glaces]";
mes "Anyways, Fon can't make it?";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Glaces]";
mes "Moreng's birthday is not long from now, and without being able to meet all this time, it might turn out to be a terrible party.";
@@ -949,12 +949,12 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{
mes "[Glaces]";
mes "Yube even flew here from Splendide for Moreng's birthday...";
mes "Speaking of which, where did that guy go?!";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Glaces]";
mes "He was the one who suggested that we should meet at his own place.";
mes "The least he could do is opening the door before disappearing!";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Glaces]";
mes "Well, I can't leave this place since others might arrive, so if you see a fairy with a yellow, tangerine-stem-like head, please tell him Glaces is looking for him.";
@@ -967,8 +967,8 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{
mes "That";
mes "favor!";
mes "I will take care of it!";
- emotion e_omg;
- emotion e_omg,1;
+ emotion ET_HUK;
+ emotion ET_HUK, playerattached();
cutin "bu_du1",2;
next;
cutin "",255;
@@ -1002,7 +1002,7 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{
cutin "",255;
mes "[Glaces]";
mes "Who are you calling a girl? You got my name wrong too!";
- emotion e_an;
+ emotion ET_FRET;
next;
mes "[Du Lian]";
mes "Heh heh, don't you worry, baby girl.";
@@ -1020,7 +1020,7 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{
next;
mes "[Glaces]";
mes "And also please tell him that if he doesn't get back right away, I will pluck off that stem.";
- emotion e_omg;
+ emotion ET_HUK;
}
else if (ep14_2_oliver == 9) {
mes "Oh...";
@@ -1028,13 +1028,13 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{
next;
mes "[Glaces]";
mes "Hmm... I think we are apart by about 30 years...";
- emotion e_hmm;
+ emotion ET_SCRATCH;
next;
select("Then what's Glaces' age?");
mes "[Glaces]";
mes "How dare you ask a lady's age!!!";
mes "We aren't exactly the same age, but since Murah is also 30 years apart from Moreng, ask Murah.";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Glaces]";
mes "Murah is probably at the Eclage plaza.";
@@ -1044,7 +1044,7 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{
else if (ep14_2_oliver == 10) {
mes "How dare you ask a lady's age!!!";
mes "We aren't exactly the same age, but since Murah is also 30 years apart from Moreng, ask Murah.";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Glaces]";
mes "Murah is probably at the Eclage plaza.";
@@ -1059,7 +1059,7 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{
mes "A king lives in Eclage.";
mes "He is super good looking.";
mes "Hehe";
- emotion e_shy;
+ emotion ET_SHY;
}
else if (ep14_2_oliver == 14) {
mes "To think of it, I should probably visit Fon and Golie as well...";
@@ -1073,7 +1073,7 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{
}
mes "Whoa!";
mes "We would need an enormous cake to fit all these candles...";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Glaces]";
mes "Hmm... Since everyone seems so busy, I'm going to give up meeting them today and just go to bake a cake big enough to fit the candles.";
@@ -1084,18 +1084,18 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{
mes "[Du Lian]";
mes "Baby girl!";
mes "I brought the guy named Yube!";
- emotion e_omg;
- emotion e_omg,1;
+ emotion ET_HUK;
+ emotion ET_HUK, playerattached();
cutin "bu_du2",2;
next;
cutin "",255;
mes "[Glaces]";
mes "...";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "["+ strcharinfo(0) +"]";
mes "...";
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
next;
mes "[Yube]";
mes "What, who is this fool?";
@@ -1106,7 +1106,7 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{
mes "[Glaces]";
mes "Do you mind not treating my friend like a piece of luggage?";
mes "And it's too late anyways!";
- emotion e_an;
+ emotion ET_FRET;
next;
mes "[Du Lian]";
mes "What?!";
@@ -1121,7 +1121,7 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{
cutin "",255;
mes "["+ strcharinfo(0) +"]";
mes "Two?";
- emotion e_what,1;
+ emotion ET_QUESTION, playerattached();
next;
mes "[Du Lian]";
mes "What do you mean?";
@@ -1131,7 +1131,7 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{
cutin "",255;
mes "["+ strcharinfo(0) +"]";
mes "Huh?!";
- emotion e_what,1;
+ emotion ET_QUESTION, playerattached();
next;
mes "[Du Lian]";
mes "Sure, he's kind of cute too, but we have our cutest Maggi to beat them all!!!";
@@ -1147,7 +1147,7 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{
next;
mes "[???]";
mes "Can you see me?";
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
cutin "bu_oliver3",0;
next;
mes "[Du Lian]";
@@ -1170,7 +1170,7 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{
cutin "",255;
mes "[Glaces]";
mes "Maybe it's because he doesn't have much presence to begin with.";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "[Alp Ocart]";
mes "...";
@@ -1231,7 +1231,7 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{
cutin "",255;
mes "[Glaces]";
mes "Who are those guys?They even took Yube with them!";
- emotion e_swt;
+ emotion ET_SWEAT;
next;
mes "[Glaces]";
mes "Well, I'm sure Yube will take care of himself.";
@@ -1240,7 +1240,7 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{
}
else if (ep14_2_oliver == 16) {
mes "Who are those guys? They even took Yube with them?!";
- emotion e_swt;
+ emotion ET_SWEAT;
next;
mes "[Glaces]";
mes "Well... I'm sure Yube will take care of himself.";
@@ -1249,13 +1249,13 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{
}
else if (ep14_2_oliver < 22) {
mes "I wonder what's better, cream or chocolate...";
- emotion e_shy;
+ emotion ET_SHY;
next;
mes "- She seems really busy making the cake. Let's not bother her. -";
}
else if (ep14_2_oliver == 22) {
mes "I wonder what's better, cream or chocolate?";
- emotion e_shy;
+ emotion ET_SHY;
next;
mes "[Glaces]";
mes "Oh you're back.";
@@ -1263,13 +1263,13 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{
next;
mes "[Glaces]";
mes "...";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "[Glaces]";
mes "Huh!!!";
mes "The legend of the great bird?!";
mes "It's been close to a hundred years since I've known Moreng, and he's never talked about it before!";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Glaces]";
mes "If he really seems like he might leave soon, we should grab him before he leaves and at least throw him a farewell party.";
@@ -1278,7 +1278,7 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{
mes "So sudden...";
mes "I'm going to try to talk with Moreng, so would you ask Yube for me?";
mes "He went inside to look for something, so I'm sure he's still inside.";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
ep14_2_oliver = 23;
changequest 11330,11331;
}
@@ -1289,7 +1289,7 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{
mes "So sudden...";
mes "I'm going to try to talk with Moreng, so would you ask Yube for me?";
mes "He went inside to look for something, so I'm sure he's still inside.";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
}
else {
mes "It's going to feel really empty if Moreng leaves for Midgard.";
@@ -1297,7 +1297,7 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{
next;
mes "[Glaces]";
mes "Well, I should first decide on what present to get him!";
- emotion e_no1;
+ emotion ET_BEST;
}
close2;
cutin "",255;
@@ -1319,7 +1319,7 @@ eclage,191,200,4 script Yube#ep14_2 4_M_FAIRYKID5,{
mes "[Yube]";
mes "Whoa!";
mes "Who are you?!";
- emotion e_omg;
+ emotion ET_HUK;
cutin "war_y1",2;
next;
if (Class == Job_Warlock || Class == Job_Warlock_T) {
@@ -1327,7 +1327,7 @@ eclage,191,200,4 script Yube#ep14_2 4_M_FAIRYKID5,{
mes "Whoa! Who's this? It's";
mes strcharinfo(0) +"?";
mes "You seem more like a Warlock now!";
- emotion e_heh;
+ emotion ET_SMILE;
cutin "war_y4",2;
next;
mes "[Yube]";
@@ -1339,7 +1339,7 @@ eclage,191,200,4 script Yube#ep14_2 4_M_FAIRYKID5,{
mes "[Yube]";
mes "I told her I'll be looking for materials to make candles with, but as expected, she wasn't listening.";
mes "She always loses her mind looking at herself through a mirror.";
- emotion e_sigh;
+ emotion ET_OHNO;
cutin "war_y3",2;
next;
mes "[Yube]";
@@ -1366,7 +1366,7 @@ eclage,191,200,4 script Yube#ep14_2 4_M_FAIRYKID5,{
mes "Oh!";
mes "You gathered enough already?";
mes "I also made enough wicks just in time!";
- emotion e_ho;
+ emotion ET_DELIGHT;
cutin "war_y4",2;
delitem 6561,128;// Dustball
ep14_2_oliver = 15;
@@ -1385,7 +1385,7 @@ eclage,191,200,4 script Yube#ep14_2 4_M_FAIRYKID5,{
mes "And also...";
mes "To return the favor, I'll let you use my house!";
mes "You can stay over whenever you want as long as you are in Eclage.";
- emotion e_no1;
+ emotion ET_BEST;
next;
mes "[Yube]";
mes "I work at Splendide for the most part anyways, so I don't come to Eclage very often.";
@@ -1423,21 +1423,21 @@ eclage,191,200,4 script Yube#ep14_2 4_M_FAIRYKID5,{
else if (ep14_2_oliver == 13) {
mes "Huh?!";
mes "So no one knows how old Moreng is?";
- emotion e_omg;
+ emotion ET_HUK;
cutin "war_y3",2;
next;
mes "[Yube]";
mes "Hmm, at least to summarize what everyone has said...";
mes "He's younger than me; 30 years age gap wtih both Glaces and Murah but Glaces and Murah are not the same age,";
mes "Shul's age is to add Moreng's age to my age of 100 years before; Shul is 2 years older than Glaces; the average age of me and Shul is Tato and Tato's age is 146, right?";
- emotion e_dots;
- emotion e_dots,1;
+ emotion ET_THINK;
+ emotion ET_THINK, playerattached();
cutin "war_y2",2;
next;
mes "[Yube]";
mes "...";
mes "Then how old is he?";
- emotion e_what;
+ emotion ET_QUESTION;
cutin "war_y3",2;
next;
input .@inputnum;
@@ -1452,13 +1452,13 @@ eclage,191,200,4 script Yube#ep14_2 4_M_FAIRYKID5,{
mes "That's right!";
mes "Now I remember!!!";
mes "I think that's what it was!";
- emotion e_ic;
+ emotion ET_AHA;
cutin "war_y4",2;
next;
mes "[Yube]";
mes "Hmm that means I still have to make more than a hundred candles...";
mes "Oy......";
- emotion e_wah;
+ emotion ET_KEK;
cutin "war_y3",2;
next;
mes "[Yube]";
@@ -1481,7 +1481,7 @@ eclage,191,200,4 script Yube#ep14_2 4_M_FAIRYKID5,{
else {
mes "Wha.. You lost the candles?";
mes "I still have some wicks left, so if you bring me the clump of dust again, I'll remake them for ya.";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
cutin "war_y3",2;
next;
cutin "",255;
@@ -1559,7 +1559,7 @@ ecl_in01,73,51,4 script Murah#ep14_2 4_M_FAIRYKID,{
}
else
mes "Hmm... What amazing present should I give?";
- emotion e_flash;
+ emotion ET_SPARK;
close;
}
@@ -1570,7 +1570,7 @@ eclage,265,166,4 script Shul#ep14_2 4_M_FAIRYKID2,{
mes "Hmm...";
mes "It's been awhile since I kept track of everyone's age.";
mes "I just remember that Glaces was two years younger than me.";
- emotion e_hmm;
+ emotion ET_SCRATCH;
next;
mes "[Shul]";
mes "Come to think of it, not too long ago, Tato said that his age was the same as the average between my age and Yube's age.";
@@ -1598,12 +1598,12 @@ eclage,137,169,4 script Tato#ep14_2 4_F_FAIRYKID4,{
next;
mes "[Tato]";
mes "But why is it that they don't know their own age either?!";
- emotion e_omg;
+ emotion ET_HUK;
next;
select("What's Tato's age?");
mes "[Tato]";
mes "I am 146 years old.";
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
next;
mes "- Although the exact information regarding Moreng's age is still unknown, let's return to Yube first.";
ep14_2_oliver = 13;
@@ -1630,7 +1630,7 @@ eclage,266,216,4 script Moreng#ep14_2 4_M_FAIRYKID3,{
mes "[Moreng]";
mes "Yai actually signifies an egg.";
mes "And to Laphines, Yai could even signify what is beyond a home...";
- emotion e_shy;
+ emotion ET_SHY;
}
else if (ep14_2_oliver == 16) {
mes "Eclage is a really nice place to live";
@@ -1638,7 +1638,7 @@ eclage,266,216,4 script Moreng#ep14_2 4_M_FAIRYKID3,{
next;
mes "[Moreng]";
mes "If there were a beautiful Yai of my own, it would truly be a paradise!";
- emotion e_shy;
+ emotion ET_SHY;
next;
mes "[Oliver]";
mes "Oh, so you call those round houses a Yai.";
@@ -1651,12 +1651,12 @@ eclage,266,216,4 script Moreng#ep14_2 4_M_FAIRYKID3,{
next;
mes "[Moreng]";
mes "While I spent time and effort as much as putting my life into it, my Yai is nothing more than a fake.";
- emotion e_an;
+ emotion ET_FRET;
next;
mes "[Moreng]";
mes "It's called an egg and looks like an egg, but it's really not an egg!";
mes "It's just something else that just looks like an egg!";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Moreng]";
mes "Hey, wait a minute!";
@@ -1685,7 +1685,7 @@ eclage,266,216,4 script Moreng#ep14_2 4_M_FAIRYKID3,{
cutin "",255;
mes "[Moreng]";
mes "......";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "[Moreng]";
mes "When I first heard of that legend, I was so excited that I couldn't sleep for days.";
@@ -1693,7 +1693,7 @@ eclage,266,216,4 script Moreng#ep14_2 4_M_FAIRYKID3,{
mes "[Moreng]";
mes "But as time went by, and as I aged more, I gradually forgot about it.";
mes "Isn't that how all childhood dreams are like?";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Moreng]";
mes "But not too long ago when I went to the plaza, I met my old neighbor who told me about a traveler from Midgard holding an incredibly enormous feather...";
@@ -1701,7 +1701,7 @@ eclage,266,216,4 script Moreng#ep14_2 4_M_FAIRYKID3,{
mes "[Moreng]";
mes "Ever since I heard about it, I can't seem to put my mind on anything else.";
mes "Could that legend possibly be true?";
- emotion e_sigh;
+ emotion ET_OHNO;
next;
mes "[Moreng]";
mes "Truthfully, when I heard that story, I went searching all over the town but couldn't find anyone with a huge feather.";
@@ -1709,19 +1709,19 @@ eclage,266,216,4 script Moreng#ep14_2 4_M_FAIRYKID3,{
mes "[Moreng]";
mes "Do you think that old man's story is real? Or do you think it's a lie?";
mes "I used to think of it as a forgotten legend, but now I am even afraid to find out whether it is real or fake. ";
- emotion e_wah;
+ emotion ET_KEK;
next;
mes "[Du Lian]";
mes "If you are a real man, don't be so meek!";
mes "Face it head on! And if you must, you can crash and burn afterwards!";
- emotion e_omg;
- emotion e_omg,1;
+ emotion ET_HUK;
+ emotion ET_HUK, playerattached();
cutin "bu_du2",2;
next;
cutin "",255;
mes "[Moreng]";
mes "Don't crash and burn anything...";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "[Du Lian]";
mes "For something like that-!";
@@ -1770,8 +1770,8 @@ eclage,266,216,4 script Moreng#ep14_2 4_M_FAIRYKID3,{
mes "I feel like I can't just stay here anymore.";
mes "I have to quickly pack my bags and leave for Midgard!";
if (ep14_2_oliver == 22) {
- emotion e_omg;
- emotion e_omg,1;
+ emotion ET_HUK;
+ emotion ET_HUK, playerattached();
}
next;
mes "- Moreng seems like he's really about to leave soon. I should let Glaces know. -";
@@ -1803,15 +1803,15 @@ ecl_in01,60,71,4 script Old Man#ep14_2 4_M_FAIRYKID2,{
mes "[Old Man]";
mes "Nowadays, things are way more convenient with de-regulation and all.";
mes "And with the warps and flying to all these places, where's all the romance in adventures anymore?";
- emotion e_pif;
+ emotion ET_HNG;
next;
mes "[Old Man]";
mes "Young people nowadays probably don't even know how frog eggs taste like.";
- emotion e_pif;
+ emotion ET_HNG;
next;
mes "[Old Man]";
mes "It seems like yesterday when I saved enough Jellopies to buy a Tsurugi, but even that Tsurugi is deserted somewhere in the storage.";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Old Man]";
mes "Time really is merciless... If I had known this then, I would have...";
@@ -1853,11 +1853,11 @@ ecl_in01,60,71,4 script Old Man#ep14_2 4_M_FAIRYKID2,{
next;
mes "[Du Lian]";
mes "But old man, would you happen to know anything about a legend regarding the great bird in Midgard? ";
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
cutin "bu_du1",2;
next;
cutin "",255;
- emotion e_shy,1;
+ emotion ET_SHY, playerattached();
next;
mes "[Old Man]";
mes "Oh!";
@@ -1865,7 +1865,7 @@ ecl_in01,60,71,4 script Old Man#ep14_2 4_M_FAIRYKID2,{
next;
mes "[Old Man]";
mes "For that, there's probably no one who knows it better than I in Eclage.";
- emotion e_flash;
+ emotion ET_SPARK;
next;
mes "[Old Man]";
mes "Well, it wasn't too long after Light Standard arrived in Midgard.";
@@ -1893,7 +1893,7 @@ ecl_in01,60,71,4 script Old Man#ep14_2 4_M_FAIRYKID2,{
cutin "",255;
mes "[Old Man]";
mes "Huh? But I haven't even begun to talk about a monster he met in Midgard who can break any kind of metal!";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Du Lian]";
mes "We will hear about it later~";
@@ -1924,14 +1924,14 @@ ecl_in01,60,71,4 script Old Man#ep14_2 4_M_FAIRYKID2,{
mes "Old Man#ep14_2";
mes "Nowadays, things are much more convenient with de-regulation and all.";
mes "And with the warps and flying to all these places, where's all the romance in adventures anymore?";
- emotion e_pif;
+ emotion ET_HNG;
next;
mes "[Old Man]";
mes "Young people nowadays probably don't even know how frog eggs taste like.";
next;
mes "[Old Man]";
mes "It seems like yesterday when I saved enough Jellopies to buy a Tsurugi, but even that Tsurugi is deserted somewhere in storage.";
- emotion e_sob;
+ emotion ET_CRY;
}
close2;
cutin "",255;
@@ -1947,7 +1947,7 @@ ecl_fild01,97,315,4 script Traveler#ep14_2 4_M_JOB_HUNTER,{
mes "[Traveler]";
mes "Oh, you came to ask me about the feather, too?";
mes "It's just a plain old decoration, but everyone really likes to bother me about it.";
- emotion e_flash;
+ emotion ET_SPARK;
next;
mes "[Traveler]";
mes "If you are thinking about selling it, you should just give up.";
@@ -1970,11 +1970,11 @@ ecl_fild01,97,315,4 script Traveler#ep14_2 4_M_JOB_HUNTER,{
mes "[Traveler]";
mes "But I am not one to give up so easily.";
mes "If I think about it, it was a very long fight.";
- emotion e_shy;
+ emotion ET_SHY;
next;
mes "[Du Lian]";
mes "That's weird. The old man earlier said that he saw it in Midgard.";
- emotion e_omg;
+ emotion ET_HUK;
cutin "bu_du1",2;
next;
cutin "",255;
@@ -1982,7 +1982,7 @@ ecl_fild01,97,315,4 script Traveler#ep14_2 4_M_JOB_HUNTER,{
mes "Eck!";
mes "No... No way.";
mes "I definitely saw it at Midgard.";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Traveler]";
mes "I didn't want to show you this, but this scar is the proof.";
@@ -1992,7 +1992,7 @@ ecl_fild01,97,315,4 script Traveler#ep14_2 4_M_JOB_HUNTER,{
mes "Hmm...";
mes "For a fight not too long ago, the scar seems very old.";
mes "From how the scar looks, it doesn't even seem like it's been treated by magic...";
- emotion e_omg;
+ emotion ET_HUK;
cutin "bu_mark4",0;
next;
cutin "",255;
@@ -2000,23 +2000,23 @@ ecl_fild01,97,315,4 script Traveler#ep14_2 4_M_JOB_HUNTER,{
mes "Eeck!!!!";
mes "If... If I really think about, it might be awhile back actually.";
mes "I can't remember too well having so many memoirs and souvenirs.";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Oliver]";
mes "But how did you travel to other places when you can't even enter Eclage?";
- emotion e_omg;
+ emotion ET_HUK;
cutin "bu_oliver2",0;
next;
mes "[Maggi Steen]";
mes "If it came near here somewhere, there's no way others haven't seen it...";
- emotion e_omg;
+ emotion ET_HUK;
cutin "bu_maggi1",2;
next;
cutin "",255;
mes "[Traveler]";
mes "Keeeek!!!!";
mes "Yes!";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Traveler]";
mes "Actually, this isn't my first time here, but I had the opportunity to go to other places during when deregulation was at its peak awhile back.";
@@ -2024,12 +2024,12 @@ ecl_fild01,97,315,4 script Traveler#ep14_2 4_M_JOB_HUNTER,{
mes "[Alp Ocart]";
mes "Hmm... But this feather...";
mes "If I look at it very closely, the shaft is too thick for its size";
- emotion e_omg;
+ emotion ET_HUK;
cutin "bu_alp3",2;
next;
mes "[Alp Ocart]";
mes "And doesn't the end of it seem really jagged?";
- emotion e_omg;
+ emotion ET_HUK;
cutin "bu_alp4",2;
next;
cutin "",255;
@@ -2038,11 +2038,11 @@ ecl_fild01,97,315,4 script Traveler#ep14_2 4_M_JOB_HUNTER,{
mes "Wait! Let me see!!!!";
mes "Oh my, that's really true!";
mes "How dare that cat sell me a fake?!";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Du Lian]";
mes "Oh.... You bought it, didn't you?";
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
cutin "bu_du2",2;
next;
mes "[Oliver]";
@@ -2057,7 +2057,7 @@ ecl_fild01,97,315,4 script Traveler#ep14_2 4_M_JOB_HUNTER,{
mes "[Traveler]";
mes "Hu....";
mes "You have no idea how expensive this was!";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Traveler]";
mes "Hey you guys, you can get into Eclage, right?";
@@ -2072,7 +2072,7 @@ ecl_fild01,97,315,4 script Traveler#ep14_2 4_M_JOB_HUNTER,{
mes "At least hold him until I can get into Eclage!";
mes "I ask you!";
mes "Please!";
- emotion e_sob;
+ emotion ET_CRY;
ep14_2_oliver = 20;
changequest 11327,11328;
}
@@ -2089,13 +2089,13 @@ ecl_fild01,97,315,4 script Traveler#ep14_2 4_M_JOB_HUNTER,{
mes "At least hold him until I can get into Eclage!";
mes "I ask you!";
mes "Please!";
- emotion e_sob;
+ emotion ET_CRY;
}
else if (ep14_2_oliver > 20) {
mes "Oh dear, my money...";
mes "I can't believe it was a fake...";
mes "Oy oy....";
- emotion e_sob;
+ emotion ET_CRY;
}
else {
mes "Who are you?";
@@ -2105,11 +2105,10 @@ ecl_fild01,97,315,4 script Traveler#ep14_2 4_M_JOB_HUNTER,{
mes "Oh, you came to ask me about the feather, too?";
mes "It's just a plain old decoration, but everyone really likes to bother me about it.";
next;
- mes "Traveler#ep14_2fl";
mes "[Traveler]";
mes "If you are thinking about selling it, you should just give up.";
- next;
mes "I have no wishes to sell it no matter how much you beg.";
+ next;
mes "[Traveler]";
mes "This feather..";
}
@@ -2129,7 +2128,7 @@ ecl_in01,70,88,4 script Sack Merchant#ep14_2 4_M_MERCAT1,{
mes "[Sack Merchant]";
mes "That's not trueow~!";
mes "I'm seriouseow~!";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Sack Merchant]";
mes "That's definitely a precious item from Midgardeow.";
@@ -2142,7 +2141,7 @@ ecl_in01,70,88,4 script Sack Merchant#ep14_2 4_M_MERCAT1,{
mes "[Sack Merchant]";
mes "Meoweoweow!!!";
mes "I...I can't believe you noticedeow...Pretty sharpeow...";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Sack Merchant]";
mes "Actually...";
@@ -2220,13 +2219,13 @@ ecl_in04,182,224,4 script Yube#ep14_2in 4_M_FAIRYKID5,{
if (ep14_2_oliver < 15) {
mes "How did you get in here?";
mes "Uninvited guests are not very welcome, you know?";
- emotion e_omg;
+ emotion ET_HUK;
cutin "war_y2",2;
}
else if (ep14_2_oliver == 23) {
mes "Hmm, the legend of a great bird?";
mes "I think there was one, but since I don't believe in myths, I didn't pay much attention.";
- emotion e_dum;
+ emotion ET_HUM;
cutin "war_y3",2;
next;
mes "[Yube]";
@@ -2235,7 +2234,7 @@ ecl_in04,182,224,4 script Yube#ep14_2in 4_M_FAIRYKID5,{
mes "[Yube]";
mes "I guess if you look at Glaces' Yai...";
mes "When I first saw the crack, I was reminded of Glace's Yai.";
- emotion e_spin;
+ emotion ET_CONFUSE;
cutin "war_y2",2;
next;
mes "[Yube]";
@@ -2249,7 +2248,7 @@ ecl_in04,182,224,4 script Yube#ep14_2in 4_M_FAIRYKID5,{
mes "[Yube]";
mes "It's always exciting to place seeds in a box...";
mes "One mistake can lead to immense consequences.";
- emotion e_flash;
+ emotion ET_SPARK;
cutin "war_y2",2;
next;
mes "[Yube]";
@@ -2261,7 +2260,7 @@ ecl_in04,182,224,4 script Yube#ep14_2in 4_M_FAIRYKID5,{
mes "Whew...";
mes "Done...";
mes "The ones I took last time couldn't be used because of a mistake, and I was scolded so much for that...";
- emotion e_sob;
+ emotion ET_CRY;
cutin "war_y3",2;
next;
mes "[Yube]";
@@ -2270,7 +2269,7 @@ ecl_in04,182,224,4 script Yube#ep14_2in 4_M_FAIRYKID5,{
next;
mes "[Yube]";
mes "Maybe it's an underlying statement that I would be eliminated if it's not sent right away...";
- emotion e_dots;
+ emotion ET_THINK;
cutin "war_y2",2;
if (ep14_2_oliver == 24) {
ep14_2_oliver = 25;
@@ -2283,7 +2282,7 @@ ecl_in04,182,224,4 script Yube#ep14_2in 4_M_FAIRYKID5,{
next;
mes "[Yube]";
mes "I will be on my way so I'll catch you later~";
- emotion e_heh;
+ emotion ET_SMILE;
next;
mes "[Maggi Steen]";
mes "Be safe now~";
@@ -2361,14 +2360,14 @@ ecl_in04,182,224,4 script Yube#ep14_2in 4_M_FAIRYKID5,{
mes "[Oliver]";
mes "Hmm...";
mes "I'm hungry.";
- emotion e_rice,0,"Oliver#ep14_2";
+ emotion ET_HUNGRY, getnpcid(0, "Oliver#ep14_2");
cutin "bu_oliver3",0;
next;
mes "[Oliver]";
mes "Acorns!";
mes "I saw many acorns just outside the city!";
mes "I want them!";
- emotion e_slur,0,"Oliver#ep14_2";
+ emotion ET_SEXY, getnpcid(0, "Oliver#ep14_2");
cutin "bu_oliver4",0;
next;
mes "[Du Lian]";
@@ -2384,7 +2383,7 @@ ecl_in04,182,224,4 script Yube#ep14_2in 4_M_FAIRYKID5,{
mes "[Oliver]";
mes "Hey hey hey!";
mes "I told you not to pull on my cheeks!!";
- emotion e_an,0,"Oliver#ep14_2";
+ emotion ET_FRET, getnpcid(0, "Oliver#ep14_2");
cutin "bu_oliver7",0;
next;
mes "[Mark Esha]";
@@ -2412,7 +2411,7 @@ ecl_in04,179,226,4 script Oliver#ep14_2 4_M_OLIVER,{
if (!countitem(6558)) {// Pile_Of_Acorn
mes "Acorns~~!!!";
mes "I thought you said you'll bring a whole bunch of acorns~~";
- emotion e_sob;
+ emotion ET_CRY;
cutin "bu_oliver7",0;
next;
mes "[Du Lian]";
@@ -2423,7 +2422,7 @@ ecl_in04,179,226,4 script Oliver#ep14_2 4_M_OLIVER,{
else {
mes "Whoa, what a delicious looking acorn!";
mes "Thanks!";
- emotion e_slur;
+ emotion ET_SEXY;
cutin "bu_oliver4",0;
next;
mes "[Oliver]";
@@ -2437,7 +2436,7 @@ ecl_in04,179,226,4 script Oliver#ep14_2 4_M_OLIVER,{
mes "[Oliver]";
mes "Yay!! What a feast!!";
mes "I'm full now.";
- emotion e_kis;
+ emotion ET_CHUP;
mes "Ugh...";
cutin "bu_oliver81",0;
next;
@@ -2450,7 +2449,7 @@ ecl_in04,179,226,4 script Oliver#ep14_2 4_M_OLIVER,{
mes "Yawn...";
mes "I'm full...";
mes "I'm sleepy...";
- emotion e_yawn;
+ emotion ET_SLEEPY;
cutin "bu_oliver82",0;
next;
mes "[Du Lian]";
@@ -2472,7 +2471,7 @@ ecl_in04,179,226,4 script Oliver#ep14_2 4_M_OLIVER,{
next;
mes "[Oliver]";
mes "...";
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
cutin "bu_oliver86",0;
next;
mes "[Oliver]";
@@ -2485,7 +2484,7 @@ ecl_in04,179,226,4 script Oliver#ep14_2 4_M_OLIVER,{
next;
mes "[Du Lian]";
mes "AHHHHHHHH!!!!!!!!!!";
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
cutin "bu_du5",2;
delitem 6558,1;// Pile_Of_Acorn
ep14_2_oliver = 28;
@@ -2497,7 +2496,7 @@ ecl_in04,179,226,4 script Oliver#ep14_2 4_M_OLIVER,{
else {
mes "Yawnnn... so sleepy...";
mes "I'm going to take a nap, so wake me up when we're leaving... Don't leave without me now~";
- emotion e_yawn;
+ emotion ET_SLEEPY;
cutin "bu_oliver6",0;
close2;
}
@@ -2516,7 +2515,7 @@ ecl_in01,44,53,4 script Delivery Man#ep14_2 4_M_DOGTRAVELER,{
next;
mes "[Delivery Man]";
mes "I don't know why people can't just make small amounts of pickled Poring for themselves instead of mailing them...";
- emotion e_sob;
+ emotion ET_CRY;
ep14_2_oliver = 26;
changequest 11333,11334;
}
@@ -2528,7 +2527,7 @@ ecl_in01,44,53,4 script Delivery Man#ep14_2 4_M_DOGTRAVELER,{
mes "Wait a minute...";
mes "Is it actually better to deliver it later...";
mes "I remember seeing so many boxes of pickled Poring in the storage waiting to be delivered...";
- emotion e_sob;
+ emotion ET_CRY;
}
close;
}
@@ -2546,7 +2545,7 @@ ecl_in04,226,231,4 script Du Lian#ep14_2in2 4_M_REDMAN,{
mes "[Du Lian]";
mes "Hmm... Where did he go...?";
mes "Could he be... a ghost?!";
- emotion e_omg,0,"Du Lian#ep14_2in2";
+ emotion ET_HUK, getnpcid(0, "Du Lian#ep14_2in2");
cutin "bu_du5",2;
next;
mes "[Maggi Steen]";
@@ -2555,36 +2554,36 @@ ecl_in04,226,231,4 script Du Lian#ep14_2in2 4_M_REDMAN,{
next;
mes "[Maggi Steen]";
mes "Wait! Here's the hood that Oliver was wearing...";
- emotion e_omg,0,"Maggi Steen#ep14_2in2";
+ emotion ET_HUK, getnpcid(0, "Maggi Steen#ep14_2in2");
cutin "bu_maggi4",2;
next;
mes "[Maggi Steen]";
mes "And... doesn't it feel like this room is different from before?";
- emotion e_swt2,0,"Mark Esha#ep14_2in2";
+ emotion ET_PROFUSELY_SWEAT, getnpcid(0, "Mark Esha#ep14_2in2");
cutin "bu_mark4",0;
next;
mes "[Du Lian]";
mes "Hey stop that!!";
mes "It's scaring me!!!";
- emotion e_omg,0,"Du Lian#ep14_2in2";
+ emotion ET_HUK, getnpcid(0, "Du Lian#ep14_2in2");
cutin "bu_du5",2;
next;
mes "[Maggi Steen]";
mes "Arrrrr~~";
- emotion e_sob,0,"Maggi Steen#ep14_2in2";
+ emotion ET_CRY, getnpcid(0, "Maggi Steen#ep14_2in2");
cutin "bu_maggi4",2;
next;
mes "[Alp Ocart]";
mes "Oh!!! I just remembered...";
mes "Oliver...";
- emotion e_flash,0,"Alp Ocart#ep14_2in2";
+ emotion ET_SPARK, getnpcid(0, "Alp Ocart#ep14_2in2");
cutin "bu_alp2",2;
next;
mes "[Alp Ocart]";
mes "...";
mes "Oliver Hilpert...";
mes ".........is also known as the dreaming novelist...";
- emotion e_dots,0,"Alp Ocart#ep14_2in2";
+ emotion ET_THINK, getnpcid(0, "Alp Ocart#ep14_2in2");
cutin "bu_alp3",2;
next;
mes "[Alp Ocart]";
@@ -2595,23 +2594,23 @@ ecl_in04,226,231,4 script Du Lian#ep14_2in2 4_M_REDMAN,{
mes "[Du Lian]";
mes "Hey...";
mes "Did you just take that book out from your bag?";
- emotion e_dots,0,"Du Lian#ep14_2in2";
+ emotion ET_THINK, getnpcid(0, "Du Lian#ep14_2in2");
cutin "bu_du5",2;
next;
mes "[Alp Ocart]";
mes "Yeah, that's because I'm a fan...";
- emotion e_shy,0,"Alp Ocart#ep14_2in2";
+ emotion ET_SHY, getnpcid(0, "Alp Ocart#ep14_2in2");
cutin "bu_alp4",2;
next;
mes "[Du Lian]";
mes "Why didn't you remember the book when you are such a fan..?";
mes "Not only that, do people usually carry books with them when they're fans?? Especially hardcover books?";
- emotion e_omg,0,"Du Lian#ep14_2in2";
+ emotion ET_HUK, getnpcid(0, "Du Lian#ep14_2in2");
cutin "bu_du5",2;
next;
mes "[Alp Ocart]";
mes "......";
- emotion e_shy,0,"Alp Ocart#ep14_2in2";
+ emotion ET_SHY, getnpcid(0, "Alp Ocart#ep14_2in2");
cutin "bu_alp4",2;
next;
mes "[Du Lian]";
@@ -2621,32 +2620,32 @@ ecl_in04,226,231,4 script Du Lian#ep14_2in2 4_M_REDMAN,{
mes "[Mark Esha]";
mes "More importantly... The title of this book...";
mes "is [The City of Fairies]?";
- emotion e_omg,0,"Mark Esha#ep14_2in2";
+ emotion ET_HUK, getnpcid(0, "Mark Esha#ep14_2in2");
cutin "bu_mark4",0;
next;
mes "[Mark Esha]";
mes "And...";
mes "It's been many years since this book was published...";
- emotion e_omg,0,"Mark Esha#ep14_2in2";
+ emotion ET_HUK, getnpcid(0, "Mark Esha#ep14_2in2");
next;
mes "[Du Lian]";
mes "...This is getting kind of scary...?";
- emotion e_omg,0,"Du Lian#ep14_2in2";
+ emotion ET_HUK, getnpcid(0, "Du Lian#ep14_2in2");
cutin "bu_du1",2;
next;
mes "[Mark Esha]";
mes "......";
- emotion e_dots,0,"Mark Esha#ep14_2in2";
+ emotion ET_THINK, getnpcid(0, "Mark Esha#ep14_2in2");
cutin "bu_mark4",0;
next;
mes "[Maggi Steen]";
mes "......";
- emotion e_dots,0,"Maggi Steen#ep14_2in2";
+ emotion ET_THINK, getnpcid(0, "Maggi Steen#ep14_2in2");
cutin "bu_maggi4",2;
next;
mes "[Alp Ocart]";
mes "......";
- emotion e_dots,0,"Alp Ocart#ep14_2in2";
+ emotion ET_THINK, getnpcid(0, "Alp Ocart#ep14_2in2");
cutin "bu_alp2",2;
ep14_2_oliver = 30;
getitem 19543,1;//Oliver_Wolf_Hood
@@ -2661,61 +2660,61 @@ ecl_in04,226,231,4 script Du Lian#ep14_2in2 4_M_REDMAN,{
case 0:
mes "[Du Lian]";
mes "But this is Volume 1. Does that mean there's more?";
- emotion e_dots;
+ emotion ET_THINK;
cutin "bu_du1",2;
next;
mes "[Alp Ocart]";
mes "It has a total of 3 volumes.";
- emotion e_no1,0,"Alp Ocart#ep14_2in2";
+ emotion ET_BEST, getnpcid(0, "Alp Ocart#ep14_2in2");
cutin "bu_alp1",2;
next;
mes "[Du Lian]";
mes "Wow, how many are you carrying with you...";
mes "Why are you bringing all of them around...";
- emotion e_omg;
+ emotion ET_HUK;
cutin "bu_du5",2;
break;
case 1:
mes "[Mark Esha]";
mes "Everybody calm down!!!";
mes "This has to be some kind of a dream!";
- emotion e_omg;
- emotion e_omg,0,"Du Lian#ep14_2in2";
+ emotion ET_HUK;
+ emotion ET_HUK, getnpcid(0, "Du Lian#ep14_2in2");
cutin "bu_mark2",0;
next;
mes "[Du Lian]";
mes "Why are you hitting me, calling it a dream and all!";
mes "It hurts!";
- emotion e_swt2,0,"Du Lian#ep14_2in2";
+ emotion ET_PROFUSELY_SWEAT, getnpcid(0, "Du Lian#ep14_2in2");
cutin "bu_du4",2;
next;
mes "[Mark Esha]";
mes "Ahhhh maybe it really isn't a dream after all!!!";
- emotion e_omg;
- emotion e_an,0,"Du Lian#ep14_2in2";
+ emotion ET_HUK;
+ emotion ET_FRET, getnpcid(0, "Du Lian#ep14_2in2");
cutin "bu_mark3",0;
break;
case 2:
mes "[Maggi Steen]";
mes "...A...A...Aaaaahhhhhhhhh!!!!!";
- emotion e_sob;
+ emotion ET_CRY;
cutin "bu_maggi4",2;
next;
mes "[Du Lian]";
mes "Don't cry, Maggi~";
- emotion e_swt2,0,"Du Lian#ep14_2in2";
+ emotion ET_PROFUSELY_SWEAT, getnpcid(0, "Du Lian#ep14_2in2");
cutin "bu_du4",2;
break;
case 3:
mes "[Alp Ocart]";
mes "I wonder...";
mes "Why didn't I remember this...?";
- emotion e_omg;
+ emotion ET_HUK;
cutin "bu_alp5",2;
next;
mes "[Alp Ocart]";
mes "I... I should have.. I should have gotten his autograph!!!";
- emotion e_omg;
+ emotion ET_HUK;
}
}
close2;
@@ -2761,7 +2760,7 @@ eclage,282,255,4 script Wuhari#eclbig 4_M_FAIRYKID6,{
mes "[Wuhari]";
mes "Wow! The name sure sounds like it has defeated many in the mountains, seas, and skies! It's amazing!";
next;
- emotion e_shy,1;
+ emotion ET_SHY, playerattached();
mes "["+ strcharinfo(0) +"]";
mes "It's not much.";
mes "I am not really all that great.";
@@ -2774,13 +2773,13 @@ eclage,282,255,4 script Wuhari#eclbig 4_M_FAIRYKID6,{
mes "[Wuhari]";
mes "Really? Oh well...";
next;
- emotion e_sob;
+ emotion ET_CRY;
mes "[Wuhari]";
mes "Sorry to bother you.";
close;
}
mes "[Wuhari]";
- emotion e_heh;
+ emotion ET_SMILE;
mes "Really?";
mes "Thank you so much!";
next;
@@ -2843,7 +2842,7 @@ eclage,282,255,4 script Wuhari#eclbig 4_M_FAIRYKID6,{
mes "["+ strcharinfo(0) +"]";
mes "I just couldn't pass by without doing something about it.";
next;
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Wuhari]";
mes "Does that mean you would meet up with my brother?";
mes "Thank you so much!!!";
@@ -2859,7 +2858,7 @@ eclage,282,255,4 script Wuhari#eclbig 4_M_FAIRYKID6,{
mes "[Wuhari]";
mes "So you might have to be a bit patient with him. Please give this ^0000cdletter^000000 to him.";
next;
- emotion e_go;
+ emotion ET_GO;
mes "[Wuhari]";
mes "Well, you must have a long way to go, so please be on your way.";
ep14_2_big = 2;
@@ -2932,7 +2931,7 @@ eclage,282,255,4 script Wuhari#eclbig 4_M_FAIRYKID6,{
mes "[Wuhari]";
mes "Thanks to that, many gave us lots of good things to eat, heh heh.";
next;
- emotion e_heh;
+ emotion ET_SMILE;
mes "["+ strcharinfo(0) +"]";
mes "......";
next;
@@ -3097,7 +3096,7 @@ eclage,282,255,4 script Wuhari#eclbig 4_M_FAIRYKID6,{
mes "[Wuhari]";
mes "But I guess it's still too much.";
mes "It must be too much...";
- emotion e_sob;
+ emotion ET_CRY;
ep14_2_big = 16;
erasequest 14131;
close;
@@ -3535,7 +3534,7 @@ ecl_in02,149,117,4 script Wuhuru#eclbig 4_M_FAIRYFREAK,{
eclage,200,272,4 script Masione#eclbig 4_F_FAIRYKID2,{
WeightBigQuest;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Masione]";
mes "Whoa! Hey!";
if (ep14_2_big != 9) {
@@ -3795,7 +3794,7 @@ eclage,126,151,4 script Pompe#eclbig 4_M_FAIRYKID3,{
mes "["+ strcharinfo(0) +"]";
mes "That's not it. I was just curious about the Laphine you saw in the field.";
next;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Pompe]";
mes "Oy! That Laphine?";
next;
@@ -3869,7 +3868,7 @@ ecl_fild01,70,285,4 script Giranni#eclbig 4_F_FAIRY2,{
mes "You really seem like you have an impressive aura.";
next;
select("Do you know the way?");
- emotion e_sob;
+ emotion ET_CRY;
mes "[Giranni]";
mes "I'm sorry? Do I know the way...?";
mes "No, no, I'm not someone like that.";
@@ -4081,7 +4080,7 @@ ecl_in01,54,91,2 script Dandy#eclbig 4_M_FAIRYKID2,{
mes "[Dandy]";
mes "A Laphine can freely change in between different clothes, but not any Laphine looks this great!";
next;
- emotion e_pif,0,"Lafiki#eclbig";
+ emotion ET_HNG, getnpcid(0, "Lafiki#eclbig");
mes "[Lafiki]";
mes "What nonsensical nonsense are you saying? No matter who looks at it, this region's best looker is me!";
close;
@@ -4091,12 +4090,12 @@ ecl_in01,53,92,4 script Lafiki#eclbig 4_M_FAIRYKID3,{
mes "[Lafiki]";
mes "My fashion sense today is excellent as usual. Heh-";
next;
- emotion e_lv2;
+ emotion ET_BIGTHROB;
mes "[Lafiki]";
mes "Hello~ My beautiful body~";
mes "Every strand of hair is so beautiful!";
next;
- emotion e_gg,0,"Dandy#eclbig";
+ emotion ET_KIK, getnpcid(0, "Dandy#eclbig");
mes "[Dandy]";
mes "Yes, it's definitely your garbage fashion sense that wreaks of trash as usual.";
close;
@@ -4110,7 +4109,7 @@ eclage,101,130,5 script Wutapoa#eclbig 4_F_FAIRY,{
mes "[Wutapoa]";
mes "I'm going to make it the most decorative, beautiful Yai in Eclage!";
next;
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Wutapoa]";
mes "Yay, woohoo!!!";
close;
@@ -4133,7 +4132,7 @@ eclage,106,61,4 script Markoza#eclbig 4_M_FAIRYKID3,{
mes "[Markoza]";
mes "But would foreigners leave me be when I am this adorable?";
next;
- emotion e_pif;
+ emotion ET_HNG;
mes "[Markoza]";
mes "Man, wherever I go, my cuteness just complicates everything...";
close;
@@ -4143,7 +4142,7 @@ ecl_in02,168,41,2 script Pambo#eclbig 4_F_FAIRYKID3,{
mes "[Pambo]";
mes "Do you like things that twinkle?";
next;
- emotion e_lv2;
+ emotion ET_BIGTHROB;
mes "[Pambo]";
mes "I love them so much!";
next;
@@ -4161,7 +4160,7 @@ ecl_in02,168,41,2 script Pambo#eclbig 4_F_FAIRYKID3,{
mes "Heh heh heh~ Huhuhe~ Hoho~";
mes "Kehehe~ Halala~ Fufu~";
next;
- emotion e_sob;
+ emotion ET_CRY;
mes "[Pambo]";
mes "But there's nothing twinkling here...";
close;
@@ -4174,7 +4173,7 @@ ecl_fild01,134,109,4 script Warao#eclbig 4_M_FAIRYKID5,{
mes "[Warao]";
mes "Come to think of it, I wonder how this foreigner will taste?";
next;
- emotion e_gg;
+ emotion ET_KIK;
mes "[Warao]";
mes "Hey hey, you know I'm kidding, right?";
close;
@@ -4187,7 +4186,7 @@ ecl_in01,38,37,4 script A kneeling boy#eclbig 4_F_FAIRYKID6,{
mes "[A kneeling boy]";
mes "At first, it was because it was comfortable. Now it's because I can't stretch my legs out anymore.";
next;
- emotion e_sob;
+ emotion ET_CRY;
mes "[A kneeling boy]";
mes "I try to stretch them out, and my legs are all asleep!!";
mes "Does that mean I have to fly around with my legs flexed like this?";
@@ -4199,27 +4198,27 @@ ecl_fild01,183,190,4 script Catering#eclbig 4_M_FAIRYSOLDIER,{
mes "Wahahaha! How do you do!";
mes "It's perfect weather for a picnic, no?";
next;
- emotion e_wah;
+ emotion ET_KEK;
mes "[Catering]";
mes "You say it's hard to pack for a picnic?";
next;
- emotion e_no1;
+ emotion ET_BEST;
mes "[Catering]";
mes "Don't you worry!";
next;
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Catering]";
mes "This is a specialty combining acorns with 7 different kinds and 7 different levels of flavor collected by squirrels of Eclage!";
next;
- emotion e_cash;
+ emotion ET_MONEY;
mes "[Catering]";
mes "This specialty to-go box is only 2,999 coins!!!";
next;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Catering]";
mes "Such a remarkable price!";
next;
- emotion e_lv;
+ emotion ET_THROB;
mes "[Catering]";
mes "If you order now, we also give you a disposable fork that feels like new even with a hundred uses!";
close;
@@ -4230,7 +4229,7 @@ ecl_in01,41,103,1 script A blushing girl#eclbig 4_F_FAIRYKID4,{
mes "Do you see this balcony up top?";
mes "Mayor Jun appears there everytime there is an important occasion!";
next;
- emotion e_lv2;
+ emotion ET_BIGTHROB;
mes "[A blushing girl]";
mes "He's so handome!! Ahhh~";
close;
@@ -4244,29 +4243,29 @@ ecl_in01,52,102,4 script Choir Conductor#eclbig 4_M_FAIRYKID,{
mes "[Choir conductor]";
mes "Hello foreigner, we'll give you a taste of our harmony~";
next;
- emotion e_ho;
+ emotion ET_DELIGHT;
mes "[Choir]";
mes "Aaa~";
next;
- emotion e_ho,0,"Choir member#eclbig01";
+ emotion ET_DELIGHT, getnpcid(0, "Choir member#eclbig01");
mes "[Choir]";
mes "Aaa~~";
mes "Aaa~";
next;
- emotion e_ho,0,"Choir member#eclbig02";
+ emotion ET_DELIGHT, getnpcid(0, "Choir member#eclbig02");
mes "[Choir]";
mes "Aaa~~~";
mes "Aaa~~";
mes "Aaa~";
next;
- emotion e_ho,0,"Choir member#eclbig03";
+ emotion ET_DELIGHT, getnpcid(0, "Choir member#eclbig03");
mes "[Choir]";
mes "Aaa~~~~";
mes "Aaa~~~";
mes "Aaa~~";
mes "Aaa~";
next;
- emotion e_ho,0,"Choir member#eclbig04";
+ emotion ET_DELIGHT, getnpcid(0, "Choir member#eclbig04");
mes "[Choir]";
mes "Aaa~~~~~";
mes "Aaa~~~~";
@@ -4274,7 +4273,7 @@ ecl_in01,52,102,4 script Choir Conductor#eclbig 4_M_FAIRYKID,{
mes "Aaa~~";
mes "Aaa~";
next;
- emotion e_ho,0,"Choir member#eclbig05";
+ emotion ET_DELIGHT, getnpcid(0, "Choir member#eclbig05");
mes "[Choir]";
mes "Aaa~~~~~~";
mes "Aaa~~~~~";
@@ -4283,12 +4282,12 @@ ecl_in01,52,102,4 script Choir Conductor#eclbig 4_M_FAIRYKID,{
mes "Aaa~~";
mes "Aaa~";
next;
- emotion e_ho;
- emotion e_ho,0,"Choir member#eclbig01";
- emotion e_ho,0,"Choir member#eclbig02";
- emotion e_ho,0,"Choir member#eclbig03";
- emotion e_ho,0,"Choir member#eclbig04";
- emotion e_ho,0,"Choir member#eclbig05";
+ emotion ET_DELIGHT;
+ emotion ET_DELIGHT, getnpcid(0, "Choir member#eclbig01");
+ emotion ET_DELIGHT, getnpcid(0, "Choir member#eclbig02");
+ emotion ET_DELIGHT, getnpcid(0, "Choir member#eclbig03");
+ emotion ET_DELIGHT, getnpcid(0, "Choir member#eclbig04");
+ emotion ET_DELIGHT, getnpcid(0, "Choir member#eclbig05");
mes "[Choir]";
mes "Uhhurukukuruhuuhhurukukuruhuuh";
mes "Try to feel this~ The melody that flows~";
@@ -4301,7 +4300,7 @@ ecl_in01,52,102,4 script Choir Conductor#eclbig 4_M_FAIRYKID,{
ecl_in01,51,103,4 script Choir member#eclbig01 4_M_FAIRYKID,{
mes "[Choir member]";
mes "Aaa~";
- emotion e_ho;
+ emotion ET_DELIGHT;
close;
}
ecl_in01,53,103,4 duplicate(Choir member#eclbig01) Choir member#eclbig02 4_M_FAIRYKID
@@ -7088,7 +7087,7 @@ ecl_in02,160,36,4 script Eirinn#nk 4_F_FAIRYKID6,{
mes "[Eirinn]";
mes "Something serious? Like, something untreatable??";
mes "Am I going to be like the leading actress who plays a tragic role in a soap opera?";
- emotion e_what;
+ emotion ET_QUESTION;
}
else if (isbegin_quest(4257) == 1) {
if (checkquest(4258) == 2) {
@@ -7481,7 +7480,7 @@ ecl_in01,26,88,5 script Cecilia#nk 4_F_FAIRYKID5,{
mes "No matter how many times I check some items are missing...";
mes "Is it because of the wanderers randomly showing up in town nowadays?";
next;
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Cecilia]";
mes "Hey~ hey~ listen!";
mes "Hey you, what are you doing over there?";
@@ -7495,7 +7494,7 @@ ecl_in01,26,88,5 script Cecilia#nk 4_F_FAIRYKID5,{
mes "[Cecilia]";
mes "For that reason you, who knows that our supplies are missing and who happens to be an outsider as well.";
mes "Must be a thief!";
- emotion e_heh;
+ emotion ET_SMILE;
next;
mes "[Cecilia]";
mes "You have the right to have an attorney present and... no, never mind.";
@@ -10673,7 +10672,7 @@ ecl_in04,105,216,4 script Hiel's Workshop#pa0829 HIDDEN_NPC,{
next;
cutin "EP14_etran1",1;
mes "[Etran]";
- mes "Welcome welcomeow~! We are cat merchants, always serving guests as our kingeow~! Special sale! One piece of meat for 200제니!!";
+ mes "Welcome welcomeow~! We are cat merchants, always serving guests as our kingeow~! Special sale! One piece of meat for 200 Zeny!!";
next;
cutin "EP14_robert1",1;
mes "[Robert]";
@@ -10939,11 +10938,11 @@ ecl_fild01,190,93,5 script Fili#1 4_M_FAIRYANG,1,1,{
mes "[Fili]";
if (BaseLevel < 100) {
mes "Looking at this beautiful field, the song sings itself~";
- emotion e_ho;
+ emotion ET_DELIGHT;
}
else if (ep14_2_nines > 2) {
mes "It's always so beautiful with flowers blooming everywhere.";
- emotion e_ho;
+ emotion ET_DELIGHT;
next;
switch( select("Start a conversation:Laphine that loves the earth:Asking after adventurers") ) {
mes "[Fili]";
@@ -10971,7 +10970,7 @@ ecl_fild01,190,93,5 script Fili#1 4_M_FAIRYANG,1,1,{
mes "There are four in the work group. Don't forget to tell everyone.";
else {
mes "Thanks. Can you hear the earth singing? The sound of flowers and trees dancing in the wind. You'll hear it someday.";
- emotion e_lv;
+ emotion ET_THROB;
changequest 13050,13059;
getexp 300000,300000;
getitem 6081,1;// Splendide_Coin
@@ -11005,7 +11004,7 @@ ecl_fild01,190,93,5 script Fili#1 4_M_FAIRYANG,1,1,{
}
else if (checkquest(13060,PLAYTIME) == 0) {
mes "Should I say it's a relief that they're all alive...? Well...at least it's good that they're still alive.";
- emotion e_dots;
+ emotion ET_THINK;
}
else if (isbegin_quest(13055) == 1) {
if (isbegin_quest(13056) == 1 || isbegin_quest(13057) == 1 || isbegin_quest(13058) == 1) {
@@ -11016,7 +11015,7 @@ ecl_fild01,190,93,5 script Fili#1 4_M_FAIRYANG,1,1,{
}
else {
mes "I'm glad they're all safe and sound. I'll be relieved if they finish their business quickly and go back...Thanks anyway!";
- emotion e_sigh;
+ emotion ET_OHNO;
changequest 13055,13060;
getexp 300000,300000;
getitem 6081,1;// Splendide_Coin
@@ -11055,7 +11054,7 @@ ecl_fild01,190,93,5 script Fili#1 4_M_FAIRYANG,1,1,{
select("......");
mes "[Fili]";
mes "Hmm...I can't just ignore them though...";
- emotion e_dots;
+ emotion ET_THINK;
next;
select("The adventurer on the third floor is starving!");
mes "[Fili]";
@@ -11081,7 +11080,7 @@ ecl_fild01,190,93,5 script Fili#1 4_M_FAIRYANG,1,1,{
next;
mes "[Fili]";
mes "But you know, travelers...they want to go even more if it's dangerous.";
- emotion e_sigh;
+ emotion ET_OHNO;
next;
mes "[Fili]";
mes "^FF0000three adventurers^000000went into the tower recently. I'm not sure if they're still alive...";
@@ -11198,7 +11197,7 @@ ecl_fild01,222,290,5 script Singing Laphine#1 4_F_FAIRYKID,{
if (ep14_2_nines > 2) {
if (checkquest(13059,PLAYTIME) == 0) {
mes "Whew, did I sing too much? I'm so thirsty. A glass of rice wine sounds great, hah~";
- emotion e_spin;
+ emotion ET_CONFUSE;
close;
}
}
@@ -11207,11 +11206,11 @@ ecl_fild01,222,290,5 script Singing Laphine#1 4_F_FAIRYKID,{
mes "Did the great Fili send you? Man, he's got skills for sure! I shall start singing then!?";
else {
mes "I suppose you came to tell me to start working? Don't worry, my voice will touch the earth~";
- emotion e_ho;
+ emotion ET_DELIGHT;
}
next;
mes "As soon as the Laphine started singing, it began to warm my heart.";
- emotion e_ho;
+ emotion ET_DELIGHT;
erasequest 13051;
}
else if (isbegin_quest(13050) == 1)
@@ -11264,7 +11263,7 @@ ecl_fild01,163,196,5 script Dancing Laphine#1 4_F_FAIRYKID3,{
mes "I would love to see the great Fili next time...";
else if (isbegin_quest(13050) == 1 && isbegin_quest(13053) == 1) {
mes "Ah, it's you again! You're so insensitive. Anyway, you're here to tell me to start working, right? I see, I see. You can go now.";
- emotion e_pif;
+ emotion ET_HNG;
erasequest 13053;
}
else if (isbegin_quest(13050) == 1)
@@ -11310,16 +11309,16 @@ ecl_fild01,237,181,5 script Cute Laphine#1 4_M_FAIRYKID5,{
mes "It takes a cute person like me to bring joy to the earth...Too bad that you'll never be able to do so!";
else if (isbegin_quest(13050) == 1 && isbegin_quest(13054) == 1) {
mes "You're new, right? Tell him I'll start the work.";
- emotion e_heh;
+ emotion ET_SMILE;
erasequest 13054;
}
else if (isbegin_quest(13050) == 1) {
mes "You might think smiling to the earth always is nothing, but it's not that easy actually. I mean, it's hard to be cute like me in the first place~";
- emotion e_heh;
+ emotion ET_SMILE;
}
else {
mes "I hope someday the flowers, trees, grasses, and little creatures on this earth will smile with joy.";
- emotion e_heh;
+ emotion ET_SMILE;
}
}
else if (ep14_2_nines == 1) {
@@ -11356,7 +11355,7 @@ ecl_fild01,237,181,5 script Cute Laphine#1 4_M_FAIRYKID5,{
mes "Anyway, you should find some work for the earth as well. Tell Fili that I'll start working.";
next;
mes "As soon as he finished talking, he put on a bright smile.";
- emotion e_heh;
+ emotion ET_SMILE;
erasequest 13054;
}
else
@@ -11507,14 +11506,14 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{
if (.@playtime_13062 == 0 && .@playtime_13064 == 0 && .@playtime_13066 == 0) {
cutin "nines02",2;
mes "No need to worry about me! ^FF0000I'll definitely go home this time!^000000 Thanks for everything! I'll take you out for a nice meal next time!";
- emotion e_thx;
+ emotion ET_THANKS;
if (isbegin_quest(13058))
erasequest 13058;
}
else if (.@playtime_13062 == 2 || .@playtime_13064 == 2 || .@playtime_13066 == 2) {
cutin "nines01",2;
mes "Ah...What a relief...I'm so glad you're here. I was about to leave this tower alone! But I think I'm lost.";
- emotion e_gasp;
+ emotion ET_SURPRISE;
if (.@playtime_13062 == 2) {
next;
cutin "nines04",2;
@@ -11556,7 +11555,7 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{
else {
cutin "nines04",2;
mes "I'm starving to death though... Could you please help me, my friend?";
- emotion e_wah;
+ emotion ET_KEK;
}
if (isbegin_quest(13058))
erasequest 13058;
@@ -11570,11 +11569,11 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{
if (countitem(517) > 9 && countitem(6558) > 9) {
cutin "nines02",2;
mes "Ah, how long has it been since the last time I saw food! Yummm! Thank goodness it's meat! I think it's a little tough...and not warm enough...but still, it's meat!!";
- emotion e_thx;
+ emotion ET_THANKS;
next;
mes "[New Oz]";
mes "Thank you so much!! Yum yum. You're such a good friend! Munch munch.";
- emotion e_no1;
+ emotion ET_BEST;
next;
mes "[New Oz]";
mes "I should get a hustle on and find a way out now! I feel like I can get out of here this time!";
@@ -11622,14 +11621,14 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{
select("Why don't you just eat whatever I get you!");
mes "[New Oz]";
mes "As long as I'm getting something to eat, I was just hoping for a good one. I'm sorry, but do me a favor please. I couldn't forget the taste of the meat.";
- emotion e_slur;
+ emotion ET_SEXY;
if (.@playtime_13062 == 2)
erasequest 13062;
setquest 13061;
break;
case 2:
mes "Okay...I see. I'll try to find another way then. If you meet that muscular Laphine on your way out, tell him I won't be able to see him again...";
- emotion e_wah;
+ emotion ET_KEK;
}
}
break;
@@ -11641,7 +11640,7 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{
else if (checkquest(13063,HUNTING) == 2) {
cutin "nines02",2;
mes "Hey, you really are a good adventurer! I'm actually starting to like you even more.";
- emotion e_flash;
+ emotion ET_SPARK;
next;
mes "[New Oz]";
mes "I'll take care of the rest. I can't just keep bothering you, right? Hahaha.";
@@ -11651,7 +11650,7 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{
}
else if (checkquest(13063,HUNTING) == 1) {
mes "These guys are not really visible and they're so annoying. Ah...I asked you to clean up, but it's not because I'm lazy or anything. Hahaha...";
- emotion e_no;
+ emotion ET_STARE_ABOUT;
}
else {
cutin "nines03",2;
@@ -11663,14 +11662,14 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{
cutin "nines04",2;
mes "[New Oz]";
mes "Of course I can do it on my own~ But if I do it alone, then I'll end up using too much of my energy, and then I'll get hungry again...";
- emotion e_dots;
+ emotion ET_THINK;
next;
switch( select("So you want me to help you brushing off the dust?:Do it yourself then!") ) {
mes "[New Oz]";
case 1:
cutin "nines02",2;
mes "How did you know? I think we're really clicking! If I have a chance, I'll let you join my guild later.";
- emotion e_ok;
+ emotion ET_OK;
next;
mes "[New Oz]";
mes "Fight off some Cherenes then. You don't have to eliminate that many because I'll start fighting soon, too! Haha.";
@@ -11699,7 +11698,7 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{
next;
mes "[New Oz]";
mes "I'll make sure to give my friends all the souvenirs you collected for me, and I'll tell them about you, too!";
- emotion e_thx;
+ emotion ET_THANKS;
delitem 6560,20;// Leaf_Bookmark
changequest 13065,13066;
getexp 300000,300000;
@@ -11716,7 +11715,7 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{
next;
mes "[New Oz]";
mes "Would you mind helping me with that? What are friends for! Hahaha! Thanks!!";
- emotion e_otl;
+ emotion ET_OTL;
erasequest 13065;
}
else {
@@ -11807,7 +11806,7 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{
next;
mes "[New Oz]";
mes "If you look at the books scattered all over the tower, there are bookmarks inside. I think it'll be a great gift for my friends even though it has someone else's memories.";
- emotion e_flash;
+ emotion ET_SPARK;
next;
mes "[New Oz]";
mes "^FF0000A good melody^000000 just came across my mind, and I think I should start writing a song now. You should collect souvenirs for me in the meantime.";
@@ -11828,7 +11827,7 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{
next;
mes "[New Oz]";
mes "I should bring some souvenirs to make them feel better. Is there anything I could use?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
switch( select("Jellopy:Lucky Egg:Loots from local monsters") ) {
case 1:
@@ -11839,7 +11838,7 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{
cutin "nines04",2;
mes "[New Oz]";
mes "Hey... but it's not something we can get around here.";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
select("Loots from local monsters");
}
@@ -11847,7 +11846,7 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{
case 2:
mes "[New Oz]";
mes "Hmm? What's that for? I guess new items came out while I was travelling.";
- emotion e_what;
+ emotion ET_QUESTION;
next;
mes "[New Oz]";
mes "I can't get them unless I know what they are. Is there anything else?";
@@ -11863,7 +11862,7 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{
cutin "nines01",2;
mes "[New Oz]";
mes "Loots from local monsters...hmm, that sounds interesting!";
- emotion e_gasp;
+ emotion ET_SURPRISE;
next;
mes "[New Oz]";
mes "I'm sure they haven't made it here yet. So it's something new for them, too! Right?";
@@ -11893,7 +11892,7 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{
select("I don't see anything.");
mes "[New Oz]";
mes "No, you have to see them carefully. Those Dustballs over there are covering my eyes, and when I can't see clearly, I get sleepy and hungry...";
- emotion e_wah;
+ emotion ET_KEK;
next;
select("I think it's just your imagination!");
cutin "nines03",2;
@@ -12323,7 +12322,7 @@ ecl_tdun04,26,39,1 script Professor Worm#worm 4_M_PROFESSORWORM,{
mes "Wait, there are no more spaces on the wall!";
mes "Who doodled so much on the walls?";
mes "Is it you, monster?";
- emotion e_swt,1;
+ emotion ET_SWEAT, playerattached();
next;
mes "[Professor Worm]";
mes "I guess I would have to write a diary then...";
@@ -12651,7 +12650,7 @@ ecl_tdun03,21,69,5 script Diary Frog No.3#worm 4_FROG,{
case 3:
mes "I used to have more, but unfortunately, the fuel I need to live is the recordings themselves, so part of it got digested away.";
mes "It's the way I work so I can't do much about it.";
- emotion e_swt2,1;
+ emotion ET_PROFUSELY_SWEAT, playerattached();
close;
}
}
@@ -13037,7 +13036,7 @@ ecl_in01,32,52,5 script Traveler Fome#tl01 4_F_DOGTRAVELER,3,3,{
mes "Moreover, the biggest reason why Eclage is so crowded recently is...!!!";
next;
select("It is...?!");
- emotion e_loud;
+ emotion ET_BLABLA;
mes "[Fome]";
mes "A new Mayor Jun was born!";
next;
@@ -13140,9 +13139,9 @@ ecl_in01,32,52,5 script Traveler Fome#tl01 4_F_DOGTRAVELER,3,3,{
OnTouch:
if (ep14_2_mylord == 0 && BaseLevel > 98) {
mes "A group of travelers of Alpheim are having a conversation.";
- emotion e_loud;
- emotion e_loud,0,"Traveler Litrip#tl02";
- emotion e_loud,0,"Traveler Chiba#tl03";
+ emotion ET_BLABLA;
+ emotion ET_BLABLA, getnpcid(0, "Traveler Litrip#tl02");
+ emotion ET_BLABLA, getnpcid(0, "Traveler Chiba#tl03");
next;
switch( select("Avoid them.:Join the group.") ) {
case 1:
@@ -15465,7 +15464,7 @@ eclage,112,40,3 script Eclage Guard Leo#tl 4_M_FAIRYSOLDIER2,{
case 0:
mes "[Leo]";
mes "Hi, how are you?";
- emotion e_gasp;
+ emotion ET_SURPRISE;
next;
mes "[Leo]";
mes "How are you, really!";
@@ -15536,7 +15535,7 @@ eclage,112,40,3 script Eclage Guard Leo#tl 4_M_FAIRYSOLDIER2,{
mes "I'll be counting on you!";
close;
}
- emotion e_flash;
+ emotion ET_SPARK;
mes "Ohhhhh look at that!!!";
mes "Sweet pickled fruits and honey jam that is even sweeter!!!";
mes "You saved my life.";
@@ -15792,7 +15791,7 @@ eclage,112,40,3 script Eclage Guard Leo#tl 4_M_FAIRYSOLDIER2,{
close;
S_Setquest7423:
select("You don't like the king?");
- emotion e_dots;
+ emotion ET_THINK;
mes "[Leo]";
mes "No, it's not that I don't like him. I'm rather concerned...or having trouble trusting him...something like that.";
mes "Since he didn't do anything wrong, I don't have any reason to hate him, but..";
@@ -15818,7 +15817,7 @@ ecl_fild01,205,86,3 script Eclage Messenger Roy#tl 4_M_FAIRYSOLDIER2,{
mes "It's hard.";
mes "It really is hard.";
mes "The more I think about it, I feel like Shenime has a nasty temper.";
- emotion e_gasp;
+ emotion ET_SURPRISE;
next;
mes "[Roy]";
mes "You, who appeared in this time of crisis.";
diff --git a/npc/re/quests/quests_glastheim.txt b/npc/re/quests/quests_glastheim.txt
index 55409b5d2aa..1fa9d67a322 100644
--- a/npc/re/quests/quests_glastheim.txt
+++ b/npc/re/quests/quests_glastheim.txt
@@ -11,7 +11,7 @@
//= 1.1 Dialogue cleanup [Aleos]
//============================================================
-glast_01,195,273,4 script Hugin's Follower#n_gh 123,{
+glast_01,195,273,3 script Hugin's follower#1 2_F_MAGICMASTER,{
mes "[Hugin's Follower]";
mes "I can't move between time and dimensions like master Hugin but I can pretend to.";
next;
diff --git a/npc/re/quests/quests_malangdo.txt b/npc/re/quests/quests_malangdo.txt
index 4e8c7199207..9afedf3e69b 100644
--- a/npc/re/quests/quests_malangdo.txt
+++ b/npc/re/quests/quests_malangdo.txt
@@ -382,7 +382,7 @@ mal_in02,28,56,5 script Samuel#mal 495,{
mes "Kha~ It was nice!!!!";
mes "I was fascinated by that attraction and took the ship, Navi!";
mes "This thing is called the romance of a guy. Hoo hoo~";
- emotion e_shy;
+ emotion ET_SHY;
next;
mes "[Samuel]";
mes "Well... His cuticle seems to have gone bad a bit with his village chief duty, since he settled in Malangdo. But his eyes are still the same.";
@@ -420,7 +420,7 @@ mal_in02,22,62,3 script Tomas#mal 556,{
mes "[Samuel]";
mes "Yes, Admiral!";
mes "Moved all 3 thousand boxes, including the one I just received, to the storage. The next boxes are expected to be delivered in 5 hours!";
- emotion e_omg,0,"Samuel#mal";
+ emotion ET_HUK, getnpcid(0, "Samuel#mal");
next;
mes "[Tomas, Village Chief]";
mes "Samuel!";
@@ -429,7 +429,7 @@ mal_in02,22,62,3 script Tomas#mal 556,{
mes "[Samuel]";
mes "Sorry! Village Chief!";
mes "I will correct myself!";
- emotion e_omg,0,"Samuel#mal";
+ emotion ET_HUK, getnpcid(0, "Samuel#mal");
next;
mes "[Tomas, Village Chief]";
mes "Hmm, hmm!";
@@ -441,22 +441,22 @@ mal_in02,22,62,3 script Tomas#mal 556,{
mes "[Samuel]";
mes "Yes! Village Chief!";
mes "Seaweed, Sea cucumbers, sea squirts, sea anemones to the right! Seaweed and glasses downstairs! Send anchovies and drums to the gathering place! Let the rest stack assortatively in the corner!";
- emotion e_omg,0,"Samuel#mal";
+ emotion ET_HUK, getnpcid(0, "Samuel#mal");
next;
mes "[Tomas, Village Chief]";
mes "It it not.";
mes "Sea cucumbers, sea squirts, sea anemones to the right. Seaweed and kelp downstairs. Anchovies and drums to the gathering place. Let the rest stack assortatively in the corner.";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "[Samuel]";
mes "Yes!!";
- emotion e_omg,0,"Samuel#mal";
+ emotion ET_HUK, getnpcid(0, "Samuel#mal");
next;
mes "[Tomas, Village Chief]";
mes "Huuu...";
mes "It doesn't seem to end.";
mes "There are still piles of paperwork to do... I will be in trouble unless I finish them up before the next boxes arrive.";
- emotion e_sigh;
+ emotion ET_OHNO;
next;
mes "[Tomas, Village Chief]";
mes "So, the amount of the next boxes is 1300....";
@@ -473,7 +473,7 @@ mal_in02,22,62,3 script Tomas#mal 556,{
case 1:
mes "[Tomas, Village Chief]";
mes "...So I told you your face was not familiar.";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "[Tomas, Village Chief]";
mes "Hmm... Sorry, but as I told you before, would you talk to the other cats if it's not that urgent, since I have plenty of work left undone and no time to talk with you.";
@@ -482,7 +482,7 @@ mal_in02,22,62,3 script Tomas#mal 556,{
mes "[Tomas, Village Chief]";
mes "...Anyway all are always good to leave me with the work.";
mes "Pitiless ones...";
- emotion e_an;
+ emotion ET_FRET;
next;
mes "[Tomas, Village Chief]";
mes "Umm... Having said that, would you talk to the other cats if it's not that urgent, since I got plenty of work to do left undone and no time to talk with you?";
@@ -531,11 +531,11 @@ mal_in02,22,62,3 script Tomas#mal 556,{
mes "Admiral!";
mes "Sea bass, sea jelly, sea sponge are well arranged on the right!";
mes "Seaweed and kiwi downstairs! Anchovies and cod to the gathering place! Let the rest stack assortatively in the corner?";
- emotion e_omg,0,"Samuel#mal";
+ emotion ET_HUK, getnpcid(0, "Samuel#mal");
next;
mes "[Tomas, Village Chief]";
mes "....";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "[Tomas, Village Chief]";
mes "....";
@@ -550,7 +550,7 @@ mal_in02,22,62,3 script Tomas#mal 556,{
mes "You!!";
mes "How many times did I tell you! Mew~";
mes "Huh?!";
- emotion e_an;
+ emotion ET_FRET;
cutin "ma_tomas03",2;
next;
mes "[Tomas, Village Chief]";
@@ -558,7 +558,7 @@ mal_in02,22,62,3 script Tomas#mal 556,{
next;
mes "[Tomas, Village Chief]";
mes "Huh?! If you really want to put Sea bass to the right that much, let yourself stand there all day long! Mew~";
- emotion e_omg,0,"Samuel#mal";
+ emotion ET_HUK, getnpcid(0, "Samuel#mal");
next;
mes "[Tomas, Village Chief]";
mes "I'm busy enough without you. You're getting on my nerves! Mew~";
@@ -567,14 +567,14 @@ mal_in02,22,62,3 script Tomas#mal 556,{
mes "[Tomas, Village Chief]";
mes "Ooops!!!";
mes "!!!!!!";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Tomas, Village Chief]";
mes "Hmm, hmm...";
mes "Well... what are you still doing here?";
mes "Go to the regular meeting being held now at the end of the corridor.";
mes "Ahem....";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
cutin "ma_tomas02",2;
close2;
cutin "",255;
@@ -585,7 +585,7 @@ mal_in02,22,62,3 script Tomas#mal 556,{
mes "Well... what are you still doing here?";
mes "Go to the regular meeting being held now at the end of the corridor.";
mes "Ahem....";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
cutin "ma_tomas02",2;
close2;
cutin "",255;
@@ -594,7 +594,7 @@ mal_in02,22,62,3 script Tomas#mal 556,{
mes "[Tomas, Village Chief]";
mes "How is the meeting going on?";
mes "It's been a long time since I visited, since I'm busy... Tsk...";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
cutin "ma_tomas02",2;
close2;
cutin "",255;
@@ -603,13 +603,13 @@ mal_in02,22,62,3 script Tomas#mal 556,{
mes "[Tomas, Village Chief]";
mes "Hoh!";
mes "There have been such issues!";
- emotion e_ic;
+ emotion ET_AHA;
cutin "ma_tomas04",2;
next;
mes "[Tomas, Village Chief]";
mes "I felt uneasy since I couldn't take care of you, being so busy.";
mes "You already got used to Malangdo well enough by yourself.";
- emotion e_heh;
+ emotion ET_SMILE;
next;
mes "[Tomas, Village Chief]";
mes "Then, as village chief and the admiral of the cat association, I'd like you to get along with me as well!";
@@ -624,7 +624,7 @@ mal_in02,22,62,3 script Tomas#mal 556,{
mes "Ha ha ha!";
mes "How are you doing?";
mes "Come to me if anything difficult happens.";
- emotion e_heh;
+ emotion ET_SMILE;
cutin "ma_tomas04",2;
close2;
cutin "",255;
@@ -655,27 +655,27 @@ mal_in02,182,61,3 script President of Meeting#mal 421,{
mes "Umm... Yes. Then, please say first, ^6666ccScottfold^000000.";
set ma_tomas,2;
changequest 11209,11210;
- emotion e_paper,0,"Scottfold#mal";
+ emotion ET_WRAP, getnpcid(0, "Scottfold#mal");
close;
} else if (ma_tomas == 2) {
mes "[President of Meeting]";
mes "Umm... Yes. Please speak first, ^6666ccScottfold^000000.";
- emotion e_paper,0,"Scottfold#mal";
+ emotion ET_WRAP, getnpcid(0, "Scottfold#mal");
close;
} else if (ma_tomas == 3) {
mes "[President of Meeting]";
mes "Please speak, Koon.... next.";
- emotion e_paper,0,"Koon#mal";
+ emotion ET_WRAP, getnpcid(0, "Koon#mal");
close;
} else if (ma_tomas == 4) {
mes "[President of Meeting]";
mes "There will be a presentation by Dr. Devore on his study continuously.";
- emotion e_paper,0,"Linguist Devore#mal";
+ emotion ET_WRAP, getnpcid(0, "Linguist Devore#mal");
close;
} else if (ma_tomas == 5) {
mes "[President of Meeting]";
mes "Please speak next, Dr. Mali.";
- emotion e_paper,0,"Geologist Mali#mal";
+ emotion ET_WRAP, getnpcid(0, "Geologist Mali#mal");
close;
} else if (ma_tomas == 6) {
mes "[President of Meeting]";
@@ -693,7 +693,7 @@ mal_in02,182,61,3 script President of Meeting#mal 421,{
next;
mes "[President of Meeting]";
mes "I feel really sick sometimes when the meeting is prolonged.";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
@@ -723,7 +723,7 @@ mal_in02,178,66,5 script Scottfold#mal 422,{
mes "Then for the next... yes, Koon please speak now.";
set ma_tomas,3;
changequest 11210,11211;
- emotion e_paper,0,"Koon#mal";
+ emotion ET_WRAP, getnpcid(0, "Koon#mal");
close;
}
mes "[Scottfold]";
@@ -764,7 +764,7 @@ mal_in02,177,58,7 script Koon#mal 546,{
mes "Yes. Carry on please.";
set ma_tomas,4;
changequest 11211,11212;
- emotion e_paper,0,"Linguist Devore#mal";
+ emotion ET_WRAP, getnpcid(0, "Linguist Devore#mal");
close;
}
mes "[Koon]";
@@ -789,7 +789,7 @@ mal_in02,174,64,5 script Linguist Devore#mal 549,{
next;
mes "[Linguist Devore]";
mes "Let me say the definite conclusion first. Since ^0000FFthe study on the Starfish language^000000 started from the time we settled in Malangdo, there's been no remarkable outcome yet.";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Linguist Devore]";
mes "Of course it is possible to talk with ^6666ccBiscuit^000000 somehow, but this is not close to the result we expected to solve the situation.";
@@ -823,7 +823,7 @@ mal_in02,174,64,5 script Linguist Devore#mal 549,{
mes "Then, let's wrap up the progress of the language study, and listen to Geologist, Dr. Mali.";
set ma_tomas,5;
changequest 11212,11213;
- emotion e_paper,0,"Geologist Mali#mal";
+ emotion ET_WRAP, getnpcid(0, "Geologist Mali#mal");
close;
} else if (ma_tomas < 18) {
mes "[Linguist Devore]";
@@ -833,7 +833,7 @@ mal_in02,174,64,5 script Linguist Devore#mal 549,{
mes "[Linguist Devore]";
mes "I should solve the puzzling Starfish language soon.";
mes "I'm ashamed to see you all like this as a result.";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
close;
} else if (ma_tomas == 18) {
mes "[Linguist Devore]";
@@ -850,7 +850,7 @@ mal_in02,174,64,5 script Linguist Devore#mal 549,{
mes "But this Starfish is just mysterious.";
mes "I cannot understand it at all.";
mes "I am rather doubtful to say it's actual 'language'.";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Linguist Devore]";
mes "I have no clue, though I study it in various ways.";
@@ -867,7 +867,7 @@ mal_in02,174,64,5 script Linguist Devore#mal 549,{
mes "[Linguist Devore]";
mes "Wooaaa wooaaa ahhh!!!!";
mes "I don't see what's wrong here!";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Linguist Devore]";
mes "Why are they here and what do they want!";
@@ -879,7 +879,7 @@ mal_in02,174,64,5 script Linguist Devore#mal 549,{
mes "[Linguist Devore]";
mes "Wooaaa wooaaa ahhh!!!!";
mes "I don't see what's wrong here!";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Linguist Devore]";
mes "Why are they here and what do they want!";
@@ -890,7 +890,7 @@ mal_in02,174,64,5 script Linguist Devore#mal 549,{
mes "What?! What did you say?!";
mes "Fluently said!";
mes "How come!";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Linguist Devore]";
mes "I can't believe it unless I see it with my own eyes.";
@@ -905,7 +905,7 @@ mal_in02,174,64,5 script Linguist Devore#mal 549,{
mes "[Linguist Devore]";
mes "The study by this time was just making a totally wrong guess!";
mes "But before you're disappointed, I'd rather be happy enough to get the answer.";
- emotion e_no1;
+ emotion ET_BEST;
next;
mes "[Linguist Devore]";
mes "Once we get the answer, it's only a matter of time before understanding the Starfish language.";
@@ -914,7 +914,7 @@ mal_in02,174,64,5 script Linguist Devore#mal 549,{
mes "[Linguist Devore]";
mes "Is it true?!";
mes "Did Biscuit say so?!";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Linguist Devore]";
mes "Ah, ah! Thanks to you, "+strcharinfo(0)+"!";
@@ -927,7 +927,7 @@ mal_in02,174,64,5 script Linguist Devore#mal 549,{
mes "[Linguist Devore]";
mes "Ah, and I really want to tell this happy news to our chief, Tomas.";
mes "Please!!";
- emotion e_hlp;
+ emotion ET_HELP;
set ma_tomas,35;
changequest 11236,11237;
getitem 6422,30; //Egrade_Coin
@@ -936,14 +936,14 @@ mal_in02,174,64,5 script Linguist Devore#mal 549,{
mes "[Linguist Devore]";
mes "Ah, and I really want to tell this happy news to our chief, Tomas.";
mes "Please!!";
- emotion e_hlp;
+ emotion ET_HELP;
close;
}
mes "[Linguist Devore]";
mes "Ah, ah!!";
mes "The study on Starfish is going well.";
mes "It could've really been a disaster, if you, "+strcharinfo(0)+", didn't help us.";
- emotion e_thx;
+ emotion ET_THANKS;
close;
}
@@ -952,7 +952,7 @@ mal_in02,179,57,1 script Geologist Mali#mal 559,{
mes "[Geologist Mali]";
mes "Malangdo is named because the ground here is so soft, mew~";
mes "It gets hard when you touch it, mew~";
- emotion e_slur;
+ emotion ET_SEXY;
close;
} else if (ma_tomas == 5) {
mes "[Geologist Mali]";
@@ -969,25 +969,25 @@ mal_in02,179,57,1 script Geologist Mali#mal 559,{
next;
mes "[Geologist Mali]";
mes "As everyone has their own work to do, I understand that we all must be busy. But I'd like to participate in this repairing, since it's related to our life.";
- emotion e_hlp;
+ emotion ET_HELP;
next;
mes "[Brie]";
mes "Wait!";
mes "It's not something to be done only with instant repairs!";
mes "My father was seriously injured from the earthquake some time ago!";
- emotion e_omg,0,"Brie#mal";
+ emotion ET_HUK, getnpcid(0, "Brie#mal");
next;
mes "[President of Meeting]";
mes "Mr. Brie!! I understand what your situation is, but please clam dowm, since we're having a meeting.";
set ma_tomas,6;
changequest 11213,11214;
- emotion e_paper,0,"Brie#mal";
+ emotion ET_WRAP, getnpcid(0, "Brie#mal");
close;
} else if (ma_tomas < 13) {
mes "[Geologist Mali]";
mes "You attended to the meeting instead of your father today, Brie.";
mes "He's quite unfriendly but devoted to his parents, mew~";
- emotion e_heh;
+ emotion ET_SMILE;
next;
mes "[Geologist Mali]";
mes "Mr. Brie was not a member of our group at first, but he joined in after getting the news that his father, Rican, joined in with the new trade course development, mew~";
@@ -1009,12 +1009,12 @@ mal_in02,179,57,1 script Geologist Mali#mal 559,{
mes "[Geologist Mali]";
mes "Soft and sticky feeling like this...";
mes "Haha~ it gets you addicted to it...";
- emotion e_shy;
+ emotion ET_SHY;
next;
mes "[Geologist Mali]";
mes "Oops!!";
mes "I was about to be sunk into this softness, mew~!!!";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Geologist Mali]";
mes "Though it's got the risk of making you lose your mind, it helped the ship Navi not to break, mew~";
@@ -1025,7 +1025,7 @@ mal_in02,179,57,1 script Geologist Mali#mal 559,{
mes "[Geologist Mali]";
mes "Moreover!!";
mes "How come it's been ^0000FFcracked with this softness^000000, mew~!";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Geologist Mali]";
mes "If this ^0000FFcrack goes on, the underground support may collapse^000000, mew...";
@@ -1043,7 +1043,7 @@ mal_in02,179,57,1 script Geologist Mali#mal 559,{
mes "Khhh!!!";
mes "What a beatiful young person in this hard world!!!";
mes "Whenever I come across a person like you, I feel this life is still good to live, mew~";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Geologist Mali]";
mes "Please listen to ^6666ccmy assistant, Bob^000000 in detail, mew~";
@@ -1055,7 +1055,7 @@ mal_in02,179,57,1 script Geologist Mali#mal 559,{
mes "[Geologist Mali]";
mes "Woohoohoo.";
mes "I~will~be~waiting~for~you~~";
- emotion e_lv2;
+ emotion ET_BIGTHROB;
close;
}
} else if (ma_tomas == 14) {
@@ -1063,7 +1063,7 @@ mal_in02,179,57,1 script Geologist Mali#mal 559,{
mes "Khhh!!!";
mes "What a beatiful young person in this hard world!!!";
mes "Whenever I come across a person like you, I feel this life is still good to live, mew~";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Geologist Mali]";
mes "Please listen to ^6666ccmy assistant, Bob^000000 in detail, mew~";
@@ -1079,17 +1079,17 @@ mal_in02,179,57,1 script Geologist Mali#mal 559,{
mes "[Geologist Mali]";
mes "Ah! Bob complimented you so much on your great job, mew~";
mes "Please help us next time again when you can, mew~";
- emotion e_no1;
+ emotion ET_BEST;
next;
mes "[Linguist Devore]";
mes "I made this, since the Starfish study was well finished and you didn't need to do such hard work like this!";
mes "Sob sob!!!";
- emotion e_sob,0,"Linguist Devore#mal";
+ emotion ET_CRY, getnpcid(0, "Linguist Devore#mal");
next;
mes "[Geologist Mali]";
mes "Ohhh! What are you talking about Dr. Devore, mew~!!!!";
mes "I don't think that way at~~all, mew~!!!";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Geologist Mali]";
mes "Everyone knows how you, Dr. Devore, are studying hard, mew~!!!";
@@ -1144,7 +1144,7 @@ mal_in02,179,57,1 script Geologist Mali#mal 559,{
mes "[Geologist Mali]";
mes "Soft and sticky feeling like this...";
mes "Haha~ it gets you addicted to it...";
- emotion e_slur;
+ emotion ET_SEXY;
close;
}
@@ -1153,7 +1153,7 @@ mal_in02,140,94,0 script Bob#mal 553,{
mes "[Bob]";
mes "You bow-wow! bow! wow! I mew! mew! mew!";
mes "I'm into juice from delicious fish, mew~";
- emotion e_ho;
+ emotion ET_DELIGHT;
close;
} else if (ma_tomas == 14) {
// Dialogue in repeatable quest is identical.
@@ -1165,12 +1165,12 @@ mal_in02,140,94,0 script Bob#mal 553,{
mes "[Bob]";
mes "You bow-wow! bow! wow! I mew! mew! mew!";
mes "I'm into juice from delicious fish, mew~";
- emotion e_ho;
+ emotion ET_DELIGHT;
next;
mes "[Bob]";
mes "Ah ahhh!!!!!!!!!!!";
mes "Are you here for voluntary service?!";
- emotion e_omg;
+ emotion ET_HUK;
next;
if (checkweight(1201,1) == 0) {
mes "[Bob]";
@@ -1191,14 +1191,14 @@ mal_in02,140,94,0 script Bob#mal 553,{
mes "Impressed!!!";
mes "I am impressed!!!";
mes "The impressive mind is dancing in my heart!!!";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Bob]";
mes "I treated the people like I looked down on them and had a prejudice against human beings!!!";
mes "I feel like crying with scales!!!!";
mes "Impressed!!!";
mes "Impression Pegasus Hurricane!!!";
- emotion e_omg;
+ emotion ET_HUK;
next;
select("Stop it! Tell me how to repair the cracks.");
mes "[Bob]";
@@ -1232,7 +1232,7 @@ mal_in02,140,94,0 script Bob#mal 553,{
mes "I see...";
mes "Disappointed...";
mes "Hoohoot shh shh~";
- emotion e_otl;
+ emotion ET_OTL;
close;
}
} else if (ma_tomas == 15) {
@@ -1271,7 +1271,7 @@ mal_in02,140,94,0 script Bob#mal 553,{
mes "[Bob]";
mes "Khhh~~~~~~~~~~~~~~~~~~~~~~";
mes "That was perfect!";
- emotion e_no1;
+ emotion ET_BEST;
next;
mes "[Bob]";
mes "The adhesive filled in just right!!";
@@ -1282,7 +1282,7 @@ mal_in02,140,94,0 script Bob#mal 553,{
mes "Impressed!";
mes "Mysterious!";
mes "Shocked!";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Bob]";
mes "You did a great job indeed!!!";
@@ -1302,7 +1302,7 @@ mal_in02,140,94,0 script Bob#mal 553,{
mes "[Bob]";
mes "You bow-wow! bow! wow! I mew! mew! mew!";
mes "I'm into juice from delicious fish, mew~";
- emotion e_ho;
+ emotion ET_DELIGHT;
close;
}
@@ -1569,7 +1569,7 @@ mal_in01,114,169,5 script Rican#mal 547,{
mes "Woo waa hoohoo...";
mes "Woowaa ahhh ahh ahh...";
mes "I'm impatient... to stay home like this!!";
- emotion e_yawn;
+ emotion ET_SLEEPY;
next;
mes "[Rican]";
mes "When will my legs recover, when?!";
@@ -1582,7 +1582,7 @@ mal_in01,114,169,5 script Rican#mal 547,{
mes "All I can do is press the button all day long~";
mes "This is not exciting at all~";
mes "I'm not willing to do anything more and more~ Doobie dooba~";
- emotion e_yawn;
+ emotion ET_SLEEPY;
next;
select("Excuse me. Is this Rican's house?");
mes "[Rican]";
@@ -1591,7 +1591,7 @@ mal_in01,114,169,5 script Rican#mal 547,{
mes "I am Rican!";
mes "It's good to see you, since I'm so bored now...";
mes "Tell me what's happening right now! Now!";
- emotion e_omg;
+ emotion ET_HUK;
next;
select("Ask about Yggdrasil Berry.");
mes "[Rican]";
@@ -1599,7 +1599,7 @@ mal_in01,114,169,5 script Rican#mal 547,{
mes "You... you know something!";
mes "Umm, hahaha!";
mes "Only a few cats know about Yggdrasil Berry!";
- emotion e_flash;
+ emotion ET_SPARK;
next;
mes "[Rican]";
mes "Well, before I traded them with human beings like you, Yggdrasil Berry was not thought to be a very remarkable fruit.";
@@ -1607,7 +1607,7 @@ mal_in01,114,169,5 script Rican#mal 547,{
mes "[Rican]";
mes "It used to be spread out here and there in my old town. It doesn't have a good taste and causes indigestion, mew~";
mes "Cats need to eat fishes, naturally.";
- emotion e_slur;
+ emotion ET_SEXY;
next;
mes "[Rican]";
mes "But if human beings eat this, it gets you fully recharged.";
@@ -1622,14 +1622,14 @@ mal_in01,114,169,5 script Rican#mal 547,{
mes "[Rican]";
mes "Very long ago...";
mes "Our group left the town for a new course to trade.";
- emotion e_shy;
+ emotion ET_SHY;
next;
mes "[Rican]";
mes "Actually, we dominated the areas around our town, and it was like a challenge to find unexplored areas.";
next;
mes "[Rican]";
mes "But discovering the unknown is the romance of a man, isn't it?";
- emotion e_awsm;
+ emotion ET_COOL;
next;
mes "[Rican]";
mes "Well, the beginning was quite nice, anyway.";
@@ -1637,7 +1637,7 @@ mal_in01,114,169,5 script Rican#mal 547,{
next;
mes "[Rican]";
mes "The sea has enough fishes in it, but it made me bored. I wanted to eat seasoning, like radish with chicken the most.";
- emotion e_rice;
+ emotion ET_HUNGRY;
next;
mes "[Rican]";
mes "Though we drifted for a very long time, we couldn't land on any island. Rather, we met storms.";
@@ -1653,7 +1653,7 @@ mal_in01,114,169,5 script Rican#mal 547,{
mes "Khhh khhh!";
mes "Can you believe it?";
mes "^0000FFThat enormous ship just flied, vroom~~ like an airship and was dropped here in the middle of this island!^000000";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Rican]";
mes "Anyhow, I survived, but most of the goods in the ship were swept and we were left with only Yggdrasil Berry.";
@@ -1661,7 +1661,7 @@ mal_in01,114,169,5 script Rican#mal 547,{
mes "[Rican]";
mes "Huh? Why did we load them, if we don't eat them?";
mes "It... it's the secret...";
- emotion e_swt;
+ emotion ET_SWEAT;
next;
mes "[Rican]";
mes "Well, it's not important. As we sent reconnaissance groups there, we found out that there's a land where the other kind lives, not like us.";
@@ -1684,12 +1684,12 @@ mal_in01,114,169,5 script Rican#mal 547,{
next;
mes "[Rican]";
mes "Since it disappears as we prepare, it's definately the best for our group.";
- emotion e_pat;
+ emotion ET_GOODBOY;
next;
mes "[Rican]";
mes "By the way, as I got injured in this important season, it harms my credibility if I don't meet the deadline to deliver the amount ordered!";
mes "Trading is credibility!!!";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Rican]";
mes "For this reason, would you like to help me?";
@@ -1704,25 +1704,25 @@ mal_in01,114,169,5 script Rican#mal 547,{
mes "[Rican]";
mes "Harvesting Yggdrasil Berry is very easy.";
mes "You can get it when you just dig the ground, mew~";
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
next;
select("?!");
mes "[Rican]";
mes "Huh?";
mes "Doesn't it originally come from the ground?";
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
next;
select("Doesn't it grow on trees?");
mes "[Rican]";
mes "Well, the Yggdrasil Berry in Midgard could do so.";
mes "But ^6666ccwe dig our Yggdrasil Berry here from the ground^000000.";
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
next;
mes "[Rican]";
mes "You can get it on Malangdo Island easily. Bring me about 30.";
mes "Ah! Keep the secret to my son for sure~";
mes "Then please^ff99cc!!!^000000 please^ff99cc!!!^000000 please~~~";
- emotion e_kis;
+ emotion ET_CHUP;
set ma_tomas,9;
changequest 11216,11217;
close;
@@ -1738,7 +1738,7 @@ mal_in01,114,169,5 script Rican#mal 547,{
mes "You can get it on Malangdo Island easily. Bring me about 30.";
mes "Ah! Keep the secret to my son for sure~";
mes "Then please^ff99cc!!!^000000 please^ff99cc!!!^000000 please~~~";
- emotion e_kis;
+ emotion ET_CHUP;
close;
}
mes "[Rican]";
@@ -1840,7 +1840,7 @@ mal_in01,114,169,5 script Rican#mal 547,{
mes "30 Yggdrasil Berry. You can easily find it in Malangdo!!";
mes "Ah! Keep the secret to my son for sure~";
mes "Then please^ff99cc!!!^000000 please^ff99cc!!!^000000 please~~~";
- emotion e_kis;
+ emotion ET_CHUP;
setquest 11238;
close;
case 2:
@@ -1873,7 +1873,7 @@ mal_in01,116,168,0 script Dry Machine#mal 563,{
case 1:
mes "[Rican]";
mes "I'll press the button by myself!!!";
- emotion e_omg,0,"Rican#mal";
+ emotion ET_HUK, getnpcid(0, "Rican#mal");
next;
mes "- The machine starts operating -";
mes "- when he presses the button. -";
@@ -1911,7 +1911,7 @@ mal_in01,116,168,0 script Dry Machine#mal 563,{
mes "- I feel like I'm touching -";
mes "- something bad. -";
mes "- Ah, ah! Feels bad... -";
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
}
set .off,1;
donpcevent "Water Sand"+strnpcinfo(2)+"#mal::OnEnable";
@@ -1998,12 +1998,12 @@ mal_dun01,136,122,3 script Biscuit#mal 551,{
mes "[Biscuit]";
mes "Star Candy sacrifices herself like this, but those fellows are setting the pillars around her for themselves only.";
mes "Hewww!!!";
- emotion e_ag;
+ emotion ET_ANGER;
next;
mes "[Biscuit]";
mes "They talk to her, but ignore me when I talk to her.";
mes "I don't like them at all!!!";
- emotion e_ag;
+ emotion ET_ANGER;
next;
mes "- Unlike the words of Dr. Devore, Biscuit appears fluent in speaking. -";
next;
@@ -2026,7 +2026,7 @@ mal_dun01,136,122,3 script Biscuit#mal 551,{
mes "[Linguist Devore]";
mes "Ummm? What do you mean?";
mes "I cannot hear anything.";
- emotion e_what,0,"Linguist Devore#mald";
+ emotion ET_QUESTION, getnpcid(0, "Linguist Devore#mald");
next;
mes "["+strcharinfo(0)+"]";
mes "Huh? Biscuit said 'Well, that fellow is often the one ignoring my words. He wavers with words to say and makes me uncomfortable.'?";
@@ -2034,29 +2034,29 @@ mal_dun01,136,122,3 script Biscuit#mal 551,{
mes "[Linguist Devore]";
mes "What? What are you taling about?";
mes "I cannot hear anything.";
- emotion e_what,0,"Linguist Devore#mald";
+ emotion ET_QUESTION, getnpcid(0, "Linguist Devore#mald");
next;
mes "["+strcharinfo(0)+"]";
mes "Huh?";
- emotion e_what,1;
+ emotion ET_QUESTION, playerattached();
next;
mes "[Linguist Devore]";
mes "Ah?!";
mes "Ah?!?!?!?!?!?";
mes "Ah!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!";
- emotion e_omg,0,"Linguist Devore#mald";
+ emotion ET_HUK, getnpcid(0, "Linguist Devore#mald");
next;
mes "[Linguist Devore]";
mes "If... if that's the cause!";
mes "We may have totally misunderstood!";
- emotion e_omg,0,"Linguist Devore#mald";
+ emotion ET_HUK, getnpcid(0, "Linguist Devore#mald");
next;
mes "[Linguist Devore]";
mes "Oh my, we couldn't have known, since we live here only with ourselves.";
next;
mes "[Linguist Devore]";
mes "Each living thing has its own area for audibility and vocalization. But we and Biscuit were in slightly different areas!";
- emotion e_omg,0,"Linguist Devore#mald";
+ emotion ET_HUK, getnpcid(0, "Linguist Devore#mald");
next;
mes "[Linguist Devore]";
mes "In such conditions, we cannot hear any language properly!";
@@ -2076,7 +2076,7 @@ mal_dun01,136,122,3 script Biscuit#mal 551,{
mes "["+strcharinfo(0)+"]";
mes "Wait, Dr. Devore, what on earth is next...?";
mes "What should I do...?";
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
next;
mes "[Linguist Devore]";
mes "Hahaha~ You are the kind who can have conversations with Biscuit. Please try to talk with him.";
@@ -2084,7 +2084,7 @@ mal_dun01,136,122,3 script Biscuit#mal 551,{
next;
mes "[Biscuit]";
mes "Hey... Don't look down on me!";
- emotion e_ag;
+ emotion ET_ANGER;
donpcevent "Linguist Devore#mald::OnDisable";
set ma_tomas,22;
completequest 11228;
@@ -2101,7 +2101,7 @@ mal_dun01,136,122,3 script Biscuit#mal 551,{
mes "Star Candy?";
mes "Tsk tsk!";
mes "It's no go, the lowly fellows.";
- emotion e_ag;
+ emotion ET_ANGER;
next;
mes "[Biscuit]";
mes "You shouldn've recognized the previous and mysterious feeling from Star Candy!";
@@ -2111,12 +2111,12 @@ mal_dun01,136,122,3 script Biscuit#mal 551,{
mes "How gorgeous she is that... umm...";
mes "Just gorgeous.";
mes "She is so gorgeous... but I don't know how to explaing it...";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Biscuit]";
mes "Khummm...";
mes "That's why the kinds speaking with sound are irritating.";
- emotion e_ag;
+ emotion ET_ANGER;
next;
select("Speaking with sound?");
mes "[Biscuit]";
@@ -2138,7 +2138,7 @@ mal_dun01,136,122,3 script Biscuit#mal 551,{
mes "[Biscuit]";
mes "Me?";
mes "I'm an assistant to Star Candy, a new star in the Starfish race with multi-faceted talents!";
- emotion e_flash;
+ emotion ET_SPARK;
next;
mes "[Biscuit]";
mes "Ah, ah...";
@@ -2148,7 +2148,7 @@ mal_dun01,136,122,3 script Biscuit#mal 551,{
mes "[Biscuit]";
mes "But if the elderly see this, they'll dry me out in the sun...";
mes "It was a life like a flame... Sob sob sob sob";
- emotion e_sob;
+ emotion ET_CRY;
if (ma_tomas == 23)
set ma_tomas,24;
if (ma_tomas == 25)
@@ -2192,14 +2192,14 @@ mal_dun01,136,122,3 script Biscuit#mal 551,{
next;
mes "[Biscuit]";
mes "How rude...";
- emotion e_ag;
+ emotion ET_ANGER;
next;
mes "[Biscuit]";
mes "You're not my subordinate, so I can't order you by force. But if Star Candy can't have her meal on time, you have to remember that this island will collapse completely.";
next;
mes "["+strcharinfo(0)+"]";
mes "...It's not a request, but a threat...";
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
close;
}
} else if (ma_tomas == 26) {
@@ -2266,7 +2266,7 @@ mal_dun01,136,122,3 script Biscuit#mal 551,{
mes "What's this!!!";
mes "Her skin is!!!!";
mes "She got an abscess on her skin that used to shine like a jewel!!!!";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Biscuit]";
mes "She got in trouble with her dried skin, since she's here!";
@@ -2274,7 +2274,7 @@ mal_dun01,136,122,3 script Biscuit#mal 551,{
next;
mes "[Biscuit]";
mes "Ah, ah! She's so kind that she sacrifices herself to save such things. Sob sob.";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Biscuit]";
mes "Ah, ah...";
@@ -2328,7 +2328,7 @@ mal_dun01,136,122,3 script Biscuit#mal 551,{
next;
mes "[Biscuit]";
mes "For such enormous skin as Star Candy's, it's full of barnacles, oysters, and mussels!!!";
- emotion e_omg;
+ emotion ET_HUK;
close;
}
} else if (ma_tomas < 33) {
@@ -2358,12 +2358,12 @@ mal_dun01,136,122,3 script Biscuit#mal 551,{
mes "[Biscuit]";
mes "Well done!";
mes "Now I see that her beautiful face has recovered.";
- emotion e_awsm;
+ emotion ET_COOL;
next;
mes "[Biscuit]";
mes "The skin will go bad if you don't clean it every day.";
mes "There's a saying... cleansing your skin is much more important than using makeup.";
- emotion e_no1;
+ emotion ET_BEST;
next;
mes "[Biscuit]";
mes "You did a good job.";
@@ -2378,7 +2378,7 @@ mal_dun01,136,122,3 script Biscuit#mal 551,{
next;
mes "[Biscuit]";
mes "This is not for you... and all of you, either. It's rather for Star Candy to get rest as soon as possible, you know!";
- emotion e_pif;
+ emotion ET_HNG;
set ma_tomas,34;
erasequest 11235;
setquest 11236;
@@ -2526,7 +2526,7 @@ mal_dun01,133,125,5 script Star Candy#mal 552,{
mes "["+strcharinfo(0)+"]";
mes "?!";
mes "You can talk!";
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
next;
mes "[Biscuit]";
mes "What?";
@@ -2540,7 +2540,7 @@ mal_dun01,133,125,5 script Star Candy#mal 552,{
mes "[Biscuit]";
mes "Our precious Star Candy humbly supports them, and they treat her like this.";
mes "They don't know how to express thanks!";
- emotion e_ag,0,"Biscuit#mal";
+ emotion ET_ANGER, getnpcid(0, "Biscuit#mal");
next;
select("Support?");
mes "[Biscuit]";
@@ -2567,7 +2567,7 @@ mal_dun01,133,125,5 script Star Candy#mal 552,{
mes "[Biscuit]";
mes "Star Candy sacrifices herself like this, but those fellows are setting the pillars around her for themselves only.";
mes "Hewww!!!";
- emotion e_ag,0,"Biscuit#mal";
+ emotion ET_ANGER, getnpcid(0, "Biscuit#mal");
next;
mes "[Biscuit]";
mes "They talk to her, but ignore me when I talk to her.";
@@ -2940,7 +2940,7 @@ malangdo,175,206,3 script Gobonge#ml 561,{
mes "nice colthes.";
mes "I can't let you go,";
mes "that hurts me so badly!";
- emotion e_sob;
+ emotion ET_CRY;
next;
switch(select("You deserve the pain!:Need help?")) {
case 1:
@@ -2981,7 +2981,7 @@ malangdo,175,206,3 script Gobonge#ml 561,{
mes "If I am usual, I will engrave something";
mes "with your tear...";
mes "Let your bag be here instead!";
- emotion e_sob;
+ emotion ET_CRY;
close;
}
} else if (malang_bad_guys == 1) {
@@ -3018,7 +3018,7 @@ malangdo,175,206,3 script Gobonge#ml 561,{
mes "[Gobonge]";
mes "How do you know the source of bad can?";
mes "Do you have time to do slow at the moment?";
- emotion e_sob;
+ emotion ET_CRY;
close;
} else if (malang_bad_guys == 8) {
mes "[Gobonge]";
@@ -3064,7 +3064,7 @@ malangdo,175,206,3 script Gobonge#ml 561,{
mes "Instead of us, you did bad behavior.";
mes "Good to hear that?";
mes "This is what teacher see best pupil?";
- emotion e_swt;
+ emotion ET_SWEAT;
next;
mes "[Gobonge]";
mes "You deserve a reward!";
@@ -3297,7 +3297,7 @@ malangdo,171,163,3 script Awfully Suspious Dealer 543,{
mes "[Awfully Suspious Dealer]";
mes "It just looks wonderful.";
mes "There's nothing more to have?";
- emotion e_ho;
+ emotion ET_DELIGHT;
close;
case 2:
mes "[Awfully Suspious Dealer]";
@@ -3459,15 +3459,15 @@ malangdo,125,147,3 script Patrol Leader#ml 545,{
next;
mes "[Crime Prevention Staff]";
mes "Captain, we have work again, right?";
- emotion e_sob;
- emotion e_sob,0,"Crime Prevention Staff#ml";
+ emotion ET_CRY;
+ emotion ET_CRY, getnpcid(0, "Crime Prevention Staff#ml");
next;
mes "[Patrol Leader]";
mes "Hide your tears and save your tears!";
mes "You should cry when having a clue for bad activity";
mes "at crime spot!";
- emotion e_sob;
- emotion e_sob,0,"Crime Prevention Staff#ml";
+ emotion ET_CRY;
+ emotion ET_CRY, getnpcid(0, "Crime Prevention Staff#ml");
next;
mes "[Patrol Leader]";
mes "I will scold you once the investigation is over!";
@@ -3585,13 +3585,13 @@ mal_in02,76,63,7 script Cleanyang 544,{
}
if (mal_qook == 0) {
mes "Sailor cat is crying sadly.";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Cleanyang]";
mes "Meow meow meoooow~";
mes "What is going on... Heu... heuk...";
mes "You don't have to know. Heu... heuk...";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "Could not continue talk.";
next;
@@ -3599,7 +3599,7 @@ mal_in02,76,63,7 script Cleanyang 544,{
case 1:
mes "I comforted his wounded heart just standing by him.";
next;
- emotion e_sob;
+ emotion ET_CRY;
mes "[Cleanyang]";
mes "This is unjust... Heuheuk...";
mes "The chef... He always gives me scolding.";
@@ -3627,7 +3627,7 @@ mal_in02,76,63,7 script Cleanyang 544,{
next;
switch(select("Don't ask anymore.:Asking for the place of vermin came.")) {
case 1:
- emotion e_sob;
+ emotion ET_CRY;
mes "[Cleanyang]";
mes "...what's wrong with your face?";
mes "Are you afraid of sending on an errand?";
@@ -3656,14 +3656,14 @@ mal_in02,76,63,7 script Cleanyang 544,{
}
} else if (mal_qook == 1) {
if (checkquest(7261) != -1 && checkquest(7262) != -1 && checkquest(7263) != -1) {
- emotion e_omg;
+ emotion ET_HUK;
mes "[Cleanyang]";
mes "Uh. What is that? Meow.";
mes "This is cat's ship biscuit... It might be left for a long time...";
mes "No way...!";
next;
select("Yeah, this is it.");
- emotion e_hmm;
+ emotion ET_SCRATCH;
mes "[Cleanyang]";
mes "There were infested with insects because sailors hided and left the cat's ship biscuit..";
mes "I got a scolding cause of just teeth grinder?";
@@ -3977,7 +3977,7 @@ mal_in02,29,67,0 script #CaptainRoom3 844,{
mes "Ignoring Thomas and search under the junk.";
mes "And at that time...";
next;
- emotion e_omg;
+ emotion ET_HUK;
mes "The place where the black shadow just passed, I don't how long been it is left.";
mes "Find a cat's ship biscuit.";
switch(rand(3)) {
@@ -4009,7 +4009,7 @@ mal_in02,29,67,0 script #CaptainRoom3 844,{
next;
mes "And at that time...";
mes "The place where the dark shadow just passed, find a cat's ship biscuit that is hided recently.";
- emotion e_omg;
+ emotion ET_HUK;
switch(rand(3)) {
case 0: monster "mal_in02",30,67,"Quick Dark Shadow",2209,1;
case 1: monster "mal_in02",30,65,"Quick Dark Shadow",2209,1;
@@ -4048,7 +4048,7 @@ mal_in02,183,49,0 script #MeetingFloor4 844,{
next;
mes "The place where the dark shadow just passed, I don't how long been it is left.";
mes "Find a cat's ship biscuit.";
- emotion e_omg;
+ emotion ET_HUK;
switch(rand(2)) {
case 0: monster "mal_in02",182,50,"Quick Dark Shadow",2209,1;
case 1: monster "mal_in02",184,50,"Quick Dark Shadow",2209,1;
@@ -4091,7 +4091,7 @@ mal_in02,103,22,0 script #MalBed5 844,{
next;
mes "The place where the dark shadow just passed, I don't how long been it is left.";
mes "Find a cat's ship biscuit.";
- emotion e_omg;
+ emotion ET_HUK;
monster "mal_in02",102,23,"Quick Dark Shadow",2209,1;
setquest 7262;
getitem 11536,1; //Cat_Hard_Biscuit
@@ -4136,7 +4136,7 @@ malangdo,141,178,0 script #Darkweed6 844,{
next;
mes "From the place where Dark shadow just passed and someone hided recently.";
mes "Find a cat's ship biscuit.";
- emotion e_omg;
+ emotion ET_HUK;
monster "malangdo",141,178,"Quick Dark Shadow",2209,1;
setquest 7269;
getitem 11536,1; //Cat_Hard_Biscuit
@@ -4183,7 +4183,7 @@ malangdo,133,134,0 script Strange Pile of Sand#7 557,{
mes "Find a some chips of cat's ship biscuit.";
setquest .@quest;
if (!rand(3)) {
- emotion e_omg;
+ emotion ET_HUK;
getmapxy(.@map$,.@x,.@y,UNITTYPE_NPC);
monster .@map$,.@x,.@y,"Quick Dark Shadow",2209,1;
} else
@@ -4217,7 +4217,7 @@ malangdo,232,131,0 script #UnderStairs8 844,{
mes "Find a some chips of cat's ship biscuit.";
setquest 7271;
if (!rand(3)) {
- emotion e_omg;
+ emotion ET_HUK;
monster "malangdo",231,130,"Quick Dark Shadow",2209,1;
} else
getitem 11536,1; //Cat_Hard_Biscuit
@@ -4251,7 +4251,7 @@ mal_in01,74,20,0 script #CornerTower9 844,{
mes "Find a some chips of cat's ship biscuit.";
setquest 7272;
if (!rand(3)) {
- emotion e_omg;
+ emotion ET_HUK;
monster "mal_in01",73,19,"Quick Dark Shadow",2209,1;
} else
getitem 11536,1; //Cat_Hard_Biscuit
@@ -4282,7 +4282,7 @@ mal_in01,159,225,0 script #CornerLocker10 844,{
mes "Find a some chips of cat's ship biscuit.";
setquest 7273;
if (!rand(3)) {
- emotion e_omg;
+ emotion ET_HUK;
monster "mal_in01",159,225,"Quick Dark Shadow",2209,1;
} else
getitem 11536,1; //Cat_Hard_Biscuit
@@ -4313,7 +4313,7 @@ mal_in01,24,72,0 script #FootholdTower11 844,{
mes "Find a some chips of cat's ship biscuit.";
setquest 7274;
if (!rand(3)) {
- emotion e_omg;
+ emotion ET_HUK;
monster "mal_in01",24,71,"Quick Dark Shadow",2209,1;
} else
getitem 11536,1; //Cat_Hard_Biscuit
@@ -4894,7 +4894,7 @@ malangdo,211,203,4 script [Meow Team] Charo#nya_11 560,{
mes "[Charo]";
mes "We fixed the Duruduru compass, we only need a visitor now...";
mes "Hey, do you want to be a visitor?";
- emotion e_gasp;
+ emotion ET_SURPRISE;
next;
select("A visitor?");
mes "[Charo]";
@@ -6260,8 +6260,8 @@ L_ShowLights:
mes "The speed of spinning is getting faster after pressing the buttons.";
mes "After all...";
specialeffect EF_BEGINSPELL6;
- emotion e_gasp,0,"Cat Detective#nya_14";
- emotion e_gasp,0,"Friend of Detective#mal";
+ emotion ET_SURPRISE, getnpcid(0, "Cat Detective#nya_14");
+ emotion ET_SURPRISE, getnpcid(0, "Friend of Detective#mal");
next;
cutin "mal_homnya_s",2;
mes "[Homnya]";
@@ -6539,7 +6539,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{
next;
mes "[Cat Gamers Director]";
mes "Man! 10 losses in a row...";
- emotion e_sigh;
+ emotion ET_OHNO;
next;
mes "[Cat Gamers Director]";
mes "We are the 'Cat Gamers' Association.";
@@ -6587,7 +6587,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{
mes "[Cat Gamers Director]";
mes "Now that I know the reason,";
mes "there should be a solution to that.";
- emotion e_hmm;
+ emotion ET_SCRATCH;
next;
select("Umm... Mr. Cat...");
mes "[Cat Gamers Director]";
@@ -6604,7 +6604,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{
mes "[Cat Gamers Director]";
mes "So good to see you!!";
mes "What is your name by the way?";
- emotion e_gasp;
+ emotion ET_SURPRISE;
next;
mes "["+strcharinfo(0)+"]";
mes "My name is "+strcharinfo(0)+", Mr. Cat.";
@@ -6621,7 +6621,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{
next;
mes "["+strcharinfo(0)+"]";
mes "A weakness is no longer a weakness when you say it out loud.";
- emotion e_no1,1;
+ emotion ET_BEST, playerattached();
next;
mes "[Cat Gamers Director]";
mes "Hahahaha I like that phrase.";
@@ -6642,7 +6642,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{
mes "How can a person call themself stupid.";
mes "Now I can see how stupid you are.";
mes "Good bye~";
- emotion e_hmm;
+ emotion ET_SCRATCH;
close;
case 2:
mes "[Cat Gamers Director]";
@@ -6665,7 +6665,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{
} else if (malang_gamer == 4) {
mes "[Cat Gamers Director]";
mes "Ok Ok. So what did the manager cat say about the atmosphere these days?~";
- emotion e_what;
+ emotion ET_QUESTION;
next;
mes "You tell him exactly what the Manager Cat said.";
next;
@@ -6674,14 +6674,14 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{
next;
mes "[Cat Gamers Director]";
mes "Do not hesitate... Just tell me everything~";
- emotion e_what;
+ emotion ET_QUESTION;
next;
mes "["+strcharinfo(0)+"]";
mes "Umm... the player cats are afraid of you...";
next;
mes "[Cat Gamers Director]";
mes "What... What did you say?";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "Cat Gamers Director seems to be in shock. Let's give him some time to calm down.";
set malang_gamer,5;
@@ -6696,12 +6696,12 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{
mes "[Cat Gamers Director]";
mes "That is impossible!";
mes "There is no other cat that's nicer than I am!";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Cat Gamers Director]";
mes "Am I really that scary?";
mes "Are those players who bailed on the practice afraid of me too?";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Cat Gamers Director]";
mes "It can't be, right? ehehehehe~";
@@ -6715,7 +6715,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{
mes strcharinfo(0)+", will you help me out?";
mes "There are 4 players who ran away from practice saying they were too tired.";
mes "Could you check if they ran away because of me? ehehehe~";
- emotion e_what;
+ emotion ET_QUESTION;
next;
mes "[Cat Gamers Director]";
mes "Their names are Eryu, Stew, Ketchup, and Eff.";
@@ -6740,11 +6740,11 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{
next;
mes "[Cat Gamers Director]";
mes "What good is it to scam innocent cats?~";
- emotion e_gg;
+ emotion ET_KIK;
next;
mes "["+strcharinfo(0)+"]";
mes "Yes, I think that you're right.";
- emotion e_hmm,1;
+ emotion ET_SCRATCH, playerattached();
next;
mes "[Cat Gamers Director]";
mes "Oh, so you met Eryu, Stew, Ketchup, and Eff.";
@@ -6836,7 +6836,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{
next;
mes "[Cat Gamers Director]";
mes "Well, I kind of was eavesdropping when "+strcharinfo(0)+" and Manager Cat were talking together. Heh~";
- emotion e_heh;
+ emotion ET_SMILE;
next;
mes "["+strcharinfo(0)+"]";
mes "............";
@@ -6866,7 +6866,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{
next;
mes "[Cat Gamers Director]";
mes "Heh~ Let me see... 'Stupid Cat lea...de...'";
- emotion e_an;
+ emotion ET_FRET;
next;
mes "- Crumpling the paper -";
mes "Cat Gamers Director has crumpled the paper and thrown it away.";
@@ -6887,7 +6887,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{
mes "Heh~ I see.";
mes "I can take this positively.";
mes "Heh~ Let's move on to another one.";
- emotion e_ok;
+ emotion ET_OK;
next;
mes "~Reading~";
next;
@@ -6898,7 +6898,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{
mes "[Cat Gamers Director]";
mes "Heh~ This one also sounds productive.";
mes "Heh~ Petition letters are good, I guess... Heh~";
- emotion e_ok;
+ emotion ET_OK;
next;
mes "Reading...~";
next;
@@ -6910,7 +6910,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{
mes "Heh~ Our team is absolutely";
mes "like a family here~ Someone is";
mes "playing here, you know. Heh~";
- emotion e_gasp;
+ emotion ET_SURPRISE;
next;
mes "Reading...~";
next;
@@ -6956,7 +6956,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{
mes "I didn't expect a refusal from a person like you, "+strcharinfo(0)+".";
mes "But still, here's some coins for you~";
mes "Heh~";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Cat Gamers Director]";
mes "We will always welcome you, "+strcharinfo(0)+", as a guest member of the Cat Gamers.";
@@ -6972,7 +6972,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{
mes "[Cat Gamers Director]";
mes "Heh~ Good choice.";
mes "I knew you would help us Cat Gamers... Heh~";
- emotion e_no1;
+ emotion ET_BEST;
next;
mes "[Cat Gamers Director]";
mes "Heh~ Thank you for your help.";
@@ -7012,7 +7012,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{
mes "Heh~ At last!!";
mes strcharinfo(0)+" will become our honorable member!!";
mes "I shall make a '^0000FFCat Gamers Certificate^000000' right away. Heh~";
- emotion e_ho;
+ emotion ET_DELIGHT;
next;
mes "[Cat Gamers Director]";
mes "Come back in an hour and I will get you a '^0000FFCat Gamers Certificate^000000'.";
@@ -7028,7 +7028,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{
next;
mes "[Cat Gamers Director]";
mes "So, it's a bit tricky... Heh~ Please come later. Heh~";
- emotion e_ho;
+ emotion ET_DELIGHT;
close;
}
mes "[Cat Gamers Director]";
@@ -7069,7 +7069,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{
}
mes "[Cat Gamers Director]";
mes "Heh~ Hello, "+strcharinfo(0)+". How is it going practicing with the players?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
switch(select("How are the players doing?:Just stopped by to say hi~:Here's the current status...")) {
case 1:
@@ -7126,7 +7126,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{
case 3:
mes "[Cat Gamers Director]";
mes "Heh~ What happened to your face, "+strcharinfo(0)+"? Guess you lost from the practice, right? Heh~";
- emotion e_gg;
+ emotion ET_KIK;
next;
mes "[Cat Gamers Director]";
mes "Heh~ I saw players puting notes in the 'Petition box'. Heh~ Guess that was your work. Let me see...";
@@ -7304,7 +7304,7 @@ L_CompleteQuest:
next;
mes "[Cat Gamers Director]";
mes "Heh~ Thanks for coming by, "+strcharinfo(0)+". Heh~ Keep up the good work. Heh~";
- emotion e_thx;
+ emotion ET_THANKS;
close;
}
@@ -7329,25 +7329,25 @@ malangdo,127,111,4 script Strange Cat#gamer 547,{
next;
mes "[Manager Cat]";
mes "What do you want?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
set .@cat_gam, rand(1,10);
select("Ask about the team's attitude...");
if (.@cat_gam == 5) {
mes "[Manager Cat]";
mes "Do not lie to me! How can I trust you and reveal our team secret? Aren't you a spy from the doggy team?";
- emotion e_ag;
+ emotion ET_ANGER;
next;
select("Aww, come on...");
mes "You play with a foxtail nearby and then ask again.";
next;
select("Cat Gamers Director says...");
mes "The Manager Cat seems to be interested in the foxtail and starts answering.";
- emotion e_awsm;
+ emotion ET_COOL;
next;
mes "[Manager Cat]";
mes "Players are afraid of the Cat Gamers Director. When they see Cat Gamers Director at the game, they get nervous.";
- emotion e_lv;
+ emotion ET_THROB;
next;
mes "[Manager Cat]";
mes "Can you give me that?";
@@ -7364,7 +7364,7 @@ malangdo,127,111,4 script Strange Cat#gamer 547,{
mes "and give our team information?";
mes "Aren't you a spy from doggy team...?";
mes "Go away.";
- emotion e_ag;
+ emotion ET_ANGER;
next;
mes "This cat might hit you.";
close;
@@ -7372,59 +7372,59 @@ malangdo,127,111,4 script Strange Cat#gamer 547,{
} else if (malang_gamer < 8) {
mes "The Manager Cat is playing with the foxtail you gave him.";
mes "He seems to be liking it...";
- emotion e_lv;
+ emotion ET_THROB;
close;
} else if (malang_gamer == 8) {
mes "The Manager Cat is playing with the foxtail you gave him.";
mes "He seems to be liking it...";
- emotion e_lv;
+ emotion ET_THROB;
next;
switch(select("Help~ Fire~:Hey~!:Do you want to hear something?")) {
case 1:
mes "[Manager Cat]";
mes "Don't lie~ We don't use fire that much~";
- emotion e_an;
+ emotion ET_FRET;
next;
break;
case 2:
mes "The Manager Cat ignores you, and keeps on playing with the foxtail.";
- emotion e_lv;
+ emotion ET_THROB;
close;
case 3:
mes "[Manager Cat]";
mes "Meow~ I want to tell you a story~ Follow me meow~ Let talk over there, meow~";
- emotion e_gg;
+ emotion ET_KIK;
next;
break;
}
mes "["+strcharinfo(0)+"]";
mes "Haha, I was just kidding. I actually need to tell you that the Cat Gamers Director has an issue...";
- emotion e_swt2,1;
+ emotion ET_PROFUSELY_SWEAT, playerattached();
next;
mes "You explain the story to the Manager Cat.";
- emotion e_swt2,1;
+ emotion ET_PROFUSELY_SWEAT, playerattached();
next;
mes "[Manager Cat]";
mes "Scary image... Meow, I understand... Cat Gamers Director should feel peace by giving up things.";
- emotion e_hmm;
+ emotion ET_SCRATCH;
next;
mes "["+strcharinfo(0)+"]";
mes "... ... ...";
- emotion e_dots,1;
+ emotion ET_THINK, playerattached();
next;
mes "[Manager Cat]";
mes "Meow! Go tell him this, meow~ Prepare a box, meow~";
next;
mes "["+strcharinfo(0)+"]";
mes "A box?";
- emotion e_what,1;
+ emotion ET_QUESTION, playerattached();
next;
mes "[Manager Cat]";
mes "Petition it is, meow!! There is some place where humans do such things, I think it will help us~";
next;
mes "["+strcharinfo(0)+"]";
mes "Ok, I will go tell it to the Games Director~";
- emotion e_ok,1;
+ emotion ET_OK, playerattached();
set malang_gamer,9;
erasequest 5066;
setquest 5067;
@@ -7462,7 +7462,7 @@ malangdo,127,111,4 script Strange Cat#gamer 547,{
case 1:
mes "[Manager Cat]";
mes "Oh, hi meow~";
- emotion e_heh;
+ emotion ET_SMILE;
close;
case 2:
switch(rand(1,7)) {
@@ -7475,7 +7475,7 @@ malangdo,127,111,4 script Strange Cat#gamer 547,{
mes "Heh~ >> Normal";
mes "lol Heh~ >> Happy";
mes "lol lol Heh~ >> Crazy meow";
- emotion e_ok;
+ emotion ET_OK;
close;
case 2:
mes "[Manager Cat]";
@@ -7621,13 +7621,13 @@ malangdo,161,197,4 script Eryu#gamer 876,{
mes "[Eryu]";
mes "Arrgg. Go away...";
mes "I don't know who you're talking about.";
- emotion e_an;
+ emotion ET_FRET;
break;
case 2:
mes "[Eryu]";
mes "Umm? 'Human' magazine?";
mes "Is there such a thing?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
mes "["+strcharinfo(0)+"]";
mes "We've been publishing for 10 years.";
@@ -7639,7 +7639,7 @@ malangdo,161,197,4 script Eryu#gamer 876,{
next;
mes "[Eryu]";
mes "Hmm... ok. But, what can I do for you?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
mes "["+strcharinfo(0)+"]";
mes "I am in the middle of writing an article named 'Game Playing Cats'...'";
@@ -7648,7 +7648,7 @@ malangdo,161,197,4 script Eryu#gamer 876,{
next;
mes "[Eryu]";
mes "'Dog n Waltz'?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
mes "["+strcharinfo(0)+"]";
mes "Oh! Yes!";
@@ -7659,7 +7659,7 @@ malangdo,161,197,4 script Eryu#gamer 876,{
next;
mes "[Eryu]";
mes "I don't remember anyone from 'Dog n Waltz' that much.";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "["+strcharinfo(0)+"]";
mes "The person isn't important.";
@@ -7668,7 +7668,7 @@ malangdo,161,197,4 script Eryu#gamer 876,{
mes "Just answer a few questions for me, ok?";
mes "Be yourself and you'll do just fine.";
mes "Ok, first question: How much do you practice a day?";
- emotion e_what,1;
+ emotion ET_QUESTION, playerattached();
next;
mes "[Eryu]";
mes "Usually for about 8 hours, but I have to tell you that I'm not on the team anymore...";
@@ -7676,7 +7676,7 @@ malangdo,161,197,4 script Eryu#gamer 876,{
mes "["+strcharinfo(0)+"]";
mes "Wait, what?";
mes "You are not with the team now? How come...?";
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
next;
mes "[Eryu]";
mes "Well...";
@@ -7704,7 +7704,7 @@ malangdo,161,197,4 script Eryu#gamer 876,{
mes "[Eryu]";
mes "Oh...";
mes "Sorry to make you waste your time.";
- emotion e_sry;
+ emotion ET_SORRY;
next;
mes "["+strcharinfo(0)+"]";
mes "Oh, don't worry.";
@@ -7732,7 +7732,7 @@ malangdo,161,197,4 script Eryu#gamer 876,{
mes "Sorry, I was trying to interview another cat...";
mes "And came back to you by mistake.";
mes "I'm sorry.";
- emotion e_sry,1;
+ emotion ET_SORRY, playerattached();
next;
mes "[Eryu]";
mes "Ah... I see. Take care of yourself.";
@@ -7758,7 +7758,7 @@ malangdo,161,197,4 script Eryu#gamer 876,{
mes "[Eryu]";
mes "What is this? What do you mean by '"+.@inputstr$+"'...?";
mes "Ah... aren't you the writer?";
- emotion e_an;
+ emotion ET_FRET;
next;
mes "["+strcharinfo(0)+"]";
mes "Huh... Who is that..?";
@@ -7784,7 +7784,7 @@ malangdo,161,197,4 script Eryu#gamer 876,{
} else {
mes "[Eryu]";
mes "Aren't you the writer?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
mes "["+strcharinfo(0)+"]";
mes "Huh... Who is that..?";
@@ -7831,7 +7831,7 @@ malangdo,230,197,4 script Stew#gamer 555,{
next;
mes "[Stew]";
mes "Meow...? Who are you, meow?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
switch(select("The 'Cat Gamers' Manager sent me.:Meow~ Grrr~:I'm with the 'Boom Can' Company.")) {
case 1:
@@ -7846,7 +7846,7 @@ malangdo,230,197,4 script Stew#gamer 555,{
case 3:
mes "[Stew]";
mes "'Boom Can' Company, meow?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
mes "["+strcharinfo(0)+"]";
mes "You don't know 'Boom Can' food?";
@@ -7855,7 +7855,7 @@ malangdo,230,197,4 script Stew#gamer 555,{
next;
mes "[Stew]";
mes "Yes meow~ Stew likes canned food very much meow~";
- emotion e_lv;
+ emotion ET_THROB;
next;
mes "["+strcharinfo(0)+"]";
mes "Ah! Ok then.";
@@ -7880,7 +7880,7 @@ malangdo,230,197,4 script Stew#gamer 555,{
mes "[Stew]";
mes "Dogs are natually like that~";
mes "You humans know animals~";
- emotion e_ok;
+ emotion ET_OK;
next;
mes "["+strcharinfo(0)+"]";
mes "Thank you! I'm flattered.~";
@@ -7916,7 +7916,7 @@ malangdo,230,197,4 script Stew#gamer 555,{
mes "Ah! I see.";
mes "Ok, the survey is over now.";
mes "Thank you for your opinion on our survey for the 'Boom Can' company.";
- emotion e_thx,1;
+ emotion ET_THANKS, playerattached();
next;
mes "[Stew]";
mes "Meow? Did you aks anything meow?";
@@ -7925,13 +7925,13 @@ malangdo,230,197,4 script Stew#gamer 555,{
mes "I already asked you everything...";
mes "Don't you remember?";
mes "There were 10 questions!";
- emotion e_what,1;
+ emotion ET_QUESTION, playerattached();
next;
mes "[Stew]";
mes "Really meow? Strange meow.";
mes "Sorry meow? Don't remember meow.";
mes "It didn't felt like an interview meow.";
- emotion e_sry;
+ emotion ET_SORRY;
next;
mes "["+strcharinfo(0)+"]";
mes "Well you did way better than those dogs.";
@@ -7955,12 +7955,12 @@ malangdo,230,197,4 script Stew#gamer 555,{
mes "[Stew]";
mes "Aren't you from the 'Boom Can' Company?";
mes "Another survey meow?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
mes "["+strcharinfo(0)+"]";
mes "Oops! I should be meeting other cats.";
mes "I am very sorry...";
- emotion e_sry,1;
+ emotion ET_SORRY, playerattached();
next;
mes "[Stew]";
mes "It's ok meow~ Good bye meow~";
@@ -7973,7 +7973,7 @@ malangdo,230,197,4 script Stew#gamer 555,{
} else if (checkquest(5085) == 0 || checkquest(5085) == 1) {
mes "[Stew]";
mes "Who are you meow?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
mes "What do you want to say?";
next;
@@ -7987,7 +7987,7 @@ malangdo,230,197,4 script Stew#gamer 555,{
mes "[Stew]";
mes "What is this? What do you mean by '"+.@inputstr$+"'? Meow...";
mes "And... Aren't you from the 'Boom Can' Company, meow?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
mes "["+strcharinfo(0)+"]";
mes "Huh? What's that?";
@@ -8060,7 +8060,7 @@ malangdo,244,144,4 script Ketchup#gamer 546,{
next;
mes "[Ketchup]";
mes "Meow...? Who are you?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
switch(select("Grrr~ Bow wow~:The Game Director cat sent me.:I'm from 'Cans for Kittens'.")) {
case 1:
@@ -8074,16 +8074,16 @@ malangdo,244,144,4 script Ketchup#gamer 546,{
case 3:
mes "[Ketchup]";
mes "Oh yeah? 'Cans for Kittens'?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
mes "["+strcharinfo(0)+"]";
mes "I want to share some of our philosophy with you.";
mes "Do you believe in giving to others?";
- emotion e_what,1;
+ emotion ET_QUESTION, playerattached();
next;
mes "[Ketchup]";
mes "Umm I guess so...";
- emotion e_slur;
+ emotion ET_SEXY;
next;
mes "["+strcharinfo(0)+"]";
mes "'Cans for Kittens' is a religion that embraces all felines.";
@@ -8113,16 +8113,16 @@ malangdo,244,144,4 script Ketchup#gamer 546,{
mes "[Ketchup]";
mes "I am sorry. Really sorry.";
mes "Please forgive me Lord of Cans.";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Ketchup]";
mes "That Director Cat was so scary~!";
mes "I said so many bad things when I left the Cat Gamers...";
mes "Please forgive.";
- emotion e_sob;
+ emotion ET_CRY;
next;
- emotion e_dots;
- emotion e_dots,1;
+ emotion ET_THINK;
+ emotion ET_THINK, playerattached();
next;
mes "["+strcharinfo(0)+"]";
mes "The Lord of Cans forgives Ketchup's sins.";
@@ -8142,7 +8142,7 @@ malangdo,244,144,4 script Ketchup#gamer 546,{
} else if (checkquest(5064) == 2) {
mes "[Ketchup]";
mes "You are...";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "Ketchup gives you an apologetic look and runs away.";
mes "He probably did something bad already.";
@@ -8155,7 +8155,7 @@ malangdo,244,144,4 script Ketchup#gamer 546,{
} else if (checkquest(5087) == 0 || checkquest(5087) == 1) {
mes "[Ketchup]";
mes "Who are you?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
mes "What do you want to say?";
next;
@@ -8166,8 +8166,8 @@ malangdo,244,144,4 script Ketchup#gamer 546,{
mes "[Ketchup]";
mes "What is this? What do you mean by 'Come back'...?";
mes "Can... 'Cans for Kittens'?";
- emotion e_omg;
- emotion e_what;
+ emotion ET_HUK;
+ emotion ET_QUESTION;
next;
mes "Ketchup recognized you and ran away.";
mes "You've delivered the message.";
@@ -8176,7 +8176,7 @@ malangdo,244,144,4 script Ketchup#gamer 546,{
mes "[Ketchup]";
mes "What is this? What do you mean by '"+.@inputstr$+"'...?";
mes "Can... 'Cans for Kittens'?";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "["+strcharinfo(0)+"]";
mes "Huh? What's that?";
@@ -8188,7 +8188,7 @@ malangdo,244,144,4 script Ketchup#gamer 546,{
} else if (checkquest(5088) == 0 || checkquest(5088) == 1) {
mes "[Ketchup]";
mes "Can... 'Cans for Kittens'?";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "Ketchup ran away once again.";
close2;
@@ -8249,14 +8249,14 @@ malangdo,181,119,7 script Eff#gamer 560,{
next;
mes "[Eff]";
mes "Who are you meow?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
switch(select("I have some good investment news...:A... Cat?:The 'Cat Gamers' Director sent me...")) {
case 1:
mes "[Eff]";
mes "Investment info? Meow~?";
mes "What is that? Meow~?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
mes "["+strcharinfo(0)+"]";
mes "Interested, huh?";
@@ -8266,7 +8266,7 @@ malangdo,181,119,7 script Eff#gamer 560,{
mes "["+strcharinfo(0)+"]";
mes "Haha! You are lucky today.";
mes "You heard that land can be a good investment, right?";
- emotion e_what,1;
+ emotion ET_QUESTION, playerattached();
next;
mes "[Eff]";
mes "Oh oh~ I think so. Meow~";
@@ -8276,7 +8276,7 @@ malangdo,181,119,7 script Eff#gamer 560,{
next;
mes "[Eff]";
mes "Prontera meow? Yes, I know about it. Meow~";
- emotion e_heh;
+ emotion ET_SMILE;
next;
mes "["+strcharinfo(0)+"]";
mes "There are some locations where";
@@ -8289,7 +8289,7 @@ malangdo,181,119,7 script Eff#gamer 560,{
mes "Hmm, this is top secret.";
mes "Something that must not be revealed at all...";
mes "Can you really keep this secret...?";
- emotion e_what,1;
+ emotion ET_QUESTION, playerattached();
next;
mes "[Eff]";
mes "Well... I've always been known for being a good keeper of secrets meow.";
@@ -8301,7 +8301,7 @@ malangdo,181,119,7 script Eff#gamer 560,{
next;
mes "[Eff]";
mes "I got it. Meow~";
- emotion e_ok;
+ emotion ET_OK;
next;
mes "["+strcharinfo(0)+"]";
mes "Well, I heard that there is a location in Juno where underground big shots will be investing about 10,000,000,000 zeny.";
@@ -8320,17 +8320,17 @@ malangdo,181,119,7 script Eff#gamer 560,{
next;
mes "[Eff]";
mes "Woot!! 100 Cans~ Meow~";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "["+strcharinfo(0)+"]";
mes "So, how many cans do you want to invest?";
mes "You'll be a part owner so make sure to invest the max that you can afford.";
- emotion e_what,1;
+ emotion ET_QUESTION, playerattached();
next;
mes "[Eff]";
mes "I want to invest.";
mes "But, I don't have cans with me. Meow~";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "["+strcharinfo(0)+"]";
mes "You can always get a loan!!";
@@ -8350,7 +8350,7 @@ malangdo,181,119,7 script Eff#gamer 560,{
next;
mes "["+strcharinfo(0)+"]";
mes "What!! Why would you quit such good a gig!! Are you crazy?";
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
next;
mes "["+strcharinfo(0)+"]";
mes "Let's say we invest 1,000 cans after getting that loan.";
@@ -8574,18 +8574,18 @@ mal_in01,91,216,4 script Ser#gamer 544,{
next;
mes "[Ser]";
mes "Scissors beats Paper,";
- emotion e_scissors;
- emotion e_paper,1;
+ emotion ET_SCISSOR;
+ emotion ET_WRAP, playerattached();
next;
mes "[Ser]";
mes "Paper beats Rock,";
- emotion e_paper;
- emotion e_rock,1;
+ emotion ET_WRAP;
+ emotion ET_ROCK, playerattached();
next;
mes "[Ser]";
mes "And Rock beats Scissors.";
- emotion e_rock;
- emotion e_scissors,1;
+ emotion ET_ROCK;
+ emotion ET_SCISSOR, playerattached();
next;
mes "[Ser]";
mes "Ok? Got it now?";
@@ -8602,7 +8602,7 @@ mal_in01,91,216,4 script Ser#gamer 544,{
close;
}
setarray .@rps$[0], "Rock", "Paper", "Scissors";
- setarray .@emote[0], e_rock, e_paper, e_scissors;
+ setarray .@emote[0], ET_ROCK, ET_WRAP, ET_SCISSOR;
setarray .@count$[0],"First","Second","Third","Fourth","Last";
while(1) {
mes "[Ser]";
@@ -8619,7 +8619,7 @@ mal_in01,91,216,4 script Ser#gamer 544,{
set .@pc, select("Rock:Paper:Scissors")-1;
set .@npc, rand(3);
- emotion .@emote[.@pc],1;
+ emotion .@emote[.@pc], playerattached();
emotion .@emote[.@npc];
mes "["+strcharinfo(0)+"] "+.@rps$[.@pc];
mes "--------------------------------";
@@ -8934,7 +8934,7 @@ mal_in01,86,222,4 script Paa#gamer 544,{
close;
}
setarray .@rps$[0], "Rock", "Paper", "Scissors";
- setarray .@emote[0], e_rock, e_paper, e_scissors;
+ setarray .@emote[0], ET_ROCK, ET_WRAP, ET_SCISSOR;
setarray .@count$[0],"First","Second","Third","Fourth","Last";
while(1) {
mes "[Paa]";
@@ -8951,7 +8951,7 @@ mal_in01,86,222,4 script Paa#gamer 544,{
set .@pc, select("Rock:Paper:Scissors")-1;
set .@npc, rand(3);
- emotion .@emote[.@pc],1;
+ emotion .@emote[.@pc], playerattached();
emotion .@emote[.@npc];
mes "["+strcharinfo(0)+"] "+.@rps$[.@pc];
mes "--------------------------------";
@@ -9592,9 +9592,9 @@ mal_in01,134,221,4 script KungKung#gamer 422,{
set .@npc_dic, rand(6);
// Emote[58-63]:
- // e_dice1, e_dice2, e_dice3, e_dice4, e_dice5, e_dice6
- emotion 58+.@pc_dic,1;
- emotion 58+.@npc_dic;
+ // ET_DICE1, ET_DICE2, ET_DICE3, ET_DICE4, ET_DICE5, ET_DICE6
+ emotion ET_DICE1+.@pc_dic, playerattached();
+ emotion ET_DICE1+.@npc_dic;
if (.@pc_dic > .@npc_dic) {
mes "[KungKung]";
@@ -9624,18 +9624,18 @@ mal_in01,134,221,4 script KungKung#gamer 422,{
next;
mes "[KungKung & "+strcharinfo(0)+"]";
mes "Kong!";
- emotion e_loud,1;
- emotion e_loud;
+ emotion ET_BLABLA, playerattached();
+ emotion ET_BLABLA;
next;
mes "[KungKung & "+strcharinfo(0)+"]";
mes "Kong! Nyang!";
- emotion e_loud,1;
- emotion e_loud;
+ emotion ET_BLABLA, playerattached();
+ emotion ET_BLABLA;
next;
mes "[KungKung & "+strcharinfo(0)+"]";
mes "Kong! Nyang! Kong!";
- emotion e_loud,1;
- emotion e_loud;
+ emotion ET_BLABLA, playerattached();
+ emotion ET_BLABLA;
next;
set .@cat_hand, rand(1,10);
switch(.@attack_turn) {
@@ -9741,7 +9741,7 @@ mal_in01,134,221,4 script KungKung#gamer 422,{
cutin "cat_g_lose",4;
mes "[KungKung]";
mes "Sob...";
- emotion e_sob;
+ emotion ET_CRY;
next;
cutin "",255;
mes "[KungKung]";
@@ -10017,7 +10017,7 @@ mal_in01,133,214,6 script Leader#gamer 546,{
// Emotions displayed when cats' flags not waved.
setarray .@cat_emote[1],
- e_ho,e_no,e_an,e_no1,e_spin;
+ ET_DELIGHT,ET_STARE_ABOUT,ET_FRET,ET_BEST,ET_CONFUSE;
// .@cat_action[] when cats' flags are not waved.
setarray .@cat_emotes$[1],
@@ -10123,15 +10123,15 @@ mal_in01,133,214,6 script Leader#gamer 546,{
set .@rounds_nowave, .@rounds_nowave+1;
if (.@you_flag == 1) {
set .@you_flag$, "You waved the flag";
- set .@emotion[0], e_korea;
+ set .@emotion[0], ET_FLAG;
} else {
set .@you_flag$, "You didn't wave the flag";
- set .@emotion[0], e_swt2;
+ set .@emotion[0], ET_PROFUSELY_SWEAT;
}
for(set .@i,1; .@i<=5; set .@i,.@i+1) {
if (.@flag_point_cat[.@i] == 0) {
set .@cat_flag$[.@i], "Not enough Flag Points, could not wave";
- set .@emotion[.@i], e_ho;
+ set .@emotion[.@i], ET_DELIGHT;
} else {
if (compare(.@cat_emotes$[.@i],""+.@cat_action[.@i])) {
set .@cat_flag$[.@i], "Didn't wave";
@@ -10140,7 +10140,7 @@ mal_in01,133,214,6 script Leader#gamer 546,{
set .@cat_flag$[.@i], "Did wave";
set .@flag_point_cat[.@i], .@flag_point_cat[.@i]-1;
set .@cat_flags_waved, .@cat_flags_waved+1;
- set .@emotion[.@i], e_korea;
+ set .@emotion[.@i], ET_FLAG;
}
}
}
@@ -10151,14 +10151,14 @@ mal_in01,133,214,6 script Leader#gamer 546,{
mes "~ Flag Game challenger "+strcharinfo(0)+" ~";
mes "^FF0000"+.@you_flag$+"^000000 for game ^C1653E"+.@round+"^000000.";
mes .@flag_point+" Flag Point remaining.";
- emotion .@emotion[0],1;
+ emotion .@emotion[0], playerattached();
next;
for(set .@i,1; .@i<=5; set .@i,.@i+1) {
mes "[Leader]";
mes "~ "+.@cat_name$[.@i]+.@cat_desc$[.@i]+" ~";
mes "^FF0000"+.@cat_flag$[.@i]+"^000000 the flag for game ^C1653E"+.@round+"^000000.";
mes .@flag_point_cat[.@i]+" Flag Point remaining for "+.@cat_name$[.@i]+".";
- emotion .@emotion[.@i],0,.@npc_name$[.@i];
+ emotion .@emotion[.@i], getnpcid(0, .@npc_name$[.@i]);
next;
}
if (.@you_flag == 1) {
@@ -10292,7 +10292,7 @@ mal_in01,136,216,2 script Seichi#gamer 553,{
next;
mes "[Seichi]";
mes "Hey, why don't you look around? Who knows? Maybe we can find a delicious canned food~";
- emotion e_no;
+ emotion ET_STARE_ABOUT;
next;
mes "[Seichi]";
mes "Then, you can give me one. Hehe~";
@@ -10300,7 +10300,7 @@ mal_in01,136,216,2 script Seichi#gamer 553,{
} else {
mes "[Seichi]";
mes "I am hungry~ Any leftover canned food there?";
- emotion e_no;
+ emotion ET_STARE_ABOUT;
close;
}
end;
@@ -10319,7 +10319,7 @@ mal_in01,136,215,2 script Row#gamer 559,{
next;
mes "[Row]";
mes "But, you know you can never beat me, the great Row.";
- emotion e_gg;
+ emotion ET_KIK;
close;
} else {
mes "[Row]";
@@ -10340,7 +10340,7 @@ mal_in01,136,214,2 script Debong#gamer 876,{
next;
mes "[Debong]";
mes "Come here, you, meow. I'll pick your hair meow.";
- emotion e_lv;
+ emotion ET_THROB;
close;
} else {
mes "The cat is picking your hair.";
@@ -10353,7 +10353,7 @@ mal_in01,136,213,2 script Libs#gamer 421,{
if (malang_gamer == 20) {
mes "[Libs]";
mes "Arrgg!! Why should I play this stupid flag waving game here?";
- emotion e_an;
+ emotion ET_FRET;
next;
mes "[Libs]";
mes "Hey you. What do you think? I know you've hearing me!";
@@ -10363,11 +10363,11 @@ mal_in01,136,213,2 script Libs#gamer 421,{
next;
mes "[Libs]";
mes "Well, I'm sure you won't have a clue why this is happening. I forgive you.";
- emotion e_ok;
+ emotion ET_OK;
next;
mes "[Libs]";
mes "How can a human understand the overwhelming heart of cats.";
- emotion e_pif;
+ emotion ET_HNG;
close;
} else {
mes "[Libs]";
@@ -10384,19 +10384,19 @@ mal_in01,136,212,2 script YongYong#gamer 554,{
if (malang_gamer == 20) {
mes "[YongYong]";
mes "Meow~ I'm annoyed meow~";
- emotion e_an;
+ emotion ET_FRET;
next;
mes "[YongYong]";
mes "Annoying meow~";
- emotion e_an;
+ emotion ET_FRET;
next;
mes "[YongYong]";
mes "You're annoying meow~";
- emotion e_an;
+ emotion ET_FRET;
next;
mes "[YongYong]";
mes "What are you, a dog? Meow~!";
- emotion e_an;
+ emotion ET_FRET;
specialeffect EF_SONICBLOW2;
next;
mes "[YongYong]";
@@ -10662,6 +10662,7 @@ mal_in01,15,16,3 script Fallen Angel#mal 403,{
}
specialeffect2 EF_REPAIRWEAPON;
progressbar "ffff00",2;
+ setarray .@equip_card[0], getequipcardid(EQI_GARMENT,0),getequipcardid(EQI_GARMENT,1),getequipcardid(EQI_GARMENT,2),getequipcardid(EQI_GARMENT,3);
if (getequipisequiped(EQI_GARMENT) == 0) {
mes "[Fallen Angel]";
mes "The Archangel Wing has been taken out!";
@@ -10677,13 +10678,12 @@ mal_in01,15,16,3 script Fallen Angel#mal 403,{
mes "I can't do it if you can't pay!";
close;
}
- if (getequipcardid(EQI_GARMENT,3) < 4700) { // Armor Enchant System
+ if (callfunc("F_IsCharm",.@equip_card[3]) == false) {
mes "[Fallen Angel]";
mes "This equipment has not been enchanted, please check it again!";
close;
}
set .@equip_refine, getequiprefinerycnt(EQI_GARMENT);
- setarray .@equip_card[0], getequipcardid(EQI_GARMENT,0),getequipcardid(EQI_GARMENT,1),getequipcardid(EQI_GARMENT,2);
delitem 6417,3; //Silvervine
delequip EQI_GARMENT;
getitem2 2573,1,1,.@equip_refine,0,.@equip_card[0],.@equip_card[1],.@equip_card[2],0; //Archangel_Wing
diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt
index 9cec96a7a23..c4e0a00ceaf 100644
--- a/npc/re/quests/quests_malaya.txt
+++ b/npc/re/quests/quests_malaya.txt
@@ -174,7 +174,7 @@ malaya,266,76,3 script Rodel the Guard#malaya 570,4,4,{
close;
}
OnTouch:
- emotion e_gasp;
+ emotion ET_SURPRISE;
end;
OnInit:
@@ -3891,8 +3891,8 @@ malaya,305,281,3 script Guard#buwaya 570,7,7,{
close;
OnTouch:
if ((malaya_hi > 19) && (malaya_buwaya == 0)) {
- emotion e_gasp;
- emotion e_gasp,1;
+ emotion ET_SURPRISE;
+ emotion ET_SURPRISE, playerattached();
}
end;
}
@@ -3901,16 +3901,16 @@ malaya,276,288,5 script Port Malaya Villager::buwaya_A 582,{
mes "- Look at you warily while whispering to each other. -";
close;
} else if (malaya_buwaya == 1) {
- emotion e_gasp,0,"buwaya_A";
+ emotion ET_SURPRISE, getnpcid(0, "buwaya_A");
mes "[Port Malaya Villager]";
mes "No, I heard they got lost in the woods.";
mes "Who would hide such a treasure from a small village like ours?";
next;
- emotion e_swt2,0,"buwaya_B";
+ emotion ET_PROFUSELY_SWEAT, getnpcid(0, "buwaya_B");
mes "[Port Malaya Villager]";
mes "Could it been a monster? My grandma said there is a dragon with a huge head living deep inside the woods.";
next;
- emotion e_no,0,"buwaya_C";
+ emotion ET_STARE_ABOUT, getnpcid(0, "buwaya_C");
mes "[Port Malaya Villager]";
mes "No. Listen to me.";
next;
@@ -3918,70 +3918,70 @@ malaya,276,288,5 script Port Malaya Villager::buwaya_A 582,{
mes "You all know ^3131FFTotoy^000000? The kid living at the ^3131FFInn^000000.";
mes "Well, did you know Totoy came back from the woods recently?";
next;
- emotion e_omg,0,"buwaya_A";
- emotion e_omg,0,"buwaya_B";
+ emotion ET_HUK, getnpcid(0, "buwaya_A");
+ emotion ET_HUK, getnpcid(0, "buwaya_B");
mes "[Port Malaya Villager]";
mes "Really??? He came back alive?";
next;
- emotion e_gasp,0,"buwaya_C";
+ emotion ET_SURPRISE, getnpcid(0, "buwaya_C");
mes "[Port Malaya Villager]";
mes "Yeah. But the strange part is that the troublemaker ^3131FFTotoy^000000 now quietly stays home and never comes out.";
next;
- emotion e_what,0,"buwaya_B";
+ emotion ET_QUESTION, getnpcid(0, "buwaya_B");
mes "[Port Malaya Villager]";
mes "Why?";
next;
- emotion e_gasp,0,"buwaya_C";
+ emotion ET_SURPRISE, getnpcid(0, "buwaya_C");
mes "[Port Malaya Villager]";
mes "Don't you get it? Totoy must have found the treasure.";
next;
- emotion e_omg,0,"buwaya_A";
- emotion e_omg,0,"buwaya_B";
+ emotion ET_HUK, getnpcid(0, "buwaya_A");
+ emotion ET_HUK, getnpcid(0, "buwaya_B");
mes "[Port Malaya Villager]";
mes "What!!!! Then ^3131FFTotoy^000000 is rich now?";
next;
- emotion e_no,0,"buwaya_C";
+ emotion ET_STARE_ABOUT, getnpcid(0, "buwaya_C");
mes "[Port Malaya Villager]";
mes "I don't think so.";
mes "I saw ^3131FFTotoy^000000 come back home, but Totoy wasn't carrying anything.";
mes "But then, I must have missed it because I ran back home right away.";
next;
- emotion e_what,0,"buwaya_B";
+ emotion ET_QUESTION, getnpcid(0, "buwaya_B");
mes "[Port Malaya Villager]";
mes "Then what is ^3131FFTotoy^000000 doing at home?";
next;
- emotion e_dots,0,"buwaya_C";
+ emotion ET_THINK, getnpcid(0, "buwaya_C");
mes "[Port Malaya Villager]";
mes "I think Totoy is making a plan to bring the treasure back without us knowing it.";
mes "To have the whole treasure for himself, that greedy kid.";
next;
- emotion e_what,0,"buwaya_A";
+ emotion ET_QUESTION, getnpcid(0, "buwaya_A");
mes "[Port Malaya Villager]";
mes "Is that true?";
next;
- emotion e_lv2,0,"buwaya_B";
+ emotion ET_BIGTHROB, getnpcid(0, "buwaya_B");
mes "[Port Malaya Villager]";
mes "The treasure would be in better hands with me ~";
mes "I would clean it every day so it shined and would use it as a beautiful ornament. Ah~~~";
next;
- emotion e_dots,0,"buwaya_C";
+ emotion ET_THINK, getnpcid(0, "buwaya_C");
mes "[Port Malaya Villager]";
mes "Then how about we talk to ^3131FFTotoy^000000 to spill the beans on where the treasure is?";
next;
- emotion e_what,0,"buwaya_A";
+ emotion ET_QUESTION, getnpcid(0, "buwaya_A");
mes "[Port Malaya Villager]";
mes "Wow. That is an awesome idea. No wonder you're the leader!";
next;
- emotion e_dots,0,"buwaya_A";
+ emotion ET_THINK, getnpcid(0, "buwaya_A");
mes "[Port Malaya Villager]";
mes "But will ^3131FFTotoy^000000 give up the information easily?";
mes "Because Totoy was sneaky enough to think of getting away with taking the whole treasure.";
next;
- emotion e_sob,0,"buwaya_B";
+ emotion ET_CRY, getnpcid(0, "buwaya_B");
mes "[Port Malaya Villager]";
mes "Then we should convince ^3131FFTotoy^000000 to tell us where the treasure is instead of looking for it ourselves.";
next;
- emotion e_sob,0,"buwaya_B";
+ emotion ET_CRY, getnpcid(0, "buwaya_B");
mes "[Port Malaya Villager]";
mes "Ah~~~ it is so hard to get something pretty these days ~~~!!!!";
set malaya_buwaya,2;
@@ -4009,7 +4009,7 @@ ma_in01,47,101,3 script Totoy#buwaya 577,7,7,{
next;
if (select("Tap him on the shoulder.:Ignore him.") == 2)
close;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Totoy]";
mes "Wah! No! Go away! Leave me alone!";
next;
@@ -4060,13 +4060,13 @@ ma_in01,47,101,3 script Totoy#buwaya 577,7,7,{
}
close;
} else if (malaya_buwaya == 4) {
- emotion e_gasp;
+ emotion ET_SURPRISE;
mes "[Totoy]";
mes "I can see!! My eyes work!!!";
mes "Yay! I feel better now!";
next;
- emotion e_dots,1;
- emotion e_no1;
+ emotion ET_THINK, playerattached();
+ emotion ET_BEST;
mes "[Totoy]";
mes "Wow! You look better than you sounded. Ha ha.";
next;
@@ -4076,16 +4076,16 @@ ma_in01,47,101,3 script Totoy#buwaya 577,7,7,{
mes "What is that about?";
next;
select("Tell him what the people are talking about.");
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Totoy]";
mes "WHAT?";
mes "Puhaha! Totoy is rich! Became rich overnight! Chief Ed!";
next;
- emotion e_pif;
+ emotion ET_HNG;
mes "[Totoy]";
mes "Sorry but I went to the woods to collect bugs. Wish I saw a treasure while I was at it. Hmph!";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "[Totoy]";
mes "I did go deep in the woods because I wasn't getting anywhere with collecting bugs. But who would have thought I'd get into this mess?";
next;
@@ -4093,7 +4093,7 @@ ma_in01,47,101,3 script Totoy#buwaya 577,7,7,{
mes "[Totoy]";
mes "I only wanted to show people my collection of cute bugs. Ha ha.";
next;
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Totoy]";
mes "Dropping ice or bugs down peoples clothes is just like a daily greeting, isn't it?";
next;
@@ -4107,7 +4107,7 @@ ma_in01,47,101,3 script Totoy#buwaya 577,7,7,{
mes "[Totoy]";
mes "Ah, Ed is my cute puppy. He's very nice and cuddly. My best friend in the whole wide world.";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "[Totoy]";
mes "Ed usually barks a lot but I should have looked around when he barked and pulled on my sleeves.";
next;
@@ -4124,7 +4124,7 @@ ma_in01,47,101,3 script Totoy#buwaya 577,7,7,{
mes "[Totoy]";
mes "The scariest part is that the monster has two heads. You won't believe it till you see it.";
next;
- emotion e_sob;
+ emotion ET_CRY;
mes "[Totoy]";
mes "Ed bit the monsters leg with all his might to let me get away. But I don't know what happened to him afterwards. Sniff~";
next;
@@ -4176,7 +4176,7 @@ ma_in01,47,101,3 script Totoy#buwaya 577,7,7,{
mes "Poor Ed. I miss Ed. Wail!!!!";
close;
} else if (malaya_buwaya == 12) {
- emotion e_sob;
+ emotion ET_CRY;
mes "[Totoy]";
mes "Poor Ed. I miss Ed. Wail!!!!";
next;
@@ -4184,7 +4184,7 @@ ma_in01,47,101,3 script Totoy#buwaya 577,7,7,{
mes "[Dog]";
mes "Bark bark!!";
next;
- emotion e_omg;
+ emotion ET_HUK;
mes "[Totoy]";
mes "Ed!!";
mes "Ed!!! You're alive!!!";
@@ -4217,7 +4217,7 @@ ma_in01,47,101,3 script Totoy#buwaya 577,7,7,{
mes "Um... hey!";
next;
select("You are a " + ((Sex == SEX_MALE) ? "boy" : "girl") + ", aren't you?");
- emotion e_omg,1;
+ emotion ET_HUK, playerattached();
mes "[Totoy]";
mes "Huh?";
if (Sex == SEX_FEMALE) {
@@ -4279,7 +4279,7 @@ ma_in01,47,101,3 script Totoy#buwaya 577,7,7,{
close;
}
OnTouch_:
- emotion e_omg;
+ emotion ET_HUK;
end;
}
@@ -4754,7 +4754,7 @@ ma_fild02,312,259,3 script Dog#buwaya 81,{
mes "[" + strcharinfo(0) + "]";
mes "You didn't get killed by Buwaya. You lucky little dog. Let's go back to your owner.";
next;
- emotion e_ho;
+ emotion ET_DELIGHT;
mes "[Dog]";
mes "Bark bark!!";
next;
@@ -6371,7 +6371,7 @@ OnTouch_:
mes "[Cowardly Worker]";
mes "Go up and you will";
mes "find the Gloomy Worker.";
- emotion e_swt,1;
+ emotion ET_SWEAT, playerattached();
close;
}
end;
@@ -6467,7 +6467,7 @@ ma_scene01,175,170,5 script Sentimental Worker#bako2 578,{
mes "I'm secretly guarding the trap!";
mes "I want to hear out loud.";
mes "I have a trap in front of me! Ha ha ha ha~";
- emotion e_swt2,1;
+ emotion ET_PROFUSELY_SWEAT, playerattached();
close;
}
end;
@@ -6613,7 +6613,7 @@ function script F_Malaya_Nurse {
mes "Yes!";
mes "I have an idea.";
mes "How about we stick that one over the one we saw on the 2nd floor door?";
- emotion e_ic;
+ emotion ET_AHA;
next;
mes "[Nurse Las]";
mes "Maybe it will block the bad energy it's giving out.";
@@ -6625,7 +6625,7 @@ function script F_Malaya_Nurse {
mes "Yes!";
mes "I have an idea.";
mes "How about we stick that one over the one we saw on the 2nd floor door?";
- emotion e_ic;
+ emotion ET_AHA;
cutin "malaya_nurseA01",2;
next;
mes "[Nurse Las]";
@@ -6640,7 +6640,7 @@ function script F_Malaya_Nurse {
next;
mes "[Nurse Maenne]";
mes "I didn't think you'd do something like this.";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "[Nurse Maenne]";
mes "We were just about to enter Bangungot's room, before we were thrown out...";
@@ -6837,7 +6837,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{
if (malaya_hi < 20) {
mes "[Nurse]";
mes "People of this town are too cautious of outsiders.";
- emotion e_ag;
+ emotion ET_ANGER;
cutin "malaya_nurseA01",2;
next;
mes "[Nurse]";
@@ -6874,7 +6874,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{
next;
mes "[Nurse]";
mes "I heard it was just built, but it seems so creepy....";
- emotion e_swt;
+ emotion ET_SWEAT;
next;
mes "[Nurse]";
mes "I was surprised when I got here too.";
@@ -6891,7 +6891,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{
mes "[Nurse]";
mes "Not even a soul to welcome me, let alone a party!";
mes "Shocking!";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Nurse]";
mes "What's more, I made it here after being lost and now I'm facing a creepy and locked hospital!";
@@ -6909,7 +6909,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{
mes "[Nurse]";
mes "Not even a soul to welcome me, let alone a party!";
mes "Shocking!";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Nurse]";
mes "What's more, I made it here after being lost and now I'm facing a creepy and locked hospital!";
@@ -6921,7 +6921,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{
next;
mes "[Nurse]";
mes "I heard it was just built, but it seems so creepy....";
- emotion e_swt;
+ emotion ET_SWEAT;
next;
mes "[Nurse]";
mes "I was surprised when I got here too.";
@@ -6934,7 +6934,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{
mes "Oh, well.";
mes "I'll let you be on your way.";
mes "Don't mind me. *Sob*";
- emotion e_sob;
+ emotion ET_CRY;
cutin "malaya_nurseA03",2;
close2;
cutin "",255;
@@ -6944,7 +6944,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{
case 2:
mes "[Nurse]";
mes "Oh, I see...";
- emotion e_sob;
+ emotion ET_CRY;
close2;
cutin "",255;
end;
@@ -6961,7 +6961,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{
next;
mes "[Nurse]";
mes "If I knew this was going to happen, I would've worn ER night-shift shoes instead of first-day shoes... *sniff*";
- emotion e_sob;
+ emotion ET_CRY;
next;
switch(select("Help.:Don't help.")) {
case 1:
@@ -6969,7 +6969,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{
mes "*Sob*";
mes "I guess this world is still worth living in.";
mes "You are too kind.";
- emotion e_sob;
+ emotion ET_CRY;
next;
mes "[Nurse Las]";
mes "I'm 'Las', who's supposed to work in this hospital.";
@@ -6981,7 +6981,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{
mes "[Nurse Las]";
mes "Before that....";
mes "Could you get something to wrap my feet? I can't put my shoes on because I've got blisters.";
- emotion e_hlp;
+ emotion ET_HELP;
cutin "malaya_nurseA04",2;
next;
mes "[Nurse Las]";
@@ -6997,7 +6997,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{
mes "Oh, well.";
mes "I'll let you be on your way.";
mes "Don't mind me. *Sob*";
- emotion e_sob;
+ emotion ET_CRY;
cutin "malaya_nurseA03",2;
close2;
cutin "",255;
@@ -7030,7 +7030,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{
mes "[Nurse Las]";
mes "Before that...";
mes "Could you get something to wrap my feet? I can't put my shoes on because I've got blisters.";
- emotion e_hlp;
+ emotion ET_HELP;
cutin "malaya_nurseA03",2;
next;
mes "[Nurse Las]";
@@ -7048,7 +7048,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{
mes "[Nurse Las]";
mes "Oh...... the smell......";
mes "My new shoes will be ruined...";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Nurse Las]";
mes "Okay!!!!!!";
@@ -7069,7 +7069,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{
} else if (malaya_bang == 4) {
mes "["+strcharinfo(0)+"]";
mes "We pushed and pulled, but it won't budge.";
- emotion e_swt2,1;
+ emotion ET_PROFUSELY_SWEAT, playerattached();
next;
mes "[Nurse Las]";
mes "Strange~";
@@ -7079,7 +7079,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{
mes "[Nurse Las]";
mes "Hmmm!";
mes "I can't stand it anymore!";
- emotion e_an;
+ emotion ET_FRET;
next;
mes "[Nurse Las]";
mes "Could you ask the townsfolk about the hospital while I contact HQ?";
@@ -7107,7 +7107,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{
} else if (malaya_bang == 6) {
mes "[Nurse Las]";
mes "What did she say?";
- emotion e_what;
+ emotion ET_QUESTION;
cutin "malaya_nurseA02",2;
next;
select("Tell her what she said.");
@@ -7143,7 +7143,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{
mes "An inn?";
mes "Good gracious!";
mes "If they'd have told me earlier I wouldn't have had to stand out here for so long!";
- emotion e_pif;
+ emotion ET_HNG;
cutin "malaya_nurseA01",2;
next;
mes "[Nurse Las]";
@@ -7156,7 +7156,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{
next;
mes "[Nurse Las]";
mes "I don't think I can move anymore because of my feet. Could you go to the inn for me?";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
cutin "malaya_nurseA03",2;
next;
mes "[Nurse Las]";
@@ -7173,7 +7173,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{
} else if (malaya_bang == 9) {
mes "[Nurse Las]";
mes "I don't think I can move anymore because of my feet. Could you go to the inn for me?";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
cutin "malaya_nurseA03",2;
next;
mes "[Nurse Las]";
@@ -7215,8 +7215,8 @@ malaya,55,72,4 script Nurse#ma_n1 569,{
mes "The door's not locked?";
mes "How can this be?????";
mes "????";
- emotion e_what;
- emotion e_what,1;
+ emotion ET_QUESTION;
+ emotion ET_QUESTION, playerattached();
cutin "malaya_nurseA04",2;
next;
mes "[Nurse Las]";
@@ -7231,8 +7231,8 @@ malaya,55,72,4 script Nurse#ma_n1 569,{
next;
mes "[???]";
mes "*Snigger*";
- emotion e_what,1;
- emotion e_what;
+ emotion ET_QUESTION, playerattached();
+ emotion ET_QUESTION;
next;
mes "[???]";
mes "Hey "+((Sex == SEX_MALE)?"dude":"missy")+",";
@@ -7353,7 +7353,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{
next;
mes "[Nurse Las]";
mes "Hey you in the bushes, I'll tell on you if you don't go home now!";
- emotion e_omg,0,"Bushes#ma";
+ emotion ET_HUK, getnpcid(0, "Bushes#ma");
close2;
cutin "",255;
end;
@@ -7375,7 +7375,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{
mes "[Nurse Las]";
mes "Anyway, the first floor door is open, so let's go inside.";
mes "Everything would be meaningless if the second floor door is not opened.";
- emotion e_sob;
+ emotion ET_CRY;
set malaya_bang,19;
changequest 11299,11300;
close2;
@@ -7386,7 +7386,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{
mes "[Nurse Las]";
mes "Anyway, the first floor door is open, so let's go inside.";
mes "Everything would be meaningless if the second floor door is not opened.";
- emotion e_sob;
+ emotion ET_CRY;
cutin "malaya_nurseA01",2;
close2;
cutin "",255;
@@ -7782,11 +7782,11 @@ malaya,53,68,4 script Bushes#ma 844,{
mes "Don't come any closer!";
mes "Old "+((Sex == SEX_MALE)?"man":"lady")+"!";
mes "How'd you know I was here?";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "["+strcharinfo(0)+"]";
mes "I'm not old.";
- emotion e_an,1;
+ emotion ET_FRET, playerattached();
next;
switch(select("About entering the hospital.:About its mom.:About ???.:Ask about the old lady.:Ask about the hospital grounds.:Quit.")) {
case 1:
@@ -7850,7 +7850,7 @@ malaya,53,68,4 script Bushes#ma 844,{
case 6:
mes "[???]";
mes "Humph!!";
- emotion e_pif;
+ emotion ET_HNG;
close;
}
mes "[???]";
@@ -7866,11 +7866,11 @@ malaya,53,68,4 script Bushes#ma 844,{
mes "Don't come any closer!";
mes "Old "+((Sex == SEX_MALE)?"man":"lady")+"!";
mes "How'd you know I was here?";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "["+strcharinfo(0)+"]";
mes "I'm not old.";
- emotion e_an,1;
+ emotion ET_FRET, playerattached();
close;
} else {
mes "There's a trace of a young child.";
@@ -8078,19 +8078,19 @@ malaya,114,183,3 script Bent Old Lady#ma 575,{
mes "[Bent Old Lady]";
mes "What?";
mes "Arghhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Bent Old Lady]";
mes "Arghhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Bent Old Lady]";
mes "Arghhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Bent Old Lady]";
mes "Arghhhhhhhhhh!!!!!!!!!!!";
- emotion e_omg;
+ emotion ET_HUK;
next;
mes "[Bent Old Lady]";
mes "What have you done!";
@@ -8387,11 +8387,11 @@ ma_fild01,179,260,2 script Festival Helper Boy#pin 577,{
if ($malaya_pintados_01 > 999 && $malaya_pintados_02 > 999 && $malaya_pintados_03 > 299) {
set $malaya_pintados_00,1;
donpcevent "Pintados Manager#pin::OnEnable";
- emotion e_lv;
+ emotion ET_THROB;
mes "[Isco]";
mes "Many adventurers helped find festival items that I returned to the village.";
next;
- emotion e_ho;
+ emotion ET_DELIGHT;
mes "[Isco]";
mes "He he... Now we can hold the '^7A96E0Pintados Festival^000000'.";
close;
@@ -8402,7 +8402,7 @@ ma_fild01,179,260,2 script Festival Helper Boy#pin 577,{
mes "He he... The fun '^7A96E0Pintados Festival^000000' is in full swing.";
next;
if ($malaya_pintados_00 > 0 && $malaya_pintados_00 < 50) {
- emotion e_ho;
+ emotion ET_DELIGHT;
mes "[Isco]";
mes "Today's the first day of the '^7A96E0Pintados Festival^000000'. The festival is held for 7 days, so have fun.";
close;
@@ -8433,18 +8433,18 @@ ma_fild01,179,260,2 script Festival Helper Boy#pin 577,{
mes "Have you every seen ^FF8440Bakonawa^000000, the monster known to swallow the moon? They say he is really ferocious.";
close;
} else if ($malaya_pintados_00 > 245 && $malaya_pintados_00 < 295) {
- emotion e_sob;
+ emotion ET_CRY;
mes "[Isco]";
mes "I'm so sad. Many adventurers helped to hold the '^7A96E0Pintados Festival^000000' and now only one day is left.";
close;
} else {
- emotion e_sob;
+ emotion ET_CRY;
mes "[Isco]";
mes "Oh gosh! It's already the last day of the '^7A96E0Pintados Festival^000000'. Can't believe there won't be more festivities.";
close;
}
}
- emotion e_spin;
+ emotion ET_CONFUSE;
mes "[Isco]";
mes "Oh no. What will we do with the festival coming to an end.";
next;
@@ -8454,7 +8454,7 @@ ma_fild01,179,260,2 script Festival Helper Boy#pin 577,{
mes "There is a traditional festival held since ancient times";
mes "in Baryo Mahiwaga called the '^7A96E0Pintados Festival^000000'.";
next;
- emotion e_otl;
+ emotion ET_OTL;
mes "[Isco]";
mes "I don't think I'll make it to the festival this time.";
next;
@@ -8466,7 +8466,7 @@ ma_fild01,179,260,2 script Festival Helper Boy#pin 577,{
mes "But '^FF8440Bongisungisu^000000' appeared out of nowhere and took the items away from me.";
next;
select("Are you hurt?");
- emotion e_sigh;
+ emotion ET_OHNO;
mes "[Isco]";
mes "Fortunately not.";
next;
@@ -8480,7 +8480,7 @@ ma_fild01,179,260,2 script Festival Helper Boy#pin 577,{
mes "[Isco]";
mes "Lesser Agimat "+$malaya_pintados_01+", Silver Cross "+$malaya_pintados_02+", Dyestuff "+$malaya_pintados_03+" so far.";
next;
- emotion e_sigh;
+ emotion ET_OHNO;
mes "[Isco]";
mes "Sigh... We are still short of materials to start the '^7A96E0Pintados Festival^000000'.";
close;
@@ -8488,7 +8488,7 @@ ma_fild01,179,260,2 script Festival Helper Boy#pin 577,{
set .@str$, (Sex == SEX_MALE)?"Bro":"Sis";
break;
}
- emotion e_lv;
+ emotion ET_THROB;
mes "[Isco]";
mes "Oh~ Really? Wow!";
mes "Thanks! "+strcharinfo(0)+" "+.@str$+"!!";
@@ -8605,7 +8605,7 @@ ma_fild01,172,223,6 script Tattooist#pin 574,{
mes "Cannot proceed because you have too many items in your possession.";
close;
}
- emotion e_what;
+ emotion ET_QUESTION;
mes "[Tattooist]";
mes "Why do you want a Tattoo?";
next;
@@ -8742,7 +8742,7 @@ ma_fild01,172,223,6 script Tattooist#pin 574,{
mes "Need 10 Ancient Grudges, 1 Piece of "+.@name$+"'s Spirit, and 1 "+.@name$+" Doll to create a ^EE1D11"+.@name$+" Agimat Tattoo^000000.";
close;
}
- emotion e_flash;
+ emotion ET_SPARK;
mes "[Tattooist]";
mes "The materials are full with holy energy. I'm sure we'll get a great Tattoo using these.";
next;
@@ -8761,7 +8761,7 @@ ma_fild01,172,223,6 script Tattooist#pin 574,{
mes "And then "+.@name$+" stared intensely at the doll as if to remember every detail of it in his head.";
next;
if(select("Aren't you going to start?:... ... ..") == 1) {
- emotion e_an;
+ emotion ET_FRET;
delitem 6499,5; //Ancient_Grudge
mes "[Tattooist]";
mes "Oh no, now you ruined it.";
@@ -8770,7 +8770,7 @@ ma_fild01,172,223,6 script Tattooist#pin 574,{
mes "Received back 5 Ancient Grudges, "+.@name$+" Doll, and Piece of "+.@name$+"'s Spirit.";
close;
}
- emotion e_bzz;
+ emotion ET_STARE;
mes "Think he will melt the doll with his eyes?";
next;
specialeffect EF_SONICBLOWHIT;
@@ -8778,12 +8778,12 @@ ma_fild01,172,223,6 script Tattooist#pin 574,{
next;
mes "The "+.@name$+" Tattoo was completed almost instantly.";
next;
- emotion e_an;
+ emotion ET_FRET;
mes "But he kept on looking at each corner of the drawing as if he didn't like some of its details.";
next;
if(select("Looks good to me.:... ... ..") == 1) {
- emotion e_an;
- emotion e_ag;
+ emotion ET_FRET;
+ emotion ET_ANGER;
delitem 6499,5; //Ancient_Grudge
mes "[Tattooist]";
mes "Ergh! I told you not to interrupt!";
@@ -8800,12 +8800,12 @@ ma_fild01,172,223,6 script Tattooist#pin 574,{
next;
mes "Looks like he is satisfied with the "+.@name$+" drawing.";
next;
- emotion e_dum;
+ emotion ET_HUM;
mes "But now he is staring at the sky without doing anything else. What is he waiting for?";
next;
if(select("When will it be done?:... ... ..") == 1) {
- emotion e_an;
- emotion e_ag;
+ emotion ET_FRET;
+ emotion ET_ANGER;
delitem 6499,5; //Ancient_Grudge
mes "[Tattooist]";
mes "Ergh! I told you not to interrupt!";
@@ -8818,7 +8818,7 @@ ma_fild01,172,223,6 script Tattooist#pin 574,{
mes "Received back 5 Ancient Grudges, "+.@name$+" Doll, and Piece of "+.@name$+"'s Spirit.";
close;
}
- emotion e_dots;
+ emotion ET_THINK;
mes "[Tattooist]";
mes ".";
next;
@@ -8828,7 +8828,7 @@ ma_fild01,172,223,6 script Tattooist#pin 574,{
mes "[Tattooist]";
mes ". . .";
next;
- emotion e_dots;
+ emotion ET_THINK;
mes "[Tattooist]";
mes ". . . .";
next;
@@ -8841,7 +8841,7 @@ ma_fild01,172,223,6 script Tattooist#pin 574,{
mes "[Tattooist]";
mes ". . . . . . .";
next;
- emotion e_flash;
+ emotion ET_SPARK;
mes "The Tattooist's eyes started to shine after staring at the sky for awhile, then he broke the Piece of "+.@name$+"'s Spirit with both his hands.";
next;
specialeffect EF_DETOXICATION;
@@ -8850,8 +8850,8 @@ ma_fild01,172,223,6 script Tattooist#pin 574,{
if(select("Why did you break the pieces...:... ... ..") == 1) {
delitem 6499,5; //Ancient_Grudge
delitem .@spirit,1;
- emotion e_an;
- emotion e_ag;
+ emotion ET_FRET;
+ emotion ET_ANGER;
mes "[Tattooist]";
mes "Ergh! I told you not to interrupt!";
next;
@@ -8881,7 +8881,7 @@ ma_fild01,172,223,6 script Tattooist#pin 574,{
next;
mes "The Tattooist is finally satisfied and is all smiles.";
next;
- emotion e_heh;
+ emotion ET_SMILE;
mes "[Tattooist]";
mes "Ha ha. It came out great.";
next;
diff --git a/npc/re/quests/quests_mora.txt b/npc/re/quests/quests_mora.txt
index 6def2bf3e37..00eaff22f0c 100644
--- a/npc/re/quests/quests_mora.txt
+++ b/npc/re/quests/quests_mora.txt
@@ -1863,7 +1863,7 @@ dicastes02,125,192,0 script #call_cheshir_ep14 139,0,3,{
OnTouch_:
if (ep13_3_secret > 22) {
if (rand(2)) {
- emotion e_ho,1;
+ emotion ET_DELIGHT, playerattached();
mes "..........?";
mes "You sense someone moving around.";
mes "There must be someone down there.";
@@ -2547,12 +2547,12 @@ mora,31,138,6 script Raffle Researcher#ep14 522,{
mes "[Raffle Researcher]";
mes "Oh no~ My research tools...";
mes "What...... What was it?";
- emotion e_sob;
+ emotion ET_CRY;
next;
select("What is your business here?");
mes "[Raffle Researcher]";
mes "Hmm?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
mes "[Raffle Researcher]";
mes "You're human...? Are you human...?";
@@ -2568,14 +2568,14 @@ mora,31,138,6 script Raffle Researcher#ep14 522,{
mes "[Raffle Researcher]";
mes "You, come here for a minute.";
mes "It's a simple experiment, so there's no need to be afraid.";
- emotion e_gg;
+ emotion ET_KIK;
next;
if(select("What a crazy Raffle. I must run away.:... ...") == 1) {
mes "[Raffle Researcher]";
mes "You said you had made it up from the Crevice,";
mes "so I was wondering what race you were,";
mes "but a mere human? How did you get up here?";
- emotion e_lv;
+ emotion ET_THROB;
close;
}
if (BaseLevel < 100) {
@@ -2591,7 +2591,7 @@ mora,31,138,6 script Raffle Researcher#ep14 522,{
}
mes "[Raffle Researcher]";
mes "... ... ...";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "[Raffle Researcher]";
mes "You... You're not like the other humans.";
@@ -2621,7 +2621,7 @@ mora,31,138,6 script Raffle Researcher#ep14 522,{
mes "but you clearly care about";
mes "another person's hardship.";
mes "You must be an ^FF0000extremely^000000 nice human.";
- emotion e_no1;
+ emotion ET_BEST;
next;
mes "[Raffle Researcher]";
mes "I'll save my thanks for time's sake.";
@@ -2664,13 +2664,13 @@ mora,31,138,6 script Raffle Researcher#ep14 522,{
next;
mes "[Raffle Researcher]";
mes "Have a safe trip.";
- emotion e_paper;
+ emotion ET_WRAP;
close;
} else if (ep14_1_muk == 1) {
if (checkquest(5016) > -1 && countitem(6385) == 0) {
mes "[Raffle Researcher]";
mes "You're back? Where are my research tools?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
mes "[Raffle Researcher]";
mes "You still haven't found the research tools?";
@@ -2734,7 +2734,7 @@ mora,31,138,6 script Raffle Researcher#ep14 522,{
mes "I'm still preparing for the research.";
mes "Unfortunately a few research tools";
mes "were damaged.";
- emotion e_an;
+ emotion ET_FRET;
close;
case 2:
mes "[Raffle Researcher]";
@@ -2746,14 +2746,14 @@ mora,31,138,6 script Raffle Researcher#ep14 522,{
mes "asks you who you are working with,";
mes "you can say ^0000FFI'm working with Researcher Inffle.^000000";
mes "That's why I'm telling you my name.";
- emotion e_ok;
+ emotion ET_OK;
close;
case 3:
mes "[Raffle Researcher]";
mes "Why? The inn is closed?";
mes "That's strange, it shouldn't be.";
mes "Why don't you go try again?";
- emotion e_what;
+ emotion ET_QUESTION;
close;
case 4:
break;
@@ -2765,7 +2765,7 @@ mora,31,138,6 script Raffle Researcher#ep14 522,{
mes "Can't believe I got attacked...";
mes "I just can't believe it...";
mes "What do you think?";
- emotion e_an;
+ emotion ET_FRET;
close;
}
mes "[Raffle Researcher]";
@@ -2809,12 +2809,12 @@ mora,31,138,6 script Raffle Researcher#ep14 522,{
mes "You can draw on his face,";
mes "pinch him, tickle him, or whatever.";
mes "Bully him 3 times.";
- emotion e_gg;
+ emotion ET_KIK;
close;
} else if (ep14_1_muk == 6) {
mes "[Raffle Researcher]";
mes "So you taught him a lesson? Great. I feel avenged!";
- emotion e_heh;
+ emotion ET_SMILE;
next;
mes "[Raffle Researcher]";
mes "For a while, I couldn't sleep";
@@ -2899,7 +2899,7 @@ mora,31,138,6 script Raffle Researcher#ep14 522,{
mes "The basic tests are done.";
mes "As I thought...";
mes "There were many interesting substances in the bath water.";
- emotion e_ho;
+ emotion ET_DELIGHT;
next;
mes "[Raffle Researcher]";
mes "The most notable is this unidentifiable DNA.";
@@ -2999,7 +2999,7 @@ mora,31,138,6 script Raffle Researcher#ep14 522,{
mes "[Raffle Researcher]";
mes "This is not it.";
mes "The samples that you collected belonged to a normal species.";
- emotion e_swt2;
+ emotion ET_PROFUSELY_SWEAT;
next;
mes "[Raffle Researcher]";
mes "Must be because so many species of creatures";
@@ -3032,8 +3032,8 @@ mora,31,138,6 script Raffle Researcher#ep14 522,{
mes "my head is filled with even more questions.";
next;
mes "... ... ... ... ...";
- emotion e_dots;
- emotion e_dots,1;
+ emotion ET_THINK;
+ emotion ET_THINK, playerattached();
next;
mes "[Raffle Researcher]";
mes "The village elders say";
@@ -3336,7 +3336,7 @@ mora,31,138,6 script Raffle Researcher#ep14 522,{
next;
mes "[Raffle Researcher]";
mes "... ... ... ...";
- emotion e_dots;
+ emotion ET_THINK;
next;
mes "[Raffle Researcher]";
mes "Maybe I haven't shown you.";
@@ -3350,7 +3350,7 @@ mora,31,138,6 script Raffle Researcher#ep14 522,{
mes "This concludes the report of";
mes "Mora Village's mysterious bath.";
mes "You want to look again?";
- emotion e_what;
+ emotion ET_QUESTION;
next;
switch(select("Look again.:Don't look again.")) {
case 1:
@@ -3483,7 +3483,7 @@ mora,114,79,0 script Black Shadow#ep14_muk 844,{
mes "You stop bullying me.";
next;
if(select("Bully anyway.:I'll stop.") == 1) {
- emotion e_sob;
+ emotion ET_CRY;
set ep14_1_goki,0;
close2;
donpcevent "Black Shadow#ep14_muk::OnDisable";
@@ -3510,7 +3510,7 @@ mora,114,79,0 script Black Shadow#ep14_muk 844,{
mes "You... Good. Help Fishee?";
next;
if(select("Don't help.:Help.") == 1) {
- emotion e_sob;
+ emotion ET_CRY;
set ep14_1_goki,0;
close2;
donpcevent "Black Shadow#ep14_muk::OnDisable";
@@ -5359,6 +5359,6 @@ mora,112,161,5 script Knights Leader#mo 523,{
mes "Huh! I said the Boss is the boss!";
mes "No, the Chief is the best!";
mes "How rude you all are! I'm the Head here!";
- emotion e_swt2,1;
+ emotion ET_PROFUSELY_SWEAT, playerattached();
close;
}
diff --git a/npc/re/scripts_athena.conf b/npc/re/scripts_athena.conf
index 1d355b6749c..e4260b4c1ab 100644
--- a/npc/re/scripts_athena.conf
+++ b/npc/re/scripts_athena.conf
@@ -54,15 +54,19 @@ npc: npc/re/guides/guides_woe_te.txt
npc: npc/re/instances/BakonawaLake.txt
npc: npc/re/instances/BangungotHospital.txt
npc: npc/re/instances/BuwayaCave.txt
+npc: npc/re/instances/CentralLaboratory.txt
+npc: npc/re/instances/EclageInterior.txt
npc: npc/re/instances/FacewormsNest.txt
+npc: npc/re/instances/GhostPalace.txt
npc: npc/re/instances/HazyForest.txt
npc: npc/re/instances/HorrorToyFactory.txt
+npc: npc/re/instances/LastRoom.txt
npc: npc/re/instances/MalangdoCulvert.txt
npc: npc/re/instances/OctopusCave.txt
npc: npc/re/instances/OldGlastHeim.txt
-npc: npc/re/instances/WolfchevLaboratory.txt
-npc: npc/re/instances/EclageInterior.txt
+npc: npc/re/instances/SarahAndFenrir.txt
npc: npc/re/instances/SaraMemory.txt
+npc: npc/re/instances/WolfchevLaboratory.txt
//npc: npc/custom/official/GeffenMagicTournament.txt
// ---------------- Kafras & Cool Event Corp. -------------------
@@ -89,6 +93,7 @@ npc: npc/re/merchants/gld_mission_exchange.txt
npc: npc/re/merchants/hd_refiner.txt
npc: npc/re/merchants/HorrorToyFactory_merchants.txt
npc: npc/re/merchants/inn.txt
+npc: npc/re/merchants/OldGlastHeim_merchants.txt
npc: npc/re/merchants/quivers.txt
npc: npc/re/merchants/refine.txt
npc: npc/re/merchants/renters.txt
@@ -97,8 +102,10 @@ npc: npc/re/merchants/shops.txt
//npc: npc/re/merchants/enchan_upg.txt
//npc: npc/re/merchants/cash_trader-idRO.txt
npc: npc/re/merchants/te_merchant.txt
+npc: npc/re/merchants/shadow_refiner.txt
// --------------------------- Others ---------------------------
+npc: npc/re/other/achievements.txt
npc: npc/re/other/adven_boards.txt
npc: npc/re/other/bulletin_boards.txt
npc: npc/re/other/Global_Functions.txt
@@ -146,6 +153,9 @@ npc: npc/re/quests/mrsmile.txt
npc: npc/re/quests/ninja_quests.txt
npc: npc/re/quests/pile_bunker.txt
npc: npc/re/quests/quests_13_1.txt
+npc: npc/re/quests/quests_14_3.txt
+npc: npc/re/quests/quests_15_1.txt
+npc: npc/re/quests/quests_15_2.txt
npc: npc/re/quests/quests_aldebaran.txt
npc: npc/re/quests/quests_brasilis.txt
npc: npc/re/quests/quests_dewata.txt
diff --git a/npc/re/scripts_jobs.conf b/npc/re/scripts_jobs.conf
index 68670615c97..1141dbbdb0c 100644
--- a/npc/re/scripts_jobs.conf
+++ b/npc/re/scripts_jobs.conf
@@ -12,6 +12,7 @@ npc: npc/re/jobs/1-1/swordman.txt
npc: npc/re/jobs/1-1/thief.txt
// - 2e
npc: npc/re/jobs/2e/kagerou_oboro.txt
+npc: npc/re/jobs/2e/rebellion.txt
// - 3-1
npc: npc/re/jobs/3-1/archbishop.txt
npc: npc/re/jobs/3-1/mechanic.txt
diff --git a/npc/re/scripts_monsters.conf b/npc/re/scripts_monsters.conf
index 6fde63ad84f..7a4375bc91b 100644
--- a/npc/re/scripts_monsters.conf
+++ b/npc/re/scripts_monsters.conf
@@ -5,7 +5,9 @@
//npc: npc/re/mobs/academy.txt
npc: npc/re/mobs/championmobs.txt
npc: npc/re/mobs/citycleaners.txt
+npc: npc/re/mobs/int_land.txt
npc: npc/re/mobs/towns.txt
+npc: npc/re/mobs/verus.txt
// -------------------------- Dungeons --------------------------
npc: npc/re/mobs/dungeons/abbey.txt
diff --git a/npc/re/scripts_warps.conf b/npc/re/scripts_warps.conf
index aba13b61c20..e62f8adb9cf 100644
--- a/npc/re/scripts_warps.conf
+++ b/npc/re/scripts_warps.conf
@@ -41,4 +41,6 @@ npc: npc/re/warps/other/jobquests.txt
npc: npc/re/warps/other/paradise.txt
npc: npc/re/warps/other/s_workshop.txt
npc: npc/re/warps/other/sign.txt
+npc: npc/re/warps/other/un_myst.txt
+npc: npc/re/warps/other/verus.txt
npc: npc/re/warps/guildcastles.txt
diff --git a/npc/re/warps/cities/izlude.txt b/npc/re/warps/cities/izlude.txt
index f0b4629b4c7..b4eaa4fe204 100644
--- a/npc/re/warps/cities/izlude.txt
+++ b/npc/re/warps/cities/izlude.txt
@@ -52,6 +52,65 @@ izlude_b,52,172,0 warp iz04_b 2,2,izlude_in,74,161
izlude_c,52,172,0 warp iz04_c 2,2,izlude_in,74,161
izlude_d,52,172,0 warp iz04_d 2,2,izlude_in,74,161
+//= iz_int(Intro) & int_land(Secluded Island) ================
+iz_int,27,30,0 warp #room_out 1,1,iz_int,51,30
+iz_int01,27,30,0 warp #room_out01 1,1,iz_int01,51,30
+iz_int02,27,30,0 warp #room_out02 1,1,iz_int02,51,30
+iz_int03,27,30,0 warp #room_out03 1,1,iz_int03,51,30
+iz_int04,27,30,0 warp #room_out04 1,1,iz_int04,51,30
+
+iz_int,47,30,0 warp #room_in 1,1,iz_int,22,30
+iz_int01,47,30,0 warp #room_in01 1,1,iz_int01,22,30
+iz_int02,47,30,0 warp #room_in02 1,1,iz_int02,22,30
+iz_int03,47,30,0 warp #room_in03 1,1,iz_int03,22,30
+iz_int04,47,30,0 warp #room_in04 1,1,iz_int04,22,30
+
+iz_int,56,15,0 script #ship_out WARPNPC,1,1,{
+ end;
+OnTouch:
+ .@num$ = replacestr( strnpcinfo(2), "ship_out", "" );
+ .@map$ = "int_land" + .@num$;
+ savepoint .@map$,77,101;
+ warp .@map$,85,107;
+ end;
+}
+iz_int01,56,15,0 duplicate(#ship_out) #ship_out01 WARPNPC,1,1
+iz_int02,56,15,0 duplicate(#ship_out) #ship_out02 WARPNPC,1,1
+iz_int03,56,15,0 duplicate(#ship_out) #ship_out03 WARPNPC,1,1
+iz_int04,56,15,0 duplicate(#ship_out) #ship_out04 WARPNPC,1,1
+
+int_land,49,57,0 script #intro_to_izlude WARPNPC,2,2,{
+ end;
+OnTouch:
+ if (isbegin_quest(21008) == 1) {
+ mes "^4d4dffOnce you leave this island there is no way back.";
+ mes "Are you sure you want to go directly to Izlude?^000000";
+ next;
+ mes "^4d4dffIf you do, the quest will be deleted from your Quest Log.^000000";
+ next;
+ if (select("Do not go to Izlude yet", "Sail to Izlude!") == 1) {
+ mes "[Sailor]";
+ mes "You want to stay here longer?";
+ mes "Good, then I'll wait until you're ready~";
+ close;
+ }
+ completequest 21008;
+ }
+ mes "[Sailor]";
+ mes "Let's head towards Izlude!";
+ close2;
+ if (isbegin_quest(21001) == 1)
+ completequest 21001;
+ .@map$ = "izlude" + replacestr( strnpcinfo(2), "intro_to_izlude", "" );
+ warp .@map$,196,209;
+ savepoint .@map$,128,142,1,1;
+ end;
+}
+int_land01,49,57,0 duplicate(#intro_to_izlude) #intro_to_izlude_a WARPNPC,2,2
+int_land02,49,57,0 duplicate(#intro_to_izlude) #intro_to_izlude_b WARPNPC,2,2
+int_land03,49,57,0 duplicate(#intro_to_izlude) #intro_to_izlude_c WARPNPC,2,2
+int_land04,49,57,0 duplicate(#intro_to_izlude) #intro_to_izlude_d WARPNPC,2,2
+
//= Izlude Academy ===========================================
izlude,125,257,0 warp #to_ac01 2,2,iz_ac01,99,29
izlude,130,257,0 warp #to_ac02 2,2,iz_ac01,99,29
@@ -62,20 +121,6 @@ iz_ac02,94,27,0 warp #to_ac1f01 2,2,iz_ac01,78,28
iz_ac02,113,27,0 warp #to_ac1f02 2,2,iz_ac01,122,28
new_1-3,96,176,0 warp #to_ac01-2 1,1,iz_ac01,49,73
-iz_int,96,73,0 script iz_int_iz WARPNPC,2,2,{
- end;
-
-OnTouch:
- savepoint "izlude",128,98,1,1;
- warp "izlude"+strnpcinfo(2)+"", 195, 209;
- end;
-}
-
-iz_int01,96,73,0 duplicate(iz_int_iz) iz_int_iz#_a WARPNPC,2,2
-iz_int02,96,73,0 duplicate(iz_int_iz) iz_int_iz#_b WARPNPC,2,2
-iz_int03,96,73,0 duplicate(iz_int_iz) iz_int_iz#_c WARPNPC,2,2
-iz_int04,96,73,0 duplicate(iz_int_iz) iz_int_iz#_d WARPNPC,2,2
-
//= Izlude Academy Duplicates ================================
izlude_a,125,257,0 warp #to_ac01_a 2,2,iz_ac01_a,99,29
izlude_b,125,257,0 warp #to_bc01_b 2,2,iz_ac01_b,99,29
diff --git a/npc/re/warps/other/dimensional_gap.txt b/npc/re/warps/other/dimensional_gap.txt
index a57e6ee7d3e..a76fc12005b 100644
--- a/npc/re/warps/other/dimensional_gap.txt
+++ b/npc/re/warps/other/dimensional_gap.txt
@@ -62,3 +62,6 @@ dali,149,82,0 warp dg001 2,2,mid_camp,210,289
dali,122,48,0 warp dg002 2,2,moc_fild22b,227,200
dali,38,87,0 warp dg003 2,2,bif_fild01,318,155
dali,34,139,0 warp dg004 2,2,dic_fild02,237,32
+
+dali,64,129,0 warp #dali_to_dali02 1,1,dali02,66,101
+dali02,66,97,0 warp #dali02_to_dali 1,1,dali,64,125
diff --git a/npc/re/warps/other/paradise.txt b/npc/re/warps/other/paradise.txt
index 248600dd8f7..f30a81d00b2 100644
--- a/npc/re/warps/other/paradise.txt
+++ b/npc/re/warps/other/paradise.txt
@@ -23,3 +23,9 @@ moc_para01,113,32,0 warp2 #warp_2_ware 1,1,moc_para01,105,92
moc_para01,102,92,0 warp2 #warp_2_pass_2 1,1,moc_para01,109,33
moc_para01,41,187,0 warp2 #warp_2_room2 1,1,moc_para01,179,93
moc_para01,179,90,0 warp2 #warp_2_2fhall_3 1,1,moc_para01,41,185
+
+// moc_para01,47,38,0 warp2 #warp_2_pass_2_2 1,1,moc_para01,106,14
+moc_para01,17,187,0 warp2 #warp_2_bossroom 1,1,moc_para01,132,159
+moc_para01,132,156,0 warp2 #warp_2_2fhall_1 1,1,moc_para01,17,185
+moc_para01,29,187,0 warp2 #warp_2_room1 1,1,moc_para01,180,159
+moc_para01,180,156,0 warp2 #warp_2_2fhall_2 1,1,moc_para01,29,185
diff --git a/npc/re/warps/other/un_myst.txt b/npc/re/warps/other/un_myst.txt
new file mode 100644
index 00000000000..2126624e823
--- /dev/null
+++ b/npc/re/warps/other/un_myst.txt
@@ -0,0 +1,132 @@
+//===== rAthena Script =======================================
+//= un_myst warps
+//===== Description: =========================================
+//= Warp Points for episodes 15.1 & 15.2
+//===== Changelogs: ==========================================
+//= 1.0 First version. [Capuche]
+//============================================================
+
+// A
+un_myst,124,189,0 script #un_myst_entrance WARPNPC,1,1,{
+ end;
+OnTouch:
+ warp "un_myst",171,197;
+ @weird_piece = 1;
+ end;
+}
+un_myst,171,183,0 warp2 #un_myst_A_1 1,1,un_myst,259,200
+
+un_myst,258,208,0 script #un_myst_A_2 WARPNPC,1,1,{
+ end;
+OnTouch:
+ .@r = rand(9);
+ if (.@r == 0)
+ warp "un_myst",329,205;
+ else if (.@r < 5)
+ warp "un_myst",291,203;
+ else
+ warp "un_myst",259,200;
+ end;
+}
+un_myst,295,208,0 script #un_myst_A_3 WARPNPC,1,1,{
+ end;
+OnTouch:
+ .@r = rand(9);
+ if (.@r == 0)
+ warp "un_myst",329,205;
+ else if (.@r < 5)
+ warp "un_myst",291,203;
+ else
+ warp "un_myst",259,200;
+ end;
+}
+
+// B
+un_myst,393,139,0 script #un_myst_B_1 WARPNPC,1,1,{
+ end;
+OnTouch:
+ .@r = rand(9);
+ if (.@r == 0)
+ warp "un_myst",176,137;
+ else if (.@r < 5)
+ warp "un_myst",138,138;
+ else
+ warp "un_myst",86,136;
+ end;
+}
+un_myst,104,136,0 script #un_myst_B_2 WARPNPC,1,1,{
+ end;
+OnTouch:
+ .@r = rand(9);
+ if (.@r == 0)
+ warp "un_myst",176,137;
+ else if (.@r < 5)
+ warp "un_myst",138,138;
+ else
+ warp "un_myst",86,136;
+ end;
+}
+un_myst,138,140,0 script #un_myst_B_3 WARPNPC,1,1,{
+ end;
+OnTouch:
+ .@r = rand(9);
+ if (.@r == 0)
+ warp "un_myst",176,137;
+ else if (.@r < 5)
+ warp "un_myst",138,138;
+ else
+ warp "un_myst",86,136;
+ end;
+}
+
+// C
+un_myst,75,91,0 script #un_myst_C_1 WARPNPC,1,1,{
+ end;
+OnTouch:
+ .@r = rand(9);
+ if (.@r == 0)
+ warp "un_myst",217,84;
+ else if (.@r < 5)
+ warp "un_myst",160,89;
+ else
+ warp "un_myst",107,88;
+ end;
+}
+un_myst,169,89,0 script #un_myst_C_2 WARPNPC,1,1,{
+ end;
+OnTouch:
+ .@r = rand(9);
+ if (.@r == 0)
+ warp "un_myst",217,84;
+ else if (.@r < 5)
+ warp "un_myst",160,89;
+ else
+ warp "un_myst",107,88;
+ end;
+}
+un_myst,121,82,0 script #un_myst_C_3 WARPNPC,1,1,{
+ end;
+OnTouch:
+ .@r = rand(9);
+ if (.@r == 0)
+ warp "un_myst",217,84;
+ else if (.@r < 5)
+ warp "un_myst",160,89;
+ else
+ warp "un_myst",107,88;
+ end;
+}
+un_myst,219,88,0 script #un_myst_C_4 WARPNPC,1,1,{
+ end;
+OnTouch:
+ .@r = rand(9);
+ if (.@r == 0)
+ warp "un_myst",217,84;
+ else if (.@r < 5)
+ warp "un_myst",160,89;
+ else
+ warp "un_myst",107,88;
+ end;
+}
+
+un_myst,108,38,0 warp2 #un_myst_tamarin 1,1,un_myst,209,33
diff --git a/npc/re/warps/other/verus.txt b/npc/re/warps/other/verus.txt
new file mode 100644
index 00000000000..43ae1c0b74b
--- /dev/null
+++ b/npc/re/warps/other/verus.txt
@@ -0,0 +1,156 @@
+//===== rAthena Script =======================================
+//= Verus warps
+//===== Description: =========================================
+//= Warp Points for episodes 15.1 & 15.2
+//===== Changelogs: ==========================================
+//= 1.0 First version. [Capuche]
+//============================================================
+
+verus04,204,163,0 warp2 fr_ver04_to_tun 1,1,ver_tunn,13,35
+verus04,121,267,0 warp2 fr_ver04_to_ver03_1 1,1,verus03,121,20
+verus04,44,267,0 warp2 fr_ver04_to_ver03_2 1,1,verus03,44,20
+
+verus01,247,58,0 warp2 verus01_to_verus03 1,1,verus03,55,251
+verus02,72,16,0 warp2 verus02_to_verus03 1,1,verus03,169,255
+verus03,122,17,0 warp2 fr_ver03_to_ver04_1 1,1,verus04,121,264
+verus03,44,17,0 warp2 fr_ver03_to_ver04_2 1,1,verus04,44,264
+
+juperos_01,245,87,0 warp2 fr_ju_to_eju 1,1,ver_eju,13,148
+ver_eju,10,148,0 warp2 fr_eju_to_ju 1,1,juperos_01,242,87
+ver_eju,107,36,0 warp2 fr_eju_to_tun 2,2,ver_tunn,84,82
+ver_tunn,84,86,0 warp2 fr_tun_to_eju 1,1,ver_eju,113,38
+ver_tunn,10,36,0 warp2 fr_tun_to_ver04 1,1,verus04,202,165
+
+lhz_in01,276,238,0 warp2 in_to_out#e152i02 1,1,lhz_in01,276,230
+
+// Bunker
+un_bunker,41,275,0 warp2 A_0#A_1 1,1,un_bunker,21,276
+un_bunker,98,85,0 warp2 #bunker_out 1,1,verus01,115,190
+un_bunker,24,276,0 warp2 A_1#A_0 1,1,un_bunker,45,275
+un_bunker,24,256,0 warp2 A_2#A_3 1,1,un_bunker,26,190
+un_bunker,23,190,0 warp2 A_3#A_2 1,1,un_bunker,21,256
+un_bunker,31,196,0 warp2 A_4#A_5 1,1,un_bunker,22,378
+un_bunker,21,375,0 warp2 A_5#A_4 1,1,un_bunker,32,193
+un_bunker,51,196,0 warp2 A_6#A_7 1,1,un_bunker,68,378
+un_bunker,67,375,0 warp2 A_7#A_6 1,1,un_bunker,52,193
+un_bunker,60,183,0 warp2 A_8#A_9 1,1,un_bunker,75,235
+un_bunker,71,236,0 warp2 A_9#A_8 1,1,un_bunker,57,182
+un_bunker,60,169,0 warp2 A_10#A_11 1,1,un_bunker,72,168
+un_bunker,69,167,0 warp2 A_11#A_10 1,1,un_bunker,57,168
+un_bunker,47,135,0 warp2 A_12#A_13 1,1,un_bunker,37,134
+un_bunker,40,135,0 warp2 A_13#A_12 1,1,un_bunker,50,134
+un_bunker,57,118,0 warp2 A_14#A_15 1,1,un_bunker,72,117
+un_bunker,69,118,0 warp2 A_15#A_14 1,1,un_bunker,53,117
+un_bunker,97,124,0 warp2 A_16#A_17 1,1,un_bunker,100,144
+un_bunker,97,141,0 warp2 A_17#A_16 1,1,un_bunker,98,121
+un_bunker,128,118,0 warp2 A_18#A_19 1,1,un_bunker,144,117
+un_bunker,140,118,0 warp2 A_19#A_18 1,1,un_bunker,125,117
+un_bunker,137,168,0 warp2 A_20#A_21 1,1,un_bunker,122,167
+un_bunker,126,168,0 warp2 A_21#A_20 1,1,un_bunker,140,167
+un_bunker,137,185,0 warp2 A_22#A_23 1,1,un_bunker,120,235
+un_bunker,124,236,0 warp2 A_23#A_22 1,1,un_bunker,140,184
+un_bunker,147,196,0 warp2 A_24#A_25 1,1,un_bunker,106,378
+un_bunker,105,375,0 warp2 A_25#A_24 1,1,un_bunker,148,193
+un_bunker,167,196,0 warp2 A_26#A_27 1,1,un_bunker,152,378
+un_bunker,151,375,0 warp2 A_27#A_26 1,1,un_bunker,168,193
+un_bunker,174,190,0 warp2 A_28#A_29 1,1,un_bunker,172,229
+un_bunker,169,230,0 warp2 A_29#A_28 1,1,un_bunker,171,189
+un_bunker,213,346,0 warp2 A_30#A_31 1,1,un_bunker,213,299
+un_bunker,216,300,0 warp2 A_31#A_30 1,1,un_bunker,216,345
+un_bunker,216,280,0 warp2 A_32#A_33 1,1,un_bunker,220,261
+un_bunker,217,262,0 warp2 A_33#A_32 1,1,un_bunker,213,279
+un_bunker,249,268,0 warp2 A_34#A_35 1,1,un_bunker,390,380
+un_bunker,389,377,0 warp2 A_35#A_34 1,1,un_bunker,250,265
+un_bunker,258,262,0 warp2 A_36#A_37 1,1,un_bunker,274,289
+un_bunker,271,290,0 warp2 A_37#A_36 1,1,un_bunker,255,261
+un_bunker,258,236,0 warp2 A_38#A_39 1,1,un_bunker,272,235
+un_bunker,269,236,0 warp2 A_39#A_38 1,1,un_bunker,255,235
+un_bunker,245,214,0 warp2 A_40#A_41 1,1,un_bunker,226,213
+un_bunker,230,214,0 warp2 A_41#A_40 1,1,un_bunker,248,213
+un_bunker,262,200,0 warp2 A_42#A_43 1,1,un_bunker,274,199
+un_bunker,271,200,0 warp2 A_43#A_42 1,1,un_bunker,258,199
+un_bunker,75,128,0 warp2 A_44#B_1 1,1,un_bunker,276,196
+un_bunker,275,191,0 warp2 B_1#A_44 1,1,un_bunker,76,121
+un_bunker,119,128,0 warp2 A_45#B_2 1,1,un_bunker,319,196
+un_bunker,320,191,0 warp2 B_2#A_45 1,1,un_bunker,120,121
+un_bunker,297,206,0 warp2 B_3#B_4 1,1,un_bunker,298,224
+un_bunker,297,221,0 warp2 B_4#B_3 1,1,un_bunker,298,203
+un_bunker,324,200,0 warp2 B_5#B_6 1,1,un_bunker,344,199
+un_bunker,339,200,0 warp2 B_6#B_5 1,1,un_bunker,321,199
+un_bunker,350,214,0 warp2 B_7#B_8 1,1,un_bunker,368,213
+un_bunker,365,214,0 warp2 B_8#B_7 1,1,un_bunker,347,213
+un_bunker,337,236,0 warp2 B_9#B_10 1,1,un_bunker,323,235
+un_bunker,326,236,0 warp2 B_10#B_9 1,1,un_bunker,340,235
+un_bunker,281,266,0 warp2 B_11#B_12 1,1,un_bunker,282,282
+un_bunker,281,279,0 warp2 B_12#B_11 1,1,un_bunker,282,263
+un_bunker,313,266,0 warp2 B_13#B_14 1,1,un_bunker,314,282
+un_bunker,313,279,0 warp2 B_14#B_13 1,1,un_bunker,314,262
+un_bunker,324,290,0 warp2 B_15#B_16 1,1,un_bunker,340,261
+un_bunker,337,262,0 warp2 B_16#B_15 1,1,un_bunker,321,289
+un_bunker,343,270,0 warp2 B_17#B_18 1,1,un_bunker,382,328
+un_bunker,381,325,0 warp2 B_18#B_17 1,1,un_bunker,344,267
+un_bunker,370,264,0 warp2 B_19#B_20 1,1,un_bunker,388,263
+un_bunker,385,264,0 warp2 B_20#B_19 1,1,un_bunker,367,263
+un_bunker,297,192,0 warp2 B_21#B_22 1,1,un_bunker,298,181
+un_bunker,297,186,0 warp2 B_22#B_21 1,1,un_bunker,298,196
+un_bunker,229,163,0 warp2 B_23#B_24 1,1,un_bunker,159,52
+un_bunker,164,51,0 warp2 B_24#B_23 1,1,un_bunker,233,164
+un_bunker,366,164,0 warp2 B_25#B_26 1,1,un_bunker,31,51
+un_bunker,27,52,0 warp2 B_26#B_25 1,1,un_bunker,361,163
+un_bunker,387,79,0 warp2 alp2#out 1,1,un_bunker,366,164
+
+// Memory bunker
+un_bk_q,69,118,0 warp2 A-0#L-1 1,1,un_bk_q,53,117
+un_bk_q,128,118,0 warp2 A-0#L-2 1,1,un_bk_q,144,117
+un_bk_q,97,124,0 warp2 A-0#Monitoring room 1,1,un_bk_q,100,144
+un_bk_q,40,135,0 warp2 B-1#L-1 1,1,un_bk_q,50,134
+un_bk_q,71,236,0 warp2 Control room#L-1 1,1,un_bk_q,57,182
+un_bk_q,124,236,0 warp2 Control room#L-2 1,1,un_bk_q,140,184
+un_bk_q,216,280,0 warp2 C-0#G-1 1,1,un_bk_q,220,261
+un_bk_q,21,375,0 warp2 D-1#L-1 1,1,un_bk_q,32,193
+un_bk_q,67,375,0 warp2 D-2#L-1 1,1,un_bk_q,52,193
+un_bk_q,105,375,0 warp2 E-1#L-2 1,1,un_bk_q,148,193
+un_bk_q,151,375,0 warp2 E-2#L-2 1,1,un_bk_q,168,193
+un_bk_q,230,214,0 warp2 F-1#G-1 1,1,un_bk_q,248,213
+un_bk_q,365,214,0 warp2 F-2#G-2 1,1,un_bk_q,347,213
+un_bk_q,258,262,0 warp2 G-1#Cafeteria 1,1,un_bk_q,274,289
+un_bk_q,217,262,0 warp2 G-1#C-0 1,1,un_bk_q,213,279
+un_bk_q,245,214,0 warp2 G-1#F-1 1,1,un_bk_q,226,213
+un_bk_q,262,200,0 warp2 G-1#H-0 1,1,un_bk_q,274,199
+un_bk_q,249,268,0 warp2 G-1#M-0 1,1,un_bk_q,390,380
+un_bk_q,350,214,0 warp2 G-2#F-2 1,1,un_bk_q,368,213
+un_bk_q,324,200,0 warp2 G-2#H-0 1,1,un_bk_q,344,199
+un_bk_q,370,264,0 warp2 G-2#I-0 1,1,un_bk_q,388,263
+un_bk_q,343,270,0 warp2 G-2#N-0 1,1,un_bk_q,382,328
+un_bk_q,337,262,0 warp2 H-0#Cafeteria 1,1,un_bk_q,321,289
+un_bk_q,271,200,0 warp2 H-0#G-1 1,1,un_bk_q,258,199
+un_bk_q,339,200,0 warp2 H-0#G-2 1,1,un_bk_q,321,199
+un_bk_q,297,192,0 warp2 H-0#Z-0 1,1,un_bk_q,298,181
+un_bk_q,385,264,0 warp2 I-0#G-2 1,1,un_bk_q,367,263
+un_bk_q,24,256,0 warp2 J-0#L-1 1,1,un_bk_q,26,190
+un_bk_q,24,276,0 warp2 J-0#Machine Warehouse 1,1,un_bk_q,45,275
+un_bk_q,169,230,0 warp2 K-0#L-2 1,1,un_bk_q,171,189
+un_bk_q,60,183,0 warp2 L-1#Control room 1,1,un_bk_q,75,235
+un_bk_q,60,169,0 warp2 L-1#Monitoring room 1,1,un_bk_q,72,168
+un_bk_q,137,168,0 warp2 L-2#Monitoring room 1,1,un_bk_q,122,167
+un_bk_q,57,118,0 warp2 L-1#A-0 1,1,un_bk_q,72,117
+un_bk_q,47,135,0 warp2 L-1#B-1 1,1,un_bk_q,37,134
+un_bk_q,31,196,0 warp2 L-1#D-1 1,1,un_bk_q,22,378
+un_bk_q,51,196,0 warp2 L-1#D-2 1,1,un_bk_q,68,378
+un_bk_q,23,190,0 warp2 L-1#J-0 1,1,un_bk_q,21,256
+un_bk_q,137,185,0 warp2 L-2#Control room 1,1,un_bk_q,120,235
+un_bk_q,140,118,0 warp2 L-2#A-0 1,1,un_bk_q,125,117
+un_bk_q,147,196,0 warp2 L-2#E-1 1,1,un_bk_q,106,378
+un_bk_q,167,196,0 warp2 L-2#E-2 1,1,un_bk_q,152,378
+un_bk_q,174,190,0 warp2 L-2#K-0 1,1,un_bk_q,172,229
+un_bk_q,389,377,0 warp2 M-0#G-1 1,1,un_bk_q,250,265
+un_bk_q,381,325,0 warp2 N-0#G-2 1,1,un_bk_q,344,267
+un_bk_q,297,186,0 warp2 Z-0#H-0 1,1,un_bk_q,298,196
+un_bk_q,164,51,0 warp2 Z-1#Z-0 1,1,un_bk_q,233,164
+un_bk_q,27,52,0 warp2 Z-2#Z-0 1,1,un_bk_q,361,163
+un_bk_q,229,163,0 warp2 Z-0#Z-1 1,1,un_bk_q,159,52
+un_bk_q,366,164,0 warp2 Z-0#Z-2 1,1,un_bk_q,31,51
+un_bk_q,75,128,0 warp2 LA-0#LH-0 1,1,un_bk_q,276,196
+un_bk_q,275,191,0 warp2 LH-0#LA-0 1,1,un_bk_q,76,121
+un_bk_q,119,128,0 warp2 RA-0#RH-0 1,1,un_bk_q,319,196
+un_bk_q,320,191,0 warp2 RH-0#RA-0 1,1,un_bk_q,120,121
diff --git a/npc/test/npc_test_longvar.txt b/npc/test/npc_test_longvar.txt
new file mode 100644
index 00000000000..4eadec25048
--- /dev/null
+++ b/npc/test/npc_test_longvar.txt
@@ -0,0 +1,23 @@
+//===== rAthena Script =======================================
+//= Sample: Character variable lengths Test
+//===== By: ==================================================
+//= rAthena Dev Team
+//===== Last Updated: ========================================
+//= 20171125
+//===== Description: =========================================
+//= An validation test about long character variable stored on char-serv
+//= from https://github.com/rathena/rathena/issues/2425
+//============================================================
+
+prontera,155,176,3 script Pront Test 77,{
+ mes "Testing to store long variable on char-serv";
+//test1 long value
+ test$ = "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345";
+//test2 normal length
+ test2$ = "anything really, doesn't matter at this point";
+//test3 long key (41)
+ thisisareallylongkeyImeanReallyReallyLong$ = "gotcha";
+//test4 long key 2 (with int)
+ ReallyReallyReallyReallyReallyReallyLong = 42;
+ end;
+}
diff --git a/npc/warps/fields/abyss_warper.txt b/npc/warps/fields/abyss_warper.txt
index 72516db3170..1c31e641537 100644
--- a/npc/warps/fields/abyss_warper.txt
+++ b/npc/warps/fields/abyss_warper.txt
@@ -75,7 +75,7 @@ hu_fild05,168,304,0 script Column#abyss1 111,{
mes "and the taste of these items";
mes "is surprisingly putrid.^000000";
next;
- emotion e_rice,1;
+ emotion ET_HUNGRY, playerattached();
delitem 1035,1;
delitem 1036,1;
delitem 1037,1;
diff --git a/rAthena.sln b/rAthena.sln
index 3c95e03e276..e8e96ac2909 100644
--- a/rAthena.sln
+++ b/rAthena.sln
@@ -2,7 +2,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.40629.0
-MinimumVisualStudioVersion = 10.0.40219.1
+MinimumVisualStudioVersion = 12.0.40629.0
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3rdparty", "3rdparty", "{6ABA1767-6242-4CA0-BA22-A30972DC8918}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "src\common\common.vcxproj", "{F8FD7B1E-8E1C-4CC3-9CD1-2E28F77B6559}"
@@ -21,6 +21,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Config", "Config", "{60D331
src\config\const.h = src\config\const.h
src\config\core.h = src\config\core.h
src\config\classes\general.h = src\config\classes\general.h
+ src\config\packets.h = src\config\packets.h
src\config\renewal.h = src\config\renewal.h
src\config\secure.h = src\config\secure.h
EndProjectSection
@@ -30,6 +31,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "classes", "classes", "{33B4
src\config\classes\general.h = src\config\classes\general.h
EndProjectSection
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Custom", "Custom", "{6513C8D3-D15F-45D4-9AD8-6286CBA7EE36}"
+ ProjectSection(SolutionItems) = preProject
+ src\custom\atcommand.inc = src\custom\atcommand.inc
+ src\custom\atcommand_def.inc = src\custom\atcommand_def.inc
+ src\custom\battle_config_init.inc = src\custom\battle_config_init.inc
+ src\custom\battle_config_struct.inc = src\custom\battle_config_struct.inc
+ src\custom\defines_post.h = src\custom\defines_post.h
+ src\custom\defines_pre.h = src\custom\defines_pre.h
+ src\custom\script.inc = src\custom\script.inc
+ src\custom\script_def.inc = src\custom\script_def.inc
+ EndProjectSection
+EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "server-components", "server-components", "{6D9F5D00-2988-4812-844D-D155C4F588DC}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "core", "{C0A6FC9A-3A5C-48F8-A4B6-8D463C61C021}"
@@ -42,6 +55,7 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server", "src\char\char-server.vcxproj", "{FED3A941-0AF7-49FE-85CF-E1DFDC0EBB23}"
ProjectSection(ProjectDependencies) = postProject
{F8FD7B1E-8E1C-4CC3-9CD1-2E28F77B6559} = {F8FD7B1E-8E1C-4CC3-9CD1-2E28F77B6559}
+ {61D6A599-6BED-4154-A9FC-40553BD972E0} = {61D6A599-6BED-4154-A9FC-40553BD972E0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server", "src\map\map-server.vcxproj", "{B4114A9C-EEA4-433C-A830-56119A984F24}"
@@ -53,13 +67,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common-minicore", "src\comm
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{9F328FE9-129D-4C0C-820B-BE4AA5996652}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-cache", "src\tool\map-cache.vcxproj", "{FC4C071B-2C26-4B03-948A-335C94A88B5E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapcache", "src\tool\mapcache.vcxproj", "{FC4C071B-2C26-4B03-948A-335C94A88B5E}"
ProjectSection(ProjectDependencies) = postProject
{352B45B3-FE88-4431-9D89-48CF811446DB} = {352B45B3-FE88-4431-9D89-48CF811446DB}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yaml-cpp", "3rdparty\yaml-cpp\yaml-cpp.vcxproj", "{61D6A599-6BED-4154-A9FC-40553BD972E0}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basic_test", "src\test\basic_test.vcxproj", "{99B4DF6A-6180-4E7F-9227-F812FF30414A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {F8FD7B1E-8E1C-4CC3-9CD1-2E28F77B6559} = {F8FD7B1E-8E1C-4CC3-9CD1-2E28F77B6559}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -75,6 +94,7 @@ Global
{F8FD7B1E-8E1C-4CC3-9CD1-2E28F77B6559}.Release|Win32.ActiveCfg = Release|Win32
{F8FD7B1E-8E1C-4CC3-9CD1-2E28F77B6559}.Release|Win32.Build.0 = Release|Win32
{F8FD7B1E-8E1C-4CC3-9CD1-2E28F77B6559}.Release|x64.ActiveCfg = Release|x64
+ {F8FD7B1E-8E1C-4CC3-9CD1-2E28F77B6559}.Release|x64.Build.0 = Release|x64
{F6CC5F60-BD13-41B1-81D3-822A45EC0DBD}.Debug|Win32.ActiveCfg = Debug|Win32
{F6CC5F60-BD13-41B1-81D3-822A45EC0DBD}.Debug|Win32.Build.0 = Debug|Win32
{F6CC5F60-BD13-41B1-81D3-822A45EC0DBD}.Debug|x64.ActiveCfg = Debug|x64
@@ -82,6 +102,7 @@ Global
{F6CC5F60-BD13-41B1-81D3-822A45EC0DBD}.Release|Win32.ActiveCfg = Release|Win32
{F6CC5F60-BD13-41B1-81D3-822A45EC0DBD}.Release|Win32.Build.0 = Release|Win32
{F6CC5F60-BD13-41B1-81D3-822A45EC0DBD}.Release|x64.ActiveCfg = Release|x64
+ {F6CC5F60-BD13-41B1-81D3-822A45EC0DBD}.Release|x64.Build.0 = Release|x64
{7AE31676-6137-4FB3-AE9C-AD47D8A861CF}.Debug|Win32.ActiveCfg = Debug|Win32
{7AE31676-6137-4FB3-AE9C-AD47D8A861CF}.Debug|Win32.Build.0 = Debug|Win32
{7AE31676-6137-4FB3-AE9C-AD47D8A861CF}.Debug|x64.ActiveCfg = Debug|x64
@@ -89,6 +110,7 @@ Global
{7AE31676-6137-4FB3-AE9C-AD47D8A861CF}.Release|Win32.ActiveCfg = Release|Win32
{7AE31676-6137-4FB3-AE9C-AD47D8A861CF}.Release|Win32.Build.0 = Release|Win32
{7AE31676-6137-4FB3-AE9C-AD47D8A861CF}.Release|x64.ActiveCfg = Release|x64
+ {7AE31676-6137-4FB3-AE9C-AD47D8A861CF}.Release|x64.Build.0 = Release|x64
{864805EA-FD39-453D-9248-C581951BA058}.Debug|Win32.ActiveCfg = Debug|Win32
{864805EA-FD39-453D-9248-C581951BA058}.Debug|Win32.Build.0 = Debug|Win32
{864805EA-FD39-453D-9248-C581951BA058}.Debug|x64.ActiveCfg = Debug|x64
@@ -96,6 +118,7 @@ Global
{864805EA-FD39-453D-9248-C581951BA058}.Release|Win32.ActiveCfg = Release|Win32
{864805EA-FD39-453D-9248-C581951BA058}.Release|Win32.Build.0 = Release|Win32
{864805EA-FD39-453D-9248-C581951BA058}.Release|x64.ActiveCfg = Release|x64
+ {864805EA-FD39-453D-9248-C581951BA058}.Release|x64.Build.0 = Release|x64
{FED3A941-0AF7-49FE-85CF-E1DFDC0EBB23}.Debug|Win32.ActiveCfg = Debug|Win32
{FED3A941-0AF7-49FE-85CF-E1DFDC0EBB23}.Debug|Win32.Build.0 = Debug|Win32
{FED3A941-0AF7-49FE-85CF-E1DFDC0EBB23}.Debug|x64.ActiveCfg = Debug|x64
@@ -103,6 +126,7 @@ Global
{FED3A941-0AF7-49FE-85CF-E1DFDC0EBB23}.Release|Win32.ActiveCfg = Release|Win32
{FED3A941-0AF7-49FE-85CF-E1DFDC0EBB23}.Release|Win32.Build.0 = Release|Win32
{FED3A941-0AF7-49FE-85CF-E1DFDC0EBB23}.Release|x64.ActiveCfg = Release|x64
+ {FED3A941-0AF7-49FE-85CF-E1DFDC0EBB23}.Release|x64.Build.0 = Release|x64
{B4114A9C-EEA4-433C-A830-56119A984F24}.Debug|Win32.ActiveCfg = Debug|Win32
{B4114A9C-EEA4-433C-A830-56119A984F24}.Debug|Win32.Build.0 = Debug|Win32
{B4114A9C-EEA4-433C-A830-56119A984F24}.Debug|x64.ActiveCfg = Debug|x64
@@ -110,6 +134,7 @@ Global
{B4114A9C-EEA4-433C-A830-56119A984F24}.Release|Win32.ActiveCfg = Release|Win32
{B4114A9C-EEA4-433C-A830-56119A984F24}.Release|Win32.Build.0 = Release|Win32
{B4114A9C-EEA4-433C-A830-56119A984F24}.Release|x64.ActiveCfg = Release|x64
+ {B4114A9C-EEA4-433C-A830-56119A984F24}.Release|x64.Build.0 = Release|x64
{352B45B3-FE88-4431-9D89-48CF811446DB}.Debug|Win32.ActiveCfg = Debug|Win32
{352B45B3-FE88-4431-9D89-48CF811446DB}.Debug|Win32.Build.0 = Debug|Win32
{352B45B3-FE88-4431-9D89-48CF811446DB}.Debug|x64.ActiveCfg = Debug|x64
@@ -117,6 +142,7 @@ Global
{352B45B3-FE88-4431-9D89-48CF811446DB}.Release|Win32.ActiveCfg = Release|Win32
{352B45B3-FE88-4431-9D89-48CF811446DB}.Release|Win32.Build.0 = Release|Win32
{352B45B3-FE88-4431-9D89-48CF811446DB}.Release|x64.ActiveCfg = Release|x64
+ {352B45B3-FE88-4431-9D89-48CF811446DB}.Release|x64.Build.0 = Release|x64
{FC4C071B-2C26-4B03-948A-335C94A88B5E}.Debug|Win32.ActiveCfg = Debug|Win32
{FC4C071B-2C26-4B03-948A-335C94A88B5E}.Debug|Win32.Build.0 = Debug|Win32
{FC4C071B-2C26-4B03-948A-335C94A88B5E}.Debug|x64.ActiveCfg = Debug|x64
@@ -124,6 +150,7 @@ Global
{FC4C071B-2C26-4B03-948A-335C94A88B5E}.Release|Win32.ActiveCfg = Release|Win32
{FC4C071B-2C26-4B03-948A-335C94A88B5E}.Release|Win32.Build.0 = Release|Win32
{FC4C071B-2C26-4B03-948A-335C94A88B5E}.Release|x64.ActiveCfg = Release|x64
+ {FC4C071B-2C26-4B03-948A-335C94A88B5E}.Release|x64.Build.0 = Release|x64
{61D6A599-6BED-4154-A9FC-40553BD972E0}.Debug|Win32.ActiveCfg = Debug|Win32
{61D6A599-6BED-4154-A9FC-40553BD972E0}.Debug|Win32.Build.0 = Debug|Win32
{61D6A599-6BED-4154-A9FC-40553BD972E0}.Debug|x64.ActiveCfg = Debug|x64
@@ -132,6 +159,14 @@ Global
{61D6A599-6BED-4154-A9FC-40553BD972E0}.Release|Win32.Build.0 = Release|Win32
{61D6A599-6BED-4154-A9FC-40553BD972E0}.Release|x64.ActiveCfg = Release|x64
{61D6A599-6BED-4154-A9FC-40553BD972E0}.Release|x64.Build.0 = Release|x64
+ {99B4DF6A-6180-4E7F-9227-F812FF30414A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {99B4DF6A-6180-4E7F-9227-F812FF30414A}.Debug|Win32.Build.0 = Debug|Win32
+ {99B4DF6A-6180-4E7F-9227-F812FF30414A}.Debug|x64.ActiveCfg = Debug|x64
+ {99B4DF6A-6180-4E7F-9227-F812FF30414A}.Debug|x64.Build.0 = Debug|x64
+ {99B4DF6A-6180-4E7F-9227-F812FF30414A}.Release|Win32.ActiveCfg = Release|Win32
+ {99B4DF6A-6180-4E7F-9227-F812FF30414A}.Release|Win32.Build.0 = Release|Win32
+ {99B4DF6A-6180-4E7F-9227-F812FF30414A}.Release|x64.ActiveCfg = Release|x64
+ {99B4DF6A-6180-4E7F-9227-F812FF30414A}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -147,5 +182,9 @@ Global
{352B45B3-FE88-4431-9D89-48CF811446DB} = {C0A6FC9A-3A5C-48F8-A4B6-8D463C61C021}
{FC4C071B-2C26-4B03-948A-335C94A88B5E} = {9F328FE9-129D-4C0C-820B-BE4AA5996652}
{61D6A599-6BED-4154-A9FC-40553BD972E0} = {6ABA1767-6242-4CA0-BA22-A30972DC8918}
+ {99B4DF6A-6180-4E7F-9227-F812FF30414A} = {9F328FE9-129D-4C0C-820B-BE4AA5996652}
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {026DA20F-820C-40AA-983E-0E231EA90AD5}
EndGlobalSection
EndGlobal
diff --git a/sql-files/item_db.sql b/sql-files/item_db.sql
index f79368b55b6..f19961c4a1a 100644
--- a/sql-files/item_db.sql
+++ b/sql-files/item_db.sql
@@ -1558,7 +1558,7 @@ REPLACE INTO `item_db` VALUES (2703,'Expert_Ring','Expert Ring',4,20,NULL,150,NU
REPLACE INTO `item_db` VALUES (2704,'Golden_Accessory','Golden Accessories',4,20,NULL,100,NULL,4,NULL,0,0xFFFFFFFF,7,2,136,NULL,0,0,0,'bonus bMdef,4;',NULL,NULL);
REPLACE INTO `item_db` VALUES (2705,'Golden_Accessory2','Golden Accessories',4,20,NULL,100,NULL,4,NULL,0,0xFFFFFFFF,7,2,136,NULL,NULL,NULL,NULL,'bonus2 bAddMonsterDropItem,12018,500;',NULL,NULL);
REPLACE INTO `item_db` VALUES (2706,'Handcuff','Arrest Handcuffs',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,7,2,136,NULL,0,0,0,NULL,NULL,NULL);
-REPLACE INTO `item_db` VALUES (2707,'GUSLI','GUSLI',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,7,2,136,NULL,0,0,0,NULL,NULL,NULL);
+REPLACE INTO `item_db` VALUES (2707,'Gusli','GUSLI',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,7,2,136,NULL,0,0,0,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (2708,'Chinese_Handicraft','Chinese Handicraft',4,0,NULL,50,NULL,0,NULL,0,0xFFFFFFFF,7,2,136,NULL,0,0,0,'bonus3 bAutoSpell,"MG_FIREBOLT",5,300;',NULL,NULL);
REPLACE INTO `item_db` VALUES (2709,'5_Anniversary_Coin','5th Anniversary Coin',4,2,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,7,2,136,NULL,0,0,0,'bonus bAtkRate,5; bonus bMatkRate,5;',NULL,NULL);
REPLACE INTO `item_db` VALUES (2710,'Bloody_Iron_Ball_C','Bloody Iron Ball',4,1,NULL,0,NULL,0,NULL,0,0xFFFFFFFE,7,2,136,NULL,0,0,0,'bonus bBaseAtk,30;',NULL,NULL);
@@ -1611,7 +1611,7 @@ REPLACE INTO `item_db` VALUES (2756,'Chemical_Ring','Chemical Ring',4,0,NULL,0,N
REPLACE INTO `item_db` VALUES (2757,'Insecticide_Ring','Insecticide Ring',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,7,2,136,NULL,1,0,0,'bonus2 bExpAddRace,RC_Insect,15;',NULL,NULL);
REPLACE INTO `item_db` VALUES (2758,'Fisher_Ring','Fischer Ring',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,7,2,136,NULL,1,0,0,'bonus2 bExpAddRace,RC_Fish,15;',NULL,NULL);
REPLACE INTO `item_db` VALUES (2759,'Decussate_Ring','Decussate Ring',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,7,2,136,NULL,1,0,0,'bonus2 bExpAddRace,RC_Demon,15;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (2760,'Bloody_Ring','Bloody Ring',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,7,2,136,NULL,1,0,0,'bonus2 bExpAddRace,RC_DemiHuman,15; bonus2 bExpAddRace,RC_Player,15;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (2760,'Bloody_Ring','Bloody Ring',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,7,2,136,NULL,1,0,0,'bonus2 bExpAddRace,RC_DemiHuman,15;',NULL,NULL);
REPLACE INTO `item_db` VALUES (2761,'Satanic_Ring','Satanic Ring',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,7,2,136,NULL,1,0,0,'bonus2 bExpAddRace,RC_Angel,15;',NULL,NULL);
REPLACE INTO `item_db` VALUES (2762,'Dragoon_Ring','Dragon Ring',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,7,2,136,NULL,1,0,0,'bonus2 bExpAddRace,RC_Dragon,15;',NULL,NULL);
REPLACE INTO `item_db` VALUES (2763,'Skul_Ring_C','Neo Skull Ring',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFE,2,2,136,NULL,95,0,0,'bonus bAtkRate,5; bonus bMatkrate,5; bonus bMaxHPrate,5; bonus2 bSkillHeal,"AL_HEAL",5; skill "MG_SIGHT",1;',NULL,NULL);
@@ -1820,7 +1820,7 @@ REPLACE INTO `item_db` VALUES (4150,'Goat_Card','Goat Card',6,20,NULL,10,NULL,NU
REPLACE INTO `item_db` VALUES (4151,'Gajomart_Card','Gajomart Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,64,NULL,NULL,NULL,NULL,'bonus2 bSubRace,RC_Plant,-20; bonus2 bExpAddRace,RC_Plant,10;',NULL,NULL);
REPLACE INTO `item_db` VALUES (4152,'Galapago_Card','Galapago Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,136,NULL,NULL,NULL,NULL,'bonus2 bAddItemGroupHealRate,IG_Juice,50; bonus3 bAddMonsterDropItem,531,RC_Insect,300; bonus3 bAddMonsterDropItem,532,RC_Insect,300; bonus3 bAddMonsterDropItem,534,RC_Insect,300;',NULL,NULL);
REPLACE INTO `item_db` VALUES (4153,'Crab_Card','Crab Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bBaseAtk,5; bonus2 bAddDamageClass,1266,30;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (4154,'Rice_Cake_Boy_Card','Dumpling Child Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,136,NULL,NULL,NULL,NULL,'bonus2 bAddItemGroupHealRate,IG_Candy,50; bonus3 bAddMonsterDropItem,529,RC_DemiHuman,300; bonus3 bAddMonsterDropItem,529,RC_Player,300; bonus3 bAddMonsterDropItem,530,RC_DemiHuman,100; bonus3 bAddMonsterDropItem,530,RC_Player,100;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (4154,'Rice_Cake_Boy_Card','Dumpling Child Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,136,NULL,NULL,NULL,NULL,'bonus2 bAddItemGroupHealRate,IG_Candy,50; bonus3 bAddMonsterDropItem,529,RC_DemiHuman,300; bonus3 bAddMonsterDropItem,530,RC_DemiHuman,100;',NULL,NULL);
REPLACE INTO `item_db` VALUES (4155,'Goblin_Leader_Card','Goblin Leader Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus2 bAddRace2,RC2_Goblin,30;',NULL,NULL);
REPLACE INTO `item_db` VALUES (4156,'Steam_Goblin_Card','Goblin Steamrider Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bCritAtkRate,10; bonus2 bCriticalAddRace,RC_Formless,7;',NULL,NULL);
REPLACE INTO `item_db` VALUES (4157,'Goblin_Archer_Card','Goblin Archer Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bCritAtkRate,10; bonus2 bCriticalAddRace,RC_Undead,7;',NULL,NULL);
@@ -1911,7 +1911,7 @@ REPLACE INTO `item_db` VALUES (4241,'Archangeling_Card','Arc Angeling Card',6,20
REPLACE INTO `item_db` VALUES (4242,'Apocalips_Card','Apocalipse Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bVit,2; if(getrefine()>8) bonus bMaxHP,800;',NULL,NULL);
REPLACE INTO `item_db` VALUES (4243,'Antonio_Card','Antonio Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus3 bAutoSpellWhenHit,"AL_TELEPORT",1,500;',NULL,NULL);
REPLACE INTO `item_db` VALUES (4244,'Alarm_Card','Alarm Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,64,NULL,NULL,NULL,NULL,'bonus3 bAutoSpellWhenHit,"MG_SIGHT",1,200; bonus bMaxHP,300; bonus bVit,1;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (4245,'Am_Mut_Card','Am Mut Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,64,NULL,NULL,NULL,NULL,'bonus2 bSubRace,RC_DemiHuman,-20; bonus2 bSubRace,RC_Player,-20; bonus2 bExpAddRace,RC_DemiHuman,10; bonus2 bExpAddRace,RC_Player,10;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (4245,'Am_Mut_Card','Am Mut Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,64,NULL,NULL,NULL,NULL,'bonus2 bSubRace,RC_DemiHuman,-20; bonus2 bSubRace,RC_Player,-20; bonus2 bExpAddRace,RC_DemiHuman,10;',NULL,NULL);
REPLACE INTO `item_db` VALUES (4246,'Assulter_Card','Assaulter Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bCritAtkRate,10; bonus2 bCriticalAddRace,RC_DemiHuman,7; bonus2 bCriticalAddRace,RC_Player,7;',NULL,NULL);
REPLACE INTO `item_db` VALUES (4247,'Aster_Card','Aster Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bBaseAtk,5; bonus2 bAddDamageClass,1074,30;',NULL,NULL);
REPLACE INTO `item_db` VALUES (4248,'Ancient_Mummy_Card','Ancient Mummy Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,32,NULL,NULL,NULL,NULL,'bonus3 bAutoSpellWhenHit,"AL_CRUCIS",5,30;',NULL,NULL);
@@ -1922,7 +1922,7 @@ REPLACE INTO `item_db` VALUES (4252,'Alligator_Card','Alligator Card',6,20,NULL,
REPLACE INTO `item_db` VALUES (4253,'Alice_Card','Alice Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,32,NULL,NULL,NULL,NULL,'bonus2 bSubClass,Class_Boss,40; bonus2 bSubClass,Class_Normal,-40;',NULL,NULL);
REPLACE INTO `item_db` VALUES (4254,'Tirfing_Card','Ogretooth Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,32,NULL,NULL,NULL,NULL,'bonus2 bSubSize,Size_Medium,25; bonus bDef,1;',NULL,NULL);
REPLACE INTO `item_db` VALUES (4255,'Orc_Lady_Card','Orc Lady Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus2 bAddRace2,3,30;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (4256,'Orc_Archer_Card','Orc Archer Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,136,NULL,NULL,NULL,NULL,'bonus3 bAddMonsterDropItem,12034,RC_DemiHuman,100; bonus3 bAddMonsterDropItem,12034,RC_Player,100;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (4256,'Orc_Archer_Card','Orc Archer Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,136,NULL,NULL,NULL,NULL,'bonus3 bAddMonsterDropItem,12034,RC_DemiHuman,100;',NULL,NULL);
REPLACE INTO `item_db` VALUES (4257,'Wild_Rose_Card','Wild Rose Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,64,NULL,NULL,NULL,NULL,'bonus bAgi,1; if(BaseClass==Job_Thief) bonus bFlee2,5;',NULL,NULL);
REPLACE INTO `item_db` VALUES (4258,'Wicked_Nymph_Card','Evil Nymph Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,769,NULL,NULL,NULL,NULL,'bonus bInt,1; bonus bMaxSP,50;',NULL,NULL);
REPLACE INTO `item_db` VALUES (4259,'Wooden_Golem_Card','Wooden Golem Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bDef,1; bonus bHPrecovRate,30;',NULL,NULL);
@@ -1975,7 +1975,7 @@ REPLACE INTO `item_db` VALUES (4305,'Turtle_General_Card','Turtle General Card',
REPLACE INTO `item_db` VALUES (4306,'Toad_Card','Toad Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,4,NULL,NULL,NULL,NULL,'bonus bFlee2,1;',NULL,NULL);
REPLACE INTO `item_db` VALUES (4307,'Kind_Of_Beetle_Card','Beetle King Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus2 bSPGainRace,RC_Fish,5;',NULL,'heal 0,-5;');
REPLACE INTO `item_db` VALUES (4308,'Tri_Joint_Card','Tri Joint Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus2 bSPGainRace,RC_Formless,5;',NULL,'heal 0,-5;');
-REPLACE INTO `item_db` VALUES (4309,'Parasite_Card','Parasite Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,32,NULL,NULL,NULL,NULL,'bonus bDef,1; bonus2 bSubEle,Ele_Neutral,5;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (4309,'Parasite_Card','Parasite Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,32,NULL,NULL,NULL,NULL,'bonus bDef,1; bonus2 bSubRace,RC_Formless,5;',NULL,NULL);
REPLACE INTO `item_db` VALUES (4310,'Panzer_Goblin_Card','Panzer Goblin Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bCritAtkRate,10; bonus2 bCriticalAddRace,RC_Demon,7;',NULL,NULL);
REPLACE INTO `item_db` VALUES (4311,'Permeter_Card','Permeter Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,769,NULL,NULL,NULL,NULL,'bonus2 bSubEle,Ele_Dark,15; bonus2 bSubEle,Ele_Undead,15;',NULL,NULL);
REPLACE INTO `item_db` VALUES (4312,'Fur_Seal_Card','Seal Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bFlee,3; bonus bHit,10; if(BaseClass==Job_Acolyte) { bonus2 bCriticalAddRace,RC_Undead,9; bonus2 bCriticalAddRace,RC_Demon,9; }',NULL,NULL);
@@ -2116,7 +2116,7 @@ REPLACE INTO `item_db` VALUES (4447,'Centipede_Card','Centipede Card',6,20,NULL,
REPLACE INTO `item_db` VALUES (4448,'Cornus_Card','Cornus Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,32,NULL,NULL,NULL,NULL,'bonus2 bSubEle,Ele_Holy,20; bonus2 bAddEle,Ele_Holy,5;',NULL,NULL);
REPLACE INTO `item_db` VALUES (4449,'Dark_Shadow_Card','Dark Shadow Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,32,NULL,NULL,NULL,NULL,'bonus2 bSubEle,Ele_Dark,20; bonus2 bAddEle,Ele_Dark,5;',NULL,NULL);
REPLACE INTO `item_db` VALUES (4450,'Banshee_Master_Card','Banshee Master Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bInt,1; bonus bMatk,10;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (4451,'Entweihen_Card','Entweihen Crothen Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bMatk,100;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (4451,'Ant_Buyanne_Card','Entweihen Crothen Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bMatk,100;',NULL,NULL);
REPLACE INTO `item_db` VALUES (4452,'Centipede_Larva_Card','Centipede Larva Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bInt,1; bonus bMatk,3;',NULL,NULL);
REPLACE INTO `item_db` VALUES (4453,'Hilsrion_Card','Hillsrion Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bBaseAtk,25;',NULL,NULL);
# Armor Enchant System
@@ -2181,8 +2181,8 @@ REPLACE INTO `item_db` VALUES (4756,'Luck7','LUK+7',6,20,NULL,10,NULL,NULL,NULL,
REPLACE INTO `item_db` VALUES (4757,'Luck8','LUK+8',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bLuk,8;',NULL,NULL);
REPLACE INTO `item_db` VALUES (4758,'Luck9','LUK+9',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bLuk,9;',NULL,NULL);
REPLACE INTO `item_db` VALUES (4759,'Luck10','LUK+10',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bLuk,10;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (4760,'Magic_Attack1','MATK+1%',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bMatkRate,1;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (4761,'Magic_Attack2','MATK+2%',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bMatkRate,2;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (4760,'Matk1','MATK+1%',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bMatkRate,1;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (4761,'Matk2','MATK+2%',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bMatkRate,2;',NULL,NULL);
REPLACE INTO `item_db` VALUES (4762,'Evasion6','FLEE+6',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bFlee,6;',NULL,NULL);
REPLACE INTO `item_db` VALUES (4763,'Evasion12','FLEE+12',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bFlee,12;',NULL,NULL);
REPLACE INTO `item_db` VALUES (4764,'Critical5','CRI+5',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bCritical,5;',NULL,NULL);
@@ -2680,7 +2680,7 @@ REPLACE INTO `item_db` VALUES (5464,'Zaha_Doll_Hat','Zaha Doll Hat',4,20,NULL,0,
#REPLACE INTO `item_db` VALUES (5469,'Noble_Hat','Musketeer Hat',4,20,NULL,300,NULL,2,NULL,0,0xFFFFFFFF,7,2,256,NULL,30,1,466,'bonus bStr,2; bonus3 bAutoSpellWhenHit,"BS_ADRENALINE",1,7;',NULL,NULL);
#REPLACE INTO `item_db` VALUES (5470,'Eyes_Of_Darkness','Eye Of Darkness',4,20,NULL,100,NULL,1,NULL,0,0xFFFFFFFF,7,2,512,NULL,50,0,467,'bonus bDex,1; bonus2 bResEff,Eff_Blind,10000;',NULL,NULL);
#REPLACE INTO `item_db` VALUES (5471,'Hairband_Of_Reginleif','Hairband Of Reginleif',4,20,NULL,800,NULL,1,NULL,0,0xFFFFFFFF,7,2,512,NULL,50,0,468,'bonus2 bSubEle,Ele_Water,3; bonus2 bSubEle,Ele_Fire,3; bonus2 bSubEle,Ele_Undead,3; bonus2 bSubEle,Ele_Ghost,3;',NULL,NULL);
-#REPLACE INTO `item_db` VALUES (5472,'Red_White_Hat','Red Hat',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,7,2,256,NULL,0,1,469,'bonus3 bAddMonsterDropItem,550,RC_DemiHuman,3; bonus3 bAddMonsterDropItem,550,RC_Player,3;',NULL,NULL);
+#REPLACE INTO `item_db` VALUES (5472,'Red_White_Hat','Red Hat',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,7,2,256,NULL,0,1,469,'bonus3 bAddMonsterDropItem,550,RC_DemiHuman,3;',NULL,NULL);
#REPLACE INTO `item_db` VALUES (5473,'Forceps_Hairpin','Nipper Crab Hairpin',4,20,NULL,500,NULL,4,NULL,0,0xFFFFFFFF,7,2,256,NULL,30,1,470,'bonus3 bAutoSpellWhenHit,"MG_COLDBOLT",1,100; bonus3 bAddMonsterDropItem,991,RC_Fish,3;',NULL,NULL);
#REPLACE INTO `item_db` VALUES (5474,'Notice_Board','AFK Hat',4,20,NULL,700,NULL,2,NULL,0,0xFFFFFFFF,7,2,256,NULL,10,0,471,NULL,NULL,NULL);
#REPLACE INTO `item_db` VALUES (5475,'Cube_Mask','Mask Cube',4,20,NULL,100,NULL,1,NULL,0,0xFFFFFFFF,7,2,513,NULL,0,0,472,NULL,NULL,NULL);
@@ -2782,10 +2782,10 @@ REPLACE INTO `item_db` VALUES (5570,'Gemini_Crown','Gemini Crown',4,20,NULL,300,
#REPLACE INTO `item_db` VALUES (5571,'Rasta_Wig','Rasta_Wig',4,20,NULL,100,NULL,1,NULL,0,0xFFFFFFFF,7,2,256,NULL,0,1,552,'bonus bStr,1;',NULL,NULL);
REPLACE INTO `item_db` VALUES (5572,'Savage_Baby_Hat','Savage Babe Hat',4,20,NULL,100,NULL,1,NULL,1,0xFFFFFFFF,7,2,256,NULL,1,1,553,'bonus bVit,2;',NULL,NULL);
REPLACE INTO `item_db` VALUES (5573,'Bogy_Horn','Dokebi Horn',4,20,NULL,100,NULL,1,NULL,1,0xFFFFFFFF,7,2,256,NULL,0,1,554,NULL,NULL,NULL);
-REPLACE INTO `item_db` VALUES (5574,'Pencil_in_Mouth','Well-Chewed Pencil',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,7,2,1,NULL,10,0,555,'bonus bdex,2; bonus bHitRate,3;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (5574,'Pencil_In_Mouth','Well-Chewed Pencil',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,7,2,1,NULL,10,0,555,'bonus bdex,2; bonus bHitRate,3;',NULL,NULL);
REPLACE INTO `item_db` VALUES (5575,'Onigiri_Hat','Rice Ball Hat',4,20,NULL,100,NULL,6,NULL,1,0xFFFFFFFF,7,2,256,NULL,30,0,556,NULL,NULL,NULL);
#REPLACE INTO `item_db` VALUES (5576,'Japan_Winecup','Wine Cup',4,20,NULL,100,NULL,1,NULL,0,0xFFFFFFFF,7,2,1,NULL,0,0,557,NULL,NULL,NULL);
-REPLACE INTO `item_db` VALUES (5577,'Dark_Knight_Mask_','Dark Knight Mask',4,NULL,NULL,3000,NULL,5,NULL,0,0xFFFFFFFF,7,2,769,NULL,80,1,479,'bonus bStr,3;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (5577,'Dark_Knight_MaskB','Dark Knight Mask',4,NULL,NULL,3000,NULL,5,NULL,0,0xFFFFFFFF,7,2,769,NULL,80,1,479,'bonus bStr,3;',NULL,NULL);
REPLACE INTO `item_db` VALUES (5578,'Voyage_Hat','Voyage_Hat',4,200,NULL,10,NULL,1,NULL,0,0xFFFFFFFF,7,2,256,NULL,0,1,236,'bonus bAgi,2;',NULL,NULL);
REPLACE INTO `item_db` VALUES (5579,'Wanderer\'s_Sakkat','Wanderer\'s Sakkat',4,20,NULL,300,NULL,2,NULL,1,0xFFFFFFFF,7,2,768,NULL,70,1,558,'bonus bAgi,2;',NULL,NULL);
#REPLACE INTO `item_db` VALUES (5580,'Red_Beret','Red Beret',4,20,NULL,100,NULL,1,NULL,0,0xFFFFFFFF,7,2,256,NULL,0,0,559,'bonus bAllStats,3; bonus bMdef,3;',NULL,NULL);
@@ -2800,8 +2800,8 @@ REPLACE INTO `item_db` VALUES (5587,'Mosquito_Coil_1Use','Mosquito Coil',4,0,NUL
#REPLACE INTO `item_db` VALUES (5589,'Leo_Diadem','Leo Diadem',4,20,NULL,300,NULL,3,NULL,0,0xFFFFFFFF,7,2,256,NULL,70,1,566,'bonus bDex,2; bonus2 bSubEle,Ele_Fire,5; if(getrefine()>6) { bonus bFlee,10; bonus bAspdRate,3; autobonus "{ bonus bSplashRange,1; }",10,10000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }"; }',NULL,NULL);
REPLACE INTO `item_db` VALUES (5590,'K_Poring_Cake_Cap','Poring Cake Hat',4,20,NULL,200,NULL,1,NULL,0,0xFFFFFFFF,7,2,256,NULL,0,1,417,NULL,NULL,NULL);
#REPLACE INTO `item_db` VALUES (5591,'Desert_Prince','Desert Prince',4,20,NULL,100,NULL,1,NULL,1,0xFFFFFFFF,7,2,256,NULL,30,0,567,NULL,NULL,NULL);
-REPLACE INTO `item_db` VALUES (5592,'Sigrun\'s_Wings','Sigrun\'s Wings',4,20,NULL,100,NULL,2,NULL,0,0xFFFFFFFF,7,2,512,NULL,80,0,568,'if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief||(BaseJob==Job_Taekwon&&Class!=Job_Soul_Linker)) bonus bStr,1; else if(BaseClass==Job_Mage||BaseClass==Job_Acolyte||class==Job_Ninja||class==Job_Soul_Linker) bonus bInt,1; else if(BaseClass==Job_Archer||BaseClass==Job_Gunslinger) bonus bDex,1; else if(BaseJob==Job_Novice||BaseJob==Job_SuperNovice) { bonus bMaxHP,80; bonus bMaxSP,30; }',NULL,NULL);
-REPLACE INTO `item_db` VALUES (5593,'Rabbit_Bonnet_','Rabbit Bonnet',4,20,NULL,200,NULL,1,NULL,1,0xFFFFFFFF,7,2,768,NULL,1,1,549,NULL,NULL,NULL);
+REPLACE INTO `item_db` VALUES (5592,'Sigrun\'s_Wing','Sigrun\'s Wings',4,20,NULL,100,NULL,2,NULL,0,0xFFFFFFFF,7,2,512,NULL,80,0,568,'if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief||(BaseJob==Job_Taekwon&&Class!=Job_Soul_Linker)) bonus bStr,1; else if(BaseClass==Job_Mage||BaseClass==Job_Acolyte||class==Job_Ninja||class==Job_Soul_Linker) bonus bInt,1; else if(BaseClass==Job_Archer||BaseClass==Job_Gunslinger) bonus bDex,1; else if(BaseJob==Job_Novice||BaseJob==Job_SuperNovice) { bonus bMaxHP,80; bonus bMaxSP,30; }',NULL,NULL);
+REPLACE INTO `item_db` VALUES (5593,'K_Rabbit_Bonnet','Rabbit Bonnet',4,20,NULL,200,NULL,1,NULL,1,0xFFFFFFFF,7,2,768,NULL,1,1,549,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (5594,'Donut_In_Mouth','Donut In Mouth',4,20,NULL,50,NULL,1,NULL,0,0xFFFFFFFF,7,2,1,NULL,1,0,569,NULL,NULL,NULL);
#REPLACE INTO `item_db` VALUES (5595,'Eye_Of_Juno','Eye Of Juno',4,20,NULL,400,NULL,2,NULL,1,0xFFFFFFFF,7,2,256,NULL,1,1,570,'bonus bMdef,2;',NULL,NULL);
REPLACE INTO `item_db` VALUES (5596,'4Leaf_Clover_In_Mouth','4Leaf Clover In Mouth',4,20,NULL,0,NULL,2,NULL,0,0xFFFFFFFF,7,2,1,NULL,1,0,571,'bonus bMdef,2;',NULL,NULL);
@@ -2867,7 +2867,7 @@ REPLACE INTO `item_db` VALUES (5654,'Holy_Marching_Hat_J','Holy Marching Hat',4,
#REPLACE INTO `item_db` VALUES (5656,'Scooter_Hat_J','Scooter Helmet',4,20,NULL,1000,NULL,7,NULL,1,0xFFFFFFFF,7,2,256,NULL,50,1,588,'bonus bUnbreakableHelm,0;',NULL,NULL);
#REPLACE INTO `item_db` VALUES (5657,'Antique_Pipe_J','Captain\'s Pipe',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,7,2,1,NULL,30,0,383,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (5658,'Imp_Hat','Imp Hat',4,20,NULL,400,NULL,1,NULL,0,0xFFFFFFFF,7,2,256,NULL,1,1,589,'bonus3 bAutoSpell,"SA_FLAMELAUNCHER",1,5;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (5659,'Sleeper_Hat','Sleeper Hat',4,20,NULL,400,NULL,1,NULL,0,0xFFFFFFFF,7,2,256,NULL,1,1,590,'bonus3 bAutoSpell,"SA_SEISMICWEAPON",1,5;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (5659,'Sleepr_Hat','Sleeper Hat',4,20,NULL,400,NULL,1,NULL,0,0xFFFFFFFF,7,2,256,NULL,1,1,590,'bonus3 bAutoSpell,"SA_SEISMICWEAPON",1,5;',NULL,NULL);
REPLACE INTO `item_db` VALUES (5660,'Gryphon_Hat','Gryphon Hat',4,20,NULL,400,NULL,1,NULL,0,0xFFFFFFFF,7,2,256,NULL,1,1,591,'bonus3 bAutoSpell,"SA_LIGHTNINGLOADER",1,5;',NULL,NULL);
#REPLACE INTO `item_db` VALUES (5661,'Red_Pirate_Bandana','Red Pirate Banada',4,0,NULL,0,NULL,3,NULL,0,0xFFFFFFFF,7,2,256,NULL,10,1,592,'bonus bStr,1; bonus bDex,1; bonus bAspdRate,2; bonus bCastRate,-2; bonus3 bAutoSpell,"MO_EXTREMITYFIST",1,30;',NULL,NULL);
#REPLACE INTO `item_db` VALUES (5662,'Libra_Crown','Libra Crown',4,10,NULL,300,NULL,3,NULL,0,0xFFFFFFFF,7,2,256,NULL,1,1,593,'bonus bDex,3;',NULL,NULL);
@@ -4253,7 +4253,7 @@ REPLACE INTO `item_db` VALUES (7852,'Pass_F2','Divx Player Raffle Ticket',3,20,N
REPLACE INTO `item_db` VALUES (7853,'Pass_F3','iPod nano Raffle Ticket',3,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (7854,'Pass_CF','Comodo Festival Ticket',3,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (7855,'Heart','Heart',3,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db` VALUES (7856,'Girl_Bunch_Of_Flower','Girl\'s Bouquet',3,20,NULL,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db` VALUES (7856,'Girl_Bunch_Of_Flower_','Girl\'s Bouquet',3,20,NULL,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (7857,'Handmade_Kitty_Doll','Hand-made Kitty Doll',3,20,NULL,30,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (7858,'Dragonball_Yellow_','Dragonball Yellow',3,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (7859,'Game_Ticket','Game Ticket',3,20,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -4583,7 +4583,7 @@ REPLACE INTO `item_db` VALUES (11528,'Kanafeh','Kanafeh',0,1500,NULL,200,NULL,NU
REPLACE INTO `item_db` VALUES (11529,'MAAMOUL_','Maamoul',0,500,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'itemheal 120,60;',NULL,NULL);
REPLACE INTO `item_db` VALUES (11530,'Jujube','Jujube',0,10,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'itemheal 30,0;',NULL,NULL);
REPLACE INTO `item_db` VALUES (11531,'Coffee','Coffee',0,10,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'itemheal 0,10;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (11701,'Girl_Bunch_Of_Flower_','Girl\'s Bouquet',0,20,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(105,145),0;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (11701,'Girl_Bunch_Of_Flower','Girl\'s Bouquet',0,20,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(105,145),0;',NULL,NULL);
REPLACE INTO `item_db` VALUES (11702,'Moon_Cookie','Moon Cookie',0,0,NULL,300,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (11703,'Mysterious_Blood','Mystery Blood',0,0,NULL,30,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'itemheal 0,rand(25,35);',NULL,NULL);
REPLACE INTO `item_db` VALUES (11704,'KETUPAT_F','Ketupat',0,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(70,90),0;',NULL,NULL);
@@ -4985,9 +4985,9 @@ REPLACE INTO `item_db` VALUES (12388,'Runstone_Crush','Rhydo Runestone For Appre
REPLACE INTO `item_db` VALUES (12389,'Runstone_Storm','Pertz Runestone For Apprentice',11,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'/* if(strcharinfo(3)=="job3_rune02") { itemskill "RK_STORMBLAST",1; } */',NULL,NULL);
REPLACE INTO `item_db` VALUES (12390,'Runstone_Millennium','Verkana Runestone For Apprentice',11,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'/* if(strcharinfo(3)=="job3_rune02") { itemskill "RK_MILLENNIUMSHIELD",1; } */',NULL,NULL);
REPLACE INTO `item_db` VALUES (12391,'Lucky_Egg_C','Lucky Egg',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db` VALUES (12392,'Repair_A','Repair A',2,220,NULL,100,NULL,NULL,NULL,NULL,0x00000400,8,2,NULL,NULL,NULL,NULL,NULL,'if ( checkmadogear() ) { itemheal rand(200,300),0; }',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12393,'Repair_B','Repair B',2,500,NULL,140,NULL,NULL,NULL,NULL,0x00000400,8,2,NULL,NULL,NULL,NULL,NULL,'if ( checkmadogear() ) { itemheal rand(300,400),0; }',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12394,'Repair_C','Repair C',2,1100,NULL,180,NULL,NULL,NULL,NULL,0x00000400,8,2,NULL,NULL,NULL,NULL,NULL,'if ( checkmadogear() ) { itemheal rand(400,500),0; }',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12392,'RepairA','Repair A',2,220,NULL,100,NULL,NULL,NULL,NULL,0x00000400,8,2,NULL,NULL,NULL,NULL,NULL,'if ( checkmadogear() ) { itemheal rand(200,300),0; }',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12393,'RepairB','Repair B',2,500,NULL,140,NULL,NULL,NULL,NULL,0x00000400,8,2,NULL,NULL,NULL,NULL,NULL,'if ( checkmadogear() ) { itemheal rand(300,400),0; }',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12394,'RepairC','Repair C',2,1100,NULL,180,NULL,NULL,NULL,NULL,0x00000400,8,2,NULL,NULL,NULL,NULL,NULL,'if ( checkmadogear() ) { itemheal rand(400,500),0; }',NULL,NULL);
REPLACE INTO `item_db` VALUES (12395,'Tantanmen','Tantan Noodle',2,20,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'pet 1519;',NULL,NULL);
REPLACE INTO `item_db` VALUES (12396,'Fools_Day_Box','Gift Box?',11,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'.@rnd = rand(1,10); if(.@rnd==1) itemskill "AL_TELEPORT",1; else if(.@rnd==2) itemskill "AL_TELEPORT",3; else if(.@rnd==3) percentheal 50,0; else if(.@rnd==4) percentheal 0,50; else if(.@rnd==5) end; else if(.@rnd==6) getitem 512,1; else if(.@rnd==7) itemskill "ALL_REVERSEORCISH",1; else if(.@rnd==8) specialeffect2 EF_MAPPILLAR2; else if(.@rnd==9) specialeffect2 EF_ANGEL2; else specialeffect2 EF_COIN;',NULL,NULL);
REPLACE INTO `item_db` VALUES (12397,'Fools_Day_Box2','Gift Box?',11,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'.@rnd = rand(1,10); if(.@rnd==1) itemskill "TF_DETOXIFY",1; else if(.@rnd==2) itemskill "TF_PICKSTONE",1; else if(.@rnd==3) itemskill "BA_FROSTJOKER",1; else if(.@rnd==4) itemskill "DC_SCREAM",1; else if(.@rnd==5) end; else if(.@rnd==6) getitem 909,1; else if(.@rnd==7) itemskill "AL_RUWACH",1; else if(.@rnd==8) specialeffect2 EF_BEGINASURA; else if(.@rnd==9) specialeffect2 EF_MVP; else specialeffect2 EF_CURSEATTACK;',NULL,NULL);
@@ -4996,7 +4996,7 @@ REPLACE INTO `item_db` VALUES (12399,'Castle_Treasure_Box','Castle Treasure Box'
REPLACE INTO `item_db` VALUES (12400,'Water_Of_Blessing_','Water Of Blessing',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (12401,'Rune_Kn_Test_Int','Rune Kn Test Int',2,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_INCINT,300000,40;',NULL,NULL);
REPLACE INTO `item_db` VALUES (12402,'29Fruit','29Fruit',2,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'percentheal 5,5;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12403,'Lucky_Egg2','Lucky Egg2',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db` VALUES (12403,'Lucky_Egg_C2','Lucky Egg2',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (12404,'Acti_Potion','Acti Potion',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (12405,'Underripe_Yggseed','Underripe Yggseed',2,20,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'percentheal 30,30; skilleffect "AL_BLESSING",0; sc_start SC_BLESSING,140000,5;',NULL,NULL);
REPLACE INTO `item_db` VALUES (12406,'Psychic_ArmorS','Psychic ArmorS',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -5014,23 +5014,23 @@ REPLACE INTO `item_db` VALUES (12417,'Boost500','Boost500',2,100,NULL,50,NULL,NU
REPLACE INTO `item_db` VALUES (12418,'Full_SwingK','Full SwingK',2,100,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_FULL_SWING_K,500000,50;',NULL,NULL);
REPLACE INTO `item_db` VALUES (12419,'Mana_Plus','Mana Plus',2,100,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_MANA_PLUS,500000,50;',NULL,NULL);
REPLACE INTO `item_db` VALUES (12420,'Stamina_Up_M','Stamina Up M',2,100,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_MUSTLE_M,500000,5;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12421,'Falmons_F','Falmons F',2,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_LIFE_FORCE_F,500000,5;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12421,'Digestive_F','Falmons F',2,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_LIFE_FORCE_F,500000,5;',NULL,NULL);
REPLACE INTO `item_db` VALUES (12422,'HP_Increase_PotionS','HP Increase Potion (Small)',2,100,NULL,20,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start2 SC_PROMOTE_HEALTH_RESERCH,500000,1,1; percentheal 1,0;',NULL,NULL);
REPLACE INTO `item_db` VALUES (12423,'HP_Increase_PotionM','HP Increase Potion (Medium)',2,100,NULL,40,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start2 SC_PROMOTE_HEALTH_RESERCH,500000,1,2; percentheal 2,0;',NULL,NULL);
REPLACE INTO `item_db` VALUES (12424,'HP_Increase_PotionL','HP Increase Potion (Large)',2,100,NULL,80,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start2 SC_PROMOTE_HEALTH_RESERCH,500000,1,3; percentheal 5,0;',NULL,NULL);
REPLACE INTO `item_db` VALUES (12425,'SP_Increase_PotionS','SP Increase Potion (Small)',2,100,NULL,20,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start2 SC_ENERGY_DRINK_RESERCH,500000,1,1; percentheal 0,2;',NULL,NULL);
REPLACE INTO `item_db` VALUES (12426,'SP_Increase_PotionM','SP Increase Potion (Medium)',2,100,NULL,40,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start2 SC_ENERGY_DRINK_RESERCH,500000,1,2; percentheal 0,4;',NULL,NULL);
REPLACE INTO `item_db` VALUES (12427,'SP_Increase_PotionL','SP Increase Potion (Large)',2,100,NULL,80,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start2 SC_ENERGY_DRINK_RESERCH,500000,1,3; percentheal 0,8;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12428,'Concentrated_White_Potion_Z','Concentrated White Potion Z',0,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_EXTRACT_WHITE_POTION_Z,500000,20; heal 1000,0;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12429,'Savage_Full_Roast','Savage Full Roast',2,NULL,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_SAVAGE_STEAK,300000,20;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12430,'Cocktail_Warg_Blood','Cocktail Warg Blood',2,NULL,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_COCKTAIL_WARG_BLOOD,300000,20;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12431,'Minor_Stew','Minor Stew',2,NULL,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_MINOR_BBQ,300000,20;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12432,'Siroma_Iced_Tea','Siroma Iced Tea',2,NULL,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_SIROMA_ICE_TEA,300000,20;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12433,'Drosera_Herb_Salad','Drosera Herb Salad',2,NULL,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_DROCERA_HERB_STEAMED,300000,20;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12434,'Petite_Tail_Noodles','Petite Tail Noodles',2,NULL,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_PUTTI_TAILS_NOODLES,300000,20;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12435,'Black_Mass','Black Mass',2,NULL,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_STOMACHACHE,60000,rand(5,10);',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12436,'Vitata_500','Vitata 500',0,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_VITATA_500,500000,0; itemheal 0,200;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12437,'Concentrated_Ceromain_Soup','Concentrated Ceromain Soup',2,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_EXTRACT_SALAMINE_JUICE,500000,10;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12428,'Enrich_White_PotionZ','Concentrated White Potion Z',0,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_EXTRACT_WHITE_POTION_Z,500000,20; heal 1000,0;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12429,'Savage_BBQ','Savage Full Roast',2,NULL,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_SAVAGE_STEAK,300000,20;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12430,'Wug_Blood_Cocktail','Cocktail Warg Blood',2,NULL,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_COCKTAIL_WARG_BLOOD,300000,20;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12431,'Minor_Brisket','Minor Stew',2,NULL,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_MINOR_BBQ,300000,20;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12432,'Siroma_Icetea','Siroma Iced Tea',2,NULL,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_SIROMA_ICE_TEA,300000,20;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12433,'Drocera_Herb_Stew','Drosera Herb Salad',2,NULL,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_DROCERA_HERB_STEAMED,300000,20;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12434,'Petti_Tail_Noodle','Petite Tail Noodles',2,NULL,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_PUTTI_TAILS_NOODLES,300000,20;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12435,'Black_Thing','Black Mass',2,NULL,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_STOMACHACHE,60000,rand(5,10);',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12436,'Vitata500','Vitata 500',0,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_VITATA_500,500000,0; itemheal 0,200;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12437,'Enrich_Celermine_Juice','Concentrated Ceromain Soup',2,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_EXTRACT_SALAMINE_JUICE,500000,10;',NULL,NULL);
REPLACE INTO `item_db` VALUES (12438,'F_Giant_Fly_Wing','F Giant Fly Wing',2,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (12439,'F_Battle_Manual','F Battle Manual',2,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (12440,'F_Insurance','F Insurance',2,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -5173,7 +5173,7 @@ REPLACE INTO `item_db` VALUES (12578,'Rapid_Life_Water','Rapid Life Water',2,0,N
REPLACE INTO `item_db` VALUES (12579,'Ring_Of_Valkyrie_Box','Ring Of Valkyrie Box',2,20,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (12580,'Vending_Search_Scroll','Universal Catalog Silver',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'searchstores 10,0;',NULL,NULL);
REPLACE INTO `item_db` VALUES (12581,'Vending_Search_Scroll2','Universal Catalog Gold',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'searchstores 10,1;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12591,'Vending_Search_Scroll3','Universal Catalog Bronze',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'searchstores 10,1;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12591,'Uni_Catalog_Bz','Universal Catalog Bronze',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'searchstores 10,1;',NULL,NULL);
REPLACE INTO `item_db` VALUES (12701,'Old_Blue_Box_F','Old Blue Box',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (12702,'Old_Bleu_Box','Old Navy Box',2,0,NULL,200,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getrandgroupitem(IG_BleuBox),1; getrandgroupitem(IG_BleuBox),1;',NULL,NULL);
REPLACE INTO `item_db` VALUES (12703,'Holy_Egg_2','Holy Egg',11,0,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -5194,22 +5194,22 @@ REPLACE INTO `item_db` VALUES (12716,'Indian_Rice_Cake','Indian Rice Cake',2,0,N
REPLACE INTO `item_db` VALUES (12717,'Poison_Paralysis','Paralyze',0,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_PARALYSE,300000,0,10,0;',NULL,NULL);
REPLACE INTO `item_db` VALUES (12718,'Poison_Leech','Leech End',0,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_LEECHESEND,300000,0,10,0;',NULL,NULL);
REPLACE INTO `item_db` VALUES (12719,'Poison_Oblivion','Oblivion Curse',0,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_OBLIVIONCURSE,300000,0,10,0;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12720,'Poison_Disheart','Disheart',0,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_DEATHHURT,300000,0,10,0;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12720,'Poison_Contamination','Disheart',0,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_DEATHHURT,300000,0,10,0;',NULL,NULL);
REPLACE INTO `item_db` VALUES (12721,'Poison_Numb','Toxin',0,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_TOXIN,300000,0,10,0;',NULL,NULL);
REPLACE INTO `item_db` VALUES (12722,'Poison_Fever','Pyrexia',0,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_PYREXIA,300000,0,10,0;',NULL,NULL);
REPLACE INTO `item_db` VALUES (12723,'Poison_Laughing','Magic Mushroom',0,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_MAGICMUSHROOM,300000,0,10,0;',NULL,NULL);
REPLACE INTO `item_db` VALUES (12724,'Poison_Fatigue','Venom Bleed',0,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_VENOMBLEED,15000,0,10,0;',NULL,NULL);
# Rune Knight's Rune Stones
-REPLACE INTO `item_db` VALUES (12725,'Runstone_Nosiege','Nauthiz Rune',11,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,8,2,NULL,NULL,NULL,NULL,NULL,'itemskill "RK_REFRESH",1;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12726,'Runstone_Rhydo','Raido Rune',11,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,8,2,NULL,NULL,NULL,NULL,NULL,'itemskill "RK_CRUSHSTRIKE",1;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12727,'Runstone_Verkana','Berkana Rune',11,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,8,2,NULL,NULL,NULL,NULL,NULL,'itemskill "RK_MILLENNIUMSHIELD",1;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12728,'Runstone_Isia','Isa Rune',11,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,8,2,NULL,NULL,NULL,NULL,NULL,'itemskill "RK_VITALITYACTIVATION",1;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12729,'Runstone_Asir','Othila Rune',11,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,8,2,NULL,NULL,NULL,NULL,NULL,'itemskill "RK_FIGHTINGSPIRIT",1;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12730,'Runstone_Urj','Uruz Rune',11,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,8,2,NULL,NULL,NULL,NULL,NULL,'itemskill "RK_ABUNDANCE",1;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12731,'Runstone_Turisus','Thurisaz Rune',11,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,8,2,NULL,NULL,NULL,NULL,NULL,'itemskill "RK_GIANTGROWTH",1;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12732,'Runstone_Pertz','Wyrd Rune',11,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,8,2,NULL,NULL,NULL,NULL,NULL,'itemskill "RK_STORMBLAST",1;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12733,'Runstone_Hagalas','Hagalaz Rune',11,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,8,2,NULL,NULL,NULL,NULL,NULL,'itemskill "RK_STONEHARDSKIN",1;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12725,'Runstone_Nosiege','Nauthiz Rune',2,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,8,2,NULL,NULL,NULL,NULL,NULL,'if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_REFRESH",1;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12726,'Runstone_Rhydo','Raido Rune',2,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,8,2,NULL,NULL,NULL,NULL,NULL,'if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_CRUSHSTRIKE",1;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12727,'Runstone_Verkana','Berkana Rune',2,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,8,2,NULL,NULL,NULL,NULL,NULL,'if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_MILLENNIUMSHIELD",1;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12728,'Runstone_Isia','Isa Rune',2,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,8,2,NULL,NULL,NULL,NULL,NULL,'if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_VITALITYACTIVATION",1;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12729,'Runstone_Asir','Othila Rune',2,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,8,2,NULL,NULL,NULL,NULL,NULL,'if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_FIGHTINGSPIRIT",1;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12730,'Runstone_Urj','Uruz Rune',2,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,8,2,NULL,NULL,NULL,NULL,NULL,'if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_ABUNDANCE",1;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12731,'Runstone_Turisus','Thurisaz Rune',2,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,8,2,NULL,NULL,NULL,NULL,NULL,'if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_GIANTGROWTH",1;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12732,'Runstone_Pertz','Wyrd Rune',2,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,8,2,NULL,NULL,NULL,NULL,NULL,'if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_STORMBLAST",1;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12733,'Runstone_Hagalas','Hagalaz Rune',2,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,8,2,NULL,NULL,NULL,NULL,NULL,'if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_STONEHARDSKIN",1;',NULL,NULL);
# Rune Knight Rune Ores
REPLACE INTO `item_db` VALUES (12734,'Runstone_Quality','Luxurious Rune',0,2,NULL,100,NULL,NULL,NULL,NULL,0x00000080,8,2,NULL,NULL,NULL,NULL,NULL,'makerune 5;',NULL,NULL);
@@ -5562,8 +5562,8 @@ REPLACE INTO `item_db` VALUES (13517,'Yggdrasilberry_Box','Yggdrasil Berry Box',
REPLACE INTO `item_db` VALUES (13518,'Weapon_Card_Scroll_Box','Weapon Card Pet Egg Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 13558,1;',NULL,NULL);
REPLACE INTO `item_db` VALUES (13519,'Armor_Card_Scroll_Box','Armor Card Pet Egg Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 13559,1;',NULL,NULL);
REPLACE INTO `item_db` VALUES (13520,'Helmet_Card_Scroll_Box','Helmet Card Pet Egg Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 13560,1;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (13521,'Garment_Card_Scroll_Box','Garment Card Pet Egg Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 13561,1;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (13522,'Shield_Card_Scroll_Box','Shield Card Pet Egg Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 13562,1;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (13521,'Hood_Card_Scroll_Box','Garment Card Pet Egg Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 13561,1;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (13522,'Hood_Card_Scroll_Box2','Shield Card Pet Egg Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 13562,1;',NULL,NULL);
REPLACE INTO `item_db` VALUES (13523,'Shoes_Card_Scroll_Box','Shoes Card Pet Egg Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 13563,1;',NULL,NULL);
REPLACE INTO `item_db` VALUES (13524,'Accy_Card_Scroll_Box','Accessory Card Pet Egg Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 13564,1;',NULL,NULL);
REPLACE INTO `item_db` VALUES (13525,'Zeny_Scroll_Box','Zeny Pet Egg Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 14508,1;',NULL,NULL);
@@ -5952,10 +5952,10 @@ REPLACE INTO `item_db` VALUES (13907,'Soft_Core_Set_Box','XM Softcore Set Box',1
REPLACE INTO `item_db` VALUES (13908,'Deviruchi_Set_Box','XM Deviruchi Set Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 5227,1; getitem 5228,1; getitem 5229,1;',NULL,NULL);
REPLACE INTO `item_db` VALUES (13909,'MVP_Hunt_Box','MVP Hunting Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 7621,1; getitem 12210,1; getitem 12221,1; getitem 12214,3;',NULL,NULL);
REPLACE INTO `item_db` VALUES (13910,'Brewing_Box','XM Brewing Set Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 12204,10; getitem 12205,10; getitem 12206,10;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (13911,'Christmas_Pet_Scroll','Christmas Pet Scroll',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db` VALUES (13912,'Pty_Blessing_Box','Party Blessing 10 Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 14588,10;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (13913,'Pty_Inc_Agi_Box','Party Increase Agi 10 Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 14589,10;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (13914,'Pty_Assumptio_Box','Party Assumptio 5 Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 14590,10;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (13911,'Xmas_Pet_Scroll','Christmas Pet Scroll',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db` VALUES (13912,'Party_Blessing_Box','Party Blessing 10 Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 14588,10;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (13913,'Party_Inc_Agi_Box','Party Increase Agi 10 Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 14589,10;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (13914,'Party_Assumptio_Box','Party Assumptio 5 Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 14590,10;',NULL,NULL);
REPLACE INTO `item_db` VALUES (13915,'Love_Angel_Box','Love Angel Magic Powder Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'rentitem 12287,604800;',NULL,NULL);
REPLACE INTO `item_db` VALUES (13916,'Squirrel_Box','Squirrel Magic Powder Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'rentitem 12288,604800;',NULL,NULL);
REPLACE INTO `item_db` VALUES (13917,'Gogo_Box','Gogo Magic Powder Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'rentitem 12289,604800;',NULL,NULL);
@@ -5977,21 +5977,21 @@ REPLACE INTO `item_db` VALUES (13932,'Sylph_Box','Sylph Box',18,20,NULL,10,NULL,
REPLACE INTO `item_db` VALUES (13933,'Undine_Box','Undine Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 4350,4;',NULL,NULL);
REPLACE INTO `item_db` VALUES (13934,'Salamander_Box','Salamander Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 4380,4;',NULL,NULL);
REPLACE INTO `item_db` VALUES (13935,'Soul_Box','Soul Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 4388,4;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (13936,'Noum_Box','Gnome Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 4335,4;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (13936,'Noum_Bpx','Gnome Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 4335,4;',NULL,NULL);
REPLACE INTO `item_db` VALUES (13937,'Robo_Eye_Box','Robo Eye Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 5325,1;',NULL,NULL);
REPLACE INTO `item_db` VALUES (13938,'Twin_Ribbon_Box','Maiden\'s Twin Ribbon Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 5187,1;',NULL,NULL);
#REPLACE INTO `item_db` VALUES (13939,'Diadem_Box','Diadem Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 5313,1;',NULL,NULL);
REPLACE INTO `item_db` VALUES (13940,'Siege_Tele_Scroll_Box','WoE Teleport Scroll 100 Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 14591,100;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (13941,'TW_Valentine_Scroll','Taiwan Valentine Scroll',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db` VALUES (13941,'Valentine_Scroll_TW','Taiwan Valentine Scroll',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (13942,'Love_Angel_Box_1m','Love Angel Magic Powder Box 30 Days',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 14009,1;',NULL,NULL);
REPLACE INTO `item_db` VALUES (13943,'Squirrel_Box_1m','Squirrel Magic Powder Box 30 Days',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 14010,1;',NULL,NULL);
REPLACE INTO `item_db` VALUES (13944,'Gogo_Box_1m','Gogo Magic Powder Box 30 Days',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 14011,1;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (13945,'BRO_SM_Package','Brazil Swordsman Package',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 2317,1; getitem 2106,1; getitem 2406,1; getitem 2506,1; getitem 4003,1; getitem 4133,1; getitem 2607,2; getitem 2229,1; getitem 2266,1;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (13946,'BRO_MG_Package','Brazil Magician Package',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 2322,1; getitem 2102,1; getitem 2104,1; getitem 2504,1; getitem 4003,1; getitem 4077,1; getitem 2607,2; getitem 5027,1;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (13947,'BRO_AC_Package','Brazil Acolyte Package',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 2326,1; getitem 2104,1; getitem 2404,1; getitem 2504,1; getitem 4003,1; getitem 4100,1; getitem 2607,2; getitem 2217,1;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (13948,'BRO_AR_Package','Brazil Archer package',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 2331,1; getitem 1716,1; getitem 2406,1; getitem 2504,1; getitem 4064,1; getitem 4102,1; getitem 2607,2; getitem 2285,1;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (13949,'BRO_MC_Package','Brazil Merchant Package',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 2315,1; getitem 2104,1; getitem 2406,1; getitem 2506,1; getitem 4003,1; getitem 4133,1; getitem 2607,2; getitem 5021,1;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (13950,'BRO_TF_Package','Brazil Thief Package',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 2336,1; getitem 2104,1; getitem 2406,1; getitem 2506,1; getitem 4097,1; getitem 4102,1; getitem 2607,2; getitem 2274,1;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (13945,'Br_SwordPackage','Brazil Swordsman Package',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 2317,1; getitem 2106,1; getitem 2406,1; getitem 2506,1; getitem 4003,1; getitem 4133,1; getitem 2607,2; getitem 2229,1; getitem 2266,1;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (13946,'Br_MagePackage','Brazil Magician Package',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 2322,1; getitem 2102,1; getitem 2104,1; getitem 2504,1; getitem 4003,1; getitem 4077,1; getitem 2607,2; getitem 5027,1;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (13947,'Br_AcolPackage','Brazil Acolyte Package',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 2326,1; getitem 2104,1; getitem 2404,1; getitem 2504,1; getitem 4003,1; getitem 4100,1; getitem 2607,2; getitem 2217,1;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (13948,'Br_ArcherPackage','Brazil Archer package',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 2331,1; getitem 1716,1; getitem 2406,1; getitem 2504,1; getitem 4064,1; getitem 4102,1; getitem 2607,2; getitem 2285,1;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (13949,'Br_MerPackage','Brazil Merchant Package',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 2315,1; getitem 2104,1; getitem 2406,1; getitem 2506,1; getitem 4003,1; getitem 4133,1; getitem 2607,2; getitem 5021,1;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (13950,'Br_ThiefPackage','Brazil Thief Package',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 2336,1; getitem 2104,1; getitem 2406,1; getitem 2506,1; getitem 4097,1; getitem 4102,1; getitem 2607,2; getitem 2274,1;',NULL,NULL);
REPLACE INTO `item_db` VALUES (13951,'Wasteland_Outlaw_Box','Western Outlaw Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'rentitem 13109,604800;',NULL,NULL);
REPLACE INTO `item_db` VALUES (13952,'Lever_Action_Rifle_Box','Lever Action Rifle Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'rentitem 13170,604800;',NULL,NULL);
REPLACE INTO `item_db` VALUES (13953,'All_In_One_Ring_Box','All In One Ring Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'rentitem 2741,604800;',NULL,NULL);
@@ -6039,9 +6039,9 @@ REPLACE INTO `item_db` VALUES (13994,'Speed_Up_Potion_Box5','Speed Potion 5 Box'
REPLACE INTO `item_db` VALUES (13995,'Speed_Up_Potion_Box10','Speed Potion 10 Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 12016,10;',NULL,NULL);
REPLACE INTO `item_db` VALUES (13996,'Big_Bun_Box100','Big Bun 100 Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 14522,100;',NULL,NULL);
REPLACE INTO `item_db` VALUES (13997,'Big_Bun_Box500','Big Bun 500 Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 14522,500;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (13998,'Giant_Flywing_Box500','Giant Fly Wing 500 Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 12212,500;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (13999,'Pill_Box100','Pill 100 Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 14523,100;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (14000,'Pill_Box500','Pill 500 Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 14523,500;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (13998,'Giant_Fly_Wing_Box500','Giant Fly Wing 500 Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 12212,500;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (13999,'Pill__Box100','Pill 100 Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 14523,100;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (14000,'Pill__Box500','Pill 500 Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 14523,500;',NULL,NULL);
REPLACE INTO `item_db` VALUES (14001,'Basic_Siege_Supply_Box','Recruit Siege Supply Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 11503,25; getitem 11504,10;',NULL,NULL);
REPLACE INTO `item_db` VALUES (14002,'Adv_Siege_Supply_Box','Veteran Siege Supply Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 11503,50; getitem 11504,20;',NULL,NULL);
REPLACE INTO `item_db` VALUES (14003,'Elite_Siege_Supply_Box','Elite Siege Supply Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 11503,100; getitem 11504,50;',NULL,NULL);
@@ -6343,7 +6343,7 @@ REPLACE INTO `item_db` VALUES (14300,'Mask_Of_Ifrit_Box','Mask Of Ifrit Box',18,
REPLACE INTO `item_db` VALUES (14301,'Ifrit\'s_Ear_Box','Ears Of Ifrit Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 5421,1;',NULL,NULL);
REPLACE INTO `item_db` VALUES (14304,'Scuba_Mask_Box','Scuba Mask Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 5397,1;',NULL,NULL);
REPLACE INTO `item_db` VALUES (14314,'Phreeoni_Scroll_Box','Phreeoni Scroll Box',2,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 14597,10;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (14315,'Ghostring_Scroll_Box','Ghostring Scroll Box',2,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 14598,10;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (14315,'GhostringS_Box','Ghostring Scroll Box',2,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 14598,10;',NULL,NULL);
REPLACE INTO `item_db` VALUES (14316,'July7_Scroll','July7 Scroll',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (14317,'Bacsojin_Scroll','Bacsojin Scroll',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (14343,'Spiked_Scarf_Box','Spiked Scarf Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 5462,1;',NULL,NULL);
@@ -6410,7 +6410,7 @@ REPLACE INTO `item_db` VALUES (14544,'B_Mdef_Potion','Big Magic Defense Potion',
REPLACE INTO `item_db` VALUES (14545,'Battle_Manual_X3','Field Manual 300%',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_EXPBOOST,1800000,300;',NULL,NULL);
REPLACE INTO `item_db` VALUES (14546,'Fire_Cracker_Love','I Love You Firecracker',2,2,NULL,20,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (14547,'Fire_Cracker_Wday','Whiteday Firecracker',2,2,NULL,20,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db` VALUES (14548,'Fire_Cracker_Valentine','Valentine\'s Day Firecracker',2,2,NULL,20,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db` VALUES (14548,'Fire_Cracker_Vday','Valentine\'s Day Firecracker',2,2,NULL,20,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (14549,'Fire_Cracker_Bday','Birthday Firecracker',2,2,NULL,20,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (14550,'Fire_Cracker_Xmas','Xmas Firecracker',2,2,NULL,20,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (14551,'Str_Dish01_','Fried Grasshopper Legs',0,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_STRFOOD,1200000,1; percentheal 5,0;',NULL,NULL);
@@ -6495,10 +6495,10 @@ REPLACE INTO `item_db` VALUES (16248,'Tiger_Arhat_Mask_Box','Tiger Arhat Mask Bo
#16251,Gemini_Diadem_Box
#16252,Gemini_Crown_Box
REPLACE INTO `item_db` VALUES (16257,'Buddah_Scroll','Buddah Scroll',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db` VALUES (16258,'HD_Bradium_5_Box','HD Bradium 5 Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 6226,5;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (16259,'HD_Carnium_5_Box','HD Carnium 5 Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 6225,5;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (16260,'HD_Bradium_10_Box','HD Bradium 10 Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 6226,10;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (16261,'HD_Carnium_10_Box','HD Carnium 10 Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 6225,10;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (16258,'HD_Bradium_Box5','HD Bradium 5 Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 6226,5;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (16259,'HD_Carnium_Box5','HD Carnium 5 Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 6225,5;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (16260,'HD_Bradium_Box10','HD Bradium 10 Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 6226,10;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (16261,'HD_Carnium_Box10','HD Carnium 10 Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 6225,10;',NULL,NULL);
#16262,HD_Bradium_5_Box,
#16263,HD_Carnium_5_Box,
#16264,HD_Bradium_10_Box,
@@ -6507,7 +6507,7 @@ REPLACE INTO `item_db` VALUES (16261,'HD_Carnium_10_Box','HD Carnium 10 Box',2,2
#16268,HE_Bubble_Gum_Box
#16269,Cancer_Diadem_Box
#16270,Cancer_Crown_Box,
-REPLACE INTO `item_db` VALUES (16304,'Evil_Incarnation','Evil Incarnation',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db` VALUES (16304,'Evil_Incarnation_Disable','Evil Incarnation',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
#16343,Leo_Crown_Box
#16344,Leo_Diadem_Box
#16345,Leo_Crown_Box
@@ -6577,14 +6577,14 @@ REPLACE INTO `item_db` VALUES (18002,'Dark_Cannon_Ball','Dark Cannon Ball',10,20
REPLACE INTO `item_db` VALUES (18003,'Soul_Cannon_Ball','Soul Cannon Ball',10,200,NULL,10,120,NULL,NULL,NULL,0x00040400,8,2,32768,NULL,99,NULL,8,'bonus bAtkEle,Ele_Ghost;',NULL,NULL);
REPLACE INTO `item_db` VALUES (18004,'Iron_Cannon_Ball','Iron Cannon Ball',10,500,NULL,10,250,NULL,NULL,NULL,0x00040400,8,2,32768,NULL,99,NULL,8,NULL,NULL,NULL);
# More Bows
-REPLACE INTO `item_db` VALUES (18100,'Shooting_Star','Shooting Star',5,20,NULL,0,190,NULL,5,0,0x00080800,7,2,34,4,1,1,11,'bonus bLongAtkRate,20;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (18100,'Shooting_Star_C','Shooting Star',5,20,NULL,0,190,NULL,5,0,0x00080800,7,2,34,4,1,1,11,'bonus bLongAtkRate,20;',NULL,NULL);
REPLACE INTO `item_db` VALUES (18101,'F_Bow_Of_Rudra_C','Rudra Bow',5,2,NULL,0,185,NULL,5,0,0x000A0848,7,2,34,4,0,0,11,'bonus bAtkEle,Ele_Holy; bonus bInt,5; skill "AL_CURE",1; skill "AL_HEAL",1; bonus2 bResEff,Eff_Poison,5000; bonus2 bResEff,Eff_Curse,5000; bonus2 bResEff,Eff_Silence,5000; bonus2 bResEff,Eff_Confusion,5000; bonus2 bResEff,Eff_Blind,5000;',NULL,NULL);
REPLACE INTO `item_db` VALUES (18102,'E_Bow_Of_Rudra_C','Rudra Bow',5,2,NULL,0,185,NULL,5,0,0x000A0848,7,2,34,4,0,0,11,'bonus bAtkEle,Ele_Holy; bonus bInt,5; skill "AL_CURE",1; skill "AL_HEAL",1; bonus2 bResEff,Eff_Poison,5000; bonus2 bResEff,Eff_Curse,5000; bonus2 bResEff,Eff_Silence,5000; bonus2 bResEff,Eff_Confusion,5000; bonus2 bResEff,Eff_Blind,5000;',NULL,NULL);
# More Headgears
REPLACE INTO `item_db` VALUES (18500,'Cheer_Scarf6','Cheer Scarf6',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,7,2,1,NULL,1,0,369,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (18501,'Cheer_Scarf8','Cheer Scarf8',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,7,2,1,NULL,1,0,369,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (18502,'Cheer_Scarf10','Cheer Scarf10',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,7,2,1,NULL,1,0,369,NULL,NULL,NULL);
-REPLACE INTO `item_db` VALUES (18503,'Majestic_Devil','Small Devil Horns',4,20,NULL,100,NULL,2,NULL,0,0xFFFFFFFF,7,2,512,NULL,1,0,562,'bonus bAtkRate,5; bonus bMatkRate,5; bonus bMaxHPRate,10; bonus bMaxSPRate,10;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (18503,'Small_Horn_Of_Devil','Small Devil Horns',4,20,NULL,100,NULL,2,NULL,0,0xFFFFFFFF,7,2,512,NULL,1,0,562,'bonus bAtkRate,5; bonus bMatkRate,5; bonus bMaxHPRate,10; bonus bMaxSPRate,10;',NULL,NULL);
REPLACE INTO `item_db` VALUES (18505,'Umbala_Spirit','Umbala Spirit',4,0,NULL,200,NULL,1,NULL,1,0xFFFFFFFF,7,2,1,NULL,30,0,675,'bonus bVit,1;',NULL,NULL);
REPLACE INTO `item_db` VALUES (18506,'Hattah_Black','Hattah Black',4,12000,NULL,4000,NULL,2,NULL,1,0xFFFFFFFF,7,2,769,NULL,1,1,676,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (18507,'Elven_Ears_','Elven Ears',4,20,NULL,100,NULL,0,NULL,1,0xFFFFFFFE,7,2,512,NULL,70,0,73,NULL,NULL,NULL);
@@ -6593,16 +6593,16 @@ REPLACE INTO `item_db` VALUES (18539,'Skull_Cap','Skull Cap',4,40,NULL,200,NULL,
#
REPLACE INTO `item_db` VALUES (18595,'Horn_Of_Ancient','Horn of Ancient',4,40,NULL,200,NULL,8,NULL,1,0xFFFFFFFF,7,2,256,NULL,50,1,757,'autobonus "{ bonus bBaseAtk,100; }",5,10000,0,"{ specialeffect2 EF_POTION_BERSERK; }";',NULL,NULL);
REPLACE INTO `item_db` VALUES (18596,'Sprout_Hat','Sprout Hat',4,20,NULL,200,NULL,4,NULL,0,0xFFFFFFFF,7,2,256,NULL,70,1,758,'skill "WZ_HEAVENDRIVE",3;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (18597,'Mercury_Riser','Mercury Riser',4,40,NULL,200,NULL,10,NULL,1,0xFFFFFFFF,7,2,256,NULL,0,1,759,'bonus bAspdRate,3; bonus bCritical,3; if(getrefine() >= 7) { bonus bAspdRate,2; bonus bCritical,2; } if(getrefine() >= 9) { bonus bAspdRate,2; bonus bCritical,2; }',NULL,NULL);
+REPLACE INTO `item_db` VALUES (18597,'Mercury_Helm','Mercury Riser',4,40,NULL,200,NULL,10,NULL,1,0xFFFFFFFF,7,2,256,NULL,0,1,759,'bonus bAspdRate,3; bonus bCritical,3; if(getrefine() >= 7) { bonus bAspdRate,2; bonus bCritical,2; } if(getrefine() >= 9) { bonus bAspdRate,2; bonus bCritical,2; }',NULL,NULL);
#
-REPLACE INTO `item_db` VALUES (18600,'Cat_Ear_Beret','Cat Ear Beret',4,20,NULL,100,NULL,5,NULL,0,0xFFFFFFFF,7,2,256,NULL,0,1,761,'bonus bAtkRate,5; if(getrefine() > 5 && getrefine() <= 12) { bonus2 bAddRace,RC_DemiHuman,(getrefine() - 5); bonus2 bSubRace,RC_DemiHuman,(getrefine() - 5); bonus2 bAddRace,RC_Player,(getrefine() - 5); bonus2 bSubRace,RC_Player,(getrefine() - 5); } if(getrefine() > 12) { bonus2 bAddRace,RC_DemiHuman,7; bonus2 bAddRace,RC_Player,7; bonus2 bSubRace,RC_DemiHuman,7; bonus2 bSubRace,RC_Player,7; }',NULL,NULL);
+REPLACE INTO `item_db` VALUES (18600,'Cat_Ears_Beret','Cat Ear Beret',4,20,NULL,100,NULL,5,NULL,0,0xFFFFFFFF,7,2,256,NULL,0,1,761,'bonus bAtkRate,5; if(getrefine() > 5 && getrefine() <= 12) { bonus2 bAddRace,RC_DemiHuman,(getrefine() - 5); bonus2 bSubRace,RC_DemiHuman,(getrefine() - 5); bonus2 bAddRace,RC_Player,(getrefine() - 5); bonus2 bSubRace,RC_Player,(getrefine() - 5); } if(getrefine() > 12) { bonus2 bAddRace,RC_DemiHuman,7; bonus2 bAddRace,RC_Player,7; bonus2 bSubRace,RC_DemiHuman,7; bonus2 bSubRace,RC_Player,7; }',NULL,NULL);
#
REPLACE INTO `item_db` VALUES (18612,'White_Musang_Hat','White Musang Hat',4,40,NULL,200,NULL,3,NULL,1,0xFFFFFFFF,7,2,256,NULL,0,1,770,'bonus bStr,2; bonus bVit,2; bonus bLuk,1; bonus bUnbreakableHelm,0;',NULL,NULL);
REPLACE INTO `item_db` VALUES (18613,'Black_Musang_Hat','Black Musang Hat',4,40,NULL,200,NULL,3,NULL,1,0xFFFFFFFF,7,2,256,NULL,0,1,771,'bonus bInt,2; bonus bDex,2; bonus bAgi,1; bonus bUnbreakableHelm,0;',NULL,NULL);
#
-REPLACE INTO `item_db` VALUES (18620,'Heart_Eye_Patch','Heart Eyepatch',4,5,NULL,200,NULL,2,NULL,0,0xFFFFFFFF,7,2,512,NULL,20,1,779,NULL,NULL,NULL);
+REPLACE INTO `item_db` VALUES (18620,'Heart_Eyepatch','Heart Eyepatch',4,5,NULL,200,NULL,2,NULL,0,0xFFFFFFFF,7,2,512,NULL,20,1,779,NULL,NULL,NULL);
#
-REPLACE INTO `item_db` VALUES (18656,'Witch\'s_Pumpkin_Hat','Witch\'s Pumpkin Hat',4,20,NULL,300,NULL,10,NULL,0,0xFFFFFFFF,7,2,256,NULL,20,1,717,'bonus bMdef,10; bonus bStr,2; bonus bInt,2; bonus2 bMagicAddRace,RC_Undead,15; bonus2 bMagicAddRace,RC_Demon,15;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (18656,'Wit_Pumpkin_Hat','Witch\'s Pumpkin Hat',4,20,NULL,300,NULL,10,NULL,0,0xFFFFFFFF,7,2,256,NULL,20,1,717,'bonus bMdef,10; bonus bStr,2; bonus bInt,2; bonus2 bMagicAddRace,RC_Undead,15; bonus2 bMagicAddRace,RC_Demon,15;',NULL,NULL);
# Costume System
REPLACE INTO `item_db` VALUES (19500,'T_Mr_Smile','T Mr Smile',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,7,2,6144,NULL,0,0,65,'bonus bStr,2;',NULL,NULL);
@@ -6610,5 +6610,5 @@ REPLACE INTO `item_db` VALUES (19501,'T_Spinx_Helm','T Spinx Helm',4,0,NULL,0,NU
REPLACE INTO `item_db` VALUES (19504,'T_Sunglasses','T Sunglasses',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,7,2,2048,NULL,0,0,12,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (19505,'T_Cigarette','T Cigarette',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,7,2,4096,NULL,0,0,54,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (19506,'T_Valkyrie_Feather_Band','T Valkyrie Feather Band',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,7,2,1024,NULL,0,1,300,NULL,NULL,NULL);
-REPLACE INTO `item_db` VALUES (19507,'Clear_Sun','Clear Sun',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,7,2,1024,NULL,1,0,654,NULL,NULL,NULL);
+REPLACE INTO `item_db` VALUES (19507,'Fine_Sun','Clear Sun',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,7,2,1024,NULL,1,0,654,NULL,NULL,NULL);
diff --git a/sql-files/item_db_re.sql b/sql-files/item_db_re.sql
index ce5c46284e8..161cd80df0d 100644
--- a/sql-files/item_db_re.sql
+++ b/sql-files/item_db_re.sql
@@ -94,7 +94,7 @@ REPLACE INTO `item_db_re` VALUES (556,'Long_Rice_Cake','Rice Cake Stick',0,10,NU
REPLACE INTO `item_db_re` VALUES (557,'Hash_Rice_Cake','Neatly Sliced Rice Cake',0,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(25,30),0;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (558,'Chocolate','Chocolate',0,1,NULL,20,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 1,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (559,'HandMade_Chocolate','Hand-made Chocolate',0,1,NULL,80,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 50,50;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (560,'HandMade_White_Chocolate','Handmade White Chocolate',0,5000,NULL,80,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 50,50;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (560,'HandMade_Chocolate_','Handmade White Chocolate',0,5000,NULL,80,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 50,50;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (561,'White_Chocolate','White Chocolate',0,5000,NULL,80,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 50,50;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (562,'Pizza','Doublecrust Swiss Fondue',0,100,NULL,150,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(70,100),0;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (563,'Pizza_01','Doublecrust Swiss Fondue',0,1200,NULL,150,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(375,445),0;',NULL,NULL);
@@ -711,11 +711,11 @@ REPLACE INTO `item_db_re` VALUES (1313,'Tourist_Axe','Tourist Axe',5,0,NULL,500,
REPLACE INTO `item_db_re` VALUES (1314,'F_Tomahawk_C','Tomahawk',5,2,NULL,0,'200',NULL,1,0,0x000444A2,63,2,34,4,'0',0,7,'bonus bAtkEle,Ele_Wind;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1315,'F_Right_Epsilon_C','Light Epsilon',5,1,NULL,0,'229',NULL,1,0,0x000444A2,63,2,34,4,'1',0,7,'bonus bAtkEle,Ele_Holy; bonus bStr,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1316,'Adventure_Axe','Adventure Axe',5,0,NULL,0,'100',NULL,1,0,0x00040420,63,2,2,1,'1',0,6,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (1317,'Academy_Axe','Academy Axe',5,0,NULL,1600,'130',NULL,1,1,0x00040420,63,2,2,1,'1',1,6,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (1317,'Academy_Axe','Academy Axe',5,0,NULL,1600,'130',NULL,1,1,0x00040420,63,2,2,1,'30',1,6,'bonus bUnbreakableWeapon,1; bonus bAspdRate,5-(BaseLevel/10); bonus bMaxHP,200-(40*(BaseLevel/10));',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1318,'Dofle_Axe','Deflation Axe',5,50000,NULL,1800,'180',NULL,1,2,0x000654E2,63,2,2,4,'105',1,6,'bonus bUnbreakableWeapon,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1319,'TE_Woe_Axe','TE Woe Axe',5,0,NULL,0,'100',NULL,1,0,0x000654E3,63,2,2,3,'40',1,6,'bonus bUnbreakableWeapon,1; bonus2 bAddRace,RC_Player,40; bonus2 bAddEff,Eff_Freeze,3000;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1321,'Dofle_Axe_','Deflation Axe',5,50000,NULL,1800,'180',NULL,1,3,0x000654E2,63,2,2,4,'105',1,6,'bonus bUnbreakableWeapon,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (1322,'Blue_Axe','Blue Axe',5,10,NULL,1800,'180',NULL,1,1,0xFFFFFFFF,63,2,2,1,'1',1,6,'bonus bStr,5; bonus bVit,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (1322,'Ru_Blue_Axe','Blue Axe',5,10,NULL,1800,'180',NULL,1,1,0xFFFFFFFF,63,2,2,1,'1',1,6,'bonus bStr,5; bonus bVit,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1323,'Ru_Gold_Axe','Ru Gold Axe',5,0,NULL,1800,'180',NULL,1,2,0x00040000,56,2,2,3,'120',1,6,'bonus bStr,8; bonus bInt,8;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1324,'War_Axe_','War Axe',5,20,NULL,4200,'140',NULL,1,3,0x00040400,63,2,2,3,'76',1,6,'bonus bDex,2; bonus bLuk,2;',NULL,NULL);
#===================================================================
@@ -807,16 +807,16 @@ REPLACE INTO `item_db_re` VALUES (1430,'Pike_C','Pike',5,0,NULL,0,'74',NULL,3,0,
REPLACE INTO `item_db_re` VALUES (1431,'F_Pole_Axe_C','Pole Axe',5,1,NULL,4800,'195',NULL,3,0,0x00004082,63,2,2,3,'1',0,4,'bonus bStr,1; bonus bInt,2; bonus bDex,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1432,'E_Pole_Axe_C','Pole Axe',5,1,NULL,4800,'195',NULL,3,0,0x00004082,63,2,2,3,'1',0,4,'bonus bStr,1; bonus bInt,2; bonus bDex,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1433,'Imperial_Spear','Imperial Spear',5,20,NULL,1800,'180:40',NULL,3,1,0x00004082,63,2,2,3,'102',1,4,'.@r = getrefine(); bonus2 bSkillAtk,"LG_CANNONSPEAR",20+(.@r/2); bonus2 bSkillAtk,"LG_BANISHINGPOINT",20+(.@r/2);',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (1434,'P_Spear1','Eden Spear I',5,0,NULL,0,'165',NULL,3,0,0x00004082,63,2,2,3,'60',0,4,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (1434,'P_Sphere1','Eden Spear I',5,0,NULL,0,'165',NULL,3,0,0x00004082,63,2,2,3,'60',0,4,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1435,'Cannon_Spear','Cannon Spear',5,56000,NULL,1600,'180',NULL,3,1,0x00004000,63,2,2,4,'100',1,4,'bonus bMaxSP,-100; bonus2 bSkillAtk,"LG_CANNONSPEAR",10; bonus bBaseAtk,(getrefine()/3);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1436,'Velum_Spear','Vellum Spear',5,20,NULL,850,'150',NULL,3,0,0x00004082,63,2,2,4,'95',1,4,'bonus2 bAddRace,RC_Player,60; .@r = getrefine(); if(.@r>=6) { bonus2 bSkillAtk,"RK_HUNDREDSPEAR",80; bonus2 bSkillAtk,"LG_PINPOINTATTACK",80; } if(.@r>=9) { bonus2 bAddRace,RC_Player,30; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1437,'TE_Woe_Pike','TE Woe Pike',5,0,NULL,0,'100',NULL,3,0,0x00004082,63,2,2,3,'40',1,4,'bonus2 bAddRace,RC_Player,40; bonus2 bAddEff,Eff_Curse,3000;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (1438,'Thanos_Spear','Thanatos Spear',5,10,NULL,3000,'150:100',NULL,3,1,0x00004082,63,2,2,4,'120',1,4,'bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000;',NULL,'heal -1000,0;');
+REPLACE INTO `item_db_re` VALUES (1438,'Thanos_Spear','Thanatos Spear',5,10,NULL,3000,'150:100',NULL,3,1,0x00004082,56,2,2,4,'120',1,4,'bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000;',NULL,'heal -1000,0;');
REPLACE INTO `item_db_re` VALUES (1439,'Half_BF_Spear1','Half BF Spear1',5,20,NULL,0,'60',NULL,3,0,0x00004082,63,2,2,3,'80',1,4,'bonus bStr,2; bonus2 bAddRace,RC_DemiHuman,45; bonus2 bAddRace,RC_Player,45; bonus2 bIgnoreDefRaceRate,RC_DemiHuman,10; bonus2 bIgnoreDefRaceRate,RC_Player,10; bonus bUnbreakableWeapon,1; if(BaseJob==Job_Crusader) bonus bAspdRate,20;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1440,'Battle_Hook_','Battle Hook',5,20,NULL,900,'140',NULL,3,3,0x00004082,18,2,2,4,'65',1,4,'bonus2 bAddEff,Eff_Stun,500; bonus2 bAddRace,RC_DemiHuman,20; bonus2 bAddRace,RC_Player,20; skill "KN_PIERCE",3;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (1441,'Blue_Spear','Blue Spear',5,10,NULL,1200,'180:170',NULL,3,1,0x00004000,56,2,2,3,'100',1,4,'bonus bDex,5; bonus bInt,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (1441,'Ru_Blue_Spear','Blue Spear',5,10,NULL,1200,'180:170',NULL,3,1,0x00004000,56,2,2,3,'100',1,4,'bonus bDex,5; bonus bInt,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1442,'Ru_Gold_Spear','Ru Gold Spear',5,0,NULL,1200,'180',NULL,3,2,0x00004000,56,2,2,3,'120',1,4,'bonus bStr,8; bonus bAgi,8;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (1443,'Crimson_Spear','Crimson Spear',5,20,NULL,900,'90',NULL,3,2,0x00004082,56,2,2,3,'70',1,4,'.@r = getrefine(); bonus bBaseAtk,((BaseLevel/10)*5)+(.@r<=15?pow(.@r,2):225);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (1443,'Crimson_Spear','Crimson Spear',5,20,NULL,900,'90',NULL,3,2,0x00004082,63,2,2,3,'70',1,4,'.@r = getrefine(); bonus bBaseAtk,((BaseLevel/10)*5)+(.@r<=15?pow(.@r,2):225);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1446,'Requiem_Spear','Requiem Spear',5,20,NULL,1000,'130',NULL,3,NULL,0x00004080,63,2,2,4,'100',1,4,'.@r = getrefine(); .@b = 40; bonus bUnbreakableWeapon,1; if(.@r>=5){ .@b += (.@r-5)*15+20; } bonus2 bAddRace2,RC2_BioLab,.@b;',NULL,NULL);
#===================================================================
# 2-Handed Spears
@@ -873,7 +873,7 @@ REPLACE INTO `item_db_re` VALUES (1492,'Velum_Glaive','Vellum Glaive',5,20,NULL,
REPLACE INTO `item_db_re` VALUES (1493,'Metal_Lance','Metal Lance',5,20,NULL,0,'100',NULL,3,1,0x00004082,63,2,34,3,'1',1,5,'bonus bBaseAtk,(getrefine()*6); .@i = min(BaseLevel/10,12); if(.@i>2) bonus bBaseAtk,((.@i-2)*5);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1494,'Undine_Spear','Spear Of Odin',5,50000,NULL,3800,'190',NULL,3,3,0x00004082,63,2,34,4,'105',1,5,'bonus bAtkEle,Ele_Water;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1495,'TE_Woe_Lance','TE Woe Lance',5,0,NULL,0,'150',NULL,3,0,0x00004082,63,2,34,3,'40',1,5,'bonus2 bAddRace,RC_Player,40; bonus2 bAddEff,Eff_Blind,3000;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (1496,'Thanos_Long_Spear','Thanatos Long Spear',5,10,NULL,3750,'250:50',NULL,3,1,0x00004082,63,2,34,4,'120',1,5,'bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000;',NULL,'heal -1000,0;');
+REPLACE INTO `item_db_re` VALUES (1496,'Thanos_Long_Spear','Thanatos Long Spear',5,10,NULL,3750,'250:50',NULL,3,1,0x00004082,56,2,34,4,'120',1,5,'bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000;',NULL,'heal -1000,0;');
REPLACE INTO `item_db_re` VALUES (1497,'Hell_Fire_','Hellfire',5,20,NULL,3500,'200',NULL,3,3,0x00004082,63,2,34,4,'48',1,5,'bonus bAtkEle,Ele_Fire; bonus3 bAutoSpell,"MG_FIREBALL",5,100; bonus bStr,3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1498,'Crimson_Lance','Crimson Lance',5,20,NULL,1750,'175',NULL,1,2,0x00004082,63,2,34,3,'70',1,5,'.@r = getrefine(); bonus bBaseAtk,((BaseLevel/10)*5)+(.@r<=15?pow(.@r,2):225);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1499,'Requiem_Lance','Requiem Lance',5,20,NULL,1500,'220',NULL,3,NULL,0x00004080,63,2,34,4,'100',1,5,'.@r = getrefine(); .@b = 40; .@c = 5; bonus bUnbreakableWeapon,1; if(.@r>=5){ .@b += (.@r-5)*15+30; .@c += (.@r-5); } bonus2 bAddRace2,RC2_BioLab,.@b; bonus2 bSubRace2,RC2_BioLab,.@c;',NULL,NULL);
@@ -963,9 +963,9 @@ REPLACE INTO `item_db_re` VALUES (1577,'Krieger_Book2','Glorious Apocalypse',5,2
REPLACE INTO `item_db_re` VALUES (1578,'Book_Of_Prayer','Book Of Prayer',5,20,NULL,0,'140',NULL,1,0,0x00410100,63,2,2,3,'0',0,15,'bonus bVit,2; bonus bMdef,2; bonus bMaxSPrate,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1579,'Death_Note_M','Book of the Dead',5,20,NULL,1000,'137',NULL,1,2,0x00410100,63,2,2,4,'85',1,15,'bonus bMatkRate,15; bonus bStr,3; bonus bInt,3; bonus bLuk,-20; bonus2 bComaRace,RC_DemiHuman,10; bonus2 bComaRace,RC_Player,10; bonus bAspdRate,getrefine(); if(BaseJob==Job_Sage) bonus3 bAutoSpell,"NPC_HELLJUDGEMENT",5,20;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1580,'Encyclopedia_C','Giant Encyclopedia',5,0,NULL,0,'145:100',NULL,1,0,0x00410100,63,2,2,3,'0',0,15,'bonus bMatkRate,15; bonus bInt,3; bonus bDex,2; bonus bCritical,20+((readparam(bLuk)*2)/10); bonus2 bAddSize,Size_All,40;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (1581,'F_Diary_Of_Great_Sage_C','Diary Of Great Sage',5,1,NULL,0,'135',NULL,1,2,0x00410100,63,2,2,3,'1',0,15,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (1581,'F_Diary_Of_Great_Sage_C','Diary Of Great Sage',5,1,NULL,0,'135',NULL,1,2,0x00410100,63,2,2,3,'1',0,15,'bonus bMatkRate,20; bonus bAspdRate,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1582,'E_Diary_Of_Great_Sage_C','Diary Of Great Sage',5,1,NULL,0,'135',NULL,1,2,0x00410100,63,2,2,3,'1',0,15,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (1583,'P_Book1','Eden Book I',5,0,NULL,0,'135:110',NULL,1,0,0x00410100,63,2,2,3,'60',0,15,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (1583,'P_Dic1','Eden Book I',5,0,NULL,0,'135:110',NULL,1,0,0x00410100,63,2,2,3,'60',0,15,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1584,'Chilly_Spell_Book','Cold Magic Book',5,56000,NULL,1000,'100:160',NULL,1,2,0x00010000,63,2,2,4,'100',1,15,'bonus bAtkEle,Ele_Water; bonus bUnbreakableWeapon,1; bonus bDex,1; .@r = getrefine(); bonus2 bSkillAtk,"MG_COLDBOLT",(.@r*3); bonus2 bSkillAtk,"SO_DIAMONDDUST",(.@r*3); bonus2 bSkillUseSP,"MG_COLDBOLT",-(.@r*5); bonus2 bSkillUseSP,"SO_DIAMONDDUST",-(.@r*5);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1585,'Upg_Book','Upg Book',5,20,NULL,600,'45:20',NULL,1,1,0x00410100,63,2,2,3,'1',1,15,'.@r = getrefine(); bonus bBaseAtk,(.@r*10); bonus bMatk,(.@r*5); if(BaseLevel>70) bonus bMatk,(((BaseLevel-70)/10)*5);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1586,'Velum_Bible','Vellum Bible',5,20,NULL,600,'110:125',NULL,1,0,0x00410100,63,2,2,4,'95',1,15,'if(BaseLevel>104) { bonus bHealPower,(BaseLevel/5)-20; if(getrefine()>=6) { bonus2 bSkillCooldown,"AB_LAUDAAGNUS",-3000; bonus2 bSkillCooldown,"AB_LAUDARAMUS",-3000; bonus2 bSkillCooldown,"AB_CLEARANCE",-10000; bonus2 bSkillUseSP,"AB_LAUDAAGNUS",-60; bonus2 bSkillUseSP,"AB_LAUDARAMUS",-60; bonus2 bSkillUseSP,"AB_CLEARANCE",-60; } }',NULL,NULL);
@@ -1034,7 +1034,7 @@ REPLACE INTO `item_db_re` VALUES (1649,'Rafini_Staff','Laphine Staff',5,20,NULL,
REPLACE INTO `item_db_re` VALUES (1650,'P_Staff1','Eden Staff I',5,0,NULL,0,'60:125',NULL,1,0,0x00818314,63,2,2,2,'26',0,10,'bonus bInt,2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1651,'P_Staff2','Eden Staff II',5,0,NULL,0,'60:150',NULL,1,0,0x00818314,63,2,2,2,'40',0,10,'bonus bInt,3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1652,'Tourist_Staff','Tourist Staff',5,0,NULL,500,'35:0',NULL,1,0,0x00818315,63,2,2,1,'1',0,10,'bonus bMatkRate,15; bonus bInt,2; bonus bAgi,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (1653,'Staff_Of_Healing_C','Staff of Healing',5,20,NULL,0,'10:100',NULL,1,0,0x00008110,63,2,2,3,'1',0,10,'bonus bAtkEle,Ele_Holy;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (1653,'Staff_Of_Healing_C','Staff of Healing',5,20,NULL,0,'10:100',NULL,1,0,0x00008110,63,2,2,3,'1',0,10,'bonus bAtkEle,Ele_Holy; bonus bHealPower,18;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1654,'Mental_Stick','Mental Stick',5,20,NULL,500,'40:170',NULL,1,1,0x00818315,63,2,2,3,'102',1,10,'.@r = getrefine(); if(.@r>5) { bonus2 bSkillAtk,"SO_PSYCHIC_WAVE",(.@r-5)*2; bonus bMaxHPrate,-(.@r-5)*2; } bonus2 bSkillVariableCast,"SO_PSYCHIC_WAVE",-3000; bonus2 bSkillUseSP,"SO_PSYCHIC_WAVE",-60;',NULL,'itemheal 0,-100;');
REPLACE INTO `item_db_re` VALUES (1655,'Adventure_Staff','Adventure Staff',5,0,NULL,0,'60',NULL,1,0,0x00810204,63,2,2,1,'1',0,10,'bonus bUnbreakableWeapon,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1656,'Academy_Wand','Academy Wand',5,0,NULL,600,'60',NULL,1,1,0x00810204,63,2,2,1,'1',1,10,'bonus bUnbreakableWeapon,1;',NULL,NULL);
@@ -1045,21 +1045,21 @@ REPLACE INTO `item_db_re` VALUES (1660,'Wand_Of_Affection2','Empowered Wand Of A
REPLACE INTO `item_db_re` VALUES (1661,'Mental_Destroyer','Mental Destroyer',5,20,NULL,1400,'100:50',NULL,1,0,0x00000200,63,2,2,4,'95',1,10,'bonus bInt,10; bonus bUnbreakableWeapon,1; bonus bUseSPrate,100; bonus bMdef,20; bonus2 bSPVanishRate,10000,5; if(getrefine()>5) { bonus2 bSPVanishRate,10000,5; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1662,'Bone_Wand_','Evil Bone Wand',5,20,NULL,700,'40:110',NULL,1,2,0x00818314,63,2,2,3,'24',1,10,'bonus bInt,4; bonus bAtkEle,Ele_Undead;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1663,'Staff_Of_Bordeaux_','Staff Of Bordeaux',5,20,NULL,500,'30:180',NULL,1,2,0x00010200,18,2,2,4,'50',1,10,'bonus bInt,2; bonus bDex,1; if(getskilllv("SA_DRAGONOLOGY") == 5) { bonus bUseSPrate,-15; bonus bInt,3; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (1664,'Thorn_Staff_of_Darkness','Thorn Staff of Darkness',5,10,NULL,700,'60:160',NULL,NULL,1,0x14,50,2,2,4,'75',1,8,'bonus bInt,3; bonus bDex,3; bonus bVariableCastrate,-getrefine(); bonus bAtkEle,Ele_Dark;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (1664,'Thorn_Staff_','Thorn Staff of Darkness',5,10,NULL,700,'60:160',NULL,NULL,1,0x14,50,2,2,4,'75',1,8,'bonus bInt,3; bonus bDex,3; bonus bVariableCastrate,-getrefine(); bonus bAtkEle,Ele_Dark;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1665,'Piercing_Staff_','Piercing Staff',5,20,NULL,500,'80:145',NULL,1,2,0x00018314,18,2,2,3,'70',1,10,'.@r = getrefine(); bonus bInt,4; bonus2 bIgnoreMdefClassRate,Class_Normal,10+.@r; bonus2 bIgnoreMdefClassRate,Class_Boss,10+.@r;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1666,'Healing_Staff_','Healing Staff',5,20,NULL,400,'10:105',NULL,1,2,0x00008110,63,2,2,3,'55',1,10,'bonus bAtkEle,Ele_Holy; bonus bHealPower,(getrefine()*3/2);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1667,'TE_Woe_Staff','TE Woe Staff',5,0,NULL,0,'50:100',NULL,1,0,0x00818315,63,2,2,3,'40',1,10,'bonus2 bMagicAddRace,RC_Player,10; bonus3 bAddEff,Eff_Blind,1000,ATF_MAGIC; bonus bHPRecovRate,5; bonus bSPRecovRate,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1668,'Sword_Stick','Sword Stick',5,10,NULL,500,'120:150',NULL,NULL,2,0x800200,63,2,2,4,'80',1,10,'bonus bAspdRate,10;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (1669,'Thanos_Staff','Thanatos Staff',5,10,NULL,1000,'100:200',NULL,1,1,0x00018314,63,2,2,4,'120',1,10,'bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus bHealPower,15; bonus bMagicHPGainValue,500; bonus bMagicSPGainValue,50; bonus2 bHPLossRate,100,10000;',NULL,'heal -1000,0;');
+REPLACE INTO `item_db_re` VALUES (1669,'Thanos_Staff','Thanatos Staff',5,10,NULL,1000,'100:200',NULL,1,1,0x00018314,56,2,2,4,'120',1,10,'bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus bHealPower,15; bonus bMagicHPGainValue,500; bonus bMagicSPGainValue,50; bonus2 bHPLossRate,100,10000;',NULL,'heal -1000,0;');
REPLACE INTO `item_db_re` VALUES (1670,'RWC_Memory_Staff','RWC Memory Staff',5,20,NULL,500,'25:30',NULL,1,1,0x00818315,63,2,2,3,'1',1,10,'.@r = getrefine(); bonus bMatk,30*(.@r/3); if(.@r>=6) bonus2 bMagicAddClass,Class_All,(.@r>=9?10:5); if(.@r>=9) bonus4 bAutoSpell,"HW_MAGICPOWER",1,10,0;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (1671,'Devil_Won_Staff','Devil Won Staff',5,10,NULL,800,'30:155',NULL,NULL,1,0x00818315,63,2,2,3,'100',1,10,'bonus2 bAddRace,RC_Undead,10; bonus2 bAddRace,RC_Demon,10; bonus bMatkRate,10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (1671,'Staff_Of_Evil_Slayer','Devil Won Staff',5,10,NULL,800,'30:155',NULL,NULL,1,0x00818315,63,2,2,3,'100',1,10,'bonus2 bAddRace,RC_Undead,10; bonus2 bAddRace,RC_Demon,10; bonus2 bMagicAddRace,RC_Undead,10; bonus2 bMagicAddRace,RC_Demon,10; .@r = getrefine(); if(.@r>=12) bonus bMatkRate,7; else if(.@r>=9) bonus bMatkRate,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1673,'Half_BF_Staff4','Half BF Staff4',5,20,NULL,0,'70:125',NULL,1,0,0x00818314,63,2,2,3,'80',1,10,'bonus bInt,3; bonus bDex,2; bonus bDelayRate,-10; bonus2 bSPLossRate,5,12000; bonus bUnbreakableWeapon,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1674,'Half_BF_Staff2','Half BF Staff2',5,20,NULL,0,'70:125',NULL,1,0,0x00818314,63,2,2,3,'80',1,10,'bonus bInt,3; bonus bDex,3; bonus2 bMagicAddRace,RC_DemiHuman,10; bonus2 bMagicAddRace,RC_Player,10; bonus3 bAddEff,Eff_Stun,200,ATF_SKILL; bonus bUnbreakableWeapon,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1675,'Walking_Stick_','Gentleman\'s Staff',5,20,NULL,500,'40:125',NULL,1,3,0x00818314,63,2,2,4,'50',1,10,'bonus bDex,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1676,'Baculum_Daemonicum','Baculum Daemonicum',5,20,NULL,1200,'60:150',NULL,1,2,0x00818315,63,2,2,4,'80',1,10,'bonus bAtkEle,Ele_Dark; bonus bUnbreakableWeapon,1; bonus bVariableCastrate,-10; if (BaseLevel > 99){ bonus bMatk,30; } if(getrefine() > 8){ bonus2 bResEff,Eff_Blind,3000; bonus bUseSPrate,-10; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (1677,'Blue_Wand','Blue Wand',5,10,NULL,0,'50',NULL,1,1,0x00000200,56,2,2,3,'100',1,10,'bonus bStr,5; bonus bInt,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (1677,'Ru_Blue_Wand','Blue Wand',5,10,NULL,0,'50:200',NULL,1,1,0x00000200,56,2,2,3,'100',1,10,'bonus bDex,5; bonus bInt,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1678,'Ru_Gold_Wand','Ru Gold Wand',5,0,NULL,0,'50',NULL,1,2,0x00000200,56,2,2,3,'120',1,10,'bonus bDex,8; bonus bInt,8;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (1679,'Rafini_Staff_','Laphine Staff',5,20,NULL,500,'30:180',NULL,1,2,0x00818315,63,2,2,3,'100',1,10,'bonus bFixedCastRate,-getrefine();',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (1679,'Rafini_Staff_S','Laphine Staff',5,20,NULL,500,'30:180',NULL,1,2,0x00818315,63,2,2,3,'100',1,10,'bonus bFixedCastRate,-getrefine();',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1680,'Crimson_One-Handed_Staff','Crimson One-Handed Staff',5,10,NULL,600,'60:70',NULL,1,2,0x00818315,63,2,2,3,'70',1,10,'.@r = getrefine(); bonus bInt,4; bonus bMatk,((BaseLevel/10)*5)+(.@r<=15?pow(.@r,2):225); bonus bUnbreakableWeapon,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1681,'Short_Foxtail_Staff','Short Foxtail Staff',5,20,NULL,0,'30',NULL,1,0,0x80000000,7,2,2,1,'1',1,10,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1682,'Shadow_Staff','Shadow Staff',5,0,NULL,600,'70:130',NULL,1,2,0x00000200,56,2,2,4,'90',1,10,'.@r = getrefine(); bonus2 bSkillAtk,"WL_HELLINFERNO",(getskilllv("WL_HELLINFERNO") >= 5 ? 100 : 0) + (.@r*10); bonus2 bIgnoreMdefRaceRate,RC_All,5; autobonus "{ bonus2 bVariableCastrate,\\\"WL_HELLINFERNO\\\",-30; }",.@r*20,5000,BF_MAGIC,"{ specialeffect2 EF_SPELLBREAKER }";',NULL,NULL);
@@ -1197,7 +1197,8 @@ REPLACE INTO `item_db_re` VALUES (1831,'P_Knuckle1','Eden Knuckle I',5,0,NULL,0,
REPLACE INTO `item_db_re` VALUES (1832,'Velum_Claw','Vellum Claw',5,20,NULL,650,'160',NULL,1,0,0x00008100,63,2,2,4,'95',1,12,'bonus2 bAddRace,RC_Player,100; .@r = getrefine(); if(.@r>7) { bonus2 bAddRace,RC_Player,20; } if(.@r>9) { bonus2 bVariableCastrate,"MO_EXTREMITYFIST",-100; bonus2 bFixedCastrate,"MO_EXTREMITYFIST",-100; bonus4 bAutoSpellOnSkill,"MO_EXPLOSIONSPIRITS","CH_SOULCOLLECT",1,10000; bonus2 bHPLossRate,500,3000; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1833,'Claw_Of_Flash','Claw of Flash',5,60000,NULL,400,'140',NULL,1,2,0x00008100,63,2,2,4,'105',1,12,'bonus bAspd,1; bonus bAspdRate,getrefine(); bonus2 bAddSize,Size_Medium,getrefine();',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1834,'TE_Woe_Fist','TE Woe Fist',5,0,NULL,0,'150',NULL,1,0,0x00008100,63,2,2,3,'40',1,12,'bonus2 bAddRace,RC_Player,40; bonus2 bAddEff,Eff_Freeze,3000;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (1836,'Thanos_Knuckle','Thanatos Knuckle',5,10,NULL,600,'160:100',NULL,1,1,0x00008000,63,2,2,4,'120',1,12,'bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000;',NULL,'heal -1000,0;');
+REPLACE INTO `item_db_re` VALUES (1835,'Spartacus','Spartacus',5,0,NULL,600,'100',NULL,1,2,0x00008100,63,2,2,4,'50',1,12,'bonus bUnbreakableWeapon,1; .@r = getrefine(); bonus2 bAddClass,Class_All,.@r; if(.@r>9) { bonus bNoSizeFix,0; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (1836,'Thanos_Knuckle','Thanatos Knuckle',5,10,NULL,600,'160:100',NULL,1,1,0x00008000,56,2,2,4,'120',1,12,'bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000;',NULL,'heal -1000,0;');
REPLACE INTO `item_db_re` VALUES (1837,'Iron_nail','Iron Nail',5,10,NULL,1500,'100',NULL,NULL,1,0x00008100,63,2,2,3,'50',1,12,'bonus bAspdRate,-5; bonus bAspdRate,((getrefine()+1)/2);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1838,'Half_BF_Knuckle1','Half BF Knuckle1',5,20,NULL,0,'30',NULL,1,0,0x00008100,63,2,2,3,'80',1,12,'bonus bStr,2; bonus bAgi,1; bonus2 bAddRace,RC_DemiHuman,30; bonus2 bAddRace,RC_Player,30; bonus2 bIgnoreDefRaceRate,RC_DemiHuman,10; bonus2 bIgnoreDefRaceRate,RC_Player,10; bonus4 bAutoSpell,"CH_SOULCOLLECT",1,5,0; bonus bUnbreakableWeapon,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1839,'Crimson_Knuckles','Crimson Knuckles',5,20,NULL,1000,'100',NULL,1,2,0x00008100,63,2,2,3,'70',1,12,'.@r = getrefine(); bonus bBaseAtk,((BaseLevel/10)*5)+(.@r<=15?pow(.@r,2):225); bonus bUnbreakableWeapon,1;',NULL,NULL);
@@ -1237,12 +1238,12 @@ REPLACE INTO `item_db_re` VALUES (1927,'Krieger_Instrument1','Glorious Guitar',5
REPLACE INTO `item_db_re` VALUES (1928,'Berserk_Guitar_I','Spirited Guitar',5,0,NULL,0,'40',NULL,1,0,0x00080000,18,1,2,4,'0',0,13,'bonus bAspdRate,100; bonus bHPrecovRate,-100; bonus2 bHPLossRate,50,5000; bonus bDex,-readparam(bDex);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1929,'Guitar_C','Guitar',5,0,NULL,0,'177',NULL,1,0,0x00080000,63,1,2,3,'1',0,13,'bonus2 bAddSize,Size_All,40;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1930,'Green_Whistle','Green Whistle',5,20,NULL,800,'170:50',NULL,1,1,0x00080000,63,1,2,3,'102',1,13,'.@r = getrefine(); if(.@r>5) { bonus2 bSkillUseSP,"MI_RUSH_WINDMILL",(.@r-5)*4; bonus2 bSkillUseSP,"WM_LULLABY_DEEPSLEEP",(.@r-5)*4; } bonus2 bSkillVariableCast,"MI_RUSH_WINDMILL",-2000; bonus2 bSkillVariableCast,"WM_LULLABY_DEEPSLEEP",-2000;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (1931,'P_Guitar1','Eden Guitar I',5,0,NULL,0,'125',NULL,1,0,0x00080000,63,1,2,3,'60',0,13,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (1931,'P_String_Inst1','Eden Guitar I',5,0,NULL,0,'125',NULL,1,0,0x00080000,63,1,2,3,'60',0,13,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1932,'TE_Woe_Guitar','TE Woe Guitar',5,0,NULL,0,'100',NULL,1,0,0x00080000,63,1,2,3,'40',1,13,'bonus2 bAddRace,RC_Player,40; bonus2 bAddEff,Eff_Poison,3000;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (1933,'Tanos_Violin','Tanos Violin',5,10,NULL,2000,'200:130',NULL,NULL,1,0x00080000,63,1,2,4,'120',1,13,'bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus bLongAtkRate,20; bonus2 bHPLossRate,100,10000;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (1934,'Contrabass','Contrabass',5,20,NULL,250,'180:120',NULL,1,2,0x00080000,63,1,2,3,'130',1,13,'bonus2 bSkillCooldown,"WM_RANDOMIZESPELL",-20;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (1935,'Ozs_New_Ukulele','Oz\'s New Ukulele',5,20,NULL,2000,'160',NULL,1,2,0x00080000,63,1,2,4,'130',1,13,'bonus2 bSkillUseSP,"MI_RUSH_WINDMILL",-20;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (1936,'Blue_Violin','Blue Violin',5,10,NULL,1500,'180',NULL,2,1,0x00080000,63,1,2,3,'100',1,13,'bonus bDex,5; bonus bVit,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (1933,'Thanos_Violin','Thanatos Violin',5,10,NULL,2000,'200:130',NULL,1,1,0x00080000,56,1,2,4,'120',1,13,'bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus bLongAtkRate,20; bonus2 bHPLossRate,100,10000;',NULL,'heal -1000,0;');
+REPLACE INTO `item_db_re` VALUES (1934,'Contabass','Contrabass',5,20,NULL,250,'180:120',NULL,1,2,0x00080000,63,1,2,3,'130',1,13,'bonus2 bSkillCooldown,"WM_RANDOMIZESPELL",-20;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (1935,'Ukulele_Of_Newoz','Oz\'s New Ukulele',5,20,NULL,2000,'160',NULL,1,2,0x00080000,63,1,2,4,'130',1,13,'bonus2 bSkillUseSP,"MI_RUSH_WINDMILL",-20;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (1936,'Ru_Blue_Violin','Blue Violin',5,10,NULL,1500,'180',NULL,2,1,0x00080000,63,1,2,3,'100',1,13,'bonus bDex,5; bonus bVit,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1937,'Ru_Gold_Violin','Ru Gold Violin',5,0,NULL,1500,'180',NULL,1,2,0x00080000,56,2,2,3,'120',1,13,'bonus bDex,8; bonus bVit,8;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1938,'Infinity_Violin','Infinity Violin',5,10,NULL,500,'150',NULL,2,1,0x00080000,56,1,2,4,'100',1,13,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1939,'Crimson_Violin','Crimson Violin',5,20,NULL,800,'80',NULL,2,2,0x00080000,63,1,2,3,'70',1,13,'.@r = getrefine(); bonus bBaseAtk,((BaseLevel/10)*5)+(.@r<=15?pow(.@r,2):225);',NULL,NULL);
@@ -1290,10 +1291,10 @@ REPLACE INTO `item_db_re` VALUES (1984,'Stem_Whip','Stem Whip',5,20,NULL,800,'17
REPLACE INTO `item_db_re` VALUES (1985,'Rosebine','Rosebine',5,20,NULL,1000,'100:130',NULL,1,0,0x00080000,63,0,2,4,'110',1,14,'bonus bInt,2; bonus bAgi,-2; bonus3 bAutoSpell,"WM_VOICEOFSIREN",1,20;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1986,'P_Tail1','Eden Tail I',5,0,NULL,0,'125',NULL,2,0,0x00080000,63,0,2,3,'60',0,14,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1987,'TE_Woe_Rope','TE Woe Rope',5,0,NULL,0,'100',NULL,2,0,0x00080000,63,0,2,3,'40',1,14,'bonus2 bAddRace,RC_Player,40; bonus2 bAddEff,Eff_Blind,3000;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (1988,'Tanos_Whip_Sword','Tanos Whip Sword',5,10,NULL,2200,'200:130',NULL,NULL,1,0x00080000,63,0,2,4,'120',1,14,'bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus bLongAtkRate,20; bonus2 bHPLossRate,100,10000;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (1989,'Rhythmic_Gymnastics_Ribbon','Rhythmic Gymnastics Ribbon',5,20,NULL,300,'150:120',NULL,2,2,0x00080000,63,0,2,3,'130',1,14,'bonus bAspdRate,20;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (1990,'Bloody_Floral_Decoration_Microphone','Bloody Floral Decoration Microphone',5,20,NULL,1000,'160',NULL,2,2,0x00080000,63,0,2,4,'130',1,14,'bonus2 bSkillUseSP,"CG_MOONLIT",-20;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (1991,'Blue_Whip','Blue Whip',5,10,NULL,1500,'180',NULL,2,1,0x00080000,63,0,2,3,'100',1,14,'bonus bDex,5; bonus bVit,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (1988,'Thanos_Whip','Thanatos Whip',5,10,NULL,2200,'200:130',NULL,2,1,0x00080000,56,0,2,4,'120',1,14,'bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus bLongAtkRate,20; bonus2 bHPLossRate,100,10000;',NULL,'heal -1000,0;');
+REPLACE INTO `item_db_re` VALUES (1989,'Gymnastics_Ribbon','Rhythmic Gymnastics Ribbon',5,20,NULL,300,'150:120',NULL,2,2,0x00080000,63,0,2,3,'130',1,14,'bonus bAspdRate,20;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (1990,'Floral_Mic_Of_Igu','Bloody Floral Decoration Microphone',5,20,NULL,1000,'160',NULL,2,2,0x00080000,63,0,2,4,'130',1,14,'bonus2 bSkillUseSP,"CG_MOONLIT",-20;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (1991,'Ru_Blue_Whip','Blue Whip',5,10,NULL,1500,'180',NULL,2,1,0x00080000,63,0,2,3,'100',1,14,'bonus bDex,5; bonus bVit,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1992,'Ru_Gold_Whip','Ru Gold Whip',5,0,NULL,1500,'180',NULL,2,2,0x00080000,56,2,2,3,'120',1,14,'bonus bDex,8; bonus bVit,8;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1994,'Infinity_Whip','Infinity Whip',5,10,NULL,500,'150',NULL,2,1,0x00080000,56,0,2,4,'100',1,14,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (1995,'Crimson_Whip','Crimson Whip',5,20,NULL,800,'80',NULL,2,2,0x00080000,63,0,2,3,'70',1,14,'.@r = getrefine(); bonus bBaseAtk,((BaseLevel/10)*5)+(.@r<=15?pow(.@r,2):225);',NULL,NULL);
@@ -1324,12 +1325,12 @@ REPLACE INTO `item_db_re` VALUES (2018,'Metal_Staff','Metal Staff',5,20,NULL,0,'
REPLACE INTO `item_db_re` VALUES (2019,'TE_Woe_Two_Hand_Staff','TE Woe Two Hand Staff',5,0,NULL,0,'50:130',NULL,1,0,0x00818315,63,2,34,3,'40',1,23,'bonus2 bMagicAddRace,RC_Player,20; bonus3 bAddEff,Eff_Stun,1000,ATF_MAGIC; bonus bHPRecovRate,5; bonus bSPRecovRate,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2020,'Jormungand','Jormungand',5,10,NULL,3000,'200:280',NULL,NULL,0,0x810200,63,2,34,4,'1',0,23,'bonus bInt,20; bonus bUnbreakableWeapon,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2021,'Ganbantein','Ganbantein',5,0,NULL,2000,'100:320',NULL,1,0,0x00000200,56,2,2,4,'100',1,10,'bonus bInt,25; bonus bDex,25; bonus3 bAddEff,Eff_Poison,1000,ATF_MAGIC; bonus3 bAutoSpell,"AB_SILENTIUM",1,100; bonus bUnbreakableWeapon,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2022,'Geffen_Staff','Staff of Geffen',5,20,NULL,1000,'100:300',NULL,1,1,0x00000200,18,2,34,1,'150',1,23,'bonus bInt,20;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2023,'Tanos_Two-handed_Stick','Tanos Two-handed Stick',5,10,NULL,1400,'120:250',NULL,NULL,1,0x810200,63,2,34,4,'120',1,23,'bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus bHealPower,18; bonus2 bHPLossRate,100,10000;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2022,'Staff_Of_Geffen','Staff of Geffen',5,20,NULL,1000,'100:300',NULL,1,1,0x00000200,18,2,34,1,'150',1,23,'bonus bInt,20;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2023,'Thanos_Rod','Thanatos Two-Handed Staff',5,10,NULL,1400,'120:250',NULL,1,1,0x00018314,56,2,34,4,'120',1,23,'bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus bHealPower,18; bonus bMagicHPGainValue,500; bonus bMagicSPGainValue,50; bonus2 bHPLossRate,100,10000;',NULL,'heal -1000,0;');
REPLACE INTO `item_db_re` VALUES (2024,'Infinity_Two-handed_Stick','Infinity Two-handed Stick',5,10,NULL,500,'30:170',NULL,NULL,1,0x810200,56,2,34,4,'100',1,23,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2025,'Crimson_Two-Handed_Staff','Crimson Two-Handed Staff',5,20,NULL,1000,'100',NULL,1,2,0x800200,63,2,34,3,'70',1,23,'.@r = getrefine(); bonus bInt,5; bonus bMatk,150+((BaseLevel/10)*5)+(.@r<=15?pow(.@r,2):225);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2026,'Staff_of_Vicious_Mind','Staff of Vicious Mind',5,20,NULL,1000,'100:200',NULL,1,1,0x00810204,63,2,34,4,'160',1,23,'bonus bMatk,pow(min(getrefine(),15),2); bonus bInt,6; bonus bUnbreakableWeapon,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2027,'Sunflower_Kid','Sunflower Kid',5,10,NULL,1500,'150:320',NULL,NULL,2,0x00000200,40,2,34,4,'170',1,23,'bonus bInt,5; .@r = getrefine(); bonus bMatkRate,(.@r/2); bonus bDelayrate,(.@r*-1); bonus bUnbreakableWeapon,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2027,'Sunflower_Kid','Sunflower Kid',5,10,NULL,1500,'150:320',NULL,NULL,2,0x00000200,56,2,34,4,'170',1,23,'bonus bInt,5; .@r = getrefine(); bonus bMatkRate,(.@r/2); bonus bDelayrate,(.@r*-1); bonus bUnbreakableWeapon,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2030,'Unity_Two-Handed_Staff','Unity Two-Handed Staff',5,20,NULL,500,'95:135',NULL,1,1,0x800200,63,2,34,3,'1',1,23,'bonus bMatk,pow(getrefine(),2)*125/100;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2032,'Requiem_Wizardry_Staff','Requiem Wizardry Staff',5,20,NULL,500,'100:230',NULL,1,NULL,0xFFFFFFFF,63,2,2,4,'100',1,10,'.@r = getrefine(); .@b = 40; .@c = 5; if(.@r>=5){ .@b += (.@r-5)*15+20; .@c += .@r-5; } bonus2 bMagicAddRace2,RC2_BioLab,.@b; bonus2 bSubRace2,RC2_BioLab,.@c; bonus2 bIgnoreMdefRace2Rate,RC2_BioLab,(.@r-5)*10;',NULL,NULL);
#===================================================================
@@ -1411,22 +1412,22 @@ REPLACE INTO `item_db_re` VALUES (2173,'Crescent_Armguard','Crescent Wrist Guard
REPLACE INTO `item_db_re` VALUES (2174,'Lumiere_Shield','Lumiere Shield',4,20,NULL,1300,NULL,50,NULL,1,0xFFFFFFFF,63,2,32,NULL,'65',1,3,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2175,'Esprit_Shield','Spirit Shield',4,20,NULL,1300,NULL,50,NULL,1,0xFFFFFFFF,63,2,32,NULL,'65',1,3,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2176,'Dark_Book','Black Book',4,20,NULL,500,NULL,80,NULL,1,0xFFFFFFFF,63,2,32,NULL,'65',1,5,'bonus bMdef,5; .@r = getrefine(); bonus3 bAutoSpellWhenHit,"NPC_DRAGONFEAR",1,(.@r<=6)?(10):((.@r<=8)?(20):(30));',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2177,'Shield_Of_Death','Shield Of Death',4,20,NULL,2000,NULL,150,NULL,1,0xFFFFFFFF,63,2,32,NULL,'90',1,3,'bonus2 bAddClass,Class_Boss,2; bonus2 bMagicAddClass,Class_Boss,2; bonus2 bAddClass,Class_Normal,10; bonus2 bMagicAddClass,Class_Normal,10;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2178,'TE_Woe_Buckler','TE Woe Buckler',4,0,NULL,0,NULL,15,NULL,0,0xFFFFFFFF,63,2,32,1,'40',1,2,'bonus bMdef,15; bonus bMaxHP,100; bonus bMaxSP,100; bonus2 bSubRace,RC_Player,15;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2179,'TE_Woe_Shield','TE Woe Shield',4,0,NULL,0,NULL,25,NULL,0,0x000444A2,63,2,32,1,'40',1,3,'bonus bMdef,5; bonus bMaxHP,200; bonus2 bSubRace,RC_Player,20;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2180,'TE_Woe_Magic_Guard','TE Woe Magic Guard',4,0,NULL,0,NULL,5,NULL,0,0x00818315,63,2,32,1,'40',1,1,'bonus bMdef,25; bonus bMaxSP,200; bonus2 bSubRace,RC_Player,10;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2181,'Hervor','Hervor',4,10,NULL,1500,NULL,100,NULL,0,0xFFFFFFFF,63,2,32,NULL,'1',NULL,2,'bonus bMdef,5; bonus2 bSubRace,RC_All,30; bonus bUnbreakableArmor,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2182,'Hervor_Alvitr','Hervor Alvitr',4,0,NULL,3000,NULL,150,NULL,0,0x000FDF80,56,2,32,1,'100',0,2,'bonus bMdef,10; bonus bVit,20; bonus2 bSubRace,RC_All,30; bonus bUnbreakableShield,1; autobonus2 "{ sc_end SC_STUN; sc_end SC_SLEEP; sc_end SC_CURSE; sc_end SC_STONE; sc_end SC_POISON; sc_end SC_BLIND; sc_end SC_SILENCE; sc_end SC_BLEEDING; sc_end SC_CONFUSION; sc_end SC_FREEZE; bonus2 bResEff,Eff_Stun,10000; bonus2 bResEff,Eff_Sleep,10000; bonus2 bResEff,Eff_Curse,10000; bonus2 bResEff,Eff_Stone,10000; bonus2 bResEff,Eff_Poison,10000; bonus2 bResEff,Eff_Blind,10000; bonus2 bResEff,Eff_Silence,10000; bonus2 bResEff,Eff_Bleeding,10000; bonus2 bResEff,Eff_Confusion,10000; bonus2 bResEff,Eff_Freeze,10000; }",10,60000,BF_SHORT;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2177,'Shield_Of_Death','Shield Of Death',4,20,NULL,2000,NULL,150,NULL,1,0xFFFFFFFF,63,2,32,NULL,'90',1,3,'bonus2 bAddClass,Class_Boss,2; bonus2 bMagicAddClass,Class_Boss,2; bonus2 bSubClass,Class_Normal,-10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2178,'TE_Woe_Buckler','TE Woe Buckler',4,0,NULL,0,NULL,15,NULL,0,0xFFFFFFFF,63,2,32,NULL,'40',1,2,'bonus bMdef,15; bonus bMaxHP,100; bonus bMaxSP,100; bonus2 bSubRace,RC_Player,15;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2179,'TE_Woe_Shield','TE Woe Shield',4,0,NULL,0,NULL,25,NULL,0,0x000444A2,63,2,32,NULL,'40',1,3,'bonus bMdef,5; bonus bMaxHP,200; bonus2 bSubRace,RC_Player,20;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2180,'TE_Woe_Magic_Guard','TE Woe Magic Guard',4,0,NULL,0,NULL,5,NULL,0,0x00818315,63,2,32,NULL,'40',1,1,'bonus bMdef,25; bonus bMaxSP,200; bonus2 bSubRace,RC_Player,10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2181,'Hervor','Hervor',4,10,NULL,1500,NULL,100,NULL,0,0xFFFFFFFF,63,2,32,NULL,'1',NULL,2,'bonus bMdef,5; bonus2 bSubRace,RC_All,30; bonus bUnbreakableShield,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2182,'Hervor_Alvitr','Hervor Alvitr',4,0,NULL,3000,NULL,150,NULL,0,0x000FDF80,56,2,32,NULL,'100',0,2,'bonus bMdef,10; bonus bVit,20; bonus2 bSubRace,RC_All,30; bonus bUnbreakableShield,1; autobonus2 "{ sc_end SC_STUN; sc_end SC_SLEEP; sc_end SC_CURSE; sc_end SC_STONE; sc_end SC_POISON; sc_end SC_BLIND; sc_end SC_SILENCE; sc_end SC_BLEEDING; sc_end SC_CONFUSION; sc_end SC_FREEZE; bonus2 bResEff,Eff_Stun,10000; bonus2 bResEff,Eff_Sleep,10000; bonus2 bResEff,Eff_Curse,10000; bonus2 bResEff,Eff_Stone,10000; bonus2 bResEff,Eff_Poison,10000; bonus2 bResEff,Eff_Blind,10000; bonus2 bResEff,Eff_Silence,10000; bonus2 bResEff,Eff_Bleeding,10000; bonus2 bResEff,Eff_Confusion,10000; bonus2 bResEff,Eff_Freeze,10000; }",10,60000,BF_SHORT;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2183,'Impr_Angel\'s_Safeguard','Advanced Angelic Guard',4,10000,NULL,400,NULL,30,NULL,1,0x00000001,63,2,32,NULL,'99',1,1,'bonus2 bSubRace,RC_Demon,5; bonus2 bSubEle,Ele_All,5; bonus2 bSubEle,Ele_Neutral,-5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2185,'Magic_Reflect','Magic Reflect',4,10,NULL,1000,NULL,50,NULL,1,0xFFFFFFFF,63,2,32,NULL,'99',1,3,'bonus bMdef,10; bonus bMagicDamageReturn,3+((getrefine()>=9) ? 3 : 0);',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2186,'Great_Encyclopedia_Revision','Great Encyclopedia Revision',4,10,NULL,200,'0:5',50,NULL,1,0x00810100,63,2,32,NULL,'99',1,4,'bonus bInt,3; bonus bDex,2; .@r = getrefine(); bonus bCritical,3+((.@r >= 7) ? 2 : 0); if(.@r >= 9) bonus bMatk,5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2187,'Shield_of_Gray','Shield of Gray',4,10,NULL,2000,NULL,75,NULL,1,0xFFFFFFFF,56,2,32,NULL,'120',1,3,'.@r = getrefine(); bonus2 bSubEle,Ele_Holy,30+.@r; bonus bMdef,9+.@r/3;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2185,'Magic_Reflector','Magic Reflect',4,10,NULL,1000,NULL,50,NULL,1,0xFFFFFFFF,63,2,32,NULL,'99',1,3,'bonus bMdef,10; bonus bMagicDamageReturn,3+((getrefine()>=9) ? 3 : 0);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2186,'Encyclopedia_Revision','Great Encyclopedia Revision',4,10,NULL,200,'0:5',50,NULL,1,0x00810100,63,2,32,NULL,'99',1,4,'bonus bInt,3; bonus bDex,2; .@r = getrefine(); bonus bCritical,3+((.@r >= 7) ? 2 : 0); if(.@r >= 9) bonus bMatk,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2187,'Shield_Of_Gray','Shield of Gray',4,10,NULL,2000,NULL,75,NULL,1,0xFFFFFFFF,56,2,32,NULL,'120',1,3,'.@r = getrefine(); bonus2 bSubEle,Ele_Holy,30+.@r; bonus bMdef,9+.@r/3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2188,'Svalinn_J','Svalinn',4,10,NULL,500,NULL,80,NULL,1,0xFFFFFFFF,63,2,32,NULL,'65',1,3,'.@r = getrefine(); bonus bMaxHP,9+.@r/3; bonus2 bAddEle,Ele_Water,4+.@r/3*5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2189,'Mad_Bunny','Mad Bunny Shield',4,10,NULL,100,NULL,40,NULL,1,0xFFFFFFFF,63,2,32,NULL,'30',1,6,'bonus2 bSubEle,Ele_All,5; bonus bMdef,6; bonus bDex,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2190,'Ancient_Shield_Of_Aeon','Ancient Shield Of Aeon',4,0,NULL,200,NULL,5,NULL,0,0x000FDF80,63,2,32,NULL,'130',1,2,'bonus2 bSubEle,Ele_Neutral,10; bonus2 bSubEle,Ele_Fire,10; bonus2 bSubEle,Ele_Water,10; bonus2 bSubEle,Ele_Wind,10; bonus2 bSubEle,Ele_Earth,10; bonus2 bSubEle,Ele_Dark,10; bonus2 bSubEle,Ele_Holy,10; bonus2 bSubEle,Ele_Ghost,10; bonus bMaxHP,500; bonus bMaxSP,50; if(getrefine()>=14) skill "MG_STONECURSE",5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2195,'Lian_Shield','Lian Shield',4,0,NULL,1300,NULL,50,NULL,1,0xFFFFFFFF,63,2,32,1,'65',1,NULL,'bonus2 bSubEle,Ele_Neutral,5; bonus2 bSubRace,RC_Formless,-5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2196,'White_Gold_Shield','White Gold Shield',4,0,NULL,1800,NULL,140,NULL,1,0xFFFFFFFF,63,2,32,NULL,NULL,1,NULL,'autobonus2 "{ bonus bMagicDamageReturn,20; }",100,2000,BF_MAGIC; /* Confirm: Success rate? */',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2198,'Lapine_Shield','Lapine Shield',4,0,NULL,1000,NULL,25,NULL,1,0xFFFFFFFF,63,2,32,NULL,'100',1,NULL,'bonus bMdef,10; if (getrefine() > 7) { bonus bMatk,20; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2195,'Lian_Shield','Lian Shield',4,0,NULL,1300,NULL,50,NULL,1,0xFFFFFFFF,63,2,32,NULL,'65',1,3,'bonus2 bSubEle,Ele_Neutral,5; bonus2 bSubRace,RC_Formless,-5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2196,'White_Gold_Shield','White Gold Shield',4,0,NULL,1800,NULL,140,NULL,1,0xFFFFFFFF,63,2,32,NULL,NULL,1,4,'autobonus2 "{ bonus bMagicDamageReturn,20; }",100,2000,BF_MAGIC; /* Confirm: Success rate? */',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2198,'Lapine_Shield','Lapine Shield',4,0,NULL,1000,NULL,25,NULL,1,0xFFFFFFFF,63,2,32,NULL,'100',1,3,'bonus bMdef,10; if (getrefine() > 7) { bonus bMatk,20; }',NULL,NULL);
# GM Shield
REPLACE INTO `item_db_re` VALUES (2199,'Ahura_Mazda','Ahura Mazdah',4,1,NULL,10,NULL,10000,NULL,0,0xFFFFFFFF,63,2,32,NULL,'1',1,1,'bonus bAllStats,50; bonus bMdef,99; bonus bShortWeaponDamageReturn,100; bonus2 bSubRace,RC_DemiHuman,95; bonus2 bSubRace,RC_Player,95; skill "CR_FULLPROTECTION",5; skill "WZ_ESTIMATION",1; skill "ST_FULLSTRIP",5; skill "HW_MAGICPOWER",10; skill "ECL_SNOWFLIP",1; skill "ECL_PEONYMAMY",1; skill "ECL_SADAGUI",1; skill "ECL_SEQUOIADUST",1; bonus bMaxHPrate,200; bonus bNoKnockback,0; bonus bDelayRate,-20; bonus bSpeedRate,25; bonus bIntravision,1;','sc_start4 SC_ENDURE,60000,10,0,0,1;','sc_end SC_ENDURE;');
#===================================================================
@@ -1730,9 +1731,9 @@ REPLACE INTO `item_db_re` VALUES (2492,'Bayani_Bangungot_Boots','Bayani Bangungo
REPLACE INTO `item_db_re` VALUES (2493,'Goibne\'s_Combat_Boots_','Goibne\'s Greaves',4,30000,NULL,700,NULL,13,NULL,1,0xFFFFFFFE,63,2,64,NULL,'54',1,0,'bonus bMdef,3; bonus bMaxHPrate,5; bonus bMaxSPrate,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2494,'Chrystal_Pumps_','Crystal Pumps',4,20,NULL,100,NULL,5,NULL,1,0xFFFFFFFE,63,0,64,NULL,'0',1,0,'bonus bMdef,10; bonus bLuk,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2495,'Egir_Shoes','Egir Shoes',4,200000,NULL,300,NULL,13,NULL,1,0xFFFFFFFF,63,2,64,NULL,'110',1,0,'if(BaseClass==Job_Mage||BaseClass==Job_Archer||BaseClass==Job_Acolyte) bonus bMaxHP,BaseLevel*5; else if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief) bonus bMaxSP,JobLevel*2;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2496,'TE_Woe_Shoes','TE Woe Shoes',4,0,NULL,0,NULL,5,NULL,0,0xFFFFFFFF,63,2,64,0,'40',1,NULL,'bonus bMdef,5; bonus bMaxHP,150; bonus bMaxSP,150; bonus2 bAddRace,RC_Player,5; bonus2 bMagicAddRace,RC_Player,5; bonus2 bResEff,Eff_Freeze,25;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2497,'TE_Woe_Boots','TE Woe Boots',4,0,NULL,0,NULL,10,NULL,0,0x000444A2,63,2,64,0,'40',1,NULL,'bonus bMaxHP,200; bonus bMaxSP,100; bonus2 bAddRace,RC_Player,10; bonus2 bResEff,Eff_Freeze,25;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2498,'TE_Woe_Magic_Sandal','TE Woe Magic Sandal',4,0,NULL,0,NULL,5,NULL,0,0x00818315,63,2,64,1,'40',1,NULL,'bonus bMdef,5; bonus bMaxHP,100; bonus bMaxSP,200; bonus2 bMagicAddRace,RC_Player,5; bonus2 bResEff,Eff_Freeze,25;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2496,'TE_Woe_Shoes','TE Woe Shoes',4,0,NULL,0,NULL,5,NULL,0,0xFFFFFFFF,63,2,64,NULL,'40',1,NULL,'bonus bMdef,5; bonus bMaxHP,150; bonus bMaxSP,150; bonus2 bAddRace,RC_Player,5; bonus2 bMagicAddRace,RC_Player,5; bonus2 bResEff,Eff_Freeze,25;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2497,'TE_Woe_Boots','TE Woe Boots',4,0,NULL,0,NULL,10,NULL,0,0x000444A2,63,2,64,NULL,'40',1,NULL,'bonus bMaxHP,200; bonus bMaxSP,100; bonus2 bAddRace,RC_Player,10; bonus2 bResEff,Eff_Freeze,25;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2498,'TE_Woe_Magic_Sandal','TE Woe Magic Sandal',4,0,NULL,0,NULL,5,NULL,0,0x00818315,63,2,64,NULL,'40',1,NULL,'bonus bMdef,5; bonus bMaxHP,100; bonus bMaxSP,200; bonus2 bMagicAddRace,RC_Player,5; bonus2 bResEff,Eff_Freeze,25;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2499,'Temporal_Boots','Temporal Boots',4,400,NULL,600,NULL,20,NULL,0,0xFFFFFFFF,63,2,64,NULL,'10',1,NULL,'.@r = getrefine(); bonus bMaxHP,300; bonus bMaxSP,30; bonus bMaxHP,100*(.@r/3); bonus bMaxSP,10*(.@r/3);',NULL,NULL);
#===================================================================
# Garments
@@ -1796,7 +1797,7 @@ REPLACE INTO `item_db_re` VALUES (2556,'Freyja_SScarf30','Freyja Soul Scarf',4,2
REPLACE INTO `item_db_re` VALUES (2557,'Freyja_SScarf60','Freyja Soul Scarf',4,20,NULL,400,NULL,4,NULL,0,0xFFFFFFFF,63,2,4,NULL,'20',0,0,'bonus bFlee,15; bonus2 bSubEle,Ele_Neutral,15;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2558,'Freyja_SScarf90','Freyja Soul Scarf',4,20,NULL,400,NULL,4,NULL,0,0xFFFFFFFF,63,2,4,NULL,'20',0,0,'bonus bFlee,15; bonus2 bSubEle,Ele_Neutral,15;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2559,'Time_Keepr_Manteau','Time Keeper\'s Manteau',4,30000,NULL,0,NULL,9,NULL,0,0xFFFFFFFF,63,2,4,NULL,'1',1,0,'bonus bMdef,1; bonus bFlee,10; bonus2 bSubEle,Ele_Neutral,10;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2560,'Para_Team_Manteau1','Eden Team Manteau I',4,0,NULL,0,NULL,14,NULL,0,0xFFFFFFFF,63,2,4,NULL,'12',0,0,'bonus2 bSubEle,Ele_Neutral,10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2560,'Para_Team_Manteau','Eden Team Manteau I',4,0,NULL,0,NULL,14,NULL,0,0xFFFFFFFF,63,2,4,NULL,'12',0,0,'bonus2 bSubEle,Ele_Neutral,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2561,'Upg_Hood','Upg Hood',4,0,NULL,100,NULL,9,NULL,1,0xFFFFFFFF,63,2,4,NULL,'0',1,0,'bonus bMaxHPrate,3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2562,'Upg_Muffler','Upg Muffler',4,20,NULL,200,NULL,13,NULL,1,0xFFFFFFFE,63,2,4,NULL,'0',1,0,'bonus bMaxHPrate,3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2563,'Upg_Manteau','Upg Manteau',4,20,NULL,300,NULL,18,NULL,1,0x006654E2,63,2,4,NULL,'0',1,0,'bonus bMaxHPrate,3;',NULL,NULL);
@@ -1869,8 +1870,8 @@ REPLACE INTO `item_db_re` VALUES (2630,'Brysinggamen','Brisingamen',4,20,NULL,15
REPLACE INTO `item_db_re` VALUES (2631,'First_Age_Ring','Celebration Ring',4,1,NULL,10,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'0',0,0,'bonus bAllStats,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2632,'Korean_Trinket','Korean Trinket',4,125000,NULL,100,NULL,1,NULL,0,0xFFFFFFFE,63,2,136,NULL,'65',0,0,'bonus bVit,1; bonus bDex,1; bonus bLuk,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2633,'Jade_Ring','Jade Ring',4,204000,NULL,100,NULL,0,NULL,0,0xFFFFFFFE,63,2,136,NULL,'80',0,0,'bonus bStr,2; bonus bInt,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2634,'Bridegroom_Ring','Wedding Ring',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,1,136,NULL,'0',0,0,'skill "WE_MALE",1; skill "WE_FEMALE",1; skill "WE_CALLPARTNER",1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2635,'Bride_Ring','Wedding Ring',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,0,136,NULL,'0',0,0,'skill "WE_MALE",1; skill "WE_FEMALE",1; skill "WE_CALLPARTNER",1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2634,'Bridegroom_Ring','Wedding Ring',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,1,136,NULL,'0',0,0,'skill "WE_MALE",1; skill "WE_FEMALE",1; skill "WE_CALLPARTNER",1; skill "WE_CALLALLFAMILY",1; skill "WE_ONEFOREVER",1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2635,'Bride_Ring','Wedding Ring',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,0,136,NULL,'0',0,0,'skill "WE_MALE",1; skill "WE_FEMALE",1; skill "WE_CALLPARTNER",1; skill "WE_CALLALLFAMILY",1; skill "WE_ONEFOREVER",1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2636,'Gold_Ring_','Gold Christmas Ring',4,30000,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'0',0,0,'bonus bLuk,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2637,'Silver_Ring_','Silver Christmas Ring',4,20000,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'0',0,0,'bonus bLuk,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2638,'Exorcize_Sachet','Sacred Incense',4,20000,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'0',0,0,'bonus bStr,1; bonus bLuk,1;',NULL,NULL);
@@ -1942,7 +1943,7 @@ REPLACE INTO `item_db_re` VALUES (2703,'Expert_Ring','Expert Ring',4,20,NULL,150
REPLACE INTO `item_db_re` VALUES (2704,'Golden_Accessory','Golden Accessories',4,20,NULL,100,NULL,4,NULL,0,0xFFFFFFFF,63,2,136,NULL,'0',0,0,'bonus bMdef,4;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2705,'Golden_Accessory2','Golden Accessories',4,20,NULL,100,NULL,4,NULL,0,0xFFFFFFFF,63,2,136,NULL,'0',0,0,'bonus2 bAddMonsterDropItem,12018,500;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2706,'Handcuff','Arrest Handcuffs',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'0',0,0,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2707,'GUSLI','GUSLI',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'0',0,0,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2707,'Gusli','GUSLI',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'0',0,0,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2708,'Chinese_Handicraft','Chinese Handicraft',4,0,NULL,50,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'0',0,0,'bonus3 bAutoSpell,"MG_FIREBOLT",5,50;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2709,'5_Anniversary_Coin','5th Anniversary Coin',4,2,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'0',0,0,'bonus2 bAddClass,Class_All,5; bonus bMatkRate,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2710,'Bloody_Iron_Ball_C','Bloody Iron Ball',4,1,NULL,0,NULL,0,NULL,0,0xFFFFFFFE,63,2,136,NULL,'0',0,0,'bonus bBaseAtk,30;',NULL,NULL);
@@ -1995,7 +1996,7 @@ REPLACE INTO `item_db_re` VALUES (2756,'Chemical_Ring','Chemical Ring',4,0,NULL,
REPLACE INTO `item_db_re` VALUES (2757,'Insecticide_Ring','Insecticide Ring',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'0',0,0,'bonus2 bExpAddRace,RC_Insect,15;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2758,'Fisher_Ring','Fischer Ring',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'0',0,0,'bonus2 bExpAddRace,RC_Fish,15;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2759,'Decussate_Ring','Decussate Ring',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'0',0,0,'bonus2 bExpAddRace,RC_Demon,15;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2760,'Bloody_Ring','Bloody Ring',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'0',0,0,'bonus2 bExpAddRace,RC_DemiHuman,15; bonus2 bExpAddRace,RC_Player,15;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2760,'Bloody_Ring','Bloody Ring',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'0',0,0,'bonus2 bExpAddRace,RC_DemiHuman,15;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2761,'Satanic_Ring','Satanic Ring',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'0',0,0,'bonus2 bExpAddRace,RC_Angel,15;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2762,'Dragoon_Ring','Dragon Ring',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'0',0,0,'bonus2 bExpAddRace,RC_Dragon,15;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2763,'Skul_Ring_C','Neo Skull Ring',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFE,18,2,136,NULL,'95',0,0,'bonus2 bAddClass,Class_All,5; bonus bMatkrate,5; bonus bMaxHPrate,5; skill "MG_SIGHT",1;',NULL,NULL);
@@ -2126,7 +2127,7 @@ REPLACE INTO `item_db_re` VALUES (2887,'Nab_Ring','Nab Ring',4,20,NULL,100,NULL,
REPLACE INTO `item_db_re` VALUES (2888,'School_Bag','School Bag',4,20,NULL,1000,NULL,0,NULL,1,0xFFFFFFFF,63,2,136,NULL,'0',0,0,'bonus bAspdRate,3; bonus bVariableCastrate,-3; if(BaseLevel<80){ bonus bMaxHP,200; bonus bMaxSP,100; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2889,'Endure_Ring','Endure Ring',4,20,NULL,100,NULL,0,NULL,1,0xFFFFFFFF,63,2,136,NULL,'60',0,0,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2890,'White_Wing_Brooch','White Wing Brooch',4,20,NULL,100,NULL,0,NULL,0,0x00000800,63,2,136,NULL,'100',0,0,'bonus bDex,2; bonus bLongAtkRate,3;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2891,'Black_Wing_Brooch','Black Wing Brooch',4,20,NULL,100,NULL,0,NULL,0,0x00000800,56,2,136,NULL,'100',0,0,'bonus bInt,2; bonus bFlee2,3;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2891,'Black_wing_Brooch','Black Wing Brooch',4,20,NULL,100,NULL,0,NULL,0,0x00000800,56,2,136,NULL,'100',0,0,'bonus bInt,2; bonus bFlee2,3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2892,'Assassin_Handcuffs','Assassin\'s Glove',4,56000,NULL,400,NULL,3,NULL,1,0x00001000,63,2,136,NULL,'100',0,0,'bonus bMaxSP,20; bonus bCritical,3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2893,'Cursed_Heart','Cursed Heart',4,20,NULL,50,NULL,0,NULL,1,0xFFFFFFFF,63,2,136,NULL,'80',0,0,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2894,'Glove_Of_Shura','Sura Gauntlet',4,20,NULL,400,NULL,1,NULL,0,0x00008000,63,2,136,NULL,'130',0,0,'bonus bStr,5; bonus bMaxSPrate,6; bonus bMaxHPrate,-6; if(readparam(bStr)>=120){ bonus bBaseAtk,30; }',NULL,NULL);
@@ -2142,7 +2143,7 @@ REPLACE INTO `item_db_re` VALUES (2903,'Morpheus\'s_Armlet_','Morpheus\'s Armlet
REPLACE INTO `item_db_re` VALUES (2904,'Naqsh','Naqsi',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'0',0,0,'skill "BS_MAXIMIZE",5; skill "BS_WEAPONPERFECT",5; skill "WL_RECOGNIZEDSPELL",5; skill "ECL_SNOWFLIP",1; skill "ECL_PEONYMAMY",1; skill "ECL_SADAGUI",1; skill "ECL_SEQUOIADUST",1; bonus2 bSkillCooldown,"WL_RECOGNIZEDSPELL",-180000; bonus bDelayRate,-100;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2905,'Super_Ora_Ora','Super Ora Ora',4,0,NULL,1000,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'0',0,0,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2906,'Happy_Gauntlet','Happy Gauntlet',4,20,NULL,1000,NULL,3,NULL,1,0xFFFFFFFF,63,2,136,NULL,'70',0,0,'bonus bMdef,3;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2907,'Buwaya_Tattoo','Bawaya Agimat Tattoo',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'1',0,0,'bonus bMatkRate,7; bonus bVariableCastrate,-7;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2907,'Buwaya_Tattoo','Bawaya Agimat Tattoo',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'1',0,0,'bonus bMatkRate,7; bonus bFixedCastrate,-7;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2908,'Light_Ring','Light Ring',4,20,NULL,100,NULL,0,NULL,1,0xFFFFFFFF,63,2,136,NULL,'0',0,0,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2909,'Darkness_Ring','Darkness Ring',4,20,NULL,100,NULL,0,NULL,1,0xFFFFFFFF,63,2,136,NULL,'0',0,0,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2910,'Bakonawa_Tattoo','Bakunawa Agimat Tattoo',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'1',0,0,'bonus2 bAddClass,Class_All,7; bonus bAspdRate,10;',NULL,NULL);
@@ -2169,15 +2170,15 @@ REPLACE INTO `item_db_re` VALUES (2940,'Ninja_Manual','Ninja Manual',4,0,NULL,10
REPLACE INTO `item_db_re` VALUES (2941,'Gunslinger_Manual','Gunslinger Manual',4,0,NULL,100,NULL,0,NULL,0,0x00000001,63,2,136,NULL,'0',0,0,'bonus bMaxSP,100; skill "GS_GLITTERING",1; skill "GS_ADJUSTMENT",1; skill "GS_MADNESSCANCEL",1; skill "GS_INCREASING",1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2942,'Taekwon_Manual','Taekwon Manual',4,0,NULL,100,NULL,0,NULL,0,0x00000001,63,2,136,NULL,'0',0,0,'bonus bMaxSP,100; skill "TK_SEVENWIND",4; skill "TK_JUMPKICK",5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2943,'Critical_Ring_','Critical Ring',4,0,NULL,100,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,136,NULL,NULL,0,NULL,'bonus bCritical,5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2944,'TE_Ring_Of_Protection','TE Ring Of Protection',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,136,1,'40',0,NULL,'bonus bMaxHP,100; bonus2 bSubRace,RC_Player,5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2945,'TE_Ring_Of_Rage','TE Ring Of Rage',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,136,1,'40',0,NULL,'bonus2 bAddRace,RC_Player,5; bonus2 bMagicAddRace,RC_Player,5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2946,'TE_Ring_Of_Defiance','TE Ring Of Defiance',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,136,1,'40',0,NULL,'bonus bMdef,5; bonus2 bSubRace,RC_Player,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2944,'TE_Ring_Of_Protection','TE Ring Of Protection',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,136,NULL,'40',0,NULL,'bonus bMaxHP,100; bonus2 bSubRace,RC_Player,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2945,'TE_Ring_Of_Rage','TE Ring Of Rage',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,136,NULL,'40',0,NULL,'bonus2 bAddRace,RC_Player,5; bonus2 bMagicAddRace,RC_Player,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2946,'TE_Ring_Of_Defiance','TE Ring Of Defiance',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,136,NULL,'40',0,NULL,'bonus bMdef,5; bonus2 bSubRace,RC_Player,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2948,'Demon_Wing','Demon Wing',4,10,NULL,100,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,136,NULL,'70',NULL,NULL,'bonus bFlee,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2949,'Silversmith_Bracelet','Silversmith Bracelet',4,10,NULL,100,NULL,3,NULL,1,0xFFFFFFFF,63,2,136,NULL,'60',NULL,NULL,'bonus bAllStats,1; bonus bMdef,3; skill "SA_SPELLBREAKER",5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2950,'Rune_Ring','Rune Ring',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,136,1,'1',0,NULL,'bonus2 bExpAddClass,Class_Normal,10;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2951,'Kvasir_Ring_Blue','Kvasir Ring Blue',4,0,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,136,1,'1',0,NULL,'bonus bMaxSP,30; skill "ECL_SNOWFLIP",1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2952,'Kvasir_Ring_Red','Kvasir Ring Red',4,0,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,136,1,'1',0,NULL,'bonus bMaxSP,30; skill "ECL_PEONYMAMY",1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2953,'Kvasir_Ring_Green','Kvasir Ring Green',4,0,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,136,1,'1',0,NULL,'bonus bMaxHP,100; skill "ECL_SADAGUI",1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2950,'Rune_Ring','Rune Ring',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,136,NULL,'1',0,NULL,'bonus2 bExpAddClass,Class_Normal,10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2951,'Kvasir_Ring_Blue','Kvasir Ring Blue',4,0,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,136,NULL,'1',0,NULL,'bonus bMaxSP,30; skill "ECL_SNOWFLIP",1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2952,'Kvasir_Ring_Red','Kvasir Ring Red',4,0,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,136,NULL,'1',0,NULL,'bonus bMaxSP,30; skill "ECL_PEONYMAMY",1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2953,'Kvasir_Ring_Green','Kvasir Ring Green',4,0,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,136,NULL,'1',0,NULL,'bonus bMaxHP,100; skill "ECL_SADAGUI",1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2954,'Kvasir_Ring_Brown','Kvasir Ring Brown',4,10,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,136,NULL,'1',NULL,NULL,'bonus bMaxHP,100;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2956,'Safety_Ring_','Advanced Safety Ring',4,75000,NULL,100,NULL,10,NULL,1,0xFFFFFFFE,63,2,136,NULL,'50',0,0,'bonus bMdef,5; bonus bAllStats,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2957,'Good_Ring_Of_Flame_Lord','Advanced Ring Of Flame Lord',4,20,NULL,100,NULL,0,NULL,0,0x7CCFDF80,63,2,136,NULL,'85',0,0,'bonus bStr,3; bonus bVit,2; bonus bBaseAtk,20; bonus2 bSubEle,Ele_Fire,10; bonus3 bAutoSpell,"CH_SOULCOLLECT",1,30; bonus3 bAutoSpell,"MO_EXPLOSIONSPIRITS",1,10; bonus3 bAutoSpell,"PA_PRESSURE",2,30; bonus3 bAutoSpell,"MG_FIREBALL",1,150; bonus3 bAutoSpell,"KN_BOWLINGBASH",5,20;',NULL,NULL);
@@ -2194,23 +2195,23 @@ REPLACE INTO `item_db_re` VALUES (2971,'Pocket_Watch','Pocket Watch',4,10,NULL,2
REPLACE INTO `item_db_re` VALUES (2976,'Red_Lantern','Red Lantern',4,10,NULL,200,NULL,0,NULL,1,0xFFFFFFFF,63,2,136,NULL,'100',0,NULL,'bonus bMaxSP,-300; skill "MG_SIGHT",1;',NULL,'sc_end SC_SIGHT;');
REPLACE INTO `item_db_re` VALUES (2977,'Hurt_Mind','Hurt Mind',4,10,NULL,100,NULL,0,NULL,1,0xFFFFFFFF,63,2,136,NULL,'110',0,NULL,'bonus bMaxSP,200; skill "DC_SCREAM",3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2978,'KindHeart','Kind Heart',4,10,NULL,100,NULL,0,NULL,1,0xFFFFFFFF,63,2,136,NULL,'110',0,NULL,'bonus bMaxHP,500; bonus2 bHPRegenRate,300,10000; skill "DC_SCREAM",3;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2979,'Strawberry_Decoration','Strawberry Decoration',4,0,NULL,500,NULL,1,NULL,1,0xFFFFFFFF,63,2,136,NULL,NULL,0,NULL,'bonus bAllStats,1; bonus3 bAutoSpellWhenHit,"WZ_FROSTNOVA",3,10; /* Confirm: Frost Nova cast chance */',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2979,'Strawberry_Decoration','Strawberry Decoration',4,20,NULL,500,NULL,1,NULL,1,0xFFFFFFFE,63,2,136,NULL,'1',NULL,NULL,'bonus bAllStats,1; bonus3 bAutoSpellWhenHit,"WZ_FROSTNOVA",3,10; /* Confirm: Frost Nova cast chance */',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2980,'Evilspirit_Gloves','Evilspirit Gloves',4,10,NULL,100,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,136,NULL,'110',1,NULL,'bonus bMaxHP,500; bonus bMaxSP,200; skill "PF_SPIDERWEB",1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2981,'Warrior\'s_Ring','Warrior\'s Ring',4,10,NULL,200,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'160',NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2981,'RingOfHero','Warrior\'s Ring',4,10,NULL,200,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'160',NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2983,'Greed_Brooch','Greed Brooch',4,10,NULL,100,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,136,NULL,'50',1,NULL,'bonus2 bHPLossRate,10,5000;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2984,'Glove_Save_Rimnil','Glove Save Rimnil',4,10,NULL,100,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,136,NULL,'30',1,NULL,'bonus2 bExpAddRace,RC_All,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2985,'Gyges_Ring','Gyges Ring',4,10,NULL,100,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,136,NULL,'50',NULL,NULL,'bonus bInt,3; bonus bMatk,30; skill "TF_HIDING",1;',NULL,'sc_end SC_HIDING;');
REPLACE INTO `item_db_re` VALUES (2986,'Snake_Ring','Snake Ring',4,20,NULL,100,NULL,2,NULL,1,0xFFFFFFFF,63,2,136,NULL,'0',0,0,'bonus bDex,3; bonus bMdef,2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2987,'Snake_Pendant','Snake Pendant',4,20,NULL,100,NULL,3,NULL,1,0xFFFFFFFF,63,2,136,NULL,'0',0,0,'bonus bAgi,3; bonus bLuk,2; bonus bMdef,3;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2988,'Ozs_New_Wing_Ring','Oz\'s New Wing Ring',4,20,NULL,100,NULL,0,NULL,1,0x00080000,56,1,136,NULL,'130',NULL,NULL,'bonus bVariableCastrate,-25;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2989,'Bloody_Floral_Decoration_Bracelet','Bloody Floral Decoration Bracelet',4,20,NULL,100,NULL,0,NULL,1,0x00080000,56,0,136,NULL,'130',NULL,NULL,'bonus bVariableCastrate,-25;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2990,'Pendant_of_Harmony','Pendant of Harmony',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'130',NULL,NULL,'bonus bMatkRate,6; bonus bHPrecovRate,50; bonus bSPrecovRate,50; bonus2 bSubEle,Ele_Holy,5; bonus5 bAutoSpell,"AB_RENOVATIO",1,100,BF_NORMAL,0; bonus4 bAutoSpellWhenHit,"PR_SANCTUARY",3,100,0; bonus bStr,-5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2991,'Pendant_of_Chaos','Pendant of Chaos',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'130',NULL,NULL,'bonus2 bAddClass,Class_All,6; bonus2 bSubEle,Ele_Dark,5; bonus2 bResEff,Eff_Confusion,10000; bonus2 bAddEff,Eff_Confusion,500; bonus3 bAutoSpellWhenHit,"NPC_WIDECONFUSE",2,30; bonus bInt,-5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2992,'Pendant_of_Maelstrom','Pendant of Maelstrom',4,20,NULL,100,NULL,0,NULL,1,0xFFFFFFFF,63,2,136,NULL,'130',NULL,NULL,'bonus2 bAddClass,Class_All,6; bonus bMatkRate,6; bonus bAllStats,1; bonus5 bAutoSpellWhenHit,"SC_MAELSTROM",1,100,BF_MAGIC,0;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2995,'Supplement_Part_Dex','Supplement Part Dex',4,25000,NULL,100,NULL,0,NULL,1,0x00000400,56,2,136,NULL,'100',0,0,'bonus bUseSPrate,-10; bonus bDelayrate,-10; bonus bVariableCastrate,-10; bonus2 bSkillVariableCast,"NC_AXEBOOMERANG",-2000;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2996,'Reinforced_Parts_Gun_Barrel','Reinforced Parts - Gun Barrel',4,10,NULL,500,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,136,NULL,'100',NULL,NULL,'bonus2 bAddClass,Class_All,4; bonus bHit,10; bonus2 bSkillAtk,"NC_BOOSTKNUCKLE",25;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2988,'Winged_Ring_Of_Newoz','Oz\'s New Wing Ring',4,20,NULL,100,NULL,0,NULL,1,0x00080000,56,1,136,NULL,'130',NULL,NULL,'bonus bVariableCastrate,-25;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2989,'Floral_Bracelet_Of_Igu','Bloody Floral Decoration Bracelet',4,20,NULL,100,NULL,0,NULL,1,0x00080000,56,0,136,NULL,'130',NULL,NULL,'bonus bVariableCastrate,-25;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2990,'Pendant_Of_Harmony','Pendant of Harmony',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'130',NULL,NULL,'bonus bMatkRate,6; bonus bHPrecovRate,50; bonus bSPrecovRate,50; bonus2 bSubEle,Ele_Holy,5; bonus5 bAutoSpell,"AB_RENOVATIO",1,100,BF_NORMAL,0; bonus4 bAutoSpellWhenHit,"PR_SANCTUARY",3,100,0; bonus bStr,-5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2991,'Pendant_Of_Chaos','Pendant of Chaos',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'130',NULL,NULL,'bonus2 bAddClass,Class_All,6; bonus2 bSubEle,Ele_Dark,5; bonus2 bResEff,Eff_Confusion,10000; bonus2 bAddEff,Eff_Confusion,500; bonus3 bAutoSpellWhenHit,"NPC_WIDECONFUSE",2,30; bonus bInt,-5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2992,'Pendant_Of_Maelstorm','Pendant of Maelstrom',4,20,NULL,100,NULL,0,NULL,1,0xFFFFFFFF,63,2,136,NULL,'130',NULL,NULL,'bonus2 bAddClass,Class_All,6; bonus bMatkRate,6; bonus bAllStats,1; bonus5 bAutoSpellWhenHit,"SC_MAELSTROM",1,100,BF_MAGIC,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2995,'Supplement_Part_Dex','Supplement Part Dex',4,25000,NULL,100,NULL,0,NULL,1,0x00000400,56,2,136,NULL,'100',0,0,'bonus bUseSPrate,-10; bonus bDelayrate,-10; bonus bVariableCastrate,-10; bonus2 bSkillCooldown,"NC_AXEBOOMERANG",-2000;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2996,'Upgrade_Part_Gun_Barrel','Reinforced Parts - Gun Barrel',4,10,NULL,500,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,136,NULL,'100',NULL,NULL,'bonus2 bAddClass,Class_All,4; bonus bHit,10; bonus2 bSkillAtk,"NC_BOOSTKNUCKLE",25;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2997,'RWC_Gold_Brooch','RWC Gold Brooch',4,10,NULL,200,NULL,0,NULL,1,0xFFFFFFFF,63,2,136,NULL,'0',0,NULL,'bonus bBaseAtk,25; bonus bMatk,20;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2998,'Shining_Trapezohedron','Shining Trapezohedron',4,0,NULL,100,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,136,1,'90',1,NULL,'bonus2 bSubEle,Ele_Holy,10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2998,'Shining_Trapezohedron','Shining Trapezohedron',4,0,NULL,100,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,136,NULL,'90',1,NULL,'bonus2 bSubEle,Ele_Holy,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2999,'RWC_Brooch','RWC Brooch',4,10,NULL,200,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'0',0,NULL,'bonus bMaxHP,300; bonus bMaxSP,30;',NULL,NULL);
#===================================================================
# Cards
@@ -2368,7 +2369,7 @@ REPLACE INTO `item_db_re` VALUES (4150,'Goat_Card','Goat Card',6,20,NULL,10,NULL
REPLACE INTO `item_db_re` VALUES (4151,'Gajomart_Card','Gajomart Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,64,NULL,NULL,NULL,NULL,'bonus2 bSubRace,RC_Plant,-20; bonus2 bExpAddRace,RC_Plant,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4152,'Galapago_Card','Galapago Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,136,NULL,NULL,NULL,NULL,'bonus2 bAddItemGroupHealRate,IG_Juice,50; bonus3 bAddMonsterDropItem,531,RC_Insect,300; bonus3 bAddMonsterDropItem,532,RC_Insect,300; bonus3 bAddMonsterDropItem,534,RC_Insect,300;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4153,'Crab_Card','Crab Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bBaseAtk,5; bonus2 bAddDamageClass,1266,30;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4154,'Rice_Cake_Boy_Card','Dumpling Child Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,136,NULL,NULL,NULL,NULL,'bonus2 bAddItemGroupHealRate,IG_Candy,50; bonus3 bAddMonsterDropItem,529,RC_DemiHuman,300; bonus3 bAddMonsterDropItem,530,RC_DemiHuman,100; bonus3 bAddMonsterDropItem,529,RC_Player,300; bonus3 bAddMonsterDropItem,530,RC_Player,100;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4154,'Rice_Cake_Boy_Card','Dumpling Child Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,136,NULL,NULL,NULL,NULL,'bonus2 bAddItemGroupHealRate,IG_Candy,50; bonus3 bAddMonsterDropItem,529,RC_DemiHuman,300; bonus3 bAddMonsterDropItem,530,RC_DemiHuman,100;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4155,'Goblin_Leader_Card','Goblin Leader Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus2 bAddRace2,RC2_Goblin,30;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4156,'Steam_Goblin_Card','Goblin Steamrider Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bCritAtkRate,10; bonus2 bCriticalAddRace,RC_Formless,7;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4157,'Goblin_Archer_Card','Goblin Archer Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bCritAtkRate,10; bonus2 bCriticalAddRace,RC_Undead,7;',NULL,NULL);
@@ -2459,7 +2460,7 @@ REPLACE INTO `item_db_re` VALUES (4241,'Archangeling_Card','Arc Angeling Card',6
REPLACE INTO `item_db_re` VALUES (4242,'Apocalips_Card','Apocalipse Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bVit,2; if(getrefine()>8) bonus bMaxHP,800;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4243,'Antonio_Card','Antonio Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus3 bAutoSpellWhenHit,"AL_TELEPORT",1,500;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4244,'Alarm_Card','Alarm Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,64,NULL,NULL,NULL,NULL,'bonus3 bAutoSpellWhenHit,"MG_SIGHT",1,200; bonus bMaxHP,300; bonus bVit,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4245,'Am_Mut_Card','Am Mut Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,64,NULL,NULL,NULL,NULL,'bonus2 bSubRace,RC_DemiHuman,-20; bonus2 bSubRace,RC_Player,-20; bonus2 bExpAddRace,RC_DemiHuman,10; bonus2 bExpAddRace,RC_Player,10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4245,'Am_Mut_Card','Am Mut Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,64,NULL,NULL,NULL,NULL,'bonus2 bSubRace,RC_DemiHuman,-20; bonus2 bSubRace,RC_Player,-20; bonus2 bExpAddRace,RC_DemiHuman,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4246,'Assulter_Card','Assaulter Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bCritAtkRate,10; bonus2 bCriticalAddRace,RC_DemiHuman,7; bonus2 bCriticalAddRace,RC_Player,7;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4247,'Aster_Card','Aster Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bBaseAtk,5; bonus2 bAddDamageClass,1074,30;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4248,'Ancient_Mummy_Card','Ancient Mummy Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,32,NULL,NULL,NULL,NULL,'bonus3 bAutoSpellWhenHit,"AL_CRUCIS",5,30;',NULL,NULL);
@@ -2470,7 +2471,7 @@ REPLACE INTO `item_db_re` VALUES (4252,'Alligator_Card','Alligator Card',6,20,NU
REPLACE INTO `item_db_re` VALUES (4253,'Alice_Card','Alice Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,32,NULL,NULL,NULL,NULL,'bonus2 bSubClass,Class_Boss,40; bonus2 bSubClass,Class_Normal,-40;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4254,'Tirfing_Card','Ogretooth Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,32,NULL,NULL,NULL,NULL,'bonus2 bSubSize,Size_Medium,25; bonus bDef,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4255,'Orc_Lady_Card','Orc Lady Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus2 bAddRace2,RC2_Orc,30;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4256,'Orc_Archer_Card','Orc Archer Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,136,NULL,NULL,NULL,NULL,'bonus3 bAddMonsterDropItem,12034,RC_DemiHuman,100; bonus3 bAddMonsterDropItem,12034,RC_Player,100;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4256,'Orc_Archer_Card','Orc Archer Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,136,NULL,NULL,NULL,NULL,'bonus3 bAddMonsterDropItem,12034,RC_DemiHuman,100;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4257,'Wild_Rose_Card','Wild Rose Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,64,NULL,NULL,NULL,NULL,'bonus bAgi,1; if(BaseClass==Job_Thief) bonus bFlee2,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4258,'Wicked_Nymph_Card','Evil Nymph Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,769,NULL,NULL,NULL,NULL,'bonus bInt,1; bonus bMaxSP,50;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4259,'Wooden_Golem_Card','Wooden Golem Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bDef,1; bonus bHPrecovRate,30;',NULL,NULL);
@@ -2523,7 +2524,7 @@ REPLACE INTO `item_db_re` VALUES (4305,'Turtle_General_Card','Turtle General Car
REPLACE INTO `item_db_re` VALUES (4306,'Toad_Card','Toad Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,4,NULL,NULL,NULL,NULL,'bonus bFlee2,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4307,'Kind_Of_Beetle_Card','Beetle King Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus2 bSPGainRace,RC_Fish,5;',NULL,'heal 0,-5;');
REPLACE INTO `item_db_re` VALUES (4308,'Tri_Joint_Card','Tri Joint Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus2 bSPGainRace,RC_Formless,5;',NULL,'heal 0,-5;');
-REPLACE INTO `item_db_re` VALUES (4309,'Parasite_Card','Parasite Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,32,NULL,NULL,NULL,NULL,'bonus bDef,1; bonus2 bSubEle,Ele_Neutral,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4309,'Parasite_Card','Parasite Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,32,NULL,NULL,NULL,NULL,'bonus bDef,1; bonus2 bSubRace,RC_Formless,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4310,'Panzer_Goblin_Card','Panzer Goblin Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bCritAtkRate,10; bonus2 bCriticalAddRace,RC_Demon,7;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4311,'Permeter_Card','Permeter Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,769,NULL,NULL,NULL,NULL,'bonus2 bSubEle,Ele_Dark,15; bonus2 bSubEle,Ele_Undead,15;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4312,'Fur_Seal_Card','Seal Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bFlee,3; bonus bHit,10; if(BaseClass==Job_Acolyte) { bonus2 bCriticalAddRace,RC_Undead,9; bonus2 bCriticalAddRace,RC_Demon,9; }',NULL,NULL);
@@ -2676,8 +2677,8 @@ REPLACE INTO `item_db_re` VALUES (4458,'Duneirre_Card','Duneyrr Card',6,20,NULL,
REPLACE INTO `item_db_re` VALUES (4459,'Lata_Card','Rata Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,769,NULL,NULL,NULL,NULL,'bonus bMatk,10; autobonus "{ bonus bFixedCastrate,-50; }",5,4000,BF_MAGIC,"{ specialeffect2 EF_SUFFRAGIUM; }";',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4460,'Ringco_Card','Rhyncho Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,769,NULL,NULL,NULL,NULL,'bonus bHealPower,4; bonus2 bSkillUseSP,"AL_HEAL",-15;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4461,'Pillar_Card','Phylla Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,769,NULL,NULL,NULL,NULL,'bonus bDex,1; bonus bAgi,1; autobonus "{ bonus bCritical,20; }",15,4000,0,"{ specialeffect2 EF_ENHANCE; }";',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4462,'Hardrock_Mammos_Card','Hardrock Mammoth Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'.@r = getrefine(); bonus bDef,5; if(.@r>=12) { bonus bDef,20; bonus bMaxHPrate,10; } if(.@r>=14) { bonus bMaxHPrate,3; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4463,'Tendrilrion_Card','Tendrilrion Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bCritical,5; .@r = getrefine(); if(.@r>=12) { bonus bBaseAtk,35; } if(.@r>=14) { bonus bCritical,10; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4462,'Hardrock_Mommos_Card','Hardrock Mammoth Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'.@r = getrefine(); bonus bDef,5; if(.@r>=12) { bonus bDef,20; bonus bMaxHPrate,10; } if(.@r>=14) { bonus bMaxHPrate,3; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4463,'Tendrilion_Card','Tendrilrion Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bCritical,5; .@r = getrefine(); if(.@r>=12) { bonus bBaseAtk,35; } if(.@r>=14) { bonus bCritical,10; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4464,'Aunoe_Card','Aunoe Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bCritAtkRate,20;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4465,'Panat_Card','Fanat Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bBaseAtk,10; if(getiteminfo(getequipid(EQI_HAND_R),11)==W_2HSWORD) { .@r = getrefine(); if(.@r>=10) { bonus bAspd,1; } if(.@r>=14) { bonus bAspd,1; } }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4466,'Beholder_Master_Card','Beholder Master Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bLongAtkRate,3; if(getiteminfo(getequipid(EQI_HAND_R),11)==W_BOW) { .@r = getrefine(); if(.@r>=10) { bonus bAspd,1; } if(.@r>=14) { bonus bAspd,1; } }',NULL,NULL);
@@ -2761,8 +2762,8 @@ REPLACE INTO `item_db_re` VALUES (4543,'SLD_Garm_Card','Sealed Hatii Card',6,20,
REPLACE INTO `item_db_re` VALUES (4544,'SLD_Dark_Snake_Card','Sealed Evil Snake Lord Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,769,NULL,NULL,NULL,NULL,'bonus bInt,3; .@i = (getrefine()>14?7500:5000); bonus2 bResEff,Eff_Blind,.@i; bonus2 bResEff,Eff_Curse,.@i;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4545,'Novice_Poring_Card','Novice Poring Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,769,NULL,NULL,NULL,NULL,'bonus bLuk,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4546,'Val\'khiri_Card','Val\'khiri Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4547,'Enhanced_Byorgue_Card','Enhanced Byorgue Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'if(BaseJob==Job_Rogue) { bonus bMatkRate,10; bonus2 bAddClass,Class_All,10; bonus bMaxHPrate,getrefine()/2; } /* Adds a chance of inflicting Confuse on target when using Body Paint skill. */',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4548,'Enhanced_Salamander_Card','Enhanced Salamander Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,4,NULL,NULL,NULL,NULL,'bonus2 bSkillAtk,"WZ_FIREPILLAR",40; bonus2 bSkillAtk,"WZ_METEOR",40;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4547,'Upd_Byorgue_Card','Enhanced Byorgue Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'if(BaseJob==Job_Rogue) { bonus bMatkRate,10; bonus2 bAddClass,Class_All,10; bonus bMaxHPrate,getrefine()/2; } /* Adds a chance of inflicting Confuse on target when using Body Paint skill. */',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4548,'Upd_Salamander_Card','Enhanced Salamander Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,4,NULL,NULL,NULL,NULL,'bonus2 bSkillAtk,"WZ_FIREPILLAR",40; bonus2 bSkillAtk,"WZ_METEOR",40;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4549,'Upd_Maya_Puple_Card','Upd Maya Puple Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,769,NULL,NULL,NULL,NULL,'bonus bIntravision,1; bonus bAllStats,1; skill "AL_RUWACH",1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4550,'Upd_Bow_Guardian_Card','Upd Bow Guardian Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'if(getiteminfo(getequipid(EQI_HAND_R),11)==W_BOW) { bonus2 bSkillAtk,"RA_ARROWSTORM",50; bonus bCriticalLong,25+10*(getequiprefinerycnt(EQI_HAND_R)/4); bonus bHit,5; bonus3 bAutoSpell,"HT_PHANTASMIC",1,100; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4552,'Manny_Card','Manny Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,136,NULL,NULL,NULL,NULL,'bonus bMaxHP,10;',NULL,NULL);
@@ -2770,17 +2771,17 @@ REPLACE INTO `item_db_re` VALUES (4553,'Sid_Card','Sid Card',6,20,NULL,10,NULL,N
REPLACE INTO `item_db_re` VALUES (4554,'Diego_Card','Diego Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,4,NULL,NULL,NULL,NULL,'bonus bMaxHP,100;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4555,'Scrat_Card','Scrat Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,769,NULL,NULL,NULL,NULL,'bonus bMaxHP,100;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4556,'Fenrir_Card','Fenrir Card',6,10,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,769,NULL,NULL,NULL,NULL,'bonus bMatk,50+getrefine()*5; bonus bFixedCastrate,-70;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4557,'Weakened_Fenrir_Card','Weakened Fenrir Card',6,10,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,769,NULL,NULL,NULL,NULL,'bonus bMatk,25;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4559,'Evil_Morocc_Card','Evil Morocc Card',6,20,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,NULL,64,NULL,NULL,NULL,NULL,'bonus bAspd,1; bonus bMaxSPrate,-10;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4560,'Clown_Alphoccio_Card','Clown Alphoccio Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'skill "BA_POEMBRAGI",10; bonus bFlee,(readparam(bVit)>=110)?40:20;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4561,'Professor_Celia_Card','Professor Celia Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bMatkRate,(readparam(bDex)>=110)?14:7; bonus5 bAutoSpellWhenHit,"SA_LANDPROTECTOR",5,70,BF_MAGIC,0;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4562,'Champion_Chen_Card','Champion Chen Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus2 bAddClass,Class_All,(readparam(bAgi)>=110)?14:7; bonus5 bAutoSpellWhenHit,"MO_INVESTIGATE",5,70,BF_WEAPON,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4563,'Creator_Flamel_Card','Creator Flamel Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bCritical,(readparam(bStr)>=110)?40:20; bonus5 bAutoSpellWhenHit,"AM_ACIDTERROR",5,70,BF_WEAPON,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4564,'Stalker_Gertie_Card','Stalker Gertie Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bHit,(readparam(bLuk)>=110)?40:20; bonus5 bAutoSpellWhenHit,"ST_FULLSTRIP",1,70,BF_WEAPON,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4565,'Paladin_Randel_Card','Paladin Randel Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bMaxHPrate,(readparam(bLuk)>=110)?20:10; bonus5 bAutoSpellWhenHit,"CR_GRANDCROSS",10,70,BF_WEAPON,0;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4566,'Gypsy_Trentini_Card','Gypsy Trentini Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'skill "DC_FORTUNEKISS",10; bonus bFlee,(readparam(bVit)>=110)?40:20;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4557,'Fenrir_Card_','Weakened Fenrir Card',6,10,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,769,NULL,NULL,NULL,NULL,'bonus bMatk,25;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4559,'M_Morocc_Card','Evil Morocc Card',6,20,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,NULL,64,NULL,NULL,NULL,NULL,'bonus bAspd,1; bonus bMaxSPrate,-10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4560,'Clown_Card','Clown Alphoccio Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'skill "BA_POEMBRAGI",10; bonus bFlee,(readparam(bVit)>=110)?40:20;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4561,'Professor_Card','Professor Celia Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bMatkRate,(readparam(bDex)>=110)?14:7; bonus5 bAutoSpellWhenHit,"SA_LANDPROTECTOR",5,70,BF_MAGIC,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4562,'Champion_Card','Champion Chen Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus2 bAddClass,Class_All,(readparam(bAgi)>=110)?14:7; bonus5 bAutoSpellWhenHit,"MO_INVESTIGATE",5,70,BF_WEAPON,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4563,'Creator_Card','Creator Flamel Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bCritical,(readparam(bStr)>=110)?40:20; bonus5 bAutoSpellWhenHit,"AM_ACIDTERROR",5,70,BF_WEAPON,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4564,'Stalker_Card','Stalker Gertie Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bHit,(readparam(bLuk)>=110)?40:20; bonus5 bAutoSpellWhenHit,"ST_FULLSTRIP",1,70,BF_WEAPON,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4565,'Paladin_Card','Paladin Randel Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bMaxHPrate,(readparam(bLuk)>=110)?20:10; bonus5 bAutoSpellWhenHit,"CR_GRANDCROSS",10,70,BF_WEAPON,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4566,'Gypsy_Card','Gypsy Trentini Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'skill "DC_FORTUNEKISS",10; bonus bFlee,(readparam(bVit)>=110)?40:20;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4567,'Alphoccio_Card','Alphoccio Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,4,NULL,NULL,NULL,NULL,'bonus bFlee,10; if(BaseJob==Job_Bard) { bonus bMaxHPrate,10; bonus bMaxSPrate,5;}',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4568,'Celia_Card','Celia Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,4,NULL,NULL,NULL,NULL,'bonus bFlee,10; skill "SA_ABRACADABRA",1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4568,'Ceila_Card','Celia Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,4,NULL,NULL,NULL,NULL,'bonus bFlee,10; skill "SA_ABRACADABRA",1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4569,'Chen_Card','Chen Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,4,NULL,NULL,NULL,NULL,'bonus bFlee,10; skill "MO_CALLSPIRITS",2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4570,'Flamel_Card','Flamel Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,4,NULL,NULL,NULL,NULL,'bonus bFlee,10; bonus2 bAddItemGroupHealRate,IG_Flamel_Card,200;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4571,'Gertie_Card','Gertie Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,4,NULL,NULL,NULL,NULL,'bonus bFlee,10; skill "RG_CLOSECONFINE",1;',NULL,NULL);
@@ -2791,9 +2792,9 @@ REPLACE INTO `item_db_re` VALUES (4575,'Soheon_Card','Armed Guard Soheon Card',6
REPLACE INTO `item_db_re` VALUES (4576,'Gioia_Card','Gioia Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,4,NULL,NULL,NULL,NULL,'bonus2 bMagicAtkEle,Ele_Wind,100; bonus2 bMagicAtkEle,Ele_Ghost,100; bonus2 bSubEle,Ele_All,-30;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4577,'Elvira_Card','Elvira Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,136,NULL,NULL,NULL,NULL,'bonus2 bMagicAtkEle,Ele_Wind,20; bonus2 bMagicAtkEle,Ele_Ghost,20;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4578,'Pyuriel_Card','Angry Student Pyuriel Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bCritAtkRate,30; bonus2 bSubRace,RC_All,-10; bonus2 bSubRace,RC_Player,10;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4579,'Lola_Card','Warrior Lola Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'if(getiteminfo(getequipid(EQI_HAND_R),11) == W_MACE) { bonus bBaseAtk,20; bonus bCritical,10; } .@r = getrefine(); bonus bBaseAtk,.@r; bonus bCritical,.@r;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4579,'Lora_Card','Warrior Lola Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'if(getiteminfo(getequipid(EQI_HAND_R),11) == W_MACE) { bonus bBaseAtk,20; bonus bCritical,10; } .@r = getrefine(); bonus bBaseAtk,.@r; bonus bCritical,.@r;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4580,'Kades_Card','Dark Guardian Kades Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,4,NULL,NULL,NULL,NULL,'bonus2 bSubEle,Ele_Water,50; bonus2 bSubEle,Ele_Earth,50; bonus2 bSubEle,Ele_Fire,50; bonus2 bSubEle,Ele_Wind,50; bonus2 bSubEle,Ele_Dark,50; bonus2 bSubEle,Ele_Undead,50; bonus2 bSubEle,Ele_Holy,-100; bonus2 bSubEle,Ele_Ghost,-100;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4581,'Rudo_Card','Rudo Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,64,NULL,NULL,NULL,NULL,'autobonus "{ sc_start SC_SPEEDUP1,3000,50; bonus bAgi,44; heal 0,-40; }",3,3000,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4581,'Rudo_Card','Rudo Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,64,NULL,NULL,NULL,NULL,'autobonus "{ bonus bAgi,44; heal 0,-40; }",500,3000,0,"{ sc_start SC_SPEEDUP1,3000,50; }";',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4582,'Bungisngis_Card','Bungisngis Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,769,NULL,NULL,NULL,NULL,'bonus bMaxHPrate,(getrefine()/2);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4583,'Engkanto_Card','Engkanto Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,769,NULL,NULL,NULL,NULL,'bonus2 bAddEle,Ele_Poison,30; bonus2 bMagicAddEle,Ele_Poison,30; bonus2 bIgnoreDefRaceRate,RC_Plant,30;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4584,'Manananggal_Card','Manananggal Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bSPDrainValue,1; bonus bMaxSPrate,-1;',NULL,NULL);
@@ -2810,13 +2811,13 @@ REPLACE INTO `item_db_re` VALUES (4594,'Petal_Card','Petal Card',6,20,NULL,10,NU
REPLACE INTO `item_db_re` VALUES (4595,'Cenere_Card','Cenere Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,4,NULL,NULL,NULL,NULL,'bonus bAspdRate,2*(readparam(bAgi)/10);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4596,'AntiqueBook_Card','Antique Book Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,4,NULL,NULL,NULL,NULL,'bonus bMatk,5*(readparam(bInt)/10);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4597,'LichternB_Card','Lichtern Blue Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,769,NULL,NULL,NULL,NULL,'bonus bMatk,10; bonus2 bMagicAtkEle,Ele_Water,(getrefine()>=9)?10:5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4598,'LichternG_Card','Lichtern Green Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,769,NULL,NULL,NULL,NULL,'bonus bMatk,10; bonus2 bMagicAtkEle,Ele_Ghost,(getrefine()>=9)?10:5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4598,'LichternY_Card','Lichtern Green Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,769,NULL,NULL,NULL,NULL,'bonus bMatk,10; bonus2 bMagicAtkEle,Ele_Ghost,(getrefine()>=9)?10:5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4599,'LichternR_Card','Lichtern Red Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,769,NULL,NULL,NULL,NULL,'bonus bMatk,10; bonus2 bMagicAtkEle,Ele_Fire,(getrefine()>=9)?10:5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4600,'LichternY_Card','Lichtern Yellow Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,769,NULL,NULL,NULL,NULL,'bonus bMatk,10; bonus2 bMagicAtkEle,Ele_Earth,(getrefine()>=9)?10:5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4600,'LichternG_Card','Lichtern Yellow Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,769,NULL,NULL,NULL,NULL,'bonus bMatk,10; bonus2 bMagicAtkEle,Ele_Earth,(getrefine()>=9)?10:5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4601,'Amdarais_Card','Amdarais Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus2 bAddClass,Class_All,15; bonus bMatkRate,15; bonus2 bHPLossRate,666,4000; bonus2 bSPLossRate,66,4000;',NULL,'heal -6666,-666;');
REPLACE INTO `item_db_re` VALUES (4602,'AmdaraisH_Card','Realized Amdarais Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus2 bAddClass,Class_All,20; bonus bMatkRate,20; bonus2 bHPLossRate,666,6000; bonus2 bSPLossRate,66,6000;',NULL,'heal -6666,-666;');
-REPLACE INTO `item_db_re` VALUES (4603,'Corruption_Root_Card','Corruption Root Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bBaseAtk,20; bonus5 bAutoSpell,"NPC_WIDESTONE",1,70,BF_WEAPON,0; bonus5 bAutoSpell,"NPC_WIDESLEEP",1,70,BF_WEAPON,0; bonus5 bAutoSpell,"NPC_WIDECURSE",1,70,BF_WEAPON,0;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4604,'Realized_Corruption_Root_Card','Realized Corruption Root Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bBaseAtk,30; bonus5 bAutoSpell,"NPC_WIDESTONE",2,70,BF_WEAPON,0; bonus5 bAutoSpell,"NPC_WIDESLEEP",2,70,BF_WEAPON,0; bonus5 bAutoSpell,"NPC_WIDECURSE",2,70,BF_WEAPON,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4603,'CorruptionRoot_Card','Corruption Root Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bBaseAtk,20; bonus5 bAutoSpell,"NPC_WIDESTONE",1,70,BF_WEAPON,0; bonus5 bAutoSpell,"NPC_WIDESLEEP",1,70,BF_WEAPON,0; bonus5 bAutoSpell,"NPC_WIDECURSE",1,70,BF_WEAPON,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4604,'CorruptionRootH_Card','Realized Corruption Root Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bBaseAtk,30; bonus5 bAutoSpell,"NPC_WIDESTONE",2,70,BF_WEAPON,0; bonus5 bAutoSpell,"NPC_WIDESLEEP",2,70,BF_WEAPON,0; bonus5 bAutoSpell,"NPC_WIDECURSE",2,70,BF_WEAPON,0;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4605,'UndeadKnightM_Card','Agony Of Royal Knight Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bMaxHPrate,-44; bonus bHPGainValue,200+10*getrefine();',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4606,'UndeadKnightF_Card','Grudge of Royal Knight Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,4,NULL,NULL,NULL,NULL,'bonus bMaxSPrate,-44; bonus bSPGainValue,20+(getrefine()/2);',NULL,'heal 0,-444;');
REPLACE INTO `item_db_re` VALUES (4607,'FaithfulManager_Card','Faithful Manager Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bBaseAtk,5; bonus bMatk,5; if(getiteminfo(getequipid(EQI_HAND_R),11) == W_BOOK) { .@r = getrefine(); if(.@r>=10) { bonus bBaseAtk,20; bonus bMatk,20; } if(.@r>=14) { bonus bBaseAtk,20; bonus bMatk,20; } }',NULL,NULL);
@@ -2887,7 +2888,7 @@ REPLACE INTO `item_db_re` VALUES (4685,'V_B_Magaleta_Card','True Margaretha Sori
REPLACE INTO `item_db_re` VALUES (4686,'V_B_Katrinn_Card','True Kathryne Keyron Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'if(getrefine() > 9) .@b+=20; if(getequipweaponlv(-1) == 4) .@b += 20; bonus2 bSkillAtk,"WL_CRIMSONROCK",20+.@b;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4687,'V_B_Shecil_Card','True Cecil Damon Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'if(getrefine() > 9) .@b+=20; if(getequipweaponlv(-1) == 4) .@b += 20; bonus2 bSkillAtk,"RA_CLUSTERBOMB",20+.@b;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4688,'V_B_Harword_Card','True Howard Alt-Eisen Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'if(getrefine() > 9) .@b+=20; if(getequipweaponlv(-1) == 4) .@b += 20; bonus2 bSkillAtk,"NC_AXETORNADO",20+.@b;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4689,'V_B_Seyren_Card','True Seyren Windsor Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'if(getrefine() > 9) .@b+=20; if(getequipweaponlv(-1) == 4) .@b += 20; bonus2 bSkillAtk,"LK_IGNITIONBREAK",20+.@b;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4689,'V_B_Seyren_Card','True Seyren Windsor Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'if(getrefine() > 9) .@b+=20; if(getequipweaponlv(-1) == 4) .@b += 20; bonus2 bSkillAtk,"RK_IGNITIONBREAK",20+.@b;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4690,'V_B_Randel_Card','True Randel Lawrence Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'if(getrefine() > 9) .@b+=20; if(getequipweaponlv(-1) == 4) .@b += 20; bonus2 bSkillAtk,"LG_EARTHDRIVE",20+.@b;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4691,'V_B_Flamel_Card','True Flamel Emure Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'if(getrefine() > 9) .@b+=20; if(getequipweaponlv(-1) == 4) .@b += 20; bonus2 bSkillAtk,"GN_CART_TORNADO",20+.@b;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4692,'V_B_Celia_Card','True Celia Alde Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'if(getrefine() > 9) .@b+=20; if(getequipweaponlv(-1) == 4) .@b += 20; bonus2 bSkillAtk,"SO_VARETYR_SPEAR",20+.@b;',NULL,NULL);
@@ -3077,14 +3078,14 @@ REPLACE INTO `item_db_re` VALUES (4872,'Attack_Delay_2','DelayafterAttack2Lv',6,
REPLACE INTO `item_db_re` VALUES (4873,'Attack_Delay_3','DelayafterAttack3Lv',6,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bAspdRate,8;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4875,'Bear\'s_Power','Bear\'s Power',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'autobonus2 "{ bonus bStr,200; bonus2 bHPLossRate,500,1000; }",20,5000,BF_WEAPON,"{ active_transform 1060,5000; specialeffect2 EF_POTION_BERSERK; showscript \\\"Bigfoot Power !\\\"; }";',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4876,'Runaway_Magic','Runaway Magic',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'autobonus "{ bonus bInt,200; bonus2 bSPLossRate,200,1000; }",10,10000,BF_MAGIC,"{ specialeffect2 EF_LAMADAN; }";',NULL,'heal 0,-2000;');
-REPLACE INTO `item_db_re` VALUES (4877,'Speed_of_Light','Speed of Light',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'/*TODO: Confirm the rate*/ autobonus "{ bonus bAspdRate,100; bonus bFlee,100; bonus2 bHPLossRate,400,1000; bonus2 bSPLossRate,50,1000;}",10,5000,BF_WEAPON,"{ specialeffect2 EF_AGIUP2; }";',NULL,'heal 0,-300;');
+REPLACE INTO `item_db_re` VALUES (4877,'Speed_Of_Light','Speed of Light',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'/*TODO: Confirm the rate*/ autobonus "{ bonus bAspdRate,100; bonus bFlee,100; bonus2 bHPLossRate,400,1000; bonus2 bSPLossRate,50,1000;}",10,5000,BF_WEAPON,"{ specialeffect2 EF_AGIUP2; }";',NULL,'heal 0,-300;');
REPLACE INTO `item_db_re` VALUES (4878,'Muscle_Fool','Muscle Fool',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'autobonus2 "{ bonus bDef,1000; bonus2 bAddRace,RC_All,-50; bonus bMatkRate,-50; }",10,5000,BF_WEAPON,"{ specialeffect2 EF_GUARD3; }";',NULL,'heal 0,-300;');
REPLACE INTO `item_db_re` VALUES (4879,'Hawkeye','Hawkeye',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'autobonus "{ bonus bDex,200; bonus2 bSPLossRate,50,1000; }",10,5000,BF_WEAPON,"{ specialeffect2 EF_BASH3D6; }";',NULL,'heal 0,-300;');
REPLACE INTO `item_db_re` VALUES (4880,'Lucky_Day','Lucky Day',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'autobonus "{ bonus bLuk,200; }",10,5000,BF_WEAPON|BF_MAGIC,"{ specialeffect2 EF_DANCE_BLADE_ATK; }";',NULL,'heal 0,-300;');
REPLACE INTO `item_db_re` VALUES (4881,'Attack_Delay_4','Attack Delay 4',6,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bAspdRate,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4882,'Atk1p','ATK + 1%',6,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus2 bAddClass,Class_All,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4883,'Matk1p','MATK + 1%',6,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bMatkRate,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4884,'Hit1_','HIT + 1',6,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bHit,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4884,'HIT1','HIT + 1',6,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bHit,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4885,'Conjure1','Spell 1',6,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bMatk,5; bonus bVariableCastrate,-3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4886,'Conjure2','Spell 2',6,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bMatk,10; bonus bVariableCastrate,-3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4887,'Conjure3','Spell 3',6,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bMatk,15; bonus bVariableCastrate,-3;',NULL,NULL);
@@ -3125,7 +3126,7 @@ REPLACE INTO `item_db_re` VALUES (4922,'Artful3','Darklord Essence Concentration
REPLACE INTO `item_db_re` VALUES (4923,'Fortune1','Darklord Essence Luck1',6,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1023,NULL,NULL,NULL,NULL,'bonus bLuk,1; bonus bCritical,1; bonus bDex,-1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4924,'Fortune2','Darklord Essence Luck2',6,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1023,NULL,NULL,NULL,NULL,'bonus bLuk,2; bonus bCritical,2; bonus bDex,-2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4925,'Fortune3','Darklord Essence Luck3',6,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1023,NULL,NULL,NULL,NULL,'bonus bLuk,4; bonus bCritical,4; bonus bDex,-4;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4926,'Critical_Lv1','Cri 1Lv',6,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bCritical,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4926,'Critical1','Cri 1Lv',6,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bCritical,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4927,'HP50','MaxHP50',6,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bMaxHP,50;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4928,'SP10','MaxSP+10',6,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bMaxSP,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4929,'MSP1','MSP+1%',6,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bMaxSPrate,1;',NULL,NULL);
@@ -3139,7 +3140,7 @@ REPLACE INTO `item_db_re` VALUES (4936,'ATK_BIG1','Attack big1',6,20,NULL,10,NUL
REPLACE INTO `item_db_re` VALUES (4937,'ATK_MEDIUM1','Attack mid1',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus2 bAddSize,Size_Medium,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4938,'ATK_SMALL1','Attack small1',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus2 bAddSize,Size_Small,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4939,'Critical2','CRI Lv2',6,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bCritical,2;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4940,'Cricital3','CRI Lv3',6,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bCritical,4;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4940,'Critical3','CRI Lv3',6,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bCritical,4;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4941,'Critical4','CRI Lv4',6,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bCritical,6;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4942,'Dodge1','Parrying Lv1',6,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bFlee2,2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4943,'Dodge2','Parrying Lv2',6,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bFlee2,4;',NULL,NULL);
@@ -3150,6 +3151,55 @@ REPLACE INTO `item_db_re` VALUES (4947,'Thrift3','Economy Lv3',6,10,NULL,0,NULL,
REPLACE INTO `item_db_re` VALUES (4948,'Skill_Delay1','After Skill Delay Lv1',6,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bDelayrate,-2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4949,'Skill_Delay2','After Skill Delay Lv2',6,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bDelayrate,-4;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (4950,'Skill_Delay3','After Skill Delay Lv3',6,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bDelayrate,-6;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4951,'Darkness_Drop','Darkness Drop',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus2 bAddEle,Ele_Dark,2; bonus2 bMagicAtkEle,Ele_Dark,2; bonus2 bSubEle,Ele_Dark,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4952,'Fire_Drop','Fire Drop',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus2 bAddEle,Ele_Fire,2; bonus2 bMagicAtkEle,Ele_Fire,2; bonus2 bSubEle,Ele_Fire,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4953,'Water_Drop','Water Drop',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus2 bAddEle,Ele_Water,2; bonus2 bMagicAtkEle,Ele_Water,2; bonus2 bSubEle,Ele_Water,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4954,'Earth_Drop','Earth Drop',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus2 bAddEle,Ele_Earth,2; bonus2 bMagicAtkEle,Ele_Earth,2; bonus2 bSubEle,Ele_Earth,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4955,'Holy_Drop','Holy Drop',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus2 bAddEle,Ele_Holy,2; bonus2 bMagicAtkEle,Ele_Holy,2; bonus2 bSubEle,Ele_Holy,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4956,'Recovery_Drop','Recovery Drop',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'setarray .@skills$, "AL_HEAL", "PR_SANCTUARY", "AM_POTIONPITCHER", "AB_HIGHNESSHEAL", "AB_CHEAL"; for( .@i = 0; .@i < getarraysize(.@skills$); .@i++ ){ bonus2 bSkillHeal,.@skills$[.@i],2; bonus2 bSkillHeal2,.@skills$[.@i],2; } /* TODO: Depending on some recovery items HP recovery amount + 2% */',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4957,'Famitsus_Power','Famitsu\'s Power',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bMaxHP,832;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4958,'Gemini','Gemini',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bDelayrate,-1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4959,'Sagittarius','Sagittarius',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bLongAtkRate,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4960,'Aquarius','Aquarius',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bUseSPrate,-2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4961,'Aries','Aries',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bMatk,10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4962,'Cancer','Cancer',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bAtk,3;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4963,'Taurus','Taurus',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bAtk,4; bonus bHit,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4964,'Capricorn','Capricorn',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus2 bMagicAddRace,RC_All,3;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4965,'Pisces','Pisces',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bVariableCastrate,-2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4966,'Scorpio','Scorpio',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus2 bAddRace,RC_All,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4967,'Leo','Leo',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bAspdRate,3;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4968,'Virgo','Virgo',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'setarray .@skills$, "AL_HEAL", "PR_SANCTUARY", "AM_POTIONPITCHER", "AB_HIGHNESSHEAL", "AB_CHEAL"; for( .@i = 0; .@i < getarraysize(.@skills$); .@i++ ){ bonus2 bSkillHeal,.@skills$[.@i],1; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4969,'Libra','Libra',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'setarray .@skills$, "AL_HEAL", "PR_SANCTUARY", "AM_POTIONPITCHER", "AB_HIGHNESSHEAL", "AB_CHEAL"; for( .@i = 0; .@i < getarraysize(.@skills$); .@i++ ){ bonus2 bSkillHeal2,.@skills$[.@i],1; } /* TODO: Depending on some recovery items HP recovery amount + 1% */',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4970,'Fire_Property_Reactor','Fire Property Reactor',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bDefEle,Ele_Fire;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4971,'Water_Property_Reactor','Water Property Reactor',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bDefEle,Ele_Water;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4972,'Earth_Property_Reactor','Earth Property Reactor',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bDefEle,Ele_Earth;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4973,'Wind_Property_Reactor','Wind Property Reactor',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bDefEle,Ele_Wind;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4974,'Fire_Resistance_Reactor','Fire Resistance Reactor',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus2 bSubEle,Ele_Fire,25; bonus2 bSubEle,Ele_Water,-25;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4975,'Water_Resistance_Reactor','Water Resistance Reactor',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus2 bSubEle,Ele_Water,25; bonus2 bSubEle,Ele_Wind,-25;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4976,'Earth_Resistance_Reactor','Earth Resistance Reactor',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus2 bSubEle,Ele_Earth,25; bonus2 bSubEle,Ele_Fire,-25;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4977,'Wind_Resistance_Reactor','Wind Resistance Reactor',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus2 bSubEle,Ele_Wind,25; bonus2 bSubEle,Ele_Earth,-25;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4978,'Recovery_Reactor_101','Recovery Reactor 101',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'if (getrefine()>=7) bonus2 bHPRegenRate,100,5000; else bonus2 bHPRegenRate,50,5000;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4979,'Recovery_Reactor_102','Recovery Reactor 102',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'if (getrefine()>=7) bonus2 bSPRegenRate,5,5000; else bonus2 bHPRegenRate,3,5000;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4980,'Recovery_Reactor_201','Recovery Reactor 201',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'if (getrefine()>=7) bonus2 bRegenPercentHP,100,5000; else bonus2 bRegenPercentHP,50,5000;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4981,'Recovery_Reactor_202','Recovery Reactor 202',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'if (getrefine()>=7) bonus2 bRegenPercentSP,100,5000; else bonus2 bRegenPercentSP,50,5000;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4982,'STR_Supplement_Reactor','STR Supplement Reactor',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'if (getrefine()>=7) { .@bonus = 10; } bonus bBaseAtk,.@bonus + 5*(readparam(bStr)/10);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4983,'INT_Supplement_Reactor','INT Supplement Reactor',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'if (getrefine()>=7) { .@bonus = 10; } bonus bMatk,.@bonus + 5*(readparam(bInt)/10);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4984,'DEF_Supplement_Reactor','DEF SupplementReactor',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bDef,100;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4985,'PD_Supplement_Reactor','PD Supplement Reactor',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bFlee2,3;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4986,'Attack_Supplement_Reactor','Attack Supplement Reactor',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bBaseAtk,20;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4987,'Magic_Supplement_Reactor','Magic Supplement Reactor',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bMatk,20;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4988,'HP_Supplement_Reactor','HP Supplement Reactor',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bMaxHPrate,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4989,'SP_Supplement_Reactor','SP Supplement Reactor',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bMaxSPrate,3;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4990,'Frozen_Supplement_Reactor','Frozen Supplement Reactor',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus2 bResEff,Eff_Freeze,10000;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4991,'ASPD_Supplement_Reactor','ASPD Supplement Reactor',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bAspd,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4992,'HPAbsorb1_Supplement_Reactor','HP Absorb Supplement Reactor',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus2 bHPDrainRate,10,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4993,'SPAbsorb1_Supplement_Reactor','SP Absorb Supplement Reactor',6,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus2 bSPDrainRate,10,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4994,'Rune_of_Strength_Lv_1','Rune of Strength Lv 1',6,20,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'.@r = getrefine(); if (.@r>=7) { bonus bStr,5; } if (.@r>=10) { bonus bAtkRate,5; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4995,'Rune_of_Strength_Lv_2','Rune of Strength Lv 2',6,20,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'.@r = getrefine(); if (.@r>=7) { bonus bStr,6; } if (.@r>=11) { bonus bStr,1; bonus bAtkRate,7; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4996,'Rune_of_Strength_Lv_3','Rune of Strength_Lv 3',6,20,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'.@r = getrefine(); if (.@r>=7) { bonus bStr,7; } if (.@r>=12) { bonus bStr,1; bonus bAtkRate,8; } if (.@r>=13) { bonus bStr,1; bonus bAtkRate,2; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4997,'Rune_of_Agility_Lv_1','Rune of Agility Lv 1',6,20,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'.@r = getrefine(); if (.@r>=7) { bonus bAgi,5; } if (.@r>=10) { bonus bFlee2,5; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4998,'Rune_of_Agility_Lv_2','Rune of Agility Lv 2',6,20,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'.@r = getrefine(); if (.@r>=7) { bonus bAgi,6; } if (.@r>=11) { bonus bAgi,1; bonus bFlee2,7; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4999,'Rune_of_Agility_Lv_3','Rune of Agility Lv 3',6,20,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'.@r = getrefine(); if (.@r>=7) { bonus bAgi,7; } if (.@r>=12) { bonus bAgi,1; bonus bFlee2,5; } if (.@r>=13) { bonus bAgi,1; bonus bFlee2,5; }',NULL,NULL);
#===================================================================
# More Headgears
#===================================================================
@@ -3354,7 +3404,7 @@ REPLACE INTO `item_db_re` VALUES (5198,'Drooping_Bunny','Drooping Bunny',4,10,NU
REPLACE INTO `item_db_re` VALUES (5199,'Baseball_Cap_I','Baseball Cap',4,0,NULL,200,NULL,3,NULL,0,0xFFFFFFFF,63,2,256,NULL,'0',1,216,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5200,'Coppola','Coppola',4,10,NULL,300,NULL,0,NULL,0,0xFFFFFFFF,63,2,256,NULL,'0',1,252,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5201,'Party_Hat_B','Party Hat',4,20,NULL,300,NULL,4,NULL,0,0xFFFFFFFF,63,2,256,NULL,'0',1,144,'bonus bAllStats,3;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5202,'Pumpkin_Hat_','Fantastic Pumpkin-Head',4,20,NULL,200,NULL,3,NULL,0,0xFFFFFFFF,63,2,256,NULL,'0',1,206,'bonus2 bSubRace,RC_Demon,5; bonus3 bAddMonsterDropItem,529,RC_DemiHuman,1500; bonus3 bAddMonsterDropItem,529,RC_Player,1500;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5202,'Pumpkin_Hat_','Fantastic Pumpkin-Head',4,20,NULL,200,NULL,3,NULL,0,0xFFFFFFFF,63,2,256,NULL,'0',1,206,'bonus2 bSubRace,RC_Demon,5; bonus3 bAddMonsterDropItem,529,RC_DemiHuman,1500;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5203,'Tongue_Mask','Smiling Mask',4,20,NULL,200,NULL,2,NULL,0,0xFFFFFFFF,63,2,513,NULL,'0',0,253,'bonus bSpeedRate,25;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5204,'Event_Pierrot_Nose','Rudolph\'s Nose',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,1,NULL,'0',0,49,'bonus2 bResEff,Eff_Blind,3000; bonus2 bAddMonsterDropItem,12130,30;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5205,'Wreath','Emperor\'s Laurel Crown',4,20,NULL,1000,NULL,3,NULL,0,0xFFFFFFFF,63,2,768,NULL,'0',1,261,'bonus bAllStats,1; bonus bMdef,3;',NULL,NULL);
@@ -3512,7 +3562,7 @@ REPLACE INTO `item_db_re` VALUES (5356,'Pumpkin_Hat_H','Festival Pumpkin Hat',4,
REPLACE INTO `item_db_re` VALUES (5357,'Wings_Of_Victory','Wings Of Victory',4,20,NULL,200,NULL,10,NULL,0,0xFFFFFFFF,63,2,768,NULL,'0',0,365,'bonus bMdef,10; bonus bUnbreakableHelm,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5358,'Pecopeco_Wing_Ears','Peco Ears',4,20,NULL,100,NULL,2,NULL,0,0xFFFFFFFF,63,2,512,NULL,'70',0,366,'bonus bAgi,1; bonus bMdef,2; bonus bUnbreakableHelm,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5359,'J_Captain_Hat','Ship Captain Hat',4,20,NULL,300,NULL,3,NULL,1,0xFFFFFFFF,63,2,256,NULL,'60',1,367,'bonus bDex,1; bonus bMaxHP,100; bonus bLongAtkRate,7;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5360,'Whikebain_Ears','Hyuke\'s Black Cat Ears',4,20,NULL,200,NULL,4,NULL,0,0xFFFFFFFF,63,2,256,NULL,'45',1,368,'bonus bFlee,10; bonus bCritical,3; bonus bCritAtkRate,10; bonus bDefRate,-50; bonus bDef2Rate,-50;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5360,'Whikebain_Ears','Hyuke\'s Black Cat Ears',4,20,NULL,200,NULL,4,NULL,0,0xFFFFFFFE,63,2,256,NULL,'45',1,368,'bonus bFlee,10; bonus bCritAtkRate,10; autobonus "{ bonus2 bIgnoreMdefRaceRate,RC_ALL,25; }",50,5000,BF_MAGIC,"{ specialeffect2 EF_AGIUP; }";',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5361,'Gang_Scarf','Gangster Scarf',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,1,NULL,'0',0,369,'bonus bBaseAtk,5; if(BaseJob==Job_Rogue) skill "RG_GANGSTER",1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5362,'Ninja_Scroll','Ninja Scroll',4,20,NULL,200,NULL,0,NULL,0,0xFFFFFFFF,63,2,1,NULL,'0',0,370,'bonus bMatkRate,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5363,'Helm_Of_Abyss','Helm Of Abyss',4,20,NULL,1000,NULL,9,NULL,1,0x000654E2,63,2,256,NULL,'70',1,371,'bonus2 bSubClass,Class_Normal,-5; bonus2 bSubClass,Class_Boss,10;',NULL,NULL);
@@ -3616,7 +3666,7 @@ REPLACE INTO `item_db_re` VALUES (5460,'Adv_Dragon_Skull','Evolved Dragon Skull
REPLACE INTO `item_db_re` VALUES (5461,'Adv_Whisper_Mask','Evolved Whisper Mask',4,20,NULL,300,NULL,1,NULL,0,0xFFFFFFFF,63,2,769,NULL,'50',1,458,'bonus bDex,3; bonus2 bSubEle,Ele_Ghost,20;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5462,'Spiked_Scarf','Spiked Scarf',4,20,NULL,100,NULL,1,NULL,0,0xFFFFFFFF,63,2,1,NULL,'90',0,459,'bonus bAtk,30; bonus bMaxHPrate,-2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5463,'Rainbow_Scarf','Rainbow Scarf',4,20,NULL,0,NULL,1,NULL,0,0xFFFFFFFF,63,2,1,NULL,'90',0,460,'bonus bMatk,30; bonus bMaxSPrate,-2;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5464,'Zaha_Doll_Hat_J','Zaha Doll Hat',4,20,NULL,0,NULL,1,NULL,1,0xFFFFFFFF,63,2,256,NULL,'0',0,461,'bonus bInt,3; bonus bMdef,9; bonus2 bMagicAddRace,Ele_Undead,10; .@r0 = getrefine(); autobonus "{ .@r = getrefine(); bonus2 bSPLossRate,10,1000; bonus bMatk,30*.@r; bonus bFixedCast,-80*.@r; }",3*.@r0,3000,BF_MAGIC,"{ active_transform 1518,3000; specialeffect2 EF_POTION_BERSERK; showscript \\\"Bacsojin Power !\\\"; }"; autobonus2 "{ .@r = getrefine(); bonus2 bSPLossRate,10,1000; bonus bMatk,30*.@r; bonus bFixedCast,-80*.@r; }",.@r0,3000,BF_MAGIC,"{ active_transform 1518,3000; specialeffect2 EF_POTION_BERSERK; showscript \\\"Bacsojin Power !\\\"; }";',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5464,'Zaha_Doll_Hat','Zaha Doll Hat',4,20,NULL,0,NULL,1,NULL,1,0xFFFFFFFF,63,2,256,NULL,'0',1,461,'bonus bInt,3; bonus bMdef,9; bonus2 bMagicAddRace,Ele_Undead,10; .@r0 = getrefine(); autobonus "{ .@r = getrefine(); bonus2 bSPLossRate,10,1000; bonus bMatk,30*.@r; bonus bFixedCast,-80*.@r; }",3*.@r0,3000,BF_MAGIC,"{ active_transform 1518,3000; specialeffect2 EF_POTION_BERSERK; showscript \\\"Bacsojin Power !\\\"; }"; autobonus2 "{ .@r = getrefine(); bonus2 bSPLossRate,10,1000; bonus bMatk,30*.@r; bonus bFixedCast,-80*.@r; }",.@r0,3000,BF_MAGIC,"{ active_transform 1518,3000; specialeffect2 EF_POTION_BERSERK; showscript \\\"Bacsojin Power !\\\"; }";',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5465,'Celestial_Hat','Hat Of Fortune',4,20,NULL,500,NULL,3,NULL,1,0xFFFFFFFF,63,2,256,NULL,'40',1,462,'bonus bLuk,2; bonus bMdef,5; .@r = getrefine(); if(.@r>4) bonus bLuk,.@r-4;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5466,'Wind_Milestone','Wind Milestone',4,20,NULL,100,NULL,2,NULL,1,0xFFFFFFFF,63,2,256,NULL,'30',1,463,'bonus bAgi,2; skill "AL_TELEPORT",1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5467,'Helm_Of_Dragoon','Helm Of Dragon',4,20,NULL,1000,NULL,10,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',1,464,'bonus bStr,2; bonus bInt,2; bonus bDex,2; .@r = getrefine(); if(.@r>=7) bonus2 bExpAddRace,RC_Dragon,3; if(.@r>=9) bonus2 bExpAddRace,RC_Dragon,5; bonus3 bAutoSpell,"NPC_DRAGONFEAR",1,30;',NULL,NULL);
@@ -3624,7 +3674,7 @@ REPLACE INTO `item_db_re` VALUES (5468,'Parade_Cap','Parade Hat',4,20,NULL,800,N
REPLACE INTO `item_db_re` VALUES (5469,'Noble_Hat','Musketeer Hat',4,20,NULL,300,NULL,4,NULL,1,0xFFFFFFFF,63,2,256,NULL,'60',1,466,'bonus bDex,3; bonus bFlee,3; .@r = getrefine(); if(.@r>=7){ bonus bFlee,3; bonus bLongAtkRate,3; } if(.@r>=9){ bonus bFlee,4; bonus bLongAtkRate,2; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5470,'Eyes_Of_Darkness','Eye Of Darkness',4,20,NULL,100,NULL,1,NULL,0,0xFFFFFFFF,63,2,512,NULL,'50',0,467,'bonus bDex,1; bonus2 bResEff,Eff_Blind,10000;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5471,'Hairband_Of_Reginleif','Hairband Of Reginleif',4,20,NULL,800,NULL,2,NULL,0,0xFFFFFFFF,63,2,512,NULL,'50',0,468,'bonus2 bSubEle,Ele_Water,3; bonus2 bSubEle,Ele_Fire,3; bonus2 bSubEle,Ele_Undead,3; bonus2 bSubEle,Ele_Ghost,3;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5472,'Red_White_Hat','Red Hat',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,256,NULL,'0',1,469,'bonus3 bAddMonsterDropItem,554,RC_DemiHuman,200; bonus3 bAddMonsterDropItem,554,RC_Player,200;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5472,'Red_White_Hat','Red Hat',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,256,NULL,'0',1,469,'bonus3 bAddMonsterDropItem,554,RC_DemiHuman,200;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5473,'Forceps_Hairpin','Nipper Crab Hairpin',4,20,NULL,500,NULL,8,NULL,0,0xFFFFFFFF,63,2,256,NULL,'30',1,470,'bonus3 bAutoSpellWhenHit,"MG_COLDBOLT",1,30; bonus3 bAddMonsterDropItem,991,RC_Fish,100;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5474,'Notice_Board','AFK Hat',4,20,NULL,700,NULL,2,NULL,0,0xFFFFFFFF,63,2,256,NULL,'10',0,471,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5475,'Cube_Mask','Mask Cube',4,20,NULL,100,NULL,1,NULL,0,0xFFFFFFFF,63,2,513,NULL,'0',0,472,'bonus bAllStats,1;',NULL,NULL);
@@ -3735,7 +3785,7 @@ REPLACE INTO `item_db_re` VALUES (5579,'Wanderer\'s_Sakkat','Wanderer\'s Sakkat'
REPLACE INTO `item_db_re` VALUES (5580,'Red_Beret','Red Beret',4,20,NULL,100,NULL,3,NULL,0,0xFFFFFFFF,63,2,256,NULL,'0',0,559,'bonus bAllStats,3; bonus bMdef,3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5581,'Cancer_Diadem','Cancer Diadem',4,20,NULL,300,NULL,3,NULL,0,0xFFFFFFFF,63,2,256,NULL,'70',1,560,'bonus bInt,2; bonus2 bSubEle,Ele_Water,5; if(getrefine()>6) { bonus bMdef,1; bonus bHealPower,3; bonus bMatkRate,2; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5582,'Cancer_Crown','Cancer Crown',4,20,NULL,300,NULL,3,NULL,0,0xFFFFFFFF,63,2,256,NULL,'70',1,561,'bonus bStr,2; bonus2 bSubEle,Ele_Water,5; if(getrefine()>6) { bonus bDef,1; bonus bBaseAtk,15; bonus bFlee,10; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5583,'Para_Team_Hat1','Eden Team Hat I',4,0,NULL,0,NULL,5,NULL,0,0xFFFFFFFF,63,2,256,NULL,'12',1,465,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5583,'Para_Team_Hat','Eden Team Hat I',4,0,NULL,0,NULL,5,NULL,0,0xFFFFFFFF,63,2,256,NULL,'12',1,465,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5584,'Majestic_Evil_Horn','Majestic Evil Horns',4,0,NULL,400,NULL,2,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',1,562,'bonus2 bSubRace,RC_Demon,3; bonus2 bHPDrainRate,3,15; bonus2 bSPDrainRate,1,7; /*Gold PC Room bonus bSPGainValue,2; bonus bMagicSPGainValue,2; bonus2 bSubRace,RC_Demon,2;*/',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5585,'Rune_Hairband','Rune Cloth Circlet',4,20,NULL,400,NULL,1,NULL,1,0xFFFFFFFF,63,2,768,NULL,'1',1,564,'bonus2 bSubEle,Ele_Neutral,3; bonus bHit,5; bonus2 bHPDrainRate,30,10; bonus2 bSPDrainRate,10,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5586,'Mosquito_Coil','Mosquito Coil',4,20,NULL,100,NULL,1,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',1,563,'bonus2 bAddDamageClass,1627,100; bonus2 bAddDamageClass,1095,20; bonus2 bAddDamageClass,1160,20; bonus2 bAddDamageClass,1105,20; bonus2 bAddDamageClass,1097,20; bonus2 bAddDamageClass,1051,20; bonus2 bAddDamageClass,1053,20; bonus2 bAddDamageClass,1054,20; bonus2 bAddDamageClass,1048,20;',NULL,NULL);
@@ -3744,8 +3794,8 @@ REPLACE INTO `item_db_re` VALUES (5588,'Leo_Crown','Leo Crown',4,20,NULL,300,NUL
REPLACE INTO `item_db_re` VALUES (5589,'Leo_Diadem','Leo Diadem',4,20,NULL,300,NULL,3,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',1,566,'bonus bDex,2; bonus2 bSubEle,Ele_Fire,5; if(getrefine()>6) { bonus bFlee,10; bonus bAspdRate,3; autobonus "{ bonus bSplashRange,1; }",10,10000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }"; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5590,'K_Poring_Cake_Cap','Poring Cake Hat',4,20,NULL,200,NULL,1,NULL,0,0xFFFFFFFF,63,2,256,NULL,'0',1,417,'bonus bLuk,3; bonus bMdef,5; bonus bMaxHP,BaseLevel*2; bonus bMaxSP,50;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5591,'Desert_Prince','Desert Prince',4,20,NULL,100,NULL,3,NULL,1,0xFFFFFFFF,63,2,256,NULL,'30',0,567,'bonus bUnbreakableHelm,0;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5592,'Sigrun\'s_Wings','Sigrun\'s Wings',4,20,NULL,100,NULL,2,NULL,0,0xFFFFFFFF,63,2,512,NULL,'80',0,568,'if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief||(BaseJob==Job_Taekwon&&Class!=Job_Soul_Linker)) bonus bAspd,1; else if(BaseClass==Job_Mage||BaseClass==Job_Acolyte||Class==Job_Ninja||Class==Job_Soul_Linker){ bonus bMatk,5; bonus bHealPower,2; } else if(BaseClass==Job_Archer||BaseClass==Job_Gunslinger) bonus bLongAtkRate,2; else if(BaseJob==Job_Novice||BaseJob==Job_SuperNovice) { bonus bMaxHP,120; bonus bMaxSP,60; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5593,'Rabbit_Bonnet_','Rabbit Bonnet',4,20,NULL,200,NULL,1,NULL,1,0xFFFFFFFF,63,2,768,NULL,'1',1,549,'bonus bBaseAtk,10; bonus bMatk,10; bonus2 bSubRace,RC_DemiHuman,3; bonus2 bSubRace,RC_Player,3; bonus bDelayRate,-3; if(getrefine()>6) { bonus2 bSubDefEle,Ele_All,5; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5592,'Sigrun\'s_Wing','Sigrun\'s Wings',4,20,NULL,100,NULL,2,NULL,0,0xFFFFFFFF,63,2,512,NULL,'80',0,568,'if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief||(BaseJob==Job_Taekwon&&Class!=Job_Soul_Linker)) bonus bAspd,1; else if(BaseClass==Job_Mage||BaseClass==Job_Acolyte||Class==Job_Ninja||Class==Job_Soul_Linker){ bonus bMatk,5; bonus bHealPower,2; } else if(BaseClass==Job_Archer||BaseClass==Job_Gunslinger) bonus bLongAtkRate,2; else if(BaseJob==Job_Novice||BaseJob==Job_SuperNovice) { bonus bMaxHP,120; bonus bMaxSP,60; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5593,'K_Rabbit_Bonnet','Rabbit Bonnet',4,20,NULL,200,NULL,1,NULL,1,0xFFFFFFFF,63,2,768,NULL,'1',1,549,'bonus bBaseAtk,10; bonus bMatk,10; bonus2 bSubRace,RC_DemiHuman,3; bonus2 bSubRace,RC_Player,3; bonus bDelayRate,-3; if(getrefine()>6) { bonus2 bSubDefEle,Ele_All,5; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5594,'Donut_In_Mouth','Donut In Mouth',4,20,NULL,50,NULL,1,NULL,0,0xFFFFFFFF,63,2,1,NULL,'1',0,569,'bonus2 bHPRegenRate,1,10000; bonus bMaxHP,100;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5595,'Eye_Of_Juno','Eye Of Juno',4,20,NULL,400,NULL,2,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',1,570,'bonus bMdef,2; .@i = JobLevel/14; if(BaseClass==Job_Mage||BaseClass==Job_Archer||BaseClass==Job_Acolyte){ bonus bInt,2; bonus bDex,2; bonus2 bSubEle,Ele_Neutral,.@i; bonus2 bSubEle,Ele_Water,.@i; } else if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief){ bonus bAgi,2; bonus bVit,2; bonus2 bSubEle,Ele_Neutral,.@i; bonus2 bSubEle,Ele_Water,.@i; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5596,'4Leaf_Clover_In_Mouth','4Leaf Clover In Mouth',4,20,NULL,0,NULL,2,NULL,0,0xFFFFFFFF,63,2,1,NULL,'1',0,571,'bonus bMdef,2; bonus2 bAddMonsterDropItem,12245,10;',NULL,NULL);
@@ -3811,7 +3861,7 @@ REPLACE INTO `item_db_re` VALUES (5655,'Dark_Snake_Lord_Hat_J','Evil Snake Lord
REPLACE INTO `item_db_re` VALUES (5656,'Scooter_Hat_J','Scooter Helmet',4,20,NULL,1000,NULL,7,NULL,1,0xFFFFFFFF,63,2,256,NULL,'50',1,588,'bonus bUnbreakableHelm,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5657,'Antique_Pipe_J','Captain\'s Pipe',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,1,NULL,'30',0,383,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5658,'Imp_Hat','Imp Hat',4,20,NULL,400,NULL,1,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',1,589,'bonus3 bAutoSpell,"SA_FLAMELAUNCHER",1,5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5659,'Sleeper_Hat','Sleeper Hat',4,20,NULL,400,NULL,1,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',1,590,'bonus3 bAutoSpell,"SA_SEISMICWEAPON",1,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5659,'Sleepr_Hat','Sleeper Hat',4,20,NULL,400,NULL,1,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',1,590,'bonus3 bAutoSpell,"SA_SEISMICWEAPON",1,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5660,'Gryphon_Hat','Gryphon Hat',4,20,NULL,400,NULL,1,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',1,591,'bonus bAgi,2; if (getrefine() > 6) { bonus bAgi,2; } if (getrefine() > 8) { bonus2 bAddRace,RC_Demon,10; bonus2 bAddRace,RC_Undead,10; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5661,'Red_Pirate_Bandana','Red Pirate Bandana',4,0,NULL,0,NULL,3,NULL,0,0xFFFFFFFF,63,2,256,NULL,'10',1,592,'bonus bStr,1; bonus bDex,1; bonus bAspdRate,2; bonus bVariableCastrate,-2; bonus3 bAutoSpell,"MO_EXTREMITYFIST",1,3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5662,'Libra_Crown','Libra Crown',4,10,NULL,300,NULL,3,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',1,593,'bonus bDex,3; bonus2 bSubEle,Ele_Wind,7; if (getrefine()>=7) { bonus bMatkRate,3; } if (getrefine()>=9) { bonus bMatkRate,5; bonus3 bAutoSpellWhenHit,"WZ_FROSTNOVA",5,20;}',NULL,NULL);
@@ -3840,7 +3890,7 @@ REPLACE INTO `item_db_re` VALUES (5684,'Jewel_Crown_Repl','Ornate Crown',4,20,NU
REPLACE INTO `item_db_re` VALUES (5685,'Prontera_Army_Cap_Repl','Army Cap',4,20,NULL,100,NULL,5,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',1,48,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5686,'Feather_Bonnet_Repl','Nice Hat Feather',4,20,NULL,100,NULL,5,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',1,104,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5687,'Viking_Helm_Repl','Orc Helm',4,20,NULL,100,NULL,5,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',1,86,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5688,'2009_Love_Dad','2009 Love Dad',4,20,NULL,100,NULL,3,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',1,611,'bonus bVit,2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5688,'2009Love_Daddy','2009 Love Dad',4,20,NULL,100,NULL,3,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',1,611,'bonus bVit,2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5689,'Queen_Ant_Diadem','Queen Ant Diadem',4,20,NULL,300,NULL,1,NULL,0,0xFFFFFFFF,63,2,256,NULL,'75',1,612,'bonus3 bAutoSpellWhenHit,"MG_SIGHT",1,5; bonus2 bSubRace,RC_Insect,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5690,'Red_Wing_Hat','Red Wing Hat',4,20,NULL,600,NULL,5,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',1,613,'bonus bHPrecovRate,20; bonus bSPrecovRate,20;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5691,'Catain_Bandanna','Sailor\'s Bandana',4,20,NULL,10,NULL,1,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',1,542,'bonus bDex,1; bonus2 bSubEle,Ele_Poison,20; bonus2 bResEff,Eff_Poison,2000; bonus bUnbreakableHelm,0;',NULL,NULL);
@@ -3890,14 +3940,14 @@ REPLACE INTO `item_db_re` VALUES (5734,'E_Magestic_Goat_C','E Magestic Goat C',4
REPLACE INTO `item_db_re` VALUES (5735,'E_Ribbon_Green','Green Ribbon',4,800,NULL,100,NULL,1,NULL,0,0xFFFFFFFF,63,0,256,NULL,'0',1,244,'bonus bMdef,3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5736,'EF_Whisper_Mask','Whisper Mask',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,769,NULL,'0',0,321,'bonus bAgi,3; bonus2 bSubEle,Ele_Ghost,-10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5737,'Cactus_Hat','Cactus Hat',4,20,NULL,300,NULL,1,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',0,615,'bonus3 bAddMonsterDropItem,952,RC_Plant,500;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5738,'Snowman_Hat','Snowman Hat',4,20,NULL,300,NULL,4,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',1,616,'bonus bStr,1; bonus bInt,1; bonus bMdef,3; bonus2 bSubEle,Ele_Water,7; bonus2 bAddMonsterDropItem,530,100; bonus2 bAddMonsterDropItem,12354,300; bonus5 bAutoSpellwhenhit,"BA_FROSTJOKER",(getrefine()>7?5:1),20,BF_WEAPON|BF_MAGIC,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5738,'Snowman_Hat','Snowman Hat',4,20,NULL,300,NULL,4,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',1,616,'bonus bStr,1; bonus bInt,1; bonus bMdef,3; bonus2 bSubEle,Ele_Water,7; bonus2 bAddMonsterDropItem,12354,100; bonus2 bAddMonsterDropItem,530,300; bonus5 bAutoSpellwhenhit,"BA_FROSTJOKER",(getrefine()>7?5:1),20,BF_WEAPON|BF_MAGIC,0;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5739,'Sagittarius_Crown','Sagittarius Crown',4,20,NULL,300,NULL,3,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',1,617,'bonus bDex,2; bonus2 bSubEle,Ele_Fire,7; .@r = getrefine(); if (.@r>6) { bonus bAspdRate,2; } if (.@r>7) { bonus bAgi,2; } if (.@r>8) { bonus bLongAtkRate,5; } if (.@r>9) { autobonus "{ bonus bAgi,10; bonus bDex,10; }",3,10000,0,"{ specialeffect2 EF_ENHANCE; }"; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5740,'Sagittarius_Diadem','Sagittarius Diadem',4,20,NULL,300,NULL,3,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',1,618,'bonus bDex,2; bonus bMdef,3; bonus2 bSubEle,Ele_Fire,7; .@r = getrefine(); if (.@r>6) { bonus bVariableCastrate,-3; } if (.@r>7) { bonus5 bAutoSpell,"WZ_SIGHTRASHER",10,5,BF_MAGIC,0; } if (.@r>8) { bonus bVariableCastrate,-2; } if (.@r>9) { bonus bMatkRate,4; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5741,'Im_Egg_Shell_Hat','Eternal Egg Shell',4,20,NULL,0,NULL,1,NULL,0,0xFFFFFFFF,63,2,256,NULL,'10',1,101,'bonus2 bAddItemGroupHealRate,IG_Potion,10; bonus bHealPower2,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5742,'Rudolf_Santa_Hat','Rudolph Santa Hat',4,20,NULL,400,NULL,5,NULL,0,0xFFFFFFFF,63,2,256,NULL,'10',1,619,'bonus2 bAddMonsterDropItem,538,100; bonus2 bAddMonsterDropItem,539,100; bonus2 bAddItemHealRate,538,100; bonus2 bAddItemHealRate,539,100;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5743,'Orange_Stem_Hat','Orange Stem Hat',4,20,NULL,100,NULL,0,NULL,0,0x00000000,63,2,256,NULL,'1',0,620,'bonus bLuk,3;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5744,'Capricon_Crown','Capricorn Crown',4,20,NULL,300,NULL,3,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',1,621,'bonus bVit,2; bonus bDex,2; if (getrefine()>6) { bonus3 bAutoSpell,"TK_SEVENWIND",1,500; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5745,'Capricon_Diadem','Capricorn Diadem',4,20,NULL,300,NULL,3,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',1,622,'bonus bDex,2; bonus bMdef,5; bonus2 bSubEle,Ele_Earth,5; .@r = getrefine(); if (.@r>6) { bonus bInt,2; } if (.@r>7) { bonus bVariableCastrate,-3; } if (.@r>8) { bonus bHealPower2,4; } if (.@r>9) { bonus3 bAutoSpell,"BS_HAMMERFALL",5,5; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5744,'Capricorn_Crown','Capricorn Crown',4,20,NULL,300,NULL,3,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',1,621,'bonus bVit,2; bonus bDex,2; if (getrefine()>6) { bonus3 bAutoSpell,"TK_SEVENWIND",1,500; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5745,'Capricorn_Diadem','Capricorn Diadem',4,20,NULL,300,NULL,3,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',1,622,'bonus bDex,2; bonus bMdef,5; bonus2 bSubEle,Ele_Earth,5; .@r = getrefine(); if (.@r>6) { bonus bInt,2; } if (.@r>7) { bonus bVariableCastrate,-3; } if (.@r>8) { bonus bHealPower2,4; } if (.@r>9) { bonus3 bAutoSpell,"BS_HAMMERFALL",5,5; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5746,'Rune_Circlet','Rune Circlet',4,20,NULL,100,NULL,12,NULL,1,0x00000080,56,2,256,NULL,'100',1,623,'bonus bStr,1; bonus bInt,1; bonus bMdef,5; if(readparam(bStr)>=120){ bonus bBaseAtk,10; bonus bMatk,5; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5747,'Mitra','Mitra',4,20,NULL,100,NULL,12,NULL,1,0x00000100,56,2,256,NULL,'100',1,624,'bonus bVit,1; bonus bInt,1; bonus bMdef,5; bonus bHealPower,5; if(readparam(bInt)>=120){ bonus bMatk,10; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5748,'Sniper_Goggle','Sniper Goggles',4,20,NULL,100,NULL,12,NULL,1,0x00000800,56,2,768,NULL,'100',1,625,'bonus bAgi,1; bonus bDex,1; bonus bMdef,5; if(readparam(bAgi)>=120){ bonus bLongAtkRate,4; bonus bAspd,1; }',NULL,NULL);
@@ -3922,7 +3972,7 @@ REPLACE INTO `item_db_re` VALUES (5766,'Amistr_Cap','Amistr Cap',4,20,NULL,500,N
REPLACE INTO `item_db_re` VALUES (5767,'Samurai_Mask','Samurai Mask',4,20,NULL,300,NULL,1,NULL,0,0xFFFFFFFF,63,2,1,NULL,'50',0,644,'bonus2 bAddClass,Class_All,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5768,'Sakura_Coronet','Sakura Coronet',4,20,NULL,800,NULL,1,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',1,645,'bonus bMdef,3; bonus bMaxSP,25;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5769,'Gold_Angel_Sculpture','Gold Angel Sculpture',4,100,NULL,0,NULL,2,NULL,0,0xFFFFFFFF,63,2,256,NULL,'70',0,646,'skill "RG_GRAFFITI",1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5770,'Splash_Hat','Splash Hat',4,20,NULL,100,NULL,3,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',1,649,'autobonus "{ sc_start SC_WINDWEAPON,180000,1; }",3,180000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }";',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5770,'Splash_Hat','Splash Hat',4,20,NULL,100,NULL,3,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',1,649,'autobonus "{}",3,180000,BF_WEAPON,"{ sc_start SC_WINDWEAPON,180000,1; specialeffect2 EF_ENHANCE; }";',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5771,'Family_Hat','Family Hat',4,20,NULL,100,NULL,3,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',1,650,'bonus bDex,1; bonus bMdef,1; bonus bMaxHPrate,2; bonus bMaxSPrate,2; skill "PR_MAGNIFICAT",1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5772,'Red_Navy_Hat','Red Navy Hat',4,3000,NULL,500,NULL,1,NULL,0,0xFFFFFFFF,63,2,256,NULL,'95',1,651,'bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5773,'Navy_Beret','Navy Beret',4,3000,NULL,500,NULL,1,NULL,0,0xFFFFFFFF,63,2,256,NULL,'95',1,652,'bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10;',NULL,NULL);
@@ -3942,7 +3992,7 @@ REPLACE INTO `item_db_re` VALUES (5786,'Ancient_Elven_Ear','Ancient Elven Ear',4
REPLACE INTO `item_db_re` VALUES (5787,'Tha_Maero_Mask','Tha Maero Mask',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,513,NULL,'30',0,666,'bonus bMdef,2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5788,'3D_Glasses','3D Glasses',4,20,NULL,100,NULL,1,NULL,0,0xFFFFFFFF,63,2,512,NULL,'1',0,661,'bonus2 bMagicAddRace,RC_Formless,4; bonus2 bSubEle,Ele_Neutral,5; bonus bUnbreakableHelm,0;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5789,'Thanatos_Mal_Mask','Thanatos Mal Mask',4,20,NULL,100,NULL,3,NULL,0,0xFFFFFFFF,63,2,513,NULL,'30',0,667,'bonus bVit,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5790,'Holy_Mom_Love','TM',4,20,NULL,500,NULL,0,NULL,1,0xFFFFFFFF,63,2,768,NULL,'45',1,610,'bonus2 bSubRace,RC_Demon,-5; bonus2 bSubRace,RC_Undead,-5; bonus3 bAutoSpell,"MG_COLDBOLT",1,20;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5790,'Holy_Mom_Love','TM',4,20,NULL,500,NULL,0,NULL,1,0xFFFFFFFF,63,2,768,NULL,'45',1,610,'bonus2 bSubRace,RC_Demon,-5; bonus2 bSubRace,RC_Undead,-5; bonus3 bAutoSpell,"AL_BLESSING",1,20;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5791,'Tenkaippin_Ramen','Tenkaippin Ramen',4,20,NULL,500,NULL,1,NULL,0,0xFFFFFFFF,63,2,256,NULL,'30',0,668,'bonus bInt,-1; bonus bDex,4;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5792,'Fish_Pin','Fish Pin',4,20,NULL,100,NULL,3,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',1,669,'bonus2 bSubRace,RC_Fish,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5793,'Ribbon_Of_Life','Ribbon Of Life',4,20,NULL,0,NULL,2,NULL,0,0xFFFFFFFF,63,2,512,NULL,'1',0,575,'bonus bInt,1; bonus bMdef,2;',NULL,NULL);
@@ -3978,7 +4028,7 @@ REPLACE INTO `item_db_re` VALUES (5821,'Gold_Tulip_Hairpin','Gold Tulip Hairpin'
REPLACE INTO `item_db_re` VALUES (5822,'Love_Chick_Hat','Love Chick Hat',4,10000,NULL,100,NULL,4,NULL,0,0xFFFFFFFF,63,2,256,NULL,'0',1,500,'bonus bLuk,4; bonus bMaxHP,100; bonus bMaxSP,100; bonus2 bSubRace,RC_Brute,7; bonus2 bSubRace,RC_DemiHuman,7; bonus2 bSubRace,RC_Player,7;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5823,'Love_Arrow','Love Arrow',4,5000,NULL,100,NULL,1,NULL,0,0xFFFFFFFF,63,2,136,NULL,'0',0,0,'bonus bDex,5; bonus bAgi,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5824,'Fools_Day_Hat','Fools Day Hat',4,20,NULL,300,NULL,6,NULL,0,0xFFFFFFFF,63,2,256,NULL,'30',1,265,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5825,'Badge_Of_Order_Grace','Badge Of Order Grace',4,0,NULL,0,NULL,1,NULL,0,0xFFFFFFFF,63,2,136,NULL,'0',0,0,'bonus bMdef,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5825,'Badge_Of_Order_Grace','Badge Of Order Grace',4,0,NULL,0,NULL,1,NULL,0,0xFFFFFFFF,63,2,136,NULL,'0',0,0,'bonus bMdef,1; bonus2 bAddClass,Class_All,10; bonus bMatkRate,10; bonus bMaxHP,1500;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5826,'Valkyrie_Helmet','Valkyrie Helmet',4,0,NULL,0,NULL,10,NULL,0,0xFFFFFFFF,63,2,256,NULL,'0',0,225,'bonus bStr,2; bonus bInt,2; bonus bDex,2; bonus bAgi,2; bonus bMdef,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5827,'Book_File_Hat','Book File Hat',4,20,NULL,100,NULL,1,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',1,423,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5828,'Honor_Gold_Ring','Honor Gold Ring',4,0,NULL,50,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'1',1,0,'bonus bAllStats,1; bonus bMdef,5;',NULL,NULL);
@@ -4000,7 +4050,7 @@ REPLACE INTO `item_db_re` VALUES (5843,'Loyal_Ring2','Loyal Ring2',4,0,NULL,0,NU
REPLACE INTO `item_db_re` VALUES (5844,'Loyal_Ring3','Loyal Ring3',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'1',1,0,'bonus bAllStats,3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5845,'Buzzy_Ball_Board','Buzzy Ball Board',4,50,NULL,400,NULL,0,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',1,641,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5846,'Buzzy_Ball_Gum','Buzzy Ball Gum',4,50,NULL,100,NULL,1,NULL,0,0xFFFFFFFF,63,2,1,NULL,'1',0,572,'bonus bMdef,5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5847,'Fools_Day_Helmet','Fools Day Helmet',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',0,647,'bonus bInt,5; bonus bVit,-3;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5847,'Fools_Day_hat_','Fools Day Helmet',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',0,647,'bonus bInt,5; bonus bVit,-3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5848,'Robin_Eyepatch','Robin Eyepatch',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,512,NULL,'1',0,50,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5849,'Doctor_Hairband','Doctor Hairband',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',0,60,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5850,'Golden_Savage_Hat','Golden Savage Hat',4,20,NULL,500,NULL,5,NULL,0,0xFFFFFFFF,63,2,256,NULL,'50',1,648,NULL,NULL,NULL);
@@ -4032,23 +4082,23 @@ REPLACE INTO `item_db_re` VALUES (5893,'RCC2013_2ND_CROWN','RCC2013 2ND CROWN',4
REPLACE INTO `item_db_re` VALUES (5894,'RCC2013_3RD_CROWN','RCC2013 3RD CROWN',4,20,NULL,2500,NULL,7,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',0,1108,'bonus bAllStats,3; skill "AL_TELEPORT",1;','sc_start SC_SPEEDUP0,-1,25;','sc_end SC_SPEEDUP0;');
REPLACE INTO `item_db_re` VALUES (5895,'RCC2013_ANV_Hat','RCC2013 ANV Hat',4,20,NULL,2500,NULL,7,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',0,1109,'bonus bAllStats,1; bonus2 bAddClass,Class_All,2; bonus bMatkRate,2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5906,'Oni_Horns_','Oni Horns',4,0,NULL,20,NULL,10,NULL,1,0x00001000,63,2,256,NULL,'100',1,1127,'bonus2 bSkillAtk,"GC_COUNTERSLASH",(10*getskilllv("GC_WEAPONBLOCKING")); .@r = getrefine(); if(.@r > 6){ bonus bAtk,20; bonus bHit,5; } if(.@r > 9){ bonus3 bAutoSpell,"GC_CROSSIMPACT",1,10; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5914,'C_Flutter_Butterfly','C Flutter Butterfly',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,1,'1',0,1378,'hateffect HAT_EF_FLUTTER_BUTTERFLY,true;',NULL,'hateffect HAT_EF_FLUTTER_BUTTERFLY,false;');
-REPLACE INTO `item_db_re` VALUES (5917,'Yellow_Scarf','Yellow Scarf',4,0,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1,0,'90',0,1170,'bonus bLongAtkDef,3;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5914,'Earmuff_Flowerform','C Flutter Butterfly',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1378,'hateffect HAT_EF_FLUTTER_BUTTERFLY,true;',NULL,'hateffect HAT_EF_FLUTTER_BUTTERFLY,false;');
+REPLACE INTO `item_db_re` VALUES (5917,'Yellow_Scarf','Yellow Scarf',4,0,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1,NULL,'90',0,1170,'bonus bLongAtkDef,3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5918,'Gambler_Seal','Gambler Seal',4,0,NULL,500,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,512,NULL,NULL,0,1202,'bonus bCritical,3; bonus bCritAtkRate,3; bonus2 bSubSkill,"RA_ARROWSTORM",10; bonus2 bSubSkill,"SR_GATEOFHELL",10; .@dex = readparam(bDex); .@luk = readparam(bLuk); bonus bCritAtkRate,-(.@dex/10)*2; bonus bCritical,.@luk/10; bonus bBaseAtk,(.@luk/10)*2; bonus bMatk,(.@luk/10)*2; if (.@luk > 120) { bonus bCritical,10; bonus bCritAtkRate,10; bonus2 bSubSkill,"RA_ARROWSTORM",30; bonus2 bSubSkill,"SR_GATEOFHELL",30; } else if (.@luk > 108) { bonus bCritical,5; bonus bCritAtkRate,10; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5919,'Camellia_Hair_Pin','Camellia Hair Pin',4,0,NULL,1000,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,256,0,'50',1,1203,'bonus bMdef,20; bonus3 bAutoSpell,"AL_PNEUMA",1,30+getrefine()*5; /* CONFIRM The Rate*/',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5919,'Camellia_Hair_Pin','Camellia Hair Pin',4,0,NULL,1000,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,256,NULL,'50',1,1203,'bonus bMdef,20; bonus3 bAutoSpell,"AL_PNEUMA",1,30+getrefine()*5; /* CONFIRM The Rate*/',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (5920,'Medical_Boots','Medical Boots',4,0,NULL,300,NULL,10,NULL,0,0xFFFFFFFF,63,2,64,NULL,'10',1,NULL,'.@r = getrefine(); bonus bHealPower,10+((.@r/2) * 2); bonus2 bSkillUseSP,"AB_CHEAL",(.@r * 5);',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5943,'Owlviscount_Silk_Hat','Owl Viscount Silk Hat',4,0,NULL,500,NULL,15,NULL,1,0xFFFFFFFF,63,2,256,0,'70',1,1323,'bonus bInt,1; bonus bAspdRate,10; .@r = getrefine(); bonus bMatk,7*.@r; autobonus "{ .@r = getrefine(); bonus bAspdRate,(.@r >= 9 ? 40 : ((.@r >= 7) ? 10 : ((.@r >= 5) ? 5 : 1))); }",.@r*20,30000,BF_MAGIC,"{ specialeffect2 EF_SPELLBREAKER }";',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5966,'KarduiEar','KarduiEar',4,0,NULL,300,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,512,0,'70',0,1357,'.@dex = readparam(bDex); bonus bMatk,(.@dex > 10) ? .@dex/10*2 : 0; if (.@dex > 107) { bonus bVariableCastrate,-10; bonus bMatk,60; } if (.@dex > 119) { bonus bVariableCastrate,-5; bonus bMatk,100; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5967,'Flying Galapago','Flying Galapago',4,0,NULL,500,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1,0,'110',0,1358,'bonus bAgi,1; bonus2 bSkillAtk,"HT_BLITZBEAT",getskilllv("HT_STEELCROW")*40;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5968,'DVAngelNurseCap','DVAngelNurseCap',4,0,NULL,500,NULL,10,NULL,1,0xFFFFFFFF,63,2,256,0,'50',1,1359,'if (BaseClass == Job_Acolyte) bonus bHealPower,3; bonus bNoCastCancel,1; .@r = getrefine(); bonus bHealPower,(.@r > 8) ? 12 : ((.@r > 6) ? 9 : ((.@r > 4) ? 6 : 0));',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5969,'QueenAnzRevenge','QueenAnzRevenge',4,0,NULL,400,NULL,7,NULL,1,0xFFFFFFFF,63,2,256,0,'100',1,1360,'bonus bStr,5; .@r = getrefine(); bonus2 bAddClass,Class_All,7+(.@r > 8 ? 4 : (.@r > 6 ? 3 : (.@r > 4 ? 2 : 0))); bonus bNoSizeFix,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5971,'Moon_Eyepatch','Moon Eyepatch',4,0,NULL,100,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,512,0,'10',0,1370,'bonus2 bSubEle,Ele_Water,5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5972,'Chatty_Parrot','Chatty Parrot',4,0,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1,0,'80',0,1116,'bonus bMatkRate,BaseLevel/50; bonus bVariableCast,-readparam(bInt)/30;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5973,'Ancient_Elven_Ear_J','Ancient Elven Ear J',4,0,NULL,200,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,512,0,'70',0,665,'bonus bLuk,10; bonus bMdef,10; bonus bFlee2,2;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5978,'Syringe_Toy','Toy Syringe',4,0,NULL,100,NULL,3,NULL,0,0xFFFFFFFF,63,2,1,1,'70',0,842,'bonus bMdef,3; bonus2 bAddItemHealRate,545,150; bonus2 bAddItemHealRate,546,150; bonus2 bAddItemHealRate,547,150;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5979,'C_Angel_Fluttering','C Angel Fluttering',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,0,'1',0,1380,'hateffect HAT_EF_ANGEL_FLUTTERING,true;',NULL,'hateffect HAT_EF_ANGEL_FLUTTERING,false;');
-REPLACE INTO `item_db_re` VALUES (5980,'C_Classical_Fhat','C Classical Fhat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,0,'1',0,1381,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5985,'Noble_Mask','Noble Mask',4,0,NULL,200,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,256,0,'30',0,1409,'bonus2 bSkillAtk,"PA_SACRIFICE",BaseLevel*2; bonus2 bSkillVariableCast,"PA_PRESSURE",-2000; bonus2 bSkillVariableCast,"CR_DEVOTION",-2000; if (BaseLevel > 149) { bonus bMaxHPrate,3; bonus bAspdRate,3; } else if (BaseLevel > 99) { bonus bMaxHPrate,2; bonus bAspdRate,2; } else { bonus bMaxHPrate,1; bonus bAspdRate,1; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5943,'Owlviscount_Silk_Hat','Owl Viscount Silk Hat',4,0,NULL,500,NULL,15,NULL,1,0xFFFFFFFF,63,2,256,NULL,'70',1,1323,'bonus bInt,1; bonus bAspdRate,10; .@r = getrefine(); bonus bMatk,7*.@r; autobonus "{ .@r = getrefine(); bonus bAspdRate,(.@r >= 9 ? 40 : ((.@r >= 7) ? 10 : ((.@r >= 5) ? 5 : 1))); }",.@r*20,30000,BF_MAGIC,"{ specialeffect2 EF_SPELLBREAKER }";',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5966,'KarduiEar','KarduiEar',4,0,NULL,300,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,512,NULL,'70',0,1357,'.@dex = readparam(bDex); bonus bMatk,(.@dex > 10) ? .@dex/10*2 : 0; if (.@dex > 107) { bonus bVariableCastrate,-10; bonus bMatk,60; } if (.@dex > 119) { bonus bVariableCastrate,-5; bonus bMatk,100; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5967,'FlyingGalapago','Flying Galapago',4,0,NULL,500,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1,NULL,'110',0,1358,'set .@bblvl,max(getskilllv("HT_BLITZBEAT"),1); set .@luk,min(readparam(bLuk),120); bonus bAgi,1; bonus3 bAutoSpell,"HT_BLITZBEAT",.@bblvl,50 + (.@luk / 3) + (.@bblvl * 2); bonus2 bSkillAtk,"HT_BLITZBEAT",getskilllv("HT_STEELCROW") * 40;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5968,'DVAngelNurseCap','DVAngelNurseCap',4,0,NULL,500,NULL,10,NULL,1,0xFFFFFFFF,63,2,256,NULL,'50',1,1359,'if (BaseClass == Job_Acolyte) bonus bHealPower,3; bonus bNoCastCancel,1; .@r = getrefine(); bonus bHealPower,(.@r > 8) ? 12 : ((.@r > 6) ? 9 : ((.@r > 4) ? 6 : 0));',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5969,'QueenAnzRevenge','QueenAnzRevenge',4,0,NULL,400,NULL,7,NULL,1,0xFFFFFFFF,63,2,256,NULL,'100',1,1360,'bonus bStr,5; .@r = getrefine(); bonus2 bAddClass,Class_All,7+(.@r > 8 ? 4 : (.@r > 6 ? 3 : (.@r > 4 ? 2 : 0))); bonus bNoSizeFix,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5971,'Moon_Eyepatch','Moon Eyepatch',4,0,NULL,100,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,512,NULL,'10',0,1370,'bonus2 bSubEle,Ele_Water,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5972,'Chatty_Parrot','Chatty Parrot',4,0,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1,NULL,'80',0,1116,'bonus bMatkRate,BaseLevel/50; bonus bVariableCast,-readparam(bInt)/30;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5973,'Ancient_Elven_Ear_J','Ancient Elven Ear J',4,0,NULL,200,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,512,NULL,'70',0,665,'bonus bLuk,10; bonus bMdef,10; bonus bFlee2,2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5978,'Syringe_Toy','Toy Syringe',4,0,NULL,100,NULL,3,NULL,0,0xFFFFFFFF,63,2,1,NULL,'70',0,842,'bonus bMdef,3; bonus2 bAddItemHealRate,545,150; bonus2 bAddItemHealRate,546,150; bonus2 bAddItemHealRate,547,150;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5979,'C_Angel_Fluttering','C Angel Fluttering',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1380,'hateffect HAT_EF_ANGEL_FLUTTERING,true;',NULL,'hateffect HAT_EF_ANGEL_FLUTTERING,false;');
+REPLACE INTO `item_db_re` VALUES (5980,'C_Classical_Fhat','C Classical Fhat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1381,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5985,'Noble_Mask','Noble Mask',4,0,NULL,200,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,256,NULL,'30',0,1409,'bonus2 bSkillAtk,"PA_SACRIFICE",BaseLevel*2; bonus2 bSkillVariableCast,"PA_PRESSURE",-2000; bonus2 bSkillVariableCast,"CR_DEVOTION",-2000; if (BaseLevel > 149) { bonus bMaxHPrate,3; bonus bAspdRate,3; } else if (BaseLevel > 99) { bonus bMaxHPrate,2; bonus bAspdRate,2; } else { bonus bMaxHPrate,1; bonus bAspdRate,1; }',NULL,NULL);
#===================================================================
# More Etc Items
#===================================================================
@@ -4630,11 +4680,12 @@ REPLACE INTO `item_db_re` VALUES (6604,'Essence_Rune_Magic','Essence Rune Magic'
REPLACE INTO `item_db_re` VALUES (6605,'Muspellium','Muspellium',3,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (6606,'Cute_Cart_Coupon','Cute Cart Remodel Coupon',3,0,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (6607,'Temporal_Crystal','Temporal Crystal',3,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (6608,'Coagulated_Spell','Coagulated Spell',3,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (6609,'Glast_Decayed_Nail','Glast Decayed Nail',3,82,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (6610,'Glast_Horrendous_Mouth','Glast Horrendous Mouth',3,390,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (6612,'Gold_Coin_Basket','Gold Coin Basket',3,20,NULL,200,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (6613,'Flashy_Brooch','Flashy Brooch',3,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (6608,'Coagulated_Spell','Coagulated Spell',3,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (6609,'Glast_Decayed_Nail','Glast Decayed Nail',3,2800,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (6610,'Glast_Horrendous_Mouth','Glast Horrendous Mouth',3,3200,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (6611,'Colorful_Key','Colorful Key',3,50000,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (6612,'Gold_Coin_Basket','Gold Coin Basket',3,300000,NULL,200,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (6613,'Colorful_Brooch','Colorful Brooch',3,100000,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (6615,'Siege_Guild_Coin','Siege Guild Coin',3,0,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (6616,'Lmtd_Manny_Card','Limited Manny Card',3,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (6617,'Lmtd_Sid_Card','Limited Sid Card',3,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -4733,8 +4784,8 @@ REPLACE INTO `item_db_re` VALUES (6742,'HealStone_Middle','Stone Recovery(Middle
REPLACE INTO `item_db_re` VALUES (6743,'HPStone_Middle','HP Stone(Middle)',6,10,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bMaxHPrate,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (6744,'SPStone_Middle','SP Stone(Middle)',6,10,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bMaxSPrate,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (6745,'HealStone_Bottom','Recovery Stone(Low)',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bSPGainValue,1; bonus bMagicHPGainValue,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (6746,'Iron_Artifacts','Iron Artifacts',3,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (6747,'Steel_Workpiece','Steel Workpiece',3,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (6746,'Iron_Artifacts','Steel Artifact',3,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (6747,'Iron_Artifacts_','Steel Artifact',3,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (6748,'Daily_Report_He_And_His_Team','Daily Report He And His Team',3,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (6749,'Operation_Control_Device','Operation Control Device',3,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (6750,'Failed_Engine','Failed Engine',3,10,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -4871,7 +4922,8 @@ REPLACE INTO `item_db_re` VALUES (6914,'Black_Horn','Black Horn',3,10,NULL,0,NUL
REPLACE INTO `item_db_re` VALUES (6915,'Captured_Soul','Captured Soul',3,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (6916,'Piece_Of_Soul_Monkey','Piece Of Soul Monkey',3,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (6917,'Piece_Of_Soul_Chicken','Piece Of Soul Chicken',3,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (6919,'Honor_Proof','Honor Proof',3,10,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (6919,'Honor_Proof','Honor Token',3,10,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (6920,'Rune_Magic_Powder','Rune Magic Powder',3,10,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (6921,'Dehumidifiers','Dehumidifiers',3,10,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (6922,'Sandpaper','Sandpaper',3,10,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (6923,'Bright_Fire_Lights','Bright Fire Lights',3,10,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -4910,6 +4962,8 @@ REPLACE INTO `item_db_re` VALUES (6956,'Captured_Sheep','Captured Sheep',3,10,NU
REPLACE INTO `item_db_re` VALUES (6957,'Lamb_Fleece','Lamb Fleece',3,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (6958,'Lamb_Horns','Lamb Horns',3,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (6960,'Key_Air_Fortress','Key Air Fortress',3,10,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (6961,'Huge_Metal_Scrap','Huge Metal Scrap',3,10,0,1000,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (6962,'Old_Fuel','Old Fuel',3,10,0,100,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
#
REPLACE INTO `item_db_re` VALUES (7001,'Mould_Powder','Mould Powder',3,466,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (7002,'Ogre_Tooth','Ogre Tooth',3,658,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -5560,7 +5614,7 @@ REPLACE INTO `item_db_re` VALUES (7648,'Snake_Bookmark','Snake Bookmark',3,20,NU
REPLACE INTO `item_db_re` VALUES (7649,'Big_Luk_Bookmark','Big Luk Bookmark',3,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (7651,'Mystery_Egg','Mystery Egg',3,10,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (7663,'Full_Metal_Jacket','Full Metal Jacket',10,200,NULL,2,'10',NULL,NULL,NULL,0x41000000,63,2,32768,NULL,'1',NULL,3,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (7664,'Projection_Landmines','Projection Landmines',10,450,NULL,3,'10',NULL,NULL,NULL,0x41000000,63,2,32768,NULL,'1',NULL,5,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (7664,'Mine_Projectile','Grenade Launcher',10,450,NULL,3,'10',NULL,NULL,NULL,0x41000000,63,2,32768,NULL,'1',NULL,5,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (7665,'Dragon_Tail_Missile','Dragon Tail Missile',10,1500,NULL,100,'10',NULL,NULL,NULL,0x41000000,63,2,32768,NULL,'1',NULL,5,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (7666,'TimeTravel_Scroll','Time Travel Scroll',3,20,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (7667,'Abandoned_Machine','Abandoned Machine',3,20,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -5732,7 +5786,7 @@ REPLACE INTO `item_db_re` VALUES (7852,'Pass_F2','Divx Player Raffle Ticket',3,2
REPLACE INTO `item_db_re` VALUES (7853,'Pass_F3','iPod nano Raffle Ticket',3,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (7854,'Pass_CF','Comodo Festival Ticket',3,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (7855,'Heart','Heart',3,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (7856,'Girl_Bunch_Of_Flower','Girl\'s Bouquet',3,20,NULL,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (7856,'Girl_Bunch_Of_Flower_','Girl\'s Bouquet',3,20,NULL,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (7857,'Handmade_Kitty_Doll','Hand-made Kitty Doll',3,20,NULL,30,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (7858,'Dragonball_Yellow_','Dragonball Yellow',3,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (7859,'Game_Ticket','Game Ticket',3,20,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -5935,7 +5989,7 @@ REPLACE INTO `item_db_re` VALUES (9055,'Succubus_Egg','Succubus Egg',7,20,NULL,0
REPLACE INTO `item_db_re` VALUES (9056,'Imp_Egg','Imp Egg',7,20,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (9057,'Egg_Of_Tiny','Egg Of Tiny',7,20,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (9058,'Snow_Rabbit_Egg','Christmas Snow Rabbit Egg',7,20,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (9059,'Tikbalang_Egg','Tikbalang Egg',7,20,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (9059,'Tikbalang_Pet','Tikbalang Egg',7,20,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (9060,'Brownie_Egg','Brownie Egg',7,20,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (9061,'Marin_Egg','Marin Egg',7,20,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (9062,'Novice_Poring_Egg','Novice Poring Egg',7,20,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -6091,8 +6145,8 @@ REPLACE INTO `item_db_re` VALUES (11533,'Satay','Satay',0,15,NULL,20,NULL,NULL,N
REPLACE INTO `item_db_re` VALUES (11534,'Coco_Juice','Coconut Juice',0,20,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(17,23),0;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (11535,'Almond_Chocolate','Almond Chocolate',0,190,NULL,200,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 0,rand(8,16);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (11536,'Cat_Hard_Biscuit','Cat Biscuit',0,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(70,110),0; callfunc "F_Cat_Hard_Biscuit";',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (11537,'Rice_Weevil_Bug','Rice Weevil Bug',0,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(100,150),0; callfunc "F_Rice_Weevil_Bug";',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (11538,'Fresh_Octopus_Legs','Fresh Octopus Legs',0,20,NULL,30,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(35,60),rand(5,10);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (11537,'Rice_weevil_Bug','Rice Weevil Bug',0,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(100,150),0; callfunc "F_Rice_Weevil_Bug";',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (11538,'Octupus_Leg','Fresh Octopus Legs',0,20,NULL,30,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(35,60),rand(5,10);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (11539,'Athale_Choco','Athale Choco',0,1,NULL,80,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 50,50;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (11540,'Shyai_Choco','Shyai Choco',0,1,NULL,80,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 50,50;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (11541,'Mid_Choco','Mid Choco',0,1,NULL,80,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 50,50;',NULL,NULL);
@@ -6114,46 +6168,46 @@ REPLACE INTO `item_db_re` VALUES (11557,'TE_White_Potion','TE White Potion',0,20
REPLACE INTO `item_db_re` VALUES (11558,'TE_White_Slim_Potion','TE White Slim Potion',0,275,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 325,0;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (11563,'Hot_Tee','Hot Tea',2,10,NULL,20,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 0,100;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (11564,'Sweet_Canape','Sweet Canape',2,10,NULL,20,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 1000,0;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (11565,'White_Potion_','White Potion',0,10,NULL,150,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(325,405),0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (11565,'White_Potion_B','White Potion',0,10,NULL,150,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(325,405),0;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (11566,'Yellow_Potion_','Yellow Potion',0,10,NULL,130,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(175,235),0;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (11567,'Novice_Potion_','Novice Potion',0,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(44,66),0;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (11568,'Red_Slim_Potion_','Red Slim Potion',0,10,NULL,20,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(45,65),0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (11567,'Novice_Potion_B','Novice Potion',0,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(44,66),0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (11568,'Red_Slim_Potion_B','Red Slim Potion',0,10,NULL,20,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(45,65),0;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (11569,'Orange_Potion_','Orange Potion',0,10,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(105,145),0;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (11570,'Red_Potion_','Red Potion',0,10,NULL,70,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(45,65),0;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (11571,'Green_Potion_','Green Potion',0,10,NULL,70,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_end SC_POISON; sc_end SC_SILENCE; sc_end SC_BLIND; sc_end SC_CONFUSION;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (11572,'Blue_Potion_','Blue Potion',0,10,NULL,150,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 0,rand(40,60);',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (11573,'White_Slim_Potion_','White Slim Potion',0,10,NULL,50,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(325,405),0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (11572,'Blue_Potion_B','Blue Potion',0,10,NULL,150,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 0,rand(40,60);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (11573,'White_Slim_Potion_B','White Slim Potion',0,10,NULL,50,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(325,405),0;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (11574,'Yellow_Slim_Potion_','Yellow Slim Potion',0,10,NULL,30,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(175,235),0;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (11575,'Lucky_Cookie_','Lucky Cookie',3,10,NULL,30,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (11576,'Lucky_Lollipop','Lucky Lollipop',3,10,NULL,30,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (11577,'Rice_Ball_','Rice Ball',0,10,NULL,30,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 200,0;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (11578,'Candy_Bar','Candy Bar',0,10,NULL,40,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(105,145),0;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (11579,'Lucky_Candy_','Lucky Candy',3,10,NULL,30,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (11580,'Candy_','Candy',0,10,NULL,30,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(45,65),0;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (11581,'Piece_of_Cake__','Piece of Cake',0,10,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(270,330),0;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (11582,'Well-baked_Cookie','Well-baked Cookie',0,10,NULL,30,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(160,200),0;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (11583,'Chocolate_Drink_','Chocolate Drink',0,10,NULL,150,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(330,410),rand(45,65); sc_end SC_POISON; sc_end SC_SILENCE; sc_end SC_BLIND; sc_end SC_CONFUSION; sc_end SC_CURSE; sc_end SC_Hallucination;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (11584,'White_Chocolate_','White Chocolate',0,10,NULL,80,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 50,50;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (11585,'Hand-made_Chocolate','Hand-made Chocolate',0,10,NULL,80,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 50,50;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (11586,'Hand-made_Chocolate_','Hand-made White Chocolate',0,10,NULL,80,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 50,50;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (11587,'Chocolate_','Chocolate',0,10,NULL,20,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 1,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (11575,'Lucky_Cookie_B','Lucky Cookie',3,10,NULL,30,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (11576,'Lucky_Candy_Cane_B','Lucky Lollipop',3,10,NULL,30,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (11577,'Rice_Ball_B','Rice Ball',0,10,NULL,30,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 200,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (11578,'Candy_Striper_B','Candy Bar',0,10,NULL,40,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(105,145),0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (11579,'Lucky_Candy_B','Lucky Candy',3,10,NULL,30,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (11580,'Candy_B','Candy',0,10,NULL,30,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(45,65),0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (11581,'Piece_Of_Cake_B','Piece of Cake',0,10,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(270,330),0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (11582,'Well_Baked_Cookie_B','Well-baked Cookie',0,10,NULL,30,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(160,200),0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (11583,'Chocolate_Drink_B','Chocolate Drink',0,10,NULL,150,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(330,410),rand(45,65); sc_end SC_POISON; sc_end SC_SILENCE; sc_end SC_BLIND; sc_end SC_CONFUSION; sc_end SC_CURSE; sc_end SC_Hallucination;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (11584,'White_Chocolate_B','White Chocolate',0,10,NULL,80,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 50,50;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (11585,'HandMade_Chocolate_B','Hand-made Chocolate',0,10,NULL,80,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 50,50;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (11586,'HandMade_Chocolate_B_','Hand-made White Chocolate',0,10,NULL,80,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 50,50;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (11587,'Chocolate_B','Chocolate',0,10,NULL,20,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 1,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (11588,'Fresh_Strawberries','Fresh Strawberries',0,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(32,56),rand(16,28);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (11589,'Iceflake','Cold Snow Cone',0,20,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'percentheal 5,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (11590,'Meat_Skewer5','Skewer No.5',0,5000,NULL,300,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(760,810),10;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (11592,'Trans_Candy_Red','Trans Candy Red',0,20,NULL,30,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 45,0; transform 1507,600000,SC_MTF_MHP,1000;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (11593,'Trans_Candy_Blue','Trans Candy Blue',0,20,NULL,30,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 45,0; transform 1102,600000,SC_MTF_MSP,100;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (11594,'Trans_Candy_Yellow','Trans Candy Yellow',0,20,NULL,30,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 45,0; transform 1130,600000,SC_MTF_PUMPKIN,2000;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (11595,'Trans_Candy_Green','Trans Candy Green',0,20,NULL,30,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 45,0; transform 1508,600000,SC_MTF_HITFLEE,10,20;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (11592,'Trance_Candy_R','Trans Candy Red',0,20,NULL,30,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 45,0; transform 1507,600000,SC_MTF_MHP,1000;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (11593,'Trance_Candy_B','Trans Candy Blue',0,20,NULL,30,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 45,0; transform 1102,600000,SC_MTF_MSP,100;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (11594,'Trance_Candy_Y','Trans Candy Yellow',0,20,NULL,30,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 45,0; transform 1130,600000,SC_MTF_PUMPKIN,2000;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (11595,'Trance_Candy_G','Trans Candy Green',0,20,NULL,30,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 45,0; transform 1508,600000,SC_MTF_HITFLEE,10,20;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (11596,'Blood_In_Skull','Blood In Skull',0,20,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(600,800),0;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (11597,'Iron_Worm','Iron Worm',0,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (11597,'Iron_Bug','Iron Worm',0,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (11598,'Bitter_Cacao_Bean','Bitter Cacao Bean',0,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (11599,'Superstar_Potion','Superstar Potion',0,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (11600,'Shining_Holy_Water','Shining Holy Water',0,10,NULL,15,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'if(strcharinfo(3)=="prt_q") { bonus_script "{ bonus2 bSubSize,Size_All,10; }",600; sc_end SC_SILENCE; sc_end SC_POISON; sc_end SC_CURSE; heal 1000,0; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (11602,'Catnip_Fruit','Catnip Fruit',0,15,NULL,1,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(10,40),0;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (11601,'Delicious_Anchovy','Delicious Anchovy',0,20,NULL,30,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(30,46),0;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (11605,'Cookie_Bat','Cookie Bat',0,0,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(50,100),0; /*TODO*/',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (11605,'Cookies_Bat','Cookie Bat',0,0,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(50,100),0; /*TODO*/',NULL,NULL);
#
-REPLACE INTO `item_db_re` VALUES (11701,'Girl_Bunch_Of_Flower_','Girl\'s Bouquet',0,20,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(105,145),0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (11701,'Girl_Bunch_Of_Flower','Girl\'s Bouquet',0,20,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(105,145),0;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (11702,'Moon_Cookie','Moon Cookie',0,0,NULL,300,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (11703,'Mysterious_Blood','Mystery Blood',0,0,NULL,30,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 0,rand(25,35);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (11704,'KETUPAT_F','Ketupat',0,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(70,90),0;',NULL,NULL);
@@ -6367,7 +6421,7 @@ REPLACE INTO `item_db_re` VALUES (12196,'Hearty_Rice_Cake','Hearty Rice Cake',0,
REPLACE INTO `item_db_re` VALUES (12197,'Salty_Rice_Cake','Salty Rice Cake',0,20,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'percentheal 10,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12198,'Lucky_Rice_Cake','Lucky Rice Cake',2,20,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_INCLUK,1200000,21;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12199,'Rice_Scroll','Scroll of Magic',2,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12200,'Event_Cake','X-mas Cake',11,20,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemskill "PR_MAGNIFICAT",3;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12200,'Event_Cake','X-mas Cake',11,20,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'percentheal 5,0; itemskill "PR_MAGNIFICAT",3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12201,'Red_Box_C','Commonplace Red Box',2,20,NULL,200,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
#===================================================================
# Cash Shop Usable Items
@@ -6430,7 +6484,7 @@ REPLACE INTO `item_db_re` VALUES (12259,'Miracle_Medicine','Miracle Tonic',2,0,N
REPLACE INTO `item_db_re` VALUES (12260,'Cool_Summer_Outfit','Cool Summer Outfit',2,0,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_SUMMER,600000,0;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12261,'Secret_Medicine','Leap of Fantasy',2,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getexp2(2000000,1000000);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12262,'Inspector_Certificate_','Authoritative Badge',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_SPEEDUP0,540000,25;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12263,'Comp_Battle_Manual','Field Manual',2,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_EXPBOOST,1800000,50;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12263,'Comp_Battle_Manual','Field Manual',2,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_EXPBOOST,1800000,200;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12264,'Comp_Bubble_Gum','Bubble Gum',2,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_ITEMBOOST,1800000,200;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12265,'Comp_Insurance','Life Insurrance',2,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_LIFEINSURANCE,1800000,0;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12266,'Sesame_Pastry_','Sesame Pastry',2,2,NULL,70,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_HITFOOD,180000,30;',NULL,NULL);
@@ -6559,9 +6613,9 @@ REPLACE INTO `item_db_re` VALUES (12388,'Runstone_Crush','Rhydo Runestone For Ap
REPLACE INTO `item_db_re` VALUES (12389,'Runstone_Storm','Pertz Runestone For Apprentice',11,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'if(strcharinfo(3)=="job3_rune02") { itemskill "RK_STORMBLAST",1; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12390,'Runstone_Millennium','Verkana Runestone For Apprentice',11,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'if(strcharinfo(3)=="job3_rune02") { itemskill "RK_MILLENNIUMSHIELD",1; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12391,'Lucky_Egg_C','Lucky Egg C',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Lucky_Egg_C);',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12392,'Repair_A','Repair A',2,220,NULL,100,NULL,NULL,NULL,NULL,0x00000400,56,2,NULL,NULL,NULL,NULL,NULL,'if ( checkmadogear() ) { itemheal rand(200,300),0; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12393,'Repair_B','Repair B',2,500,NULL,140,NULL,NULL,NULL,NULL,0x00000400,56,2,NULL,NULL,NULL,NULL,NULL,'if ( checkmadogear() ) { itemheal rand(300,400),0; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12394,'Repair_C','Repair C',2,1100,NULL,180,NULL,NULL,NULL,NULL,0x00000400,56,2,NULL,NULL,NULL,NULL,NULL,'if ( checkmadogear() ) { itemheal rand(400,500),0; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12392,'RepairA','Repair A',2,220,NULL,100,NULL,NULL,NULL,NULL,0x00000400,56,2,NULL,NULL,NULL,NULL,NULL,'if ( checkmadogear() ) { itemheal rand(200,300),0; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12393,'RepairB','Repair B',2,500,NULL,140,NULL,NULL,NULL,NULL,0x00000400,56,2,NULL,NULL,NULL,NULL,NULL,'if ( checkmadogear() ) { itemheal rand(300,400),0; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12394,'RepairC','Repair C',2,1100,NULL,180,NULL,NULL,NULL,NULL,0x00000400,56,2,NULL,NULL,NULL,NULL,NULL,'if ( checkmadogear() ) { itemheal rand(400,500),0; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12395,'Tantanmen','Tantan Noodle',2,20,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'pet 1519;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12396,'Fools_Day_Box','Gift Box?',11,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'.@rnd = rand(1,10); if(.@rnd==1) itemskill "AL_TELEPORT",1; else if(.@rnd==2) itemskill "AL_TELEPORT",3; else if(.@rnd==3) percentheal 50,0; else if(.@rnd==4) percentheal 0,50; else if(.@rnd==5) end; else if(.@rnd==6) getitem 512,1; else if(.@rnd==7) itemskill "ALL_REVERSEORCISH",1; else if(.@rnd==8) specialeffect2 EF_MAPPILLAR2; else if(.@rnd==9) specialeffect2 EF_ANGEL2; else specialeffect2 EF_COIN;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12397,'Fools_Day_Box2','Gift Box?',11,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'.@rnd = rand(1,10); if(.@rnd==1) itemskill "TF_DETOXIFY",1; else if(.@rnd==2) itemskill "TF_PICKSTONE",1; else if(.@rnd==3) itemskill "BA_FROSTJOKER",1; else if(.@rnd==4) itemskill "DC_SCREAM",1; else if(.@rnd==5) end; else if(.@rnd==6) getitem 909,1; else if(.@rnd==7) itemskill "AL_RUWACH",1; else if(.@rnd==8) specialeffect2 EF_BEGINASURA; else if(.@rnd==9) specialeffect2 EF_MVP; else specialeffect2 EF_CURSEATTACK;',NULL,NULL);
@@ -6575,7 +6629,7 @@ REPLACE INTO `item_db_re` VALUES (12404,'Acti_Potion','Acti Potion',2,20,NULL,10
REPLACE INTO `item_db_re` VALUES (12405,'Underripe_Yggseed','Underripe Yggseed',2,20,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'percentheal 30,30; skilleffect "AL_BLESSING",0; sc_start SC_BLESSING,140000,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12406,'Psychic_ArmorS','Psychic ArmorS',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'specialeffect2 EF_ENERGYCOAT; sc_start4 SC_ELEMENTALCHANGE,10000,1,Ele_Ghost,1,0;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12407,'PCBang_Coupon_Box','PC Cafe Coupon Box',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12408,'Hydra_Ball','Hydra Ball',2,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'pet 2081;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12408,'Leaf_Cat_Ball','Hydra Ball',2,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'pet 2081;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12409,'Pork_Belly_H','1st Class Pork Belly',2,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12410,'Spareribs_H','Thick Pork Belly',2,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12411,'HE_Battle_Manual','HE Battle Manual',2,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_EXPBOOST,900000,200;',NULL,NULL);
@@ -6588,23 +6642,23 @@ REPLACE INTO `item_db_re` VALUES (12417,'Boost500','Boost500',2,100,NULL,50,NULL
REPLACE INTO `item_db_re` VALUES (12418,'Full_SwingK','Full SwingK',2,100,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_FULL_SWING_K,500000,50;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12419,'Mana_Plus','Mana Plus',2,100,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_MANA_PLUS,500000,50;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12420,'Stamina_Up_M','Stamina Up M',2,100,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_MUSTLE_M,500000,5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12421,'Falmons_F','Falmons F',2,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_LIFE_FORCE_F,500000,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12421,'Digestive_F','Falmons F',2,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_LIFE_FORCE_F,500000,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12422,'HP_Increase_PotionS','HP Increase Potion (Small)',2,100,NULL,20,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start2 SC_PROMOTE_HEALTH_RESERCH,500000,1,1; percentheal 1,0;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12423,'HP_Increase_PotionM','HP Increase Potion (Medium)',2,100,NULL,40,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start2 SC_PROMOTE_HEALTH_RESERCH,500000,1,2; percentheal 2,0;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12424,'HP_Increase_PotionL','HP Increase Potion (Large)',2,100,NULL,80,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start2 SC_PROMOTE_HEALTH_RESERCH,500000,1,3; percentheal 5,0;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12425,'SP_Increase_PotionS','SP Increase Potion (Small)',2,100,NULL,20,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start2 SC_ENERGY_DRINK_RESERCH,500000,1,1; percentheal 0,2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12426,'SP_Increase_PotionM','SP Increase Potion (Medium)',2,100,NULL,40,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start2 SC_ENERGY_DRINK_RESERCH,500000,1,2; percentheal 0,4;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12427,'SP_Increase_PotionL','SP Increase Potion (Large)',2,100,NULL,80,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start2 SC_ENERGY_DRINK_RESERCH,500000,1,3; percentheal 0,8;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12428,'Concentrated_White_Potion_Z','Concentrated White Potion Z',0,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_EXTRACT_WHITE_POTION_Z,500000,20; heal 1000,0;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12429,'Savage_Full_Roast','Savage Full Roast',2,NULL,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_SAVAGE_STEAK,300000,20;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12430,'Cocktail_Warg_Blood','Cocktail Warg Blood',2,NULL,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_COCKTAIL_WARG_BLOOD,300000,20;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12431,'Minor_Stew','Minor Stew',2,NULL,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_MINOR_BBQ,300000,20;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12428,'Enrich_White_PotionZ','Concentrated White Potion Z',0,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_EXTRACT_WHITE_POTION_Z,500000,20; heal 1000,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12429,'Savage_BBQ','Savage Full Roast',2,NULL,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_SAVAGE_STEAK,300000,20;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12430,'Wug_Blood_Cocktail','Cocktail Warg Blood',2,NULL,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_COCKTAIL_WARG_BLOOD,300000,20;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12431,'Minor_Brisket','Minor Stew',2,NULL,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_MINOR_BBQ,300000,20;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12432,'Siroma_Icetea','Siroma Iced Tea',2,NULL,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_SIROMA_ICE_TEA,300000,20;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12433,'Drosera_Herb_Salad','Drosera Herb Salad',2,NULL,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_DROCERA_HERB_STEAMED,300000,20;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12434,'Petite_Tail_Noodles','Petite Tail Noodles',2,NULL,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_PUTTI_TAILS_NOODLES,300000,20;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12435,'Black_Mass','Black Mass',2,NULL,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_STOMACHACHE,60000,rand(5,10);',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12436,'Vitata_500','Vitata 500',0,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start2 SC_VITATA_500,500000,20,5; itemheal 0,200;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12437,'Concentrated_Ceromain_Soup','Concentrated Ceromain Soup',2,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_EXTRACT_SALAMINE_JUICE,500000,10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12433,'Drocera_Herb_Stew','Drosera Herb Salad',2,NULL,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_DROCERA_HERB_STEAMED,300000,20;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12434,'Petti_Tail_Noodle','Petite Tail Noodles',2,NULL,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_PUTTI_TAILS_NOODLES,300000,20;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12435,'Black_Thing','Black Mass',2,NULL,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_STOMACHACHE,60000,rand(5,10);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12436,'Vitata500','Vitata 500',0,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start2 SC_VITATA_500,500000,20,5; itemheal 0,200;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12437,'Enrich_Celermine_Juice','Concentrated Ceromain Soup',2,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_EXTRACT_SALAMINE_JUICE,500000,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12438,'F_Giant_Fly_Wing','F Giant Fly Wing',2,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12439,'F_Battle_Manual','F Old Battle Manual',2,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12440,'F_Insurance','F Insurance',2,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -6612,12 +6666,12 @@ REPLACE INTO `item_db_re` VALUES (12441,'F_Bubble_Gum','F Old Bubble Gum',2,2,NU
REPLACE INTO `item_db_re` VALUES (12442,'F_Kafra_Card','F Kafra Card',2,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12443,'F_Neuralizer','F Neuralizer',2,2,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12444,'F_Dun_Tele_Scroll1','WoE Telport Scroll',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'callfunc "F_CashSiegeTele";',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12445,'F_Str_Dish10_','F Str Dish10',2,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12446,'F_Agi_Dish10_','F Agi Dish10',2,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12447,'F_Int_Dish10_','F Int Dish10',2,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12448,'F_Dex_Dish10_','F Dex Dish10',2,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12449,'F_Luk_Dish10_','F Luk Dish10',2,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12450,'F_Vit_Dish10_','F Vit Dish10',2,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12445,'F_Str_Dish10_','F Str Dish10',2,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_STRFOOD,1800000,10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12446,'F_Agi_Dish10_','F Agi Dish10',2,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_AGIFOOD,1800000,10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12447,'F_Int_Dish10_','F Int Dish10',2,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_INTFOOD,1800000,10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12448,'F_Dex_Dish10_','F Dex Dish10',2,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_DEXFOOD,1800000,10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12449,'F_Luk_Dish10_','F Luk Dish10',2,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_LUKFOOD,1800000,10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12450,'F_Vit_Dish10_','F Vit Dish10',2,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_VITFOOD,1800000,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12451,'F_WOB_Rune','F WOB Rune',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12452,'F_WOB_Schwaltz','F WOB Schwaltz',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12453,'F_WOB_Rachel','F WOB Rachel',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -6765,7 +6819,7 @@ REPLACE INTO `item_db_re` VALUES (12597,'Opor_Ayam','Opor Ayam',11,20,NULL,150,N
REPLACE INTO `item_db_re` VALUES (12598,'Dendeng_Balado','Dendeng Balado',11,20,NULL,150,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12599,'Kurma','Kurma',11,20,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12600,'Treasure_Box_Scroll','Treasure Chest Summoned',11,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12601,'Fresh_Watermelon_Juice','Fresh Watermelon Juice',0,20,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'percentheal 5,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12601,'Cold_Watermelon_Juice','Fresh Watermelon Juice',0,20,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'percentheal 5,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12602,'Special_Box1','Special Box I',11,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12603,'Special_Box2','Special Box II',11,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12604,'Special_Box3','Special Box III',11,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -6784,7 +6838,7 @@ REPLACE INTO `item_db_re` VALUES (12618,'Bgrade_Pocket','B Grade Coin Bag',2,20,
REPLACE INTO `item_db_re` VALUES (12619,'Cgrade_Pocket','C Grade Coin Bag',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Cgrade_Pocket);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12620,'Dgrade_Pocket','D Grade Coin Bag',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Dgrade_Pocket);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12621,'Egrade_Pocket','E Grade Coin Bag',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Egrade_Pocket);',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12622,'Boarding_Halter','Reins Of Mount',11,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'setmounting();',NULL,'if (ismounting()) setmounting();');
+REPLACE INTO `item_db_re` VALUES (12622,'Boarding_Halter','Reins Of Mount',2,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'setmounting();',NULL,'if (ismounting()) setmounting();');
REPLACE INTO `item_db_re` VALUES (12623,'High_Weapon_Box','Advanced Weapons Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getrandgroupitem(IG_Advanced_Weapons_Box,1);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12624,'Delicious_Jelly','Delicious Jelly',0,20,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'percentheal 3,3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12625,'Sapa_Feat_Cert_Pack','Sapa Feat Cert Pack',2,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -6795,7 +6849,7 @@ REPLACE INTO `item_db_re` VALUES (12629,'Salamander_Scroll','Salamander Scroll',
REPLACE INTO `item_db_re` VALUES (12630,'Teddy_Bear_Scroll','Teddy Bear Scroll',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'mercenary_create 2217,1800000;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12631,'Macro_Stone_A','Macro Stone A',2,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12632,'Macro_Stone_B','Macro Stone B',2,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12633,'Malang_Cat_Can','Malangdo Cat Can',2,20,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'specialeffect2 EF_MAGICALATTHIT; bonus_script "{ bonus2 bExpAddRace,RC_All,10; }",1200; sc_start SC_ITEMBOOST,1200000,20;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12633,'Malang_Cat_Can','Malangdo Cat Can',2,20,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'specialeffect2 EF_MAGICALATTHIT; bonus_script "{ bonus2 bExpAddRace,RC_All,10; bonus2 bDropAddRace,RC_All,20; }",1200,1,0,SI_OVERLAPEXPUP;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12634,'Macro_Stone_A1','Macro Stone A1',2,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12635,'Macro_Stone_A2','Macro Stone A2',2,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12636,'Malang_Sp_Can','Malangdo Canned Specialties',2,20,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'warp "malangdo",140,114;',NULL,NULL);
@@ -6839,8 +6893,8 @@ REPLACE INTO `item_db_re` VALUES (12673,'Lucky_Egg_C10','Lucky Egg C10',2,20,NUL
REPLACE INTO `item_db_re` VALUES (12674,'God_Material_Box','God Material Box',2,20,NULL,500,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_God_Material_Box);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12675,'Sg_Weapon_Supply_Box','WoE Weapon Supply Box',2,20,NULL,500,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Sg_Weapon_Supply_Box);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12676,'Sg_Violet_Potion_Box','Siege Violet Potion Box',2,20,NULL,500,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 11547,50;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12677,'Siege_Arrow_Quiver_S','Siege Arrow Quiver S',2,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,'130',NULL,NULL,'getitem 1776,200;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12678,'Siege_Arrow_Quiver_A','Siege Arrow Quiver A',2,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,'95',NULL,NULL,'getitem 1775,200;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12677,'Siege_Arrow_Quiver_S','Siege Arrow Quiver S',2,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,'130',NULL,NULL,'getitem 1775,200;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12678,'Siege_Arrow_Quiver_A','Siege Arrow Quiver A',2,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,'95',NULL,NULL,'getitem 1776,200;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12679,'Sg_White_Potion_Box','Siege White Potion Box',2,20,NULL,200,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 11548,30;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12680,'Sg_Blue_Potion_Box','Siege Blue Potion Box',2,20,NULL,200,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 11549,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12681,'Nestea_Lemon','Nestea Lemon',2,0,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -6882,26 +6936,26 @@ REPLACE INTO `item_db_re` VALUES (12716,'Indian_Rice_Cake','Indian Rice Cake',2,
#===================================================================
# Guillotine Cross Poisons
#===================================================================
-REPLACE INTO `item_db_re` VALUES (12717,'Poison_Paralysis','Paralyze',0,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_PARALYSE,300000,0,10,2;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12718,'Poison_Leech','Leech End',0,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_LEECHESEND,300000,0,10,2;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12719,'Poison_Oblivion','Oblivion Curse',0,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_OBLIVIONCURSE,300000,0,10,2;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12720,'Poison_Disheart','Disheart',0,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_DEATHHURT,300000,0,10,2;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12721,'Poison_Numb','Toxin',0,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_TOXIN,300000,0,10,2;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12722,'Poison_Fever','Pyrexia',0,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_PYREXIA,300000,0,10,2;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12723,'Poison_Laughing','Magic Mushroom',0,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_MAGICMUSHROOM,300000,0,10,2;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12724,'Poison_Fatigue','Venom Bleed',0,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_VENOMBLEED,15000,0,10,2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12717,'Poison_Paralysis','Paralyze',2,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12718,'Poison_Leech','Leech End',2,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12719,'Poison_Oblivion','Oblivion Curse',2,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12720,'Poison_Contamination','Disheart',2,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12721,'Poison_Numb','Toxin',2,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12722,'Poison_Fever','Pyrexia',2,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12723,'Poison_Laughing','Magic Mushroom',2,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12724,'Poison_Fatigue','Venom Bleed',2,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
#===================================================================
# Rune Knight's Rune Stones
#===================================================================
-REPLACE INTO `item_db_re` VALUES (12725,'Runstone_Nosiege','Nauthiz Rune',11,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,56,2,NULL,NULL,NULL,NULL,NULL,'itemskill "RK_REFRESH",1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12726,'Runstone_Rhydo','Raido Rune',11,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,56,2,NULL,NULL,NULL,NULL,NULL,'itemskill "RK_CRUSHSTRIKE",1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12727,'Runstone_Verkana','Berkana Rune',11,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,56,2,NULL,NULL,NULL,NULL,NULL,'itemskill "RK_MILLENNIUMSHIELD",1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12728,'Runstone_Isia','Isa Rune',11,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,56,2,NULL,NULL,NULL,NULL,NULL,'itemskill "RK_VITALITYACTIVATION",1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12729,'Runstone_Asir','Othila Rune',11,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,56,2,NULL,NULL,NULL,NULL,NULL,'itemskill "RK_FIGHTINGSPIRIT",1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12730,'Runstone_Urj','Uruz Rune',11,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,56,2,NULL,NULL,NULL,NULL,NULL,'itemskill "RK_ABUNDANCE",1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12731,'Runstone_Turisus','Thurisaz Rune',11,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,56,2,NULL,NULL,NULL,NULL,NULL,'itemskill "RK_GIANTGROWTH",1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12732,'Runstone_Pertz','Wyrd Rune',11,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,56,2,NULL,NULL,NULL,NULL,NULL,'itemskill "RK_STORMBLAST",1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12733,'Runstone_Hagalas','Hagalaz Rune',11,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,56,2,NULL,NULL,NULL,NULL,NULL,'itemskill "RK_STONEHARDSKIN",1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12725,'Runstone_Nosiege','Nauthiz Rune',2,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_REFRESH",1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12726,'Runstone_Rhydo','Raido Rune',2,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_CRUSHSTRIKE",1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12727,'Runstone_Verkana','Berkana Rune',2,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_MILLENNIUMSHIELD",1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12728,'Runstone_Isia','Isa Rune',2,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_VITALITYACTIVATION",1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12729,'Runstone_Asir','Othila Rune',2,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_FIGHTINGSPIRIT",1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12730,'Runstone_Urj','Uruz Rune',2,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_ABUNDANCE",1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12731,'Runstone_Turisus','Thurisaz Rune',2,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_GIANTGROWTH",1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12732,'Runstone_Pertz','Wyrd Rune',2,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_STORMBLAST",1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12733,'Runstone_Hagalas','Hagalaz Rune',2,100,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_STONEHARDSKIN",1;',NULL,NULL);
#===================================================================
# Rune Knight Rune Ores
#===================================================================
@@ -7014,8 +7068,8 @@ REPLACE INTO `item_db_re` VALUES (12841,'Golden_Treasure_Box','Golden Treasure B
REPLACE INTO `item_db_re` VALUES (12842,'Platinum_Treasure_Box','Platinum Treasure Box',2,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,'50',NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12843,'Pearl_Treasure_Box','Pearl Treasure Box',2,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,'60',NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12844,'Diamond_Treasure_Box','Diamond Treasure Box',2,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,'70',NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12845,'Amatsu_Butterfly_Wing','Amatsu_Butterfly_Wing',2,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12846,'Little_Unripe_Apple','Little Unripe Apple',2,10,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'pet 2398;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12845,'WOB_Amatsu','Amatsu_Butterfly_Wing',2,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12846,'Unripe_Apple2','Little Unripe Apple',2,10,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'pet 2398;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12847,'Old_Equipment_Box','Old Equipment Box',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12848,'Falcon_Flute','Falcon Flute',11,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'if(getskilllv("HT_FALCON")) { if(!checkoption(Option_Wug) && !checkoption(Option_Wugrider)) setfalcon (!checkfalcon()); }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12849,'Combination_Kit','Combination Kit',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'cooking 30;',NULL,NULL);
@@ -7039,7 +7093,7 @@ REPLACE INTO `item_db_re` VALUES (12883,'Almighty','Almighty',2,20,NULL,10,NULL,
REPLACE INTO `item_db_re` VALUES (12884,'Infinite_Concentration_Potion','Infinite Concentration Potion',11,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_ASPDPOTION0,1800000,4;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12885,'Infinite_Awakening_Potion','Infinite Awakening Potion',11,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_ASPDPOTION1,1800000,6;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12886,'Infinite_Berserk_Potion','Infinite Berserk Potion',11,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_ASPDPOTION2,1800000,9;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12887,'C_Wing_Of_Fly','Infinite Flywing',11,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'unitskilluseid getcharid(3),"AL_TELEPORT",1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12887,'C_Wing_Of_Fly','Infinite Flywing',2,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemskill "AL_TELEPORT",1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12888,'Siege_Kit_Box','Siege Kit Box',18,0,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12889,'Weapon_Box_Spear','Weapon Box(Spear)',2,10,NULL,200,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12890,'Weapon_Box_Mace','Weapon Box(Mace)',2,10,NULL,200,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -7245,12 +7299,12 @@ REPLACE INTO `item_db_re` VALUES (13088,'Greater_Lease','Greater Lease',5,10,NUL
REPLACE INTO `item_db_re` VALUES (13089,'FaceWorm_Leg','Faceworm Leg',5,20,NULL,500,'110:50',NULL,1,1,0x028F5EEF,63,2,2,3,'24',1,1,'bonus bAtkEle,Ele_Poison; autobonus "{}",30,5000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; active_transform 2528,5000; }";',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13090,'FaceWormQueen_Leg','Faceworm Queen Leg',5,20,NULL,500,'180:120',NULL,1,2,0x028F5EEF,63,2,2,4,'100',1,1,'bonus bInt,3; autobonus "{ bonus3 bAutoSpell,\\\"NPC_EARTHQUAKE\\\",1,200; }",8,5000,BF_NORMAL,"{ specialeffect2 EF_POTION_BERSERK; active_transform 2529,5000; }";',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13092,'RWC_Memory_Knife','RWC Memory Knife',5,1000,500,650,'50',0,1,1,0x02800075,63,2,2,3,'1',1,1,'.@r = getrefine(); bonus bBaseAtk,20*(.@r/3); bonus bMatk,20*(.@r/3); if(.@r>=9){ .@i = 1; bonus4 bAutoSpell,"BS_WEAPONPERFECT",1,20,0; } if(.@r>=6){ .@rate = 5*(.@i+1); bonus2 bAddClass,Class_All,.@rate; bonus2 bMagicAddClass,Class_All,.@rate; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13093,'Thanos_Dagger','Thanatos Dagger',5,10,NULL,800,'100:130',NULL,1,1,0x000E5CEA,63,2,2,4,'120',1,1,'bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000;',NULL,'heal -1000,0;');
+REPLACE INTO `item_db_re` VALUES (13093,'Thanos_Dagger','Thanatos Dagger',5,10,NULL,800,'100:130',NULL,1,1,0x000E5CEA,56,2,2,4,'120',1,1,'bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000;',NULL,'heal -1000,0;');
REPLACE INTO `item_db_re` VALUES (13094,'Dagger_Of_Evil_Slayer','Evil Slayer Stabber Dagger',5,10,NULL,900,'120',NULL,1,1,0x028F5EEF,63,2,2,3,'100',1,1,'bonus2 bAddRace,RC_Undead,10; .@r = getrefine(); bonus2 bAddClass,Class_All,(.@r>=12?12:(.@r>=9?5:0));',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13096,'Half_BF_Dagger2','Half BF Dagger2',5,20,NULL,0,'120:90',NULL,1,0,0x3E9F7EEF,63,2,2,3,'80',1,1,'bonus bStr,1; bonus bAgi,1; bonus2 bAddRace,RC_DemiHuman,35; bonus2 bAddRace,RC_Player,35; bonus2 bIgnoreDefRaceRate,RC_DemiHuman,10; bonus2 bIgnoreDefRaceRate,RC_Player,10; bonus bUnbreakableWeapon,1; autobonus "{ bonus bDefRatioAtkClass,Class_All; }",10,3000,BF_WEAPON,"{ specialeffect2 EF_HASTEUP; }"; if(Class==Job_Ninja||Class==Job_Rogue||Class==Job_Stalker) bonus bMatkRate,45;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13097,'Blue_Dagger','Blue Dagger',5,10,NULL,1000,'160',NULL,1,1,0x00020000,56,2,2,3,'100',1,1,'bonus bStr,5; bonus bInt,5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13098,'Blue_Ashura','Blue Ashura',5,10,NULL,1000,'150:120',NULL,1,1,0x02000000,7,2,2,3,'100',1,1,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13099,'Blue_Knife','Blue Knife',5,10,NULL,500,'160',NULL,1,1,0x00010000,56,2,2,3,'100',1,1,'bonus bStr,5; bonus bInt,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13097,'Ru_Blue_Dagger','Blue Dagger',5,10,NULL,1000,'160',NULL,1,1,0x00020000,56,2,2,3,'100',1,1,'bonus bStr,5; bonus bInt,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13098,'Ru_Blue_Ashura','Blue Ashura',5,10,NULL,1000,'150:120',NULL,1,1,0x02000000,7,2,2,3,'100',1,1,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13099,'Ru_Blue_Knife','Blue Knife',5,10,NULL,500,'160',NULL,1,1,0x00010000,56,2,2,3,'100',1,1,'bonus bStr,5; bonus bInt,5;',NULL,NULL);
#===================================================================
# Guns
#===================================================================
@@ -7272,8 +7326,8 @@ REPLACE INTO `item_db_re` VALUES (13114,'P_Revolver3','Eden Revolver III',5,0,NU
REPLACE INTO `item_db_re` VALUES (13115,'Upg_Revolver','Upg Revolver',5,20,NULL,500,'35',NULL,7,1,0x41000000,63,2,34,3,'1',1,17,'.@r = getrefine(); bonus bBaseAtk,(.@r*5); bonus bLongAtkRate,(.@r*2); if(BaseLevel>70) bonus bBaseAtk,(((BaseLevel-70)/10)*5);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13116,'Novice_Revolver','Novice Revolver',5,0,NULL,500,'20',NULL,7,0,0x41000000,63,2,34,1,'1',0,17,'bonus bHit,-5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13117,'TE_Woe_Pistol','TE Woe Pistol',5,0,NULL,0,'60',NULL,7,0,0x41000000,63,2,34,3,'40',1,17,'bonus2 bAddRace,RC_Player,40; bonus2 bAddEff,Eff_Curse,3000;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13118,'Spark_Light','Spark Light',5,1,NULL,100,'0',NULL,9,0,0x41000000,63,2,34,1,'1',1,17,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13119,'Spark_Of_Freedom','Spark Of Freedom',5,1,NULL,100,'100',NULL,9,2,0x41000000,63,2,34,3,'99',1,17,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13118,'Tiny_Flame','Fading Flame',5,1,NULL,100,'0',NULL,7,0,0x01000000,63,2,34,1,'1',1,17,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13119,'Freedom_Flame','Freedom Flame',5,1,NULL,100,'100',NULL,7,2,0x01000000,63,2,34,3,'99',1,17,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13120,'Heaven\'s_Feather_and_Hell\'s_Fire','Heaven\'s Feather & Hell\'s Fire',5,1250000,NULL,800,'150',NULL,9,1,0x41000000,63,2,34,3,'99',1,17,'bonus2 bSkillAtk,"GS_DESPERADO",20; bonus2 bSkillAtk,"RL_FALLEN_ANGEL",20;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13122,'Altea_and_Ares','Altea & Ares',5,1450000,NULL,1000,'200',NULL,9,0,0x40000000,63,2,34,3,'140',1,17,'bonus bHit,5; bonus bDelayrate,10; bonus bLongAtkRate,30;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13124,'Altea_and_Ares_','Altea & Ares',5,1450000,NULL,1000,'200',NULL,9,1,0x40000000,63,2,34,3,'140',1,17,'bonus bHit,5; bonus bDelayrate,10; bonus bLongAtkRate,30;',NULL,NULL);
@@ -7320,16 +7374,16 @@ REPLACE INTO `item_db_re` VALUES (13184,'TE_Woe_Rifle','TE Woe Rifle',5,0,NULL,0
REPLACE INTO `item_db_re` VALUES (13185,'TE_Woe_Gatling','TE Woe Gatling',5,0,NULL,0,'100',NULL,7,0,0x41000000,63,2,34,3,'40',1,19,'bonus2 bAddRace,RC_Player,40; bonus2 bAddEff,Eff_Stun,3000;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13186,'TE_Woe_Shotgun','TE Woe Shotgun',5,0,NULL,0,'100',NULL,7,0,0x41000000,63,2,34,3,'40',1,20,'bonus2 bAddRace,RC_Player,40; bonus2 bAddEff,Eff_Poison,3000;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13187,'TE_Woe_Grenade','TE Woe Grenade',5,0,NULL,0,'100',NULL,9,0,0x41000000,63,2,34,3,'40',1,21,'bonus2 bAddRace,RC_Player,40; bonus2 bAddEff,Eff_Blind,3000;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13189,'Color_Scope','Color Scope',5,1350000,NULL,1200,'240',NULL,9,2,0x40000000,63,2,34,3,'105',1,18,'bonus bHit,20; bonus bCriticalRate,30;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13190,'RAG203','RAG203',5,1800000,NULL,1300,'260',NULL,9,1,0x40000000,63,2,34,3,'140',1,18,'bonus bHit,10; bonus bCriticalRate,15; bonus4 bAutoSpell,"AL_DECAGI",1,500,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13192,'Death_Fire','Death Fire',5,1250000,NULL,2000,'400',NULL,9,1,0x40000000,63,2,34,3,'108',1,20,'bonus bLongAtkRate,5; bonus bHit,-50; bonus bDelayrate,-10;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13193,'Rolling_Thunder','Rolling Thunder',5,1350000,NULL,1800,'280',NULL,9,1,0x40000000,63,2,34,3,'120',1,20,'bonus bHit,-10; bonus bDelayrate,-10; bonus3 bAutoSpell,"MG_THUNDERSTORM",5,500;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13194,'Peace_Breaker','Peace Breaker',5,1950000,NULL,1400,'250',NULL,9,0,0x41000000,63,2,34,3,'140',1,20,'bonus bHit,-25; bonus bAspdRate,25;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13195,'RAG203_','RAG203',5,1800000,NULL,1300,'260',NULL,9,0,0x40000000,63,2,34,3,'140',1,18,'bonus bHit,10; bonus bCriticalRate,15; bonus4 bAutoSpell,"AL_DECAGI",1,10,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13196,'Peace_Breaker_','Peace Breaker',5,1950000,NULL,1400,'250',NULL,9,1,0x41000000,63,2,34,3,'140',1,20,'bonus bHit,-25; bonus bAspdRate,25;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13197,'Mini_Mei','Mini Mei',5,1600000,NULL,2500,'220',NULL,9,2,0x41000000,63,2,34,2,'106',1,19,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13198,'Tempest_','Tempest',5,2200000,NULL,2500,'250',NULL,9,0,0x41000000,63,2,34,2,'140',1,19,'bonus bHit,-25; bonus bCritical,10; bonus bLongAtkRate,20;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13199,'Tempest','Tempest',5,2200000,NULL,2500,'250',NULL,9,1,0x41000000,63,2,34,2,'140',1,19,'bonus bHit,-25; bonus bCritical,10; bonus bLongAtkRate,20;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13189,'COLORSCOPE','Color Scope',5,1350000,NULL,1200,'240',NULL,9,2,0x40000000,63,2,34,3,'105',1,18,'bonus bHit,20; bonus bCriticalRate,30;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13190,'RAG203_','RAG203',5,1800000,NULL,1300,'260',NULL,9,1,0x40000000,63,2,34,3,'140',1,18,'bonus bHit,10; bonus bCriticalRate,15; bonus4 bAutoSpell,"AL_DECAGI",1,500,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13192,'DEATHFIRE','Death Fire',5,1250000,NULL,2000,'400',NULL,9,1,0x40000000,63,2,34,3,'108',1,20,'bonus bLongAtkRate,5; bonus bHit,-50; bonus bDelayrate,-10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13193,'R_THUNDER','Rolling Thunder',5,1350000,NULL,1800,'280',NULL,9,1,0x40000000,63,2,34,3,'120',1,20,'bonus bHit,-10; bonus bDelayrate,-10; bonus3 bAutoSpell,"MG_THUNDERSTORM",5,500;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13194,'P_BREAKER','Peace Breaker',5,1950000,NULL,1400,'250',NULL,9,0,0x41000000,63,2,34,3,'140',1,20,'bonus bHit,-25; bonus bAspdRate,25;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13195,'RAG203','RAG203',5,1800000,NULL,1300,'260',NULL,9,0,0x40000000,63,2,34,3,'140',1,18,'bonus bHit,10; bonus bCriticalRate,15; bonus4 bAutoSpell,"AL_DECAGI",1,10,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13196,'P_BREAKER_','Peace Breaker',5,1950000,NULL,1400,'250',NULL,9,1,0x41000000,63,2,34,3,'140',1,20,'bonus bHit,-25; bonus bAspdRate,25;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13197,'MINIMAY','Mini Mei',5,1600000,NULL,2500,'220',NULL,9,2,0x41000000,63,2,34,2,'106',1,19,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13198,'TEMPEST','Tempest',5,2200000,NULL,2500,'250',NULL,9,0,0x41000000,63,2,34,4,'140',1,19,'bonus bHit,-25; bonus bCritical,10; bonus bLongAtkRate,20;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13199,'TEMPEST_','Tempest',5,2200000,NULL,2500,'250',NULL,9,1,0x41000000,63,2,34,4,'140',1,19,'bonus bHit,-25; bonus bCritical,10; bonus bLongAtkRate,20;',NULL,NULL);
#===================================================================
# Bullets
#===================================================================
@@ -7342,24 +7396,29 @@ REPLACE INTO `item_db_re` VALUES (13205,'Poison_Sphere','Poison Sphere',10,80,NU
REPLACE INTO `item_db_re` VALUES (13206,'Blind_Sphere','Blind Sphere',10,80,NULL,5,'50',NULL,NULL,NULL,0x41000000,63,2,32768,NULL,'1',NULL,5,'bonus bAtkEle,Ele_Dark; bonus2 bAddEff,Eff_Blind,500;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13207,'Freezing_Sphere','Freezing Sphere',10,80,NULL,5,'50',NULL,NULL,NULL,0x41000000,63,2,32768,NULL,'1',NULL,5,'bonus bAtkEle,Ele_Water;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13208,'Gong_Bug','Sow Bug',10,0,NULL,5,'50',NULL,NULL,NULL,0x41000000,63,2,32768,NULL,'50',NULL,3,'bonus2 bAddEff,Eff_Stun,1000;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13210,'Slug_Ammunition_L','Slug Ammunition L',10,250,NULL,250,'30',NULL,NULL,NULL,0x41000000,63,2,32768,NULL,'1',NULL,3,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13211,'Slug_Ammunition_M','Slug Ammunition M',10,500,NULL,500,'30',NULL,NULL,NULL,0x41000000,63,2,32768,NULL,'1',NULL,3,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13212,'Slug_Ammunition_H','Slug Ammunition H',10,750,NULL,750,'30',NULL,NULL,NULL,0x41000000,63,2,32768,NULL,'1',NULL,3,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13213,'Slug_Ammunition_SH','Slug Ammunition SH',10,1,NULL,1000,'30',NULL,NULL,NULL,0x41000000,63,2,32768,NULL,'1',NULL,3,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13214,'Slug_Ammunition_XH','Slug Ammunition XH',10,1,NULL,1200,'30',NULL,NULL,NULL,0x41000000,63,2,32768,NULL,'1',NULL,3,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13215,'Armor_Burnt','Armor Burnt',10,10,NULL,2,'50',NULL,NULL,0,0xFFFFFFFF,63,2,32768,NULL,'100',NULL,3,'bonus bAtkEle,Ele_Neutral;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13216,'Incandescence_Shot','Incandescence Shot',10,10,NULL,2,'40',NULL,NULL,0,0xFFFFFFFF,63,2,32768,NULL,'100',NULL,3,'bonus bAtkEle,Ele_Fire;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13217,'Glaciation_Shot','Glaciation Shot',10,10,NULL,2,'40',NULL,NULL,0,0xFFFFFFFF,63,2,32768,NULL,'100',NULL,3,'bonus bAtkEle,Ele_Water;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13218,'Dengeki_Shot','Dengeki Shot',10,10,NULL,2,'40',NULL,NULL,0,0xFFFFFFFF,63,2,32768,NULL,'100',NULL,3,'bonus bAtkEle,Ele_Wind;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13219,'Hearthstone_Shot','Hearthstone Shot',10,10,NULL,2,'40',NULL,NULL,0,0xFFFFFFFF,63,2,32768,NULL,'100',NULL,3,'bonus bAtkEle,Ele_Earth;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13220,'Purification_Shot','Purification Shot',10,10,NULL,2,'40',NULL,NULL,0,0xFFFFFFFF,63,2,32768,NULL,'100',NULL,3,'bonus bAtkEle,Ele_Holy;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13210,'Slug_Bullet_1','Slug Ammunition L',10,250,NULL,250,'30',NULL,NULL,NULL,0x41000000,63,2,32768,NULL,'1',NULL,3,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13211,'Slug_Bullet_2','Slug Ammunition M',10,500,NULL,500,'30',NULL,NULL,NULL,0x41000000,63,2,32768,NULL,'1',NULL,3,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13212,'Slug_Bullet_3','Slug Ammunition H',10,750,NULL,750,'30',NULL,NULL,NULL,0x41000000,63,2,32768,NULL,'1',NULL,3,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13213,'Slug_Bullet_4','Slug Ammunition SH',10,1000,NULL,1000,'30',NULL,NULL,NULL,0x41000000,63,2,32768,NULL,'1',NULL,3,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13214,'Slug_Bullet_5','Slug Ammunition XH',10,1200,NULL,1200,'30',NULL,NULL,NULL,0x41000000,63,2,32768,NULL,'1',NULL,3,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13215,'AP_Ammo','Armor Burnt',10,10,NULL,2,'50',NULL,NULL,0,0xFFFFFFFF,63,2,32768,NULL,'100',NULL,3,'bonus bAtkEle,Ele_Neutral;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13216,'Blaze_Bullet','Incandescence Shot',10,10,NULL,2,'40',NULL,NULL,0,0xFFFFFFFF,63,2,32768,NULL,'100',NULL,3,'bonus bAtkEle,Ele_Fire;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13217,'Freezing_Bullet','Glaciation Shot',10,10,NULL,2,'40',NULL,NULL,0,0xFFFFFFFF,63,2,32768,NULL,'100',NULL,3,'bonus bAtkEle,Ele_Water;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13218,'Electric_Shock_Bullet','Dengeki Shot',10,10,NULL,2,'40',NULL,NULL,0,0xFFFFFFFF,63,2,32768,NULL,'100',NULL,3,'bonus bAtkEle,Ele_Wind;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13219,'Magical_Stone_Bullet','Hearthstone Shot',10,10,NULL,2,'40',NULL,NULL,0,0xFFFFFFFF,63,2,32768,NULL,'100',NULL,3,'bonus bAtkEle,Ele_Earth;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13220,'Sanctified_Bullet','Purification Shot',10,10,NULL,2,'40',NULL,NULL,0,0xFFFFFFFF,63,2,32768,NULL,'100',NULL,3,'bonus bAtkEle,Ele_Holy;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13221,'Silver_Bullet_','Silver Bullet',10,10,NULL,2,'15',NULL,NULL,0,0xFFFFFFFF,63,2,32768,NULL,'1',NULL,3,'bonus bAtkEle,Ele_Holy;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13222,'Bloody_Shell','Bloody Shell',10,10,NULL,2,'30',NULL,NULL,0,0xFFFFFFFF,63,2,32768,NULL,'1',NULL,3,'bonus bAtkEle,Ele_Neutral;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13222,'Shell_Of_Blood_','Bloody Shell',10,10,NULL,2,'30',NULL,NULL,0,0xFFFFFFFF,63,2,32768,NULL,'1',NULL,3,'bonus bAtkEle,Ele_Neutral;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13223,'Flare_Sphere_','Flare Sphere',10,10,NULL,5,'50',NULL,NULL,0,0xFFFFFFFF,63,2,32768,NULL,'1',NULL,5,'bonus bAtkEle,Ele_Fire;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13224,'Lightning_Sphere','Lightning Sphere',10,10,NULL,5,'50',NULL,NULL,0,0xFFFFFFFF,63,2,32768,NULL,'1',NULL,5,'bonus bAtkEle,Ele_Wind;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13224,'Lighting_Sphere_','Lightning Sphere',10,10,NULL,5,'50',NULL,NULL,0,0xFFFFFFFF,63,2,32768,NULL,'1',NULL,5,'bonus bAtkEle,Ele_Wind;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13225,'Poison_Sphere_','Poison Sphere',10,10,NULL,5,'50',NULL,NULL,0,0xFFFFFFFF,63,2,32768,NULL,'1',NULL,5,'bonus bAtkEle,Ele_Poison;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13226,'Blind_Sphere_','Blind Sphere',10,10,NULL,5,'50',NULL,NULL,0,0xFFFFFFFF,63,2,32768,NULL,'1',NULL,5,'bonus bAtkEle,Ele_Dark;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13227,'Freezing_Sphere_','Freezing Sphere',10,10,NULL,5,'50',NULL,NULL,0,0xFFFFFFFF,63,2,32768,NULL,'1',NULL,5,'bonus bAtkEle,Ele_Water;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13228,'Flare_Bullet','Flare Bullet',10,1,NULL,2,'20',NULL,NULL,NULL,0x41000000,63,2,32768,NULL,'1',NULL,3,'bonus bAtkEle,Ele_Fire;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13229,'Lightning_Bullet','Lightning Bullet',10,1,NULL,2,'20',NULL,NULL,NULL,0x41000000,63,2,32768,NULL,'1',NULL,3,'bonus bAtkEle,Ele_Wind;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13230,'Ice_Bullet','Ice Bullet',10,1,NULL,2,'20',NULL,NULL,NULL,0x41000000,63,2,32768,NULL,'1',NULL,3,'bonus bAtkEle,Ele_Water;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13231,'Poison_Bullet','Poison Bullet',10,1,NULL,2,'20',NULL,NULL,NULL,0x41000000,63,2,32768,NULL,'1',NULL,3,'bonus bAtkEle,Ele_Poison;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13232,'Blind_Bullet','Blind Bullet',10,1,NULL,2,'20',NULL,NULL,NULL,0x41000000,63,2,32768,NULL,'1',NULL,3,'bonus bAtkEle,Ele_Dark;',NULL,NULL);
#===================================================================
# Shurikens & Kunais
#===================================================================
@@ -7428,7 +7487,7 @@ REPLACE INTO `item_db_re` VALUES (13306,'BF_Huuma_Shuriken2','Valorous Huuma Fro
REPLACE INTO `item_db_re` VALUES (13307,'Krieger_Huuma_Shuriken1','Glorious Shuriken',5,20,NULL,0,'55:90',NULL,1,0,0x02000000,63,2,34,4,'80',1,22,'bonus2 bAddRace,RC_DemiHuman,95; bonus2 bAddRace,RC_Player,95; bonus2 bIgnoreDefRaceRate,RC_DemiHuman,20; bonus2 bIgnoreDefRaceRate,RC_Player,20; bonus bMatkRate,15; autobonus "{ bonus2 bSkillAtk,\\\"NJ_HUUMA\\\",100; bonus2 bSkillAtk,\\\"NJ_ISSEN\\\",100; }",50,10000; bonus bUnbreakableWeapon,1; .@r = getrefine(); if(.@r>5) { bonus2 bAddRace,RC_DemiHuman,pow(min(14,.@r)-3,2); bonus2 bAddRace,RC_Player,pow(min(14,.@r)-3,2); bonus2 bIgnoreDefRaceRate,RC_DemiHuman,5; bonus2 bIgnoreDefRaceRate,RC_Player,5; } if(.@r>8) { bonus5 bAutoSpellOnSkill,"NJ_ISSEN","AL_HEAL",10,1000,1; bonus4 bAutoSpellOnSkill,"NJ_HUUMA","NPC_CRITICALWOUND",2,200; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13308,'Huuma_Blaze_I','Huuma Blaze Shuriken',5,0,NULL,0,'230',NULL,1,0,0x02000000,63,2,34,4,'0',0,22,'bonus bUnbreakableWeapon,1; bonus bAtkEle,Ele_Fire; bonus bDex,2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13309,'Huuma_Giant_Wheel_C','Huuma Giant Wheel Shuriken',5,0,NULL,0,'99',NULL,1,0,0x02000000,63,2,34,4,'1',0,22,'bonus2 bAddSize,Size_All,80;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13310,'P_Huuma_Suriken1','P.Huuma Suriken I',5,0,NULL,0,'150:50',NULL,1,0,0x02000000,63,2,34,3,'60',0,22,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13310,'P_Huuma_Shuriken1','P.Huuma Suriken I',5,0,NULL,0,'150:50',NULL,1,0,0x02000000,63,2,34,3,'60',0,22,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13311,'Huuma_Shadow','Sword Huuma Shuriken',5,5000,NULL,1500,'170',NULL,1,0,0x02000000,63,2,34,3,'99',1,22,'bonus bStr,3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13312,'Huuma_Job_Test','Prototype Huuma Shuriken',5,0,NULL,3000,'0',NULL,1,0,0x02000000,63,2,34,4,'99',1,22,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13313,'Huuma_Swirling_Petal','Flower Huuma Shuriken',5,100000,NULL,1500,'150:50',NULL,1,2,0x02000000,63,2,34,3,'110',1,22,'bonus2 bSkillAtk,"KO_HUUMARANKA",20;',NULL,NULL);
@@ -7483,15 +7542,15 @@ REPLACE INTO `item_db_re` VALUES (13434,'P_Saber3','Eden Saber III',5,0,NULL,0,'
REPLACE INTO `item_db_re` VALUES (13438,'Magical_Blade','Magical Blade',5,60000,NULL,2000,'165:110',NULL,1,2,0x000654E3,63,2,2,4,'105',1,2,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13439,'TE_Woe_Sword','TE Woe Sword',5,0,NULL,0,'120:100',NULL,1,0,0x000654E3,63,2,2,3,'40',1,2,'bonus2 bAddRace,RC_Player,40; bonus2 bAddEff,Eff_Poison,3000;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13440,'Ceremonial_Sword','Ceremonial Sword',5,20,NULL,500,'60',NULL,1,0,0x00000063,5,2,2,1,'1',1,2,'bonus bAtkEle,Ele_Holy;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13441,'Thanos_Sword','Thanatos Sword',5,10,NULL,700,'150:100',NULL,1,1,0x00004082,63,2,2,4,'120',1,2,'bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000;',NULL,'heal -1000,0;');
+REPLACE INTO `item_db_re` VALUES (13441,'Thanos_Sword','Thanatos Sword',5,10,NULL,700,'150:100',NULL,1,1,0x00004082,56,2,2,4,'120',1,2,'bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000;',NULL,'heal -1000,0;');
REPLACE INTO `item_db_re` VALUES (13442,'Old_Parasol','Old Parasol',5,10,NULL,500,'120:80',NULL,NULL,3,0x000654E2,63,2,2,3,'80',1,2,'bonus bMatk,getrefine(); skill "MG_SOULSTRIKE",10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13444,'Pala','Pala',5,20,NULL,700,'190',NULL,0,1,0x000654E2,63,2,2,3,'0',1,2,'bonus bAspdRate,8;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13445,'Half_BF_Sword1','Half BF Sword1',5,20,NULL,0,'115',NULL,1,0,0x000654E3,63,2,2,3,'80',1,2,'bonus bStr,1; bonus bDex,1; bonus2 bAddRace,RC_DemiHuman,35; bonus2 bAddRace,RC_Player,35; bonus2 bIgnoreDefRaceRate,RC_DemiHuman,10; bonus2 bIgnoreDefRaceRate,RC_Player,10; bonus bUnbreakableWeapon,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13449,'Gladius_Daemonicus','Gladius Daemonicus',5,20,NULL,1200,'130',NULL,NULL,2,0x000654E2,63,2,2,4,'80',1,2,'bonus bAtkEle,Ele_Dark;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13450,'Saber__','Saber',5,10,NULL,1000,'115',NULL,NULL,2,0x000654E2,63,2,2,3,'27',1,0,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13451,'Blue_Sword','Blue Sword',5,10,NULL,1200,'190',NULL,1,1,0x00000080,56,2,2,3,'100',1,2,'bonus bStr,5; bonus bAgi,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13451,'Ru_Blue_Sword','Blue Sword',5,10,NULL,1200,'190',NULL,1,1,0x00000080,56,2,2,3,'100',1,2,'bonus bStr,5; bonus bAgi,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13452,'Ru_Gold_Sword','Ru Gold Sword',5,0,NULL,1200,'190',NULL,1,2,0x00000080,56,2,2,3,'120',1,2,'bonus bStr,8; bonus bAgi,8;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13454,'Crimson_Saber','Crimson Saber',5,20,NULL,850,'85',NULL,1,2,0x000654E3,56,2,2,3,'70',1,2,'.@r = getrefine(); bonus bBaseAtk,((BaseLevel/10)*5)+(.@r<=15?pow(.@r,2):225);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13454,'Crimson_Saber','Crimson Saber',5,20,NULL,850,'85',NULL,1,2,0x000654E3,63,2,2,3,'70',1,2,'.@r = getrefine(); bonus bBaseAtk,((BaseLevel/10)*5)+(.@r<=15?pow(.@r,2):225);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13455,'Saber_of_Vicious_Mind','Saber of Vicious Mind',5,20,NULL,1350,'135',NULL,1,1,0x000654E3,63,2,2,4,'160',1,2,'bonus bAtk,pow(min(getrefine(),15),2);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13456,'Unity_Sword','Unity Sword',5,20,NULL,420,'80',NULL,1,1,0x000654E3,56,2,2,3,'1',1,2,'bonus bBaseAtk,pow(getrefine(),2)*125/100;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13457,'Unity_Dagger','Unity Dagger',5,20,NULL,270,'52',NULL,1,1,0x028F5EEF,63,2,2,3,'1',1,1,'bonus bBaseAtk,pow(getrefine(),2)*125/100;',NULL,NULL);
@@ -7519,8 +7578,8 @@ REPLACE INTO `item_db_re` VALUES (13517,'Yggdrasilberry_Box','Yggdrasil Berry Bo
REPLACE INTO `item_db_re` VALUES (13518,'Weapon_Card_Scroll_Box','Weapon Card Pet Egg Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13558,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13519,'Armor_Card_Scroll_Box','Armor Card Pet Egg Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13559,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13520,'Helmet_Card_Scroll_Box','Helmet Card Pet Egg Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13560,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13521,'Garment_Card_Scroll_Box','Garment Card Pet Egg Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13561,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13522,'Shield_Card_Scroll_Box','Shield Card Pet Egg Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13562,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13521,'Hood_Card_Scroll_Box','Garment Card Pet Egg Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13561,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13522,'Hood_Card_Scroll_Box2','Shield Card Pet Egg Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13562,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13523,'Shoes_Card_Scroll_Box','Shoes Card Pet Egg Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13563,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13524,'Accy_Card_Scroll_Box','Accessory Card Pet Egg Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13564,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13525,'Zeny_Scroll_Box','Zeny Pet Egg Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 14508,1;',NULL,NULL);
@@ -7907,10 +7966,10 @@ REPLACE INTO `item_db_re` VALUES (13907,'Soft_Core_Set_Box','XM Softcore Set Box
REPLACE INTO `item_db_re` VALUES (13908,'Deviruchi_Set_Box','XM Deviruchi Set Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Deviruchi_Set_Box); /*getitem 5227,1; getitem 5228,1; getitem 5229,1;*/',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13909,'MVP_Hunt_Box','MVP Hunting Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_MVP_Hunt_Box); /*getitem 7621,1; getitem 12210,1; getitem 12221,1; getitem 12214,3;*/',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13910,'Brewing_Box','XM Brewing Set Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Brewing_Box); /*getitem 12204,10; getitem 12205,10; getitem 12206,10;*/',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13911,'Christmas_Pet_Scroll','Christmas Pet Scroll',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Xmas_Pet_Scroll);',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13912,'Pty_Blessing_Box','Party Blessing 10 Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 14588,10;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13913,'Pty_Inc_Agi_Box','Party Increase Agi 10 Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 14589,10;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13914,'Pty_Assumptio_Box','Party Assumptio 5 Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 14590,10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13911,'Xmas_Pet_Scroll','Christmas Pet Scroll',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Xmas_Pet_Scroll);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13912,'Party_Blessing_Box','Party Blessing 10 Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 14588,10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13913,'Party_Inc_Agi_Box','Party Increase Agi 10 Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 14589,10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13914,'Party_Assumptio_Box','Party Assumptio 5 Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 14590,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13915,'Love_Angel_Box','Love Angel Magic Powder Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'rentitem 12287,604800;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13916,'Squirrel_Box','Squirrel Magic Powder Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'rentitem 12288,604800;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13917,'Gogo_Box','Gogo Magic Powder Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'rentitem 12289,604800;',NULL,NULL);
@@ -7932,12 +7991,12 @@ REPLACE INTO `item_db_re` VALUES (13932,'Sylph_Box','Sylph Box',18,20,NULL,10,NU
REPLACE INTO `item_db_re` VALUES (13933,'Undine_Box','Undine Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 4350,4;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13934,'Salamander_Box','Salamander Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 4380,4;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13935,'Soul_Box','Soul Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 4388,4;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13936,'Noum_Box','Gnome Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 4335,4;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13936,'Noum_Bpx','Gnome Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 4335,4;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13937,'Robo_Eye_Box','Robo Eye Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 5325,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13938,'Twin_Ribbon_Box','Maiden\'s Twin Ribbon Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 5187,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13939,'Diadem_Box','Diadem Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 5313,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13940,'Siege_Tele_Scroll_Box','WoE Teleport Scroll 100 Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 14591,100;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13941,'TW_Valentine_Scroll','Taiwan Valentine Scroll',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13941,'Valentine_Scroll_TW','Taiwan Valentine Scroll',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13942,'Love_Angel_Box_1m','Love Angel Magic Powder Box 30 Days',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 14009,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13943,'Squirrel_Box_1m','Squirrel Magic Powder Box 30 Days',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 14010,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13944,'Gogo_Box_1m','Gogo Magic Powder Box 30 Days',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 14011,1;',NULL,NULL);
@@ -7994,9 +8053,9 @@ REPLACE INTO `item_db_re` VALUES (13994,'Speed_Up_Potion_Box5','Speed Potion 5 B
REPLACE INTO `item_db_re` VALUES (13995,'Speed_Up_Potion_Box10','Speed Potion 10 Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 12016,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13996,'Big_Bun_Box100','Big Bun 100 Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 14522,100;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13997,'Big_Bun_Box500','Big Bun 500 Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 14522,500;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13998,'Giant_Flywing_Box500','Giant Fly Wing 500 Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 12212,500;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (13999,'Pill_Box100','Pill 100 Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 14523,100;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (14000,'Pill_Box500','Pill 500 Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 14523,500;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13998,'Giant_Fly_Wing_Box500','Giant Fly Wing 500 Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 12212,500;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13999,'Pill__Box100','Pill 100 Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 14523,100;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (14000,'Pill__Box500','Pill 500 Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 14523,500;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (14001,'Basic_Siege_Supply_Box','Recruit Siege Supply Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Basic_Siege_Supply_Box); /*getitem 11503,25; getitem 11504,10;*/',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (14002,'Adv_Siege_Supply_Box','Veteran Siege Supply Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Adv_Siege_Supply_Box); /*getitem 11503,50; getitem 11504,20;*/',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (14003,'Elite_Siege_Supply_Box','Elite Siege Supply Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Elite_Siege_Supply_Box); /*getitem 11503,100; getitem 11504,50;*/',NULL,NULL);
@@ -8216,7 +8275,7 @@ REPLACE INTO `item_db_re` VALUES (14216,'F_Bubble_Gum_Box5','Bubble Gum 5 Box',1
REPLACE INTO `item_db_re` VALUES (14217,'F_Megaphone_Box1','Megaphone Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 12221,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (14218,'F_Megaphone_Box5','Megaphone 5 Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 12221,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (14219,'F_Enriched_Elunium_Box5','Enriched Elunium 5 Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 7619,5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (14220,'F_Enriched_Oridecon_Box5','Enriched Oridecon 5 Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 7620,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (14220,'FEnriched_Oridecon_Box5','Enriched Oridecon 5 Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 7620,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (14221,'MP_Scroll_Box','Mystical Amplification Scroll 10 Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 14593,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (14222,'MP_Scroll_Box30','Mystical Amplification Scroll 30 Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 14593,30;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (14223,'MP_Scroll_Box50','Mystical Amplification Scroll 50 Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 14593,50;',NULL,NULL);
@@ -8225,7 +8284,7 @@ REPLACE INTO `item_db_re` VALUES (14225,'Quagmire_Scroll_Box30','Quagmire Scroll
REPLACE INTO `item_db_re` VALUES (14226,'Quagmire_Scroll_Box50','Quagmire Scroll 50 Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 14594,50;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (14227,'Healing_Staff_Box','Healing Staff Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'rentitem 1638,604800;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (14228,'Praxinus_Box','Praccsinos Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'rentitem 2752,604800;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (14229,'Sakura_Scroll','Cherry Blossom Scroll',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Sakura_Scroll);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (14229,'Cherry_Blossom_Scroll','Cherry Blossom Scroll',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Sakura_Scroll);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (14230,'Note_Headphones_Box','Note Headphones Box',18,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 5151,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (14231,'Novice_Breastplate_Boxes','Novice Breastplate Boxes',18,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (14232,'Yggdrasilberry_Box_','Yggdrasil Berry 10 Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 607,10;',NULL,NULL);
@@ -8443,7 +8502,7 @@ REPLACE INTO `item_db_re` VALUES (14544,'B_Mdef_Potion','Big Magic Defense Potio
REPLACE INTO `item_db_re` VALUES (14545,'Battle_Manual_X3','Field Manual 300%',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_EXPBOOST,1800000,300;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (14546,'Fire_Cracker_Love','I Love You Firecracker',2,2,NULL,20,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (14547,'Fire_Cracker_Wday','Whiteday Firecracker',2,2,NULL,20,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (14548,'Fire_Cracker_Valentine','Valentine\'s Day Firecracker',2,2,NULL,20,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (14548,'Fire_Cracker_Vday','Valentine\'s Day Firecracker',2,2,NULL,20,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (14549,'Fire_Cracker_Bday','Birthday Firecracker',2,2,NULL,20,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (14550,'Fire_Cracker_Xmas','Xmas Firecracker',2,2,NULL,20,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (14551,'Str_Dish01_','Fried Grasshopper Legs',0,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_STRFOOD,1200000,1; percentheal 5,0;',NULL,NULL);
@@ -8509,10 +8568,10 @@ REPLACE INTO `item_db_re` VALUES (14611,'M_Def_Potion','M Def Potion',11,0,NULL,
REPLACE INTO `item_db_re` VALUES (14612,'M_Mdef_Potion','M Mdef Potion',11,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'specialeffect2 EF_SPELLBREAKER; sc_start SC_MDEF_RATE,120000,3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (14613,'RWC_Scroll_2012','RWC Scroll 2012',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_RWC_Scroll_2012);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (14614,'Ex_Def_Potion','Ex Def Potion',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'specialeffect2 EF_GUARD; sc_start SC_DEF_RATE,1800000,3; sc_start SC_MDEF_RATE,1800000,3;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (14616,'STR_Biscuit_Stick','Bar Cookie Of Strength',18,1,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_STRFOOD,1800000,15; sc_start SC_INCATKRATE,600000,rand(11,111);',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (14617,'VIT_Biscuit_Stick','Bar Cookie Of Vitality',18,1,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_VITFOOD,1800000,15; sc_start SC_INCDEFRATE,600000,rand(11,33);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (14616,'STR_Biscuit_Stick','Bar Cookie Of Strength',18,1,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_STRFOOD,1800000,15; sc_start SC_ATKPOTION,600000,rand(11,111);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (14617,'VIT_Biscuit_Stick','Bar Cookie Of Vitality',18,1,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_VITFOOD,1800000,15; bonus_script "{ bonus bHPRecovRate,rand(11,33); }",1800,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (14618,'AGI_Biscuit_Stick','Bar Cookie Of Agility',18,1,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_AGIFOOD,1800000,15; sc_start SC_FLEEFOOD,600000,rand(11,33);',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (14619,'INT_Biscuit_Stick','Bar Cookie Of Intelligence',18,1,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_INTFOOD,1800000,15; sc_start SC_INCMATKRATE,600000,rand(11,111);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (14619,'INT_Biscuit_Stick','Bar Cookie Of Intelligence',18,1,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_INTFOOD,1800000,15; sc_start SC_MATKPOTION,600000,rand(11,111);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (14620,'DEX_Biscuit_Stick','Bar Cookie Of Dexterity',18,1,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_DEXFOOD,1800000,15; sc_start SC_HITFOOD,600000,rand(11,33);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (14621,'LUK_Biscuit_Stick','Bar Cookie Of Lucky',18,1,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_LUKFOOD,1800000,15; sc_start SC_CRIFOOD,600000,rand(11,33);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (14623,'Golden_Treasure_Box_','Golden Treasure Box',18,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'/*getitem callfunc("F_Rand",Devilring card, Angeling card, 11 weapons smelting ticket, armor smelting 11 ticket , horns of the buffalo, ring of recovery, pink bunny costume hair band)*/',NULL,NULL);
@@ -8563,7 +8622,7 @@ REPLACE INTO `item_db_re` VALUES (14741,'Imortal_Midgard_Scroll','Midgard Celebr
REPLACE INTO `item_db_re` VALUES (14753,'Hero_Midgard_Egg','Hero Midgard Egg',18,0,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Hero_Midgard_Egg);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (14758,'Safe_To_Smelting_Scroll','Safe To Smelting Scroll',18,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem callfunc("F_Rand",6238,6239,6228,6232,24216,17474,969),1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (14765,'Limited_Edition_JOB_Battle_Manual','Limited Edition JOB Battle Manual',18,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_JEXPBOOST,3600000,35;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (14766,'Limited_Power_Booster','Limited Power Booster',18,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'bonus_script "{ bonus bBaseAtk,30; bonus bMatk,30; bonus bAddClass,Class_All,1; bonus bMatkRate,1; bonus bHit,30; bonus bFlee,30; bonus bAspd,1; bonus bUseSPrate,-5; bonus bFixedCastrate,-30; }",1800,1,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (14766,'Limited_Power_Booster','Limited Power Booster',18,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'bonus_script "{ bonus bBaseAtk,30; bonus bMatk,30; bonus2 bAddClass,Class_All,1; bonus bMatkRate,1; bonus bHit,30; bonus bFlee,30; bonus bAspd,1; bonus bUseSPrate,-5; bonus bFixedCastrate,-30; }",1800,1,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (14805,'July_Lucky_Scroll','Almighty Lucky Egg',18,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_July_Lucky_Scroll);',NULL,NULL);
#===================================================================
# More Armors
@@ -8603,7 +8662,7 @@ REPLACE INTO `item_db_re` VALUES (15031,'Para_Team_Armor','Paradise Uniform IV',
REPLACE INTO `item_db_re` VALUES (15032,'Tidung','Tidung',4,10,NULL,500,NULL,2,NULL,1,0xFFFFFFFE,63,2,16,NULL,'0',1,0,'bonus bMdef,10; bonus2 bResEff,Eff_Stun,1500; bonus2 bResEff,Eff_Freeze,1500; bonus2 bSubClass,Class_All,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (15033,'Tutorial_Mattle','Tutorial Mantle',4,0,NULL,600,NULL,37,NULL,0,0x00000000,63,2,16,NULL,'1',0,0,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (15034,'Tutorial_Mattle_','Tutorial Mantle',4,0,NULL,600,NULL,37,NULL,1,0x00000000,63,2,16,NULL,'1',0,0,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (15035,'2010_Love_Dad','2010 Love Dad',4,10,NULL,100,NULL,6,NULL,1,0xFFFFFFFF,63,2,16,NULL,'0',1,0,'bonus bAllStats,1; bonus bMaxHP,150; bonus bMaxSP,150; bonus2 bResEff,Eff_Stone,9000; bonus2 bResEff,Eff_Freeze,9000; bonus2 bResEff,Eff_Stun,9000; bonus2 bResEff,Eff_Sleep,9000; bonus2 bResEff,Eff_Silence,9000; bonus2 bResEff,Eff_Curse,9000; bonus2 bResEff,Eff_Confusion,9000; bonus2 bResEff,Eff_Blind,9000; bonus2 bResEff,Eff_Poison,9000; bonus2 bResEff,Eff_Bleeding,9000;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (15035,'2010_Love_Daddy','2010 Love Dad',4,10,NULL,100,NULL,6,NULL,1,0xFFFFFFFF,63,2,16,NULL,'0',1,0,'bonus bAllStats,1; bonus bMaxHP,150; bonus bMaxSP,150; bonus2 bResEff,Eff_Stone,9000; bonus2 bResEff,Eff_Freeze,9000; bonus2 bResEff,Eff_Stun,9000; bonus2 bResEff,Eff_Sleep,9000; bonus2 bResEff,Eff_Silence,9000; bonus2 bResEff,Eff_Curse,9000; bonus2 bResEff,Eff_Confusion,9000; bonus2 bResEff,Eff_Blind,9000; bonus2 bResEff,Eff_Poison,9000; bonus2 bResEff,Eff_Bleeding,9000;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (15036,'Ur_Plate','Ur\'s Plate',4,20,NULL,3000,NULL,110,NULL,0,0x00000080,56,2,16,NULL,'100',1,0,'bonus bMdef,10; bonus bMaxHPrate,getrefine(); bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player,5; bonus2 bSubEle,Ele_Neutral,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (15037,'Peuz_Plate','Peuz\'s Plate',4,20,NULL,3000,NULL,110,NULL,0,0x00000080,56,2,16,NULL,'100',1,0,'bonus bMdef,10; bonus bBaseAtk,20; bonus bFlee,17;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (15038,'Sabah_Cloth','Sapha\'s Cloth',4,20,NULL,100,NULL,45,NULL,1,0x00001000,63,2,16,NULL,'100',1,0,'bonus bLuk,3; bonus3 bAutoSpell,"ASC_METEORASSAULT",max(getskilllv("ASC_METEORASSAULT"),1),20;',NULL,NULL);
@@ -8630,39 +8689,39 @@ REPLACE INTO `item_db_re` VALUES (15058,'Rider_Suit','Rider Suit',4,20,NULL,1000
REPLACE INTO `item_db_re` VALUES (15059,'2011Love_Daddy','2011Love Daddy',4,20,NULL,100,'0',80,0,1,0xFFFFFFFF,63,2,16,NULL,'0',1,0,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (15060,'Sky_Blue_Smock','Sky Blue Smock',4,20,NULL,300,'0',1,0,1,0xFFFFFFFF,63,2,16,NULL,'0',1,0,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (15061,'Egir_Armor','Egir Armor',4,200000,NULL,2600,NULL,55,NULL,1,0xFFFFFFFF,63,2,16,NULL,'110',1,0,'bonus bAllStats,1; if(BaseClass==Job_Mage||BaseClass==Job_Archer||BaseClass==Job_Acolyte) bonus2 bResEff,Eff_Silence,5000; else if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief) bonus2 bResEff,Eff_Stun,5000;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (15062,'TE_Woe_Coat','TE Woe Coat',4,0,NULL,0,NULL,15,NULL,0,0xFFFFFFFF,63,2,16,0,'40',1,NULL,'bonus bMdef,15; bonus bMaxHP,250; bonus bMaxSP,250; bonus2 bSubRace,RC_Player,10; bonus2 bResEff,Eff_Freeze,25;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (15063,'TE_Woe_Chain_Mail','TE Woe Chain Mail',4,0,NULL,0,NULL,25,NULL,0,0x000444A2,63,2,16,0,'40',1,NULL,'bonus bMdef,5; bonus bMaxHP,450; bonus bMaxSP,50; bonus2 bSubRace,RC_Player,15; bonus2 bResEff,Eff_Freeze,25;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (15064,'TE_Woe_Mage_Coat','TE Woe Mage Coat',4,0,NULL,0,NULL,5,NULL,0,0x00818315,63,2,16,0,'40',1,NULL,'bonus bMdef,25; bonus bMaxHP,200; bonus bMaxSP,200; bonus2 bSubRace,RC_Player,5; bonus2 bResEff,Eff_Freeze,25;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (15066,'Engraved_Plate_Armor','Engraved Plate Armor',4,100000,NULL,3000,NULL,120,NULL,1,0x00004082,63,2,16,NULL,'150',1,NULL,'bonus bMdef,25;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (15067,'Rune_Suit','Rune Suit',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,16,0,'1',1,NULL,'bonus2 bExpAddRace,RC_All,10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (15062,'TE_Woe_Coat','TE Woe Coat',4,0,NULL,0,NULL,15,NULL,0,0xFFFFFFFF,63,2,16,NULL,'40',1,NULL,'bonus bMdef,15; bonus bMaxHP,250; bonus bMaxSP,250; bonus2 bSubRace,RC_Player,10; bonus2 bResEff,Eff_Freeze,25;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (15063,'TE_Woe_Chain_Mail','TE Woe Chain Mail',4,0,NULL,0,NULL,25,NULL,0,0x000444A2,63,2,16,NULL,'40',1,NULL,'bonus bMdef,5; bonus bMaxHP,450; bonus bMaxSP,50; bonus2 bSubRace,RC_Player,15; bonus2 bResEff,Eff_Freeze,25;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (15064,'TE_Woe_Mage_Coat','TE Woe Mage Coat',4,0,NULL,0,NULL,5,NULL,0,0x00818315,63,2,16,NULL,'40',1,NULL,'bonus bMdef,25; bonus bMaxHP,200; bonus bMaxSP,200; bonus2 bSubRace,RC_Player,5; bonus2 bResEff,Eff_Freeze,25;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (15066,'Engraved_Armor','Engraved Plate Armor',4,100000,NULL,3000,NULL,120,NULL,1,0x00004082,63,2,16,NULL,'150',1,NULL,'bonus bMdef,25;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (15067,'Rune_Suit','Rune Suit',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,16,NULL,'1',1,NULL,'bonus2 bExpAddRace,RC_All,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (15068,'Im_Angel\'s_Protection','Advanced Angelic Protection',4,10000,NULL,600,NULL,40,NULL,1,0x00000001,63,2,16,NULL,'99',1,0,'bonus bMdef,30;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (15069,'Suit_Of_Sid','Suit Of Sid',4,20,NULL,1000,NULL,30,NULL,0,0xFFFFFFFF,63,2,16,NULL,'0',1,0,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (15070,'Clothes_of_Happiness','Clothes of Happiness',4,10,NULL,1000,NULL,5,NULL,1,0xFFFFFFFF,63,2,16,NULL,'1',1,NULL,'bonus bMdef,5; bonus bLuk,getrefine();',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (15073,'Anti-Magic_Suits','Anti-Magic Suits',4,10,NULL,1500,NULL,50,NULL,1,0xFFFFFFFF,63,2,16,NULL,'99',1,0,'.@r = getrefine(); bonus bMaxHPrate,5+((.@r >= 9) ? 2 : 0); bonus bMdef,10+((.@r >= 7) ? 5 : 0);',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (15074,'Geffen_Magic_Robe','Geffen Magic Robe',4,10,NULL,1000,NULL,40,NULL,1,0xFFFFFFFF,63,2,16,NULL,'99',1,0,'.@r = getrefine(); bonus bUseSPrate,-10-((.@r>=7) ? 5: 0); bonus bVariableCastrate,-15-((.@r>=9) ? 5: 0); bonus bNoCastCancel2,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (15073,'Anti_Magic_Suit','Anti-Magic Suits',4,10,NULL,1500,NULL,50,NULL,1,0xFFFFFFFF,63,2,16,NULL,'99',1,0,'.@r = getrefine(); bonus bMaxHPrate,5+((.@r >= 9) ? 2 : 0); bonus bMdef,10+((.@r >= 7) ? 5 : 0);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (15074,'Geffen_Mage_Robe','Geffen Magic Robe',4,10,NULL,1000,NULL,40,NULL,1,0xFFFFFFFF,63,2,16,NULL,'99',1,0,'.@r = getrefine(); bonus bUseSPrate,-10-((.@r>=7) ? 5: 0); bonus bVariableCastrate,-15-((.@r>=9) ? 5: 0); bonus bNoCastCancel2,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (15088,'School_Uniform','School Uniform',4,20,NULL,500,NULL,25,NULL,1,0xFFFFFFFF,63,2,16,NULL,'0',1,0,'bonus bAgi,1; bonus bLuk,1; bonus bMaxHP,BaseLevel*3; bonus bMaxSP,BaseLevel/2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (15089,'Menswear','Menswear',4,10,NULL,300,NULL,40,NULL,0,0xFFFFFFFE,63,2,16,NULL,'80',1,NULL,'.@r = getrefine(); bonus bAspdRate,3+((.@r>=7)?2:0); bonus bDelayrate,-3-((.@r>=7)?2:0); bonus bVariableCastrate,-3-((.@r>=7)?2:0);',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (15090,'Armor_of_Gray','Armor of Gray',4,10,NULL,2400,NULL,90,NULL,1,0x000654E2,63,2,16,NULL,'120',1,0,'bonus bMdef,10; bonus2 bSubEle,Ele_Holy,10+getrefine()*2;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (15091,'Robe_of_Gray','Robe of Gray',4,10,NULL,1300,NULL,55,NULL,1,0x00810100,63,2,16,NULL,'120',1,0,'bonus2 bSubEle,Ele_Holy,10+getrefine()*2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (15090,'Armor_Of_Gray','Armor of Gray',4,10,NULL,2400,NULL,90,NULL,1,0x000654E2,56,2,16,NULL,'120',1,0,'bonus bMdef,10; bonus2 bSubEle,Ele_Holy,10+getrefine()*2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (15091,'Gray_Robe','Gray Robe',4,20,NULL,1300,NULL,55,NULL,1,0x00018314,56,2,16,NULL,'120',1,0,'bonus2 bSubEle,Ele_Holy,10+getrefine()*2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (15093,'Hero_Plate','Hero Plate',4,10,NULL,4000,NULL,120,NULL,1,0x00004082,63,2,16,NULL,'160',1,NULL,'bonus bMdef,5; bonus bMaxHPrate,5; bonus bMaxSPrate,5; bonus bMatk,10; bonus bBaseAtk,10; bonus bHit,10; bonus bFlee,10; bonus2 bSkillAtk,"LG_BANISHINGPOINT",10; bonus2 bSkillAtk,"RK_HUNDREDSPEAR",10; .@r = getrefine(); bonus5 bAutoSpell,"AL_HEAL",10,50+.@r,BF_SHORT,0; bonus5 bAutoSpell,"WZ_STORMGUST",10,50+.@r,BF_SHORT,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (15094,'Hero_Magic_Coat','Hero Magic Coat',4,10,NULL,800,NULL,50,NULL,1,0x00010204,63,2,16,NULL,'160',1,NULL,'bonus bMatk,10; bonus bMaxHPrate,5; bonus bMaxSPrate,5; bonus bFlee,10; bonus2 bSkillAtk,"WL_CRIMSONROCK",10; bonus2 bSkillAtk,"SO_PSYCHIC_WAVE",10; .@r = getrefine(); if (.@r) { bonus bFixedCastrate,21-.@r/2; bonus bNoCastCancel2,1; bonus bMdef,.@r/2; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (15095,'Hero_Judgement_Shawl','Hero Judgement Shawl',4,10,NULL,500,NULL,77,NULL,1,0x00008110,63,2,16,NULL,'160',1,NULL,'bonus bMaxHPrate,5; bonus bMaxSPrate,5; bonus bMatk,10; bonus bBaseAtk,10; bonus bHit,10; bonus bFlee,10; bonus2 bSkillAtk,"AB_JUDEX",10; bonus2 bSkillAtk,"AB_ADORAMUS",10; bonus2 bSkillAtk,"SR_DRAGONCOMBO",10; bonus2 bSkillAtk,"SR_SKYNETBLOW",10; bonus2 bSkillAtk,"SR_EARTHSHAKER",10; .@r = getrefine(); bonus5 bAutoSpell,"PR_KYRIE",1,50+.@r,BF_SHORT,0; bonus5 bAutoSpell,"PR_LEXAETERNA",10,50+.@r,BF_MAGIC,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (15096,'Hero_Trade_Mail','Hero Trade Mail',4,10,NULL,500,NULL,100,NULL,1,0x00040420,56,2,16,NULL,'160',1,NULL,'bonus bMaxHPrate,5; bonus bMaxSPrate,5; bonus bMatk,10; bonus bBaseAtk,10; .@r = getrefine(); if(readparam(bStr) >= 90) bonus bStr,.@r/2; if(readparam(bInt) >= 90) bonus bInt,.@r/2; if(readparam(bAgi) >= 90) bonus bAgi,.@r/2; if(readparam(bVit) >= 90) bonus bVit,.@r/2; if(readparam(bDex) >= 90) bonus bDex,.@r/2; if(readparam(bLuk) >= 90) bonus bLuk,.@r/2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (15097,'Hero_Hidden_Cloth','Hero Hidden Cloth',4,10,NULL,200,NULL,70,NULL,1,0x00021040,63,2,16,NULL,'160',1,0,'bonus bMaxHPrate,5; bonus bMaxSPrate,5; bonus2 bSkillAtk,"SC_FATALMENACE",10; bonus2 bSkillAtk,"SC_TRIANGLESHOT",10; bonus2 bSkillAtk,"GC_CROSSIMPACT",10; bonus2 bSkillAtk,"GC_CROSSRIPPERSLASHER",10; autobonus "{ bonus bCritical,20; bonus bFlee,20; bonus2 bAddClass,Class_All,10; bonus bMatkRate,10; }",(5+getrefine())*10,10000,BF_WEAPON;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (15098,'Hero_Target_Suit','Hero Target Suit',4,10,NULL,200,NULL,60,NULL,1,0x00080808,56,2,16,NULL,'160',1,NULL,'bonus bMaxHPrate,5; bonus bMaxSPrate,5; .@r = getrefine(); bonus bAllStats,1; bonus5 bAutoSpell,"AC_CONCENTRATION",10,(5+.@r)*5,BG_WEAPON,0; bonus5 bAutoSpell,"AC_DOUBLE",10,(5+.@r)*5,BG_WEAPON,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (15098,'Hero_Taget_Suits','Hero Target Suit',4,10,NULL,200,NULL,60,NULL,1,0x00080808,56,2,16,NULL,'160',1,NULL,'bonus bMaxHPrate,5; bonus bMaxSPrate,5; .@r = getrefine(); bonus bAllStats,1; bonus5 bAutoSpell,"AC_CONCENTRATION",10,(5+.@r)*5,BG_WEAPON,0; bonus5 bAutoSpell,"AC_DOUBLE",10,(5+.@r)*5,BG_WEAPON,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (15100,'Frozen_Breastplate','Frozen Breastplate',4,20,NULL,1500,NULL,20,NULL,1,0xFFFFFFFF,63,2,16,NULL,'130',1,0,'bonus bDefEle,Ele_Water;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (15101,'Hardened_Breastplate','Hardened Breastplate',4,20,NULL,1500,NULL,20,NULL,1,0xFFFFFFFF,63,2,16,NULL,'130',1,0,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (15101,'Harden_Breastplate','Hardened Breastplate',4,20,NULL,1500,NULL,20,NULL,1,0xFFFFFFFF,63,2,16,NULL,'130',1,0,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (15103,'Kirin_Armor','Kirin Armor',4,10,NULL,500,NULL,55,NULL,1,0xFFFFFFFF,63,2,16,NULL,'70',NULL,NULL,'bonus bDefEle,Ele_Holy;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (15104,'FishingMan_Mail','FishingMan Mail',4,10,NULL,500,NULL,30,NULL,1,0xFFFFFFFF,63,2,16,NULL,'50',NULL,NULL,'bonus2 bAddRace,RC_Fish,10; bonus2 bMagicAddRace,RC_Fish,10; .@r = getrefine(); if(.@r>5){ bonus2 bAddRace,RC_All,.@r; bonus2 bMagicAddRace,RC_All,.@r; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (15105,'Kaftan','Kaftan',4,20,NULL,400,NULL,13,NULL,1,0xFFFFFFFF,63,2,16,NULL,'0',1,0,'bonus bMdef,3; bonus2 bSubRace,RC_Demon,5; bonus2 bSubRace,RC_Undead,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (15110,'Supplement_Part_Str','Supplement Part Str',4,25000,NULL,2000,NULL,80,NULL,NULL,0x00000400,56,2,16,NULL,'100',1,0,'bonus2 bAddClass,Class_All,5+getrefine()/4;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (15111,'Reinforced_Parts_Gloves','Reinforced Parts - Gloves',4,10,NULL,3000,NULL,110,NULL,NULL,0x00000400,56,2,16,NULL,'100',1,NULL,'bonus bUnbreakableArmor,1; bonus2 bSubSize,0,10; bonus2 bSubSize,1,10; .@r = getrefine(); if(.@r>=7){ bonus2 bSubSize,2,10; }; if(.@r>=9){ bonus2 bSubSize,0,5; bonus2 bSubSize,1,5; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (15116,'Armor_Of_Airship','Armor Of Airship',4,10,NULL,700,NULL,100,NULL,0,0xFFFFFFFF,63,2,16,NULL,'125',1,NULL,'bonus bMaxHP,1000; bonus bMaxSP,100; bonus bMdef,10; bonus bAllStats,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (15117,'Tarlock\'s_Armor','Tarlock\'s Armor',4,10,NULL,750,NULL,70,NULL,0,0xFFFFFFFF,63,2,16,NULL,'125',1,NULL,'bonus bMaxHP,500; bonus bMaxSP,50; bonus bMdef,10; bonus bAllStats,1; .@r = getrefine(); if(.@r>=7) { bonus bMaxHP,500; bonus bMaxSP,50; } if(.@r>=9) { bonus bMaxHP,200; bonus bMaxSP,20; } if(.@r>=12) { bonus bMaxHP,300; bonus bMaxSP,30; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (15121,'Sarah_Combat_Robe','Sarah Combat Robe',4,10,NULL,800,NULL,35,NULL,1,0xFFFFFFFF,63,2,16,NULL,'145',1,NULL,'/*TODO: Confirm the real rate and additional MAtk*/ .@r = getrefine(); autobonus "{ bonus bMatk,20; }",100,(10+((.@r) ? .@r*8 : 0))*1000,BF_MAGIC;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (15111,'Upgrade_Part_Plate','Reinforced Parts - Gloves',4,10,NULL,3000,NULL,110,NULL,NULL,0x00000400,56,2,16,NULL,'100',1,NULL,'bonus bUnbreakableArmor,1; bonus2 bSubSize,0,10; bonus2 bSubSize,1,10; .@r = getrefine(); if(.@r>=7){ bonus2 bSubSize,2,10; }; if(.@r>=9){ bonus2 bSubSize,0,5; bonus2 bSubSize,1,5; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (15116,'Airship_Armor','Armor Of Airship',4,10,NULL,700,NULL,100,NULL,0,0xFFFFFFFF,63,2,16,NULL,'125',1,NULL,'bonus bMaxHP,1000; bonus bMaxSP,100; bonus bMdef,10; bonus bAllStats,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (15117,'Felock_Armor','Tarlock\'s Armor',4,10,NULL,750,NULL,70,NULL,0,0xFFFFFFFF,63,2,16,NULL,'125',1,NULL,'bonus bMaxHP,500; bonus bMaxSP,50; bonus bMdef,10; bonus bAllStats,1; .@r = getrefine(); if(.@r>=7) { bonus bMaxHP,500; bonus bMaxSP,50; } if(.@r>=9) { bonus bMaxHP,200; bonus bMaxSP,20; } if(.@r>=12) { bonus bMaxHP,300; bonus bMaxSP,30; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (15121,'Robe_Of_Sarah','Sarah Combat Robe',4,10,NULL,800,NULL,35,NULL,1,0xFFFFFFFF,63,2,16,NULL,'145',1,NULL,'/*TODO: Confirm the real rate and additional MAtk*/ .@r = getrefine(); autobonus "{ bonus bMatk,20; }",100,(10+((.@r) ? .@r*8 : 0))*1000,BF_MAGIC;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (15123,'Whikebain_Suit','Whikebain Suit',4,0,NULL,900,NULL,56,NULL,1,0x00001000,56,2,16,NULL,'105',1,NULL,'.@r = getrefine(); bonus bCritAtkRate,(.@r>=7)?(6):((.@r>=5)?(4):(0)); bonus3 bAutoSpell,"DC_WINKCHARM",1,10; /* Confirm: Success rate */',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (15126,'Private_Doram_Suits','Private Doram Suits',4,20,NULL,700,NULL,80,NULL,1,0x80000000,7,2,16,NULL,'100',1,NULL,'bonus bMaxHP,500; bonus bMaxSP,100; .@r = getrefine()/3; bonus bDex,.@r; bonus bInt,.@r;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (15129,'Luxury_Doram_Suit','Luxury Doram Suit',4,20,NULL,800,NULL,100,NULL,1,0x80000000,7,2,16,NULL,'140',1,NULL,'bonus bMaxHPrate,10; bonus bMaxSPrate,10; .@r = getrefine()/2; bonus bDex,.@r; bonus bInt,.@r;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (15126,'Female_Poring_Balloon','Private Doram Suits',4,20,NULL,700,NULL,80,NULL,1,0x80000000,7,2,16,NULL,'100',1,NULL,'bonus bMaxHP,500; bonus bMaxSP,100; .@r = getrefine()/3; bonus bDex,.@r; bonus bInt,.@r;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (15129,'Blue_Bellflower_Hat','Luxury Doram Suit',4,20,NULL,800,NULL,100,NULL,1,0x80000000,7,2,16,NULL,'140',1,NULL,'bonus bMaxHPrate,10; bonus bMaxSPrate,10; .@r = getrefine()/2; bonus bDex,.@r; bonus bInt,.@r;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (15138,'Aegir_Armor','Aegir Armor',4,10,NULL,1600,NULL,25,NULL,1,0xFFFFFFFF,63,2,16,NULL,'40',1,NULL,'bonus bMaxHP,500; bonus bMaxSP,50; bonus bUnbreakableArmor,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (15141,'Rift_Ancient_Armor','Rift Ancient Armor',4,10,NULL,500,NULL,30,NULL,1,0xFFFFFFFF,63,2,16,NULL,'100',1,NULL,'.@r = getrefine(); bonus bMaxHP,(.@r >= 9 ? 1500 : .@r >= 7 ? 900 : 500); bonus bMaxSP,-100;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (15145,'EvilDragon_Armor','Evil Dragon Armor',4,0,NULL,4000,NULL,60,NULL,1,0xFFFFFFFF,63,2,16,NULL,NULL,1,NULL,'.@r = getrefine(); bonus2 bHPDrainRate,100,(.@r>=10)?(3):((.@r>=9)?(4):((.@r>=8)?(6):(0))); bonus2 bSPDrainRate,100,(.@r>=10)?(5):((.@r>=9)?(3):((.@r>=8)?(2):(0))); /* Confirm: Success rate and it says no effect if with Rideword, Vanargandr Helm, or Piece Of Angent Skin */',NULL,NULL);
@@ -8717,15 +8776,15 @@ REPLACE INTO `item_db_re` VALUES (16024,'Quadrille_','Quadrille',5,10,NULL,900,'
REPLACE INTO `item_db_re` VALUES (16025,'TE_Woe_Mace','TE Woe Mace',5,0,NULL,0,'120',NULL,1,0,0x0004C5B3,63,2,2,3,'40',1,8,'bonus bUnbreakableWeapon,1; bonus2 bAddRace,RC_Player,40; bonus2 bAddEff,Eff_Freeze,3000; bonus bHPRecovRate,5; bonus bSPRecovRate,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16026,'RWC_Memory_Mace','RWC Memory Mace',5,20,NULL,800,'100',NULL,1,1,0x0004C5B2,63,2,2,3,'1',1,8,'bonus bUnbreakableWeapon,1; .@r = getrefine(); bonus bBaseAtk,(.@r/30)*30; if(.@r>=9){ .@i = 1; bonus3 bAutoSpellWhenHit,"BS_WEAPONPERFECT",1,10; } if(.@r>=6){ .@rate = 5*(.@i+1); bonus2 bAddClass,Class_All,5; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16027,'Hammer_Of_Evil_Slayer','Evil Slayer Destroyer Hammer',5,10,NULL,1350,'125',NULL,1,1,0x0004C5B3,63,2,2,3,'100',1,8,'bonus2 bAddRace,RC_Demon,10; bonus2 bAddRace,RC_Undead,10; .@r = getrefine(); bonus2 bAddClass,Class_All,(.@r>=12?12:(.@r>=9?5:0));',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (16028,'Thanos_Hammer','Thanatos Hammer',5,10,NULL,3000,'180:120',NULL,1,1,0x0004C5B2,63,2,2,4,'120',1,8,'bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000;',NULL,'heal -1000,0;');
+REPLACE INTO `item_db_re` VALUES (16028,'Thanos_Hammer','Thanatos Hammer',5,10,NULL,3000,'180:120',NULL,1,1,0x0004C5B2,56,2,2,4,'120',1,8,'bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000;',NULL,'heal -1000,0;');
REPLACE INTO `item_db_re` VALUES (16029,'Noble_Cross','Noble Cross',5,10,NULL,1500,'195:150',NULL,NULL,1,0x00000010,58,2,2,4,'40',1,8,'bonus3 bAutoSpell,"PR_TURNUNDEAD",6,50; bonus2 bSPDrainValueRace,RC_Undead,1; bonus2 bSPGainRace,RC_Undead,12;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (16030,'Pile_Bunker_S','Pile Bunker S',5,20,NULL,3000,'400',NULL,1,1,0x00000400,56,2,2,4,'130',1,8,'bonus bAspdRate,getrefine()/2;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (16031,'Pile_Bunker_P','Pile Bunker P',5,20,NULL,4000,'450',NULL,1,NULL,0x00000400,56,2,2,4,'130',1,8,'bonus bBaseAtk,getrefine()*5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (16032,'Pile_Bunker_T','Pile Bunker T',5,20,NULL,3500,'400',NULL,1,1,0x00000400,56,2,2,4,'130',1,8,'bonus bUseSPrate,getrefine()*-1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (16033,'Robots_Mechanical_Arm','Robot\'s Mechanical Arm',5,20,NULL,3000,'195',NULL,1,2,0x00000400,56,2,2,4,'130',1,8,'bonus bUnbreakableWeapon,1; bonus bCritical,20;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (16030,'Pilebuncker_S','Pile Bunker S',5,20,NULL,3000,'400',NULL,1,1,0x00000400,56,2,2,4,'130',1,8,'bonus bAspdRate,getrefine()/2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (16031,'Pilebuncker_P','Pile Bunker P',5,20,NULL,4000,'450',NULL,1,NULL,0x00000400,56,2,2,4,'130',1,8,'bonus bBaseAtk,getrefine()*5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (16032,'Pilebuncker_T','Pile Bunker T',5,20,NULL,3500,'400',NULL,1,1,0x00000400,56,2,2,4,'130',1,8,'bonus bUseSPrate,getrefine()*-1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (16033,'Robot\'s_Arm','Robot\'s Mechanical Arm',5,20,NULL,3000,'195',NULL,1,2,0x00000400,56,2,2,4,'130',1,8,'bonus bUnbreakableWeapon,1; bonus bCritical,20;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16034,'Half_Mjolnir','Half Mjolnir',5,20,NULL,6000,'350',NULL,1,0,0x000444A2,63,2,2,4,'95',0,8,'bonus bAtkEle,Ele_Wind; bonus bDex,50; bonus bStr,20; bonus bAspdRate,10; bonus3 bAutoSpell,"MG_THUNDERSTORM",10,100; autobonus "{ bonus bSplashRange,1; }",50,10000;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16035,'Half_BF_Morning_Star1','Half BF Morning Star1',5,20,NULL,0,'105',NULL,1,0,0x0004C5B3,63,2,2,3,'80',1,8,'bonus bStr,1; bonus bDex,1; bonus2 bAddRace,RC_DemiHuman,35; bonus2 bAddRace,RC_Player,35; bonus2 bIgnoreDefRaceRate,RC_DemiHuman,10; bonus2 bIgnoreDefRaceRate,RC_Player,10; bonus bUnbreakableWeapon,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (16036,'Blue_Mace','Blue Mace',5,10,NULL,1500,'170',NULL,1,1,0x00008000,56,2,2,3,'100',1,8,'bonus bVit,5; bonus bInt,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (16036,'Ru_Blue_Mace','Blue Mace',5,10,NULL,1500,'170',NULL,1,1,0x00008000,56,2,2,3,'100',1,8,'bonus bVit,5; bonus bInt,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16037,'Ru_Gold_Mace','Ru Gold Mace',5,0,NULL,1500,'170',NULL,1,2,0x00008000,56,2,2,3,'120',1,8,'bonus bVit,8; bonus bInt,8;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16038,'Infinity_Mace','Infinity Mace',5,10,NULL,500,'155',NULL,1,1,0x0004C780,56,2,2,4,'100',1,8,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16039,'Spoon','Spoon',5,10,NULL,1000,'80',NULL,1,1,0x0004C5B3,63,2,2,3,'40',1,8,'bonus bAspd,10; bonus2 bAddEff,Eff_Curse,1000;',NULL,NULL);
@@ -8772,12 +8831,12 @@ REPLACE INTO `item_db_re` VALUES (16252,'Gemini_Crown_Box','Gemini Crown Box',18
REPLACE INTO `item_db_re` VALUES (16253,'Rabbit_Scroll','Rabbit Scroll',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16254,'Energizing_Potion_Box','Energizing Potion Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16257,'Buddah_Scroll','Buddah Scroll',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Buddah_Scroll);',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (16258,'HD_Bradium_5_Box','HD Bradium 5 Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 6226,5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (16259,'HD_Carnium_5_Box','HD Carnium 5 Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 6225,5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (16260,'HD_Bradium_10_Box','HD Bradium 10 Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 6226,10;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (16261,'HD_Carnium_10_Box','HD Carnium 10 Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 6225,10;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (16262,'HD_Bradium_5_Box2','HD Bradium 5 Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 6226,5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (16263,'HD_Carnium_5_Box2','HD Carnium 5 Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 6225,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (16258,'HD_Bradium_Box5','HD Bradium 5 Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 6226,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (16259,'HD_Carnium_Box5','HD Carnium 5 Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 6225,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (16260,'HD_Bradium_Box10','HD Bradium 10 Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 6226,10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (16261,'HD_Carnium_Box10','HD Carnium 10 Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 6225,10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (16262,'F_HD_Bradium_Box5','HD Bradium 5 Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 6226,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (16263,'F_HD_Carnium_Box5','HD Carnium 5 Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 6225,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16264,'HD_Bradium_10_Box2','HD Bradium 10 Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 6226,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16265,'HD_Carnium_10_Box2','HD Carnium 10 Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 6225,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16266,'Indonesia_Beret_Box','Indonesia Beret Box',18,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,'1',NULL,NULL,'getitem 5580,1;',NULL,NULL);
@@ -8785,7 +8844,7 @@ REPLACE INTO `item_db_re` VALUES (16267,'HE_Battle_Manual_Box','HE Battle Manual
REPLACE INTO `item_db_re` VALUES (16268,'HE_Bubble_Gum_Box','HE Bubble Gum Box',2,20,10,1,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 12412,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16269,'Cancer_Diadem_Box','Cancer Diadem Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 5581,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16270,'Cancer_Crown_Box','Cancer Crown Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 5582,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (16304,'Evil_Incarnation','Evil Incarnation',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Evil_Incarnation);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (16304,'Evil_Incarnation_Disable','Evil Incarnation',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Evil_Incarnation);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16305,'Upg_Guard_Box','Upg Guard Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 2149,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16306,'F_Upg_Guard_Box','F Upg Guard Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 2149,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16307,'Upg_Buckler_Box','Upg Buckler Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 2150,1;',NULL,NULL);
@@ -8861,7 +8920,7 @@ REPLACE INTO `item_db_re` VALUES (16414,'Turtle_Hat_Box','Turtle Hat Box',18,20,
REPLACE INTO `item_db_re` VALUES (16415,'FTurtle_Hat_Box','FTurtle Hat Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 5611,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16418,'Giant_Fly_Wing_Box_500','Giant Fly Wing Box 500',2,20,10,1,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 12212,500;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16419,'Greed_Scroll_Box_30','Greed Scroll Box 30',2,20,10,1,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 14529,30;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (16420,'Adventurer_Pack','Adventurer Pack',2,20,10,1,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 12208,10; getitem 12210,10; getitem 12216,20; getitem 12215,20; getitem 7621,10; getitem 12209,10; getitem 12211,5; getitem 12450,10; getitem 12448,10; getitem 12446,10; getitem 12206,10; getitem 12445,10; getitem 12447,10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (16420,'Adventurer_Pack','Adventurer Pack',2,20,10,1,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 12208,10; getitem 12210,10; getitem 12216,20; getitem 12215,20; getitem 7621,10; getitem 12209,10; getitem 12211,5; getitem 12445,10; getitem 12446,10; getitem 12447,10; getitem 12448,10; getitem 12449,10; getitem 12450,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16421,'Written_Oath_Of_Marriage_Box','Written Oath Of Marriage Box',2,20,10,1,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 6026,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16422,'Magestic_Goat_Box_','Magestic Goat Box',2,20,10,1,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'rentitem 5280,604800;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16423,'Episode_13.1_Key_Package','Episode 13.1 Key Package',2,20,10,1,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 7782,1; getitem 12208,2; getitem 14582,10;',NULL,NULL);
@@ -8912,7 +8971,7 @@ REPLACE INTO `item_db_re` VALUES (16550,'Sagittarius_Crown_Box_','Sagittarius Cr
REPLACE INTO `item_db_re` VALUES (16551,'Sagittarius_Diadem_Box_','Sagittarius Diadem Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 5740,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16554,'Elven_Sunglasses_Box','Elven Sunglasses Box',2,20,NULL,1,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 5245,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16555,'Pr_Reset_Stone_Box','Pr Reset Stone Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'/*getgroupitem(IG_Pr_Reset_Stone_Box);*/ getitem 6320,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (16556,'FPr_Reset_Stone_Box','Reset Stone Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'/*getgroupitem(IG_FPr_Reset_Stone_Box);*/ getitem 6320,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (16556,'FPremium_Reset_Stone_Box','Reset Stone Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'/*getgroupitem(IG_FPr_Reset_Stone_Box);*/ getitem 6320,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16557,'CP_Helm_Scroll10','CP Helm Scroll10',18,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 14517,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16558,'CP_Shield_Scroll10','CP Shield Scroll10',18,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 14518,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16559,'CP_Armor_Scroll10','CP Armor Scroll10',18,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 14519,10;',NULL,NULL);
@@ -8952,9 +9011,9 @@ REPLACE INTO `item_db_re` VALUES (16623,'Green_Bunny_Band_Box','Green Bunny Band
REPLACE INTO `item_db_re` VALUES (16625,'Half_Asprika_box7','Half Asprika Box7',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'rentitem 2566,604800;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16628,'Brynhild_Box','Half Brynhild Box',2,20,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,'47',NULL,NULL,'rentitem 15023,604800;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16631,'Aributa_Scroll','Aributa Scroll',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (16638,'Life_Ribbon_Box','Life Ribbon Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Life_Ribbon_Box);',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (16639,'Life_Ribbon_Box2','Life Ribbon Box2',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Life_Ribbon_Box2);',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (16640,'Life_Ribbon_Box3','Life Ribbon Box3',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Life_Ribbon_Box3);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (16638,'Ribbon_Of_Life_Box','Life Ribbon Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Life_Ribbon_Box);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (16639,'Ribbon_Of_Life_Box2','Life Ribbon Box2',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Life_Ribbon_Box2);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (16640,'Ribbon_Of_Life_Box3','Life Ribbon Box3',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Life_Ribbon_Box3);',NULL,NULL);
#
REPLACE INTO `item_db_re` VALUES (16652,'Flame_Light','Flame Light',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Flame_Light);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16653,'BM75_10Box','BM75 10Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 12563,10;',NULL,NULL);
@@ -9029,7 +9088,7 @@ REPLACE INTO `item_db_re` VALUES (16736,'Fantastic_Wig_Box','Fantastic Wig Box',
REPLACE INTO `item_db_re` VALUES (16737,'Fantastic_Wig_Box_','Fantastic Wig Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 5276,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16738,'Yellow_Mage_Hat_Box','Yellow Mage Hat Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 5242,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16739,'Yellow_Mage_Hat_Box_','Yellow Mage Hat Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 5242,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (16740,'Protection_Seagod_Box','The Sea God\'s Call 23 Hour Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'rentitem 6436,86400;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (16740,'Ptotection_Seagod_Box','The Sea God\'s Call 23 Hour Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'rentitem 6436,86400;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16741,'Hairtail_Box1','Cutlass 1 Hour Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'/*getgroupitem(IG_Hairtail_Box1);*/ rentitem 1198,3600;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16742,'Hairtail_Box2','Cutlass 7 Day Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'/*getgroupitem(IG_Hairtail_Box2);*/ rentitem 1198,604800;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (16743,'Spearfish_Box1','Marlin 1 Hour Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'/*getgroupitem(IG_Spearfish_Box1);*/ rentitem 1489,3600;',NULL,NULL);
@@ -9126,7 +9185,7 @@ REPLACE INTO `item_db_re` VALUES (17040,'Trans_Box_Marduk','Trans Box Marduk',2,
REPLACE INTO `item_db_re` VALUES (17041,'Trans_Box_Banshee','Trans Box Banshee',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 12662,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (17042,'Trans_Box_Poring','Trans Box Poring',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 12663,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (17043,'Trans_Box_Golem','Trans Box Golem',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 12664,10;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (17050,'Aries_Scroll','Aries Scroll',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Aries_Scroll);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (17050,'Aries_Scroll_','Aries Scroll',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Aries_Scroll);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (17051,'Aries_Scroll_Box','Aries Scroll Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Aries_Scroll_Box);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (17052,'Holy_Mom_Blaze_Box','Holy Mom Blaze Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 6472,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (17056,'Wiz_Card_Album','Wiz Card Album',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -9187,7 +9246,7 @@ REPLACE INTO `item_db_re` VALUES (17113,'Pisces_Scroll','Pisces Scroll',2,20,NUL
REPLACE INTO `item_db_re` VALUES (17114,'Horn_Of_Ancient_Box','Horn Of Ancient Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 18595,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (17115,'Sprout_Hat_Box','Sprout Hat Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 18596,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (17116,'Mercury_Helm_Box','Mercury Helm Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 18597,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (17117,'Aries_Scroll_','Aries Scroll',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (17117,'Aries_Scroll','Aries Scroll',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (17118,'ASPD_Potion_Box10','ASPD Enhanced Potion Box',18,20,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 12684,3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (17120,'Taurus_Scroll','Taurus Scroll',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (17121,'Starry_Scroll','Starry Scroll',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -9210,7 +9269,7 @@ REPLACE INTO `item_db_re` VALUES (17155,'Upg_Huuma_Shuriken_Box','Upg Huuma Shur
REPLACE INTO `item_db_re` VALUES (17156,'TCG_Card_Scroll','Bossnia Ticket Scroll',2,20,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_TCG_Card_Scroll);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (17157,'Vital_Flower_Box','Vital Flower Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 6113,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (17158,'Flame_Gemstone_Box','Flame Gemstone Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 6114,10;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (17159,'Name_Change_Box','Name Change Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (17159,'Change_Name_Card_Box','Name Change Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (17160,'Character_Name_Change_Card_Box','Character Name Change Card Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (17162,'Boarding_Halter_Box7','Boarding Halter Box7',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (17165,'Challenge_Kit','Challenge Kit',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Challenge_Kit); /*getitem Blessing_10_Scroll,20; getitem Inc_Agi_10_Scroll,20;*/',NULL,NULL);
@@ -9376,9 +9435,9 @@ REPLACE INTO `item_db_re` VALUES (17498,'Three_Master_Package_IV','Three Master
REPLACE INTO `item_db_re` VALUES (17499,'Three_Master_Package_IV_10','Three Master Package IV(10)',2,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 14534,200; getitem 14535,200; getitem 12578,200; getitem 22812,11;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (17501,'Support_Package_IV','Support Package IV',2,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 12208,2; getitem 12210,2; getitem 12883,2; getitem 14600,2; /*getitem Mysterious Water of Life,6;*/ if(!rand(100)) getitem 22823,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (17502,'Support_Package_IV_10','Support Package IV(10)',2,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 12208,20; getitem 12210,20; getitem 12883,20; getitem 14600,20; /*getitem Mysterious Water of Life,60;*/ if(!rand(100)) getitem 22823,11;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (17507,'Actinidia_Cat_Fruit_Box_4','Actinidia Cat Fruit Box(4)',2,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 6909,4;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (17508,'Actinidia_Cat_Fruit_Box_10','Actinidia Cat Fruit Box(10)',2,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 6909,10;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (17509,'Actinidia_Cat_Fruit_Box_40','Actinidia Cat Fruit Box(40)',2,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 6909,40;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (17507,'Nyangvine_Box4','Actinidia Cat Fruit Box(4)',2,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 6909,4;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (17508,'Nyangvine_Box10','Actinidia Cat Fruit Box(10)',2,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 6909,10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (17509,'Nyangvine_Box40','Actinidia Cat Fruit Box(40)',2,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 6909,40;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (17510,'Smelting_Ore_Box_VIII','Smelting Ore Box VIII',2,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 7619,5; getitem 7620,5; getitem 22828,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (17511,'Smelting_Ore_Box_VIII_10','Smelting Ore Box VIII(10)',2,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 7619,50; getitem 7620,50; getitem 22828,11;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (17512,'Limited_Purified_Eluminium_Box_30','(Limited) Purified Eluminium Box(30)',2,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 6911,30; getitem 6635,1;',NULL,NULL);
@@ -9394,7 +9453,7 @@ REPLACE INTO `item_db_re` VALUES (17523,'Costama_Egg29','Mystical Costume Scroll
REPLACE INTO `item_db_re` VALUES (17524,'Limited_Power_Booster_Box','Limited Power Booster Box',2,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 14766,1; getitem 22873,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (17525,'Limited_Power_Booster_Box_100','Limited Power Booster Box(100)',2,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 14766,100; getitem 22873,11;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (17526,'Majestic_Lucky_Scroll','Majestic Lucky Egg',18,0,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Majestic_Lucky_Scroll);',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (17527,'Actinidia_Cat_Fruit_Box_200','Actinidia Cat Fruit Box(200)',2,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 6909,200; getitem 12636,rand(1,5); /*TODO: Fix the 12636 amount*/',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (17527,'Nyangvine_Box200','Actinidia Cat Fruit Box(200)',2,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 6909,200; getitem 12636,rand(1,5); /*TODO: Fix the 12636 amount*/',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (17532,'Blessing_Lucky_Scroll','Blessing Lucky Egg',18,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Blessing_Lucky_Scroll);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (17544,'Smelting_Ore_Box_IX','Smelting Ore Box IX',2,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 7619,5; getitem 7620,5; getitem 22888,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (17545,'Smelting_Ore_Box_IX_10','Smelting Ore Box IX(10)',2,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 7619,50; getitem 7620,50; getitem 22888,11;',NULL,NULL);
@@ -9451,14 +9510,14 @@ REPLACE INTO `item_db_re` VALUES (18115,'Orc_Archer_Bow_','Orc Archer Bow',5,20,
REPLACE INTO `item_db_re` VALUES (18116,'Metal_Bow','Metal Bow',5,20,NULL,0,'50',NULL,5,1,0x00080800,63,2,34,3,'1',1,11,'.@r = getrefine(); if(BaseJob==Job_Hunter && Upper!=2) bonus bBaseAtk,10; bonus bBaseAtk,(.@r*3); bonus bLongAtkRate,.@r; .@i = min(BaseLevel/10,12); if(.@i>2) bonus bBaseAtk,((.@i-2)*5);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18117,'Royal_Bow','Royal Bow',5,200000,NULL,1500,'80',NULL,5,1,0x000A0808,63,2,34,4,'105',1,11,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18118,'TE_Woe_Bow','TE Woe Bow',5,0,NULL,0,'120',NULL,5,0,0x000A0848,63,2,34,3,'40',1,11,'bonus2 bAddRace,RC_Player,40; bonus2 bAddEff,Eff_Curse,3000;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18119,'Thanos_Bow','Thanatos Bow',5,10,NULL,1300,'180:110',NULL,5,1,0x00080808,63,2,34,4,'120',1,11,'bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000;',NULL,'heal -1000,0;');
+REPLACE INTO `item_db_re` VALUES (18119,'Thanos_Bow','Thanatos Bow',5,10,NULL,1300,'180:110',NULL,5,1,0x00080808,56,2,34,4,'120',1,11,'bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000;',NULL,'heal -1000,0;');
REPLACE INTO `item_db_re` VALUES (18120,'Bow_Of_Evil_Slayer','Evil Slayer Piercer Bow',5,10,NULL,1350,'115',NULL,5,1,0x000A0808,63,2,34,3,'100',1,11,'bonus2 bAddRace,RC_Demon,10; bonus2 bAddRace,RC_Undead,10; .@r = getrefine(); bonus2 bAddClass,Class_All,(.@r>=12?12:(.@r>=9?5:0));',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18121,'Bow_of_Vicious_Mind','Bow of Vicious Mind',5,20,NULL,1700,'170',NULL,5,1,0x000A0808,63,2,34,4,'160',1,11,'bonus bAtk,pow(min(getrefine(),15),2);',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18122,'Giant_Bow','Giant Bow',5,20,NULL,3000,'195',NULL,5,1,0x00000800,63,2,34,4,'130',1,11,'bonus bLongAtkRate,40; bonus bAspdRate,-15; bonus bHit,50;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18123,'Bow_of_Storms','Bow of Storms',5,20,NULL,1500,'160',NULL,5,1,0x00080800,63,2,34,4,'130',1,11,'bonus bLongAtkRate,30; bonus2 bSkillCooldown,"WM_SEVERE_RAINSTORM",-2000; bonus2 bSkillUseSP,"WM_SEVERE_RAINSTORM",15;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18122,'Gigantic_Bow','Giant Bow',5,20,NULL,3000,'195',NULL,5,1,0x00000800,63,2,34,4,'130',1,11,'bonus bLongAtkRate,40; bonus bAspdRate,-15; bonus bHit,50;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18123,'Bow_Of_Storm','Bow of Storms',5,20,NULL,1500,'160',NULL,5,1,0x00080800,63,2,34,4,'130',1,11,'bonus bLongAtkRate,30; bonus2 bSkillCooldown,"WM_SEVERE_RAINSTORM",-2000; bonus2 bSkillUseSP,"WM_SEVERE_RAINSTORM",15;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18124,'Half_BF_Bow1','Half BF Bow1',5,20,NULL,0,'100',NULL,5,0,0x000A0848,63,2,34,3,'80',1,11,'bonus bDex,2; bonus2 bAddRace,RC_DemiHuman,30; bonus2 bAddRace,RC_Player,30; bonus2 bIgnoreDefRaceRate,RC_DemiHuman,10; bonus2 bIgnoreDefRaceRate,RC_Player,10; bonus bUnbreakableWeapon,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18125,'Arcus_Daemonicus','Arcus Daemonicus',5,20,NULL,1000,'130',NULL,5,2,0x00020008,63,2,34,4,'80',1,11,'/*Fix me: bonus2 bAddClass,Class_All,50; when equipped with shadow arrows*/ if(getrefine()>9){ bonus bAspd,1; bonus bUseSPrate,-20; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18126,'Blue_Bow','Blue Bow',5,10,NULL,1200,'150',NULL,5,1,0x00000800,56,2,2,3,'100',1,11,'bonus bAgi,5; bonus bDex,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18126,'Ru_Blue_Bow','Blue Bow',5,10,NULL,1200,'150',NULL,5,1,0x00000800,56,2,2,3,'100',1,11,'bonus bAgi,5; bonus bDex,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18127,'Ru_Gold_Bow','Ru Gold Bow',5,0,NULL,1200,'150',NULL,5,2,0x00000800,56,2,34,3,'120',1,11,'bonus bAgi,8; bonus bDex,8;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18128,'Infinity_Bow','Infinity Bow',5,20,NULL,500,'160',NULL,5,1,0x00020800,56,2,34,4,'100',1,11,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18130,'Crimson_Bow','Crimson Bow',5,20,NULL,1200,'120',NULL,5,2,0x000A0848,63,2,34,3,'70',1,11,'.@r = getrefine(); bonus bBaseAtk,((BaseLevel/10)*5)+(.@r<=15?pow(.@r,2):225);',NULL,NULL);
@@ -9473,7 +9532,7 @@ REPLACE INTO `item_db_re` VALUES (18140,'Gust_Bow_','Gust Bow',5,20,NULL,1400,'9
REPLACE INTO `item_db_re` VALUES (18500,'Cheer_Scarf6','Cheer Scarf6',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1,NULL,'1',0,369,'bonus2 bExpAddClass,Class_All,60;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18501,'Cheer_Scarf8','Cheer Scarf8',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1,NULL,'1',0,369,'bonus2 bExpAddClass,Class_All,80;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18502,'Cheer_Scarf10','Cheer Scarf10',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1,NULL,'1',0,369,'bonus2 bExpAddClass,Class_All,100;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18503,'Majestic_Devil','Small Devil Horns',4,20,NULL,100,NULL,2,NULL,0,0xFFFFFFFF,63,2,512,NULL,'1',0,562,'bonus2 bAddClass,Class_All,5; bonus bMatkRate,5; bonus bMaxHPrate,10; bonus bMaxSPrate,10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18503,'Small_Horn_Of_Devil','Small Devil Horns',4,20,NULL,100,NULL,2,NULL,0,0xFFFFFFFF,63,2,512,NULL,'1',0,562,'bonus2 bAddClass,Class_All,5; bonus bMatkRate,5; bonus bMaxHPrate,10; bonus bMaxSPrate,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18504,'Anubis_Helm_J','Anubis Helm J',4,20,NULL,1000,NULL,0,NULL,0,0xFFFFFFFF,63,2,769,NULL,'70',0,485,'bonus bMdefRate,-50; bonus bDefRate,-50; bonus5 bAutoSpellWhenHit,"NPC_WIDESTONE",2,10,BF_WEAPON|BF_MAGIC,0;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18505,'Umbala_Spirit','Umbala Spirit',4,0,NULL,0,NULL,1,NULL,0,0xFFFFFFFF,63,2,1,NULL,'30',0,675,'bonus bMaxHPrate,1; bonus2 bAddMonsterDropItem,517,500; bonus2 bAddItemHealRate,517,25; /*Gold PC Room: bonus bAllStats,1;*/',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18506,'Hattah_Black','Hattah Black',4,12000,NULL,4000,NULL,2,NULL,1,0xFFFFFFFF,63,2,769,NULL,'1',1,676,'bonus bMaxHPrate,10; bonus bMaxSPrate,10;',NULL,NULL);
@@ -9485,14 +9544,14 @@ REPLACE INTO `item_db_re` VALUES (18511,'Blood_Angel_Wing_Ear','Blood Angel Wing
REPLACE INTO `item_db_re` VALUES (18512,'Juho_Necktie','Juho Necktie',4,0,NULL,0,NULL,1,NULL,1,0xFFFFFFFF,63,2,256,NULL,'20',1,443,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18513,'Shining_Sunflower','Shining Sunflower',4,20,NULL,300,NULL,0,NULL,0,0xFFFFFFFE,63,2,256,NULL,'0',0,681,'bonus bLuk,2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18514,'Para_Team_Hat2','Eden Team Hat II',4,0,NULL,0,NULL,5,NULL,1,0xFFFFFFFF,63,2,256,NULL,'60',1,682,'autobonus "{ bonus bBaseAtk,10; }",70,5000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }"; autobonus "{ bonus bMatk,10; }",50,5000,BF_MAGIC,"{ specialeffect2 EF_SPELLBREAKER; }";',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18515,'RTC_Winner_Hat','RTC Winner Hat',4,20,NULL,100,NULL,2,NULL,1,0xFFFFFFFF,63,2,512,NULL,'1',0,683,'bonus bAllStats,5; bonus bIntravision,1; bonus2 bSubRace,RC_DemiHuman,15; bonus2 bSubRace,RC_Player,15; bonus2 bAddEff,Eff_Curse,50;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18516,'RTC_2nd_Winner_Hat','RTC 2nd Winner Hat',4,20,NULL,100,NULL,2,NULL,1,0xFFFFFFFF,63,2,512,NULL,'1',0,684,'bonus bAllStats,3; bonus bIntravision,1; bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10; bonus2 bAddEff,Eff_Curse,50;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18517,'RTC_3rd_Winner_Hat','RTC 3rd Winner Hat',4,20,NULL,100,NULL,2,NULL,1,0xFFFFFFFF,63,2,512,NULL,'1',0,685,'bonus bAllStats,1; bonus bIntravision,1; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player,5; bonus2 bAddEff,Eff_Curse,50;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18518,'Angelwing_Ear_S','Angel Wing Ears',4,20,NULL,100,NULL,3,NULL,1,0xFFFFFFFF,63,2,512,NULL,'70',0,158,'bonus bStr,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18519,'Devilwing_Ear_S','Evil Wing Ears',4,20,NULL,100,NULL,3,NULL,1,0xFFFFFFFF,63,2,512,NULL,'70',0,152,'bonus bStr,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18515,'RTC_Winner_Headgear','RTC Winner Hat',4,20,NULL,100,NULL,2,NULL,1,0xFFFFFFFF,63,2,512,NULL,'1',0,683,'bonus bAllStats,5; bonus bIntravision,1; bonus2 bSubRace,RC_DemiHuman,15; bonus2 bSubRace,RC_Player,15; bonus2 bAddEff,Eff_Curse,50;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18516,'RTC_2nd_Headgear','RTC 2nd Winner Hat',4,20,NULL,100,NULL,2,NULL,1,0xFFFFFFFF,63,2,512,NULL,'1',0,684,'bonus bAllStats,3; bonus bIntravision,1; bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10; bonus2 bAddEff,Eff_Curse,50;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18517,'RTC_3rd_Headgear','RTC 3rd Winner Hat',4,20,NULL,100,NULL,2,NULL,1,0xFFFFFFFF,63,2,512,NULL,'1',0,685,'bonus bAllStats,1; bonus bIntravision,1; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player,5; bonus2 bAddEff,Eff_Curse,50;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18518,'Ear_Of_Angel\'s_Wing_','Angel Wing Ears',4,20,NULL,100,NULL,3,NULL,1,0xFFFFFFFF,63,2,512,NULL,'70',0,158,'bonus bStr,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18519,'Ear_Of_Devil\'s_Wing_','Evil Wing Ears',4,20,NULL,100,NULL,3,NULL,1,0xFFFFFFFF,63,2,512,NULL,'70',0,152,'bonus bStr,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18520,'Jaty_C','Jaty Crown',4,20,NULL,100,NULL,1,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',1,686,'bonus2 bSubRace,RC_Plant,5; bonus2 bSubRace,RC_Brute,5; bonus2 bAddRace,RC_Plant,5; bonus2 bAddRace,RC_Brute,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18521,'Lucky_Clover','Lucky Clover',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,1,NULL,'50',0,571,'bonus bLuk,1; bonus bMaxSP,20;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18522,'Evil_Marcher_Hat','Evil Marcher Hat',4,20,NULL,500,NULL,10,NULL,1,0xFFFFFFFF,63,2,256,NULL,'0',1,687,'bonus bStr,2; bonus bMdef,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18522,'Evil_Marcher_Hat','Evil Marcher Hat',4,20,NULL,500,NULL,10,NULL,1,0xFFFFFFFF,63,2,256,NULL,'0',1,687,'bonus bStr,2; bonus bMdef,1; .@r = getrefine(); if(.@r>=7) { bonus bCritAtkRate,10; }; bonus2 bAddClass,Class_All,(.@r>=9?7:2); if(.@r>=9) { bonus bLongAtkRate,5; };',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18523,'Super_Scell','Thunderstorm Cloud',4,20,NULL,100,NULL,2,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',0,688,'bonus3 bAutoSpell,"MG_LIGHTNINGBOLT",max(getskilllv("MG_LIGHTNINGBOLT"),5),50+(getskilllv("MG_LIGHTNINGBOLT")*5); bonus3 bAutoSpell,"MG_THUNDERSTORM",max(getskilllv("MG_THUNDERSTORM"),5),50+(getskilllv("MG_THUNDERSTORM")*5);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18524,'Dokkebi_Mask','Dokkebi Mask',4,20,NULL,700,NULL,1,NULL,0,0xFFFFFFFF,63,2,513,NULL,'50',0,689,'bonus bStr,2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18525,'Watermelon_Hat','Watermelon Cap',4,20,NULL,100,NULL,4,NULL,1,0xFFFFFFFF,63,2,256,NULL,'30',1,690,'bonus bVit,1; bonus bLuk,1; bonus bMdef,4; bonus2 bAddEle,Ele_Fire,3;',NULL,NULL);
@@ -9519,7 +9578,7 @@ REPLACE INTO `item_db_re` VALUES (18545,'Whrabbit_Hband','Whrabbit Hband',4,20,N
REPLACE INTO `item_db_re` VALUES (18546,'Lover_In_Mouth','Lover In Mouth',4,20,NULL,300,NULL,0,NULL,0,0xFFFFFFFF,63,2,1,NULL,'0',0,720,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18547,'Campus_Festival','Campus Festival',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,256,NULL,'0',1,721,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18548,'Tiny_Hat','Tiny Hat',4,20,NULL,30,NULL,0,NULL,0,0xFFFFFFFF,63,2,256,NULL,'0',1,722,'bonus bInt,1; bonus bAgi,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18549,'Butterfly_Hairpin','Butterfly Hairpin',4,20,NULL,200,NULL,3,NULL,1,0xFFFFFFFF,63,2,256,NULL,'20',1,723,'bonus bInt,1; bonus bAgi,1; bonus bMdef,3; bonus2 bAddRace,RC_Plant,5; bonus2 bMagicAddRace,RC_Plant,5; bonus2 bSubRace,RC_Plant,5; bonus3 bAddMonsterDropItem,709,RC_Plant,30;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18549,'Nabi_Hair_Pin','Butterfly Hairpin',4,20,NULL,200,NULL,3,NULL,1,0xFFFFFFFF,63,2,256,NULL,'20',1,723,'bonus bInt,1; bonus bAgi,1; bonus bMdef,3; bonus2 bAddRace,RC_Plant,5; bonus2 bMagicAddRace,RC_Plant,5; bonus2 bSubRace,RC_Plant,5; bonus3 bAddMonsterDropItem,709,RC_Plant,30;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18550,'Asgard_Blessing','Asgard Blessing',4,20,NULL,300,NULL,3,NULL,1,0xFFFFFFFF,63,2,256,NULL,'30',1,724,'bonus bAllStats,2; bonus2 bSubEle,Ele_All,5; bonus2 bHPRegenRate,(MaxHp/100),10000;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18551,'Galaxy_Circlet','Galaxy Circlet',4,20,NULL,1000,NULL,5,NULL,1,0xFFFFFFFF,63,2,256,NULL,'50',1,725,'.@r = getrefine(); .@a = .@r*10; .@b = .@r/2; bonus bMdef,5; bonus bMaxHP,.@a; bonus bMaxSP,.@a; bonus2 bSubEle,Ele_Earth,.@b; bonus2 bSubEle,Ele_Fire,.@b; bonus2 bSubEle,Ele_Water,.@b;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18552,'Proba_Angel_Blessing','Proba Angel Blessing',4,20,NULL,1200,NULL,0,NULL,1,0xFFFFFFFF,63,2,256,NULL,'10',1,444,'bonus bLuk,2;',NULL,NULL);
@@ -9533,9 +9592,9 @@ REPLACE INTO `item_db_re` VALUES (18559,'Fafnir_Skin','Fafnir Skin',4,20,NULL,10
REPLACE INTO `item_db_re` VALUES (18560,'Fafnir_Mask','Fafnir Mask',4,20,NULL,300,NULL,2,NULL,0,0xFFFFFFFF,63,2,1,NULL,'50',0,180,'bonus bCritical,2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18561,'B_Feather_Beret','B Feather Beret',4,20,NULL,300,NULL,5,NULL,1,0xFFFFFFFF,63,2,256,NULL,'40',1,731,'bonus bVit,2; bonus bMdef,3; bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18562,'Bone_Hat','Bone Hat',4,20,NULL,200,NULL,3,NULL,1,0xFFFFFFFF,63,2,256,NULL,'10',1,732,'bonus bMdef,3;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18563,'Heart_Wing_Hairband','Heart Wing Hairband',4,20,NULL,300,NULL,0,NULL,1,0xFFFFFFFF,63,2,256,NULL,'50',1,733,'bonus bUseSPrate,-10; bonus bDelayrate,-5; .@r = getrefine()/3; if(.@r>0){ bonus bUseSPrate,.@r*3; bonus bDelayrate,.@r*3; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18563,'Heart_Wing_Hairband','Heart Wing Hairband',4,20,NULL,300,NULL,0,NULL,1,0xFFFFFFFF,63,2,256,NULL,'50',1,733,'.@r = getrefine()/3; bonus bUseSPrate,-(10+.@r*3); bonus bDelayrate,-(5+.@r*3);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18564,'Love_Piece','Love Piece',4,20,NULL,200,NULL,0,NULL,0,0xFFFFFFFF,63,2,1,NULL,'50',0,734,'bonus bNoCastCancel,1; bonus bUseSPrate,15;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18565,'Leprechaun_Hat','Leprechaun Hat',4,20,NULL,300,NULL,8,NULL,1,0xFFFFFFFF,63,2,256,NULL,'40',0,735,'bonus bStr,1; bonus bInt,1; bonus bMdef,4; if(getrefine()>6){ bonus2 bAddMonsterDropItem,12135,50; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18565,'Leprechaun_Hat','St Patrick\'s Hat',4,20,NULL,300,NULL,8,NULL,1,0xFFFFFFFF,63,2,256,NULL,'40',1,735,'bonus bStr,1; bonus bInt,1; bonus bMdef,4; if(getrefine()>7){ bonus2 bAddMonsterDropItem,12135,50; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18566,'Nut_Donut_In_Mouth','Nut Donut In Mouth',4,20,NULL,0,NULL,1,NULL,0,0xFFFFFFFF,63,2,1,NULL,'0',0,736,'bonus bBaseAtk,5; bonus bMatk,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18567,'Stretched_Nose','Stretched Nose',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,1,NULL,'0',0,737,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18568,'Humming_Bird','Humming Bird',4,20,NULL,100,NULL,3,NULL,0,0xFFFFFFFF,63,2,256,NULL,'10',0,702,'bonus bMdef,6;',NULL,NULL);
@@ -9567,19 +9626,19 @@ REPLACE INTO `item_db_re` VALUES (18593,'Fancy_Mini_Crown','Fancy Mini Crown',4,
REPLACE INTO `item_db_re` VALUES (18594,'Magni_Cap_','Magni Cap',4,30000,NULL,1000,NULL,9,NULL,1,0xFFFFFFFE,63,2,256,NULL,'0',1,250,'bonus bStr,2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18595,'Horn_Of_Ancient','Horn of Ancient',4,40,NULL,200,NULL,8,NULL,1,0xFFFFFFFF,63,2,256,NULL,'50',1,757,'bonus2 bSubClass,Class_Boss,10; bonus2 bAddClass,Class_Boss,10; .@r = getrefine(); if (.@r > 6) { autobonus "{ bonus bBaseAtk,100; }",10,10000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }"; } if (.@r > 8) { bonus2 bSubClass,Class_Boss,10; bonus2 bAddClass,Class_Boss,10; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18596,'Sprout_Hat','Sprout Hat',4,20,NULL,200,NULL,4,NULL,0,0xFFFFFFFF,63,2,256,NULL,'70',1,758,'skill "WZ_HEAVENDRIVE",3;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18597,'Mercury_Riser','Mercury Riser',4,40,NULL,200,NULL,10,NULL,1,0xFFFFFFFF,63,2,256,NULL,'0',1,759,'bonus2 bSubRace,RC_DemiHuman,10; bonus2 bAddRace,RC_DemiHuman,10; bonus bAspdRate,3; bonus bDelayrate,-3; .@r = getrefine(); if(.@r >= 7) { bonus bAspdRate,2; bonus bDelayrate,-2; } if(.@r >= 9) { bonus bAspdRate,2; bonus bDelayrate,-2; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18597,'Mercury_Helm','Mercury Riser',4,40,NULL,200,NULL,10,NULL,1,0xFFFFFFFF,63,2,256,NULL,'0',1,759,'bonus2 bSubRace,RC_DemiHuman,10; bonus2 bAddRace,RC_DemiHuman,10; bonus bAspdRate,3; bonus bDelayrate,-3; .@r = getrefine(); if(.@r >= 7) { bonus bAspdRate,2; bonus bDelayrate,-2; } if(.@r >= 9) { bonus bAspdRate,2; bonus bDelayrate,-2; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18598,'Mini_Tree_J','Mini Tree J',4,20,NULL,50,NULL,0,NULL,1,0xFFFFFFFF,63,2,256,NULL,'0',0,727,'bonus bMdef,20;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18599,'Black_Devil_Mask','Black Devil Mask',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,512,NULL,'0',0,760,'bonus bAllStats,2;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18600,'Cat_Ear_Beret','Cat Ear Beret',4,20,NULL,100,NULL,5,NULL,1,0xFFFFFFFF,63,2,256,NULL,'0',1,761,'bonus2 bAddClass,Class_All,5; .@r = getrefine(); if(.@r < 5) .@r = 5; bonus2 bSubRace,RC_DemiHuman,(.@r - 5); bonus2 bAddRace,RC_DemiHuman,(.@r - 5);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18600,'Cat_Ears_Beret','Cat Ear Beret',4,20,NULL,100,NULL,5,NULL,1,0xFFFFFFFF,63,2,256,NULL,'0',1,761,'bonus2 bAddClass,Class_All,5; .@r = getrefine(); if(.@r < 5) .@r = 5; bonus2 bSubRace,RC_DemiHuman,(.@r - 5); bonus2 bAddRace,RC_DemiHuman,(.@r - 5);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18601,'Red_Bread_Hat','Red Bread Hat',4,20,NULL,300,NULL,0,NULL,1,0xFFFFFFFF,63,2,256,NULL,'0',1,762,'bonus bMdef,5; .@r = getrefine(); if (.@r < 5) .@r = 5; bonus2 bSubRace,RC_DemiHuman,(.@r - 5); bonus2 bMagicAddRace,RC_DemiHuman,(.@r - 5);',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18602,'Watermelon_Bite','Watermelon Bite',4,20,NULL,100,NULL,4,NULL,0,0xFFFFFFFF,63,2,1,NULL,'30',0,763,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18602,'Watermelon_Slice','Watermelon Bite',4,20,NULL,100,NULL,4,NULL,0,0xFFFFFFFF,63,2,1,NULL,'30',0,763,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18603,'Black_Devil_Mask_','Black Devil Mask',4,20,NULL,100,NULL,0,NULL,1,0xFFFFFFFF,63,2,512,NULL,'0',0,760,'bonus bAllStats,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18604,'Falcon_Mask','Falcon Mask',4,10,NULL,30,NULL,0,NULL,0,0xFFFFFFFF,63,2,513,NULL,'50',0,782,'bonus2 bAddEle,Ele_Water,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18605,'Dark_Age','Dark Age',4,20,NULL,200,NULL,3,NULL,1,0xFFFFFFFF,63,2,256,NULL,'10',1,766,'bonus bMdef,3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18606,'Tear_Drop','Tear Drop',4,20,NULL,100,NULL,1,NULL,0,0xFFFFFFFF,63,2,513,NULL,'30',0,767,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18607,'Blush_S','Blush',4,20,NULL,100,NULL,0,NULL,1,0xFFFFFFFF,63,2,512,NULL,'0',0,125,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18608,'Pair_Of_Red_Ribbon_S','Small Ribbons',4,20,NULL,100,NULL,2,NULL,1,0xFFFFFFFF,63,2,512,NULL,'45',0,169,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18609,'Dark_Blindfold_S','Dark Blinder',4,20,NULL,100,NULL,0,NULL,1,0xFFFFFFFE,63,2,512,NULL,'0',0,187,'bonus2 bResEff,Eff_Blind,10000; bonus2 bResEff,Eff_Stun,200;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18607,'Blush_','Blush',4,20,NULL,100,NULL,0,NULL,1,0xFFFFFFFF,63,2,512,NULL,'0',0,125,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18608,'Pair_Of_Red_Ribbon2','Small Ribbons',4,20,NULL,100,NULL,2,NULL,1,0xFFFFFFFF,63,2,512,NULL,'45',0,169,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18609,'Dark_Blindfold_','Dark Blinder',4,20,NULL,100,NULL,0,NULL,1,0xFFFFFFFE,63,2,512,NULL,'0',0,187,'bonus2 bResEff,Eff_Blind,10000; bonus2 bResEff,Eff_Stun,200;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18610,'7th_Anni_Hat_B','7th Anni Hat B',4,20,NULL,500,NULL,4,NULL,0,0xFFFFFFFF,63,2,256,NULL,'0',1,778,'bonus bAllStats,5; bonus bMdef,4;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18611,'Black_Glasses_','Black Glasses',4,20,NULL,200,NULL,2,NULL,1,0xFFFFFFFF,63,2,512,NULL,'0',0,404,'bonus bInt,1; bonus bMdef,2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18612,'White_Musang_Hat','White Musang Hat',4,40,NULL,400,NULL,3,NULL,1,0xFFFFFFFF,63,2,256,NULL,'0',1,770,'bonus bStr,2; bonus bVit,2; bonus bLuk,1; bonus bUnbreakableHelm,1;',NULL,NULL);
@@ -9590,11 +9649,11 @@ REPLACE INTO `item_db_re` VALUES (18616,'Long_Tongue','Long Tongue',4,20,NULL,20
REPLACE INTO `item_db_re` VALUES (18617,'Onigiri_In_Mouth','Onigiri In Mouth',4,20,NULL,200,NULL,0,NULL,0,0xFFFFFFFE,63,2,1,NULL,'20',0,774,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18618,'Airplane_Hat','Airplane Hat',4,20,NULL,200,NULL,8,NULL,1,0xFFFFFFFE,63,2,256,NULL,'20',1,775,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18619,'Thief_Bandana','Thief Bandana',4,20,NULL,200,NULL,1,NULL,0,0xFFFFFFFE,63,2,256,NULL,'20',1,776,'bonus3 bAutoSpell,"TF_STEAL",1,20;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18620,'Heart_Eye_Patch','Heart Eyepatch',4,5,NULL,50,NULL,2,NULL,0,0xFFFFFFFF,63,2,512,NULL,'20',1,779,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18620,'Heart_Eyepatch','Heart Eyepatch',4,5,NULL,50,NULL,2,NULL,0,0xFFFFFFFF,63,2,512,NULL,'20',1,779,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18621,'Gangster_Mask_A','Gangster Mask A',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,1,NULL,'0',0,52,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18622,'Rocket_Helm_1','Rocket Helm 1',4,20,NULL,1000,NULL,20,NULL,1,0xFFFFFFFF,63,2,256,NULL,'95',1,764,'bonus bAllStats,5; bonus bMdef,5; bonus bUnbreakableHelm,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18623,'Rocket_Helm_2','Rocket Helm 2',4,20,NULL,1000,NULL,20,NULL,1,0xFFFFFFFF,63,2,256,NULL,'95',1,765,'bonus bAllStats,4; bonus bMdef,5; bonus bUnbreakableHelm,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18624,'Rocket_Helm_3','Rocket Helm 3',4,20,NULL,1000,NULL,20,NULL,1,0xFFFFFFFF,63,2,256,NULL,'95',1,768,'bonus bAllStats,3; bonus bMdef,5; bonus bUnbreakableHelm,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18622,'Rocket_Helm1','Rocket Helm 1',4,20,NULL,1000,NULL,20,NULL,1,0xFFFFFFFF,63,2,256,NULL,'95',1,764,'bonus bAllStats,5; bonus bMdef,5; bonus bUnbreakableHelm,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18623,'Rocket_Helm2','Rocket Helm 2',4,20,NULL,1000,NULL,20,NULL,1,0xFFFFFFFF,63,2,256,NULL,'95',1,765,'bonus bAllStats,4; bonus bMdef,5; bonus bUnbreakableHelm,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18624,'Rocket_Helm3','Rocket Helm 3',4,20,NULL,1000,NULL,20,NULL,1,0xFFFFFFFF,63,2,256,NULL,'95',1,768,'bonus bAllStats,3; bonus bMdef,5; bonus bUnbreakableHelm,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18625,'Rocket_Helm_RWC','Rocket Helm RWC',4,10000,NULL,1000,NULL,20,NULL,1,0xFFFFFFFF,63,2,256,NULL,'95',1,769,'bonus bAllStats,2; bonus bMdef,5; bonus bUnbreakableHelm,1; bonus bSpeedRate,25;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18626,'Gelato_Hat','Gelato Hat',4,20,NULL,200,NULL,2,NULL,0,0xFFFFFFFF,63,2,256,NULL,'40',1,777,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18627,'Dried_Leaf','Dried Leaf',4,20,NULL,50,NULL,0,NULL,0,0xFFFFFFFF,63,2,1,NULL,'10',0,711,'bonus bUnbreakableHelm,1;',NULL,NULL);
@@ -9612,7 +9671,7 @@ REPLACE INTO `item_db_re` VALUES (18638,'Citron_Hat','Citron Hat',4,20,NULL,400,
REPLACE INTO `item_db_re` VALUES (18639,'Naval_Officer_Hat','Naval Officer Hat',4,20,NULL,200,NULL,2,NULL,1,0xFFFFFFFE,63,2,256,NULL,'1',1,792,'bonus bLuk,3; bonus2 bAddEle,Ele_Water,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18640,'Starfish_Headband','Starfish Headband',4,20,NULL,200,NULL,2,NULL,1,0xFFFFFFFE,63,2,256,NULL,'1',1,793,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18641,'Ribbon_Magic_Hat','Ribbon Magic Hat',4,20,NULL,200,NULL,2,NULL,1,0xFFFFFFFE,63,2,256,NULL,'1',1,794,'bonus bMaxSP,50; bonus bMatkRate,5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18642,'Scissorhand_Model','Scissorhand Model',4,20,NULL,200,NULL,0,NULL,0,0xFFFFFFFE,63,2,1,NULL,'20',0,795,'bonus bAgi,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18642,'hand_Scissorhand_Model','Scissorhand Model',4,20,NULL,200,NULL,0,NULL,0,0xFFFFFFFE,63,2,1,NULL,'20',0,795,'bonus bAgi,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18643,'Rockhand_Model','Rockhand Model',4,20,NULL,200,NULL,0,NULL,0,0xFFFFFFFE,63,2,1,NULL,'20',0,796,'bonus bStr,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18644,'Paperhand_Model','Paperhand Model',4,20,NULL,200,NULL,0,NULL,0,0xFFFFFFFE,63,2,1,NULL,'20',0,797,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18645,'Sailor_Hat','Sailor Hat',4,20,NULL,200,NULL,2,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',1,798,'bonus bInt,1; bonus2 bAddRace,RC_DemiHuman,5; bonus2 bAddRace,RC_Player,5;',NULL,NULL);
@@ -9622,15 +9681,15 @@ REPLACE INTO `item_db_re` VALUES (18648,'Tongue_Charm','Tongue Charm',4,20,NULL,
REPLACE INTO `item_db_re` VALUES (18649,'Lude_Mask','Lude Mask',4,10,NULL,100,NULL,1,NULL,0,0xFFFFFFFF,63,2,513,NULL,'0',1,802,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18650,'RWC_Shouting_Mouth','RWC Shouting Mouth',4,20,NULL,50,NULL,0,NULL,0,0xFFFFFFFF,63,2,1,NULL,'1',0,194,'bonus3 bAutoSpellWhenHit,"SM_ENDURE",1,10; bonus3 bAutoSpellWhenHit,"MO_CALLSPIRITS",5,10; bonus3 bAutoSpellWhenHit,"MO_EXPLOSIONSPIRITS",5,10; bonus3 bAutoSpell,"BS_MAXIMIZE",5,10; bonus3 bAutoSpell,"MC_LOUD",1,10; bonus3 bAutoSpell,"AC_CONCENTRATION",5,10; bonus3 bAutoSpell,"PR_GLORIA",3,10; autobonus "{ bonus bStr,3; bonus bAgi,3; }",10,5000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; showscript \\\"RWC 2011 Fighting!!\\\"; }"; autobonus "{ bonus bInt,3; bonus bLuk,3; }",5,5000,BF_MAGIC,"{ specialeffect2 EF_ENERGYCOAT; showscript \\\"RWC 2011 Fighting!!\\\"; }";',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18651,'Ignis_Cap','Ignis Cap',4,20,NULL,800,NULL,8,NULL,1,0xFFFFFFFF,63,2,256,NULL,'40',1,803,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18652,'Vanargandr_Helm','Vanargandr Helm',4,20,NULL,1500,NULL,10,NULL,1,0xFFFFFFFF,63,2,256,NULL,'80',1,804,'bonus bMdef,5; .@r = getrefine(); if (.@r >= 9 ) { bonus2 bHPDrainRate,60,8; bonus2 bSPDrainRate,20,4; } else if (.@r >= 8 ) { bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,2; } else if (.@r >= 7 ) { bonus2 bHPDrainRate,30,5; bonus2 bSPDrainRate,10,2; } else if (.@r >= 5 ) { bonus2 bHPDrainRate,10,3; bonus2 bSPDrainRate,10,1; } else { bonus2 bHPDrainRate,10,1; bonus2 bSPDrainRate,10,1; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18653,'Deviruchi_Headphone','Deviruchi Headphone',4,20,NULL,200,NULL,8,NULL,1,0xFFFFFFFF,63,2,256,NULL,'30',1,805,'bonus bMdef,4;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18655,'Goedo_Monocle','Goedo Monocle',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,512,NULL,'50',0,807,'bonus bAgi,2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18652,'Vanargand_Helm','Vanargandr Helm',4,20,NULL,1500,NULL,10,NULL,1,0xFFFFFFFF,63,2,256,NULL,'80',1,804,'bonus bMdef,5; .@r = getrefine(); if (.@r >= 9 ) { bonus2 bHPDrainRate,60,8; bonus2 bSPDrainRate,20,4; } else if (.@r >= 8 ) { bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,2; } else if (.@r >= 7 ) { bonus2 bHPDrainRate,30,5; bonus2 bSPDrainRate,10,2; } else if (.@r >= 5 ) { bonus2 bHPDrainRate,10,3; bonus2 bSPDrainRate,10,1; } else { bonus2 bHPDrainRate,10,1; bonus2 bSPDrainRate,10,1; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18653,'Devi_Headphone','Deviruchi Headphone',4,20,NULL,200,NULL,8,NULL,1,0xFFFFFFFF,63,2,256,NULL,'30',1,805,'bonus bMdef,4;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18655,'Lupin_One_Eyed_Glasses','Goedo Monocle',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,512,NULL,'50',0,807,'bonus bAgi,2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18656,'Wit_Pumpkin_Hat','Witch\'s Pumpkin Hat',4,20,NULL,300,NULL,10,NULL,0,0xFFFFFFFF,63,2,256,NULL,'20',1,717,'bonus bMdef,10; bonus bStr,2; bonus bInt,2; bonus2 bMagicAddRace,RC_Undead,15; bonus2 bMagicAddRace,RC_Undead,15; bonus2 bMagicAddRace,RC_Demon,15; bonus2 bMagicAddRace,RC_Demon,15;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18657,'Pegasus_Wing_Ears','Pegasus Wing Ears',4,20,NULL,500,NULL,1,NULL,0,0xFFFFFFFF,63,2,512,NULL,'80',0,568,'bonus bUnbreakableHelm,1; .@i = BaseLevel; bonus bAspdRate,(.@i>=150)?(3):((.@i>=100)?(2):((.@i>=50)?(1):(0)));',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18658,'Holy_Santa_Beard','Holy Santa Beard',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,1,NULL,'1',0,25,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18659,'Boitata_Hat','Boitata Hat',4,20,NULL,0,NULL,5,NULL,1,0xFFFFFFFF,63,2,768,NULL,'0',1,808,'autobonus "{ bonus bAtkEle,Ele_Fire; }",10,180000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }"; bonus3 bAutospell,"AS_SONICBLOW",5,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18660,'Indi_Feather_Band','Indian Feather Headband',4,20,NULL,400,NULL,3,NULL,1,0xFFFFFFFE,63,2,256,NULL,'0',1,809,'bonus bAgi,2;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18661,'Trident_Helm','Trident Helm',4,20,NULL,400,NULL,3,NULL,1,0xFFFFFFFE,63,2,256,NULL,'20',1,810,'bonus bStr,2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18661,'Trident_Helmet','Trident Helm',4,20,NULL,400,NULL,3,NULL,1,0xFFFFFFFE,63,2,256,NULL,'20',1,810,'bonus bStr,2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18662,'Antler_Fedora','Antler Fedora',4,20,NULL,400,NULL,3,NULL,0,0xFFFFFFFE,63,2,256,NULL,'1',1,811,'bonus bInt,3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18663,'Sunglasses_Bball_Hat','Sunglasses Baseball Hat',4,20,NULL,200,NULL,2,NULL,1,0xFFFFFFFE,63,2,256,NULL,'20',1,812,'bonus bInt,3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18664,'Blind_Glasses','Blind Glasses',4,20,NULL,400,NULL,3,NULL,0,0xFFFFFFFE,63,2,512,NULL,'20',1,813,NULL,NULL,NULL);
@@ -9642,7 +9701,7 @@ REPLACE INTO `item_db_re` VALUES (18669,'Cowhide_Hat','Cowhide Hat',4,20,NULL,20
REPLACE INTO `item_db_re` VALUES (18670,'Hankie_In_Mouth','Hankie In Mouth',4,20,NULL,100,NULL,1,NULL,0,0xFFFFFFFF,63,2,1,NULL,'12',0,818,'bonus bDex,3; bonus2 bSubRace,RC_DemiHuman,3; bonus2 bSubRace,RC_Player,3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18671,'Rudolf_Hairband','Rudolf Hairband',4,20,NULL,200,NULL,5,NULL,0,0xFFFFFFFF,63,2,256,NULL,'30',1,836,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18672,'Tare_Pope','Drooping Pope',4,20,NULL,300,NULL,0,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',0,817,'bonus bMdef,1; bonus bSPrecovRate,2; bonus bUnbreakableHelm,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18673,'Tare_Pope_','Drooping Pope',4,20,NULL,300,NULL,0,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',0,817,'bonus bMdef,7; bonus bSPrecovRate,2; bonus bUnbreakableHelm,1; .@r = getrefine(); if (.@r >= 7 ) { bonus bHealPower,1; } if (.@r >= 9 ) {bonus bMatkRate,7; } if (.@r >= 12 ) {bonus bMatkRate,5; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18673,'Tare_Pope_','Drooping Pope',4,20,NULL,300,NULL,0,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',1,817,'bonus bMdef,7; bonus bSPrecovRate,2; bonus bUnbreakableHelm,1; .@r = getrefine(); if (.@r >= 7 ) { bonus bHealPower,1; } if (.@r >= 9 ) {bonus bMatkRate,7; } if (.@r >= 12 ) {bonus bMatkRate,5; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18674,'Planewing_Hat','Planewing Hat',4,20,NULL,200,NULL,3,NULL,1,0xFFFFFFFE,63,2,256,NULL,'1',1,820,'bonus bAgi,3; bonus bAspdRate,1; bonus2 bSPLossRate,5,10000;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18675,'Green_Apple_Hat','Green Apple Hat',4,20,NULL,200,NULL,3,NULL,1,0xFFFFFFFE,63,2,256,NULL,'20',1,821,'bonus bDex,2; bonus bHit,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18676,'Hexagon_Spectacles','Hexagon Spectacles',4,20,NULL,400,NULL,3,NULL,0,0xFFFFFFFE,63,2,512,NULL,'20',0,822,'bonus bFlee,2;',NULL,NULL);
@@ -9691,13 +9750,13 @@ REPLACE INTO `item_db_re` VALUES (18727,'Sedora_Hat','Sedora Hat',4,20,NULL,300,
REPLACE INTO `item_db_re` VALUES (18728,'Egir_Helm','Egir Helm',4,200000,NULL,800,NULL,10,NULL,1,0xFFFFFFFF,63,2,256,NULL,'110',1,870,'bonus bMdef,5; bonus bUnbreakableHelm,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18729,'MVP_Basketball','MVP Basketball',4,20,NULL,150,NULL,6,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',1,871,'bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10; bonus2 bAddItemHealRate,522,30; .@r = getrefine(); bonus bVariableCastrate,(.@r>=12)?(-5):((.@r>=10)?(-4):(-3));',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18730,'Cryptura_Academy_Hat','Cryptura Academy Hat',4,0,NULL,200,NULL,2,NULL,1,0xFFFFFFFF,63,2,256,NULL,'0',1,872,'bonus bMaxHP,15; bonus bMaxSP,5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18732,'TE_Woe_Cap','TE Woe Cap',4,0,NULL,0,NULL,5,NULL,0,0xFFFFFFFF,63,2,256,0,'40',1,14,'bonus bMdef,5; bonus bBaseAtk,5; bonus bMatk,5; bonus2 bAddRace,RC_Player,10; bonus2 bMagicAddRace,RC_Player,10; bonus2 bResEff,Eff_Freeze,25;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18733,'TE_Woe_Bone_Helm','TE Woe Bone Helm',4,0,NULL,0,NULL,10,NULL,0,0x000444A2,63,2,256,0,'40',1,103,'bonus bBaseAtk,10; bonus2 bAddRace,RC_Player,20; bonus2 bResEff,Eff_Freeze,25;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18734,'TE_Woe_Magic_Eyes','TE Woe Magic Eyes',4,0,NULL,0,NULL,5,NULL,0,0x00818315,63,2,256,0,'40',1,209,'bonus bMdef,5; bonus bMatk,10; bonus2 bMagicAddRace,RC_Player,20; bonus2 bResEff,Eff_Freeze,25;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18736,'Censor_Bar_','Censor Bar',4,0,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,512,0,'1',0,229,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18732,'TE_Woe_Cap','TE Woe Cap',4,0,NULL,0,NULL,5,NULL,0,0xFFFFFFFF,63,2,256,NULL,'40',1,14,'bonus bMdef,5; bonus bBaseAtk,5; bonus bMatk,5; bonus2 bAddRace,RC_Player,10; bonus2 bMagicAddRace,RC_Player,10; bonus2 bResEff,Eff_Freeze,25;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18733,'TE_Woe_Bone_Helm','TE Woe Bone Helm',4,0,NULL,0,NULL,10,NULL,0,0x000444A2,63,2,256,NULL,'40',1,103,'bonus bBaseAtk,10; bonus2 bAddRace,RC_Player,20; bonus2 bResEff,Eff_Freeze,25;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18734,'TE_Woe_Magic_Eyes','TE Woe Magic Eyes',4,0,NULL,0,NULL,5,NULL,0,0x00818315,63,2,256,NULL,'40',1,209,'bonus bMdef,5; bonus bMatk,10; bonus2 bMagicAddRace,RC_Player,20; bonus2 bResEff,Eff_Freeze,25;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18736,'Censor_Bar_','Censor Bar',4,0,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,512,NULL,'1',0,229,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18737,'Fortier_Mask','Fortier Masque',4,20,NULL,200,NULL,0,NULL,0,0xFFFFFFFF,63,2,512,NULL,'10',0,876,'bonus bUnbreakableHelm,1; bonus2 bMagicAtkEle,Ele_Fire,4;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18739,'Carnation_Hairband','Carnation Hairband',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,256,NULL,'0',1,878,'bonus bLuk,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18740,'Hair_Of_The_Strong','RMSC2012 Special Costume',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'0',0,879,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18740,'C_Hair_Of_The_Strong','RMSC2012 Special Costume',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'0',0,879,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18741,'C_Will_O_Wisp','Costume Will O Wisp',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',NULL,880,NULL,'sc_start SC_STRANGELIGHTS,-1,0;','sc_end SC_STRANGELIGHTS;');
REPLACE INTO `item_db_re` VALUES (18742,'C_MoonStar_Accessory','Costume Moon and Stars',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'0',0,881,NULL,'sc_start SC_MOONSTAR,-1,0;','sc_end SC_MOONSTAR;');
REPLACE INTO `item_db_re` VALUES (18743,'C_Spirit_Of_Chung_E','Costume Spirit Of Chung E',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'0',0,882,NULL,NULL,NULL);
@@ -9711,7 +9770,7 @@ REPLACE INTO `item_db_re` VALUES (18750,'Poker_Card_In_Mouth','Poker Card In Mou
REPLACE INTO `item_db_re` VALUES (18752,'Cursed_Book','Cursed Book',4,20,NULL,300,NULL,3,NULL,1,0xFFFFFFFE,63,2,256,NULL,'99',1,890,'.@r = getrefine(); bonus2 bHPLossRate,.@r,5000; bonus2 bHPDrainRate,40,4+(.@r/2); bonus2 bSPDrainRate,10,1+(.@r/3);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18753,'Tw_Rice_Ball','Tw Rice Ball',4,20,NULL,100,NULL,6,NULL,0,0xFFFFFFFF,63,2,256,NULL,'0',0,892,'bonus bLuk,1; bonus2 bAddMonsterDropItem,564,100;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18754,'Blood_Sucker','Blood Sucker',4,20,NULL,300,NULL,0,NULL,0,0xFFFFFFFF,63,2,1,NULL,'40',0,893,'bonus bUnbreakableHelm,1; bonus2 bHPDrainRate,30,5; bonus bHPrecovRate,-100; bonus bSPrecovRate,-100;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18755,'Feather_Beret_','Feather Beret',4,0,NULL,600,NULL,1,NULL,1,0xFFFFFFFF,63,2,256,0,'1',1,224,'bonus bMdef,1; bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18755,'Feather_Beret_','Feather Beret',4,0,NULL,600,NULL,1,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',1,224,'bonus bMdef,1; bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18756,'Black_Shiba_Inu_Hat','Black Shiba Inu Hat',4,20,NULL,400,NULL,6,NULL,1,0xFFFFFFFF,63,2,256,NULL,'50',1,894,'bonus bBaseAtk,30; bonus2 bAddRace,RC_Brute,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18758,'Hat_Of_Scrat','Hat Of Scrat',4,20,NULL,200,NULL,3,NULL,1,0xFFFFFFFF,63,2,256,NULL,'0',1,896,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18759,'Stretched_Nose_M','Wood Goblin\'s Nose',4,20,NULL,200,NULL,0,NULL,0,0xFFFFFFFF,63,2,512,NULL,'50',0,737,'bonus bUnbreakableHelm,1; bonus2 bAddMonsterDropItem,1032,400; bonus2 bAddMonsterDropItem,1033,100; bonus3 bAddMonsterDropItem,576,RC_Plant,40;',NULL,NULL);
@@ -9732,9 +9791,9 @@ REPLACE INTO `item_db_re` VALUES (18773,'Improved_Fin_Helm','Advanced Fin Helm',
REPLACE INTO `item_db_re` VALUES (18774,'Improved_Assassin_Mask','Advanced Assassin Mask',4,20,NULL,100,NULL,1,NULL,0,0x00001100,63,2,1,NULL,'70',0,180,'bonus bCritical,1; bonus bCritAtkRate,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18775,'Improved_Welding_Mask','Advanced Welding Mask',4,20,NULL,300,NULL,2,NULL,0,0x00040420,63,2,513,NULL,'50',0,79,'bonus2 bSubEle,Ele_Fire,10; bonus bDex,5; bonus bLuk,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18776,'Improved_Kiss_Of_Angel','Advanced Angel\'s Kiss',4,10000,NULL,300,NULL,6,NULL,1,0x00000001,63,2,256,NULL,'99',1,255,'bonus bSPrecovRate,30;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18779,'RWC_Champ_Crown_First_Place','RWC Champ Crown First Place',4,20,NULL,500,NULL,12,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',NULL,902,'bonus2 bResEff,Eff_Stun,10000; bonus2 bResEff,Eff_Curse,10000; bonus bUnbreakableHelm,1; bonus bAllStats,7; bonus bMdef,5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18780,'RWC_Champ_Crown_Second_Place','RWC Champ Crown Second Place',4,20,NULL,500,NULL,12,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',NULL,903,'bonus2 bResEff,Eff_Curse,10000; bonus bUnbreakableHelm,1; bonus bAllStats,7; bonus bMdef,5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18781,'RWC_Champ_Crown_Third_Place','RWC Champ Crown Third Place',4,20,NULL,500,NULL,12,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',NULL,904,'bonus2 bResEff,Eff_Curse,10000; bonus bUnbreakableHelm,1; bonus bAllStats,3; bonus bMdef,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18779,'RWC_Champ_Crown_Red','RWC Champ Crown First Place',4,20,NULL,500,NULL,12,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',NULL,902,'bonus2 bResEff,Eff_Stun,10000; bonus2 bResEff,Eff_Curse,10000; bonus bUnbreakableHelm,1; bonus bAllStats,7; bonus bMdef,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18780,'RWC_Champ_Crown_Blue','RWC Champ Crown Second Place',4,20,NULL,500,NULL,12,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',NULL,903,'bonus2 bResEff,Eff_Curse,10000; bonus bUnbreakableHelm,1; bonus bAllStats,7; bonus bMdef,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18781,'RWC_Champ_Crown_Black','RWC Champ Crown Third Place',4,20,NULL,500,NULL,12,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',NULL,904,'bonus2 bResEff,Eff_Curse,10000; bonus bUnbreakableHelm,1; bonus bAllStats,3; bonus bMdef,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18782,'Butterfly_Wing_Ear_J','Butterfly Wing Ear',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,512,NULL,'0',0,695,'bonus bDex,2; bonus bUnbreakableHelm,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18785,'King_Poring_Hat','King Poring Hat',4,20,NULL,600,NULL,10,NULL,1,0xFFFFFFFF,63,2,256,NULL,'10',1,905,'bonus bDex,1; bonus bLuk,1; .@r = getrefine(); if(.@r>=3){ bonus bDex,(.@r-4); bonus bLuk,(.@r-4); }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18786,'Anemos_Mask','Anemos Mask',4,20,NULL,200,NULL,0,NULL,0,0xFFFFFFFF,63,2,512,NULL,'10',0,906,'bonus bUnbreakableHelm,1; bonus2 bMagicAtkEle,Ele_Wind,4;',NULL,NULL);
@@ -9742,7 +9801,7 @@ REPLACE INTO `item_db_re` VALUES (18790,'Rainbow_Poring_Hat','Rainbow Poring Hat
REPLACE INTO `item_db_re` VALUES (18791,'Shrine_Maiden_Hat','Shrine Maiden Hat',4,20,NULL,200,NULL,30,NULL,1,0xFFFFFFFF,63,2,256,NULL,NULL,NULL,908,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18792,'Idn_Sakkat','Indonesian Independence Sakkat',4,10,NULL,400,NULL,NULL,NULL,0,0xFFFFFFFE,63,2,256,NULL,'45',1,901,'bonus bVit,10; bonus2 bAddClass,Class_All,5; bonus bMatkRate,5; bonus2 bSubRace,RC_DemiHuman,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18793,'Sorc_Night_Cap','Sorcerer\'s Night Cap',4,20,NULL,200,NULL,25,NULL,1,0x00010000,56,2,256,NULL,'100',1,911,'.@r = getrefine(); bonus2 bSkillAtk,"MG_LIGHTNINGBOLT",50; bonus2 bSkillAtk,"MG_FIREBOLT",50; bonus2 bSkillAtk,"MG_COLDBOLT",50; bonus bMdef,10; if(.@r>6) bonus2 bSkillAtk,"SC_SPELLFIST",25; if(.@r>8) bonus bAspd,5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18796,'RWC_Champ_Crown_Fourth_Place','RWC Champ Crown Fourth Place',4,20,NULL,500,NULL,12,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',NULL,914,'bonus2 bResEff,Eff_Curse,10000; bonus bUnbreakableHelm,1; bonus bAllStats,2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18796,'RWC_Champ_Crown_QF','RWC Champ Crown Fourth Place',4,20,NULL,500,NULL,12,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',NULL,914,'bonus2 bResEff,Eff_Curse,10000; bonus bUnbreakableHelm,1; bonus bAllStats,2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18803,'Rose_Cascade','Rose Cascade',4,0,NULL,500,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,256,NULL,NULL,1,920,'.@dex = readparam(bDex); bonus bUseSPrate,-5-((.@dex >= 120)?5:0)-((.@dex >= 100)?5:0);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18805,'Eclipse_Hat','Eclipse Hat',4,20,NULL,300,NULL,2,NULL,0,0xFFFFFFFF,63,2,256,NULL,'0',1,922,'bonus bLuk,3; bonus bMdef,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18806,'Black_Rabbit_Hat','Black Rabbit Hat',4,20,NULL,300,NULL,2,NULL,1,0xFFFFFFFF,63,2,256,NULL,'0',1,923,'bonus bDex,2; bonus bAgi,3; bonus3 bAutoSpellWhenHit,"AL_INCAGI",5,10;',NULL,NULL);
@@ -9756,7 +9815,7 @@ REPLACE INTO `item_db_re` VALUES (18816,'Adv_Angel_School_Cap','Evoked Angel Sch
REPLACE INTO `item_db_re` VALUES (18817,'Adv_Devil_School_Cap','Evoked Devil School Cap',4,20,NULL,100,NULL,4,NULL,1,0xFFFFFFFE,63,2,256,NULL,'0',1,930,'bonus bStr,2; bonus bVit,2; bonus bLuk,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18818,'Red_Pencil_In_Mouth','Red Pencil In Mouth',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,1,NULL,'0',0,931,'bonus bUnbreakableHelm,1; bonus bHit,3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18819,'Blue_Pencil_In_Mouth','Blue Pencil In Mouth',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,1,NULL,'0',0,932,'bonus bUnbreakableHelm,1; bonus bHit,3;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18820,'Helmet_of_Gray','Helmet of Gray',4,10,NULL,450,NULL,35,NULL,1,0xFFFFFFFF,63,2,256,NULL,'120',1,941,'bonus2 bSubEle,Ele_Holy,3+getrefine()*2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18820,'Gray_Helmet','Gray Helmet',4,20,NULL,450,NULL,35,NULL,1,0xFFFFFFFF,56,2,256,NULL,'120',1,941,'bonus2 bSubEle,Ele_Holy,3+getrefine()/2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18821,'Rainbow_Feather_Deco','Rainbow Feather Deco',4,20,NULL,300,NULL,5,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',1,934,'bonus2 bAddClass,Class_All,1; bonus bMatkRate,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18823,'Imperial_Feather','Imperial Feather',4,10,NULL,500,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,512,NULL,'70',1,935,'bonus bAspdRate,1; bonus2 bSubEle,Ele_Wind,5; if(readparam(bAgi)>108){ bonus bAspd,1; bonus bAspdRate,1; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18827,'Valkyrie_Circlet','Valkyrie Circlet',4,0,NULL,300,NULL,10,NULL,1,0xFFFFFFFF,63,2,256,NULL,NULL,1,940,'bonus bStr,3; bonus2 bAddEle,Ele_Dark,10; bonus2 bAddRace,RC_Demon,10;',NULL,NULL);
@@ -9777,27 +9836,27 @@ REPLACE INTO `item_db_re` VALUES (18848,'Lush_Rose','Lush Rose',4,10,NULL,200,'0
REPLACE INTO `item_db_re` VALUES (18849,'Celines_Ribbon','Celines Ribbon',4,10,NULL,200,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',1,967,'bonus bDex,3; bonus bMatk,40+getrefine(); bonus bMagicHPGainValue,200; bonus2 bHPLossRate,50,5000;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18850,'Polar_Bear_Cap','Polar Bear Cap',4,20,NULL,300,NULL,7,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',0,966,'bonus bUnbreakableHelm,1; bonus bDex,1; bonus bAgi,1; bonus bMdef,3; bonus bHPrecovRate,5; bonus bSPrecovRate,3; bonus2 bAddMonsterDropItem,12354,100;',NULL,NULL);
#REPLACE INTO `item_db_re` VALUES (18851,'C_Polar_Bear_Cap','Costume Polar Bear Cap',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,966,'/*Is this correct item?*/',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18851,'Valentine_Heart','Valentine Heart',4,20,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',1,397,'bonus bMaxHPrate,5+(getrefine()/2); bonus bAllStats,7;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18852,'Tasty_Strawberry_Hat','Tasty Strawberry Hat',4,20,NULL,150,NULL,4,NULL,NULL,0xFFFFFFFF,63,2,256,NULL,'30',1,968,'bonus bAllStats,1; if(getrefine()>11) bonus bAspd,2;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18853,'Tasty_Strawberry_Hat_','Tasty Strawberry Hat',4,20,NULL,150,NULL,4,NULL,NULL,0xFFFFFFFF,63,2,256,NULL,'30',1,968,'bonus bAllStats,1; if(getrefine()>11) bonus bAspd,2;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18854,'Yellow_Valentine_Heart','Yellow Valentine Heart',4,20,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',1,865,'bonus bMaxSPrate,2+(getrefine()/2); bonus bAllStats,7;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18851,'ValentineHeart','Valentine Heart',4,20,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',1,397,'bonus bMaxHPrate,5+(getrefine()/2); bonus bAllStats,7;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18852,'Berry_Hat_Decoration','Tasty Strawberry Hat',4,20,NULL,150,NULL,4,NULL,NULL,0xFFFFFFFF,63,2,256,NULL,'30',1,968,'bonus bAllStats,1; if(getrefine()>11) bonus bAspd,2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18853,'Berry_Hat_Decoration_','Tasty Strawberry Hat',4,20,NULL,150,NULL,4,NULL,NULL,0xFFFFFFFF,63,2,256,NULL,'30',1,968,'bonus bAllStats,1; if(getrefine()>11) bonus bAspd,2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18854,'ValentineYellowHeart','Yellow Valentine Heart',4,20,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',1,865,'bonus bMaxSPrate,2+(getrefine()/2); bonus bAllStats,7;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18855,'Aviator_Hat','Aviator Hat',4,10,NULL,100,NULL,10,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',1,972,'bonus bAgi,3; bonus bInt,3; autobonus "{ bonus bAtkEle,Ele_Wind; }",500,180,BF_NORMAL;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18856,'W_King_Tiger_Doll_Hat','W King Tiger Doll Hat',4,10,NULL,0,NULL,10,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',1,973,'bonus bStr,2; bonus bDex,2; bonus2 bAddRace,RC_Brute,10; .@r = getrefine(); autobonus "{ bonus2 bSPLossRate,5,1000; bonus bBaseAtk,25*getrefine(); }",3*.@r,3000,BF_NORMAL,"{ active_transform 1115,3000; specialeffect2 EF_POTION_BERSERK; showscript \\\"Traaaansformation-!! Eddga form!!\\\"; }"; autobonus2 "{ bonus2 bSPLossRate,5,1000; bonus bBaseAtk,25*getrefine(); }",.@r,3000,BF_NORMAL,"{ active_transform 1115,3000; specialeffect2 EF_POTION_BERSERK; showscript \\\"Traaaansformation-!! Eddga form!!\\\"; }";',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18857,'Curupira_Hat','Curupira Hat',4,10,NULL,100,NULL,20,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',1,974,'bonus bDex,3; bonus2 bAddEffWhenHit,Eff_Confusion,500;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18858,'Pink_Angeling_Bubble','Pink Angeling Bubble',4,10,NULL,50,NULL,5,NULL,0,0xFFFFFFFF,63,2,1,NULL,'1',NULL,975,'bonus bMaxHP,200; bonus bAspdRate,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18859,'Angeling_Bubble','Angeling Bubble',4,10,NULL,50,NULL,5,NULL,0,0xFFFFFFFF,63,2,1,NULL,'1',NULL,976,'bonus bDex,1; bonus bMatkRate,2; bonus bMaxHP,100;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18860,'Red_Flower_Hat','Red Flower Hat',4,10,NULL,200,NULL,10,NULL,1,0xFFFFFFFF,63,2,256,NULL,'50',1,1033,'bonus bDex,5; bonus2 bSubDefEle,Ele_Earth,3; bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10; if (getrefine() >= 12) { bonus bShortWeaponDamageReturn,5; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18861,'Zaha_Doll_J_Hat','Zaha Doll J Hat',4,10,NULL,100,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,256,NULL,'50',1,461,'bonus bHealPower,15; bonus bUseSPrate,15;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18861,'Zaha_Doll_Hat_J','Zaha Doll J Hat',4,10,NULL,100,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,256,NULL,'50',1,461,'bonus bHealPower,15; bonus bUseSPrate,15;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18863,'Exorcist_Robe','Exorcist Robe',4,10,NULL,1700,NULL,57,NULL,1,0xFFFFFFFF,63,2,16,NULL,'60',1,NULL,'bonus bMdef,5; .@r = getrefine(); if (.@r >= 3) { bonus2 bAddRace,RC_Undead,.@r/3*5; } if (BaseClass==Job_Acolyte) bonus2 bAddRace,RC_Undead,10;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18864,'Earth_Goddess_Flower','Earth Goddess Flower',4,10,NULL,250,NULL,6,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',1,864,'bonus2 bAddEle,Ele_Earth,15; skill "WZ_EARTHSPIKE",5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18864,'Earth_Goddess_Flower_J','Earth Goddess Flower',4,10,NULL,250,NULL,6,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',1,864,'bonus2 bAddEle,Ele_Earth,15; skill "WZ_EARTHSPIKE",5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18865,'Sword_Master_Crown','Sword Master Crown',4,10,NULL,1000,NULL,30,NULL,1,0xFFFFFFFF,63,2,256,NULL,'50',1,981,'.@i = BaseLevel; bonus bBaseAtk,(.@i>150)?(15):((.@i>100)?(10):((.@i>50)?(5):(0))); if(getskilllv("SM_SWORD")==10) bonus bHit,10; if(getskilllv("SM_TWOHAND")==10) bonus bUseSPrate,-5; if(getskilllv("AM_AXEMASTERY")==10) bonus bVariableCastrate,-5; if(getskilllv("AS_KATAR")==10) bonus bCritAtkRate,20; if(getskilllv("PR_MACEMASTERY")==10) bonus bAspdRate,10;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18867,'Vajra','Vajra',4,0,NULL,300,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1,0,'48',0,983,'bonus bDex,1; bonus bLongAtkRate,2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18867,'Vajra','Vajra',4,0,NULL,300,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1,NULL,'48',0,983,'bonus bDex,1; bonus bLongAtkRate,2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18868,'Assassin_Skull_Mask','Assassin Skull Mask',4,10,NULL,500,NULL,2,NULL,0,0xFFFFFFFF,63,2,513,NULL,'70',NULL,984,'bonus bCritical,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18870,'Very_Sweet_Candy_Bar','Very Sweet Candy Bar',4,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1,NULL,'1',1,446,'bonus bAllStats,2; bonus bBaseAtk,10; bonus bMatk,10; bonus2 bExpAddClass,Class_All,2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18871,'Very_Sweet_Candy','Very Sweet Candy',4,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1,NULL,'1',1,446,'bonus bAllStats,1; bonus bBaseAtk,5; bonus bMatk,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18872,'Snake_Hat','Snake Hat',4,20,NULL,100,NULL,5,NULL,1,0xFFFFFFFF,63,2,256,NULL,'0',1,986,'bonus bStr,3; bonus bInt,3; bonus bMdef,5; bonus bUnbreakableHelm,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18873,'Sweet_Valentine_Out','Sweet Valentine Out',4,20,NULL,100,NULL,1,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',1,865,'bonus bMaxHPrate,7; bonus bMaxSPrate,7;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18874,'Cyclops_Glasses','Cyclops Glasses',4,10,NULL,100,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,512,NULL,'1',NULL,23,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18874,'One_Eyed_Glass_','Cyclops Glasses',4,10,NULL,100,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,512,NULL,'1',NULL,23,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18877,'Baron_Evil_Eye','Baron\'s Evil Eye',4,10,NULL,300,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,512,NULL,'30',NULL,989,'bonus bDelayrate,-5; bonus bUseSPrate,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18878,'Palace_Guard_Cap','Palace Guard Cap',4,10,NULL,1000,NULL,15,NULL,1,0xFFFFFFFF,63,2,256,NULL,'50',1,991,'.@r = getrefine(); bonus2 bAddEle,Ele_Neutral,4+.@r/6; bonus bLongAtkRate,4+.@r; bonus bUnbreakableHelm,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18879,'Angry_Scorpion_Hat','Angry Scorpion Hat',4,10,NULL,100,NULL,5,NULL,0,0xFFFFFFFF,63,2,256,NULL,'0',1,995,'bonus bMdef,5;',NULL,NULL);
@@ -9842,25 +9901,26 @@ REPLACE INTO `item_db_re` VALUES (18960,'Love_Daddy_2013','Love Daddy 2013',4,10
REPLACE INTO `item_db_re` VALUES (18970,'Magical_Moon_Cat','Magical Moon Cat',4,20,NULL,50,NULL,5,NULL,1,0xFFFFFFFF,63,2,256,NULL,NULL,1,1308,'/*TODO: Enables use of Level 1 Monster\'s Cry*/ bonus bAllStats,3; bonus bDelayrate,-5; bonus bVariableCastrate,-5-(getrefine()/2);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18971,'Old_Rune_Circlet','Old Rune Circlet',4,10,NULL,100,NULL,10,NULL,1,0x00000080,56,2,256,NULL,'170',1,623,'bonus bAllStats,1; bonus bMdef,5; .@r = getrefine(); bonus bBaseAtk,4*.@r; bonus bAspd,.@r/5; bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus2 bSkillAtk,"RK_IGNITIONBREAK",20*.@r/2; bonus2 bSkillAtk,"RK_HUNDREDSPEAR",15*.@r/2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18972,'Old_Mitra','Old Mitra',4,10,NULL,100,NULL,10,NULL,1,0x00000100,56,2,256,NULL,'170',1,624,'bonus bAllStats,1; bonus bMdef,5; .@r = getrefine(); bonus bMatk,2*.@r; bonus bBaseAtk,4*.@r; bonus bHealPower,.@r; bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus2 bSkillAtk,"AB_JUDEX",20*.@r/2; bonus2 bSkillAtk,"PR_MAGNUS",10*.@r/2;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18973,'Old_Driver_Band','Old Driver Band',4,10,NULL,100,NULL,10,NULL,1,0x00000400,56,2,256,NULL,'170',1,626,'bonus bAllStats,1; .@r = getrefine(); bonus bBaseAtk,4*.@r; bonus bAspd,.@r/5; bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus2 bSkillAtk,"NC_POWERSWING",20*.@r/2; bonus2 bSkillAtk,"NC_AXETORNADO",20*.@r/2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18973,'Old_Driver_Band_R','Old Driver Band',4,10,NULL,100,NULL,10,NULL,1,0x00000400,56,2,256,NULL,'170',1,626,'bonus bAllStats,1; .@r = getrefine(); bonus bBaseAtk,4*.@r; bonus bAspd,.@r/5; bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus2 bSkillAtk,"NC_POWERSWING",20*.@r/2; bonus2 bSkillAtk,"NC_AXETORNADO",20*.@r/2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18974,'Old_Driver_Band_Y','Old Driver Band(Yellow)',4,10,NULL,100,NULL,10,NULL,1,0x00000400,56,2,256,NULL,'170',1,637,'bonus bAllStats,1; .@r = getrefine(); bonus bBaseAtk,4*.@r; bonus bAspd,.@r/5; bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus2 bSkillAtk,"NC_ARMSCANNON",20*.@r/2; bonus2 bSkillAtk,"NC_SELFDESTRUCTION",20*.@r/4;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18975,'Old_Shadow_Handicraft','Old Shadow Handicraft',4,10,NULL,100,NULL,10,NULL,1,0x00020000,56,2,256,NULL,'170',1,627,'bonus bAllStats,1; .@r = getrefine(); bonus bBaseAtk,4*.@r; bonus bMatk,4*.@r; bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus2 bSkillAtk,"SC_TRIANGLESHOT",25*.@r/2; if (.@r>=6) { bonus2 bSkillCooldown,"SC_ENERVATION",-1000; bonus2 bSkillCooldown,"SC_UNLUCKY",-1000; } if (.@r>=8) { bonus2 bSkillCooldown,"SC_LAZINESS",-1000; bonus2 bSkillCooldown,"SC_WEAKNESS",-1000; } if (.@r>=10) { bonus2 bSkillCooldown,"SC_IGNORANCE",-1000; bonus2 bSkillCooldown,"SC_GROOMY",-1000; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18976,'Old_Minstrel_Song\'s_Hat','Old Minstrel Song\'s Hat',4,10,NULL,100,NULL,10,NULL,1,0x00080000,56,1,256,NULL,'170',1,628,'bonus bAllStats,1; .@r = getrefine(); bonus bLongAtkRate,.@r; bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus2 bSkillAtk,"CG_ARROWVULCAN",20*.@r/2; bonus2 bSkillAtk,"WM_SEVERE_RAINSTORM",5*.@r/2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18976,'Old_Minstrel_Song_Hat','Old Minstrel Song\'s Hat',4,10,NULL,100,NULL,10,NULL,1,0x00080000,56,1,256,NULL,'170',1,628,'bonus bAllStats,1; .@r = getrefine(); bonus bLongAtkRate,.@r; bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus2 bSkillAtk,"CG_ARROWVULCAN",20*.@r/2; bonus2 bSkillAtk,"WM_SEVERE_RAINSTORM",5*.@r/2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18977,'Old_Midas_Whisper','Old Midas Whisper',4,10,NULL,100,NULL,10,NULL,1,0x00040000,56,2,256,NULL,'170',1,629,'bonus bAllStats,1; .@r = getrefine(); bonus bBaseAtk,4*.@r; bonus bLongAtkRate,.@r; bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus2 bSkillAtk,"GN_CARTCANNON",15*.@r/2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18978,'Old_Magic_Stone_Hat','Old Magic Stone Hat',4,10,NULL,100,NULL,10,NULL,1,0x00000200,56,2,256,NULL,'170',1,630,'bonus bAllStats,1; .@r = getrefine(); bonus bMdef,5; bonus bMatkRate,.@r; bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus2 bSkillAtk,"WL_SOULEXPANSION",5*.@r/2; bonus2 bSkillCooldown,"WL_CRIMSONROCK",-1000-(.@r*100);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18979,'Old_Blazing_Soul','Old Blazing Soul',4,10,NULL,100,NULL,10,NULL,1,0x00008000,56,2,256,NULL,'170',1,631,'bonus bAllStats,1; .@r = getrefine(); bonus bBaseAtk,4*.@r; bonus bCritical,2*.@r; bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus2 bSkillAtk,"SR_RAMPAGEBLASTER",15*.@r/2; bonus2 bSkillAtk,"SR_RIDEINLIGHTNING",20*.@r/2;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18980,'Old_Wind_Whisper','Old Wind Whisper',4,10,NULL,100,NULL,10,NULL,1,0x10000,56,2,256,NULL,'170',1,633,'bonus bAllStats,1; .@r = getrefine(); bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus bMdef,5; bonus2 bSkillAtk,"SO_POISON_BUSTER",15*.@r/2; bonus2 bSkillAtk,"SO_VARETYR_SPEAR",20*.@r/2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18980,'Old_Wind_Whisper','Old Wind Whisper',4,10,NULL,100,NULL,10,NULL,1,0x10000,56,2,256,NULL,'170',1,633,'bonus bAllStats,1; .@r = getrefine(); bonus bAtk2,4*.@r; bonus bMatkRate,.@r; bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus bMdef,5; bonus2 bSkillAtk,"SO_POISON_BUSTER",15*(.@r/2); bonus2 bSkillAtk,"SO_VARETYR_SPEAR",20*(.@r/2);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18981,'Old_Dying_Swan','Old Dying Swan',4,10,NULL,100,NULL,10,NULL,1,0x00080000,56,0,256,NULL,'170',1,635,'bonus bAllStats,1; .@r = getrefine(); bonus bLongAtkRate,.@r; bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus2 bSkillAtk,"CG_ARROWVULCAN",20*.@r/2; bonus2 bSkillAtk,"WM_SEVERE_RAINSTORM",5*.@r/2;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18982,'Old_Circlet_Of_Bones','Old Circlet Of Bones',4,10,NULL,100,NULL,10,NULL,1,0x00001000,56,2,256,NULL,'170',1,1141,'bonus bAllStats,1; .@r = getrefine(); bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus bCriticalRate,.@r; bonus bAspdRate,1; bonus2 bSkillAtk,"GC_CROSSIMPACT",10*.@r/2; bonus2 bSkillAtk,"GC_CROSSRIPPERSLASHER",20*.@r/2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18982,'Old_Circlet_Of_Bone','Old Circlet Of Bones',4,10,NULL,100,NULL,10,NULL,1,0x00001000,56,2,256,NULL,'170',1,1141,'bonus bAllStats,1; .@r = getrefine(); bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus bCriticalRate,.@r; bonus bAspdRate,1; bonus2 bSkillAtk,"GC_CROSSIMPACT",10*.@r/2; bonus2 bSkillAtk,"GC_CROSSRIPPERSLASHER",20*.@r/2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18983,'Old_Protect_Of_Crown','Old Protect Of Crown',4,10,NULL,100,NULL,10,NULL,1,0x00004000,56,2,256,NULL,'170',1,1140,'bonus bAllStats,1; .@r = getrefine(); bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus bMdef,5; bonus bBaseAtk,4*.@r; bonus bAspd,.@r/5; bonus2 bSkillAtk,"LG_CANNONSPEAR",20*.@r/2; bonus2 bSkillAtk,"LG_OVERBRAND",5*.@r/2;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18984,'Old_Camouflage_Rabbit_Hood','Old Camouflage Rabbit Hood',4,10,NULL,100,NULL,10,NULL,1,0x0000800,56,2,256,NULL,'170',1,1142,'bonus bAllStats,1; .@r = getrefine(); bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus bLongAtkRate,.@r; bonus bFlee2,.@r/3; bonus2 bSkillAtk,"RA_CLUSTERBOMB",15*.@r/2; bonus2 bSkillAtk,"RA_WUGSTRIKE",10*.@r/2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18984,'Old_Camo_RabbitHood','Old Camouflage Rabbit Hood',4,10,NULL,100,NULL,10,NULL,1,0x0000800,56,2,256,NULL,'170',1,1142,'bonus bAllStats,1; .@r = getrefine(); bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus bLongAtkRate,.@r; bonus bFlee2,.@r/3; bonus2 bSkillAtk,"RA_CLUSTERBOMB",15*.@r/2; bonus2 bSkillAtk,"RA_WUGSTRIKE",10*.@r/2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18985,'Falconer_Flute','Falconer Flute',4,0,NULL,100,NULL,NULL,NULL,0,0x0000800,63,2,1,NULL,'75',0,1143,'set .@bblvl,max(getskilllv("HT_BLITZBEAT"),1); set .@luk,min(readparam(bLuk),120); bonus3 bAutoSpell,"HT_BLITZBEAT",.@i,((.@bblvl / 3) * 10) + (.@luk * 10) + (((.@bblvl / 5) * .@bblvl) * 2);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18987,'RWC13_Jormungandr_Hat','RWC13 Jormungandr Hat',4,20,NULL,2500,NULL,7,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',0,1149,'bonus bAllStats,2; bonus bVariableCastrate,-5; bonus bDelayrate,-5; bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10; .@r = getrefine(); if(.@r>6){ bonus2 bAddItemHealRate,11596,20; bonus bAspd,1; } if(.@r>9){ bonus bVariableCastrate,-5; bonus bDelayrate,-5; } bonus2 bAddItemHealRate,11596,150;','sc_end SC_SpeedUp0;',NULL);
-REPLACE INTO `item_db_re` VALUES (18997,'Reckless_Chip','Reckless Chip',4,10,NULL,300,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,256,NULL,'100',1,1201,'bonus bHit,50; bonus bFlee,50; bonus bMaxSPrate,-50;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18997,'Riot_Chip','Runaway Chip',4,10,NULL,300,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,256,NULL,'100',1,1201,'bonus bHit,50; bonus bFlee,50; bonus bMaxSPrate,-50;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19019,'Elemental_Crown','Elemental Crown',4,0,NULL,500,NULL,10,NULL,1,0xFFFFFFFF,63,2,256,NULL,NULL,1,1219,'.@r = getrefine(); bonus bDex,(3 + (.@r/2)+ (readparam(bDex) > 130 ? .@r : 0)); bonus bLongAtkRate,4;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19020,'Survive_Circlet','Survive Circlet',4,0,NULL,500,NULL,10,NULL,0,0xFFFFFFFF,63,2,256,NULL,NULL,1,1220,'.@r = getrefine(); bonus bInt,(3 + (.@r/2)+ (BaseLevel > 130 ? .@r : 0)); bonus bMatkRate,4;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19021,'Gigant_Helm','Gigant Helm',4,0,NULL,500,NULL,10,NULL,0,0xFFFFFFFF,63,2,256,NULL,NULL,1,1221,'bonus bStr,3+((BaseLevel > 130) ? getrefine() : 0); bonus2 bAddClass,Class_All,4;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19022,'Floating_Stone_Of_Intelligence','Floating Stone Of Intelligence',4,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,256,NULL,NULL,NULL,1230,NULL,'sc_start SC_FSTONE,-1,0;','sc_end SC_FSTONE;');
-REPLACE INTO `item_db_re` VALUES (19024,'Protect_Feathers','Protect Feathers',4,0,NULL,500,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,512,0,'70',0,1232,'bonus2 bSubRace,RC_DemiHuman,2; bonus2 bSubRace,RC_Player,2; bonus bAspdRate,-5; .@vit = readparam(bVit); if (.@vit >= 108) { bonus2 bSubRace,RC_DemiHuman,3; bonus2 bSubRace,RC_Player,3; bonus bAspdRate,-5; } if (.@vit >= 120) { bonus bMaxHPRate,3; bonus bMdef,3; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19022,'Floating_Stone_Of_Int','Floating Stone Of Intelligence',4,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,256,NULL,NULL,NULL,1230,NULL,'sc_start SC_FSTONE,-1,0;','sc_end SC_FSTONE;');
+REPLACE INTO `item_db_re` VALUES (19024,'Protect_Feathers','Protect Feathers',4,0,NULL,500,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,512,NULL,'70',0,1232,'bonus2 bSubRace,RC_DemiHuman,2; bonus2 bSubRace,RC_Player,2; bonus bAspdRate,-5; .@vit = readparam(bVit); if (.@vit >= 108) { bonus2 bSubRace,RC_DemiHuman,3; bonus2 bSubRace,RC_Player,3; bonus bAspdRate,-5; } if (.@vit >= 120) { bonus bMaxHPRate,3; bonus bMdef,3; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19026,'Aegir_Helm','Aegir Helm',4,10,NULL,800,NULL,10,NULL,1,0xFFFFFFFF,63,2,256,NULL,'40',1,870,'bonus bVit,3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19030,'Pretty_Rabbit_Hood','Pretty Rabbit Hood',4,10,NULL,100,NULL,20,NULL,1,0xFFFFFFFF,63,2,769,NULL,'1',1,1085,'bonus bMaxHP,(15*BaseLevel);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19031,'Fallen_Angel_Blessing','Fallen Angel Blessing',4,0,NULL,200,NULL,1,NULL,0,0xFFFFFFFF,63,2,512,NULL,NULL,1,1250,'bonus2 bAddRace,RC_Angel,5; bonus2 bSubRace,RC_Angel,5;',NULL,NULL);
@@ -9869,10 +9929,11 @@ REPLACE INTO `item_db_re` VALUES (19038,'12_Anniversary_Crown_Of_Saint','12 Anni
REPLACE INTO `item_db_re` VALUES (19039,'12_Anniversary_Elf_Ears','12 Anniversary Elf Ears',4,10,NULL,120,NULL,0,NULL,0,0xFFFFFFFF,63,2,512,NULL,'0',1,875,'bonus2 bSubRace,RC_All,4; bonus2 bSubRace,RC_Player,-4;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19047,'Angeling_KnitCap','Angeling KnitCap',4,0,NULL,300,NULL,5,NULL,1,0xFFFFFFFF,63,2,256,NULL,'20',1,953,'bonus2 bSPGainRace,RC_Angel,5; bonus bHPGainValue,100; .@r = getrefine(); if (.@r >= 5) { bonus2 bSubRace,RC_Angel,5+((.@r >= 7) ? 5 : 0); }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19048,'Elemental_Clothe','Elemental Clothes',4,0,NULL,500,NULL,45,NULL,1,0xFFFFFFFF,63,2,16,NULL,'80',1,NULL,'.@r = getrefine(); bonus bLongAtkRate,2+((.@r >= 9) ? 3 : 0)+((.@r >= 7) ? 2 : 0); if (.@r >= 7) bonus bUnbreakableArmor,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19050,'Loki_Nidhogg_Hat','Loki & Nidhoggur\'s Hat',4,0,NULL,100,NULL,0,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',1,1304,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19051,'Warrior_Moon_Cat','Warrior Moon Cat',4,20,NULL,100,NULL,5,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',1,1308,'/*Enables use of Level 1 Monster\'s Cry*/ bonus bAllStats,3; bonus2 bHPDrainRate,40,5; bonus2 bSPDrainRate,10,2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19052,'Sigruns_Wing','Rental Sigrun\'s Wing',4,10,NULL,0,NULL,2,NULL,0,0xFFFFFFFF,63,2,512,NULL,'1',0,568,'if (Class == Job_Swordman || Class == Job_Thief || Class == Job_Merchant || Class == Job_Taekwon || Class == Job_Star_Gladiator || Class == Job_Star_Gladiator2) bonus bAspd,1; else if (Class == Job_Mage || Class == Job_Acolyte || Class == Job_Ninja || Class == Job_Soul_Linker) { bonus bMatk,5; bonus bHealPower,2; } else if (Class == Job_Archer || Class == Job_Gunslinger) bonus bLongAtkRate,2; else if (Class == Job_Novice || Class == Job_SuperNovice) { bonus bMaxHP,120; bonus bMaxSP,60; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19053,'Fighter_Moon_Cat','Fighter Moon Cat',4,20,NULL,100,NULL,5,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',1,1308,'/*Enables use of Level 1 Monster\'s Cry*/ .@r = getrefine(); bonus bAllStats,3; bonus2 bAddEff,Eff_Stun,500+(.@r*100);',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19082,'Bio_Protector','Bio Protector',4,0,NULL,500,NULL,3,NULL,0,0xFFFFFFFF,63,2,512,1,'50',1,1366,'bonus bHit,10; bonus bVariableCastrate,-5; bonus bPerfectHitRate,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19082,'Bio_Protector','Bio Protector',4,0,NULL,500,NULL,3,NULL,0,0xFFFFFFFF,63,2,512,NULL,'50',1,1366,'bonus bHit,10; bonus bVariableCastrate,-5; bonus bPerfectHitRate,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19083,'Mask_of_Hero','Mask of Hero',4,20,NULL,200,NULL,0,NULL,0,0xFFFFFFFF,63,2,512,NULL,'70',0,1367,'bonus bVit,10; bonus bMdef,10; bonus bShortWeaponDamageReturn,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19084,'Parfaille_Vigilante_Hat','Parfaille Vigilante Hat',4,0,NULL,100,NULL,2,NULL,0,0x80000000,63,2,256,NULL,'20',1,1368,'bonus bLuk,1; bonus3 bAutoSpell,"AL_BLESSING",3,100;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19085,'Sigrun\'s_Wings_','Sigrun\'s Wings',4,20,NULL,100,NULL,2,NULL,1,0xFFFFFFFF,63,2,512,NULL,'1',0,568,'if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief||(BaseJob==Job_Taekwon&&Class!=Job_Soul_Linker)) { bonus bAspd,1; bonus bAgi,-2; } else if(BaseClass==Job_Mage||BaseClass==Job_Acolyte||Class==Job_Ninja||Class==Job_Soul_Linker){ bonus bMatk,3; bonus bHealPower,2; } else if(BaseClass==Job_Archer||BaseClass==Job_Gunslinger) bonus bLongAtkRate,1; else if(BaseJob==Job_Novice||BaseJob==Job_SuperNovice) { bonus bMaxHP,60; bonus bMaxSP,30; }',NULL,NULL);
@@ -9886,11 +9947,11 @@ REPLACE INTO `item_db_re` VALUES (19092,'Machoman_Glasses_','Machoman\'s Glasses
REPLACE INTO `item_db_re` VALUES (19093,'Spinning_Eyes_','Geek Glasses',4,20000,NULL,100,NULL,1,NULL,1,0xFFFFFFFF,63,2,512,NULL,'0',0,27,'bonus2 bResEff,Eff_Blind,800;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19094,'Mr_Smile_','Mr. Smile',4,60,NULL,100,NULL,1,NULL,1,0xFFFFFFFF,63,2,513,NULL,'0',0,65,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19095,'Happy_Balloon','Happy Balloon',4,0,NULL,10,NULL,0,NULL,0,0xFFFFFFFF,63,2,1,NULL,'1',0,1289,'bonus2 bDropAddRace,RC_All,5; bonus2 bExpAddRace,RC_All,5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19109,'Valhalla_Idol','Valhalla Idol',4,0,NULL,300,NULL,2,NULL,0,0xFFFFFFFF,63,2,512,0,'70',0,1423,'bonus bMaxSP,50; bonus3 bAutoSpell,"MG_SAFETYWALL",10,50;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19111,'Laser_Of_Eagle','Laser of Eagle',4,0,NULL,400,NULL,5,NULL,1,0xFFFFFFFF,63,2,256,0,'100',1,1424,'bonus bDex,2; bonus bLongAtkRate,10; bonus4 bAutoSpell,"PR_LEXAETERNA",1,50,BF_LONG; /*TODO: Chance to transform become Shechil while attacking.*/',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19116,'Red_Baby_Dragon','Red Baby Dragon',4,0,NULL,700,NULL,NULL,1,1,0xFFFFFFFF,63,2,256,0,'90',1,1463,'.@r=getrefine(); bonus bMaxHPrate,5; bonus bMaxSPrate,5; bonus2 bSkillAtk,"RK_DRAGONBREATH",15; bonus2 bSkillAtk,"RK_DRAGONBREATH_WATER",15; if (.@r>=6) { bonus2 bSkillAtk,"RK_DRAGONBREATH",15; bonus2 bSkillAtk,"RK_DRAGONBREATH_WATER",15; } if (.@r>=8) { bonus2 bSkillAtk,"RK_DRAGONBREATH",15; bonus2 bSkillAtk,"RK_DRAGONBREATH_WATER",15; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19117,'Poring_Sunglasses','Poring Sunglasses',4,0,NULL,10,NULL,0,NULL,0,0xFFFFFFFF,63,2,512,NULL,'1',0,954,'bonus2 bDropAddRace,RC_All,5; bonus2 bExpAddRace,RC_All,5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19118,'Poring_Sunglasses_','Poring Sunglasses',4,0,NULL,10,NULL,0,NULL,1,0xFFFFFFFF,63,2,512,NULL,'1',0,954,'bonus2 bDropAddRace,RC_All,4; bonus2 bExpAddRace,RC_All,4;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19109,'Valhalla_Idol','Valhalla Idol',4,0,NULL,300,NULL,2,NULL,0,0xFFFFFFFF,63,2,512,NULL,'70',0,1423,'bonus bMaxSP,50; bonus4 bAutoSpellWhenHit,"MG_SAFETYWALL",10,50,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19111,'Laser_Of_Eagle','Laser of Eagle',4,0,NULL,400,NULL,5,NULL,1,0xFFFFFFFF,63,2,256,NULL,'100',1,1424,'bonus bDex,2; bonus bLongAtkRate,10; bonus5 bAutoSpell,"PR_LEXAETERNA",1,50,BF_LONG,1; /*TODO: Chance to transform become Shechil while attacking.*/',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19116,'Red_Baby_Dragon','Red Baby Dragon',4,0,NULL,700,NULL,NULL,1,1,0xFFFFFFFF,63,2,256,NULL,'90',1,1463,'.@r=getrefine(); bonus bMaxHPrate,5; bonus bMaxSPrate,5; bonus2 bSkillAtk,"RK_DRAGONBREATH",15; bonus2 bSkillAtk,"RK_DRAGONBREATH_WATER",15; if (.@r>=6) { bonus2 bSkillAtk,"RK_DRAGONBREATH",15; bonus2 bSkillAtk,"RK_DRAGONBREATH_WATER",15; } if (.@r>=8) { bonus2 bSkillAtk,"RK_DRAGONBREATH",15; bonus2 bSkillAtk,"RK_DRAGONBREATH_WATER",15; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19117,'Poring_Sunglasses_','Poring Sunglasses',4,0,NULL,10,NULL,0,NULL,0,0xFFFFFFFF,63,2,512,NULL,'1',0,954,'bonus2 bDropAddRace,RC_All,5; bonus2 bExpAddRace,RC_All,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19118,'Poring_Sunglasses__','Poring Sunglasses',4,0,NULL,10,NULL,0,NULL,1,0xFFFFFFFF,63,2,512,NULL,'1',0,954,'bonus2 bDropAddRace,RC_All,4; bonus2 bExpAddRace,RC_All,4;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19126,'Shadow_Booster_','Magical Booster',4,10,NULL,300,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,512,NULL,'1',1,873,'bonus bAspd,1; bonus bDelayrate,-1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19128,'Ifrit\'s_Ear_','Ears Of Ifrit',4,20,NULL,300,NULL,0,NULL,1,0xFFFFFFFE,63,2,512,NULL,'50',0,422,'bonus bStr,1; bonus bMdef,3; bonus bInt,1; bonus2 bSkillAtk,"MG_FIREBOLT",3; bonus2 bSkillAtk,"WZ_FIREPILLAR",3; bonus2 bSkillAtk,"WZ_METEOR",3; bonus2 bSkillAtk,"SM_BASH",4; bonus2 bSkillAtk,"SM_MAGNUM",4; bonus2 bSkillAtk,"KN_PIERCE",3; bonus2 bSubEle,Ele_Fire,3; bonus2 bSubEle,Ele_Water,-3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19129,'Chick_Hat_','Chick Hat',4,20,NULL,100,NULL,2,NULL,1,0xFFFFFFFF,63,2,256,NULL,'10',0,311,'bonus bLuk,2; bonus bMaxHP,50; bonus bMaxSP,50; skill "TF_DOUBLE",2; bonus bDoubleRate,10; bonus2 bSubRace,RC_DemiHuman,3; bonus2 bSubRace,RC_Player,3;',NULL,NULL);
@@ -9898,7 +9959,7 @@ REPLACE INTO `item_db_re` VALUES (19130,'Magic_Eyes_','Magic Eyes',4,20,NULL,300
REPLACE INTO `item_db_re` VALUES (19131,'Radio_Antenna_','Radio Antenna',4,0,NULL,1500,NULL,2,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',1,347,'bonus bMdef,5; bonus bCritical,5; bonus bFlee,5; skill "MG_LIGHTNINGBOLT",1; bonus4 bAutoSpellWhenHit,"MG_THUNDERSTORM",5,30,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19132,'Masquerade_','Masquerade',4,20,NULL,100,NULL,0,NULL,1,0xFFFFFFFE,63,2,512,NULL,'0',0,78,'bonus2 bAddRace,RC_DemiHuman,3; bonus2 bAddRace,RC_Player,3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19133,'Odin_Mask_','Odin\'s Mask',4,20,NULL,100,NULL,1,NULL,1,0xFFFFFFFF,63,2,513,NULL,'1',0,480,'bonus2 bSubClass,Class_Boss,2;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19134,'Wickebines_Black_Cat_Ears','Wickebine\'s Black Cat Ears',4,20,NULL,200,NULL,4,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',1,368,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19134,'Wickebines_Black_Cat_Ears','Wickebine\'s Black Cat Ears',4,20,NULL,200,NULL,4,NULL,1,0xFFFFFFFE,63,2,256,NULL,'45',1,368,'bonus bFlee,10; bonus bCritAtkRate,10; autobonus "{ bonus2 bIgnoreMdefRaceRate,RC_ALL,25; }",50,5000,BF_MAGIC,"{ specialeffect2 EF_AGIUP; }";',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19138,'Seraphim_Coronet','Seraphim Coronet',4,20,NULL,300,NULL,0,NULL,0,0xFFFFFFFF,63,2,512,NULL,'70',0,1487,'bonus bStr,2; .@int = readparam(bInt); bonus bBaseAtk,(.@int/8)*5; bonus bHealPower,.@int/8; bonus bVariableCastrate,.@int/8; if ((.@int>108)) { bonus bBaseAtk,50; bonus bHealPower,5; bonus bVariableCastrate,4; } if ((.@int>120)) { bonus bBaseAtk,75; bonus bHealPower,5; bonus bVariableCastrate,2; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19139,'SurviveOrb','Survive Orb',4,0,NULL,300,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1,NULL,'50',0,1488,'skill "TF_HIDING",1; bonus2 bAddClass,Class_All,2; bonus bMatkRate,2; bonus bVariableCastrate,-3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19140,'Squirrel_Ear_Hat','Squirrel Ear Hat',4,0,NULL,200,NULL,10,NULL,1,0xFFFFFFFF,63,2,256,NULL,'100',1,1486,'.@r = getrefine(); bonus bAspd,1; bonus bCriticalLong,5; bonus bCritAtkRate,10; bonus2 bIgnoreDefRaceRate,RC_All,10; if (.@r > 4) { bonus bAspd,1; bonus bCriticalLong,10; bonus bCritAtkRate,2; bonus2 bIgnoreDefRaceRate,RC_All,20; } if (.@r > 6) { bonus bAspd,1; bonus bCriticalLong,15; bonus bCritAtkRate,6; bonus2 bIgnoreDefRaceRate,RC_All,30; } if (.@r > 8) { bonus bAspd,1; bonus bCriticalLong,20; bonus bCritAtkRate,12; bonus2 bIgnoreDefRaceRate,RC_All,40; autobonus "{ bonus bCritAtkRate,100; }",70,5000; }',NULL,NULL);
@@ -9917,6 +9978,7 @@ REPLACE INTO `item_db_re` VALUES (19152,'Angelring_Balloon','Angelring Balloon',
REPLACE INTO `item_db_re` VALUES (19153,'Ghostring_Balloon','Ghostring Balloon',4,20,NULL,10,NULL,0,NULL,0,0xFFFFFFFF,63,2,1,NULL,'1',0,1436,'bonus3 bAutoSpell,"MG_SOULSTRIKE",5,10; bonus2 bExpAddRace,RC_All,5; bonus2 bDropAddRace,RC_All,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19154,'Arch_Angelring_Balloon','Arch Angelring Balloon',4,20,NULL,10,NULL,0,NULL,0,0xFFFFFFFF,63,2,1,NULL,'1',0,1437,'skill "ALL_RESURRECTION",1; bonus2 bExpAddRace,RC_All,5; bonus2 bDropAddRace,RC_All,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19155,'Demons_Eyes','Demon\'s Eyes',4,20,NULL,10,NULL,0,NULL,0,0xFFFFFFFF,63,2,512,NULL,'60',0,1490,'bonus2 bSubRace,RC_Player,3; bonus bFlee2,2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19156,'Lunar_Rainbow','Lunar Rainbow',4,20,NULL,200,NULL,10,NULL,1,0xFFFFFFFF,63,2,256,NULL,'80',1,704,'bonus bAgi,3; bonus bMdef,10; bonus bMatk,(10*getrefine());',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19157,'Drooping_Rebellion_','Drooping Rebellion',4,20,NULL,200,NULL,1,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',1,1444,'bonus bAllStats,1; bonus bUseSPrate,-10; .@r = getrefine(); if (.@r >= 9) { bonus bAspd,1; } if (.@r >= 12) { bonus bSpeedRate,25; } bonus2 bExpAddRace,RC_All,5; bonus2 bDropAddRace,RC_All,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19158,'C_GeminiS58_Eyes_Blue','Costume GeminiS58 Eyes Blue',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'0',0,1456,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19159,'Barrel_Helm','Barrel Helm',4,20,NULL,420,NULL,59,NULL,1,0xFFFFFFFF,63,2,769,NULL,'60',1,1498,'bonus bVit,5; bonus bHPrecovRate,-10; .@r = getrefine(); if (.@r >= 7) { bonus bDef,100; skill "CR_AUTOGUARD",1; } if (.@r >= 8) { bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10; if(BaseJob==Job_SuperNovice) { skill "CR_AUTOGUARD",5; } }',NULL,NULL);
@@ -9925,12 +9987,12 @@ REPLACE INTO `item_db_re` VALUES (19164,'Para_Team_Hat100','Awakened Eden Group
REPLACE INTO `item_db_re` VALUES (19165,'Para_Team_Hat160','Awakened Eden Group Hat II',4,20,NULL,0,NULL,10,NULL,1,0xFFFFFFFF,63,2,256,NULL,'160',1,1530,'autobonus "{ bonus bBaseAtk,30; }",70,5000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }"; autobonus "{ bonus bMatk,30; }",50,5000,BF_MAGIC,"{ specialeffect2 EF_SPELLBREAKER; }"; .@r = getrefine(); if(.@r >= 7){ bonus bAtk,15; bonus bMatk,15; if(.@r >= 9){ bonus bAllStats,2; if(.@r >= 12){ bonus2 bRegenPercentHP,2,10000; bonus2 bRegenPercentSP,1,10000; } } }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19166,'RO_Celebration_Hat','RO Celebration Hat',4,20,NULL,140,NULL,14,NULL,1,0xFFFFFFFF,63,2,256,NULL,'14',1,1541,'bonus bMaxSP,140; bonus2 bSPRegenRate,6,4000;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19168,'Band_Of_Kafra_','Kafra Staff Headband',4,20,NULL,500,NULL,0,NULL,1,0xFFFFFFFF,63,2,256,NULL,NULL,1,106,'bonus2 bSubClass,Class_All,5; .@r = getrefine()*10; bonus2 bAddMonsterDropItem,23177,10+.@r; bonus2 bAddMonsterDropItem,7059,10+.@r; bonus2 bAddMonsterDropItem,7060,10+.@r;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19176,'Fallen_Angel_Blessing','Fallen Angel Blessing',4,20,NULL,200,NULL,1,NULL,1,0xFFFFFFFF,63,2,512,NULL,'10',0,1250,'bonus2 bAddRace,RC_Angel,5; bonus2 bSubRace,RC_Angel,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19176,'Fallen_Angel_Blessing_','Fallen Angel Blessing',4,20,NULL,200,NULL,1,NULL,1,0xFFFFFFFF,63,2,512,NULL,'10',0,1250,'bonus2 bAddRace,RC_Angel,5; bonus2 bSubRace,RC_Angel,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19177,'Elemental_Crown_','Elemental Crown',4,0,NULL,500,NULL,10,NULL,0,0xFFFFFFFF,63,2,256,NULL,'50',1,1219,'.@r = getrefine(); bonus bDex,3 + (.@r/2); bonus bLongAtkRate,4;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19178,'Elemental_Crown__','Elemental Crown',4,0,NULL,500,NULL,10,NULL,1,0xFFFFFFFF,63,2,256,NULL,'50',1,1219,'.@r = getrefine(); bonus bDex,3 + (.@r/2); bonus bLongAtkRate,4;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19179,'Rabbit_Magic_Hat_','Magic Rabit Hat',4,0,NULL,800,NULL,4,NULL,1,0xFFFFFFFF,63,2,256,NULL,'0',1,497,'bonus bDex,1; bonus bAgi,1; bonus bMdef,1; bonus bAspdRate,5; bonus bDelayRate,-4;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19180,'Anubis_Helm_','Anubis Helm',4,20,NULL,0,NULL,8,NULL,1,0xFFFFFFFF,63,2,768,NULL,'65',0,485,'bonus bMdef,5; bonus2 bSubClass,Class_Boss,10; bonus bHealpower2,10; bonus bAddItemHealRate,10;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19181,'New_Wave_Sunglasses','New Wave Sunglasses',4,20,NULL,100,NULL,1,NULL,1,0xFFFFFFFF,63,2,512,NULL,'30',0,856,'bonus bDelayRate,-5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19181,'New_Wave_Sunglasses_','New Wave Sunglasses',4,20,NULL,100,NULL,1,NULL,1,0xFFFFFFFF,63,2,512,NULL,'30',0,856,'bonus bDelayRate,-5;',NULL,NULL);
#===================================================================
# Costume System
#===================================================================
@@ -9941,9 +10003,9 @@ REPLACE INTO `item_db_re` VALUES (19503,'T_Munak_Hat','T Munak Hat',4,0,NULL,0,N
REPLACE INTO `item_db_re` VALUES (19504,'T_Sunglasses','T Sunglasses',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'0',0,12,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19505,'T_Cigarette','T Cigarette',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'0',0,54,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19506,'T_Valkyrie_Feather_Band','T Valkyrie Feather Band',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'0',1,300,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19507,'Clear_Sun','Clear Sun',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,654,'bonus bUnbreakableHelm,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19507,'Fine_Sun','Clear Sun',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,654,'bonus bUnbreakableHelm,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19508,'T_Gemmed_Sallet','T Gemmed Sallet',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'0',1,0,'bonus bUnbreakableHelm,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19509,'Butterfly_Wing_Ears','Butterfly Wing Ears',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,695,'bonus bUnbreakableHelm,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19509,'Butterfly_Wing_Ear','Butterfly Wing Ears',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,695,'bonus bUnbreakableHelm,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19510,'Nut_On_Head','Screw Stuck in Head',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,696,'bonus bUnbreakableHelm,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19511,'Heart_Eye_Patch1','Heart Eye Patch 1',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,697,'bonus bUnbreakableHelm,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19512,'Heart_Eye_Patch2','Heart Eye Patch 2',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,698,'bonus bUnbreakableHelm,1;',NULL,NULL);
@@ -9979,7 +10041,7 @@ REPLACE INTO `item_db_re` VALUES (19541,'C_Romantic_White_Flower','Costume Roman
REPLACE INTO `item_db_re` VALUES (19542,'C_Devil_Whisper','Costume Devil Whisper',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,712,'bonus bUnbreakableHelm,1; bonus2 bSubRace,RC_Angel,1; bonus2 bSubRace,RC_Demon,1; bonus3 bAddMonsterDropItem,12020,RC_Angel,400; bonus3 bAddMonsterDropItem,523,RC_Demon,400;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19543,'Oliver_Wolf_Hood','Oliver Wolf Hood',4,20,NULL,300,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'70',0,849,'bonus bUnbreakableHelm,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19544,'C_Tare_Neko_Cru','Costume Tare Neko Cru',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,692,'bonus bUnbreakableHelm,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19545,'C_Boy\'s_Cap','Costume Boy\'s Cap',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'100',0,102,'bonus bUnbreakableHelm,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19545,'C_Boys_Cap','Costume Boy\'s Cap',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'100',0,102,'bonus bUnbreakableHelm,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19546,'C_Valkyrie_Helm','Costume Valkyrie Helm',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'100',0,225,'bonus bUnbreakableHelm,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19547,'C_Deviruchi_Cap','Costume Deviruchi Cap',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'100',0,123,'bonus bUnbreakableHelm,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19548,'C_Frog_Cap','Costume Frog Cap',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'100',0,448,NULL,'bonus bUnbreakableHelm,1;',NULL);
@@ -9988,7 +10050,7 @@ REPLACE INTO `item_db_re` VALUES (19550,'C_Blush','Costume Blush',4,20,NULL,100,
REPLACE INTO `item_db_re` VALUES (19551,'C_Elven_Ears','Costume Elven Ears',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'100',0,73,'bonus bUnbreakableHelm,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19552,'C_Centimental_Flower','Costume Centimental Flower',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'100',0,56,'bonus bUnbreakableHelm,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19553,'C_Assassin_Mask_','Costume Assassin Mask',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'100',0,180,'bonus bUnbreakableHelm,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19554,'C_Hahoe_Mask_','Costume Hahoe Mask',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,6144,NULL,'100',0,230,'bonus bUnbreakableHelm,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19554,'C_Hahoe_Mask','Costume Hahoe Mask',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,6144,NULL,'100',0,230,'bonus bUnbreakableHelm,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19555,'C_Crescent_Moon_Helm','Costume Crescent Moon Helm',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,3072,NULL,'1',1,213,'bonus bVit,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19556,'C_Kabuki_Mask','Costume Kabuki Mask',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,7168,NULL,'1',1,214,'bonus bInt,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19557,'C_Ayothaya_Hat','Costume Ayothaya Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,334,'bonus bStr,1;',NULL,NULL);
@@ -10012,7 +10074,7 @@ REPLACE INTO `item_db_re` VALUES (19574,'C_Lord_of_Death','Costume Lord of Death
REPLACE INTO `item_db_re` VALUES (19575,'C_Ascension_Black_Dragon','Costume Ascension Black Dragon',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,863,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19576,'C_Tare_Pope','Costume Tare Pope',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,817,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19577,'10th_Anni_Poring_Hat','10th Anni Poring Hat',4,10,NULL,100,NULL,1,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,874,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19578,'C_Googles','Costume Googles',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,3072,NULL,'1',1,1,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19578,'C_Goggle','Costume Googles',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,3072,NULL,'1',1,1,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19579,'C_Red_Wind_Hat','Costume Red Wind Hat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,613,'bonus bHPrecovRate,20; bonus bSPrecovRate,20;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19580,'C_Sphinx_Helm','Costume Sphinx Helm',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,5120,NULL,'1',1,137,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19581,'C_Adventurers_Hat','Costume Adventurer\'s Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,891,NULL,NULL,NULL);
@@ -10020,39 +10082,39 @@ REPLACE INTO `item_db_re` VALUES (19582,'C_Cowboy_Hat','Costume Cowboy Hat',4,0,
REPLACE INTO `item_db_re` VALUES (19583,'C_Zorro_Mask','Costume Zorro Mask',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,50,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19584,'C_Pirate_Dagger','Costume Dagger In Mouth',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,327,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19585,'C_Feather_Beret','Costume Feather Beret',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,224,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19586,'C_Pink_Bunny_Hair_Band','Costume Pink Bunny Hair Band',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,898,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19586,'C_Pink_Bunny_Band_J','Costume Pink Bunny Hair Band',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,898,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19587,'C_King_Poring_Hat','Costume King Poring Hat',4,0,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,905,'bonus bUnbreakableHelm,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19588,'C_Cat_Hat_J','Costume Cat Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,182,'bonus bAllStats,3; bonus2 bExpAddClass,Class_All,30;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19589,'C_Fallen_Angel_Lost_J','Costume Fallen Angel Lost',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'0',0,907,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19590,'C_Twin_Maiden_Ribbon_J','Costume Maiden\'s Twin Ribbon',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'0',0,239,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19590,'C_Twin_Ribbon_J','Costume Maiden\'s Twin Ribbon',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'0',0,239,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19591,'C_Ribbon_Red','Costume Red Ribbon',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,246,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19592,'C_Hibiscus','Costume Hibiscus',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,210,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19593,'C_Laurel_Wreath','Costume Laurel Wreath',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,237,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19594,'C_Decorative_Geographer','Costume Decorative Geographer',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,238,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19595,'C_Aprils_Fool_Day','Costume April\'s Fool Day',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,265,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19595,'C_Dress_Hat_J','Costume April\'s Fool Day',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,265,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19596,'C_Flapping_Angel_Wing','Costume Flapping Angel Wing',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,264,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19597,'C_Magic_Eyes','Costume Magic Eyes',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,209,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19598,'C_Wandering_Wolf_Hat','Costume Wandering Wolf Hat',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFE,63,2,1024,NULL,'0',0,490,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19598,'C_Wondering_Wolf_Helm','Costume Wandering Wolf Hat',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFE,63,2,1024,NULL,'0',0,490,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19599,'C_Imp_Hat','Costume Imp Hat',4,20,NULL,400,NULL,1,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,589,'bonus3 bAutoSpell,"SA_FLAMELAUNCHER",1,5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19600,'C_Drooping_Kiehl','Costume Drooping Kiehl',4,0,NULL,40,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,'30',NULL,909,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19601,'C_Drooping_Aliot','Costume Drooping Aliot',4,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,'1',NULL,910,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19600,'Drooping_Kiehl','Costume Drooping Kiehl',4,0,NULL,40,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,'30',NULL,909,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19601,'Drooping_Aliot','Costume Drooping Aliot',4,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,'1',NULL,910,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19602,'C_Invisible_Cap','Costume Invisible Cap',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,0,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19603,'C_Invisible_Sunglasses','Costume Invisible Sunglasses',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,0,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19604,'C_Invisible_Flu_Mask','Costume Invisible Flu Mask',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,0,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19604,'C_Invisible_Mask','Costume Invisible Flu Mask',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,0,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19605,'C_Gang_Scarf','Costume Gang Scarf',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,369,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19606,'C_Ninja_Scroll','Costume Ninja Scroll',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,370,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19607,'C_Love_Chick_Hat','Costume Love Chick Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,500,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19608,'C_Baby_Chick','Costume Baby Chick',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,311,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19608,'C_Chick_Hat','Costume Baby Chick',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,311,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19609,'C_Red_Glasses','Costume Red Glasses',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,316,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19610,'C_Whisper_Mask','Costume Whisper Mask',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,7168,NULL,'1',1,321,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19611,'C_Peco_Ears','Costume Peco Ears',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,366,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19612,'C_Note_Headphone','Costume Note Headphone',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,3072,NULL,'1',1,220,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19613,'C_Valkyrie_Feather_Hat','Costume Valkyrie Feather Hat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,300,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19613,'C_Valkyrie_Feather_Band','Costume Valkyrie Feather Hat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,300,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19614,'C_Super_Novice_Hat','Costume Super Novice Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,193,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19615,'C_Loki_Mask','Costume Loki Mask',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,6144,NULL,'1',1,346,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19616,'C_Wickebines_Black_Cat_Ears','Costume Wickebine\'s Black Cat Ears',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,368,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19617,'C_Puppy_Headband','Costume Puppy Headband',4,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,NULL,NULL,199,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19618,'C_Kitsune_Mask','Costume Kitsune Mask',4,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,NULL,NULL,153,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19618,'C_Mask_Of_Fox','Costume Kitsune Mask',4,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,NULL,NULL,153,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19619,'C_Corsair','Costume Corsair',4,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,'0',0,105,'bonus bVit,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19620,'C_Dectective_Hat','Costume Detective Hat',4,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,NULL,NULL,189,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19621,'C_Ear_Of_Devils_Wing','Costume Evil Wing Ear',4,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,2048,NULL,NULL,NULL,152,NULL,NULL,NULL);
@@ -10066,13 +10128,13 @@ REPLACE INTO `item_db_re` VALUES (19629,'C_Tiara','Costume Tiara',4,20,NULL,0,NU
REPLACE INTO `item_db_re` VALUES (19630,'C_Crown','Costume Crown',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,45,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19631,'C_Poring_Fedora_Hat','Costume Poring Fedora Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,919,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19632,'C_Hat','Costume Hat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,16,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19633,'C_Flower_Band','Costume Flower Band',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,5,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19633,'C_Flower_Hairband','Costume Flower Band',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,5,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19634,'C_Flu_Mask','Costume Flu Mask',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,8,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19635,'C_Mini_Propeller','Costume Mini Propeller',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,46,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19636,'C_Clown_Nose','Costume Clown Nose',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,49,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19636,'C_Pierrot_Nose','Costume Clown Nose',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,49,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19637,'C_Nurse_Cap','Costume Nurse Cap',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,64,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19638,'C_Mr._Smile','Costume Mr. Smile',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,65,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19639,'C_Sakkat','Costume Sakkat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,67,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19638,'C_Mr_Smile','Costume Mr. Smile',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,65,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19639,'C_Sahkkat','Costume Sakkat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,67,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19640,'C_Charming_Ribbon','Costume Charming Ribbon',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,211,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19641,'C_Helm_of_Darkness','Costume Helm of Darkness',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,3072,NULL,'1',1,233,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19642,'C_Moonlight_Flower_Hat','Costume Moonlight Flower Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,3072,NULL,'1',1,268,NULL,NULL,NULL);
@@ -10087,16 +10149,16 @@ REPLACE INTO `item_db_re` VALUES (19650,'C_Rainbow_Feather_Deco','Costume Rainbo
REPLACE INTO `item_db_re` VALUES (19651,'C_RWC_Shouting_Mouth','Costume RWC Shouting Mouth',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,194,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19652,'C_Rabbit_Magic_Hat','Costume Rabbit Magic Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,497,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19653,'C_Marcher_Hat','Costume Marcher Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,269,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19654,'C_Ship_Captain_Hat','Costume Ship Captain Hat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,367,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19654,'C_J_Captain_Hat','Costume Ship Captain Hat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,367,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19655,'C_Tiraya_Bonnet','Costume Tiraya Bonnet',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'0',0,398,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19656,'C_Wandering_Minstrel_Hat','Wandering Minstrel Hat',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'0',0,240,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19656,'C_Minstrel_Hat','Wandering Minstrel Hat',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'0',0,240,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19657,'C_Captain_Hat','Costume Captain Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,236,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19658,'C_Vacation_Hat','Costume Vacation Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,315,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19659,'C_Brown_Beanie','Costume Brown Beanie',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,279,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19660,'C_Coppola','Costume Coppola',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,252,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19661,'C_Sweet_Bonnet','Costume Sweet Bonnet',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,938,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19662,'C_Magician_Hat','Costume Magician Hat',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,130,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19663,'C_Wish_Lamp','Costume Wish Lamp',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,947,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19663,'Wishing_Sky_Lantern','Costume Wish Lamp',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,947,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19664,'C_Campus_Festival','Costume Campus Festival',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,721,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19665,'C_Poring_Cake_Hat','Costume Poring Cake Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,417,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19666,'C_Cookie_Hat','Costume Cookie Hat',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,217,'bonus2 bAddItemHealRate,513,1100;',NULL,NULL);
@@ -10108,17 +10170,17 @@ REPLACE INTO `item_db_re` VALUES (19671,'C_Piggie_Bank','Costume Piggie Bank',4,
REPLACE INTO `item_db_re` VALUES (19676,'C_Rainbow_Poring_Hat','Costume Rainbow Poring Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,900,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19677,'C_Soulless_Wing','Costume Soulless Wing',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',NULL,301,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19678,'C_Bell_Ribbon','Costume Bell Ribbon',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,388,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19682,'C_SantaPoring_Cap','Costume SantaPoring Cap',4,10,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,387,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19682,'C_Santa_Poring_Hat','Costume SantaPoring Cap',4,10,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,387,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19685,'C_ShineSantaPoring','Costume Shining Santa Poring',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,961,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19686,'C_SantaHairband','Costume Santa Hairband',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,964,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19687,'C_Lush_Rose','Costume Lush Rose',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,963,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19689,'C_Ati_Atihan','Costume Ati Atihan',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,7168,NULL,'1',0,303,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19690,'C_Dark_Snake_Lord_Hat','Costume Dark Snake Lord Hat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,372,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19689,'C_Ati_Atihan_Hat','Costume Ati Atihan',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,7168,NULL,'1',0,303,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19690,'C_Dark_Snake_Lord_Hat_J','Costume Dark Snake Lord Hat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,372,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19695,'C_Kettle_Hat','Costume Kettle Hat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,318,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19696,'C_Friend_Mochiring_Hat','Costume Friend Mochiring Hat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,965,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19697,'C_Rudolph_Santa_Hat','Costume Rudolph Santa Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,NULL,1,619,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19701,'C_Red_Bonnet','Costume Red Bonnet',4,10,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,190,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19702,'C_Twin_Pompom_By_JB','Costume Twin Pompom By JB',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,390,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19702,'C_Santa_Hat_1','Costume Twin Pompom By JB',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,390,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19706,'C_Red_Dress_Hat','Costume Red Dress Hat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,670,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19707,'C_Polar_Bear_Cap','Costume Polar Bear Cap',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'0',0,966,'bonus bUnbreakableHelm,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19708,'C_White_Snake_Hat','Costume White Snake Hat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',1,413,NULL,NULL,NULL);
@@ -10130,35 +10192,35 @@ REPLACE INTO `item_db_re` VALUES (19714,'C_Lady_Tanee_Doll','Costume Lady Tanee
REPLACE INTO `item_db_re` VALUES (19715,'C_Scarf','Costume Scarf',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,343,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19716,'C_Alice_Doll','Costume Alice Doll',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,208,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19717,'C_Pink_Ribbon','Costume Pink Ribbon',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,245,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19718,'C_Gothic_Headdress','Costume Gothic Headdress',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,978,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19718,'C_Gothic_Head_Dress','Costume Gothic Headdress',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,978,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19719,'C_Coronet','Costume Coronet',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,33,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19720,'C_Romantic_Gent','Costume Romantic Gent',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,31,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19721,'C_Darkness_Helm','Costume Darkness Helm',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,586,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19722,'C_Black_Glasses','Costume Black Glasses',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,404,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19723,'C_Sacred_Torch_Coronet','Costume Sacred Torch Coronet',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,431,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19724,'C_Deprote_Doll_Hat','Costume Deprote Doll Hat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,354,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19724,'C_Deprotai_Doll_Hat','Costume Deprote Doll Hat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,354,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19725,'C_Bread_Bag','Costume Bread Bag',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,7168,NULL,'1',0,412,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19726,'C_Scarlet_Rose','Costume Scarlet Rose',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,534,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19727,'C_Devilring_Hat','Costume Devilring Hat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,298,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19728,'C_Tare_Zonda','Costume Tare Zonda',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,985,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19729,'C_Neko_Mimi_Kafra','Costume Neko Mimi Kafra',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,392,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19730,'C_Snake_Hat','Costume Snake Hat',4,20,NULL,10,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'0',0,986,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19731,'C_Evolved_Evil_Wing','Costume Evolved Evil Wing',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,39,'bonus bStr,1; bonus bAgi,1; bonus bFlee,3; bonus2 bSubRace,RC_Angel,3;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19732,'C_Goblin_Leader_Mask','Costume Goblin Leader Mask',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,174,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19731,'C_Satanic_Chain','Costume Evolved Evil Wing',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,39,'bonus bStr,1; bonus bAgi,1; bonus bFlee,3; bonus2 bSubRace,RC_Angel,3;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19732,'C_Goblin_Mask_04','Costume Goblin Leader Mask',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,174,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19733,'C_Panda_Cap','Costume Panda Cap',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,115,'bonus bAllStats,1; bonus2 bExpAddClass,Class_All,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19734,'C_Binoculars','Costume Binoculars',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,83,'bonus bDex,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19735,'C_Fin_Helm','Costume Fin Helm',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,100,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19736,'C_Gas_Mask','Costume Gas Mask',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,91,'bonus2 bResEff,Eff_Poison,3000;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19737,'C_Refined_Corsair','Costume Refined Corsair',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,105,'bonus bVit,3; bonus bInt,3;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19738,'C_Renown_Detective\'s_Cap','Costume Renown Detective\'s Cap',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,189,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19739,'C_Sleeping_Kitty_Hat','Costume Sleeping Kitty Hat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,838,'bonus2 bAddRace,RC_Brute,2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19737,'C_Corsair_K','Costume Refined Corsair',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,105,'bonus bVit,3; bonus bInt,3;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19738,'C_Detective_Hat_K','Costume Renown Detective\'s Cap',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,189,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19739,'C_Sleeping_Kitty_Cat','Costume Sleeping Kitty Hat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,838,'bonus2 bAddRace,RC_Brute,2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19741,'C_Majestic_Devil_Horns','Costume Majestic Devil Horns',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,562,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19742,'C_Small_Golden_Wings','Costume Small Golden Wings',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,NULL,NULL,724,'bonus2 bExpAddRace,RC_All,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19743,'C_Anubis_Helm','Costume Anubis Helm',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,7168,NULL,'1',0,485,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19744,'C_Black_Tail_Ribbon','Costume Black Tail Ribbon',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,642,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19745,'C_Holy_Marching_Hat','Costume Holy Marching Hat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,587,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19746,'C_Executioner_Hood','Costume Executioner Hood',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,326,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19747,'C_Tha_Despero_Mask','Costume Tha Despero Mask',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,6144,NULL,'1',1,693,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19746,'C_Cap_Of_Blindness','Costume Executioner Hood',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,326,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19747,'C_Tha_Despero_Mask_','Costume Tha Despero Mask',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,6144,NULL,'1',1,693,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19748,'C_Diadem','Costume Diadem',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,3072,NULL,'1',1,335,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19749,'C_Gold_Spirit_Chain','Costume Gold Spirit Chain',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,260,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19750,'C_Saint_Frill_Ribbon','Costume Saint Frill Ribbon',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,987,NULL,NULL,NULL);
@@ -10180,36 +10242,36 @@ REPLACE INTO `item_db_re` VALUES (19765,'C_Wing_Angels_Ears','Costume Wing Angel
REPLACE INTO `item_db_re` VALUES (19767,'C_Home_Cherry_Blossom','Costume Home Cherry Blossom',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,602,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19768,'C_Sakura_Coronet','Costume Sakura Coronet',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,645,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19772,'C_Honeybee_Hat','Costume Honeybee Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,709,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19775,'C_Dokebi_Hat','Costume Dokebi Hat',4,20,NULL,10,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,307,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19777,'C_Shiny_Small_Star','Costume Shiny Small Star',4,20,NULL,10,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1005,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19775,'C_Marvelous_Wig','Costume Dokebi Hat',4,20,NULL,10,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,307,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19777,'C_Twinkle_Little_Star','Costume Shiny Small Star',4,20,NULL,10,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1005,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19778,'C_King_Berry','Costume King Berry',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,968,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19779,'C_Persika','Costume Persika',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,659,'bonus bAllStats,1; bonus2 bExpAddClass,Class_All,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19780,'C_Rabbit_Ear_Knit_Hat','Costume Knit Rabbit Ears',4,20,NULL,10,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,867,'bonus bMaxHPrate,3; bonus bMaxSPrate,3;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19781,'C_Angel_Wing_Ears','Costume Angel Wing Ears',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,158,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19782,'C_Refined_Drooping_Cat','Costume Refined Drooping Cat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,142,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19783,'C_Grampa_Beard','Costume Grampa Beard',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,25,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19781,'C_Ear_Of_Angel\'s_Wing_','Costume Angel Wing Ears',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,158,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19782,'C_Drooping_Kitty','Costume Refined Drooping Cat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,142,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19783,'C_Granpa_Beard','Costume Grampa Beard',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,25,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19784,'C_Morrigane\'s_Helm','Costume Morrigane\'s Helm',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,257,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19785,'C_Crunch_Toast','Costume Crunch Toast',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,188,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19786,'C_Crown_of_Mistress','Costume Crown of Mistress',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,165,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19789,'C_Sweet_Gent','Costume Sweet Gent',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,29,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19785,'C_Well_Baked_Toast','Costume Crunch Toast',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,188,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19786,'C_Mistress_Crown','Costume Crown of Mistress',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,165,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19789,'C_Sweet_Gents','Costume Sweet Gent',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,29,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19790,'C_Wedding_Veil','Costume Wedding Veil',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,44,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19791,'C_Alarm_Mask','Costume Alarm Mask',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,170,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19792,'C_Goblin_Mask_01','Costume Poker Face',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,171,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19793,'C_Goblin_Mask_02','Costume Surprised Mask',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,172,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19794,'C_Goblin_Mask_03','Costume Annoyed Mask',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,173,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19795,'C_Grand_Circlet','Costume Grand Circlet',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,93,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19795,'C_Lord_Circlet','Costume Grand Circlet',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,93,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19796,'C_Bone_Helm','Costume Bone Helm',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,103,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19797,'C_Apple_of_Archer','Costume Apple of Archer',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,72,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19797,'C_Apple_Of_Archer','Costume Apple of Archer',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,72,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19798,'C_Angry_Mouth','Costume Angry Snarl',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,194,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19799,'C_Golden_Gear','Costume Golden Gear',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,30,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19800,'C_Carnation_Hairband','Costume Carnation Headband',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,878,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19821,'C_Hyegun_hat','Costume Yao Jun',4,20,NULL,10,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,375,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19821,'C_Hyegun_Hat','Costume Yao Jun',4,20,NULL,10,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,375,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19823,'C_White_Cat_Hood','Costume White Cat Hood',4,20,NULL,10,NULL,0,NULL,0,0xFFFFFFFF,63,2,3072,NULL,'1',0,1052,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19824,'C_Evil_Druid_Hat','Costume Evil Druid Hat',4,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,'1',NULL,1053,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19825,'C_Vicious_Stop_Bandage','Costume Vicious Stop Bandage',4,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,'1',NULL,1054,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19826,'C_Ice_Wing_Ear','Costume Ice Wing Ear',4,20,NULL,10,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,584,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19827,'C_Amistr_Cap','Costume Amistr',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,643,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19828,'C_Bucket_Hat','Costume Bucket Hat',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,195,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19828,'C_Fedora','Costume Bucket Hat',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,195,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19829,'C_Straw_Hat','Costume Straw Hat',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'0',0,146,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19830,'C_Sunglasses','Costume Sunglasses',4,10,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,2048,NULL,'1',NULL,12,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19831,'C_Filir_Hat','Costume Filir Hat',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,408,NULL,NULL,NULL);
@@ -10224,8 +10286,8 @@ REPLACE INTO `item_db_re` VALUES (19842,'C_Puppy_Hat','Costume Puppy Hat',4,20,N
REPLACE INTO `item_db_re` VALUES (19843,'C_Cat_Hairband','Costume Kitty Band',4,20,NULL,10,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,2,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19844,'C_Turban','Costume Turban',4,20,NULL,10,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,7,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19845,'C_Hair_Protector','Costume Bao Bao',4,20,NULL,10,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,127,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19846,'C_Phantom_Of_Opera','Costume Opera Masque',4,20,NULL,10,NULL,0,NULL,0,0xFFFFFFFF,63,2,6144,NULL,'1',0,128,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19847,'C_Big_Sis\'_Ribbon','Costume Big Ribbon',4,20,NULL,10,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,28,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19846,'C_Opera_Ghost_Mask','Costume Opera Masque',4,20,NULL,10,NULL,0,NULL,0,0xFFFFFFFF,63,2,6144,NULL,'1',0,128,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19847,'C_Big_Sis_Ribbon','Costume Big Ribbon',4,20,NULL,10,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,28,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19848,'C_Angeling_Hat','Costume Angeling Hat',4,20,NULL,10,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,204,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19849,'C_Munak_Turban','Costume Munak Hat',4,20,NULL,10,NULL,0,NULL,0,0xFFFFFFFF,63,2,7168,NULL,'1',0,51,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19850,'C_Bongun_Hat','Costume Bongun Hat',4,20,NULL,10,NULL,0,NULL,0,0xFFFFFFFF,63,2,7168,NULL,'1',0,139,NULL,NULL,NULL);
@@ -10235,49 +10297,49 @@ REPLACE INTO `item_db_re` VALUES (19853,'C_Filir_Wing_Ears','Costume Filir Wings
REPLACE INTO `item_db_re` VALUES (19854,'C_Ear_Of_Black_Cat_','Costume Black Cat Ears',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,141,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19856,'C_Iceflake_Hat','Costume Snow Cone Hat',4,10,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1080,'bonus2 bAddEle,Ele_Fire,5; bonus2 bMagicAddEle,Ele_Fire,5; bonus2 bAddMonsterDropItem,11589,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19857,'C_King_Prawn_Hat','Costume Crayfish Hat',4,10,NULL,10,NULL,0,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,'1',0,728,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19858,'C_Smokie_Leaf','Costume Smokie Leaf',4,20,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,'1',0,148,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19858,'C_Leaf_Headgear','Costume Smokie Leaf',4,20,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,'1',0,148,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19859,'C_Flying_Angel','Costume Flying Angel',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'0',0,264,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19860,'C_School_Criatura_Hat','Costume School Criatura Hat',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'0',0,872,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19861,'C_Heart_Hairpin','Costume Heart Hairpin',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'0',0,126,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19862,'C_Succubus_Horn','Costume Succubus Horn',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'0',0,150,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19863,'C_Incubus_Horn','Costume Incubus Horn',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'0',0,156,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19860,'C_Cryptura_Hair_Cap','Costume School Criatura Hat',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'0',0,872,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19861,'C_Heart_Hair_Pin','Costume Heart Hairpin',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'0',0,126,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19862,'C_Horn_Of_Succubus','Costume Succubus Horn',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'0',0,150,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19863,'C_Inccubus_Horn','Costume Incubus Horn',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'0',0,156,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19864,'C_Dokebi\'s_Wig','Costume Dokebi\'s Wig',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,3072,NULL,'0',0,302,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19865,'C_Joker_Jester','Costume Joker Jester',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'0',0,89,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19871,'C_DecorationOfMusic_Accessory','Costume Decoration of Music',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'0',0,1074,NULL,'sc_start SC_DECORATION_OF_MUSIC,-1,0;','sc_end SC_DECORATION_OF_MUSIC;');
-REPLACE INTO `item_db_re` VALUES (19876,'C_Bunny_Top_Hat','Costume Bunny Top Hat',4,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,'1',NULL,384,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19878,'C_Evolved_Drooping_Bunny','Costume Evolved Drooping Bunny',4,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,'1',NULL,249,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19871,'C_Music_Decoration','Costume Decoration of Music',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'0',0,1074,NULL,'sc_start SC_DECORATION_OF_MUSIC,-1,0;','sc_end SC_DECORATION_OF_MUSIC;');
+REPLACE INTO `item_db_re` VALUES (19876,'C_Rabbit_Ear_Hat','Costume Bunny Top Hat',4,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,'1',NULL,384,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19878,'C_Drooping_Bunny','Costume Evolved Drooping Bunny',4,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,'1',NULL,249,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19882,'C_Flowerpot_Mask','Costume Flowerpot Mask',4,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,4096,NULL,'1',NULL,1086,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19883,'C_Piamette_Hood','Costume Piamette Hood',4,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,'1',NULL,1087,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19884,'C_Vanargandr_Helm','Costume Vanargand Helm',4,10,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,'1',NULL,804,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19885,'C_Blinker','Costume Blinker',4,10,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,2048,NULL,'1',NULL,82,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19886,'C_Purple_Glasses','Costume Purple Glasses',4,10,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,2048,NULL,'1',NULL,26,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19887,'C_Cyclops_Glasses','Costume Cyclops Glasses',4,10,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,2048,NULL,'1',NULL,23,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19886,'C_Luxury_Sunglasses','Costume Purple Glasses',4,10,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,2048,NULL,'1',NULL,26,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19887,'C_One_Eyed_Glass','Costume Cyclops Glasses',4,10,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,2048,NULL,'1',NULL,23,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19888,'C_Glasses','Costume Glasses',4,10,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,2048,NULL,'1',NULL,3,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19889,'C_Small_Ribbons','Costume Small Ribbons',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,NULL,NULL,169,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19902,'C_Cigarette','Costume Cigarette',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,NULL,NULL,54,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19889,'C_Pair_Of_Red_Ribbon','Costume Small Ribbons',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,NULL,NULL,169,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19902,'C_Cigar','Costume Cigarette',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,NULL,NULL,54,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19903,'C_Witchs_Hat','Costume Witch\'s Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,717,'bonus bVariableCastrate,-10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19910,'C_Halloween_Hat','Costume Halloween Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,NULL,1,1098,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19913,'C_Poo_Poo_Hat','Costume Poo Poo Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,NULL,1,76,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19914,'C_Tarlock\'s_Hat','Costume Tarlock\'s Hat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1101,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19914,'Felock_Cap','Costume Tarlock\'s Hat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1101,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19916,'C_Black_Cat_Hat','Costume Black Cat Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1105,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19917,'C_Gloomy_Pumpkin_Hat','Costume Pumpkin Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,691,'bonus bSpeedRate,25;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19918,'C_Lude_Mask','Costume Lude Mask',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,6144,NULL,'1',0,802,'bonus bAddItemHealRate,20;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19919,'C_Cube_Mask_','Costume Quve Mask',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,6144,NULL,'1',0,472,'bonus bAspdRate,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19920,'C_Adv_Whisper_Mask','Costume Evolved Whisper Mask',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,7168,NULL,'1',0,458,'bonus bFlee,20;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19922,'C_Noah\'s_Hat','Costume Noah\'s Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,7168,NULL,'1',0,636,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19925,'C_Monocle','Costume Monocle',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,23,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19922,'C_Noah_Hat','Costume Noah\'s Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,7168,NULL,'1',0,636,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19925,'C_One_Eyed_Glasses','Costume Monocle',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,23,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19928,'C_Gothic_Heart_Wing','Costume Gothic Heart Wing',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1111,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19929,'C_Classical_Ribbon','Costume Classical Ribbon',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,NULL,1,1112,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19930,'C_Angel_Mini_Silk_Hat','Costume Angel Mini Silk Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1113,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19931,'C_Lazy_Smokie','Costume Lazy Smokie',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,NULL,1,168,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19932,'C_Model_Training_Hat','Costume Model Training Hat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,NULL,1,157,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19934,'C_Lolita_Ten_Gallon_Hat','Costume Alive Ten Gallon Hat Of Flame',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1075,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19931,'C_Lazy_Raccoon','Costume Lazy Smokie',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,NULL,1,168,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19932,'C_Cap_Of_Concentration','Costume Model Training Hat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,NULL,1,157,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19934,'C_10Gallon_Hat_Of_Flame','Costume Alive Ten Gallon Hat Of Flame',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1075,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19935,'C_Hunting_Cap_Of_Gust','Costume Hunting Cap Of Gust',4,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,'1',1,1076,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19936,'C_Knit_Cap_Of_Water','Costume Knit Cap Of Water',4,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,'1',1,1077,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19937,'C_Silk_Hat_of_Earth','Costume Silk Hat of Earth',4,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,'1',1,1078,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19937,'C_Silk_Hat_Of_Earth','Costume Silk Hat of Earth',4,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,'1',1,1078,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19938,'C_Love_Rabbit_Hood','Costume Love Rabbit Hood',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,7168,NULL,'1',1,549,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19939,'C_Antlers','Costume Antlers',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,71,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19941,'C_Ear_Muffs','Costume Ear Muffs',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,70,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19939,'C_Antler','Costume Antlers',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,71,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19941,'C_Ear_Mufs','Costume Ear Muffs',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,70,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19949,'C_RWC2013_Japan_Hat','Costume RWC2013 Japan Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1136,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19952,'C_Bubble_Gum_in_Mouth','Costume Bubble Gum in Mouth',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,572,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19953,'C_Parade_Cap','Costume Parade Cap',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,465,NULL,NULL,NULL);
@@ -10293,23 +10355,23 @@ REPLACE INTO `item_db_re` VALUES (19962,'C_Mitra','Costume Mitra',4,10,NULL,0,NU
REPLACE INTO `item_db_re` VALUES (19963,'C_Driver_Band_R','Costume Driver Band(Red)',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,626,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19964,'C_Driver_Band_Y','Costume Driver Band(Yellow)',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,637,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19965,'C_Shadow_Handicraft','Costume Shadow Handicraft',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,627,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19966,'C_Minstrel_Song\'s_Hat','Costume Minstrel Song\'s Hat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,628,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19966,'C_Minstrel_Song_Hat','Costume Minstrel Song\'s Hat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,628,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19967,'C_Midas_Whisper','Costume Midas Whisper',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,629,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19968,'C_Magic_Stone_Hat','Costume Magic Stone Hat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,630,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19969,'C_Blazing_Soul','Costume Blazing Soul',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,631,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19970,'C_Wind_Whisper','Costume Wind Whisper',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,633,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19971,'C_Dying_Swan','Costume Dying Swan',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,635,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19972,'C_Protect_Of_Crown','Costume Protect Of Crown',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1140,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19973,'C_Circlet_Of_Bones','Costume Circlet Of Bones',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1141,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19974,'C_Camouflage_Rabbit_Hood','Costume Camouflage Rabbit Hood',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1142,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19973,'C_Circlet_Of_Bone','Costume Circlet Of Bones',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1141,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19974,'C_Camouflage_RabbitHood','Costume Camouflage Rabbit Hood',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1142,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19976,'C_Cat_Santa_Hat','Cat Santa Hat',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1144,'bonus bAspdRate,10; bonus bSpeedRate,25;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19977,'C_Golden_Exclamation_Mark','Costume Golden Exclamation Mark',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1145,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19978,'C_Silver_Exclamation_Mark','Costume Silver Exclamation Mark',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1146,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19979,'C_Golden_Question_Mark','Costume Golden Question Mark',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1147,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19980,'C_Silver_Question_Mark','Costume Silver Question Mark',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1148,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19982,'C_Santa_Hat','Costume Santa Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,NULL,1,20,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19977,'C_Golden_Exclamation','Costume Golden Exclamation Mark',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1145,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19978,'C_Silver_Exclamation','Costume Silver Exclamation Mark',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1146,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19979,'C_Golden_Question','Costume Golden Question Mark',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1147,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19980,'C_Silver_Question','Costume Silver Question Mark',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1148,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19982,'C_Santa\'s_Hat','Costume Santa Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,NULL,1,20,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19983,'C_Flower_Hairpin','Costume Flower Hairpin',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,145,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19984,'C_Fashion_Winter_Hat','Costume Fashion Winter Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,196,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19984,'C_Winter_Hat','Costume Fashion Winter Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,196,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19985,'C_Aura_Quartz_Crown','Costume Aura Quartz',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,866,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19986,'C_Lunatic_Hat','Costume Lunatic Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,521,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (19987,'C_Blue_Fur_Hat','Costume Blue Fur Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,280,NULL,NULL,NULL);
@@ -10337,12 +10399,12 @@ REPLACE INTO `item_db_re` VALUES (20010,'C_Rainbow_Wing_Ears','Costume Rainbow E
REPLACE INTO `item_db_re` VALUES (20011,'C_Lightning_Speed','Costume Lightning Speed',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1199,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20012,'C_Double_Horn_Helm','Costume Double Horn Helm',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1200,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20013,'C_Chef_Hat','Costume Chef Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,111,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20014,'C_Lincoln_Hat','Costume Lincoln Hat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,NULL,1,1204,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20015,'C_Lincoln_Beard','Costume Lincoln Beard',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,NULL,1,1205,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20016,'C_Cool_Dinner_Hat','Costume Cool Dinner Hat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,NULL,1,1206,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20014,'Lincoln_Hat','Costume Lincoln Hat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,NULL,1,1204,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20015,'Lincoln_Beard','Costume Lincoln Beard',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,NULL,1,1205,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20016,'Lobster_Hat','Costume Cool Dinner Hat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,NULL,1,1206,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20017,'C_Marionette_Doll','Costume Marionette Doll',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,NULL,1,212,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20018,'C_Holo_Ear','Costume Holo Ear',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,NULL,1,1208,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20019,'C_Beret_Of_Artist','Costume Beret Of Artist',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,NULL,1,1209,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20019,'Beret_Of_Artist','Costume Beret Of Artist',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,NULL,1,1209,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20020,'C_Zaha_Doll_Hat','Costume Zaha Doll Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,461,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20021,'C_Heart_Ribbon_Hairband','Costume Heart Ribbon Hairband',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,708,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20022,'C_Love_Fragment','Costume Love Fragment',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,734,NULL,NULL,NULL);
@@ -10354,7 +10416,7 @@ REPLACE INTO `item_db_re` VALUES (20027,'C_Cow_Hat3','Costume Cow Hat 3',4,10,NU
REPLACE INTO `item_db_re` VALUES (20028,'C_Cow_Hat4','Costume Cow Hat 4',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1214,'bonus bDex,2; bonus2 bAddMonsterDropItem,519,100;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20029,'C_Donut_in_Mouth','Costume Donut in Mouth',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,569,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20030,'C_Choco_Donut_in_Mouth','Costume Choco Donut in Mouth',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,653,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20031,'C_Bunny_Headress','Costume Bunny Headress',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1215,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20031,'C_Bunny_Head_Dress','Costume Bunny Headress',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1215,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20032,'C_Firinto_Scarf','Costume Firinto Scarf',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1216,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20033,'C_Buddhist_Priest_Crown','Costume Monk Crown',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1217,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20034,'C_Jack_Castle_Bat','Costume Jack Castle Bat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1041,NULL,NULL,NULL);
@@ -10372,14 +10434,14 @@ REPLACE INTO `item_db_re` VALUES (20045,'C_Samambaia','Costume Samambaia',4,0,NU
REPLACE INTO `item_db_re` VALUES (20046,'C_Decoration_bluerose','Costume Blue Ribbon Band',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1222,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20047,'C_Pray_Cherry_Blossom','Costume Prayer Cherry Blossom',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1223,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20048,'C_Wind_Of_The_Prairie','Costume Wind Prairie',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1224,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20049,'C_Giant_Band_Aid','Costume Giant Band Aid',4,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,'1',NULL,147,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20049,'C_Plaster','Costume Giant Band Aid',4,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,'1',NULL,147,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20050,'C_Ph.D_Hat','Costume Ph.D Hat',4,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,'1',NULL,98,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20051,'C_Stop_Post','Costume Stop Post',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,59,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20052,'C_AFK_Hat','Costume AFK Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,471,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20053,'C_W_King_Tiger_Doll_Hat','Costume White King Tiger Doll Hat',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,973,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20054,'C_Baby_Pacifier','Costume Baby Pacifier',4,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,4096,NULL,'1',NULL,191,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20055,'C_Ghost_Bandana','Costume Ghost Bandana',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,61,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20056,'C_Bride\'s_Corolla','Costume Bride\'s Corolla',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,437,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20056,'C_Bride_Corolla','Costume Bride\'s Corolla',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,437,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20057,'C_Feather_Bonnet','Costume Feather Bonnet',4,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,'1',NULL,104,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20058,'C_Hot_Blood_Headband','Costume Hot Blood Headband',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,154,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20059,'C_Welding_Mask','Costume Welding Mask',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,6144,NULL,'1',1,79,NULL,NULL,NULL);
@@ -10406,22 +10468,22 @@ REPLACE INTO `item_db_re` VALUES (20080,'C_Shaman\'s_Hair_Orna','Costume Shaman
REPLACE INTO `item_db_re` VALUES (20081,'C_Metal_Dragon_Helm','Costume Metal Dragon Helm',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1242,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20082,'C_Metal_Dragon_Hat','Costume Metal Dragon Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1243,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20083,'C_Mythlit_Hat','Costume Mythlit Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1244,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20084,'C_Ceremonial_Hat','Costume Ceremonial Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,325,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20085,'C_St_Patrick\'s_Hat','Costume St Patrick\'s Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,735,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20084,'C_Clover_Coronet','Costume Ceremonial Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,325,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20085,'C_Clover_Silkhat','Costume St Patrick\'s Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,735,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20086,'C_Dragon_Cintamani_Hat1','Costume Dragon Cintamani Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1245,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20087,'C_Dragon_Cintamani_Hat2','Costume Dragon Cintamani Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1246,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20088,'C_Dragon_Cintamani_Hat3','Costume Dragon Cintamani Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1247,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20089,'C_Dragon_Cintamani_Hat4','Costume Dragon Cintamani Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1248,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20090,'C_Egg_Shell','Costume Egg Shell',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,101,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20091,'C_Pipe','Costume Pipe',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,55,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20092,'C_Sales_Banner','Costume Sales Banner',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,183,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20093,'C_Wizard_Hat','Costume Wizard Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,36,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20094,'C_Green_Ribbon','Costume Green Ribbon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,439,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20095,'C_Red_Ribbon','Costume Red Ribbon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,440,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20096,'C_Blue_Ribbon','Costume Blue Ribbon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,441,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20097,'C_White_Ribbon','Costume White Ribbon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,442,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20091,'C_Smoking_Pipe','Costume Pipe',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,55,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20092,'C_Sales_Signboard','Costume Sales Banner',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,183,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20093,'C_Star_Sparkling','Costume Wizard Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,36,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20094,'C_Fillet_Green','Costume Green Ribbon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,439,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20095,'C_Fillet_Red','Costume Red Ribbon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,440,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20096,'C_Fillet_Blue','Costume Blue Ribbon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,441,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20097,'C_Fillet_White','Costume White Ribbon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,442,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20098,'C_Vampire_Hairband','Costume Vampire Hairband',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1238,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20099,'C_Ljosalfar','Flying Ljosalfar',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,1,'1',1,1239,NULL,'sc_start SC_LJOSALFAR,-1,0;','sc_end SC_LJOSALFAR;');
+REPLACE INTO `item_db_re` VALUES (20099,'C_Ljosalfar','Flying Ljosalfar',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1239,NULL,'sc_start SC_LJOSALFAR,-1,0;','sc_end SC_LJOSALFAR;');
REPLACE INTO `item_db_re` VALUES (20100,'C_Volume_Fhat','Costume Volume Fhat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1240,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20101,'C_Bragi_Wing_Ears','Costume Bragi Wing Ears',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1241,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20102,'C_Horse_King_J','Costume Horse King J',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,7168,NULL,'1',1,1189,NULL,NULL,NULL);
@@ -10436,15 +10498,15 @@ REPLACE INTO `item_db_re` VALUES (20110,'C_Coiledup_Snake','Costume Coiledup Sna
REPLACE INTO `item_db_re` VALUES (20111,'C_Coiledup_Snake_Hat2','Costume Coiledup Snake Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1259,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20112,'C_Aqua_Ten_Gallon_Hat','Costume Aqua Ten Gallon Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1256,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20113,'C_Star_Reading_Hat','Costume Star Reading Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1253,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20114,'C_Funeral_Hat','Costume Funeral Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,77,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20115,'C_Under_Rim_Glasses','Under Rim Glasses',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,1,'1',1,1255,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20116,'C_Mermaid_Headphone','Mermaid Headphone',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,1,'1',1,1254,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20117,'C_Raspberry_Mousse_Hat','Raspberry Mousse Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,1,'1',1,1257,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20118,'C_Cake_Hat','Costume Cake Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,109,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20119,'C_Beanie','Costume Beanie',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,160,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20120,'C_Aerial','Costume Aerial',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,97,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20121,'C_Flower_Lily','Costume Flower Lily',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,324,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20122,'C_Happy_Summer_Ribbon','Costume Happy Summer Ribbon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1260,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20114,'C_Funeral_Costume','Costume Funeral Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,77,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20115,'C_Under_Rim_Glasses','Under Rim Glasses',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,1255,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20116,'C_Mermaid_Headphone','Mermaid Headphone',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,1254,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20117,'C_Raspberry_Mousse_Hat','Raspberry Mousse Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1257,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20118,'C_Hat_Of_Cake','Costume Cake Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,109,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20119,'C_Fur_Hat','Costume Beanie',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,160,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20120,'C_Antenna','Costume Aerial',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,97,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20121,'C_Lotus_Flower_Hat','Costume Flower Lily',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,324,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20122,'Happy_Summer_Ribbon','Costume Happy Summer Ribbon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1260,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20123,'C_Eagle_Eyes','Costume Eagle Eyes',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,63,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20124,'C_Masquerade','Costume Masquerade',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,78,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20125,'C_Mini_Glasses','Costume Mini Glasses',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,47,NULL,NULL,NULL);
@@ -10455,8 +10517,8 @@ REPLACE INTO `item_db_re` VALUES (20129,'C_Poporing_Cap','Costume Poporing Cap',
REPLACE INTO `item_db_re` VALUES (20130,'C_Whisper_Tall_Hat','Costume Whisper Tall Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1265,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20131,'C_C_Tower_Manager_Incom','Costume Clock Tower Manager',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,NULL,1,1266,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20132,'C_Subject_Aura','Costume Aura Vicious Mind',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1267,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20133,'C_Poring_Mascot','Costume Poring Mascot',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1268,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20134,'C_White_Helm_Of_Abyss','Costume White Helm Of Abyss',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1269,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20133,'C_Poring_Mascot_Costume','Costume Poring Mascot',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1268,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20134,'C_Helm_Of_Abyss_White','Costume White Helm Of Abyss',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1269,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20135,'C_12_Anniversary_Crown_Of_Saint','Costume 12 Anniversary Crown of Saint',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1117,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20136,'C_12_Anniversary_Elf_Ears','Costume 12 Anniversary Elf Ears',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,875,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20137,'C_Bomb_Wick','Costume Bomb Wick',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,66,NULL,NULL,NULL);
@@ -10468,8 +10530,8 @@ REPLACE INTO `item_db_re` VALUES (20142,'C_Machoman_Glasses','Costume Machoman G
REPLACE INTO `item_db_re` VALUES (20143,'C_Candy_Cane_In_Mouth','Costume Candy Cane In Mouth',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,665,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20144,'C_Ancient_Elven_Ear','Costume Ancient Elven Ear',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,665,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20145,'C_Robo_Eye','Costume Robo Eye',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,345,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20146,'C_Angel_Of_Ghost','Costume Angel of Ghost',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,394,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20147,'C_Bell_Of_Piegon','Costume Bell of Piegon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,1034,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20146,'C_Angel_Spirit','Costume Angel of Ghost',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,394,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20147,'C_Bell_Pigeon','Costume Bell of Piegon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,1034,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20148,'C_Musketeer_Hat','Costume Musketeer Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,466,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20149,'C_Hexagon_Glasses','Costume Hexagon Glasses',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,822,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20150,'C_Wind_Fan','Costume Wind Fan',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1051,NULL,NULL,NULL);
@@ -10479,11 +10541,11 @@ REPLACE INTO `item_db_re` VALUES (20153,'C_Monochrome_Cap','Costume Monochrome C
REPLACE INTO `item_db_re` VALUES (20154,'C_Maple_Which_Falls','Costume Maple Which Falls',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,NULL,1,1275,NULL,'sc_start SC_MAPLE_FALLS,-1,0;','sc_end SC_MAPLE_FALLS;');
REPLACE INTO `item_db_re` VALUES (20155,'C_Ladys_Feather_Hat','Costume Lady\'s Feather Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,NULL,1,1276,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20156,'C_Fan_in_Mouth','Costume Fan in Mouth',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,857,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20157,'C_Evolved_Blue_Fish','Costume Evolved Blue Fish',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,149,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20157,'C_Fish_On_Head','Costume Evolved Blue Fish',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,149,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20158,'C_Circlet','Costume Circlet',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,18,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20159,'C_Blue_Hairband','Costume Blue Hairband',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,136,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20160,'C_Magnolia_Hat','Costume Magnolia Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,373,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20161,'C_Army_Cap','Costume Army Cap',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,48,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20159,'C_Blue_Hair_Band','Costume Blue Hairband',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,136,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20160,'C_Fried_Egg','Costume Magnolia Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,373,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20161,'C_Prontera_Army_Cap','Costume Army Cap',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,48,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20162,'C_Fleece_Hat','Costume Fleece Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,7168,NULL,'1',1,1277,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20163,'C_Fleece_Hat_','Costume Fleece Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,7168,NULL,'1',1,1278,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20164,'C_Duneyrr_Hat','Costume Duneyrr Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,639,NULL,NULL,NULL);
@@ -10494,21 +10556,21 @@ REPLACE INTO `item_db_re` VALUES (20168,'C_Skull_Hood','Costume Skull Hood',4,0,
REPLACE INTO `item_db_re` VALUES (20169,'C_Long_Tongue','Costume Long Tongue',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,773,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20170,'C_Brown_Deviruchi_Cap','Costume Brown Deviruchi Cap',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,273,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20171,'C_Sepia_Cap','Costume Sepia Cap',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,NULL,1,1280,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20172,'C_Pumpkin_Hat','Costume Pumpkin Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1281,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20172,'C_Pumpkin_Head','Costume Pumpkin Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1281,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20173,'C_Lude_Hood','Costume Lude Hood',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1282,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20174,'C_Orange_Halloween_Hat','Costume Orange Halloween Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1283,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20174,'C_Halloween_Hat_Orange','Costume Orange Halloween Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1283,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20175,'C_Diabolic_Headphone','Costume Diabolic Headphone',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1284,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20176,'C_Happy_Pierrot_Mask','Costume Happy Pierrot Mask',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,6144,NULL,'1',1,1288,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20176,'Happy_Pierrot_Mask','Costume Happy Pierrot Mask',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,6144,NULL,'1',1,1288,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20177,'C_Drooping_Dorasuke','Costume Drooping Dorasuke',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1290,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20178,'C_Puppy_Love','Costume Puppy Love',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,94,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20179,'C_Monkey_Coat_Hat','Costume Monkey Coat Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,858,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20180,'C_Western_Grace','Costume Western Grace',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,32,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20181,'C_Mystic_Rose','Costume Mystic Rose',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,198,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20182,'C_Rainbow_Eggshell','Costume Rainbow Eggshell',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,124,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20183,'C_There\'s..Something..','Costume There\'s..Something..',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,3072,NULL,'1',1,1091,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20180,'C_Westren_Grace','Costume Western Grace',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,32,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20181,'C_Mistic_Rose','Costume Mystic Rose',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,198,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20182,'C_Mottled_Egg_Shell','Costume Rainbow Eggshell',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,124,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20183,'C_There_Is_Something','Costume There\'s..Something..',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,3072,NULL,'1',1,1091,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20184,'C_Party_Hat','Costume Party Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,144,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20185,'C_Fashionable_Glasses','Costume Fashionable Glasses',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,131,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20186,'C_Magni\'s_Cap','Costume Magni\'s Cap',4,20,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,'1',1,250,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20186,'C_Magni_Cap','Costume Magni\'s Cap',4,20,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,'1',1,250,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20187,'C_Fricca\'s_Circlet','Costume Fricca\'s Circlet',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,251,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20188,'C_Morpheus\'s_Hood','Costume Morpheus\'s Hood',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,256,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20189,'C_Goibne\'s_Helm','Costume Goibne\'s Helm',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,258,NULL,NULL,NULL);
@@ -10526,42 +10588,42 @@ REPLACE INTO `item_db_re` VALUES (20200,'C_Rabbit_Head_Dress','Costume Rabbit He
REPLACE INTO `item_db_re` VALUES (20201,'C_Banshee_Master_Kiss','Costume Banshee Master Kiss',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,959,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20202,'C_Deviruchi_Balloon','Costume Deviruchi Balloon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1082,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20203,'C_Bandana','Costume Bandana',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,6,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20204,'C_Hunter_Hat','Costume Hunter Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,389,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20204,'C_Hunting_Cap','Costume Hunter Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,389,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20205,'C_Fancy_Flower','Costume Fancy Flower',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,4,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20206,'C_Chicken_Hat','Costume Chicken Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,7168,NULL,'1',1,1296,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20207,'C_Striped_Hairband','Costume Striped Hairband',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,133,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20208,'C_Neck_Tie','Costume Neck Tie',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,443,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20209,'C_Mermaid_Bubbles','Costume Mermaid Bubbles',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1299,NULL,'sc_start SC_MERMAID_LONGING,-1,0;','sc_end SC_MERMAID_LONGING;');
+REPLACE INTO `item_db_re` VALUES (20207,'C_Stripe_Band','Costume Striped Hairband',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,133,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20208,'C_Necktie','Costume Neck Tie',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,443,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20209,'C_Mermaid_Longing','Costume Mermaid Bubbles',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1299,NULL,'sc_start SC_MERMAID_LONGING,-1,0;','sc_end SC_MERMAID_LONGING;');
REPLACE INTO `item_db_re` VALUES (20210,'C_Chicken_Hat_','Costume Chicken Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,7168,NULL,'1',1,1297,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20211,'C_Chicken_Hat__','Costume Chicken Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,7168,NULL,'1',1,1298,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20212,'C_Loki_&_Nidhoggur\'s_Hat','Costume Loki & Nidhoggur\'s Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1304,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20212,'C_Loki_Nidhogg_Hat','Costume Loki & Nidhoggur\'s Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1304,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20213,'C_Sirt_Evil_Eye','Costume Robot Eyes',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,345,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20214,'C_Evil_Marcher_Hat_J','Costume Evil Marcher Hat J',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1002,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20215,'C_Black_Devil_Mask','Costume Black Devil Mask',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,760,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20216,'C_Rideword_Hat','Costume Rideword Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,890,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20217,'C_Arabian_Veil','Costume Arabian Veil',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1300,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20218,'C_Spell_Circuit','Costume Spell Circuit',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,1,'1',1,1301,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20218,'C_Spell_Circuit','Costume Spell Circuit',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1301,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20219,'C_Angel_Marcher_Hat','Costume Angel Marcher Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1302,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20220,'C_Dark_Night_Veil','Costume Dark Night Veil',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,3072,1,'1',1,1303,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20220,'C_Dark_Night_Veil','Costume Dark Night Veil',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,3072,NULL,'1',1,1303,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20221,'C_Eyes_Of_Ifrit','C Eyes Of Ifrit',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,886,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20222,'C_Blue_Pigtail_Santa_Hat','Costume Blue Pigtail Santa Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,NULL,1,395,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20223,'C_Romantic_Leaf','Costume Romantic Leaf',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,57,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20222,'C_Santa_Hat_2','Costume Blue Pigtail Santa Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,NULL,1,395,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20223,'C_Centimental_Leaf','Costume Romantic Leaf',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,57,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20224,'C_Red_Tailed_Ribbon','Costume Red Tailed Ribbon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,167,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20225,'C_Pumpkin-Head','Costume Pumpkin-Head',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,206,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20226,'C_Red_Comb','Costume Red Comb',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,445,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20225,'C_Pumpkin_Hat','Costume Pumpkin-Head',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,206,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20226,'C_Hair_Brush','Costume Red Comb',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,445,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20227,'C_Husky_Hat','Costume Husky Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1016,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20228,'C_Pig_MoneyBox','Costume Pig MoneyBox',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,603,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20230,'C_Bankruptcy_Mask','Costume Bankruptcy Mask',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,6144,NULL,'1',1,936,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20230,'C_Mask_Of_Bankrupt','Costume Bankruptcy Mask',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,6144,NULL,'1',1,936,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20231,'C_Snowman_Hat','Costume Snowman Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,616,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20232,'C_Celines_Ribbon','Costume Celine Ribbon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,967,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20233,'C_Golden_Angel','Costume Golden Angel',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,646,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20233,'C_Gold_Angel_Sculpture','Costume Golden Angel',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,646,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20234,'C_Baphomet_Hat','Costume Baphomet Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,7168,NULL,'1',1,1311,'bonus bMaxHPrate,15; bonus bMaxSPrate,15; bonus2 bAddRace,RC_All,15; bonus2 bMagicAddRace,RC_All,15; bonus2 bAddItemHealRate,519,2015;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20235,'C_Frozen_Rose','Costume Frozen Rose',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1025,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20236,'C_Arc_Angeling_Hat','Costume Arc Angeling Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,241,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20237,'C_Pink_Beanie','Costume Pink Beanie',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,281,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20238,'C_Drooping_Blue_Cat','Costume Drooping Blue Cat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,277,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20235,'C_Frozen_Land_Rose','Costume Frozen Rose',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1025,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20236,'C_Hellomother_Hat','Costume Arc Angeling Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,241,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20237,'C_Pink_Fur_Hat','Costume Pink Beanie',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,281,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20238,'C_Blue_Drooping_Kitty','Costume Drooping Blue Cat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,277,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20239,'C_Large_Ribbon_Muffler','Costume Large Ribbon Muffler',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1312,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20240,'C_Gift_of_Snow','Costume Gift of Snow',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,NULL,'/*TODO: ViewID*/',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20240,'C_Gift_Of_Snow','Costume Gift of Snow',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,NULL,'/*TODO: ViewID*/',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20241,'C_Eclipse_Hat','Costume Eclipse Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,922,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20242,'C_Snownow_Hat','Costume Snownow Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1313,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20243,'C_Choco_Mint_Bonnet','Costume Choco Mint Bonnet',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1314,NULL,NULL,NULL);
@@ -10573,17 +10635,17 @@ REPLACE INTO `item_db_re` VALUES (20248,'C_Black_Strong_Hair','Costume Black Str
REPLACE INTO `item_db_re` VALUES (20249,'C_Red_Strong_Hair','Costume Red Strong Hair',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1316,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20250,'C_White_Strong_Hair','Costume White Strong Hair',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1317,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20251,'C_Rose_Cascade','Costume Rose Cascade',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,920,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20252,'C_Mage_Decoration','Costume Mage Decoration',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1150,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20253,'C_Drooping_Alicel','Costume Drooping Alicel',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,784,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20254,'C_Yellow_Ribbonn','Costume Yellow Ribbonn',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,243,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20255,'C_Love_Cheeks','Costume Love Cheeks',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,1318,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20256,'C_Honey_Pancake','Costume Honey Pancake',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1319,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20252,'C_Accessory_of_Ascetic','Costume Mage Decoration',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1150,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20253,'C_Droopy_Alice_Doll','Costume Drooping Alicel',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,784,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20254,'C_Ribbon_Yellow','Costume Yellow Ribbonn',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,243,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20255,'C_Love_Cheek','Costume Love Cheeks',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,1318,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20256,'C_Honey_Pancakes','Costume Honey Pancake',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1319,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20257,'C_Black_Rabbit_Bonnet','Costume Black Rabbit Bonnet',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1320,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20258,'C_Blue_Headdress','Costume Blue Headdress',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1321,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20258,'C_Blue_Head_Dress','Costume Blue Headdress',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1321,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20259,'C_Pink_Clover','Costume Pink Clover',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1322,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20260,'C_Stardust','Costume Stardust',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,81,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20262,'C_Fox_Ears_Drop_Ribbon','Costume Fox Ears Drop Ribbon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1070,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20263,'C_Sleeping_Cat_Hat_J','Costume Sleeping Cat Hat J',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,838,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20262,'C_Fox_Ears_Bell_Ribbon','Costume Fox Ears Drop Ribbon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1070,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20263,'C_Hat_Of_Drowsy_Cat','Costume Sleeping Cat Hat J',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,838,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20264,'C_Blood_Sucker','Costume Blood Sucker',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,893,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20265,'C_Bird_Nest_Hat','Costume Bird Nest Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,235,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20266,'C_Secret_Zipper','Costume Secret Zipper',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1324,NULL,NULL,NULL);
@@ -10592,7 +10654,7 @@ REPLACE INTO `item_db_re` VALUES (20268,'C_Sleep_Eclipse_Family','Costume Sleep
REPLACE INTO `item_db_re` VALUES (20269,'C_White_Fox_Ear_Ribbon','Costume White Fox Ear Ribbon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1327,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20270,'C_Gryphon_Wing_Ears','Costume Gryphon Wing Ears',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,1328,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20271,'C_Sunflower','Costume Sunflower',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,37,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20272,'C_Unicorn_Horn','Costume Unicorn Horn',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,42,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20272,'C_Snowy_Horn','Costume Unicorn Horn',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,42,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20273,'C_Soft_Sheep_Hat','Costume Soft Sheep Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,738,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20274,'C_Polar_Bear_Cap_J','Costume Polar Bear Cap J',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,966,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20277,'C_Balloon_Hat','Costume Balloon Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,385,NULL,NULL,NULL);
@@ -10602,8 +10664,8 @@ REPLACE INTO `item_db_re` VALUES (20280,'C_Well-Chewed_Pencil','Costume Well-Che
REPLACE INTO `item_db_re` VALUES (20281,'C_Kindergarten_Hat','Costume Kindergarten Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,977,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20282,'C_White_Student_Cap','Costume White Student Cap',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,877,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20283,'C_Over_Protector','Costume Over Protector',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1329,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20284,'C_Sakura_Hat','Costume Sakura Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1330,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20285,'C_Dancing_Fallen_Sakura','Costume Dancing Fallen Sakura',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1331,'hateffect HAT_EF_BLOSSOM_FLUTTERING,true;',NULL,'hateffect HAT_EF_BLOSSOM_FLUTTERING,false;');
+REPLACE INTO `item_db_re` VALUES (20284,'C_Cherry_Blossom_Hat','Costume Sakura Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1330,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20285,'C_Blossom_Fluttering','Costume Dancing Fallen Sakura',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1331,'hateffect HAT_EF_BLOSSOM_FLUTTERING,true;',NULL,'hateffect HAT_EF_BLOSSOM_FLUTTERING,false;');
REPLACE INTO `item_db_re` VALUES (20286,'C_Under_Rim_Glasses_Red','Costume Under Rim Glasses Red',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,1332,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20287,'C_Mans_Medal_Gold','Costume Man\'s Medal(Gold)',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1333,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20288,'C_Bijou_Hat','Costume Bijou Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1334,NULL,NULL,NULL);
@@ -10614,7 +10676,7 @@ REPLACE INTO `item_db_re` VALUES (20294,'C_Savage_Babe_Hat','Costume Savage Babe
REPLACE INTO `item_db_re` VALUES (20295,'C_Poring_Sunglasses','Costume Poring Sunglasses',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,954,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20296,'C_Yoyo_Hat','Costume Yoyo Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,391,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20297,'C_Cactus_Hat','Costume Cactus Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,615,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20298,'C_Happy_Lunatic_Hanging_Ear','Costume Happy Lunatic Hanging Ear',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,1340,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20298,'C_Happy_Lunatic_Ear','Costume Happy Lunatic Hanging Ear',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,1340,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20299,'C_Face_Crusher','Costume Face Crusher',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,6144,NULL,'1',1,1341,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20300,'C_Hill_Wind_Mask','Costume Hill Wind Mask',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,7168,NULL,'1',1,1342,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20301,'C_Golden_Savage_Hat','Costume Golden Savage Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,648,NULL,NULL,NULL);
@@ -10626,8 +10688,8 @@ REPLACE INTO `item_db_re` VALUES (20311,'C_Magical_Booster','Costume Magical Boo
REPLACE INTO `item_db_re` VALUES (20312,'C_Barons_Evil_Eye','Costume Baron\'s Evil Eye',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,989,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20313,'C_CD_in_Mouth','Costume CD in Mouth',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,815,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20314,'C_New_Wave_Sunglasses','Costume New Wave Sunglasses',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,856,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20315,'C_Analyze_Eye','Costume Analyze Eye',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,1,'1',1,1351,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20316,'C_Seraph_Wing_Helm','Costume Seraph Wing Helm',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,1,'1',1,1352,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20315,'C_Analyze_Eye','Costume Analyze Eye',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1351,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20316,'C_Seraph_Wing_Helm','Costume Seraph Wing Helm',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1352,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20317,'C_Nekomimi_Cyber_Headphone','Costume Nekomimi Cyber Headphone',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1353,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20318,'C_Charleston_Antenna','Costume Charleston Antenna',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,1354,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20319,'C_Crimson_Booster','Costume Crimson Booster',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,1355,NULL,NULL,NULL);
@@ -10635,8 +10697,8 @@ REPLACE INTO `item_db_re` VALUES (20320,'C_Red_Bandana','Costume Red Bandana',4,
REPLACE INTO `item_db_re` VALUES (20321,'C_Pterios_Fins','Costume Pterios Fins',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,1009,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20322,'C_Seal_Hat','Costume Seal Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,540,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20323,'C_Sparkling_Sound','Costume Sparkling Sound',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1074,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20324,'C_Pigeon_Hat','Costume Pigeon Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,1,'1',1,1362,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20325,'C_Little_Aquarium','Costume Little Aquarium',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,1,'1',1,1363,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20324,'C_Pigeon_Hat','Costume Pigeon Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1362,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20325,'C_Little_Aquarium','Costume Little Aquarium',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,1363,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20326,'C_Sailor_Collar','Costume Sailor Collar',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1364,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20327,'C_Marine_Cap','Costume Marine Cap',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1365,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20328,'C_Mackerel_Pike','Costume Mackerel Pike',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1081,NULL,NULL,NULL);
@@ -10684,7 +10746,7 @@ REPLACE INTO `item_db_re` VALUES (20374,'C_Mechanical_Plant_Hat','Costume Mechan
REPLACE INTO `item_db_re` VALUES (20375,'C_Ignis_Cap','Costume Ignis Cap',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,803,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20376,'C_Memory_of_Lovers','Costume Memory of Lovers',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,1072,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20377,'C_Flight_Cap','Costume Flight Cap',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,820,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20378,'C_Sky_Met','Costume Sky Met',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,868,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20378,'C_Skymet','Costume Sky Met',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,868,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20379,'C_Pocketwatch_Hair_Ornament','Costume Pocketwatch Hair Ornament',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1404,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20380,'C_Mechanical_Feather_Hairband','Costume Mechanical Feather Hairband',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1405,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20381,'C_Steampunk_Hat','Costume Steampunk Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1406,NULL,NULL,NULL);
@@ -10696,7 +10758,7 @@ REPLACE INTO `item_db_re` VALUES (20392,'C_Sniper_Google','Costume Sniper Google
REPLACE INTO `item_db_re` VALUES (20393,'C_Schmitz_Helm','Costume Schmitz Helm',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,634,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20394,'C_Pumpkin_Toque','Costume Pumpkin Toque',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1411,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20396,'C_Green_Hat','Costume Green Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,939,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20397,'Jack','Jack',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,6144,NULL,'1',1,1415,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20397,'C_Jakk','Jack',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,6144,NULL,'1',1,1415,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20398,'C_Niffleheim_Bunny_Hat','Costume Niffleheim Bunny Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1285,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20399,'C_Crow_Tengu_Mask','Costume Crow Tengu Mask',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,1287,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20400,'C_Ichthys_Rosario','Costume Ichthys Rosario',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1028,NULL,NULL,NULL);
@@ -10709,19 +10771,19 @@ REPLACE INTO `item_db_re` VALUES (20406,'C_Commandments_Of_Chain','Costume Chain
REPLACE INTO `item_db_re` VALUES (20407,'C_Subject_Aura_Red','Costume Vicious Mind Aura Crimson',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1418,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20408,'C_Requiem_Crown_of_Light_and_Dark','Costume Requiem Crown of Light and Dark',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1419,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20409,'C_There_is_Something_','Costume There is Something',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1091,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20416,'C_Grade_1_Balloon','Costume Grade 1 Balloon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1426,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20417,'C_Grade_2_Balloon','Costume Grade 2 Balloon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1427,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20418,'C_Grade_3_Balloon','Costume Grade 3 Balloon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1428,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20419,'C_Grade_4_Balloon','Costume Grade 4 Balloon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1429,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20420,'C_Grade_5_Balloon','Costume Grade 5 Balloon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1430,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20421,'C_Grade_6_Balloon','Costume Grade 6 Balloon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1431,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20422,'C_Grade_7_Balloon','Costume Grade 7 Balloon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1432,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20423,'C_Grade_8_Balloon','Costume Grade 8 Balloon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1433,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20424,'C_Grade_9_Balloon','Costume Grade 9 Balloon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1434,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20425,'C_Grade_10_Balloon','Costume Grade 10 Balloon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1435,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20426,'C_Grade_11_Balloon','Costume Grade 11 Balloon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1436,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20427,'C_Grade_12_Balloon','Costume Grade 12 Balloon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1437,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20428,'C_Grade_13_Balloon','Costume Grade 13 Balloon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1438,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20416,'C_1Grade_Balloon','Costume Grade 1 Balloon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1426,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20417,'C_2Grade_Balloon','Costume Grade 2 Balloon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1427,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20418,'C_3Grade_Balloon','Costume Grade 3 Balloon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1428,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20419,'C_4Grade_Balloon','Costume Grade 4 Balloon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1429,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20420,'C_5Grade_Balloon','Costume Grade 5 Balloon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1430,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20421,'C_6Grade_Balloon','Costume Grade 6 Balloon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1431,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20422,'C_7Grade_Balloon','Costume Grade 7 Balloon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1432,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20423,'C_8Grade_Balloon','Costume Grade 8 Balloon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1433,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20424,'C_9Grade_Balloon','Costume Grade 9 Balloon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1434,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20425,'C_10Grade_Balloon','Costume Grade 10 Balloon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1435,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20426,'C_11Grade_Balloon','Costume Grade 11 Balloon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1436,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20427,'C_12Grade_Balloon','Costume Grade 12 Balloon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1437,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20428,'C_13Grade_Balloon','Costume Grade 13 Balloon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1438,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20429,'C_Piamette_Bowtie','Costume Piamette Bowtie',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',1,1439,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20430,'C_Loyal_Servant_of_Devil_Morocc','Costume Loyal Servant of Devil Morocc',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',1,1440,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20431,'C_Magician_Headdress','Costume Magician Headdress',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,1441,NULL,NULL,NULL);
@@ -10755,8 +10817,8 @@ REPLACE INTO `item_db_re` VALUES (20464,'C_Monochrome_Ribbon_Hat','Costume Monoc
REPLACE INTO `item_db_re` VALUES (20465,'C_Glasses_Without_Lens','Costume Glasses Without Lens',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1467,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20466,'C_Crimson_Ribbon','Costume Crimson Ribbon',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1468,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20467,'C_Elemental_Crown','Costume Elemental Crown',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1219,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20468,'You_in_ONE','You in ONE',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,7168,NULL,'1',0,1462,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20470,'C_Sweet_Chocolate_Hat','Costume Sweet Chocolate Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1469,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20468,'C_Youinone_Mask','You in ONE',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,7168,NULL,'1',0,1462,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20470,'C_SweetChocolate_Hat','Costume Sweet Chocolate Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1469,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20490,'C_Full_Blossom_Sakura_Hairpin_Blue','Costume Full Blossom Sakura Hairpin Blue',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1476,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20491,'C_Laser_of_Eagle','Costume Laser of Eagle',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1424,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20492,'C_Unidentified_Flying_Poring','Costume Unidentified Flying Poring',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1017,NULL,NULL,NULL);
@@ -10776,48 +10838,52 @@ REPLACE INTO `item_db_re` VALUES (20507,'C_Poring_Bag','Costume Poring Bag',4,0,
REPLACE INTO `item_db_re` VALUES (20508,'C_Poster_Girl_Hat','Costume Poster Girl Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1446,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20509,'C_Wings_of_Uriel','Costume Wings of Uriel',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,8192,NULL,'1',0,17,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20510,'C_SwordWing','Costume Sword Wing',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,8192,NULL,'1',0,19,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20511,'C_Blue_Fairy_Wing','Blue Wings of Fairy',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,8192,NULL,'1',0,21,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20512,'C_Bag_of_Adventurer_j','Costume Adventurer\'s Backpack',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,8192,NULL,'1',0,2,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20514,'C_Thanatos_Sword','Costume Thanatos Sword',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,8192,NULL,'1',0,23,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20516,'C_Wings_of_Michael','Costume Wings of Michael',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,8192,NULL,'1',0,24,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20600,'Fantastic_Aura','Fantastic Aura',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,8192,NULL,'1',0,0,'/*TODO: View ID*/ bonus bUnbreakableHelm,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20700,'Egir_Manteau','Egir Manteau',4,200000,NULL,300,NULL,10,NULL,1,0xFFFFFFFF,63,2,4,NULL,'110',1,0,'bonus bUnbreakableGarment,1; .@r = getrefine(); if (.@r > 10) .@r = 10; if (BaseClass == Job_Mage || BaseClass == Job_Archer || BaseClass == Job_Acolyte) { bonus bFlee2,5+(.@r*2); } else if (BaseClass == Job_Swordman || BaseClass == Job_Merchant || BaseClass == Job_Thief) { bonus bShortWeaponDamageReturn,5+(.@r*2); }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20702,'TE_Woe_Muffler','TE Woe Muffler',4,0,NULL,0,NULL,5,NULL,0,0xFFFFFFFF,63,2,4,1,'40',1,NULL,'bonus bMdef,5; bonus2 bAddRace,RC_Player,5; bonus2 bMagicAddRace,RC_Player,5; bonus2 bResEff,Eff_Freeze,25;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20703,'TE_Woe_Manteau','TE Woe Manteau',4,0,NULL,0,NULL,10,NULL,0,0x000444A2,63,2,4,1,'40',1,NULL,'bonus2 bAddRace,RC_Player,10; bonus2 bResEff,Eff_Freeze,25;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20704,'TE_Woe_Magic_Manteau','TE Woe Magic Manteau',4,0,NULL,0,NULL,5,NULL,0,0x00818315,63,2,4,1,'40',1,NULL,'bonus2 bMagicAddRace,RC_Player,10; bonus2 bResEff,Eff_Freeze,25;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20702,'TE_Woe_Muffler','TE Woe Muffler',4,0,NULL,0,NULL,5,NULL,0,0xFFFFFFFF,63,2,4,NULL,'40',1,NULL,'bonus bMdef,5; bonus2 bAddRace,RC_Player,5; bonus2 bMagicAddRace,RC_Player,5; bonus2 bResEff,Eff_Freeze,25;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20703,'TE_Woe_Manteau','TE Woe Manteau',4,0,NULL,0,NULL,10,NULL,0,0x000444A2,63,2,4,NULL,'40',1,NULL,'bonus2 bAddRace,RC_Player,10; bonus2 bResEff,Eff_Freeze,25;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20704,'TE_Woe_Magic_Manteau','TE Woe Magic Manteau',4,0,NULL,0,NULL,5,NULL,0,0x00818315,63,2,4,NULL,'40',1,NULL,'bonus2 bMagicAddRace,RC_Player,10; bonus2 bResEff,Eff_Freeze,25;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20706,'Amistr_Bag','Amistr Bag',4,10,NULL,500,NULL,18,NULL,0,0xFFFFFFFF,63,2,4,NULL,'1',NULL,4,'bonus bAllStats,1; bonus2 bSubEle,Ele_All,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20707,'Kirin_Wing','Kirin Wing',4,20,NULL,0,NULL,18,NULL,0,0xFFFFFFFF,63,2,4,NULL,'0',1,6,'bonus bAllStats,1; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player,5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20709,'Mana_Manteau','Mana Manteau',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4,0,'1',1,NULL,'bonus2 bExpAddRace,RC_All,10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20709,'Mana_Manteau','Mana Manteau',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4,NULL,'1',1,NULL,'bonus2 bExpAddRace,RC_All,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20710,'Impr_Angel\'s_Warmth','Advanced Angelic Cardigan',4,10000,NULL,400,NULL,6,NULL,1,0x00000001,63,2,4,NULL,'99',1,0,'bonus bHPrecovRate,50;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20711,'Manteau_Of_Diego','Manteau Of Diego',4,20,NULL,600,NULL,15,NULL,1,0xFFFFFFFF,63,2,4,NULL,'0',1,0,'bonus bInt,1; bonus bDex,1; bonus bMdef,3;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20717,'Gigant_Snake_Skin','Gigant Snake Skin',4,10,NULL,400,NULL,38,NULL,0,0xFFFFFFFF,63,2,4,NULL,'1',1,0,'bonus bMdef,10;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20718,'Gigant_Snake_Skin_','Gigant Snake Skin',4,10,NULL,400,NULL,38,NULL,1,0xFFFFFFFF,63,2,4,NULL,'1',1,0,'bonus bMdef,10;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20721,'Manteau_of_Gray','Manteau of Gray',4,10,NULL,600,NULL,45,NULL,1,0xFFFFFFFF,63,2,4,NULL,'120',1,0,'bonus2 bSubEle,Ele_Holy,5+(getrefine()/2);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20717,'FaceWorm_Skin','Gigant Snake Skin',4,10,NULL,400,NULL,38,NULL,0,0xFFFFFFFF,63,2,4,NULL,'1',1,0,'bonus bMdef,10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20718,'FaceWorm_Skin_','Gigant Snake Skin',4,10,NULL,400,NULL,38,NULL,1,0xFFFFFFFF,63,2,4,NULL,'1',1,0,'bonus bMdef,10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20721,'Cloak_Of_Gray','Cloak of Gray',4,20,NULL,600,NULL,45,NULL,1,0xFFFFFFFF,56,2,4,NULL,'120',1,0,'bonus2 bSubEle,Ele_Holy,5+getrefine()/2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20724,'Love_Dad_Wings_2012','Love Dad Wings 2012',4,0,NULL,100,NULL,15,NULL,1,0xFFFFFFFF,63,2,4,NULL,'1',1,5,'.@r = getrefine(); if ((readparam(bStr)>89)) { bonus bAllStats,1; bonus bStr,.@r; bonus bMaxHPRate,1; bonus bMaxSPRate,1; } if ((readparam(bAgi)>89)) { bonus bAllStats,1; bonus bAgi,.@r; bonus bMaxHPRate,1; bonus bMaxSPRate,1; } if ((readparam(bVit)>89)) { bonus bAllStats,1; bonus bVit,.@r; bonus bMaxHPRate,1; bonus bMaxSPRate,1; } if ((readparam(bInt)>89)) { bonus bAllStats,1; bonus bInt,.@r; bonus bMaxHPRate,1; bonus bMaxSPRate,1; } if ((readparam(bDex)>89)) { bonus bAllStats,1; bonus bDex,.@r; bonus bMaxHPRate,1; bonus bMaxSPRate,1; } if ((readparam(bLuk)>89)) { bonus bAllStats,1; bonus bLuk,.@r; bonus bMaxHPRate,1; bonus bMaxSPRate,1; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20725,'Ribbon_Piamat','Ribbon Piamat',4,10,NULL,100,'0:10',NULL,NULL,1,0xFFFFFFFF,63,2,4,NULL,'30',1,7,'bonus bInt,1; bonus bDex,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20727,'Brilliant_Golden_Wings','Brilliant Golden Wings',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,8192,NULL,'1',1,5,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20730,'Loyalists_Hood','Loyalists Hood',4,10,NULL,200,NULL,30,NULL,1,0xFFFFFFFF,63,2,8192,NULL,'80',NULL,NULL,'bonus bStr,2; bonus bMaxHPrate,10; bonus bNoKnockback,1; bonus2 bSubEle,Ele_All,-20;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20732,'Supplement_Part_Con','Supplement Part Con',4,25000,NULL,500,NULL,20,NULL,1,0x00000400,56,2,4,NULL,'100',1,NULL,'.@r = getrefine(); bonus bMaxHPrate,6+(.@r/2); if(.@r>=9){bonus bHPrecovRate,50;}',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20733,'Reinforced_Parts_Engine','Reinforced Parts - Engine',4,10,NULL,1500,NULL,25,NULL,1,0x00000400,56,2,4,NULL,'100',1,NULL,'bonus bDelayrate,-10; .@r = getrefine(); if(.@r>=7) {bonus2 bSubEle,0,10;}; if(.@r>=9) {bonus bDelayrate,-10;}',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20733,'Upgrade_Part_Engine','Reinforced Parts - Engine',4,10,NULL,1500,NULL,25,NULL,1,0x00000400,56,2,4,NULL,'100',1,NULL,'bonus bDelayrate,-10; .@r = getrefine(); if(.@r>=7) {bonus2 bSubEle,0,10;}; if(.@r>=9) {bonus bDelayrate,-10;}',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20737,'C_Kirin_Wing','Costume Kirin Wing',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,8192,NULL,'1',0,6,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20743,'Cloak_Of_Airship','Cloak Of Airship',4,10,NULL,0,NULL,25,NULL,1,0xFFFFFFFF,63,2,4,NULL,'125',0,NULL,'bonus2 bSubEle,Ele_Neutral,10; bonus bFlee,20; bonus bVariableCastrate,-20;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20744,'Tarlock\'s_Cloak','Tarlock\'s Cloak',4,10,NULL,400,NULL,12,NULL,1,0xFFFFFFFF,63,2,4,NULL,'125',1,NULL,'bonus2 bSubEle,Ele_Neutral,10; bonus bFlee,20; bonus bVariableCastrate,-10; .@r = getrefine(); if(.@r>=7) { bonus bVariableCastrate,-10; } if(.@r>=9) { bonus bVariableCastrate,-10;} if(.@r>=12) { bonus bVariableCastrate,-5; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20746,'C_Rudra_Wings','Costume Rudra Wings',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,8192,NULL,'1',0,8,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20748,'Cloak_Of_Casualties','Cloak Of Casualties',4,10,NULL,600,NULL,20,NULL,0,0xFFFFFFFF,63,2,4,NULL,'120',1,NULL,'.@r = getrefine(); bonus bAgi,5; bonus bFlee,10; if(readparam(bStr)>=90) bonus bBaseAtk,10+(.@r*2); if(readparam(bInt)>=90) bonus bMatk,20+(.@r*3); if(readparam(bVit)>=90) bonus2 bSubEle,Ele_Neutral,3+((.@r>=8)?3:0)+((.@r>=10)?4:0); if(readparam(bAgi)>=90){ bonus bAspdRate,3+(.@r/2); bonus bAspd,((.@r>=10)?1:0); } if(readparam(bDex)>=90) bonus bLongAtkRate,3+(.@r/2); if(readparam(bLuk)>=90) bonus bCriticalRate,5+.@r;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20749,'Cloak_Of_Casualties_','Cloak Of Casualties',4,10,NULL,600,NULL,30,NULL,1,0xFFFFFFFF,63,2,4,NULL,'170',1,NULL,'.@r = getrefine(); bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus bAgi,5; bonus bFlee,10; if(readparam(bStr)>=90) bonus bBaseAtk,10+(.@r*2); if(readparam(bInt)>=90) bonus bMatk,20+(.@r*3); if(readparam(bVit)>=90) bonus2 bSubEle,Ele_Neutral,3+((.@r>=8)?3:0)+((.@r>=10)?4:0); if(readparam(bAgi)>=90){ bonus bAspdRate,3+(.@r/2); bonus bAspd,((.@r>=10)?1:0); } if(readparam(bDex)>=90) bonus bLongAtkRate,3+(.@r/2); if(readparam(bLuk)>=90) bonus bCriticalRate,5+.@r;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20753,'Lian_Robe','Lian Robe',4,0,NULL,700,NULL,20,1,1,0xFFFFFFFF,63,2,4,0,'65',1,NULL,'bonus2 bSubEle,Ele_Neutral,5; bonus2 bSubRace,RC_Formless,-5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20743,'Airship_Cape','Cloak Of Airship',4,10,NULL,0,NULL,25,NULL,1,0xFFFFFFFF,63,2,4,NULL,'125',0,NULL,'bonus2 bSubEle,Ele_Neutral,10; bonus bFlee,20; bonus bVariableCastrate,-20;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20744,'Felock_Cape','Tarlock\'s Cloak',4,10,NULL,400,NULL,12,NULL,1,0xFFFFFFFF,63,2,4,NULL,'125',1,NULL,'bonus2 bSubEle,Ele_Neutral,10; bonus bFlee,20; bonus bVariableCastrate,-10; .@r = getrefine(); if(.@r>=7) { bonus bVariableCastrate,-10; } if(.@r>=9) { bonus bVariableCastrate,-10;} if(.@r>=12) { bonus bVariableCastrate,-5; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20746,'C_Rudra_Wing','Costume Rudra Wings',4,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,8192,NULL,'1',0,8,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20748,'Manteau_Of_Fallen','Cloak Of Casualties',4,10,NULL,600,NULL,20,NULL,0,0xFFFFFFFF,63,2,4,NULL,'120',1,NULL,'.@r = getrefine(); bonus bAgi,5; bonus bFlee,10; if(readparam(bStr)>=90) bonus bBaseAtk,10+(.@r*2); if(readparam(bInt)>=90) bonus bMatk,20+(.@r*3); if(readparam(bVit)>=90) bonus2 bSubEle,Ele_Neutral,3+((.@r>=8)?3:0)+((.@r>=10)?4:0); if(readparam(bAgi)>=90){ bonus bAspdRate,3+(.@r/2); bonus bAspd,((.@r>=10)?1:0); } if(readparam(bDex)>=90) bonus bLongAtkRate,3+(.@r/2); if(readparam(bLuk)>=90) bonus bCriticalRate,5+.@r;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20749,'Manteau_Of_Fallen_','Cloak Of Casualties',4,10,NULL,600,NULL,30,NULL,1,0xFFFFFFFF,63,2,4,NULL,'170',1,NULL,'.@r = getrefine(); bonus bMaxHPrate,.@r/2; bonus bMaxSPrate,.@r/2; bonus bAgi,5; bonus bFlee,10; if(readparam(bStr)>=90) bonus bBaseAtk,10+(.@r*2); if(readparam(bInt)>=90) bonus bMatk,20+(.@r*3); if(readparam(bVit)>=90) bonus2 bSubEle,Ele_Neutral,3+((.@r>=8)?3:0)+((.@r>=10)?4:0); if(readparam(bAgi)>=90){ bonus bAspdRate,3+(.@r/2); bonus bAspd,((.@r>=10)?1:0); } if(readparam(bDex)>=90) bonus bLongAtkRate,3+(.@r/2); if(readparam(bLuk)>=90) bonus bCriticalRate,5+.@r;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20753,'Lian_Robe','Lian Robe',4,0,NULL,700,NULL,20,1,1,0xFFFFFFFF,63,2,4,NULL,'65',1,NULL,'bonus2 bSubEle,Ele_Neutral,5; bonus2 bSubRace,RC_Formless,-5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20756,'Aegir_Cloak','Aegir Cloak',4,10,NULL,300,NULL,10,NULL,1,0xFFFFFFFF,63,2,4,NULL,'40',1,NULL,'bonus bUnbreakableGarment,1; bonus bMaxHP,500; bonus bMaxSP,50;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20761,'C_Happiness_Wings','Costume Happiness Wings',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,8192,NULL,'1',0,9,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20762,'C_Great_Devil_Wings','Costume Great Devil Wings',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,8192,NULL,'1',0,10,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20761,'C_Wing_Of_Happiness','Costume Happiness Wings',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,8192,NULL,'1',0,9,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20762,'C_GreatDevilWing','Costume Great Devil Wings',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,8192,NULL,'1',0,10,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20763,'C_Amistr_Bag','Costume Amistr Bag',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,8192,NULL,'1',0,4,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20764,'C_Fallen_Angel_Wing','Costume Fallen Angel Wing',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,8192,NULL,'1',0,3,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20779,'Rift_Manteau','Rift Manteau',4,20,NULL,500,NULL,16,NULL,1,0xFFFFFFFF,63,2,4,NULL,'100',1,NULL,'.@r = getrefine(); bonus bMaxHP,(.@r >= 9 ? 1300 : .@r >= 7 ? 700 : 300); bonus bMaxSP,-50;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20780,'Unity_STR_Manteau','Unity STR Manteau',4,32000,NULL,300,NULL,20,NULL,1,0xFFFFFFFF,63,2,4,NULL,'1',1,0,'.@r = getrefine(); if(BaseLevel<100) { bonus2 bExpAddRace,RC_All,4; bonus bMaxHPrate,2*(.@r/2); }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20781,'Unity_AGI_Manteau','Unity AGI Manteau',4,32000,NULL,300,NULL,20,NULL,1,0xFFFFFFFF,63,2,4,NULL,'1',1,0,'.@r = getrefine(); if(BaseLevel<100) { bonus2 bExpAddRace,RC_All,4; bonus bFlee,3*(.@r/2); }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20782,'Unity_INT_Muffler','Unity INT Muffler',4,32000,NULL,300,NULL,20,NULL,1,0xFFFFFFFF,63,2,4,NULL,'1',1,0,'.@r = getrefine(); if(BaseLevel<100) { bonus2 bExpAddRace,RC_All,4; bonus bUseSPrate,-(.@r/2); }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20783,'Hero_Cape','Hero Cape',4,0,NULL,100,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,4,1,'10',1,NULL,'.@r = getrefine(); bonus2 bSubEle,Ele_Neutral,1+(.@r/3); bonus bFlee,1+(.@r/3); if (.@r > 9) { bonus2 bSubEle,Ele_Neutral,20; bonus bFlee,20; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20783,'Hero_Cape','Hero Cape',4,0,NULL,100,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,4,NULL,'10',1,NULL,'.@r = getrefine(); bonus2 bSubEle,Ele_Neutral,1+(.@r/3); bonus bFlee,1+(.@r/3); if (.@r > 9) { bonus2 bSubEle,Ele_Neutral,20; bonus bFlee,20; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20787,'Unity_Exquisite_Muffler','Unity Exquisite Muffler',4,32000,NULL,300,NULL,20,NULL,1,0xFFFFFFFF,63,2,4,NULL,'1',1,0,'.@r = getrefine(); if(BaseLevel<100) { bonus2 bExpAddRace,RC_All,4; bonus bCritical,2*(.@r/2); }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20788,'Private_Doram_Manteau','Private Doram Manteau',4,20,NULL,300,NULL,20,NULL,1,0x80000000,7,2,4,NULL,'100',1,NULL,'bonus bFlee,5; bonus2 bSubEle,Ele_Neutral,2; bonus bFlee2,getrefine()/3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20789,'Luxury_Doram_Manteau','Luxury Doram Manteau',4,20,NULL,400,NULL,25,NULL,1,0x80000000,7,2,4,NULL,'140',1,NULL,'bonus bFlee,7; bonus2 bSubEle,Ele_Neutral,3; .@r = getrefine()/3; bonus bFlee2,.@r; bonus bLuk,.@r;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20790,'Elegant_Doram_Manteau','Elegant Doram Manteau',4,20,NULL,500,NULL,30,NULL,1,0x80000000,7,2,4,NULL,'175',1,NULL,'bonus bFlee,10; bonus2 bSubEle,Ele_Neutral,5; .@r = getrefine()/2; bonus bFlee2,.@r; bonus bInt,.@r; bonus bDex,.@r; bonus bLuk,.@r;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20797,'Etran_Shirt','Etran Shirt',4,0,NULL,150,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,4,1,'1',1,NULL,'bonus bMdef,10; bonus bMaxHPrate,2; .@r = getrefine(); if (.@r >= 6) bonus bMaxHPrate,4; if (.@r >= 7) bonus bMaxHPrate,6; if (.@r >= 8) bonus bMaxHPrate,8; if (.@r >= 9) bonus bNoKnockback,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (20798,'C_Grim_Reaper_Protection','Costume Grim Reaper Protection',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1450,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20797,'Etran_Shirt','Etran Shirt',4,0,NULL,150,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,4,NULL,'1',1,NULL,'bonus bMdef,10; bonus bMaxHPrate,2; .@r = getrefine(); if (.@r >= 6) bonus bMaxHPrate,4; if (.@r >= 7) bonus bMaxHPrate,6; if (.@r >= 8) bonus bMaxHPrate,8; if (.@r >= 9) bonus bNoKnockback,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20798,'GrimReaper_Protection','Costume Grim Reaper Protection',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1450,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20815,'SeraphimRobe','Seraphim Robe',4,0,NULL,300,NULL,18,NULL,1,0xFFFFFFFF,63,2,4,NULL,'1',1,NULL,'bonus bMaxHPrate,10; bonus2 bMagicAtkEle,Ele_Neutral,5; .@r = getrefine(); if (.@r > 6) { bonus2 bSubEle,Ele_Dark,20; bonus2 bSubEle,Ele_Holy,20; bonus bMatkRate,10; } if (.@r > 8) { bonus2 bSubEle,Ele_Dark,10; bonus2 bSubEle,Ele_Holy,10; bonus bVariableCastrate,-5; } if (getskilllv("CR_TRUST") > 0) { bonus2 bSubEle,Ele_Holy,.@r*3; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20819,'Oxygen_Bottle','Oxygen Bottle',4,0,NULL,500,NULL,0,NULL,1,0xFFFFFFFF,63,2,4,NULL,'40',0,0,'bonus bFlee,12+getrefine(); bonus bHit,getrefine();',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (20823,'Para_Team_Manteau100','Awakened Eden Group Manteau I',4,0,NULL,0,NULL,20,NULL,0,0xFFFFFFFF,63,2,4,NULL,'100',1,0,'bonus2 bSubEle,Ele_Neutral,10; bonus bFlee,12; .@r = getrefine(); if(.@r >= 7){ bonus bMaxHP,500; bonus bFlee2,2; if(.@r >= 9){ bonus bMaxHP,500; bonus2 bSubEle,Ele_All,10; bonus2 bSubEle,Ele_Neutral,-10; } }',NULL,NULL);
@@ -10835,11 +10901,11 @@ REPLACE INTO `item_db_re` VALUES (21003,'Muramasa_','Muramasa',5,20,NULL,1000,'1
REPLACE INTO `item_db_re` VALUES (21004,'Alca_Bringer_','Alca Bringer',5,20,NULL,3400,'280',NULL,2,2,0x00004082,63,2,34,3,'100',1,3,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (21005,'Metal_Two_Hand_Sword','Metal Two Hand Sword',5,20,NULL,0,'95',NULL,1,1,0x00004082,63,2,34,3,'1',1,3,'.@r = getrefine(); bonus bBaseAtk,(.@r*6); bonus bMatk,(.@r*2); .@i = min(BaseLevel/10,12); if(.@i>2) bonus bBaseAtk,((.@i-2)*5);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (21006,'TE_Woe_Two_Hand_Sword','TE Woe Two Hand Sword',5,0,NULL,0,'150',NULL,1,0,0x00004082,63,2,34,3,'40',1,3,'bonus2 bAddRace,RC_Player,40; bonus2 bAddEff,Eff_Bleeding,3000;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (21007,'Heavy_Greatsword','Heavy Greatsword',5,20,NULL,2500,'330',NULL,1,1,0x00004082,63,2,34,1,'150',1,3,'bonus bStr,20;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (21007,'Heavy_Sword','Heavy Greatsword',5,20,NULL,2500,'330',NULL,1,1,0x00004082,63,2,34,1,'150',1,3,'bonus bStr,20;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (21008,'Small_Karasuma','Small Karasuma',5,20,NULL,1000,'170',NULL,1,2,0x00004082,63,2,34,4,'50',1,3,'bonus bCritAtkRate,getrefine()*2; bonus3 bAutoSpell,"NPC_CRITICALWOUND",1,50;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (21009,'Thanos_Great_Sword','Thanatos Great Sword',5,10,NULL,1300,'280:120',NULL,1,1,0x00004082,63,2,34,4,'120',1,3,'bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000;',NULL,'heal -1000,0;');
+REPLACE INTO `item_db_re` VALUES (21009,'Thanos_Great_Sword','Thanatos Great Sword',5,10,NULL,1300,'280:120',NULL,1,1,0x00004082,56,2,34,4,'120',1,3,'bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000;',NULL,'heal -1000,0;');
REPLACE INTO `item_db_re` VALUES (21010,'Tw_Sword_Of_Evil_Slayer','Evil Slayer Slasher Sword',5,10,NULL,2000,'225',NULL,1,1,0x00004082,63,2,34,3,'100',1,3,'bonus2 bAddRace,RC_Demon,10; bonus2 bAddRace,RC_Undead,10; .@r = getrefine(); bonus2 bAddClass,Class_All,(.@r>=12?12:(.@r>=9?5:0));',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (21011,'Gigantic_Blade','Gigantic Blade',5,10,NULL,5000,'300',NULL,1,1,0x00004082,56,2,34,4,'130',1,3,'bonus bUnbreakableWeapon,1; bonus bAspdRate,-5; bonus bCritAtkRate,getrefine(); if(readparam(bStr)<=110){ bonus bAtk,-250; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (21011,'Giant_Blade','Gigantic Blade',5,10,NULL,5000,'300',NULL,1,1,0x00004082,56,2,34,4,'130',1,3,'bonus bUnbreakableWeapon,1; bonus bAspdRate,-5; bonus bCritAtkRate,getrefine(); if(readparam(bStr)<=110){ bonus bAtk,-250; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (21012,'Some_Wizard_MagicSword','Some Wizard MagicSword',5,0,NULL,2200,'200:150',NULL,1,2,0x00000080,56,2,34,4,'110',1,3,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (21013,'Hetairoi_Sword','Hetairoi Sword',5,0,NULL,2200,'210',NULL,1,2,0x00000080,56,2,34,4,'110',1,3,'bonus2 bSkillUseSP,"KN_AUTOCOUNTER",2; bonus2 bSkillUseSP,"LK_PARRYING",25;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (21014,'Infinity_Two-Handed_Sword','Infinity Two-Handed Sword',5,20,NULL,500,'230',NULL,1,1,0x00004082,56,2,34,4,'100',1,3,NULL,NULL,NULL);
@@ -10850,38 +10916,38 @@ REPLACE INTO `item_db_re` VALUES (21019,'Onimaru','Onimaru',5,0,NULL,4200,'75',N
#===================================================================
# New Shoes
#===================================================================
-REPLACE INTO `item_db_re` VALUES (22000,'Temporal_STR_Boots','Temporal Boots Of Strength',4,20,NULL,600,NULL,25,NULL,0,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bAtk,7*(.@r/3); if(readparam(bStr)>=120) bonus bBaseAtk,50;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22001,'Temporal_INT_Boots','Temporal Boots Of Intelligence',4,20,NULL,600,NULL,20,NULL,0,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMdef,5; bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bMatk,10*(.@r/3); if(readparam(bInt)>=120) bonus bMatk,60;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22002,'Temporal_AGI_Boots','Temporal Boots Of Agility',4,20,NULL,600,NULL,25,NULL,0,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bAspdRate,3*(.@r/3); if(readparam(bAgi)>=120) bonus bAspd,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22003,'Temporal_VIT_Boots','Temporal Boots Of Vitality',4,20,NULL,600,NULL,25,NULL,0,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(300*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); if(readparam(bVit)>=120) bonus bMaxHPrate,8;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22004,'Temporal_DEX_Boots','Temporal Boots Of Dexterity',4,20,NULL,600,NULL,25,NULL,0,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bDex,3*(.@r/3); if(readparam(bDex)>=120){ bonus bLongAtkRate,5; bonus bFixedCast,-500; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22005,'Temporal_LUK_Boots','Temporal Boots Of Luck',4,20,NULL,600,NULL,20,NULL,0,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bMdef,5; bonus bCritAtkRate,2*(.@r/3); if(readparam(bLuk)>=120) bonus bCritAtkRate,30;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22006,'Temporal_STR_Boots_','Temporal Boots Of Strength',4,20,NULL,600,NULL,25,NULL,1,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bBaseAtk,7*(.@r/3); if(readparam(bStr)>=120) bonus bBaseAtk,50;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22007,'Temporal_VIT_Boots_','Temporal Boots Of Vitality',4,20,NULL,600,NULL,25,NULL,1,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(300*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); if(readparam(bVit)>=120) bonus bMaxHPrate,8;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22008,'Temporal_DEX_Boots_','Temporal Boots Of Dexterity',4,20,NULL,600,NULL,25,NULL,1,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bDex,3*(.@r/3); if(readparam(bDex)>=120){ bonus bLongAtkRate,5; bonus bFixedCast,-500; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22009,'Temporal_INT_Boots_','Temporal Boots Of Intelligence',4,20,NULL,600,NULL,20,NULL,1,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMdef,5; bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bMatk,10*(.@r/3); if(readparam(bInt)>=120) bonus bMatk,60;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22010,'Temporal_AGI_Boots_','Temporal Boots Of Agility',4,20,NULL,600,NULL,25,NULL,1,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bAspdRate,3*(.@r/3); if(readparam(bAgi)>=120) bonus bAspd,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22011,'Temporal_LUK_Boots_','Temporal Boots Of Luck',4,20,NULL,600,NULL,20,NULL,1,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bMdef,5; bonus bCritAtkRate,2*(.@r/3); if(readparam(bLuk)>=120) bonus bCritAtkRate,30;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22012,'Mana_Boots','Mana Boots',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,64,0,'1',1,NULL,'bonus2 bExpAddRace,RC_All,10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22000,'Temporal_Str_Boots','Temporal Boots Of Strength',4,20,NULL,600,NULL,25,NULL,0,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bAtk,7*(.@r/3); if(readparam(bStr)>=120) bonus bBaseAtk,50;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22001,'Temporal_Int_Boots','Temporal Boots Of Intelligence',4,20,NULL,600,NULL,20,NULL,0,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMdef,5; bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bMatk,10*(.@r/3); if(readparam(bInt)>=120) bonus bMatk,60;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22002,'Temporal_Agi_Boots','Temporal Boots Of Agility',4,20,NULL,600,NULL,25,NULL,0,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bAspdRate,3*(.@r/3); if(readparam(bAgi)>=120) bonus bAspd,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22003,'Temporal_Vit_Boots','Temporal Boots Of Vitality',4,20,NULL,600,NULL,25,NULL,0,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(300*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); if(readparam(bVit)>=120) bonus bMaxHPrate,8;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22004,'Temporal_Dex_Boots','Temporal Boots Of Dexterity',4,20,NULL,600,NULL,25,NULL,0,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bDex,3*(.@r/3); if(readparam(bDex)>=120){ bonus bLongAtkRate,5; bonus bFixedCast,-500; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22005,'Temporal_Luk_Boots','Temporal Boots Of Luck',4,20,NULL,600,NULL,20,NULL,0,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bMdef,5; bonus bCritAtkRate,2*(.@r/3); if(readparam(bLuk)>=120) bonus bCritAtkRate,30;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22006,'Temporal_Str_Boots_','Temporal Boots Of Strength',4,20,NULL,600,NULL,25,NULL,1,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bBaseAtk,7*(.@r/3); if(readparam(bStr)>=120) bonus bBaseAtk,50;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22007,'Temporal_Vit_Boots_','Temporal Boots Of Vitality',4,20,NULL,600,NULL,25,NULL,1,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(300*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); if(readparam(bVit)>=120) bonus bMaxHPrate,8;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22008,'Temporal_Dex_Boots_','Temporal Boots Of Dexterity',4,20,NULL,600,NULL,25,NULL,1,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bDex,3*(.@r/3); if(readparam(bDex)>=120){ bonus bLongAtkRate,5; bonus bFixedCast,-500; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22009,'Temporal_Int_Boots_','Temporal Boots Of Intelligence',4,20,NULL,600,NULL,20,NULL,1,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMdef,5; bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bMatk,10*(.@r/3); if(readparam(bInt)>=120) bonus bMatk,60;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22010,'Temporal_Agi_Boots_','Temporal Boots Of Agility',4,20,NULL,600,NULL,25,NULL,1,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bAspdRate,3*(.@r/3); if(readparam(bAgi)>=120) bonus bAspd,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22011,'Temporal_Luk_Boots_','Temporal Boots Of Luck',4,20,NULL,600,NULL,20,NULL,1,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bMdef,5; bonus bCritAtkRate,2*(.@r/3); if(readparam(bLuk)>=120) bonus bCritAtkRate,30;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22012,'Mana_Boots','Mana Boots',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,64,NULL,'1',1,NULL,'bonus2 bExpAddRace,RC_All,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22014,'Enhanced_Variant_Shoes','Enhanced Variant Shoes',4,20,NULL,500,NULL,13,NULL,1,0x7CCFDF80,63,2,64,NULL,'85',1,0,'bonus bMaxHPrate,12; bonus bMaxSPrate,12; .@r = getrefine(); bonus bDef,.@r; bonus bMdef,.@r;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22015,'Impr_Angel\'s_Arrival','Advanced Angel\'s Reincarnation',4,10000,NULL,300,NULL,8,NULL,1,0x00000001,63,2,64,NULL,'99',1,0,'bonus bMaxHP,500; bonus bMaxSP,100;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22018,'Shoes_Of_Wise_Man','Shoes Of Wise Man',4,10,NULL,300,NULL,15,NULL,1,0xFFFFFFFF,63,2,64,NULL,'50',1,NULL,'.@r = getrefine(); if(.@r>5){ bonus bInt,.@r-5; bonus bMaxHPrate,-(.@r-5); }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22033,'Boots_of_Gray','Boots of Gray',4,10,NULL,0,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,64,NULL,'120',1,NULL,'bonus2 bSubEle,Ele_Holy,1+getrefine()/3;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22033,'Boots_Of_Gray','Boots of Gray',4,20,NULL,400,NULL,25,NULL,1,0xFFFFFFFF,56,2,64,NULL,'120',1,0,'bonus2 bSubEle,Ele_Holy,2+getrefine()/3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22034,'Crimson_Gaiter','Crimson Gaiter',4,0,NULL,500,NULL,10,NULL,0,0xFFFFFFFF,63,2,64,NULL,'50',1,NULL,'bonus bCritical,2; bonus bCritAtkRate,2; if(getrefine()>=7){ bonus bCritical,3; bonus bCritAtkRate,3; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22035,'Heoric_Nepenthes_Shoes','Heoric Nepenthes Shoes',4,10,NULL,300,NULL,10,NULL,1,0xFFFFFFFF,63,2,64,NULL,'160',1,NULL,'.@r = getrefine(); if (.@r>=8 && .@r<=10) .@i=5+.@r; else if (.@r>=11 && .@r<=13) .@i=5+(.@r*3); else if (.@r>13) .@i=42; bonus bVariableCastrate,-10-.@i;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22036,'Heroic_Silver_Fox_Leather_Boots','Heroic Silver Fox Leather Boots',4,10,NULL,300,NULL,15,NULL,1,0xFFFFFFFF,63,2,64,NULL,'160',1,NULL,'.@r = getrefine(); if (.@r>=8 && .@r<=13) .@i=.@r; else if (.@r>13) .@i=13; bonus bLongAtkRate,5+.@i;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22037,'Heroic_Ungoliant_Upgrade_Boots','Heroic Ungoliant Upgrade Boots',4,10,NULL,300,NULL,10,NULL,1,0xFFFFFFFF,63,2,64,NULL,'160',1,NULL,'.@r = getrefine(); if (.@r>=8 && .@r<=13) .@i=.@r; else if (.@r>13) .@i=13; bonus bUseSPrate,-5-.@i;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22035,'Vet_Nepen_Heel','Heoric Nepenthes Shoes',4,10,NULL,300,NULL,10,NULL,1,0xFFFFFFFF,63,2,64,NULL,'160',1,NULL,'.@r = getrefine(); if (.@r>=8 && .@r<=10) .@i=5+.@r; else if (.@r>=11 && .@r<=13) .@i=5+(.@r*3); else if (.@r>13) .@i=42; bonus bVariableCastrate,-10-.@i;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22036,'Vet_SliverFox_Boots','Heroic Silver Fox Leather Boots',4,10,NULL,300,NULL,15,NULL,1,0xFFFFFFFF,63,2,64,NULL,'160',1,NULL,'.@r = getrefine(); if (.@r>=8 && .@r<=13) .@i=.@r; else if (.@r>13) .@i=13; bonus bLongAtkRate,5+.@i;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22037,'Vet_Ungo_Boots','Heroic Ungoliant Upgrade Boots',4,10,NULL,300,NULL,10,NULL,1,0xFFFFFFFF,63,2,64,NULL,'160',1,NULL,'.@r = getrefine(); if (.@r>=8 && .@r<=13) .@i=.@r; else if (.@r>13) .@i=13; bonus bUseSPrate,-5-.@i;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22042,'Talaria_Shoes','Talaria Shoes',4,10,NULL,300,NULL,15,NULL,1,0xFFFFFFFF,63,2,64,NULL,'50',1,NULL,'bonus bAgi,2; bonus bAspd,1; bonus bUnbreakableShoes,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22043,'Supplement_Part_Agi','Supplement Part Agi',4,25000,NULL,350,NULL,25,NULL,1,0x00000400,56,2,64,NULL,'100',1,NULL,'bonus bAspdRate,5+(getrefine()/4);',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22044,'Reinforced_Parts_Booster','Reinforced Parts - Booster',4,10,NULL,1000,NULL,23,NULL,1,0x00000400,56,2,64,NULL,'100',1,NULL,'bonus2 bSkillUseSP,"NC_HOVERING",15; if(getrefine()>=7){bonus2 bSkillUseSP,"NC_HOVERING",-20;}',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22044,'Upgrade_Part_Booster','Reinforced Parts - Booster',4,10,NULL,1000,NULL,23,NULL,1,0x00000400,56,2,64,NULL,'100',1,NULL,'bonus2 bSkillUseSP,"NC_HOVERING",15; if(getrefine()>=7){bonus2 bSkillUseSP,"NC_HOVERING",-20;}',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22045,'Beach_Sandals','Summer Sandals',4,10,NULL,200,NULL,5,NULL,0,0xFFFFFFFF,63,2,64,NULL,'0',1,0,'bonus bFlee,5; bonus3 bAutoSpellWhenHit,"AL_INCAGI",10,300;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22046,'Boots_Of_Airship','Boots Of Airship',4,10,NULL,0,NULL,26,NULL,0,0xFFFFFFFF,63,2,64,NULL,'125',1,NULL,'bonus bAgi,1; bonus bSpeedRate,10;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22047,'Tarlock\'s_Boots','Tarlock\'s Boots',4,10,NULL,250,NULL,13,NULL,0,0xFFFFFFFF,63,2,64,NULL,'125',1,NULL,'bonus bAgi,1; .@r = getrefine(); bonus bAspdRate,5; if(.@r>=7) { bonus bAgi,1; bonus bAspdRate,5; } if(.@r>=9) { bonus bAgi,1; bonus bAspdRate,5; } if(.@r>=12) { bonus bAspd,1; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22046,'Airship_Boots','Boots Of Airship',4,10,NULL,0,NULL,26,NULL,0,0xFFFFFFFF,63,2,64,NULL,'125',1,NULL,'bonus bAgi,1; bonus bSpeedRate,10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22047,'Felock_Boots','Tarlock\'s Boots',4,10,NULL,250,NULL,13,NULL,0,0xFFFFFFFF,63,2,64,NULL,'125',1,NULL,'bonus bAgi,1; .@r = getrefine(); bonus bAspdRate,5; if(.@r>=7) { bonus bAgi,1; bonus bAspdRate,5; } if(.@r>=9) { bonus bAgi,1; bonus bAspdRate,5; } if(.@r>=12) { bonus bAspd,1; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22059,'Aegir_Shoes','Aegir Shoes',4,10,NULL,300,NULL,13,NULL,1,0xFFFFFFFF,63,2,64,NULL,'40',1,NULL,'bonus bUnbreakableShoes,1; bonus bMaxHP,500; bonus bMaxSP,50;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22064,'Thorny_Shoes','Thorny Shoes',4,0,NULL,1000,NULL,25,NULL,1,0xFFFFFFFF,63,2,64,NULL,NULL,1,NULL,'bonus bShortWeaponDamageReturn,getrefine()/2;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22067,'Shoe_of_Witch','Shoe of Witch',4,10,NULL,400,NULL,10,NULL,0,0xFFFFFFFE,63,2,64,NULL,'1',1,NULL,'skill "ALL_CATCRY",1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22069,'Lian_Shoes','Lian Shoes',4,0,NULL,250,NULL,12,NULL,1,0xFFFFFFFF,63,2,64,1,'90',1,NULL,'bonus bMdef,3; bonus2 bSubEle,Ele_Neutral,5; .@r = getrefine(); bonus bMaxHPrate,.@r; bonus bMaxSPrate,.@r;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22072,'Hikingboots','Hikingboots',4,0,NULL,500,NULL,10,NULL,1,0xFFFFFFFF,63,2,64,0,'100',1,NULL,'.@r = getrefine(); bonus bMaxHPRate,4+(.@r/3); bonus bMaxSPRate,4+(.@r/3); if (.@r > 9) bonus bSpeedRate,25;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22067,'Witch_Shoes','Shoe of Witch',4,10,NULL,400,NULL,10,NULL,0,0xFFFFFFFE,63,2,64,NULL,'1',1,NULL,'skill "ALL_CATCRY",1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22069,'Lian_Shoes','Lian Shoes',4,0,NULL,250,NULL,12,NULL,1,0xFFFFFFFF,63,2,64,NULL,'90',1,NULL,'bonus bMdef,3; bonus2 bSubEle,Ele_Neutral,5; .@r = getrefine(); bonus bMaxHPrate,.@r; bonus bMaxSPrate,.@r;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22072,'Hikingboots','Hikingboots',4,0,NULL,500,NULL,10,NULL,1,0xFFFFFFFF,63,2,64,NULL,'100',1,NULL,'.@r = getrefine(); bonus bMaxHPRate,4+(.@r/3); bonus bMaxSPRate,4+(.@r/3); if (.@r > 9) bonus bSpeedRate,25;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22075,'Rift_Shoes','Rift Shoes',4,20,NULL,250,NULL,12,NULL,1,0xFFFFFFFF,63,2,64,NULL,'100',1,NULL,'.@r = getrefine(); bonus bMaxHP,(.@r >= 9 ? 1300 : .@r >= 7 ? 700 : 300); bonus bMaxSP,-50;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22076,'Wooden_Slipper','Wooden Slipper',4,20,NULL,50,NULL,10,NULL,1,0x80000000,7,2,64,NULL,'9',1,NULL,'bonus2 bHPRegenRate,2,10000;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22077,'Red_Eco-Friendly_Shoes','Red Eco-Friendly Shoes',4,20,NULL,100,NULL,20,NULL,1,0x80000000,7,2,64,NULL,'18',1,NULL,'bonus bCritical,5; bonus2 bHPRegenRate,4,10000; bonus2 bSPRegenRate,1,10000;',NULL,NULL);
@@ -10889,14 +10955,26 @@ REPLACE INTO `item_db_re` VALUES (22078,'Unity_STR_Boots','Unity STR Boots',4,10
REPLACE INTO `item_db_re` VALUES (22079,'Unity_AGI_Boots','Unity AGI Boots',4,10,NULL,300,NULL,20,NULL,1,0xFFFFFFFF,63,2,64,NULL,'1',1,NULL,'.@r = getrefine(); if(BaseLevel<100) { bonus2 bExpAddRace,RC_All,4; bonus bAgi,.@r/2; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22080,'Unity_DEX_Boots','Unity DEX Boots',4,10,NULL,300,NULL,20,NULL,1,0xFFFFFFFF,63,2,64,NULL,'1',1,NULL,'.@r = getrefine(); if(BaseLevel<100) { bonus2 bExpAddRace,RC_All,4; bonus bDex,.@r/2; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22081,'Unity_INT_Boots','Unity INT Boots',4,10,NULL,300,NULL,20,NULL,1,0xFFFFFFFF,63,2,64,NULL,'1',1,NULL,'.@r = getrefine(); if(BaseLevel<100) { bonus2 bExpAddRace,RC_All,4; bonus bInt,.@r/2; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22082,'Polyhedron_Shoes','Polyhedron Shoes',4,0,NULL,500,NULL,12,NULL,1,0xFFFFFFFF,63,2,64,0,'90',1,NULL,'.@r = getrefine(); bonus2 bSubEle,Ele_Neutral,5; bonus2 bSubEle,Ele_Fire,5; bonus2 bSubEle,Ele_Water,5; bonus2 bSubEle,Ele_Wind,5; if (.@r > 4) { .@b = (.@r > 6) ? 10 : 5; bonus2 bAddEle,Ele_Neutral,.@b; bonus2 bAddEle,Ele_Fire,.@b; bonus2 bAddEle,Ele_Water,.@b; bonus2 bAddEle,Ele_Wind,.@b; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22082,'Polyhedron_Shoes','Polyhedron Shoes',4,0,NULL,500,NULL,12,NULL,1,0xFFFFFFFF,63,2,64,NULL,'90',1,NULL,'.@r = getrefine(); bonus2 bSubEle,Ele_Neutral,5; bonus2 bSubEle,Ele_Fire,5; bonus2 bSubEle,Ele_Water,5; bonus2 bSubEle,Ele_Wind,5; if (.@r > 4) { .@b = (.@r > 6) ? 10 : 5; bonus2 bAddEle,Ele_Neutral,.@b; bonus2 bAddEle,Ele_Fire,.@b; bonus2 bAddEle,Ele_Water,.@b; bonus2 bAddEle,Ele_Wind,.@b; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22083,'Private_Doram_Shoes','Private Doram Shoes',4,20,NULL,500,NULL,25,NULL,1,0x80000000,7,2,64,NULL,'100',1,NULL,'bonus bMaxHP,100; bonus bMaxSP,50; .@r = getrefine()/3; bonus bHPrecovRate,.@r*10; bonus bSPrecovRate,.@r*10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22084,'Luxury_Doram_Shoes','Luxury Doram Shoes',4,20,NULL,600,NULL,30,NULL,1,0x80000000,7,2,64,NULL,'140',1,NULL,'bonus bMaxHP,300; bonus bMaxSP,100; .@r = getrefine()/3; bonus bHPrecovRate,20*.@r; bonus bSPrecovRate,20*.@r;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22085,'Elegant_Doram_Shoes','Elegant Doram Shoes',4,20,NULL,700,NULL,35,NULL,1,0x80000000,7,2,64,NULL,'175',1,NULL,'bonus bMaxHPrate,10; bonus bMaxSPrate,5; .@r = getrefine()/2; bonus bMaxHP,100*.@r; bonus bMaxSP,20*.@r; if(.@r >= 4) bonus2 bSkillUseSP,"SU_LOPE",5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22089,'Crimson_Gaiter_','Crimson Gaiter',4,0,NULL,500,NULL,10,NULL,1,0xFFFFFFFF,63,2,64,NULL,'50',1,NULL,'bonus bCritical,2; bonus bCritAtkRate,2; if(getrefine()>=7){ bonus bCritical,3; bonus bCritAtkRate,3; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22101,'Angel_Poring_Boots','Angel Poring Boots',4,10,NULL,300,NULL,15,NULL,1,0xFFFFFFFF,63,2,64,NULL,'1',1,NULL,'bonus bAllStats,1; skill "AL_HEAL",1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22103,'Excelion_Leg','Excelion Leg',4,0,NULL,500,NULL,13,NULL,0,0xFFFFFFFF,63,2,64,1,'100',1,NULL,'.@r = getrefine(); bonus bMaxHP,5+((BaseLevel > 129) ? 4 : 0)+(.@r/3)*3; bonus bMaxSP,5+((BaseLevel > 129) ? 4 : 0)+(.@r/3)*3;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22103,'Excelion_Leg','Excelion Leg',4,0,NULL,500,NULL,13,NULL,0,0xFFFFFFFF,63,2,64,NULL,'100',1,NULL,'.@r = getrefine(); bonus bMaxHP,5+((BaseLevel > 129) ? 4 : 0)+(.@r/3)*3; bonus bMaxSP,5+((BaseLevel > 129) ? 4 : 0)+(.@r/3)*3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22106,'Giant_Boots','Giant Boots',4,0,NULL,500,NULL,13,NULL,1,0xFFFFFFFF,63,2,64,NULL,'1',1,NULL,'bonus2 bSubRace,RC_All,1; bonus bMaxHPrate,2; bonus bMaxSPrate,2; .@r = getrefine(); if (.@r > 4) { bonus bDefRate,2; bonus bMaxHPrate,4; bonus bMaxSPrate,4; } if (.@r > 6) { bonus bDefRate,2; bonus bMaxHPrate,4; bonus bMaxSPrate,4; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22107,'Modified_Str_Boots','Modified Str Boots',4,20,NULL,600,NULL,25,NULL,0,0x60000000,63,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bAtk,7*(.@r/3); if(readparam(bStr)>=120) bonus bBaseAtk,50;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22108,'Modified_Int_Boots','Modified Int Boots',4,20,NULL,600,NULL,25,NULL,0,0x60000000,63,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMdef,5; bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bMatk,10*(.@r/3); if(readparam(bInt)>=120) bonus bMatk,60;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22109,'Modified_Agi_Boots','Modified Agi Boots',4,20,NULL,600,NULL,25,NULL,0,0x60000000,63,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bAspdRate,3*(.@r/3); if(readparam(bAgi)>=120) bonus bAspd,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22110,'Modified_Vit_Boots','Modified Vit Boots',4,20,NULL,600,NULL,25,NULL,0,0x60000000,63,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(300*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); if(readparam(bVit)>=120) bonus bMaxHPrate,8;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22111,'Modified_Dex_Boots','Modified Dex Boots',4,20,NULL,600,NULL,25,NULL,0,0x60000000,63,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bDex,3*(.@r/3); if(readparam(bDex)>=120){ bonus bLongAtkRate,5; bonus bFixedCast,-500; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22112,'Modified_Luk_Boots','Modified Luk Boots',4,20,NULL,600,NULL,25,NULL,0,0x60000000,63,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bMdef,5; bonus bCritAtkRate,2*(.@r/3); if(readparam(bLuk)>=120) bonus bCritAtkRate,30;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22113,'Modified_Str_Boots_','Modified Str Boots',4,20,NULL,600,NULL,25,NULL,1,0x60000000,63,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bAtk,7*(.@r/3); if(readparam(bStr)>=120) bonus bBaseAtk,50;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22114,'Modified_Int_Boots_','Modified Int Boots',4,20,NULL,600,NULL,25,NULL,1,0x60000000,63,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMdef,5; bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bMatk,10*(.@r/3); if(readparam(bInt)>=120) bonus bMatk,60;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22115,'Modified_Agi_Boots_','Modified Agi Boots',4,20,NULL,600,NULL,25,NULL,1,0x60000000,63,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bAspdRate,3*(.@r/3); if(readparam(bAgi)>=120) bonus bAspd,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22116,'Modified_Vit_Boots_','Modified Vit Boots',4,20,NULL,600,NULL,25,NULL,1,0x60000000,63,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(300*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); if(readparam(bVit)>=120) bonus bMaxHPrate,8;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22117,'Modified_Dex_Boots_','Modified Dex Boots',4,20,NULL,600,NULL,25,NULL,1,0x60000000,63,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bDex,3*(.@r/3); if(readparam(bDex)>=120){ bonus bLongAtkRate,5; bonus bFixedCast,-500; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22118,'Modified_Luk_Boots_','Modified Luk Boots',4,20,NULL,600,NULL,25,NULL,1,0x60000000,63,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bMdef,5; bonus bCritAtkRate,2*(.@r/3); if(readparam(bLuk)>=120) bonus bCritAtkRate,30;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22122,'Para_Team_Boots100','Awakened Eden Group Boots I',4,0,NULL,0,NULL,22,NULL,0,0xFFFFFFFF,63,2,64,NULL,'100',1,NULL,'bonus bAllStats,1; bonus bHPrecovRate,30; bonus bSPrecovRate,14;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22123,'Para_Team_Boots115','Awakened Eden Group Boots II',4,0,NULL,0,NULL,25,NULL,0,0xFFFFFFFF,63,2,64,NULL,'115',1,NULL,'bonus bAllStats,1; bonus bHPrecovRate,36; bonus bSPrecovRate,18;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22124,'Para_Team_Boots130','Awakened Eden Group Boots III',4,0,NULL,0,NULL,27,NULL,0,0xFFFFFFFF,63,2,64,NULL,'130',1,NULL,'bonus bAllStats,2; bonus bHPrecovRate,36; bonus bSPrecovRate,18;',NULL,NULL);
@@ -10905,17 +10983,17 @@ REPLACE INTO `item_db_re` VALUES (22126,'Para_Team_Boots160','Awakened Eden Grou
#===================================================================
# New Usable items
#===================================================================
-REPLACE INTO `item_db_re` VALUES (22508,'Para_Team_Mark_','Eden Group Mark',11,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'warp "moc_para01",171,115;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22508,'Para_Team_Mark_','Eden Group Mark',2,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'warp "moc_para01",171,115;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22507,'ShabbyOldScroll','Old Scroll',2,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'callfunc "F_22507";',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22510,'King_Wolf_Scroll','King Wolf Scroll',2,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'/*TODO, confirm the rates*/ getitem callfunc("F_Rand",6635,19598,5658,6238,6239),1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22511,'Fenrirs_Power_Scroll','Fenrir\'s Power Scroll',2,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'bonus_script "bonus bMatk,25; bonus bFixedCastRate,-50;",300,1025;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22511,'Fenrir_Card__','Fenrir\'s Power Scroll',2,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'bonus_script "bonus bMatk,25; bonus bFixedCastRate,-50;",300,1025;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22513,'King_of_Gift_Box','King of Gift Box',2,10,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'/*TODO, confirm the rates*/ getitem callfunc("F_Rand",12817,4403,14512),1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22514,'Candy_Holder','Candy Holder',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getrandgroupitem(IG_Candy_Holder,1); getrandgroupitem(IG_Candy_Holder,1); getrandgroupitem(IG_Candy_Holder,1);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22515,'Twisted_Key_of_Time','Twisted Key of Time',3,10,NULL,300,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22516,'Black_As_Night_Piece_','Black As Night Piece',3,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22517,'Rocker_Summoning_Scroll','Rocker Summoning Scroll',3,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22516,'Dark_Red_Clot','Black As Night Piece',3,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22517,'Loki_Summon_Scroll','Rocker Summoning Scroll',3,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22518,'Idn_Wisdom_Egg','Egg Of Wisdom',18,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,'1',NULL,NULL,'getgroupitem(IG_Idn_Wisdom_Egg);',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22519,'Stops_Buff','Stops Buff',3,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22519,'Pc_Stop_Cancel','Stops Buff',3,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22520,'Stops_Buff_Reset','Stops Buff Reset',3,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22521,'Level_Up_Box_','Level Up Box',18,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,'80',NULL,NULL,'/*TODO*/',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22522,'Level_Up_Box100','Level Up Box(100)',18,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,'100',NULL,NULL,'getgroupitem(IG_Level_Up_Box100);',NULL,NULL);
@@ -10933,20 +11011,20 @@ REPLACE INTO `item_db_re` VALUES (22534,'Closedmind_Box','Closed Mind Box',18,10
REPLACE INTO `item_db_re` VALUES (22535,'WorkerScroll_A','Scroll Summoning Workers(Male)',2,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22536,'WorkerScroll_B','Scroll Summoning Workers(Female)',2,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22538,'Hanbok_bag','Hanbok bag',2,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,'1',NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22540,'Runstone_Luxanima','Lux Anima Runestone',11,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,56,2,NULL,NULL,NULL,NULL,NULL,'itemskill "RK_LUXANIMA",1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22540,'Runstone_Lux','Lux Anima Runestone',11,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,56,2,NULL,NULL,NULL,NULL,NULL,'itemskill "RK_LUXANIMA",1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22541,'PC_Room_Coupon_Box_VI','PC Room Coupon Box VI',18,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22542,'Concentration_Potion','Concentration Potion',2,10,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_ASPDPOTION0,1800000,4;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22543,'Berserk_Potion_','Berserk Potion',2,10,NULL,200,NULL,NULL,NULL,0,0x6,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_ASPDPOTION2,1800000,9;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22544,'Awakening_Potion_','Awakening Potion',2,10,NULL,150,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_ASPDPOTION1,1800000,6;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22542,'Center_Potion_B','Concentration Potion',2,10,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_ASPDPOTION0,1800000,4;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22543,'Berserk_Potion_B','Berserk Potion',2,10,NULL,200,NULL,NULL,NULL,0,0x6,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_ASPDPOTION2,1800000,9;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22544,'Awakening_Potion_B','Awakening Potion',2,10,NULL,150,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_ASPDPOTION1,1800000,6;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22545,'Speed_Potion','Speed Potion',2,10,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_SPEEDUP1,5000,50;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22546,'Slow_Potion','Slow Potion',2,10,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_SLOWDOWN,5000,100;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22547,'Anti-Payne_Moment','Anti-Payne Moment',2,10,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22548,'Wed_Cursed','Wed Cursed',2,10,NULL,30,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22549,'Poison_Bottle_','Poison Bottle',2,10,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'if(Class == Job_Assassin_Cross || Class == Job_Guillotine_Cross || Class == Job_Guillotine_Cross_T) { sc_start SC_DPOISON,60000,0; sc_start SC_ASPDPOTION3,60000,9; } else percentheal -100,-100;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22550,'Sweets_Pocket','Sweets Pocket',2,10,NULL,70,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22551,'Teacake','Teacake',2,10,NULL,70,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22552,'Fried_Pastry','Fried Pastry',2,10,NULL,70,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22553,'Rainbow_Bread','Rainbow Bread',2,10,NULL,70,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22550,'Cookie_Bag_B','Sweets Pocket',2,10,NULL,70,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22551,'Sesame_Pastry_B','Teacake',2,10,NULL,70,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22552,'Honey_Pastry_B','Fried Pastry',2,10,NULL,70,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22553,'Rainbow_Cake_B','Rainbow Bread',2,10,NULL,70,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22554,'First_Aid_Box','First Aid Box',18,10,NULL,200,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getrandgroupitem(IG_FirstAid,1); getrandgroupitem(IG_FirstAid,1); getrandgroupitem(IG_FirstAid,1); getrandgroupitem(IG_FirstAid,1); getrandgroupitem(IG_FirstAid,1);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22555,'Gourmet_Chocolate','Gourmet Chocolate',0,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22556,'Luxury_Chocolate','Luxury Chocolate',0,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -10954,18 +11032,18 @@ REPLACE INTO `item_db_re` VALUES (22557,'Masterpieces_of_Artisan_Chocolate','Mas
REPLACE INTO `item_db_re` VALUES (22558,'Lucky_Bag','Lucky Bag',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getrandgroupitem(IG_Lucky_Bag,1);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22559,'Mock_Strawberry','Mock Strawberry',11,20,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'percentheal 50,50; itemskill "SM_ENDURE",3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22563,'Lucky_Bag_Of_New_Era','Lucky Bag Of New Era',2,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'/* TODO */',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22566,'Last_Years_Frost','Last Year\'s Frost',3,20,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22567,'Expedition_Award_Box','Expedition Award Box',0,20,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22568,'Nidhoggur_Summon_Scroll','Nidhoggur Summon Scroll',0,20,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22566,'Frost_Crystal','Last Year\'s Frost',3,20,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22567,'Squad_Prize','Expedition Award Box',0,20,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22568,'Nyd_Summon_Scroll','Nidhoggur Summon Scroll',0,20,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22569,'Gift_New_start','Gift New start',18,10,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22571,'Easter_Egg','Easter Egg',11,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22589,'Savage_Ora_Ora','Savage Ora Ora',3,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22590,'Grand_Peco_Ora_Ora','Grand Peco Ora Ora',3,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22591,'Desert_Wolf_Ora_Ora','Desert Wolf Ora Ora',3,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22589,'Savage_Ora','Savage Ora Ora',3,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22590,'Grand_Peco_Ora','Grand Peco Ora Ora',3,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22591,'Dest_Wolf_Ora','Desert Wolf Ora Ora',3,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22592,'Happy_Call_Box','Happy Call Box',18,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22605,'Ginger_Bread','Ginger Bread',2,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22605,'Gingerbread2','Ginger Bread',2,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22610,'New_Beginnings_Box','New Beginnings Box',2,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 12803,1; getitem 12802,1; getitem 12809,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22611,'Packed_Envelope','Packed Envelope',11,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'/* TODO */',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22611,'Packing_Envelope','Packed Envelope',11,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'/* TODO */',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22612,'Corrupt_Reagents','Corrupt Reagents',11,10,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'/* TODO */',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22613,'Contaminated_Reagents','Contaminated Reagents',11,10,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'/* TODO */',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22614,'Premium_Manual','Premium Manual',2,2,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_EXPBOOST,8640000,50; sc_start SC_ITEMBOOST,8640000,200;',NULL,NULL);
@@ -11007,15 +11085,15 @@ REPLACE INTO `item_db_re` VALUES (22673,'May_Gift_Box','May Gift Box',2,10,NULL,
REPLACE INTO `item_db_re` VALUES (22674,'June_Gift_Box','June Gift Box',2,10,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'/*1 Potion Box*/',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22676,'Hangul_Day_Event_Box','Hangul Day Event Box',2,20,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,'0',NULL,NULL,'getitem 22675,10; getitem 607,9;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22675,'Mysterious_Scroll','Mysterious Scroll',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_INTFOOD,3600000,30;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22679,'Death_Bin','Death Bin',18,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,'170',NULL,NULL,'/*TODO*/',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22679,'Chest_Of_Death','Death Bin',18,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,'170',NULL,NULL,'/*TODO*/',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22685,'Solo_Christmas_Gift','Single Union Christmas Gift',2,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,'0',NULL,NULL,'getgroupitem(IG_Solo_Christmas_Gift);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22686,'Solo_Cookie','Single Cookie',0,0,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,'0',NULL,NULL,'percentheal 5,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22687,'Fragments_Vicious_Mind','Fragments Vicious Mind',3,10,NULL,1,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'/*TODO*/',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22691,'Record_Fragment1','Record Fragment',3,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22692,'Record_Fragment2','Record Fragment',3,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22693,'Record_Fragment3','Record Fragment',3,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22694,'Record_Fragment4','Record Fragment',3,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22695,'Record_Fragment5','Record Fragment',3,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22691,'Record_Fragment1','Record Fragment',0,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'warp "un_bk_q",98,143; if (callfunc("F_time_limit_recorder") == 1) { recorder_quest_type = 1; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22692,'Record_Fragment2','Record Fragment',0,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'warp "un_bk_q",45,276; if (callfunc("F_time_limit_recorder") == 1) { recorder_quest_type = 2; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22693,'Record_Fragment3','Record Fragment',0,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'warp "un_bk_q",217,346; if (callfunc("F_time_limit_recorder") == 1) { recorder_quest_type = 3; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22694,'Record_Fragment4','Record Fragment',0,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'warp "un_bk_q",273,235; if (callfunc("F_time_limit_recorder") == 1) { recorder_quest_type = 4; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22695,'Record_Fragment5','Record Fragment',0,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'warp "un_bk_q",275,290; if (callfunc("F_time_limit_recorder") == 1) { recorder_quest_type = 5; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22699,'Test_Reagent','Test Reagent',3,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22700,'Jumping_Support_Box','Jumping Support Box',18,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'/*TODO: getitem 12529,1; getitem 12323,200; getitem 12324,50; and 5 boxes that containing quivers + oridecons*/',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22702,'STR_Soul_Potion','STR Reduction Potion',11,10,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'callfunc "F_CashReduceStat",bStr,-1,22702;',NULL,NULL);
@@ -11024,7 +11102,7 @@ REPLACE INTO `item_db_re` VALUES (22704,'VIT_Soul_Potion','STR Reduction Potion'
REPLACE INTO `item_db_re` VALUES (22705,'INT_Soul_Potion','STR Reduction Potion',11,10,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'callfunc "F_CashReduceStat",bInt,-1,22705;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22706,'DEX_Soul_Potion','STR Reduction Potion',11,10,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'callfunc "F_CashReduceStat",bDex,-1,22706;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22707,'LUK_Soul_Potion','STR Reduction Potion',11,10,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'callfunc "F_CashReduceStat",bLuk,-1,22707;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22708,'Thrilling_Box','Thrilling Box',2,10,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'/*No clue the random item yet*/',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22708,'Pitapat_Box','Thrilling Box',2,10,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'/*No clue the random item yet*/',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22717,'Wanderer_Ball','Wanderer Ball',3,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22718,'Lude_Ball','Lude Ball',3,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22719,'Tatacho_Ball','Tatacho Ball',3,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -11033,19 +11111,19 @@ REPLACE INTO `item_db_re` VALUES (22721,'?_Box','? Box',18,10,NULL,0,NULL,NULL,N
REPLACE INTO `item_db_re` VALUES (22734,'Revolution_Quiz_Box','Revolution Quiz Box',18,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 6635,2; getitem 6423,1; /*1x Enchanted Letter Introduction*/',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22735,'Sealed_Moonlight_Flower_Scroll','Sealed Moonlight Flower Scroll',18,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'/*TODO: Confirm the rates*/ getitem callfunc("F_Rand",6228,6232,24150,19934,6635,17474),1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22736,'July_Gift_Box','July Gift Box',2,10,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 20212,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22737,'Bloody_Cartridge','Bloody Cartridge',18,10,NULL,250,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13222,500;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22738,'Silver_Cartridge','Silver Cartridge',18,10,NULL,250,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13221,500;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22739,'Lightning_Sphere_Pack','Lightning Sphere Pack',18,10,NULL,350,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13224,500;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22740,'Blind_Sphere_Pack','Blind Sphere Pack',18,10,NULL,350,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13226,500;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22741,'Poison_Sphere_Pack','Poison Sphere Pack',18,10,NULL,350,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13225,500;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22742,'Freezing_Sphere_Pack','Freezing Sphere Pack',18,10,NULL,350,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13227,500;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22743,'Flare_Sphere_Pack','Flare Sphere Pack',18,10,NULL,350,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13223,500;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22744,'Armor-Piercing_Cartridge','Armor-Piercing Cartridge',18,10,NULL,250,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13215,500;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22745,'Incandescence_Shot_Cartridge','Incandescence Shot Cartridge',18,10,NULL,250,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13216,500;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22746,'Glaciation_Shot_Cartridge','Glaciation Shot Cartridge',18,10,NULL,250,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13217,500;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22747,'Dengeki_Shot_Cartridge','Dengeki Shot Cartridge',18,10,NULL,250,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13218,500;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22748,'Hearthstone_Shot_Cartridge','Hearthstone Shot Cartridge',18,10,NULL,250,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13219,500;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22749,'Purification_Shot_Cartridge','Purification Shot Cartridge',18,10,NULL,250,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13220,500;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22737,'Bullet_Case_Blood_','Bloody Cartridge',18,10,NULL,250,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13222,500;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22738,'Bullet_Case_Silver_','Silver Cartridge',18,10,NULL,250,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13221,500;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22739,'Sphere_Case_Wind_','Lightning Sphere Pack',18,10,NULL,350,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13224,500;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22740,'Sphere_Case_Darkness_','Blind Sphere Pack',18,10,NULL,350,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13226,500;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22741,'Sphere_Case_Poison_','Poison Sphere Pack',18,10,NULL,350,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13225,500;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22742,'Sphere_Case_Water_','Freezing Sphere Pack',18,10,NULL,350,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13227,500;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22743,'Sphere_Case_Fire_','Flare Sphere Pack',18,10,NULL,350,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13223,500;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22744,'Bullet_Case_AP','Armor-Piercing Cartridge',18,10,NULL,250,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13215,500;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22745,'Bullet_Case_Blaze','Incandescence Shot Cartridge',18,10,NULL,250,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13216,500;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22746,'Bullet_Case_Fleeze','Glaciation Shot Cartridge',18,10,NULL,250,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13217,500;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22747,'Bullet_Case_Electric','Dengeki Shot Cartridge',18,10,NULL,250,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13218,500;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22748,'Bullet_Case_Stone','Hearthstone Shot Cartridge',18,10,NULL,250,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13219,500;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22749,'Sanctified_Bullet_Case','Purification Shot Cartridge',18,10,NULL,250,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 13220,500;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22750,'Trans_Scroll_Horn_Scaraba','Transformation Scroll(Horn Scaraba)',2,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'transform 2161,1200000,SC_MTF_ASPD2,2,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22751,'Trans_Scroll_Wanderer','Transformation Scroll(Wanderer)',2,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'transform 1208,1200000,SC_MTF_ASPD2,2,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22752,'Trans_Scroll_Gazeti','Transformation Scroll(Gazeti)',2,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'transform 1778,1200000,SC_MTF_RANGEATK2,30;',NULL,NULL);
@@ -11077,8 +11155,9 @@ REPLACE INTO `item_db_re` VALUES (22808,'Special_Gift_Box','Special Gift Box',2,
REPLACE INTO `item_db_re` VALUES (22812,'Sealed_Dracula_Scroll','Sealed Dracula Scroll',2,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,'1',NULL,NULL,'getitem callfunc("F_Rand",6228,6232,22813,19937,17314, 6635),1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22813,'Bearer\'s_Shadow_Box','Bearer\'s Shadow Box',2,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,'1',NULL,NULL,'getitem callfunc("F_Rand",24180,24181,24182,24183,24184,24185),1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22814,'Cat_Hand_Ticket','Cat Hand Ticket',3,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22822,'Summer_Vacation_Costumes','Summer Vacation Costumes',2,NULL,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,'1',NULL,NULL,'sc_start SC_DRESSUP,600000,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22823,'Sealed_Sniper_Scroll','Sealed Sniper Scroll',2,10,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'/*getitem callfunc("F_Rand",4491,6228,6232,24196, Hasty Shadow Armor, 19882, 17474, 6635),1;*/',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22826,'Costume_Enchantment_Stone_Box_4','Costume Enchantment Stone Box 4',2,10,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22826,'Enchant_Stone_Box4','Costume Enchantment Stone Box 4',2,10,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22827,'Shadow_Cube','Shadow Cube',2,10,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'/*No Info*/',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22828,'Sealed_Album_Scroll','Sealed Album Scroll',2,10,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,'1',NULL,NULL,'getitem callfunc("F_Rand",22829,6232,6228,24208,24209,17474/*,Enchanted Letter*/),1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22829,'Sealed_Card_Album','Sealed Card Album',2,10,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,'1',NULL,NULL,'getitem callfunc("F_Rand",4488,4497,4486,4480,4485,4539,4487,4494,4538,4489,4490,4482,4503,4483,4491),1;',NULL,NULL);
@@ -11089,9 +11168,9 @@ REPLACE INTO `item_db_re` VALUES (22843,'Superstar_Snack','Superstar Snack',2,10
REPLACE INTO `item_db_re` VALUES (22844,'Sealed_Dracula_Card_Album','Sealed Dracula Card Album',2,10,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'/*No Info*/',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22845,'Sealed_Fortune_Egg','Sealed Fortune Egg',2,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,'1',NULL,NULL,'getitem callfunc("F_Rand",4488,4497,4486,4480,4485,4539,4487,4494,4538,4489,4490,4482,4503,22846),1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22846,'Sealed_Dracula_Card_','Sealed Dracula Card',2,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'bonus_script "{ bonus2 bSPDrainRate,50,5; }",300;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22847,'Prontera_Medal','Prontera Medal',2,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'warp "prontera",0,0; /*No coord info*/',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22847,'Prontera_Medal','Prontera Medal',2,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'warp "prontera",159,192; /*No coord info*/',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22848,'Prison_Key','Prison Key',2,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'warp "prt_prison",0,0; /*No coord info*/',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22849,'Prontera_Time_Crystal','Prontera Time Crystal',2,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'warp "prt_lib_q",0,0; /*No map+coord info*/',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22849,'Prontera_Time_Crystal','Prontera Time Crystal',2,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'warp "prt_q",155,27;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22850,'January_Gift_Box_','January Gift Box',2,10,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'rentitem 19052,604800;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22851,'February_Gift_Box_','February Gift Box',2,10,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 12105,2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22852,'March_Gift_Box_','March Gift Box',2,10,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'/*2 Lucky Eggs*/',NULL,NULL);
@@ -11104,15 +11183,15 @@ REPLACE INTO `item_db_re` VALUES (22858,'September_Gift_Box','September Gift Box
REPLACE INTO `item_db_re` VALUES (22859,'October_Gift_Box','October Gift Box',2,10,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 12529,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22860,'November_Gift_Box','November Gift Box',2,10,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'rentitem callfunc("F_Rand",2566,2856,2857,15023),1209600;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22861,'December_Gift_Box','December Gift Box',2,10,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 22869,10;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22868,'Costume_Enchantment_Stone_Box_5','Costume Enchantment Stone Box 5',2,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem callfunc("F_Rand",6908,6943,6944,6945,6946,6947,6948,6949,6950,6951),1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22868,'Enchant_Stone_Box5','Costume Enchantment Stone Box 5',2,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem callfunc("F_Rand",6908,6943,6944,6945,6946,6947,6948,6949,6950,6951),1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22869,'Lucky_Roulette_Tickets','Lucky Roulette Ticket',2,10,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,'50',NULL,NULL,'RouletteBronze++;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22870,'Christmas_Package','Christmas Package',3,0,NULL,10,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22870,'Xmas_Package_14','Christmas Package',3,0,NULL,10,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22873,'Sealed_Beelzebub_Scroll_II','Sealed Beelzebub Scroll II',2,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem callfunc("F_Rand",22875,6238,6239,6228,6232,24231,24232,17474,6635),1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22874,'Sealed_Beelzebub_Card_Album','Sealed Beelzebub Card Album',2,10,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'/*No Info*/',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22875,'Sealed_Beelzebub_Card','Sealed Beelzebub Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,769,NULL,NULL,NULL,NULL,'bonus bVariableCastrate,-15; /*Item removed on 2014-12-17*/',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22876,'Old_Money_Pocket','Old Money Pocket',3,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22881,'Rope_Gallows','Rope Gallows',2,10,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'/*Used to catch a Lost Sheep*/',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22882,'Chocolate_Rice_Cake_Soup','Chocolate Rice Cake Soup',2,10,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'percentheal 10,10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22876,'Old_Money_Pocket','Old Money Pocket',3,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'Zeny += rand(500,550);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22881,'Binding_Rope','Rope Gallows',2,10,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'/*Used to catch a Lost Sheep*/',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22882,'Choco_Tteokguk','Chocolate Rice Cake Soup',2,10,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'percentheal 10,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22883,'September_Gift_Box_','September Gift Box',2,10,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'/*2 Lucky Eggs*/',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22884,'October_Gift_Box_','October Gift Box',2,10,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 12529,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22885,'November_Gift_Box_','November Gift Box',2,10,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'rentitem callfunc("F_Rand",2566,2856,2857,15023),1209600;',NULL,NULL);
@@ -11354,21 +11433,21 @@ REPLACE INTO `item_db_re` VALUES (24212,'S_Rookie_Shoes','Rookie Shadow Shoes',1
REPLACE INTO `item_db_re` VALUES (24213,'S_Rookie_Shield','Rookie Shadow Shield',12,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,262144,NULL,'50:99',1,NULL,'bonus2 bExpAddRace,RC_All,(getrefine()/2);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (24214,'S_Advanced_Shoes','Advanced Shadow Shoes',12,20,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,524288,NULL,'100:149',1,NULL,'bonus2 bExpAddRace,RC_All,(getrefine()/3);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (24215,'S_Advanced_Shield','Advanced Shadow Shield',12,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,262144,NULL,'100:149',1,NULL,'bonus2 bExpAddRace,RC_All,(getrefine()/3);',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (24216,'Attack_Shadow_Armor','Attack Shadow Armor',12,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,65536,NULL,'1',1,NULL,'.@r = getrefine(); autobonus "{ bonus bAtk2,(.@r*5); }",(.@r*20)+100,3000,BF_NORMAL;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (24217,'Blitz_Shadow_Earring','Blitz Shadow Earring',12,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1048576,NULL,'1',1,NULL,'.@r = getrefine(); bonus bHit,(.@r/2)+5; if(.@r>=7){ bonus bAspd,1; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (24218,'Blitz_Shadow_Pendant','Blitz Shadow Pendant',12,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2097152,NULL,'1',1,NULL,'.@r = getrefine(); bonus bAtk2,(.@r/2)+5; if(.@r>=7){ bonus bAspd,1; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (24219,'Cold_Bolt_Shadow_Armor','Cold Bolt Shadow Armor',12,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,65536,NULL,'1',1,NULL,'.@r = getrefine(); if(.@r>=2) autobonus "{ bonus3 bAutoSpell,\\\"MG_COLDBOLT\\\",(.@r/2),1000; }",(.@r*2)+100,100,BF_SHORT;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (24220,'Fire_Bolt_Shadow_Armor','Fire Bolt Shadow Armor',12,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,65536,NULL,'1',1,NULL,'.@r = getrefine(); if(.@r>=2) autobonus "{ bonus3 bAutoSpell,\\\"MG_FIREBOLT\\\",(.@r/2),1000; }",(.@r*2)+100,100,BF_SHORT;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (24221,'Lightning_Bolt_Shadow_Armor','Lightning Bolt Shadow Armor',12,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,65536,NULL,'1',1,NULL,'.@r = getrefine(); if(.@r>=2) autobonus "{ bonus3 bAutoSpell,\\\"MG_LIGHTNINGBOLT\\\",(.@r/2),1000; }",(.@r*2)+100,100,BF_SHORT;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (24222,'Earth_Spike_Shadow_Armor','Earth Spike Shadow Armor',12,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,65536,NULL,'1',1,NULL,'.@r = getrefine(); if(.@r>=2) autobonus "{ bonus3 bAutoSpell,\\\"WZ_EARTHSPIKE\\\",(.@r/2),1000; }",(.@r*2)+100,100,BF_SHORT;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (24223,'Enhanced_Force_Shadow_Weapon','Enhanced Force Shadow Weapon',12,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,56,2,131072,NULL,'100',1,NULL,'bonus bAtk2,10; bonus2 bAddClass,Class_All,(getrefine()/2);',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (24224,'Force_Shadow_Weapon','Force Shadow Weapon',12,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,131072,NULL,'70',1,NULL,'.@r = getrefine(); bonus2 bAddClass,Class_All,(.@r<7)?1:((.@r<9)?2:3);',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (24225,'Force_Shadow_Earring','Force Shadow Earring',12,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1048576,NULL,'70',1,NULL,'.@r = getrefine(); bonus bAtk2,(5+.@r); if(.@r>=7) bonus bMaxHPrate,1; if(.@r>=9) bonus bMaxSPrate,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (24226,'Force_Shadow_Pendant','Force Shadow Pendant',12,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2097152,NULL,'70',1,NULL,'.@r = getrefine(); bonus bAtk2,(5+.@r); if(.@r>=7) bonus bMaxHPrate,1; if(.@r>=9) bonus bMaxSPrate,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (24227,'Enhanced_Soul_Shadow_Weapon','Enhanced Soul Shadow Weapon',12,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,56,2,131072,NULL,'100',1,NULL,'bonus bMatk,10; bonus bMatkRate,(getrefine()/2);',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (24228,'Soul_Shadow_Weapon','Soul Shadow Weapon',12,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,131072,NULL,'70',1,NULL,'.@r = getrefine(); bonus bMatkRate,(.@r<7)?1:((.@r<9)?2:3);',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (24229,'Soul_Shadow_Earring','Soul Shadow Earring',12,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1048576,NULL,'70',1,NULL,'.@r = getrefine(); bonus bMatk,(5+.@r); if(.@r>=7) bonus bMaxHPrate,1; if(.@r>=9) bonus bMatkRate,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (24230,'Soul_Shadow_Pendant','Soul Shadow Pendant',12,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2097152,NULL,'70',1,NULL,'.@r = getrefine(); bonus bMatk,(5+.@r); if(.@r>=7) bonus bMaxHPrate,1; if(.@r>=9) bonus bMatkRate,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (24216,'S_Attack_Armor','Attack Shadow Armor',12,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,65536,NULL,'1',1,NULL,'.@r = getrefine(); autobonus "{ bonus bAtk2,(.@r*5); }",(.@r*20)+100,3000,BF_NORMAL;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (24217,'S_Blitz_Earring','Blitz Shadow Earring',12,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1048576,NULL,'1',1,NULL,'.@r = getrefine(); bonus bHit,(.@r/2)+5; if(.@r>=7){ bonus bAspd,1; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (24218,'S_Blitz_Pendent','Blitz Shadow Pendant',12,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2097152,NULL,'1',1,NULL,'.@r = getrefine(); bonus bAtk2,(.@r/2)+5; if(.@r>=7){ bonus bAspd,1; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (24219,'S_ColdBolt_Armor','Cold Bolt Shadow Armor',12,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,65536,NULL,'1',1,NULL,'.@r = getrefine(); if(.@r>=2) autobonus "{ bonus3 bAutoSpell,\\\"MG_COLDBOLT\\\",(.@r/2),1000; }",(.@r*2)+100,100,BF_SHORT;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (24220,'S_FireBolt_Armor','Fire Bolt Shadow Armor',12,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,65536,NULL,'1',1,NULL,'.@r = getrefine(); if(.@r>=2) autobonus "{ bonus3 bAutoSpell,\\\"MG_FIREBOLT\\\",(.@r/2),1000; }",(.@r*2)+100,100,BF_SHORT;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (24221,'S_LightingBolt_Armor','Lightning Bolt Shadow Armor',12,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,65536,NULL,'1',1,NULL,'.@r = getrefine(); if(.@r>=2) autobonus "{ bonus3 bAutoSpell,\\\"MG_LIGHTNINGBOLT\\\",(.@r/2),1000; }",(.@r*2)+100,100,BF_SHORT;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (24222,'S_EarthSpike_Armor','Earth Spike Shadow Armor',12,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,65536,NULL,'1',1,NULL,'.@r = getrefine(); if(.@r>=2) autobonus "{ bonus3 bAutoSpell,\\\"WZ_EARTHSPIKE\\\",(.@r/2),1000; }",(.@r*2)+100,100,BF_SHORT;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (24223,'S_Enhance_Force_Weapon','Enhanced Force Shadow Weapon',12,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,56,2,131072,NULL,'100',1,NULL,'bonus bAtk2,10; bonus2 bAddClass,Class_All,(getrefine()/2);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (24224,'S_Force_Weapon','Force Shadow Weapon',12,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,131072,NULL,'70',1,NULL,'.@r = getrefine(); bonus2 bAddClass,Class_All,(.@r<7)?1:((.@r<9)?2:3);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (24225,'S_Force_Earring','Force Shadow Earring',12,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1048576,NULL,'70',1,NULL,'.@r = getrefine(); bonus bAtk2,(5+.@r); if(.@r>=7) bonus bMaxHPrate,1; if(.@r>=9) bonus bMaxSPrate,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (24226,'S_Force_Pendant','Force Shadow Pendant',12,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2097152,NULL,'70',1,NULL,'.@r = getrefine(); bonus bAtk2,(5+.@r); if(.@r>=7) bonus bMaxHPrate,1; if(.@r>=9) bonus bMaxSPrate,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (24227,'S_Enhance_Spirit_Weapon','Enhanced Soul Shadow Weapon',12,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,56,2,131072,NULL,'100',1,NULL,'bonus bMatk,10; bonus bMatkRate,(getrefine()/2);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (24228,'S_Spirit_Weapon','Soul Shadow Weapon',12,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,131072,NULL,'70',1,NULL,'.@r = getrefine(); bonus bMatkRate,(.@r<7)?1:((.@r<9)?2:3);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (24229,'S_Spirit_Earring','Soul Shadow Earring',12,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1048576,NULL,'70',1,NULL,'.@r = getrefine(); bonus bMatk,(5+.@r); if(.@r>=7) bonus bMaxHPrate,1; if(.@r>=9) bonus bMatkRate,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (24230,'S_Spirit_Pendant','Soul Shadow Pendant',12,10,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2097152,NULL,'70',1,NULL,'.@r = getrefine(); bonus bMatk,(5+.@r); if(.@r>=7) bonus bMaxHPrate,1; if(.@r>=9) bonus bMatkRate,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (24231,'S_Blitz_Shoes','Blitz Shadow Shoes',12,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,524288,NULL,'1',1,NULL,'bonus bFlee,5; .@r = getrefine(); if(.@r>=2){ bonus bCritical,2; } if(.@r>=7){ bonus bAspd,1; } if(.@r>=9){ bonus bAspd,1; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (24232,'S_Blitz_Shield','Blitz Shadow Shield',12,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,262144,NULL,'1',1,NULL,'bonus bCritical,5; .@r = getrefine(); if(.@r>=2){ bonus bCritical,2; } if(.@r>=7){ bonus bAspd,1; } if(.@r>=9){ bonus bAspd,1; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (24233,'S_Exceed_Weapon','Exceeding Shadow Weapon',12,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,131072,NULL,'100',1,NULL,'.@r = getrefine()/2; bonus bBaseAtk,5; bonus bMatk,5; bonus2 bAddClass,Class_All,.@r; bonus bMatkRate,.@r;',NULL,NULL);
@@ -11443,13 +11522,53 @@ REPLACE INTO `item_db_re` VALUES (27027,'Fire_Sandman_Card','Fire Sandman Card',
REPLACE INTO `item_db_re` VALUES (27028,'Fire_Frilldora_Card','Fire Frilldora Card',6,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,2,NULL,NULL,NULL,NULL,'.@r = getrefine(); bonus2 bMagicAddEle,Ele_Earth,3+((.@r>=7)*5)+((.@r>=9)*7);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (27029,'Fire_Golem_Card','Fire Golem Card',6,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,32,NULL,NULL,NULL,NULL,'bonus2 bSubEle,Ele_Fire,20; bonus2 bAddEle,Ele_Fire,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (27030,'Fulbuk_Card','Fulbuk Card',6,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,769,NULL,NULL,NULL,NULL,'bonus3 bAddEff,Eff_Burning,700,ATF_WEAPON|ATF_MAGIC;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27147,'Humanoid_Chimera_Card','Humanoid Chimera Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,136,NULL,NULL,NULL,NULL,'bonus bHit,(BaseLevel >= 90 ? 15 : 5);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27148,'Material_Chimera_Card','Material Chimera Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,136,NULL,NULL,NULL,NULL,'bonus bFlee,(BaseLevel >= 90 ? 20 : 10);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27149,'Heart_Hunter_Card','Heart Hunter Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'.@type = getiteminfo(getequipid(EQI_COMPOUND_ON),11); .@r = getrefine(); if(.@type == 17 || .@type == 18 || .@type == 21){ bonus bLongAtkRate,5+.@r+(.@r >= 10 ? 5 : 0); }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27150,'Toxic_Enchanted_Chimera_Card','Toxic Enchanted Chimera Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,64,NULL,NULL,NULL,NULL,'bonus bMaxHP,1000; bonus bMaxSP,200; if(getrefine() >= 12){ bonus bMaxHPrate,15; bonus bMaxSPrate,15; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27151,'Heart_Hunter_Evil_Card','Heart Hunter Evil Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus2 bAddEffWhenHit,SC_FREEZING,1000 + (readparam(bInt) >= 110 ? 5 : 0); bonus bMdef,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27152,'Cutie_Card','Cutie Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,64,NULL,NULL,NULL,NULL,'bonus bMaxHPrate,10; .@r = getrefine()/2; bonus bAgi,.@r; bonus bAspdRate,.@r;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27157,'Wood_Goblin_Card','Wood Goblin Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'.@r = getrefine(); bonus2 bAddEle,Ele_Water,(.@r >= 9 ? 10 : 5); bonus2 bAddEle,Ele_Earth,(.@r >= 9 ? 10 : 5); bonus2 bSubDefEle,Ele_Water,-5; bonus2 bSubDefEle,Ele_Earth,-5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27158,'Les_Card','Les Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,32,NULL,NULL,NULL,NULL,'bonus2 bSubEle,Ele_Wind,30;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27159,'Uzhas_Card','Uzhas Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,769,NULL,NULL,NULL,NULL,'bonus2 bMagicAddRace,RC_Demon,(getrefine() >= 9 ? 15 : 10);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27160,'Vavayaga_Card','Vavayaga Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,64,NULL,NULL,NULL,NULL,'bonus bFlee,getrefine()*2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27161,'Mavka_Card','Mavka Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,136,NULL,NULL,NULL,NULL,'bonus2 bMagicAtkEle,Ele_Fire,20; bonus2 bMagicAtkEle,Ele_Earth,20;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27162,'Gopinich_Card','Gopinich Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,769,NULL,NULL,NULL,NULL,'bonus bSPDrainValue,5; bonus bUseSPrate,50;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27163,'Faceworm_Card','Faceworm Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,136,NULL,NULL,NULL,NULL,'bonus bAgi,-1; bonus bDex,-1; bonus bAspdRate,3;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27164,'Faceworm_Queen_Card','Faceworm Queen Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,64,NULL,NULL,NULL,NULL,'bonus bMaxHPrate,-10; .@r = getrefine(); bonus bCritical,15 + .@r; bonus bCritAtkRate,.@r;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27165,'Dark_Faceworm_Card','Dark Faceworm Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,136,NULL,NULL,NULL,NULL,'bonus bVit,-1; bonus bInt,-1; bonus bDelayrate,-3;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27166,'Faceworm_Egg_Card','Faceworm Egg Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,64,NULL,NULL,NULL,NULL,'.@r = getrefine(); .@sub = 2+(.@r >= 9 ? 3 : .@r >= 7 ? 1 : 0); bonus bNearAtkDef,.@sub; bonus bMagicAtkDef,.@sub;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27167,'Faceworm_Larva_Card','Faceworm Larva Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,4,NULL,NULL,NULL,NULL,'bonus2 bSubEle,Ele_Neutral,15; bonus2 bMagicAddSize,Size_All,getrefine()*3;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27168,'Irene_High_Elder_Card','Irene High Elder Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,4,NULL,NULL,NULL,NULL,'bonus bHit,10 + 5 * (getrefine()/3);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27169,'Payon_Soldier_Card','Payon Soldier Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'.@atk = 5; .@r = getrefine(); if(getiteminfo(getequipid(EQI_HAND_R),11) == W_SPEAR && .@r >= 10){ .@atk += 20; if(.@r >= 14){ .@atk += 20; } } bonus bAtk,.@atk; bonus bMatk,.@atk;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27181,'Airship_Raid_Card','Airship Raid Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'.@r = getrefine(); bonus bLongAtkRate,1 + .@r/2; bonus bCritical,.@r/2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27182,'Captain_Felock_Card','Captain Felock Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bAtk,30; .@r = getrefine(); bonus2 bSkillAtk,"RL_AM_BLAST",.@r >= 10 ? 60 : 30; bonus2 bSkillAtk,"RL_HAMMER_OF_GOD",.@r >= 10 ? 60 : 30;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27183,'Gigantes_Card','Gigantes Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,128,NULL,NULL,NULL,NULL,'bonus bAtk,20; if(readparam(bStr) >= 120) { bonus bAtk,20; bonus bAspdRate,-3; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27184,'Knight_Sakray_Card','Knight Sakray Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bAtk,20; bonus2 bAddRace,RC_Demon,30; bonus2 bAddRace,RC_Undead,30;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27249,'Arhi_Card','Arhi Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,64,NULL,NULL,NULL,NULL,'bonus bAtk,15; bonus bMatk,15; bonus bMaxHP,500; bonus bHit,15; bonus bFlee,15;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27250,'Dio_Anemos_Card','Dio Anemos Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,64,NULL,NULL,NULL,NULL,'bonus bMatkRate,3; bonus2 bMagicAtkEle,Ele_Neutral,5; bonus2 bMagicAtkEle,Ele_Earth,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27251,'Geffen_Gang_Member_Card','Geffen Gang Member Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,64,NULL,NULL,NULL,NULL,'bonus bCritAtkRate,3; bonus bAspdRate,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27252,'Geffen_Bully_Card','Geffen Bully Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,64,NULL,NULL,NULL,NULL,'bonus bCritAtkRate,5; bonus bAspdRate,3;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27253,'Geffen_Shoplifter_Card','Geffen Shoplifter Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,64,NULL,NULL,NULL,NULL,'bonus bMatkRate,3; bonus2 bMagicAtkEle,Ele_Fire,5; bonus2 bMagicAtkEle,Ele_Holy,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27254,'Faymont_Card','Faymont Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,64,NULL,NULL,NULL,NULL,'bonus bSPrecovRate,10; bonus3 bAutoSpellWhenHit,"CH_SOULCOLLECT",1,10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27255,'Ordre_Card','Ordre Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,64,NULL,NULL,NULL,NULL,'bonus bMatkRate,3; bonus2 bMagicAtkEle,Ele_Wind,5; bonus2 bMagicAtkEle,Ele_Water,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27256,'Blut_Hase_Card','Blut Hase Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,64,NULL,NULL,NULL,NULL,'bonus bAtkRate,3; bonus bLongAtkRate,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27257,'Kuro_Akuma_Card','Kuro Akuma Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,64,NULL,NULL,NULL,NULL,'bonus bCastrate,3; bonus bLongAtkRate,5; bonus2 bSkillAtk,"NJ_HUUJIN",5; bonus2 bSkillAtk,"NJ_HYOUSENSOU",5; bonus2 bSkillAtk,"NJ_KOUENKA",5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27258,'Ifodes_Card','Ifodes Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,64,NULL,NULL,NULL,NULL,'bonus bAtkRate,3; bonus bAspdRate,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27259,'Licheniyes_Card','Licheniyes Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,64,NULL,NULL,NULL,NULL,'bonus bMatkRate,3; bonus2 bMagicAtkEle,Ele_Holy,5; bonus bHealPower,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27260,'Odoric_Card','Odoric Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,64,NULL,NULL,NULL,NULL,'bonus bAspdRate,3; bonus bLongAtkRate,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27261,'Ju_Card','Ju Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'.@rate = 10 + (getiteminfo(getequipid(EQI_HAND_R),11) == W_BOOK ? 20 : 0) + (getrefine() >= 14 ? 20 : 0); bonus2 bSkillAtk,"MG_FIREBOLT",.@rate; bonus2 bSkillAtk,"MG_COLDBOLT",.@rate; bonus2 bSkillAtk,"MG_LIGHTNINGBOLT",.@rate;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27262,'Dwigh_Card','Dwigh Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,136,NULL,NULL,NULL,NULL,'bonus2 bMagicAtkEle,Ele_Dark,20; bonus2 bMagicAtkEle,Ele_Neutral,20;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27263,'Fay_Kanavian_Card','Fay Kanavian Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,64,NULL,NULL,NULL,NULL,'autobonus "{ bonus bDef,300; }",100,10000,BF_WEAPON|BF_SHORT,"{ active_transform 1040,10000; }";',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27264,'Evil_Shadow_Card','Evil Shadow Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,32,NULL,NULL,NULL,NULL,'bonus2 bSubEle,Ele_Dark,30; bonus2 bSubEle,Ele_Undead,30; bonus2 bSubEle,Ele_Holy,-30; bonus2 bSubEle,Ele_Fire,-30;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (27265,'Evil_Fanatics_Card','Evil Fanatics Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus2 bAddEle,Ele_Dark,30; bonus2 bAddEle,Ele_Undead,30; bonus2 bMagicAddEle,Ele_Dark,30; bonus2 bMagicAddEle,Ele_Undead,30; bonus2 bAddEle,Ele_Holy,-30; bonus2 bAddEle,Ele_Fire,-30; bonus2 bMagicAddEle,Ele_Holy,-30; bonus2 bMagicAddEle,Ele_Fire,-30;',NULL,NULL);
#===================================================================
# New Katars
#===================================================================
-REPLACE INTO `item_db_re` VALUES (28000,'Tanos_Katar','Tanos Katar',5,10,NULL,1800,'220:80',NULL,NULL,1,0x00001000,63,2,34,4,'120',1,16,'bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bAddClass,Class_All,5; bonus2 bHPLossRate,100,10000;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (28000,'Thanos_Katar','Thanatos Katar',5,10,NULL,1800,'220:80',NULL,1,1,0x00001000,56,2,34,4,'120',1,16,'bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000;',NULL,'heal -1000,0;');
REPLACE INTO `item_db_re` VALUES (28001,'Katar_Of_Evil_Slayer','Katar Of Evil Slayer',5,10,NULL,1200,'120',NULL,1,1,0x00001000,63,2,34,3,'100',1,16,'bonus2 bAddRace,RC_Demon,10; bonus2 bAddRace,RC_Undead,10; .@r = getrefine(); if(.@r>=9){ bonus2 bAddClass,Class_All,5; } if(.@r>=12){ bonus2 bAddClass,Class_All,7; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28002,'Half_BF_Katar2','Half BF Katar2',5,20,NULL,0,'130',NULL,1,0,0x00001000,63,2,34,3,'80',1,16,'bonus bStr,1; bonus bDex,1; bonus bLuk,1; bonus2 bAddRace,RC_DemiHuman,35; bonus2 bAddRace,RC_Player,35; bonus bCritAtkRate,10; bonus bAspdRate,3; bonus bUnbreakableWeapon,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (28005,'Blue_Katar','Blue Katar',5,10,NULL,1200,'190',NULL,1,1,0x00001000,56,2,34,3,'100',1,16,'bonus bAgi,5; bonus bStr,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (28005,'Ru_Blue_Katar','Blue Katar',5,10,NULL,1200,'190',NULL,1,1,0x00001000,56,2,34,3,'100',1,16,'bonus bAgi,5; bonus bStr,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28006,'Ru_Gold_Katar','Ru Gold Katar',5,0,NULL,1200,'190',NULL,1,2,0x00001000,56,2,34,3,'120',1,16,'bonus bAgi,8; bonus bStr,8;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28007,'Crimson_Katar','Crimson Katar',5,20,NULL,1300,'130',NULL,1,2,0x00001000,63,2,34,3,'70',1,16,'.@r = getrefine(); bonus bBaseAtk,((BaseLevel/10)*5)+(.@r<=15?pow(.@r,2):225);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28008,'Katar_of_Vicious_Mind','Katar of Vicious Mind',5,20,NULL,1800,'180',NULL,1,1,0x00001000,63,2,34,4,'160',1,16,'bonus bAtk,pow(min(getrefine(),15),2);',NULL,NULL);
@@ -11458,10 +11577,10 @@ REPLACE INTO `item_db_re` VALUES (28011,'Unity_Katar','Unity Katar',5,20,NULL,65
#===================================================================
# New Axes
#===================================================================
-REPLACE INTO `item_db_re` VALUES (28100,'Tanos_Axe_','Tanos Axe',5,10,NULL,4000,'300:80',NULL,NULL,1,0x00000400,63,2,34,4,'120',1,7,'bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bAddClass,Class_All,5; bonus2 bHPLossRate,100,10000;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (28101,'Axe_Tornado','Axe Tornado',5,10,NULL,4000,'320',NULL,NULL,1,0x00000400,56,2,34,4,'130',1,7,'bonus bAtkEle,Ele_Wind; bonus2 bSkillCooldown,"NC_AXETORNADO",-1000;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (28100,'Thanos_Axe','Thanatos Axe',5,10,NULL,4000,'300:80',NULL,1,1,0x000444A2,56,2,34,4,'120',1,7,'bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000;',NULL,'heal -1000,0;');
+REPLACE INTO `item_db_re` VALUES (28101,'Tornado_Axe','Axe Tornado',5,10,NULL,4000,'320',NULL,NULL,1,0x00000400,56,2,34,4,'130',1,7,'bonus bAtkEle,Ele_Wind; bonus2 bSkillCooldown,"NC_AXETORNADO",-1000;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28102,'Half_BF_Two_Handed_Axe1','Half BF Two Handed Axe1',5,20,NULL,0,'200',NULL,1,0,0x000444A2,63,2,34,3,'80',1,7,'bonus bStr,3; bonus2 bAddRace,RC_DemiHuman,30; bonus2 bAddRace,RC_Player,30; bonus2 bIgnoreDefRaceRate,RC_DemiHuman,10; bonus2 bIgnoreDefRaceRate,RC_Player,10; bonus bUnbreakableWeapon,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (28103,'Blue_Twohand_Axe','Blue Twohand Axe',5,10,NULL,3000,'330',NULL,1,1,0x00000400,56,2,34,3,'1',1,7,'bonus bStr,5; bonus bVit,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (28103,'Ru_Blue_Axe_M','Blue Twohand Axe',5,10,NULL,3000,'330',NULL,1,1,0x00000400,56,2,34,3,'1',1,7,'bonus bStr,5; bonus bVit,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28104,'Ru_Gold_Axe_M','Ru Gold Axe M',5,0,NULL,3000,'330',NULL,1,2,0x00000400,56,2,34,3,'120',1,7,'bonus bStr,8; bonus bVit,8;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28105,'Infinity_Axe','Infinity Axe',5,10,NULL,500,'265',NULL,1,1,0x000444A2,56,2,34,4,'100',1,7,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28106,'Crimson_Two-Handed_Axe','Crimson Two-Handed Axe',5,20,NULL,2000,'200',NULL,1,2,0x000444A2,63,2,34,3,'70',1,7,'.@r = getrefine(); bonus bBaseAtk,((BaseLevel/10)*5)+(.@r<=15?pow(.@r,2):225); bonus bUnbreakableWeapon,1;',NULL,NULL);
@@ -11470,9 +11589,9 @@ REPLACE INTO `item_db_re` VALUES (28110,'Unity_Two-Handed_Axe','Unity Two-Handed
#===================================================================
# New Guns
#===================================================================
-REPLACE INTO `item_db_re` VALUES (28200,'End_Of_The_Horizon','End Of The Horizon',5,2700000,NULL,2400,'410',NULL,9,1,0x40000000,63,2,34,4,'110',1,21,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (28201,'Southern_Cross_','Southern Cross',5,2800000,NULL,2000,'480',NULL,9,0,0x40000000,63,2,34,4,'141',1,21,'bonus3 bAutoSpell,"GC_CROSSIMPACT",1,50;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (28202,'Southern_Cross__','Southern Cross',5,2800000,NULL,2000,'480',NULL,9,1,0x40000000,63,2,34,4,'141',1,21,'bonus3 bAutoSpell,"GC_CROSSIMPACT",1,50;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (28200,'END_OF_HORIZO','End Of The Horizon',5,2700000,NULL,2400,'410',NULL,9,1,0x40000000,63,2,34,4,'110',1,21,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (28201,'Southern_Cross_R','Southern Cross',5,2800000,NULL,2000,'480',NULL,9,0,0x40000000,63,2,34,4,'141',1,21,'bonus3 bAutoSpell,"GC_CROSSIMPACT",1,50;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (28202,'Southern_Cross_R_','Southern Cross',5,2800000,NULL,2000,'480',NULL,9,1,0x40000000,63,2,34,4,'141',1,21,'bonus3 bAutoSpell,"GC_CROSSIMPACT",1,50;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28203,'Half_BF_Rifle1','Half BF Rifle1',5,0,NULL,0,'50',NULL,9,0,0x41000000,63,2,34,3,'80',1,18,'bonus bDex,2; bonus bHit,8; bonus bCritical,8; bonus2 bAddRace,RC_DemiHuman,30; bonus2 bAddRace,RC_Player,30; bonus2 bVariableCastrate,"GS_TRACKING",-20; bonus2 bIgnoreDefRaceRate,RC_DemiHuman,10; bonus2 bIgnoreDefRaceRate,RC_Player,10; bonus bUnbreakableWeapon,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28204,'Half_BF_Shotgun1','Half BF Shotgun1',5,0,NULL,0,'100',NULL,9,0,0x41000000,63,2,34,3,'80',1,20,'bonus bDex,2; bonus bSplashRange,1; bonus2 bAddRace,RC_DemiHuman,30; bonus2 bAddRace,RC_Player,30; bonus2 bIgnoreDefRaceRate,RC_DemiHuman,10; bonus2 bIgnoreDefRaceRate,RC_Player,10; autobonus "{ bonus bBaseAtk,80; bonus2 bHPLossRate,100,1000; }",30,6000,BF_WEAPON,"{ specialeffect2 EF_BASH3D; }"; bonus bUnbreakableWeapon,1;',NULL,NULL);
#===================================================================
@@ -11487,27 +11606,30 @@ REPLACE INTO `item_db_re` VALUES (28315,'RCC2013_ARMLET','RCC2013_ARMLET',4,200,
REPLACE INTO `item_db_re` VALUES (28316,'RCC2013_ARMLET_','RCC2013_ARMLET_',4,200,NULL,200,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,136,NULL,'1',0,NULL,'bonus2 bAddClass,Class_All,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28317,'RCC2013_RING','RCC2013_RING',4,200,NULL,200,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,136,NULL,'1',0,NULL,'bonus2 bAddClass,Class_All,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28318,'RCC2013_RING_','RCC2013_RING_',4,200,NULL,200,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,136,NULL,'1',0,NULL,'bonus2 bAddClass,Class_All,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (28310,'Sarah\'s_Left_Earring','Sarah\'s Left Earring',4,10,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,128,NULL,'145',0,NULL,'skill "AL_HEAL",1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (28311,'Sarah\'s_Right_Earring','Sarah\'s Right Earring',4,10,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,8,NULL,'145',0,NULL,'skill "AL_TELEPORT",1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (28321,'Falconer_Claw','Falconer Claw',4,0,NULL,100,NULL,5,NULL,1,0x00000800,63,2,136,0,'80',0,NULL,'bonus bDex,1; bonus2 bSkillAtk,"HT_BLITZBEAT",getskilllv("HT_STEELCROW")*10;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (28322,'Falconer_Glove','Falconer Glove',4,0,NULL,100,NULL,5,NULL,1,0x00000800,63,2,136,0,'80',0,NULL,'bonus bDex,1; bonus bUseSPrate,-5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (28326,'Broken_Chips_01','Broken Chips 01',4,10,NULL,100,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,136,NULL,'100',0,NULL,'bonus bStr,4;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (28327,'Broken_Chips_02','Broken Chips 02',4,10,NULL,100,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,136,NULL,'100',0,NULL,'bonus bInt,4;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (28332,'Jewerly_Ring','Jewerly Ring',4,10,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,136,NULL,'1',0,NULL,'bonus bLuk,20; autobonus "{ bonus bAspd,2; }",50,2000,BF_WEAPON|BF_MAGIC;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (28310,'Earring_Of_Sarah_L','Sarah\'s Left Earring',4,10,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,136,NULL,'145',0,NULL,'skill "AL_HEAL",1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (28311,'Earring_Of_Sarah_R','Sarah\'s Right Earring',4,10,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,136,NULL,'145',0,NULL,'skill "AL_TELEPORT",1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (28321,'Falconer_Claw','Falconer Claw',4,0,NULL,100,NULL,5,NULL,1,0x00000800,63,2,136,NULL,'80',0,NULL,'bonus bDex,1; bonus2 bSkillAtk,"HT_BLITZBEAT",getskilllv("HT_STEELCROW")*10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (28322,'Falconer_Glove','Falconer Glove',4,0,NULL,100,NULL,5,NULL,1,0x00000800,63,2,136,NULL,'80',0,NULL,'bonus bDex,1; bonus bUseSPrate,-5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (28326,'Broken_Chip_1','Broken Chips 01',4,10,NULL,100,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,136,NULL,'100',0,NULL,'bonus bStr,4;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (28327,'Broken_Chip_2','Broken Chips 02',4,10,NULL,100,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,136,NULL,'100',0,NULL,'bonus bInt,4;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (28332,'Jewel_Ring','Jewerly Ring',4,10,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,136,NULL,'1',0,NULL,'bonus bLuk,20; autobonus "{ bonus bAspd,2; }",50,2000,BF_WEAPON|BF_MAGIC;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28333,'Gold_PC_Room_Ring','Gold PC Room Ring',4,10,NULL,0,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,136,NULL,'1',0,NULL,'bonus bMaxHPrate,3; bonus bMaxSPrate,3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28342,'Critical_Anklet','Critical Anklet',4,0,NULL,200,NULL,3,NULL,1,0xFFFFFFFF,63,2,136,NULL,NULL,0,NULL,'bonus bCritical,5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (28358,'Cursed_Lucky_Clover','Cursed Lucky Clover',4,0,NULL,100,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,136,0,'100',0,NULL,'bonus bLuk,2; bonus bFlee,3; bonus2 bAddEff2,Eff_Curse,5;',NULL,'sc_end SC_CLOAKING; /*FIXME: Because the combo has Cloaking skill*/');
-REPLACE INTO `item_db_re` VALUES (28372,'Imperial_Ring','Imperial Ring',4,0,NULL,500,NULL,3,NULL,1,0xFFFFFFFF,63,2,136,0,'50',0,NULL,'bonus bStr,1; bonus bInt,1; bonus bMaxHPRate,3; bonus bMaxSPRate,3;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (28354,'City_Map','City Map',4,0,NULL,100,NULL,0,NULL,1,0xFFFFFFFF,63,2,136,NULL,'1',0,0,'/* todo */',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (28355,'Shining_Holy_Water_','Shining Holy Water',4,0,NULL,100,NULL,0,NULL,1,0xFFFFFFFF,63,2,136,NULL,'1',0,0,'/* todo */',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (28356,'Prontera_Badge','Prontera Badge',4,0,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'1',0,0,'/*warp "prontera",159,192; 15 mins cooldown */',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (28358,'Cursed_Lucky_Clover','Cursed Lucky Clover',4,0,NULL,100,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,136,NULL,'100',0,NULL,'bonus bLuk,2; bonus bFlee,3; bonus2 bAddEff2,Eff_Curse,5;',NULL,'sc_end SC_CLOAKING; /*FIXME: Because the combo has Cloaking skill*/');
+REPLACE INTO `item_db_re` VALUES (28372,'Imperial_Ring','Imperial Ring',4,0,NULL,500,NULL,3,NULL,1,0xFFFFFFFF,63,2,136,NULL,'50',0,NULL,'bonus bStr,1; bonus bInt,1; bonus bMaxHPRate,3; bonus bMaxSPRate,3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28374,'Foxtail_Ring','Foxtail Ring',4,20,NULL,100,NULL,0,NULL,0,0x80000000,7,2,136,NULL,'1',0,NULL,'bonus2 bExpAddRace,RC_All,5; .@lvl = min(BaseLevel/5,10); bonus bAtk,2*.@lvl; bonus bMatk,2*.@lvl; bonus bMaxHP,10*.@lvl; bonus bMaxSP,5*.@lvl;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (28377,'Magical_Ring','Magical Ring',4,0,NULL,100,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,136,0,'20',0,NULL,'bonus2 bMagicAddEle,Ele_Fire,5; bonus2 bMagicAddEle,Ele_Water,5; bonus2 bMagicAddEle,Ele_Earth,5; bonus2 bMagicAddEle,Ele_Wind,5; if (BaseLevel > 4) { bonus2 bSkillAtk,"MG_FIREBOLT",BaseLevel/5; bonus2 bSkillAtk,"MG_COLDBOLT",BaseLevel/5; bonus2 bSkillAtk,"MG_LIGHTNINGBOLT",BaseLevel/5; bonus2 bSkillAtk,"WZ_EARTHSPIKE",BaseLevel/5; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (28377,'Magical_Ring','Magical Ring',4,0,NULL,100,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,136,NULL,'20',0,NULL,'bonus2 bMagicAtkEle,Ele_Fire,5; bonus2 bMagicAtkEle,Ele_Water,5; bonus2 bMagicAtkEle,Ele_Earth,5; bonus2 bMagicAtkEle,Ele_Wind,5; if (BaseLevel > 4) { bonus2 bSkillAtk,"MG_FIREBOLT",BaseLevel/5; bonus2 bSkillAtk,"MG_COLDBOLT",BaseLevel/5; bonus2 bSkillAtk,"MG_LIGHTNINGBOLT",BaseLevel/5; bonus2 bSkillAtk,"WZ_EARTHSPIKE",BaseLevel/5; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28380,'Fresh_Grass_Necklace','Fresh Grass Necklace',4,20,NULL,100,NULL,0,NULL,1,0x80000000,7,2,136,NULL,'100',0,NULL,'bonus bFlee2,5; bonus2 bSkillCooldown,"SU_SCAROFTAROU",-5000;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28381,'Cute_Grass_Necklace','Cute Grass Necklace',4,20,NULL,10,NULL,0,NULL,1,0x80000000,7,2,136,NULL,'100',0,NULL,'bonus bHealPower,5; bonus2 bSkillCooldown,"SU_TUNAPARTY",-7000;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28382,'Charm_Grass_Necklace','Charm Grass Necklace',4,20,NULL,10,NULL,0,NULL,1,0x80000000,7,2,136,NULL,'100',0,NULL,'bonus bMdef,5; bonus2 bVariableCastrate,"SU_CN_METEOR",-1000;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (28386,'Fallen_Monk_Rosary','Fallen Monk Rosary',4,0,NULL,100,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,136,0,'20',0,NULL,'bonus bAspdRate,5; bonus bCritical,5; bonus2 bSkillUseSP,"CH_SOULCOLLECT",-5; if (BaseLevel > 14) bonus2 bSkillAtk,"SR_DRAGONCOMBO",BaseLevel/15; if (BaseLevel > 19) bonus2 bSkillAtk,"SR_KNUCKLEARROW",BaseLevel/20; if (BaseLevel > 29) bonus2 bSkillAtk,"SR_SKYNETBLOW",BaseLevel/30;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (28386,'Fallen_Monk_Rosary','Fallen Monk Rosary',4,0,NULL,100,NULL,NULL,NULL,1,0xFFFFFFFF,63,2,136,NULL,'20',0,NULL,'bonus bAspdRate,5; bonus bCritical,5; bonus2 bSkillUseSP,"CH_SOULCOLLECT",-5; if (BaseLevel > 14) bonus2 bSkillAtk,"SR_DRAGONCOMBO",BaseLevel/15; if (BaseLevel > 19) bonus2 bSkillAtk,"SR_KNUCKLEARROW",BaseLevel/20; if (BaseLevel > 29) bonus2 bSkillAtk,"SR_SKYNETBLOW",BaseLevel/30;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28391,'S_Thief_Earring','Thief Shadow Earring',12,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1048576,NULL,'1',1,NULL,'.@r = getrefine(); autobonus3 "{ bonus bBaseAtk,30+(.@r*10); bonus bFlee,30+(.@r*10); }",200,5000,"TF_THROWSTONE","{ specialeffect2 EF_ENHANCE; }";',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28392,'S_Archer_Earring','Archer Shadow Earring',12,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1048576,NULL,'1',1,NULL,'.@r = getrefine(); autobonus3 "{ bonus bBaseAtk,30+(.@r*10); bonus bHit,30+(.@r*10); }",200,5000,"AC_DOUBLE","{ specialeffect2 EF_ENHANCE; }";',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (28410,'Sapphire_Wrist','Sapphire Wrist',4,0,NULL,500,NULL,3,NULL,1,0xFFFFFFFF,63,2,136,0,'50',0,NULL,'bonus bDex,5; bonus bLuk,5; bonus bInt,5; bonus2 bSkillAtk,"GN_SPORE_EXPLOSION",BaseLevel/5; bonus2 bVariableCastrate,"CR_ACIDDEMONSTRATION",-(BaseLevel/4); .@n = getskilllv("CR_SLIMPITCHER"); bonus bDex,.@n/2; bonus bLuk,.@n/2; bonus bInt,.@n/2; bonus bMatk,(.@n/2)*20;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (28411,'Emerald_Earring','Emerald Earring',4,0,NULL,500,NULL,3,NULL,1,0xFFFFFFFF,63,2,136,0,'50',0,NULL,'bonus bDex,5; bonus bAgi,5; bonus bInt,5; bonus2 bSkillAtk,"CG_ARROWVULCAN",BaseLevel; bonus2 bSkillAtk,"BA_MUSICALSTRIKE",BaseLevel; bonus2 bSkillAtk,"DC_THROWARROW",BaseLevel; bonus2 bSkillAtk,"WM_METALICSOUND",2*(BaseLevel/5); .@n = getskilllv("WM_METALICSOUND"); bonus2 bVariableCastrate,"WM_METALICSOUND",.@n/2; bonus bDex,.@n/2; bonus bAgi,.@n/2; bonus bInt,.@n/2; bonus bMatk,(.@n/2)*20;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (28410,'Sapphire_Wrist','Sapphire Wrist',4,0,NULL,500,NULL,3,NULL,1,0xFFFFFFFF,63,2,136,NULL,'50',0,NULL,'bonus bDex,5; bonus bLuk,5; bonus bInt,5; bonus2 bSkillAtk,"GN_SPORE_EXPLOSION",BaseLevel/5; bonus2 bVariableCastrate,"CR_ACIDDEMONSTRATION",-(BaseLevel/4); .@n = getskilllv("CR_SLIMPITCHER"); bonus bDex,.@n/2; bonus bLuk,.@n/2; bonus bInt,.@n/2; bonus bMatk,(.@n/2)*20;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (28411,'Emerald_Earring','Emerald Earring',4,0,NULL,500,NULL,3,NULL,1,0xFFFFFFFF,63,2,136,NULL,'50',0,NULL,'bonus bDex,5; bonus bAgi,5; bonus bInt,5; bonus2 bSkillAtk,"CG_ARROWVULCAN",BaseLevel; bonus2 bSkillAtk,"BA_MUSICALSTRIKE",BaseLevel; bonus2 bSkillAtk,"DC_THROWARROW",BaseLevel; bonus2 bSkillAtk,"WM_METALICSOUND",2*(BaseLevel/5); .@n = getskilllv("WM_METALICSOUND"); bonus2 bVariableCastrate,"WM_METALICSOUND",.@n/2; bonus bDex,.@n/2; bonus bAgi,.@n/2; bonus bInt,.@n/2; bonus bMatk,(.@n/2)*20;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28413,'Lesser_Mackerel_Talisman','Lesser Mackerel Talisman',4,0,NULL,100,NULL,1,NULL,1,0x80000000,63,2,136,NULL,'100',NULL,NULL,'bonus bVit,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28414,'Intermediate_Mackerel_Talisman','Intermediate Mackerel Talisman',4,0,NULL,100,NULL,1,NULL,1,0x80000000,63,2,136,NULL,'140',NULL,NULL,'bonus bVit,2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28415,'Greater_Mackerel_Talisman','Greater Mackerel Talisman',4,0,NULL,100,NULL,1,NULL,1,0x80000000,63,2,136,NULL,'175',NULL,NULL,'bonus bVit,3;',NULL,NULL);
@@ -11555,7 +11677,7 @@ REPLACE INTO `item_db_re` VALUES (28499,'Proof_of_Glory','Proof of Glory',4,0,NU
#===================================================================
# More books
#===================================================================
-REPLACE INTO `item_db_re` VALUES (28600,'Blue_Book','Blue Book',5,10,NULL,500,'160',NULL,1,1,0x00000100,56,2,2,3,'100',1,15,'bonus bAgi,5; bonus bDex,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (28600,'Ru_Blue_Book','Blue Book',5,10,NULL,500,'160',NULL,1,1,0x00000100,56,2,2,3,'100',1,15,'bonus bAgi,5; bonus bDex,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28601,'Ru_Gold_Book','Ru Gold Book',5,0,NULL,500,'160',NULL,1,2,0x00000008,63,2,2,3,'120',1,15,'bonus bVit,8; bonus bInt,8;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28602,'Demon_Hunting_Bible','Demon Hunting Bible',5,0,NULL,500,'30:170',NULL,1,2,0x00000008,63,2,2,3,'110',1,15,'bonus bInt,2; bonus bDex,2; .@b = readparam(bInt); bonus2 bSkillAtk,"PR_MAGNUS",30+min(.@b,120);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28604,'Crimson_Bible','Crimson Bible',5,20,NULL,450,'45',NULL,1,2,0x00410100,63,2,2,3,'70',1,15,'.@r = getrefine(); bonus bBaseAtk,((BaseLevel/10)*5)+(.@r<=15?pow(.@r,2):225); bonus bMatk,(.@r<=15?(pow(.@r,2)/2):225);',NULL,NULL);
@@ -11567,7 +11689,7 @@ REPLACE INTO `item_db_re` VALUES (28606,'Unity_Bible','Unity Bible',5,20,NULL,22
REPLACE INTO `item_db_re` VALUES (28700,'Ru_Gold_Dagger','Ru Gold Dagger',5,0,NULL,1000,'160',NULL,1,2,0x00020000,56,2,2,3,'120',1,1,'bonus bStr,8; bonus bInt,8;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28701,'Ru_Gold_Knife','Ru Gold Knife',5,0,NULL,500,'160',NULL,1,2,0x00010000,56,2,2,3,'120',1,1,'bonus bVit,8; bonus bInt,8;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28702,'Ru_Gold_Ashura','Ru Gold Ashura',5,0,NULL,1000,'150:150',NULL,1,2,0x2000000,63,2,2,3,'120',1,1,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (28703,'Infinity_Dagger','Infinity Dagger',5,10,NULL,500,'125',NULL,1,1,0x028F5EEF,56,2,2,4,'100',1,1,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (28703,'Infinity_Dagger','Infinity Dagger',5,10,NULL,500,'125:100',NULL,1,1,0x028F5EEF,56,2,2,4,'100',1,1,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28705,'Crimson_Dagger','Crimson Dagger',5,20,NULL,550,'55',NULL,1,2,0x028F5EEF,63,2,2,3,'70',1,1,'.@r = getrefine(); bonus bBaseAtk,((BaseLevel/10)*5)+(.@r<=15?pow(.@r,2):225); bonus bMatk,(.@r<=15?(pow(.@r,2)/2):225);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28706,'Dagger_of_Vicious_Mind','Dagger of Vicious Mind',5,20,NULL,1050,'105:50',NULL,1,1,0x028F5EEF,63,2,2,4,'160',1,1,'bonus bAtk,pow(min(getrefine(),15),2); bonus bMatk,pow(min(getrefine(),15),2)/2;',NULL,NULL);
#===================================================================
@@ -11576,13 +11698,13 @@ REPLACE INTO `item_db_re` VALUES (28706,'Dagger_of_Vicious_Mind','Dagger of Vici
REPLACE INTO `item_db_re` VALUES (28900,'Guardsmen\'s_Shield','Guardsmen\'s Shield',4,20,NULL,3000,NULL,30,NULL,1,0xFFFFFFFF,63,2,32,NULL,'100',1,1,'.@r = getrefine(); skill "LG_SHIELDSPELL",1; bonus3 bAutoSpellWhenHit,"HP_ASSUMPTIO",3,(10+(.@r*10)); bonus bDef,(.@r*10); bonus bMdef,.@r;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28901,'Cursed_Mad_Bunny','Cursed Mad Bunny',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,32,NULL,'1',1,1,'bonus bAspd,3; bonus2 bAddRace,RC_All,5; bonus2 bMagicAddRace,RC_All,5; bonus bShortWeaponDamageReturn,10; autobonus2 "{ bonus bMagicDamageReturn,60; }",10,2000,BF_MAGIC,"{ specialeffect2 EF_WIND; }"; .@r = getrefine(); if(.@r>=7) { bonus bBaseAtk,5; bonus bMatk,5; } if(.@r>=9) { bonus bBaseAtk,15; bonus bMatk,15; } if(.@r>=12) { bonus bCritical,10; bonus bNoCastCancel,0; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28902,'Mad_Bunny_','Mad Bunny',4,20,NULL,100,NULL,0,NULL,1,0xFFFFFFFF,63,2,32,NULL,'1',1,1,'bonus2 bAddRace,RC_All,5; bonus2 bMagicAddRace,RC_All,5; bonus bShortWeaponDamageReturn,10; autobonus2 "{ bonus bMagicDamageReturn,60; }",10,2000,BF_MAGIC,"{ specialeffect2 EF_WIND; }"; .@r = getrefine(); if(.@r>=7) { bonus bBaseAtk,5; bonus bMatk,5; } if(.@r>=9) { bonus bBaseAtk,15; bonus bMatk,15; } if(.@r>=12) { bonus bCritical,10; bonus bNoCastCancel,0; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (28903,'Scutum','Scutum',4,0,NULL,500,NULL,1,NULL,1,0xFFFFFFFF,63,2,32,1,'1',1,NULL,'.@r = getrefine(); bonus bFlee,5+(.@r*3); bonus bFlee2,1+(.@r*2); if (.@r > 10) { bonus bMaxHPrate,10; bonus bMaxSPrate,10; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (28903,'Scutum','Scutum',4,0,NULL,500,NULL,1,NULL,1,0xFFFFFFFF,63,2,32,NULL,'1',1,1,'.@r = getrefine(); bonus bFlee,5+(.@r*3); bonus bFlee2,1+(.@r*2); if (.@r > 10) { bonus bMaxHPrate,10; bonus bMaxSPrate,10; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28904,'Unity_Guard','Unity Guard',4,20,NULL,300,NULL,60,NULL,1,0xFFFFFFFF,63,2,32,NULL,'100',1,1,'if(BaseLevel<100) { bonus bDef,12*getrefine(); }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28905,'Unity_Buckler','Unity Buckler',4,20,NULL,300,NULL,60,NULL,1,0xFFFFFFFF,63,2,32,NULL,'100',1,1,'if(BaseLevel<100) { bonus bMaxSPrate,2*getrefine(); }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (28906,'Shield_Of_Flame','Shield Of Flame',4,0,NULL,500,NULL,80,NULL,1,0xFFFFFFFF,63,2,32,1,'90',1,NULL,'bonus2 bSubEle,Ele_Fire,25; .@r = getrefine(); if(.@r > 4) { bonus bAspd,1+((.@r > 6) ? 1 : 0); }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (28907,'Shield_Of_Gust','Shield Of Gust',4,0,NULL,500,NULL,80,NULL,1,0xFFFFFFFF,63,2,32,1,'90',1,NULL,'bonus2 bSubEle,Ele_Wind,25; .@r = getrefine(); if(.@r > 4) { bonus bAspd,1+((.@r > 6) ? 1 : 0); }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (28908,'Shield_Of_Water','Shield Of Water',4,0,NULL,500,NULL,80,NULL,1,0xFFFFFFFF,63,2,32,1,'90',1,NULL,'bonus2 bSubEle,Ele_Water,25; .@r = getrefine(); if(.@r > 4) { bonus bAspd,1+((.@r > 6) ? 1 : 0); }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (28909,'Shield_Of_Earth','Shield Of Earth',4,0,NULL,500,NULL,80,NULL,1,0xFFFFFFFF,63,2,32,1,'90',1,NULL,'bonus2 bSubEle,Ele_Earth,25; .@r = getrefine(); if(.@r > 4) { bonus bAspd,1+((.@r > 6) ? 1 : 0); }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (28906,'Shield_Of_Flame','Shield Of Flame',4,0,NULL,500,NULL,80,NULL,1,0xFFFFFFFF,63,2,32,NULL,'90',1,1,'bonus2 bSubEle,Ele_Fire,25; .@r = getrefine(); if(.@r > 4) { bonus bAspd,1+((.@r > 6) ? 1 : 0); }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (28907,'Shield_Of_Gust','Shield Of Gust',4,0,NULL,500,NULL,80,NULL,1,0xFFFFFFFF,63,2,32,NULL,'90',1,1,'bonus2 bSubEle,Ele_Wind,25; .@r = getrefine(); if(.@r > 4) { bonus bAspd,1+((.@r > 6) ? 1 : 0); }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (28908,'Shield_Of_Water','Shield Of Water',4,0,NULL,500,NULL,80,NULL,1,0xFFFFFFFF,63,2,32,NULL,'90',1,1,'bonus2 bSubEle,Ele_Water,25; .@r = getrefine(); if(.@r > 4) { bonus bAspd,1+((.@r > 6) ? 1 : 0); }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (28909,'Shield_Of_Earth','Shield Of Earth',4,0,NULL,500,NULL,80,NULL,1,0xFFFFFFFF,63,2,32,NULL,'90',1,1,'bonus2 bSubEle,Ele_Earth,25; .@r = getrefine(); if(.@r > 4) { bonus bAspd,1+((.@r > 6) ? 1 : 0); }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28910,'Rectangular_Large_Sleeve','Rectangular Large Sleeve',4,20,NULL,800,NULL,80,NULL,1,0xFFFFFFFF,63,2,32,NULL,'100',1,1,'bonus bLongAtkDef,5; .@r = getrefine(); if(.@r>=5) { bonus bLongAtkDef,5; } if(.@r>=7) { bonus bLongAtkDef,10; } if(.@r>=9) { bonus bLongAtkDef,15; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28913,'Ultralight_Magic_Shield','Ultralight Magic Shield',4,20,NULL,100,NULL,50,NULL,1,0xFFFFFFFF,63,2,32,NULL,'100',1,1,'bonus bAspdRate,5; bonus2 bIgnoreDefClassRate,Class_Normal,10; bonus2 bSubEle,Ele_Neutral,5; .@r = getrefine(); if(.@r>=7) { bonus2 bIgnoreDefClassRate,Class_Normal,2; bonus bAspdRate,2; } if(.@r>=9) { bonus2 bIgnoreDefClassRate,Class_Normal,3; bonus bAspdRate,3; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (28915,'Bunker_Shield','Bunker Shield',4,20,NULL,3500,NULL,90,NULL,1,0xFFFFFFFF,63,2,32,NULL,'50',1,1,'bonus2 bAddRace,RC_All,4; bonus bAspdRate,5; .@r = getrefine(); if(.@r>=5) { bonus2 bAddRace,RC_All,.@r; }',NULL,NULL);
@@ -11591,6 +11713,18 @@ REPLACE INTO `item_db_re` VALUES (28920,'Diamond_Shield','Diamond Shield',4,20,N
#===================================================================
# Enchantment stones
#===================================================================
+REPLACE INTO `item_db_re` VALUES (29000,'Rune_of_Intellect_Lv_1','Rune of Intellect Lv 1',6,20,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'.@r = getrefine(); if (.@r>=7) { bonus bInt,5; } if (.@r>=10) { bonus bMatkRate,5; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (29001,'Rune_of_Intellect_Lv_2','Rune of Intellect Lv 2',6,20,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'.@r = getrefine(); if (.@r>=7) { bonus bInt,6; } if (.@r>=11) { bonus bInt,1; bonus bMatkRate,7; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (29002,'Rune_of_Intellect_Lv_3','Rune of Intellect Lv 3',6,20,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'.@r = getrefine(); if (.@r>=7) { bonus bInt,7; } if (.@r>=12) { bonus bInt,1; bonus bMatkRate,8; } if (.@r>=13) { bonus bInt,1; bonus bMatkRate,2; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (29003,'Rune_of_Dexterity_Lv_1','Rune of Dexterity Lv 1',6,20,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'.@r = getrefine(); if (.@r>=7) { bonus bDex,5; } if (.@r>=10) { bonus bLongAtkRate,5; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (29004,'Rune_of_Dexterity_Lv_2','Rune of Dexterity Lv 2',6,20,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'.@r = getrefine(); if (.@r>=7) { bonus bDex,6; } if (.@r>=11) { bonus bDex,1; bonus bLongAtkRate,7; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (29005,'Rune_of_Dexterity_Lv_3','Rune of Dexterity Lv 3',6,20,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'.@r = getrefine(); if (.@r>=7) { bonus bDex,7; } if (.@r>=12) { bonus bDex,1; bonus bLongAtkRate,8; } if (.@r>=13) { bonus bDex,1; bonus bLongAtkRate,2; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (29006,'Rune_of_Luck_Lv_1','Rune of Luck Lv 1',6,20,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'.@r = getrefine(); if (.@r>=7) { bonus bLuk,5; } if (.@r>=10) { bonus bCritAtkRate,5; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (29007,'Rune_of_Luck_Lv_2','Rune of Luck Lv 2',6,20,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'.@r = getrefine(); if (.@r>=7) { bonus bLuk,6; } if (.@r>=11) { bonus bLuk,1; bonus bCritAtkRate,7; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (29008,'Rune_of_Luck_Lv_3','Rune of Luck Lv 3',6,20,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'.@r = getrefine(); if (.@r>=7) { bonus bLuk,7; } if (.@r>=12) { bonus bLuk,1; bonus bCritAtkRate,8; } if (.@r>=13) { bonus bLuk,1; bonus bCritAtkRate,6; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (29009,'Rune_of_Vitality_Lv_1','Rune of Vitality Lv 1',6,20,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'.@r = getrefine(); if (.@r>=7) { bonus bVit,5; } if (.@r>=10) { bonus bMaxHPrate,5; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (29010,'Rune_of_Vitality_Lv_2','Rune of Vitality Lv 2',6,20,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'.@r = getrefine(); if (.@r>=7) { bonus bVit,6; } if (.@r>=11) { bonus bVit,1; bonus bMaxHPrate,7; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (29011,'Rune_of_Vitality_Lv_3','Rune of Vitality Lv 3',6,20,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'.@r = getrefine(); if (.@r>=7) { bonus bVit,7; } if (.@r>=12) { bonus bVit,1; bonus bMaxHPrate,8; } if (.@r>=13) { bonus bVit,1; bonus bMaxHPrate,2; }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (29061,'Ambition1Lv','Ambition1Lv',6,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus2 bAddClass,Class_All,3; bonus bHit,3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (29062,'Ambition2Lv','Ambition2Lv',6,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus2 bAddClass,Class_All,6; bonus bHit,6;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (29063,'Ambition3Lv','Ambition3Lv',6,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus2 bAddClass,Class_All,9; bonus bHit,9;',NULL,NULL);
@@ -11685,7 +11819,7 @@ REPLACE INTO `item_db_re` VALUES (31019,'Creepy_Demon_Card','Creepy Demon Card',
REPLACE INTO `item_db_re` VALUES (31020,'Malicious_Baby_Ghost_Card','Malicious Baby Ghost Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bMaxHPrate,-13; bonus3 bAddEffWhenHit,Eff_Curse,300,ATF_WEAPON; /* unofficial chance [Secret] */',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (31021,'Dancing_Marionette_Card','Dancing Marionette Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bAspdRate,10; bonus2 bAddClass,Class_All,-3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (31022,'Abandoned_Teddy_Bear_Card','Abandoned Teddy Bear Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,64,NULL,NULL,NULL,NULL,'bonus bMaxSPRate,20; bonus2 bAddEff2,Eff_Curse,100; /* unofficial chance [Secret] */',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (31023,'Celine_Kimi_Card','Celine Kimi Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bMatkRate,10; bonus5 bAutoSpell,"NPC_CRITICALWOUND",5,200+(50*getrefine()),BF_MAGIC,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31023,'Celine_Kimi_Card','Celine Kimi Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bMatkRate,10; bonus5 bAutoSpell,"NPC_CRITICALWOUND",3,200+(50*getrefine()),BF_MAGIC,1;',NULL,NULL);
#===================================================================
# More Costumes
#===================================================================
@@ -11749,7 +11883,7 @@ REPLACE INTO `item_db_re` VALUES (31084,'C_Long_Pony_White','Costume Long Pony W
REPLACE INTO `item_db_re` VALUES (31085,'C_Long_Pony_Crimson','Costume Long Pony Crimson',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1525,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (31086,'C_Long_Pony_Purple','Costume Long Pony Purple',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1526,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (31087,'C_Dwarf_Beard','Costume Dwarf Beard',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1349,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (31088,'C_Mad_Hatter','Costume Mad Hatter',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1421,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31088,'C_Mad_Hatter','Costume Mad Hatter',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,5120,NULL,'1',0,1421,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (31089,'C_Exploding_Crimson_Flame','Costume Exploding Crimson Flame',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,0,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (31090,'C_Angelring_Hat','Costume Angelring Hat',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,348,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (31091,'C_Show_Me_The_Zeny','Costume Show Me The Zeny',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,0,NULL,NULL,NULL);
@@ -11807,6 +11941,8 @@ REPLACE INTO `item_db_re` VALUES (31150,'C_Shalosh_Head_Dress','Costume Shalosh
REPLACE INTO `item_db_re` VALUES (31151,'C_Chasher_Ear','Costume Cheshire\'s Cat Ears',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1565,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (31152,'C_Piamette_BowTie_Red','Costume Piamette\'s Red Bow Tie',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1566,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (31153,'C_Aniv_Star_Hat2','Costume Cactus Flower Corsage',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1567,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31154,'C_Cap','C Cap',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,14,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31158,'C_Squirrel_Ear_Hat','Costume Squirrel Ear Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1486,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (31160,'C_Rune_Helm','Costume Rune Helm',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1361,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (31161,'C_Tiger_Mask','Costume Tiger Mask',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,3072,NULL,'1',0,181,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (31162,'C_Shaving_Foam','Costume Shaving Foam',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1129,NULL,NULL,NULL);
@@ -11820,4 +11956,238 @@ REPLACE INTO `item_db_re` VALUES (31169,'C_Hat_Of_Outlaw','Costume Hilarious Ban
REPLACE INTO `item_db_re` VALUES (31170,'C_Wind_Wings','Costume Wings of Wind',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,493,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (31171,'C_Nekomimi','Costume Nekomimi',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,182,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (31172,'C_Roast_Memory','Costume Roast Memory',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,7168,NULL,'1',0,1576,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31173,'C_Oyster_Parakeet','Costume Oyster Parakeet',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,419,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31174,'C_Suspicious_Bread_Bag','C Suspicious Bread Bag',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,429,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31175,'C_Strawberry_Hat','Costume Strawberry Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,755,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31176,'C_Looking','C Looking',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1577,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31177,'C_Tail_Hat','C Tail Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1578,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31178,'C_Fire_Muffler','C Fire Muffler',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1579,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31179,'C_Wolf_Masquerade','C Wolf Masquerade',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1580,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31180,'C_King_Sura_Headband','C King Sura Headband',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1581,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31181,'C_Necklace_Rosary','Costume Necklace Rosary',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1471,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31182,'C_Side_Cap','Costume Side Cap',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,529,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31183,'C_Fallen_Angel_Blessing','Costume Blessing of Fallen Angel',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1250,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31184,'C_Hawkeye','Costume Hawkeye',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,609,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31185,'C_Engineer_Cap','Costume Engineer Cap',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,608,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31186,'C_Black_Cat','Costume Black Cat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1582,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31187,'C_War_Princess_Ribbon','Costume War Princess Ribbon',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1583,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31188,'C_Mono_Gothic_Bonnet','Costume Mono Gothic Bonnet',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1584,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31189,'C_Cat_Ears_Cape_Red','Costume Red Cat Ears Cape',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1591,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31190,'C_Angel_Mini_Silk_Hat_B','Costume Black Angel Mini Silk Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1586,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31191,'C_Whikebain_Ears_Gold','Vibrant Cat Ears',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1588,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31192,'C_Bluecat_Ear','Blue Cat Ears',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1589,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31193,'C_Tare_Ahat','Costume Drooping Ahat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1590,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31194,'C_Spinning_Propeller','Costume Spinning Propeller',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,270,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31195,'C_Choco_Minihat','Costume Mini Chocolate Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1592,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31196,'C_JP_EV12','C Drooping Chuni Penguin',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1596,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31197,'C_Egg_Crispinette','Costume Egg Crispinette',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1598,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31198,'C_Octopus_Hat','C Octopus Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,538,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31199,'C_Weird_Beard','C Weird Beard',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,21,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31200,'C_Wrapping_Ribbon','C Wrapping Ribbon',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1599,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31201,'C_Royal_Rabbit_Crown','C Royal Rabbit Crown',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1600,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31202,'C_Dog_Officer','C Dog Officer',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1601,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31203,'C_Charcoal_Stove','C Charcoal Stove',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1602,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31204,'C_Drooping_White_Cat','C Drooping White Cat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,378,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31205,'C_Large_Orc_Hero_Helm','C Large Orc Hero Helm',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,3072,NULL,'1',0,381,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31206,'C_Rune_Hairband','C Rune Hairband',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,3072,NULL,'1',0,564,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31207,'C_Dokkebi_Mask','C Dokkebi Mask',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,6144,NULL,'1',0,689,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31208,'C_Straight_Long_YL','C Straight_Long Yellow',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1603,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31209,'C_Straight_Long_WH','C Straight Long White',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1604,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31210,'C_Side_Pigtail_BU','C Side Pigtail Blue',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1605,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31211,'C_Side_Pigtail_RD','C Side Pigtail Red',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1606,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31212,'C_Side_Pigtail_YL','C Side Pigtail Yellow',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1607,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31213,'C_Side_Pigtail_GN','C Side Pigtail Green',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1608,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31214,'C_Side_Pigtail_BL','C Side Pigtail Black',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1609,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31215,'C_Side_Pigtail_WH','C Side Pigtail White',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1610,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31216,'C_Side_Pigtail_OM','C Side Pigtail Brown',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1611,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31217,'C_Side_Pigtail_PP','C Side Pigtail Purple',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1612,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31218,'C_Low_Pony_BU','C Low Pony Blue',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1613,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31219,'C_Low_Pony_RD','C Low Pony Red',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1614,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31220,'C_Low_Pony_YL','C Low Pony Yellow',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1615,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31221,'C_Low_Pony_GN','C Low Pony Green',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1616,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31222,'C_Low_Pony_BL','C Low Pony Black',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1617,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31223,'C_Low_Pony_WH','C Low Pony White',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1618,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31224,'C_Low_Pony_OM','C Low Pony Brown',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1619,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31225,'C_Low_Pony_PP','C Low Pony Purple',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1620,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31226,'C_Long_Twin_BU','C Long Twin Blue',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1621,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31227,'C_Long_Twin_RD','C Long Twin Red',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1622,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31228,'C_Long_Twin_YL','C Long Twin Yellow',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1623,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31229,'C_Long_Twin_GN','C Long Twin Yellow',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1624,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31230,'C_Long_Twin_BL','C Long Twin Yellow',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1625,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31231,'C_Long_Twin_WH','C Long Twin Yellow',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1626,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31232,'C_Long_Twin_OM','C Long Twin Yellow',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1627,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31233,'C_Long_Twin_PP','C Long Twin Yellow',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1628,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31234,'C_Persica','C Persica',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,659,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31235,'C_Large_Ribbon_Muffler_Mid','C Large Ribbon Muffler Mid',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1312,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31236,'C_Vicious_Mind_Aura_Mid','C Vicious Mind Aura Mid',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1267,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31237,'C_Pale_Yellow_Ribbon_Lower','C Pale Yellow Ribbon Lower',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1474,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31238,'C_True_Love_Upper','C True Love Upper',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,489,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31239,'C_Love_Rabbit_Hood_Upper','C Love Rabbit Hood Upper',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,549,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31240,'C_Whisper_Mask_','C Whisper Mask Upper',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,321,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31241,'C_Burning_Sun_Lower','C Burning Sun Lower',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,654,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31242,'C_Anubis_Helm_','C Anubis Hat Upper',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,485,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31243,'C_Tongue_Mask_Mid','C Tongue Mask Mid',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,253,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31244,'C_Skymet_','C Skymet Upper',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,868,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31245,'C_Cherry','C Cherry',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,602,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31246,'C_Humming_Bird','C Humming Bird',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,702,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31247,'C_Hippo_Hat','C Hippo Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,859,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31248,'C_Isabella_Red_Ears','C Isabella Red Ears',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1030,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31249,'C_Rabbit_Hopping','C Hopping Rabbit',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1635,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31250,'C_Wonderful_Beast_Ear','C Wonderful Beast Ears',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1636,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31251,'C_Cat_Mouth','C Cats Mouth',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1637,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31252,'C_Cat_Ear_Hat_White','C White Cat Ears Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1638,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31253,'C_Rinzu_Helmet','C Rinzu Helmet',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,548,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31254,'C_Red_Hare_Hat','C Red Hare Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,7168,NULL,'1',0,1631,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31255,'C_Sweet_Helmet','C Sweet Helmet',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,3072,NULL,'1',0,1374,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31256,'C_Jaguar_Mask','C Jaguar Mask',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,6144,NULL,'1',0,530,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31260,'C_Observer_J','C Observer',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1639,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31261,'C_Soda_in_Mouth','C Soda in Mouth',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1643,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31262,'C_Disposable_3D_Glasses','C Disposable 3D Glasses',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,661,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31263,'C_Disposable_Popcorn_Hat','C Disposable Popcorn Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,415,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31264,'C_Wings_of_Protector_Lower','C Wings of Protector Lower',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,990,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31265,'C_Straight_Pony_Blue_Mid','C Straight Pony Blue Mid',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1394,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31266,'C_Straight_Pony_Red_Mid','C Straight Pony Red Mid',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1392,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31267,'C_Straight_Pony_Yellow_Mid','C Straight Pony Yellow Mid',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1389,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31268,'C_Straight_Pony_Green_Mid','C Straight_Pony Green Mid',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1390,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31269,'C_Straight_Pony_Black_Mid','C Straight Pony Black Mid',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1371,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31270,'C_Straight_Pony_White_Mid','C Straight Pony White Mid',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1395,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31271,'C_Straight_Pony_Crimson_Mid','C Straight Pony Crimson Mid',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1393,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31272,'C_Straight_Pony_Purple_Mid','C Straight Pony Purple Mid',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1391,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31273,'C_Cowlick_Blue_Mid','C Cowlick Blue Mid',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1387,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31274,'C_Cowlick_Red_Mid','C Cowlick Red Mid',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1385,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31275,'C_Cowlick_Yellow_Mid','C Cowlick Yellow Mid',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1382,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31276,'C_Cowlick_Green_Mid','C Cowlick Green Mid',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1383,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31277,'C_Cowlick_Black_Mid','C Cowlick Black Mid',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1372,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31278,'C_Cowlick_White_Mid','C Cowlick White Mid',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1388,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31279,'C_Cowlick_Crimson_Mid','C Cowlick Crimson Mid',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1386,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31280,'C_Cowlick_Purple_Mid','C Cowlick Purple Mid',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1384,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31281,'C_Loose_Wave_Twin_Blue_Mid','C Loose Wave Twin Blue Mid',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1401,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31282,'C_Loose_Wave_Twin_Red_Mid','C Loose Wave Twin Red Mid',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1399,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31283,'C_Loose_Wave_Twin_Yellow_Mid','C Loose Wave Twin Yellow Mid',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1396,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31284,'C_Loose_Wave_Twin_Green_Mid','C Loose Wave Twin Green Mid',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1397,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31285,'C_Loose_Wave_Twin_Black_Mid','C Loose Wave Twin Black Mid',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1373,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31286,'C_Loose_Wave_Twin_White_Mid','C Loose Wave Twin White Mid',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1402,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31287,'C_Loose_Wave_Twin_Crimson_Mid','C Loose Wave Twin Crimson Mid',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1400,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31288,'C_Loose_Wave_Twin_Purple_Mid','C Loose Wave Twin Purple Mid',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1398,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31289,'C_Black_Wing_Ears_Lower','C Black Wing Ears Lower',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1336,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31290,'C_Angels_Feather_Cap','C Angels Feather Cap',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,929,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31291,'C_Devils_Feather_Cap','C Devils Feather Cap',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,930,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31293,'C_Kings_Crown_Purple','C Crown of Ancient King Purple',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1651,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31294,'C_Jirant_Circlet_Red','C Jirant Circlet Red',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1652,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31295,'C_Red_Wing_Hat','C Red Wing Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,613,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31296,'C_Strawberry_in_Mouth','C Strawberry in Mouth',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,861,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31297,'C_Fruit_of_Love','C Fruit of Love',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,140,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31298,'C_Sepia_Parade_Hat','C Sepia Parade Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,682,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31299,'C_White_Rabbit','C White Rabbit',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1656,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31300,'C_Warm_Cat_Muffler','C Warm Cat Muffler',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1657,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31301,'C_Blinking_Eyes','C Blinking Eyes',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1658,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31302,'C_Black_Magenta_Ribbon','C Black Magenta Ribbon',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1659,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31303,'C_Black_Ramen_Hat_','C Black Ramen Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1338,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31304,'C_Summer_Fan','C Summer Fan',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1051,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31306,'C_Toucan_Hat','C Toucan Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,528,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31307,'C_Violet_Macaw','C Violet Macaw',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,656,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31308,'C_Protect_Feathers','C Protect Feathers',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1232,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31309,'C_Pure_White_Marching_Hat','C Pure White Marching Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1470,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31310,'C_666_Black_Elven_Ears','C 666 Black_ Elven Ears',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,498,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31311,'C_Dolor_Thanatos_Mask','C Dolor Thanatos Mask',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,6144,NULL,'1',0,666,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31312,'C_Hades_Helm','C Hades Helm',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,523,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31313,'C_FallenAngelWingEar','C Fallen Angel Wing Ears',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1662,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31314,'C_Ghost_Holiday','C Ghost Holiday',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1663,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31315,'C_Stall_Of_Angel','C Stall of Angel',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1664,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31316,'C_C_FlutterButterfly_BL','C Black Fluttering Butterfly',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1665,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31317,'C_15th_Anniversary_Wing','C 15th Anniversary Wing',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1660,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31318,'C_Gerhard_Von_Devi','Costume Gerhard Von Devi',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1092,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31319,'C_Summer_Fan_','C Summer Fan',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1051,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31320,'C_Pinwheel_Hat','C Pinwheel Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,456,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31321,'C_Shining_Sunflower','C Shining Sunflower',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,681,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31322,'C_Candy_Hat','C Candy Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,853,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31323,'C_Yellow_Hunting_Cap','C Yellow Hunting Cap',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,484,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31325,'C_Queen_Scarabas_Helmet','C Queen Scarabas Helmet',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,5120,NULL,'1',0,1231,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31326,'C_Rolf_Von_Ziege_666_II','C Rolf Von Ziege 666 II',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,946,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31327,'C_Wood_Goblins_Nose','C Wood Goblins Nose',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,737,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31328,'C_Faceworm_Eggshell','C Faceworm Eggshell',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1356,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31329,'C_Alice_Wig','Costume Alice Wig',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1673,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31330,'C_Fallen_Angel_Valletta','Costume Fallen Angel Valletta',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1674,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31331,'C_Chung_E_Shinyon_Cap','C Chung e Shinyon Cap',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1675,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31332,'C_Khalitzburg_KN_Helm_BL','C Black Khalitzburg Knight Helm',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1676,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31368,'C_Harvest_Festa_Hat','C Thanksgiving Memorial Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1677,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31369,'C_Straight_Long_WH_','Costume Straight Long White',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1604,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31370,'C_Straight_Long_YL_','Costume Straight Long Yellow',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1603,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31373,'C_Crown_of_Ancient_king','C Crown of Ancient king',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1412,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31374,'C_Explosion_gum','C Explosion gum',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1414,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31375,'C_Mystic_Eye','C Mystic Eye',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1490,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31376,'C_Ancient_Dragon_Coronet_Purple','C Ancient Dragon Coronet Purple',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1680,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31377,'C_Glastheim_Obeserver','C Glastheim Obeserver',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1041,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31378,'C_Catharina_Von_Brad_60th','C Catharina Von Brad 60th',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1527,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31379,'C_Wind-Up_Key','C Wind-Up Key',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1335,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31380,'C_Crow','C Crow',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1035,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31381,'C_Diabolic_Lapel','Costume Diabolic Lapel',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1681,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31382,'C_Cat_Ears_Punkish','Costume Cat Ears Punkish',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1682,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31383,'C_Volume_Low_Twin','Costume Volume Low Twin',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1683,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31384,'C_False_Ears','Costume False Ears',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1684,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31385,'C_Gothic_Pumpkin_Head','Costume Gothic Pumpkin Head',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1685,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31387,'C_Jjakk','C Jjakk',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1687,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31389,'C_White_Bird_Rose','C White Bird Rose',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1688,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31390,'C_Let_It_Snow','C Let It Snow',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1690,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31391,'C_Floating_Stone_of_Sage','C Floating Stone of Sage',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1230,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31392,'C_Radio_Antenna','C Radio Antenna',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,347,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31393,'C_Vajra','C Vajra',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,983,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31394,'C_Magician_White_Hat','C Magician White Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,283,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31395,'C_Book_Of_Magic','C Book of Magic',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1691,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31396,'C_Sorcerer_Hood','C Sorcerer Hood',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1692,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31397,'C_Sitting_Pope','C Sitting Pope',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1553,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31398,'C_Blinking_Thin_Eyes','C Blinking Thin Eyes',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1693,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31399,'C_Darkness_Veil','C Darkness Veil',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1694,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31400,'C_Ribbon','C Ribbon',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,17,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31401,'C_Nuns_Veil','C Nuns Veil',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,3072,NULL,'1',0,176,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31402,'C_Idun_Green_Apple','C Iduns Green Apple',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1698,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31403,'C_Wall','C Wall',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1699,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31404,'C_Poring_Traffic_Light','C Poring Traffic Light',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1700,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31405,'C_Eleanor_Wig_YL','C Eleanor Wig Yellow',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1701,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31406,'C_Nydhog_Wig_WH','C Nydhoggur Wig White',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1702,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31407,'C_Alice_Wig_PK','C Alice Wig Peach',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1703,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31408,'C_Ragnarok_Rush_Goat','C Ragnarok Rush Goat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,41,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31409,'C_Barrel_Helm','C Barrel Helm',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,7168,NULL,'1',0,1498,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31410,'C_GodsHelm','Costume God\'s Helm',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1678,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31411,'C_Leo_Diadem','C Leo Diadem',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,566,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31412,'C_Virgo_Crown','C Virgo Crown',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,573,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31413,'C_Taurus_Crown','C_ Taurus Crown',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,536,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31414,'C_Cancer_Diadem','C Cancer Diadem',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,560,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31415,'C_Wanderers_ Sakkat','Costume Wanderer\'s Sakkat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,3072,NULL,'1',0,558,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31417,'C_Rice_Ball_Hat','C Rice Ball Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,556,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31418,'C_Green_Onion_in_Mouth','C Green Onion in Mouth',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,824,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31420,'C_Shining_Santa_Poring','C Shining Santa Poring',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,961,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31432,'C_Floating_Ice','C Floating Ice',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1562,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31433,'C_Celestial_Circle','C Celestial Circle',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1073,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31434,'C_Cloud_Burst','C Cloud Burst',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,705,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31435,'C_Ghost_Magicians_Knit_Hat','C Ghost Magicians Knit Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,854,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31436,'C_Lazy_Cat','C Lazy Cat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,274,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31437,'C_Baby_Penguin','C Baby Penguin',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1705,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31438,'C_Fluffy_Angel_Cape','C Fluffy Angel Cape',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1706,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31439,'C_Fluffy_Heart_Earmuffs','C Fluffy Heart Earmuffs',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1707,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31440,'C_Snow_Bear_Hood','C Snow Bear Hood',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1708,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31441,'C_Penguin_Cap_BU','C Penguin Cap Blue',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1709,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31442,'C_Smile_Mask_Middle','C Smile Mask Middle',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,65,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31443,'C_Munak_Hat_','C Munak Hat Upper',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,51,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31444,'C_Bongun_Hat_','C Bongun Hat Upper',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,139,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31446,'C_Toy_Syringe','C Toy Syringe',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,842,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31447,'C_Light_Moonlight_Hat','C Light Moonlight_Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,913,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31448,'C_Stings_Silk_Ribbon','C Stings Silk Ribbon',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1457,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31449,'C_Blue_Rose_Eyepatch','C Blue Rose Eyepatch',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1712,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31450,'C_Lolita_Two_Side_Up','C Lolita Two Side Up',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1713,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31451,'C_Blue_Frill_Ribbon','C Blue Frill Ribbon',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1714,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31452,'C_White_Cat','C White Cat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1715,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31453,'C_L_RibbonMuff_Black','C Large Ribbon Muffler Black',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1716,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31455,'C_Enchanted_Dog','C Super Cute Dog',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,6144,NULL,'1',0,1718,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31457,'C_Laughing_Wonderful_Wolf_Hat','C Laughing Wonderful Wolf Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1016,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31464,'C_Bloom_Afro','C Bloom Afro',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,837,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31468,'C_Stripe_Hat','C Stripe Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1728,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31470,'C_Scroll_of_Tengu','C Scroll of Tengu',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1445,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31471,'C_Celestial_Flower','C Celestial Flower',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,438,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31472,'C_Fairy_Feathers','C Fairy Feathers',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,2048,NULL,'1',0,1723,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31473,'C_Tipsy','C Tipsy',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1724,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31474,'C_Straight_Long_BL','C Straight Long Black',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1725,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31475,'C_Black_Fox_Ear_Ribbon','C Black Fox Ears Ribbon',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1726,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31476,'C_Cherry_Blossom_Hat_YL','C Yellow Cherry Blossom Hat',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,1727,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (31478,'C_Eleanor_Wig_','C Eleanors Wig Lower',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1502,NULL,NULL,NULL);
diff --git a/sql-files/logs.sql b/sql-files/logs.sql
index cf873a8fd9b..aadcc87dc1f 100644
--- a/sql-files/logs.sql
+++ b/sql-files/logs.sql
@@ -178,21 +178,21 @@ CREATE TABLE IF NOT EXISTS `picklog` (
`card1` smallint(5) unsigned NOT NULL default '0',
`card2` smallint(5) unsigned NOT NULL default '0',
`card3` smallint(5) unsigned NOT NULL default '0',
- `option_id0` smallint(5) unsigned NOT NULL default '0',
- `option_val0` smallint(5) unsigned NOT NULL default '0',
- `option_parm0` tinyint(3) unsigned NOT NULL default '0',
- `option_id1` smallint(5) unsigned NOT NULL default '0',
- `option_val1` smallint(5) unsigned NOT NULL default '0',
- `option_parm1` tinyint(3) unsigned NOT NULL default '0',
- `option_id2` smallint(5) unsigned NOT NULL default '0',
- `option_val2` smallint(5) unsigned NOT NULL default '0',
- `option_parm2` tinyint(3) unsigned NOT NULL default '0',
- `option_id3` smallint(5) unsigned NOT NULL default '0',
- `option_val3` smallint(5) unsigned NOT NULL default '0',
- `option_parm3` tinyint(3) unsigned NOT NULL default '0',
- `option_id4` smallint(5) unsigned NOT NULL default '0',
- `option_val4` smallint(5) unsigned NOT NULL default '0',
- `option_parm4` tinyint(3) unsigned NOT NULL default '0',
+ `option_id0` smallint(5) NOT NULL default '0',
+ `option_val0` smallint(5) NOT NULL default '0',
+ `option_parm0` tinyint(3) NOT NULL default '0',
+ `option_id1` smallint(5) NOT NULL default '0',
+ `option_val1` smallint(5) NOT NULL default '0',
+ `option_parm1` tinyint(3) NOT NULL default '0',
+ `option_id2` smallint(5) NOT NULL default '0',
+ `option_val2` smallint(5) NOT NULL default '0',
+ `option_parm2` tinyint(3) NOT NULL default '0',
+ `option_id3` smallint(5) NOT NULL default '0',
+ `option_val3` smallint(5) NOT NULL default '0',
+ `option_parm3` tinyint(3) NOT NULL default '0',
+ `option_id4` smallint(5) NOT NULL default '0',
+ `option_val4` smallint(5) NOT NULL default '0',
+ `option_parm4` tinyint(3) NOT NULL default '0',
`unique_id` bigint(20) unsigned NOT NULL default '0',
`map` varchar(11) NOT NULL default '',
`bound` tinyint(1) unsigned NOT NULL default '0',
diff --git a/sql-files/main.sql b/sql-files/main.sql
index cc58bc690ff..627738adee9 100644
--- a/sql-files/main.sql
+++ b/sql-files/main.sql
@@ -24,6 +24,29 @@ CREATE TABLE IF NOT EXISTS `acc_reg_str` (
KEY `account_id` (`account_id`)
) ENGINE=MyISAM;
+--
+-- Table structure for table `achievement`
+--
+
+CREATE TABLE IF NOT EXISTS `achievement` (
+ `char_id` int(11) unsigned NOT NULL default '0',
+ `id` bigint(11) unsigned NOT NULL,
+ `count1` mediumint(8) unsigned NOT NULL default '0',
+ `count2` mediumint(8) unsigned NOT NULL default '0',
+ `count3` mediumint(8) unsigned NOT NULL default '0',
+ `count4` mediumint(8) unsigned NOT NULL default '0',
+ `count5` mediumint(8) unsigned NOT NULL default '0',
+ `count6` mediumint(8) unsigned NOT NULL default '0',
+ `count7` mediumint(8) unsigned NOT NULL default '0',
+ `count8` mediumint(8) unsigned NOT NULL default '0',
+ `count9` mediumint(8) unsigned NOT NULL default '0',
+ `count10` mediumint(8) unsigned NOT NULL default '0',
+ `completed` datetime,
+ `rewarded` datetime,
+ PRIMARY KEY (`char_id`,`id`),
+ KEY `char_id` (`char_id`)
+) ENGINE=MyISAM;
+
--
-- Table structure for table `auction`
--
@@ -47,21 +70,21 @@ CREATE TABLE IF NOT EXISTS `auction` (
`card1` smallint(5) unsigned NOT NULL default '0',
`card2` smallint(5) unsigned NOT NULL default '0',
`card3` smallint(5) unsigned NOT NULL default '0',
- `option_id0` smallint(5) unsigned NOT NULL default '0',
- `option_val0` smallint(5) unsigned NOT NULL default '0',
- `option_parm0` tinyint(3) unsigned NOT NULL default '0',
- `option_id1` smallint(5) unsigned NOT NULL default '0',
- `option_val1` smallint(5) unsigned NOT NULL default '0',
- `option_parm1` tinyint(3) unsigned NOT NULL default '0',
- `option_id2` smallint(5) unsigned NOT NULL default '0',
- `option_val2` smallint(5) unsigned NOT NULL default '0',
- `option_parm2` tinyint(3) unsigned NOT NULL default '0',
- `option_id3` smallint(5) unsigned NOT NULL default '0',
- `option_val3` smallint(5) unsigned NOT NULL default '0',
- `option_parm3` tinyint(3) unsigned NOT NULL default '0',
- `option_id4` smallint(5) unsigned NOT NULL default '0',
- `option_val4` smallint(5) unsigned NOT NULL default '0',
- `option_parm4` tinyint(3) unsigned NOT NULL default '0',
+ `option_id0` smallint(5) NOT NULL default '0',
+ `option_val0` smallint(5) NOT NULL default '0',
+ `option_parm0` tinyint(3) NOT NULL default '0',
+ `option_id1` smallint(5) NOT NULL default '0',
+ `option_val1` smallint(5) NOT NULL default '0',
+ `option_parm1` tinyint(3) NOT NULL default '0',
+ `option_id2` smallint(5) NOT NULL default '0',
+ `option_val2` smallint(5) NOT NULL default '0',
+ `option_parm2` tinyint(3) NOT NULL default '0',
+ `option_id3` smallint(5) NOT NULL default '0',
+ `option_val3` smallint(5) NOT NULL default '0',
+ `option_parm3` tinyint(3) NOT NULL default '0',
+ `option_id4` smallint(5) NOT NULL default '0',
+ `option_val4` smallint(5) NOT NULL default '0',
+ `option_parm4` tinyint(3) NOT NULL default '0',
`unique_id` bigint(20) unsigned NOT NULL default '0',
PRIMARY KEY (`auction_id`)
) ENGINE=MyISAM;
@@ -142,21 +165,21 @@ CREATE TABLE IF NOT EXISTS `cart_inventory` (
`card1` smallint(5) unsigned NOT NULL default '0',
`card2` smallint(5) unsigned NOT NULL default '0',
`card3` smallint(5) unsigned NOT NULL default '0',
- `option_id0` smallint(5) unsigned NOT NULL default '0',
- `option_val0` smallint(5) unsigned NOT NULL default '0',
- `option_parm0` tinyint(3) unsigned NOT NULL default '0',
- `option_id1` smallint(5) unsigned NOT NULL default '0',
- `option_val1` smallint(5) unsigned NOT NULL default '0',
- `option_parm1` tinyint(3) unsigned NOT NULL default '0',
- `option_id2` smallint(5) unsigned NOT NULL default '0',
- `option_val2` smallint(5) unsigned NOT NULL default '0',
- `option_parm2` tinyint(3) unsigned NOT NULL default '0',
- `option_id3` smallint(5) unsigned NOT NULL default '0',
- `option_val3` smallint(5) unsigned NOT NULL default '0',
- `option_parm3` tinyint(3) unsigned NOT NULL default '0',
- `option_id4` smallint(5) unsigned NOT NULL default '0',
- `option_val4` smallint(5) unsigned NOT NULL default '0',
- `option_parm4` tinyint(3) unsigned NOT NULL default '0',
+ `option_id0` smallint(5) NOT NULL default '0',
+ `option_val0` smallint(5) NOT NULL default '0',
+ `option_parm0` tinyint(3) NOT NULL default '0',
+ `option_id1` smallint(5) NOT NULL default '0',
+ `option_val1` smallint(5) NOT NULL default '0',
+ `option_parm1` tinyint(3) NOT NULL default '0',
+ `option_id2` smallint(5) NOT NULL default '0',
+ `option_val2` smallint(5) NOT NULL default '0',
+ `option_parm2` tinyint(3) NOT NULL default '0',
+ `option_id3` smallint(5) NOT NULL default '0',
+ `option_val3` smallint(5) NOT NULL default '0',
+ `option_parm3` tinyint(3) NOT NULL default '0',
+ `option_id4` smallint(5) NOT NULL default '0',
+ `option_val4` smallint(5) NOT NULL default '0',
+ `option_parm4` tinyint(3) NOT NULL default '0',
`expire_time` int(11) unsigned NOT NULL default '0',
`bound` tinyint(3) unsigned NOT NULL default '0',
`unique_id` bigint(20) unsigned NOT NULL default '0',
@@ -185,10 +208,10 @@ CREATE TABLE IF NOT EXISTS `char` (
`int` smallint(4) unsigned NOT NULL default '0',
`dex` smallint(4) unsigned NOT NULL default '0',
`luk` smallint(4) unsigned NOT NULL default '0',
- `max_hp` mediumint(8) unsigned NOT NULL default '0',
- `hp` mediumint(8) unsigned NOT NULL default '0',
- `max_sp` mediumint(6) unsigned NOT NULL default '0',
- `sp` mediumint(6) unsigned NOT NULL default '0',
+ `max_hp` int(11) unsigned NOT NULL default '0',
+ `hp` int(11) unsigned NOT NULL default '0',
+ `max_sp` int(11) unsigned NOT NULL default '0',
+ `sp` int(11) unsigned NOT NULL default '0',
`status_point` int(11) unsigned NOT NULL default '0',
`skill_point` int(11) unsigned NOT NULL default '0',
`option` int(11) NOT NULL default '0',
@@ -231,6 +254,8 @@ CREATE TABLE IF NOT EXISTS `char` (
`hotkey_rowshift` tinyint(3) unsigned NOT NULL default '0',
`clan_id` int(11) unsigned NOT NULL default '0',
`last_login` datetime DEFAULT NULL,
+ `title_id` INT(11) unsigned NOT NULL default '0',
+ `show_equip` tinyint(3) unsigned NOT NULL default '0',
PRIMARY KEY (`char_id`),
UNIQUE KEY `name_key` (`name`),
KEY `account_id` (`account_id`),
@@ -338,10 +363,10 @@ CREATE TABLE IF NOT EXISTS `elemental` (
`char_id` int(11) NOT NULL,
`class` mediumint(9) unsigned NOT NULL default '0',
`mode` int(11) unsigned NOT NULL default '1',
- `hp` int(12) NOT NULL default '1',
- `sp` int(12) NOT NULL default '1',
- `max_hp` mediumint(8) unsigned NOT NULL default '0',
- `max_sp` mediumint(6) unsigned NOT NULL default '0',
+ `hp` int(11) unsigned NOT NULL default '0',
+ `sp` int(11) unsigned NOT NULL default '0',
+ `max_hp` int(11) unsigned NOT NULL default '0',
+ `max_sp` int(11) unsigned NOT NULL default '0',
`atk1` MEDIUMINT(6) unsigned NOT NULL default '0',
`atk2` MEDIUMINT(6) unsigned NOT NULL default '0',
`matk` MEDIUMINT(6) unsigned NOT NULL default '0',
@@ -533,21 +558,21 @@ CREATE TABLE IF NOT EXISTS `guild_storage` (
`card1` smallint(5) unsigned NOT NULL default '0',
`card2` smallint(5) unsigned NOT NULL default '0',
`card3` smallint(5) unsigned NOT NULL default '0',
- `option_id0` smallint(5) unsigned NOT NULL default '0',
- `option_val0` smallint(5) unsigned NOT NULL default '0',
- `option_parm0` tinyint(3) unsigned NOT NULL default '0',
- `option_id1` smallint(5) unsigned NOT NULL default '0',
- `option_val1` smallint(5) unsigned NOT NULL default '0',
- `option_parm1` tinyint(3) unsigned NOT NULL default '0',
- `option_id2` smallint(5) unsigned NOT NULL default '0',
- `option_val2` smallint(5) unsigned NOT NULL default '0',
- `option_parm2` tinyint(3) unsigned NOT NULL default '0',
- `option_id3` smallint(5) unsigned NOT NULL default '0',
- `option_val3` smallint(5) unsigned NOT NULL default '0',
- `option_parm3` tinyint(3) unsigned NOT NULL default '0',
- `option_id4` smallint(5) unsigned NOT NULL default '0',
- `option_val4` smallint(5) unsigned NOT NULL default '0',
- `option_parm4` tinyint(3) unsigned NOT NULL default '0',
+ `option_id0` smallint(5) NOT NULL default '0',
+ `option_val0` smallint(5) NOT NULL default '0',
+ `option_parm0` tinyint(3) NOT NULL default '0',
+ `option_id1` smallint(5) NOT NULL default '0',
+ `option_val1` smallint(5) NOT NULL default '0',
+ `option_parm1` tinyint(3) NOT NULL default '0',
+ `option_id2` smallint(5) NOT NULL default '0',
+ `option_val2` smallint(5) NOT NULL default '0',
+ `option_parm2` tinyint(3) NOT NULL default '0',
+ `option_id3` smallint(5) NOT NULL default '0',
+ `option_val3` smallint(5) NOT NULL default '0',
+ `option_parm3` tinyint(3) NOT NULL default '0',
+ `option_id4` smallint(5) NOT NULL default '0',
+ `option_val4` smallint(5) NOT NULL default '0',
+ `option_parm4` tinyint(3) NOT NULL default '0',
`expire_time` int(11) unsigned NOT NULL default '0',
`bound` tinyint(3) unsigned NOT NULL default '0',
`unique_id` bigint(20) unsigned NOT NULL default '0',
@@ -575,10 +600,10 @@ CREATE TABLE IF NOT EXISTS `homunculus` (
`int` smallint(4) unsigned NOT NULL default '0',
`dex` smallint(4) unsigned NOT NULL default '0',
`luk` smallint(4) unsigned NOT NULL default '0',
- `hp` int(12) NOT NULL default '1',
- `max_hp` int(12) NOT NULL default '1',
- `sp` int(12) NOT NULL default '1',
- `max_sp` int(12) NOT NULL default '1',
+ `hp` int(11) unsigned NOT NULL default '0',
+ `max_hp` int(11) unsigned NOT NULL default '0',
+ `sp` int(11) NOT NULL default '0',
+ `max_sp` int(11) NOT NULL default '0',
`skill_point` smallint(4) unsigned NOT NULL default '0',
`alive` tinyint(2) NOT NULL default '1',
`rename_flag` tinyint(2) NOT NULL default '0',
@@ -635,21 +660,21 @@ CREATE TABLE IF NOT EXISTS `inventory` (
`card1` smallint(5) unsigned NOT NULL default '0',
`card2` smallint(5) unsigned NOT NULL default '0',
`card3` smallint(5) unsigned NOT NULL default '0',
- `option_id0` smallint(5) unsigned NOT NULL default '0',
- `option_val0` smallint(5) unsigned NOT NULL default '0',
- `option_parm0` tinyint(3) unsigned NOT NULL default '0',
- `option_id1` smallint(5) unsigned NOT NULL default '0',
- `option_val1` smallint(5) unsigned NOT NULL default '0',
- `option_parm1` tinyint(3) unsigned NOT NULL default '0',
- `option_id2` smallint(5) unsigned NOT NULL default '0',
- `option_val2` smallint(5) unsigned NOT NULL default '0',
- `option_parm2` tinyint(3) unsigned NOT NULL default '0',
- `option_id3` smallint(5) unsigned NOT NULL default '0',
- `option_val3` smallint(5) unsigned NOT NULL default '0',
- `option_parm3` tinyint(3) unsigned NOT NULL default '0',
- `option_id4` smallint(5) unsigned NOT NULL default '0',
- `option_val4` smallint(5) unsigned NOT NULL default '0',
- `option_parm4` tinyint(3) unsigned NOT NULL default '0',
+ `option_id0` smallint(5) NOT NULL default '0',
+ `option_val0` smallint(5) NOT NULL default '0',
+ `option_parm0` tinyint(3) NOT NULL default '0',
+ `option_id1` smallint(5) NOT NULL default '0',
+ `option_val1` smallint(5) NOT NULL default '0',
+ `option_parm1` tinyint(3) NOT NULL default '0',
+ `option_id2` smallint(5) NOT NULL default '0',
+ `option_val2` smallint(5) NOT NULL default '0',
+ `option_parm2` tinyint(3) NOT NULL default '0',
+ `option_id3` smallint(5) NOT NULL default '0',
+ `option_val3` smallint(5) NOT NULL default '0',
+ `option_parm3` tinyint(3) NOT NULL default '0',
+ `option_id4` smallint(5) NOT NULL default '0',
+ `option_val4` smallint(5) NOT NULL default '0',
+ `option_parm4` tinyint(3) NOT NULL default '0',
`expire_time` int(11) unsigned NOT NULL default '0',
`favorite` tinyint(3) unsigned NOT NULL default '0',
`bound` tinyint(3) unsigned NOT NULL default '0',
@@ -737,21 +762,21 @@ CREATE TABLE IF NOT EXISTS `mail_attachments` (
`card1` smallint(5) unsigned NOT NULL DEFAULT '0',
`card2` smallint(5) unsigned NOT NULL DEFAULT '0',
`card3` smallint(5) unsigned NOT NULL DEFAULT '0',
- `option_id0` smallint(5) unsigned NOT NULL DEFAULT '0',
- `option_val0` smallint(5) unsigned NOT NULL DEFAULT '0',
- `option_parm0` tinyint(3) unsigned NOT NULL DEFAULT '0',
- `option_id1` smallint(5) unsigned NOT NULL DEFAULT '0',
- `option_val1` smallint(5) unsigned NOT NULL DEFAULT '0',
- `option_parm1` tinyint(3) unsigned NOT NULL DEFAULT '0',
- `option_id2` smallint(5) unsigned NOT NULL DEFAULT '0',
- `option_val2` smallint(5) unsigned NOT NULL DEFAULT '0',
- `option_parm2` tinyint(3) unsigned NOT NULL DEFAULT '0',
- `option_id3` smallint(5) unsigned NOT NULL DEFAULT '0',
- `option_val3` smallint(5) unsigned NOT NULL DEFAULT '0',
- `option_parm3` tinyint(3) unsigned NOT NULL DEFAULT '0',
- `option_id4` smallint(5) unsigned NOT NULL DEFAULT '0',
- `option_val4` smallint(5) unsigned NOT NULL DEFAULT '0',
- `option_parm4` tinyint(3) unsigned NOT NULL DEFAULT '0',
+ `option_id0` smallint(5) NOT NULL default '0',
+ `option_val0` smallint(5) NOT NULL default '0',
+ `option_parm0` tinyint(3) NOT NULL default '0',
+ `option_id1` smallint(5) NOT NULL default '0',
+ `option_val1` smallint(5) NOT NULL default '0',
+ `option_parm1` tinyint(3) NOT NULL default '0',
+ `option_id2` smallint(5) NOT NULL default '0',
+ `option_val2` smallint(5) NOT NULL default '0',
+ `option_parm2` tinyint(3) NOT NULL default '0',
+ `option_id3` smallint(5) NOT NULL default '0',
+ `option_val3` smallint(5) NOT NULL default '0',
+ `option_parm3` tinyint(3) NOT NULL default '0',
+ `option_id4` smallint(5) NOT NULL default '0',
+ `option_val4` smallint(5) NOT NULL default '0',
+ `option_parm4` tinyint(3) NOT NULL default '0',
`unique_id` bigint(20) unsigned NOT NULL DEFAULT '0',
`bound` tinyint(1) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`id`,`index`)
@@ -803,8 +828,8 @@ CREATE TABLE IF NOT EXISTS `mercenary` (
`mer_id` int(11) unsigned NOT NULL auto_increment,
`char_id` int(11) NOT NULL,
`class` mediumint(9) unsigned NOT NULL default '0',
- `hp` int(12) NOT NULL default '1',
- `sp` int(12) NOT NULL default '1',
+ `hp` int(11) unsigned NOT NULL default '0',
+ `sp` int(11) unsigned NOT NULL default '0',
`kill_counter` int(11) NOT NULL,
`life_time` int(11) NOT NULL default '0',
PRIMARY KEY (`mer_id`)
@@ -979,21 +1004,21 @@ CREATE TABLE IF NOT EXISTS `storage` (
`card1` smallint(5) unsigned NOT NULL default '0',
`card2` smallint(5) unsigned NOT NULL default '0',
`card3` smallint(5) unsigned NOT NULL default '0',
- `option_id0` smallint(5) unsigned NOT NULL default '0',
- `option_val0` smallint(5) unsigned NOT NULL default '0',
- `option_parm0` tinyint(3) unsigned NOT NULL default '0',
- `option_id1` smallint(5) unsigned NOT NULL default '0',
- `option_val1` smallint(5) unsigned NOT NULL default '0',
- `option_parm1` tinyint(3) unsigned NOT NULL default '0',
- `option_id2` smallint(5) unsigned NOT NULL default '0',
- `option_val2` smallint(5) unsigned NOT NULL default '0',
- `option_parm2` tinyint(3) unsigned NOT NULL default '0',
- `option_id3` smallint(5) unsigned NOT NULL default '0',
- `option_val3` smallint(5) unsigned NOT NULL default '0',
- `option_parm3` tinyint(3) unsigned NOT NULL default '0',
- `option_id4` smallint(5) unsigned NOT NULL default '0',
- `option_val4` smallint(5) unsigned NOT NULL default '0',
- `option_parm4` tinyint(3) unsigned NOT NULL default '0',
+ `option_id0` smallint(5) NOT NULL default '0',
+ `option_val0` smallint(5) NOT NULL default '0',
+ `option_parm0` tinyint(3) NOT NULL default '0',
+ `option_id1` smallint(5) NOT NULL default '0',
+ `option_val1` smallint(5) NOT NULL default '0',
+ `option_parm1` tinyint(3) NOT NULL default '0',
+ `option_id2` smallint(5) NOT NULL default '0',
+ `option_val2` smallint(5) NOT NULL default '0',
+ `option_parm2` tinyint(3) NOT NULL default '0',
+ `option_id3` smallint(5) NOT NULL default '0',
+ `option_val3` smallint(5) NOT NULL default '0',
+ `option_parm3` tinyint(3) NOT NULL default '0',
+ `option_id4` smallint(5) NOT NULL default '0',
+ `option_val4` smallint(5) NOT NULL default '0',
+ `option_parm4` tinyint(3) NOT NULL default '0',
`expire_time` int(11) unsigned NOT NULL default '0',
`bound` tinyint(3) unsigned NOT NULL default '0',
`unique_id` bigint(20) unsigned NOT NULL default '0',
diff --git a/sql-files/mob_db_re.sql b/sql-files/mob_db_re.sql
index 819d47134cc..8e7599d7a70 100644
--- a/sql-files/mob_db_re.sql
+++ b/sql-files/mob_db_re.sql
@@ -256,6 +256,7 @@ REPLACE INTO `mob_db_re` VALUES (1183,'CHONCHON_','Chonchon','Chonchon',5,63,1,3
REPLACE INTO `mob_db_re` VALUES (1184,'FABRE_','Fabre','Fabre',1,30,1,1,0,1,4,7,0,0,1,2,1,1,4,5,10,12,0,4,22,0x2003885,400,1672,672,480,0,0,0,0,0,0,0,914,2000,949,250,1502,80,721,2,511,350,705,500,1501,200,0,0,0,0,0,0);
REPLACE INTO `mob_db_re` VALUES (1185,'WHISPER_','Whisper','Whisper',34,1796,1,483,737,1,198,239,0,45,1,51,14,0,60,0,10,12,0,1,28,0x0,150,1960,960,504,0,0,0,0,0,0,0,1001,10,1059,100,0,0,2333,1,0,0,0,0,0,0,0,0,0,0,0,0);
REPLACE INTO `mob_db_re` VALUES (1186,'WHISPER_BOSS','Giant Whisper','Giant Whisper',66,2570,0,630,710,1,282,341,94,45,40,79,44,51,67,31,10,12,0,6,48,0x2003695,250,2536,1536,672,0,0,0,0,0,0,0,1001,150,1059,5335,2282,1,2333,10,0,0,0,0,0,0,0,0,0,0,4303,1);
+#1187,SWITCH
REPLACE INTO `mob_db_re` VALUES (1188,'BON_GUN','Bongun','Bongun',59,2510,1,531,597,1,189,218,88,5,55,24,24,5,34,10,10,12,1,1,29,0x3095,200,1720,500,420,0,0,0,0,0,0,0,1094,5500,7014,40,618,60,5046,1,609,15,508,1000,508,1250,0,0,0,0,4212,1);
REPLACE INTO `mob_db_re` VALUES (1189,'ORC_ARCHER','Orc Archer','Orc Archer',78,4835,1,922,1161,9,260,303,67,31,55,32,24,30,99,15,10,12,1,7,22,0x3095,300,1960,620,480,0,0,0,0,0,0,0,1063,4656,1753,1000,1756,2500,1755,2500,1734,2,507,1400,509,900,0,0,0,0,4256,1);
REPLACE INTO `mob_db_re` VALUES (1190,'ORC_LORD','Orc Lord','Orc Lord',55,552000,1,156240,122760,1,780,1428,256,92,95,95,103,96,155,85,10,12,2,7,82,0x6283695,100,1248,500,360,31102,968,5500,617,2000,0,0,1363,400,2621,400,5007,400,1371,400,617,1000,985,4268,16000,100,0,0,0,0,4135,1);
@@ -285,6 +286,8 @@ REPLACE INTO `mob_db_re` VALUES (1213,'HIGH_ORC','High Orc','High Orc',81,4193,1
REPLACE INTO `mob_db_re` VALUES (1214,'CHOCO','Choco','Choco',48,1080,1,369,414,1,120,167,70,30,40,45,32,19,42,20,10,12,0,2,23,0x3095,150,1028,528,360,0,0,0,0,0,0,0,7011,5335,942,7000,985,53,513,5000,634,20,532,1000,607,25,0,0,0,0,4285,1);
REPLACE INTO `mob_db_re` VALUES (1215,'STEM_WORM','Stem Worm','Stem Worm',84,4530,1,1080,1215,1,266,307,73,50,55,37,25,47,70,30,10,12,1,3,24,0x3095,300,1956,756,528,0,0,0,0,0,0,0,7012,5335,509,1800,1968,10,756,115,997,5,0,0,608,45,0,0,0,0,4224,1);
REPLACE INTO `mob_db_re` VALUES (1216,'PENOMENA','Penomena','Penomena',85,4589,1,1116,1556,7,292,333,85,32,76,38,35,35,89,10,10,12,1,5,25,0x3695,400,832,500,600,0,0,0,0,0,0,0,7013,4850,962,8000,938,7000,525,200,719,15,1258,1,716,550,0,0,0,0,4314,1);
+#1217,ORC_WARRIOR
+#1218,PECO_EGG
REPLACE INTO `mob_db_re` VALUES (1219,'KNIGHT_OF_ABYSS','Knight of Abyss','Abysmal Knight',122,23297,1,4779,4013,1,810,1002,102,50,121,55,68,70,97,37,10,12,2,7,87,0x3695,300,1500,500,1000,0,0,0,0,0,0,0,1064,5335,7023,5,2318,1,1421,25,0,0,985,369,15014,10,0,0,0,0,4140,1);
REPLACE INTO `mob_db_re` VALUES (1220,'M_DESERT_WOLF','Desert Wolf','Desert Wolf',103,9447,1,349,218,1,254,313,114,47,93,69,63,61,82,42,10,12,1,2,23,0x3695,200,1120,420,288,0,0,0,0,0,0,0,1253,5,7030,5500,2311,1,517,1200,920,2000,756,53,0,0,0,0,0,0,4082,1);
REPLACE INTO `mob_db_re` VALUES (1221,'M_SAVAGE','Savage','Savage',26,2092,0,321,203,1,146,177,16,5,1,26,54,10,37,10,10,12,2,2,42,0x3695,150,1960,960,384,0,0,0,0,0,0,0,1028,6000,514,150,702,3,2276,2,605,15,757,70,0,0,0,0,0,0,4078,1);
@@ -594,7 +597,7 @@ REPLACE INTO `mob_db_re` VALUES (1500,'PARASITE','Parasite','Parasite',76,3222,1
# Event MVP
REPLACE INTO `mob_db_re` VALUES (1502,'PORING_V','Pori Pori','Bring it on!',99,95000000,1,78525,25106,1,5000,10000,0,10,100,100,65,100,255,255,10,12,1,3,25,0x6283885,160,1672,672,480,43625,10020,1000,4005,100,2286,200,5035,10000,2344,2500,2346,2500,2350,2500,2348,2500,2655,500,7126,10000,0,0,0,0,2110,4500);
-# Nifflheim (7.0)
+# Niflheim (7.0)
REPLACE INTO `mob_db_re` VALUES (1503,'GIBBET','Gibbet','Gibbet',105,12999,1,1944,1458,1,536,621,116,45,103,56,62,55,61,37,10,12,2,6,27,0x2003885,180,917,1584,576,0,0,0,0,0,0,0,7212,1800,7218,5335,7222,4074,724,300,716,100,604,10,7939,100,0,0,0,0,4278,1);
REPLACE INTO `mob_db_re` VALUES (1504,'DULLAHAN','Dullahan','Dullahan',108,18546,1,2509,1977,2,666,741,111,38,121,29,51,43,87,3,10,12,1,1,49,0x3885,155,847,1152,480,0,0,0,0,0,0,0,7209,3200,7210,4850,2614,1,2505,13,2506,1,15039,10,0,0,0,0,0,0,4176,1);
REPLACE INTO `mob_db_re` VALUES (1505,'LOLI_RURI','Loli Ruri','Loli Ruri',109,15280,1,2790,2093,2,787,1017,53,44,111,50,47,79,79,79,10,12,2,6,87,0x2003885,125,747,1632,576,0,0,0,0,0,0,0,7206,800,7219,3000,7214,5044,985,100,7019,1,2718,5,6246,300,15038,10,0,0,4191,1);
@@ -1017,12 +1020,12 @@ REPLACE INTO `mob_db_re` VALUES (1878,'E_SHINING_PLANT','Shining Plant','Mystic
REPLACE INTO `mob_db_re` VALUES (1879,'ECLIPSE_P','Eclipse Pet','Eclipse',6,1800,0,0,0,1,20,26,0,40,1,36,6,0,11,80,10,12,1,2,60,0x6203695,200,1456,456,336,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
# Moscovia
-REPLACE INTO `mob_db_re` VALUES (1880,'WOOD_GOBLIN','Wood Goblin','Leshij',81,5499,1,1106,1245,1,193,208,144,12,73,19,56,15,56,25,10,12,1,3,62,0x81,320,2304,840,360,0,0,0,0,0,0,0,2719,5,7203,4000,7201,2000,907,2000,916,500,7032,500,574,50,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (1881,'LES','Les','Lesavka',82,6216,1,1205,1356,1,270,300,123,30,63,20,35,25,52,30,10,12,1,3,82,0x1089,230,1728,720,576,0,0,0,0,0,0,0,7100,2000,511,1000,711,1000,905,2500,2270,1,521,500,510,50,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (1882,'VAVAYAGA','Baba Yaga','Baba-Yaga',87,6498,1,1188,1337,2,282,353,63,60,69,45,30,60,51,35,10,12,1,7,21,0x3885,270,1536,600,420,0,0,0,0,0,0,0,7099,1000,7762,5000,1630,10,7226,150,539,1500,519,1500,580,1500,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (1883,'UZHAS','Uzhas','Kikimora',85,7140,1,1294,1455,1,271,306,49,8,69,14,41,30,55,20,10,12,1,7,61,0x3885,200,576,672,384,0,0,0,0,0,0,0,520,900,1573,5,621,100,522,100,918,3500,579,1500,603,3,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (1884,'MAVKA','Mavka','Mavka',84,5421,1,1253,1530,7,263,323,98,58,65,31,50,35,81,30,10,12,1,3,62,0x3885,170,1536,504,360,0,0,0,0,0,0,0,1572,5,629,300,707,300,710,50,747,1500,748,300,510,3000,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (1885,'GOPINICH','Gopinich','Gopinich',97,1120500,1,714240,580320,3,1988,3849,355,121,127,102,143,102,152,76,10,12,2,2,62,0x6283695,150,1536,864,432,357120,607,5500,617,5000,617,5000,617,4000,2621,200,12080,1000,1737,100,1417,5,7444,5000,5007,1,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (1880,'WOOD_GOBLIN','Wood Goblin','Leshij',81,5499,1,1106,1245,1,193,208,144,12,73,19,56,15,56,25,10,12,1,3,62,0x81,320,2304,840,360,0,0,0,0,0,0,0,2719,5,7203,4000,7201,2000,907,2000,916,500,7032,500,574,50,0,0,0,0,27157,1);
+REPLACE INTO `mob_db_re` VALUES (1881,'LES','Les','Lesavka',82,6216,1,1205,1356,1,270,300,123,30,63,20,35,25,52,30,10,12,1,3,82,0x1089,230,1728,720,576,0,0,0,0,0,0,0,7100,2000,511,1000,711,1000,905,2500,2270,1,521,500,510,50,0,0,0,0,27158,1);
+REPLACE INTO `mob_db_re` VALUES (1882,'VAVAYAGA','Baba Yaga','Baba-Yaga',87,6498,1,1188,1337,2,282,353,63,60,69,45,30,60,51,35,10,12,1,7,21,0x3885,270,1536,600,420,0,0,0,0,0,0,0,7099,1000,7762,5000,1630,10,7226,150,539,1500,519,1500,580,1500,0,0,0,0,27160,1);
+REPLACE INTO `mob_db_re` VALUES (1883,'UZHAS','Uzhas','Kikimora',85,7140,1,1294,1455,1,271,306,49,8,69,14,41,30,55,20,10,12,1,7,61,0x3885,200,576,672,384,0,0,0,0,0,0,0,520,900,1573,5,621,100,522,100,918,3500,579,1500,603,3,0,0,0,0,27159,1);
+REPLACE INTO `mob_db_re` VALUES (1884,'MAVKA','Mavka','Mavka',84,5421,1,1253,1530,7,263,323,98,58,65,31,50,35,81,30,10,12,1,3,62,0x3885,170,1536,504,360,0,0,0,0,0,0,0,1572,5,629,300,707,300,710,50,747,1500,748,300,510,3000,0,0,0,0,27161,1);
+REPLACE INTO `mob_db_re` VALUES (1885,'GOPINICH','Gopinich','Gopinich',97,1120500,1,714240,580320,3,1988,3849,355,121,127,102,143,102,152,76,10,12,2,2,62,0x6283695,150,1536,864,432,357120,607,5500,617,5000,617,5000,617,4000,2621,200,12080,1000,1737,100,1417,5,7444,5000,5007,1,0,0,0,0,27162,1);
REPLACE INTO `mob_db_re` VALUES (1886,'G_MAVKA','Mavka','Mavka',84,5421,1,0,0,7,263,323,98,58,65,31,50,35,81,30,10,12,1,3,62,0x3885,170,1536,504,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
# Additional Monsters
@@ -1624,12 +1627,12 @@ REPLACE INTO `mob_db_re` VALUES (2404,'DEAD_PLANKTON','Dead Plankton','Dead Plan
REPLACE INTO `mob_db_re` VALUES (2405,'WEAK_SKELETON','Weak Skeleton','Weak Skeleton',18,280,1,58,43,1,25,33,12,2,15,5,10,0,12,0,10,12,1,1,29,0x91,200,2228,576,528,0,0,0,0,0,0,0,1010,45,932,800,1505,40,909,1500,507,500,2609,15,0,0,0,0,0,0,0,0);
REPLACE INTO `mob_db_re` VALUES (2406,'WEAK_SKEL_SOLDIER','Weak Soldier Skeleton','Weak Soldier Skeleton',23,468,1,72,81,1,66,75,28,5,18,9,28,5,43,5,10,12,1,1,29,0x3885,200,2276,432,576,0,0,0,0,0,0,0,932,1300,756,15,1214,3,507,170,934,2,2315,1,1216,10,0,0,0,0,0,0);
REPLACE INTO `mob_db_re` VALUES (2407,'SAILOR_SKELETON','Sailor Skeleton','Sailor Skeleton',19,310,1,58,43,1,27,35,12,2,15,5,10,0,12,0,10,12,1,1,29,0x3885,200,2228,576,528,0,0,0,0,0,0,0,932,700,2287,4,7477,1,2211,60,1104,60,756,10,628,5,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (2408,'DUMMY_10','Dummy 10','Dummy 10',10,99999999,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,200,1,0,20,0x200000,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (2409,'DUMMY_50','Dummy 50','Dummy 50',50,99999999,1,0,0,0,0,0,50,50,0,0,0,0,0,0,0,200,1,0,20,0x200000,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (2410,'DUMMY_100','Dummy 100','Dummy 100',100,99999999,1,0,0,0,0,0,90,90,0,0,0,0,0,0,0,200,1,0,20,0x200000,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (2411,'DUMMY_150','Dummy 150','Dummy 150',150,99999999,1,0,0,0,0,0,120,120,0,0,0,0,0,0,0,200,1,0,20,0x200000,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (2408,'DUMMY_10','Dummy 10','Dummy 10',10,99999999,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,20,0x4680020,200,0,0,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (2409,'DUMMY_50','Dummy 50','Dummy 50',50,99999999,1,0,0,0,0,0,50,50,0,0,0,0,0,0,0,0,1,0,20,0x4680020,200,0,0,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (2410,'DUMMY_100','Dummy 100','Dummy 100',100,99999999,1,0,0,0,0,0,90,90,0,0,0,0,0,0,0,0,1,0,20,0x4680020,200,0,0,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (2411,'DUMMY_150','Dummy 150','Dummy 150',150,99999999,1,0,0,0,0,0,120,120,0,0,0,0,0,0,0,0,1,0,20,0x4680020,200,0,0,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
#2412,E_VALKIWI
-REPLACE INTO `mob_db_re` VALUES (2413,'DUMMY_10_FIRE','Dummy 10','Dummy 10',10,99999999,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,200,1,0,23,0x0,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (2413,'DUMMY_10_FIRE','Dummy 10','Dummy 10',10,99999999,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,23,0x4680020,200,0,0,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
#2414,RUNAWAY_BOOK
REPLACE INTO `mob_db_re` VALUES (2415,'L_SEYREN','Knight Seyren','Knight Seyren',98,13260,1,2950,1974,1,827,1112,149,10,127,62,77,44,118,49,10,12,1,7,63,0x3885,150,432,400,288,0,0,0,0,0,0,0,7345,5000,7347,2500,1163,100,1164,5,2314,500,2315,5,603,2,0,0,0,0,0,0);
@@ -1682,20 +1685,20 @@ REPLACE INTO `mob_db_re` VALUES (2461,'TREASURE_BOX_TE_9','Treasure Chest','Trea
REPLACE INTO `mob_db_re` VALUES (2462,'TREASURE_BOX_TE_10','Treasure Chest','Treasure Chest',99,0,1,0,0,0,0,0,0,0,0,0,0,0,1199,0,0,0,0,0,20,0x1000000,0,0,0,0,0,0,0,0,0,0,0,6600,40,658,500,7444,10000,7444,10000,12399,5000,0,0,616,400,12399,500,0,0,0,0);
#2463,E_BOMBPORING
-# Old Glast Heim (currently placeholders)
-REPLACE INTO `mob_db_re` VALUES (2464,'MG_ZOMBIE','Zombie','Zombie',17,9340,1,117,87,1,38,50,20,3,15,8,17,0,15,0,10,12,1,1,29,0x3885,400,2612,912,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (2465,'MG_WRAITH','Wraith','Wraith',77,23168,1,1190,1191,1,335,396,80,40,62,26,30,55,76,5,10,12,2,1,89,0x3695,300,1816,576,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (2466,'MG_GHOUL','Ghoul','Ghoul',61,12614,1,583,656,1,216,245,78,5,56,12,19,11,27,10,10,12,1,1,49,0x3885,250,2456,912,504,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (2467,'MG_ARCLOUSE','Arclouse','Arclouze',107,14020,1,1844,2607,1,269,309,101,36,60,73,45,35,140,15,10,12,1,4,42,0x2003095,100,960,500,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (2468,'MG_RAYDRIC','Raydric','Raydric',115,25408,1,20770,2076,1,572,668,89,15,129,87,55,32,76,27,10,12,2,7,47,0x3095,150,824,780,420,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (2469,'MG_RAYDRIC_ARCHER','Raydric Archer','Raydric Archer',82,30370,1,1049,1332,9,377,395,63,40,53,24,40,15,112,30,10,12,1,6,47,0x2002085,200,1152,1152,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (2470,'MG_KNIGHT_OF_ABYSS','Knight of Abyss','Abysmal Knight',122,332970,1,4779,4013,1,810,1002,102,50,121,55,68,70,97,37,10,12,2,7,87,0x3695,300,1500,500,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (2471,'MG_KHALITZBURG','Khalitzburg','Khalitzburg',118,109860,1,2862,2147,1,737,833,125,10,121,48,40,31,89,32,10,12,2,1,29,0x3695,350,528,1000,396,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (2472,'MG_BLOODY_KNIGHT','Bloody Knight','Bloody Knight',116,285000,1,7348,6511,3,942,1065,122,50,132,59,70,57,98,45,10,12,2,0,87,0x3695,250,828,528,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (2473,'MG_M_UNDEAD_KNIGHT','Undead Knight','Undead Knight',133,500000,0,4500,3375,2,751,880,122,62,122,87,54,65,103,65,14,16,2,7,80,0x6203695,170,140,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (2474,'MG_F_UNDEAD_KNIGHT','Undead Knight','Undead Knight',133,500000,0,4500,3375,2,751,880,122,62,122,87,54,65,103,65,14,16,2,7,80,0x6203695,170,140,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (2475,'MG_CORRUPTION_ROOT','Root of Corruption','Root of Corruption',136,3190000,1,240120,187920,3,710,1762,213,123,86,89,120,131,101,92,14,12,2,7,62,0x6280084,170,854,2016,480,120060,607,5500,608,3500,732,5500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4603,1);
-REPLACE INTO `mob_db_re` VALUES (2476,'MG_AMDARAIS','Amdarias','Amdarias',143,3283990,1,74288,77950,2,8860,10022,32,66,140,159,30,109,300,90,10,12,2,2,63,0x6283695,200,1152,1152,576,37144,617,5500,617,5000,616,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4601,1);
+# Old Glast Heim
+REPLACE INTO `mob_db_re` VALUES (2464,'MG_ZOMBIE','Corrupted Steward','Corrupted Steward',130,135600,1,13332,15998,1,2364,2808,15,15,44,22,77,25,88,22,10,12,1,1,29,0x3885,400,2612,912,288,0,0,0,0,0,0,0,6609,1000,6610,1000,6608,10,938,1000,727,500,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (2465,'MG_WRAITH','Corrupted Monk','Corrupted Monk',133,100168,1,13998,16796,1,999,3786,80,200,16,26,30,115,79,5,10,12,2,1,89,0x3695,350,1816,576,240,0,0,0,0,0,0,0,6609,1000,6610,1000,6608,10,2206,100,731,100,747,500,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (2466,'MG_GHOUL','Grand Chamberlain in pain','Grand Chamberlain in pain',132,208100,1,14222,17066,1,2965,3631,30,30,88,44,88,21,95,44,10,12,1,1,49,0x3885,300,2456,912,504,0,0,0,0,0,0,0,6609,1000,6610,1000,6608,10,756,100,2609,100,7751,1000,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (2467,'MG_ARCLOUSE','Maggot','Maggot',133,80811,1,22,26,1,1246,2503,121,36,60,103,45,35,172,15,10,12,0,4,42,0x2003095,100,960,500,480,0,0,0,0,0,0,0,6609,1000,6610,1000,6608,10,1096,3000,997,100,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (2468,'MG_RAYDRIC','Corrupted Palace Guard','Corrupted Palace Guard',135,184080,1,16306,6944,2,3167,3305,89,15,159,87,66,33,106,27,10,12,1,1,47,0x3095,150,824,780,420,0,0,0,0,0,0,0,6609,1000,6610,1000,6608,10,7054,3000,985,50,2316,200,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (2469,'MG_RAYDRIC_ARCHER','Wandering Archer','Wandering Archer',136,144370,1,14248,9378,14,3891,4058,63,40,53,24,40,15,156,30,10,12,1,1,47,0x2002085,200,1152,1152,480,0,0,0,0,0,0,0,6609,1000,6610,1000,6608,10,7054,3000,985,50,2330,200,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (2470,'MG_KNIGHT_OF_ABYSS','Corrupted Knight of Abyss','Corrupted Abysmal Knight',142,225789,1,18584,16576,2,3200,3322,102,50,121,55,99,70,126,37,10,12,2,1,87,0x6203695,300,1000,500,1000,0,0,0,0,0,0,0,6609,3000,6610,2000,6608,50,1064,5000,1004,10,2341,200,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (2471,'MG_KHALITZBURG','Suffering Khalitzburg','Suffering Khalitzburg',143,236851,1,17542,14662,2,2800,2900,125,10,121,142,55,81,105,32,10,12,2,1,29,0x6203695,350,0,1000,396,0,0,0,0,0,0,0,6609,3000,6610,2000,6608,50,985,50,1004,10,1110,300,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (2472,'MG_BLOODY_KNIGHT','Bloody Knight','Bloody Knight',143,246751,1,20448,21882,2,1881,5081,122,300,132,55,89,151,137,45,10,12,2,1,87,0x6203695,250,828,528,192,0,0,0,0,0,0,0,6609,3000,6610,2000,6608,50,7054,5000,1160,100,1157,100,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (2473,'MG_M_UNDEAD_KNIGHT','1st Commander of Destruction','1st Commander of Destruction',145,950033,1,160018,135184,2,3321,4330,80,150,165,82,110,122,154,52,10,12,1,1,49,0x6203695,130,350,864,480,0,0,0,0,0,0,0,6609,5000,6610,5000,6608,50,1191,10,1163,100,1463,200,0,0,0,0,0,0,4605,1);
+REPLACE INTO `mob_db_re` VALUES (2474,'MG_F_UNDEAD_KNIGHT','2nd Commander of Destruction','2nd Commander of Destruction',145,848011,1,159672,120398,2,3090,4578,80,180,155,88,110,135,154,59,10,12,1,1,49,0x6203695,120,350,768,480,0,0,0,0,0,0,0,6609,5000,6610,5000,6608,50,1163,100,1145,50,0,0,0,0,0,0,0,0,4606,1);
+REPLACE INTO `mob_db_re` VALUES (2475,'MG_CORRUPTION_ROOT','Corrupted Soul','Corrupted Soul',150,1820000,1,2199906,2008478,3,3887,7774,333,333,201,20,90,201,201,20,10,12,2,6,62,0x6280084,2000,576,672,480,0,0,0,0,0,0,0,616,5000,617,10000,6607,5000,607,10000,2854,1000,7566,10000,0,0,0,0,0,0,4603,1);
+REPLACE INTO `mob_db_re` VALUES (2476,'MG_AMDARAIS','Amdarias','Amdarias',150,4290000,1,2291324,2197024,3,5290,9190,30,40,255,39,90,169,166,20,10,12,2,1,89,0x6283695,120,312,1200,432,0,0,0,0,0,0,0,616,5000,617,10000,6607,5000,607,10000,1186,1000,1004,10000,0,0,0,0,0,0,4601,1);
REPLACE INTO `mob_db_re` VALUES (2477,'NG_WANDER_MAN','Nightmare Wander Man','Nightmare Wander Man',151,130682,1,19814,17228,2,2827,3045,129,16,208,151,76,39,231,50,12,12,1,6,24,0x2003695,100,672,500,192,0,0,0,0,0,0,0,7005,4850,616,2,13015,5,2270,5,21003,1,984,110,1164,10,0,0,0,0,0,0);
REPLACE INTO `mob_db_re` VALUES (2478,'NG_RIDEWORD','Nightmare Rideword','Nightmare Rideword',146,103220,1,10500,15840,1,2320,2486,140,59,131,195,58,66,263,5,12,12,0,0,60,0x3695,150,864,500,192,0,0,0,0,0,0,0,1097,4850,1568,5,1569,5,1570,5,1571,5,7015,150,18752,1,0,0,0,0,0,0);
@@ -1748,9 +1751,9 @@ REPLACE INTO `mob_db_re` VALUES (2485,'NG_CHIMERA','Nightmare Chimera','Nightmar
#2525,WATERMELON_16
#2526,E_BANDIT
#2527,ME_ANOPHELES
-REPLACE INTO `mob_db_re` VALUES (2528,'FACEWORM','Faceworm','Faceworm',140,482427,1,38800,3960,2,1818,727,50,30,100,50,100,100,100,50,10,12,2,4,25,0x2000085,200,384,720,480,0,0,0,0,0,0,0,971,100,22507,100,0,0,0,0,0,0,0,0,13089,10,7326,1000,972,100,0,0);
-REPLACE INTO `mob_db_re` VALUES (2529,'FACEWORM_QUEEN','Faceworm Queen','Faceworm Queen',155,50000000,1,200000,200000,2,4024,1609,100,60,200,100,200,200,200,100,10,12,2,4,85,0x6283695,200,768,540,480,90909,0,0,617,2500,12246,2500,607,1000,0,0,0,0,0,0,0,0,13090,100,0,0,6649,5000,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (2530,'FACEWORM_DARK','Faceworm Dark','Dark Faceworm',144,5000000,1,100000,80000,2,2012,805,100,30,150,100,150,150,150,100,10,12,2,4,45,0x6283695,180,576,480,480,0,0,0,0,0,0,0,13089,10,22507,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (2528,'FACEWORM','Faceworm','Faceworm',140,482427,1,38800,3960,2,1818,727,50,30,100,50,100,100,100,50,10,12,2,4,25,0x2000085,200,384,720,480,0,0,0,0,0,0,0,971,100,22507,100,0,0,0,0,0,0,0,0,13089,10,7326,1000,972,100,27163,1);
+REPLACE INTO `mob_db_re` VALUES (2529,'FACEWORM_QUEEN','Faceworm Queen','Faceworm Queen',155,50000000,1,200000,200000,2,4024,1609,100,60,200,100,200,200,200,100,10,12,2,4,85,0x6283695,200,768,540,480,90909,0,0,617,2500,12246,2500,607,1000,0,0,0,0,0,0,0,0,13090,100,0,0,6649,5000,0,0,27164,1);
+REPLACE INTO `mob_db_re` VALUES (2530,'FACEWORM_DARK','Faceworm Dark','Dark Faceworm',144,5000000,1,100000,80000,2,2012,805,100,30,150,100,150,150,150,100,10,12,2,4,45,0x6283695,180,576,480,480,0,0,0,0,0,0,0,13089,10,22507,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27165,1);
REPLACE INTO `mob_db_re` VALUES (2531,'VENOM_BUG','Venom Bug','Venom Bug',140,10000,1,0,0,1,340,0,200,100,200,200,200,200,200,200,12,12,0,4,25,0x2200084,2000,384,0,480,0,0,0,0,0,0,0,938,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7326,1000,0,0);
REPLACE INTO `mob_db_re` VALUES (2532,'FACEWORM_QUEEN_R','Faceworm Queen (Red)','Red Faceworm Queen',155,50000000,1,200000,200000,2,12000,4800,400,400,500,100,200,200,200,100,10,12,2,4,23,0x6283695,200,768,540,480,90909,12246,2500,617,2500,0,0,994,5000,0,0,0,0,0,0,0,0,13090,100,0,0,6649,5000,0,0,0,0);
REPLACE INTO `mob_db_re` VALUES (2533,'FACEWORM_QUEEN_G','Faceworm Queen (Green)','Green Faceworm Queen',155,50000000,1,200000,200000,2,5000,2000,500,60,200,100,400,200,200,100,10,12,2,4,22,0x6283695,200,768,540,480,90909,617,2500,12246,2500,0,0,6649,5000,13090,100,997,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
@@ -1760,30 +1763,30 @@ REPLACE INTO `mob_db_re` VALUES (2536,'HIDDEN_MOB3','Hidden Mob 3','Monster 3',1
REPLACE INTO `mob_db_re` VALUES (2537,'HIDDEN_MOB4','Hidden Mob 4','Monster 4',151,10000,200,0,0,1,2000,0,200,100,100,100,100,100,100,100,12,12,0,0,88,0x0370084,2000,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
#2538,E_KING_PORING
REPLACE INTO `mob_db_re` VALUES (2539,'HIDDEN_MOB5','Hidden Mob 5','Monster 5',151,10000,200,0,0,9,500,0,200,100,100,100,100,100,100,100,12,12,0,0,88,0x2370084,2000,0,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (2540,'FACEWORM_EGG','Faceworm Egg','Faceworm Egg',140,10,1,10,12,1,150,150,10,10,10,10,10,10,10,10,10,12,1,4,25,0x2370000,150,24,0,0,0,0,0,0,0,0,0,7032,5000,938,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (2541,'FACEWORM_LARVA','Faceworm Larva','Faceworm Larva',145,260380,1,10,12,1,1286,1851,10,10,10,50,50,50,180,50,10,12,1,4,45,0x2000085,150,1000,792,336,0,0,0,0,0,0,0,912,225,0,0,0,0,0,0,0,0,0,0,1096,1750,943,400,938,1500,0,0);
-REPLACE INTO `mob_db_re` VALUES (2542,'IRENE_ELDER','Irene Elder','Doyen Irene',101,433110,1,11360,27032,1,1749,2281,145,73,82,36,55,100,182,88,10,12,1,7,20,102774421,170,73,384,288,0,0,0,0,0,0,0,12072,100,12082,100,12087,100,12077,100,12092,100,12097,100,7481,1,12129,1,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (2543,'PAYONSOLDIER','1st Payon Soldier','1st Payon Soldier',101,20099,1,1083,2688,1,545,596,66,36,20,46,35,35,64,30,10,12,1,7,20,0x3095,225,73,348,288,0,0,0,0,0,0,0,12054,533,12044,533,12059,533,12069,533,12049,533,12127,266,12064,533,7479,1,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (2544,'PAYONSOLDIER2','2nd Payon Soldier','2nd Payon Soldier',101,21099,1,1136,2703,1,697,748,66,36,20,46,25,35,64,30,10,12,1,7,20,0x3095,200,73,348,288,0,0,0,0,0,0,0,12071,400,12076,400,12091,400,12081,400,12096,400,12086,400,12128,133,7480,1,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (2540,'FACEWORM_EGG','Faceworm Egg','Faceworm Egg',140,10,1,10,12,1,150,150,10,10,10,10,10,10,10,10,10,12,1,4,25,0x2370000,150,24,0,0,0,0,0,0,0,0,0,7032,5000,938,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27166,1);
+REPLACE INTO `mob_db_re` VALUES (2541,'FACEWORM_LARVA','Faceworm Larva','Faceworm Larva',145,260380,1,10,12,1,1286,1851,10,10,10,50,50,50,180,50,10,12,1,4,45,0x2000085,150,1000,792,336,0,0,0,0,0,0,0,912,225,0,0,0,0,0,0,0,0,0,0,1096,1750,943,400,938,1500,27167,1);
+REPLACE INTO `mob_db_re` VALUES (2542,'IRENE_ELDER','Irene Elder','Doyen Irene',101,433110,1,11360,27032,1,1749,2281,145,73,82,36,55,100,182,88,10,12,1,7,20,102774421,170,73,384,288,0,0,0,0,0,0,0,12072,100,12082,100,12087,100,12077,100,12092,100,12097,100,7481,1,12129,1,0,0,27168,1);
+REPLACE INTO `mob_db_re` VALUES (2543,'PAYONSOLDIER','1st Payon Soldier','1st Payon Soldier',101,20099,1,1083,2688,1,545,596,66,36,20,46,35,35,64,30,10,12,1,7,20,0x3095,225,73,348,288,0,0,0,0,0,0,0,12054,533,12044,533,12059,533,12069,533,12049,533,12127,266,12064,533,7479,1,0,0,27169,1);
+REPLACE INTO `mob_db_re` VALUES (2544,'PAYONSOLDIER2','2nd Payon Soldier','2nd Payon Soldier',101,21099,1,1136,2703,1,697,748,66,36,20,46,25,35,64,30,10,12,1,7,20,0x3095,200,73,348,288,0,0,0,0,0,0,0,12071,400,12076,400,12091,400,12081,400,12096,400,12086,400,12128,133,7480,1,0,0,27169,1);
REPLACE INTO `mob_db_re` VALUES (2545,'GUARDDOG','1st Guard Dog','1st Guard Dog',101,20099,1,944,2658,1,546,598,66,36,20,46,25,35,64,30,10,12,1,2,22,0x3091,150,73,348,288,0,0,0,0,0,0,0,12043,600,12068,600,7477,1,12048,600,12053,600,12058,600,12063,600,12125,333,0,0,0,0);
REPLACE INTO `mob_db_re` VALUES (2546,'GUARDDOG2','2nd Guard Dog','2nd Guard Dog',101,21099,1,1014,2673,1,573,229,66,36,20,46,25,35,64,30,10,12,1,2,23,0x3095,120,73,348,288,0,0,0,0,0,0,0,12045,466,7478,1,12050,466,12055,466,12060,466,12065,466,12070,466,12126,200,0,0,0,0);
#2547,MER_GARM_BABY
#2548,MER_HILLSRION
-REPLACE INTO `mob_db_re` VALUES (2549,'GEFFEN_MAGE_1','Arhi','Arhi',90,100000,1,8900,4550,1,329,424,64,38,50,50,50,50,130,50,10,12,1,7,20,0x85,200,1000,864,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (2550,'GEFFEN_MAGE_2','Dio Anemos','Dio Anemos',95,200000,1,9440,4430,1,478,649,129,18,40,40,50,80,130,60,10,12,1,7,20,0x85,200,900,672,480,0,0,0,0,0,0,0,1095,10000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (2551,'GEFFEN_MAGE_3_1','Geffen Shoplifter','Geffen Shoplifter',100,300000,1,9780,3665,1,478,632,93,36,70,70,40,40,140,60,10,12,1,7,20,0x85,200,800,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (2552,'GEFFEN_MAGE_3_2','Geffen Bully','Geffen Bully',100,300000,1,9780,3665,1,478,632,93,36,70,50,70,40,140,40,10,12,1,7,20,0x85,200,900,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (2553,'GEFFEN_MAGE_3_3','Geffen Gang Member','Geffen Gang Member',100,300000,1,9780,3665,1,468,622,93,36,60,80,30,30,140,70,10,12,1,7,20,0x85,200,950,864,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (2554,'GEFFEN_MAGE_4','Faymont','Faymont',105,400000,1,11660,4370,1,477,633,114,21,60,60,60,60,140,60,10,12,1,7,20,0x85,200,672,648,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (2555,'GEFFEN_MAGE_5','Ordre','Ordre',110,600000,1,15610,4861,1,654,906,107,21,40,70,40,100,150,60,10,12,1,7,20,0x85,200,768,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (2556,'GEFFEN_MAGE_6','Blut Hase','Blut Hase',120,1000000,1,20560,10010,1,480,601,66,47,120,120,120,50,150,60,10,12,1,7,48,0x85,200,800,768,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (2557,'GEFFEN_MAGE_7','Kuro Akuma','Kuro Akuma',130,1200000,1,26100,12030,1,761,1026,135,10,100,100,100,100,145,100,10,12,1,7,20,0x85,200,1000,864,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (2558,'GEFFEN_MAGE_8','Ifodes','Ifodes',140,1400000,1,46150,18900,1,676,869,120,60,150,100,100,50,170,100,10,12,1,7,20,0x85,200,800,768,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (2559,'GEFFEN_MAGE_9','Licheniyes','Licheniyes',145,1600000,1,52060,24105,1,763,1048,140,57,50,100,50,200,220,75,10,12,1,7,20,0x85,200,864,768,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (2560,'GEFFEN_MAGE_10','Odoric','Odoric',150,2000000,1,60027,40237,1,950,1250,165,62,200,150,50,50,170,100,10,12,1,7,20,0x85,200,800,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (2561,'GEFFEN_MAGE_11','Ju','Ju',155,5000000,1,75335,52130,1,1045,1465,170,65,50,100,100,200,220,100,10,12,1,7,20,0x85,200,800,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (2562,'GEFFEN_MAGE_12','Dwigh','Dwigh',160,7000000,1,151317,123000,1,1410,2010,175,65,50,100,100,250,220,100,10,12,1,7,48,0x6200085,200,800,768,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (2563,'FEI_KANABIAN','Fei Kanabian','Fay Kanavian',160,8000000,1,157975,110571,1,1710,2460,175,65,50,100,100,250,220,100,10,12,1,7,48,0x6200085,200,720,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (2549,'GEFFEN_MAGE_1','Arhi','Arhi',90,100000,1,8900,4550,1,329,424,64,38,50,50,50,50,130,50,10,12,1,7,20,0x85,200,1000,864,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27249,1);
+REPLACE INTO `mob_db_re` VALUES (2550,'GEFFEN_MAGE_2','Dio Anemos','Dio Anemos',95,200000,1,9440,4430,1,478,649,129,18,40,40,50,80,130,60,10,12,1,7,20,0x85,200,900,672,480,0,0,0,0,0,0,0,1095,10000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27250,1);
+REPLACE INTO `mob_db_re` VALUES (2551,'GEFFEN_MAGE_3_1','Geffen Shoplifter','Geffen Shoplifter',100,300000,1,9780,3665,1,478,632,93,36,70,70,40,40,140,60,10,12,1,7,20,0x85,200,800,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27253,1);
+REPLACE INTO `mob_db_re` VALUES (2552,'GEFFEN_MAGE_3_2','Geffen Bully','Geffen Bully',100,300000,1,9780,3665,1,478,632,93,36,70,50,70,40,140,40,10,12,1,7,20,0x85,200,900,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27252,1);
+REPLACE INTO `mob_db_re` VALUES (2553,'GEFFEN_MAGE_3_3','Geffen Gang Member','Geffen Gang Member',100,300000,1,9780,3665,1,468,622,93,36,60,80,30,30,140,70,10,12,1,7,20,0x85,200,950,864,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27251,1);
+REPLACE INTO `mob_db_re` VALUES (2554,'GEFFEN_MAGE_4','Faymont','Faymont',105,400000,1,11660,4370,1,477,633,114,21,60,60,60,60,140,60,10,12,1,7,20,0x85,200,672,648,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27254,1);
+REPLACE INTO `mob_db_re` VALUES (2555,'GEFFEN_MAGE_5','Ordre','Ordre',110,600000,1,15610,4861,1,654,906,107,21,40,70,40,100,150,60,10,12,1,7,20,0x85,200,768,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27255,1);
+REPLACE INTO `mob_db_re` VALUES (2556,'GEFFEN_MAGE_6','Blut Hase','Blut Hase',120,1000000,1,20560,10010,1,480,601,66,47,120,120,120,50,150,60,10,12,1,7,48,0x85,200,800,768,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27256,1);
+REPLACE INTO `mob_db_re` VALUES (2557,'GEFFEN_MAGE_7','Kuro Akuma','Kuro Akuma',130,1200000,1,26100,12030,1,761,1026,135,10,100,100,100,100,145,100,10,12,1,7,20,0x85,200,1000,864,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27257,1);
+REPLACE INTO `mob_db_re` VALUES (2558,'GEFFEN_MAGE_8','Ifodes','Ifodes',140,1400000,1,46150,18900,1,676,869,120,60,150,100,100,50,170,100,10,12,1,7,20,0x85,200,800,768,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27258,1);
+REPLACE INTO `mob_db_re` VALUES (2559,'GEFFEN_MAGE_9','Licheniyes','Licheniyes',145,1600000,1,52060,24105,1,763,1048,140,57,50,100,50,200,220,75,10,12,1,7,20,0x85,200,864,768,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27259,1);
+REPLACE INTO `mob_db_re` VALUES (2560,'GEFFEN_MAGE_10','Odoric','Odoric',150,2000000,1,60027,40237,1,950,1250,165,62,200,150,50,50,170,100,10,12,1,7,20,0x85,200,800,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27260,1);
+REPLACE INTO `mob_db_re` VALUES (2561,'GEFFEN_MAGE_11','Ju','Ju',155,5000000,1,75335,52130,1,1045,1465,170,65,50,100,100,200,220,100,10,12,1,7,20,0x85,200,800,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27261,1);
+REPLACE INTO `mob_db_re` VALUES (2562,'GEFFEN_MAGE_12','Dwigh','Dwigh',160,7000000,1,151317,123000,1,1410,2010,175,65,50,100,100,250,220,100,10,12,1,7,48,0x6200085,200,800,768,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27262,1);
+REPLACE INTO `mob_db_re` VALUES (2563,'FEI_KANABIAN','Fei Kanabian','Fay Kanavian',160,8000000,1,157975,110571,1,1710,2460,175,65,50,100,100,250,220,100,10,12,1,7,48,0x6200085,200,720,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27263,1);
REPLACE INTO `mob_db_re` VALUES (2564,'GEFFEN_FENRIR','Geffen Fenrir','Fenrir',160,20000000,1,323300,300000,1,2160,3060,200,70,200,100,200,200,220,100,10,12,1,7,48,0x6200085,200,900,864,480,0,0,0,0,0,0,0,22511,100,22511,100,22511,100,22511,100,22511,100,22511,100,0,0,0,0,0,0,4556,1);
REPLACE INTO `mob_db_re` VALUES (2565,'ALPHONSE','Alphonse','Alphonse',150,1000000,1,0,0,1,650,850,100,20,100,100,50,50,170,100,10,12,1,7,42,0x85,200,1400,816,396,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
REPLACE INTO `mob_db_re` VALUES (2566,'ALPHONSE_JR','Alphonse Jr','Alphonse Jr',150,100000,1,0,0,1,450,550,80,20,100,100,50,50,170,100,10,12,1,7,62,0x85,200,936,792,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
@@ -2168,20 +2171,20 @@ REPLACE INTO `mob_db_re` VALUES (2936,'E_GHOSTRING','Ghostring','Ghostring',1,10
#2945,J_MUMMY
#2946,J_ANUBIS
#2947,J_EGGYRA
-#2948,CURSED_SOLDIER
-#2949,CURSED_SENTINEL
-#2950,BROKEN_MIND
-#2951,FLOATING_WORD
-#2952,LIKE_LOVE
-#2953,CURSED_MEMORY
-#2954,COLORLESS_VOW
-#2955,OLD_FRIENDSHIP
-#2956,SWEET_SLAUGHTER
-#2957,FORGOTTEN_NAME
-#2958,FATAL_DAYS
-#2959,TORTUROUS_REDEEMER
+REPLACE INTO `mob_db_re` VALUES (2948,'CURSED_SOLDIER','Cursed Soldier','Cursed Soldier',110,18574,1,1907,1851,9,1258,1791,85,35,81,50,64,56,178,23,10,12,1,1,69,0x3885,150,1960,576,420,0,0,0,0,0,0,0,6672,1000,957,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (2949,'CURSED_SENTINEL','Cursed Sentinel','Cursed Sentinel',110,14099,1,1634,1346,2,1347,1906,84,41,120,65,66,41,107,26,10,12,2,7,67,0x3885,175,914,1344,384,0,0,0,0,0,0,0,6672,1000,934,2500,1097,1500,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (2950,'BROKEN_MIND','Broken Mind','Broken Mind',110,13520,1,1545,1557,1,1259,1799,67,27,69,37,36,10,64,5,10,12,1,6,67,0x2003885,200,920,720,200,0,0,0,0,0,0,0,6672,1000,6086,2500,683,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (2951,'FLOATING_WORD','Floating Word','Floating Word',110,11276,1,1166,1034,1,1080,1509,93,40,111,90,60,70,139,65,10,12,0,6,68,0x2003885,150,972,648,432,0,0,0,0,0,0,0,6672,1000,938,3000,947,2500,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (2952,'LIKE_LOVE','Like Love','Like Love',110,14008,1,1505,1667,2,1182,1183,64,51,62,27,25,55,102,20,10,12,1,6,64,0x2003885,150,1056,1056,336,0,0,0,0,0,0,0,6672,1000,929,2500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (2953,'CURSED_MEMORY','Cursed Memory','Cursed Memory',110,18045,1,1802,1623,1,1310,1867,89,28,87,39,58,5,82,10,10,12,1,1,69,0x3885,350,1768,500,192,0,0,0,0,0,0,0,6672,1000,957,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (2954,'COLORLESS_VOW','Colorless Vow','Colorless Vow',110,19194,0,1939,1881,1,1478,2121,95,41,84,35,60,20,85,15,10,12,1,1,69,0x3885,350,0,500,0,0,0,0,0,0,0,0,6672,1000,958,3500,1063,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (2955,'OLD_FRIENDSHIP','Old Friendship','Old Friendship',110,12614,0,1306,1328,0,1147,1638,78,5,56,12,19,11,30,10,10,12,1,1,49,0x3885,250,2460,912,0,0,0,0,0,0,0,0,6672,1000,932,3500,1098,2500,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (2956,'SWEET_SLAUGHTER','Sweet Slaughter','Sweet Slaughter',110,13986,0,1960,1587,0,1216,1709,125,10,121,48,40,31,125,32,10,12,2,1,29,0x3885,350,1538,1000,396,0,0,0,0,0,0,0,6672,1000,929,2000,682,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (2957,'FORGOTTEN_NAME','Forgotten Name','Forgotten Name',120,19546,1,1505,1485,2,1093,1520,111,38,121,29,51,43,100,3,10,12,1,1,49,0x3885,155,1169,1152,480,0,0,0,0,0,0,0,6672,1500,682,5000,683,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (2958,'FATAL_DAYS','Fatal Days','Fatal Days',120,24240,1,2052,2026,2,1025,1428,72,15,100,71,63,85,115,37,10,12,1,6,67,0x2003885,190,720,384,480,0,0,0,0,0,0,0,6672,1500,1050,2500,1038,2500,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (2959,'TORTUROUS_REDEEMER','Torturous Redeemer','Torturous Redeemer',120,103342,0,10590,8378,0,1253,1753,144,28,133,69,72,55,165,44,10,12,1,7,62,0x3885,200,672,420,360,0,0,0,0,0,0,0,6672,10000,6672,10000,923,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
#2960,MM_FLAMECROSS
-#2961,E_TORTUROUS_REDEEMER
+REPLACE INTO `mob_db_re` VALUES (2961,'E_TORTUROUS_REDEEMER','Torturous Redeemer','Torturous Redeemer',120,103342,1,10590,8378,1,1253,1753,144,28,133,69,72,55,165,44,10,12,1,7,62,0x3885,200,672,420,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
#2962,E_DEVILING
#2963,WOODIE
#2964,EXP_1000
@@ -2240,15 +2243,15 @@ REPLACE INTO `mob_db_re` VALUES (2997,'G_XM_CELINE_KIMI','Kimi\'s Phantom','Kimi
#3017,EP14_3_DEATH_C_MOB2
#3018,EP14_3_DEATH_C_MOB3
#3019,CELINE_KIMI
-#3020,FIRE_CONDOR
-#3021,FIRE_SAND_MAN
-#3022,FIRE_FRILLDORA
-#3023,FIRE_GOLEM
+REPLACE INTO `mob_db_re` VALUES (3020,'FIRE_CONDOR','Fire Condor','Fire Condor',141,125114,1,7021,7481,1,1364,2565,71,45,104,72,66,10,113,52,10,12,1,2,43,0x0000081,110,1148,648,480,0,0,0,0,0,0,0,6691,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (3021,'FIRE_SAND_MAN','Fire Sand Man','Fire Sandman',143,130501,1,7207,7734,1,1404,2760,122,73,84,36,25,55,124,35,10,12,1,0,63,0x003885,150,1672,720,288,0,0,0,0,0,0,0,6694,1500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (3022,'FIRE_FRILLDORA','Fire Frilldora','Fire Frilldora',147,141301,1,7807,8199,1,1511,2903,134,40,148,38,128,45,121,30,10,12,1,2,63,0x0000081,130,1540,720,432,0,0,0,0,0,0,0,6694,1500,6696,1500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (3023,'FIRE_GOLEM','Fire Golem','Fire Golem',148,180213,1,8912,9464,1,1478,2799,292,102,70,78,267,25,84,25,10,12,2,0,83,0x003885,200,1608,816,396,0,0,0,0,0,0,0,6693,2000,6695,1500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
#3024,14_3_MERCENARY_A
#3025,14_3_MERCENARY_B
-#3026,FIREPIT
-#3027,FULBUK
-#3028,SONIA
+REPLACE INTO `mob_db_re` VALUES (3026,'FIREPIT','Fire Pit','Fire Pit',17,10,1,58,43,1,38,50,20,3,15,8,17,0,15,0,10,12,1,1,29,0x170000,400,2612,912,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (3027,'FULBUK','Fire Bug','Fire Bug',150,234,1,58,47,1,38,50,20,3,15,8,17,0,15,0,10,12,1,1,29,0x0000001,120,1288,288,768,0,0,0,0,0,0,0,6689,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (3028,'SONIA','Sonia','Sonia',17,20,1,58,43,1,38,50,20,3,15,8,17,0,15,0,10,12,1,1,29,0x170000,400,2612,912,288,0,0,0,0,0,0,0,6690,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
#3029,GRIM_REAPER_ANKOU
#3030,STANDING_SOUL
#3031,MUTANT_NECROMANCER
@@ -2345,7 +2348,7 @@ REPLACE INTO `mob_db_re` VALUES (3074,'TIMEHOLDER','Time Holder','Time Holder',1
#3122,CHARLESTON1
#3123,CHARLESTON2
#3124,CHARLESTON3
-REPLACE INTO `mob_db_re` VALUES (3125,'STEP','Step','Step',130,55403,0,3088,2392,1,871,1566,101,58,117,127,55,61,116,60,10,12,0,6,22,234894485,250,0,780,0,0,0,0,0,0,0,0,6751,1000,998,150,13213,400,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (3125,'STEP','Step','Step',130,55403,0,3088,2392,1,871,1566,101,58,117,127,55,61,116,60,10,12,0,6,22,0x2000000,250,0,780,0,0,0,0,0,0,0,0,6751,1000,998,150,13213,400,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
#3126,ROCK_STEP
#3127,KICK_STEP
#3128,KICK_AND_KICK
@@ -2373,13 +2376,13 @@ REPLACE INTO `mob_db_re` VALUES (3125,'STEP','Step','Step',130,55403,0,3088,2392
#3150,MG_AMDARAIS_H
#3151,MG_CORRUPTION_ROOT_H
#3152,G_MG_KHALITZBURG_H
-#3153,EXCAVATOR_ROBOT
-#3154,RECON_ROBOT
-#3155,REPAIR_ROBOT
-#3156,EXPLORATION_ROVER
-#3157,RUIN_BELIEVER1
-#3158,RUIN_BELIEVER2
-#3159,ILLEGAL_PROMOTION
+REPLACE INTO `mob_db_re` VALUES (3153,'EXCAVATOR_ROBOT','Excavator Robot','Excavator Robot',163,166860,0,15026,16915,1,4093,6007,138,53,102,104,72,57,98,57,10,12,1,0,60,0x0000085,250,1020,500,768,0,0,0,0,0,0,0,11597,251,984,101,6962,101,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (3154,'RECON_ROBOT','Recon Robot','Recon Robot',165,256000,0,15796,17738,1,2668,3863,128,60,112,60,72,57,120,77,10,12,2,0,80,0x0000085,170,1072,672,384,0,0,0,0,0,0,0,998,1001,756,1001,11597,151,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (3155,'REPAIR_ROBOT','Repair Robot','Repair Robot',155,154760,0,11748,47654,1,1893,2714,99,55,98,39,30,35,95,45,10,12,0,3,24,0x0000085,300,1500,500,660,0,0,0,0,0,0,0,998,5000,756,1501,999,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (3156,'EXPLORATION_ROVER','Exploration Rover','Exploration Rover',168,293640,0,18172,126234,1,2278,3283,105,41,100,63,35,99,106,61,10,12,2,7,80,0x0000085,165,1552,1152,336,0,0,0,0,0,0,0,998,5000,756,1,999,1,6961,1,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (3157,'RUIN_BELIEVER1','Ruin Grace Believer','Ruin Grace Believer',100,61350,0,4666,3874,1,982,1379,91,50,88,61,51,62,136,60,10,12,1,7,40,0x0000085,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (3158,'RUIN_BELIEVER2','Ruin Grace Believer','Ruin Grace Believer',100,61350,0,4666,139500,1,982,1379,91,50,88,61,51,62,136,60,10,12,1,7,40,0x0000085,200,2125,2112,0,0,0,0,0,0,0,0,6753,10000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (3159,'ILLEGAL_PROMOTION','Illegal Promotion','Illegal Promotion',100,10,0,0,0,1,101,102,1,50,1,1,1,1,1,1,10,12,0,0,40,0x0370020,200,0,0,768,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
#3160,BOILED_RICE_DUANWU
#3161,BOMB
#3162,ELEPHANT
@@ -2389,8 +2392,8 @@ REPLACE INTO `mob_db_re` VALUES (3125,'STEP','Step','Step',130,55403,0,3088,2392
#3166,M_E_DEVILING
#3167,E_POPORING_CRO
#3168,POURING_SEA_FES
-REPLACE INTO `mob_db_re` VALUES (3169,'J_REB_SHECIL1','Shooting Target','Shooting Target',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0x1,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db_re` VALUES (3170,'J_REB_SHECIL2','Shooting Target','Shooting Target',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0x1,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (3169,'J_REB_SHECIL1','Shooting Target','Shooting Target',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0x0000001,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (3170,'J_REB_SHECIL2','Shooting Target','Shooting Target',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0x0000001,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
#3171,EVENT_MONEMUS01
#3172,EVENT_MONEMUS02
#3173,EVENT_FIREFOX
@@ -2410,17 +2413,17 @@ REPLACE INTO `mob_db_re` VALUES (3170,'J_REB_SHECIL2','Shooting Target','Shootin
#3187,E2_G_S_NYDHOG
#3188,E2_FELOCK
#3189,WOLF_MOON
-#3190,MM_SARAH
-#3191,MM_M_GIGAN1
-#3192,MM_M_GIGAN2
-#3193,MM_M_GIGAN3
-#3194,MM_L_GIGAN1
-#3195,MM_L_GIGAN2
-#3196,MM_L_GIGAN3
-#3197,MM_M_GARGOYLE
-#3198,MM_M_GALION
-#3199,MM_M_MUTANT_DRAGON
-#3200,MM_M_CHIMERA
+REPLACE INTO `mob_db_re` VALUES (3190,'MM_SARAH','Sarah','Sarah Irene',160,100000000,1,0,0,12,1090,2755,276,255,43,161,6,188,225,136,10,12,0,0,20,0x87700A4,2000,500,500,0,0,0,0,0,0,0,0,15121,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4610,1);
+REPLACE INTO `mob_db_re` VALUES (3191,'MM_M_GIGAN1','Gigantes','Gigantes',160,6653400,1,0,1,2,4635,4755,64,112,156,151,30,62,265,21,10,12,1,6,47,0x62D3885,250,500,500,600,0,0,0,0,0,0,0,15121,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (3192,'MM_M_GIGAN2','Gigantes','Gigantes',160,9870000,1,0,0,2,5128,5217,89,175,212,138,43,21,227,15,10,12,1,6,47,0x62A3885,250,500,500,600,0,0,0,0,0,0,0,15121,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (3193,'MM_M_GIGAN3','Ancient Medium Gigantes','Ancient Medium Gigantes',160,1126300,1,0,0,2,3967,4132,113,155,121,125,45,35,271,15,10,12,1,6,47,0x6283885,300,500,500,600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (3194,'MM_L_GIGAN1','Large Gigantes','Large Gigantes',160,2482000,1,0,0,2,4172,4254,55,177,135,135,12,72,220,91,10,12,2,6,47,0x62D3885,200,500,500,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (3195,'MM_L_GIGAN2','Large Gigantes','Large Gigantes',160,2784175,1,0,0,2,3641,3757,71,140,102,119,18,45,275,71,10,12,2,6,47,0x62A3885,200,500,500,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (3196,'MM_L_GIGAN3','Ancient Gigantes','Ancient Gigantes',160,12063464,1,0,0,2,8957,9018,48,190,203,141,1,66,355,103,10,12,2,6,47,0x6283885,330,800,800,500,0,0,0,0,0,0,0,6803,10000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (3197,'MM_M_GARGOYLE','Gargoyle','Mutant Gargoyle',150,256780,1,0,0,9,712,801,124,43,147,110,66,57,191,70,10,12,1,6,64,0x2002085,200,1020,720,384,0,0,0,0,0,0,0,912,1940,1039,250,1746,3,0,0,2619,1,1769,1000,757,119,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (3198,'MM_M_GALION','Galion','Mutant Galion',150,293165,1,0,0,1,801,878,166,71,133,142,71,45,166,45,10,12,1,2,44,0x020108F,150,864,624,360,0,0,0,0,0,0,0,7564,1500,919,1500,996,5,2531,3,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (3199,'MM_M_MUTANT_DRAGON','Mutant Dragon','Wicked Mutant Dragon',150,324891,1,0,0,4,1176,1274,185,86,175,161,66,68,201,35,10,12,2,9,43,0x0203695,250,1280,1080,240,0,0,0,0,0,0,0,7054,2425,1035,250,1036,250,930,250,1559,50,7296,750,2527,25,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (3200,'MM_M_CHIMERA','Wicked Chimera','Wicked Chimera',150,301158,1,0,0,1,1029,1177,199,10,166,175,110,88,188,85,10,12,2,2,63,0x0203695,200,772,672,360,0,0,0,0,0,0,0,7054,2668,1048,1250,568,500,1306,1,7295,750,1364,1,984,80,0,0,0,0,0,0);
#REPLACE INTO `mob_db_re` VALUES (3201,'LUCKYCASE','Poring','Poring',1,60,1,27,20,1,8,9,2,5,6,1,1,0,6,5,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
REPLACE INTO `mob_db_re` VALUES (3202,'ORGANIC_JAKK','Organic Pumpkin','Organic Pumpkin',10,40,1,20,13,1,100,100,160,99,1,1,1,1,999,1,0,0,0,3,21,0x4370001,200,0,0,0,0,0,0,0,0,0,0,6804,5000,6804,5000,6804,1000,2267,100,1062,1000,664,100,546,1000,12192,100,0,0,0,0);
REPLACE INTO `mob_db_re` VALUES (3203,'INORGANIC_JAKK','Inorganic Pumpkin','Inorganic Pumpkin',10,40,1,20,13,1,100,100,160,99,1,1,1,1,999,1,0,0,0,3,21,0x4370001,200,0,0,0,0,0,0,0,0,0,0,6805,5000,6805,5000,6805,1000,2267,100,1062,1000,664,100,546,1000,12192,100,0,0,0,0);
@@ -2467,16 +2470,16 @@ REPLACE INTO `mob_db_re` VALUES (3243,'V_B_CHEN','Sura Chen','Sura Chen',1,1,0,0
REPLACE INTO `mob_db_re` VALUES (3244,'V_B_GERTIE','Shadow Chaser Gertie','Shadow Chaser Gertie',1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
REPLACE INTO `mob_db_re` VALUES (3245,'V_B_ALPHOCCIO','Minstrel Alphoccio','Minstrel Alphoccio',1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
REPLACE INTO `mob_db_re` VALUES (3246,'V_B_TRENTINI','Wanderer Trentini','Wanderer Trentini',1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-#3247,CENERE_G
-#3248,REPAIR_ROBOT_T
-#3249,EXPLORATION_ROVER_T
-#3250,SCR_MT_ROBOTS
-#3251,GC109
-#3252,DR815
-#3253,SYS_MSG
-#3254,T_W_O
-#3255,GHOUL_H
-#3256,ZOMBIE_H
+REPLACE INTO `mob_db_re` VALUES (3247,'CENERE_G','Cenere G','Green Cenere',150,140088,1,7635,7698,1,1897,2007,91,81,70,48,40,37,100,45,10,12,0,0,24,0x0000085,300,3009,720,360,0,0,0,0,0,0,0,6561,5000,7322,500,7001,1500,7320,1000,12815,500,0,0,0,0,0,0,0,0,27014,1);
+REPLACE INTO `mob_db_re` VALUES (3248,'REPAIR_ROBOT_T','Repair Robot T','Repair Robot Turbo',158,186320,1,13208,14489,1,2431,2657,118,59,101,42,55,35,110,45,10,12,0,0,40,0x000008B,300,1515,500,660,0,0,0,0,0,0,0,7512,500,7507,250,998,2000,999,500,11597,1500,0,0,0,0,0,0,0,0,27015,1);
+REPLACE INTO `mob_db_re` VALUES (3249,'EXPLORATION_ROVER_T','Exploration Rover T','Explorer Robot Turbo',171,318117,1,19826,41023,1,2945,3786,121,67,118,80,45,121,138,65,10,12,2,0,80,0x0000085,165,1552,1152,336,0,0,0,0,0,0,0,7512,500,7507,250,998,2000,999,500,11597,1500,0,0,0,0,0,0,0,0,27016,1);
+REPLACE INTO `mob_db_re` VALUES (3250,'SCR_MT_ROBOTS','Scr Mt Robots','Can Robot',155,30,1,61,58,1,95,97,100,99,35,42,20,12,68,3,10,12,0,0,20,0x0070085,300,0,500,400,0,0,0,0,0,0,0,7512,1000,7507,1500,7319,2000,0,0,0,0,0,0,0,0,0,0,0,0,27017,1);
+REPLACE INTO `mob_db_re` VALUES (3251,'GC109','Machine Component','Machine Component',149,217650,1,6598,5931,1,2678,3935,121,71,60,132,45,35,155,15,10,12,0,0,47,0x0000085,120,1000,500,600,0,0,0,0,0,0,0,7512,1000,7507,1500,7319,2000,0,0,0,0,0,0,0,0,0,0,0,0,27018,1);
+REPLACE INTO `mob_db_re` VALUES (3252,'DR815','Machine Component','Machine Component',153,245670,1,7255,7011,1,3315,4076,143,45,88,98,88,21,116,22,10,12,1,0,27,0x0000085,135,1500,600,500,0,0,0,0,0,0,0,7512,1000,7507,1500,7319,2000,0,0,0,0,0,0,0,0,0,0,0,0,27019,1);
+REPLACE INTO `mob_db_re` VALUES (3253,'SYS_MSG','Sys Msg','System message',160,100,1,0,0,1,1,2,276,99,0,0,0,188,0,0,10,12,0,0,20,0xC170081,2000,3000,600,550,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (3254,'T_W_O','T_W_O','T_W_O',165,48000000,1,0,0,1,3955,4151,158,134,90,141,7,87,267,70,10,12,2,6,67,0x6280085,150,1250,500,350,0,6832,5000,617,5000,617,5000,22699,3000,1531,500,7319,2000,0,0,0,0,0,0,0,0,0,0,0,0,27020,1);
+REPLACE INTO `mob_db_re` VALUES (3255,'GHOUL_H','Ghoul H','Smelly Ghoul',155,178652,1,10233,10598,1,2235,2451,99,55,98,55,61,22,133,2,10,12,0,3,24,0x0000085,200,0,500,660,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (3256,'ZOMBIE_H','Zombie H','Smelly Zombie',148,134615,1,6859,6903,1,1995,2445,91,42,76,53,54,21,125,3,10,12,0,0,60,0x0000085,220,0,960,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
#3257,MALE_PORING
#3258,FEMALE_PORING
#3259,FANTASTIC_B_UNICORN
@@ -3100,7 +3103,17 @@ REPLACE INTO `mob_db_re` VALUES (3508,'DR_EGGRING_G','Eggring','Eggring',20,220,
#3874,AB_MOB_048
#3875,AB_MOB_049
#3876,AB_MOB_050
-
+#3877,E_NYAIL_PIG
+#3878,E_PIT
+#3879,E_SEA_WORMS
+#3880,E_SMALL_SWIRL
+#3881,E_RIPE_WATERMELON
+#3882,E_MD_NYAILO
+#3883,E_MD_NYAILO_LEG
+#3884,E_MD_S_TREASURE_BOX
+#3885,E_MD_B_TREASURE_BOX
+#3886,E_MD_BOX_PUPPET
+#3887,E_MD_DEPRESS_SOUL
#3888,TW_I_QUEEN_SCARABA
#3889,TW_GIOIA
#3890,TW_TIMEHOLDER
@@ -3117,4 +3130,293 @@ REPLACE INTO `mob_db_re` VALUES (3508,'DR_EGGRING_G','Eggring','Eggring',20,220,
#3901,MD_ORK_HERO
#3902,MD_ORC_LORD
#3903,MD_ORC_FLOWER
+#3904,DUCKLING
+#3905,BIG_DUCKLING
+#3906,IA_LOLI_RURI
+#3907,IA_TEDDY_BEAR
+#3908,IA_MIYABI_NINGYO
+#3909,IA_MARIONETTE
+#3910,E_EMPEL_1
+#3911,E_GIBBET
+#3912,E_LOLI_RURI
+#3913,E_DULLAHAN
+#3914,E_BLOODY_MURDERER
+#3915,E_EMPEL_1B
+#3916,JP_E_MONSTER_74
+#3917,JP_E_MONSTER_75
+#3918,JP_E_MONSTER_76
+#3919,JP_E_MONSTER_77
+#3920,JP_E_MONSTER_78
+#3921,JP_E_MONSTER_79
+#3922,JP_E_MONSTER_80
+#3923,JP_E_MONSTER_81
+#3924,JP_E_MONSTER_82
+#3925,JP_E_MONSTER_83
+#3926,JP_E_MONSTER_84
+#3927,JP_E_MONSTER_85
+#3928,JP_E_MONSTER_86
+#3929,JP_E_MONSTER_87
+#3930,JP_E_MONSTER_88
+#3931,JP_E_MONSTER_89
+#3932,JP_E_MONSTER_90
+#3933,JP_E_MONSTER_91
+#3934,JP_E_MONSTER_92
+#3935,JP_E_MONSTER_93
+#3936,JP_E_MONSTER_94
+#3937,JP_E_MONSTER_95
+#3938,JP_E_MONSTER_96
+#3939,JP_E_MONSTER_97
+#3940,JP_E_MONSTER_98
+#3941,JP_E_MONSTER_99
+#3942,JP_E_MONSTER_100
+#3943,JP_E_MONSTER_101
+#3944,JP_E_MONSTER_102
+#3945,JP_E_MONSTER_103
+#3946,JP_E_MONSTER_104
+#3947,JP_E_MONSTER_105
+#3948,ORC_WARRIOR_MJ
+#3949,ORC_LADY_MJ
+#3950,ORC_BABY_MJ
+#3951,HIGH_ORC_MJ
+#3952,ORC_ARCHER_MJ
+#3953,ORC_HERO_MJ
+#3954,ORC_LORD_MJ
+#3955,E_SAVAGE
+#3956,E_ELDER_WILOW
+#3957,HORNET_MJ
+#3958,MANTIS_MJ
+#3959,ARGOS_MJ
+#3960,MISTRESS_MJ
+#3961,BIGFOOT_MJ
+#3962,SNAKE_MJ
+#3963,WOLF_MJ
+#3964,EDDGA_MJ
+#3965,FRILLDORA_MJ
+#3966,SANDMAN_MJ
+#3967,HODE_MJ
+#3968,PHREEONI_MJ
+#3969,MD_RED_MUSHROOM
+#3970,MD_BLACK_MUSHROOM
+#3971,SKELION
+#3972,MD_THIEF_BUG__
+#3973,MD_THIEF_BUG
+#3974,MD_THIEF_BUG_EGG
+#3975,MD_GOLDEN_BUG
+#3976,EIRA_BRZ
+#3977,AB_MOB_051
+#3978,AB_MOB_052
+#3979,AB_MOB_053
+#3980,AB_MOB_054
+#3981,AB_MOB_055
+#3982,AB_MOB_056
+#3983,AB_MOB_057
+#3984,AB_MOB_058
+#3985,AB_MOB_059
+#3986,AB_MOB_060
+#3987,AB_MOB_061
+#3988,AB_MOB_062
+#3989,AB_MOB_063
+#3990,AB_MOB_064
+#3991,AB_MOB_065
+#3992,AB_MOB_066
+#3993,AB_MOB_067
+#3994,AB_MOB_068
+#3995,AB_MOB_069
+#3996,AB_MOB_070
+#3997,AB_MOB_071
+#3998,AB_MOB_072
+
+# New Monster Range
+#20021,AB_MOB_073
+#20022,AB_MOB_074
+#20023,AB_MOB_075
+#20024,AB_MOB_076
+#20025,JP_CM_MOB_001
+#20026,JP_CM_MOB_002
+#20027,JP_CM_MOB_003
+#20028,JP_CM_MOB_004
+#20029,JP_CM_MOB_005
+#20030,JP_CM_MOB_006
+#20031,JP_CM_MOB_007
+#20032,JP_CM_MOB_008
+#20033,JP_CM_MOB_009
+#20034,JP_CM_MOB_010
+#20035,JP_CM_MOB_011
+#20036,JP_CM_MOB_012
+#20037,JP_CM_MOB_013
+#20038,JP_CM_MOB_014
+#20039,JP_CM_MOB_015
+#20040,JP_CM_MOB_016
+#20041,JP_CM_MOB_017
+#20042,JP_CM_MOB_018
+#20043,JP_CM_MOB_019
+#20044,JP_CM_MOB_020
+#20045,JP_CM_MOB_021
+#20046,JP_CM_MOB_022
+#20047,JP_CM_MOB_023
+#20048,JP_CM_MOB_024
+#20049,JP_CM_MOB_025
+#20050,JP_CM_MOB_026
+#20051,JP_CM_MOB_027
+#20052,JP_CM_MOB_028
+#20053,JP_CM_MOB_029
+#20054,JP_CM_MOB_030
+#20055,JP_CM_MOB_031
+#20056,JP_CM_MOB_032
+#20057,JP_CM_MOB_033
+#20058,JP_CM_MOB_034
+#20059,JP_CM_MOB_035
+#20060,JP_CM_MOB_036
+#20061,EVT_BAPHOMET
+#20062,EVT_BAPHO_JR
+#20063,EVT_V_WOLF
+#20064,EVT_ECLIPSE
+#20065,EVT_VOCAL
+#20066,EVT_UNGOLIANT
+#20067,EVT_GEOGRAPHER
+#20068,EVT_MANTIS
+#20069,EVT_GRIZZLY
+#20070,EVT_KINDOFBEETLE
+#20071,EVT_BIGFOOT
+#20072,EVT_COCO
+#20073,E_SIROMA
+#20074,E_MYSTCASE
+#20075,E_X_PORING
+#20076,MD_MAYA
+#20077,MD_DENIRO
+#20078,MD_VITATA
+#20079,MD_ANDRE
+#20080,MD_PIERE
+#20081,MD_IZ_COELACANTH
+#20082,MD_IZ_MARSE
+#20083,MD_IZ_MERMAN
+#20084,MD_IZ_OBEAUNE
+#20085,MD_IZ_CORNUTUS
+#20086,RED_ERUMA_MJ
+#20087,SIORAVA_MJ
+
+#20101,WILOW_MJ
+#20102,MANDRAGORA_MJ
+#20103,STEM_WORM_MJ
+#20104,SPORE_MJ
+#20105,TW_V_B_KATRINN
+#20106,TW_V_B_SHECIL
+#20107,TW_DETALE
+#20108,TW_KIEL
+#20109,TW_TAO_GUNKA
+#20110,TW_KNIGHT_OF_WINDSTORM
+#20111,MD_TRE_DRAKE
+#20112,MD_MANHOLE
+#20113,MD_TRE_MIMIC
+#20114,MD_TRE_WRAITH
+#20115,MD_TRE_PIRATE_SKEL
+#20116,MD_TRE_WHISPER
+#20117,MD_TRE_HYDRA
+#20118,GOBLIN_KING
+#20119,BAD_CATCUMBER
+
+#20165,MD_TOUCAN
+#20166,FLAME_GHOST
+#20167,ICE_GHOST
+#20168,B_FLAME_GHOST
+#20169,B_ICE_GHOST
+#20170,GARGOYLE_MJ
+#20171,STING_MJ
+#20172,RAYDRIC_MJ
+#20173,RAYDRIC_ARCHER_MJ
+#20174,RAGGED_ZOMBIE_MJ
+#20175,EXTRA_JOKER
+#20176,ERZSEBET
+#20177,JENIFFER
+#20178,GENERAL_ORC
+#20179,SIEGLOUSE
+
+#20181,VH_AMON_RA
+#20182,VH_BAPHOMET
+#20183,VH_DARK_LORD
+#20184,VH_DOPPELGANGER
+#20185,VH_DRACULA
+#20186,VH_DRAKE
+#20187,VH_EDDGA
+#20188,VH_GARM
+#20189,VH_GOLDEN_BUG
+#20190,VH_KNIGHT_OF_WS
+#20191,VH_MAYA
+#20192,VH_MISTRESS
+#20193,VH_MOONLIGHT
+#20194,VH_ORC_LORD
+#20195,VH_ORK_HERO
+#20196,VH_OSIRIS
+#20197,VH_PHARAOH
+#20198,VH_PHREEONI
+#20199,VH_TAO_GUNKA
+#20200,VH_TURTLE_GENERAL
+#20201,VH_B_SEYREN
+#20202,VH_B_HARWORD
+#20203,VH_B_EREMES
+#20204,VH_B_KATRINN
+#20205,VH_B_MAGALETA
+#20206,VH_LORD_OF_DEATH
+#20207,VH_ENTWEIHEN
+#20208,VH_NAGHT_SIEGER
+#20209,VH_DETALE
+#20210,VH_THANATOS
+#20211,VH_APOCALIPS_H
+#20212,VH_KIEL_
+#20213,VH_RANDGRIS
+#20214,VH_RSX_0806
+#20215,VH_B_YGNIZEM
+#20216,VH_ATROCE
+#20217,VH_BEELZEBUB_
+#20218,VH_FALLINGBISHOP
+#20219,VH_GLOOM_U_N
+#20220,VH_IFRIT
+#20221,VH_KTULLANUX
+#20222,VH_H_HUNTER_EV
+#20223,VH_MM_CUTIE
+#20224,VH_VENOM_KIMERA
+#20225,VH_B_SHECIL
+#20226,VH_B_RANDEL
+#20227,VH_B_FLAMEL
+#20228,VH_B_TRENTINI
+#20229,VH_CHARLESTON3
+#20230,VH_GRAND_PERE
+#20231,VH_S_NYDHOG
+#20232,VH_QUEEN_SCARABA
+#20233,VH_KRAKEN
+#20234,VH_TIMEHOLDER
+#20235,VH_INCAN_SAMURAI
+#20236,VH_BACSOJIN
+#20237,VH_DARK_S_LORD
+#20238,VH_LADY_TANEE
+#20239,VH_GOPINICH
+#20240,VH_LEAK
+#20241,VH_MECHASPIDER
+#20242,VH_PYURIEL
+#20243,VH_KADES
+#20244,VH_GIOIA
+#20245,VH_DAEHYON
+#20246,VH_B_CELIA
+#20247,VH_B_CHEN
+#20248,VH_B_ALPHOCCIO
+#20249,VH_B_GERTIE
+#20250,VH_ENTWEIHEN_R
+#20251,VH_ENTWEIHEN_H
+#20252,VH_ENTWEIHEN_M
+#20253,VH_ENTWEIHEN_S
+#20254,VH_MIMIC
+#20255,ILL_TEDDY_BEAR_R
+#20256,ILL_TEDDY_BEAR_Y
+#20257,ILL_TEDDY_BEAR_G
+#20258,ILL_TEDDY_BEAR_W
+#20259,ILL_TEDDY_BEAR_B
+#20260,ILL_TEDDY_BEAR_S
+#20261,ILL_PITMAN
+#20262,ILL_MINERAL
+#20263,ILL_OBSIDIAN
+#20264,G_ILL_TEDDY_BEAR_R
+#20265,G_ILL_TEDDY_BEAR_Y
+#20266,G_ILL_TEDDY_BEAR_G
+#20267,G_ILL_TEDDY_BEAR_W
+#20268,G_ILL_TEDDY_BEAR_B
diff --git a/sql-files/mob_skill_db.sql b/sql-files/mob_skill_db.sql
index 70621201be7..a5e181485ea 100644
--- a/sql-files/mob_skill_db.sql
+++ b/sql-files/mob_skill_db.sql
@@ -2963,7 +2963,7 @@ REPLACE INTO `mob_skill_db` VALUES (1639,'Kathryne Keyron@MG_COLDBOLT','attack',
REPLACE INTO `mob_skill_db` VALUES (1639,'Kathryne Keyron@MG_COLDBOLT','chase',14,10,3000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1639,'Kathryne Keyron@MG_FIREBALL','attack',17,44,3000,500,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1639,'Kathryne Keyron@MG_FIREBALL','chase',17,44,3000,500,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1639,'Kathryne Keyron@WZ_SIGHTRASHER','attack',81,20,3000,0,10000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1639,'Kathryne Keyron@WZ_SIGHTRASHER','attack',81,10,3000,0,10000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1639,'Kathryne Keyron@WZ_QUAGMIRE','chase',92,5,3000,0,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1639,'Kathryne Keyron@MG_SAFETYWALL','attack',12,10,3000,0,10000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1639,'Kathryne Keyron@MG_FIREBOLT','chase',19,10,3000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -3675,7 +3675,7 @@ REPLACE INTO `mob_skill_db` VALUES (1705,'Thanatos Despero@NPC_FIREATTACK','atta
REPLACE INTO `mob_skill_db` VALUES (1705,'Thanatos Despero@NPC_CRITICALSLASH','attack',170,1,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1705,'Thanatos Despero@NPC_STUNATTACK','attack',179,4,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1705,'Thanatos Despero@NPC_TELEKINESISATTACK','attack',191,5,500,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'21',NULL);
-REPLACE INTO `mob_skill_db` VALUES (1705,'Thanatos Despero@WZ_SIGHTRASHER','attack',81,20,1000,0,10000,'yes','target','attackpcge','2',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1705,'Thanatos Despero@WZ_SIGHTRASHER','attack',81,10,1000,0,10000,'yes','target','attackpcge','2',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
#REPLACE INTO `mob_skill_db` VALUES (1705,'Thanatos Despero@KN_BOWLINGBASH','attack',62,4,1000,0,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1705,'Thanatos Despero@NPC_AGIUP','attack',350,5,1000,0,60000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1705,'Thanatos Despero@NPC_AGIUP','attack',350,5,2000,0,10000,'yes','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -3741,7 +3741,7 @@ REPLACE INTO `mob_skill_db` VALUES (1710,'Thanatos Despero@NPC_FIREATTACK','atta
REPLACE INTO `mob_skill_db` VALUES (1710,'Thanatos Despero@NPC_CRITICALSLASH','attack',170,1,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1710,'Thanatos Despero@NPC_STUNATTACK','attack',179,4,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1710,'Thanatos Despero@NPC_TELEKINESISATTACK','attack',191,5,500,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'21',NULL);
-REPLACE INTO `mob_skill_db` VALUES (1710,'Thanatos Despero@WZ_SIGHTRASHER','attack',81,20,1000,0,10000,'yes','target','attackpcge','2',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1710,'Thanatos Despero@WZ_SIGHTRASHER','attack',81,10,1000,0,10000,'yes','target','attackpcge','2',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
#REPLACE INTO `mob_skill_db` VALUES (1710,'Thanatos Despero@KN_BOWLINGBASH','attack',62,5,1000,0,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1710,'Thanatos Despero@NPC_AGIUP','attack',350,5,1000,0,60000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1710,'Thanatos Despero@NPC_AGIUP','attack',350,5,2000,0,10000,'yes','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -4117,7 +4117,7 @@ REPLACE INTO `mob_skill_db` VALUES (1768,'Gloom Under Night@NPC_POWERUP','attack
REPLACE INTO `mob_skill_db` VALUES (1768,'Gloom Under Night@NPC_POWERUP','attack',349,5,2000,700,50000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1768,'Gloom Under Night@NPC_FIREBREATH','chase',654,10,2000,500,10000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1768,'Gloom Under Night@SM_MAGNUM','attack',7,25,10000,0,5000,'yes','self','attackpcge','2',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1768,'Gloom Under Night@WZ_SIGHTRASHER','attack',81,20,2000,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1768,'Gloom Under Night@WZ_SIGHTRASHER','attack',81,10,2000,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1768,'Gloom Under Night@MG_FIREBALL','attack',17,44,1000,500,20000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1768,'Gloom Under Night@MG_FIREBALL','chase',17,44,10000,500,20000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1768,'Gloom Under Night@NPC_CALLSLAVE','attack',352,1,10000,0,30000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -4549,7 +4549,7 @@ REPLACE INTO `mob_skill_db` VALUES (1833,'Kasa@NPC_FIREBREATH','attack',654,10,2
REPLACE INTO `mob_skill_db` VALUES (1833,'Kasa@MG_FIREBALL','idle',17,44,10000,500,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1833,'Kasa@MG_FIREBALL','chase',17,44,10000,500,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1833,'Kasa@MG_FIREBALL','attack',17,44,5000,500,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1833,'Kasa@WZ_SIGHTRASHER','attack',81,20,1000,0,20000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1833,'Kasa@WZ_SIGHTRASHER','attack',81,10,1000,0,20000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1833,'Kasa@LK_SPIRALPIERCE','attack',397,1,1500,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1833,'Kasa@WZ_METEOR','chase',83,1,5000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1833,'Kasa@WZ_METEOR','attack',83,1,5000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -4593,7 +4593,7 @@ REPLACE INTO `mob_skill_db` VALUES (1837,'Imp@MG_FIREBALL','chase',17,44,3000,50
REPLACE INTO `mob_skill_db` VALUES (1837,'Imp@NPC_FIREATTACK','attack',186,5,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1837,'Imp@NPC_PULSESTRIKE','attack',661,3,1000,1000,5000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1837,'Imp@MG_SIGHT','idle',10,1,500,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1837,'Imp@WZ_SIGHTRASHER','attack',81,20,3000,0,10000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1837,'Imp@WZ_SIGHTRASHER','attack',81,10,3000,0,10000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1837,'Imp@RG_STRIPARMOR','attack',217,1,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'29',NULL);
REPLACE INTO `mob_skill_db` VALUES (1838,'Knocker@HT_LANDMINE','idle',116,2,4000,1000,18000,'yes','around2','always','0',NULL,NULL,NULL,NULL,NULL,'5',NULL);
REPLACE INTO `mob_skill_db` VALUES (1838,'Knocker@NPC_GROUNDATTACK','attack',185,2,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -4886,45 +4886,45 @@ REPLACE INTO `mob_skill_db` VALUES (1904,'Bomb Poring@NPC_SELFDESTRUCTION','any'
REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_DRAGONFEAR','chase',659,10,10000,0,600000,'no','self','myhpltmaxrate','5',NULL,NULL,NULL,NULL,NULL,NULL,'17');
REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_DRAGONFEAR','attack',659,10,10000,0,600000,'no','self','myhpltmaxrate','5',NULL,NULL,NULL,NULL,NULL,NULL,'17');
#10% HP - Talk
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_TALK','chase',682,10,10000,0,600000,'no','self','myhpinrate','6',10,NULL,NULL,NULL,NULL,NULL,'16');
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_TALK','attack',682,10,10000,0,600000,'no','self','myhpinrate','6',10,NULL,NULL,NULL,NULL,NULL,'16');
+REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_TALK','chase',682,10,10000,0,600000,'no','self','myhpltmaxrate','10',NULL,NULL,NULL,NULL,NULL,NULL,'16');
+REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_TALK','attack',682,10,10000,0,600000,'no','self','myhpltmaxrate','10',NULL,NULL,NULL,NULL,NULL,NULL,'16');
#30% HP - Earthquake Combo
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_WIDEHELLDIGNITY','chase',684,1,10000,2000,180000,'no','self','myhpinrate','11',30,NULL,NULL,NULL,NULL,NULL,'6');
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_WIDEHELLDIGNITY','attack',684,1,10000,2000,180000,'no','self','myhpinrate','11',30,NULL,NULL,NULL,NULL,NULL,'6');
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_WIDESTUN','chase',678,5,10000,1300,180000,'no','self','afterskill','684',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_WIDESTUN','attack',678,5,10000,1300,180000,'no','self','afterskill','684',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_EARTHQUAKE','chase',653,10,10000,2000,180000,'no','self','afterskill','678',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_EARTHQUAKE','attack',653,10,10000,2000,180000,'no','self','afterskill','678',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_WIDEHELLDIGNITY','chase',684,1,10000,2000,180000,'no','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,NULL,'6');
+REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_WIDEHELLDIGNITY','attack',684,1,10000,2000,180000,'no','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,NULL,'6');
+REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_WIDESTUN','chase',678,5,10000,1300,180000,'no','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_WIDESTUN','attack',678,5,10000,1300,180000,'no','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_EARTHQUAKE','chase',653,10,10000,2000,180000,'no','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_EARTHQUAKE','attack',653,10,10000,2000,180000,'no','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
#40% HP - Mixed Combo
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_PULSESTRIKE','chase',661,5,10000,800,60000,'no','self','myhpinrate','31',40,NULL,NULL,NULL,NULL,NULL,'14');
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_PULSESTRIKE','attack',661,5,10000,800,60000,'no','self','myhpinrate','31',40,NULL,NULL,NULL,NULL,NULL,'14');
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_WIDESTONE','chase',666,5,10000,0,60000,'no','self','afterskill','661',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_WIDESTONE','attack',666,5,10000,0,60000,'no','self','afterskill','661',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@WZ_METEOR','chase',83,5,10000,800,60000,'no','target','afterskill','666',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@WZ_METEOR','attack',83,5,10000,800,60000,'no','target','afterskill','666',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_PULSESTRIKE','chase',661,5,10000,800,60000,'no','self','myhpltmaxrate','40',NULL,NULL,NULL,NULL,NULL,NULL,'14');
+REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_PULSESTRIKE','attack',661,5,10000,800,60000,'no','self','myhpltmaxrate','40',NULL,NULL,NULL,NULL,NULL,NULL,'14');
+REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_WIDESTONE','chase',666,5,10000,0,60000,'no','self','myhpltmaxrate','40',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_WIDESTONE','attack',666,5,10000,0,60000,'no','self','myhpltmaxrate','40',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@WZ_METEOR','chase',83,5,10000,800,60000,'no','target','myhpltmaxrate','40',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@WZ_METEOR','attack',83,5,10000,800,60000,'no','target','myhpltmaxrate','40',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
#50% HP - Vampire Combo
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_VAMPIRE_GIFT','chase',679,9,10000,1000,50000,'no','self','myhpinrate','41',50,NULL,NULL,NULL,NULL,NULL,'15');
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_VAMPIRE_GIFT','attack',679,9,10000,1000,50000,'no','self','myhpinrate','41',50,NULL,NULL,NULL,NULL,NULL,'15');
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_WIDESOULDRAIN','chase',680,10,10000,1000,50000,'no','self','afterskill','679',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_WIDESOULDRAIN','attack',680,10,10000,1000,50000,'no','self','afterskill','679',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_EVILLAND','chase',670,10,10000,1000,50000,'no','target','afterskill','680',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_EVILLAND','attack',670,10,10000,1000,50000,'no','target','afterskill','680',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_VAMPIRE_GIFT','chase',679,9,10000,1000,50000,'no','self','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,'15');
+REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_VAMPIRE_GIFT','attack',679,9,10000,1000,50000,'no','self','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,'15');
+REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_WIDESOULDRAIN','chase',680,10,10000,1000,50000,'no','self','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_WIDESOULDRAIN','attack',680,10,10000,1000,50000,'no','self','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_EVILLAND','chase',670,10,10000,1000,50000,'no','target','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_EVILLAND','attack',670,10,10000,1000,50000,'no','target','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
#60% HP - Hell Combo
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_WIDESLEEP','chase',668,5,10000,700,35000,'no','self','myhpinrate','51',60,NULL,NULL,NULL,NULL,NULL,'3');
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_WIDESLEEP','attack',668,5,10000,700,35000,'no','self','myhpinrate','51',60,NULL,NULL,NULL,NULL,NULL,'3');
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_HELLPOWER','chase',683,1,10000,800,35000,'no','target','afterskill','668',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_HELLPOWER','attack',683,1,10000,800,35000,'no','target','afterskill','668',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_HELLJUDGEMENT','chase',662,5,10000,800,35000,'no','self','afterskill','683',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_HELLJUDGEMENT','attack',662,5,10000,800,35000,'no','self','afterskill','683',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_WIDESLEEP','chase',668,5,10000,700,35000,'no','self','myhpltmaxrate','60',NULL,NULL,NULL,NULL,NULL,NULL,'3');
+REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_WIDESLEEP','attack',668,5,10000,700,35000,'no','self','myhpltmaxrate','60',NULL,NULL,NULL,NULL,NULL,NULL,'3');
+REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_HELLPOWER','chase',683,1,10000,800,35000,'no','target','myhpltmaxrate','60',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_HELLPOWER','attack',683,1,10000,800,35000,'no','target','myhpltmaxrate','60',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_HELLJUDGEMENT','chase',662,5,10000,800,35000,'no','self','myhpltmaxrate','60',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_HELLJUDGEMENT','attack',662,5,10000,800,35000,'no','self','myhpltmaxrate','60',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
#80% HP - Magic Combo
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@MG_STONECURSE','chase',16,10,10000,1000,20000,'no','target','myhpinrate','61',80,NULL,NULL,NULL,NULL,NULL,'2');
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@MG_STONECURSE','attack',16,10,10000,1000,20000,'no','target','myhpinrate','61',80,NULL,NULL,NULL,NULL,NULL,'2');
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@MG_FIREBOLT','chase',19,10,10000,300,20000,'no','target','afterskill','16',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@MG_FIREBOLT','attack',19,10,10000,300,20000,'no','target','afterskill','16',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@MG_FROSTDIVER','chase',15,40,10000,1000,20000,'no','target','afterskill','19',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@MG_FROSTDIVER','attack',15,40,10000,1000,20000,'no','target','afterskill','19',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@WZ_JUPITEL','chase',84,28,10000,1000,20000,'no','target','afterskill','15',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@WZ_JUPITEL','attack',84,28,10000,1000,20000,'no','target','afterskill','15',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@MG_STONECURSE','chase',16,10,10000,1000,20000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,'2');
+REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@MG_STONECURSE','attack',16,10,10000,1000,20000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,'2');
+REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@MG_FIREBOLT','chase',19,10,10000,300,20000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@MG_FIREBOLT','attack',19,10,10000,300,20000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@MG_FROSTDIVER','chase',15,40,10000,1000,20000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@MG_FROSTDIVER','attack',15,40,10000,1000,20000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@WZ_JUPITEL','chase',84,28,10000,1000,20000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@WZ_JUPITEL','attack',84,28,10000,1000,20000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@AL_TELEPORT','idle',26,1,10000,0,0,'yes','self','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@AL_TELEPORT','chase',26,1,5000,0,5000,'yes','self','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@AL_PNEUMA','idle',25,1,10000,0,1000,'yes','self','longrangeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -4935,53 +4935,51 @@ REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_CALLSLAVE','idle',352
REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_TALK','chase',682,1,10000,0,600000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,'1');
REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_SUMMONSLAVE','attack',196,4,10000,0,30000,'yes','self','slavele','1',1922,1923,1924,1925,NULL,NULL,'4');
REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_SUMMONSLAVE','chase',196,4,10000,0,30000,'yes','self','slavele','1',1922,1923,1924,1925,NULL,NULL,'4');
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_SUMMONSLAVE','idle',196,4,10000,0,30000,'yes','self','onspawn','0',1922,1923,1924,1925,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_SUMMONSLAVE','idle',196,4,10000,0,30000,'yes','self','slavele','1',1922,1923,1924,1925,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@SA_LANDPROTECTOR','attack',288,1,10000,0,15000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1916,'Satan Morroc@NPC_SHIELDBRAKE','attack',346,10,10000,0,15000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
#5% HP - Dragon Fear
REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_DRAGONFEAR','chase',659,10,10000,0,600000,'no','self','myhpltmaxrate','5',NULL,NULL,NULL,NULL,NULL,NULL,'17');
REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_DRAGONFEAR','attack',659,10,10000,0,600000,'no','self','myhpltmaxrate','5',NULL,NULL,NULL,NULL,NULL,NULL,'17');
#10% HP - Talk
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_TALK','chase',682,10,10000,0,600000,'no','self','myhpinrate','6',10,NULL,NULL,NULL,NULL,NULL,'16');
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_TALK','attack',682,10,10000,0,600000,'no','self','myhpinrate','6',10,NULL,NULL,NULL,NULL,NULL,'16');
+REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_TALK','chase',682,10,10000,0,600000,'no','self','myhpltmaxrate','10',NULL,NULL,NULL,NULL,NULL,NULL,'16');
+REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_TALK','attack',682,10,10000,0,600000,'no','self','myhpltmaxrate','10',NULL,NULL,NULL,NULL,NULL,NULL,'16');
#30% HP - Earthquake Combo
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_WIDEHELLDIGNITY','chase',684,1,10000,2000,180000,'no','self','myhpinrate','11',30,NULL,NULL,NULL,NULL,NULL,'6');
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_WIDEHELLDIGNITY','attack',684,1,10000,2000,180000,'no','self','myhpinrate','11',30,NULL,NULL,NULL,NULL,NULL,'6');
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_WIDESTUN','chase',678,5,10000,1300,180000,'no','self','afterskill','684',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_WIDESTUN','attack',678,5,10000,1300,180000,'no','self','afterskill','684',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_EARTHQUAKE','chase',653,10,10000,2000,180000,'no','self','afterskill','678',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_EARTHQUAKE','attack',653,10,10000,2000,180000,'no','self','afterskill','678',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_WIDEHELLDIGNITY','chase',684,1,10000,2000,180000,'no','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,NULL,'6');
+REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_WIDEHELLDIGNITY','attack',684,1,10000,2000,180000,'no','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,NULL,'6');
+REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_WIDESTUN','chase',678,5,10000,1300,180000,'no','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_WIDESTUN','attack',678,5,10000,1300,180000,'no','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_EARTHQUAKE','chase',653,10,10000,2000,180000,'no','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_EARTHQUAKE','attack',653,10,10000,2000,180000,'no','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
#40% HP - Mixed Combo
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_PULSESTRIKE','chase',661,5,10000,800,60000,'no','self','myhpinrate','31',40,NULL,NULL,NULL,NULL,NULL,'14');
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_PULSESTRIKE','attack',661,5,10000,800,60000,'no','self','myhpinrate','31',40,NULL,NULL,NULL,NULL,NULL,'14');
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_WIDESTONE','chase',666,5,10000,0,60000,'no','self','afterskill','661',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_WIDESTONE','attack',666,5,10000,0,60000,'no','self','afterskill','661',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@WZ_METEOR','chase',83,5,10000,800,60000,'no','target','afterskill','666',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@WZ_METEOR','attack',83,5,10000,800,60000,'no','target','afterskill','666',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_PULSESTRIKE','chase',661,5,10000,800,60000,'no','self','myhpltmaxrate','40',NULL,NULL,NULL,NULL,NULL,NULL,'14');
+REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_PULSESTRIKE','attack',661,5,10000,800,60000,'no','self','myhpltmaxrate','40',NULL,NULL,NULL,NULL,NULL,NULL,'14');
+REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_WIDESTONE','chase',666,5,10000,0,60000,'no','self','myhpltmaxrate','40',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_WIDESTONE','attack',666,5,10000,0,60000,'no','self','myhpltmaxrate','40',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@WZ_METEOR','chase',83,5,10000,800,60000,'no','target','myhpltmaxrate','40',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@WZ_METEOR','attack',83,5,10000,800,60000,'no','target','myhpltmaxrate','40',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
#50% HP - Vampire Combo
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_VAMPIRE_GIFT','chase',679,9,10000,1000,50000,'no','self','myhpinrate','41',50,NULL,NULL,NULL,NULL,NULL,'15');
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_VAMPIRE_GIFT','attack',679,9,10000,1000,50000,'no','self','myhpinrate','41',50,NULL,NULL,NULL,NULL,NULL,'15');
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_WIDESOULDRAIN','chase',680,10,10000,1000,50000,'no','self','afterskill','679',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_WIDESOULDRAIN','attack',680,10,10000,1000,50000,'no','self','afterskill','679',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_EVILLAND','chase',670,10,10000,1000,50000,'no','target','afterskill','680',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_EVILLAND','attack',670,10,10000,1000,50000,'no','target','afterskill','680',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_VAMPIRE_GIFT','chase',679,9,10000,1000,50000,'no','self','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,'15');
+REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_VAMPIRE_GIFT','attack',679,9,10000,1000,50000,'no','self','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,'15');
+REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_WIDESOULDRAIN','chase',680,10,10000,1000,50000,'no','self','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_WIDESOULDRAIN','attack',680,10,10000,1000,50000,'no','self','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_EVILLAND','chase',670,10,10000,1000,50000,'no','target','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_EVILLAND','attack',670,10,10000,1000,50000,'no','target','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
#60% HP - Hell Combo
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_WIDESLEEP','chase',668,5,10000,700,35000,'no','self','myhpinrate','51',60,NULL,NULL,NULL,NULL,NULL,'3');
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_WIDESLEEP','attack',668,5,10000,700,35000,'no','self','myhpinrate','51',60,NULL,NULL,NULL,NULL,NULL,'3');
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_HELLPOWER','chase',683,1,10000,800,35000,'no','target','afterskill','668',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_HELLPOWER','attack',683,1,10000,800,35000,'no','target','afterskill','668',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_HELLJUDGEMENT','chase',662,5,10000,800,35000,'no','self','afterskill','683',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_HELLJUDGEMENT','attack',662,5,10000,800,35000,'no','self','afterskill','683',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_WIDESLEEP','chase',668,5,10000,700,35000,'no','self','myhpltmaxrate','60',NULL,NULL,NULL,NULL,NULL,NULL,'3');
+REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_WIDESLEEP','attack',668,5,10000,700,35000,'no','self','myhpltmaxrate','60',NULL,NULL,NULL,NULL,NULL,NULL,'3');
+REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_HELLPOWER','chase',683,1,10000,800,35000,'no','target','myhpltmaxrate','60',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_HELLPOWER','attack',683,1,10000,800,35000,'no','target','myhpltmaxrate','60',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_HELLJUDGEMENT','chase',662,5,10000,800,35000,'no','self','myhpltmaxrate','60',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_HELLJUDGEMENT','attack',662,5,10000,800,35000,'no','self','myhpltmaxrate','60',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
#80% HP - Magic Combo
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@MG_STONECURSE','chase',16,10,10000,1000,20000,'no','target','myhpinrate','61',80,NULL,NULL,NULL,NULL,NULL,'2');
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@MG_STONECURSE','attack',16,10,10000,1000,20000,'no','target','myhpinrate','61',80,NULL,NULL,NULL,NULL,NULL,'2');
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@MG_FIREBOLT','chase',19,10,10000,300,20000,'no','target','afterskill','16',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@MG_FIREBOLT','attack',19,10,10000,300,20000,'no','target','afterskill','16',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@MG_FROSTDIVER','chase',15,40,10000,1000,20000,'no','target','afterskill','19',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@MG_FROSTDIVER','attack',15,40,10000,1000,20000,'no','target','afterskill','19',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@WZ_JUPITEL','chase',84,28,10000,1000,20000,'no','target','afterskill','15',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@WZ_JUPITEL','attack',84,28,10000,1000,20000,'no','target','afterskill','15',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@MG_STONECURSE','chase',16,10,10000,1000,20000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,'2');
+REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@MG_STONECURSE','attack',16,10,10000,1000,20000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,'2');
+REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@MG_FIREBOLT','chase',19,10,10000,300,20000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@MG_FIREBOLT','attack',19,10,10000,300,20000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@MG_FROSTDIVER','chase',15,40,10000,1000,20000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@MG_FROSTDIVER','attack',15,40,10000,1000,20000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@WZ_JUPITEL','chase',84,28,10000,1000,20000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@WZ_JUPITEL','attack',84,28,10000,1000,20000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@AL_TELEPORT','idle',26,1,10000,0,0,'yes','self','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@AL_TELEPORT','chase',26,1,5000,0,5000,'yes','self','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@AL_PNEUMA','idle',25,1,10000,0,1000,'yes','self','longrangeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -4992,8 +4990,6 @@ REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_CALLSLAVE','idle',3
REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_TALK','chase',682,1,10000,0,600000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,'1');
REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_SUMMONSLAVE','attack',196,4,10000,0,30000,'yes','self','slavele','1',1922,1923,1924,1925,NULL,NULL,'4');
REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_SUMMONSLAVE','chase',196,4,10000,0,30000,'yes','self','slavele','1',1922,1923,1924,1925,NULL,NULL,'4');
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_SUMMONSLAVE','idle',196,4,10000,0,30000,'yes','self','onspawn','0',1922,1923,1924,1925,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_SUMMONSLAVE','idle',196,4,10000,0,30000,'yes','self','slavele','1',1922,1923,1924,1925,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@SA_LANDPROTECTOR','attack',288,1,10000,0,15000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1917,'Wounded Morroc@NPC_SHIELDBRAKE','attack',346,10,10000,0,15000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1918,'Incarnation of Morroc@AL_PNEUMA','idle',25,1,10000,0,1000,'yes','self','longrangeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
diff --git a/sql-files/mob_skill_db_re.sql b/sql-files/mob_skill_db_re.sql
index 3215a142626..2b33fd955d5 100644
--- a/sql-files/mob_skill_db_re.sql
+++ b/sql-files/mob_skill_db_re.sql
@@ -2964,7 +2964,7 @@ REPLACE INTO `mob_skill_db_re` VALUES (1639,'Kathryne Keyron@MG_COLDBOLT','attac
REPLACE INTO `mob_skill_db_re` VALUES (1639,'Kathryne Keyron@MG_COLDBOLT','chase',14,10,3000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1639,'Kathryne Keyron@MG_FIREBALL','attack',17,44,3000,500,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1639,'Kathryne Keyron@MG_FIREBALL','chase',17,44,3000,500,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1639,'Kathryne Keyron@WZ_SIGHTRASHER','attack',81,20,3000,0,10000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1639,'Kathryne Keyron@WZ_SIGHTRASHER','attack',81,10,3000,0,10000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1639,'Kathryne Keyron@WZ_QUAGMIRE','chase',92,5,3000,0,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1639,'Kathryne Keyron@MG_SAFETYWALL','attack',12,10,3000,0,10000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1639,'Kathryne Keyron@MG_FIREBOLT','chase',19,10,3000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -3676,7 +3676,7 @@ REPLACE INTO `mob_skill_db_re` VALUES (1705,'Thanatos Despero@NPC_FIREATTACK','a
REPLACE INTO `mob_skill_db_re` VALUES (1705,'Thanatos Despero@NPC_CRITICALSLASH','attack',170,1,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1705,'Thanatos Despero@NPC_STUNATTACK','attack',179,4,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1705,'Thanatos Despero@NPC_TELEKINESISATTACK','attack',191,5,500,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'21',NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1705,'Thanatos Despero@WZ_SIGHTRASHER','attack',81,20,1000,0,10000,'yes','target','attackpcge','2',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1705,'Thanatos Despero@WZ_SIGHTRASHER','attack',81,10,1000,0,10000,'yes','target','attackpcge','2',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
#REPLACE INTO `mob_skill_db_re` VALUES (1705,'Thanatos Despero@KN_BOWLINGBASH','attack',62,4,1000,0,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1705,'Thanatos Despero@NPC_AGIUP','attack',350,5,1000,0,60000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1705,'Thanatos Despero@NPC_AGIUP','attack',350,5,2000,0,10000,'yes','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -3742,7 +3742,7 @@ REPLACE INTO `mob_skill_db_re` VALUES (1710,'Thanatos Despero@NPC_FIREATTACK','a
REPLACE INTO `mob_skill_db_re` VALUES (1710,'Thanatos Despero@NPC_CRITICALSLASH','attack',170,1,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1710,'Thanatos Despero@NPC_STUNATTACK','attack',179,4,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1710,'Thanatos Despero@NPC_TELEKINESISATTACK','attack',191,5,500,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'21',NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1710,'Thanatos Despero@WZ_SIGHTRASHER','attack',81,20,1000,0,10000,'yes','target','attackpcge','2',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1710,'Thanatos Despero@WZ_SIGHTRASHER','attack',81,10,1000,0,10000,'yes','target','attackpcge','2',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
#REPLACE INTO `mob_skill_db_re` VALUES (1710,'Thanatos Despero@KN_BOWLINGBASH','attack',62,5,1000,0,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1710,'Thanatos Despero@NPC_AGIUP','attack',350,5,1000,0,60000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1710,'Thanatos Despero@NPC_AGIUP','attack',350,5,2000,0,10000,'yes','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -4118,7 +4118,7 @@ REPLACE INTO `mob_skill_db_re` VALUES (1768,'Gloom Under Night@NPC_POWERUP','att
REPLACE INTO `mob_skill_db_re` VALUES (1768,'Gloom Under Night@NPC_POWERUP','attack',349,5,2000,700,50000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1768,'Gloom Under Night@NPC_FIREBREATH','chase',654,10,2000,500,10000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1768,'Gloom Under Night@SM_MAGNUM','attack',7,25,10000,0,5000,'yes','self','attackpcge','2',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1768,'Gloom Under Night@WZ_SIGHTRASHER','attack',81,20,2000,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1768,'Gloom Under Night@WZ_SIGHTRASHER','attack',81,10,2000,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1768,'Gloom Under Night@MG_FIREBALL','attack',17,44,1000,500,20000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1768,'Gloom Under Night@MG_FIREBALL','chase',17,44,10000,500,20000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1768,'Gloom Under Night@NPC_CALLSLAVE','attack',352,1,10000,0,30000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -4550,7 +4550,7 @@ REPLACE INTO `mob_skill_db_re` VALUES (1833,'Kasa@NPC_FIREBREATH','attack',654,1
REPLACE INTO `mob_skill_db_re` VALUES (1833,'Kasa@MG_FIREBALL','idle',17,44,10000,500,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1833,'Kasa@MG_FIREBALL','chase',17,44,10000,500,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1833,'Kasa@MG_FIREBALL','attack',17,44,5000,500,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1833,'Kasa@WZ_SIGHTRASHER','attack',81,20,1000,0,20000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1833,'Kasa@WZ_SIGHTRASHER','attack',81,10,1000,0,20000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1833,'Kasa@LK_SPIRALPIERCE','attack',397,1,1500,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1833,'Kasa@WZ_METEOR','chase',83,1,5000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1833,'Kasa@WZ_METEOR','attack',83,1,5000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -4594,7 +4594,7 @@ REPLACE INTO `mob_skill_db_re` VALUES (1837,'Imp@MG_FIREBALL','chase',17,44,3000
REPLACE INTO `mob_skill_db_re` VALUES (1837,'Imp@NPC_FIREATTACK','attack',186,5,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1837,'Imp@NPC_PULSESTRIKE','attack',661,3,1000,1000,5000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1837,'Imp@MG_SIGHT','idle',10,1,500,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1837,'Imp@WZ_SIGHTRASHER','attack',81,20,3000,0,10000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1837,'Imp@WZ_SIGHTRASHER','attack',81,10,3000,0,10000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1837,'Imp@RG_STRIPARMOR','attack',217,1,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'29',NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1838,'Knocker@HT_LANDMINE','idle',116,2,4000,1000,18000,'yes','around2','always','0',NULL,NULL,NULL,NULL,NULL,'5',NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1838,'Knocker@NPC_GROUNDATTACK','attack',185,2,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -4887,45 +4887,45 @@ REPLACE INTO `mob_skill_db_re` VALUES (1904,'Bomb Poring@NPC_SELFDESTRUCTION','a
REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_DRAGONFEAR','chase',659,10,10000,0,600000,'no','self','myhpltmaxrate','5',NULL,NULL,NULL,NULL,NULL,NULL,'17');
REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_DRAGONFEAR','attack',659,10,10000,0,600000,'no','self','myhpltmaxrate','5',NULL,NULL,NULL,NULL,NULL,NULL,'17');
#10% HP - Talk
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_TALK','chase',682,10,10000,0,600000,'no','self','myhpinrate','6',10,NULL,NULL,NULL,NULL,NULL,'16');
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_TALK','attack',682,10,10000,0,600000,'no','self','myhpinrate','6',10,NULL,NULL,NULL,NULL,NULL,'16');
+REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_TALK','chase',682,10,10000,0,600000,'no','self','myhpltmaxrate','10',NULL,NULL,NULL,NULL,NULL,NULL,'16');
+REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_TALK','attack',682,10,10000,0,600000,'no','self','myhpltmaxrate','10',NULL,NULL,NULL,NULL,NULL,NULL,'16');
#30% HP - Earthquake Combo
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_WIDEHELLDIGNITY','chase',684,1,10000,2000,180000,'no','self','myhpinrate','11',30,NULL,NULL,NULL,NULL,NULL,'6');
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_WIDEHELLDIGNITY','attack',684,1,10000,2000,180000,'no','self','myhpinrate','11',30,NULL,NULL,NULL,NULL,NULL,'6');
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_WIDESTUN','chase',678,5,10000,1300,180000,'no','self','afterskill','684',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_WIDESTUN','attack',678,5,10000,1300,180000,'no','self','afterskill','684',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_EARTHQUAKE','chase',653,10,10000,2000,180000,'no','self','afterskill','678',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_EARTHQUAKE','attack',653,10,10000,2000,180000,'no','self','afterskill','678',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_WIDEHELLDIGNITY','chase',684,1,10000,2000,180000,'no','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,NULL,'6');
+REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_WIDEHELLDIGNITY','attack',684,1,10000,2000,180000,'no','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,NULL,'6');
+REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_WIDESTUN','chase',678,5,10000,1300,180000,'no','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_WIDESTUN','attack',678,5,10000,1300,180000,'no','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_EARTHQUAKE','chase',653,10,10000,2000,180000,'no','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_EARTHQUAKE','attack',653,10,10000,2000,180000,'no','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
#40% HP - Mixed Combo
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_PULSESTRIKE','chase',661,5,10000,800,60000,'no','self','myhpinrate','31',40,NULL,NULL,NULL,NULL,NULL,'14');
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_PULSESTRIKE','attack',661,5,10000,800,60000,'no','self','myhpinrate','31',40,NULL,NULL,NULL,NULL,NULL,'14');
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_WIDESTONE','chase',666,5,10000,0,60000,'no','self','afterskill','661',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_WIDESTONE','attack',666,5,10000,0,60000,'no','self','afterskill','661',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@WZ_METEOR','chase',83,5,10000,800,60000,'no','target','afterskill','666',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@WZ_METEOR','attack',83,5,10000,800,60000,'no','target','afterskill','666',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_PULSESTRIKE','chase',661,5,10000,800,60000,'no','self','myhpltmaxrate','40',NULL,NULL,NULL,NULL,NULL,NULL,'14');
+REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_PULSESTRIKE','attack',661,5,10000,800,60000,'no','self','myhpltmaxrate','40',NULL,NULL,NULL,NULL,NULL,NULL,'14');
+REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_WIDESTONE','chase',666,5,10000,0,60000,'no','self','myhpltmaxrate','40',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_WIDESTONE','attack',666,5,10000,0,60000,'no','self','myhpltmaxrate','40',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@WZ_METEOR','chase',83,5,10000,800,60000,'no','target','myhpltmaxrate','40',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@WZ_METEOR','attack',83,5,10000,800,60000,'no','target','myhpltmaxrate','40',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
#50% HP - Vampire Combo
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_VAMPIRE_GIFT','chase',679,9,10000,1000,50000,'no','self','myhpinrate','41',50,NULL,NULL,NULL,NULL,NULL,'15');
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_VAMPIRE_GIFT','attack',679,9,10000,1000,50000,'no','self','myhpinrate','41',50,NULL,NULL,NULL,NULL,NULL,'15');
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_WIDESOULDRAIN','chase',680,10,10000,1000,50000,'no','self','afterskill','679',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_WIDESOULDRAIN','attack',680,10,10000,1000,50000,'no','self','afterskill','679',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_EVILLAND','chase',670,10,10000,1000,50000,'no','target','afterskill','680',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_EVILLAND','attack',670,10,10000,1000,50000,'no','target','afterskill','680',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_VAMPIRE_GIFT','chase',679,9,10000,1000,50000,'no','self','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,'15');
+REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_VAMPIRE_GIFT','attack',679,9,10000,1000,50000,'no','self','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,'15');
+REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_WIDESOULDRAIN','chase',680,10,10000,1000,50000,'no','self','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_WIDESOULDRAIN','attack',680,10,10000,1000,50000,'no','self','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_EVILLAND','chase',670,10,10000,1000,50000,'no','target','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_EVILLAND','attack',670,10,10000,1000,50000,'no','target','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
#60% HP - Hell Combo
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_WIDESLEEP','chase',668,5,10000,700,35000,'no','self','myhpinrate','51',60,NULL,NULL,NULL,NULL,NULL,'3');
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_WIDESLEEP','attack',668,5,10000,700,35000,'no','self','myhpinrate','51',60,NULL,NULL,NULL,NULL,NULL,'3');
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_HELLPOWER','chase',683,1,10000,800,35000,'no','target','afterskill','668',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_HELLPOWER','attack',683,1,10000,800,35000,'no','target','afterskill','668',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_HELLJUDGEMENT','chase',662,5,10000,800,35000,'no','self','afterskill','683',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_HELLJUDGEMENT','attack',662,5,10000,800,35000,'no','self','afterskill','683',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_WIDESLEEP','chase',668,5,10000,700,35000,'no','self','myhpltmaxrate','60',NULL,NULL,NULL,NULL,NULL,NULL,'3');
+REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_WIDESLEEP','attack',668,5,10000,700,35000,'no','self','myhpltmaxrate','60',NULL,NULL,NULL,NULL,NULL,NULL,'3');
+REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_HELLPOWER','chase',683,1,10000,800,35000,'no','target','myhpltmaxrate','60',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_HELLPOWER','attack',683,1,10000,800,35000,'no','target','myhpltmaxrate','60',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_HELLJUDGEMENT','chase',662,5,10000,800,35000,'no','self','myhpltmaxrate','60',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_HELLJUDGEMENT','attack',662,5,10000,800,35000,'no','self','myhpltmaxrate','60',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
#80% HP - Magic Combo
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@MG_STONECURSE','chase',16,10,10000,1000,20000,'no','target','myhpinrate','61',80,NULL,NULL,NULL,NULL,NULL,'2');
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@MG_STONECURSE','attack',16,10,10000,1000,20000,'no','target','myhpinrate','61',80,NULL,NULL,NULL,NULL,NULL,'2');
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@MG_FIREBOLT','chase',19,10,10000,300,20000,'no','target','afterskill','16',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@MG_FIREBOLT','attack',19,10,10000,300,20000,'no','target','afterskill','16',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@MG_FROSTDIVER','chase',15,40,10000,1000,20000,'no','target','afterskill','19',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@MG_FROSTDIVER','attack',15,40,10000,1000,20000,'no','target','afterskill','19',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@WZ_JUPITEL','chase',84,28,10000,1000,20000,'no','target','afterskill','15',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@WZ_JUPITEL','attack',84,28,10000,1000,20000,'no','target','afterskill','15',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@MG_STONECURSE','chase',16,10,10000,1000,20000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,'2');
+REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@MG_STONECURSE','attack',16,10,10000,1000,20000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,'2');
+REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@MG_FIREBOLT','chase',19,10,10000,300,20000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@MG_FIREBOLT','attack',19,10,10000,300,20000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@MG_FROSTDIVER','chase',15,40,10000,1000,20000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@MG_FROSTDIVER','attack',15,40,10000,1000,20000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@WZ_JUPITEL','chase',84,28,10000,1000,20000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@WZ_JUPITEL','attack',84,28,10000,1000,20000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@AL_TELEPORT','idle',26,1,10000,0,0,'yes','self','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@AL_TELEPORT','chase',26,1,5000,0,5000,'yes','self','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@AL_PNEUMA','idle',25,1,10000,0,1000,'yes','self','longrangeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -4936,53 +4936,51 @@ REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_CALLSLAVE','idle',
REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_TALK','chase',682,1,10000,0,600000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,'1');
REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_SUMMONSLAVE','attack',196,4,10000,0,30000,'yes','self','slavele','1',1922,1923,1924,1925,NULL,NULL,'4');
REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_SUMMONSLAVE','chase',196,4,10000,0,30000,'yes','self','slavele','1',1922,1923,1924,1925,NULL,NULL,'4');
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_SUMMONSLAVE','idle',196,4,10000,0,30000,'yes','self','onspawn','0',1922,1923,1924,1925,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_SUMMONSLAVE','idle',196,4,10000,0,30000,'yes','self','slavele','1',1922,1923,1924,1925,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@SA_LANDPROTECTOR','attack',288,1,10000,0,15000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1916,'Satan Morroc@NPC_SHIELDBRAKE','attack',346,10,10000,0,15000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
#5% HP - Dragon Fear
REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_DRAGONFEAR','chase',659,10,10000,0,600000,'no','self','myhpltmaxrate','5',NULL,NULL,NULL,NULL,NULL,NULL,'17');
REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_DRAGONFEAR','attack',659,10,10000,0,600000,'no','self','myhpltmaxrate','5',NULL,NULL,NULL,NULL,NULL,NULL,'17');
#10% HP - Talk
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_TALK','chase',682,10,10000,0,600000,'no','self','myhpinrate','6',10,NULL,NULL,NULL,NULL,NULL,'16');
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_TALK','attack',682,10,10000,0,600000,'no','self','myhpinrate','6',10,NULL,NULL,NULL,NULL,NULL,'16');
+REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_TALK','chase',682,10,10000,0,600000,'no','self','myhpltmaxrate','10',NULL,NULL,NULL,NULL,NULL,NULL,'16');
+REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_TALK','attack',682,10,10000,0,600000,'no','self','myhpltmaxrate','10',NULL,NULL,NULL,NULL,NULL,NULL,'16');
#30% HP - Earthquake Combo
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_WIDEHELLDIGNITY','chase',684,1,10000,2000,180000,'no','self','myhpinrate','11',30,NULL,NULL,NULL,NULL,NULL,'6');
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_WIDEHELLDIGNITY','attack',684,1,10000,2000,180000,'no','self','myhpinrate','11',30,NULL,NULL,NULL,NULL,NULL,'6');
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_WIDESTUN','chase',678,5,10000,1300,180000,'no','self','afterskill','684',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_WIDESTUN','attack',678,5,10000,1300,180000,'no','self','afterskill','684',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_EARTHQUAKE','chase',653,10,10000,2000,180000,'no','self','afterskill','678',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_EARTHQUAKE','attack',653,10,10000,2000,180000,'no','self','afterskill','678',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_WIDEHELLDIGNITY','chase',684,1,10000,2000,180000,'no','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,NULL,'6');
+REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_WIDEHELLDIGNITY','attack',684,1,10000,2000,180000,'no','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,NULL,'6');
+REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_WIDESTUN','chase',678,5,10000,1300,180000,'no','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_WIDESTUN','attack',678,5,10000,1300,180000,'no','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_EARTHQUAKE','chase',653,10,10000,2000,180000,'no','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_EARTHQUAKE','attack',653,10,10000,2000,180000,'no','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
#40% HP - Mixed Combo
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_PULSESTRIKE','chase',661,5,10000,800,60000,'no','self','myhpinrate','31',40,NULL,NULL,NULL,NULL,NULL,'14');
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_PULSESTRIKE','attack',661,5,10000,800,60000,'no','self','myhpinrate','31',40,NULL,NULL,NULL,NULL,NULL,'14');
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_WIDESTONE','chase',666,5,10000,0,60000,'no','self','afterskill','661',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_WIDESTONE','attack',666,5,10000,0,60000,'no','self','afterskill','661',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@WZ_METEOR','chase',83,5,10000,800,60000,'no','target','afterskill','666',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@WZ_METEOR','attack',83,5,10000,800,60000,'no','target','afterskill','666',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_PULSESTRIKE','chase',661,5,10000,800,60000,'no','self','myhpltmaxrate','40',NULL,NULL,NULL,NULL,NULL,NULL,'14');
+REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_PULSESTRIKE','attack',661,5,10000,800,60000,'no','self','myhpltmaxrate','40',NULL,NULL,NULL,NULL,NULL,NULL,'14');
+REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_WIDESTONE','chase',666,5,10000,0,60000,'no','self','myhpltmaxrate','40',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_WIDESTONE','attack',666,5,10000,0,60000,'no','self','myhpltmaxrate','40',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@WZ_METEOR','chase',83,5,10000,800,60000,'no','target','myhpltmaxrate','40',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@WZ_METEOR','attack',83,5,10000,800,60000,'no','target','myhpltmaxrate','40',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
#50% HP - Vampire Combo
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_VAMPIRE_GIFT','chase',679,9,10000,1000,50000,'no','self','myhpinrate','41',50,NULL,NULL,NULL,NULL,NULL,'15');
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_VAMPIRE_GIFT','attack',679,9,10000,1000,50000,'no','self','myhpinrate','41',50,NULL,NULL,NULL,NULL,NULL,'15');
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_WIDESOULDRAIN','chase',680,10,10000,1000,50000,'no','self','afterskill','679',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_WIDESOULDRAIN','attack',680,10,10000,1000,50000,'no','self','afterskill','679',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_EVILLAND','chase',670,10,10000,1000,50000,'no','target','afterskill','680',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_EVILLAND','attack',670,10,10000,1000,50000,'no','target','afterskill','680',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_VAMPIRE_GIFT','chase',679,9,10000,1000,50000,'no','self','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,'15');
+REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_VAMPIRE_GIFT','attack',679,9,10000,1000,50000,'no','self','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,'15');
+REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_WIDESOULDRAIN','chase',680,10,10000,1000,50000,'no','self','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_WIDESOULDRAIN','attack',680,10,10000,1000,50000,'no','self','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_EVILLAND','chase',670,10,10000,1000,50000,'no','target','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_EVILLAND','attack',670,10,10000,1000,50000,'no','target','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
#60% HP - Hell Combo
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_WIDESLEEP','chase',668,5,10000,700,35000,'no','self','myhpinrate','51',60,NULL,NULL,NULL,NULL,NULL,'3');
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_WIDESLEEP','attack',668,5,10000,700,35000,'no','self','myhpinrate','51',60,NULL,NULL,NULL,NULL,NULL,'3');
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_HELLPOWER','chase',683,1,10000,800,35000,'no','target','afterskill','668',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_HELLPOWER','attack',683,1,10000,800,35000,'no','target','afterskill','668',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_HELLJUDGEMENT','chase',662,5,10000,800,35000,'no','self','afterskill','683',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_HELLJUDGEMENT','attack',662,5,10000,800,35000,'no','self','afterskill','683',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_WIDESLEEP','chase',668,5,10000,700,35000,'no','self','myhpltmaxrate','60',NULL,NULL,NULL,NULL,NULL,NULL,'3');
+REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_WIDESLEEP','attack',668,5,10000,700,35000,'no','self','myhpltmaxrate','60',NULL,NULL,NULL,NULL,NULL,NULL,'3');
+REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_HELLPOWER','chase',683,1,10000,800,35000,'no','target','myhpltmaxrate','60',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_HELLPOWER','attack',683,1,10000,800,35000,'no','target','myhpltmaxrate','60',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_HELLJUDGEMENT','chase',662,5,10000,800,35000,'no','self','myhpltmaxrate','60',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_HELLJUDGEMENT','attack',662,5,10000,800,35000,'no','self','myhpltmaxrate','60',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
#80% HP - Magic Combo
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@MG_STONECURSE','chase',16,10,10000,1000,20000,'no','target','myhpinrate','61',80,NULL,NULL,NULL,NULL,NULL,'2');
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@MG_STONECURSE','attack',16,10,10000,1000,20000,'no','target','myhpinrate','61',80,NULL,NULL,NULL,NULL,NULL,'2');
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@MG_FIREBOLT','chase',19,10,10000,300,20000,'no','target','afterskill','16',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@MG_FIREBOLT','attack',19,10,10000,300,20000,'no','target','afterskill','16',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@MG_FROSTDIVER','chase',15,40,10000,1000,20000,'no','target','afterskill','19',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@MG_FROSTDIVER','attack',15,40,10000,1000,20000,'no','target','afterskill','19',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@WZ_JUPITEL','chase',84,28,10000,1000,20000,'no','target','afterskill','15',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@WZ_JUPITEL','attack',84,28,10000,1000,20000,'no','target','afterskill','15',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@MG_STONECURSE','chase',16,10,10000,1000,20000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,'2');
+REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@MG_STONECURSE','attack',16,10,10000,1000,20000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,'2');
+REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@MG_FIREBOLT','chase',19,10,10000,300,20000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@MG_FIREBOLT','attack',19,10,10000,300,20000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@MG_FROSTDIVER','chase',15,40,10000,1000,20000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@MG_FROSTDIVER','attack',15,40,10000,1000,20000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@WZ_JUPITEL','chase',84,28,10000,1000,20000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@WZ_JUPITEL','attack',84,28,10000,1000,20000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@AL_TELEPORT','idle',26,1,10000,0,0,'yes','self','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@AL_TELEPORT','chase',26,1,5000,0,5000,'yes','self','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@AL_PNEUMA','idle',25,1,10000,0,1000,'yes','self','longrangeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -4993,8 +4991,6 @@ REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_CALLSLAVE','idle
REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_TALK','chase',682,1,10000,0,600000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,'1');
REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_SUMMONSLAVE','attack',196,4,10000,0,30000,'yes','self','slavele','1',1922,1923,1924,1925,NULL,NULL,'4');
REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_SUMMONSLAVE','chase',196,4,10000,0,30000,'yes','self','slavele','1',1922,1923,1924,1925,NULL,NULL,'4');
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_SUMMONSLAVE','idle',196,4,10000,0,30000,'yes','self','onspawn','0',1922,1923,1924,1925,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_SUMMONSLAVE','idle',196,4,10000,0,30000,'yes','self','slavele','1',1922,1923,1924,1925,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@SA_LANDPROTECTOR','attack',288,1,10000,0,15000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1917,'Wounded Morroc@NPC_SHIELDBRAKE','attack',346,10,10000,0,15000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (1918,'Incarnation of Morroc@AL_PNEUMA','idle',25,1,10000,0,1000,'yes','self','longrangeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -6132,7 +6128,7 @@ REPLACE INTO `mob_skill_db_re` VALUES (2103,'Ktullanux@NPC_ARMORBRAKE','attack',
REPLACE INTO `mob_skill_db_re` VALUES (2103,'Ktullanux@MG_FROSTDIVER','idle',15,40,5000,1000,7000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (2103,'Ktullanux@MG_FROSTDIVER','chase',15,40,5000,1000,7000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (2103,'Ktullanux@WZ_STORMGUST','chase',89,10,5000,1000,20000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2103,'Ktullanux@WZ_STORMGUST','attack',89,11,5000,1000,20000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2103,'Ktullanux@WZ_STORMGUST','attack',89,10,5000,1000,20000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (2103,'Ktullanux@WZ_WATERBALL','chase',86,10,5000,0,20000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (2103,'Ktullanux@WZ_WATERBALL','attack',86,10,5000,0,20000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (2103,'Ktullanux@WZ_FROSTNOVA','chase',88,10,5000,0,20000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -6229,7 +6225,7 @@ REPLACE INTO `mob_skill_db_re` VALUES (2108,'Gloom Under Night@NPC_POWERUP','att
REPLACE INTO `mob_skill_db_re` VALUES (2108,'Gloom Under Night@NPC_POWERUP','attack',349,5,2000,700,50000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (2108,'Gloom Under Night@NPC_FIREBREATH','chase',654,10,2000,500,10000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (2108,'Gloom Under Night@SM_MAGNUM','attack',7,25,10000,0,5000,'yes','self','attackpcge','2',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2108,'Gloom Under Night@WZ_SIGHTRASHER','attack',81,20,2000,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2108,'Gloom Under Night@WZ_SIGHTRASHER','attack',81,10,2000,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (2108,'Gloom Under Night@MG_FIREBALL','attack',17,44,1000,500,20000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (2108,'Gloom Under Night@MG_FIREBALL','chase',17,44,10000,500,20000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (2108,'Gloom Under Night@NPC_CALLSLAVE','attack',352,1,10000,0,30000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -7896,7 +7892,7 @@ REPLACE INTO `mob_skill_db_re` VALUES (2255,'Kades@NPC_POWERUP','attack',349,5,1
REPLACE INTO `mob_skill_db_re` VALUES (2255,'Kades@NPC_POWERUP','attack',349,5,2000,700,50000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (2255,'Kades@NPC_FIREBREATH','chase',654,10,2000,500,10000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (2255,'Kades@SM_MAGNUM','attack',7,25,10000,0,5000,'yes','self','attackpcge','2',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2255,'Kades@WZ_SIGHTRASHER','attack',81,20,2000,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2255,'Kades@WZ_SIGHTRASHER','attack',81,10,2000,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (2255,'Kades@MG_FIREBALL','attack',17,44,1000,500,20000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (2255,'Kades@MG_FIREBALL','chase',17,44,10000,500,20000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (2255,'Kades@NPC_BLEEDING','attack',660,3,2000,0,50000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -8307,113 +8303,755 @@ REPLACE INTO `mob_skill_db_re` VALUES (2409,'Dummy 50@AL_HEAL','idle',28,11,1000
REPLACE INTO `mob_skill_db_re` VALUES (2410,'Dummy 100@AL_HEAL','idle',28,11,10000,0,10000,'no','self','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db_re` VALUES (2411,'Dummy 150@AL_HEAL','idle',28,11,10000,0,10000,'no','self','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-# Old Glast Heim (currently placeholders)
-REPLACE INTO `mob_skill_db_re` VALUES (2464,'MG Zombie@AL_HEAL','idle',28,10,10000,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,'26');
-REPLACE INTO `mob_skill_db_re` VALUES (2464,'MG Zombie@NPC_UNDEADATTACK','chase',347,10,8000,1000,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2465,'MG Wraith@NPC_ENERGYDRAIN','attack',200,1,500,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2466,'MG Ghoul@NPC_UNDEADATTACK','chase',347,10,8000,1000,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2467,'MG Arclouse@NPC_GROUNDATTACK','attack',185,10,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2468,'MG Raydric@BS_MAXIMIZE','attack',114,5,500,1000,5000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2468,'MG Raydric@BS_MAXIMIZE','chase',114,5,500,1000,5000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2468,'MG Raydric@NPC_EMOTION','chase',197,1,2000,0,5000,'yes','self','always','0',0,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2468,'MG Raydric@SM_MAGNUM','attack',7,9,500,500,5000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2468,'MG Raydric@CR_AUTOGUARD','chase',249,2,2000,0,300000,'yes','self','longrangeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2468,'MG Raydric@CR_AUTOGUARD','attack',249,2,500,0,300000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2469,'MG Raydric Archer@AC_CHARGEARROW','attack',148,1,500,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'9',NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2469,'MG Raydric Archer@NPC_DARKNESSATTACK','attack',190,10,500,500,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'9',NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2469,'MG Raydric Archer@CR_AUTOGUARD','attack',249,2,500,0,300000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2470,'MG Knight of Abyss@AC_CHARGEARROW','chase',148,1,500,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2470,'MG Knight of Abyss@KN_BRANDISHSPEAR','attack',57,10,500,1000,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'9',NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2470,'MG Knight of Abyss@NPC_DARKNESSATTACK','attack',190,5,500,500,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'9',NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2470,'MG Knight of Abyss@CR_AUTOGUARD','chase',249,10,2000,0,300000,'yes','self','longrangeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2470,'MG Knight of Abyss@CR_AUTOGUARD','attack',249,10,500,0,300000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2472,'MG Bloody Knight@KN_BRANDISHSPEAR','attack',57,5,500,1000,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'9',NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2472,'MG Bloody Knight@NPC_CHANGEFIRE','attack',164,1,10000,2000,600000,'no','self','myhpltmaxrate','20',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2472,'MG Bloody Knight@NPC_DARKNESSATTACK','attack',190,2,500,500,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'9',NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2472,'MG Bloody Knight@CR_SHIELDCHARGE','attack',250,5,500,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'9',NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2472,'MG Bloody Knight@WZ_METEOR','attack',83,5,2000,0,5000,'no','target','myhpltmaxrate','20',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2472,'MG Bloody Knight@WZ_METEOR','chase',83,5,2000,0,5000,'no','target','myhpltmaxrate','20',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2472,'MG Bloody Knight@NPC_WEAPONBRAKER','attack',343,5,500,0,30000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2475,'MG_CORRUPTION_ROOT@NPC_HELLJUDGEMENT','idle',662,10,10000,4000,100,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,'36',NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2475,'MG_CORRUPTION_ROOT@NPC_HELLJUDGEMENT','attack',662,10,10000,1000,10000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,'36',NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2475,'MG_CORRUPTION_ROOT@NPC_DARKSTRIKE','attack',340,10,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2475,'MG_CORRUPTION_ROOT@NPC_SILENCEATTACK','attack',178,10,2000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2475,'MG_CORRUPTION_ROOT@NPC_PETRIFYATTACK','attack',180,5,500,500,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'3',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2475,'MG_CORRUPTION_ROOT@NPC_TALK','idle',682,10,10000,0,60000,'no','self','myhpltmaxrate','100',NULL,NULL,NULL,NULL,NULL,NULL,'41');
-REPLACE INTO `mob_skill_db_re` VALUES (2476,'MG_AMDARAIS@NPC_DRAGONFEAR','chase',659,5,10000,0,30000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2476,'MG_AMDARAIS@NPC_DRAGONFEAR','attack',659,5,2000,1000,20000,'no','self','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,'32',NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2476,'MG_AMDARAIS@NPC_CRITICALSLASH','attack',170,1,500,500,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2476,'MG_AMDARAIS@NPC_FIREBREATH','attack',654,5,500,800,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'32',NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2476,'MG_AMDARAIS@NPC_DARKBREATH','attack',202,5,500,800,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'36',NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2476,'MG_AMDARAIS@NPC_WEAPONBRAKER','attack',343,10,500,0,30000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `mob_skill_db_re` VALUES (2476,'MG_AMDARAIS@MG_FIREBALL','chase',17,44,5000,500,1000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2476,'MG_AMDARAIS@NPC_TALK','idle',682,10,10000,0,60000,'no','self','myhpltmaxrate','100',NULL,NULL,NULL,NULL,NULL,NULL,'42');
+REPLACE INTO `mob_skill_db_re` VALUES (2415,'Knight Seyren@KN_SPEARBOOMERANG','idle',59,5,10000,0,0,'yes','randomtarget','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2415,'Knight Seyren@KN_SPEARBOOMERANG','chase',59,5,10000,0,0,'yes','target','skillused','18',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2415,'Knight Seyren@KN_SPEARBOOMERANG','follow',59,5,10000,0,0,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2415,'Knight Seyren@KN_TWOHANDQUICKEN','attack',60,30,10000,0,300000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,'2',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2415,'Knight Seyren@KN_BOWLINGBASH','attack',62,5,1000,0,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2415,'Knight Seyren@SM_BASH','attack',5,10,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2415,'Knight Seyren@KN_PIERCE','attack',56,10,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2415,'Knight Seyren@SM_MAGNUM','attack',7,25,1000,0,0,'yes','self','attackpcge','2',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2415,'Knight Seyren@SM_PROVOKE','attack',6,5,1000,0,300000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2415,'Knight Seyren@SM_PROVOKE','chase',6,5,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2415,'Knight Seyren@NPC_CRITICALSLASH','attack',170,1,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2415,'Knight Seyren@NPC_STUNATTACK','attack',179,5,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2415,'Knight Seyren@NPC_FIREATTACK','attack',186,5,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2416,'Assassin Eremes@AS_CLOAKING','attack',135,3,2000,200,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2416,'Assassin Eremes@AS_CLOAKING','idle',135,3,2000,200,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2416,'Assassin Eremes@AS_CLOAKING','chase',135,3,2000,200,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2416,'Assassin Eremes@AS_GRIMTOOTH','idle',137,5,10000,0,0,'yes','randomtarget','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2416,'Assassin Eremes@AS_SONICBLOW','attack',136,10,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2416,'Assassin Eremes@AS_GRIMTOOTH','chase',137,5,2000,0,0,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2416,'Assassin Eremes@AS_VENOMDUST','idle',140,10,2000,0,50000,'yes','randomtarget','always','0',NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2416,'Assassin Eremes@AS_VENOMDUST','attack',140,10,2000,0,50000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2416,'Assassin Eremes@NPC_CRITICALSLASH','attack',170,1,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2416,'Assassin Eremes@NPC_STUNATTACK','attack',179,5,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2416,'Assassin Eremes@NPC_POISONATTACK','attack',188,5,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2416,'Assassin Eremes@AS_GRIMTOOTH','chase',137,5,10000,0,0,'no','target','skillused','18',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2416,'Assassin Eremes@AS_GRIMTOOTH','chase',137,5,10000,0,0,'yes','target','skillused','18',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2417,'Blacksmith Howard@BS_ADRENALINE','attack',111,10,2000,0,150000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2417,'Blacksmith Howard@BS_MAXIMIZE','attack',114,1,1000,0,60000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2417,'Blacksmith Howard@MC_MAMMONITE','attack',42,22,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'23',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2417,'Blacksmith Howard@BS_HAMMERFALL','chase',110,5,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2417,'Blacksmith Howard@BS_HAMMERFALL','attack',110,5,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2417,'Blacksmith Howard@NPC_ARMORBRAKE','attack',344,10,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'19',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2417,'Blacksmith Howard@NPC_CRITICALSLASH','attack',170,1,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2417,'Blacksmith Howard@NPC_FIREATTACK','attack',186,5,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2417,'Blacksmith Howard@NPC_WATERATTACK','attack',184,5,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2418,'Hunter Cecil@AC_DOUBLE','attack',46,10,2000,0,3000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2418,'Hunter Cecil@AC_SHOWER','attack',47,10,2000,0,3000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2418,'Hunter Cecil@AC_CHARGEARROW','attack',148,1,2000,0,3000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2418,'Hunter Cecil@NPC_RUN','follow',354,1,10000,0,5000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,'22',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2418,'Hunter Cecil@HT_SKIDTRAP','idle',115,5,2000,0,60000,'yes','around2','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2418,'Hunter Cecil@HT_SKIDTRAP','attack',115,5,500,0,5000,'yes','around2','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2418,'Hunter Cecil@HT_FLASHER','idle',120,5,2000,0,60000,'yes','around2','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2418,'Hunter Cecil@HT_FLASHER','attack',120,5,500,0,5000,'yes','around2','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2418,'Hunter Cecil@HT_FREEZINGTRAP','idle',121,5,2000,0,60000,'yes','around2','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2418,'Hunter Cecil@HT_FREEZINGTRAP','attack',121,5,500,0,5000,'yes','around2','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2418,'Hunter Cecil@NPC_CRITICALSLASH','attack',170,1,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2418,'Hunter Cecil@NPC_STUNATTACK','attack',179,5,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2418,'Hunter Cecil@NPC_WINDATTACK','attack',187,5,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2419,'Wizard Kathryne@MG_SIGHT','idle',10,1,2000,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2419,'Wizard Kathryne@MG_SIGHT','idle',10,1,10000,0,5000,'yes','self','skillused','137',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2419,'Wizard Kathryne@MG_FROSTDIVER','idle',15,1,10000,1000,10000,'no','randomtarget','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2419,'Wizard Kathryne@WZ_JUPITEL','idle',84,28,10000,1000,10000,'no','randomtarget','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2419,'Wizard Kathryne@MG_FROSTDIVER','attack',15,1,3000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2419,'Wizard Kathryne@MG_FROSTDIVER','chase',15,1,3000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2419,'Wizard Kathryne@WZ_JUPITEL','attack',84,28,3000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2419,'Wizard Kathryne@WZ_JUPITEL','chase',84,28,3000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2419,'Wizard Kathryne@MG_COLDBOLT','attack',14,5,3000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2419,'Wizard Kathryne@MG_COLDBOLT','chase',14,5,3000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2419,'Wizard Kathryne@WZ_SIGHTRASHER','attack',81,2,3000,0,10000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2419,'Wizard Kathryne@WZ_QUAGMIRE','chase',92,5,3000,0,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2419,'Wizard Kathryne@MG_SAFETYWALL','attack',12,10,3000,0,10000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2419,'Wizard Kathryne@MG_FIREBOLT','chase',19,4,3000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2419,'Wizard Kathryne@MG_FIREBOLT','attack',19,4,3000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2419,'Wizard Kathryne@MG_FIREWALL','chase',18,10,3000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2419,'Wizard Kathryne@MG_FIREWALL','attack',18,10,3000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2419,'Wizard Kathryne@MG_LIGHTNINGBOLT','chase',20,4,3000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2419,'Wizard Kathryne@MG_LIGHTNINGBOLT','attack',20,4,3000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2419,'Wizard Kathryne@WZ_FROSTNOVA','chase',88,10,3000,1000,10000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2419,'Wizard Kathryne@WZ_FROSTNOVA','attack',88,10,3000,1000,10000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2419,'Wizard Kathryne@WZ_METEOR','attack',83,11,3000,1500,10000,'yes','target','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2419,'Wizard Kathryne@WZ_STORMGUST','attack',89,10,3000,1500,10000,'yes','target','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2419,'Wizard Kathryne@MG_FROSTDIVER','chase',15,1,10000,1000,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2419,'Wizard Kathryne@WZ_JUPITEL','chase',84,28,10000,1000,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2419,'Wizard Kathryne@MG_FROSTDIVER','chase',15,1,10000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2419,'Wizard Kathryne@WZ_JUPITEL','chase',84,28,10000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2420,'Priest Margaretha@PR_KYRIE','idle',73,10,10000,1000,10000,'no','randomtarget','myhpltmaxrate','99',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2420,'Priest Margaretha@PR_KYRIE','chase',73,10,10000,1000,10000,'no','target','myhpltmaxrate','100',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2420,'Priest Margaretha@PR_KYRIE','idle',73,10,10000,1000,10000,'no','friend','friendhpltmaxrate','100',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2420,'Priest Margaretha@PR_KYRIE','chase',73,10,10000,1000,10000,'no','friend','friendhpltmaxrate','100',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2420,'Priest Margaretha@AL_PNEUMA','idle',25,1,10000,0,0,'yes','self','longrangeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2420,'Priest Margaretha@AL_INCAGI','attack',29,1,2000,0,240000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,'2',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2420,'Priest Margaretha@AL_INCAGI','chase',29,1,2000,0,240000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,'2',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2420,'Priest Margaretha@AL_DECAGI','chase',30,48,2000,0,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2420,'Priest Margaretha@MG_SAFETYWALL','attack',12,10,1000,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2420,'Priest Margaretha@AL_PNEUMA','attack',25,1,5000,0,10000,'yes','self','longrangeattacked',NULL,NULL,NULL,NULL,NULL,NULL,'19',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2420,'Priest Margaretha@AL_PNEUMA','chase',25,1,5000,0,10000,'yes','self','longrangeattacked',NULL,NULL,NULL,NULL,NULL,NULL,'19',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2420,'Priest Margaretha@PR_LEXDIVINA','attack',76,5,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'18',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2420,'Priest Margaretha@PR_LEXDIVINA','chase',76,5,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'18',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2420,'Priest Margaretha@PR_LEXDIVINA','idle',76,5,10000,0,5000,'yes','target','casttargeted',NULL,NULL,NULL,NULL,NULL,NULL,'18',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2420,'Priest Margaretha@PR_LEXDIVINA','attack',76,5,5000,0,5000,'yes','target','casttargeted',NULL,NULL,NULL,NULL,NULL,NULL,'18',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2420,'Priest Margaretha@PR_LEXDIVINA','chase',76,5,5000,0,5000,'yes','target','casttargeted',NULL,NULL,NULL,NULL,NULL,NULL,'18',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2420,'Priest Margaretha@PR_LEXAETERNA','attack',78,1,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2420,'Priest Margaretha@PR_LEXAETERNA','chase',78,1,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2420,'Priest Margaretha@NPC_HOLYATTACK','attack',189,10,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2420,'Priest Margaretha@AL_HEAL','attack',28,11,3000,0,2000,'yes','friend','friendhpltmaxrate','99',NULL,NULL,NULL,NULL,NULL,'3',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2420,'Priest Margaretha@AL_HEAL','attack',28,11,3000,0,2000,'yes','self','myhpltmaxrate','99',NULL,NULL,NULL,NULL,NULL,'3',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2420,'Priest Margaretha@AL_HEAL','idle',28,11,3000,0,2000,'yes','friend','friendhpltmaxrate','99',NULL,NULL,NULL,NULL,NULL,'3',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2420,'Priest Margaretha@AL_HEAL','idle',28,11,3000,0,2000,'yes','self','myhpltmaxrate','99',NULL,NULL,NULL,NULL,NULL,'3',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2420,'Priest Margaretha@AL_HEAL','chase',28,11,3000,0,2000,'yes','friend','friendhpltmaxrate','99',NULL,NULL,NULL,NULL,NULL,'3',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2420,'Priest Margaretha@AL_HEAL','chase',28,11,3000,0,2000,'yes','self','myhpltmaxrate','99',NULL,NULL,NULL,NULL,NULL,'3',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2421,'Crusader Egnigem@CR_SHIELDCHARGE','attack',250,5,2000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2421,'Crusader Egnigem@CR_SHIELDBOOMERANG','idle',251,5,10000,0,0,'yes','randomtarget','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2421,'Crusader Egnigem@CR_SHIELDBOOMERANG','chase',251,5,10000,0,0,'yes','target','skillused','18',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2421,'Crusader Egnigem@CR_SHIELDBOOMERANG','follow',251,5,10000,0,0,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2421,'Crusader Egnigem@CR_DEFENDER','idle',257,3,10000,0,0,'yes','self','longrangeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2421,'Crusader Egnigem@CR_DEFENDER','chase',257,3,5000,0,10000,'yes','self','longrangeattacked',NULL,NULL,NULL,NULL,NULL,NULL,'19',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2421,'Crusader Egnigem@CR_DEFENDER','attack',257,3,5000,0,10000,'yes','self','longrangeattacked',NULL,NULL,NULL,NULL,NULL,NULL,'19',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2421,'Crusader Egnigem@CR_AUTOGUARD','chase',249,10,2000,0,300000,'yes','self','longrangeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2421,'Crusader Egnigem@CR_AUTOGUARD','attack',249,10,2000,0,300000,'yes','self','longrangeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2421,'Crusader Egnigem@CR_REFLECTSHIELD','attack',252,3,1000,0,200000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,'7',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2421,'Crusader Egnigem@CR_REFLECTSHIELD','chase',252,5,10000,0,300000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,'32',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2421,'Crusader Egnigem@CR_GRANDCROSS','attack',254,10,2000,500,2500,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2421,'Crusader Egnigem@CR_HOLYCROSS','attack',253,10,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2421,'Crusader Egnigem@AL_HEAL','idle',28,5,3000,0,2000,'yes','friend','friendhpltmaxrate','99',NULL,NULL,NULL,NULL,NULL,'3',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2421,'Crusader Egnigem@AL_HEAL','chase',28,5,3000,0,2000,'yes','friend','friendhpltmaxrate','99',NULL,NULL,NULL,NULL,NULL,'3',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2422,'Rogue Wickebine@TF_THROWSTONE','chase',152,1,10000,0,3000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2422,'Rogue Wickebine@TF_THROWSTONE','follow',152,1,10000,0,3000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2422,'Rogue Wickebine@NPC_POISON','attack',176,5,1000,800,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2422,'Rogue Wickebine@RG_STRIPWEAPON','attack',215,5,500,0,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'18',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2422,'Rogue Wickebine@RG_STRIPARMOR','attack',217,5,500,0,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'18',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2422,'Rogue Wickebine@RG_STRIPSHIELD','attack',216,5,500,0,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'17',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2422,'Rogue Wickebine@RG_STRIPHELM','attack',218,5,500,0,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2422,'Rogue Wickebine@RG_INTIMIDATE','attack',219,10,2000,0,60000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2422,'Rogue Wickebine@RG_CLOSECONFINE','attack',1005,1,1000,0,30000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2422,'Rogue Wickebine@NPC_POISONATTACK','attack',188,5,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2423,'Alchemist Armeyer@ITM_TOMAHAWK','idle',337,1,10000,0,0,'yes','randomtarget','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2423,'Alchemist Armeyer@ITM_TOMAHAWK','chase',337,1,10000,0,0,'yes','target','skillused','18',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2423,'Alchemist Armeyer@ITM_TOMAHAWK','follow',337,1,10000,0,0,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2423,'Alchemist Armeyer@BS_ADRENALINE','attack',111,10,2000,0,150000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2423,'Alchemist Armeyer@MC_MAMMONITE','attack',42,22,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'23',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2423,'Alchemist Armeyer@AM_DEMONSTRATION','chase',229,5,5000,0,2000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2423,'Alchemist Armeyer@AM_DEMONSTRATION','attack',229,5,5000,0,2000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2423,'Alchemist Armeyer@AM_POTIONPITCHER','idle',231,4,10000,0,0,'yes','friend','friendhpltmaxrate','90',NULL,NULL,NULL,NULL,NULL,'2',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2423,'Alchemist Armeyer@AM_POTIONPITCHER','attack',231,4,10000,0,0,'yes','friend','friendhpltmaxrate','90',NULL,NULL,NULL,NULL,NULL,'2',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2423,'Alchemist Armeyer@NPC_CRITICALSLASH','attack',170,1,500,500,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2424,'Bard Kavach@AC_DOUBLE','attack',46,10,2000,0,3000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2424,'Bard Kavach@AC_SHOWER','attack',47,10,2000,0,3000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2424,'Bard Kavach@AC_CHARGEARROW','attack',148,1,2000,0,3000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2424,'Bard Kavach@NPC_RUN','follow',354,1,10000,0,5000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,'22',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2424,'Bard Kavach@BA_FROSTJOKER','idle',318,3,100,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2424,'Bard Kavach@BA_FROSTJOKER','chase',318,3,100,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2424,'Bard Kavach@BA_FROSTJOKER','follow',318,3,100,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2424,'Bard Kavach@NPC_WINDATTACK','attack',187,5,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2425,'Dancer Josephina@AC_DOUBLE','attack',46,10,2000,0,3000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2425,'Dancer Josephina@AC_SHOWER','attack',47,10,2000,0,3000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2425,'Dancer Josephina@AC_CHARGEARROW','attack',148,1,2000,0,3000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2425,'Dancer Josephina@NPC_RUN','follow',354,1,10000,0,5000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,'22',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2425,'Dancer Josephina@DC_SCREAM','idle',326,3,100,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2425,'Dancer Josephina@DC_SCREAM','chase',326,3,100,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2425,'Dancer Josephina@DC_SCREAM','follow',326,3,100,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2425,'Dancer Josephina@NPC_WINDATTACK','attack',187,5,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2426,'Sage Laurell@MG_SOULSTRIKE','idle',13,10,10000,0,1000,'yes','randomtarget','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2426,'Sage Laurell@MG_SOULSTRIKE','attack',13,10,5000,0,1000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2426,'Sage Laurell@MG_SOULSTRIKE','chase',13,10,3000,500,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2426,'Sage Laurell@MG_SAFETYWALL','attack',12,10,1000,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2426,'Sage Laurell@SA_SPELLBREAKER','attack',277,5,1000,0,10000,'yes','target','casttargeted',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2426,'Sage Laurell@SA_DISPELL','attack',289,1,200,0,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'18',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2426,'Sage Laurell@MG_THUNDERSTORM','attack',21,20,1000,1500,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2426,'Sage Laurell@SA_LANDPROTECTOR','attack',288,1,3000,500,10000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,'32',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2426,'Sage Laurell@NPC_MENTALBREAKER','attack',159,3,500,800,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2426,'Sage Laurell@NPC_MENTALBREAKER','chase',159,3,500,800,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2426,'Sage Laurell@SA_LANDPROTECTOR','chase',288,1,3000,500,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2426,'Sage Laurell@SA_LANDPROTECTOR','chase',288,1,3000,500,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2427,'Monk Errende@MO_FINGEROFFENSIVE','idle',267,3,10000,0,0,'yes','randomtarget','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2427,'Monk Errende@MO_FINGEROFFENSIVE','chase',267,3,10000,0,0,'yes','target','skillused','18',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2427,'Monk Errende@MO_FINGEROFFENSIVE','follow',267,3,10000,0,0,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2427,'Monk Errende@MO_TRIPLEATTACK','attack',263,5,1000,0,0,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2427,'Monk Errende@MO_INVESTIGATE','attack',266,5,1000,0,0,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2427,'Monk Errende@MO_BODYRELOCATION','chase',264,1,2000,500,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2427,'Monk Errende@MO_BODYRELOCATION','walk',264,1,2000,500,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2427,'Monk Errende@MO_EXTREMITYFIST','attack',271,5,100,1500,15000,'no','target','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,'32',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2427,'Monk Errende@MO_EXTREMITYFIST','attack',271,5,50,1500,15000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2428,'Knight Seyren@KN_SPEARBOOMERANG','idle',59,5,10000,0,0,'yes','randomtarget','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2428,'Knight Seyren@KN_SPEARBOOMERANG','chase',59,5,10000,0,0,'yes','target','skillused','18',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2428,'Knight Seyren@KN_SPEARBOOMERANG','follow',59,5,10000,0,0,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2428,'Knight Seyren@KN_TWOHANDQUICKEN','attack',60,30,10000,0,300000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,'2',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2428,'Knight Seyren@KN_BOWLINGBASH','attack',62,5,1000,0,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2428,'Knight Seyren@SM_BASH','attack',5,10,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2428,'Knight Seyren@KN_PIERCE','attack',56,10,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2428,'Knight Seyren@SM_MAGNUM','attack',7,25,1000,0,0,'yes','self','attackpcge','2',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2428,'Knight Seyren@SM_PROVOKE','attack',6,5,1000,0,300000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2428,'Knight Seyren@SM_PROVOKE','chase',6,5,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2428,'Knight Seyren@NPC_CRITICALSLASH','attack',170,1,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2428,'Knight Seyren@NPC_STUNATTACK','attack',179,5,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2428,'Knight Seyren@NPC_FIREATTACK','attack',186,5,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2429,'Assassin Eremes@AS_CLOAKING','attack',135,3,2000,200,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2429,'Assassin Eremes@AS_CLOAKING','idle',135,3,2000,200,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2429,'Assassin Eremes@AS_CLOAKING','chase',135,3,2000,200,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2429,'Assassin Eremes@AS_GRIMTOOTH','idle',137,5,10000,0,0,'yes','randomtarget','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2429,'Assassin Eremes@AS_SONICBLOW','attack',136,10,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2429,'Assassin Eremes@AS_GRIMTOOTH','chase',137,5,2000,0,0,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2429,'Assassin Eremes@AS_VENOMDUST','idle',140,10,2000,0,50000,'yes','randomtarget','always','0',NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2429,'Assassin Eremes@AS_VENOMDUST','attack',140,10,2000,0,50000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2429,'Assassin Eremes@NPC_CRITICALSLASH','attack',170,1,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2429,'Assassin Eremes@NPC_STUNATTACK','attack',179,5,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2429,'Assassin Eremes@NPC_POISONATTACK','attack',188,5,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2429,'Assassin Eremes@AS_GRIMTOOTH','chase',137,5,10000,0,0,'no','target','skillused','18',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2429,'Assassin Eremes@AS_GRIMTOOTH','chase',137,5,10000,0,0,'yes','target','skillused','18',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2430,'Blacksmith Howard@BS_ADRENALINE','attack',111,10,2000,0,150000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2430,'Blacksmith Howard@BS_MAXIMIZE','attack',114,1,1000,0,60000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2430,'Blacksmith Howard@MC_MAMMONITE','attack',42,22,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'23',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2430,'Blacksmith Howard@BS_HAMMERFALL','chase',110,5,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2430,'Blacksmith Howard@BS_HAMMERFALL','attack',110,5,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2430,'Blacksmith Howard@NPC_ARMORBRAKE','attack',344,10,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'19',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2430,'Blacksmith Howard@NPC_CRITICALSLASH','attack',170,1,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2430,'Blacksmith Howard@NPC_FIREATTACK','attack',186,5,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2430,'Blacksmith Howard@NPC_WATERATTACK','attack',184,5,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2431,'Hunter Cecil@AC_DOUBLE','attack',46,10,2000,0,3000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2431,'Hunter Cecil@AC_SHOWER','attack',47,10,2000,0,3000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2431,'Hunter Cecil@AC_CHARGEARROW','attack',148,1,2000,0,3000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2431,'Hunter Cecil@NPC_RUN','follow',354,1,10000,0,5000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,'22',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2431,'Hunter Cecil@HT_SKIDTRAP','idle',115,5,2000,0,60000,'yes','around2','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2431,'Hunter Cecil@HT_SKIDTRAP','attack',115,5,500,0,5000,'yes','around2','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2431,'Hunter Cecil@HT_FLASHER','idle',120,5,2000,0,60000,'yes','around2','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2431,'Hunter Cecil@HT_FLASHER','attack',120,5,500,0,5000,'yes','around2','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2431,'Hunter Cecil@HT_FREEZINGTRAP','idle',121,5,2000,0,60000,'yes','around2','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2431,'Hunter Cecil@HT_FREEZINGTRAP','attack',121,5,500,0,5000,'yes','around2','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2431,'Hunter Cecil@NPC_CRITICALSLASH','attack',170,1,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2431,'Hunter Cecil@NPC_STUNATTACK','attack',179,5,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2431,'Hunter Cecil@NPC_WINDATTACK','attack',187,5,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2432,'Wizard Kathryne@MG_SIGHT','idle',10,1,2000,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2432,'Wizard Kathryne@MG_SIGHT','idle',10,1,10000,0,5000,'yes','self','skillused','137',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2432,'Wizard Kathryne@MG_FROSTDIVER','idle',15,1,10000,1000,10000,'no','randomtarget','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2432,'Wizard Kathryne@WZ_JUPITEL','idle',84,28,10000,1000,10000,'no','randomtarget','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2432,'Wizard Kathryne@MG_FROSTDIVER','attack',15,1,3000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2432,'Wizard Kathryne@MG_FROSTDIVER','chase',15,1,3000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2432,'Wizard Kathryne@WZ_JUPITEL','attack',84,28,3000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2432,'Wizard Kathryne@WZ_JUPITEL','chase',84,28,3000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2432,'Wizard Kathryne@MG_COLDBOLT','attack',14,5,3000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2432,'Wizard Kathryne@MG_COLDBOLT','chase',14,5,3000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2432,'Wizard Kathryne@WZ_SIGHTRASHER','attack',81,2,3000,0,10000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2432,'Wizard Kathryne@WZ_QUAGMIRE','chase',92,5,3000,0,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2432,'Wizard Kathryne@MG_SAFETYWALL','attack',12,10,3000,0,10000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2432,'Wizard Kathryne@MG_FIREBOLT','chase',19,4,3000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2432,'Wizard Kathryne@MG_FIREBOLT','attack',19,4,3000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2432,'Wizard Kathryne@MG_FIREWALL','chase',18,10,3000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2432,'Wizard Kathryne@MG_FIREWALL','attack',18,10,3000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2432,'Wizard Kathryne@MG_LIGHTNINGBOLT','chase',20,4,3000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2432,'Wizard Kathryne@MG_LIGHTNINGBOLT','attack',20,4,3000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2432,'Wizard Kathryne@WZ_FROSTNOVA','chase',88,10,3000,1000,10000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2432,'Wizard Kathryne@WZ_FROSTNOVA','attack',88,10,3000,1000,10000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2432,'Wizard Kathryne@WZ_METEOR','attack',83,11,3000,1500,10000,'yes','target','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2432,'Wizard Kathryne@WZ_STORMGUST','attack',89,10,3000,1500,10000,'yes','target','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2432,'Wizard Kathryne@MG_FROSTDIVER','chase',15,1,10000,1000,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2432,'Wizard Kathryne@WZ_JUPITEL','chase',84,28,10000,1000,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2432,'Wizard Kathryne@MG_FROSTDIVER','chase',15,1,10000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2432,'Wizard Kathryne@WZ_JUPITEL','chase',84,28,10000,1000,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2433,'Priest Margaretha@PR_KYRIE','idle',73,10,10000,1000,10000,'no','randomtarget','myhpltmaxrate','99',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2433,'Priest Margaretha@PR_KYRIE','chase',73,10,10000,1000,10000,'no','target','myhpltmaxrate','100',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2433,'Priest Margaretha@PR_KYRIE','idle',73,10,10000,1000,10000,'no','friend','friendhpltmaxrate','100',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2433,'Priest Margaretha@PR_KYRIE','chase',73,10,10000,1000,10000,'no','friend','friendhpltmaxrate','100',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2433,'Priest Margaretha@AL_PNEUMA','idle',25,1,10000,0,0,'yes','self','longrangeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2433,'Priest Margaretha@AL_INCAGI','attack',29,1,2000,0,240000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,'2',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2433,'Priest Margaretha@AL_INCAGI','chase',29,1,2000,0,240000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,'2',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2433,'Priest Margaretha@AL_DECAGI','chase',30,48,2000,0,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2433,'Priest Margaretha@MG_SAFETYWALL','attack',12,10,1000,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2433,'Priest Margaretha@AL_PNEUMA','attack',25,1,5000,0,10000,'yes','self','longrangeattacked',NULL,NULL,NULL,NULL,NULL,NULL,'19',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2433,'Priest Margaretha@AL_PNEUMA','chase',25,1,5000,0,10000,'yes','self','longrangeattacked',NULL,NULL,NULL,NULL,NULL,NULL,'19',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2433,'Priest Margaretha@PR_LEXDIVINA','attack',76,5,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'18',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2433,'Priest Margaretha@PR_LEXDIVINA','chase',76,5,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'18',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2433,'Priest Margaretha@PR_LEXDIVINA','idle',76,5,10000,0,5000,'yes','target','casttargeted',NULL,NULL,NULL,NULL,NULL,NULL,'18',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2433,'Priest Margaretha@PR_LEXDIVINA','attack',76,5,5000,0,5000,'yes','target','casttargeted',NULL,NULL,NULL,NULL,NULL,NULL,'18',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2433,'Priest Margaretha@PR_LEXDIVINA','chase',76,5,5000,0,5000,'yes','target','casttargeted',NULL,NULL,NULL,NULL,NULL,NULL,'18',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2433,'Priest Margaretha@PR_LEXAETERNA','attack',78,1,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2433,'Priest Margaretha@PR_LEXAETERNA','chase',78,1,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2433,'Priest Margaretha@NPC_HOLYATTACK','attack',189,10,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2433,'Priest Margaretha@AL_HEAL','attack',28,11,3000,0,2000,'yes','friend','friendhpltmaxrate','99',NULL,NULL,NULL,NULL,NULL,'3',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2433,'Priest Margaretha@AL_HEAL','attack',28,11,3000,0,2000,'yes','self','myhpltmaxrate','99',NULL,NULL,NULL,NULL,NULL,'3',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2433,'Priest Margaretha@AL_HEAL','idle',28,11,3000,0,2000,'yes','friend','friendhpltmaxrate','99',NULL,NULL,NULL,NULL,NULL,'3',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2433,'Priest Margaretha@AL_HEAL','idle',28,11,3000,0,2000,'yes','self','myhpltmaxrate','99',NULL,NULL,NULL,NULL,NULL,'3',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2433,'Priest Margaretha@AL_HEAL','chase',28,11,3000,0,2000,'yes','friend','friendhpltmaxrate','99',NULL,NULL,NULL,NULL,NULL,'3',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2433,'Priest Margaretha@AL_HEAL','chase',28,11,3000,0,2000,'yes','self','myhpltmaxrate','99',NULL,NULL,NULL,NULL,NULL,'3',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2434,'Crusader Egnigem@CR_SHIELDCHARGE','attack',250,5,2000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2434,'Crusader Egnigem@CR_SHIELDBOOMERANG','idle',251,5,10000,0,0,'yes','randomtarget','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2434,'Crusader Egnigem@CR_SHIELDBOOMERANG','chase',251,5,10000,0,0,'yes','target','skillused','18',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2434,'Crusader Egnigem@CR_SHIELDBOOMERANG','follow',251,5,10000,0,0,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2434,'Crusader Egnigem@CR_DEFENDER','idle',257,3,10000,0,0,'yes','self','longrangeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2434,'Crusader Egnigem@CR_DEFENDER','chase',257,3,5000,0,10000,'yes','self','longrangeattacked',NULL,NULL,NULL,NULL,NULL,NULL,'19',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2434,'Crusader Egnigem@CR_DEFENDER','attack',257,3,5000,0,10000,'yes','self','longrangeattacked',NULL,NULL,NULL,NULL,NULL,NULL,'19',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2434,'Crusader Egnigem@CR_AUTOGUARD','chase',249,10,2000,0,300000,'yes','self','longrangeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2434,'Crusader Egnigem@CR_AUTOGUARD','attack',249,10,2000,0,300000,'yes','self','longrangeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2434,'Crusader Egnigem@CR_REFLECTSHIELD','attack',252,3,1000,0,200000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,'7',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2434,'Crusader Egnigem@CR_REFLECTSHIELD','chase',252,5,10000,0,300000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,'32',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2434,'Crusader Egnigem@CR_GRANDCROSS','attack',254,10,2000,500,2500,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2434,'Crusader Egnigem@CR_HOLYCROSS','attack',253,10,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2434,'Crusader Egnigem@AL_HEAL','idle',28,5,3000,0,2000,'yes','friend','friendhpltmaxrate','99',NULL,NULL,NULL,NULL,NULL,'3',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2434,'Crusader Egnigem@AL_HEAL','chase',28,5,3000,0,2000,'yes','friend','friendhpltmaxrate','99',NULL,NULL,NULL,NULL,NULL,'3',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2435,'Rogue Wickebine@TF_THROWSTONE','chase',152,1,10000,0,3000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2435,'Rogue Wickebine@TF_THROWSTONE','follow',152,1,10000,0,3000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2435,'Rogue Wickebine@NPC_POISON','attack',176,5,1000,800,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2435,'Rogue Wickebine@RG_STRIPWEAPON','attack',215,5,500,0,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'18',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2435,'Rogue Wickebine@RG_STRIPARMOR','attack',217,5,500,0,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'18',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2435,'Rogue Wickebine@RG_STRIPSHIELD','attack',216,5,500,0,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'17',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2435,'Rogue Wickebine@RG_STRIPHELM','attack',218,5,500,0,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2435,'Rogue Wickebine@RG_INTIMIDATE','attack',219,10,2000,0,60000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2435,'Rogue Wickebine@RG_CLOSECONFINE','attack',1005,1,1000,0,30000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2435,'Rogue Wickebine@NPC_POISONATTACK','attack',188,5,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2436,'Alchemist Armeyer@ITM_TOMAHAWK','idle',337,1,10000,0,0,'yes','randomtarget','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2436,'Alchemist Armeyer@ITM_TOMAHAWK','chase',337,1,10000,0,0,'yes','target','skillused','18',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2436,'Alchemist Armeyer@ITM_TOMAHAWK','follow',337,1,10000,0,0,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2436,'Alchemist Armeyer@BS_ADRENALINE','attack',111,10,2000,0,150000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2436,'Alchemist Armeyer@MC_MAMMONITE','attack',42,22,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'23',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2436,'Alchemist Armeyer@AM_DEMONSTRATION','chase',229,5,5000,0,2000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2436,'Alchemist Armeyer@AM_DEMONSTRATION','attack',229,5,5000,0,2000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2436,'Alchemist Armeyer@AM_POTIONPITCHER','idle',231,4,10000,0,0,'yes','friend','friendhpltmaxrate','90',NULL,NULL,NULL,NULL,NULL,'2',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2436,'Alchemist Armeyer@AM_POTIONPITCHER','attack',231,4,10000,0,0,'yes','friend','friendhpltmaxrate','90',NULL,NULL,NULL,NULL,NULL,'2',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2436,'Alchemist Armeyer@NPC_CRITICALSLASH','attack',170,1,500,500,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2437,'Bard Kavach@AC_DOUBLE','attack',46,10,2000,0,3000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2437,'Bard Kavach@AC_SHOWER','attack',47,10,2000,0,3000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2437,'Bard Kavach@AC_CHARGEARROW','attack',148,1,2000,0,3000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2437,'Bard Kavach@NPC_RUN','follow',354,1,10000,0,5000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,'22',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2437,'Bard Kavach@BA_FROSTJOKER','idle',318,3,100,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2437,'Bard Kavach@BA_FROSTJOKER','chase',318,3,100,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2437,'Bard Kavach@BA_FROSTJOKER','follow',318,3,100,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2437,'Bard Kavach@NPC_WINDATTACK','attack',187,5,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2438,'Dancer Josephina@AC_DOUBLE','attack',46,10,2000,0,3000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2438,'Dancer Josephina@AC_SHOWER','attack',47,10,2000,0,3000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2438,'Dancer Josephina@AC_CHARGEARROW','attack',148,1,2000,0,3000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2438,'Dancer Josephina@NPC_RUN','follow',354,1,10000,0,5000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,'22',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2438,'Dancer Josephina@DC_SCREAM','idle',326,3,100,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2438,'Dancer Josephina@DC_SCREAM','chase',326,3,100,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2438,'Dancer Josephina@DC_SCREAM','follow',326,3,100,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2438,'Dancer Josephina@NPC_WINDATTACK','attack',187,5,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2439,'Sage Laurell@MG_SOULSTRIKE','idle',13,10,10000,0,1000,'yes','randomtarget','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2439,'Sage Laurell@MG_SOULSTRIKE','attack',13,10,5000,0,1000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2439,'Sage Laurell@MG_SOULSTRIKE','chase',13,10,3000,500,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2439,'Sage Laurell@MG_SAFETYWALL','attack',12,10,1000,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2439,'Sage Laurell@SA_SPELLBREAKER','attack',277,5,1000,0,10000,'yes','target','casttargeted',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2439,'Sage Laurell@SA_DISPELL','attack',289,1,200,0,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'18',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2439,'Sage Laurell@MG_THUNDERSTORM','attack',21,20,1000,1500,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2439,'Sage Laurell@SA_LANDPROTECTOR','attack',288,1,3000,500,10000,'no','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,'32',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2439,'Sage Laurell@NPC_MENTALBREAKER','attack',159,3,500,800,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2439,'Sage Laurell@NPC_MENTALBREAKER','chase',159,3,500,800,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2439,'Sage Laurell@SA_LANDPROTECTOR','chase',288,1,3000,500,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2439,'Sage Laurell@SA_LANDPROTECTOR','chase',288,1,3000,500,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2440,'Monk Errende@MO_FINGEROFFENSIVE','idle',267,3,10000,0,0,'yes','randomtarget','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2440,'Monk Errende@MO_FINGEROFFENSIVE','chase',267,3,10000,0,0,'yes','target','skillused','18',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2440,'Monk Errende@MO_FINGEROFFENSIVE','follow',267,3,10000,0,0,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2440,'Monk Errende@MO_TRIPLEATTACK','attack',263,5,1000,0,0,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2440,'Monk Errende@MO_INVESTIGATE','attack',266,5,1000,0,0,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2440,'Monk Errende@MO_BODYRELOCATION','chase',264,1,2000,500,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2440,'Monk Errende@MO_BODYRELOCATION','walk',264,1,2000,500,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2440,'Monk Errende@MO_EXTREMITYFIST','attack',271,5,100,1500,15000,'no','target','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,'32',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2440,'Monk Errende@MO_EXTREMITYFIST','attack',271,5,50,1500,15000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2441,'The Last One@AL_TELEPORT','idle',26,1,10000,0,0,'yes','self','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2441,'The Last One@AL_TELEPORT','walk',26,1,5000,0,5000,'yes','self','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2441,'The Last One@NPC_CRITICALSLASH','attack',170,1,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2441,'The Last One@NPC_POWERUP','attack',349,5,10000,0,30000,'yes','self','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2441,'The Last One@NPC_AGIUP','attack',350,5,10000,0,30000,'yes','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2441,'The Last One@KN_TWOHANDQUICKEN','attack',60,30,10000,0,120000,'yes','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2441,'The Last One@NPC_HELLJUDGEMENT','attack',662,5,10000,700,15000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2441,'The Last One@NPC_CALLSLAVE','attack',352,1,10000,0,10000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2441,'The Last One@NPC_CALLSLAVE','idle',352,1,10000,0,10000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2441,'The Last One@NPC_SUMMONSLAVE','attack',196,1,10000,700,10000,'no','self','slavele','3',2428,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2441,'The Last One@NPC_SUMMONSLAVE','idle',196,1,10000,700,10000,'no','self','slavele','3',2428,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2442,'King of the Alley@AL_TELEPORT','idle',26,1,10000,0,0,'yes','self','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2442,'King of the Alley@AL_TELEPORT','walk',26,1,5000,0,5000,'yes','self','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2442,'King of the Alley@NPC_WIDESILENCE','attack',663,5,10000,1000,20000,'no','self','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,'32',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2442,'King of the Alley@NPC_WIDESILENCE','chase',663,5,10000,1000,20000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,'18',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2442,'King of the Alley@WZ_STORMGUST','attack',89,10,2000,500,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'21',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2442,'King of the Alley@WZ_STORMGUST','chase',89,10,10000,500,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'21',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2442,'King of the Alley@NPC_EARTHQUAKE','attack',653,5,10000,1500,30000,'no','self','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,'32',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2442,'King of the Alley@NPC_EARTHQUAKE','chase',653,5,10000,1500,30000,'no','self','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,'32',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2442,'King of the Alley@MG_SAFETYWALL','attack',12,10,1000,0,5000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2442,'King of the Alley@HW_GANBANTEIN','attack',483,1,10000,500,7000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2442,'King of the Alley@NPC_WIDESLEEP','attack',668,5,10000,1000,20000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2442,'King of the Alley@NPC_WIDESLEEP','chase',668,5,10000,1000,20000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2442,'King of the Alley@NPC_CALLSLAVE','attack',352,1,10000,0,10000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2442,'King of the Alley@NPC_CALLSLAVE','idle',352,1,10000,0,10000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2442,'King of the Alley@NPC_SUMMONSLAVE','attack',196,1,10000,700,10000,'no','self','slavele','3',2434,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2442,'King of the Alley@NPC_SUMMONSLAVE','idle',196,1,10000,700,10000,'no','self','slavele','3',2434,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2442,'King of the Alley@WZ_JUPITEL','attack',84,28,5000,0,0,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2442,'King of the Alley@WZ_JUPITEL','chase',84,28,5000,0,0,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2442,'King of the Alley@WZ_JUPITEL','attack',84,28,5000,0,0,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2442,'King of the Alley@WZ_JUPITEL','chase',84,28,5000,0,0,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2443,'Aira@KN_SPEARBOOMERANG','idle',59,5,10000,0,0,'no','randomtarget','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2443,'Aira@KN_SPEARBOOMERANG','chase',59,5,10000,0,0,'no','target','skillused','18',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2443,'Aira@KN_SPEARBOOMERANG','follow',59,5,10000,0,0,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2443,'Aira@KN_TWOHANDQUICKEN','attack',60,30,10000,0,300000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,'2',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2443,'Aira@KN_BOWLINGBASH','attack',62,5,1000,0,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2443,'Aira@SM_BASH','attack',5,10,1000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2443,'Aira@KN_PIERCE','attack',56,10,1000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2443,'Aira@SM_MAGNUM','attack',7,25,1000,0,0,'no','self','attackpcge','2',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2443,'Aira@SM_PROVOKE','attack',6,5,1000,0,300000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2443,'Aira@SM_PROVOKE','chase',6,5,1000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2443,'Aira@NPC_CRITICALSLASH','attack',170,1,2000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2443,'Aira@NPC_STUNATTACK','attack',179,5,2000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2443,'Aira@NPC_FIREATTACK','attack',186,5,2000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2444,'Kuluna@MG_SOULSTRIKE','idle',13,10,10000,0,1000,'no','randomtarget','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2444,'Kuluna@MG_SOULSTRIKE','attack',13,10,5000,0,1000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2444,'Kuluna@MG_SOULSTRIKE','chase',13,10,3000,500,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2444,'Kuluna@MG_SAFETYWALL','attack',12,10,1000,0,5000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2444,'Kuluna@SA_SPELLBREAKER','attack',277,5,1000,0,10000,'no','target','casttargeted',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2444,'Kuluna@SA_DISPELL','attack',289,1,200,0,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'18',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2444,'Kuluna@MG_THUNDERSTORM','attack',21,20,1000,1500,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2444,'Kuluna@SA_LANDPROTECTOR','attack',288,1,3000,500,10000,'yes','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,'32',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2444,'Kuluna@SA_LANDPROTECTOR','chase',288,1,3000,500,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2444,'Kuluna@NPC_MENTALBREAKER','attack',159,3,500,800,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2444,'Kuluna@NPC_MENTALBREAKER','chase',159,3,500,800,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2445,'Mallina@ITM_TOMAHAWK','idle',337,1,10000,0,0,'no','randomtarget','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2445,'Mallina@ITM_TOMAHAWK','chase',337,1,10000,0,0,'no','target','skillused','18',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2445,'Mallina@ITM_TOMAHAWK','follow',337,1,10000,0,0,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2445,'Mallina@BS_ADRENALINE','attack',111,10,2000,0,150000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2445,'Mallina@MC_MAMMONITE','attack',42,22,2000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'23',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2445,'Mallina@AM_DEMONSTRATION','chase',229,5,5000,0,2000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2445,'Mallina@AM_DEMONSTRATION','attack',229,5,5000,0,2000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2445,'Mallina@AM_POTIONPITCHER','idle',231,4,10000,0,0,'no','friend','friendhpltmaxrate','90',NULL,NULL,NULL,NULL,NULL,'2',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2445,'Mallina@AM_POTIONPITCHER','attack',231,4,10000,0,0,'no','friend','friendhpltmaxrate','90',NULL,NULL,NULL,NULL,NULL,'2',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2445,'Mallina@NPC_CRITICALSLASH','attack',170,1,500,500,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2446,'Ezella@AC_DOUBLE','attack',46,10,2000,0,3000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2446,'Ezella@AC_SHOWER','attack',47,10,2000,0,3000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2446,'Ezella@AC_CHARGEARROW','attack',148,1,2000,0,3000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2446,'Ezella@NPC_RUN','follow',354,1,10000,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,'22',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2446,'Ezella@HT_SKIDTRAP','idle',115,5,2000,0,60000,'no','around2','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2446,'Ezella@HT_SKIDTRAP','attack',115,5,500,0,5000,'no','around2','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2446,'Ezella@HT_FLASHER','idle',120,5,2000,0,60000,'no','around2','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2446,'Ezella@HT_FLASHER','attack',120,5,500,0,5000,'no','around2','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2446,'Ezella@HT_FREEZINGTRAP','idle',121,5,2000,0,60000,'no','around2','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2446,'Ezella@HT_FREEZINGTRAP','attack',121,5,500,0,5000,'no','around2','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2446,'Ezella@NPC_CRITICALSLASH','attack',170,1,1000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2446,'Ezella@NPC_STUNATTACK','attack',179,5,1000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2446,'Ezella@NPC_WINDATTACK','attack',187,5,1000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2447,'Lune@BS_ADRENALINE','attack',111,10,2000,0,150000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2447,'Lune@BS_MAXIMIZE','attack',114,1,1000,0,60000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2447,'Lune@MC_MAMMONITE','attack',42,22,2000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'23',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2447,'Lune@BS_HAMMERFALL','chase',110,5,2000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2447,'Lune@BS_HAMMERFALL','attack',110,5,2000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2447,'Lune@NPC_ARMORBRAKE','attack',344,10,1000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'19',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2447,'Lune@NPC_CRITICALSLASH','attack',170,1,1000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2447,'Lune@NPC_FIREATTACK','attack',186,5,1000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2447,'Lune@NPC_WATERATTACK','attack',184,5,1000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2448,'Morin@AS_CLOAKING','attack',135,3,2000,200,5000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2448,'Morin@AS_CLOAKING','idle',135,3,2000,200,5000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2448,'Morin@AS_CLOAKING','chase',135,3,2000,200,5000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2448,'Morin@AS_GRIMTOOTH','idle',137,5,10000,0,0,'no','randomtarget','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2448,'Morin@AS_GRIMTOOTH','chase',137,5,10000,0,0,'no','target','skillused','18',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2448,'Morin@AS_SONICBLOW','attack',136,10,2000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2448,'Morin@AS_GRIMTOOTH','chase',137,5,2000,0,0,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2448,'Morin@AS_VENOMDUST','idle',140,10,2000,0,50000,'no','randomtarget','always','0',NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2448,'Morin@AS_VENOMDUST','attack',140,10,2000,0,50000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2448,'Morin@NPC_CRITICALSLASH','attack',170,1,1000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2448,'Morin@NPC_STUNATTACK','attack',179,5,1000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2448,'Morin@NPC_POISONATTACK','attack',188,5,1000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2449,'Nasarin@TF_THROWSTONE','chase',152,1,10000,0,3000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2449,'Nasarin@TF_THROWSTONE','follow',152,1,10000,0,3000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2449,'Nasarin@NPC_POISON','attack',176,5,1000,800,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2449,'Nasarin@RG_STRIPWEAPON','attack',215,5,500,0,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'18',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2449,'Nasarin@RG_STRIPARMOR','attack',217,5,500,0,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'18',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2449,'Nasarin@RG_STRIPSHIELD','attack',216,5,500,0,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'17',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2449,'Nasarin@RG_STRIPHELM','attack',218,5,500,0,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2449,'Nasarin@RG_INTIMIDATE','attack',219,10,2000,0,60000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2449,'Nasarin@RG_CLOSECONFINE','attack',1005,1,1000,0,30000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2449,'Nasarin@NPC_POISONATTACK','attack',188,5,1000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+
+# Old Glast Heim
+REPLACE INTO `mob_skill_db_re` VALUES (2464,'Corrupted Steward@NPC_UNDEADATTACK','chase',347,3,5000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2464,'Corrupted Steward@AL_HEAL','idle',28,1,5000,1000,3000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,'26',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2464,'Corrupted Steward@NPC_UNDEADATTACK','attack',347,3,5000,500,3000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'28',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2464,'Corrupted Steward@NPC_BLOODDRAIN','attack',199,1,5000,500,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'47',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2465,'Corrupted Monk@NPC_CURSEATTACK','chase',181,5,5000,800,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2465,'Corrupted Monk@NPC_BLINDATTACK','attack',177,5,5000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2465,'Corrupted Monk@NPC_CURSEATTACK','attack',181,5,5000,800,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2465,'Corrupted Monk@NPC_ENERGYDRAIN','attack',200,1,5000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2466,'Grand Chamberlain in pain@NPC_UNDEADATTACK','chase',347,4,5000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2466,'Grand Chamberlain in pain@AL_HEAL','idle',28,1,5000,1000,3000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,'26',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2466,'Grand Chamberlain in pain@NPC_BLEEDING','attack',660,4,500,900,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2466,'Grand Chamberlain in pain@NPC_UNDEADATTACK','attack',347,4,5000,500,3000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'28',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2466,'Grand Chamberlain in pain@NPC_BLOODDRAIN','attack',199,2,5000,500,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'47',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2467,'Maggot@NPC_GROUNDATTACK','attack',185,5,2000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2467,'Maggot@NPC_EMOTION','chase',197,1,200,0,5000,'no','self','always','0',19,0x81,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2467,'Maggot@NPC_EMOTION','idle',197,1,2000,0,5000,'no','self','always','0',7,0x3095,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2468,'Corrupted Palace Guard@SM_BASH','chase',5,8,5000,1000,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2468,'Corrupted Palace Guard@BS_MAXIMIZE','chase',114,5,5000,1000,5000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2468,'Corrupted Palace Guard@CR_AUTOGUARD','chase',249,2,2000,0,300000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2468,'Corrupted Palace Guard@SM_MAGNUM','attack',7,9,5000,1000,5000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2468,'Corrupted Palace Guard@NPC_DARKNESSATTACK','attack',190,5,5000,500,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2469,'Wandering Archer@AC_DOUBLE','chase',46,5,5000,1000,1000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2469,'Wandering Archer@AC_CHARGEARROW','attack',148,1,5000,0,50000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2469,'Wandering Archer@NPC_DARKNESSATTACK','attack',190,5,5000,1000,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2469,'Wandering Archer@AC_DOUBLE','attack',46,9,5000,1800,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2470,'Corrupted Knight of Abyss@NPC_DARKSTRIKE','idle',340,3,5000,0,10000,'no','target','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2470,'Corrupted Knight of Abyss@CR_AUTOGUARD','chase',249,10,2000,0,300000,'no','self','longrangeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2470,'Corrupted Knight of Abyss@AC_CHARGEARROW','chase',148,1,500,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2470,'Corrupted Knight of Abyss@KN_BRANDISHSPEAR','attack',57,10,500,2000,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2470,'Corrupted Knight of Abyss@NPC_DARKNESSATTACK','attack',190,9,500,1500,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'7',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2470,'Corrupted Knight of Abyss@NPC_CRITICALSLASH','attack',170,1,500,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2472,'Bloody Knight@WZ_METEOR','chase',83,7,2000,0,10000,'no','target','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2472,'Bloody Knight@WZ_METEOR','attack',83,7,2000,0,5000,'no','target','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2472,'Bloody Knight@KN_BRANDISHSPEAR','attack',57,7,500,1000,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2472,'Bloody Knight@NPC_DARKNESSATTACK','attack',190,3,500,500,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2472,'Bloody Knight@NPC_PULSESTRIKE','attack',661,3,500,2000,10000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,'7',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2475,'Corrupted Soul@NPC_EARTHQUAKE','idle',653,2,10000,5000,5000,'yes','self','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,'7',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2475,'Corrupted Soul@NPC_EVILLAND','idle',670,10,7000,3000,5000,'yes','randomtarget','always','0',NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2475,'Corrupted Soul@NPC_HELLJUDGEMENT','idle',662,5,10000,5000,0,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2475,'Corrupted Soul@NPC_VAMPIRE_GIFT','idle',679,5,2000,5000,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2475,'Corrupted Soul@NPC_BLOODDRAIN','idle',199,1,2000,0,2000,'no','randomtarget','always','0',NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2475,'Corrupted Soul@AM_DEMONSTRATION','idle',229,9,10000,0,2000,'no','randomtarget','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2475,'Corrupted Soul@NPC_HELLJUDGEMENT','idle',662,5,10000,5000,5000,'yes','self','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2475,'Corrupted Soul@AL_HEAL','idle',28,11,10000,0,5000,'no','self','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2475,'Corrupted Soul@NPC_POWERUP','idle',349,5,10000,1000,5000,'yes','self','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2475,'Corrupted Soul@NPC_EARTHQUAKE','idle',653,4,10000,5000,5000,'yes','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,'7',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2475,'Corrupted Soul@NPC_EVILLAND','idle',670,10,10000,1000,5000,'yes','randomtarget','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2475,'Corrupted Soul@NPC_HELLJUDGEMENT','idle',662,10,10000,5000,0,'yes','self','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2475,'Corrupted Soul@NPC_HELLJUDGEMENT','idle',662,8,10000,5000,0,'yes','self','casttargeted',NULL,NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2475,'Corrupted Soul@NPC_HELLJUDGEMENT','idle',662,6,10000,5000,0,'yes','self','longrangeattacked',NULL,NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2475,'Corrupted Soul@NPC_WIDESOULDRAIN','idle',680,5,10000,1000,0,'yes','self','skillused','490',NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2475,'Corrupted Soul@NPC_WIDESOULDRAIN','idle',680,5,10000,1000,0,'yes','self','skillused','271',NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2475,'Corrupted Soul@NPC_DARKSTRIKE','attack',340,10,5000,1000,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2475,'Corrupted Soul@NPC_BLOODDRAIN','attack',199,1,2000,1000,0,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2475,'Corrupted Soul@NPC_CRITICALWOUND','attack',673,4,500,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2475,'Corrupted Soul@AS_SONICBLOW','attack',136,10,500,800,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2475,'Corrupted Soul@NPC_WIDECURSE','attack',677,5,10000,1000,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2475,'Corrupted Soul@NPC_WIDESILENCE','attack',663,5,8000,1000,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2475,'Corrupted Soul@NPC_WIDESTONE','attack',666,3,10000,1000,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2475,'Corrupted Soul@NPC_WIDESTUN','attack',678,3,5000,1000,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2476,'Amdarias@NPC_DARKSTRIKE','idle',340,10,10000,0,0,'no','target','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2476,'Amdarias@NPC_DARKSTRIKE','chase',340,5,5000,0,1000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2476,'Amdarias@NPC_HELLJUDGEMENT','chase',662,5,5000,4000,5000,'yes','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,'7',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2476,'Amdarias@NPC_DRAGONFEAR','chase',659,5,10000,0,0,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2476,'Amdarias@NPC_DRAGONFEAR','attack',659,5,2000,1000,20000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2476,'Amdarias@NPC_HELLJUDGEMENT','attack',662,5,10000,4000,5000,'yes','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,'7',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2476,'Amdarias@NPC_GRANDDARKNESS','attack',339,10,10000,2000,1000,'yes','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2476,'Amdarias@NPC_POWERUP','attack',349,5,10000,0,50000,'no','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2476,'Amdarias@NPC_VAMPIRE_GIFT','attack',679,5,10000,0,0,'no','self','skillused','490',NULL,NULL,NULL,NULL,NULL,'42',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2476,'Amdarias@NPC_CRITICALWOUND','attack',673,4,500,500,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2476,'Amdarias@NPC_CHANGEUNDEAD','attack',348,1,500,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'44',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2476,'Amdarias@NPC_MENTALBREAKER','attack',159,4,500,1500,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'42',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2476,'Amdarias@NPC_CRITICALSLASH','attack',170,1,10000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2476,'Amdarias@NPC_DARKCROSS','attack',338,10,5000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2476,'Amdarias@NPC_UNDEADATTACK','attack',347,10,10000,500,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2476,'Amdarias@NPC_CURSEATTACK','attack',181,5,4000,0,3000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2476,'Amdarias@NPC_STUNATTACK','attack',179,5,2000,0,3000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2476,'Amdarias@SM_MAGNUM','attack',7,25,10000,500,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
# Nightmare Glast Heim
-#REPLACE INTO `mob_skill_db_re` VALUES (2477,'Wanderer (Nightmare)@AL_TELEPORT','idle',26,1,10000,0,0,'yes','self','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2477,'Wanderer (Nightmare)@KN_AUTOCOUNTER','attack',61,5,500,0,5000,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2477,'Wanderer (Nightmare)@NPC_BLEEDING','attack',660,1,2000,0,3000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'32',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2477,'Wanderer (Nightmare)@NPC_EMOTION','idle',197,1,2000,0,5000,'yes','self','always',NULL,9,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2477,'Wanderer (Nightmare)@NPC_SPLASHATTACK','attack',174,1,2000,0,5000,'yes','target','attackpcge','2',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2477,'Wanderer (Nightmare)@NPC_UNDEADATTACK','attack',347,3,500,500,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2477,'Wanderer (Nightmare)@RG_INTIMIDATE','attack',219,1,500,0,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2478,'Rideword (Nightmare)@NPC_BLINDATTACK','attack',177,3,500,0,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2478,'Rideword (Nightmare)@NPC_BLOODDRAIN','attack',199,1,500,0,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'2',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2478,'Rideword (Nightmare)@NPC_PIERCINGATT','attack',158,3,500,0,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'2',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2479,'Mimic (Nightmare)@CR_AUTOGUARD','attack',249,2,500,0,300000,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2479,'Mimic (Nightmare)@CR_AUTOGUARD','chase',249,2,2000,0,300000,'yes','self','longrangeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2479,'Mimic (Nightmare)@NPC_BLOODDRAIN','attack',199,1,500,0,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'2',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2479,'Mimic (Nightmare)@NPC_CRITICALSLASH','attack',170,1,500,500,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'6',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2479,'Mimic (Nightmare)@NPC_EMOTION','idle',197,1,2000,0,5000,'yes','self','always',NULL,29,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2480,'Evil Druid (Nightmare)@NPC_BLINDATTACK','attack',177,3,2000,0,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'9',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2480,'Evil Druid (Nightmare)@NPC_BLINDATTACK','chase',177,3,2000,0,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'9',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2480,'Evil Druid (Nightmare)@NPC_CURSEATTACK','attack',181,3,500,800,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'9',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2480,'Evil Druid (Nightmare)@NPC_CURSEATTACK','chase',181,3,500,800,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'9',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2480,'Evil Druid (Nightmare)@NPC_ENERGYDRAIN','attack',200,1,500,0,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'9',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2480,'Evil Druid (Nightmare)@NPC_ENERGYDRAIN','chase',200,1,500,0,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'9',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2480,'Evil Druid (Nightmare)@NPC_UNDEADATTACK','attack',347,3,500,500,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'9',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2480,'Evil Druid (Nightmare)@NPC_UNDEADATTACK','chase',347,3,500,500,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'9',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2480,'Evil Druid (Nightmare)@WZ_HEAVENDRIVE','attack',91,5,500,1200,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2480,'Evil Druid (Nightmare)@WZ_HEAVENDRIVE','chase',91,5,500,1200,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2481,'Wraith Dead (Nightmare)@AL_DECAGI','chase',30,9,500,1000,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'29',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2481,'Wraith Dead (Nightmare)@AL_TELEPORT','idle',26,1,10000,0,0,'yes','self','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2481,'Wraith Dead (Nightmare)@AS_GRIMTOOTH','chase',137,5,2000,0,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2481,'Wraith Dead (Nightmare)@NPC_CURSEATTACK','attack',181,5,500,800,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'29',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2481,'Wraith Dead (Nightmare)@NPC_CURSEATTACK','chase',181,5,500,800,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'29',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2481,'Wraith Dead (Nightmare)@NPC_POISON','attack',176,5,500,800,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'29',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@AL_HEAL','idle',28,10,10000,0,5000,'yes','self','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@AL_TELEPORT','idle',26,1,10000,0,0,'yes','self','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@AL_TELEPORT','walk',26,1,5000,0,5000,'yes','self','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@KN_BRANDISHSPEAR','attack',57,10,2000,500,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'29',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@MO_BODYRELOCATION','chase',264,1,2000,200,1000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@NPC_ARMORBRAKE','attack',344,10,2000,0,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@NPC_BLEEDING','attack',660,3,500,0,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@NPC_CALLSLAVE','attack',352,1,10000,0,30000,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@NPC_CALLSLAVE','idle',352,1,10000,0,30000,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@NPC_CRITICALWOUND','attack',673,3,500,0,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@NPC_DARKBREATH','attack',202,5,2000,800,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'29',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@NPC_DARKSTRIKE','chase',340,10,2000,0,1000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@NPC_EARTHQUAKE','attack',653,5,10000,2000,30000,'no','self','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,'6',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@NPC_EARTHQUAKE','chase',653,5,10000,2000,30000,'no','self','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,'6',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@NPC_GUIDEDATTACK','attack',172,5,500,0,20000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@NPC_HELLJUDGEMENT','attack',662,5,10000,800,10000,'no','self','always',NULL,NULL,NULL,NULL,NULL,NULL,'6',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@NPC_HELLJUDGEMENT','chase',662,5,10000,800,10000,'no','self','always',NULL,NULL,NULL,NULL,NULL,NULL,'6',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@NPC_POWERUP','attack',349,5,10000,0,30000,'yes','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,'6',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@NPC_SUMMONSLAVE','attack',196,6,10000,700,10000,'no','self','slavele','3',1431,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@NPC_SUMMONSLAVE','idle',196,6,10000,700,10000,'no','self','slavele','3',1431,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@NPC_SUMMONSLAVE','idle',196,4,10000,0,0,'no','self','onspawn','0',1101,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@WZ_VERMILION','attack',85,21,2000,500,2000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'29',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@WZ_VERMILION','chase',85,21,2000,500,2000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'29',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@WZ_VERMILION','chase',85,21,5000,500,2000,'no','target','skillused','18',NULL,NULL,NULL,NULL,NULL,'29',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2485,'Chimera (Nightmare)@AL_TELEPORT','idle',26,1,10000,0,0,'yes','self','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2485,'Chimera (Nightmare)@CR_AUTOGUARD','attack',249,5,500,0,300000,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2485,'Chimera (Nightmare)@CR_AUTOGUARD','chase',249,5,2000,0,300000,'yes','self','longrangeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2485,'Chimera (Nightmare)@NPC_FIREATTACK','attack',186,5,500,500,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'6',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2485,'Chimera (Nightmare)@NPC_SHIELDBRAKE','attack',346,5,500,0,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'6',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2485,'Chimera (Nightmare)@NPC_SPLASHATTACK','attack',174,1,2000,0,5000,'yes','target','attackpcge','2',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2485,'Chimera (Nightmare)@NPC_SUMMONSLAVE','idle',196,4,10000,2000,60000,'yes','self','slavele','0',1253,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2485,'Chimera (Nightmare)@WZ_HEAVENDRIVE','attack',91,5,500,1200,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'6',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2485,'Chimera (Nightmare)@WZ_HEAVENDRIVE','chase',91,5,500,1200,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2477,'Wanderer (Nightmare)@AL_TELEPORT','idle',26,1,10000,0,0,'yes','self','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2477,'Wanderer (Nightmare)@KN_AUTOCOUNTER','attack',61,5,500,0,5000,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2477,'Wanderer (Nightmare)@NPC_SPLASHATTACK','attack',174,1,2000,0,5000,'yes','target','attackpcge','2',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2477,'Wanderer (Nightmare)@RG_INTIMIDATE','attack',219,1,500,0,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2477,'Wanderer (Nightmare)@NPC_UNDEADATTACK','attack',347,3,500,500,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2477,'Wanderer (Nightmare)@NJ_ISSEN','attack',544,10,500,500,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2477,'Wanderer (Nightmare)@NPC_BLEEDING','idle',660,5,2000,0,3000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'32',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2477,'Wanderer (Nightmare)@NPC_EMOTION','idle',197,1,2000,0,5000,'yes','self','always',NULL,9,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2478,'Rideword (Nightmare)@NPC_PIERCINGATT','attack',158,3,500,0,0,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'2',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2478,'Rideword (Nightmare)@NPC_BLINDATTACK','attack',177,3,500,0,0,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2478,'Rideword (Nightmare)@NPC_BLOODDRAIN','attack',199,1,500,0,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'2',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2479,'Mimic (Nightmare)@NPC_CRITICALSLASH','attack',170,1,500,500,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2479,'Mimic (Nightmare)@NPC_BLOODDRAIN','attack',199,1,500,0,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'2',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2479,'Mimic (Nightmare)@CR_AUTOGUARD','attack',249,2,500,0,300000,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2479,'Mimic (Nightmare)@CR_AUTOGUARD','chase',249,2,2000,0,300000,'yes','self','longrangeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2479,'Mimic (Nightmare)@NPC_EMOTION','idle',197,1,2000,0,5000,'yes','self','always',NULL,29,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2480,'Evil Druid (Nightmare)@WZ_HEAVENDRIVE','attack',91,5,500,1200,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2480,'Evil Druid (Nightmare)@WZ_HEAVENDRIVE','chase',91,5,500,1200,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2480,'Evil Druid (Nightmare)@NPC_BLINDATTACK','attack',177,3,2000,0,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2480,'Evil Druid (Nightmare)@NPC_BLINDATTACK','chase',177,3,2000,0,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2480,'Evil Druid (Nightmare)@NPC_CURSEATTACK','attack',181,3,500,800,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2480,'Evil Druid (Nightmare)@NPC_CURSEATTACK','chase',181,3,500,800,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2480,'Evil Druid (Nightmare)@NPC_ENERGYDRAIN','attack',200,1,500,0,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2480,'Evil Druid (Nightmare)@NPC_ENERGYDRAIN','chase',200,1,500,0,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2480,'Evil Druid (Nightmare)@NPC_UNDEADATTACK','attack',347,3,500,500,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2480,'Evil Druid (Nightmare)@NPC_UNDEADATTACK','chase',347,3,500,500,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2480,'Evil Druid (Nightmare)@NPC_EMOTION','idle',197,1,2000,0,5000,'yes','self','always',NULL,29,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2481,'Wraith Dead (Nightmare)@NPC_POISON','attack',176,5,500,800,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2481,'Wraith Dead (Nightmare)@NPC_BLINDATTACK','attack',177,3,2000,0,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2481,'Wraith Dead (Nightmare)@NPC_CURSEATTACK','attack',181,3,500,800,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2481,'Wraith Dead (Nightmare)@NPC_CURSEATTACK','chase',181,3,500,800,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2481,'Wraith Dead (Nightmare)@NPC_ENERGYDRAIN','attack',200,1,500,0,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@AL_TELEPORT','idle',26,1,10000,0,0,'yes','self','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@AL_TELEPORT','walk',26,1,5000,0,5000,'yes','self','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@AL_HEAL','idle',28,10,10000,0,5000,'yes','self','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@KN_BRANDISHSPEAR','attack',57,10,2000,500,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@WZ_VERMILION','attack',85,10,2000,500,2000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@WZ_VERMILION','chase',85,10,2000,500,2000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@WZ_VERMILION','chase',85,10,5000,500,2000,'no','target','skillused','18',NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@NPC_GUIDEDATTACK','attack',172,5,500,0,20000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@NPC_DARKBREATH','attack',202,5,2000,800,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@MO_BODYRELOCATION','chase',264,1,2000,200,1000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@NPC_DARKSTRIKE','chase',340,10,2000,0,1000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@NPC_ARMORBRAKE','attack',344,10,2000,0,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@NPC_POWERUP','attack',349,5,10000,0,30000,'yes','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@NPC_EARTHQUAKE','attack',653,5,10000,2000,30000,'no','self','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@NPC_EARTHQUAKE','chase',653,5,10000,2000,30000,'no','self','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@NPC_HELLJUDGEMENT','attack',662,5,10000,800,10000,'no','self','always',NULL,NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@NPC_HELLJUDGEMENT','chase',662,5,10000,800,10000,'no','self','always',NULL,NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@NPC_CALLSLAVE','attack',352,1,10000,0,30000,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@NPC_CALLSLAVE','idle',352,1,10000,0,30000,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@NPC_SUMMONSLAVE','attack',196,6,10000,700,10000,'no','self','slavele','3',2484,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@NPC_SUMMONSLAVE','idle',196,6,10000,700,10000,'no','self','slavele','3',2484,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2483,'Baphomet (Nightmare)@NPC_SUMMONSLAVE','idle',196,4,10000,0,0,'no','self','onspawn','0',2484,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2484,'Baphomet Jr. (Nightmare)@AL_TELEPORT','idle',26,1,10000,0,0,'yes','self','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2484,'Baphomet Jr. (Nightmare)@NPC_CURSEATTACK','attack',181,3,500,800,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2484,'Baphomet Jr. (Nightmare)@NPC_DARKNESSATTACK','attack',190,2,500,500,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2484,'Baphomet Jr. (Nightmare)@NPC_HALLUCINATION','attack',207,1,500,500,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2484,'Baphomet Jr. (Nightmare)@NPC_HALLUCINATION','chase',207,1,500,500,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2484,'Baphomet Jr. (Nightmare)@SA_DISPELL','attack',289,1,0,0,30000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2484,'Baphomet Jr. (Nightmare)@NPC_EMOTION','walk',197,1,2000,0,5000,'yes','self','always',NULL,2,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2484,'Baphomet Jr. (Nightmare)@NPC_EMOTION','chase',197,1,200,0,5000,'yes','self','always',NULL,19,0x0081,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2484,'Baphomet Jr. (Nightmare)@NPC_EMOTION','idle',197,1,2000,0,5000,'yes','self','always',NULL,6,0x3695,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2485,'Chimera (Nightmare)@AL_TELEPORT','idle',26,1,10000,0,0,'yes','self','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2485,'Chimera (Nightmare)@WZ_HEAVENDRIVE','attack',91,5,500,1200,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2485,'Chimera (Nightmare)@WZ_HEAVENDRIVE','chase',91,5,500,1200,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2485,'Chimera (Nightmare)@NPC_SPLASHATTACK','attack',174,1,2000,0,5000,'yes','target','attackpcge','2',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2485,'Chimera (Nightmare)@NPC_FIREATTACK','attack',186,5,500,500,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2485,'Chimera (Nightmare)@CR_AUTOGUARD','attack',249,5,500,0,300000,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2485,'Chimera (Nightmare)@CR_AUTOGUARD','chase',249,5,2000,0,300000,'yes','self','longrangeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2485,'Chimera (Nightmare)@NPC_SHIELDBRAKE','attack',346,5,500,0,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2485,'Chimera (Nightmare)@NPC_SUMMONSLAVE','idle',196,4,10000,2000,60000,'yes','self','slavele','0',1253,NULL,NULL,NULL,NULL,NULL,NULL);
+
+REPLACE INTO `mob_skill_db_re` VALUES (2528,'Faceworm@NPC_POISON','attack',176,4,10000,0,0,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2528,'Faceworm@NPC_POISONATTACK','attack',188,2,10000,0,0,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2529,'Faceworm Queen@AS_VENOMDUST','idle',140,5,10000,1000,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2529,'Faceworm Queen@NPC_EARTHQUAKE','attack',653,1,10000,5000,10000,'no','self','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2529,'Faceworm Queen@RG_CLOSECONFINE','chase',1005,1,10000,1000,10000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'9',NULL);
+#REPLACE INTO `mob_skill_db_re` VALUES (2529,'Faceworm Queen@NPC_DRAGONFEAR','attack',659,5,10000,1000,5000,'no','self','always',NULL,NULL,NULL,NULL,NULL,NULL,'9',NULL);
+#REPLACE INTO `mob_skill_db_re` VALUES (2529,'Faceworm Queen@NPC_DRAGONFEAR','chase',659,5,10000,1000,5000,'no','self','always',NULL,NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2529,'Faceworm Queen@NPC_ACIDBREATH','chase',657,10,10000,5000,10000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2529,'Faceworm Queen@KN_PIERCE','chase',56,10,10000,500,0,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2529,'Faceworm Queen@KN_PIERCE','attack',56,10,10000,500,0,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2529,'Faceworm Queen@NPC_CRITICALWOUND','attack',673,3,10000,500,10000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2529,'Faceworm Queen@NPC_CRITICALWOUND','chase',673,3,10000,500,10000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2530,'Faceworm Dark@AS_VENOMDUST','idle',140,3,10000,1000,10000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2530,'Faceworm Dark@AS_VENOMDUST','attack',140,3,10000,1000,10000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2530,'Faceworm Dark@AS_VENOMDUST','chase',140,3,10000,1000,10000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+#REPLACE INTO `mob_skill_db_re` VALUES (2530,'Faceworm Dark@NPC_DRAGONFEAR','attack',659,3,10000,1000,0,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,'9',NULL);
+#REPLACE INTO `mob_skill_db_re` VALUES (2530,'Faceworm Dark@NPC_DRAGONFEAR','chase',659,3,10000,1000,0,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2530,'Faceworm Dark@NPC_ACIDBREATH','chase',657,5,10000,5000,0,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2530,'Faceworm Dark@KN_PIERCE','chase',56,5,10000,500,0,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2530,'Faceworm Dark@KN_PIERCE','attack',56,5,10000,500,0,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2530,'Faceworm Dark@NPC_CRITICALWOUND','attack',673,1,10000,500,10000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2530,'Faceworm Dark@NPC_CRITICALWOUND','chase',673,1,10000,500,10000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2531,'Venom Bug@NPC_SELFDESTRUCTION','idle',173,1,10000,5000,0,'no','self','always',NULL,NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2531,'Venom Bug@NPC_SELFDESTRUCTION','attack',173,1,10000,5000,0,'no','self','always',NULL,NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2531,'Venom Bug@NPC_SELFDESTRUCTION','chase',173,1,10000,5000,0,'no','self','always',NULL,NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2532,'Red Faceworm Queen@NPC_POWERUP','attack',349,5,10000,0,30000,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2532,'Red Faceworm Queen@NPC_POWERUP','chase',349,5,10000,0,30000,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2532,'Red Faceworm Queen@NPC_AGIUP','attack',350,10,10000,0,30000,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,'7',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2532,'Red Faceworm Queen@NPC_AGIUP','chase',350,10,10000,0,30000,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,'7',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2532,'Red Faceworm Queen@NPC_PULSESTRIKE','chase',661,10,1000,3000,30000,'no','self','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2532,'Red Faceworm Queen@NPC_PULSESTRIKE','attack',661,10,1000,3000,30000,'no','self','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2532,'Red Faceworm Queen@NPC_EARTHQUAKE','chase',653,5,10000,3000,30000,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,'36',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2532,'Red Faceworm Queen@NPC_EARTHQUAKE','attack',653,5,10000,3000,30000,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,'36',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2532,'Red Faceworm Queen@NPC_SLOWCAST','attack',672,5,10000,500,30000,'no','self','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2532,'Red Faceworm Queen@NPC_HELLJUDGEMENT','attack',662,5,10000,3000,30000,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,'36',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2532,'Red Faceworm Queen@MO_BODYRELOCATION','chase',264,1,10000,500,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2532,'Red Faceworm Queen@NPC_DARKSTRIKE','attack',340,10,5000,700,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2532,'Red Faceworm Queen@NPC_DARKSTRIKE','chase',340,10,5000,700,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2533,'Green Faceworm Queen@WZ_HEAVENDRIVE','attack',91,5,1000,1000,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2533,'Green Faceworm Queen@WZ_HEAVENDRIVE','chase',91,5,1000,1000,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2533,'Green Faceworm Queen@NPC_WIDESTUN','chase',678,5,10000,2000,30000,'no','self','always',NULL,NULL,NULL,NULL,NULL,NULL,'36',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2533,'Green Faceworm Queen@NPC_WIDESTUN','attack',678,5,10000,2000,30000,'no','self','always',NULL,NULL,NULL,NULL,NULL,NULL,'36',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2533,'Green Faceworm Queen@AL_HEAL','attack',28,9,10000,500,5000,'no','self','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2533,'Green Faceworm Queen@AL_HEAL','chase',28,9,10000,500,5000,'no','self','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2533,'Green Faceworm Queen@WZ_QUAGMIRE','attack',92,5,500,700,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2533,'Green Faceworm Queen@NPC_GROUNDATTACK','attack',185,9,3000,500,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2534,'Blue Faceworm Queen@WZ_FROSTNOVA','chase',88,10,3000,1000,10000,'no','self','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2534,'Blue Faceworm Queen@WZ_FROSTNOVA','attack',88,10,3000,1000,10000,'no','self','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2534,'Blue Faceworm Queen@NPC_WIDEFREEZE','chase',664,5,10000,2000,30000,'no','self','always',NULL,NULL,NULL,NULL,NULL,NULL,'36',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2534,'Blue Faceworm Queen@NPC_WIDEFREEZE','attack',664,5,10000,2000,30000,'no','self','always',NULL,NULL,NULL,NULL,NULL,NULL,'36',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2534,'Blue Faceworm Queen@WZ_STORMGUST','chase',89,10,2000,1000,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2534,'Blue Faceworm Queen@WZ_STORMGUST','attack',89,10,2000,1000,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2534,'Blue Faceworm Queen@NPC_WATERATTACK','attack',184,9,3000,500,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2534,'Blue Faceworm Queen@MG_FROSTDIVER','chase',15,10,10000,500,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2535,'Yellow Faceworm Queen@WZ_VERMILION','attack',85,10,2000,1000,10000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2535,'Yellow Faceworm Queen@WZ_VERMILION','chase',85,10,5000,1000,10000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2535,'Yellow Faceworm Queen@NPC_WIDEBLEEDING','chase',665,3,10000,2000,30000,'no','self','always',NULL,NULL,NULL,NULL,NULL,NULL,'36',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2535,'Yellow Faceworm Queen@NPC_WIDEBLEEDING','attack',665,3,10000,2000,30000,'no','self','always',NULL,NULL,NULL,NULL,NULL,NULL,'36',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2535,'Yellow Faceworm Queen@WZ_JUPITEL','attack',84,9,1000,500,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2535,'Yellow Faceworm Queen@WZ_JUPITEL','chase',84,9,1000,500,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2535,'Yellow Faceworm Queen@NPC_WINDATTACK','attack',187,9,3000,500,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2535,'Yellow Faceworm Queen@MG_THUNDERSTORM','attack',21,10,2000,1000,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2536,'Monster 3@NPC_INVISIBLE','idle',353,1,10000,0,30000,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2536,'Monster 3@NPC_INVISIBLE','attack',353,1,10000,0,30000,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2536,'Monster 3@NPC_VENOMFOG','idle',706,1,10000,0,3000,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2536,'Monster 3@NPC_VENOMFOG','attack',706,1,10000,0,3000,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2537,'Monster 4@NPC_INVISIBLE','idle',353,1,10000,0,30000,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2537,'Monster 4@NPC_INVISIBLE','attack',353,1,10000,0,30000,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2537,'Monster 4@NPC_VENOMFOG','idle',706,3,10000,0,3000,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2537,'Monster 4@NPC_VENOMFOG','attack',706,3,10000,0,3000,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2539,'Monster 5@NPC_INVISIBLE','idle',353,1,10000,0,30000,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2539,'Monster 5@NPC_INVISIBLE','attack',353,1,10000,0,30000,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2539,'Monster 5@WZ_WATERBALL','idle',86,5,10000,0,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2539,'Monster 5@WZ_WATERBALL','attack',86,5,10000,0,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2540,'Faceworm Egg@NPC_SUMMONMONSTER','idle',209,1,10000,10000,10000,'no','self','always','0',2541,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2541,'Faceworm Larva@NPC_BLEEDING','attack',660,5,2000,1000,1000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2541,'Faceworm Larva@NPC_POISON','attack',176,5,500,800,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2541,'Faceworm Larva@NPC_POISONATTACK','attack',188,10,2000,2000,2000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+
+# Heroes' Trail Part 1 - Sara's Memory
+# Not Yet Implemented skill
+#REPLACE INTO `mob_skill_db_re` VALUES (2542,'Irene Elder@NPC_MILLENNIUMSHIELD','idle',707,1,5000,1000,30000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+#REPLACE INTO `mob_skill_db_re` VALUES (2542,'Irene Elder@NPC_MILLENNIUMSHIELD','attack',707,1,5000,1000,30000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+#REPLACE INTO `mob_skill_db_re` VALUES (2542,'Irene Elder@NPC_MILLENNIUMSHIELD','chase',707,1,5000,1000,30000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+
+#Geffen Magic Tournament
+REPLACE INTO `mob_skill_db_re` VALUES (2549,'[PH] 게펜마법사1@MG_FIREBOLT','attack',19,5,3000,1000,3000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2549,'[PH] 게펜마법사1@MG_FIREWALL','attack',18,1,3000,2000,3000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2550,'[PH] 게펜마법사2@MG_FROSTDIVER','attack',15,5,3000,1000,3000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2550,'[PH] 게펜마법사2@MG_THUNDERSTORM','attack',21,3,3000,2000,3000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2551,'[PH] 게펜마법사3 1@NPC_COMBOATTACK','attack',171,2,5000,0,3000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2551,'[PH] 게펜마법사3 1@MG_STONECURSE','attack',16,5,5000,1000,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2551,'[PH] 게펜마법사3 1@TF_POISON','attack',52,3,3000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2552,'[PH] 게펜마법사3 2@BS_HAMMERFALL','attack',110,5,5000,1000,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2552,'[PH] 게펜마법사3 2@NPC_POWERUP','attack',349,5,5000,1000,25000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2553,'[PH] 게펜마법사3 3@ASC_BREAKER','attack',379,1,3000,1000,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2553,'[PH] 게펜마법사3 3@AS_VENOMDUST','attack',140,10,3000,1000,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2554,'[PH] 게펜마법사4@AL_INCAGI','idle',29,10,10000,1000,10000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2554,'[PH] 게펜마법사4@AL_INCAGI','attack',29,10,3000,1000,10000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2554,'[PH] 게펜마법사4@AL_DECAGI','attack',30,48,3000,1000,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2554,'[PH] 게펜마법사4@NPC_COMBOATTACK','attack',171,3,5000,0,3000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2555,'[PH] 게펜마법사5@MG_COLDBOLT','attack',14,5,3000,1000,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2555,'[PH] 게펜마법사5@WZ_STORMGUST','attack',89,1,3000,3000,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2555,'[PH] 게펜마법사5@WZ_FROSTNOVA','attack',88,5,3000,1000,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2556,'[PH] 게펜마법사6@CR_AUTOGUARD','attack',249,5,3000,500,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2556,'[PH] 게펜마법사6@CR_GRANDCROSS','attack',254,5,3000,1000,10000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2557,'[PH] 게펜마법사7@NPC_BLEEDING','attack',660,5,5000,0,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2557,'[PH] 게펜마법사7@NPC_WIDESOULDRAIN','attack',680,3,3000,500,10000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2557,'[PH] 게펜마법사7@NPC_COMBOATTACK','attack',171,10,3000,1000,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2557,'[PH] 게펜마법사7@NPC_INVISIBLE','attack',353,1,2000,1000,60000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2558,'[PH] 게펜마법사8@LK_SPIRALPIERCE','attack',397,5,3000,1000,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2558,'[PH] 게펜마법사8@SM_ENDURE','attack',8,10,3000,0,10000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2558,'[PH] 게펜마법사8@SM_MAGNUM','attack',7,25,3000,500,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+#REPLACE INTO `mob_skill_db_re` VALUES (2558,'[PH] 게펜마법사8@NPC_MILLENNIUMSHIELD','attack',707,1,3000,1000,10000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2559,'[PH] 게펜마법사9@NPC_HOLYATTACK','attack',189,10,3000,500,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2559,'[PH] 게펜마법사9@AL_HEAL','attack',28,8,3000,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2559,'[PH] 게펜마법사9@AL_PNEUMA','attack',25,1,3000,1000,10000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2560,'[PH] 게펜마법사10@NPC_MENTALBREAKER','attack',159,4,2000,1500,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2560,'[PH] 게펜마법사10@AC_DOUBLE','attack',46,5,3000,500,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2560,'[PH] 게펜마법사10@HT_ANKLESNARE','attack',117,1,2000,1000,10000,'yes','around2','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2560,'[PH] 게펜마법사10@HT_FLASHER','attack',120,1,2000,1000,10000,'yes','around2','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2561,'[PH] 게펜마법사11@MG_FIREBOLT','attack',19,5,1000,500,15000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2561,'[PH] 게펜마법사11@MG_COLDBOLT','attack',14,5,1000,500,15000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2561,'[PH] 게펜마법사11@MG_LIGHTNINGBOLT','attack',20,5,1000,500,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2561,'[PH] 게펜마법사11@WZ_EARTHSPIKE','attack',90,5,1000,500,15000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2561,'[PH] 게펜마법사11@PF_SPIDERWEB','attack',405,1,1000,1000,15000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2561,'[PH] 게펜마법사11@RG_STRIPSHIELD','attack',216,5,3000,1000,30000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2562,'[PH] 게펜마법사12@NPC_SLOWCAST','attack',672,5,1000,1000,15000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2562,'[PH] 게펜마법사12@MG_SOULSTRIKE','attack',13,10,1000,500,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2562,'[PH] 게펜마법사12@WZ_FIREPILLAR','attack',80,5,3000,500,5000,'yes','around2','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2562,'[PH] 게펜마법사12@WZ_VERMILION','attack',85,5,1000,2000,15000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2563,'Fei Kanabian@AM_DEMONSTRATION','attack',229,5,2000,500,15000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2563,'Fei Kanabian@AM_ACIDTERROR','attack',230,5,2000,1000,15000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2563,'Fei Kanabian@AM_POTIONPITCHER','attack',231,4,3000,1000,10000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2564,'Geffen Fenrir@NPC_SHIELDBRAKE','attack',346,10,3000,1000,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2564,'Geffen Fenrir@WL_EARTHSTRAIN','attack',2216,5,3000,3000,30000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+#REPLACE INTO `mob_skill_db_re` VALUES (2564,'Geffen Fenrir@NPC_COMET','attack',708,5,2000,5000,30000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2564,'Geffen Fenrir@WL_TETRAVORTEX','attack',2217,5,1000,5000,30000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2565,'Alphonse@SM_BASH','attack',5,5,1000,500,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2566,'Alphonse Jr@PR_LEXDIVINA','attack',76,1,1000,2000,60000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2566,'Alphonse Jr@PR_LEXAETERNA','attack',78,1,1000,500,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
# Champion Monsters
REPLACE INTO `mob_skill_db_re` VALUES (2603,'Swift Zombie Slaughter@AL_TELEPORT','attack',26,1,500,0,5000,'yes','self','myhpltmaxrate','50',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -10285,69 +10923,208 @@ REPLACE INTO `mob_skill_db_re` VALUES (2913,'Acidus Ringleader@NPC_WINDATTACK','
REPLACE INTO `mob_skill_db_re` VALUES (2913,'Acidus Ringleader@NPC_SUMMONSLAVE','idle',196,2,10000,700,30000,'no','self','slavele','0',1716,NULL,NULL,NULL,NULL,NULL,NULL);
# Nightmare Clock Tower Dungeon
-#REPLACE INTO `mob_skill_db_re` VALUES (2916,'Big Ben@NPC_CURSEATTACK','attack',181,3,500,800,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2916,'Big Ben@NPC_GROUNDATTACK','attack',185,3,500,500,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2916,'Big Ben@NPC_STUNATTACK','attack',179,3,500,1500,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2916,'Big Ben@NPC_EMOTION_ON','attack',474,1,10000,0,30000,'yes','self','always','0',6,0x3885,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2916,'Big Ben@NPC_EMOTION','idle',197,1,200,0,30000,'yes','self','always','0',9,0x91,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2917,'Big Bell@NPC_BLINDATTACK','attack',177,3,500,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2917,'Big Bell@NPC_DARKBREATH','attack',202,2,500,800,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'7',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2917,'Big Bell@NPC_EMOTION','chase',197,1,200,0,5000,'yes','self','always','0',19,0x81,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2917,'Big Bell@NPC_EMOTION','idle',197,1,2000,0,5000,'yes','self','always','0',6,0x3695,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2917,'Big Bell@NPC_SPLASHATTACK','attack',174,1,2000,0,5000,'yes','target','attackpcge','2',NULL,NULL,NULL,NULL,NULL,'6',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2918,'Time Keeper@AL_TELEPORT','idle',26,1,500,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2918,'Time Keeper@WZ_FIREPILLAR','idle',80,5,500,0,5000,'yes','around2','always','0',NULL,NULL,NULL,NULL,NULL,'9',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2918,'Time Keeper@SA_DISPELL','attack',289,1,500,0,30000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2918,'Time Keeper@NPC_SILENCEATTACK','attack',178,5,500,700,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'9',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2918,'Time Keeper@NPC_SILENCEATTACK','chase',178,5,500,700,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'9',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2918,'Time Keeper@NPC_SLEEPATTACK','attack',182,5,500,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'9',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2918,'Time Keeper@NPC_SLEEPATTACK','chase',182,5,500,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'9',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2918,'Time Keeper@NPC_EMOTION_ON','attack',474,1,10000,0,30000,'yes','self','always','0',6,0x3885,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2918,'Time Keeper@NPC_EMOTION','idle',197,1,200,0,30000,'yes','self','always','0',9,0x91,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2919,'Neo Punk@NPC_BLINDATTACK','attack',177,3,500,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2919,'Neo Punk@NPC_PETRIFYATTACK','attack',180,3,500,500,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'7',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2919,'Neo Punk@NPC_EMOTION','chase',197,1,200,0,5000,'yes','self','always','0',19,0x81,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2919,'Neo Punk@NPC_EMOTION','idle',197,1,2000,0,5000,'yes','self','always','0',7,0x3095,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2919,'Neo Punk@NPC_WINDATTACK','attack',187,1,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2920,'Arc Elder@MG_FIREBOLT','attack',19,7,10000,1500,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'11',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2920,'Arc Elder@MG_FROSTDIVER','chase',15,9,10000,500,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2920,'Arc Elder@MG_LIGHTNINGBOLT','chase',20,7,10000,1500,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'12',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2920,'Arc Elder@MG_STONECURSE','attack',16,10,10000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'11',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2920,'Arc Elder@SA_DISPELL','attack',289,1,0,0,30000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2920,'Arc Elder@NPC_SILENCEATTACK','attack',178,5,500,700,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2920,'Arc Elder@MG_FIREBOLT','idle',19,7,10000,1500,5000,'yes','randomtarget','always','0',NULL,NULL,NULL,NULL,NULL,'11',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2920,'Arc Elder@MG_FROSTDIVER','idle',15,9,10000,500,5000,'yes','randomtarget','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2920,'Arc Elder@MG_LIGHTNINGBOLT','idle',20,7,10000,1500,5000,'yes','randomtarget','always','0',NULL,NULL,NULL,NULL,NULL,'12',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2920,'Arc Elder@MG_STONECURSE','idle',16,10,10000,0,5000,'yes','randomtarget','always','0',NULL,NULL,NULL,NULL,NULL,'11',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2921,'Owl Viscount@AL_TELEPORT','idle',26,1,10000,0,0,'yes','self','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2921,'Owl Viscount@MG_LIGHTNINGBOLT','attack',20,3,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2921,'Owl Viscount@MG_LIGHTNINGBOLT','chase',20,3,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2921,'Owl Viscount@PR_LEXDIVINA','attack',76,3,500,1000,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2921,'Owl Viscount@PR_LEXDIVINA','chase',76,3,500,1000,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2921,'Owl Viscount@NPC_EMOTION','idle',197,1,2000,0,5000,'yes','self','always','0',32,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2921,'Owl Viscount@NPC_EMOTION','chase',197,1,200,0,5000,'yes','self','always','0',19,0xA1,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2921,'Owl Viscount@NPC_EMOTION','idle',197,1,2000,0,5000,'yes','self','always','0',6,0x37B5,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2923,'Owl Marquees@AL_TELEPORT','idle',26,1,10000,0,0,'yes','self','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2923,'Owl Marquees@MG_LIGHTNINGBOLT','attack',20,5,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2923,'Owl Marquees@MG_LIGHTNINGBOLT','chase',20,5,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2923,'Owl Marquees@NPC_EMOTION','idle',197,1,2000,0,5000,'yes','self','always','0',32,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2923,'Owl Marquees@SA_DISPELL','attack',289,5,0,0,30000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'5',NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2923,'Owl Marquees@NPC_EMOTION','chase',197,1,200,0,5000,'yes','self','always','0',19,0xA1,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2923,'Owl Marquees@NPC_EMOTION','idle',197,1,2000,0,5000,'yes','self','always','0',6,0x37B5,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (2923,'Owl Marquees@NPC_SUMMONSLAVE','idle',196,2,10000,2000,60000,'no','self','slavele','0',2921,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (3074,'Timeholder@AL_TELEPORT','idle',26,1,10000,0,0,'yes','self','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (3074,'Timeholder@AL_TELEPORT','idle',26,1,5000,0,5000,'yes','self','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (3074,'Timeholder@AL_TELEPORT','walk',26,1,5000,0,5000,'yes','self','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (3074,'Timeholder@NPC_AGIUP','attack',350,5,10000,0,30000,'yes','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (3074,'Timeholder@AL_INCAGI','chase',29,10,2000,700,300000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (3074,'Timeholder@AL_DECAGI','attack',30,48,500,0,20000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (3074,'Timeholder@AL_DECAGI','chase',30,48,500,0,20000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (3074,'Timeholder@WZ_METEOR','attack',83,11,5000,500,2000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (3074,'Timeholder@WZ_METEOR','chase',83,11,5000,500,2000,'no','target','skillused','18',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (3074,'Timeholder@WZ_METEOR','chase',83,11,5000,500,2000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (3074,'Timeholder@NPC_HELLJUDGEMENT','chase',662,10,10000,1000,10000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (3074,'Timeholder@NPC_HELLJUDGEMENT','attack',662,10,10000,1000,10000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (3074,'Timeholder@NPC_PULSESTRIKE','attack',661,5,2000,0,30000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (3074,'Timeholder@NPC_SUMMONSLAVE','attack',196,5,10000,700,10000,'no','self','slavele','0',2917,NULL,NULL,NULL,NULL,NULL,NULL);
-#REPLACE INTO `mob_skill_db_re` VALUES (3074,'Timeholder@NPC_SUMMONSLAVE','idle',196,5,10000,700,10000,'no','self','slavele','0',2917,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2916,'Big Ben@NPC_CURSEATTACK','attack',181,3,500,800,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2916,'Big Ben@NPC_GROUNDATTACK','attack',185,3,500,500,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2916,'Big Ben@NPC_STUNATTACK','attack',179,3,500,1500,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2916,'Big Ben@NPC_EMOTION','idle',197,1,200,0,30000,'yes','self','always','0',9,0x0091,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2916,'Big Ben@NPC_POWERUP','attack',349,5,10000,0,30000,'yes','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2917,'Big Bell@NPC_BLINDATTACK','attack',177,3,500,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2917,'Big Bell@NPC_DARKBREATH','attack',202,2,500,800,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'7',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2917,'Big Bell@NPC_EMOTION','chase',197,1,200,0,5000,'yes','self','always','0',19,0x0081,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2917,'Big Bell@NPC_EMOTION','idle',197,1,2000,0,5000,'yes','self','always','0',6,0x3695,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2917,'Big Bell@NPC_SPLASHATTACK','attack',174,1,2000,0,5000,'yes','target','attackpcge','2',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2917,'Big Bell@LK_SPIRALPIERCE','attack',397,5,10000,1000,10000,'yes','target','myhpltmaxrate','80',NULL,NULL,NULL,NULL,NULL,'36',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2917,'Big Bell@NPC_STONESKIN','attack',675,3,10000,0,30000,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2918,'Time Keeper@AL_TELEPORT','idle',26,1,500,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2918,'Time Keeper@WZ_FIREPILLAR','idle',80,5,500,0,5000,'yes','around2','always','0',NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2918,'Time Keeper@SA_DISPELL','attack',289,1,500,0,30000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2918,'Time Keeper@NPC_SILENCEATTACK','attack',178,5,500,700,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2918,'Time Keeper@NPC_SILENCEATTACK','chase',178,5,500,700,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2918,'Time Keeper@NPC_SLEEPATTACK','attack',182,5,500,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2918,'Time Keeper@NPC_SLEEPATTACK','chase',182,5,500,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2918,'Time Keeper@NPC_EMOTION_ON','attack',474,1,10000,0,30000,'yes','self','always','0',6,0x3885,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2918,'Time Keeper@NPC_EMOTION','idle',197,1,200,0,30000,'yes','self','always','0',9,0x0091,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2919,'Neo Punk@NPC_BLINDATTACK','attack',177,3,500,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2919,'Neo Punk@NPC_PETRIFYATTACK','attack',180,3,500,500,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'7',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2919,'Neo Punk@NPC_EMOTION','chase',197,1,200,0,5000,'yes','self','always','0',19,0x0081,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2919,'Neo Punk@NPC_EMOTION','idle',197,1,2000,0,5000,'yes','self','always','0',7,0x3095,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2919,'Neo Punk@NPC_WINDATTACK','attack',187,1,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2919,'Neo Punk@NPC_MENTALBREAKER','attack',159,1,500,800,5000,'no','target','always',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2920,'Arc Elder@MG_FIREBOLT','attack',19,7,10000,1500,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'11',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2920,'Arc Elder@MG_FROSTDIVER','chase',15,9,10000,500,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2920,'Arc Elder@MG_LIGHTNINGBOLT','chase',20,7,10000,1500,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'12',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2920,'Arc Elder@MG_STONECURSE','attack',16,10,10000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'11',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2920,'Arc Elder@MG_FIREBOLT','idle',19,7,10000,1500,5000,'yes','randomtarget','always','0',NULL,NULL,NULL,NULL,NULL,'11',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2920,'Arc Elder@MG_FROSTDIVER','idle',15,9,10000,500,5000,'yes','randomtarget','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2920,'Arc Elder@MG_LIGHTNINGBOLT','idle',20,7,10000,1500,5000,'yes','randomtarget','always','0',NULL,NULL,NULL,NULL,NULL,'12',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2920,'Arc Elder@MG_STONECURSE','idle',16,10,10000,0,5000,'yes','randomtarget','always','0',NULL,NULL,NULL,NULL,NULL,'11',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2920,'Arc Elder@NPC_STONESKIN','attack',675,3,10000,0,30000,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2920,'Arc Elder@NPC_RUN','attack',354,1,10000,0,0,'yes','self','myhpltmaxrate','99',NULL,NULL,NULL,NULL,NULL,'26',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2920,'Arc Elder@NPC_RUN','chase',354,1,10000,0,0,'yes','self','myhpltmaxrate','99',NULL,NULL,NULL,NULL,NULL,'26',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2921,'Owl Viscount@AL_TELEPORT','idle',26,1,10000,0,0,'yes','self','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2921,'Owl Viscount@MG_LIGHTNINGBOLT','attack',20,5,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2921,'Owl Viscount@MG_LIGHTNINGBOLT','chase',20,5,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2921,'Owl Viscount@PR_LEXAETERNA','attack',78,1,500,1000,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2921,'Owl Viscount@PR_LEXAETERNA','chase',78,1,500,1000,5000,'yes','target','always',NULL,NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2921,'Owl Viscount@CR_REFLECTSHIELD','attack',252,10,10000,0,300000,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2921,'Owl Viscount@CR_REFLECTSHIELD','chase',252,10,10000,0,300000,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2921,'Owl Viscount@NPC_STONESKIN','attack',675,3,10000,0,30000,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2921,'Owl Viscount@NPC_EMOTION','idle',197,1,2000,0,5000,'yes','self','always','0',32,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2921,'Owl Viscount@NPC_EMOTION','chase',197,1,200,0,5000,'yes','self','always','0',19,0x0081,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2921,'Owl Viscount@NPC_EMOTION','idle',197,1,2000,0,5000,'yes','self','always','0',6,0x3695,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2923,'Owl Marquees@AL_TELEPORT','idle',26,1,10000,0,0,'yes','self','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2923,'Owl Marquees@MG_LIGHTNINGBOLT','attack',20,3,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2923,'Owl Marquees@MG_LIGHTNINGBOLT','chase',20,3,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2923,'Owl Marquees@NPC_STONESKIN','attack',675,3,10000,0,30000,'yes','self','always',NULL,NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2923,'Owl Marquees@NPC_EMOTION','idle',197,1,2000,0,5000,'yes','self','always','0',32,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2923,'Owl Marquees@NPC_EMOTION','chase',197,1,200,0,5000,'yes','self','always','0',19,0x0081,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2923,'Owl Marquees@NPC_EMOTION','idle',197,1,2000,0,5000,'yes','self','always','0',6,0x3695,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2923,'Owl Marquees@NPC_SUMMONSLAVE','idle',196,2,10000,2000,60000,'no','self','slavele','0',2922,NULL,NULL,NULL,NULL,NULL,NULL);
+
+# Ghost Palace Memorial
+REPLACE INTO `mob_skill_db_re` VALUES (2948,'Cursed Soldier@NPC_BLINDATTACK','attack',177,5,500,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2948,'Cursed Soldier@AC_DOUBLE','attack',46,5,500,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2948,'Cursed Soldier@NPC_MAGICALATTACK','attack',192,1,500,800,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2948,'Cursed Soldier@AC_SHOWER','attack',47,3,500,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2949,'Cursed Sentinel@AS_SONICBLOW','attack',136,7,500,800,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2949,'Cursed Sentinel@NPC_CURSEATTACK','attack',181,5,500,800,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2950,'Broken Mind@NPC_BLINDATTACK','attack',177,3,1500,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'1',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2950,'Broken Mind@NPC_BLINDATTACK','chase',177,3,1500,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'1',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2950,'Broken Mind@NPC_BLOODDRAIN','attack',199,1,500,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'26',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2950,'Broken Mind@NPC_CURSEATTACK','attack',181,3,500,800,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'0',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2950,'Broken Mind@NPC_CURSEATTACK','chase',181,3,500,800,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'0',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2950,'Broken Mind@CR_REFLECTSHIELD','attack',252,2,500,0,300000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,'7',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2950,'Broken Mind@NPC_PETRIFYATTACK','attack',180,3,500,500,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'2',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2950,'Broken Mind@NPC_PETRIFYATTACK','chase',180,3,500,500,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'2',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2951,'Floating Word@NPC_BLOODDRAIN','attack',199,1,500,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'2',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2951,'Floating Word@NPC_EMOTION','idle',197,1,2000,0,5000,'no','self','always','0',29,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2951,'Floating Word@MG_FIREBALL','chase',17,5,1500,500,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2951,'Floating Word@MO_BODYRELOCATION','chase',264,1,2000,500,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2952,'Like Love@HT_SHOCKWAVE','idle',118,5,500,0,300000,'no','around2','always','0',NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2952,'Like Love@MG_LIGHTNINGBOLT','attack',20,5,500,1500,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2952,'Like Love@MG_LIGHTNINGBOLT','chase',20,5,500,1500,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2952,'Like Love@NPC_EMOTION','idle',197,1,2000,0,5000,'no','self','always','0',29,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2952,'Like Love@NPC_MAGICALATTACK','attack',192,1,500,1000,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2952,'Like Love@NPC_UNDEADATTACK','attack',347,2,2000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2952,'Like Love@WZ_JUPITEL','attack',84,3,500,1500,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2952,'Like Love@WZ_JUPITEL','chase',84,3,500,1500,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2953,'Cursed Memory@NPC_POISON','attack',176,3,500,800,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2953,'Cursed Memory@NPC_POISONATTACK','attack',188,3,500,800,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2953,'Cursed Memory@NPC_UNDEADATTACK','attack',347,2,500,500,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2954,'Colorless Vow@NPC_CRITICALSLASH','attack',170,1,500,500,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2954,'Colorless Vow@NPC_SPLASHATTACK','attack',174,1,2000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2955,'Old Friendship@NPC_POISON','attack',176,3,500,800,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2955,'Old Friendship@NPC_POISON','angry',176,3,500,800,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2956,'Sweet Slaughter@AS_GRIMTOOTH','chase',137,5,2000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2956,'Sweet Slaughter@BS_MAXIMIZE','attack',114,5,500,1000,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2956,'Sweet Slaughter@BS_MAXIMIZE','chase',114,5,500,1000,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2956,'Sweet Slaughter@NPC_SPLASHATTACK','attack',174,1,2000,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2956,'Sweet Slaughter@NPC_STUNATTACK','attack',179,3,500,1500,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2957,'Forgotten Name@NPC_CRITICALSLASH','attack',170,1,1000,500,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2957,'Forgotten Name@NPC_DARKNESSATTACK','attack',190,3,500,500,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2958,'Fatal Days@MG_SOULSTRIKE','chase',13,5,2000,0,3000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2958,'Fatal Days@AS_GRIMTOOTH','attack',137,5,10000,0,700,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2959,'Torturous Redeemer@SM_MAGNUM','attack',7,5,500,0,10000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2959,'Torturous Redeemer@NPC_FIREATTACK','attack',186,3,1000,1000,200000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2959,'Torturous Redeemer@WZ_FIREPILLAR','attack',80,5,500,0,10000,'no','around2','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2959,'Torturous Redeemer@SM_BASH','attack',5,5,500,0,5000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+
+# Horror Toy Factory
+REPLACE INTO `mob_skill_db_re` VALUES (2987,'Decorated Evil Tree@AS_GRIMTOOTH','chase',137,5,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2987,'Decorated Evil Tree@NPC_CURSEATTACK','attack',181,3,1000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2987,'Decorated Evil Tree@NPC_UNDEADATTACK','attack',347,3,500,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2987,'Decorated Evil Tree@MG_THUNDERSTORM','attack',21,20,2000,1500,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2987,'Decorated Evil Tree@TF_SPRINKLESAND','attack',149,1,500,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2987,'Decorated Evil Tree@MG_LIGHTNINGBOLT','chase',20,10,2000,1500,30000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2988,'Wicked Vice Plant Manager@AL_TELEPORT','attack',26,1,500,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2988,'Wicked Vice Plant Manager@AL_TELEPORT','idle',26,1,1000,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2988,'Wicked Vice Plant Manager@NPC_RUN','attack',354,1,10000,0,0,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2988,'Wicked Vice Plant Manager@NPC_RUN','chase',354,1,10000,0,0,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2988,'Wicked Vice Plant Manager@SA_REVERSEORCISH','chase',294,1,500,0,30000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2988,'Wicked Vice Plant Manager@SA_REVERSEORCISH','attack',294,1,500,0,30000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2988,'Wicked Vice Plant Manager@MG_SAFETYWALL','attack',12,10,1000,1000,10000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,'18',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2988,'Wicked Vice Plant Manager@AL_INCAGI','chase',29,1,500,700,60000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2989,'Vicious Cookie@MG_COLDBOLT','attack',14,3,500,500,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'21',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2989,'Vicious Cookie@MG_COLDBOLT','chase',14,3,500,500,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'21',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2989,'Vicious Cookie@NPC_ENERGYDRAIN','attack',200,1,500,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'30',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2989,'Vicious Cookie@NPC_ENERGYDRAIN','chase',200,1,500,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'30',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2989,'Vicious Cookie@PR_LEXAETERNA','attack',78,1,500,1000,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2989,'Vicious Cookie@PR_LEXAETERNA','chase',78,1,500,1000,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2989,'Vicious Cookie@SA_REVERSEORCISH','attack',294,1,50,0,30000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'18',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2989,'Vicious Cookie@SA_REVERSEORCISH','chase',294,1,50,0,30000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'18',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2990,'Corrupt Cruiser@NPC_COMBOATTACK','attack',171,2,500,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'24',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2990,'Corrupt Cruiser@AC_CHARGEARROW','chase',148,1,2000,1000,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'27',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2990,'Corrupt Cruiser@AC_CHARGEARROW','attack',148,1,2000,1000,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2990,'Corrupt Cruiser@AC_DOUBLE','attack',46,7,2000,1200,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2991,'Evil Dwelling Box@NPC_WIDESILENCE','attack',663,1,500,1200,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2991,'Evil Dwelling Box@BS_HAMMERFALL','attack',110,5,500,1500,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'8',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2991,'Evil Dwelling Box@NPC_CURSEATTACK','attack',181,4,500,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2991,'Evil Dwelling Box@NPC_HALLUCINATION','attack',207,1,500,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2991,'Evil Dwelling Box@NPC_HALLUCINATION','chase',207,1,500,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2992,'Creepy Demon@AS_CLOAKING','attack',135,1,2000,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2992,'Creepy Demon@AS_CLOAKING','idle',135,1,2000,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2992,'Creepy Demon@AS_CLOAKING','chase',135,1,2000,0,5000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2992,'Creepy Demon@MO_BODYRELOCATION','chase',264,1,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'28',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2992,'Creepy Demon@MO_BODYRELOCATION','attack',264,1,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'28',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2993,'Malicious Baby Ghost@NPC_SILENCEATTACK','attack',178,4,500,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'29',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2993,'Malicious Baby Ghost@NPC_HALLUCINATION','chase',207,1,500,0,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2993,'Malicious Baby Ghost@NPC_HALLUCINATION','attack',207,1,500,0,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'9',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2993,'Malicious Baby Ghost@MO_BODYRELOCATION','chase',264,1,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2993,'Malicious Baby Ghost@AS_CLOAKING','idle',135,1,2000,0,10000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2993,'Malicious Baby Ghost@AS_CLOAKING','chase',135,1,2000,0,10000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2993,'Malicious Baby Ghost@NPC_TELEKINESISATTACK','attack',191,8,500,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2994,'Dancing Marionette@AS_CLOAKING','idle',135,1,2000,0,10000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2994,'Dancing Marionette@AS_CLOAKING','chase',135,1,2000,0,10000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2994,'Dancing Marionette@MG_FIREBALL','attack',17,8,2000,800,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2994,'Dancing Marionette@MG_FIREWALL','chase',18,8,500,500,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'2',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2994,'Dancing Marionette@NPC_TELEKINESISATTACK','attack',191,8,500,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2995,'Abandoned Teddy Bear@NPC_CURSEATTACK','attack',181,4,500,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'2',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2995,'Abandoned Teddy Bear@NPC_CURSEATTACK','chase',181,4,500,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'2',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2995,'Abandoned Teddy Bear@NPC_CRITICALSLASH','attack',170,1,500,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2995,'Abandoned Teddy Bear@SA_DISPELL','attack',289,1,50,1000,15000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2995,'Abandoned Teddy Bear@BS_HAMMERFALL','attack',110,5,500,1500,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'8',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2996,'Celine Kimi@AL_HEAL','idle',28,11,10000,500,5000,'yes','self','myhpltmaxrate','90',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2996,'Celine Kimi@NPC_CRITICALWOUND','attack',673,2,1000,0,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2996,'Celine Kimi@NPC_PULSESTRIKE','attack',661,3,10000,0,20000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2996,'Celine Kimi@NPC_DARKSTRIKE','attack',340,10,500,0,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2996,'Celine Kimi@NPC_DARKTHUNDER','attack',341,9,500,1000,20000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2996,'Celine Kimi@NPC_WIDESTONE','attack',666,5,10000,1000,30000,'no','self','myhpltmaxrate','20',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2996,'Celine Kimi@NPC_WIDESLEEP','attack',668,5,10000,1000,30000,'no','self','myhpltmaxrate','20',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2996,'Celine Kimi@NPC_WIDESOULDRAIN','attack',680,5,10000,5000,50000,'no','self','myhpltmaxrate','10',NULL,NULL,NULL,NULL,NULL,'42',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2996,'Celine Kimi@NPC_MAXPAIN','attack',716,9,10000,3000,50000,'no','self','myhpltmaxrate','10',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2996,'Celine Kimi@NPC_POWERUP','attack',349,5,10000,0,50000,'no','self','myhpltmaxrate','5',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2997,'Kimi\'s Phantom@AL_HEAL','idle',28,11,10000,500,5000,'yes','self','myhpltmaxrate','90',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2997,'Kimi\'s Phantom@NPC_CRITICALWOUND','attack',673,1,1000,0,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2997,'Kimi\'s Phantom@NPC_PULSESTRIKE','attack',661,1,10000,0,20000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2997,'Kimi\'s Phantom@NPC_DARKSTRIKE','attack',340,5,500,0,10000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2997,'Kimi\'s Phantom@NPC_DARKTHUNDER','attack',341,4,500,1000,20000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2997,'Kimi\'s Phantom@NPC_WIDESTONE','attack',666,1,10000,1000,30000,'no','self','myhpltmaxrate','20',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2997,'Kimi\'s Phantom@NPC_WIDESLEEP','attack',668,1,10000,1000,30000,'no','self','myhpltmaxrate','20',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2997,'Kimi\'s Phantom@NPC_WIDESOULDRAIN','attack',680,3,10000,5000,50000,'no','self','myhpltmaxrate','10',NULL,NULL,NULL,NULL,NULL,'42',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2997,'Kimi\'s Phantom@NPC_MAXPAIN','attack',716,3,10000,3000,50000,'no','self','myhpltmaxrate','10',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (2997,'Kimi\'s Phantom@NPC_POWERUP','attack',349,1,10000,0,50000,'no','self','myhpltmaxrate','5',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+
+REPLACE INTO `mob_skill_db_re` VALUES (3026,'Fire Pit@NPC_DEATHSUMMON','dead',718,3,10000,0,10000,'no','self','always','0',3027,3027,3027,NULL,NULL,NULL,NULL);
+
+REPLACE INTO `mob_skill_db_re` VALUES (3038,'Hidden Mob 7@NPC_INVISIBLE','idle',353,1,10000,0,30000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (3038,'Hidden Mob 7@NPC_INVISIBLE','attack',353,1,10000,0,30000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+#REPLACE INTO `mob_skill_db_re` VALUES ( 3038,'Hidden Mob 7@NPC_HELLBURNING','idle',719,1,10000,0,3000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+#REPLACE INTO `mob_skill_db_re` VALUES ( 3038,'Hidden Mob 7@NPC_HELLBURNING','attack',719,1,10000,0,3000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+
+REPLACE INTO `mob_skill_db_re` VALUES (3074,'Time Holder@AL_TELEPORT','idle',26,1,10000,0,0,'yes','self','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (3074,'Time Holder@AL_TELEPORT','idle',26,1,5000,0,5000,'yes','self','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (3074,'Time Holder@AL_TELEPORT','walk',26,1,5000,0,5000,'yes','self','rudeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (3074,'Time Holder@NPC_AGIUP','attack',350,5,10000,0,10000,'yes','self','myhpltmaxrate','30',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (3074,'Time Holder@AL_INCAGI','chase',29,10,2000,700,10000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (3074,'Time Holder@WZ_METEOR','attack',83,11,1000,500,10000,'no','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (3074,'Time Holder@NPC_HELLJUDGEMENT','chase',662,10,3000,1000,10000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (3074,'Time Holder@NPC_HELLJUDGEMENT','attack',662,10,3000,1000,10000,'no','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (3074,'Time Holder@NPC_PULSESTRIKE','attack',661,5,2000,0,30000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (3074,'Time Holder@NPC_SUMMONSLAVE','attack',196,5,1000,700,10000,'no','self','slavele','0',2917,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (3074,'Time Holder@NPC_SUMMONSLAVE','idle',196,5,1000,700,10000,'no','self','slavele','0',2917,NULL,NULL,NULL,NULL,NULL,NULL);
+
+REPLACE INTO `mob_skill_db_re` VALUES (3200,'Wicked Chimera@WZ_HEAVENDRIVE','attack',91,5,500,1200,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (3200,'Wicked Chimera@WZ_HEAVENDRIVE','chase',91,5,500,1200,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,'6',NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (3200,'Wicked Chimera@CR_AUTOGUARD','attack',249,5,500,0,300000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db_re` VALUES (3200,'Wicked Chimera@CR_AUTOGUARD','chase',249,5,2000,0,300000,'yes','self','longrangeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
diff --git a/sql-files/upgrades/upgrade_20140104.sql b/sql-files/upgrades/upgrade_20140104.sql
deleted file mode 100644
index a1f181172a7..00000000000
--- a/sql-files/upgrades/upgrade_20140104.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `item_db_re` CHANGE `atk:matk` `atk:matk` VARCHAR( 11 ) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL
diff --git a/sql-files/upgrades/upgrade_20140114.sql b/sql-files/upgrades/upgrade_20140114.sql
deleted file mode 100644
index 57dd2a53892..00000000000
--- a/sql-files/upgrades/upgrade_20140114.sql
+++ /dev/null
@@ -1,20 +0,0 @@
-CREATE TABLE IF NOT EXISTS `vending_items` (
- `vending_id` int(10) unsigned NOT NULL,
- `index` smallint(5) unsigned NOT NULL,
- `cartinventory_id` int(10) unsigned NOT NULL,
- `amount` smallint(5) unsigned NOT NULL,
- `price` int(10) unsigned NOT NULL
-) ENGINE=MyISAM;
-
-CREATE TABLE IF NOT EXISTS `vendings` (
- `id` int(10) unsigned NOT NULL,
- `account_id` int(11) unsigned NOT NULL,
- `char_id` int(10) unsigned NOT NULL,
- `sex` enum('F','M') NOT NULL DEFAULT 'M',
- `map` varchar(20) NOT NULL,
- `x` smallint(5) unsigned NOT NULL,
- `y` smallint(5) unsigned NOT NULL,
- `title` varchar(80) NOT NULL,
- `autotrade` tinyint(4) NOT NULL,
- PRIMARY KEY (`id`)
-) ENGINE=MyISAM;
diff --git a/sql-files/upgrades/upgrade_20140205.sql b/sql-files/upgrades/upgrade_20140205.sql
deleted file mode 100644
index a254cb68912..00000000000
--- a/sql-files/upgrades/upgrade_20140205.sql
+++ /dev/null
@@ -1,21 +0,0 @@
-CREATE TABLE IF NOT EXISTS `buyingstore_items` (
- `buyingstore_id` int(10) unsigned NOT NULL,
- `index` smallint(5) unsigned NOT NULL,
- `item_id` int(10) unsigned NOT NULL,
- `amount` smallint(5) unsigned NOT NULL,
- `price` int(10) unsigned NOT NULL
-) ENGINE=MyISAM;
-
-CREATE TABLE IF NOT EXISTS `buyingstores` (
- `id` int(10) unsigned NOT NULL,
- `account_id` int(11) unsigned NOT NULL,
- `char_id` int(10) unsigned NOT NULL,
- `sex` enum('F','M') NOT NULL DEFAULT 'M',
- `map` varchar(20) NOT NULL,
- `x` smallint(5) unsigned NOT NULL,
- `y` smallint(5) unsigned NOT NULL,
- `title` varchar(80) NOT NULL,
- `limit` int(10) unsigned NOT NULL,
- `autotrade` tinyint(4) NOT NULL,
- PRIMARY KEY (`id`)
-) ENGINE=MyISAM;
diff --git a/sql-files/upgrades/upgrade_20140523.sql b/sql-files/upgrades/upgrade_20140523.sql
deleted file mode 100644
index 2288d7456b5..00000000000
--- a/sql-files/upgrades/upgrade_20140523.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `char` ADD `font` tinyint(3) unsigned NOT NULL default '0';
diff --git a/sql-files/upgrades/upgrade_20140612.sql b/sql-files/upgrades/upgrade_20140612.sql
deleted file mode 100644
index 0c4d6da7add..00000000000
--- a/sql-files/upgrades/upgrade_20140612.sql
+++ /dev/null
@@ -1,118 +0,0 @@
-UPDATE `auction` SET `card0` = 256 WHERE `card0` = -256;
-UPDATE `cart_inventory` SET `card0` = 256 WHERE `card0` = -256;
-UPDATE `guild_storage` SET `card0` = 256 WHERE `card0` = -256;
-UPDATE `inventory` SET `card0` = 256 WHERE `card0` = -256;
-UPDATE `mail` SET `card0` = 256 WHERE `card0` = -256;
-UPDATE `storage` SET `card0` = 256 WHERE `card0` = -256;
-
-UPDATE `auction` SET `card1` = (65536 + `card1`) WHERE `card1` < 0 AND `card0` IN(254,255);
-UPDATE `auction` SET `card2` = (65536 + `card2`) WHERE `card2` < 0 AND `card0` IN(254,255);
-UPDATE `auction` SET `card3` = (65536 + `card3`) WHERE `card3` < 0 AND `card0` IN(254,255);
-
-UPDATE `cart_inventory` SET `card1` = (65536 + `card1`) WHERE `card1` < 0 AND `card0` IN(254,255);
-UPDATE `cart_inventory` SET `card2` = (65536 + `card2`) WHERE `card2` < 0 AND `card0` IN(254,255);
-UPDATE `cart_inventory` SET `card3` = (65536 + `card3`) WHERE `card3` < 0 AND `card0` IN(254,255);
-
-UPDATE `guild_storage` SET `card1` = (65536 + `card1`) WHERE `card1` < 0 AND `card0` IN(254,255);
-UPDATE `guild_storage` SET `card2` = (65536 + `card2`) WHERE `card2` < 0 AND `card0` IN(254,255);
-UPDATE `guild_storage` SET `card3` = (65536 + `card3`) WHERE `card3` < 0 AND `card0` IN(254,255);
-
-UPDATE `inventory` SET `card1` = (65536 + `card1`) WHERE `card1` < 0 AND `card0` IN(254,255);
-UPDATE `inventory` SET `card2` = (65536 + `card2`) WHERE `card2` < 0 AND `card0` IN(254,255);
-UPDATE `inventory` SET `card3` = (65536 + `card3`) WHERE `card3` < 0 AND `card0` IN(254,255);
-
-UPDATE `mail` SET `card1` = (65536 + `card1`) WHERE `card1` < 0 AND `card0` IN(254,255);
-UPDATE `mail` SET `card2` = (65536 + `card2`) WHERE `card2` < 0 AND `card0` IN(254,255);
-UPDATE `mail` SET `card3` = (65536 + `card3`) WHERE `card3` < 0 AND `card0` IN(254,255);
-
-UPDATE `storage` SET `card1` = (65536 + `card1`) WHERE `card1` < 0 AND `card0` IN(254,255);
-UPDATE `storage` SET `card2` = (65536 + `card2`) WHERE `card2` < 0 AND `card0` IN(254,255);
-UPDATE `storage` SET `card3` = (65536 + `card3`) WHERE `card3` < 0 AND `card0` IN(254,255);
-
-ALTER TABLE `auction` MODIFY `nameid` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `auction` MODIFY `card0` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `auction` MODIFY `card1` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `auction` MODIFY `card2` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `auction` MODIFY `card3` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `cart_inventory` MODIFY `nameid` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `cart_inventory` MODIFY `card0` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `cart_inventory` MODIFY `card1` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `cart_inventory` MODIFY `card2` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `cart_inventory` MODIFY `card3` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `guild_storage` MODIFY `nameid` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `guild_storage` MODIFY `card0` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `guild_storage` MODIFY `card1` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `guild_storage` MODIFY `card2` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `guild_storage` MODIFY `card3` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `inventory` MODIFY `nameid` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `inventory` MODIFY `card0` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `inventory` MODIFY `card1` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `inventory` MODIFY `card2` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `inventory` MODIFY `card3` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mail` MODIFY `nameid` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mail` MODIFY `card0` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mail` MODIFY `card1` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mail` MODIFY `card2` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mail` MODIFY `card3` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `pet` MODIFY `egg_id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `storage` MODIFY `nameid` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `storage` MODIFY `card0` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `storage` MODIFY `card1` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `storage` MODIFY `card2` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `storage` MODIFY `card3` smallint(5) unsigned NOT NULL default '0';
-
-ALTER TABLE `mob_db` MODIFY `MVP1id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db` MODIFY `MVP2id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db` MODIFY `MVP3id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db` MODIFY `Drop1id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db` MODIFY `Drop2id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db` MODIFY `Drop3id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db` MODIFY `Drop4id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db` MODIFY `Drop5id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db` MODIFY `Drop6id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db` MODIFY `Drop7id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db` MODIFY `Drop8id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db` MODIFY `Drop9id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db` MODIFY `DropCardid` smallint(5) unsigned NOT NULL default '0';
-
-ALTER TABLE `mob_db2` MODIFY `MVP1id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db2` MODIFY `MVP2id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db2` MODIFY `MVP3id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db2` MODIFY `Drop1id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db2` MODIFY `Drop2id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db2` MODIFY `Drop3id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db2` MODIFY `Drop4id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db2` MODIFY `Drop5id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db2` MODIFY `Drop6id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db2` MODIFY `Drop7id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db2` MODIFY `Drop8id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db2` MODIFY `Drop9id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db2` MODIFY `DropCardid` smallint(5) unsigned NOT NULL default '0';
-
-ALTER TABLE `mob_db2_re` MODIFY `MVP1id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db2_re` MODIFY `MVP2id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db2_re` MODIFY `MVP3id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db2_re` MODIFY `Drop1id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db2_re` MODIFY `Drop2id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db2_re` MODIFY `Drop3id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db2_re` MODIFY `Drop4id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db2_re` MODIFY `Drop5id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db2_re` MODIFY `Drop6id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db2_re` MODIFY `Drop7id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db2_re` MODIFY `Drop8id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db2_re` MODIFY `Drop9id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db2_re` MODIFY `DropCardid` smallint(5) unsigned NOT NULL default '0';
-
-ALTER TABLE `mob_db_re` MODIFY `MVP1id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db_re` MODIFY `MVP2id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db_re` MODIFY `MVP3id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db_re` MODIFY `Drop1id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db_re` MODIFY `Drop2id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db_re` MODIFY `Drop3id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db_re` MODIFY `Drop4id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db_re` MODIFY `Drop5id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db_re` MODIFY `Drop6id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db_re` MODIFY `Drop7id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db_re` MODIFY `Drop8id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db_re` MODIFY `Drop9id` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mob_db_re` MODIFY `DropCardid` smallint(5) unsigned NOT NULL default '0';
diff --git a/sql-files/upgrades/upgrade_20140612_log.sql b/sql-files/upgrades/upgrade_20140612_log.sql
deleted file mode 100644
index a42a158a0a8..00000000000
--- a/sql-files/upgrades/upgrade_20140612_log.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-UPDATE `picklog` SET `card0` = 256 WHERE `card0` = -256;
-
-UPDATE `picklog` SET `card1` = (65536 + `card1`) WHERE `card1` < 0 AND `card0` IN(254,255);
-UPDATE `picklog` SET `card2` = (65536 + `card2`) WHERE `card2` < 0 AND `card0` IN(254,255);
-UPDATE `picklog` SET `card3` = (65536 + `card3`) WHERE `card3` < 0 AND `card0` IN(254,255);
-
-ALTER TABLE `picklog` MODIFY `nameid` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `picklog` MODIFY `card0` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `picklog` MODIFY `card1` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `picklog` MODIFY `card2` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `picklog` MODIFY `card3` smallint(5) unsigned NOT NULL default '0';
-ALTER TABLE `mvplog` MODIFY `prize` smallint(5) unsigned NOT NULL default '0';
diff --git a/sql-files/upgrades/upgrade_20140616.sql b/sql-files/upgrades/upgrade_20140616.sql
deleted file mode 100644
index 0430d2b70c6..00000000000
--- a/sql-files/upgrades/upgrade_20140616.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-UPDATE `auction` SET `card0` = 256 WHERE `card0` = 65280;
-UPDATE `cart_inventory` SET `card0` = 256 WHERE `card0` = 65280;
-UPDATE `guild_storage` SET `card0` = 256 WHERE `card0` = 65280;
-UPDATE `inventory` SET `card0` = 256 WHERE `card0` = 65280;
-UPDATE `mail` SET `card0` = 256 WHERE `card0` = 65280;
-UPDATE `storage` SET `card0` = 256 WHERE `card0` = 65280;
diff --git a/sql-files/upgrades/upgrade_20140627.sql b/sql-files/upgrades/upgrade_20140627.sql
deleted file mode 100644
index 2e50d4a4246..00000000000
--- a/sql-files/upgrades/upgrade_20140627.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `pet` CHANGE `incuvate` `incubate` int(11) unsigned NOT NULL default '0';
diff --git a/sql-files/upgrades/upgrade_20140713_log.sql b/sql-files/upgrades/upgrade_20140713_log.sql
deleted file mode 100644
index b213a48db34..00000000000
--- a/sql-files/upgrades/upgrade_20140713_log.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `zenylog` CHANGE `type` `type` ENUM('T','V','P','M','S','N','D','C','A','E','I','B','K') NOT NULL DEFAULT 'S';
diff --git a/sql-files/upgrades/upgrade_20140723.sql b/sql-files/upgrades/upgrade_20140723.sql
deleted file mode 100644
index d215bd115c8..00000000000
--- a/sql-files/upgrades/upgrade_20140723.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-ALTER TABLE `vendings` ADD `body_direction` CHAR( 1 ) NOT NULL DEFAULT '4',
-ADD `head_direction` CHAR( 1 ) NOT NULL DEFAULT '0',
-ADD `sit` CHAR( 1 ) NOT NULL DEFAULT '1';
-
-ALTER TABLE `buyingstores` ADD `body_direction` CHAR( 1 ) NOT NULL DEFAULT '4',
-ADD `head_direction` CHAR( 1 ) NOT NULL DEFAULT '0',
-ADD `sit` CHAR( 1 ) NOT NULL DEFAULT '1';
diff --git a/sql-files/upgrades/upgrade_20140822.sql b/sql-files/upgrades/upgrade_20140822.sql
deleted file mode 100644
index bd8c13d5ff5..00000000000
--- a/sql-files/upgrades/upgrade_20140822.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `char` ADD COLUMN `uniqueitem_counter` bigint(20) NOT NULL AFTER `font`;
diff --git a/sql-files/upgrades/upgrade_20140826.sql b/sql-files/upgrades/upgrade_20140826.sql
deleted file mode 100644
index 9235f4a1e1c..00000000000
--- a/sql-files/upgrades/upgrade_20140826.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `char` MODIFY COLUMN `uniqueitem_counter` int(11) unsigned NOT NULL default '0';
diff --git a/sql-files/upgrades/upgrade_20140915.sql b/sql-files/upgrades/upgrade_20140915.sql
deleted file mode 100644
index 136c9b245d7..00000000000
--- a/sql-files/upgrades/upgrade_20140915.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `mail` ADD `bound` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '0';
diff --git a/sql-files/upgrades/upgrade_20140915_log.sql b/sql-files/upgrades/upgrade_20140915_log.sql
deleted file mode 100644
index 222e406d80f..00000000000
--- a/sql-files/upgrades/upgrade_20140915_log.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `picklog` ADD `bound` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '0';
diff --git a/sql-files/upgrades/upgrade_20150103_log.sql b/sql-files/upgrades/upgrade_20150103_log.sql
deleted file mode 100644
index 98fda3d397c..00000000000
--- a/sql-files/upgrades/upgrade_20150103_log.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `picklog` MODIFY `type` ENUM('M','P','L','T','V','S','N','C','A','R','G','E','B','O','I','X','D','U','$') NOT NULL DEFAULT 'S';
diff --git a/sql-files/upgrades/upgrade_20150131.sql b/sql-files/upgrades/upgrade_20150131.sql
deleted file mode 100644
index 6ab8d692da8..00000000000
--- a/sql-files/upgrades/upgrade_20150131.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-ALTER TABLE `bonus_script` MODIFY COLUMN `char_id` INT(11) UNSIGNED NOT NULL;
-ALTER TABLE `bonus_script` MODIFY COLUMN `script` TEXT NOT NULL;
-ALTER TABLE `bonus_script` MODIFY COLUMN `tick` INT(11) UNSIGNED NOT NULL DEFAULT '0';
-ALTER TABLE `bonus_script` MODIFY COLUMN `flag` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0';
-ALTER TABLE `bonus_script` MODIFY COLUMN `type` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0';
-ALTER TABLE `bonus_script` MODIFY COLUMN `icon` SMALLINT(3) NOT NULL DEFAULT '-1';
diff --git a/sql-files/upgrades/upgrade_20150211_skillset.sql b/sql-files/upgrades/upgrade_20150211_skillset.sql
deleted file mode 100644
index e60ea411aa4..00000000000
--- a/sql-files/upgrades/upgrade_20150211_skillset.sql
+++ /dev/null
@@ -1,6 +0,0 @@
--- Resetting all `lv` of skills that has `flag` >= 3 (the skill that its `learned_lv` has been changed by script or special case by `learned_lv` + SKILL_FLAG_REPLACED_LV_0)
--- If there's ALL_INCCARRY and ALL_BUYING_STORE, set the `flag` to SKILL_FLAG_PERM_GRANTED (new value is 3), those are exclusive skills given in our official scripts!
-
-UPDATE `skill` SET `lv` = `flag` - 3 WHERE `flag` >= 3;
-UPDATE `skill` SET `flag` = 0 WHERE `flag` >= 3;
-UPDATE `skill` SET `flag` = 3 WHERE `id` = 681 OR `id` = 2535;
diff --git a/sql-files/upgrades/upgrade_20150327_market.sql b/sql-files/upgrades/upgrade_20150327_market.sql
deleted file mode 100644
index 8ca000ef164..00000000000
--- a/sql-files/upgrades/upgrade_20150327_market.sql
+++ /dev/null
@@ -1,12 +0,0 @@
---
--- Table `market` for market shop persistency
---
-
-CREATE TABLE IF NOT EXISTS `market` (
- `name` varchar(32) NOT NULL DEFAULT '',
- `nameid` SMALLINT(5) UNSIGNED NOT NULL,
- `price` INT(11) UNSIGNED NOT NULL,
- `amount` SMALLINT(5) UNSIGNED NOT NULL,
- `flag` TINYINT(2) UNSIGNED NOT NULL DEFAULT '0',
- PRIMARY KEY (`name`,`nameid`)
-) ENGINE = MyISAM;
diff --git a/sql-files/upgrades/upgrade_20150408.sql b/sql-files/upgrades/upgrade_20150408.sql
deleted file mode 100644
index 6e251584d96..00000000000
--- a/sql-files/upgrades/upgrade_20150408.sql
+++ /dev/null
@@ -1,9 +0,0 @@
--- Move `bank_vault` value from `login` to `global_reg_value`.
--- Please be careful if you're running multi char-server, better you do this step manually to move the `bank_vault`
--- to proper `global_reg_value` tables of char-servers used.
-INSERT INTO `global_reg_value` (`char_id`, `str`, `value`, `type`, `account_id`)
- SELECT '0', '#BANKVAULT', `bank_vault`, '2', `account_id`
- FROM `login` WHERE `bank_vault` != 0;
-
--- Remove `bank_vault` from `login` table, login-server side.
-ALTER TABLE `login` DROP `bank_vault`;
diff --git a/sql-files/upgrades/upgrade_20150408_log.sql b/sql-files/upgrades/upgrade_20150408_log.sql
deleted file mode 100644
index 0f8d6ed7cc4..00000000000
--- a/sql-files/upgrades/upgrade_20150408_log.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `picklog` CHANGE `type` `type` ENUM('M','P','L','T','V','S','N','C','A','R','G','E','B','O','I','X','D','U','$','F') NOT NULL DEFAULT 'P';
diff --git a/sql-files/upgrades/upgrade_20150619.sql b/sql-files/upgrades/upgrade_20150619.sql
deleted file mode 100644
index 47a3ee8baff..00000000000
--- a/sql-files/upgrades/upgrade_20150619.sql
+++ /dev/null
@@ -1,68 +0,0 @@
-ALTER TABLE `char` ADD COLUMN `sex` ENUM('M','F','U') NOT NULL default 'U';
-
---
--- Table structure for `db_roulette`
---
-
-CREATE TABLE `db_roulette` (
- `index` int(11) NOT NULL default '0',
- `level` smallint(5) unsigned NOT NULL,
- `item_id` smallint(5) unsigned NOT NULL,
- `amount` smallint(5) unsigned NOT NULL DEFAULT '1',
- `flag` smallint(5) unsigned NOT NULL DEFAULT '1',
- PRIMARY KEY (`index`)
-) ENGINE=MyISAM;
-
--- ----------------------------
--- Records of db_roulette
--- ----------------------------
--- Info: http://ro.gnjoy.com/news/update/View.asp?seq=157&curpage=1
-
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 0, 1, 675, 1, 1 ); -- Silver_Coin
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 1, 1, 671, 1, 0 ); -- Gold_Coin
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 2, 1, 678, 1, 0 ); -- Poison_Bottle
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 3, 1, 604, 1, 0 ); -- Branch_Of_Dead_Tree
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 4, 1, 522, 1, 0 ); -- Fruit_Of_Mastela
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 5, 1, 671, 1, 0 ); -- Old_Ore_Box
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 6, 1, 12523, 1, 0 ); -- E_Inc_Agi_10_Scroll
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 7, 1, 985, 1, 0 ); -- Elunium
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 8, 1, 984, 1, 0 ); -- Oridecon
-
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 9, 2, 675, 1, 1 ); -- Silver_Coin
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 10, 2, 671, 1, 0 ); -- Gold_Coin
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 11, 2, 603, 1, 0 ); -- Old_Blue_Box
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 12, 2, 608, 1, 0 ); -- Seed_Of_Yggdrasil
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 13, 2, 607, 1, 0 ); -- Yggdrasilberry
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 14, 2, 12522, 1, 0 ); -- E_Blessing_10_Scroll
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 15, 2, 6223, 1, 0 ); -- Carnium
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 16, 2, 6224, 1, 0 ); -- Bradium
-
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 17, 3, 675, 1, 1 ); -- Silver_Coin
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 18, 3, 671, 1, 0 ); -- Gold_Coin
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 19, 3, 12108, 1, 0 ); -- Bundle_Of_Magic_Scroll
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 20, 3, 617, 1, 0 ); -- Old_Violet_Box
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 21, 3, 12514, 1, 0 ); -- E_Abrasive
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 22, 3, 7444, 1, 0 ); -- Treasure_Box
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 23, 3, 969, 1, 0 ); -- Gold
-
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 24, 4, 675, 1, 1 ); -- Silver_Coin
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 25, 4, 671, 1, 0 ); -- Gold_Coin
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 26, 4, 616, 1, 0 ); -- Old_Card_Album
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 27, 4, 12516, 1, 0 ); -- E_Small_Life_Potion
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 28, 4, 22777, 1, 0 ); -- Gift_Buff_Set
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 29, 4, 6231, 1, 0 ); -- Guarantee_Weapon_6Up
-
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 30, 5, 671, 1, 1 ); -- Gold_Coin
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 31, 5, 12246, 1, 0 ); -- Magic_Card_Album
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 32, 5, 12263, 1, 0 ); -- Comp_Battle_Manual
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 33, 5, 671, 1, 0 ); -- Potion_Box
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 34, 5, 6235, 1, 0 ); -- Guarantee_Armor_6Up
-
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 35, 6, 671, 1, 1 ); -- Gold_Coin
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 36, 6, 12766, 1, 0 ); -- Reward_Job_BM25
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 37, 6, 6234, 1, 0 ); -- Guarantee_Armor_7Up
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 38, 6, 6233, 1, 0 ); -- Guarantee_Armor_8Up
-
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 39, 7, 671, 1, 1 ); -- Gold_Coin
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 40, 7, 6233, 1, 0 ); -- Guarantee_Armor_8Up
-INSERT INTO `db_roulette`(`index`, `level`, `item_id`, `amount`, `flag` ) VALUES ( 41, 7, 6233, 1, 0 ); -- Guarantee_Armor_8Up // KRO lists this twice
diff --git a/sql-files/upgrades/upgrade_20150619_log.sql b/sql-files/upgrades/upgrade_20150619_log.sql
deleted file mode 100644
index c89434c2af8..00000000000
--- a/sql-files/upgrades/upgrade_20150619_log.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `picklog` MODIFY `type` enum('M','P','L','T','V','S','N','C','A','R','G','E','B','O','I','X','D','U','$','F','Y') NOT NULL default 'P';
diff --git a/sql-files/upgrades/upgrade_20150804_log.sql b/sql-files/upgrades/upgrade_20150804_log.sql
deleted file mode 100644
index b06fb6cb855..00000000000
--- a/sql-files/upgrades/upgrade_20150804_log.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `picklog` CHANGE `type` `type` ENUM('M','P','L','T','V','S','N','C','A','R','G','E','B','O','I','X','D','U','$','F','Z') NOT NULL DEFAULT 'P';
diff --git a/sql-files/upgrades/upgrade_20150828.sql b/sql-files/upgrades/upgrade_20150828.sql
deleted file mode 100644
index 22e605a4eb3..00000000000
--- a/sql-files/upgrades/upgrade_20150828.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `char` ADD COLUMN `hotkey_rowshift` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0';
diff --git a/sql-files/upgrades/upgrade_20150831.sql b/sql-files/upgrades/upgrade_20150831.sql
deleted file mode 100644
index 8ff80eab1c6..00000000000
--- a/sql-files/upgrades/upgrade_20150831.sql
+++ /dev/null
@@ -1,66 +0,0 @@
-ALTER TABLE `mapreg` ADD PRIMARY KEY (`varname`, `index`);
-ALTER TABLE `mapreg` DROP INDEX `varname`;
-ALTER TABLE `mapreg` DROP INDEX `index`;
-ALTER TABLE `mapreg` MODIFY `varname` varchar(32) binary NOT NULL;
-
-CREATE TABLE IF NOT EXISTS `acc_reg_num` (
- `account_id` int(11) unsigned NOT NULL default '0',
- `key` varchar(32) binary NOT NULL default '',
- `index` int(11) unsigned NOT NULL default '0',
- `value` int(11) NOT NULL default '0',
- PRIMARY KEY (`account_id`,`key`,`index`),
- KEY `account_id` (`account_id`)
-) ENGINE=MyISAM;
-
-CREATE TABLE IF NOT EXISTS `acc_reg_str` (
- `account_id` int(11) unsigned NOT NULL default '0',
- `key` varchar(32) binary NOT NULL default '',
- `index` int(11) unsigned NOT NULL default '0',
- `value` varchar(254) NOT NULL default '0',
- PRIMARY KEY (`account_id`,`key`,`index`),
- KEY `account_id` (`account_id`)
-) ENGINE=MyISAM;
-
-CREATE TABLE IF NOT EXISTS `char_reg_num` (
- `char_id` int(11) unsigned NOT NULL default '0',
- `key` varchar(32) binary NOT NULL default '',
- `index` int(11) unsigned NOT NULL default '0',
- `value` int(11) NOT NULL default '0',
- PRIMARY KEY (`char_id`,`key`,`index`),
- KEY `char_id` (`char_id`)
-) ENGINE=MyISAM;
-
-CREATE TABLE IF NOT EXISTS `char_reg_str` (
- `char_id` int(11) unsigned NOT NULL default '0',
- `key` varchar(32) binary NOT NULL default '',
- `index` int(11) unsigned NOT NULL default '0',
- `value` varchar(254) NOT NULL default '0',
- PRIMARY KEY (`char_id`,`key`,`index`),
- KEY `char_id` (`char_id`)
-) ENGINE=MyISAM;
-
-CREATE TABLE IF NOT EXISTS `global_acc_reg_num` (
- `account_id` int(11) unsigned NOT NULL default '0',
- `key` varchar(32) binary NOT NULL default '',
- `index` int(11) unsigned NOT NULL default '0',
- `value` int(11) NOT NULL default '0',
- PRIMARY KEY (`account_id`,`key`,`index`),
- KEY `account_id` (`account_id`)
-) ENGINE=MyISAM;
-
-CREATE TABLE IF NOT EXISTS `global_acc_reg_str` (
- `account_id` int(11) unsigned NOT NULL default '0',
- `key` varchar(32) binary NOT NULL default '',
- `index` int(11) unsigned NOT NULL default '0',
- `value` varchar(254) NOT NULL default '0',
- PRIMARY KEY (`account_id`,`key`,`index`),
- KEY `account_id` (`account_id`)
-) ENGINE=MyISAM;
-
-INSERT INTO `acc_reg_num` (`account_id`, `key`, `index`, `value`) SELECT `account_id`, `str`, 0, `value` FROM `global_reg_value` WHERE `type` = 2 AND `str` NOT LIKE '%$';
-INSERT INTO `acc_reg_str` (`account_id`, `key`, `index`, `value`) SELECT `account_id`, `str`, 0, `value` FROM `global_reg_value` WHERE `type` = 2 AND `str` LIKE '%$';
-INSERT INTO `char_reg_num` (`char_id`, `key`, `index`, `value`) SELECT `char_id`, `str`, 0, `value` FROM `global_reg_value` WHERE `type` = 3 AND `str` NOT LIKE '%$';
-INSERT INTO `char_reg_str` (`char_id`, `key`, `index`, `value`) SELECT `char_id`, `str`, 0, `value` FROM `global_reg_value` WHERE `type` = 3 AND `str` LIKE '%$';
-INSERT INTO `global_acc_reg_num` (`account_id`, `key`, `index`, `value`) SELECT `account_id`, `str`, 0, `value` FROM `global_reg_value` WHERE `type` = 1 AND `str` NOT LIKE '%$';
-INSERT INTO `global_acc_reg_str` (`account_id`, `key`, `index`, `value`) SELECT `account_id`, `str`, 0, `value` FROM `global_reg_value` WHERE `type` = 1 AND `str` LIKE '%$';
-# DROP TABLE `global_reg_value`;
diff --git a/sql-files/upgrades/upgrade_20150917_log.sql b/sql-files/upgrades/upgrade_20150917_log.sql
deleted file mode 100644
index 15715a23f34..00000000000
--- a/sql-files/upgrades/upgrade_20150917_log.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `picklog` MODIFY `type` enum('M','P','L','T','V','S','N','C','A','R','G','E','B','O','I','X','D','U','$','F','Z','Q') NOT NULL default 'P';
diff --git a/sql-files/upgrades/upgrade_20151230_log.sql b/sql-files/upgrades/upgrade_20151230_log.sql
deleted file mode 100644
index dd2fe2f38fb..00000000000
--- a/sql-files/upgrades/upgrade_20151230_log.sql
+++ /dev/null
@@ -1,19 +0,0 @@
---
--- Table structure for table `feedinglog`
---
-
-CREATE TABLE IF NOT EXISTS `feedinglog` (
- `id` INT(11) NOT NULL AUTO_INCREMENT,
- `time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
- `char_id` INT(11) NOT NULL,
- `target_id` INT(11) NOT NULL,
- `target_class` SMALLINT(11) NOT NULL,
- `type` ENUM('P','H','O') NOT NULL, -- P: Pet, H: Homunculus, O: Other
- `intimacy` INT(11) UNSIGNED NOT NULL,
- `item_id` SMALLINT(5) UNSIGNED NOT NULL,
- `map` VARCHAR(11) NOT NULL,
- `x` SMALLINT(5) UNSIGNED NOT NULL,
- `y` SMALLINT(5) UNSIGNED NOT NULL,
- PRIMARY KEY (`id`)
-) ENGINE = MyISAM AUTO_INCREMENT = 1;
-
diff --git a/sql-files/upgrades/upgrade_20170727.sql b/sql-files/upgrades/upgrade_20170727.sql
new file mode 100644
index 00000000000..f0dd3b6fc51
--- /dev/null
+++ b/sql-files/upgrades/upgrade_20170727.sql
@@ -0,0 +1,25 @@
+ALTER TABLE `char`
+ ADD COLUMN `title_id` int(11) unsigned NOT NULL default '0' AFTER `clan_id`;
+
+--
+-- Table structure for table `achievement`
+--
+
+CREATE TABLE IF NOT EXISTS `achievement` (
+ `char_id` int(11) unsigned NOT NULL default '0',
+ `id` bigint(11) unsigned NOT NULL,
+ `count1` mediumint(8) unsigned NOT NULL default '0',
+ `count2` mediumint(8) unsigned NOT NULL default '0',
+ `count3` mediumint(8) unsigned NOT NULL default '0',
+ `count4` mediumint(8) unsigned NOT NULL default '0',
+ `count5` mediumint(8) unsigned NOT NULL default '0',
+ `count6` mediumint(8) unsigned NOT NULL default '0',
+ `count7` mediumint(8) unsigned NOT NULL default '0',
+ `count8` mediumint(8) unsigned NOT NULL default '0',
+ `count9` mediumint(8) unsigned NOT NULL default '0',
+ `count10` mediumint(8) unsigned NOT NULL default '0',
+ `completed` datetime,
+ `rewarded` datetime,
+ PRIMARY KEY (`char_id`,`id`),
+ KEY `char_id` (`char_id`)
+) ENGINE=MyISAM;
diff --git a/sql-files/upgrades/upgrade_20170806.sql b/sql-files/upgrades/upgrade_20170806.sql
new file mode 100644
index 00000000000..041474e37da
--- /dev/null
+++ b/sql-files/upgrades/upgrade_20170806.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `char`
+ ADD COLUMN `show_equip` tinyint(3) unsigned NOT NULL default '0' AFTER `title_id`;
diff --git a/sql-files/upgrades/upgrade_20170830.sql b/sql-files/upgrades/upgrade_20170830.sql
new file mode 100644
index 00000000000..fd73a763c2a
--- /dev/null
+++ b/sql-files/upgrades/upgrade_20170830.sql
@@ -0,0 +1,21 @@
+ALTER TABLE `char`
+ MODIFY `max_hp` int(11) unsigned NOT NULL default '0',
+ MODIFY `hp` int(11) unsigned NOT NULL default '0',
+ MODIFY `max_sp` int(11) unsigned NOT NULL default '0',
+ MODIFY `sp` int(11) unsigned NOT NULL default '0';
+
+ALTER TABLE `elemental`
+ MODIFY `hp` int(11) unsigned NOT NULL default '0',
+ MODIFY `sp` int(11) unsigned NOT NULL default '0',
+ MODIFY `max_hp` int(11) unsigned NOT NULL default '0',
+ MODIFY `max_sp` int(11) unsigned NOT NULL default '0';
+
+ALTER TABLE `homunculus`
+ MODIFY `hp` int(11) unsigned NOT NULL default '0',
+ MODIFY `max_hp` int(11) unsigned NOT NULL default '0',
+ MODIFY `sp` int(11) unsigned NOT NULL default '0',
+ MODIFY `max_sp` int(11) unsigned NOT NULL default '0';
+
+ALTER TABLE `mercenary`
+ MODIFY `hp` int(11) unsigned NOT NULL default '0',
+ MODIFY `sp` int(11) unsigned NOT NULL default '0';
diff --git a/sql-files/upgrades/upgrade_20171001.sql b/sql-files/upgrades/upgrade_20171001.sql
new file mode 100644
index 00000000000..b06a3698219
--- /dev/null
+++ b/sql-files/upgrades/upgrade_20171001.sql
@@ -0,0 +1,118 @@
+ALTER TABLE `auction`
+ CHANGE COLUMN `option_id0` `option_id0` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `card3`,
+ CHANGE COLUMN `option_val0` `option_val0` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id0`,
+ CHANGE COLUMN `option_parm0` `option_parm0` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val0`,
+ CHANGE COLUMN `option_id1` `option_id1` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_parm0`,
+ CHANGE COLUMN `option_val1` `option_val1` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id1`,
+ CHANGE COLUMN `option_parm1` `option_parm1` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val1`,
+ CHANGE COLUMN `option_id2` `option_id2` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_parm1`,
+ CHANGE COLUMN `option_val2` `option_val2` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id2`,
+ CHANGE COLUMN `option_parm2` `option_parm2` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val2`,
+ CHANGE COLUMN `option_id3` `option_id3` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_parm2`,
+ CHANGE COLUMN `option_val3` `option_val3` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id3`,
+ CHANGE COLUMN `option_parm3` `option_parm3` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val3`,
+ CHANGE COLUMN `option_id4` `option_id4` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_parm3`,
+ CHANGE COLUMN `option_val4` `option_val4` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id4`,
+ CHANGE COLUMN `option_parm4` `option_parm4` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val4`;
+
+ALTER TABLE `cart_inventory`
+ CHANGE COLUMN `option_id0` `option_id0` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `card3`,
+ CHANGE COLUMN `option_val0` `option_val0` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id0`,
+ CHANGE COLUMN `option_parm0` `option_parm0` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val0`,
+ CHANGE COLUMN `option_id1` `option_id1` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_parm0`,
+ CHANGE COLUMN `option_val1` `option_val1` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id1`,
+ CHANGE COLUMN `option_parm1` `option_parm1` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val1`,
+ CHANGE COLUMN `option_id2` `option_id2` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_parm1`,
+ CHANGE COLUMN `option_val2` `option_val2` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id2`,
+ CHANGE COLUMN `option_parm2` `option_parm2` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val2`,
+ CHANGE COLUMN `option_id3` `option_id3` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_parm2`,
+ CHANGE COLUMN `option_val3` `option_val3` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id3`,
+ CHANGE COLUMN `option_parm3` `option_parm3` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val3`,
+ CHANGE COLUMN `option_id4` `option_id4` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_parm3`,
+ CHANGE COLUMN `option_val4` `option_val4` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id4`,
+ CHANGE COLUMN `option_parm4` `option_parm4` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val4`;
+
+ALTER TABLE `guild_storage`
+ CHANGE COLUMN `option_id0` `option_id0` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `card3`,
+ CHANGE COLUMN `option_val0` `option_val0` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id0`,
+ CHANGE COLUMN `option_parm0` `option_parm0` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val0`,
+ CHANGE COLUMN `option_id1` `option_id1` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_parm0`,
+ CHANGE COLUMN `option_val1` `option_val1` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id1`,
+ CHANGE COLUMN `option_parm1` `option_parm1` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val1`,
+ CHANGE COLUMN `option_id2` `option_id2` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_parm1`,
+ CHANGE COLUMN `option_val2` `option_val2` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id2`,
+ CHANGE COLUMN `option_parm2` `option_parm2` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val2`,
+ CHANGE COLUMN `option_id3` `option_id3` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_parm2`,
+ CHANGE COLUMN `option_val3` `option_val3` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id3`,
+ CHANGE COLUMN `option_parm3` `option_parm3` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val3`,
+ CHANGE COLUMN `option_id4` `option_id4` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_parm3`,
+ CHANGE COLUMN `option_val4` `option_val4` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id4`,
+ CHANGE COLUMN `option_parm4` `option_parm4` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val4`;
+
+ALTER TABLE `auction`
+ CHANGE COLUMN `option_id0` `option_id0` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `card3`,
+ CHANGE COLUMN `option_val0` `option_val0` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id0`,
+ CHANGE COLUMN `option_parm0` `option_parm0` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val0`,
+ CHANGE COLUMN `option_id1` `option_id1` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_parm0`,
+ CHANGE COLUMN `option_val1` `option_val1` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id1`,
+ CHANGE COLUMN `option_parm1` `option_parm1` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val1`,
+ CHANGE COLUMN `option_id2` `option_id2` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_parm1`,
+ CHANGE COLUMN `option_val2` `option_val2` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id2`,
+ CHANGE COLUMN `option_parm2` `option_parm2` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val2`,
+ CHANGE COLUMN `option_id3` `option_id3` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_parm2`,
+ CHANGE COLUMN `option_val3` `option_val3` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id3`,
+ CHANGE COLUMN `option_parm3` `option_parm3` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val3`,
+ CHANGE COLUMN `option_id4` `option_id4` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_parm3`,
+ CHANGE COLUMN `option_val4` `option_val4` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id4`,
+ CHANGE COLUMN `option_parm4` `option_parm4` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val4`;
+
+ALTER TABLE `inventory`
+ CHANGE COLUMN `option_id0` `option_id0` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `card3`,
+ CHANGE COLUMN `option_val0` `option_val0` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id0`,
+ CHANGE COLUMN `option_parm0` `option_parm0` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val0`,
+ CHANGE COLUMN `option_id1` `option_id1` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_parm0`,
+ CHANGE COLUMN `option_val1` `option_val1` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id1`,
+ CHANGE COLUMN `option_parm1` `option_parm1` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val1`,
+ CHANGE COLUMN `option_id2` `option_id2` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_parm1`,
+ CHANGE COLUMN `option_val2` `option_val2` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id2`,
+ CHANGE COLUMN `option_parm2` `option_parm2` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val2`,
+ CHANGE COLUMN `option_id3` `option_id3` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_parm2`,
+ CHANGE COLUMN `option_val3` `option_val3` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id3`,
+ CHANGE COLUMN `option_parm3` `option_parm3` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val3`,
+ CHANGE COLUMN `option_id4` `option_id4` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_parm3`,
+ CHANGE COLUMN `option_val4` `option_val4` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id4`,
+ CHANGE COLUMN `option_parm4` `option_parm4` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val4`;
+
+ALTER TABLE `mail_attachments`
+ CHANGE COLUMN `option_id0` `option_id0` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `card3`,
+ CHANGE COLUMN `option_val0` `option_val0` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id0`,
+ CHANGE COLUMN `option_parm0` `option_parm0` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val0`,
+ CHANGE COLUMN `option_id1` `option_id1` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_parm0`,
+ CHANGE COLUMN `option_val1` `option_val1` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id1`,
+ CHANGE COLUMN `option_parm1` `option_parm1` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val1`,
+ CHANGE COLUMN `option_id2` `option_id2` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_parm1`,
+ CHANGE COLUMN `option_val2` `option_val2` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id2`,
+ CHANGE COLUMN `option_parm2` `option_parm2` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val2`,
+ CHANGE COLUMN `option_id3` `option_id3` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_parm2`,
+ CHANGE COLUMN `option_val3` `option_val3` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id3`,
+ CHANGE COLUMN `option_parm3` `option_parm3` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val3`,
+ CHANGE COLUMN `option_id4` `option_id4` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_parm3`,
+ CHANGE COLUMN `option_val4` `option_val4` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id4`,
+ CHANGE COLUMN `option_parm4` `option_parm4` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val4`;
+
+ALTER TABLE `storage`
+ CHANGE COLUMN `option_id0` `option_id0` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `card3`,
+ CHANGE COLUMN `option_val0` `option_val0` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id0`,
+ CHANGE COLUMN `option_parm0` `option_parm0` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val0`,
+ CHANGE COLUMN `option_id1` `option_id1` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_parm0`,
+ CHANGE COLUMN `option_val1` `option_val1` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id1`,
+ CHANGE COLUMN `option_parm1` `option_parm1` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val1`,
+ CHANGE COLUMN `option_id2` `option_id2` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_parm1`,
+ CHANGE COLUMN `option_val2` `option_val2` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id2`,
+ CHANGE COLUMN `option_parm2` `option_parm2` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val2`,
+ CHANGE COLUMN `option_id3` `option_id3` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_parm2`,
+ CHANGE COLUMN `option_val3` `option_val3` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id3`,
+ CHANGE COLUMN `option_parm3` `option_parm3` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val3`,
+ CHANGE COLUMN `option_id4` `option_id4` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_parm3`,
+ CHANGE COLUMN `option_val4` `option_val4` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id4`,
+ CHANGE COLUMN `option_parm4` `option_parm4` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val4`;
diff --git a/sql-files/upgrades/upgrade_20171001_logs.sql b/sql-files/upgrades/upgrade_20171001_logs.sql
new file mode 100644
index 00000000000..d8a2b91de3a
--- /dev/null
+++ b/sql-files/upgrades/upgrade_20171001_logs.sql
@@ -0,0 +1,16 @@
+ALTER TABLE `picklog`
+ CHANGE COLUMN `option_id0` `option_id0` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `card3`,
+ CHANGE COLUMN `option_val0` `option_val0` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id0`,
+ CHANGE COLUMN `option_parm0` `option_parm0` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val0`,
+ CHANGE COLUMN `option_id1` `option_id1` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_parm0`,
+ CHANGE COLUMN `option_val1` `option_val1` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id1`,
+ CHANGE COLUMN `option_parm1` `option_parm1` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val1`,
+ CHANGE COLUMN `option_id2` `option_id2` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_parm1`,
+ CHANGE COLUMN `option_val2` `option_val2` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id2`,
+ CHANGE COLUMN `option_parm2` `option_parm2` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val2`,
+ CHANGE COLUMN `option_id3` `option_id3` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_parm2`,
+ CHANGE COLUMN `option_val3` `option_val3` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id3`,
+ CHANGE COLUMN `option_parm3` `option_parm3` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val3`,
+ CHANGE COLUMN `option_id4` `option_id4` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_parm3`,
+ CHANGE COLUMN `option_val4` `option_val4` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `option_id4`,
+ CHANGE COLUMN `option_parm4` `option_parm4` TINYINT(3) NOT NULL DEFAULT '0' AFTER `option_val4`;
\ No newline at end of file
diff --git a/sql-files/upgrades/upgrade_20171019.sql b/sql-files/upgrades/upgrade_20171019.sql
new file mode 100644
index 00000000000..d9edd3a66da
--- /dev/null
+++ b/sql-files/upgrades/upgrade_20171019.sql
@@ -0,0 +1,2 @@
+INSERT INTO `skill` (`char_id`, `id`, `lv`, `flag`)
+ SELECT `char_id`, 5065, 1, 0 FROM `char` WHERE `father` > 0 OR `mother` > 0;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0bd784c93a2..be74eab3f16 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,4 +16,6 @@ endif()
add_subdirectory( login )
add_subdirectory( char )
add_subdirectory( map )
+add_subdirectory( test )
add_subdirectory( tool )
+
diff --git a/src/char/CMakeLists.txt b/src/char/CMakeLists.txt
index a9d284c1c39..d02a2e93dd7 100644
--- a/src/char/CMakeLists.txt
+++ b/src/char/CMakeLists.txt
@@ -1,7 +1,7 @@
#
# setup
#
-set( SERVER_CHAR_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "" )
+set( CHAR_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "" )
#
@@ -9,44 +9,10 @@ set( SERVER_CHAR_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "" )
#
if( BUILD_SERVERS )
message( STATUS "Creating target char-server" )
-set( CHAR_HEADERS
- "${SERVER_CHAR_SOURCE_DIR}/char.h"
- "${SERVER_CHAR_SOURCE_DIR}/char_clif.h"
- "${SERVER_CHAR_SOURCE_DIR}/char_cnslif.h"
- "${SERVER_CHAR_SOURCE_DIR}/char_logif.h"
- "${SERVER_CHAR_SOURCE_DIR}/char_mapif.h"
- "${SERVER_CHAR_SOURCE_DIR}/int_auction.h"
- "${SERVER_CHAR_SOURCE_DIR}/int_clan.h"
- "${SERVER_CHAR_SOURCE_DIR}/int_elemental.h"
- "${SERVER_CHAR_SOURCE_DIR}/int_guild.h"
- "${SERVER_CHAR_SOURCE_DIR}/int_homun.h"
- "${SERVER_CHAR_SOURCE_DIR}/int_mail.h"
- "${SERVER_CHAR_SOURCE_DIR}/int_mercenary.h"
- "${SERVER_CHAR_SOURCE_DIR}/int_party.h"
- "${SERVER_CHAR_SOURCE_DIR}/int_pet.h"
- "${SERVER_CHAR_SOURCE_DIR}/int_quest.h"
- "${SERVER_CHAR_SOURCE_DIR}/int_storage.h"
- "${SERVER_CHAR_SOURCE_DIR}/inter.h"
- )
-set( CHAR_SOURCES
- "${SERVER_CHAR_SOURCE_DIR}/char.c"
- "${SERVER_CHAR_SOURCE_DIR}/char_clif.c"
- "${SERVER_CHAR_SOURCE_DIR}/char_cnslif.c"
- "${SERVER_CHAR_SOURCE_DIR}/char_logif.c"
- "${SERVER_CHAR_SOURCE_DIR}/char_mapif.c"
- "${SERVER_CHAR_SOURCE_DIR}/int_auction.c"
- "${SERVER_CHAR_SOURCE_DIR}/int_clan.c"
- "${SERVER_CHAR_SOURCE_DIR}/int_elemental.c"
- "${SERVER_CHAR_SOURCE_DIR}/int_guild.c"
- "${SERVER_CHAR_SOURCE_DIR}/int_homun.c"
- "${SERVER_CHAR_SOURCE_DIR}/int_mail.c"
- "${SERVER_CHAR_SOURCE_DIR}/int_mercenary.c"
- "${SERVER_CHAR_SOURCE_DIR}/int_party.c"
- "${SERVER_CHAR_SOURCE_DIR}/int_pet.c"
- "${SERVER_CHAR_SOURCE_DIR}/int_quest.c"
- "${SERVER_CHAR_SOURCE_DIR}/int_storage.c"
- "${SERVER_CHAR_SOURCE_DIR}/inter.c"
- )
+file(GLOB CHAR_HEADERS ${CHAR_SOURCE_DIR}/*.hpp)
+file(GLOB CHAR_SOURCES_CXX ${CHAR_SOURCE_DIR}/*.cpp)
+set(CHAR_SOURCES ${CHAR_SOURCES_C} ${CHAR_SOURCES_CXX})
+#message( STATUS "CHAR_SOURCES="${CHAR_SOURCES})
set( DEPENDENCIES common )
set( LIBRARIES ${GLOBAL_LIBRARIES} )
set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${COMMON_BASE_INCLUDE_DIRS} )
@@ -55,10 +21,14 @@ set( SOURCE_FILES ${COMMON_BASE_HEADERS} ${COMMON_HEADERS} ${CHAR_HEADERS} ${CHA
source_group( common FILES ${COMMON_BASE_HEADERS} ${COMMON_HEADERS} )
source_group( char FILES ${CHAR_HEADERS} ${CHAR_SOURCES} )
include_directories( ${INCLUDE_DIRS} )
+
+#message( STATUS "char-server SOURCE_FILES=${SOURCE_FILES}")
add_executable( char-server ${SOURCE_FILES} )
+#message( STATUS "char-server LIBRARIES=${LIBRARIES}, DEPENDENCIES=${DEPENDENCIES} DEFINITIONS=${DEFINITIONS}")
add_dependencies( char-server ${DEPENDENCIES} )
target_link_libraries( char-server ${LIBRARIES} ${DEPENDENCIES} )
set_target_properties( char-server PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" )
+
if( INSTALL_COMPONENT_RUNTIME )
cpack_add_component( Runtime_charserver DESCRIPTION "char-server" DISPLAY_NAME "char-server" GROUP Runtime )
install( TARGETS char-server
diff --git a/src/char/Makefile.in b/src/char/Makefile.in
index 1d3dfe9af03..3fddf5ee15c 100644
--- a/src/char/Makefile.in
+++ b/src/char/Makefile.in
@@ -14,9 +14,15 @@ LIBCONFIG_INCLUDE = -I../../3rdparty/libconfig
COMMON_OBJ = ../common/obj/sql.o
COMMON_H = ../common/sql.h
-CHAR_OBJ = $(shell ls *.c | sed -e "s/\.c/\.o/g") $(shell ls *.cpp | sed -e "s/\.cpp/\.o/g")
+CHAR_OBJ = $(shell ls *.cpp | sed -e "s/\.cpp/\.o/g")
CHAR_DIR_OBJ = $(CHAR_OBJ:%=obj/%)
-CHAR_H = $(shell ls ../char/*.h)
+CHAR_H = $(shell ls ../char/*.hpp)
+
+YAML_CPP_OBJ = $(shell find ../../3rdparty/yaml-cpp/ -type f -name "*.cpp" | sed -e "s/\.cpp/\.o/g" )
+YAML_CPP_DIR_OBJ = $(YAML_CPP_OBJ:%=obj/%)
+YAML_CPP_AR = ../../3rdparty/yaml-cpp/obj/yaml-cpp.a
+YAML_CPP_H = $(shell find ../../3rdparty/yaml-cpp/ -type f -name "*.h")
+YAML_CPP_INCLUDE = -I../../3rdparty/yaml-cpp/include
HAVE_MYSQL=@HAVE_MYSQL@
ifeq ($(HAVE_MYSQL),yes)
@@ -26,8 +32,6 @@ else
endif
ALL_DEPENDS=server
-CXXFLAGS=-std=c++11
-
@SET_MAKE@
#####################################################################
@@ -51,9 +55,9 @@ help:
#####################################################################
-char-server: obj $(CHAR_DIR_OBJ) $(LIBCONFIG_AR) $(COMMON_AR)
+char-server: obj $(CHAR_DIR_OBJ) $(LIBCONFIG_AR) $(COMMON_AR) $(YAML_CPP_AR)
@echo " LD @OCHR@@EXEEXT@"
- @@CXX@ @LDFLAGS@ -o ../../@OCHR@@EXEEXT@ $(CHAR_DIR_OBJ) $(LIBCONFIG_AR) $(COMMON_AR) $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) @LIBS@ @MYSQL_LIBS@
+ @@CXX@ @LDFLAGS@ -o ../../@OCHR@@EXEEXT@ $(CHAR_DIR_OBJ) $(LIBCONFIG_AR) $(COMMON_AR) $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) $(YAML_CPP_AR) @LIBS@ @MYSQL_LIBS@
needs_mysql:
@echo "MySQL not found or disabled by the configure script"
@@ -63,13 +67,13 @@ obj:
@echo " MKDIR obj"
@-mkdir obj
-obj/%.o: %.c $(CHAR_H) $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H)
+obj/%.o: %.c $(CHAR_H) $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H) $(YAML_CPP_H)
@echo " CC $<"
- @@CC@ @CFLAGS@ $(COMMON_INCLUDE) $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
+ @@CC@ @CFLAGS@ $(COMMON_INCLUDE) $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) $(YAML_CPP_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
-obj/%.o: %.cpp $(CHAR_H) $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H)
+obj/%.o: %.cpp $(CHAR_H) $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H) $(YAML_CPP_H)
@echo " CXX $<"
- @@CXX@ @CXXFLAGS@ $(COMMON_INCLUDE) $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
+ @@CXX@ @CXXFLAGS@ $(COMMON_INCLUDE) $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) $(YAML_CPP_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
# missing object files
$(COMMON_AR):
@@ -80,3 +84,6 @@ $(MT19937AR_OBJ):
$(LIBCONFIG_AR):
@$(MAKE) -C ../../3rdparty/libconfig
+
+$(YAML_CPP_AR):
+ @$(MAKE) -C ../../3rdparty/yaml-cpp
diff --git a/src/char/char-server.vcxproj b/src/char/char-server.vcxproj
index 6c2bf4cd565..61f157ee4bc 100644
--- a/src/char/char-server.vcxproj
+++ b/src/char/char-server.vcxproj
@@ -27,26 +27,26 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
@@ -94,6 +94,7 @@
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>$(DefineConstants);WIN32;FD_SETSIZE=4096;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\yaml-cpp\include\</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@@ -109,6 +110,7 @@
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>$(DefineConstants);WIN32;FD_SETSIZE=4096;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\yaml-cpp\include\</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@@ -126,6 +128,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>$(DefineConstants);WIN32;FD_SETSIZE=4096;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\yaml-cpp\include\</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@@ -145,6 +148,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>$(DefineConstants);WIN32;FD_SETSIZE=4096;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\yaml-cpp\include\</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@@ -155,44 +159,44 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClInclude Include="char.h" />
- <ClInclude Include="char_clif.h" />
- <ClInclude Include="char_cnslif.h" />
- <ClInclude Include="char_logif.h" />
- <ClInclude Include="char_mapif.h" />
- <ClInclude Include="inter.h" />
- <ClInclude Include="int_auction.h" />
- <ClInclude Include="int_clan.h" />
- <ClInclude Include="int_elemental.h" />
- <ClInclude Include="int_guild.h" />
- <ClInclude Include="int_homun.h" />
- <ClInclude Include="int_mail.h" />
- <ClInclude Include="int_mercenary.h" />
- <ClInclude Include="int_party.h" />
- <ClInclude Include="int_pet.h" />
- <ClInclude Include="int_quest.h" />
- <ClInclude Include="int_storage.h" />
+ <ClInclude Include="char.hpp" />
+ <ClInclude Include="char_clif.hpp" />
+ <ClInclude Include="char_cnslif.hpp" />
+ <ClInclude Include="char_logif.hpp" />
+ <ClInclude Include="char_mapif.hpp" />
+ <ClInclude Include="inter.hpp" />
+ <ClInclude Include="int_achievement.hpp" />
+ <ClInclude Include="int_auction.hpp" />
+ <ClInclude Include="int_clan.hpp" />
+ <ClInclude Include="int_elemental.hpp" />
+ <ClInclude Include="int_guild.hpp" />
+ <ClInclude Include="int_homun.hpp" />
+ <ClInclude Include="int_mail.hpp" />
+ <ClInclude Include="int_mercenary.hpp" />
+ <ClInclude Include="int_party.hpp" />
+ <ClInclude Include="int_pet.hpp" />
+ <ClInclude Include="int_quest.hpp" />
+ <ClInclude Include="int_storage.hpp" />
</ItemGroup>
<ItemGroup>
- <ClCompile Include="char.cpp">
- <CompileAs>CompileAsCpp</CompileAs>
- </ClCompile>
- <ClCompile Include="char_clif.c" />
- <ClCompile Include="char_cnslif.c" />
- <ClCompile Include="char_logif.c" />
- <ClCompile Include="char_mapif.c" />
- <ClCompile Include="inter.c" />
- <ClCompile Include="int_auction.c" />
- <ClCompile Include="int_clan.c" />
- <ClCompile Include="int_elemental.c" />
- <ClCompile Include="int_guild.c" />
- <ClCompile Include="int_homun.c" />
- <ClCompile Include="int_mail.c" />
- <ClCompile Include="int_mercenary.c" />
- <ClCompile Include="int_party.c" />
- <ClCompile Include="int_pet.c" />
- <ClCompile Include="int_quest.c" />
- <ClCompile Include="int_storage.c" />
+ <ClCompile Include="char.cpp" />
+ <ClCompile Include="char_clif.cpp" />
+ <ClCompile Include="char_cnslif.cpp" />
+ <ClCompile Include="char_logif.cpp" />
+ <ClCompile Include="char_mapif.cpp" />
+ <ClCompile Include="inter.cpp" />
+ <ClCompile Include="int_achievement.cpp" />
+ <ClCompile Include="int_auction.cpp" />
+ <ClCompile Include="int_clan.cpp" />
+ <ClCompile Include="int_elemental.cpp" />
+ <ClCompile Include="int_guild.cpp" />
+ <ClCompile Include="int_homun.cpp" />
+ <ClCompile Include="int_mail.cpp" />
+ <ClCompile Include="int_mercenary.cpp" />
+ <ClCompile Include="int_party.cpp" />
+ <ClCompile Include="int_pet.cpp" />
+ <ClCompile Include="int_quest.cpp" />
+ <ClCompile Include="int_storage.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/src/char/char-server.vcxproj.filters b/src/char/char-server.vcxproj.filters
index 93cd8216833..d6946ba3a34 100644
--- a/src/char/char-server.vcxproj.filters
+++ b/src/char/char-server.vcxproj.filters
@@ -11,55 +11,58 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="char.h">
+ <ClInclude Include="char.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="char_clif.h">
+ <ClInclude Include="char_clif.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="char_cnslif.h">
+ <ClInclude Include="char_cnslif.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="char_logif.h">
+ <ClInclude Include="char_logif.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="char_mapif.h">
+ <ClInclude Include="char_mapif.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="int_auction.h">
+ <ClInclude Include="int_achievement.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="int_elemental.h">
+ <ClInclude Include="int_auction.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="int_guild.h">
+ <ClInclude Include="int_elemental.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="int_homun.h">
+ <ClInclude Include="int_guild.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="int_mail.h">
+ <ClInclude Include="int_homun.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="int_mercenary.h">
+ <ClInclude Include="int_mail.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="int_party.h">
+ <ClInclude Include="int_mercenary.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="int_pet.h">
+ <ClInclude Include="int_party.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="int_quest.h">
+ <ClInclude Include="int_pet.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="int_storage.h">
+ <ClInclude Include="int_quest.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="inter.h">
+ <ClInclude Include="int_storage.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="int_clan.h">
+ <ClInclude Include="inter.hpp">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="int_clan.hpp">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
@@ -67,52 +70,55 @@
<ClCompile Include="char.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="char_clif.c">
+ <ClCompile Include="char_clif.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="char_cnslif.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="char_cnslif.c">
+ <ClCompile Include="char_logif.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="char_logif.c">
+ <ClCompile Include="char_mapif.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="char_mapif.c">
+ <ClCompile Include="int_achievement.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="int_auction.c">
+ <ClCompile Include="int_auction.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="int_elemental.c">
+ <ClCompile Include="int_elemental.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="int_guild.c">
+ <ClCompile Include="int_guild.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="int_homun.c">
+ <ClCompile Include="int_homun.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="int_mail.c">
+ <ClCompile Include="int_mail.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="int_mercenary.c">
+ <ClCompile Include="int_mercenary.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="int_party.c">
+ <ClCompile Include="int_party.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="int_pet.c">
+ <ClCompile Include="int_pet.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="int_quest.c">
+ <ClCompile Include="int_quest.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="int_storage.c">
+ <ClCompile Include="int_storage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="inter.c">
+ <ClCompile Include="inter.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="int_clan.c">
+ <ClCompile Include="int_clan.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
diff --git a/src/char/char.cpp b/src/char/char.cpp
index 3ff791c1af3..51233cf6185 100644
--- a/src/char/char.cpp
+++ b/src/char/char.cpp
@@ -2,6 +2,7 @@
// For more information, see LICENCE in the main folder
#pragma warning(disable:4800)
+#include "char.hpp"
#include <time.h>
#include <stdarg.h>
@@ -21,18 +22,19 @@
#include "../common/strlib.h"
#include "../common/timer.h"
#include "../common/cli.h"
-#include "int_guild.h"
-#include "int_homun.h"
-#include "int_mail.h"
-#include "int_mercenary.h"
-#include "int_elemental.h"
-#include "int_party.h"
-#include "int_storage.h"
-#include "inter.h"
-#include "char_logif.h"
-#include "char_mapif.h"
-#include "char_cnslif.h"
-#include "char_clif.h"
+
+#include "int_guild.hpp"
+#include "int_homun.hpp"
+#include "int_mail.hpp"
+#include "int_mercenary.hpp"
+#include "int_elemental.hpp"
+#include "int_party.hpp"
+#include "int_storage.hpp"
+#include "inter.hpp"
+#include "char_logif.hpp"
+#include "char_mapif.hpp"
+#include "char_cnslif.hpp"
+#include "char_clif.hpp"
//definition of exported var declared in .h
int login_fd=-1; //login file descriptor
@@ -215,7 +217,7 @@ int char_db_setoffline(DBKey key, DBData *data, va_list ap) {
/**
* @see DBApply
*/
-static int char_db_kickoffline(DBKey key, DBData *data, va_list ap){
+int char_db_kickoffline(DBKey key, DBData *data, va_list ap){
struct online_char_data* character = (struct online_char_data*)db_data2ptr(data);
int server_id = va_arg(ap, int);
@@ -259,7 +261,7 @@ void char_set_all_offline_sql(void){
/**
* @see DBCreateData
*/
-static DBData char_create_charstatus(DBKey key, va_list args) {
+DBData char_create_charstatus(DBKey key, va_list args) {
struct mmo_charstatus *cp;
cp = (struct mmo_charstatus *) aCalloc(1,sizeof(struct mmo_charstatus));
cp->char_id = key.i;
@@ -300,18 +302,19 @@ int char_mmo_char_tosql(uint32 char_id, struct mmo_charstatus* p){
(p->head_mid != cp->head_mid) || (p->head_bottom != cp->head_bottom) || (p->delete_date != cp->delete_date) ||
(p->rename != cp->rename) || (p->robe != cp->robe) || (p->character_moves != cp->character_moves) ||
(p->unban_time != cp->unban_time) || (p->font != cp->font) || (p->uniqueitem_counter != cp->uniqueitem_counter) ||
- (p->hotkey_rowshift != cp->hotkey_rowshift) || (p->clan_id != cp->clan_id )
+ (p->hotkey_rowshift != cp->hotkey_rowshift) || (p->clan_id != cp->clan_id ) || (p->title_id != cp->title_id) ||
+ (p->show_equip != cp->show_equip)
)
{ //Save status
if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `base_level`='%d', `job_level`='%d',"
"`base_exp`='%u', `job_exp`='%u', `zeny`='%d',"
- "`max_hp`='%d',`hp`='%d',`max_sp`='%d',`sp`='%d',`status_point`='%d',`skill_point`='%d',"
+ "`max_hp`='%u',`hp`='%u',`max_sp`='%u',`sp`='%u',`status_point`='%d',`skill_point`='%d',"
"`str`='%d',`agi`='%d',`vit`='%d',`int`='%d',`dex`='%d',`luk`='%d',"
"`option`='%d',`party_id`='%d',`guild_id`='%d',`pet_id`='%d',`homun_id`='%d',`elemental_id`='%d',"
"`weapon`='%d',`shield`='%d',`head_top`='%d',`head_mid`='%d',`head_bottom`='%d',"
"`last_map`='%s',`last_x`='%d',`last_y`='%d',`save_map`='%s',`save_x`='%d',`save_y`='%d', `rename`='%d',"
"`delete_date`='%lu',`robe`='%d',`moves`='%d',`font`='%u',`uniqueitem_counter`='%u',"
- "`hotkey_rowshift`='%d', `clan_id`='%d'"
+ "`hotkey_rowshift`='%d', `clan_id`='%d', `title_id`='%lu', `show_equip`='%d'"
" WHERE `account_id`='%d' AND `char_id` = '%d'",
schema_config.char_db, p->base_level, p->job_level,
p->base_exp, p->job_exp, p->zeny,
@@ -323,7 +326,7 @@ int char_mmo_char_tosql(uint32 char_id, struct mmo_charstatus* p){
mapindex_id2name(p->save_point.map), p->save_point.x, p->save_point.y, p->rename,
(unsigned long)p->delete_date, // FIXME: platform-dependent size
p->robe, p->character_moves, p->font, p->uniqueitem_counter,
- p->hotkey_rowshift, p->clan_id,
+ p->hotkey_rowshift, p->clan_id, p->title_id, p->show_equip,
p->account_id, p->char_id) )
{
Sql_ShowDebug(sql_handle);
@@ -917,7 +920,7 @@ int char_mmo_chars_fromsql(struct char_session_data* sd, uint8* buf) {
"`str`,`agi`,`vit`,`int`,`dex`,`luk`,`max_hp`,`hp`,`max_sp`,`sp`,"
"`status_point`,`skill_point`,`option`,`karma`,`manner`,`hair`,`hair_color`,"
"`clothes_color`,`body`,`weapon`,`shield`,`head_top`,`head_mid`,`head_bottom`,`last_map`,`rename`,`delete_date`,"
- "`robe`,`moves`,`unban_time`,`font`,`uniqueitem_counter`,`sex`,`hotkey_rowshift`"
+ "`robe`,`moves`,`unban_time`,`font`,`uniqueitem_counter`,`sex`,`hotkey_rowshift`,`title_id`,`show_equip`"
" FROM `%s` WHERE `account_id`='%d' AND `char_num` < '%d'", schema_config.char_db, sd->account_id, MAX_CHARS)
|| SQL_ERROR == SqlStmt_Execute(stmt)
|| SQL_ERROR == SqlStmt_BindColumn(stmt, 0, SQLDT_INT, &p.char_id, 0, NULL, NULL)
@@ -935,10 +938,10 @@ int char_mmo_chars_fromsql(struct char_session_data* sd, uint8* buf) {
|| SQL_ERROR == SqlStmt_BindColumn(stmt, 12, SQLDT_SHORT, &p.int_, 0, NULL, NULL)
|| SQL_ERROR == SqlStmt_BindColumn(stmt, 13, SQLDT_SHORT, &p.dex, 0, NULL, NULL)
|| SQL_ERROR == SqlStmt_BindColumn(stmt, 14, SQLDT_SHORT, &p.luk, 0, NULL, NULL)
- || SQL_ERROR == SqlStmt_BindColumn(stmt, 15, SQLDT_INT, &p.max_hp, 0, NULL, NULL)
- || SQL_ERROR == SqlStmt_BindColumn(stmt, 16, SQLDT_INT, &p.hp, 0, NULL, NULL)
- || SQL_ERROR == SqlStmt_BindColumn(stmt, 17, SQLDT_INT, &p.max_sp, 0, NULL, NULL)
- || SQL_ERROR == SqlStmt_BindColumn(stmt, 18, SQLDT_INT, &p.sp, 0, NULL, NULL)
+ || SQL_ERROR == SqlStmt_BindColumn(stmt, 15, SQLDT_UINT, &p.max_hp, 0, NULL, NULL)
+ || SQL_ERROR == SqlStmt_BindColumn(stmt, 16, SQLDT_UINT, &p.hp, 0, NULL, NULL)
+ || SQL_ERROR == SqlStmt_BindColumn(stmt, 17, SQLDT_UINT, &p.max_sp, 0, NULL, NULL)
+ || SQL_ERROR == SqlStmt_BindColumn(stmt, 18, SQLDT_UINT, &p.sp, 0, NULL, NULL)
|| SQL_ERROR == SqlStmt_BindColumn(stmt, 19, SQLDT_UINT, &p.status_point, 0, NULL, NULL)
|| SQL_ERROR == SqlStmt_BindColumn(stmt, 20, SQLDT_UINT, &p.skill_point, 0, NULL, NULL)
|| SQL_ERROR == SqlStmt_BindColumn(stmt, 21, SQLDT_UINT, &p.option, 0, NULL, NULL)
@@ -962,7 +965,9 @@ int char_mmo_chars_fromsql(struct char_session_data* sd, uint8* buf) {
|| SQL_ERROR == SqlStmt_BindColumn(stmt, 39, SQLDT_UCHAR, &p.font, 0, NULL, NULL)
|| SQL_ERROR == SqlStmt_BindColumn(stmt, 40, SQLDT_UINT, &p.uniqueitem_counter, 0, NULL, NULL)
|| SQL_ERROR == SqlStmt_BindColumn(stmt, 41, SQLDT_ENUM, &sex, sizeof(sex), NULL, NULL)
- || SQL_ERROR == SqlStmt_BindColumn(stmt, 42, SQLDT_UCHAR, &p.hotkey_rowshift, 0, NULL, NULL)
+ || SQL_ERROR == SqlStmt_BindColumn(stmt, 42, SQLDT_UCHAR, &p.hotkey_rowshift, 0, NULL, NULL)
+ || SQL_ERROR == SqlStmt_BindColumn(stmt, 43, SQLDT_ULONG, &p.title_id, 0, NULL, NULL)
+ || SQL_ERROR == SqlStmt_BindColumn(stmt, 44, SQLDT_UINT16, &p.show_equip, 0, NULL, NULL)
)
{
SqlStmt_ShowDebug(stmt);
@@ -1026,7 +1031,7 @@ int char_mmo_char_fromsql(uint32 char_id, struct mmo_charstatus* p, bool load_ev
"`status_point`,`skill_point`,`option`,`karma`,`manner`,`party_id`,`guild_id`,`pet_id`,`homun_id`,`elemental_id`,`hair`,"
"`hair_color`,`clothes_color`,`body`,`weapon`,`shield`,`head_top`,`head_mid`,`head_bottom`,`last_map`,`last_x`,`last_y`,"
"`save_map`,`save_x`,`save_y`,`partner_id`,`father`,`mother`,`child`,`fame`,`rename`,`delete_date`,`robe`, `moves`,"
- "`unban_time`,`font`,`uniqueitem_counter`,`sex`,`hotkey_rowshift`,`clan_id`"
+ "`unban_time`,`font`,`uniqueitem_counter`,`sex`,`hotkey_rowshift`,`clan_id`,`title_id`,`show_equip`"
" FROM `%s` WHERE `char_id`=? LIMIT 1", schema_config.char_db)
|| SQL_ERROR == SqlStmt_BindParam(stmt, 0, SQLDT_INT, &char_id, 0)
|| SQL_ERROR == SqlStmt_Execute(stmt)
@@ -1046,10 +1051,10 @@ int char_mmo_char_fromsql(uint32 char_id, struct mmo_charstatus* p, bool load_ev
|| SQL_ERROR == SqlStmt_BindColumn(stmt, 13, SQLDT_SHORT, &p->int_, 0, NULL, NULL)
|| SQL_ERROR == SqlStmt_BindColumn(stmt, 14, SQLDT_SHORT, &p->dex, 0, NULL, NULL)
|| SQL_ERROR == SqlStmt_BindColumn(stmt, 15, SQLDT_SHORT, &p->luk, 0, NULL, NULL)
- || SQL_ERROR == SqlStmt_BindColumn(stmt, 16, SQLDT_INT, &p->max_hp, 0, NULL, NULL)
- || SQL_ERROR == SqlStmt_BindColumn(stmt, 17, SQLDT_INT, &p->hp, 0, NULL, NULL)
- || SQL_ERROR == SqlStmt_BindColumn(stmt, 18, SQLDT_INT, &p->max_sp, 0, NULL, NULL)
- || SQL_ERROR == SqlStmt_BindColumn(stmt, 19, SQLDT_INT, &p->sp, 0, NULL, NULL)
+ || SQL_ERROR == SqlStmt_BindColumn(stmt, 16, SQLDT_UINT, &p->max_hp, 0, NULL, NULL)
+ || SQL_ERROR == SqlStmt_BindColumn(stmt, 17, SQLDT_UINT, &p->hp, 0, NULL, NULL)
+ || SQL_ERROR == SqlStmt_BindColumn(stmt, 18, SQLDT_UINT, &p->max_sp, 0, NULL, NULL)
+ || SQL_ERROR == SqlStmt_BindColumn(stmt, 19, SQLDT_UINT, &p->sp, 0, NULL, NULL)
|| SQL_ERROR == SqlStmt_BindColumn(stmt, 20, SQLDT_UINT, &p->status_point, 0, NULL, NULL)
|| SQL_ERROR == SqlStmt_BindColumn(stmt, 21, SQLDT_UINT, &p->skill_point, 0, NULL, NULL)
|| SQL_ERROR == SqlStmt_BindColumn(stmt, 22, SQLDT_UINT, &p->option, 0, NULL, NULL)
@@ -1090,6 +1095,8 @@ int char_mmo_char_fromsql(uint32 char_id, struct mmo_charstatus* p, bool load_ev
|| SQL_ERROR == SqlStmt_BindColumn(stmt, 57, SQLDT_ENUM, &sex, sizeof(sex), NULL, NULL)
|| SQL_ERROR == SqlStmt_BindColumn(stmt, 58, SQLDT_UCHAR, &p->hotkey_rowshift, 0, NULL, NULL)
|| SQL_ERROR == SqlStmt_BindColumn(stmt, 59, SQLDT_INT, &p->clan_id, 0, NULL, NULL)
+ || SQL_ERROR == SqlStmt_BindColumn(stmt, 60, SQLDT_ULONG, &p->title_id, 0, NULL, NULL)
+ || SQL_ERROR == SqlStmt_BindColumn(stmt, 61, SQLDT_UINT16, &p->show_equip, 0, NULL, NULL)
)
{
SqlStmt_ShowDebug(stmt);
@@ -1423,12 +1430,16 @@ int char_make_new_char_sql(struct char_session_data* sd, char* name_, int str, i
return -2; // invalid input
#endif
-
// check the number of already existing chars in this account
if( SQL_ERROR == Sql_Query(sql_handle, "SELECT 1 FROM `%s` WHERE `account_id` = '%d'", schema_config.char_db, sd->account_id) )
Sql_ShowDebug(sql_handle);
+#ifdef VIP_ENABLE
+ if( Sql_NumRows(sql_handle) >= MAX_CHARS )
+ return -2; // character account limit exceeded
+#else
if( Sql_NumRows(sql_handle) >= sd->char_slots )
return -2; // character account limit exceeded
+#endif
// check char slot
if( SQL_ERROR == Sql_Query(sql_handle, "SELECT 1 FROM `%s` WHERE `account_id` = '%d' AND `char_num` = '%d' LIMIT 1", schema_config.char_db, sd->account_id, slot) )
@@ -1462,21 +1473,21 @@ int char_make_new_char_sql(struct char_session_data* sd, char* name_, int str, i
#if PACKETVER >= 20151001
if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s` (`account_id`, `char_num`, `name`, `class`, `zeny`, `status_point`, `str`, `agi`, `vit`, `int`, `dex`, `luk`, `max_hp`, `hp`,"
"`max_sp`, `sp`, `hair`, `hair_color`, `last_map`, `last_x`, `last_y`, `save_map`, `save_x`, `save_y`, `sex`) VALUES ("
- "'%d', '%d', '%s', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%s', '%d', '%d', '%s', '%d', '%d', '%c')",
+ "'%d', '%d', '%s', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%u', '%u', '%u', '%u', '%d', '%d', '%s', '%d', '%d', '%s', '%d', '%d', '%c')",
schema_config.char_db, sd->account_id , slot, esc_name, start_job, charserv_config.start_zeny, 48, str, agi, vit, int_, dex, luk,
(40 * (100 + vit)/100) , (40 * (100 + vit)/100 ), (11 * (100 + int_)/100), (11 * (100 + int_)/100), hair_style, hair_color,
mapindex_id2name(tmp_start_point[start_point_idx].map), tmp_start_point[start_point_idx].x, tmp_start_point[start_point_idx].y, mapindex_id2name(tmp_start_point[start_point_idx].map), tmp_start_point[start_point_idx].x, tmp_start_point[start_point_idx].y, sex) )
#elif PACKETVER >= 20120307
if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s` (`account_id`, `char_num`, `name`, `zeny`, `status_point`, `str`, `agi`, `vit`, `int`, `dex`, `luk`, `max_hp`, `hp`,"
"`max_sp`, `sp`, `hair`, `hair_color`, `last_map`, `last_x`, `last_y`, `save_map`, `save_x`, `save_y`) VALUES ("
- "'%d', '%d', '%s', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%s', '%d', '%d', '%s', '%d', '%d')",
+ "'%d', '%d', '%s', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%u', '%u', '%u', '%u', '%d', '%d', '%s', '%d', '%d', '%s', '%d', '%d')",
schema_config.char_db, sd->account_id , slot, esc_name, charserv_config.start_zeny, 48, str, agi, vit, int_, dex, luk,
(40 * (100 + vit)/100) , (40 * (100 + vit)/100 ), (11 * (100 + int_)/100), (11 * (100 + int_)/100), hair_style, hair_color,
mapindex_id2name(tmp_start_point[start_point_idx].map), tmp_start_point[start_point_idx].x, tmp_start_point[start_point_idx].y, mapindex_id2name(tmp_start_point[start_point_idx].map), tmp_start_point[start_point_idx].x, tmp_start_point[start_point_idx].y) )
#else
if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s` (`account_id`, `char_num`, `name`, `zeny`, `str`, `agi`, `vit`, `int`, `dex`, `luk`, `max_hp`, `hp`,"
"`max_sp`, `sp`, `hair`, `hair_color`, `last_map`, `last_x`, `last_y`, `save_map`, `save_x`, `save_y`) VALUES ("
- "'%d', '%d', '%s', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%s', '%d', '%d', '%s', '%d', '%d')",
+ "'%d', '%d', '%s', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%u', '%u', '%u', '%u', '%d', '%d', '%s', '%d', '%d', '%s', '%d', '%d')",
schema_config.char_db, sd->account_id , slot, esc_name, charserv_config.start_zeny, str, agi, vit, int_, dex, luk,
(40 * (100 + vit)/100) , (40 * (100 + vit)/100 ), (11 * (100 + int_)/100), (11 * (100 + int_)/100), hair_style, hair_color,
mapindex_id2name(tmp_start_point[start_point_idx].map), tmp_start_point[start_point_idx].x, tmp_start_point[start_point_idx].y, mapindex_id2name(tmp_start_point[start_point_idx].map), tmp_start_point[start_point_idx].x, tmp_start_point[start_point_idx].y) )
@@ -1516,22 +1527,34 @@ int char_divorce_char_sql(int partner_id1, int partner_id2){
/* Returns 0 if successful
* Returns < 0 for error
*/
-int char_delete_char_sql(uint32 char_id){
+enum e_char_del_response char_delete(struct char_session_data* sd, uint32 char_id){
char name[NAME_LENGTH];
char esc_name[NAME_LENGTH*2+1]; //Name needs be escaped.
uint32 account_id;
int party_id, guild_id, hom_id, base_level, partner_id, father_id, mother_id, elemental_id;
+ time_t delete_date;
char *data;
size_t len;
+ int i;
+
+ ARR_FIND(0, MAX_CHARS, i, sd->found_char[i] == char_id);
- if (SQL_ERROR == Sql_Query(sql_handle, "SELECT `name`,`account_id`,`party_id`,`guild_id`,`base_level`,`homun_id`,`partner_id`,`father`,`mother`,`elemental_id` FROM `%s` WHERE `char_id`='%d'", schema_config.char_db, char_id))
+ // Such a character does not exist in the account
+ if (i == MAX_CHARS) {
+ ShowInfo("Char deletion aborted: %s, Account ID: %u, Character ID: %u\n", name, sd->account_id, char_id);
+ return CHAR_DELETE_NOTFOUND;
+ }
+
+ if (SQL_ERROR == Sql_Query(sql_handle, "SELECT `name`,`account_id`,`party_id`,`guild_id`,`base_level`,`homun_id`,`partner_id`,`father`,`mother`,`elemental_id`,`delete_date` FROM `%s` WHERE `account_id`='%u' AND `char_id`='%u'", schema_config.char_db, sd->account_id, char_id)){
Sql_ShowDebug(sql_handle);
+ return CHAR_DELETE_DATABASE;
+ }
if( SQL_SUCCESS != Sql_NextRow(sql_handle) )
{
- ShowError("delete_char_sql: Unable to fetch character data, deletion aborted.\n");
+ ShowInfo("Char deletion aborted: %s, Account ID: %u, Character ID: %u\n", name, sd->account_id, char_id);
Sql_FreeResult(sql_handle);
- return -1;
+ return CHAR_DELETE_NOTFOUND;
}
Sql_GetData(sql_handle, 0, &data, &len); safestrncpy(name, data, NAME_LENGTH);
@@ -1544,29 +1567,34 @@ int char_delete_char_sql(uint32 char_id){
Sql_GetData(sql_handle, 7, &data, NULL); father_id = atoi(data);
Sql_GetData(sql_handle, 8, &data, NULL); mother_id = atoi(data);
Sql_GetData(sql_handle, 9, &data, NULL); elemental_id = atoi(data);
+ Sql_GetData(sql_handle,10, &data, NULL); delete_date = strtoul(data, NULL, 10);
Sql_EscapeStringLen(sql_handle, esc_name, name, zmin(len, NAME_LENGTH));
Sql_FreeResult(sql_handle);
//check for config char del condition [Lupus]
- // TODO: Move this out to packet processing (0x68/0x1fb).
if( ( charserv_config.char_config.char_del_level > 0 && base_level >= charserv_config.char_config.char_del_level )
|| ( charserv_config.char_config.char_del_level < 0 && base_level <= -charserv_config.char_config.char_del_level )
) {
ShowInfo("Char deletion aborted: %s, BaseLevel: %i\n", name, base_level);
- return -1;
+ return CHAR_DELETE_BASELEVEL;
}
if (charserv_config.char_config.char_del_restriction&CHAR_DEL_RESTRICT_GUILD && guild_id) // character is in guild
{
ShowInfo("Char deletion aborted: %s, Guild ID: %i\n", name, guild_id);
- return -1;
+ return CHAR_DELETE_GUILD;
}
if (charserv_config.char_config.char_del_restriction&CHAR_DEL_RESTRICT_PARTY && party_id) // character is in party
{
ShowInfo("Char deletion aborted: %s, Party ID: %i\n", name, party_id);
- return -1;
+ return CHAR_DELETE_PARTY;
+ }
+
+ if( charserv_config.char_config.char_del_delay > 0 && ( !delete_date || delete_date > time(NULL) ) ){ // not queued or delay not yet passed
+ ShowInfo("Char deletion aborted: %s, Time was not set or has not been reached ye\n", name );
+ return CHAR_DELETE_TIME;
}
/* Divorce [Wizputer] */
@@ -1580,7 +1608,7 @@ int char_delete_char_sql(uint32 char_id){
if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `child`='0' WHERE `char_id`='%d' OR `char_id`='%d'", schema_config.char_db, father_id, mother_id) )
Sql_ShowDebug(sql_handle);
- if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `id` = '410'AND (`char_id`='%d' OR `char_id`='%d')", schema_config.skill_db, father_id, mother_id) )
+ if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `id` = '410' AND (`char_id`='%d' OR `char_id`='%d')", schema_config.skill_db, father_id, mother_id) )
Sql_ShowDebug(sql_handle);
WBUFW(buf,0) = 0x2b25;
@@ -1671,6 +1699,10 @@ int char_delete_char_sql(uint32 char_id){
if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `char_id` = '%d'", schema_config.bonus_script_db, char_id) )
Sql_ShowDebug(sql_handle);
+ /* Achievement Data */
+ if (SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `char_id` = '%d'", schema_config.achievement_table, char_id))
+ Sql_ShowDebug(sql_handle);
+
if (charserv_config.log_char) {
if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s`(`time`, `account_id`,`char_num`,`char_msg`,`name`) VALUES (NOW(), '%d', '%d', 'Deleted char (CID %d)', '%s')",
schema_config.charlog_db, account_id, 0, char_id, esc_name) )
@@ -1693,7 +1725,11 @@ int char_delete_char_sql(uint32 char_id){
mapif_parse_BreakGuild(0,guild_id);
else if( guild_id )
inter_guild_leave(guild_id, account_id, char_id);// Leave your guild.
- return 0;
+
+ // refresh character list cache
+ sd->found_char[i] = -1;
+
+ return CHAR_DELETE_OK;
}
/**
@@ -1726,9 +1762,21 @@ int char_mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p)
buf = WBUFP(buffer,0);
WBUFL(buf,0) = p->char_id;
+#if PACKETVER >= 20170830
+ WBUFQ(buf,4) = u64min((uint64)p->base_exp, INT64_MAX);
+ offset += 4;
+ buf = WBUFP(buffer, offset);
+#else
WBUFL(buf,4) = umin(p->base_exp, INT32_MAX);
+#endif
WBUFL(buf,8) = p->zeny;
+#if PACKETVER >= 20170830
+ WBUFQ(buf,12) = u64min((uint64)p->job_exp, INT64_MAX);
+ offset += 4;
+ buf = WBUFP(buffer, offset);
+#else
WBUFL(buf,12) = umin(p->job_exp, INT32_MAX);
+#endif
WBUFL(buf,16) = p->job_level;
WBUFL(buf,20) = 0; // probably opt1
WBUFL(buf,24) = 0; // probably opt2
@@ -2016,10 +2064,14 @@ int char_loadName(uint32 char_id, char* name){
safestrncpy(name, data, NAME_LENGTH);
return 1;
}
+#if PACKETVER < 20180221
else
{
safestrncpy(name, charserv_config.char_config.unknown_char_name, NAME_LENGTH);
}
+#else
+ name[0] = '\0';
+#endif
return 0;
}
@@ -2132,7 +2184,7 @@ int char_chardb_waiting_disconnect(int tid, unsigned int tick, int id, intptr_t
/**
* @see DBApply
*/
-static int char_online_data_cleanup_sub(DBKey key, DBData *data, va_list ap)
+int char_online_data_cleanup_sub(DBKey key, DBData *data, va_list ap)
{
struct online_char_data *character= (struct online_char_data *)db_data2ptr(data);
if (character->fd != -1)
@@ -2145,12 +2197,12 @@ static int char_online_data_cleanup_sub(DBKey key, DBData *data, va_list ap)
return 0;
}
-static int char_online_data_cleanup(int tid, unsigned int tick, int id, intptr_t data){
+int char_online_data_cleanup(int tid, unsigned int tick, int id, intptr_t data){
online_char_db->foreach(online_char_db, char_online_data_cleanup_sub);
return 0;
}
-static int char_clan_member_cleanup( int tid, unsigned int tick, int id, intptr_t data ){
+int char_clan_member_cleanup( int tid, unsigned int tick, int id, intptr_t data ){
// Auto removal is disabled
if( charserv_config.clan_remove_inactive_days <= 0 ){
return 0;
@@ -2236,7 +2288,7 @@ bool char_checkdb(void){
schema_config.auction_db, schema_config.quest_db, schema_config.homunculus_db, schema_config.skill_homunculus_db,
schema_config.mercenary_db, schema_config.mercenary_owner_db,
schema_config.elemental_db, schema_config.ragsrvinfo_db, schema_config.skillcooldown_db, schema_config.bonus_script_db,
- schema_config.clan_table, schema_config.clan_alliance_table, schema_config.mail_attachment_db
+ schema_config.clan_table, schema_config.clan_alliance_table, schema_config.mail_attachment_db, schema_config.achievement_table
};
ShowInfo("Start checking DB integrity\n");
for (i=0; i<ARRAYLENGTH(sqltable); i++){ //check if they all exist and we can acces them in sql-server
@@ -2252,7 +2304,7 @@ bool char_checkdb(void){
"`guild_id`,`pet_id`,`homun_id`,`elemental_id`,`hair`,`hair_color`,`clothes_color`,`weapon`,"
"`shield`,`head_top`,`head_mid`,`head_bottom`,`robe`,`last_map`,`last_x`,`last_y`,`save_map`,"
"`save_x`,`save_y`,`partner_id`,`online`,`father`,`mother`,`child`,`fame`,`rename`,`delete_date`,"
- "`moves`,`unban_time`,`font`,`sex`,`hotkey_rowshift`,`clan_id`,`last_login`"
+ "`moves`,`unban_time`,`font`,`sex`,`hotkey_rowshift`,`clan_id`,`last_login`,`title_id`,`show_equip`"
" FROM `%s` LIMIT 1;", schema_config.char_db) ){
Sql_ShowDebug(sql_handle);
return false;
@@ -2314,7 +2366,7 @@ bool char_checkdb(void){
//checking guild_db
if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `guild_id`,`name`,`char_id`,`master`,`guild_lv`,"
"`connect_member`,`max_member`,`average_lv`,`exp`,`next_exp`,`skill_point`,`mes1`,`mes2`,"
- "`emblem_len`,`emblem_id`,`emblem_data`"
+ "`emblem_len`,`emblem_id`,`emblem_data`,`last_master_change`"
" FROM `%s` LIMIT 1;", schema_config.guild_db) ){
Sql_ShowDebug(sql_handle);
return false;
@@ -2478,6 +2530,12 @@ bool char_checkdb(void){
Sql_ShowDebug(sql_handle);
return false;
}
+ //checking achievement_table
+ if (SQL_ERROR == Sql_Query(sql_handle, "SELECT `char_id`,`id`,`count1`,`count2`,`count3`,`count4`,`count5`,`count6`,`count7`,`count8`,`count9`,`count10`,`completed`,`rewarded`"
+ " FROM `%s` LIMIT 1;", schema_config.achievement_table)) {
+ Sql_ShowDebug(sql_handle);
+ return false;
+ }
Sql_FreeResult(sql_handle);
ShowInfo("DB integrity check finished with success\n");
return true;
@@ -2573,6 +2631,8 @@ void char_sql_config_read(const char* cfgName) {
safestrncpy(schema_config.clan_table, w2, sizeof(schema_config.clan_table));
else if(!strcmpi(w1,"clan_alliance_table"))
safestrncpy(schema_config.clan_alliance_table, w2, sizeof(schema_config.clan_alliance_table));
+ else if(!strcmpi(w1,"achievement_table"))
+ safestrncpy(schema_config.achievement_table, w2, sizeof(schema_config.achievement_table));
//support the import command, just like any other config
else if(!strcmpi(w1,"import"))
char_sql_config_read(w2);
@@ -2622,6 +2682,7 @@ void char_set_default_sql(){
safestrncpy(schema_config.acc_reg_num_table,"acc_reg_num",sizeof(schema_config.acc_reg_num_table));
safestrncpy(schema_config.clan_table,"clan",sizeof(schema_config.clan_table));
safestrncpy(schema_config.clan_table,"clan_alliance",sizeof(schema_config.clan_alliance_table));
+ safestrncpy(schema_config.achievement_table,"achievement",sizeof(schema_config.achievement_table));
}
//set default config
@@ -2727,7 +2788,7 @@ void char_set_defaults(){
* @param start: Start point reference
* @param count: Start point count reference
*/
-static void char_config_split_startpoint(char *w1_value, char *w2_value, struct point start_point[MAX_STARTPOINT], short *count)
+void char_config_split_startpoint(char *w1_value, char *w2_value, struct point start_point[MAX_STARTPOINT], short *count)
{
char *lineitem, **fields;
int i = 0, fields_length = 3 + 1;
@@ -2772,7 +2833,7 @@ static void char_config_split_startpoint(char *w1_value, char *w2_value, struct
* @param w2_value: Value from w2
* @param start: Start item reference
*/
-static void char_config_split_startitem(char *w1_value, char *w2_value, struct startitem start_items[MAX_STARTITEM])
+void char_config_split_startitem(char *w1_value, char *w2_value, struct startitem start_items[MAX_STARTITEM])
{
char *lineitem, **fields;
int i = 0, fields_length = 3 + 1;
@@ -3009,7 +3070,7 @@ bool char_config_read(const char* cfgName, bool normal){
/**
* Checks for values out of range.
*/
-static void char_config_adjust() {
+void char_config_adjust() {
#if PACKETVER < 20100803
if (charserv_config.char_config.char_del_option&CHAR_DEL_BIRTHDATE) {
ShowWarning("conf/char_athena.conf:char_del_option birthdate is enabled but it requires PACKETVER 2010-08-03 or newer, defaulting to email...\n");
diff --git a/src/char/char.h b/src/char/char.hpp
similarity index 95%
rename from src/char/char.h
rename to src/char/char.hpp
index ed19ec928bb..b43378c5216 100644
--- a/src/char/char.h
+++ b/src/char/char.hpp
@@ -1,19 +1,14 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _CHAR_SQL_H_
-#define _CHAR_SQL_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef _CHAR_HPP_
+#define _CHAR_HPP_
#include "../config/core.h"
#include "../common/core.h" // CORE_ST_LAST
#include "../common/msg_conf.h"
#include "../common/mmo.h"
-
extern int login_fd; //login file descriptor
extern int char_fd; //char file descriptor
@@ -38,6 +33,16 @@ enum e_char_delete_restriction {
CHAR_DEL_RESTRICT_ALL
};
+enum e_char_del_response {
+ CHAR_DELETE_OK = 0,
+ CHAR_DELETE_DATABASE,
+ CHAR_DELETE_NOTFOUND,
+ CHAR_DELETE_BASELEVEL,
+ CHAR_DELETE_GUILD,
+ CHAR_DELETE_PARTY,
+ CHAR_DELETE_TIME,
+};
+
struct Schema_Config {
int db_use_sqldbs;
char db_path[1024];
@@ -80,12 +85,13 @@ struct Schema_Config {
char char_reg_num_table[DB_NAME_LEN];
char clan_table[DB_NAME_LEN];
char clan_alliance_table[DB_NAME_LEN];
+ char achievement_table[DB_NAME_LEN];
};
extern struct Schema_Config schema_config;
#if PACKETVER_SUPPORTS_PINCODE
/// Pincode system
-enum pincode_state {
+enum pincode_state : uint8 {
PINCODE_OK = 0,
PINCODE_ASK = 1,
PINCODE_NOTSET = 2,
@@ -95,7 +101,12 @@ enum pincode_state {
#if 0
PINCODE_KSSN = 6, // Not supported since we do not store KSSN
#endif
+#if PACKETVER >= 20180124
+ // The button for pin code access was removed
+ PINCODE_PASSED = PINCODE_OK,
+#else
PINCODE_PASSED = 7,
+#endif
PINCODE_WRONG = 8,
PINCODE_MAXSTATE
};
@@ -222,7 +233,6 @@ struct char_session_data {
uint8 char_slots; // total number of characters that can be created
uint8 chars_vip;
uint8 chars_billing;
- uint32 version;
uint8 clienttype;
char new_name[NAME_LENGTH];
char birthdate[10+1]; // YYYY-MM-DD
@@ -272,7 +282,7 @@ int char_mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p);
int char_mmo_char_tosql(uint32 char_id, struct mmo_charstatus* p);
int char_mmo_char_fromsql(uint32 char_id, struct mmo_charstatus* p, bool load_everything);
int char_mmo_chars_fromsql(struct char_session_data* sd, uint8* buf);
-int char_delete_char_sql(uint32 char_id);
+enum e_char_del_response char_delete(struct char_session_data* sd, uint32 char_id);
int char_rename_char_sql(struct char_session_data *sd, uint32 char_id);
int char_divorce_char_sql(int partner_id1, int partner_id2);
int char_memitemdata_to_sql(const struct item items[], int max, int id, enum storage_type tableswitch, uint8 stor_id);
@@ -310,13 +320,9 @@ void char_set_session_flag_(int account_id, int val, bool set);
#define msg_config_read(cfgName) char_msg_config_read(cfgName)
#define msg_txt(msg_number) char_msg_txt(msg_number)
#define do_final_msg() char_do_final_msg()
-int char_msg_config_read(char *cfgName);
+int char_msg_config_read(const char *cfgName);
const char* char_msg_txt(int msg_number);
void char_do_final_msg(void);
bool char_config_read(const char* cfgName, bool normal);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _CHAR_SQL_H_ */
+#endif /* _CHAR_HPP_ */
diff --git a/src/char/char_clif.c b/src/char/char_clif.cpp
similarity index 88%
rename from src/char/char_clif.c
rename to src/char/char_clif.cpp
index 4ced9243a27..19bf1cf8670 100644
--- a/src/char/char_clif.c
+++ b/src/char/char_clif.cpp
@@ -1,6 +1,11 @@
// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "char_clif.hpp"
+
+#include <stdlib.h>
+#include <string.h>
+
#include "../common/mmo.h"
#include "../common/socket.h"
#include "../common/sql.h"
@@ -11,13 +16,10 @@
#include "../common/strlib.h"
#include "../common/utils.h"
#include "../common/timer.h"
-#include "inter.h"
-#include "char.h"
-#include "char_logif.h"
-#include "char_mapif.h"
-#include "char_clif.h"
-
-#include <stdlib.h>
+#include "inter.hpp"
+#include "char.hpp"
+#include "char_logif.hpp"
+#include "char_mapif.hpp"
#if PACKETVER_SUPPORTS_PINCODE
bool pincode_allowed( char* pincode );
@@ -303,8 +305,7 @@ int chclif_parse_pincode_setnew( int fd, struct char_session_data* sd ){
//----------------------------------------
void chclif_charlist_notify( int fd, struct char_session_data* sd ){
// This is needed on RE clients from october 2015 onwards
-// If you want to use one replace false by true here
-#if false && PACKETVER >= 20151001
+#if defined(PACKETVER_RE) && PACKETVER >= 20151001 && PACKETVER < 20180103
WFIFOHEAD(fd, 10);
WFIFOW(fd, 0) = 0x9a0;
// pages to req / send them all in 1 until mmo_chars_fromsql can split them up
@@ -324,21 +325,25 @@ void chclif_charlist_notify( int fd, struct char_session_data* sd ){
// Function to send characters to a player
//----------------------------------------
int chclif_mmo_send006b(int fd, struct char_session_data* sd){
- int j, offset = 0;
- bool newvers = (sd->version >= date2version(20100413) );
- if(newvers) //20100413
- offset += 3;
+ int j, offset;
+
+#if PACKETVER >= 20100413
+ offset = 3;
+#else
+ offset = 0;
+#endif
+
if (charserv_config.save_log)
- ShowInfo("Loading Char Data ("CL_BOLD"%d"CL_RESET")\n",sd->account_id);
+ ShowInfo("Loading Char Data (" CL_BOLD "%d" CL_RESET ")\n",sd->account_id);
j = 24 + offset; // offset
WFIFOHEAD(fd,j + MAX_CHARS*MAX_CHAR_BUF);
WFIFOW(fd,0) = 0x6b;
- if(newvers){ //20100413
+#if PACKETVER >= 20100413
WFIFOB(fd,4) = MAX_CHARS; // Max slots.
WFIFOB(fd,5) = MIN_CHARS; // Available slots. (PremiumStartSlot)
WFIFOB(fd,6) = MIN_CHARS+sd->chars_vip; // Premium slots. (Any existent chars past sd->char_slots but within MAX_CHARS will show a 'Premium Service' in red)
- }
+#endif
memset(WFIFOP(fd,4 + offset), 0, 20); // unknown bytes
j+=char_mmo_chars_fromsql(sd, WFIFOP(fd,j));
WFIFOW(fd,2) = j; // packet len
@@ -352,7 +357,7 @@ int chclif_mmo_send006b(int fd, struct char_session_data* sd){
//----------------------------------------
void chclif_mmo_send082d(int fd, struct char_session_data* sd) {
if (charserv_config.save_log)
- ShowInfo("Loading Char Data ("CL_BOLD"%d"CL_RESET")\n",sd->account_id);
+ ShowInfo("Loading Char Data (" CL_BOLD "%d" CL_RESET ")\n",sd->account_id);
WFIFOHEAD(fd,29);
WFIFOW(fd,0) = 0x82d;
WFIFOW(fd,2) = 29;
@@ -377,16 +382,18 @@ void chclif_mmo_send099d(int fd, struct char_session_data *sd) {
* Function to choose wich kind of charlist to send to client depending on his version
*/
void chclif_mmo_char_send(int fd, struct char_session_data* sd){
- ShowInfo("sd->version = %d\n",sd->version);
- if(sd->version >= date2version(20130000) ){
- chclif_mmo_send082d(fd,sd);
- chclif_mmo_send006b(fd,sd);
- chclif_charlist_notify(fd,sd);
- } else
- chclif_mmo_send006b(fd,sd);
+#if PACKETVER >= 20130000
+ chclif_mmo_send082d(fd, sd);
+ chclif_mmo_send006b(fd, sd);
+ chclif_charlist_notify(fd, sd);
+#else
+ chclif_mmo_send006b(fd,sd);
//@FIXME dump from kro doesn't show 6b transmission
- if(sd->version >= date2version(20060819) )
- chclif_block_character(fd,sd);
+#endif
+
+#if PACKETVER >= 20060819
+ chclif_block_character(fd,sd);
+#endif
}
/*
@@ -432,17 +439,16 @@ void chclif_char_delete2_ack(int fd, uint32 char_id, uint32 result, time_t delet
/// 3 (0x719): A database error occurred.
/// 4 (0x71d): Deleting not yet possible time.
/// 5 (0x71e): Date of birth do not match.
+/// 6 Name does not match.
+/// 7 Character Deletion has failed because you have entered an incorrect e-mail address.
/// Any (0x718): An unknown error has occurred.
-/// HC: <082a>.W <char id>.L <Msg:0-5>.L
+/// HC: <082a>.W <char id>.L <Msg>.L
void chclif_char_delete2_accept_ack(int fd, uint32 char_id, uint32 result) {
+#if PACKETVER >= 20130000
if(result == 1 ){
- struct char_session_data* sd;
- sd = (struct char_session_data*)session[fd]->session_data;
-
- if( sd->version >= date2version(20130000) ){
- chclif_mmo_char_send(fd, sd);
- }
+ chclif_mmo_char_send(fd, (char_session_data*)session[fd]->session_data);
}
+#endif
WFIFOHEAD(fd,10);
WFIFOW(fd,0) = 0x82a;
@@ -532,7 +538,7 @@ int chclif_parse_char_delete2_req(int fd, struct char_session_data* sd) {
* @param flag Delete flag
* @return true:Success, false:Failure
**/
-static bool chclif_delchar_check(struct char_session_data *sd, char *delcode, uint8 flag) {
+bool chclif_delchar_check(struct char_session_data *sd, char *delcode, uint8 flag) {
// E-Mail check
if (flag&CHAR_DEL_EMAIL && (
!stricmp(delcode, sd->email) || //email does not match or
@@ -540,7 +546,7 @@ static bool chclif_delchar_check(struct char_session_data *sd, char *delcode, ui
!stricmp("a@a.com", sd->email) && //it is default email and
!strcmp("", delcode) //user sent an empty email
))) {
- ShowInfo(""CL_RED"Char Deleted"CL_RESET" "CL_GREEN"(E-Mail)"CL_RESET".\n");
+ ShowInfo("" CL_RED "Char Deleted" CL_RESET " " CL_GREEN "(E-Mail)" CL_RESET ".\n");
return true;
}
// Birthdate (YYMMDD)
@@ -550,7 +556,7 @@ static bool chclif_delchar_check(struct char_session_data *sd, char *delcode, ui
!strcmp("",sd->birthdate) && // it is default birthdate and
!strcmp("",delcode) // user sent an empty birthdate
))) {
- ShowInfo(""CL_RED"Char Deleted"CL_RESET" "CL_GREEN"(Birthdate)"CL_RESET".\n");
+ ShowInfo("" CL_RED "Char Deleted" CL_RESET " " CL_GREEN "(Birthdate)" CL_RESET ".\n");
return true;
}
return false;
@@ -561,13 +567,10 @@ int chclif_parse_char_delete2_accept(int fd, struct char_session_data* sd) {
FIFOSD_CHECK(12)
{
char birthdate[8+1];
- uint32 char_id, i, k;
- unsigned int base_level;
- char* data;
- time_t delete_date;
+ uint32 char_id;
char_id = RFIFOL(fd,2);
- ShowInfo(CL_RED"Request Char Deletion: "CL_GREEN"%d (%d)"CL_RESET"\n", sd->account_id, char_id);
+ ShowInfo(CL_RED "Request Char Deletion: " CL_GREEN "%d (%d)" CL_RESET "\n", sd->account_id, char_id);
// construct "YY-MM-DD"
birthdate[0] = RFIFOB(fd,6);
@@ -581,54 +584,36 @@ int chclif_parse_char_delete2_accept(int fd, struct char_session_data* sd) {
birthdate[8] = 0;
RFIFOSKIP(fd,12);
- ARR_FIND( 0, MAX_CHARS, i, sd->found_char[i] == char_id );
- if( i == MAX_CHARS )
- {// character not found
- chclif_char_delete2_accept_ack(fd, char_id, 3);
- return 1;
- }
-
- if( SQL_SUCCESS != Sql_Query(sql_handle, "SELECT `base_level`,`delete_date` FROM `%s` WHERE `char_id`='%d'", schema_config.char_db, char_id) || SQL_SUCCESS != Sql_NextRow(sql_handle) )
- {// data error
- Sql_ShowDebug(sql_handle);
- chclif_char_delete2_accept_ack(fd, char_id, 3);
- return 1;
- }
-
- Sql_GetData(sql_handle, 0, &data, NULL); base_level = (unsigned int)strtoul(data, NULL, 10);
- Sql_GetData(sql_handle, 1, &data, NULL); delete_date = strtoul(data, NULL, 10);
-
- if( !delete_date || delete_date>time(NULL) )
- {// not queued or delay not yet passed
- chclif_char_delete2_accept_ack(fd, char_id, 4);
- return 1;
- }
-
- if (!chclif_delchar_check(sd, birthdate, CHAR_DEL_BIRTHDATE)) { // Only check for birthdate
+ // Only check for birthdate
+ if (!chclif_delchar_check(sd, birthdate, CHAR_DEL_BIRTHDATE)) {
chclif_char_delete2_accept_ack(fd, char_id, 5);
return 1;
}
- if( ( charserv_config.char_config.char_del_level > 0 && base_level >= (unsigned int)charserv_config.char_config.char_del_level )
- || ( charserv_config.char_config.char_del_level < 0 && base_level <= (unsigned int)(-charserv_config.char_config.char_del_level) ) )
- {// character level config restriction
- chclif_char_delete2_accept_ack(fd, char_id, 2);
- return 1;
- }
-
- // success
- if( char_delete_char_sql(char_id) < 0 ){
- chclif_char_delete2_accept_ack(fd, char_id, 3);
- return 1;
- }
-
- // refresh character list cache
- for(k = i; k < MAX_CHARS-1; k++){
- sd->found_char[k] = sd->found_char[k+1];
+ switch( char_delete(sd,char_id) ){
+ // success
+ case CHAR_DELETE_OK:
+ chclif_char_delete2_accept_ack(fd, char_id, 1);
+ break;
+ // data error
+ case CHAR_DELETE_DATABASE:
+ // character not found
+ case CHAR_DELETE_NOTFOUND:
+ chclif_char_delete2_accept_ack(fd, char_id, 3);
+ break;
+ // in a party
+ case CHAR_DELETE_PARTY:
+ // in a guild
+ case CHAR_DELETE_GUILD:
+ // character level config restriction
+ case CHAR_DELETE_BASELEVEL:
+ chclif_char_delete2_accept_ack(fd, char_id, 2);
+ break;
+ // not queued or delay not yet passed
+ case CHAR_DELETE_TIME:
+ chclif_char_delete2_accept_ack(fd, char_id, 4);
+ break;
}
- sd->found_char[MAX_CHARS-1] = -1;
-
- chclif_char_delete2_accept_ack(fd, char_id, 1);
}
return 1;
}
@@ -751,7 +736,6 @@ int chclif_parse_reqtoconnect(int fd, struct char_session_data* sd,uint32 ipl){
node->login_id2 == login_id2 /*&&
node->ip == ipl*/ )
{// authentication found (coming from map server)
- sd->version = node->version;
idb_remove(auth_db, account_id);
char_auth_ok(fd, sd);
}
@@ -931,7 +915,7 @@ int chclif_parse_charselect(int fd, struct char_session_data* sd,uint32 ipl){
// S 0067 <name>.24B <str>.B <agi>.B <vit>.B <int>.B <dex>.B <luk>.B <slot>.B <hair color>.W <hair style>.W
// S 0a39 <name>.24B <slot>.B <hair color>.W <hair style>.W <starting job ID>.W <Unknown>.(W or 2 B's)??? <sex>.B
int chclif_parse_createnewchar(int fd, struct char_session_data* sd,int cmd){
- int i = 0;
+ int char_id = 0;
if (cmd == 0xa39) FIFOSD_CHECK(36) //>=20151001
else if (cmd == 0x970) FIFOSD_CHECK(31) //>=20120307
@@ -939,39 +923,41 @@ int chclif_parse_createnewchar(int fd, struct char_session_data* sd,int cmd){
else return 0;
if( (charserv_config.char_new)==0 ) //turn character creation on/off [Kevin]
- i = -2;
+ char_id = -2;
else {
#if PACKETVER >= 20151001
- i = char_make_new_char_sql(sd, RFIFOCP(fd,2),RFIFOB(fd,26),RFIFOW(fd,27),RFIFOW(fd,29),RFIFOW(fd,31),RFIFOW(fd,32),RFIFOB(fd,35));
+ char_id = char_make_new_char_sql(sd, RFIFOCP(fd,2),RFIFOB(fd,26),RFIFOW(fd,27),RFIFOW(fd,29),RFIFOW(fd,31),RFIFOW(fd,32),RFIFOB(fd,35));
RFIFOSKIP(fd,36);
#elif PACKETVER >= 20120307
- i = char_make_new_char_sql(sd, RFIFOCP(fd,2),RFIFOB(fd,26),RFIFOW(fd,27),RFIFOW(fd,29));
+ char_id = char_make_new_char_sql(sd, RFIFOCP(fd,2),RFIFOB(fd,26),RFIFOW(fd,27),RFIFOW(fd,29));
RFIFOSKIP(fd,31);
#else
- i = char_make_new_char_sql(sd, RFIFOCP(fd,2),RFIFOB(fd,26),RFIFOB(fd,27),RFIFOB(fd,28),RFIFOB(fd,29),RFIFOB(fd,30),RFIFOB(fd,31),RFIFOB(fd,32),RFIFOW(fd,33),RFIFOW(fd,35));
+ char_id = char_make_new_char_sql(sd, RFIFOCP(fd,2),RFIFOB(fd,26),RFIFOB(fd,27),RFIFOB(fd,28),RFIFOB(fd,29),RFIFOB(fd,30),RFIFOB(fd,31),RFIFOB(fd,32),RFIFOW(fd,33),RFIFOW(fd,35));
RFIFOSKIP(fd,37);
#endif
}
- //'Charname already exists' (-1), 'Char creation denied' (-2) and 'You are underaged' (-3)
- if (i < 0) {
+ if (char_id < 0) {
+ // deny character creation
WFIFOHEAD(fd,3);
WFIFOW(fd,0) = 0x6e;
- /* Others I found [Ind] */
- /* 0x02 = Symbols in Character Names are forbidden */
- /* 0x03 = You are not elegible to open the Character Slot. */
- switch (i) {
+ switch (char_id) {
+ // 'Charname already exists' (-1)
case -1: WFIFOB(fd,2) = 0x00; break;
+ // 'Char creation denied' (-2)
case -2: WFIFOB(fd,2) = 0xFF; break;
+ // 'You are underaged' (-3)
case -3: WFIFOB(fd,2) = 0x01; break;
+ // 'You are not elegible to open the Character Slot' (-4)
case -4: WFIFOB(fd,2) = 0x03; break;
+ /* Unused: 0x02 = Symbols in Character Names are forbidden [Ind]*/
}
WFIFOSET(fd,3);
} else {
- int len, ch;
+ int len;
// retrieve data
struct mmo_charstatus char_dat;
- char_mmo_char_fromsql(i, &char_dat, false); //Only the short data is needed.
+ char_mmo_char_fromsql(char_id, &char_dat, false); //Only the short data is needed.
// send to player
WFIFOHEAD(fd,2+MAX_CHAR_BUF);
@@ -980,9 +966,7 @@ int chclif_parse_createnewchar(int fd, struct char_session_data* sd,int cmd){
WFIFOSET(fd,len);
// add new entry to the chars list
- ARR_FIND( 0, MAX_CHARS, ch, sd->found_char[ch] == -1 );
- if( ch < MAX_CHARS )
- sd->found_char[ch] = i; // the char_id of the new char
+ sd->found_char[char_dat.slot] = char_id;
}
return 1;
}
@@ -992,7 +976,9 @@ int chclif_parse_createnewchar(int fd, struct char_session_data* sd,int cmd){
* 0x70 <ErrorCode>B HC_REFUSE_DELETECHAR
* @param fd
* @param ErrorCode
- * 00 = Incorrect Email address
+ * 00 = Incorrect Email address
+ * 01 = Invalid Slot
+ * 02 = In a party or guild
*/
void chclif_refuse_delchar(int fd, uint8 errCode){
WFIFOHEAD(fd,3);
@@ -1007,10 +993,9 @@ int chclif_parse_delchar(int fd,struct char_session_data* sd, int cmd){
else return 0;
{
char email[40];
- int i, ch;
- int cid = RFIFOL(fd,2);
+ uint32 cid = RFIFOL(fd,2);
- ShowInfo(CL_RED"Request Char Deletion: "CL_GREEN"%d (%d)"CL_RESET"\n", sd->account_id, cid);
+ ShowInfo(CL_RED "Request Char Deletion: " CL_GREEN "%u (%u)" CL_RESET "\n", sd->account_id, cid);
memcpy(email, RFIFOP(fd,6), 40);
RFIFOSKIP(fd,( cmd == 0x68) ? 46 : 56);
@@ -1019,26 +1004,24 @@ int chclif_parse_delchar(int fd,struct char_session_data* sd, int cmd){
return 1;
}
- // check if this char exists
- ARR_FIND( 0, MAX_CHARS, i, sd->found_char[i] == cid );
- if( i == MAX_CHARS ) { // Such a character does not exist in the account
- chclif_refuse_delchar(fd,0);
- return 1;
- }
-
- // remove char from list and compact it
- for(ch = i; ch < MAX_CHARS-1; ch++)
- sd->found_char[ch] = sd->found_char[ch+1];
- sd->found_char[MAX_CHARS-1] = -1;
-
/* Delete character */
- if(char_delete_char_sql(cid)<0){
- //can't delete the char
- //either SQL error or can't delete by some CONFIG conditions
- //del fail
- chclif_refuse_delchar(fd,0);
- return 1;
+ switch( char_delete(sd,cid) ){
+ case CHAR_DELETE_OK:
+ break;
+ case CHAR_DELETE_DATABASE:
+ case CHAR_DELETE_BASELEVEL:
+ case CHAR_DELETE_TIME:
+ chclif_refuse_delchar(fd, 0);
+ return 1;
+ case CHAR_DELETE_NOTFOUND:
+ chclif_refuse_delchar(fd, 1);
+ return 1;
+ case CHAR_DELETE_GUILD:
+ case CHAR_DELETE_PARTY:
+ chclif_refuse_delchar(fd, 2);
+ return 1;
}
+
/* Char successfully deleted.*/
WFIFOHEAD(fd,2);
WFIFOW(fd,0) = 0x6f;
@@ -1346,7 +1329,7 @@ int chclif_parse(int fd) {
case 0x9a1: next=chclif_parse_req_charlist(fd,sd); break;
// unknown packet received
default:
- ShowError("parse_char: Received unknown packet "CL_WHITE"0x%x"CL_RESET" from ip '"CL_WHITE"%s"CL_RESET"'! Disconnecting!\n", RFIFOW(fd,0), ip2str(ipl, NULL));
+ ShowError("parse_char: Received unknown packet " CL_WHITE "0x%x" CL_RESET " from ip '" CL_WHITE "%s" CL_RESET "'! Disconnecting!\n", RFIFOW(fd,0), ip2str(ipl, NULL));
set_eof(fd);
return 0;
}
diff --git a/src/char/char_clif.h b/src/char/char_clif.hpp
similarity index 88%
rename from src/char/char_clif.h
rename to src/char/char_clif.hpp
index a377ce342b8..0bd4f320867 100644
--- a/src/char/char_clif.h
+++ b/src/char/char_clif.hpp
@@ -1,18 +1,14 @@
-/*
- * File: char_clif.h
- * Author: lighta
- *
- * Created on June 15, 2013, 12:06 PM
- */
+// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
-#ifndef CHAR_CLIF_H
-#define CHAR_CLIF_H
+#ifndef _CHAR_CLIF_HPP_
+#define _CHAR_CLIF_HPP_
-#include "char.h"
+#include "../common/cbasetypes.h"
+#include "../common/timer.h" //time_t
-#ifdef __cplusplus
-extern "C" {
-#endif
+struct char_session_data;
+enum pincode_state : uint8;
void chclif_moveCharSlotReply( int fd, struct char_session_data* sd, unsigned short index, short reason );
int chclif_parse_moveCharSlot( int fd, struct char_session_data* sd);
@@ -57,9 +53,5 @@ void chclif_block_character( int fd, struct char_session_data* sd);
int chclif_parse(int fd);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* CHAR_CLIF_H */
+#endif /* _CHAR_CLIF_HPP_ */
diff --git a/src/char/char_cnslif.c b/src/char/char_cnslif.cpp
similarity index 96%
rename from src/char/char_cnslif.c
rename to src/char/char_cnslif.cpp
index c90e7c9acd3..6468eee6d04 100644
--- a/src/char/char_cnslif.c
+++ b/src/char/char_cnslif.cpp
@@ -1,16 +1,18 @@
// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "char_cnslif.hpp"
+
+#include <stdlib.h>
+#include <string.h>
+
#include "../common/socket.h"
#include "../common/showmsg.h"
#include "../common/timer.h"
#include "../common/ers.h"
#include "../common/cli.h"
-#include "char.h"
-#include "char_cnslif.h"
-#include <stdlib.h>
-#include <string.h>
+#include "char.hpp"
/*======================================================
* Login-Server help option info
@@ -75,7 +77,7 @@ int cnslif_parse(const char* buf)
runflag = 0;
}
else if( strcmpi("alive", command) == 0 || strcmpi("status", command) == 0 )
- ShowInfo(CL_CYAN"Console: "CL_BOLD"I'm Alive."CL_RESET"\n");
+ ShowInfo(CL_CYAN "Console: " CL_BOLD "I'm Alive." CL_RESET "\n");
else if( strcmpi("reloadconf", command) == 0 ) {
ShowInfo("Reloading config file \"%s\"\n", CHAR_CONF_NAME);
char_config_read(CHAR_CONF_NAME, false);
diff --git a/src/char/char_cnslif.h b/src/char/char_cnslif.h
deleted file mode 100644
index 2eb58564a62..00000000000
--- a/src/char/char_cnslif.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * File: char_cnslif.h
- * Author: lighta
- *
- * Created on June 15, 2013, 12:07 PM
- */
-
-#ifndef CHAR_CNSLIF_H
-#define CHAR_CNSLIF_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void display_helpscreen(bool do_exit);
-int cnslif_parse(const char* buf);
-void do_init_chcnslif(void);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* CHAR_CNSLIF_H */
-
diff --git a/src/char/char_cnslif.hpp b/src/char/char_cnslif.hpp
new file mode 100644
index 00000000000..0216c2d04f3
--- /dev/null
+++ b/src/char/char_cnslif.hpp
@@ -0,0 +1,15 @@
+// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
+#ifndef _CHAR_CNSLIF_HPP_
+#define _CHAR_CNSLIF_HPP_
+
+int cnslif_parse(const char* buf);
+void do_init_chcnslif(void);
+
+extern "C" {
+void display_helpscreen(bool do_exit);
+}
+
+#endif /* _CHAR_CNSLIF_HPP_ */
+
diff --git a/src/char/char_logif.c b/src/char/char_logif.cpp
similarity index 95%
rename from src/char/char_logif.c
rename to src/char/char_logif.cpp
index a65f0e2b9a9..f9090892bf1 100644
--- a/src/char/char_logif.c
+++ b/src/char/char_logif.cpp
@@ -1,20 +1,23 @@
// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "char_logif.hpp"
+
+#include <stdlib.h>
+#include <string.h>
+
#include "../common/socket.h"
#include "../common/timer.h"
#include "../common/showmsg.h"
#include "../common/sql.h"
#include "../common/utils.h"
#include "../common/strlib.h"
-#include "inter.h"
-#include "int_guild.h"
-#include "char.h"
-#include "char_clif.h"
-#include "char_mapif.h"
-#include "char_logif.h"
-#include <stdlib.h>
+#include "inter.hpp"
+#include "int_guild.hpp"
+#include "char.hpp"
+#include "char_clif.hpp"
+#include "char_mapif.hpp"
//early declaration
void chlogif_on_ready(void);
@@ -83,7 +86,7 @@ void chlogif_pincode_start(int fd, struct char_session_data* sd){
* Load this character's account id into the 'online accounts' packet
* @see DBApply
*/
-static int chlogif_send_acc_tologin_sub(DBKey key, DBData *data, va_list ap) {
+int chlogif_send_acc_tologin_sub(DBKey key, DBData *data, va_list ap) {
struct online_char_data* character = (struct online_char_data*)db_data2ptr(data);
int* i = va_arg(ap, int*);
if(character->server > -1) {
@@ -295,7 +298,7 @@ int chlogif_parse_ackconnect(int fd, struct char_session_data* sd){
}
int chlogif_parse_ackaccreq(int fd, struct char_session_data* sd){
- if (RFIFOREST(fd) < 25)
+ if (RFIFOREST(fd) < 21)
return 0;
{
uint32 account_id = RFIFOL(fd,2);
@@ -304,19 +307,14 @@ int chlogif_parse_ackaccreq(int fd, struct char_session_data* sd){
uint8 sex = RFIFOB(fd,14);
uint8 result = RFIFOB(fd,15);
int request_id = RFIFOL(fd,16);
- uint32 version = RFIFOL(fd,20);
- uint8 clienttype = RFIFOB(fd,24);
- RFIFOSKIP(fd,25);
+ uint8 clienttype = RFIFOB(fd,20);
+ RFIFOSKIP(fd,21);
if( session_isActive(request_id) && (sd=(struct char_session_data*)session[request_id]->session_data) &&
!sd->auth && sd->account_id == account_id && sd->login_id1 == login_id1 && sd->login_id2 == login_id2 && sd->sex == sex )
{
int client_fd = request_id;
- sd->version = version;
sd->clienttype = clienttype;
- if(sd->version != date2version(PACKETVER))
- ShowWarning("aid=%d has an incorect version=%d in clientinfo. Server compiled for %d\n",
- sd->account_id,sd->version,date2version(PACKETVER));
switch( result )
{
@@ -372,8 +370,7 @@ int chlogif_parse_reqaccdata(int fd, struct char_session_data* sd){
// send characters to player
chclif_mmo_char_send(u_fd, sd);
#if PACKETVER_SUPPORTS_PINCODE
- if(sd->version >= date2version(20110309))
- chlogif_pincode_start(u_fd,sd);
+ chlogif_pincode_start(u_fd,sd);
#endif
}
}
@@ -402,7 +399,7 @@ int chlogif_parse_keepalive(int fd, struct char_session_data* sd){
*/
void chlogif_parse_change_sex_sub(int sex, int acc, int char_id, int class_, int guild_id)
{
- // job modification
+ // job modification //@TODO switch would be faster
if (class_ == JOB_BARD || class_ == JOB_DANCER)
class_ = (sex == SEX_MALE ? JOB_BARD : JOB_DANCER);
else if (class_ == JOB_CLOWN || class_ == JOB_GYPSY)
@@ -665,18 +662,17 @@ int chlogif_reqvipdata(uint32 aid, uint8 flag, int32 timediff, int mapfd) {
* HA 0x2720
* Request account info to login-server
*/
-int chlogif_req_accinfo(int fd, int u_fd, int u_aid, int u_group, int account_id, int8 type) {
+int chlogif_req_accinfo(int fd, int u_fd, int u_aid, int account_id, int8 type) {
loginif_check(-1);
//ShowInfo("%d request account info for %d (type %d)\n", u_aid, account_id, type);
- WFIFOHEAD(login_fd,23);
+ WFIFOHEAD(login_fd,19);
WFIFOW(login_fd,0) = 0x2720;
WFIFOL(login_fd,2) = fd;
WFIFOL(login_fd,6) = u_fd;
WFIFOL(login_fd,10) = u_aid;
- WFIFOL(login_fd,14) = u_group;
- WFIFOL(login_fd,18) = account_id;
- WFIFOB(login_fd,22) = type;
- WFIFOSET(login_fd,23);
+ WFIFOL(login_fd,14) = account_id;
+ WFIFOB(login_fd,18) = type;
+ WFIFOSET(login_fd,19);
return 1;
}
@@ -689,16 +685,16 @@ int chlogif_parse_AccInfoAck(int fd) {
return 0;
else {
int8 type = RFIFOB(fd, 18);
- if (type == 0 || RFIFOREST(fd) < 155+PINCODE_LENGTH+NAME_LENGTH) {
- mapif_accinfo_ack(false, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10), RFIFOL(fd,14), 0, -1, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+ if (type == 0 || RFIFOREST(fd) < 122+NAME_LENGTH) {
+ mapif_accinfo_ack(false, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10), RFIFOL(fd,14), 0, -1, 0, 0, NULL, NULL, NULL, NULL, NULL);
RFIFOSKIP(fd,19);
return 1;
}
type>>=1;
mapif_accinfo_ack(true, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10), RFIFOL(fd,14), type, RFIFOL(fd,19), RFIFOL(fd,23), RFIFOL(fd,27),
RFIFOCP(fd,31), RFIFOCP(fd,71), RFIFOCP(fd,87), RFIFOCP(fd,111),
- RFIFOCP(fd,122), RFIFOCP(fd,155), RFIFOCP(fd,155+PINCODE_LENGTH));
- RFIFOSKIP(fd,155+PINCODE_LENGTH+NAME_LENGTH);
+ RFIFOCP(fd,122));
+ RFIFOSKIP(fd,122+NAME_LENGTH);
}
return 1;
}
diff --git a/src/char/char_logif.h b/src/char/char_logif.hpp
similarity index 86%
rename from src/char/char_logif.h
rename to src/char/char_logif.hpp
index cc19c52620a..792e9654f9b 100644
--- a/src/char/char_logif.h
+++ b/src/char/char_logif.hpp
@@ -1,18 +1,12 @@
-/*
- * File: char_logif.h
- * Author: lighta
- *
- * Created on June 15, 2013, 12:05 PM
- */
+// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
-#ifndef CHAR_LOGIF_H
-#define CHAR_LOGIF_H
+#ifndef _CHAR_LOGIF_HPP_
+#define _CHAR_LOGIF_HPP_
-#include "char.h"
+#include "../common/cbasetypes.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
+struct char_session_data;
#if PACKETVER_SUPPORTS_PINCODE
void chlogif_pincode_notifyLoginPinError( uint32 account_id );
@@ -45,7 +39,7 @@ int chlogif_parse_updip(int fd, struct char_session_data* sd);
int chlogif_parse_vipack(int fd);
int chlogif_reqvipdata(uint32 aid, uint8 flag, int32 timediff, int mapfd);
-int chlogif_req_accinfo(int fd, int u_fd, int u_aid, int u_group, int account_id, int8 type);
+int chlogif_req_accinfo(int fd, int u_fd, int u_aid, int account_id, int8 type);
int chlogif_parse(int fd);
@@ -58,12 +52,7 @@ void chlogif_on_disconnect(void);
void chlogif_on_ready(void);
void do_final_chlogif(void);
-
#define loginif_check(a) { if(!chlogif_isconnected()) return a; }
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* CHAR_LOGIF_H */
+#endif /* _CHAR_LOGIF_HPP_ */
diff --git a/src/char/char_mapif.c b/src/char/char_mapif.cpp
similarity index 99%
rename from src/char/char_mapif.c
rename to src/char/char_mapif.cpp
index 2479b5fbf1c..52044fd4606 100644
--- a/src/char/char_mapif.c
+++ b/src/char/char_mapif.cpp
@@ -7,17 +7,20 @@
* @author rAthena Dev Team
*/
+#include "char_mapif.hpp"
+
+#include <stdlib.h>
+#include <string.h> //memcpy
+
#include "../common/socket.h"
#include "../common/sql.h"
#include "../common/malloc.h"
#include "../common/showmsg.h"
#include "../common/strlib.h"
-#include "inter.h"
-#include "char.h"
-#include "char_logif.h"
-#include "char_mapif.h"
-#include <stdlib.h>
+#include "inter.hpp"
+#include "char.hpp"
+#include "char_logif.hpp"
/**
* Packet send to all map-servers, attach to ourself
@@ -167,7 +170,7 @@ void chmapif_sendall_playercount(int users){
* HZ 0x2afb <size>.W <status>.B <name>.24B <mapname>.11B <map_x>.W <map_y>.W
* @param fd
**/
-static void chmapif_send_misc(int fd) {
+void chmapif_send_misc(int fd) {
uint16 offs = 5;
unsigned char buf[45];
@@ -195,7 +198,7 @@ static void chmapif_send_misc(int fd) {
* @param map_id
* @param count Number of map from new map-server has
**/
-static void chmapif_send_maps(int fd, int map_id, int count, unsigned char *mapbuf) {
+void chmapif_send_maps(int fd, int map_id, int count, unsigned char *mapbuf) {
uint16 x;
if (count == 0) {
@@ -453,15 +456,14 @@ void chmapif_charselres(int fd, uint32 aid, uint8 res){
* @return : 0 not enough data received, 1 success
*/
int chmapif_parse_authok(int fd){
- if( RFIFOREST(fd) < 19 )
+ if( RFIFOREST(fd) < 18 )
return 0;
else{
uint32 account_id = RFIFOL(fd,2);
uint32 login_id1 = RFIFOL(fd,6);
uint32 login_id2 = RFIFOL(fd,10);
uint32 ip = RFIFOL(fd,14);
- int version = RFIFOB(fd,18);
- RFIFOSKIP(fd,19);
+ RFIFOSKIP(fd,18);
if( runflag != CHARSERVER_ST_RUNNING ){
chmapif_charselres(fd,account_id,0);
@@ -478,7 +480,6 @@ int chmapif_parse_authok(int fd){
node->login_id2 = login_id2;
//node->sex = 0;
node->ip = ntohl(ip);
- node->version = version; //upd version for mapserv
//node->expiration_time = 0; // unlimited/unknown time by default (not display in map-server)
//node->gmlevel = 0;
idb_put(auth_db, account_id, node);
@@ -1027,7 +1028,7 @@ int chmapif_parse_reqauth(int fd, int id){
login_id1 = RFIFOL(fd,10);
sex = RFIFOB(fd,14);
ip = ntohl(RFIFOL(fd,15));
- autotrade = RFIFOB(fd,19);
+ autotrade = RFIFOB(fd,19) != 0;
RFIFOSKIP(fd,20);
node = (struct auth_node*)idb_get(auth_db, account_id);
diff --git a/src/char/char_mapif.h b/src/char/char_mapif.hpp
similarity index 94%
rename from src/char/char_mapif.h
rename to src/char/char_mapif.hpp
index 7128ef7eeb4..0e3cbd76260 100644
--- a/src/char/char_mapif.h
+++ b/src/char/char_mapif.hpp
@@ -7,12 +7,10 @@
* @author rAthena Dev Team
*/
-#ifndef CHAR_MAPIF_H
-#define CHAR_MAPIF_H
+#ifndef _CHAR_MAPIF_HPP_
+#define _CHAR_MAPIF_HPP_
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "../common/cbasetypes.h"
int chmapif_sendall(unsigned char *buf, unsigned int len);
int chmapif_sendallwos(int sfd, unsigned char *buf, unsigned int len);
@@ -65,10 +63,5 @@ void chmapif_server_reset(int id);
void chmapif_on_disconnect(int id);
void do_final_chmapif(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* CHAR_MAPIF_H */
+#endif /* _CHAR_MAPIF_HPP_ */
diff --git a/src/char/int_achievement.cpp b/src/char/int_achievement.cpp
new file mode 100644
index 00000000000..0a4c96f7b36
--- /dev/null
+++ b/src/char/int_achievement.cpp
@@ -0,0 +1,349 @@
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
+#include "int_achievement.hpp"
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "../common/db.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/sql.h"
+#include "../common/strlib.h"
+
+#include "char.hpp"
+#include "inter.hpp"
+#include "int_mail.hpp"
+
+/**
+ * Load achievements for a character.
+ * @param char_id: Character ID
+ * @param count: Pointer to return the number of found entries.
+ * @return Array of found entries. It has *count entries, and it is care of the caller to aFree() it afterwards.
+ */
+struct achievement *mapif_achievements_fromsql(uint32 char_id, int *count)
+{
+ struct achievement *achievelog = NULL;
+ struct achievement tmp_achieve;
+ SqlStmt *stmt;
+ StringBuf buf;
+ int i;
+
+ if (!count)
+ return NULL;
+
+ memset(&tmp_achieve, 0, sizeof(tmp_achieve));
+
+ StringBuf_Init(&buf);
+ StringBuf_AppendStr(&buf, "SELECT `id`, COALESCE(UNIX_TIMESTAMP(`completed`),0), COALESCE(UNIX_TIMESTAMP(`rewarded`),0)");
+ for (i = 0; i < MAX_ACHIEVEMENT_OBJECTIVES; ++i)
+ StringBuf_Printf(&buf, ", `count%d`", i + 1);
+ StringBuf_Printf(&buf, " FROM `%s` WHERE `char_id` = '%u'", schema_config.achievement_table, char_id);
+
+ stmt = SqlStmt_Malloc(sql_handle);
+ if( SQL_ERROR == SqlStmt_PrepareStr(stmt, StringBuf_Value(&buf))
+ || SQL_ERROR == SqlStmt_Execute(stmt) )
+ {
+ SqlStmt_ShowDebug(stmt);
+ SqlStmt_Free(stmt);
+ StringBuf_Destroy(&buf);
+ *count = 0;
+ return NULL;
+ }
+
+ SqlStmt_BindColumn(stmt, 0, SQLDT_INT, &tmp_achieve.achievement_id, 0, NULL, NULL);
+ SqlStmt_BindColumn(stmt, 1, SQLDT_INT, &tmp_achieve.completed, 0, NULL, NULL);
+ SqlStmt_BindColumn(stmt, 2, SQLDT_INT, &tmp_achieve.rewarded, 0, NULL, NULL);
+ for (i = 0; i < MAX_ACHIEVEMENT_OBJECTIVES; ++i)
+ SqlStmt_BindColumn(stmt, 3 + i, SQLDT_INT, &tmp_achieve.count[i], 0, NULL, NULL);
+
+ *count = (int)SqlStmt_NumRows(stmt);
+ if (*count > 0) {
+ i = 0;
+
+ achievelog = (struct achievement *)aCalloc(*count, sizeof(struct achievement));
+ while (SQL_SUCCESS == SqlStmt_NextRow(stmt)) {
+ if (i >= *count) // Sanity check, should never happen
+ break;
+ memcpy(&achievelog[i++], &tmp_achieve, sizeof(tmp_achieve));
+ }
+ if (i < *count) {
+ // Should never happen. Compact array
+ *count = i;
+ achievelog = (struct achievement *)aRealloc(achievelog, sizeof(struct achievement) * i);
+ }
+ }
+
+ SqlStmt_Free(stmt);
+ StringBuf_Destroy(&buf);
+
+ ShowInfo("achievement load complete from DB - id: %d (total: %d)\n", char_id, *count);
+
+ return achievelog;
+}
+
+/**
+ * Deletes an achievement from a character's achievementlog.
+ * @param char_id: Character ID
+ * @param achievement_id: Achievement ID
+ * @return false in case of errors, true otherwise
+ */
+bool mapif_achievement_delete(uint32 char_id, int achievement_id)
+{
+ if (SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `id` = '%d' AND `char_id` = '%u'", schema_config.achievement_table, achievement_id, char_id)) {
+ Sql_ShowDebug(sql_handle);
+ return false;
+ }
+
+ return true;
+}
+
+/**
+ * Adds an achievement to a character's achievementlog.
+ * @param char_id: Character ID
+ * @param ad: Achievement data
+ * @return false in case of errors, true otherwise
+ */
+bool mapif_achievement_add(uint32 char_id, struct achievement ad)
+{
+ StringBuf buf;
+ int i;
+
+ StringBuf_Init(&buf);
+ StringBuf_Printf(&buf, "INSERT INTO `%s` (`char_id`, `id`, `completed`, `rewarded`", schema_config.achievement_table);
+ for (i = 0; i < MAX_ACHIEVEMENT_OBJECTIVES; ++i)
+ StringBuf_Printf(&buf, ", `count%d`", i + 1);
+ StringBuf_AppendStr(&buf, ")");
+ StringBuf_Printf(&buf, " VALUES ('%u', '%d',", char_id, ad.achievement_id, (uint32)ad.completed, (uint32)ad.rewarded);
+ if( ad.completed ){
+ StringBuf_Printf(&buf, "FROM_UNIXTIME('%u'),", (uint32)ad.completed);
+ }else{
+ StringBuf_AppendStr(&buf, "NULL,");
+ }
+ if( ad.rewarded ){
+ StringBuf_Printf(&buf, "FROM_UNIXTIME('%u')", (uint32)ad.rewarded);
+ }else{
+ StringBuf_AppendStr(&buf, "NULL");
+ }
+ for (i = 0; i < MAX_ACHIEVEMENT_OBJECTIVES; ++i)
+ StringBuf_Printf(&buf, ", '%d'", ad.count[i]);
+ StringBuf_AppendStr(&buf, ")");
+
+ if (SQL_ERROR == Sql_QueryStr(sql_handle, StringBuf_Value(&buf))) {
+ Sql_ShowDebug(sql_handle);
+ StringBuf_Destroy(&buf);
+ return false;
+ }
+
+ StringBuf_Destroy(&buf);
+
+ return true;
+}
+
+/**
+ * Updates an achievement in a character's achievementlog.
+ * @param char_id: Character ID
+ * @param ad: Achievement data
+ * @return false in case of errors, true otherwise
+ */
+bool mapif_achievement_update(uint32 char_id, struct achievement ad)
+{
+ StringBuf buf;
+ int i;
+
+ StringBuf_Init(&buf);
+ StringBuf_Printf(&buf, "UPDATE `%s` SET ", schema_config.achievement_table);
+ if( ad.completed ){
+ StringBuf_Printf(&buf, "`completed` = FROM_UNIXTIME('%u'),", (uint32)ad.completed);
+ }else{
+ StringBuf_AppendStr(&buf, "`completed` = NULL,");
+ }
+ if( ad.rewarded ){
+ StringBuf_Printf(&buf, "`rewarded` = FROM_UNIXTIME('%u')", (uint32)ad.rewarded);
+ }else{
+ StringBuf_AppendStr(&buf, "`rewarded` = NULL");
+ }
+ for (i = 0; i < MAX_ACHIEVEMENT_OBJECTIVES; ++i)
+ StringBuf_Printf(&buf, ", `count%d` = '%d'", i + 1, ad.count[i]);
+ StringBuf_Printf(&buf, " WHERE `id` = %d AND `char_id` = %u", ad.achievement_id, char_id);
+
+ if (SQL_ERROR == Sql_QueryStr(sql_handle, StringBuf_Value(&buf))) {
+ Sql_ShowDebug(sql_handle);
+ StringBuf_Destroy(&buf);
+ return false;
+ }
+
+ StringBuf_Destroy(&buf);
+
+ return true;
+}
+
+/**
+ * Notifies the map-server of the result of saving a character's achievementlog.
+ */
+void mapif_achievement_save( int fd, uint32 char_id, bool success ){
+ WFIFOHEAD(fd, 7);
+ WFIFOW(fd, 0) = 0x3863;
+ WFIFOL(fd, 2) = char_id;
+ WFIFOB(fd, 6) = success;
+ WFIFOSET(fd, 7);
+}
+
+/**
+ * Handles the save request from mapserver for a character's achievementlog.
+ * Received achievements are saved, and an ack is sent back to the map server.
+ * @see inter_parse_frommap
+ */
+int mapif_parse_achievement_save(int fd)
+{
+ int i, j, k, old_n, new_n = (RFIFOW(fd, 2) - 8) / sizeof(struct achievement);
+ uint32 char_id = RFIFOL(fd, 4);
+ struct achievement *old_ad = NULL, *new_ad = NULL;
+ bool success = true;
+
+ if (new_n > 0)
+ new_ad = (struct achievement *)RFIFOP(fd, 8);
+
+ old_ad = mapif_achievements_fromsql(char_id, &old_n);
+
+ for (i = 0; i < new_n; i++) {
+ ARR_FIND(0, old_n, j, new_ad[i].achievement_id == old_ad[j].achievement_id);
+ if (j < old_n) { // Update existing achievements
+ // Only counts, complete, and reward are changable.
+ ARR_FIND(0, MAX_ACHIEVEMENT_OBJECTIVES, k, new_ad[i].count[k] != old_ad[j].count[k]);
+ if (k != MAX_ACHIEVEMENT_OBJECTIVES || new_ad[i].completed != old_ad[j].completed || new_ad[i].rewarded != old_ad[j].rewarded) {
+ if ((success = mapif_achievement_update(char_id, new_ad[i])) == false)
+ break;
+ }
+
+ if (j < (--old_n)) {
+ // Compact array
+ memmove(&old_ad[j], &old_ad[j + 1], sizeof(struct achievement) * (old_n - j));
+ memset(&old_ad[old_n], 0, sizeof(struct achievement));
+ }
+ } else { // Add new achievements
+ if (new_ad[i].achievement_id) {
+ if ((success = mapif_achievement_add(char_id, new_ad[i])) == false)
+ break;
+ }
+ }
+ }
+
+ for (i = 0; i < old_n; i++) { // Achievements not in new_ad but in old_ad are to be erased.
+ if ((success = mapif_achievement_delete(char_id, old_ad[i].achievement_id)) == false)
+ break;
+ }
+
+ if (old_ad)
+ aFree(old_ad);
+
+ mapif_achievement_save(fd, char_id, success);
+
+ return 0;
+}
+
+/**
+ * Sends the achievementlog of a character to the map-server.
+ */
+void mapif_achievement_load( int fd, uint32 char_id ){
+ struct achievement *tmp_achievementlog = NULL;
+ int num_achievements = 0;
+
+ tmp_achievementlog = mapif_achievements_fromsql(char_id, &num_achievements);
+
+ WFIFOHEAD(fd, num_achievements * sizeof(struct achievement) + 8);
+ WFIFOW(fd, 0) = 0x3862;
+ WFIFOW(fd, 2) = num_achievements * sizeof(struct achievement) + 8;
+ WFIFOL(fd, 4) = char_id;
+
+ if (num_achievements > 0)
+ memcpy(WFIFOP(fd, 8), tmp_achievementlog, sizeof(struct achievement) * num_achievements);
+
+ WFIFOSET(fd, num_achievements * sizeof(struct achievement) + 8);
+
+ if (tmp_achievementlog)
+ aFree(tmp_achievementlog);
+}
+
+/**
+ * Sends achievementlog to the map server
+ * NOTE: Achievements sent to the player are only completed ones
+ * @see inter_parse_frommap
+ */
+int mapif_parse_achievement_load(int fd)
+{
+ mapif_achievement_load( fd, RFIFOL(fd, 2) );
+
+ return 0;
+}
+
+/**
+ * Notify the map-server if claiming the reward has succeeded.
+ */
+void mapif_achievement_reward( int fd, uint32 char_id, int32 achievement_id, time_t rewarded ){
+ WFIFOHEAD(fd, 14);
+ WFIFOW(fd, 0) = 0x3864;
+ WFIFOL(fd, 2) = char_id;
+ WFIFOL(fd, 6) = achievement_id;
+ WFIFOL(fd, 10) = (uint32)rewarded;
+ WFIFOSET(fd, 14);
+}
+
+/**
+ * Request of the map-server that a player claimed his achievement rewards.
+ * @see inter_parse_frommap
+ */
+int mapif_parse_achievement_reward(int fd){
+ time_t current = time(NULL);
+ uint32 char_id = RFIFOL(fd, 2);
+ int32 achievement_id = RFIFOL(fd, 6);
+
+ if( Sql_Query( sql_handle, "UPDATE `%s` SET `rewarded` = FROM_UNIXTIME('%u') WHERE `char_id`='%u' AND `id` = '%d' AND `completed` IS NOT NULL AND `rewarded` IS NULL", schema_config.achievement_table, (uint32)current, char_id, achievement_id ) == SQL_ERROR ||
+ Sql_NumRowsAffected(sql_handle) <= 0 ){
+ current = 0;
+ }else if( RFIFOW(fd,10) > 0 ){ // Do not send a mail if no item reward
+ char mail_sender[NAME_LENGTH];
+ char mail_receiver[NAME_LENGTH];
+ char mail_title[MAIL_TITLE_LENGTH];
+ char mail_text[MAIL_BODY_LENGTH];
+ struct item item;
+
+ memset(&item, 0, sizeof(struct item));
+ item.nameid = RFIFOW(fd, 10);
+ item.amount = RFIFOL(fd, 12);
+ item.identify = 1;
+
+ safesnprintf(mail_sender, NAME_LENGTH, char_msg_txt(227)); // 227: GM
+ safestrncpy(mail_receiver, RFIFOCP(fd,16), NAME_LENGTH);
+ safesnprintf(mail_title, MAIL_TITLE_LENGTH, char_msg_txt(228)); // 228: Achievement Reward Mail
+ safesnprintf(mail_text, MAIL_BODY_LENGTH, char_msg_txt(229), RFIFOCP(fd,16+NAME_LENGTH) ); // 229: [%s] Achievement Reward.
+
+ if( !mail_sendmail(0, mail_sender, char_id, mail_receiver, mail_title, mail_text, 0, &item, 1) ){
+ current = 0;
+ }
+ }
+
+ mapif_achievement_reward(fd, char_id, achievement_id, current);
+
+ return 0;
+}
+
+/**
+ * Parses achievementlog related packets from the map server.
+ * @see inter_parse_frommap
+ */
+int inter_achievement_parse_frommap(int fd)
+{
+ switch (RFIFOW(fd, 0)) {
+ case 0x3062: mapif_parse_achievement_load(fd); break;
+ case 0x3063: mapif_parse_achievement_save(fd); break;
+ case 0x3064: mapif_parse_achievement_reward(fd); break;
+ default:
+ return 0;
+ }
+ return 1;
+}
diff --git a/src/char/int_achievement.hpp b/src/char/int_achievement.hpp
new file mode 100644
index 00000000000..565557e5b1c
--- /dev/null
+++ b/src/char/int_achievement.hpp
@@ -0,0 +1,9 @@
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
+#ifndef _INT_ACHIEVEMENT_HPP_
+#define _INT_ACHIEVEMENT_HPP_
+
+int inter_achievement_parse_frommap(int fd);
+
+#endif /* _INT_ACHIEVEMENT_HPP_ */
diff --git a/src/char/int_auction.c b/src/char/int_auction.cpp
similarity index 93%
rename from src/char/int_auction.c
rename to src/char/int_auction.cpp
index 99a21fbd44e..6e4afe28e76 100644
--- a/src/char/int_auction.c
+++ b/src/char/int_auction.cpp
@@ -1,6 +1,12 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "int_auction.hpp"
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
#include "../common/mmo.h"
#include "../common/malloc.h"
#include "../common/showmsg.h"
@@ -8,20 +14,18 @@
#include "../common/strlib.h"
#include "../common/sql.h"
#include "../common/timer.h"
-#include "char.h"
-#include "char_mapif.h"
-#include "inter.h"
-#include "int_mail.h"
-#include "int_auction.h"
-#include <stdlib.h>
+#include "char.hpp"
+#include "char_mapif.hpp"
+#include "inter.hpp"
+#include "int_mail.hpp"
static DBMap* auction_db_ = NULL; // int auction_id -> struct auction_data*
void auction_delete(struct auction_data *auction);
-static int auction_end_timer(int tid, unsigned int tick, int id, intptr_t data);
+int auction_end_timer(int tid, unsigned int tick, int id, intptr_t data);
-static int auction_count(uint32 char_id, bool buy)
+int auction_count(uint32 char_id, bool buy)
{
int i = 0;
struct auction_data *auction;
@@ -92,7 +96,7 @@ unsigned int auction_create(struct auction_data *auction)
StringBuf_Printf(&buf, ", `option_val%d`", j);
StringBuf_Printf(&buf, ", `option_parm%d`", j);
}
- StringBuf_Printf(&buf, ") VALUES ('%d',?,'%d',?,'%d','%d','%d','%lu','%hu',?,'%d','%d','%d','%"PRIu64"'",
+ StringBuf_Printf(&buf, ") VALUES ('%d',?,'%d',?,'%d','%d','%d','%lu','%hu',?,'%d','%d','%d','%" PRIu64 "'",
auction->seller_id, auction->buyer_id, auction->price, auction->buynow, auction->hours, (unsigned long)auction->timestamp, auction->item.nameid, auction->type, auction->item.refine, auction->item.attribute, auction->item.unique_id);
for( j = 0; j < MAX_SLOTS; j++ )
StringBuf_Printf(&buf, ",'%hu'", auction->item.card[j]);
@@ -137,7 +141,7 @@ unsigned int auction_create(struct auction_data *auction)
return auction->auction_id;
}
-static void mapif_Auction_message(uint32 char_id, unsigned char result)
+void mapif_Auction_message(uint32 char_id, unsigned char result)
{
unsigned char buf[74];
@@ -147,7 +151,7 @@ static void mapif_Auction_message(uint32 char_id, unsigned char result)
chmapif_sendall(buf,7);
}
-static int auction_end_timer(int tid, unsigned int tick, int id, intptr_t data)
+int auction_end_timer(int tid, unsigned int tick, int id, intptr_t data)
{
struct auction_data *auction;
if( (auction = (struct auction_data *)idb_get(auction_db_, id)) != NULL )
@@ -263,7 +267,7 @@ void inter_auctions_fromsql(void)
Sql_FreeResult(sql_handle);
}
-static void mapif_Auction_sendlist(int fd, uint32 char_id, short count, short pages, unsigned char *buf)
+void mapif_Auction_sendlist(int fd, uint32 char_id, short count, short pages, unsigned char *buf)
{
int len = (sizeof(struct auction_data) * count) + 12;
@@ -277,7 +281,7 @@ static void mapif_Auction_sendlist(int fd, uint32 char_id, short count, short pa
WFIFOSET(fd,len);
}
-static void mapif_parse_Auction_requestlist(int fd)
+void mapif_parse_Auction_requestlist(int fd)
{
char searchtext[NAME_LENGTH];
uint32 char_id = RFIFOL(fd,4), len = sizeof(struct auction_data);
@@ -290,7 +294,7 @@ static void mapif_parse_Auction_requestlist(int fd)
memcpy(searchtext, RFIFOP(fd,16), NAME_LENGTH);
- for( auction = dbi_first(iter); dbi_exists(iter); auction = dbi_next(iter) )
+ for( auction = static_cast<auction_data *>(dbi_first(iter)); dbi_exists(iter); auction = static_cast<auction_data *>(dbi_next(iter)) )
{
if( (type == 0 && auction->type != IT_ARMOR && auction->type != IT_PETARMOR) ||
(type == 1 && auction->type != IT_WEAPON) ||
@@ -320,7 +324,7 @@ static void mapif_parse_Auction_requestlist(int fd)
mapif_Auction_sendlist(fd, char_id, j, pages, buf);
}
-static void mapif_Auction_register(int fd, struct auction_data *auction)
+void mapif_Auction_register(int fd, struct auction_data *auction)
{
int len = sizeof(struct auction_data) + 4;
@@ -331,7 +335,7 @@ static void mapif_Auction_register(int fd, struct auction_data *auction)
WFIFOSET(fd,len);
}
-static void mapif_parse_Auction_register(int fd)
+void mapif_parse_Auction_register(int fd)
{
struct auction_data auction;
if( RFIFOW(fd,2) != sizeof(struct auction_data) + 4 )
@@ -344,7 +348,7 @@ static void mapif_parse_Auction_register(int fd)
mapif_Auction_register(fd, &auction);
}
-static void mapif_Auction_cancel(int fd, uint32 char_id, unsigned char result)
+void mapif_Auction_cancel(int fd, uint32 char_id, unsigned char result)
{
WFIFOHEAD(fd,7);
WFIFOW(fd,0) = 0x3852;
@@ -353,7 +357,7 @@ static void mapif_Auction_cancel(int fd, uint32 char_id, unsigned char result)
WFIFOSET(fd,7);
}
-static void mapif_parse_Auction_cancel(int fd)
+void mapif_parse_Auction_cancel(int fd)
{
uint32 char_id = RFIFOL(fd,2), auction_id = RFIFOL(fd,6);
struct auction_data *auction;
@@ -382,7 +386,7 @@ static void mapif_parse_Auction_cancel(int fd)
mapif_Auction_cancel(fd, char_id, 0); // The auction has been canceled
}
-static void mapif_Auction_close(int fd, uint32 char_id, unsigned char result)
+void mapif_Auction_close(int fd, uint32 char_id, unsigned char result)
{
WFIFOHEAD(fd,7);
WFIFOW(fd,0) = 0x3853;
@@ -391,7 +395,7 @@ static void mapif_Auction_close(int fd, uint32 char_id, unsigned char result)
WFIFOSET(fd,7);
}
-static void mapif_parse_Auction_close(int fd)
+void mapif_parse_Auction_close(int fd)
{
uint32 char_id = RFIFOL(fd,2), auction_id = RFIFOL(fd,6);
struct auction_data *auction;
@@ -424,7 +428,7 @@ static void mapif_parse_Auction_close(int fd)
mapif_Auction_close(fd, char_id, 0); // You have ended the auction
}
-static void mapif_Auction_bid(int fd, uint32 char_id, int bid, unsigned char result)
+void mapif_Auction_bid(int fd, uint32 char_id, int bid, unsigned char result)
{
WFIFOHEAD(fd,11);
WFIFOW(fd,0) = 0x3855;
@@ -434,7 +438,7 @@ static void mapif_Auction_bid(int fd, uint32 char_id, int bid, unsigned char res
WFIFOSET(fd,11);
}
-static void mapif_parse_Auction_bid(int fd)
+void mapif_parse_Auction_bid(int fd)
{
uint32 char_id = RFIFOL(fd,4), auction_id = RFIFOL(fd,8);
int bid = RFIFOL(fd,12);
diff --git a/src/char/int_auction.h b/src/char/int_auction.hpp
similarity index 72%
rename from src/char/int_auction.h
rename to src/char/int_auction.hpp
index bf26b152c03..35b52576e77 100644
--- a/src/char/int_auction.h
+++ b/src/char/int_auction.hpp
@@ -1,12 +1,12 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _INT_AUCTION_SQL_H_
-#define _INT_AUCTION_SQL_H_
+#ifndef _INT_AUCTION_HPP_
+#define _INT_AUCTION_HPP_
int inter_auction_parse_frommap(int fd);
int inter_auction_sql_init(void);
void inter_auction_sql_final(void);
-#endif /* _INT_AUCTION_SQL_H_ */
+#endif /* _INT_AUCTION_HPP_ */
diff --git a/src/char/int_clan.c b/src/char/int_clan.cpp
similarity index 97%
rename from src/char/int_clan.c
rename to src/char/int_clan.cpp
index 597ea7aa860..1c06b0ecae4 100644
--- a/src/char/int_clan.c
+++ b/src/char/int_clan.cpp
@@ -1,6 +1,11 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "int_clan.hpp"
+
+#include <stdlib.h>
+#include <string.h> //memset
+
#include "../common/cbasetypes.h"
#include "../common/malloc.h"
#include "../common/mmo.h"
@@ -8,11 +13,9 @@
#include "../common/socket.h"
#include "../common/strlib.h"
-#include "char.h"
-#include "char_mapif.h"
-#include "inter.h"
-
-#include <stdlib.h>
+#include "char.hpp"
+#include "char_mapif.hpp"
+#include "inter.hpp"
//clan cache
static DBMap* clan_db; // int clan_id -> struct clan*
diff --git a/src/char/int_clan.h b/src/char/int_clan.h
deleted file mode 100644
index c21e6ecffaf..00000000000
--- a/src/char/int_clan.h
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder
-
-#ifndef _INT_CLAN_H_
-#define _INT_CLAN_H_
-
- int inter_clan_parse_frommap( int fd );
- int inter_clan_init(void);
- void inter_clan_final(void);
-#endif /* _INT_CLAN_H_ */
diff --git a/src/char/int_clan.hpp b/src/char/int_clan.hpp
new file mode 100644
index 00000000000..e0b4076c9c3
--- /dev/null
+++ b/src/char/int_clan.hpp
@@ -0,0 +1,11 @@
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
+#ifndef _INT_CLAN_HPP_
+#define _INT_CLAN_HPP_
+
+int inter_clan_parse_frommap( int fd );
+int inter_clan_init(void);
+void inter_clan_final(void);
+
+#endif /* _INT_CLAN_HPP_ */
diff --git a/src/char/int_elemental.c b/src/char/int_elemental.cpp
similarity index 86%
rename from src/char/int_elemental.c
rename to src/char/int_elemental.cpp
index 1a331fc0a0e..34f80a8c151 100644
--- a/src/char/int_elemental.c
+++ b/src/char/int_elemental.cpp
@@ -1,15 +1,19 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "int_elemental.hpp"
+
+#include <stdlib.h>
+#include <string.h>
+
#include "../common/mmo.h"
#include "../common/strlib.h"
#include "../common/showmsg.h"
#include "../common/socket.h"
#include "../common/sql.h"
-#include "char.h"
-#include "inter.h"
-#include <stdlib.h>
+#include "char.hpp"
+#include "inter.hpp"
bool mapif_elemental_save(struct s_elemental* ele) {
bool flag = true;
@@ -17,7 +21,7 @@ bool mapif_elemental_save(struct s_elemental* ele) {
if( ele->elemental_id == 0 ) { // Create new DB entry
if( SQL_ERROR == Sql_Query(sql_handle,
"INSERT INTO `%s` (`char_id`,`class`,`mode`,`hp`,`sp`,`max_hp`,`max_sp`,`atk1`,`atk2`,`matk`,`aspd`,`def`,`mdef`,`flee`,`hit`,`life_time`)"
- "VALUES ('%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%u')",
+ "VALUES ('%d','%d','%d','%u','%u','%u','%u','%d','%d','%d','%d','%d','%d','%d','%d','%u')",
schema_config.elemental_db, ele->char_id, ele->class_, ele->mode, ele->hp, ele->sp, ele->max_hp, ele->max_sp, ele->atk, ele->atk2, ele->matk, ele->amotion, ele->def, ele->mdef, ele->flee, ele->hit, ele->life_time) )
{
Sql_ShowDebug(sql_handle);
@@ -26,8 +30,8 @@ bool mapif_elemental_save(struct s_elemental* ele) {
else
ele->elemental_id = (int)Sql_LastInsertId(sql_handle);
} else if( SQL_ERROR == Sql_Query(sql_handle,
- "UPDATE `%s` SET `char_id` = '%d', `class` = '%d', `mode` = '%d', `hp` = '%d', `sp` = '%d',"
- "`max_hp` = '%d', `max_sp` = '%d', `atk1` = '%d', `atk2` = '%d', `matk` = '%d', `aspd` = '%d', `def` = '%d',"
+ "UPDATE `%s` SET `char_id` = '%d', `class` = '%d', `mode` = '%d', `hp` = '%u', `sp` = '%u',"
+ "`max_hp` = '%u', `max_sp` = '%u', `atk1` = '%d', `atk2` = '%d', `matk` = '%d', `aspd` = '%d', `def` = '%d',"
"`mdef` = '%d', `flee` = '%d', `hit` = '%d', `life_time` = '%u' WHERE `ele_id` = '%d'", schema_config.elemental_db,
ele->char_id, ele->class_, ele->mode, ele->hp, ele->sp, ele->max_hp, ele->max_sp, ele->atk, ele->atk2,
ele->matk, ele->amotion, ele->def, ele->mdef, ele->flee, ele->hit, ele->life_time, ele->elemental_id) )
@@ -58,7 +62,7 @@ bool mapif_elemental_load(int ele_id, uint32 char_id, struct s_elemental *ele) {
}
Sql_GetData(sql_handle, 0, &data, NULL); ele->class_ = atoi(data);
- Sql_GetData(sql_handle, 1, &data, NULL); ele->mode = atoi(data);
+ Sql_GetData(sql_handle, 1, &data, NULL); ele->mode = (e_mode)atoi(data);
Sql_GetData(sql_handle, 2, &data, NULL); ele->hp = atoi(data);
Sql_GetData(sql_handle, 3, &data, NULL); ele->sp = atoi(data);
Sql_GetData(sql_handle, 4, &data, NULL); ele->max_hp = atoi(data);
@@ -88,7 +92,7 @@ bool mapif_elemental_delete(int ele_id) {
return true;
}
-static void mapif_elemental_send(int fd, struct s_elemental *ele, unsigned char flag) {
+void mapif_elemental_send(int fd, struct s_elemental *ele, unsigned char flag) {
int size = sizeof(struct s_elemental) + 5;
WFIFOHEAD(fd,size);
@@ -99,37 +103,37 @@ static void mapif_elemental_send(int fd, struct s_elemental *ele, unsigned char
WFIFOSET(fd,size);
}
-static void mapif_parse_elemental_create(int fd, struct s_elemental* ele) {
+void mapif_parse_elemental_create(int fd, struct s_elemental* ele) {
bool result = mapif_elemental_save(ele);
mapif_elemental_send(fd, ele, result);
}
-static void mapif_parse_elemental_load(int fd, int ele_id, uint32 char_id) {
+void mapif_parse_elemental_load(int fd, int ele_id, uint32 char_id) {
struct s_elemental ele;
bool result = mapif_elemental_load(ele_id, char_id, &ele);
mapif_elemental_send(fd, &ele, result);
}
-static void mapif_elemental_deleted(int fd, unsigned char flag) {
+void mapif_elemental_deleted(int fd, unsigned char flag) {
WFIFOHEAD(fd,3);
WFIFOW(fd,0) = 0x387d;
WFIFOB(fd,2) = flag;
WFIFOSET(fd,3);
}
-static void mapif_parse_elemental_delete(int fd, int ele_id) {
+void mapif_parse_elemental_delete(int fd, int ele_id) {
bool result = mapif_elemental_delete(ele_id);
mapif_elemental_deleted(fd, result);
}
-static void mapif_elemental_saved(int fd, unsigned char flag) {
+void mapif_elemental_saved(int fd, unsigned char flag) {
WFIFOHEAD(fd,3);
WFIFOW(fd,0) = 0x387e;
WFIFOB(fd,2) = flag;
WFIFOSET(fd,3);
}
-static void mapif_parse_elemental_save(int fd, struct s_elemental* ele) {
+void mapif_parse_elemental_save(int fd, struct s_elemental* ele) {
bool result = mapif_elemental_save(ele);
mapif_elemental_saved(fd, result);
}
diff --git a/src/char/int_elemental.h b/src/char/int_elemental.hpp
similarity index 64%
rename from src/char/int_elemental.h
rename to src/char/int_elemental.hpp
index 8b43fb591eb..e212f217673 100644
--- a/src/char/int_elemental.h
+++ b/src/char/int_elemental.hpp
@@ -1,12 +1,8 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _INT_ELEMENTAL_SQL_H_
-#define _INT_ELEMENTAL_SQL_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef _INT_ELEMENTAL_HPP_
+#define _INT_ELEMENTAL_HPP_
struct s_elemental;
@@ -16,8 +12,4 @@ int inter_elemental_parse_frommap(int fd);
bool mapif_elemental_delete(int ele_id);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _INT_ELEMENTAL_SQL_H_ */
+#endif /* _INT_ELEMENTAL_HPP_ */
diff --git a/src/char/int_guild.c b/src/char/int_guild.cpp
similarity index 98%
rename from src/char/int_guild.c
rename to src/char/int_guild.cpp
index a596b6c67c2..600553836fd 100644
--- a/src/char/int_guild.c
+++ b/src/char/int_guild.cpp
@@ -1,6 +1,12 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "int_guild.hpp"
+
+#include <stdlib.h>
+#define __STDC_WANT_LIB_EXT1__ 1
+#include <string.h>
+
#include "../common/cbasetypes.h"
#include "../common/mmo.h"
#include "../common/malloc.h"
@@ -8,12 +14,10 @@
#include "../common/showmsg.h"
#include "../common/strlib.h"
#include "../common/timer.h"
-#include "char.h"
-#include "char_mapif.h"
-#include "inter.h"
-#include "int_guild.h"
-#include <stdlib.h>
+#include "char.hpp"
+#include "char_mapif.hpp"
+#include "inter.hpp"
#define GS_MEMBER_UNMODIFIED 0x00
#define GS_MEMBER_MODIFIED 0x01
@@ -36,14 +40,14 @@ static unsigned int guild_exp[100];
int mapif_parse_GuildLeave(int fd,int guild_id,uint32 account_id,uint32 char_id,int flag,const char *mes);
int mapif_guild_broken(int guild_id,int flag);
-static bool guild_check_empty(struct guild *g);
+bool guild_check_empty(struct guild *g);
int guild_calcinfo(struct guild *g);
int mapif_guild_basicinfochanged(int guild_id,int type,const void *data,int len);
int mapif_guild_info(int fd,struct guild *g);
int guild_break_sub(int key,void *data,va_list ap);
int inter_guild_tosql(struct guild *g,int flag);
-static int guild_save_timer(int tid, unsigned int tick, int id, intptr_t data)
+int guild_save_timer(int tid, unsigned int tick, int id, intptr_t data)
{
static int last_id = 0; //To know in which guild we were.
int state = 0; //0: Have not reached last guild. 1: Reached last guild, ready for save. 2: Some guild saved, don't do further saving.
@@ -217,7 +221,7 @@ int inter_guild_tosql(struct guild *g,int flag)
StringBuf_AppendStr(&buf, ", ");
//else //last condition using add_coma setting
// add_comma = true;
- StringBuf_Printf(&buf, "`guild_lv`=%d, `skill_point`=%d, `exp`=%"PRIu64", `next_exp`=%u, `max_member`=%d", g->guild_lv, g->skill_point, g->exp, g->next_exp, g->max_member);
+ StringBuf_Printf(&buf, "`guild_lv`=%d, `skill_point`=%d, `exp`=%" PRIu64 ", `next_exp`=%u, `max_member`=%d", g->guild_lv, g->skill_point, g->exp, g->next_exp, g->max_member);
}
StringBuf_Printf(&buf, " WHERE `guild_id`=%d", g->guild_id);
if( SQL_ERROR == Sql_Query(sql_handle, "%s", StringBuf_Value(&buf)) )
@@ -237,7 +241,7 @@ int inter_guild_tosql(struct guild *g,int flag)
//Since nothing references guild member table as foreign keys, it's safe to use REPLACE INTO
Sql_EscapeStringLen(sql_handle, esc_name, m->name, strnlen(m->name, NAME_LENGTH));
if( SQL_ERROR == Sql_Query(sql_handle, "REPLACE INTO `%s` (`guild_id`,`account_id`,`char_id`,`hair`,`hair_color`,`gender`,`class`,`lv`,`exp`,`exp_payper`,`online`,`position`,`name`) "
- "VALUES ('%d','%d','%d','%d','%d','%d','%d','%d','%"PRIu64"','%d','%d','%d','%s')",
+ "VALUES ('%d','%d','%d','%d','%d','%d','%d','%d','%" PRIu64 "','%d','%d','%d','%s')",
schema_config.guild_member_db, g->guild_id, m->account_id, m->char_id,
m->hair, m->hair_color, m->gender,
m->class_, m->lv, m->exp, m->exp_payper, m->online, m->position, esc_name) )
@@ -546,7 +550,7 @@ int inter_guildcastle_tosql(struct guild_castle *gc)
}
// Read guild_castle from SQL
-static struct guild_castle* inter_guildcastle_fromsql(int castle_id)
+struct guild_castle* inter_guildcastle_fromsql(int castle_id)
{
char *data;
int i;
@@ -598,7 +602,7 @@ static struct guild_castle* inter_guildcastle_fromsql(int castle_id)
// Read exp_guild.txt
-static bool exp_guild_parse_row(char* split[], int column, int current)
+bool exp_guild_parse_row(char* split[], int column, int current)
{
unsigned int exp = (unsigned int)atol(split[0]);
@@ -728,7 +732,7 @@ int inter_guild_sql_init(void)
//Read exp file
for(i = 0; i<ARRAYLENGTH(filename); i++){
- sv_readdb(db_path, filename[i], ',', 1, 1, 100, exp_guild_parse_row, i);
+ sv_readdb(db_path, filename[i], ',', 1, 1, 100, exp_guild_parse_row, i > 0);
}
add_timer_func_list(guild_save_timer, "guild_save_timer");
@@ -739,7 +743,7 @@ int inter_guild_sql_init(void)
/**
* @see DBApply
*/
-static int guild_db_final(DBKey key, DBData *data, va_list ap)
+int guild_db_final(DBKey key, DBData *data, va_list ap)
{
struct guild *g = (struct guild*)db_data2ptr(data);
if (g->save_flag&GS_MASK) {
@@ -786,7 +790,7 @@ int search_guildname(char *str)
}
// Check if guild is empty
-static bool guild_check_empty(struct guild *g)
+bool guild_check_empty(struct guild *g)
{
int i;
ARR_FIND( 0, g->max_member, i, g->member[i].account_id > 0 );
@@ -1096,7 +1100,7 @@ int mapif_guild_master_changed(struct guild *g, int aid, int cid, time_t time)
WBUFL(buf,2)=g->guild_id;
WBUFL(buf,6)=aid;
WBUFL(buf,10)=cid;
- WBUFL(buf,14)=time;
+ WBUFL(buf,14)=(uint32)time;
chmapif_sendall(buf,18);
return 0;
}
@@ -1647,7 +1651,7 @@ int mapif_parse_GuildSkillUp(int fd,int guild_id,uint16 skill_id,uint32 account_
}
//Manual deletion of an alliance when partnering guild does not exists. [Skotlex]
-static int mapif_parse_GuildDeleteAlliance(struct guild *g, int guild_id, uint32 account_id1, uint32 account_id2, int flag)
+int mapif_parse_GuildDeleteAlliance(struct guild *g, int guild_id, uint32 account_id1, uint32 account_id2, int flag)
{
int i;
char name[NAME_LENGTH];
diff --git a/src/char/int_guild.h b/src/char/int_guild.hpp
similarity index 87%
rename from src/char/int_guild.h
rename to src/char/int_guild.hpp
index 7eb1ff68ef2..d0ade434054 100644
--- a/src/char/int_guild.h
+++ b/src/char/int_guild.hpp
@@ -1,16 +1,12 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _INT_GUILD_SQL_H_
-#define _INT_GUILD_SQL_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef _INT_GUILD_HPP_
+#define _INT_GUILD_HPP_
#include "../common/cbasetypes.h"
-enum {
+enum e_guild_action : uint32 {
GS_BASIC = 0x0001,
GS_MEMBER = 0x0002,
GS_POSITION = 0x0004,
@@ -40,8 +36,4 @@ int inter_guild_charname_changed(int guild_id,uint32 account_id, uint32 char_id,
int inter_guild_CharOnline(uint32 char_id, int guild_id);
int inter_guild_CharOffline(uint32 char_id, int guild_id);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _INT_GUILD_SQL_H_ */
+#endif /* _INT_GUILD_HPP_ */
diff --git a/src/char/int_homun.c b/src/char/int_homun.cpp
similarity index 89%
rename from src/char/int_homun.c
rename to src/char/int_homun.cpp
index d9cb851a84f..6e07e07a754 100644
--- a/src/char/int_homun.c
+++ b/src/char/int_homun.cpp
@@ -1,17 +1,20 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "int_homun.hpp"
+
+#include <stdlib.h>
+#include <string.h>
+
#include "../common/mmo.h"
#include "../common/strlib.h"
#include "../common/showmsg.h"
#include "../common/socket.h"
#include "../common/utils.h"
#include "../common/sql.h"
-#include "char.h"
-#include "inter.h"
-
-#include <stdlib.h>
+#include "char.hpp"
+#include "inter.hpp"
int inter_homunculus_sql_init(void)
{
@@ -22,7 +25,7 @@ void inter_homunculus_sql_final(void)
return;
}
-static void mapif_homunculus_created(int fd, uint32 account_id, struct s_homunculus *sh, unsigned char flag)
+void mapif_homunculus_created(int fd, uint32 account_id, struct s_homunculus *sh, unsigned char flag)
{
WFIFOHEAD(fd, sizeof(struct s_homunculus)+9);
WFIFOW(fd,0) = 0x3890;
@@ -33,7 +36,7 @@ static void mapif_homunculus_created(int fd, uint32 account_id, struct s_homuncu
WFIFOSET(fd, WFIFOW(fd,2));
}
-static void mapif_homunculus_deleted(int fd, int flag)
+void mapif_homunculus_deleted(int fd, int flag)
{
WFIFOHEAD(fd, 3);
WFIFOW(fd, 0) = 0x3893;
@@ -41,7 +44,7 @@ static void mapif_homunculus_deleted(int fd, int flag)
WFIFOSET(fd, 3);
}
-static void mapif_homunculus_loaded(int fd, uint32 account_id, struct s_homunculus *hd)
+void mapif_homunculus_loaded(int fd, uint32 account_id, struct s_homunculus *hd)
{
WFIFOHEAD(fd, sizeof(struct s_homunculus)+9);
WFIFOW(fd,0) = 0x3891;
@@ -60,7 +63,7 @@ static void mapif_homunculus_loaded(int fd, uint32 account_id, struct s_homuncul
WFIFOSET(fd, sizeof(struct s_homunculus)+9);
}
-static void mapif_homunculus_saved(int fd, uint32 account_id, bool flag)
+void mapif_homunculus_saved(int fd, uint32 account_id, bool flag)
{
WFIFOHEAD(fd, 7);
WFIFOW(fd,0) = 0x3892;
@@ -69,7 +72,7 @@ static void mapif_homunculus_saved(int fd, uint32 account_id, bool flag)
WFIFOSET(fd, 7);
}
-static void mapif_homunculus_renamed(int fd, uint32 account_id, uint32 char_id, unsigned char flag, char* name)
+void mapif_homunculus_renamed(int fd, uint32 account_id, uint32 char_id, unsigned char flag, char* name)
{
WFIFOHEAD(fd, NAME_LENGTH+12);
WFIFOW(fd, 0) = 0x3894;
@@ -91,7 +94,7 @@ bool mapif_homunculus_save(struct s_homunculus* hd)
{// new homunculus
if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s` "
"(`char_id`, `class`,`prev_class`,`name`,`level`,`exp`,`intimacy`,`hunger`, `str`, `agi`, `vit`, `int`, `dex`, `luk`, `hp`,`max_hp`,`sp`,`max_sp`,`skill_point`, `rename_flag`, `vaporize`) "
- "VALUES ('%d', '%d', '%d', '%s', '%d', '%u', '%u', '%d', '%d', %d, '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d')",
+ "VALUES ('%d', '%d', '%d', '%s', '%d', '%u', '%u', '%d', '%d', %d, '%d', '%d', '%d', '%d', '%u', '%u', '%u', '%u', '%d', '%d', '%d')",
schema_config.homunculus_db, hd->char_id, hd->class_, hd->prev_class, esc_name, hd->level, hd->exp, hd->intimacy, hd->hunger, hd->str, hd->agi, hd->vit, hd->int_, hd->dex, hd->luk,
hd->hp, hd->max_hp, hd->sp, hd->max_sp, hd->skillpts, hd->rename_flag, hd->vaporize) )
{
@@ -105,7 +108,7 @@ bool mapif_homunculus_save(struct s_homunculus* hd)
}
else
{
- if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `char_id`='%d', `class`='%d',`prev_class`='%d',`name`='%s',`level`='%d',`exp`='%u',`intimacy`='%u',`hunger`='%d', `str`='%d', `agi`='%d', `vit`='%d', `int`='%d', `dex`='%d', `luk`='%d', `hp`='%d',`max_hp`='%d',`sp`='%d',`max_sp`='%d',`skill_point`='%d', `rename_flag`='%d', `vaporize`='%d' WHERE `homun_id`='%d'",
+ if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `char_id`='%d', `class`='%d',`prev_class`='%d',`name`='%s',`level`='%d',`exp`='%u',`intimacy`='%u',`hunger`='%d', `str`='%d', `agi`='%d', `vit`='%d', `int`='%d', `dex`='%d', `luk`='%d', `hp`='%u',`max_hp`='%u',`sp`='%u',`max_sp`='%u',`skill_point`='%d', `rename_flag`='%d', `vaporize`='%d' WHERE `homun_id`='%d'",
schema_config.homunculus_db, hd->char_id, hd->class_, hd->prev_class, esc_name, hd->level, hd->exp, hd->intimacy, hd->hunger, hd->str, hd->agi, hd->vit, hd->int_, hd->dex, hd->luk,
hd->hp, hd->max_hp, hd->sp, hd->max_sp, hd->skillpts, hd->rename_flag, hd->vaporize, hd->hom_id) )
{
@@ -261,32 +264,32 @@ bool mapif_homunculus_rename(char *name)
}
-static void mapif_parse_homunculus_create(int fd, int len, uint32 account_id, struct s_homunculus* phd)
+void mapif_parse_homunculus_create(int fd, int len, uint32 account_id, struct s_homunculus* phd)
{
bool result = mapif_homunculus_save(phd);
mapif_homunculus_created(fd, account_id, phd, result);
}
-static void mapif_parse_homunculus_delete(int fd, int homun_id)
+void mapif_parse_homunculus_delete(int fd, int homun_id)
{
bool result = mapif_homunculus_delete(homun_id);
mapif_homunculus_deleted(fd, result);
}
-static void mapif_parse_homunculus_load(int fd, uint32 account_id, int homun_id)
+void mapif_parse_homunculus_load(int fd, uint32 account_id, int homun_id)
{
struct s_homunculus hd;
bool result = mapif_homunculus_load(homun_id, &hd);
mapif_homunculus_loaded(fd, account_id, ( result ? &hd : NULL ));
}
-static void mapif_parse_homunculus_save(int fd, int len, uint32 account_id, struct s_homunculus* phd)
+void mapif_parse_homunculus_save(int fd, int len, uint32 account_id, struct s_homunculus* phd)
{
bool result = mapif_homunculus_save(phd);
mapif_homunculus_saved(fd, account_id, result);
}
-static void mapif_parse_homunculus_rename(int fd, uint32 account_id, uint32 char_id, char* name)
+void mapif_parse_homunculus_rename(int fd, uint32 account_id, uint32 char_id, char* name)
{
bool result = mapif_homunculus_rename(name);
mapif_homunculus_renamed(fd, account_id, char_id, result, name);
diff --git a/src/char/int_homun.h b/src/char/int_homun.hpp
similarity index 75%
rename from src/char/int_homun.h
rename to src/char/int_homun.hpp
index 594602180fd..4bcef6f92d3 100644
--- a/src/char/int_homun.h
+++ b/src/char/int_homun.hpp
@@ -1,12 +1,10 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _INT_HOMUN_SQL_H_
-#define _INT_HOMUN_SQL_H_
+#ifndef _INT_HOMUN_HPP_
+#define _INT_HOMUN_HPP_
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "../common/cbasetypes.h"
struct s_homunculus;
@@ -19,8 +17,4 @@ bool mapif_homunculus_load(int homun_id, struct s_homunculus* hd);
bool mapif_homunculus_delete(int homun_id);
bool mapif_homunculus_rename(char *name);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _INT_HOMUN_SQL_H_ */
+#endif /* _INT_HOMUN_HPP_ */
diff --git a/src/char/int_mail.c b/src/char/int_mail.cpp
similarity index 90%
rename from src/char/int_mail.c
rename to src/char/int_mail.cpp
index 0420ffed5a8..bf47fe94bbe 100644
--- a/src/char/int_mail.c
+++ b/src/char/int_mail.cpp
@@ -1,22 +1,26 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "int_mail.hpp"
+
+#include <stdlib.h>
+#include <string.h>
+
#include "../common/mmo.h"
#include "../common/showmsg.h"
#include "../common/socket.h"
#include "../common/strlib.h"
#include "../common/sql.h"
-#include "char.h"
-#include "char_mapif.h"
-#include "inter.h"
-#include <stdlib.h>
+#include "char.hpp"
+#include "char_mapif.hpp"
+#include "inter.hpp"
-static bool mail_loadmessage(int mail_id, struct mail_message* msg);
-static void mapif_Mail_return(int fd, uint32 char_id, int mail_id);
-static void mapif_Mail_delete(int fd, uint32 char_id, int mail_id, bool deleted);
+bool mail_loadmessage(int mail_id, struct mail_message* msg);
+void mapif_Mail_return(int fd, uint32 char_id, int mail_id);
+void mapif_Mail_delete(int fd, uint32 char_id, int mail_id, bool deleted);
-static int mail_fromsql(uint32 char_id, struct mail_data* md)
+int mail_fromsql(uint32 char_id, struct mail_data* md)
{
int i;
char *data;
@@ -123,7 +127,7 @@ int mail_savemessage(struct mail_message* msg)
found = true;
}
- StringBuf_Printf(&buf, "('%"PRIu64"', '%hu', '%d', '%hu', '%d', '%d', '%d', '%"PRIu64"', '%d'", (uint64)msg->id, i, msg->item[i].amount, msg->item[i].nameid, msg->item[i].refine, msg->item[i].attribute, msg->item[i].identify, msg->item[i].unique_id, msg->item[i].bound);
+ StringBuf_Printf(&buf, "('%" PRIu64 "', '%hu', '%d', '%hu', '%d', '%d', '%d', '%" PRIu64 "', '%d'", (uint64)msg->id, i, msg->item[i].amount, msg->item[i].nameid, msg->item[i].refine, msg->item[i].attribute, msg->item[i].identify, msg->item[i].unique_id, msg->item[i].bound);
for (j = 0; j < MAX_SLOTS; j++)
StringBuf_Printf(&buf, ", '%hu'", msg->item[i].card[j]);
for (j = 0; j < MAX_ITEM_RDM_OPT; ++j) {
@@ -145,7 +149,7 @@ int mail_savemessage(struct mail_message* msg)
/// Retrieves a single message from the database.
/// Returns true if the operation succeeds (or false if it fails).
-static bool mail_loadmessage(int mail_id, struct mail_message* msg)
+bool mail_loadmessage(int mail_id, struct mail_message* msg)
{
int i, j;
StringBuf buf;
@@ -167,7 +171,7 @@ static bool mail_loadmessage(int mail_id, struct mail_message* msg)
Sql_GetData(sql_handle, 7, &data, NULL); msg->timestamp = atoi(data);
Sql_GetData(sql_handle, 8, &data, NULL); msg->status = (mail_status)atoi(data);
Sql_GetData(sql_handle, 9, &data, NULL); msg->zeny = atoi(data);
- Sql_GetData(sql_handle,10, &data, NULL); msg->type = atoi(data);
+ Sql_GetData(sql_handle,10, &data, NULL); msg->type = (mail_inbox_type)atoi(data);
if( msg->type == MAIL_INBOX_NORMAL && charserv_config.mail_return_days > 0 ){
msg->scheduled_deletion = msg->timestamp + charserv_config.mail_return_days * 24 * 60 * 60;
@@ -230,7 +234,7 @@ static bool mail_loadmessage(int mail_id, struct mail_message* msg)
return true;
}
-static int mail_timer_sub( int limit, enum mail_inbox_type type ){
+int mail_timer_sub( int limit, enum mail_inbox_type type ){
struct{
int mail_id;
int char_id;
@@ -300,7 +304,7 @@ int mail_delete_timer( int tid, unsigned int tick, int id, intptr_t data ){
/*==========================================
* Client Inbox Request
*------------------------------------------*/
-static void mapif_Mail_sendinbox(int fd, uint32 char_id, unsigned char flag, enum mail_inbox_type type)
+void mapif_Mail_sendinbox(int fd, uint32 char_id, unsigned char flag, enum mail_inbox_type type)
{
struct mail_data md;
mail_fromsql(char_id, &md);
@@ -316,15 +320,15 @@ static void mapif_Mail_sendinbox(int fd, uint32 char_id, unsigned char flag, enu
WFIFOSET(fd,WFIFOW(fd,2));
}
-static void mapif_parse_Mail_requestinbox(int fd)
+void mapif_parse_Mail_requestinbox(int fd)
{
- mapif_Mail_sendinbox(fd, RFIFOL(fd,2), RFIFOB(fd,6), RFIFOB(fd,7));
+ mapif_Mail_sendinbox(fd, RFIFOL(fd,2), RFIFOB(fd,6), (mail_inbox_type)RFIFOB(fd,7));
}
/*==========================================
* Mark mail as 'Read'
*------------------------------------------*/
-static void mapif_parse_Mail_read(int fd)
+void mapif_parse_Mail_read(int fd)
{
int mail_id = RFIFOL(fd,2);
if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `status` = '%d' WHERE `id` = '%d'", schema_config.mail_db, MAIL_READ, mail_id) )
@@ -334,7 +338,7 @@ static void mapif_parse_Mail_read(int fd)
/*==========================================
* Client Attachment Request
*------------------------------------------*/
-static bool mail_DeleteAttach(int mail_id){
+bool mail_DeleteAttach(int mail_id){
if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `id` = '%d'", schema_config.mail_attachment_db, mail_id ) ){
Sql_ShowDebug(sql_handle);
return false;
@@ -343,7 +347,7 @@ static bool mail_DeleteAttach(int mail_id){
return true;
}
-static void mapif_Mail_getattach(int fd, uint32 char_id, int mail_id, int type)
+void mapif_Mail_getattach(int fd, uint32 char_id, int mail_id, int type)
{
struct mail_message msg;
@@ -407,7 +411,7 @@ static void mapif_Mail_getattach(int fd, uint32 char_id, int mail_id, int type)
WFIFOSET(fd,WFIFOW(fd,2));
}
-static void mapif_parse_Mail_getattach(int fd)
+void mapif_parse_Mail_getattach(int fd)
{
mapif_Mail_getattach(fd, RFIFOL(fd,2), RFIFOL(fd,6),RFIFOB(fd,10));
}
@@ -415,7 +419,7 @@ static void mapif_parse_Mail_getattach(int fd)
/*==========================================
* Delete Mail
*------------------------------------------*/
-static void mapif_Mail_delete(int fd, uint32 char_id, int mail_id, bool deleted)
+void mapif_Mail_delete(int fd, uint32 char_id, int mail_id, bool deleted)
{
bool failed = false;
@@ -441,7 +445,7 @@ static void mapif_Mail_delete(int fd, uint32 char_id, int mail_id, bool deleted)
WFIFOSET(fd,11);
}
-static void mapif_parse_Mail_delete(int fd)
+void mapif_parse_Mail_delete(int fd)
{
mapif_Mail_delete(fd, RFIFOL(fd,2), RFIFOL(fd,6), false);
}
@@ -468,7 +472,7 @@ void mapif_Mail_new(struct mail_message *msg)
/*==========================================
* Return Mail
*------------------------------------------*/
-static void mapif_Mail_return(int fd, uint32 char_id, int mail_id)
+void mapif_Mail_return(int fd, uint32 char_id, int mail_id)
{
struct mail_message msg;
int new_mail = 0;
@@ -485,7 +489,7 @@ static void mapif_Mail_return(int fd, uint32 char_id, int mail_id)
char temp_[MAIL_TITLE_LENGTH];
// swap sender and receiver
- swap(msg.send_id, msg.dest_id);
+ SWAP(msg.send_id, msg.dest_id);
safestrncpy(temp_, msg.send_name, NAME_LENGTH);
safestrncpy(msg.send_name, msg.dest_name, NAME_LENGTH);
safestrncpy(msg.dest_name, temp_, NAME_LENGTH);
@@ -516,7 +520,7 @@ static void mapif_Mail_return(int fd, uint32 char_id, int mail_id)
WFIFOSET(fd,11);
}
-static void mapif_parse_Mail_return(int fd)
+void mapif_parse_Mail_return(int fd)
{
mapif_Mail_return(fd, RFIFOL(fd,2), RFIFOL(fd,6));
}
@@ -524,7 +528,7 @@ static void mapif_parse_Mail_return(int fd)
/*==========================================
* Send Mail
*------------------------------------------*/
-static void mapif_Mail_send(int fd, struct mail_message* msg)
+void mapif_Mail_send(int fd, struct mail_message* msg)
{
int len = sizeof(struct mail_message) + 4;
@@ -535,7 +539,7 @@ static void mapif_Mail_send(int fd, struct mail_message* msg)
WFIFOSET(fd,len);
}
-static void mapif_parse_Mail_send(int fd)
+void mapif_parse_Mail_send(int fd)
{
struct mail_message msg;
char esc_name[NAME_LENGTH*2+1];
@@ -578,7 +582,7 @@ static void mapif_parse_Mail_send(int fd)
mapif_Mail_new(&msg); // notify recipient
}
-void mail_sendmail(int send_id, const char* send_name, int dest_id, const char* dest_name, const char* title, const char* body, int zeny, struct item *item, int amount)
+bool mail_sendmail(int send_id, const char* send_name, int dest_id, const char* dest_name, const char* title, const char* body, int zeny, struct item *item, int amount)
{
struct mail_message msg;
memset(&msg, 0, sizeof(struct mail_message));
@@ -601,11 +605,15 @@ void mail_sendmail(int send_id, const char* send_name, int dest_id, const char*
msg.timestamp = time(NULL);
msg.type = MAIL_INBOX_NORMAL;
- mail_savemessage(&msg);
+ if( !mail_savemessage(&msg) ){
+ return false;
+ }
+
mapif_Mail_new(&msg);
+ return true;
}
-static void mapif_Mail_receiver_send( int fd, int requesting_char_id, int char_id, int class_, int base_level, const char* name ){
+void mapif_Mail_receiver_send( int fd, int requesting_char_id, int char_id, int class_, int base_level, const char* name ){
WFIFOHEAD(fd,38);
WFIFOW(fd,0) = 0x384e;
WFIFOL(fd,2) = requesting_char_id;
@@ -616,7 +624,7 @@ static void mapif_Mail_receiver_send( int fd, int requesting_char_id, int char_i
WFIFOSET(fd,38);
}
-static void mapif_parse_Mail_receiver_check( int fd ){
+void mapif_parse_Mail_receiver_check( int fd ){
char name[NAME_LENGTH], esc_name[NAME_LENGTH * 2 + 1];
uint32 char_id = 0;
uint16 class_ = 0, base_level = 0;
diff --git a/src/char/int_mail.h b/src/char/int_mail.hpp
similarity index 73%
rename from src/char/int_mail.h
rename to src/char/int_mail.hpp
index 7149e49cb8c..21cc726e554 100644
--- a/src/char/int_mail.h
+++ b/src/char/int_mail.hpp
@@ -1,18 +1,19 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _INT_MAIL_SQL_H_
-#define _INT_MAIL_SQL_H_
+#ifndef _INT_MAIL_HPP_
+#define _INT_MAIL_HPP_
+
+#include "../common/cbasetypes.h"
+
+struct mail_message;
-#ifdef __cplusplus
-extern "C" {
-#endif
int mail_return_timer( int tid, unsigned int tick, int id, intptr_t data );
int mail_delete_timer( int tid, unsigned int tick, int id, intptr_t data );
int inter_mail_parse_frommap(int fd);
-void mail_sendmail(int send_id, const char* send_name, int dest_id, const char* dest_name, const char* title, const char* body, int zeny, struct item *item, int amount);
+bool mail_sendmail(int send_id, const char* send_name, int dest_id, const char* dest_name, const char* title, const char* body, int zeny, struct item *item, int amount);
int inter_mail_sql_init(void);
void inter_mail_sql_final(void);
@@ -20,8 +21,6 @@ void inter_mail_sql_final(void);
int mail_savemessage(struct mail_message* msg);
void mapif_Mail_new(struct mail_message *msg);
-#ifdef __cplusplus
-}
-#endif
-#endif /* _INT_MAIL_SQL_H_ */
+
+#endif /* _INT_MAIL_HPP_ */
diff --git a/src/char/int_mercenary.c b/src/char/int_mercenary.cpp
similarity index 88%
rename from src/char/int_mercenary.c
rename to src/char/int_mercenary.cpp
index 0b912cb540b..0eaee859e61 100644
--- a/src/char/int_mercenary.c
+++ b/src/char/int_mercenary.cpp
@@ -1,15 +1,19 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "int_mercenary.hpp"
+
+#include <stdlib.h>
+#include <string.h>
+
#include "../common/mmo.h"
#include "../common/strlib.h"
#include "../common/showmsg.h"
#include "../common/socket.h"
#include "../common/sql.h"
-#include "char.h"
-#include "inter.h"
-#include <stdlib.h>
+#include "char.hpp"
+#include "inter.hpp"
bool mercenary_owner_fromsql(uint32 char_id, struct mmo_charstatus *status)
{
@@ -69,7 +73,7 @@ bool mapif_mercenary_save(struct s_mercenary* merc)
if( merc->mercenary_id == 0 )
{ // Create new DB entry
if( SQL_ERROR == Sql_Query(sql_handle,
- "INSERT INTO `%s` (`char_id`,`class`,`hp`,`sp`,`kill_counter`,`life_time`) VALUES ('%d','%d','%d','%d','%u','%u')",
+ "INSERT INTO `%s` (`char_id`,`class`,`hp`,`sp`,`kill_counter`,`life_time`) VALUES ('%d','%d','%u','%u','%u','%u')",
schema_config.mercenary_db, merc->char_id, merc->class_, merc->hp, merc->sp, merc->kill_count, merc->life_time) )
{
Sql_ShowDebug(sql_handle);
@@ -79,7 +83,7 @@ bool mapif_mercenary_save(struct s_mercenary* merc)
merc->mercenary_id = (int)Sql_LastInsertId(sql_handle);
}
else if( SQL_ERROR == Sql_Query(sql_handle,
- "UPDATE `%s` SET `char_id` = '%d', `class` = '%d', `hp` = '%d', `sp` = '%d', `kill_counter` = '%u', `life_time` = '%u' WHERE `mer_id` = '%d'",
+ "UPDATE `%s` SET `char_id` = '%d', `class` = '%d', `hp` = '%u', `sp` = '%u', `kill_counter` = '%u', `life_time` = '%u' WHERE `mer_id` = '%d'",
schema_config.mercenary_db, merc->char_id, merc->class_, merc->hp, merc->sp, merc->kill_count, merc->life_time, merc->mercenary_id) )
{ // Update DB entry
Sql_ShowDebug(sql_handle);
@@ -132,7 +136,7 @@ bool mapif_mercenary_delete(int merc_id)
return true;
}
-static void mapif_mercenary_send(int fd, struct s_mercenary *merc, unsigned char flag)
+void mapif_mercenary_send(int fd, struct s_mercenary *merc, unsigned char flag)
{
int size = sizeof(struct s_mercenary) + 5;
@@ -144,20 +148,20 @@ static void mapif_mercenary_send(int fd, struct s_mercenary *merc, unsigned char
WFIFOSET(fd,size);
}
-static void mapif_parse_mercenary_create(int fd, struct s_mercenary* merc)
+void mapif_parse_mercenary_create(int fd, struct s_mercenary* merc)
{
bool result = mapif_mercenary_save(merc);
mapif_mercenary_send(fd, merc, result);
}
-static void mapif_parse_mercenary_load(int fd, int merc_id, uint32 char_id)
+void mapif_parse_mercenary_load(int fd, int merc_id, uint32 char_id)
{
struct s_mercenary merc;
bool result = mapif_mercenary_load(merc_id, char_id, &merc);
mapif_mercenary_send(fd, &merc, result);
}
-static void mapif_mercenary_deleted(int fd, unsigned char flag)
+void mapif_mercenary_deleted(int fd, unsigned char flag)
{
WFIFOHEAD(fd,3);
WFIFOW(fd,0) = 0x3871;
@@ -165,13 +169,13 @@ static void mapif_mercenary_deleted(int fd, unsigned char flag)
WFIFOSET(fd,3);
}
-static void mapif_parse_mercenary_delete(int fd, int merc_id)
+void mapif_parse_mercenary_delete(int fd, int merc_id)
{
bool result = mapif_mercenary_delete(merc_id);
mapif_mercenary_deleted(fd, result);
}
-static void mapif_mercenary_saved(int fd, unsigned char flag)
+void mapif_mercenary_saved(int fd, unsigned char flag)
{
WFIFOHEAD(fd,3);
WFIFOW(fd,0) = 0x3872;
@@ -179,7 +183,7 @@ static void mapif_mercenary_saved(int fd, unsigned char flag)
WFIFOSET(fd,3);
}
-static void mapif_parse_mercenary_save(int fd, struct s_mercenary* merc)
+void mapif_parse_mercenary_save(int fd, struct s_mercenary* merc)
{
bool result = mapif_mercenary_save(merc);
mapif_mercenary_saved(fd, result);
diff --git a/src/char/int_mercenary.h b/src/char/int_mercenary.hpp
similarity index 73%
rename from src/char/int_mercenary.h
rename to src/char/int_mercenary.hpp
index d972d6366ad..2812bf76281 100644
--- a/src/char/int_mercenary.h
+++ b/src/char/int_mercenary.hpp
@@ -1,14 +1,10 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _INT_MERCENARY_SQL_H_
-#define _INT_MERCENARY_SQL_H_
+#ifndef _INT_MERCENARY_HPP_
+#define _INT_MERCENARY_HPP_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct s_mercenary;
+#include "../common/cbasetypes.h"
int inter_mercenary_sql_init(void);
void inter_mercenary_sql_final(void);
@@ -21,8 +17,5 @@ bool mercenary_owner_delete(uint32 char_id);
bool mapif_mercenary_delete(int merc_id);
-#ifdef __cplusplus
-}
-#endif
-#endif /* _INT_MERCENARY_SQL_H_ */
+#endif /* _INT_MERCENARY_HPP_ */
diff --git a/src/char/int_party.c b/src/char/int_party.cpp
similarity index 94%
rename from src/char/int_party.c
rename to src/char/int_party.cpp
index 6a61b2990ac..f3b1f2f8a21 100644
--- a/src/char/int_party.c
+++ b/src/char/int_party.cpp
@@ -1,6 +1,11 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "int_party.hpp"
+
+#include <stdlib.h>
+#include <string.h>
+
#include "../common/cbasetypes.h"
#include "../common/mmo.h"
#include "../common/malloc.h"
@@ -9,12 +14,10 @@
#include "../common/showmsg.h"
#include "../common/mapindex.h"
#include "../common/sql.h"
-#include "char.h"
-#include "char_mapif.h"
-#include "inter.h"
-#include "int_party.h"
-#include <stdlib.h>
+#include "char.hpp"
+#include "char_mapif.hpp"
+#include "inter.hpp"
struct party_data {
struct party party;
@@ -31,6 +34,7 @@ int party_check_empty(struct party_data *p);
int mapif_parse_PartyLeave(int fd, int party_id, uint32 account_id, uint32 char_id, char *name, enum e_party_member_withdraw type);
int party_check_exp_share(struct party_data *p);
int mapif_party_optionchanged(int fd,struct party *p, uint32 account_id, int flag);
+int party_check_family_share(struct party_data *p);
//Updates party's level range and unsets even share if broken.
static int int_party_check_lv(struct party_data *p) {
@@ -40,9 +44,9 @@ static int int_party_check_lv(struct party_data *p) {
p->max_lv = 0;
for(i=0;i<MAX_PARTY;i++){
/**
- * - If not online OR if it's a family party and this is the child (doesn't affect exp range)
+ * - If not online (doesn't affect exp range)
**/
- if(!p->party.member[i].online || p->party.member[i].char_id == p->family )
+ if (!p->party.member[i].online)
continue;
lv=p->party.member[i].lv;
@@ -58,7 +62,7 @@ static int int_party_check_lv(struct party_data *p) {
return 1;
}
//Calculates the state of a party.
-static void int_party_calc_state(struct party_data *p)
+void int_party_calc_state(struct party_data *p)
{
int i;
p->min_lv = UINT_MAX;
@@ -69,7 +73,8 @@ static void int_party_calc_state(struct party_data *p)
//Check party size
for(i=0;i<MAX_PARTY;i++){
- if (!p->party.member[i].lv) continue;
+ if (!p->party.member[i].lv)
+ continue;
p->size++;
if(p->party.member[i].online)
p->party.count++;
@@ -91,11 +96,9 @@ static void int_party_calc_state(struct party_data *p)
//max/min levels.
for(i=0;i<MAX_PARTY;i++){
unsigned int lv=p->party.member[i].lv;
- if (!lv) continue;
- if(p->party.member[i].online &&
- //On families, the kid is not counted towards exp share rules.
- p->party.member[i].char_id != p->family)
- {
+ if (!lv)
+ continue;
+ if (p->party.member[i].online) {
if( lv < p->min_lv ) p->min_lv=lv;
if( p->max_lv < lv ) p->max_lv=lv;
}
@@ -301,10 +304,45 @@ struct party_data* search_partyname(char* str)
return p;
}
+int party_check_family_share(struct party_data *p) {
+ int i;
+ unsigned short map = 0;
+ if (!p->family)
+ return 0;
+ for (i = 0; i < MAX_PARTY; i++) {
+ if (p->party.member[i].char_id == p->family) {
+ map = p->party.member[i].map;
+ break;
+ }
+ }
+
+ for (i = 0; i < MAX_PARTY; i++) {
+ struct party_member * mem = &(p->party.member[i]);
+ if (mem->lv == 0)
+ continue;
+ if (p->family == mem->char_id) {
+ continue;
+ }
+ if (mem->online == 0) {
+ //everyone should be online to share
+ return 0;
+ }
+ if (mem->map != map) {
+ //everyone should be on the same map
+ return 0;
+ }
+ if (mem->lv < 70) {
+ //parents must both be above 70
+ return 0;
+ }
+ }
+ return 1;
+}
+
// Returns whether this party can keep having exp share or not.
int party_check_exp_share(struct party_data *p)
{
- return (p->party.count < 2 || p->max_lv - p->min_lv <= party_share_level);
+ return (p->party.count < 2 || p->max_lv - p->min_lv <= party_share_level || party_check_family_share(p));
}
// Is there any member in the party?
@@ -347,7 +385,7 @@ int mapif_party_created(int fd,uint32 account_id,uint32 char_id,struct party *p)
}
//Party information not found
-static void mapif_party_noinfo(int fd, int party_id, uint32 char_id)
+void mapif_party_noinfo(int fd, int party_id, uint32 char_id)
{
WFIFOHEAD(fd, 12);
WFIFOW(fd,0) = 0x3821;
@@ -359,7 +397,7 @@ static void mapif_party_noinfo(int fd, int party_id, uint32 char_id)
}
//Digest party information
-static void mapif_party_info(int fd, struct party* p, uint32 char_id)
+void mapif_party_info(int fd, struct party* p, uint32 char_id)
{
unsigned char buf[8 + sizeof(struct party)];
WBUFW(buf,0) = 0x3821;
@@ -517,11 +555,10 @@ int mapif_parse_CreateParty(int fd, char *name, int item, int item2, struct part
}
// Party information request
-static void mapif_parse_PartyInfo(int fd, int party_id, uint32 char_id)
+void mapif_parse_PartyInfo(int fd, int party_id, uint32 char_id)
{
struct party_data *p;
p = inter_party_fromsql(party_id);
-
if (p)
mapif_party_info(fd, &p->party, char_id);
else
@@ -575,7 +612,8 @@ int mapif_parse_PartyChangeOption(int fd,int party_id,uint32 account_id,int exp,
if(!p)
return 0;
-
+ if (p->size == 2 || p->size == 3) //check family state. Also accept either of their parents.
+ int_party_calc_state(p);
p->party.exp=exp;
if( exp && !party_check_exp_share(p) ){
flag|=0x01;
@@ -692,6 +730,7 @@ int mapif_parse_PartyChangeMap(int fd, int party_id, uint32 account_id, uint32 c
if (p->party.member[i].map != map) {
p->party.member[i].map = map;
mapif_party_membermoved(&p->party, i);
+ int_party_check_lv(p);
}
return 0;
}
diff --git a/src/char/int_party.h b/src/char/int_party.hpp
similarity index 84%
rename from src/char/int_party.h
rename to src/char/int_party.hpp
index 2e2afeea135..f72aa7f815d 100644
--- a/src/char/int_party.h
+++ b/src/char/int_party.hpp
@@ -1,15 +1,13 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _INT_PARTY_SQL_H_
-#define _INT_PARTY_SQL_H_
+#ifndef _INT_PARTY_HPP_
+#define _INT_PARTY_HPP_
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "../common/cbasetypes.h"
//Party Flags on what to save/delete.
-enum {
+enum e_PartySaveWhatFlag {
PS_CREATE = 0x01, //Create a new party entry (index holds leader's info)
PS_BASIC = 0x02, //Update basic party info.
PS_LEADER = 0x04, //Update party's leader
@@ -18,7 +16,7 @@ enum {
PS_BREAK = 0x20, //Specify that this party must be deleted.
};
-struct party;
+//struct party;
int inter_party_parse_frommap(int fd);
int inter_party_sql_init(void);
@@ -28,8 +26,4 @@ int inter_party_charname_changed(int party_id, uint32 char_id, char *name);
int inter_party_CharOnline(uint32 char_id, int party_id);
int inter_party_CharOffline(uint32 char_id, int party_id);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _INT_PARTY_SQL_H_ */
+#endif /* _INT_PARTY_HPP_ */
diff --git a/src/char/int_pet.c b/src/char/int_pet.cpp
similarity index 99%
rename from src/char/int_pet.c
rename to src/char/int_pet.cpp
index 2299aad26b1..436ed549735 100644
--- a/src/char/int_pet.c
+++ b/src/char/int_pet.cpp
@@ -1,6 +1,11 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "int_pet.hpp"
+
+#include <stdlib.h>
+#include <string.h>
+
#include "../common/mmo.h"
#include "../common/malloc.h"
#include "../common/socket.h"
@@ -8,10 +13,9 @@
#include "../common/showmsg.h"
#include "../common/utils.h"
#include "../common/sql.h"
-#include "char.h"
-#include "inter.h"
-#include <stdlib.h>
+#include "char.hpp"
+#include "inter.hpp"
struct s_pet *pet_pt;
diff --git a/src/char/int_pet.h b/src/char/int_pet.hpp
similarity index 63%
rename from src/char/int_pet.h
rename to src/char/int_pet.hpp
index 11d08c0ea2a..5f92884bf02 100644
--- a/src/char/int_pet.h
+++ b/src/char/int_pet.hpp
@@ -1,26 +1,22 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _INT_PET_SQL_H_
-#define _INT_PET_SQL_H_
+#ifndef _INT_PET_HPP_
+#define _INT_PET_HPP_
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "../common/cbasetypes.h"
struct s_pet;
+int inter_pet_init(void);
void inter_pet_sql_final(void);
+int inter_pet_save(void);
int inter_pet_delete(int pet_id);
int inter_pet_parse_frommap(int fd);
int inter_pet_sql_init(void);
-//extern char pet_txt[256];
+ //extern char pet_txt[256];
int inter_pet_tosql(int pet_id, struct s_pet *p);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _INT_PET_SQL_H_ */
+#endif /* _INT_PET_HPP_ */
diff --git a/src/char/int_quest.c b/src/char/int_quest.cpp
similarity index 98%
rename from src/char/int_quest.c
rename to src/char/int_quest.cpp
index 8a98c9d7d97..37aebc38cec 100644
--- a/src/char/int_quest.c
+++ b/src/char/int_quest.cpp
@@ -1,17 +1,19 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "int_quest.hpp"
+
+#include <stdlib.h>
+#include <string.h>
+
#include "../common/mmo.h"
#include "../common/malloc.h"
#include "../common/socket.h"
#include "../common/strlib.h"
#include "../common/sql.h"
-#include "char.h"
-#include "inter.h"
-#include "int_quest.h"
-
-#include <stdlib.h>
+#include "char.hpp"
+#include "inter.hpp"
/**
* Loads the entire questlog for a character.
diff --git a/src/char/int_quest.h b/src/char/int_quest.hpp
similarity index 67%
rename from src/char/int_quest.h
rename to src/char/int_quest.hpp
index b0403f4361b..626e594232c 100644
--- a/src/char/int_quest.h
+++ b/src/char/int_quest.hpp
@@ -1,10 +1,10 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _QUEST_H_
-#define _QUEST_H_
+#ifndef _INT_QUEST_HPP_
+#define _INT_QUEST_HPP_
int inter_quest_parse_frommap(int fd);
-#endif
+#endif /* _INT_QUEST_HPP_ */
diff --git a/src/char/int_storage.c b/src/char/int_storage.cpp
similarity index 86%
rename from src/char/int_storage.c
rename to src/char/int_storage.cpp
index 99170dc87e3..24d7f42f28c 100644
--- a/src/char/int_storage.c
+++ b/src/char/int_storage.cpp
@@ -1,34 +1,28 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#pragma warning(disable:4800) //forcing value to bool
+#include "int_storage.hpp"
+
+#include <stdlib.h>
+#include <string.h>
+
#include "../common/malloc.h"
#include "../common/mmo.h"
#include "../common/showmsg.h"
#include "../common/socket.h"
#include "../common/strlib.h" // StringBuf
#include "../common/sql.h"
-#include "char.h"
-#include "inter.h"
-
-#include <stdlib.h>
-
-
-#define STORAGE_MEMINC 16
+#include "char.hpp"
+#include "inter.hpp"
/**
- * Check if sotrage ID is valid
+ * Check if storage ID is valid
* @param id Storage ID
* @return True:Valid, False:Invalid
**/
bool inter_premiumStorage_exists(uint8 id) {
- if (interserv_config.storages && interserv_config.storage_count) {
- int i;
- for (i = 0; i < interserv_config.storage_count; i++) {
- if (interserv_config.storages[i].id == id)
- return true;
- }
- }
- return false;
+ return interserv_config.storages.find(id) != interserv_config.storages.end();
}
/**
@@ -37,13 +31,8 @@ bool inter_premiumStorage_exists(uint8 id) {
* @return Max amount
**/
int inter_premiumStorage_getMax(uint8 id) {
- if (interserv_config.storages && interserv_config.storage_count) {
- int i;
- for (i = 0; i < interserv_config.storage_count; i++) {
- if (&interserv_config.storages[i] && interserv_config.storages[i].id == id)
- return interserv_config.storages[i].max_num;
- }
- }
+ if (inter_premiumStorage_exists(id))
+ return interserv_config.storages[id]->max_num;
return MAX_STORAGE;
}
@@ -53,13 +42,8 @@ int inter_premiumStorage_getMax(uint8 id) {
* @return Table name
**/
const char *inter_premiumStorage_getTableName(uint8 id) {
- if (interserv_config.storages && interserv_config.storage_count) {
- int i;
- for (i = 0; i < interserv_config.storage_count; i++) {
- if (&interserv_config.storages[i] && interserv_config.storages[i].id == id)
- return interserv_config.storages[i].table;
- }
- }
+ if (inter_premiumStorage_exists(id))
+ return interserv_config.storages[id]->table;
return schema_config.storage_db;
}
@@ -69,13 +53,8 @@ const char *inter_premiumStorage_getTableName(uint8 id) {
* @return printable name
**/
const char *inter_premiumStorage_getPrintableName(uint8 id) {
- if (interserv_config.storages && interserv_config.storage_count) {
- int i;
- for (i = 0; i < interserv_config.storage_count; i++) {
- if (&interserv_config.storages[i] && interserv_config.storages[i].id == id)
- return interserv_config.storages[i].name;
- }
- }
+ if (inter_premiumStorage_exists(id))
+ return interserv_config.storages[id]->name;
return "Storage";
}
@@ -85,7 +64,7 @@ const char *inter_premiumStorage_getPrintableName(uint8 id) {
* @param p: Inventory entries
* @return 0 if success, or error count
*/
-static int inventory_tosql(uint32 char_id, struct s_storage* p)
+int inventory_tosql(uint32 char_id, struct s_storage* p)
{
return char_memitemdata_to_sql(p->u.items_inventory, MAX_INVENTORY, char_id, TABLE_INVENTORY, p->stor_id);
}
@@ -96,7 +75,7 @@ static int inventory_tosql(uint32 char_id, struct s_storage* p)
* @param p: Storage entries
* @return 0 if success, or error count
*/
-static int storage_tosql(uint32 account_id, struct s_storage* p)
+int storage_tosql(uint32 account_id, struct s_storage* p)
{
return char_memitemdata_to_sql(p->u.items_storage, MAX_STORAGE, account_id, TABLE_STORAGE, p->stor_id);
}
@@ -107,7 +86,7 @@ static int storage_tosql(uint32 account_id, struct s_storage* p)
* @param p: Cart entries
* @return 0 if success, or error count
*/
-static int cart_tosql(uint32 char_id, struct s_storage* p)
+int cart_tosql(uint32 char_id, struct s_storage* p)
{
return char_memitemdata_to_sql(p->u.items_cart, MAX_CART, char_id, TABLE_CART, p->stor_id);
}
@@ -118,7 +97,7 @@ static int cart_tosql(uint32 char_id, struct s_storage* p)
* @param p: Inventory list to save the entries
* @return True if success, False if failed
*/
-static bool inventory_fromsql(uint32 char_id, struct s_storage* p)
+bool inventory_fromsql(uint32 char_id, struct s_storage* p)
{
return char_memitemdata_from_sql( p, MAX_INVENTORY, char_id, TABLE_INVENTORY, p->stor_id );
}
@@ -129,7 +108,7 @@ static bool inventory_fromsql(uint32 char_id, struct s_storage* p)
* @param p: Cart list to save the entries
* @return True if success, False if failed
*/
-static bool cart_fromsql(uint32 char_id, struct s_storage* p)
+bool cart_fromsql(uint32 char_id, struct s_storage* p)
{
return char_memitemdata_from_sql( p, MAX_CART, char_id, TABLE_CART, p->stor_id );
}
@@ -141,7 +120,7 @@ static bool cart_fromsql(uint32 char_id, struct s_storage* p)
* @param stor_id: Storage ID
* @return True if success, False if failed
*/
-static bool storage_fromsql(uint32 account_id, struct s_storage* p)
+bool storage_fromsql(uint32 account_id, struct s_storage* p)
{
return char_memitemdata_from_sql( p, MAX_STORAGE, account_id, TABLE_STORAGE, p->stor_id );
}
@@ -169,21 +148,19 @@ bool guild_storage_fromsql(int guild_id, struct s_storage* p)
return char_memitemdata_from_sql( p, MAX_GUILD_STORAGE, guild_id, TABLE_GUILD_STORAGE, p->stor_id );
}
-static void inter_storage_checkDB(void) {
- int i = 0;
+void inter_storage_checkDB(void) {
// Checking storage tables
- for (i = 0; i < interserv_config.storage_count; i++) {
- if (!&interserv_config.storages[i] || !interserv_config.storages[i].name || !interserv_config.storages[i].table || *interserv_config.storages[i].table == '\0')
- continue;
+ for (auto storage_table : interserv_config.storages) {
if (SQL_ERROR == Sql_Query(sql_handle, "SELECT `id`,`account_id`,`nameid`,`amount`,`equip`,`identify`,`refine`,"
"`attribute`,`card0`,`card1`,`card2`,`card3`,`option_id0`,`option_val0`,`option_parm0`,`option_id1`,`option_val1`,`option_parm1`,"
"`option_id2`,`option_val2`,`option_parm2`,`option_id3`,`option_val3`,`option_parm3`,`option_id4`,`option_val4`,`option_parm4`,"
"`expire_time`,`bound`,`unique_id`"
- " FROM `%s` LIMIT 1;", interserv_config.storages[i].table) ){
+ " FROM `%s` LIMIT 1;", storage_table.second->table)) {
Sql_ShowDebug(sql_handle);
+ }else{
+ Sql_FreeResult(sql_handle);
}
}
- Sql_FreeResult(sql_handle);
}
//---------------------------------------------------------
@@ -284,7 +261,7 @@ bool mapif_parse_SaveGuildStorage(int fd)
* IZ 0x3856 <account_id>.L <guild_id>.W
* Tells map-server if the process if complete, unlock the guild storage
*/
-static void mapif_itembound_ack(int fd, int account_id, int guild_id)
+void mapif_itembound_ack(int fd, int account_id, int guild_id)
{
WFIFOHEAD(fd,8);
WFIFOW(fd,0) = 0x3856;
@@ -306,7 +283,7 @@ static void mapif_itembound_ack(int fd, int account_id, int guild_id)
* @param count
* @author [Cydh]
*/
-static void mapif_itembound_store2gstorage(int fd, int guild_id, struct item items[], unsigned short count) {
+void mapif_itembound_store2gstorage(int fd, int guild_id, struct item items[], unsigned short count) {
int size = 8 + sizeof(struct item) * MAX_INVENTORY, i;
WFIFOHEAD(fd, size);
@@ -381,7 +358,7 @@ bool mapif_parse_itembound_retrieve(int fd)
memcpy(&items[count++], &item, sizeof(struct item));
Sql_FreeResult(sql_handle);
- ShowInfo("Found '"CL_WHITE"%d"CL_RESET"' guild bound item(s) from CID = "CL_WHITE"%d"CL_RESET", AID = %d, Guild ID = "CL_WHITE"%d"CL_RESET".\n", count, char_id, account_id, guild_id);
+ ShowInfo("Found '" CL_WHITE "%d" CL_RESET "' guild bound item(s) from CID = " CL_WHITE "%d" CL_RESET ", AID = %d, Guild ID = " CL_WHITE "%d" CL_RESET ".\n", count, char_id, account_id, guild_id);
if (!count) { //No items found - No need to continue
StringBuf_Destroy(&buf);
SqlStmt_Free(stmt);
@@ -393,7 +370,7 @@ bool mapif_parse_itembound_retrieve(int fd)
// Delete bound items from player's inventory
StringBuf_Clear(&buf);
- StringBuf_Printf(&buf, "DELETE FROM `%s` WHERE `bound` = %d",schema_config.inventory_db, BOUND_GUILD);
+ StringBuf_Printf(&buf, "DELETE FROM `%s` WHERE `char_id` = %d AND `bound` = %d",schema_config.inventory_db, char_id, BOUND_GUILD);
if( SQL_ERROR == SqlStmt_PrepareStr(stmt, StringBuf_Value(&buf)) ||
SQL_ERROR == SqlStmt_Execute(stmt) )
{
@@ -473,7 +450,7 @@ bool mapif_parse_itembound_retrieve(int fd)
* @param entries Inventory/cart/storage entries
* @param result
*/
-static void mapif_storage_data_loaded(int fd, uint32 account_id, char type, struct s_storage entries, bool result) {
+void mapif_storage_data_loaded(int fd, uint32 account_id, char type, struct s_storage entries, bool result) {
uint16 size = sizeof(struct s_storage) + 10;
WFIFOHEAD(fd, size);
diff --git a/src/char/int_storage.h b/src/char/int_storage.hpp
similarity index 76%
rename from src/char/int_storage.h
rename to src/char/int_storage.hpp
index bb7910b3aab..9a0ab0300e7 100644
--- a/src/char/int_storage.h
+++ b/src/char/int_storage.hpp
@@ -1,12 +1,10 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _INT_STORAGE_SQL_H_
-#define _INT_STORAGE_SQL_H_
+#ifndef _INT_STORAGE_HPP_
+#define _INT_STORAGE_HPP_
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "../common/cbasetypes.h"
struct s_storage;
@@ -22,8 +20,4 @@ bool inter_storage_parse_frommap(int fd);
bool guild_storage_tosql(int guild_id, struct s_storage *p);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _INT_STORAGE_SQL_H_ */
+#endif /* _INT_STORAGE_HPP_ */
diff --git a/src/char/inter.c b/src/char/inter.cpp
similarity index 85%
rename from src/char/inter.c
rename to src/char/inter.cpp
index 8252f7ca2ea..cf9b4b2de32 100644
--- a/src/char/inter.c
+++ b/src/char/inter.cpp
@@ -1,32 +1,39 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#include "../common/mmo.h"
+#include "inter.hpp"
+
+#include <string.h>
+#include <stdlib.h>
+#include <sys/stat.h> // for stat/lstat/fstat - [Dekamaster/Ultimate GM Tool]
+#include <yaml-cpp/yaml.h>
+#include <string>
+#include <vector>
+#include <stdlib.h>
+
+#include "../common/cbasetypes.h"
#include "../common/malloc.h"
#include "../common/strlib.h"
#include "../common/showmsg.h"
#include "../common/socket.h"
#include "../common/timer.h"
-#include "char.h"
-#include "char_logif.h"
-#include "char_mapif.h"
-#include "inter.h"
-#include "int_party.h"
-#include "int_guild.h"
-#include "int_storage.h"
-#include "int_pet.h"
-#include "int_homun.h"
-#include "int_mercenary.h"
-#include "int_mail.h"
-#include "int_auction.h"
-#include "int_quest.h"
-#include "int_elemental.h"
-#include "int_clan.h"
-
-#include <stdlib.h>
-
-#include <sys/stat.h> // for stat/lstat/fstat - [Dekamaster/Ultimate GM Tool]
+#include "char.hpp"
+#include "char_logif.hpp"
+#include "char_mapif.hpp"
+#include "inter.hpp"
+#include "int_party.hpp"
+#include "int_guild.hpp"
+#include "int_storage.hpp"
+#include "int_pet.hpp"
+#include "int_homun.hpp"
+#include "int_mercenary.hpp"
+#include "int_mail.hpp"
+#include "int_auction.hpp"
+#include "int_quest.hpp"
+#include "int_elemental.hpp"
+#include "int_clan.hpp"
+#include "int_achievement.hpp"
#define WISDATA_TTL (60*1000) //Wis data Time To Live (60 seconds)
#define WISDELLIST_MAX 256 // Number of elements in the list Delete data Wis
@@ -51,7 +58,7 @@ int inter_recv_packet_length[] = {
-1, 6,-1,-1, 55,19, 6,-1, 14,-1,-1,-1, 18,19,186,-1, // 3030-
-1, 9, 0, 0, 0, 0, 0, 0, 8, 6,11,10, 10,-1,6+NAME_LENGTH, 0, // 3040-
-1,-1,10,10, 0,-1,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 3050- Auction System [Zephyrus]
- 6,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 3060- Quest system [Kevin] [Inkfish]
+ 6,-1, 6,-1, 16+NAME_LENGTH+ACHIEVEMENT_NAME_LENGTH, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 3060- Quest system [Kevin] [Inkfish] / Achievements [Aleos]
-1,10, 6,-1, 0, 0, 0, 0, 0, 0, 0, 0, -1,10, 6,-1, // 3070- Mercenary packets [Zephyrus], Elemental packets [pakpil]
48,14,-1, 6, 0, 0, 0, 0, 0, 0,13,-1, 0, 0, 0, 0, // 3080- Pet System, Storage
-1,10,-1, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 3090- Homunculus packets [albator]
@@ -59,9 +66,9 @@ int inter_recv_packet_length[] = {
};
struct WisData {
- int id, fd, count, len;
+ int id, fd, count, len, gmlvl;
unsigned long tick;
- unsigned char src[NAME_LENGTH], dst[NAME_LENGTH], msg[512];
+ char src[NAME_LENGTH], dst[NAME_LENGTH], msg[512];
};
static DBMap* wis_db = NULL; // int wis_id -> struct WisData*
static int wis_dellist[WISDELLIST_MAX], wis_delnum;
@@ -344,7 +351,7 @@ void geoip_readdb(void){
geoip_cache = (unsigned char *) aMalloc(sizeof(unsigned char) * bufa.st_size);
if(fread(geoip_cache, sizeof(unsigned char), bufa.st_size, db) != bufa.st_size) { ShowError("geoip_cache reading didn't read all elements \n"); }
fclose(db);
- ShowStatus("Finished Reading "CL_GREEN"GeoIP"CL_RESET" Database.\n");
+ ShowStatus("Finished Reading " CL_GREEN "GeoIP" CL_RESET " Database.\n");
}
/* [Dekamaster/Nightroad] */
/* WHY NOT A DBMAP: There are millions of entries in GeoIP and it has its own algorithm to go quickly through them, a DBMap wouldn't be efficient */
@@ -406,7 +413,7 @@ void inter_to_fd(int fd, int u_fd, int aid, char* msg, ...) {
* @param acc_id : id of player found
* @param acc_name : name of player found
*/
-static void mapif_acc_info_ack(int fd, int u_fd, int acc_id, const char* acc_name){
+void mapif_acc_info_ack(int fd, int u_fd, int acc_id, const char* acc_name){
WFIFOHEAD(fd,10 + NAME_LENGTH);
WFIFOW(fd,0) = 0x3808;
WFIFOL(fd,2) = u_fd;
@@ -471,7 +478,7 @@ void mapif_parse_accinfo(int fd) {
}
/* it will only get here if we have a single match then ask login-server to fetch the `login` record */
- if (!account_id || chlogif_req_accinfo(fd, u_fd, u_aid, u_group, account_id, type) != 1) {
+ if (!account_id || chlogif_req_accinfo(fd, u_fd, u_aid, account_id, type) != 1) {
inter_to_fd(fd, u_fd, u_aid, (char *)msg_txt(213));
}
return;
@@ -482,7 +489,7 @@ void mapif_parse_accinfo(int fd) {
*/
void mapif_accinfo_ack(bool success, int map_fd, int u_fd, int u_aid, int account_id, int8 type,
int group_id, int logincount, int state, const char *email, const char *last_ip, const char *lastlogin,
- const char *birthdate, const char *user_pass, const char *pincode, const char *userid)
+ const char *birthdate, const char *userid)
{
if (map_fd <= 0 || !session_isActive(map_fd))
@@ -500,7 +507,6 @@ void mapif_accinfo_ack(bool success, int map_fd, int u_fd, int u_aid, int accoun
inter_to_fd(map_fd, u_fd, u_aid, (char *)msg_txt(217), account_id);
inter_to_fd(map_fd, u_fd, u_aid, (char *)msg_txt(218), userid, group_id, state);
- inter_to_fd(map_fd, u_fd, u_aid, (char *)msg_txt(219), user_pass[0] != '\0' ? user_pass : msg_txt(220), pincode[0] != '\0' ? msg_txt(220) : pincode);
inter_to_fd(map_fd, u_fd, u_aid, (char *)msg_txt(221), email, birthdate);
inter_to_fd(map_fd, u_fd, u_aid, (char *)msg_txt(222), last_ip, geoip_getcountry(str2ip(last_ip)));
inter_to_fd(map_fd, u_fd, u_aid, (char *)msg_txt(223), logincount, lastlogin);
@@ -766,7 +772,7 @@ int inter_accreg_fromsql(uint32 account_id, uint32 char_id, int fd, int type)
/*==========================================
* read config file
*------------------------------------------*/
-static int inter_config_read(const char* cfgName)
+int inter_config_read(const char* cfgName)
{
char line[1024];
FILE* fp;
@@ -803,7 +809,7 @@ static int inter_config_read(const char* cfgName)
else if(!strcmpi(w1,"log_inter"))
charserv_config.log_inter = atoi(w2);
else if(!strcmpi(w1,"inter_server_conf"))
- strcpy(interserv_config.cfgFile, w2);
+ interserv_config.cfgFile = w2;
else if(!strcmpi(w1,"import"))
inter_config_read(w2);
}
@@ -815,7 +821,7 @@ static int inter_config_read(const char* cfgName)
}
// Save interlog into sql
-int inter_log(char* fmt, ...)
+int inter_log(const char* fmt, ...)
{
char str[255];
char esc_str[sizeof(str)*2+1];// escaped str
@@ -832,85 +838,102 @@ int inter_log(char* fmt, ...)
return 0;
}
+void yaml_invalid_warning(const char* fmt, YAML::Node &node, std::string &file) {
+ YAML::Emitter out;
+ out << node;
+ ShowWarning(fmt, file.c_str());
+ ShowMessage("%s\n", out.c_str());
+}
+
/**
* Read inter config file
**/
-static void inter_config_readConf(void) {
- int count = 0;
- config_setting_t *config = NULL;
+void inter_config_readConf(void) {
+ std::vector<std::string> directories = { "conf/", "conf/import/" };
+ static const std::string file_name(interserv_config.cfgFile);
- if (conf_read_file(&interserv_config.cfg, interserv_config.cfgFile))
- return;
+ for (auto directory : directories) {
+ std::string current_file = directory + file_name;
+ YAML::Node config;
+ int count = 0;
- // Read storages
- config = config_lookup(&interserv_config.cfg, "storages");
- if (config && (count = config_setting_length(config))) {
- int i;
- for (i = 0; i < count; i++) {
- int id, max_num;
- const char *name, *tablename;
- struct s_storage_table table;
- config_setting_t *entry = config_setting_get_elem(config, i);
-
- if (!config_setting_lookup_int(entry, "id", &id)) {
- ShowConfigWarning(entry, "inter_config_readConf: Cannot find storage \"id\" in member %d", i);
- continue;
- }
+ try {
+ config = YAML::LoadFile(current_file);
+ }
+ catch (std::exception &e) {
+ ShowError("Cannot read storage definition file '" CL_WHITE "%s" CL_RESET "' (Caused by : " CL_WHITE "%s" CL_RESET ").\n", current_file.c_str(), e.what());
+ return;
+ }
- if (!config_setting_lookup_string(entry, "name", &name)) {
- ShowConfigWarning(entry, "inter_config_readConf: Cannot find storage \"name\" in member %d", i);
- continue;
- }
+ if (config["Storages"]) {
+ for (auto node : config["Storages"]) {
+ unsigned int id;
- if (!config_setting_lookup_string(entry, "table", &tablename)) {
- ShowConfigWarning(entry, "inter_config_readConf: Cannot find storage \"table\" in member %d", i);
- continue;
- }
+ if (!node["ID"]) {
+ yaml_invalid_warning("inter_config_readConf: Storage definition with no ID field in '" CL_WHITE "%s" CL_RESET "', skipping.\n", node, current_file);
+ continue;
+ }
- if (!config_setting_lookup_int(entry, "max", &max_num))
- max_num = MAX_STORAGE;
- else if (max_num > MAX_STORAGE) {
- ShowConfigWarning(entry, "Storage \"%s\" has \"max\" %d, max is MAX_STORAGE (%d)!\n", name, max_num, MAX_STORAGE);
- max_num = MAX_STORAGE;
- }
+ try {
+ id = node["ID"].as<unsigned int>();
+ }
+ catch (std::exception) {
+ yaml_invalid_warning("inter_config_readConf: Storage definition with invalid ID field in '" CL_WHITE "%s" CL_RESET "', skipping.\n", node, current_file);
+ continue;
+ }
+
+ if( id > UINT8_MAX ){
+ yaml_invalid_warning("inter_config_readConf: Storage definition with invalid ID field in '" CL_WHITE "%s" CL_RESET "', skipping.\n", node, current_file);
+ continue;
+ }
- memset(&table, 0, sizeof(struct s_storage_table));
+ bool existing = inter_premiumStorage_exists(id);
+ auto storage_table = existing ? interserv_config.storages[id] : std::make_shared<s_storage_table>();
- RECREATE(interserv_config.storages, struct s_storage_table, interserv_config.storage_count+1);
- interserv_config.storages[interserv_config.storage_count].id = id;
- safestrncpy(interserv_config.storages[interserv_config.storage_count].name, name, NAME_LENGTH);
- safestrncpy(interserv_config.storages[interserv_config.storage_count].table, tablename, DB_NAME_LEN);
- interserv_config.storages[interserv_config.storage_count].max_num = max_num;
- interserv_config.storage_count++;
+ if (!existing && (!node["Name"] || !node["Table"])) {
+ yaml_invalid_warning("inter_config_readConf: Invalid storage definition in '" CL_WHITE "%s" CL_RESET "'.\n", node, current_file);
+ continue;
+ }
+
+ if (node["Name"])
+ safestrncpy(storage_table->name, node["Name"].as<std::string>().c_str(), NAME_LENGTH);
+ if(node["Table"])
+ safestrncpy(storage_table->table, node["Table"].as<std::string>().c_str(), DB_NAME_LEN);
+ if (node["Max"]) {
+ try {
+ storage_table->max_num = node["Max"].as<uint16>();
+ }
+ catch (std::exception) {
+ yaml_invalid_warning("inter_config_readConf: Storage definition with invalid Max field in '" CL_WHITE "%s" CL_RESET "', skipping.\n", node, current_file);
+ continue;
+ }
+ }
+ else if (!existing)
+ storage_table->max_num = MAX_STORAGE;
+
+ if (!existing) {
+ storage_table->id = (uint8)id;
+ interserv_config.storages[id] = storage_table;
+ }
+
+ count++;
+ }
}
+ ShowStatus("Done reading '" CL_WHITE "%d" CL_RESET "' storage information in '" CL_WHITE "%s" CL_RESET "'\n", count, current_file.c_str());
}
-
- ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' storage informations in '"CL_WHITE"%s"CL_RESET"'\n", interserv_config.storage_count, interserv_config.cfgFile);
}
void inter_config_finalConf(void) {
- if (interserv_config.storages)
- aFree(interserv_config.storages);
- interserv_config.storages = NULL;
- interserv_config.storage_count = 0;
-
- config_destroy(&interserv_config.cfg);
}
-static void inter_config_defaults(void) {
- interserv_config.storage_count = 0;
- interserv_config.storages = NULL;
-
- safestrncpy(interserv_config.cfgFile, "conf/inter_server.conf", sizeof(interserv_config.cfgFile));
+void inter_config_defaults(void) {
+ interserv_config.cfgFile = "inter_server.yml";
}
// initialize
int inter_init_sql(const char *file)
{
- //int i;
-
-
inter_config_defaults();
inter_config_read(file);
@@ -976,15 +999,15 @@ void inter_final(void)
* @param fd
**/
void inter_Storage_sendInfo(int fd) {
- int size = sizeof(struct s_storage_table), len = 4 + interserv_config.storage_count * size, i = 0;
+ int size = sizeof(struct s_storage_table), len = 4 + interserv_config.storages.size() * size, offset;
// Send storage table information
WFIFOHEAD(fd, len);
WFIFOW(fd, 0) = 0x388c;
WFIFOW(fd, 2) = len;
- for (i = 0; i < interserv_config.storage_count; i++) {
- if (!&interserv_config.storages[i] || !interserv_config.storages[i].name)
- continue;
- memcpy(WFIFOP(fd, 4 + size*i), &interserv_config.storages[i], size);
+ offset = 4;
+ for (auto storage : interserv_config.storages) {
+ memcpy(WFIFOP(fd, offset), storage.second.get(), size);
+ offset += size;
}
WFIFOSET(fd, len);
}
@@ -1021,31 +1044,22 @@ int mapif_broadcast(unsigned char *mes, int len, unsigned long fontColor, short
int mapif_wis_message(struct WisData *wd)
{
unsigned char buf[2048];
- if (wd->len > 2047-56) wd->len = 2047-56; //Force it to fit to avoid crashes. [Skotlex]
+ int headersize = 12 + 2 * NAME_LENGTH;
+
+ if (wd->len > 2047-headersize) wd->len = 2047-headersize; //Force it to fit to avoid crashes. [Skotlex]
WBUFW(buf, 0) = 0x3801;
- WBUFW(buf, 2) = 56 +wd->len;
+ WBUFW(buf, 2) = headersize+wd->len;
WBUFL(buf, 4) = wd->id;
- memcpy(WBUFP(buf, 8), wd->src, NAME_LENGTH);
- memcpy(WBUFP(buf,32), wd->dst, NAME_LENGTH);
- memcpy(WBUFP(buf,56), wd->msg, wd->len);
+ WBUFL(buf, 8) = wd->gmlvl;
+ safestrncpy(WBUFCP(buf,12), wd->src, NAME_LENGTH);
+ safestrncpy(WBUFCP(buf,12 + NAME_LENGTH), wd->dst, NAME_LENGTH);
+ safestrncpy(WBUFCP(buf,12 + 2*NAME_LENGTH), wd->msg, wd->len);
wd->count = chmapif_sendall(buf,WBUFW(buf,2));
return 0;
}
-// Wis sending result
-int mapif_wis_end(struct WisData *wd, int flag)
-{
- unsigned char buf[27];
-
- WBUFW(buf, 0)=0x3802;
- memcpy(WBUFP(buf, 2),wd->src,24);
- WBUFB(buf,26)=flag;
- chmapif_send(wd->fd,buf,27);
- return 0;
-}
-
// Send the requested account_reg
int mapif_account_reg_reply(int fd, uint32 account_id, uint32 char_id, int type)
{
@@ -1098,7 +1112,7 @@ int check_ttl_wisdata(void)
struct WisData *wd = (struct WisData*)idb_get(wis_db, wis_dellist[i]);
ShowWarning("inter: wis data id=%d time out : from %s to %s\n", wd->id, wd->src, wd->dst);
// removed. not send information after a timeout. Just no answer for the player
- //mapif_wis_end(wd, 1); // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
+ //mapif_wis_reply(wd->fd, wd->src, 1); // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
idb_remove(wis_db, wd->id);
}
} while(wis_delnum >= WISDELLIST_MAX);
@@ -1132,6 +1146,17 @@ int mapif_parse_broadcast_item(int fd) {
return 0;
}
+// Wis sending result
+// flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
+int mapif_wis_reply( int mapserver_fd, char* target, uint8 flag ){
+ unsigned char buf[27];
+
+ WBUFW(buf, 0) = 0x3802;
+ safestrncpy(WBUFCP(buf, 2), target, NAME_LENGTH);
+ WBUFB(buf,26) = flag;
+
+ return chmapif_send(mapserver_fd, buf, 27);
+}
// Wisp/page request to send
int mapif_parse_WisRequest(int fd)
@@ -1141,19 +1166,20 @@ int mapif_parse_WisRequest(int fd)
char esc_name[NAME_LENGTH*2+1];// escaped name
char* data;
size_t len;
+ int headersize = 8+2*NAME_LENGTH;
if ( fd <= 0 ) {return 0;} // check if we have a valid fd
- if (RFIFOW(fd,2)-52 >= sizeof(wd->msg)) {
+ if (RFIFOW(fd,2)-headersize >= sizeof(wd->msg)) {
ShowWarning("inter: Wis message size too long.\n");
return 0;
- } else if (RFIFOW(fd,2)-52 <= 0) { // normaly, impossible, but who knows...
+ } else if (RFIFOW(fd,2)-headersize <= 0) { // normaly, impossible, but who knows...
ShowError("inter: Wis message doesn't exist.\n");
return 0;
}
- safestrncpy(name, RFIFOCP(fd,28), NAME_LENGTH); //Received name may be too large and not contain \0! [Skotlex]
+ safestrncpy(name, RFIFOCP(fd,8+NAME_LENGTH), NAME_LENGTH); //Received name may be too large and not contain \0! [Skotlex]
Sql_EscapeStringLen(sql_handle, esc_name, name, strnlen(name, NAME_LENGTH));
if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `name` FROM `%s` WHERE `name`='%s'", schema_config.char_db, esc_name) )
@@ -1162,11 +1188,7 @@ int mapif_parse_WisRequest(int fd)
// search if character exists before to ask all map-servers
if( SQL_SUCCESS != Sql_NextRow(sql_handle) )
{
- unsigned char buf[27];
- WBUFW(buf, 0) = 0x3802;
- memcpy(WBUFP(buf, 2), RFIFOP(fd, 4), NAME_LENGTH);
- WBUFB(buf,26) = 1; // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
- chmapif_send(fd, buf, 27);
+ mapif_wis_reply(fd, RFIFOCP(fd, 8), 1);
}
else
{// Character exists. So, ask all map-servers
@@ -1175,13 +1197,9 @@ int mapif_parse_WisRequest(int fd)
memset(name, 0, NAME_LENGTH);
memcpy(name, data, zmin(len, NAME_LENGTH));
// if source is destination, don't ask other servers.
- if( strncmp(RFIFOCP(fd,4), name, NAME_LENGTH) == 0 )
+ if( strncmp(RFIFOCP(fd,8), name, NAME_LENGTH) == 0 )
{
- uint8 buf[27];
- WBUFW(buf, 0) = 0x3802;
- memcpy(WBUFP(buf, 2), RFIFOP(fd, 4), NAME_LENGTH);
- WBUFB(buf,26) = 1; // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
- chmapif_send(fd, buf, 27);
+ mapif_wis_reply(fd, RFIFOCP(fd, 8), 1);
}
else
{
@@ -1194,10 +1212,11 @@ int mapif_parse_WisRequest(int fd)
wd->id = ++wisid;
wd->fd = fd;
- wd->len= RFIFOW(fd,2)-52;
- memcpy(wd->src, RFIFOP(fd, 4), NAME_LENGTH);
- memcpy(wd->dst, RFIFOP(fd,28), NAME_LENGTH);
- memcpy(wd->msg, RFIFOP(fd,52), wd->len);
+ wd->len= RFIFOW(fd,2)-headersize;
+ wd->gmlvl = RFIFOL(fd,4);
+ safestrncpy(wd->src, RFIFOCP(fd,8), NAME_LENGTH);
+ safestrncpy(wd->dst, RFIFOCP(fd,8+NAME_LENGTH), NAME_LENGTH);
+ safestrncpy(wd->msg, RFIFOCP(fd,8+2*NAME_LENGTH), wd->len);
wd->tick = gettick();
idb_put(wis_db, wd->id, wd);
mapif_wis_message(wd);
@@ -1212,7 +1231,8 @@ int mapif_parse_WisRequest(int fd)
// Wisp/page transmission result
int mapif_parse_WisReply(int fd)
{
- int id, flag;
+ int id;
+ uint8 flag;
struct WisData *wd;
id = RFIFOL(fd,2);
@@ -1222,7 +1242,7 @@ int mapif_parse_WisReply(int fd)
return 0; // This wisp was probably suppress before, because it was timeout of because of target was found on another map-server
if ((--wd->count) <= 0 || flag != 1) {
- mapif_wis_end(wd, flag); // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
+ mapif_wis_reply(wd->fd, wd->src, flag); // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
idb_remove(wis_db, id);
}
@@ -1248,37 +1268,44 @@ int mapif_parse_Registry(int fd)
if( count ) {
int cursor = 14, i;
- char key[32], sval[254];
bool isLoginActive = session_isActive(login_fd);
if( isLoginActive )
chlogif_upd_global_accreg(account_id,char_id);
for(i = 0; i < count; i++) {
- unsigned int index;
- safestrncpy(key, RFIFOCP(fd, cursor + 1), RFIFOB(fd, cursor));
- cursor += RFIFOB(fd, cursor) + 1;
+ size_t lenkey = RFIFOB( fd, cursor );
+ const char* src_key= RFIFOCP(fd, cursor + 1);
+ std::string key( src_key, lenkey );
+ cursor += lenkey + 1;
- index = RFIFOL(fd, cursor);
+ unsigned int index = RFIFOL(fd, cursor);
cursor += 4;
switch (RFIFOB(fd, cursor++)) {
// int
case 0:
- inter_savereg(account_id,char_id,key,index,RFIFOL(fd, cursor),false);
+ {
+ intptr_t lVal = RFIFOL( fd, cursor );
+ inter_savereg( account_id, char_id, key.c_str(), index, lVal, false );
cursor += 4;
break;
+ }
case 1:
- inter_savereg(account_id,char_id,key,index,0,false);
+ inter_savereg(account_id,char_id,key.c_str(),index,0,false);
break;
// str
case 2:
- safestrncpy(sval, RFIFOCP(fd, cursor + 1), RFIFOB(fd, cursor));
- cursor += RFIFOB(fd, cursor) + 1;
- inter_savereg(account_id,char_id,key,index,(intptr_t)sval,true);
+ {
+ size_t len_val = RFIFOB( fd, cursor );
+ const char* src_val= RFIFOCP(fd, cursor + 1);
+ std::string sval( src_val, len_val );
+ cursor += len_val + 1;
+ inter_savereg( account_id, char_id, key.c_str(), index, (intptr_t)sval.c_str(), true );
break;
+ }
case 3:
- inter_savereg(account_id,char_id,key,index,0,true);
+ inter_savereg(account_id,char_id,key.c_str(),index,0,true);
break;
default:
ShowError("mapif_parse_Registry: unknown type %d\n",RFIFOB(fd, cursor - 1));
@@ -1305,7 +1332,7 @@ int mapif_parse_RegistryRequest(int fd)
return 1;
}
-static void mapif_namechange_ack(int fd, uint32 account_id, uint32 char_id, int type, int flag, char *name)
+void mapif_namechange_ack(int fd, uint32 account_id, uint32 char_id, int type, int flag, char *name)
{
WFIFOHEAD(fd, NAME_LENGTH+13);
WFIFOW(fd, 0) = 0x3806;
@@ -1409,6 +1436,7 @@ int inter_parse_frommap(int fd)
|| inter_auction_parse_frommap(fd)
|| inter_quest_parse_frommap(fd)
|| inter_clan_parse_frommap(fd)
+ || inter_achievement_parse_frommap(fd)
)
break;
else
diff --git a/src/char/inter.h b/src/char/inter.hpp
similarity index 64%
rename from src/char/inter.h
rename to src/char/inter.hpp
index e437cd710ef..130dcec3985 100644
--- a/src/char/inter.h
+++ b/src/char/inter.hpp
@@ -1,22 +1,20 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _INTER_SQL_H_
-#define _INTER_SQL_H_
+#ifndef _INTER_HPP_
+#define _INTER_HPP_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "../common/conf.h"
-#include "../common/mmo.h"
+#include "../common/cbasetypes.h"
#include "../common/sql.h"
+#include <memory>
+#include <string>
+#include <unordered_map>
+
+struct s_storage_table;
struct Inter_Config {
- char cfgFile[128]; ///< Inter-Config file
- config_t cfg; ///< Config
- struct s_storage_table *storages; ///< Storage name & table information
- uint8 storage_count; ///< Number of available storage
+ std::string cfgFile; ///< Inter-Config file
+ std::unordered_map< uint8, std::shared_ptr<s_storage_table> > storages; ///< Storage name & table information
};
extern struct Inter_Config interserv_config;
@@ -28,9 +26,9 @@ int inter_mapif_init(int fd);
int mapif_disconnectplayer(int fd, uint32 account_id, uint32 char_id, int reason);
void mapif_accinfo_ack(bool success, int map_fd, int u_fd, int u_aid, int account_id, int8 type,
int group_id, int logincount, int state, const char *email, const char *last_ip, const char *lastlogin,
- const char *birthdate, const char *user_pass, const char *pincode, const char *userid);
+ const char *birthdate, const char *userid);
-int inter_log(char *fmt,...);
+int inter_log(const char *fmt,...);
#define inter_cfgName "conf/inter_athena.conf"
@@ -42,8 +40,4 @@ extern Sql* lsql_handle;
void inter_savereg(uint32 account_id, uint32 char_id, const char *key, unsigned int index, intptr_t val, bool is_string);
int inter_accreg_fromsql(uint32 account_id, uint32 char_id, int fd, int type);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _INTER_SQL_H_ */
+#endif /* _INTER_HPP_ */
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index adc828a5833..d9164f0409e 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -1,9 +1,20 @@
#
# Create svnversion.h
+# tbd, could be rename version.h
#
message( STATUS "Creating svnversion.h" )
-if( SVNVERSION )
+if(GIT_VERSION)
+ # those 2 was done in parent to produce this
+ #include(GetGitVersion)
+ #get_git_version()
+ string(SUBSTRING ${GIT_VERSION} 0 10 SHORT_GIT_VERSION)
+ string(SUBSTRING ${GIT_HEAD_VERSION} 0 10 SHORT_GIT_HEAD_VERSION)
+ string(CONCAT GIT_STR_VERSIONS ${SHORT_GIT_VERSION} "_" ${SHORT_GIT_HEAD_VERSION})
+ #message( STATUS "git version=${GIT_STR_VERSIONS}" )
+ file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h
+ "#ifndef SVNVERSION\n#define SVNVERSION ${GIT_STR_VERSIONS}\n#endif\n" )
+elseif( SVNVERSION )
file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h
"#ifndef SVNVERSION\n#define SVNVERSION ${SVNVERSION}\n#endif\n" )
else()
@@ -25,6 +36,7 @@ message( STATUS "Creating svnversion.h - done" )
#
set( COMMON_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}"
CACHE PATH "common source directory" )
+#message( STATUS "DEBUG COMMON_SOURCE_DIR=${COMMON_SOURCE_DIR}" )
mark_as_advanced( COMMON_SOURCE_DIR )
set( COMMON_ALL_HEADERS
@@ -42,7 +54,7 @@ set( COMMON_MINI_HEADERS
${LIBCONFIG_HEADERS} # needed by showmsg.h
CACHE INTERNAL "" )
set( COMMON_MINI_SOURCES
- "${COMMON_SOURCE_DIR}/core.c"
+ "${COMMON_SOURCE_DIR}/core.cpp"
"${COMMON_SOURCE_DIR}/malloc.c"
"${COMMON_SOURCE_DIR}/showmsg.c"
"${COMMON_SOURCE_DIR}/strlib.c"
@@ -83,11 +95,13 @@ set( COMMON_BASE_HEADERS
"${COMMON_SOURCE_DIR}/mempool.h"
"${COMMON_SOURCE_DIR}/msg_conf.h"
"${COMMON_SOURCE_DIR}/cli.h"
+ "${COMMON_SOURCE_DIR}/yamlwrapper.h"
+ "${COMMON_SOURCE_DIR}/utilities.hpp"
${LIBCONFIG_HEADERS} # needed by conf.h/showmsg.h
CACHE INTERNAL "common_base headers" )
set( COMMON_BASE_SOURCES
"${COMMON_SOURCE_DIR}/conf.c"
- "${COMMON_SOURCE_DIR}/core.c"
+ "${COMMON_SOURCE_DIR}/core.cpp"
"${COMMON_SOURCE_DIR}/db.c"
"${COMMON_SOURCE_DIR}/des.c"
"${COMMON_SOURCE_DIR}/ers.c"
@@ -108,24 +122,30 @@ set( COMMON_BASE_SOURCES
"${COMMON_SOURCE_DIR}/raconf.c"
"${COMMON_SOURCE_DIR}/msg_conf.c"
"${COMMON_SOURCE_DIR}/cli.c"
+ "${COMMON_SOURCE_DIR}/yamlwrapper.cpp"
+ "${COMMON_SOURCE_DIR}/utilities.cpp"
${LIBCONFIG_SOURCES} # needed by conf.c/showmsg.c
CACHE INTERNAL "common_base sources" )
set( COMMON_BASE_INCLUDE_DIRS
${LIBCONFIG_INCLUDE_DIRS}
+ ${YAML_INCLUDE_DIRS}
CACHE INTERNAL "common_base include dirs" )
set( COMMON_BASE_DEFINITIONS
${LIBCONFIG_DEFINITIONS}
CACHE INTERNAL "common_base definitions" )
-set( LIBRARIES ${GLOBAL_LIBRARIES} ${ZLIB_LIBRARIES} )
-set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${MT19937AR_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ${COMMON_BASE_INCLUDE_DIRS} )
+set( LIBRARIES ${GLOBAL_LIBRARIES} ${ZLIB_LIBRARIES} yaml-cpp )
+set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${YAML_INCLUDE_DIRS} ${MT19937AR_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ${COMMON_BASE_INCLUDE_DIRS}} )
set( DEFINITIONS "${GLOBAL_DEFINITIONS} ${COMMON_BASE_DEFINITIONS}" )
set( SOURCE_FILES ${MT19937AR_HEADERS} ${MT19937AR_SOURCES} ${COMMON_BASE_HEADERS} ${COMMON_BASE_SOURCES} )
source_group( mt19937ar FILES ${MT19937AR_HEADERS} ${MT19937AR_SOURCES} )
source_group( common FILES ${COMMON_BASE_HEADERS} ${COMMON_BASE_SOURCES} )
+
add_library( common_base ${SOURCE_FILES} )
+#message( STATUS "common_base LIBRARIES=${LIBRARIES}, DEFINITIONS=${DEFINITIONS}")
target_link_libraries( common_base ${LIBRARIES} )
set_target_properties( common_base PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" )
include_directories( ${INCLUDE_DIRS} )
+
set( HAVE_common_base ON CACHE INTERNAL "" )
set( TARGET_LIST ${TARGET_LIST} common_base CACHE INTERNAL "" )
message( STATUS "Creating target common_base - done" )
@@ -147,17 +167,20 @@ set( COMMON_HEADERS
set( COMMON_SOURCES
"${CMAKE_CURRENT_SOURCE_DIR}/sql.c"
CACHE INTERNAL "common sources" )
-set( DEPENDENCIES common_base )
+set( DEPENDENCIES common_base yaml-cpp )
set( LIBRARIES ${GLOBAL_LIBRARIES} ${MYSQL_LIBRARIES} )
set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${MYSQL_INCLUDE_DIRS} )
set( DEFINITIONS "${GLOBAL_DEFINITIONS}" )
set( SOURCE_FILES ${COMMON_HEADERS} ${COMMON_SOURCES} )
source_group( common FILES ${COMMON_HEADERS} ${COMMON_SOURCES} )
+
add_library( common ${SOURCE_FILES} )
+#message( STATUS "common LIBRARIES=${LIBRARIES}, DEPENDENCIES=${DEPENDENCIES} DEFINITIONS=${DEFINITIONS}")
add_dependencies( common ${DEPENDENCIES} )
target_link_libraries( common ${LIBRARIES} ${DEPENDENCIES} )
set_target_properties( common PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" )
-include_directories( ${INCLUDE_DIRS} )
+include_directories( ${INCLUDE_DIRS} ${YAML_INCLUDE_DIRS} )
+
set( HAVE_common ON CACHE INTERNAL "" )
set( TARGET_LIST ${TARGET_LIST} common CACHE INTERNAL "" )
message( STATUS "Creating target common - done" )
diff --git a/src/common/Makefile.in b/src/common/Makefile.in
index 08791a6a6b7..d36c795c2f3 100644
--- a/src/common/Makefile.in
+++ b/src/common/Makefile.in
@@ -1,10 +1,11 @@
#COMMON_OBJ = $(ls *.c | grep -viw sql.c | sed -e "s/\.c/\.o/g")
-COMMON_OBJ = core.o socket.o timer.o db.o nullpo.o malloc.o showmsg.o strlib.o utils.o \
+COMMON_OBJ = core.o socket.o timer.o db.o nullpo.o malloc.o showmsg.o strlib.o utils.o utilities.o \
grfio.o mapindex.o ers.o md5calc.o minicore.o minisocket.o minimalloc.o random.o des.o \
- conf.o thread.o mutex.o raconf.o mempool.o msg_conf.o cli.o sql.o
+ conf.o thread.o mutex.o raconf.o mempool.o msg_conf.o cli.o sql.o yamlwrapper.o
COMMON_DIR_OBJ = $(COMMON_OBJ:%=obj/%)
COMMON_H = $(shell ls ../common/*.h)
+COMMON_H += $(shell ls ../common/*.hpp)
COMMON_AR = obj/common.a
MT19937AR_OBJ = ../../3rdparty/mt19937ar/mt19937ar.o
@@ -15,6 +16,12 @@ LIBCONFIG_H = $(shell ls ../../3rdparty/libconfig/*.h)
LIBCONFIG_AR = ../../3rdparty/libconfig/obj/libconfig.a
LIBCONFIG_INCLUDE = -I../../3rdparty/libconfig
+YAML_CPP_OBJ = $(shell find ../../3rdparty/yaml-cpp/ -type f -name "*.cpp" | sed -e "s/\.cpp/\.o/g" )
+YAML_CPP_DIR_OBJ = $(YAML_CPP_OBJ:%=obj/%)
+YAML_CPP_AR = ../../3rdparty/yaml-cpp/obj/yaml-cpp.a
+YAML_CPP_H = $(shell find ../../3rdparty/yaml-cpp/ -type f -name "*.h")
+YAML_CPP_INCLUDE = -I../../3rdparty/yaml-cpp/include
+
HAVE_MYSQL=@HAVE_MYSQL@
ifeq ($(HAVE_MYSQL),yes)
SERVER_DEPENDS=common
@@ -23,8 +30,6 @@ else
endif
ALL_DEPENDS=server
-CXXFLAG =-std=c++11
-
@SET_MAKE@
#####################################################################
@@ -59,23 +64,23 @@ $(COMMON_AR): $(COMMON_DIR_OBJ)
@echo " AR $@"
@@AR@ rcs $(COMMON_AR) $(COMMON_DIR_OBJ)
-common: obj $(COMMON_DIR_OBJ) $(MT19937AR_OBJ) $(LIBCONFIG_AR) $(COMMON_AR)
+common: obj $(COMMON_DIR_OBJ) $(MT19937AR_OBJ) $(LIBCONFIG_AR) $(YAML_CPP_AR) $(COMMON_AR)
-obj/%.o: %.c $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H)
+obj/%.o: %.c $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H) $(YAML_CPP_H)
@echo " CC $<"
- @@CC@ @CFLAGS_AR@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
+ @@CC@ @CFLAGS_AR@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) $(YAML_CPP_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
-obj/%.o: %.cpp $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H)
+obj/%.o: %.cpp $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H) $(YAML_CPP_H)
@echo " CXX $<"
- @@CXX@ $(CXXFLAG) @CFLAGS_AR@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
+ @@CXX@ @CXXFLAGS@ @CFLAGS_AR@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) $(YAML_CPP_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
-obj/mini%.o: %.c $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H)
+obj/mini%.o: %.c $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H) $(YAML_CPP_H)
@echo " CC $<"
- @@CC@ @CFLAGS_AR@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) @MYSQL_CFLAGS@ -DMINICORE @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
+ @@CC@ @CFLAGS_AR@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) $(YAML_CPP_INCLUDE) @MYSQL_CFLAGS@ -DMINICORE @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
-obj/mini%.o: %.cpp $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H)
+obj/mini%.o: %.cpp $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H) $(YAML_CPP_H)
@echo " CXX $<"
- @@CXX@ $(CXXFLAG) @CFLAGS_AR@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) @MYSQL_CFLAGS@ -DMINICORE @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
+ @@CXX@ @CXXFLAGS@ @CFLAGS_AR@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) $(YAML_CPP_INCLUDE) @MYSQL_CFLAGS@ -DMINICORE @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
# missing object files
$(MT19937AR_OBJ):
@@ -83,3 +88,7 @@ $(MT19937AR_OBJ):
$(LIBCONFIG_AR):
@$(MAKE) -C ../../3rdparty/libconfig
+
+$(YAML_CPP_AR):
+ @$(MAKE) -C ../../3rdparty/yaml-cpp
+
diff --git a/src/common/atomic.h b/src/common/atomic.h
index 73852c9639b..3412c6db9c5 100644
--- a/src/common/atomic.h
+++ b/src/common/atomic.h
@@ -17,10 +17,10 @@
#include "cbasetypes.h"
#if defined(_MSC_VER)
-#include "winapi.h"
+#include "winapi.hpp"
-// This checks if C/C++ Compiler Version is 18.00
-#if _MSC_VER < 1800
+// This checks if C/C++ Compiler Version is 18.00 or Windows is older than Vista
+#if _MSC_VER < 1800 || WINVER < _WIN32_WINNT_VISTA
#if !defined(_M_X64)
// When compiling for windows 32bit, the 8byte interlocked operations are not provided by microsoft
diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h
index a2c06e84933..2ad5fe159b2 100644
--- a/src/common/cbasetypes.h
+++ b/src/common/cbasetypes.h
@@ -249,7 +249,9 @@ typedef uintptr_t uintptr;
// keyword replacement
#ifdef _MSC_VER
// For MSVC (windows)
+#ifndef __cplusplus
#define inline __inline
+#endif
#define forceinline __forceinline
#define ra_align(n) __declspec(align(n))
#define _chdir chdir
@@ -277,16 +279,17 @@ typedef char bool;
//////////////////////////////////////////////////////////////////////////
// macro tools
-#ifdef swap // just to be sure
-#undef swap
+#ifdef SWAP // just to be sure
+#undef SWAP
#endif
// hmm only ints?
-//#define swap(a,b) { int temp=a; a=b; b=temp;}
+//#define SWAP(a,b) { int temp=a; a=b; b=temp;}
// if using macros then something that is type independent
-//#define swap(a,b) ((a == b) || ((a ^= b), (b ^= a), (a ^= b)))
+//#define SWAP(a,b) ((a == b) || ((a ^= b), (b ^= a), (a ^= b)))
// Avoid "value computed is not used" warning and generates the same assembly code
-#define swap(a,b) if (a != b) ((a ^= b), (b ^= a), (a ^= b))
-#define swap_ptr(a,b) if ((a) != (b)) ((a) = (void*)((intptr_t)(a) ^ (intptr_t)(b)), (b) = (void*)((intptr_t)(a) ^ (intptr_t)(b)), (a) = (void*)((intptr_t)(a) ^ (intptr_t)(b)))
+#define SWAP(a,b) if (a != b) ((a ^= b), (b ^= a), (a ^= b))
+#define swap_ptrcast(c,a,b) if ((a) != (b)) ((a) = static_cast<c>((void*)((intptr_t)(a) ^ (intptr_t)(b))), (b) = static_cast<c>((void*)((intptr_t)(a) ^ (intptr_t)(b))), (a) = static_cast<c>((void*)((intptr_t)(a) ^ (intptr_t)(b))) )
+#define swap_ptr(a,b) swap_ptrcast(void*,a,b)
//////////////////////////////////////////////////////////////////////////
// should not happen
diff --git a/src/common/common-minicore.vcxproj b/src/common/common-minicore.vcxproj
index aaf7e804e64..c7fc725b28a 100644
--- a/src/common/common-minicore.vcxproj
+++ b/src/common/common-minicore.vcxproj
@@ -36,7 +36,7 @@
<ClInclude Include="showmsg.h" />
<ClInclude Include="strlib.h" />
<ClInclude Include="utils.h" />
- <ClInclude Include="winapi.h" />
+ <ClInclude Include="winapi.hpp" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="cli.c" />
@@ -56,6 +56,7 @@
<ClCompile Include="showmsg.c" />
<ClCompile Include="strlib.c" />
<ClCompile Include="utils.c" />
+ <ClCompile Include="winapi.cpp" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{352B45B3-FE88-4431-9D89-48CF811446DB}</ProjectGuid>
@@ -66,26 +67,26 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
diff --git a/src/common/common-minicore.vcxproj.filters b/src/common/common-minicore.vcxproj.filters
index 1bfeea47cb0..5cb744f8134 100644
--- a/src/common/common-minicore.vcxproj.filters
+++ b/src/common/common-minicore.vcxproj.filters
@@ -62,7 +62,7 @@
<ClInclude Include="utils.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="winapi.h">
+ <ClInclude Include="winapi.hpp">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
@@ -112,5 +112,8 @@
<ClCompile Include="utils.c">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClInclude Include="winapi.cpp">
+ <Filter>Source Files</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj
index d7da260abf3..8d72db2a242 100644
--- a/src/common/common.vcxproj
+++ b/src/common/common.vcxproj
@@ -46,8 +46,9 @@
<ClInclude Include="thread.h" />
<ClInclude Include="timer.h" />
<ClInclude Include="utils.h" />
- <ClInclude Include="winapi.h" />
+ <ClInclude Include="winapi.hpp" />
<ClInclude Include="yamlwrapper.h" />
+ <ClInclude Include="utilities.hpp" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="cli.c" />
@@ -75,7 +76,9 @@
<ClCompile Include="thread.c" />
<ClCompile Include="timer.c" />
<ClCompile Include="utils.c" />
+ <ClCompile Include="winapi.cpp" />
<ClCompile Include="yamlwrapper.cpp" />
+ <ClCompile Include="utilities.cpp" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{F8FD7B1E-8E1C-4CC3-9CD1-2E28F77B6559}</ProjectGuid>
@@ -86,26 +89,26 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
diff --git a/src/common/common.vcxproj.filters b/src/common/common.vcxproj.filters
index 94e92099898..f94aeb85d69 100644
--- a/src/common/common.vcxproj.filters
+++ b/src/common/common.vcxproj.filters
@@ -92,12 +92,15 @@
<ClInclude Include="utils.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="winapi.h">
+ <ClInclude Include="winapi.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="yamlwrapper.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="utilities.hpp">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="cli.c">
@@ -106,6 +109,9 @@
<ClCompile Include="conf.c">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="core.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
<ClCompile Include="db.c">
<Filter>Source Files</Filter>
</ClCompile>
@@ -166,11 +172,14 @@
<ClCompile Include="utils.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="core.cpp">
+ <ClInclude Include="winapi.cpp">
<Filter>Source Files</Filter>
- </ClCompile>
+ </ClInclude>
<ClCompile Include="yamlwrapper.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="utilities.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/common/conf.h b/src/common/conf.h
index 8570f38d31a..249372666ec 100644
--- a/src/common/conf.h
+++ b/src/common/conf.h
@@ -4,10 +4,18 @@
#ifndef _CONF_H_
#define _CONF_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#include "cbasetypes.h"
#include "../../3rdparty/libconfig/libconfig.h"
int conf_read_file(config_t *config, const char *config_filename);
int config_setting_copy(config_setting_t *parent, const config_setting_t *src);
+#ifdef __cplusplus
+}
+#endif
+
#endif // _CONF_H_
diff --git a/src/common/core.cpp b/src/common/core.cpp
index 22f5a3d147c..7c24f9858d6 100644
--- a/src/common/core.cpp
+++ b/src/common/core.cpp
@@ -20,7 +20,7 @@
#ifndef _WIN32
#include <unistd.h>
#else
-#include "winapi.h" // Console close event handling
+#include "winapi.hpp" // Console close event handling
#include <direct.h> // _chdir
#endif
@@ -148,12 +148,10 @@ void signals_init (void) {
}
#endif
+const char* get_svn_revision(void) {
#ifdef SVNVERSION
-const char *get_svn_revision(void) {
- return EXPAND_AND_QUOTE(SVNVERSION);
- }
+ return EXPAND_AND_QUOTE(SVNVERSION);
#else// not SVNVERSION
-const char* get_svn_revision(void) {
static char svn_version_buffer[16] = "";
FILE *fp;
@@ -244,11 +242,8 @@ const char* get_svn_revision(void) {
// fallback
svn_version_buffer[0] = UNKNOWN_VERSION;
return svn_version_buffer;
-}
#endif
-
-// GIT path
-#define GIT_ORIGIN "refs/remotes/origin/master"
+}
// Grabs the hash from the last time the user updated their working copy (last pull)
const char *get_git_hash (void) {
@@ -258,7 +253,8 @@ const char *get_git_hash (void) {
if( GitHash[0] != '\0' )
return GitHash;
- if( (fp = fopen(".git/" GIT_ORIGIN, "r")) != NULL ) {
+ if( (fp = fopen(".git/refs/remotes/origin/master", "r")) != NULL || // Already pulled once
+ (fp = fopen(".git/refs/heads/master", "r")) != NULL ) { // Cloned only
char line[64];
char *rev = (char*)malloc(sizeof(char) * 50);
@@ -307,10 +303,16 @@ static void display_title(void) {
// Warning if executed as superuser (root)
void usercheck(void)
{
-#ifndef _WIN32
- if (geteuid() == 0) {
+#if !defined(BUILDBOT)
+#ifdef _WIN32
+ if (IsCurrentUserLocalAdministrator()) {
+ ShowWarning("You are running rAthena with admin privileges, it is not necessary.\n");
+ }
+#else
+ if (geteuid() == 0) {
ShowWarning ("You are running rAthena with root privileges, it is not necessary.\n");
- }
+ }
+#endif
#endif
}
@@ -381,5 +383,11 @@ int main (int argc, char **argv)
malloc_final();
+#if defined(BUILDBOT)
+ if( buildbotflag ){
+ exit(EXIT_FAILURE);
+ }
+#endif
+
return 0;
}
diff --git a/src/common/db.c b/src/common/db.c
index d1b25d0160d..a4348f2879f 100644
--- a/src/common/db.c
+++ b/src/common/db.c
@@ -2920,7 +2920,7 @@ void* linkdb_search( struct linkdb_node** head, void *key)
if( node->key == key ) {
if( node->prev && n > 5 ) {
//Moving the head in order to improve processing efficiency
- if(node->prev) node->prev->next = node->next;
+ node->prev->next = node->next;
if(node->next) node->next->prev = node->prev;
node->next = *head;
node->prev = (*head)->prev;
diff --git a/src/common/db.h b/src/common/db.h
index 8e460294e1c..99d5aa63102 100644
--- a/src/common/db.h
+++ b/src/common/db.h
@@ -42,13 +42,13 @@
#ifndef _DB_H_
#define _DB_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <stdarg.h>
#include "cbasetypes.h"
-#include <stdarg.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
/*****************************************************************************\
* (1) Section with public typedefs, enums, unions, structures and defines. *
@@ -1133,12 +1133,12 @@ void linkdb_foreach (struct linkdb_node** head, LinkDBFunc func, ...);
///
/// @param __vec Vector
/// @param __n Size
-#define VECTOR_RESIZE(__vec,__n) \
+#define VECTOR_RESIZE(__vec,__n,__cast) \
do{ \
if( (__n) > VECTOR_CAPACITY(__vec) ) \
{ /* increase size */ \
- if( VECTOR_CAPACITY(__vec) == 0 ) VECTOR_DATA(__vec) = aMalloc((__n)*sizeof(VECTOR_FIRST(__vec))); /* allocate new */ \
- else VECTOR_DATA(__vec) = aRealloc(VECTOR_DATA(__vec),(__n)*sizeof(VECTOR_FIRST(__vec))); /* reallocate */ \
+ if( VECTOR_CAPACITY(__vec) == 0 ) VECTOR_DATA(__vec) = (__cast)(aMalloc((__n)*sizeof(VECTOR_FIRST(__vec))) ); /* allocate new */ \
+ else VECTOR_DATA(__vec) = (__cast)(aRealloc(VECTOR_DATA(__vec),(__n)*sizeof(VECTOR_FIRST(__vec))) ); /* reallocate */ \
memset(VECTOR_DATA(__vec)+VECTOR_LENGTH(__vec), 0, (VECTOR_CAPACITY(__vec)-VECTOR_LENGTH(__vec))*sizeof(VECTOR_FIRST(__vec))); /* clear new data */ \
VECTOR_CAPACITY(__vec) = (__n); /* update capacity */ \
} \
@@ -1150,7 +1150,7 @@ void linkdb_foreach (struct linkdb_node** head, LinkDBFunc func, ...);
} \
else if( (__n) < VECTOR_CAPACITY(__vec) ) \
{ /* reduce size */ \
- VECTOR_DATA(__vec) = aRealloc(VECTOR_DATA(__vec),(__n)*sizeof(VECTOR_FIRST(__vec))); /* reallocate */ \
+ VECTOR_DATA(__vec) = (__cast)(aRealloc(VECTOR_DATA(__vec),(__n)*sizeof(VECTOR_FIRST(__vec))) ); /* reallocate */ \
VECTOR_CAPACITY(__vec) = (__n); /* update capacity */ \
if( VECTOR_LENGTH(__vec) > (__n) ) VECTOR_LENGTH(__vec) = (__n); /* update length */ \
} \
@@ -1164,15 +1164,15 @@ void linkdb_foreach (struct linkdb_node** head, LinkDBFunc func, ...);
/// @param __vec Vector
/// @param __n Empty positions
/// @param __step Increase
-#define VECTOR_ENSURE(__vec,__n,__step) \
+#define VECTOR_ENSURE2(__vec,__n,__step,__cast) \
do{ \
size_t _empty_ = VECTOR_CAPACITY(__vec)-VECTOR_LENGTH(__vec); \
if( (__n) > _empty_ ) { \
while( (__n) > _empty_ ) _empty_ += (__step); \
- VECTOR_RESIZE(__vec,_empty_+VECTOR_LENGTH(__vec)); \
+ VECTOR_RESIZE(__vec,_empty_+VECTOR_LENGTH(__vec),__cast); \
} \
}while(0)
-
+#define VECTOR_ENSURE(__vec,__n,__step) VECTOR_ENSURE2(__vec,__n,__step,int*)
/// Inserts a zeroed value in the target index.
@@ -1428,7 +1428,7 @@ void linkdb_foreach (struct linkdb_node** head, LinkDBFunc func, ...);
/// @param __n Empty positions
/// @param __step Increase
#define BHEAP_ENSURE(__heap,__n,__step) VECTOR_ENSURE(__heap,__n,__step)
-
+#define BHEAP_ENSURE2(__heap,__n,__step,__cast) VECTOR_ENSURE2(__heap,__n,__step,__cast)
/// Returns the top value of the heap.
diff --git a/src/common/ers.c b/src/common/ers.c
index 8903a579346..98d1014c24f 100644
--- a/src/common/ers.c
+++ b/src/common/ers.c
@@ -290,7 +290,7 @@ void ers_cache_size(ERS *self, unsigned int new_size) {
}
-ERS *ers_new(uint32 size, char *name, enum ERSOptions options)
+ERS *ers_new(uint32 size, const char *name, enum ERSOptions options)
{
struct ers_instance_t *instance;
CREATE(instance,struct ers_instance_t, 1);
@@ -308,7 +308,7 @@ ERS *ers_new(uint32 size, char *name, enum ERSOptions options)
instance->VTable.destroy = ers_obj_destroy;
instance->VTable.chunk_size = ers_cache_size;
- instance->Name = ( options & ERS_OPT_FREE_NAME ) ? aStrdup(name) : name;
+ instance->Name = ( options & ERS_OPT_FREE_NAME ) ? (char *)aStrdup(name) : (char *)name;
instance->Options = options;
instance->Cache = ers_find_cache(size,instance->Options);
diff --git a/src/common/ers.h b/src/common/ers.h
index 8a1f617540b..51a45d951de 100644
--- a/src/common/ers.h
+++ b/src/common/ers.h
@@ -84,6 +84,7 @@ enum ERSOptions {
/* Compound, is used to determine whether it should be looking for a cache of matching options */
ERS_CACHE_OPTIONS = ERS_OPT_CLEAN|ERS_OPT_FLEX_CHUNK,
+ ERS_CLEAN_OPTIONS = ERS_OPT_CLEAN|ERS_OPT_CLEAR,
};
/**
@@ -162,7 +163,7 @@ typedef struct eri {
* @param The requested size of the entry in bytes
* @return Interface of the object
*/
-ERS *ers_new(uint32 size, char *name, enum ERSOptions options);
+ERS *ers_new(uint32 size, const char *name, enum ERSOptions options);
/**
* Print a report about the current state of the Entry Reusage System.
diff --git a/src/common/malloc.c b/src/common/malloc.c
index 4eb1f29c795..179c73a9e08 100644
--- a/src/common/malloc.c
+++ b/src/common/malloc.c
@@ -529,6 +529,7 @@ static void memmgr_log (char *buf)
{
if( !log_fp )
{
+ const char* version;
time_t raw;
struct tm* t;
@@ -537,8 +538,14 @@ static void memmgr_log (char *buf)
time(&raw);
t = localtime(&raw);
- fprintf(log_fp, "\nMemory manager: Memory leaks found at %d/%02d/%02d %02dh%02dm%02ds (Revision %s).\n",
- (t->tm_year+1900), (t->tm_mon+1), t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec, get_svn_revision());
+
+ if( ( version = get_git_hash() ) && version[0] != UNKNOWN_VERSION ){
+ fprintf(log_fp, "\nMemory manager: Memory leaks found at %d/%02d/%02d %02dh%02dm%02ds (Git Hash %s).\n", (t->tm_year+1900), (t->tm_mon+1), t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec, version );
+ }else if( ( version = get_svn_revision() ) && version[0] != UNKNOWN_VERSION ){
+ fprintf(log_fp, "\nMemory manager: Memory leaks found at %d/%02d/%02d %02dh%02dm%02ds (SVN Revision %s).\n", (t->tm_year + 1900), (t->tm_mon + 1), t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec, version );
+ }else{
+ fprintf(log_fp, "\nMemory manager: Memory leaks found at %d/%02d/%02d %02dh%02dm%02ds (Unknown version).\n", (t->tm_year + 1900), (t->tm_mon + 1), t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec );
+ }
}
fprintf(log_fp, "%s", buf);
return;
diff --git a/src/common/malloc.h b/src/common/malloc.h
index 1f273c93359..1660b870cd9 100644
--- a/src/common/malloc.h
+++ b/src/common/malloc.h
@@ -4,10 +4,11 @@
#ifndef _MALLOC_H_
#define _MALLOC_H_
+#include "cbasetypes.h"
+
#ifdef __cplusplus
extern "C" {
#endif
-#include "cbasetypes.h"
#define ALC_MARK __FILE__, __LINE__, __func__
diff --git a/src/common/mapindex.c b/src/common/mapindex.c
index 19d187de172..4ece496329b 100644
--- a/src/common/mapindex.c
+++ b/src/common/mapindex.c
@@ -1,10 +1,9 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#include "../config/core.h"
+#include "mmo.h"
#include "core.h"
#include "mapindex.h"
-#include "mmo.h"
#include "showmsg.h"
#include "strlib.h"
diff --git a/src/common/mapindex.h b/src/common/mapindex.h
index cc1f6624dbc..68e8e23dd08 100644
--- a/src/common/mapindex.h
+++ b/src/common/mapindex.h
@@ -8,7 +8,7 @@
extern "C" {
#endif
-#include "../config/renewal.h"
+#include "../common/mmo.h"
#define MAX_MAPINDEX 2000
@@ -54,6 +54,7 @@ extern "C" {
#define MAP_MALAYA "malaya"
#define MAP_ECLAGE "eclage"
#define MAP_ECLAGE_IN "ecl_in01"
+#define MAP_LASAGNA "lasagna"
const char* mapindex_getmapname(const char* string, char* output);
const char* mapindex_getmapname_ext(const char* string, char* output);
diff --git a/src/common/mempool.c b/src/common/mempool.c
index b43a04db2c9..099cf5ca9db 100644
--- a/src/common/mempool.c
+++ b/src/common/mempool.c
@@ -15,7 +15,7 @@
#include <string.h>
#ifdef WIN32
-#include "winapi.h"
+#include "winapi.hpp"
#else
#include <unistd.h>
#endif
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 7cbd06035e1..c0b9ace075d 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -9,31 +9,10 @@
#include "db.h"
#include <time.h>
-// server->client protocol version
-// 0 - pre-?
-// 1 - ? - 0x196
-// 2 - ? - 0x78, 0x79
-// 3 - ? - 0x1c8, 0x1c9, 0x1de
-// 4 - ? - 0x1d7, 0x1d8, 0x1d9, 0x1da
-// 5 - 2003-12-18aSakexe+ - 0x1ee, 0x1ef, 0x1f0, ?0x1c4, 0x1c5?
-// 6 - 2004-03-02aSakexe+ - 0x1f4, 0x1f5
-// 7 - 2005-04-11aSakexe+ - 0x229, 0x22a, 0x22b, 0x22c
-// see conf/battle/client.conf for other version
-
#ifndef PACKETVER
- #define PACKETVER 20151104
- //#define PACKETVER 20120410
+ #error Please define PACKETVER in src/config/packets.h
#endif
-// Check if the specified packetversion supports the pincode system
-#define PACKETVER_SUPPORTS_PINCODE PACKETVER>=20110309
-
-/// Check if the client needs delete_date as remaining time and not the actual delete_date (actually it was tested for clients since 2013)
-#define PACKETVER_CHAR_DELETEDATE (PACKETVER > 20130000 && PACKETVER < 20141016) || PACKETVER >= 20150513
-
-// Check if the specified packetvresion supports the cashshop sale system
-#define PACKETVER_SUPPORTS_SALES PACKETVER>=20131223
-
///Remove/Comment this line to disable sc_data saving. [Skotlex]
#define ENABLE_SC_SAVING
/** Remove/Comment this line to disable server-side hot-key saving support [Skotlex]
@@ -55,12 +34,20 @@
#define MAX_INVENTORY 100 ///Maximum items in player inventory
/** Max number of characters per account. Note that changing this setting alone is not enough if the client is not hexed to support more characters as well.
* Max value tested was 265 */
-#define MAX_CHARS 9
+#ifndef MAX_CHARS
+ #if PACKETVER >= 20180124
+ #define MAX_CHARS 15
+ #elif PACKETVER >= 20100413
+ #define MAX_CHARS 12
+ #else
+ #define MAX_CHARS 9
+ #endif
+#endif
/** Number of slots carded equipment can have. Never set to less than 4 as they are also used to keep the data of forged items/equipment. [Skotlex]
* Note: The client seems unable to receive data for more than 4 slots due to all related packets having a fixed size. */
#define MAX_SLOTS 4
#define MAX_AMOUNT 30000 ////Max amount of a single stacked item
-#define MAX_ZENY 1000000000 ///Max zeny
+#define MAX_ZENY INT_MAX ///Max zeny
#define MAX_BANK_ZENY SINT32_MAX ///Max zeny in Bank
#define MAX_FAME 1000000000 ///Max fame points
#define MAX_CART 100 ///Maximum item in cart
@@ -152,7 +139,6 @@
//Mercenary System
#define MC_SKILLBASE 8201
#define MAX_MERCSKILL 40
-#define MAX_MERCENARY_CLASS 61
//Elemental System
#define MAX_ELEMENTALSKILL 42
@@ -162,6 +148,12 @@
#define EL_CLASS_BASE 2114
#define EL_CLASS_MAX (EL_CLASS_BASE+MAX_ELEMENTAL_CLASS-1)
+//Achievement System
+#define MAX_ACHIEVEMENT_RANK 20 /// Maximum achievement level
+#define MAX_ACHIEVEMENT_OBJECTIVES 10 /// Maximum different objectives in achievement_db.yml
+#define MAX_ACHIEVEMENT_DEPENDENTS 20 /// Maximum different dependents in achievement_db.yml
+#define ACHIEVEMENT_NAME_LENGTH 50 /// Max Achievement Name length
+
enum item_types {
IT_HEALING = 0,
IT_UNKNOWN, //1
@@ -180,6 +172,43 @@ enum item_types {
IT_MAX
};
+/// Monster mode definitions to clear up code reading. [Skotlex]
+enum e_mode {
+ MD_NONE = 0x0000000,
+ MD_CANMOVE = 0x0000001,
+ MD_LOOTER = 0x0000002,
+ MD_AGGRESSIVE = 0x0000004,
+ MD_ASSIST = 0x0000008,
+ MD_CASTSENSOR_IDLE = 0x0000010,
+ MD_NORANDOM_WALK = 0x0000020,
+ MD_NOCAST_SKILL = 0x0000040,
+ MD_CANATTACK = 0x0000080,
+ //FREE = 0x0000100,
+ MD_CASTSENSOR_CHASE = 0x0000200,
+ MD_CHANGECHASE = 0x0000400,
+ MD_ANGRY = 0x0000800,
+ MD_CHANGETARGET_MELEE = 0x0001000,
+ MD_CHANGETARGET_CHASE = 0x0002000,
+ MD_TARGETWEAK = 0x0004000,
+ MD_RANDOMTARGET = 0x0008000,
+ MD_IGNOREMELEE = 0x0010000,
+ MD_IGNOREMAGIC = 0x0020000,
+ MD_IGNORERANGED = 0x0040000,
+ MD_MVP = 0x0080000,
+ MD_IGNOREMISC = 0x0100000,
+ MD_KNOCKBACK_IMMUNE = 0x0200000,
+ MD_TELEPORT_BLOCK = 0x0400000,
+ //FREE = 0x0800000,
+ MD_FIXED_ITEMDROP = 0x1000000,
+ MD_DETECTOR = 0x2000000,
+ MD_STATUS_IMMUNE = 0x4000000,
+ MD_SKILL_IMMUNE = 0x8000000,
+};
+
+#define MD_MASK 0x000FFFF
+#define ATR_MASK 0x0FF0000
+#define CL_MASK 0xF000000
+
// Questlog states
enum quest_state {
Q_INACTIVE, ///< Inactive quest (the user can toggle between active and inactive quests)
@@ -201,6 +230,15 @@ struct s_item_randomoption {
char param;
};
+/// Achievement log entry
+struct achievement {
+ int achievement_id; ///< Achievement ID
+ int count[MAX_ACHIEVEMENT_OBJECTIVES]; ///< Counters of each achievement objective
+ time_t completed; ///< Date completed
+ time_t rewarded; ///< Received reward?
+ int score; ///< Amount of points achievement is worth
+};
+
struct item {
int id;
unsigned short nameid;
@@ -226,8 +264,8 @@ enum equip_pos {
EQP_ARMOR = 0x000010, // 16
EQP_SHOES = 0x000040, // 64
EQP_GARMENT = 0x000004, // 4
- EQP_ACC_L = 0x000008, // 8
- EQP_ACC_R = 0x000080, // 128
+ EQP_ACC_R = 0x000008, // 8
+ EQP_ACC_L = 0x000080, // 128
EQP_COSTUME_HEAD_TOP = 0x000400, // 1024
EQP_COSTUME_HEAD_MID = 0x000800, // 2048
EQP_COSTUME_HEAD_LOW = 0x001000, // 4096
@@ -268,12 +306,6 @@ enum e_skill_flag
SKILL_FLAG_REPLACED_LV_0 = 10, // temporary skill overshadowing permanent skill of level 'N - SKILL_FLAG_REPLACED_LV_0',
};
-enum e_mmo_charstatus_opt {
- OPT_NONE = 0x0,
- OPT_SHOW_EQUIP = 0x1,
- OPT_ALLOW_PARTY = 0x2,
-};
-
struct s_skill {
uint16 id;
uint8 lv;
@@ -417,7 +449,7 @@ struct s_elemental {
int elemental_id;
uint32 char_id;
short class_;
- int mode;
+ enum e_mode mode;
int hp, sp, max_hp, max_sp, matk, atk, atk2;
short hit, flee, amotion, def, mdef;
int life_time;
@@ -499,6 +531,7 @@ struct mmo_charstatus {
uint32 uniqueitem_counter;
unsigned char hotkey_rowshift;
+ unsigned long title_id;
};
typedef enum mail_status {
@@ -528,7 +561,7 @@ struct mail_message {
char dest_name[NAME_LENGTH]; //receiver nickname
char title[MAIL_TITLE_LENGTH];
char body[MAIL_BODY_LENGTH];
- int type; // enum mail_inbox_type
+ enum mail_inbox_type type;
time_t scheduled_deletion;
mail_status status;
diff --git a/src/common/msg_conf.h b/src/common/msg_conf.h
index e10e63df1b6..d1feeb1d4c2 100644
--- a/src/common/msg_conf.h
+++ b/src/common/msg_conf.h
@@ -4,6 +4,8 @@
#ifndef MSG_CONF_H
#define MSG_CONF_H
+#include "../config/core.h"
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -20,10 +22,13 @@ enum lang_types {
LANG_THA = 0x100,
LANG_MAX
};
-// Multilanguage System.
-// Define which languages to enable (bitmask).
-// 0xFFF will enable all, while 0x000 will enable English only.
-#define LANG_ENABLE 0x000
+
+#ifndef LANG_ENABLE
+ // Multilanguage System.
+ // Define which languages to enable (bitmask).
+ // 0xFFF will enable all, while 0x000 will enable English only.
+ #define LANG_ENABLE 0x000
+#endif
//read msg in table
const char* _msg_txt(int msg_number,int size, char ** msg_table);
diff --git a/src/common/mutex.c b/src/common/mutex.c
index c62839fc341..6bf1fc86fc4 100644
--- a/src/common/mutex.c
+++ b/src/common/mutex.c
@@ -2,7 +2,7 @@
// For more information, see LICENCE in the main folder
#ifdef WIN32
-#include "winapi.h"
+#include "winapi.hpp"
#else
#include <pthread.h>
diff --git a/src/common/random.c b/src/common/random.c
index bce981dd86b..ef051bb40b8 100644
--- a/src/common/random.c
+++ b/src/common/random.c
@@ -5,7 +5,7 @@
#include "timer.h" // gettick
#include "random.h"
#if defined(WIN32)
- #include "winapi.h"
+ #include "winapi.hpp"
#elif defined(HAVE_GETPID) || defined(HAVE_GETTID)
#include <sys/types.h>
#include <unistd.h>
diff --git a/src/common/showmsg.c b/src/common/showmsg.c
index 31ea115a7d5..f710c9e52b9 100644
--- a/src/common/showmsg.c
+++ b/src/common/showmsg.c
@@ -10,7 +10,7 @@
#include <stdlib.h> // atexit
#ifdef WIN32
- #include "winapi.h"
+ #include "winapi.hpp"
#ifdef DEBUGLOGMAP
#define DEBUGLOGPATH "log\\map-server.log"
diff --git a/src/common/socket.c b/src/common/socket.c
index 510c5ffe359..21996abd5cc 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -12,7 +12,7 @@
#include <stdlib.h>
#ifdef WIN32
- #include "winapi.h"
+ #include "winapi.hpp"
#else
#include <errno.h>
#include <netinet/tcp.h>
diff --git a/src/common/socket.h b/src/common/socket.h
index 844db868d9b..87c71a71f3a 100644
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -7,7 +7,7 @@
#include "cbasetypes.h"
#ifdef WIN32
- #include "winapi.h"
+ #include "winapi.hpp"
typedef long in_addr_t;
#else
#include <sys/types.h>
diff --git a/src/common/spinlock.h b/src/common/spinlock.h
index 8d213541b05..27f932aa55f 100644
--- a/src/common/spinlock.h
+++ b/src/common/spinlock.h
@@ -16,7 +16,7 @@
//
#ifdef WIN32
-#include "winapi.h"
+#include "winapi.hpp"
#endif
#include "cbasetypes.h"
@@ -71,14 +71,11 @@ static forceinline void EnterSpinLock(PSPIN_LOCK lck){
// Spin until we've got it !
- while(1){
-
- if(InterlockedCompareExchange(&lck->lock, tid, 0) == 0){
-
+ while(1){
+ if(InterlockedCompareExchange(&lck->lock, tid, RA_INVALID_THID) == RA_INVALID_THID){
InterlockedIncrement(&lck->nest);
return; // Got Lock
}
-
rathread_yield(); // Force ctxswitch to another thread.
}
@@ -92,13 +89,14 @@ static forceinline void LeaveSpinLock(PSPIN_LOCK lck){
if(InterlockedCompareExchange(&lck->lock, tid, tid) == tid){ // this thread owns the lock.
if(InterlockedDecrement(&lck->nest) == 0)
- InterlockedExchange(&lck->lock, 0); // Unlock!
+ InterlockedExchange(&lck->lock, RA_INVALID_THID); // Unlock!
}
dropsynclock(&lck->sync_lock);
}
-
+#undef getsynclock
+#undef dropsynclock
#endif
diff --git a/src/common/sql.c b/src/common/sql.c
index 6533aafebca..2d75a3e49b7 100644
--- a/src/common/sql.c
+++ b/src/common/sql.c
@@ -9,7 +9,7 @@
#include "sql.h"
#ifdef WIN32
-#include "winapi.h"
+#include "winapi.hpp"
#endif
#include <mysql.h>
#include <stdlib.h>// strtoul
@@ -78,7 +78,8 @@ Sql* Sql_Malloc(void)
self->lengths = NULL;
self->result = NULL;
self->keepalive = INVALID_TIMER;
- self->handle.reconnect = 1;
+ my_bool reconnect = 1;
+ mysql_options(&self->handle, MYSQL_OPT_RECONNECT, &reconnect);
return self;
}
@@ -352,6 +353,16 @@ uint64 Sql_NumRows(Sql* self)
+/// Returns the number of rows affected by the last query
+uint64 Sql_NumRowsAffected(Sql* self)
+{
+ if( self )
+ return (uint64)mysql_affected_rows(&self->handle);
+ return 0;
+}
+
+
+
/// Fetches the next row.
int Sql_NextRow(Sql* self)
{
diff --git a/src/common/sql.h b/src/common/sql.h
index 828b0006546..8b03e1bf347 100644
--- a/src/common/sql.h
+++ b/src/common/sql.h
@@ -4,14 +4,12 @@
#ifndef _COMMON_SQL_H_
#define _COMMON_SQL_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
#include "cbasetypes.h"
#include <stdarg.h>// va_list
-
+#ifdef __cplusplus
+extern "C" {
+#endif
// Return codes
#define SQL_ERROR -1
@@ -175,6 +173,13 @@ uint64 Sql_NumRows(Sql* self);
+/// Returns the number of rows affected by the last query
+///
+/// @return Number of rows
+uint64 Sql_NumRowsAffected(Sql* self);
+
+
+
/// Fetches the next row.
/// The data of the previous row is no longer valid.
///
diff --git a/src/common/strlib.h b/src/common/strlib.h
index 441d51993eb..930f65526d4 100644
--- a/src/common/strlib.h
+++ b/src/common/strlib.h
@@ -4,10 +4,6 @@
#ifndef _STRLIB_H_
#define _STRLIB_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
#include "cbasetypes.h"
#include <stdarg.h>
@@ -21,6 +17,10 @@ extern "C" {
#undef __USED_GNU
#endif
+#ifdef __cplusplus
+extern "C" {
+#endif
+
char* jstrescape (char* pt);
char* jstrescapecpy (char* pt, const char* spt);
int jmemescapecpy (char* pt, const char* spt, int size);
diff --git a/src/common/thread.c b/src/common/thread.c
index 85f9904a015..6daadf7e8d8 100644
--- a/src/common/thread.c
+++ b/src/common/thread.c
@@ -7,7 +7,7 @@
// For more information, see LICENCE in the main folder
#ifdef WIN32
-#include "winapi.h"
+#include "winapi.hpp"
#define getpagesize() 4096 // @TODO: implement this properly (GetSystemInfo .. dwPageSize..). (Atm as on all supported win platforms its 4k its static.)
#define __thread __declspec( thread )
#else
@@ -25,7 +25,7 @@
#include "thread.h"
// When Compiling using MSC (on win32..) we know we have support in any case!
-#ifdef _MSC_VER
+#if defined(_MSC_VER ) && !defined(HAS_TLS)
#define HAS_TLS
#endif
@@ -48,7 +48,7 @@ struct rAthread {
#ifdef HAS_TLS
-__thread int g_rathread_ID = -1;
+__thread int g_rathread_ID = RA_INVALID_THID;
#endif
@@ -57,6 +57,12 @@ __thread int g_rathread_ID = -1;
///
static struct rAthread l_threads[RA_THREADS_MAX];
+prAthread rathenat_getThread( int idx ) {
+ if(idx < RA_THREADS_MAX)
+ return &l_threads[idx];
+ return NULL;
+}
+
void rathread_init(){
register unsigned int i;
memset(&l_threads, 0x00, RA_THREADS_MAX * sizeof(struct rAthread) );
@@ -70,7 +76,11 @@ void rathread_init(){
g_rathread_ID = 0;
#endif
l_threads[0].prio = RAT_PRIO_NORMAL;
- l_threads[0].proc = (rAthreadProc)0xDEADCAFE;
+#if defined(_WIN64) || defined(__x86_64__) || defined(__ppc64__)
+ l_threads[0].proc = (rAthreadProc)0xDEADCAFEDEADCAFE;
+#else
+ l_threads[0].proc = (rAthreadProc)0xDEADCAFE;
+#endif
}//end: rathread_init()
@@ -221,7 +231,7 @@ void rathread_destroy ( prAthread handle ){
rat_thread_terminated(handle);
}
#else
- if( pthread_cancel( handle->hThread ) == 0){
+ if(handle->hThread && pthread_cancel( handle->hThread ) == 0){
// We have to join it, otherwise pthread wont re-cycle its internal ressources assoc. with this thread.
//
diff --git a/src/common/thread.h b/src/common/thread.h
index 56748866fc0..402917d1c5e 100644
--- a/src/common/thread.h
+++ b/src/common/thread.h
@@ -20,6 +20,15 @@ typedef enum RATHREAD_PRIO {
RAT_PRIO_HIGH
} RATHREAD_PRIO;
+#define RA_INVALID_THID -1
+
+/**
+ * Get the handle of a specific thread
+ *
+ * @param idx - The index of the thread
+ * @return not NULL if success
+ */
+prAthread rathenat_getThread( int idx );
/**
* Creates a new Thread
diff --git a/src/common/timer.c b/src/common/timer.c
index 32a368fe92d..a5f0ff1e8e9 100644
--- a/src/common/timer.c
+++ b/src/common/timer.c
@@ -13,7 +13,7 @@
#include <string.h>
#ifdef WIN32
-#include "winapi.h" // GetTickCount()
+#include "winapi.hpp" // GetTickCount()
#else
#endif
@@ -198,7 +198,7 @@ unsigned int gettick(void)
static void push_timer_heap(int tid)
{
BHEAP_ENSURE(timer_heap, 1, 256);
- BHEAP_PUSH(timer_heap, tid, DIFFTICK_MINTOPCMP, swap);
+ BHEAP_PUSH(timer_heap, tid, DIFFTICK_MINTOPCMP, SWAP);
}
/*==========================
@@ -335,9 +335,9 @@ int settick_timer(int tid, unsigned int tick)
return (int)tick;// nothing to do, already in propper position
// pop and push adjusted timer
- BHEAP_POPINDEX(timer_heap, i, DIFFTICK_MINTOPCMP, swap);
+ BHEAP_POPINDEX(timer_heap, i, DIFFTICK_MINTOPCMP, SWAP);
timer_data[tid].tick = tick;
- BHEAP_PUSH(timer_heap, tid, DIFFTICK_MINTOPCMP, swap);
+ BHEAP_PUSH(timer_heap, tid, DIFFTICK_MINTOPCMP, SWAP);
return (int)tick;
}
@@ -357,7 +357,7 @@ int do_timer(unsigned int tick)
break; // no more expired timers to process
// remove timer
- BHEAP_POP(timer_heap, DIFFTICK_MINTOPCMP, swap);
+ BHEAP_POP(timer_heap, DIFFTICK_MINTOPCMP, SWAP);
timer_data[tid].type |= TIMER_REMOVE_HEAP;
if( timer_data[tid].func )
diff --git a/src/common/utilities.cpp b/src/common/utilities.cpp
new file mode 100644
index 00000000000..e94ce813b55
--- /dev/null
+++ b/src/common/utilities.cpp
@@ -0,0 +1,63 @@
+#include "utilities.hpp"
+
+#include <chrono>
+#include <string>
+#include <algorithm>
+#include <iostream>
+#include <numeric> //iota
+
+struct cScopeTimer::sPimpl {
+ std::chrono::steady_clock::time_point start;
+ std::chrono::steady_clock::time_point end;
+
+ sPimpl()
+ {
+ start = std::chrono::steady_clock::now();
+ }
+
+ ~sPimpl(){
+ end = std::chrono::steady_clock::now();
+ std::chrono::microseconds diff = std::chrono::duration_cast<std::chrono::microseconds>(end - start);
+ std::cout << " took=" << diff.count() << "ms !\n";
+ }
+};
+
+cScopeTimer::cScopeTimer()
+ : aPimpl(new sPimpl())
+{}
+
+/**
+ * Calculates the Levenshtein distance of two strings.
+ * @author http://en.wikibooks.org/wiki/Algorithm_Implementation/Strings/Levenshtein_distance#C.2B.2B
+ * comparison test was done here http://cpp.sh/2o7w
+ */
+int levenshtein(const std::string &s1, const std::string &s2)
+{
+ // To change the type this function manipulates and returns, change
+ // the return type and the types of the two variables below.
+ int s1len = static_cast<int>(s1.size());
+ int s2len = static_cast<int>(s2.size());
+
+ auto column_start = (decltype(s1len))1;
+
+ auto column = new decltype(s1len)[s1len + 1];
+ std::iota(column + column_start, column + s1len + 1, column_start);
+
+ for (auto x = column_start; x <= s2len; x++) {
+ column[0] = x;
+ auto last_diagonal = x - column_start;
+ for (auto y = column_start; y <= s1len; y++) {
+ auto old_diagonal = column[y];
+ auto possibilities = {
+ column[y] + 1,
+ column[y - 1] + 1,
+ last_diagonal + (s1[y - 1] == s2[x - 1]? 0 : 1)
+ };
+ column[y] = std::min(possibilities);
+ last_diagonal = old_diagonal;
+ }
+ }
+ auto result = column[s1len];
+ delete[] column;
+ return result;
+}
diff --git a/src/common/utilities.hpp b/src/common/utilities.hpp
new file mode 100644
index 00000000000..64734110534
--- /dev/null
+++ b/src/common/utilities.hpp
@@ -0,0 +1,13 @@
+#pragma once
+#include <memory>
+#include <string>
+
+// Class used to perform time measurement
+class cScopeTimer {
+ struct sPimpl; //this is to avoid long compilation time
+ std::unique_ptr<sPimpl> aPimpl;
+
+ cScopeTimer();
+};
+
+int levenshtein( const std::string &s1, const std::string &s2 );
diff --git a/src/common/utils.c b/src/common/utils.c
index 881bae3e67c..9b7af8cc730 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -11,7 +11,7 @@
#include <math.h> // floor()
#ifdef WIN32
- #include "winapi.h"
+ #include "winapi.hpp"
#ifndef F_OK
#define F_OK 0x0
#endif /* F_OK */
@@ -358,59 +358,6 @@ float GetFloat(const unsigned char* buf)
return *((float*)(void*)&val);
}
-uint32 date2version(int date) {
- if(date < 20040906) return 5;
- else if(date < 20040920) return 10;
- else if(date < 20041005) return 11;
- else if(date < 20041025) return 12;
- else if(date < 20041129) return 13;
- else if(date < 20050110) return 14;
- else if(date < 20050509) return 15;
- else if(date < 20050628) return 16;
- else if(date < 20050718) return 17;
- else if(date < 20050719) return 18;
- else if(date < 20060327) return 19;
- else if(date < 20070108) return 20;
- else if(date < 20070212) return 21;
- //wtf @FIXME
- //else if(date < 20080910) return 22;
- else if(date < 20080827) return 23;
- else if(date < 20080910) return 24;
- //unable to solve from date
- else if(date < 20101124) return 25;
- else if(date < 20111005) return 26;
- else if(date < 20111102) return 27;
- else if(date < 20120307) return 28;
- else if(date < 20120410) return 29;
- else if(date < 20120418) return 30;
- else if(date < 20120618) return 31;
- else if(date < 20120702) return 32;
- else if(date < 20130320) return 33;
- else if(date < 20130515) return 34;
- else if(date < 20130522) return 35;
- else if(date < 20130529) return 36;
- else if(date < 20130605) return 37;
- else if(date < 20130612) return 38;
- else if(date < 20130618) return 39;
- else if(date < 20130626) return 40;
- else if(date < 20130703) return 41;
- else if(date < 20130710) return 42;
- else if(date < 20130717) return 43;
- else if(date < 20130807) return 44;
- else if(date < 20131223) return 45;
- else if(date < 20140212) return 46;
- //else if(date < 20140613) return 47;
- //else if(date < 20141016) return 48;
- else if(date < 20141022) return 50;
- else if(date < 20150513) return 51;
- else if(date < 20150916) return 52;
- else if(date < 20151001) return 53;
- else if(date < 20151104) return 54;
- else if(date >= 20151104) return 55;
-
- else return 30; //default
-}
-
/// calculates the value of A / B, in percent (rounded down)
unsigned int get_percentage(const unsigned int A, const unsigned int B)
{
@@ -432,28 +379,3 @@ unsigned int get_percentage(const unsigned int A, const unsigned int B)
return (unsigned int)floor(result);
}
-
-/**
- * Calculates the Levenshtein distance of two strings.
- * @author http://en.wikibooks.org/wiki/Algorithm_Implementation/Strings/Levenshtein_distance#C
- */
-int levenshtein(const char *s1, const char *s2) {
- unsigned int s1len, s2len, x, y, lastdiag, olddiag, i;
- unsigned int *column;
- s1len = strlen(s1);
- s2len = strlen(s2);
- column = malloc((s1len+1) * sizeof(unsigned int));
- for (y = 1; y <= s1len; y++)
- column[y] = y;
- for (x = 1; x <= s2len; x++) {
- column[0] = x;
- for (y = 1, lastdiag = x-1; y <= s1len; y++) {
- olddiag = column[y];
- column[y] = min(min(column[y] + 1, column[y-1] + 1), lastdiag + (s1[y-1] == s2[x-1] ? 0 : 1));
- lastdiag = olddiag;
- }
- }
- i = column[s1len];
- free(column);
- return i;
-}
diff --git a/src/common/utils.h b/src/common/utils.h
index 8dfa9ebb3d0..7a1e8fb86ba 100644
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -50,10 +50,6 @@ extern uint32 GetULong(const unsigned char* buf);
extern int32 GetLong(const unsigned char* buf);
extern float GetFloat(const unsigned char* buf);
-uint32 date2version(int date);
-
-int levenshtein(const char *s1, const char *s2);
-
#ifdef __cplusplus
}
#endif
diff --git a/src/common/winapi.cpp b/src/common/winapi.cpp
new file mode 100644
index 00000000000..d424df5ca8a
--- /dev/null
+++ b/src/common/winapi.cpp
@@ -0,0 +1,168 @@
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
+#include "winapi.hpp"
+
+#include "cbasetypes.h"
+
+// Taken from https://support.microsoft.com/de-de/help/118626/how-to-determine-whether-a-thread-is-running-in-user-context-of-local
+bool IsCurrentUserLocalAdministrator(void){
+#ifdef WIN32
+ BOOL fReturn = FALSE;
+ DWORD dwStatus;
+ DWORD dwAccessMask;
+ DWORD dwAccessDesired;
+ DWORD dwACLSize;
+ DWORD dwStructureSize = sizeof(PRIVILEGE_SET);
+ PACL pACL = NULL;
+ PSID psidAdmin = NULL;
+
+ HANDLE hToken = NULL;
+ HANDLE hImpersonationToken = NULL;
+
+ PRIVILEGE_SET ps;
+ GENERIC_MAPPING GenericMapping;
+
+ PSECURITY_DESCRIPTOR psdAdmin = NULL;
+ SID_IDENTIFIER_AUTHORITY SystemSidAuthority = SECURITY_NT_AUTHORITY;
+
+
+ /*
+ Determine if the current thread is running as a user that is a member
+ of the local admins group.
+ To do this, create a security descriptor that has a DACL which has an ACE
+ that allows only local aministrators access.
+ Then, call AccessCheck with the current thread's token and the security
+ descriptor. It will say whether the user could access an object if it
+ had that security descriptor.
+
+ Note: you do not need to actually create the object. Just checking access
+ against the security descriptor alone will be sufficient.
+ */
+ const DWORD ACCESS_READ = 1;
+ const DWORD ACCESS_WRITE = 2;
+
+
+ __try
+ {
+
+ /*
+ AccessCheck() requires an impersonation token. We first get a
+ primary token and then create a duplicate impersonation token. The
+ impersonation token is not actually assigned to the thread, but is
+ used in the call to AccessCheck. Thus, this function itself never
+ impersonates, but does use the identity of the thread. If the
+ thread was impersonating already, this function uses that impersonation
+ context.
+ */
+ if (!OpenThreadToken(GetCurrentThread(), TOKEN_DUPLICATE | TOKEN_QUERY,
+
+ TRUE, &hToken))
+ {
+ if (GetLastError() != ERROR_NO_TOKEN)
+ __leave;
+
+ if (!OpenProcessToken(GetCurrentProcess(),
+
+ TOKEN_DUPLICATE | TOKEN_QUERY, &hToken))
+ __leave;
+ }
+
+ if (!DuplicateToken(hToken, SecurityImpersonation,
+
+ &hImpersonationToken))
+ __leave;
+
+
+ /*
+ Create the binary representation of the well-known SID that
+ represents the local administrators group. Then create the
+
+ security
+ descriptor and DACL with an ACE that allows only local admins
+
+ access.
+ After that, perform the access check. This will determine whether
+ the current user is a local admin.
+ */
+ if (!AllocateAndInitializeSid(&SystemSidAuthority, 2,
+ SECURITY_BUILTIN_DOMAIN_RID,
+ DOMAIN_ALIAS_RID_ADMINS,
+ 0, 0, 0, 0, 0, 0, &psidAdmin))
+ __leave;
+
+ psdAdmin = LocalAlloc(LPTR, SECURITY_DESCRIPTOR_MIN_LENGTH);
+ if (psdAdmin == NULL)
+ __leave;
+
+ if (!InitializeSecurityDescriptor(psdAdmin,
+
+ SECURITY_DESCRIPTOR_REVISION))
+ __leave;
+
+ // Compute size needed for the ACL.
+ dwACLSize = sizeof(ACL) + sizeof(ACCESS_ALLOWED_ACE) +
+ GetLengthSid(psidAdmin) - sizeof(DWORD);
+
+ pACL = (PACL)LocalAlloc(LPTR, dwACLSize);
+ if (pACL == NULL)
+ __leave;
+
+ if (!InitializeAcl(pACL, dwACLSize, ACL_REVISION2))
+ __leave;
+
+ dwAccessMask = ACCESS_READ | ACCESS_WRITE;
+
+ if (!AddAccessAllowedAce(pACL, ACL_REVISION2, dwAccessMask,
+
+ psidAdmin))
+ __leave;
+
+ if (!SetSecurityDescriptorDacl(psdAdmin, TRUE, pACL, FALSE))
+ __leave;
+
+ /*
+ AccessCheck validates a security descriptor somewhat;
+ set the group and owner so that enough of the security descriptor is
+ filled out to make AccessCheck happy.
+ */
+ SetSecurityDescriptorGroup(psdAdmin, psidAdmin, FALSE);
+ SetSecurityDescriptorOwner(psdAdmin, psidAdmin, FALSE);
+
+ if (!IsValidSecurityDescriptor(psdAdmin))
+ __leave;
+
+ dwAccessDesired = ACCESS_READ;
+
+ /*
+ Initialize GenericMapping structure even though you
+ do not use generic rights.
+ */
+ GenericMapping.GenericRead = ACCESS_READ;
+ GenericMapping.GenericWrite = ACCESS_WRITE;
+ GenericMapping.GenericExecute = 0;
+ GenericMapping.GenericAll = ACCESS_READ | ACCESS_WRITE;
+
+ if (!AccessCheck(psdAdmin, hImpersonationToken, dwAccessDesired,
+ &GenericMapping, &ps, &dwStructureSize, &dwStatus,
+ &fReturn))
+ {
+ fReturn = FALSE;
+ __leave;
+ }
+ }
+ __finally
+ {
+ // Clean up.
+ if (pACL) LocalFree(pACL);
+ if (psdAdmin) LocalFree(psdAdmin);
+ if (psidAdmin) FreeSid(psidAdmin);
+ if (hImpersonationToken) CloseHandle(hImpersonationToken);
+ if (hToken) CloseHandle(hToken);
+ }
+
+ return fReturn == TRUE;
+#else
+ return false;
+#endif
+}
diff --git a/src/common/winapi.h b/src/common/winapi.hpp
similarity index 51%
rename from src/common/winapi.h
rename to src/common/winapi.hpp
index 7ce5550492d..ffb8b0c13b4 100644
--- a/src/common/winapi.h
+++ b/src/common/winapi.hpp
@@ -1,11 +1,24 @@
#pragma once
+#include <sdkddkver.h>
+
+#ifndef NTDDI_VERSION
+ #define NTDDI_VERSION 0x05000000 // Windows 2000
+#endif
+#ifndef _WIN32_WINNT
+ #define _WIN32_WINNT 0x0500 // Windows 2000
+#endif
+#ifndef WINVER
+ #define WINVER 0x0500 // Windows 2000
+#endif
+#ifndef _WIN32_IE
+ #define _WIN32_IE 0x0600 // Internet Explorer 6.0
+#endif
+#ifndef _WIN32_WINNT_VISTA
+ #define _WIN32_WINNT_VISTA 0x0600 // Windows Vista
+#endif
#define STRICT
-#define NTDDI_VERSION NTDDI_WIN2K
-#define _WIN32_WINNT 0x0500
-#define WINVER 0x0500
-#define _WIN32_IE 0x0600
#define WIN32_LEAN_AND_MEAN
#define NOCOMM
#define NOKANJI
@@ -33,4 +46,6 @@
#include <Mswsock.h>
#include <MMSystem.h>
+#include "cbasetypes.h"
+bool IsCurrentUserLocalAdministrator(void);
diff --git a/src/common/yamlwrapper.cpp b/src/common/yamlwrapper.cpp
index 59838720aa5..e6b5677220f 100644
--- a/src/common/yamlwrapper.cpp
+++ b/src/common/yamlwrapper.cpp
@@ -28,11 +28,16 @@
extern "C" {
yamlwrapper::yamlwrapper(YAML::Node node) {
- this->root = node;
+ try {
+ this->root = node;
+ }
+ catch (std::exception) {
+ //ignore
+ }
}
-yamliterator::yamliterator(YAML::Node sequence) {
- this->sequence = sequence;
+yamliterator::yamliterator(YAML::Node sequence_) {
+ this->sequence = sequence_;
this->index = 0;
}
@@ -41,13 +46,21 @@ yamliterator* yamlwrapper::iterator() {
}
yamlwrapper* yaml_load_file(const char* file_name) {
- YAML::Node node = YAML::LoadFile(file_name);
- if (!node.IsDefined())
+ YAML::Node node;
+
+ try {
+ node = YAML::LoadFile(file_name);
+ } catch (YAML::ParserException &e) {
+ ShowError("YAML Exception Caught: %s\n", e.what());
+ return NULL;
+ } catch (YAML::BadFile) {
return NULL;
+ }
+
return new yamlwrapper(node);
}
-extern "C++" YAML::Node yaml_get_node(YAML::Node& node, std::string& key) {
+extern "C++" YAML::Node yaml_get_node(const YAML::Node& node,const std::string& key) {
if (key.empty())
return node;
@@ -103,10 +116,86 @@ int64 yaml_get_int64(yamlwrapper* wrapper, const char* key) {
return yaml_get_value<int64>(wrapper, key);
}
+int yaml_get_uint(yamlwrapper* wrapper, const char* key) {
+ return yaml_get_value<unsigned int>(wrapper, key);
+}
+
+int16 yaml_get_uint16(yamlwrapper* wrapper, const char* key) {
+ return yaml_get_value<uint16>(wrapper, key);
+}
+
+int32 yaml_get_uint32(yamlwrapper* wrapper, const char* key) {
+ return yaml_get_value<uint32>(wrapper, key);
+}
+
+int64 yaml_get_uint64(yamlwrapper* wrapper, const char* key) {
+ return yaml_get_value<uint64>(wrapper, key);
+}
+
bool yaml_get_boolean(yamlwrapper* wrapper, const char* key) {
return yaml_get_value<bool>(wrapper, key);
}
+char* yaml_as_c_string(yamlwrapper* wrapper) {
+ std::string cpp_str = wrapper->root.as<std::string>();
+ const char* c_str = cpp_str.c_str();
+ size_t str_size = std::strlen(c_str) + 1;
+ char* buf = (char*)aCalloc(1, str_size);
+ strcpy(buf, c_str);
+ return buf;
+}
+
+extern "C++" {
+ template<typename T>
+ T yaml_as_value(yamlwrapper* wrapper) {
+ if (wrapper == nullptr)
+ return {};
+ try {
+ return wrapper->root.as<T>();
+ }
+ catch (const std::exception& e) {
+ ShowError("Error during YAML node value resolving in node %s.\n", e.what());
+ return {};
+ }
+ }
+}
+
+int yaml_as_int(yamlwrapper* wrapper) {
+ return yaml_as_value<int>(wrapper);
+}
+
+int16 yaml_as_int16(yamlwrapper* wrapper) {
+ return yaml_as_value<int16>(wrapper);
+}
+
+int32 yaml_as_int32(yamlwrapper* wrapper) {
+ return yaml_as_value<int32>(wrapper);
+}
+
+int64 yaml_as_int64(yamlwrapper* wrapper) {
+ return yaml_as_value<int64>(wrapper);
+}
+
+int yaml_as_uint(yamlwrapper* wrapper) {
+ return yaml_as_value<unsigned int>(wrapper);
+}
+
+int16 yaml_as_uint16(yamlwrapper* wrapper) {
+ return yaml_as_value<uint16>(wrapper);
+}
+
+int32 yaml_as_uint32(yamlwrapper* wrapper) {
+ return yaml_as_value<uint32>(wrapper);
+}
+
+int64 yaml_as_uint64(yamlwrapper* wrapper) {
+ return yaml_as_value<uint64>(wrapper);
+}
+
+bool yaml_as_boolean(yamlwrapper* wrapper) {
+ return yaml_as_value<bool>(wrapper);
+}
+
bool yaml_node_is_defined(yamlwrapper* wrapper, const char* key) {
if (wrapper == nullptr || key == nullptr)
return false;
@@ -117,6 +206,14 @@ yamlwrapper* yaml_get_subnode(yamlwrapper* wrapper, const char* key) {
return new yamlwrapper(yaml_get_node(wrapper->root, std::string(key)));
}
+char* yaml_verify_nodes(yamlwrapper* wrapper, int amount, char** nodes) {
+ for (int i = 0; i < amount; i++) {
+ if (!yaml_node_is_defined(wrapper, nodes[i]))
+ return nodes[i];
+ }
+ return NULL;
+}
+
yamliterator* yaml_get_iterator(yamlwrapper* wrapper) {
return new yamliterator(wrapper->root);
}
diff --git a/src/common/yamlwrapper.h b/src/common/yamlwrapper.h
index d6f7069c4a4..3a01a759457 100644
--- a/src/common/yamlwrapper.h
+++ b/src/common/yamlwrapper.h
@@ -42,7 +42,7 @@ class yamliterator {
public:
YAML::Node sequence;
unsigned int index;
- yamliterator(YAML::Node sequence);
+ yamliterator(YAML::Node sequence_);
};
class yamlwrapper {
@@ -64,9 +64,24 @@ int yaml_get_int(yamlwrapper* wrapper, const char* key);
int16 yaml_get_int16(yamlwrapper* wrapper, const char* key);
int32 yaml_get_int32(yamlwrapper* wrapper, const char* key);
int64 yaml_get_int64(yamlwrapper* wrapper, const char* key);
+int yaml_get_uint(yamlwrapper* wrapper, const char* key);
+int16 yaml_get_uint16(yamlwrapper* wrapper, const char* key);
+int32 yaml_get_uint32(yamlwrapper* wrapper, const char* key);
+int64 yaml_get_uint64(yamlwrapper* wrapper, const char* key);
bool yaml_get_boolean(yamlwrapper* wrapper, const char* key);
+char* yaml_as_c_string(yamlwrapper* wrapper);
+int yaml_as_int(yamlwrapper* wrapper);
+int16 yaml_as_int16(yamlwrapper* wrapper);
+int32 yaml_as_int32(yamlwrapper* wrapper);
+int64 yaml_as_int64(yamlwrapper* wrapper);
+int yaml_as_uint(yamlwrapper* wrapper);
+int16 yaml_as_uint16(yamlwrapper* wrapper);
+int32 yaml_as_uint32(yamlwrapper* wrapper);
+int64 yaml_as_uint64(yamlwrapper* wrapper);
+bool yaml_as_boolean(yamlwrapper* wrapper);
bool yaml_node_is_defined(yamlwrapper* wrapper, const char* key);
yamlwrapper* yaml_get_subnode(yamlwrapper* wrapper, const char* key);
+char* yaml_verify_nodes(yamlwrapper* wrapper, int amount, char** nodes);
yamliterator* yaml_get_iterator(yamlwrapper* wrapper);
bool yaml_iterator_is_valid(yamliterator* it);
diff --git a/src/config/core.h b/src/config/core.h
index e6febaf11f7..6f39af8b9c4 100644
--- a/src/config/core.h
+++ b/src/config/core.h
@@ -8,6 +8,8 @@
* For detailed guidance on these check http://rathena.org/wiki/SRC/config/
**/
+#include "../custom/defines_pre.h"
+
/// Max number of items on @autolootid list
#define AUTOLOOTITEM_SIZE 10
@@ -20,13 +22,6 @@
/// while with OFFICIAL_WALKPATH disabled if they click to walk around a obstacle the server will do it automatically
#define OFFICIAL_WALKPATH
-/// leave this line uncommented to enable callfunc checks when processing scripts.
-/// while allowed, the script engine will attempt to match user-defined functions
-/// in scripts allowing direct function callback (without the use of callfunc.)
-/// this CAN affect performance, so if you find scripts running slower or find
-/// your map-server using more resources while this is active, comment the line
-#define SCRIPT_CALLFUNC_CHECK
-
/// uncomment to enable query_sql script command and mysql logs to function on it's own thread
/// be aware this feature is under tests and you should use at your own risk, we however
/// welcome any feedback you may have regarding this feature, please send us all bug reports.
@@ -76,12 +71,6 @@
#define MAX_CHAR_BILLING 0 // This must be less than MAX_CHARS
#endif
-/// Comment to disable the official packet obfuscation support.
-/// When enabled, make sure there is value for 'packet_keys' of used packet version or
-/// defined 'packet_keys_use' in db/[import/]packet_db.txt.
-/// This requires PACKETVER 2011-08-17 or newer.
-#define PACKET_OBFUSCATION
-
/// Comment to disable warnings for deprecated script commands
#define SCRIPT_COMMAND_DEPRECATION
@@ -91,6 +80,7 @@
/**
* No settings past this point
**/
+#include "./packets.h"
#include "./renewal.h"
#include "./secure.h"
#include "./classes/general.h"
@@ -100,4 +90,6 @@
**/
#include "./const.h"
+#include "../custom/defines_post.h"
+
#endif // _CONFIG_CORE_H_
diff --git a/src/config/packets.h b/src/config/packets.h
new file mode 100644
index 00000000000..6c1506837b0
--- /dev/null
+++ b/src/config/packets.h
@@ -0,0 +1,66 @@
+// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+#ifndef _CONFIG_PACKETS_H_
+#define _CONFIG_PACKETS_H_
+
+/**
+ * rAthena configuration file (http://rathena.org)
+ * For detailed guidance on these check http://rathena.org/wiki/SRC/config/
+ **/
+
+#ifndef PACKETVER
+ /// Do NOT edit this line! To set your client version, please do this instead:
+ /// In Windows: Add this line in your src\custom\defines_pre.h file: #define PACKETVER YYYYMMDD
+ /// In Linux: The same as above or run the following command: ./configure --enable-packetver=YYYYMMDD
+ #define PACKETVER 20151104
+#endif
+
+#ifndef PACKETVER_RE
+ /// From this point on only kRO RE clients are supported
+ #if PACKETVER > 20151104
+ #define PACKETVER_RE
+ #endif
+#endif
+
+#if PACKETVER >= 20110817
+ /// Comment to disable the official packet obfuscation support.
+ /// This requires PACKETVER 2011-08-17 or newer.
+ #ifndef PACKET_OBFUSCATION
+ #define PACKET_OBFUSCATION
+
+ // Define these inside src/custom/defines_pre.h or src/custom/defines_post.h
+ //#define PACKET_OBFUSCATION_KEY1 <key1>
+ //#define PACKET_OBFUSCATION_KEY2 <key2>
+ //#define PACKET_OBFUSCATION_KEY3 <key3>
+
+ /// Comment this to disable warnings for missing client side encryption
+ #define PACKET_OBFUSCATION_WARN
+ #endif
+#else
+ #if defined(PACKET_OBFUSCATION)
+ #error You enabled packet obfuscation for a version which is too old. Minimum supported client is 2011-08-17.
+ #endif
+#endif
+
+#ifndef DUMP_UNKNOWN_PACKET
+ //#define DUMP_UNKNOWN_PACKET
+#endif
+
+#ifndef DUMP_INVALID_PACKET
+ //#define DUMP_INVALID_PACKET
+#endif
+
+/**
+ * No settings past this point
+ **/
+
+/// Check if the specified packetversion supports the pincode system
+#define PACKETVER_SUPPORTS_PINCODE PACKETVER >= 20110309
+
+/// Check if the client needs delete_date as remaining time and not the actual delete_date (actually it was tested for clients since 2013)
+#define PACKETVER_CHAR_DELETEDATE (PACKETVER > 20130000 && PACKETVER <= 20141022) || PACKETVER >= 20150513
+
+/// Check if the specified packetvresion supports the cashshop sale system
+#define PACKETVER_SUPPORTS_SALES PACKETVER >= 20131223
+
+#endif // _CONFIG_PACKETS_H_
diff --git a/src/custom/atcommand.inc b/src/custom/atcommand.inc
index afb74b2b24b..20951667987 100644
--- a/src/custom/atcommand.inc
+++ b/src/custom/atcommand.inc
@@ -14,6 +14,6 @@
//ACMD_FUNC(newcommand)
//{
// clif_displaymessage(fd, "It works!");
-// clif_specialeffect(&sd->bl, 343, AREA);
+// clif_specialeffect(&sd->bl, EF_HEARTCASTING, AREA);
// return 0;
//}
diff --git a/src/custom/defines_post.h b/src/custom/defines_post.h
new file mode 100644
index 00000000000..33f34d4a779
--- /dev/null
+++ b/src/custom/defines_post.h
@@ -0,0 +1,13 @@
+// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+#ifndef _CONFIG_CUSTOM_DEFINES_POST_H_
+#define _CONFIG_CUSTOM_DEFINES_POST_H_
+
+/**
+ * rAthena configuration file (http://rathena.org)
+ * For detailed guidance on these check http://rathena.org/wiki/SRC/config/
+ **/
+
+
+
+#endif // _CONFIG_CUSTOM_DEFINES_POST_H_
diff --git a/src/custom/defines_pre.h b/src/custom/defines_pre.h
new file mode 100644
index 00000000000..ceed7e774c4
--- /dev/null
+++ b/src/custom/defines_pre.h
@@ -0,0 +1,13 @@
+// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+#ifndef _CONFIG_CUSTOM_DEFINES_PRE_H_
+#define _CONFIG_CUSTOM_DEFINES_PRE_H_
+
+/**
+ * rAthena configuration file (http://rathena.org)
+ * For detailed guidance on these check http://rathena.org/wiki/SRC/config/
+ **/
+
+
+
+#endif // _CONFIG_CUSTOM_DEFINES_PRE_H_
diff --git a/src/login/CMakeLists.txt b/src/login/CMakeLists.txt
index ec86c98d683..87da45c0288 100644
--- a/src/login/CMakeLists.txt
+++ b/src/login/CMakeLists.txt
@@ -7,24 +7,10 @@ set( LOGIN_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "" )
#
if( BUILD_SERVERS )
message( STATUS "Creating target login-server" )
-set( LOGIN_HEADERS
- "${LOGIN_SOURCE_DIR}/account.h"
- "${LOGIN_SOURCE_DIR}/ipban.h"
- "${LOGIN_SOURCE_DIR}/login.h"
- "${LOGIN_SOURCE_DIR}/loginclif.h"
- "${LOGIN_SOURCE_DIR}/loginchrif.h"
- "${LOGIN_SOURCE_DIR}/logincnslif.h"
- "${LOGIN_SOURCE_DIR}/loginlog.h"
- )
-set( LOGIN_SOURCES
- "${LOGIN_SOURCE_DIR}/account.c"
- "${LOGIN_SOURCE_DIR}/ipban.c"
- "${LOGIN_SOURCE_DIR}/login.c"
- "${LOGIN_SOURCE_DIR}/loginclif.c"
- "${LOGIN_SOURCE_DIR}/loginchrif.c"
- "${LOGIN_SOURCE_DIR}/logincnslif.c"
- "${LOGIN_SOURCE_DIR}/loginlog.c"
- )
+file(GLOB LOGIN_HEADERS ${LOGIN_SOURCE_DIR}/*.hpp)
+file(GLOB LOGIN_SOURCES_CXX ${LOGIN_SOURCE_DIR}/*.cpp)
+set(LOGIN_SOURCES ${LOGIN_SOURCES_C} ${LOGIN_SOURCES_CXX})
+#message( STATUS "LOGIN_SOURCES="${LOGIN_SOURCES})
set( DEPENDENCIES common )
set( LIBRARIES ${GLOBAL_LIBRARIES} )
set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${COMMON_BASE_INCLUDE_DIRS} )
@@ -33,6 +19,7 @@ set( SOURCE_FILES ${COMMON_BASE_HEADERS} ${COMMON_HEADERS} ${LOGIN_HEADERS} ${LO
source_group( common FILES ${COMMON_BASE_HEADERS} ${COMMON_HEADERS} )
source_group( login FILES ${LOGIN_HEADERS} ${LOGIN_SOURCES} )
include_directories( ${INCLUDE_DIRS} )
+
add_executable( login-server ${SOURCE_FILES} )
add_dependencies( login-server ${DEPENDENCIES} )
target_link_libraries( login-server ${LIBRARIES} ${DEPENDENCIES} )
diff --git a/src/login/Makefile.in b/src/login/Makefile.in
index f6d3ba67a7a..c9a5515a1ba 100644
--- a/src/login/Makefile.in
+++ b/src/login/Makefile.in
@@ -11,9 +11,9 @@ LIBCONFIG_H = $(shell ls ../../3rdparty/libconfig/*.h)
LIBCONFIG_AR = ../../3rdparty/libconfig/obj/libconfig.a
LIBCONFIG_INCLUDE = -I../../3rdparty/libconfig
-LOGIN_OBJ = $(shell ls *.c | sed -e "s/\.c/\.o/g") $(shell ls *.cpp | sed -e "s/\.cpp/\.o/g")
+LOGIN_OBJ = $(shell ls *.cpp | sed -e "s/\.cpp/\.o/g")
LOGIN_DIR_OBJ = $(LOGIN_OBJ:%=obj/%)
-LOGIN_H = $(shell ls *.h)
+LOGIN_H = $(shell ls *.hpp)
HAVE_MYSQL=@HAVE_MYSQL@
ifeq ($(HAVE_MYSQL),yes)
@@ -23,8 +23,6 @@ else
endif
ALL_DEPENDS=server
-CXXFLAGS=-std=c++11
-
@SET_MAKE@
#####################################################################
diff --git a/src/login/account.c b/src/login/account.cpp
similarity index 99%
rename from src/login/account.c
rename to src/login/account.cpp
index e8eb6045b82..d8840dcabc2 100644
--- a/src/login/account.c
+++ b/src/login/account.cpp
@@ -7,14 +7,18 @@
* @author rAthena Dev Team
*/
+#include "account.hpp"
+
+#include <stdlib.h>
+#include <string.h>
+#include <algorithm> //min / max
+
#include "../common/malloc.h"
#include "../common/mmo.h"
#include "../common/showmsg.h"
#include "../common/socket.h"
#include "../common/sql.h"
#include "../common/strlib.h"
-#include "account.h"
-#include <stdlib.h>
/// global defines
@@ -309,10 +313,7 @@ static bool account_db_sql_create(AccountDB* self, struct mmo_account* acc) {
Sql_GetData(sql_handle, 0, &data, &len);
account_id = ( data != NULL ) ? atoi(data) : 0;
Sql_FreeResult(sql_handle);
-
- if( account_id < START_ACCOUNT_NUM )
- account_id = START_ACCOUNT_NUM;
-
+ account_id = max((uint32_t) START_ACCOUNT_NUM, account_id);
}
// zero value is prohibited
diff --git a/src/login/account.h b/src/login/account.hpp
similarity index 96%
rename from src/login/account.h
rename to src/login/account.hpp
index 5c287b16afe..319fc7fac43 100644
--- a/src/login/account.h
+++ b/src/login/account.hpp
@@ -7,12 +7,9 @@
* @author rAthena Dev Team
*/
-#ifndef __ACCOUNT_H_INCLUDED__
-#define __ACCOUNT_H_INCLUDED__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#pragma once
+#ifndef _ACCOUNT_HPP_
+#define _ACCOUNT_HPP_
#include "../common/cbasetypes.h"
#include "../common/mmo.h" // ACCOUNT_REG2_NUM
@@ -145,8 +142,5 @@ struct AccountDB {
void mmo_send_global_accreg(AccountDB* self, int fd, int account_id, int char_id);
void mmo_save_global_accreg(AccountDB* self, int fd, int account_id, int char_id);
-#ifdef __cplusplus
-}
-#endif
-#endif // __ACCOUNT_H_INCLUDED__
+#endif /* _ACCOUNT_HPP_ */
diff --git a/src/login/ipban.c b/src/login/ipban.cpp
similarity index 97%
rename from src/login/ipban.c
rename to src/login/ipban.cpp
index d204ac84a52..4363129e527 100644
--- a/src/login/ipban.c
+++ b/src/login/ipban.cpp
@@ -8,15 +8,18 @@
* @author rAthena Dev Team
*/
+#include "ipban.hpp"
+
+#include <stdlib.h>
+#include <string.h>
+
#include "../common/cbasetypes.h"
#include "../common/showmsg.h"
#include "../common/sql.h"
#include "../common/strlib.h"
#include "../common/timer.h"
-#include "login.h"
-#include "ipban.h"
-#include "loginlog.h"
-#include <stdlib.h>
+#include "login.hpp"
+#include "loginlog.hpp"
// login sql settings
static char ipban_db_hostname[32] = "127.0.0.1";
@@ -155,10 +158,10 @@ bool ipban_config_read(const char* key, const char* value) {
safestrncpy(ipban_table, value, sizeof(ipban_table));
else
if( strcmpi(key, "enable") == 0 )
- login_config.ipban = (bool)config_switch(value);
+ login_config.ipban = (config_switch(value) != 0);
else
if( strcmpi(key, "dynamic_pass_failure_ban") == 0 )
- login_config.dynamic_pass_failure_ban = (bool)config_switch(value);
+ login_config.dynamic_pass_failure_ban = (config_switch(value) != 0);
else
if( strcmpi(key, "dynamic_pass_failure_ban_interval") == 0 )
login_config.dynamic_pass_failure_ban_interval = atoi(value);
diff --git a/src/login/ipban.h b/src/login/ipban.hpp
similarity index 88%
rename from src/login/ipban.h
rename to src/login/ipban.hpp
index 54a3930f096..64c91d6229a 100644
--- a/src/login/ipban.h
+++ b/src/login/ipban.hpp
@@ -8,12 +8,9 @@
* @author rAthena Dev Team
*/
-#ifndef __IPBAN_H_INCLUDED__
-#define __IPBAN_H_INCLUDED__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#pragma once
+#ifndef _IPBAN_HPP_
+#define _IPBAN_HPP_
#include "../common/cbasetypes.h"
@@ -51,8 +48,4 @@ void ipban_init(void);
*/
void ipban_final(void);
-#ifdef __cplusplus
-}
-#endif
-
-#endif // __IPBAN_H_INCLUDED__
+#endif /* _IPBAN_HPP_ */
diff --git a/src/login/login-server.vcxproj b/src/login/login-server.vcxproj
index 8db89069522..7b10d4ca411 100644
--- a/src/login/login-server.vcxproj
+++ b/src/login/login-server.vcxproj
@@ -27,26 +27,26 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
@@ -155,24 +155,22 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClInclude Include="account.h" />
- <ClInclude Include="ipban.h" />
- <ClInclude Include="login.h" />
- <ClInclude Include="loginchrif.h" />
- <ClInclude Include="loginclif.h" />
- <ClInclude Include="logincnslif.h" />
- <ClInclude Include="loginlog.h" />
+ <ClInclude Include="account.hpp" />
+ <ClInclude Include="ipban.hpp" />
+ <ClInclude Include="login.hpp" />
+ <ClInclude Include="loginchrif.hpp" />
+ <ClInclude Include="loginclif.hpp" />
+ <ClInclude Include="logincnslif.hpp" />
+ <ClInclude Include="loginlog.hpp" />
</ItemGroup>
<ItemGroup>
- <ClCompile Include="account.c" />
- <ClCompile Include="ipban.c" />
- <ClCompile Include="login.cpp">
- <CompileAs>CompileAsCpp</CompileAs>
- </ClCompile>
- <ClCompile Include="loginchrif.c" />
- <ClCompile Include="loginclif.c" />
- <ClCompile Include="logincnslif.c" />
- <ClCompile Include="loginlog.c" />
+ <ClCompile Include="account.cpp" />
+ <ClCompile Include="ipban.cpp" />
+ <ClCompile Include="login.cpp" />
+ <ClCompile Include="loginchrif.cpp" />
+ <ClCompile Include="loginclif.cpp" />
+ <ClCompile Include="logincnslif.cpp" />
+ <ClCompile Include="loginlog.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/src/login/login-server.vcxproj.filters b/src/login/login-server.vcxproj.filters
index 39fb2e27fc9..beb212467a7 100644
--- a/src/login/login-server.vcxproj.filters
+++ b/src/login/login-server.vcxproj.filters
@@ -11,45 +11,45 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="account.h">
+ <ClInclude Include="account.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="ipban.h">
+ <ClInclude Include="ipban.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="login.h">
+ <ClInclude Include="login.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="loginchrif.h">
+ <ClInclude Include="loginchrif.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="loginclif.h">
+ <ClInclude Include="loginclif.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="logincnslif.h">
+ <ClInclude Include="logincnslif.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="loginlog.h">
+ <ClInclude Include="loginlog.hpp">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="account.c">
+ <ClCompile Include="account.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="ipban.c">
+ <ClCompile Include="ipban.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="loginchrif.c">
+ <ClCompile Include="loginchrif.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="loginclif.c">
+ <ClCompile Include="loginclif.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="logincnslif.c">
+ <ClCompile Include="logincnslif.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="loginlog.c">
+ <ClCompile Include="loginlog.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="login.cpp">
diff --git a/src/login/login.cpp b/src/login/login.cpp
index f525f1d59b0..da3bd8a3a09 100644
--- a/src/login/login.cpp
+++ b/src/login/login.cpp
@@ -9,6 +9,11 @@
*/
#pragma warning(disable:4800)
+#include "login.hpp"
+
+#include <stdlib.h>
+#include <string.h>
+#include <string>
#include "../common/core.h"
#include "../common/db.h"
@@ -24,15 +29,12 @@
#include "../common/utils.h"
#include "../common/mmo.h"
#include "../config/core.h"
-#include "account.h"
-#include "ipban.h"
-#include "login.h"
-#include "loginlog.h"
-#include "loginclif.h"
-#include "loginchrif.h"
-#include "logincnslif.h"
-
-#include <stdlib.h>
+#include "account.hpp"
+#include "ipban.hpp"
+#include "loginlog.hpp"
+#include "loginclif.hpp"
+#include "loginchrif.hpp"
+#include "logincnslif.hpp"
#define LOGIN_MAX_MSG 30 /// Max number predefined in msg_conf
static char* msg_table[LOGIN_MAX_MSG]; /// Login Server messages_conf
@@ -303,13 +305,6 @@ int login_mmo_auth(struct login_session_data* sd, bool isServer) {
}
- //Client Version check
- if( login_config.check_client_version && sd->version != login_config.client_version_to_connect ){
- ShowNotice("Invalid version (account: '%s', auth_vers: '%d', received version: '%d', ip: %s)\n",
- sd->userid, login_config.client_version_to_connect, sd->version, ip);
- return 5;
- }
-
len = strnlen(sd->userid, NAME_LENGTH);
// Account creation with _M/_F
@@ -591,10 +586,6 @@ bool login_config_read(const char* cfgName, bool normal) {
login_config.new_acc_length_limit = (bool)config_switch(w2);
else if(!strcmpi(w1, "start_limited_time"))
login_config.start_limited_time = atoi(w2);
- else if(!strcmpi(w1, "check_client_version"))
- login_config.check_client_version = (bool)config_switch(w2);
- else if(!strcmpi(w1, "client_version_to_connect"))
- login_config.client_version_to_connect = strtoul(w2, NULL, 10);
else if(!strcmpi(w1, "use_MD5_passwords"))
login_config.use_md5_passwds = (bool)config_switch(w2);
else if(!strcmpi(w1, "group_id_to_connect"))
@@ -701,9 +692,6 @@ void login_set_defaults() {
login_config.use_md5_passwds = false;
login_config.group_id_to_connect = -1;
login_config.min_group_id_to_connect = -1;
- login_config.check_client_version = false;
- login_config.client_version_to_connect = date2version(PACKETVER); //20120410 => 30
- ShowInfo("loginconfig: client_version_to_connect = %d\n",login_config.client_version_to_connect);
login_config.ipban = true;
login_config.dynamic_pass_failure_ban = true;
diff --git a/src/login/login.h b/src/login/login.hpp
similarity index 95%
rename from src/login/login.h
rename to src/login/login.hpp
index 670533b2952..1923c17e478 100644
--- a/src/login/login.h
+++ b/src/login/login.hpp
@@ -8,17 +8,18 @@
* @author rAthena Dev Team
*/
-#ifndef _LOGIN_H_
-#define _LOGIN_H_
+#pragma once
+#ifndef _LOGIN_HPP_
+#define _LOGIN_HPP_
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <memory>
+#include "../config/core.h"
+#include "../common/cbasetypes.h"
#include "../common/mmo.h" // NAME_LENGTH,SEX_*
#include "../common/core.h" // CORE_ST_LAST
-#include "account.h"
-#include "../config/core.h"
+
+#include "account.hpp"
enum E_LOGINSERVER_ST {
LOGINSERVER_ST_RUNNING = CORE_ST_LAST,
@@ -46,7 +47,6 @@ struct login_session_data {
char lastlogin[24]; ///date when last logged, Y-M-D HH:MM:SS
uint8 group_id; ///groupid of account
uint8 clienttype; /// ???
- uint32 version; ///version contained in clientinfo
uint8 client_hash[16]; ///hash of client
int has_client_hash; ///client ha sent an hash
@@ -86,8 +86,6 @@ struct Login_Config {
bool use_md5_passwds; /// work with password hashes instead of plaintext passwords?
int group_id_to_connect; /// required group id to connect
int min_group_id_to_connect; /// minimum group id to connect
- bool check_client_version; /// check the clientversion set in the clientinfo ?
- uint32 client_version_to_connect; /// the client version needed to connect (if checking is enabled)
bool ipban; /// perform IP blocking (via contents of `ipbanlist`) ?
bool dynamic_pass_failure_ban; /// automatic IP blocking due to failed login attempts ?
@@ -143,7 +141,6 @@ struct auth_node {
uint32 login_id2;
uint32 ip;
char sex;
- uint32 version;
uint8 clienttype;
};
extern DBMap* auth_db; // uint32 account_id -> struct auth_node*
@@ -238,8 +235,5 @@ int login_mmo_auth_new(const char* userid, const char* pass, const char sex, con
*/
int login_mmo_auth(struct login_session_data* sd, bool isServer);
-#ifdef __cplusplus
-}
-#endif
-#endif /* _LOGIN_H_ */
+#endif /* _LOGIN_HPP_ */
diff --git a/src/login/loginchrif.c b/src/login/loginchrif.cpp
similarity index 96%
rename from src/login/loginchrif.c
rename to src/login/loginchrif.cpp
index 3ef53ff289f..f364403b3b5 100644
--- a/src/login/loginchrif.c
+++ b/src/login/loginchrif.cpp
@@ -7,16 +7,19 @@
* @author rAthena Dev Team
*/
+#include "loginchrif.hpp"
+
+#include <stdlib.h>
+#include <string.h>
+
#include "../common/timer.h" //difftick
#include "../common/strlib.h" //safeprint
#include "../common/showmsg.h" //show notice
#include "../common/socket.h" //wfifo session
-#include "account.h"
-#include "login.h"
-#include "loginlog.h"
-#include "loginchrif.h"
-#include <stdlib.h>
+#include "account.hpp"
+#include "login.hpp"
+#include "loginlog.hpp"
//early declaration
void logchrif_on_disconnect(int id);
@@ -52,7 +55,7 @@ int logchrif_sendallwos(int sfd, uint8* buf, size_t len) {
* @param data: unused
* @return 0
*/
-static int logchrif_sync_ip_addresses(int tid, unsigned int tick, int id, intptr_t data) {
+int logchrif_sync_ip_addresses(int tid, unsigned int tick, int id, intptr_t data) {
uint8 buf[2];
ShowInfo("IP Sync in progress...\n");
WBUFW(buf,0) = 0x2735;
@@ -96,7 +99,7 @@ int logchrif_parse_reqauth(int fd, int id,char* ip){
//ShowStatus("Char-server '%s': authentication of the account %d accepted (ip: %s).\n", server[id].name, account_id, ip);
// send ack
- WFIFOHEAD(fd,25);
+ WFIFOHEAD(fd,21);
WFIFOW(fd,0) = 0x2713;
WFIFOL(fd,2) = account_id;
WFIFOL(fd,6) = login_id1;
@@ -104,15 +107,14 @@ int logchrif_parse_reqauth(int fd, int id,char* ip){
WFIFOB(fd,14) = sex;
WFIFOB(fd,15) = 0;// ok
WFIFOL(fd,16) = request_id;
- WFIFOL(fd,20) = node->version;
- WFIFOB(fd,24) = node->clienttype;
- WFIFOSET(fd,25);
+ WFIFOB(fd,20) = node->clienttype;
+ WFIFOSET(fd,21);
// each auth entry can only be used once
idb_remove(auth_db, account_id);
}else{// authentication not found
ShowStatus("Char-server '%s': authentication of the account %d REFUSED (ip: %s).\n", ch_server[id].name, account_id, ip);
- WFIFOHEAD(fd,25);
+ WFIFOHEAD(fd,21);
WFIFOW(fd,0) = 0x2713;
WFIFOL(fd,2) = account_id;
WFIFOL(fd,6) = login_id1;
@@ -120,9 +122,8 @@ int logchrif_parse_reqauth(int fd, int id,char* ip){
WFIFOB(fd,14) = sex;
WFIFOB(fd,15) = 1;// auth failed
WFIFOL(fd,16) = request_id;
- WFIFOL(fd,20) = 0;
- WFIFOB(fd,24) = 0;
- WFIFOSET(fd,25);
+ WFIFOB(fd,20) = 0;
+ WFIFOSET(fd,21);
}
}
return 1;
@@ -716,15 +717,15 @@ int logchrif_parse_accinfo(int fd) {
if( RFIFOREST(fd) < 23 )
return 0;
else {
- int map_fd = RFIFOL(fd, 2), u_fd = RFIFOL(fd, 6), u_aid = RFIFOL(fd, 10), u_group = RFIFOL(fd, 14), account_id = RFIFOL(fd, 18);
- int8 type = RFIFOB(fd, 22);
+ int map_fd = RFIFOL(fd, 2), u_fd = RFIFOL(fd, 6), u_aid = RFIFOL(fd, 10), account_id = RFIFOL(fd, 14);
+ int8 type = RFIFOB(fd, 18);
AccountDB* accounts = login_get_accounts_db();
struct mmo_account acc;
- RFIFOSKIP(fd,23);
+ RFIFOSKIP(fd,19);
// Send back the result to char-server
if (accounts->load_num(accounts, &acc, account_id)) {
- int len = 155 + PINCODE_LENGTH + NAME_LENGTH;
+ int len = 122 + NAME_LENGTH;
//ShowInfo("Found account info for %d, requested by %d\n", account_id, u_aid);
WFIFOHEAD(fd, len);
WFIFOW(fd, 0) = 0x2721;
@@ -740,15 +741,7 @@ int logchrif_parse_accinfo(int fd) {
safestrncpy(WFIFOCP(fd, 71), acc.last_ip, 16);
safestrncpy(WFIFOCP(fd, 87), acc.lastlogin, 24);
safestrncpy(WFIFOCP(fd, 111), acc.birthdate, 11);
- if ((unsigned int)u_group >= acc.group_id) {
- safestrncpy(WFIFOCP(fd, 122), acc.pass, 33);
- safestrncpy(WFIFOCP(fd, 155), acc.pincode, PINCODE_LENGTH);
- }
- else {
- memset(WFIFOP(fd, 122), '\0', 33);
- memset(WFIFOP(fd, 155), '\0', PINCODE_LENGTH);
- }
- safestrncpy(WFIFOCP(fd, 155 + PINCODE_LENGTH), acc.userid, NAME_LENGTH);
+ safestrncpy(WFIFOCP(fd, 122), acc.userid, NAME_LENGTH);
WFIFOSET(fd, len);
}
else {
diff --git a/src/login/loginchrif.h b/src/login/loginchrif.hpp
similarity index 90%
rename from src/login/loginchrif.h
rename to src/login/loginchrif.hpp
index 698be696bae..1e449396979 100644
--- a/src/login/loginchrif.h
+++ b/src/login/loginchrif.hpp
@@ -7,12 +7,11 @@
* @author rAthena Dev Team
*/
-#ifndef LOGINCHRIF_H
-#define LOGINCHRIF_H
+#pragma once
+#ifndef _LOGINCHRIF_HPP_
+#define _LOGINCHRIF_HPP_
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "../common/cbasetypes.h"
/**
* Entry point from char-server to log-server.
@@ -48,9 +47,6 @@ void do_shutdown_loginchrif(void);
*/
void do_final_loginchrif(void);
-#ifdef __cplusplus
-}
-#endif
-#endif /* LOGINCHRIF_H */
+#endif /* _LOGINCHRIF_HPP_ */
diff --git a/src/login/loginclif.c b/src/login/loginclif.cpp
similarity index 91%
rename from src/login/loginclif.c
rename to src/login/loginclif.cpp
index 4ae3088d766..bcb9d84a410 100644
--- a/src/login/loginclif.c
+++ b/src/login/loginclif.cpp
@@ -7,6 +7,11 @@
* @author rAthena Dev Team
*/
+#include "loginclif.hpp"
+
+#include <stdlib.h>
+#include <string.h>
+
#include "../common/timer.h" //difftick
#include "../common/strlib.h" //safeprint
#include "../common/showmsg.h" //show notice
@@ -15,14 +20,12 @@
#include "../common/utils.h"
#include "../common/md5calc.h"
#include "../common/random.h"
-#include "account.h"
-#include "ipban.h" //ipban_check
-#include "login.h"
-#include "loginlog.h"
-#include "loginclif.h"
-#include "loginchrif.h"
-#include <stdlib.h>
+#include "account.hpp"
+#include "ipban.hpp" //ipban_check
+#include "login.hpp"
+#include "loginlog.hpp"
+#include "loginchrif.hpp"
/**
* Transmit auth result to client.
@@ -159,7 +162,6 @@ static void logclif_auth_ok(struct login_session_data* sd) {
node->login_id2 = sd->login_id2;
node->sex = sd->sex;
node->ip = ip;
- node->version = sd->version;
node->clienttype = sd->clienttype;
idb_put(auth_db, sd->account_id, node);
{
@@ -181,7 +183,7 @@ static void logclif_auth_ok(struct login_session_data* sd) {
3 = Rejected from Server
4 = You have been blocked by the GM Team
5 = Your Game's EXE file is not the latest version
- 6 = Your are Prohibited to log in until %s
+ 6 = You are prohibited to log in until %s
7 = Server is jammed due to over populated
8 = No more accounts may be connected from this company
9 = MSI_REFUSE_BAN_BY_DBA
@@ -216,37 +218,33 @@ static void logclif_auth_failed(struct login_session_data* sd, int result) {
if( (result == 0 || result == 1) && login_config.dynamic_pass_failure_ban )
ipban_log(ip); // log failed password attempt
-//#if PACKETVER >= 20120000 /* not sure when this started */
- if( sd->version >= date2version(20120000) ){ /* not sure when this started */
- WFIFOHEAD(fd,26);
- WFIFOW(fd,0) = 0x83e;
- WFIFOL(fd,2) = result;
- if( result != 6 )
- memset(WFIFOP(fd,6), '\0', 20);
- else { // 6 = Your are Prohibited to log in until %s
- struct mmo_account acc;
- AccountDB* accounts = login_get_accounts_db();
- time_t unban_time = ( accounts->load_str(accounts, &acc, sd->userid) ) ? acc.unban_time : 0;
- timestamp2string(WFIFOCP(fd,6), 20, unban_time, login_config.date_format);
- }
- WFIFOSET(fd,26);
+#if PACKETVER >= 20120000 /* not sure when this started */
+ WFIFOHEAD(fd,26);
+ WFIFOW(fd,0) = 0x83e;
+ WFIFOL(fd,2) = result;
+ if( result != 6 )
+ memset(WFIFOP(fd,6), '\0', 20);
+ else { // 6 = You are prohibited to log in until %s
+ struct mmo_account acc;
+ AccountDB* accounts = login_get_accounts_db();
+ time_t unban_time = ( accounts->load_str(accounts, &acc, sd->userid) ) ? acc.unban_time : 0;
+ timestamp2string(WFIFOCP(fd,6), 20, unban_time, login_config.date_format);
}
-//#else
- else {
- WFIFOHEAD(fd,23);
- WFIFOW(fd,0) = 0x6a;
- WFIFOB(fd,2) = (uint8)result;
- if( result != 6 )
- memset(WFIFOP(fd,3), '\0', 20);
- else { // 6 = Your are Prohibited to log in until %s
- struct mmo_account acc;
- AccountDB* accounts = login_get_accounts_db();
- time_t unban_time = ( accounts->load_str(accounts, &acc, sd->userid) ) ? acc.unban_time : 0;
- timestamp2string(WFIFOCP(fd,3), 20, unban_time, login_config.date_format);
- }
- WFIFOSET(fd,23);
+ WFIFOSET(fd,26);
+#else
+ WFIFOHEAD(fd,23);
+ WFIFOW(fd,0) = 0x6a;
+ WFIFOB(fd,2) = (uint8)result;
+ if( result != 6 )
+ memset(WFIFOP(fd,3), '\0', 20);
+ else { // 6 = You are prohibited to log in until %s
+ struct mmo_account acc;
+ AccountDB* accounts = login_get_accounts_db();
+ time_t unban_time = ( accounts->load_str(accounts, &acc, sd->userid) ) ? acc.unban_time : 0;
+ timestamp2string(WFIFOCP(fd,3), 20, unban_time, login_config.date_format);
}
-//#endif
+ WFIFOSET(fd,23);
+#endif
}
/**
@@ -306,7 +304,6 @@ static int logclif_parse_reqauth(int fd, struct login_session_data *sd, int comm
return 0;
else {
int result;
- uint32 version;
char username[NAME_LENGTH];
char password[PASSWD_LENGTH];
unsigned char passhash[16];
@@ -320,8 +317,6 @@ static int logclif_parse_reqauth(int fd, struct login_session_data *sd, int comm
size_t uAccLen = strlen(accname);
size_t uTokenLen = RFIFOREST(fd) - 0x5C;
- version = RFIFOL(fd,4);
-
if(uAccLen > NAME_LENGTH - 1 || uAccLen == 0 || uTokenLen > NAME_LENGTH - 1 || uTokenLen == 0)
{
logclif_auth_failed(sd, 3);
@@ -334,7 +329,6 @@ static int logclif_parse_reqauth(int fd, struct login_session_data *sd, int comm
}
else
{
- version = RFIFOL(fd,2);
safestrncpy(username, RFIFOCP(fd,6), NAME_LENGTH);
if( israwpass )
{
@@ -350,11 +344,10 @@ static int logclif_parse_reqauth(int fd, struct login_session_data *sd, int comm
RFIFOSKIP(fd,RFIFOREST(fd)); // assume no other packet was sent
sd->clienttype = clienttype;
- sd->version = version;
safestrncpy(sd->userid, username, NAME_LENGTH);
if( israwpass )
{
- ShowStatus("Request for connection of %s (ip: %s) version=%d\n", sd->userid, ip,sd->version);
+ ShowStatus("Request for connection of %s (ip: %s)\n", sd->userid, ip);
safestrncpy(sd->passwd, password, NAME_LENGTH);
if( login_config.use_md5_passwds )
MD5_String(sd->passwd, sd->passwd);
@@ -362,7 +355,7 @@ static int logclif_parse_reqauth(int fd, struct login_session_data *sd, int comm
}
else
{
- ShowStatus("Request for connection (passwdenc mode) of %s (ip: %s) version=%d\n", sd->userid, ip,sd->version);
+ ShowStatus("Request for connection (passwdenc mode) of %s (ip: %s)\n", sd->userid, ip);
bin2hex(sd->passwd, passhash, 16); // raw binary data here!
sd->passwdenc = PASSWORDENC;
}
@@ -430,7 +423,6 @@ static int logclif_parse_reqcharconnec(int fd, struct login_session_data *sd, ch
if( login_config.use_md5_passwds )
MD5_String(sd->passwd, sd->passwd);
sd->passwdenc = 0;
- sd->version = login_config.client_version_to_connect; // hack to skip version check
server_ip = ntohl(RFIFOL(fd,54));
server_port = ntohs(RFIFOW(fd,58));
safestrncpy(server_name, RFIFOCP(fd,60), 20);
@@ -495,7 +487,7 @@ int logclif_parse(int fd) {
if( session[fd]->flag.eof )
{
- ShowInfo("Closed connection from '"CL_WHITE"%s"CL_RESET"'.\n", ip);
+ ShowInfo("Closed connection from '" CL_WHITE "%s" CL_RESET "'.\n", ip);
do_close(fd);
return 0;
}
diff --git a/src/login/loginclif.h b/src/login/loginclif.hpp
similarity index 85%
rename from src/login/loginclif.h
rename to src/login/loginclif.hpp
index 2fe1aaef22f..b5e43088a22 100644
--- a/src/login/loginclif.h
+++ b/src/login/loginclif.hpp
@@ -7,12 +7,9 @@
* @author rAthena Dev Team
*/
-#ifndef _LOGINCLIF_H
-#define _LOGINCLIF_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#pragma once
+#ifndef _LOGINCLIF_HPP_
+#define _LOGINCLIF_HPP_
/**
* Entry point from client to log-server.
@@ -34,9 +31,5 @@ void do_init_loginclif(void);
*/
void do_final_loginclif(void);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _LOGINCLIF_H */
+#endif /* _LOGINCLIF_HPP_ */
diff --git a/src/login/logincnslif.c b/src/login/logincnslif.cpp
similarity index 97%
rename from src/login/logincnslif.c
rename to src/login/logincnslif.cpp
index d4580ae93db..e5055b3589c 100644
--- a/src/login/logincnslif.c
+++ b/src/login/logincnslif.cpp
@@ -7,6 +7,11 @@
* @author rAthena Dev Team
*/
+#include "logincnslif.hpp"
+
+#include <stdlib.h>
+#include <string.h>
+
#include "../common/mmo.h" //cbasetype + NAME_LENGTH
#include "../common/showmsg.h" //show notice
#include "../common/md5calc.h"
@@ -14,10 +19,8 @@
#include "../common/cli.h"
#include "../common/timer.h"
#include "../common/strlib.h"
-#include "login.h"
-#include "logincnslif.h"
-#include <stdlib.h>
+#include "login.hpp"
/**
* Login-server console help: starting option info.
@@ -121,7 +124,7 @@ int cnslif_parse(const char* buf){
runflag = 0;
}
else if( strcmpi("alive", command) == 0 || strcmpi("status", command) == 0 )
- ShowInfo(CL_CYAN"Console: "CL_BOLD"I'm Alive."CL_RESET"\n");
+ ShowInfo(CL_CYAN "Console: " CL_BOLD "I'm Alive." CL_RESET"\n");
else if( strcmpi("reloadconf", command) == 0 ) {
ShowInfo("Reloading config file \"%s\"\n", login_config.loginconf_name);
login_config_read(login_config.loginconf_name, false);
diff --git a/src/login/logincnslif.h b/src/login/logincnslif.hpp
similarity index 91%
rename from src/login/logincnslif.h
rename to src/login/logincnslif.hpp
index 67faf620bea..7ce329fee39 100644
--- a/src/login/logincnslif.h
+++ b/src/login/logincnslif.hpp
@@ -7,12 +7,18 @@
* @author rAthena Dev Team
*/
-#ifndef CONSOLEIF_H
-#define CONSOLEIF_H
+#pragma once
+#ifndef _LOGINCNSLIF_HPP_
+#define _LOGINCNSLIF_HPP_
-#ifdef __cplusplus
extern "C" {
-#endif
+/**
+ * Login-server console help: starting option info.
+ * Do not rename function used as extern.
+ * @param do_exit: terminate program execution ?
+ */
+void display_helpscreen(bool do_exit);
+}
/**
* Console Command Parser
@@ -33,13 +39,6 @@ int cnslif_parse(const char* buf);
*/
int logcnslif_get_options(int argc, char ** argv);
-/**
- * Login-server console help: starting option info.
- * Do not rename function used as extern.
- * @param do_exit: terminate program execution ?
- */
-void display_helpscreen(bool do_exit);
-
/**
* Initialize the module.
* Launched at login-serv start, create db or other long scope variable here.
@@ -50,9 +49,6 @@ void do_init_logincnslif(void);
*/
void do_final_logincnslif(void);
-#ifdef __cplusplus
-}
-#endif
-#endif /* CONSOLEIF_H */
+#endif /* _LOGINCNSLIF_HPP_ */
diff --git a/src/login/loginlog.c b/src/login/loginlog.cpp
similarity index 99%
rename from src/login/loginlog.c
rename to src/login/loginlog.cpp
index 219bf0f242e..4c96afaf66f 100644
--- a/src/login/loginlog.c
+++ b/src/login/loginlog.cpp
@@ -7,13 +7,17 @@
* @author rAthena Dev Team
*/
+#include "loginlog.hpp"
+
+#include <stdlib.h> // exit
+#include <string.h>
+
#include "../common/cbasetypes.h"
#include "../common/mmo.h"
#include "../common/socket.h"
#include "../common/sql.h"
#include "../common/strlib.h"
#include "../common/showmsg.h"
-#include <stdlib.h> // exit
// global sql settings (in ipban_sql.c)
static char global_db_hostname[64] = "127.0.0.1"; // Doubled to reflect the change on commit #0f2dd7f
diff --git a/src/login/loginlog.h b/src/login/loginlog.hpp
similarity index 89%
rename from src/login/loginlog.h
rename to src/login/loginlog.hpp
index 1acdf69cb26..099d077eb09 100644
--- a/src/login/loginlog.h
+++ b/src/login/loginlog.hpp
@@ -7,12 +7,13 @@
* @author rAthena Dev Team
*/
-#ifndef __LOGINLOG_H_INCLUDED__
-#define __LOGINLOG_H_INCLUDED__
+#pragma once
+#ifndef _LOGINLOG_HPP_
+#define _LOGINLOG_HPP_
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <memory>
+
+#include "../common/cbasetypes.h"
/**
* Get the number of failed login attempts by the ip in the last minutes.
@@ -54,8 +55,5 @@ bool loginlog_init(void);
*/
bool loginlog_final(void);
-#ifdef __cplusplus
-}
-#endif
-#endif // __LOGINLOG_H_INCLUDED__
+#endif /* _LOGINLOG_HPP_ */
diff --git a/src/login/server/CMakeLists.txt b/src/login/server/CMakeLists.txt
deleted file mode 100644
index 4cb3d76cda6..00000000000
--- a/src/login/server/CMakeLists.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-
-#
-# login server
-#
-if( BUILD_SERVERS )
-message( STATUS "Creating target login-server" )
-set( LOGIN_HEADERS
- "${SERVER_LOGIN_SOURCE_DIR}/account.h"
- "${SERVER_LOGIN_SOURCE_DIR}/ipban.h"
- "${SERVER_LOGIN_SOURCE_DIR}/login.h"
- "${SERVER_LOGIN_SOURCE_DIR}/loginclif.h"
- "${SERVER_LOGIN_SOURCE_DIR}/loginchrif.h"
- "${SERVER_LOGIN_SOURCE_DIR}/logincnslif.h"
- "${SERVER_LOGIN_SOURCE_DIR}/loginlog.h"
- )
-set( LOGIN_SOURCES
- "${SERVER_LOGIN_SOURCE_DIR}/account.c"
- "${SERVER_LOGIN_SOURCE_DIR}/ipban.c"
- "${SERVER_LOGIN_SOURCE_DIR}/login.c"
- "${SERVER_LOGIN_SOURCE_DIR}/loginclif.c"
- "${SERVER_LOGIN_SOURCE_DIR}/loginchrif.c"
- "${SERVER_LOGIN_SOURCE_DIR}/logincnslif.c"
- "${SERVER_LOGIN_SOURCE_DIR}/loginlog.c"
- )
-set( DEPENDENCIES common )
-set( LIBRARIES ${GLOBAL_LIBRARIES} )
-set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${COMMON_BASE_INCLUDE_DIRS} )
-set( DEFINITIONS "${GLOBAL_DEFINITIONS} ${COMMON_BASE_DEFINITIONS} -DWITH_SQL" )
-set( SOURCE_FILES ${COMMON_BASE_HEADERS} ${COMMON_HEADERS} ${LOGIN_HEADERS} ${LOGIN_SOURCES} )
-source_group( common FILES ${COMMON_BASE_HEADERS} ${COMMON_HEADERS} )
-source_group( login FILES ${LOGIN_HEADERS} ${LOGIN_SOURCES} )
-include_directories( ${INCLUDE_DIRS} )
-add_executable( login-server ${SOURCE_FILES} )
-add_dependencies( login-server ${DEPENDENCIES} )
-target_link_libraries( login-server ${LIBRARIES} ${DEPENDENCIES} )
-set_target_properties( login-server PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" )
-if( INSTALL_COMPONENT_RUNTIME )
- cpack_add_component( Runtime_loginserver DESCRIPTION "login-server" DISPLAY_NAME "login-server" GROUP Runtime )
- install( TARGETS login-server
- DESTINATION "."
- COMPONENT Runtime_loginserver )
-endif( INSTALL_COMPONENT_RUNTIME )
-set( TARGET_LIST ${TARGET_LIST} login-server CACHE INTERNAL "" )
-message( STATUS "Creating target login-server - done" )
-endif( BUILD_SERVERS )
diff --git a/src/map/CMakeLists.txt b/src/map/CMakeLists.txt
index 2539c8097d2..a066cc0f7b6 100644
--- a/src/map/CMakeLists.txt
+++ b/src/map/CMakeLists.txt
@@ -9,92 +9,10 @@ set( MAP_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "" )
#
if( BUILD_SERVERS )
message( STATUS "Creating target map-server" )
-set( MAP_HEADERS
- "${MAP_SOURCE_DIR}/atcommand.h"
- "${MAP_SOURCE_DIR}/battle.h"
- "${MAP_SOURCE_DIR}/battleground.h"
- "${MAP_SOURCE_DIR}/buyingstore.h"
- "${MAP_SOURCE_DIR}/chat.h"
- "${MAP_SOURCE_DIR}/chrif.h"
- "${MAP_SOURCE_DIR}/clan.h"
- "${MAP_SOURCE_DIR}/clif.h"
- "${MAP_SOURCE_DIR}/date.h"
- "${MAP_SOURCE_DIR}/duel.h"
- "${MAP_SOURCE_DIR}/elemental.h"
- "${MAP_SOURCE_DIR}/guild.h"
- "${MAP_SOURCE_DIR}/homunculus.h"
- "${MAP_SOURCE_DIR}/instance.h"
- "${MAP_SOURCE_DIR}/intif.h"
- "${MAP_SOURCE_DIR}/itemdb.h"
- "${MAP_SOURCE_DIR}/log.h"
- "${MAP_SOURCE_DIR}/mail.h"
- "${MAP_SOURCE_DIR}/map.h"
- "${MAP_SOURCE_DIR}/mapreg.h"
- "${MAP_SOURCE_DIR}/mercenary.h"
- "${MAP_SOURCE_DIR}/mob.h"
- "${MAP_SOURCE_DIR}/npc.h"
- "${MAP_SOURCE_DIR}/party.h"
- "${MAP_SOURCE_DIR}/path.h"
- "${MAP_SOURCE_DIR}/pc.h"
- "${MAP_SOURCE_DIR}/pc_groups.h"
- "${MAP_SOURCE_DIR}/pet.h"
- "${MAP_SOURCE_DIR}/quest.h"
- "${MAP_SOURCE_DIR}/script.h"
- "${MAP_SOURCE_DIR}/script_constants.h"
- "${MAP_SOURCE_DIR}/searchstore.h"
- "${MAP_SOURCE_DIR}/skill.h"
- "${MAP_SOURCE_DIR}/status.h"
- "${MAP_SOURCE_DIR}/storage.h"
- "${MAP_SOURCE_DIR}/trade.h"
- "${MAP_SOURCE_DIR}/unit.h"
- "${MAP_SOURCE_DIR}/vending.h"
- "${MAP_SOURCE_DIR}/cashshop.h"
- "${MAP_SOURCE_DIR}/channel.h"
- )
-set( MAP_SOURCES
- "${MAP_SOURCE_DIR}/atcommand.c"
- "${MAP_SOURCE_DIR}/battle.c"
- "${MAP_SOURCE_DIR}/battleground.c"
- "${MAP_SOURCE_DIR}/buyingstore.c"
- "${MAP_SOURCE_DIR}/chat.c"
- "${MAP_SOURCE_DIR}/chrif.c"
- "${MAP_SOURCE_DIR}/clan.c"
- "${MAP_SOURCE_DIR}/clif.c"
- "${MAP_SOURCE_DIR}/date.c"
- "${MAP_SOURCE_DIR}/duel.c"
- "${MAP_SOURCE_DIR}/elemental.c"
- "${MAP_SOURCE_DIR}/guild.c"
- "${MAP_SOURCE_DIR}/homunculus.c"
- "${MAP_SOURCE_DIR}/instance.c"
- "${MAP_SOURCE_DIR}/intif.c"
- "${MAP_SOURCE_DIR}/itemdb.c"
- "${MAP_SOURCE_DIR}/log.c"
- "${MAP_SOURCE_DIR}/mail.c"
- "${MAP_SOURCE_DIR}/map.c"
- "${MAP_SOURCE_DIR}/mapreg.c"
- "${MAP_SOURCE_DIR}/mercenary.c"
- "${MAP_SOURCE_DIR}/mob.c"
- "${MAP_SOURCE_DIR}/npc.c"
- "${MAP_SOURCE_DIR}/npc_chat.c"
- "${MAP_SOURCE_DIR}/party.c"
- "${MAP_SOURCE_DIR}/path.c"
- "${MAP_SOURCE_DIR}/pc.c"
- "${MAP_SOURCE_DIR}/pc_groups.c"
- "${MAP_SOURCE_DIR}/pet.c"
- "${MAP_SOURCE_DIR}/quest.c"
- "${MAP_SOURCE_DIR}/script.c"
- "${MAP_SOURCE_DIR}/searchstore.c"
- "${MAP_SOURCE_DIR}/skill.c"
- "${MAP_SOURCE_DIR}/status.c"
- "${MAP_SOURCE_DIR}/storage.c"
- "${MAP_SOURCE_DIR}/trade.c"
- "${MAP_SOURCE_DIR}/unit.c"
- "${MAP_SOURCE_DIR}/vending.c"
- "${MAP_SOURCE_DIR}/cashshop.c"
- "${MAP_SOURCE_DIR}/channel.c"
- )
-set( DEPENDENCIES common )
-set( LIBRARIES ${GLOBAL_LIBRARIES} )
+file(GLOB MAP_HEADERS ${MAP_SOURCE_DIR}/*.hpp)
+file(GLOB MAP_SOURCES ${MAP_SOURCE_DIR}/*.cpp)
+set( DEPENDENCIES common yaml-cpp)
+set( LIBRARIES ${GLOBAL_LIBRARIES})
set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${COMMON_BASE_INCLUDE_DIRS} )
set( DEFINITIONS "${GLOBAL_DEFINITIONS} ${COMMON_BASE_DEFINITIONS}" )
if( WITH_PCRE )
@@ -109,7 +27,10 @@ set( SOURCE_FILES ${COMMON_BASE_HEADERS} ${COMMON_HEADERS} ${MAP_HEADERS} ${MAP_
source_group( common FILES ${COMMON_BASE_HEADERS} ${COMMON_HEADERS} )
source_group( map FILES ${MAP_HEADERS} ${MAP_SOURCES} )
include_directories( ${INCLUDE_DIRS} )
+
+#message( STATUS "map-server SOURCE_FILES=${SOURCE_FILES}")
add_executable( map-server ${SOURCE_FILES} )
+#message( STATUS "map-server LIBRARIES=${LIBRARIES}, DEPENDENCIES=${DEPENDENCIES} DEFINITIONS=${DEFINITIONS}")
add_dependencies( map-server ${DEPENDENCIES} )
target_link_libraries( map-server ${LIBRARIES} ${DEPENDENCIES} )
set_target_properties( map-server PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" )
diff --git a/src/map/Makefile.in b/src/map/Makefile.in
index c9775682d95..6dca40358ab 100644
--- a/src/map/Makefile.in
+++ b/src/map/Makefile.in
@@ -11,9 +11,16 @@ LIBCONFIG_H = $(shell ls ../../3rdparty/libconfig/*.h)
LIBCONFIG_AR = ../../3rdparty/libconfig/obj/libconfig.a
LIBCONFIG_INCLUDE = -I../../3rdparty/libconfig
-MAP_OBJ = $(shell ls *.c | sed -e "s/\.c/\.o/g") $(shell ls *.cpp | sed -e "s/\.cpp/\.o/g")
+YAML_CPP_OBJ = $(shell find ../../3rdparty/yaml-cpp/ -type f -name "*.cpp" | sed -e "s/\.cpp/\.o/g" )
+YAML_CPP_DIR_OBJ = $(YAML_CPP_OBJ:%=obj/%)
+YAML_CPP_AR = ../../3rdparty/yaml-cpp/obj/yaml-cpp.a
+YAML_CPP_H = $(shell find ../../3rdparty/yaml-cpp/ -type f -name "*.h")
+YAML_CPP_INCLUDE = -I../../3rdparty/yaml-cpp/include
+
+MAP_OBJ = $(shell ls *.cpp | sed -e "s/\.cpp/\.o/g")
+#MAP_OBJ += $(shell ls *.c | sed -e "s/\.c/\.o/g")
MAP_DIR_OBJ = $(MAP_OBJ:%=obj/%)
-MAP_H = $(shell ls ../map/*.h) \
+MAP_H = $(shell ls ../map/*.hpp) \
$(shell ls ../config/*.h)
HAVE_MYSQL=@HAVE_MYSQL@
@@ -31,8 +38,6 @@ else
PCRE_CFLAGS=
endif
-CXXFLAGS=-std=c++11
-
@SET_MAKE@
#####################################################################
@@ -67,20 +72,24 @@ obj:
# executables
-map-server: obj $(MAP_DIR_OBJ) $(COMMON_AR) $(LIBCONFIG_AR)
+map-server: obj $(MAP_DIR_OBJ) $(COMMON_AR) $(LIBCONFIG_AR) $(YAML_CPP_AR)
@echo " LD @OMAP@@EXEEXT@"
- @@CXX@ @LDFLAGS@ -o ../../@OMAP@@EXEEXT@ $(MAP_DIR_OBJ) $(COMMON_AR) $(MT19937AR_OBJ) $(LIBCONFIG_AR) @LIBS@ @PCRE_LIBS@ @MYSQL_LIBS@
+ @@CXX@ @LDFLAGS@ -o ../../@OMAP@@EXEEXT@ $(MAP_DIR_OBJ) $(COMMON_AR) $(MT19937AR_OBJ) $(LIBCONFIG_AR) $(YAML_CPP_AR) @LIBS@ @PCRE_LIBS@ @MYSQL_LIBS@
# map object files
+#cause this one failling otherwise
+obj/npc.o: npc.cpp $(MAP_H) $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H) $(YAML_CPP_H)
+ @echo " CXX $< (custom rule)"
+ @@CXX@ @CXXFLAG_CLEARS@ $(COMMON_INCLUDE) $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) $(PCRE_CFLAGS) $(YAML_CPP_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
-obj/%.o: %.c $(MAP_H) $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H)
+obj/%.o: %.c $(MAP_H) $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H) $(YAML_CPP_H)
@echo " CC $<"
- @@CC@ @CFLAGS@ $(COMMON_INCLUDE) $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) $(PCRE_CFLAGS) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
+ @@CC@ @CFLAGS@ $(COMMON_INCLUDE) $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) $(PCRE_CFLAGS) $(YAML_CPP_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
-obj/%.o: %.cpp $(MAP_H) $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H)
+obj/%.o: %.cpp $(MAP_H) $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H) $(YAML_CPP_H)
@echo " CXX $<"
- @@CXX@ @CXXFLAGS@ $(COMMON_INCLUDE) $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) $(PCRE_CFLAGS) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
+ @@CXX@ @CXXFLAGS@ $(COMMON_INCLUDE) $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) $(PCRE_CFLAGS) $(YAML_CPP_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
# missing object files
$(COMMON_AR):
@@ -91,3 +100,6 @@ $(MT19937AR_OBJ):
$(LIBCONFIG_AR):
@$(MAKE) -C ../../3rdparty/libconfig
+
+$(YAML_CPP_AR):
+ @$(MAKE) -C ../../3rdparty/yaml-cpp
diff --git a/src/map/achievement.cpp b/src/map/achievement.cpp
new file mode 100644
index 00000000000..30aaabf20d2
--- /dev/null
+++ b/src/map/achievement.cpp
@@ -0,0 +1,1280 @@
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
+#include "achievement.hpp"
+
+#include <array>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <setjmp.h>
+#include <yaml-cpp/yaml.h>
+
+#include "../common/cbasetypes.h"
+#include "../common/malloc.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
+#include "../common/utils.h"
+
+#include "battle.hpp"
+#include "chrif.hpp"
+#include "clif.hpp"
+#include "intif.hpp"
+#include "itemdb.hpp"
+#include "map.hpp"
+#include "pc.hpp"
+#include "script.hpp"
+#include "status.hpp"
+#include "npc.hpp"
+
+static jmp_buf av_error_jump;
+static char* av_error_msg;
+static const char* av_error_pos;
+static int av_error_report;
+
+std::unordered_map<int, std::shared_ptr<s_achievement_db>> achievements;
+std::vector<int> achievement_mobs; // Avoids checking achievements on every mob killed
+
+/**
+ * Searches an achievement by ID
+ * @param achievement_id: ID to lookup
+ * @return True if achievement exists or false if it doesn't
+ */
+bool achievement_exists(int achievement_id)
+{
+ return achievements.find(achievement_id) != achievements.end();
+}
+
+/**
+ * Return an achievement by ID
+ * @param achievement_id: ID to lookup
+ * @return shared_ptr of achievement
+ */
+std::shared_ptr<s_achievement_db> &achievement_get(int achievement_id)
+{
+ return achievements[achievement_id];
+}
+
+/**
+ * Searches for an achievement by monster ID
+ * @param mob_id: Monster ID to lookup
+ * @return True on success, false on failure
+ */
+bool achievement_mobexists(int mob_id)
+{
+ if (!battle_config.feature_achievement)
+ return false;
+
+ auto it = std::find(achievement_mobs.begin(), achievement_mobs.end(), mob_id);
+
+ return (it != achievement_mobs.end()) ? true : false;
+}
+
+/**
+ * Add an achievement to the player's log
+ * @param sd: Player data
+ * @param achievement_id: Achievement to add
+ * @return NULL on failure, achievement data on success
+ */
+struct achievement *achievement_add(struct map_session_data *sd, int achievement_id)
+{
+ int i, index;
+
+ nullpo_retr(NULL, sd);
+
+ if (!achievement_exists(achievement_id)) {
+ ShowError("achievement_add: Achievement %d not found in DB.\n", achievement_id);
+ return NULL;
+ }
+
+ auto &adb = achievements[achievement_id];
+
+ ARR_FIND(0, sd->achievement_data.count, i, sd->achievement_data.achievements[i].achievement_id == achievement_id);
+ if (i < sd->achievement_data.count) {
+ ShowError("achievement_add: Character %d already has achievement %d.\n", sd->status.char_id, achievement_id);
+ return NULL;
+ }
+
+ index = sd->achievement_data.incompleteCount;
+
+ sd->achievement_data.count++;
+ sd->achievement_data.incompleteCount++;
+ RECREATE(sd->achievement_data.achievements, struct achievement, sd->achievement_data.count);
+
+ // The character has some completed achievements, make room before them so that they will stay at the end of the array
+ if (sd->achievement_data.incompleteCount != sd->achievement_data.count)
+ memmove(&sd->achievement_data.achievements[index + 1], &sd->achievement_data.achievements[index], sizeof(struct achievement) * (sd->achievement_data.count - sd->achievement_data.incompleteCount));
+
+ memset(&sd->achievement_data.achievements[index], 0, sizeof(struct achievement));
+
+ sd->achievement_data.achievements[index].achievement_id = achievement_id;
+ sd->achievement_data.achievements[index].score = adb->score;
+ sd->achievement_data.save = true;
+
+ clif_achievement_update(sd, &sd->achievement_data.achievements[index], sd->achievement_data.count - sd->achievement_data.incompleteCount);
+
+ return &sd->achievement_data.achievements[index];
+}
+
+/**
+ * Removes an achievement from a player's log
+ * @param sd: Player's data
+ * @param achievement_id: Achievement to remove
+ * @return True on success, false on failure
+ */
+bool achievement_remove(struct map_session_data *sd, int achievement_id)
+{
+ struct achievement dummy;
+ int i;
+
+ nullpo_retr(false, sd);
+
+ if (!achievement_exists(achievement_id)) {
+ ShowError("achievement_delete: Achievement %d not found in DB.\n", achievement_id);
+ return false;
+ }
+
+ ARR_FIND(0, sd->achievement_data.count, i, sd->achievement_data.achievements[i].achievement_id == achievement_id);
+ if (i == sd->achievement_data.count) {
+ ShowError("achievement_delete: Character %d doesn't have achievement %d.\n", sd->status.char_id, achievement_id);
+ return false;
+ }
+
+ if (!sd->achievement_data.achievements[i].completed)
+ sd->achievement_data.incompleteCount--;
+
+ if (i != sd->achievement_data.count - 1)
+ memmove(&sd->achievement_data.achievements[i], &sd->achievement_data.achievements[i + 1], sizeof(struct achievement) * (sd->achievement_data.count - 1 - i));
+
+ sd->achievement_data.count--;
+ if( sd->achievement_data.count == 0 ){
+ aFree(sd->achievement_data.achievements);
+ sd->achievement_data.achievements = NULL;
+ }else{
+ RECREATE(sd->achievement_data.achievements, struct achievement, sd->achievement_data.count);
+ }
+ sd->achievement_data.save = true;
+
+ // Send a removed fake achievement
+ memset(&dummy, 0, sizeof(struct achievement));
+ dummy.achievement_id = achievement_id;
+ clif_achievement_update(sd, &dummy, sd->achievement_data.count - sd->achievement_data.incompleteCount);
+
+ return true;
+}
+
+/**
+ * Lambda function that checks for completed achievements
+ * @param sd: Player data
+ * @param achievement_id: Achievement to check if it's complete
+ * @return True on completed, false if not
+ */
+static bool achievement_done(struct map_session_data *sd, int achievement_id) {
+ for (int i = 0; i < sd->achievement_data.count; i++) {
+ if (sd->achievement_data.achievements[i].achievement_id == achievement_id && sd->achievement_data.achievements[i].completed > 0)
+ return true;
+ }
+
+ return false;
+}
+
+/**
+ * Checks to see if an achievement has a dependent, and if so, checks if that dependent is complete
+ * @param sd: Player data
+ * @param achievement_id: Achievement to check if it has a dependent
+ * @return False on failure or not complete, true on complete or no dependents
+ */
+bool achievement_check_dependent(struct map_session_data *sd, int achievement_id)
+{
+ nullpo_retr(false, sd);
+
+ if (!achievement_exists(achievement_id))
+ return false;
+
+ auto &adb = achievements[achievement_id];
+
+ // Check if the achievement has a dependent
+ // If so, then do a check on all dependents to see if they're complete
+ for (int i = 0; i < adb->dependent_ids.size(); i++) {
+ if (!achievement_done(sd, adb->dependent_ids[i]))
+ return false; // One of the dependent is not complete!
+ }
+
+ return true;
+}
+
+/**
+ * Check achievements that only have dependents and no other requirements
+ * @param sd: Player to update
+ * @param sd: Achievement to compare for completed dependents
+ * @return True if successful, false if not
+ */
+static int achievement_check_groups(struct map_session_data *sd, struct s_achievement_db *ad)
+{
+ int i;
+
+ if (ad == NULL || sd == NULL)
+ return 0;
+
+ if (ad->group != AG_BATTLE && ad->group != AG_TAMING && ad->group != AG_ADVENTURE)
+ return 0;
+
+ if (ad->dependent_ids.size() == 0 || ad->condition)
+ return 0;
+
+ ARR_FIND(0, sd->achievement_data.count, i, sd->achievement_data.achievements[i].achievement_id == ad->achievement_id);
+ if (i == sd->achievement_data.count) { // Achievement isn't in player's log
+ if (achievement_check_dependent(sd, ad->achievement_id) == true) {
+ achievement_add(sd, ad->achievement_id);
+ achievement_update_achievement(sd, ad->achievement_id, true);
+ }
+ }
+
+ return 1;
+}
+
+/**
+ * Update an achievement
+ * @param sd: Player to update
+ * @param achievement_id: Achievement ID of the achievement to update
+ * @param complete: Complete state of an achievement
+ * @return True if successful, false if not
+ */
+bool achievement_update_achievement(struct map_session_data *sd, int achievement_id, bool complete)
+{
+ int i;
+
+ nullpo_retr(false, sd);
+
+ if (!achievement_exists(achievement_id))
+ return false;
+
+ auto &adb = achievements[achievement_id];
+
+ ARR_FIND(0, sd->achievement_data.incompleteCount, i, sd->achievement_data.achievements[i].achievement_id == achievement_id);
+ if (i == sd->achievement_data.incompleteCount)
+ return false;
+
+ if (sd->achievement_data.achievements[i].completed > 0)
+ return false;
+
+ // Finally we send the updated achievement to the client
+ if (complete) {
+ if (adb->targets.size()) { // Make sure all the objective targets are at their respective total requirement
+ int k;
+
+ for (k = 0; k < adb->targets.size(); k++)
+ sd->achievement_data.achievements[i].count[k] = adb->targets[k].count;
+
+ for (k = 1; k < adb->dependent_ids.size(); k++) {
+ sd->achievement_data.achievements[i].count[k] = max(1, sd->achievement_data.achievements[i].count[k]);
+ }
+ }
+
+ sd->achievement_data.achievements[i].completed = time(NULL);
+
+ if (i < (--sd->achievement_data.incompleteCount)) { // The achievement needs to be moved to the completed achievements block at the end of the array
+ struct achievement tmp_ach;
+
+ memcpy(&tmp_ach, &sd->achievement_data.achievements[i], sizeof(struct achievement));
+ memcpy(&sd->achievement_data.achievements[i], &sd->achievement_data.achievements[sd->achievement_data.incompleteCount], sizeof(struct achievement));
+ memcpy(&sd->achievement_data.achievements[sd->achievement_data.incompleteCount], &tmp_ach, sizeof(struct achievement));
+ }
+
+ achievement_level(sd, true); // Re-calculate achievement level
+ // Check dependents
+ for (auto &ach : achievements)
+ achievement_check_groups(sd, ach.second.get());
+ ARR_FIND(sd->achievement_data.incompleteCount, sd->achievement_data.count, i, sd->achievement_data.achievements[i].achievement_id == achievement_id); // Look for the index again, the position most likely changed
+ }
+
+ clif_achievement_update(sd, &sd->achievement_data.achievements[i], sd->achievement_data.count - sd->achievement_data.incompleteCount);
+ sd->achievement_data.save = true; // Flag to save with the autosave interval
+
+ return true;
+}
+
+/**
+ * Get the reward of an achievement
+ * @param sd: Player getting the reward
+ * @param achievement_id: Achievement to get reward data
+ */
+void achievement_get_reward(struct map_session_data *sd, int achievement_id, time_t rewarded)
+{
+ int i;
+
+ nullpo_retv(sd);
+
+ if (!achievement_exists(achievement_id)) {
+ ShowError("achievement_reward: Inter server sent a reward claim for achievement %d not found in DB.\n", achievement_id);
+ return;
+ }
+
+ auto &adb = achievements[achievement_id];
+
+ if (rewarded == 0) {
+ clif_achievement_reward_ack(sd->fd, 0, achievement_id);
+ return;
+ }
+
+ ARR_FIND(0, sd->achievement_data.count, i, sd->achievement_data.achievements[i].achievement_id == achievement_id);
+ if (i == sd->achievement_data.count)
+ return;
+
+ // Only update in the cache, db was updated already
+ sd->achievement_data.achievements[i].rewarded = rewarded;
+ sd->achievement_data.save = true;
+
+ run_script(adb->rewards.script, 0, sd->bl.id, fake_nd->bl.id);
+ if (adb->rewards.title_id) {
+ sd->titles.push_back(adb->rewards.title_id);
+ clif_achievement_list_all(sd);
+ }else{
+ clif_achievement_reward_ack(sd->fd, 1, achievement_id);
+ clif_achievement_update(sd, &sd->achievement_data.achievements[i], sd->achievement_data.count - sd->achievement_data.incompleteCount);
+ }
+}
+
+/**
+ * Check if player has recieved an achievement's reward
+ * @param sd: Player to get reward
+ * @param achievement_id: Achievement to get reward data
+ */
+void achievement_check_reward(struct map_session_data *sd, int achievement_id)
+{
+ int i;
+
+ nullpo_retv(sd);
+
+ if (!achievement_exists(achievement_id)) {
+ ShowError("achievement_reward: Trying to reward achievement %d not found in DB.\n", achievement_id);
+ clif_achievement_reward_ack(sd->fd, 0, achievement_id);
+ return;
+ }
+
+ auto &adb = achievements[achievement_id];
+
+ ARR_FIND(0, sd->achievement_data.count, i, sd->achievement_data.achievements[i].achievement_id == achievement_id);
+ if (i == sd->achievement_data.count) {
+ clif_achievement_reward_ack(sd->fd, 0, achievement_id);
+ return;
+ }
+
+ if (sd->achievement_data.achievements[i].rewarded > 0 || sd->achievement_data.achievements[i].completed == 0) {
+ clif_achievement_reward_ack(sd->fd, 0, achievement_id);
+ return;
+ }
+
+ if (!intif_achievement_reward(sd, adb.get())) {
+ clif_achievement_reward_ack(sd->fd, 0, achievement_id);
+ }
+}
+
+/**
+ * Return all titles to a player based on completed achievements
+ * @param char_id: Character ID requesting
+ */
+void achievement_get_titles(uint32 char_id)
+{
+ struct map_session_data *sd = map_charid2sd(char_id);
+
+ if (sd) {
+ sd->titles.clear();
+
+ if (sd->achievement_data.count) {
+ for (int i = 0; i < sd->achievement_data.count; i++) {
+ if (!achievement_exists(sd->achievement_data.achievements[i].achievement_id))
+ continue;
+
+ auto &adb = achievements[sd->achievement_data.achievements[i].achievement_id];
+
+ if (adb && adb->rewards.title_id && sd->achievement_data.achievements[i].completed > 0) // If the achievement has a title and is complete, give it to the player
+ sd->titles.push_back(adb->rewards.title_id);
+ }
+ }
+ }
+}
+
+/**
+ * Frees the player's data for achievements
+ * @param sd: Player's session
+ */
+void achievement_free(struct map_session_data *sd)
+{
+ nullpo_retv(sd);
+
+ if (sd->achievement_data.count) {
+ aFree(sd->achievement_data.achievements);
+ sd->achievement_data.achievements = NULL;
+ sd->achievement_data.count = sd->achievement_data.incompleteCount = 0;
+ }
+}
+
+/**
+ * Get an achievement's progress information
+ * @param sd: Player to check achievement progress
+ * @param achievement_id: Achievement progress to check
+ * @param type: Type to return
+ * @return The type's data, -1 if player doesn't have achievement, -2 on failure/incorrect type
+ */
+int achievement_check_progress(struct map_session_data *sd, int achievement_id, int type)
+{
+ int i;
+
+ nullpo_retr(-2, sd);
+
+ // Achievement ID is not needed so skip the lookup
+ if (type == ACHIEVEINFO_LEVEL)
+ return sd->achievement_data.level;
+ else if (type == ACHIEVEINFO_SCORE)
+ return sd->achievement_data.total_score;
+
+ ARR_FIND(0, sd->achievement_data.count, i, sd->achievement_data.achievements[i].achievement_id == achievement_id);
+ if (i == sd->achievement_data.count)
+ return -1;
+
+ if (type >= ACHIEVEINFO_COUNT1 && type <= ACHIEVEINFO_COUNT10)
+ return sd->achievement_data.achievements[i].count[type - 1];
+ else if (type == ACHIEVEINFO_COMPLETE)
+ return sd->achievement_data.achievements[i].completed > 0;
+ else if (type == ACHIEVEINFO_COMPLETEDATE)
+ return (int)sd->achievement_data.achievements[i].completed;
+ else if (type == ACHIEVEINFO_GOTREWARD)
+ return sd->achievement_data.achievements[i].rewarded > 0;
+ return -2;
+}
+
+/**
+ * Calculate a player's achievement level
+ * @param sd: Player to check achievement level
+ * @param flag: If the call should attempt to give the AG_GOAL_ACHIEVE achievement
+ * @return Player's achievement level or 0 on failure
+ */
+int *achievement_level(struct map_session_data *sd, bool flag)
+{
+ static int info[2];
+ int i, old_level;
+ const int score_table[MAX_ACHIEVEMENT_RANK] = { 18, 31, 49, 73, 135, 104, 140, 178, 900, 1000, 1100, 1200, 1300, 1400, 1500, 1600, 1700, 1800, 1900, 2000 }; //! TODO: Figure out the EXP required to level up from 8-20
+
+ nullpo_retr(0, sd);
+
+ sd->achievement_data.total_score = 0;
+ old_level = sd->achievement_data.level;
+
+ for (i = 0; i < sd->achievement_data.count; i++) {
+ if (sd->achievement_data.achievements[i].completed > 0)
+ sd->achievement_data.total_score += sd->achievement_data.achievements[i].score;
+ }
+
+ info[0] = 0;
+ info[1] = 0;
+
+ for (i = 0; i < MAX_ACHIEVEMENT_RANK; i++) {
+ info[0] = info[1];
+
+ if (i < ARRAYLENGTH(score_table))
+ info[1] = score_table[i];
+ else {
+ info[0] = info[1];
+ info[1] = info[1] + 500;
+ }
+
+ if (sd->achievement_data.total_score < info[1])
+ break;
+ }
+
+ if (i == MAX_ACHIEVEMENT_RANK)
+ i = 0;
+
+ info[1] = info[1] - info[0]; // Right number
+ info[0] = sd->achievement_data.total_score - info[0]; // Left number
+ sd->achievement_data.level = i;
+
+ if (flag == true && old_level != sd->achievement_data.level) {
+ int achievement_id = 240000 + sd->achievement_data.level;
+
+ if( achievement_add(sd, achievement_id) ){
+ achievement_update_achievement(sd, achievement_id, true);
+ }
+ }
+
+ return info;
+}
+
+/**
+ * Update achievement objectives.
+ * @param sd: Player to update
+ * @param ad: Achievement data to compare for completion
+ * @param group: Achievement group to update
+ * @param update_count: Objective values player has
+ * @return 1 on success and false on failure
+ */
+static int achievement_update_objectives(struct map_session_data *sd, std::shared_ptr<struct s_achievement_db> ad, enum e_achievement_group group, const std::array<int,MAX_ACHIEVEMENT_OBJECTIVES> &update_count)
+{
+ struct achievement *entry = NULL;
+ bool isNew = false, changed = false, complete = false;
+ int i, k = 0;
+ std::array<int,MAX_ACHIEVEMENT_OBJECTIVES> objective_count;
+
+ if (ad == NULL || sd == NULL)
+ return 0;
+
+ if (group <= AG_NONE || group >= AG_MAX)
+ return 0;
+
+ if (group != ad->group)
+ return 0;
+
+ objective_count.fill(0); // Current objectives count
+
+ ARR_FIND(0, sd->achievement_data.count, i, sd->achievement_data.achievements[i].achievement_id == ad->achievement_id);
+ if (i == sd->achievement_data.count) { // Achievement isn't in player's log
+ if (achievement_check_dependent(sd, ad->achievement_id) == false) // Check to see if dependents are complete before adding to player's log
+ return 0;
+ isNew = true;
+ } else {
+ entry = &sd->achievement_data.achievements[i];
+
+ if (entry->completed > 0) // Player has completed the achievement
+ return 0;
+
+ memcpy(objective_count.data(), entry->count, sizeof(objective_count));
+ }
+
+ switch (group) {
+ case AG_ADD_FRIEND:
+ case AG_BABY:
+ case AG_CHAT_COUNT:
+ case AG_CHAT_CREATE:
+ case AG_CHAT_DYING:
+ case AG_GET_ITEM:
+ case AG_GET_ZENY:
+ case AG_GOAL_LEVEL:
+ case AG_GOAL_STATUS:
+ case AG_JOB_CHANGE:
+ case AG_MARRY:
+ case AG_PARTY:
+ case AG_REFINE_FAIL:
+ case AG_REFINE_SUCCESS:
+ case AG_SPEND_ZENY:
+ if (group == AG_SPEND_ZENY) { // Achievement type is cummulative
+ objective_count[0] += update_count[0];
+ changed = true;
+ }
+
+ if (!ad->condition || achievement_check_condition(ad->condition, sd, update_count.data())) {
+ changed = true;
+ complete = true;
+ }
+
+ if (changed == false)
+ break;
+
+ if (isNew) {
+ if ((entry = achievement_add(sd, ad->achievement_id)) == NULL)
+ return 0; // Failed to add achievement, fall out
+ }
+ break;
+ case AG_CHAT:
+ if (!ad->targets.size())
+ break;
+
+ if (ad->condition && !achievement_check_condition(ad->condition, sd, update_count.data())) // Parameters weren't met
+ break;
+
+ if (ad->mapindex > -1 && sd->bl.m != ad->mapindex)
+ break;
+
+ for (i = 0; i < ad->targets.size(); i++) {
+ if (objective_count[i] < ad->targets[i].count)
+ objective_count[i] += update_count[0];
+ }
+
+ changed = true;
+
+ ARR_FIND(0, ad->targets.size(), k, objective_count[k] < ad->targets[k].count);
+ if (k == ad->targets.size())
+ complete = true;
+
+ if (isNew) {
+ if ((entry = achievement_add(sd, ad->achievement_id)) == NULL)
+ return 0; // Failed to add achievement, fall out
+ }
+ break;
+ case AG_BATTLE:
+ case AG_TAMING:
+ auto it = std::find_if(ad->targets.begin(), ad->targets.end(), [&update_count]
+ (const achievement_target &curTarget) {
+ return curTarget.mob == update_count[0];
+ });
+ if (it == ad->targets.end())
+ break; // Mob wasn't found
+
+ for (k = 0; k < ad->targets.size(); k++) {
+ if (ad->targets[k].mob == update_count[0] && objective_count[k] < ad->targets[k].count) {
+ objective_count[k]++;
+ changed = true;
+ }
+ }
+
+ ARR_FIND(0, ad->targets.size(), k, objective_count[k] < ad->targets[k].count);
+ if (k == ad->targets.size())
+ complete = true;
+
+ if (isNew) {
+ if ((entry = achievement_add(sd, ad->achievement_id)) == NULL)
+ return 0; // Failed to add achievement, fall out
+ }
+ break;
+ }
+
+ if (changed) {
+ memcpy(entry->count, objective_count.data(), sizeof(objective_count));
+ achievement_update_achievement(sd, ad->achievement_id, complete);
+ }
+
+ return 1;
+}
+
+/**
+ * Update achievement objective count.
+ * @param sd: Player data
+ * @param group: Achievement enum type
+ * @param sp_value: SP parameter value
+ * @param arg_count: va_arg count
+ */
+void achievement_update_objective(struct map_session_data *sd, enum e_achievement_group group, uint8 arg_count, ...)
+{
+ if (sd) {
+ va_list ap;
+ int i;
+ std::array<int,MAX_ACHIEVEMENT_OBJECTIVES> count;
+
+ if (!battle_config.feature_achievement)
+ return;
+
+ count.fill(0); // Clear out array before setting values
+
+ va_start(ap, arg_count);
+ for (i = 0; i < arg_count; i++)
+ count[i] = va_arg(ap, int);
+ va_end(ap);
+
+ switch(group) {
+ case AG_CHAT: //! TODO: Not sure how this works officially
+ case AG_GOAL_ACHIEVE:
+ // These have no objective use right now.
+ break;
+ default:
+ for (auto &ach : achievements)
+ achievement_update_objectives(sd, ach.second, group, count);
+ break;
+ }
+ }
+}
+
+/*==========================================
+ * Achievement condition parsing section
+ *------------------------------------------*/
+static void disp_error_message2(const char *mes,const char *pos,int report)
+{
+ av_error_msg = aStrdup(mes);
+ av_error_pos = pos;
+ av_error_report = report;
+ longjmp(av_error_jump, 1);
+}
+#define disp_error_message(mes,pos) disp_error_message2(mes,pos,1)
+
+/**
+ * Checks the condition of an achievement.
+ * @param condition: Achievement condition
+ * @param sd: Player data
+ * @param count: Script arguments
+ * @return The result of the condition.
+ */
+long long achievement_check_condition(std::shared_ptr<struct av_condition> condition, struct map_session_data *sd, const int *count)
+{
+ long long left = 0;
+ long long right = 0;
+
+ // Reduce the recursion, almost all calls will be C_PARAM, C_NAME or C_ARG
+ if (condition->left) {
+ if (condition->left->op == C_NAME || condition->left->op == C_INT)
+ left = condition->left->value;
+ else if (condition->left->op == C_PARAM)
+ left = pc_readparam(sd, (int)condition->left->value);
+ else if (condition->left->op == C_ARG && condition->left->value < MAX_ACHIEVEMENT_OBJECTIVES)
+ left = count[condition->left->value];
+ else
+ left = achievement_check_condition(condition->left, sd, count);
+ }
+
+ if (condition->right) {
+ if (condition->right->op == C_NAME || condition->right->op == C_INT)
+ right = condition->right->value;
+ else if (condition->right->op == C_PARAM)
+ right = pc_readparam(sd, (int)condition->right->value);
+ else if (condition->right->op == C_ARG && condition->right->value < MAX_ACHIEVEMENT_OBJECTIVES)
+ right = count[condition->right->value];
+ else
+ right = achievement_check_condition(condition->right, sd, count);
+ }
+
+ switch(condition->op) {
+ case C_NOP:
+ return false;
+ case C_NAME:
+ case C_INT:
+ return condition->value;
+ case C_PARAM:
+ return pc_readparam(sd, (int)condition->value);
+ case C_LOR:
+ return left || right;
+ case C_LAND:
+ return left && right;
+ case C_LE:
+ return left <= right;
+ case C_LT:
+ return left < right;
+ case C_GE:
+ return left >= right;
+ case C_GT:
+ return left > right;
+ case C_EQ:
+ return left == right;
+ case C_NE:
+ return left != right;
+ case C_XOR:
+ return left ^ right;
+ case C_OR:
+ return left || right;
+ case C_AND:
+ return left & right;
+ case C_ADD:
+ return left + right;
+ case C_SUB:
+ return left - right;
+ case C_MUL:
+ return left * right;
+ case C_DIV:
+ return left / right;
+ case C_MOD:
+ return left % right;
+ case C_NEG:
+ return -left;
+ case C_LNOT:
+ return !left;
+ case C_NOT:
+ return ~left;
+ case C_R_SHIFT:
+ return left >> right;
+ case C_L_SHIFT:
+ return left << right;
+ case C_ARG:
+ if (condition->value < MAX_ACHIEVEMENT_OBJECTIVES)
+ return count[condition->value];
+
+ return false;
+ default:
+ ShowError("achievement_check_condition: unexpected operator: %d\n", condition->op);
+ return false;
+ }
+
+ return false;
+}
+
+/**
+ * Skips a word. A word consists of undercores and/or alphanumeric characters, and valid variable prefixes/postfixes.
+ * @param p: Word
+ * @return Next word
+ */
+static const char *skip_word(const char *p)
+{
+ while (ISALNUM(*p) || *p == '_')
+ ++p;
+
+ if (*p == '$') // String
+ p++;
+
+ return p;
+}
+
+/**
+ * Analyze an achievement's condition script
+ * @param p: Word
+ * @param parent: Parent node
+ * @return Word
+ */
+const char *av_parse_simpleexpr(const char *p, std::shared_ptr<struct av_condition> parent)
+{
+ long long i;
+
+ p = skip_space(p);
+
+ if(*p == ';' || *p == ',')
+ disp_error_message("av_parse_simpleexpr: unexpected character.", p);
+ if(*p == '(') {
+ p = av_parse_subexpr(p + 1, -1, parent);
+ p = skip_space(p);
+
+ if (*p != ')')
+ disp_error_message("av_parse_simpleexpr: unmatched ')'", p);
+ ++p;
+ } else if(is_number(p)) {
+ char *np;
+
+ while(*p == '0' && ISDIGIT(p[1]))
+ p++;
+ i = strtoll(p, &np, 0);
+
+ if (i < INT_MIN) {
+ i = INT_MIN;
+ disp_error_message("av_parse_simpleexpr: underflow detected, capping value to INT_MIN.", p);
+ } else if (i > INT_MAX) {
+ i = INT_MAX;
+ disp_error_message("av_parse_simpleexpr: underflow detected, capping value to INT_MAX.", p);
+ }
+
+ parent->op = C_INT;
+ parent->value = i;
+ p = np;
+ } else {
+ int v, len;
+
+ if (skip_word(p) == p)
+ disp_error_message("av_parse_simpleexpr: unexpected character.", p);
+
+ len = skip_word(p) - p;
+
+ if (len == 0)
+ disp_error_message("av_parse_simpleexpr: invalid word. A word consists of undercores and/or alphanumeric characters.", p);
+
+ std::unique_ptr<char[]> word(new char[len + 1]);
+ memcpy(word.get(), p, len);
+ word[len] = 0;
+
+ if (script_get_parameter((const char*)&word[0], &v))
+ parent->op = C_PARAM;
+ else if (script_get_constant(&word[0], &v)) {
+ if (word[0] == 'b' && ISUPPER(word[1])) // Consider b* variables as parameters (because they... are?)
+ parent->op = C_PARAM;
+ else
+ parent->op = C_NAME;
+ } else {
+ if (word[0] == 'A' && word[1] == 'R' && word[2] == 'G' && ISDIGIT(word[3])) { // Special constants used to set temporary variables
+ parent->op = C_ARG;
+ v = atoi(&word[0] + 3);
+ } else {
+ disp_error_message("av_parse_simpleexpr: invalid constant.", p);
+ }
+ }
+
+ parent->value = v;
+ p = skip_word(p);
+ }
+
+ return p;
+}
+
+/**
+ * Analysis of an achievement's expression
+ * @param p: Word
+ * @param parent: Parent node
+ * @return Word
+ */
+const char *av_parse_subexpr(const char* p, int limit, std::shared_ptr<struct av_condition> parent)
+{
+ int op, opl, len;
+
+ p = skip_space(p);
+
+ parent->left.reset(new av_condition());
+
+ if ((op = C_NEG, *p == '-') || (op = C_LNOT, *p == '!') || (op = C_NOT, *p == '~')) { // Unary - ! ~ operators
+ p = av_parse_subexpr(p + 1, 11, parent->left);
+ parent->op = op;
+ } else
+ p = av_parse_simpleexpr(p, parent->left);
+
+ p = skip_space(p);
+
+ while((
+ ((op=C_ADD,opl=9,len=1,*p=='+') && p[1]!='+') ||
+ ((op=C_SUB,opl=9,len=1,*p=='-') && p[1]!='-') ||
+ (op=C_MUL,opl=10,len=1,*p=='*') ||
+ (op=C_DIV,opl=10,len=1,*p=='/') ||
+ (op=C_MOD,opl=10,len=1,*p=='%') ||
+ (op=C_LAND,opl=2,len=2,*p=='&' && p[1]=='&') ||
+ (op=C_AND,opl=5,len=1,*p=='&') ||
+ (op=C_LOR,opl=1,len=2,*p=='|' && p[1]=='|') ||
+ (op=C_OR,opl=3,len=1,*p=='|') ||
+ (op=C_XOR,opl=4,len=1,*p=='^') ||
+ (op=C_EQ,opl=6,len=2,*p=='=' && p[1]=='=') ||
+ (op=C_NE,opl=6,len=2,*p=='!' && p[1]=='=') ||
+ (op=C_R_SHIFT,opl=8,len=2,*p=='>' && p[1]=='>') ||
+ (op=C_GE,opl=7,len=2,*p=='>' && p[1]=='=') ||
+ (op=C_GT,opl=7,len=1,*p=='>') ||
+ (op=C_L_SHIFT,opl=8,len=2,*p=='<' && p[1]=='<') ||
+ (op=C_LE,opl=7,len=2,*p=='<' && p[1]=='=') ||
+ (op=C_LT,opl=7,len=1,*p=='<')) && opl>limit) {
+ p += len;
+
+ if (parent->right) { // Chain conditions
+ std::shared_ptr<struct av_condition> condition(new struct av_condition());
+
+ condition->op = parent->op;
+ condition->left = parent->left;
+ condition->right = parent->right;
+ parent->left = condition;
+ parent->right.reset();
+ }
+
+ parent->right.reset(new av_condition());
+ p = av_parse_subexpr(p, opl, parent->right);
+ parent->op = op;
+ p = skip_space(p);
+ }
+
+ if (parent->op == C_NOP && !parent->right) { // Move the node up
+ parent->right = parent->left->right;
+ parent->op = parent->left->op;
+ parent->value = parent->left->value;
+ parent->left = parent->left->left;
+ }
+
+ return p;
+}
+
+/**
+ * Parses a condition from a script.
+ * @param p: The script buffer.
+ * @param file: The file being parsed.
+ * @param line: The current achievement line number.
+ * @return The parsed achievement condition.
+ */
+std::shared_ptr<struct av_condition> parse_condition(const char *p, const char *file, int line)
+{
+ std::shared_ptr<struct av_condition> condition;
+
+ if (setjmp(av_error_jump) != 0) {
+ if (av_error_report)
+ script_error(p,file,line,av_error_msg,av_error_pos);
+ aFree(av_error_msg);
+ condition.reset();
+ return NULL;
+ }
+
+ switch(*p) {
+ case ')': case ';': case ':': case '[': case ']': case '}':
+ disp_error_message("parse_condition: unexpected character.", p);
+ }
+
+ condition.reset(new av_condition());
+ av_parse_subexpr(p, -1, condition);
+
+ return condition;
+}
+
+static void yaml_invalid_warning(const char* fmt, const YAML::Node &node, const std::string &file) {
+ YAML::Emitter out;
+ out << node;
+ ShowWarning(fmt, file.c_str());
+ ShowMessage("%s\n", out.c_str());
+}
+
+/**
+ * Reads and parses an entry from the achievement_db.
+ * @param node: YAML node containing the entry.
+ * @param n: The sequential index of the current entry.
+ * @param source: The source YAML file.
+ * @return True on successful parse or false otherwise
+ */
+bool achievement_read_db_sub(const YAML::Node &node, int n, const std::string &source)
+{
+ enum e_achievement_group group = AG_NONE;
+ int achievement_id = 0;
+ std::string group_char, name, condition, mapname;
+ bool existing = false;
+
+ if (!node["ID"]) {
+ yaml_invalid_warning("achievement_read_db_sub: Missing ID field in '" CL_WHITE "%s" CL_RESET "', skipping.\n", node, source);
+ return false;
+ }
+ try {
+ achievement_id = node["ID"].as<unsigned int>();
+ } catch (...) {
+ yaml_invalid_warning("achievement_read_db_sub: Achievement definition with invalid ID field in '" CL_WHITE "%s" CL_RESET "', skipping.\n", node, source);
+ return false;
+ }
+ if (achievement_id < 1 || achievement_id > INT_MAX) {
+ ShowWarning("achievement_read_db_sub: Invalid achievement ID %d in \"%s\", entry #%d (min: 1, max: %d), skipping.\n", achievement_id, source.c_str(), n, INT_MAX);
+ return false;
+ }
+
+ if (achievement_exists(achievement_id)) {
+ if (source.find("import") != std::string::npos) // Import file read-in, free previous value and store new value
+ existing = true;
+ else { // Normal file read-in
+ ShowWarning("achievement_read_db: Duplicate achievement %d.\n", achievement_id);
+ return false;
+ }
+ }
+
+ if(!existing)
+ achievements[achievement_id] = std::make_shared<s_achievement_db>();
+ auto &entry = achievements[achievement_id];
+ entry->achievement_id = achievement_id;
+
+ if (!node["Group"]) {
+ yaml_invalid_warning("achievement_read_db_sub: Missing group field in '" CL_WHITE "%s" CL_RESET "', skipping.\n", node, source);
+ return false;
+ }
+ try {
+ group_char = node["Group"].as<std::string>();
+ } catch (...) {
+ yaml_invalid_warning("achievement_read_db_sub: Achievement definition with invalid group field in '" CL_WHITE "%s" CL_RESET "', skipping.\n", node, source);
+ return false;
+ }
+ if (!script_get_constant(group_char.c_str(), (int *)&group)) {
+ ShowWarning("achievement_read_db_sub: Invalid group %s for achievement %d in \"%s\", skipping.\n", group_char.c_str(), achievement_id, source.c_str());
+ return false;
+ }
+
+ if (!node["Name"]) {
+ ShowWarning("achievement_read_db_sub: Missing achievement name for achievement %d in \"%s\", skipping.\n", achievement_id, source.c_str());
+ return false;
+ }
+ try {
+ name = node["Name"].as<std::string>();
+ } catch (...) {
+ yaml_invalid_warning("achievement_read_db_sub: Achievement definition with invalid name field in '" CL_WHITE "%s" CL_RESET "', skipping.\n", node, source);
+ return false;
+ }
+
+ entry->group = group;
+ entry->name = name;
+ entry->mapindex = -1;
+
+ if (node["Target"]) {
+ try {
+ const YAML::Node &target_list = node["Target"];
+
+ for (auto targetit = target_list.begin(); targetit != target_list.end() && target_list.size() < MAX_ACHIEVEMENT_OBJECTIVES; ++targetit) {
+ const YAML::Node &target = *targetit;
+ int mobid = 0, count = 0;
+
+ if (target["MobID"] && (mobid = target["MobID"].as<int>()) && mob_db(mobid) == NULL) { // The mob ID field is not required
+ ShowError("achievement_read_db_sub: Invalid mob ID %d for achievement %d in \"%s\", skipping.\n", mobid, achievement_id, source.c_str());
+ continue;
+ }
+ if (target["Count"] && (!(count = target["Count"].as<int>()) || count <= 0)) {
+ ShowError("achievement_read_db_sub: Invalid count %d for achievement %d in \"%s\", skipping.\n", count, achievement_id, source.c_str());
+ continue;
+ }
+ if (mobid && group == AG_BATTLE && !achievement_mobexists(mobid))
+ achievement_mobs.push_back(mobid);
+
+ entry->targets.push_back({ mobid, count });
+ }
+ } catch (...) {
+ yaml_invalid_warning("achievement_read_db_sub: Achievement definition with invalid target field in '" CL_WHITE "%s" CL_RESET "', skipping.\n", node, source);
+ return false;
+ }
+ }
+
+ if (node["Condition"]) {
+ try {
+ condition = node["Condition"].as<std::string>();
+ } catch (...) {
+ yaml_invalid_warning("achievement_read_db_sub: Achievement definition with invalid condition field in '" CL_WHITE "%s" CL_RESET "', skipping.\n", node, source);
+ return false;
+ }
+ entry->condition = parse_condition(condition.c_str(), source.c_str(), n);
+ }
+
+ if (node["Map"]) {
+ try {
+ mapname = node["Map"].as<std::string>();
+ } catch (...) {
+ yaml_invalid_warning("achievement_read_db_sub: Achievement definition with invalid map field in '" CL_WHITE "%s" CL_RESET "', skipping.\n", node, source);
+ return false;
+ }
+ if (group != AG_CHAT)
+ ShowWarning("achievement_read_db_sub: The map argument can only be used with the group AG_CHATTING (achievement %d in \"%s\"), skipping.\n", achievement_id, source.c_str());
+ else {
+ entry->mapindex = map_mapname2mapid(mapname.c_str());
+
+ if (entry->mapindex == -1)
+ ShowWarning("achievement_read_db_sub: Invalid map name %s for achievement %d in \"%s\".\n", mapname.c_str(), achievement_id, source.c_str());
+ }
+ }
+
+ if (node["Dependent"]) {
+ try {
+ const YAML::Node dependent_list = node["Dependent"];
+
+ if (dependent_list.IsSequence()) {
+ for (uint8 i = 0; i < dependent_list.size() && dependent_list.size() < MAX_ACHIEVEMENT_DEPENDENTS; i++)
+ entry->dependent_ids.push_back(dependent_list[i].as<int>());
+ } else
+ ShowWarning("achievement_read_db_sub: Invalid dependent format for achievement %d in \"%s\".\n", achievement_id, source.c_str());
+ } catch (...) {
+ yaml_invalid_warning("achievement_read_db_sub: Achievement definition with invalid dependent field in '" CL_WHITE "%s" CL_RESET "', skipping.\n", node, source);
+ return false;
+ }
+ }
+
+ if (node["Reward"]) {
+ try {
+ const YAML::Node reward_list = node["Reward"];
+ int nameid = 0, amount = 0, titleid = 0;
+
+ if (reward_list["ItemID"] && (nameid = reward_list["ItemID"].as<unsigned short>())) {
+ if (itemdb_exists(nameid)) {
+ entry->rewards.nameid = nameid;
+ entry->rewards.amount = 1; // Default the amount to 1
+ } else if (nameid && !itemdb_exists(nameid)) {
+ ShowWarning("achievement_read_db_sub: Invalid reward item ID %hu for achievement %d in \"%s\". Setting to 0.\n", nameid, achievement_id, source.c_str());
+ entry->rewards.nameid = nameid = 0;
+ }
+
+ if (reward_list["Amount"] && (amount = reward_list["Amount"].as<unsigned short>()) && amount > 0 && nameid > 0)
+ entry->rewards.amount = amount;
+ }
+ if (reward_list["Script"])
+ entry->rewards.script = parse_script(reward_list["Script"].as<std::string>().c_str(), source.c_str(), achievement_id, SCRIPT_IGNORE_EXTERNAL_BRACKETS);
+ if (reward_list["TitleID"] && (titleid = reward_list["TitleID"].as<int>()) && titleid > 0)
+ entry->rewards.title_id = titleid;
+ } catch (...) {
+ yaml_invalid_warning("achievement_read_db_sub: Achievement definition with invalid target field in '" CL_WHITE "%s" CL_RESET "', skipping.\n", node, source);
+ return false;
+ }
+ }
+
+ if (node["Score"]) {
+ try {
+ entry->score = node["Score"].as<int>();
+ } catch (...) {
+ yaml_invalid_warning("achievement_read_db_sub: Achievement definition with invalid score field in '" CL_WHITE "%s" CL_RESET "', skipping.\n", node, source);
+ return false;
+ }
+ }
+
+ return true;
+}
+
+/**
+ * Loads achievements from the achievement db.
+ */
+void achievement_read_db(void)
+{
+ std::vector<std::string> directories = { std::string(db_path) + "/" + std::string(DBPATH), std::string(db_path) + "/" + std::string(DBIMPORT) + "/" };
+ static const std::string file_name("achievement_db.yml");
+
+ for (auto &directory : directories) {
+ std::string current_file = directory + file_name;
+ YAML::Node config;
+ int count = 0;
+
+ try {
+ config = YAML::LoadFile(current_file);
+ } catch (...) {
+ ShowError("Cannot read '" CL_WHITE "%s" CL_RESET "'.\n", current_file.c_str());
+ return;
+ }
+
+ for (const auto &node : config["Achievements"]) {
+ if (node.IsDefined() && achievement_read_db_sub(node, count, current_file))
+ count++;
+ }
+ for (auto &achit : achievements) {
+ const auto ach = achit.second;
+
+ for (int i = 0; i < ach->dependent_ids.size(); i++) {
+ if (!achievement_exists(ach->dependent_ids[i])) {
+ ShowWarning("achievement_read_db: An invalid Dependent ID %d was given for Achievement %d. Removing from list.\n", ach->dependent_ids[i], ach->achievement_id);
+ ach->dependent_ids.erase(ach->dependent_ids.begin() + i);
+ }
+ }
+ }
+ ShowStatus("Done reading '" CL_WHITE "%d" CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'\n", count, current_file.c_str());
+ }
+
+ return;
+}
+
+/**
+ * Recursive method to free an achievement condition (probably not needed anymore, but just in case)
+ * @param condition: Condition to clear
+ */
+void achievement_script_free(std::shared_ptr<struct av_condition> condition)
+{
+ condition->left.reset();
+ condition->right.reset();
+}
+
+/**
+ * Reloads the achievement database
+ */
+void achievement_db_reload(void)
+{
+ if (!battle_config.feature_achievement)
+ return;
+ do_final_achievement();
+ do_init_achievement();
+}
+
+/**
+ * Initializes the achievement database
+ */
+void do_init_achievement(void)
+{
+ if (!battle_config.feature_achievement)
+ return;
+ achievement_read_db();
+}
+
+/**
+ * Finalizes the achievement database
+ */
+void do_final_achievement(void)
+{
+ achievement_mobs.clear();
+ achievements.clear();
+}
+
+/**
+ * Achievement constructor
+ */
+s_achievement_db::s_achievement_db()
+ : achievement_id(0)
+ , name("")
+ , group()
+ , targets()
+ , dependent_ids()
+ , condition(nullptr)
+ , mapindex(0)
+ , rewards()
+ , score(0)
+ , has_dependent(0)
+{}
+
+/**
+ * Achievement reward constructor
+ */
+s_achievement_db::ach_reward::ach_reward()
+ : nameid(0)
+ , amount(0)
+ , script(nullptr)
+ , title_id(0)
+{}
+
+/**
+ * Achievement reward deconstructor
+ */
+s_achievement_db::ach_reward::~ach_reward()
+{
+ if (script)
+ script_free_code(script);
+}
diff --git a/src/map/achievement.hpp b/src/map/achievement.hpp
new file mode 100644
index 00000000000..5abecdf5686
--- /dev/null
+++ b/src/map/achievement.hpp
@@ -0,0 +1,126 @@
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
+#ifndef _ACHIEVEMENT_HPP_
+#define _ACHIEVEMENT_HPP_
+
+#include <algorithm>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+#include "../common/mmo.h"
+#include "../common/db.h"
+
+struct map_session_data;
+struct block_list;
+
+enum e_achievement_group {
+ AG_NONE = 0,
+ AG_ADD_FRIEND,
+ AG_ADVENTURE,
+ AG_BABY,
+ AG_BATTLE,
+ AG_CHAT,
+ AG_CHAT_COUNT,
+ AG_CHAT_CREATE,
+ AG_CHAT_DYING,
+ AG_EAT,
+ AG_GET_ITEM,
+ AG_GET_ZENY,
+ AG_GOAL_ACHIEVE,
+ AG_GOAL_LEVEL,
+ AG_GOAL_STATUS,
+ AG_HEAR,
+ AG_JOB_CHANGE,
+ AG_MARRY,
+ AG_PARTY,
+ AG_REFINE_FAIL,
+ AG_REFINE_SUCCESS,
+ AG_SEE,
+ AG_SPEND_ZENY,
+ AG_TAMING,
+ AG_MAX
+};
+
+enum e_achievement_info {
+ ACHIEVEINFO_COUNT1 = 1,
+ ACHIEVEINFO_COUNT2,
+ ACHIEVEINFO_COUNT3,
+ ACHIEVEINFO_COUNT4,
+ ACHIEVEINFO_COUNT5,
+ ACHIEVEINFO_COUNT6,
+ ACHIEVEINFO_COUNT7,
+ ACHIEVEINFO_COUNT8,
+ ACHIEVEINFO_COUNT9,
+ ACHIEVEINFO_COUNT10,
+ ACHIEVEINFO_COMPLETE,
+ ACHIEVEINFO_COMPLETEDATE,
+ ACHIEVEINFO_GOTREWARD,
+ ACHIEVEINFO_LEVEL,
+ ACHIEVEINFO_SCORE,
+ ACHIEVEINFO_MAX,
+};
+
+struct achievement_target {
+ int mob;
+ int count;
+};
+
+struct av_condition {
+ int op;
+ std::shared_ptr<struct av_condition> left;
+ std::shared_ptr<struct av_condition> right;
+ long long value;
+
+ av_condition() : op(0), left(nullptr), right(nullptr), value(0) {}
+};
+
+struct s_achievement_db {
+ int achievement_id;
+ std::string name;
+ enum e_achievement_group group;
+ std::vector <achievement_target> targets;
+ std::vector <int> dependent_ids;
+ std::shared_ptr<struct av_condition> condition;
+ int16 mapindex;
+ struct ach_reward {
+ unsigned short nameid, amount;
+ struct script_code *script;
+ int title_id;
+ ach_reward();
+ ~ach_reward();
+ } rewards;
+ int score;
+ int has_dependent; // Used for quick updating of achievements that depend on others - this is their ID
+
+ s_achievement_db();
+};
+
+bool achievement_exists(int achievement_id);
+std::shared_ptr<s_achievement_db>& achievement_get(int achievement_id);
+bool achievement_mobexists(int mob_id);
+void achievement_get_reward(struct map_session_data *sd, int achievement_id, time_t rewarded);
+struct achievement *achievement_add(struct map_session_data *sd, int achievement_id);
+bool achievement_remove(struct map_session_data *sd, int achievement_id);
+bool achievement_update_achievement(struct map_session_data *sd, int achievement_id, bool complete);
+void achievement_check_reward(struct map_session_data *sd, int achievement_id);
+void achievement_free(struct map_session_data *sd);
+int achievement_check_progress(struct map_session_data *sd, int achievement_id, int type);
+int *achievement_level(struct map_session_data *sd, bool flag);
+void achievement_get_titles(uint32 char_id);
+void achievement_update_objective(struct map_session_data *sd, enum e_achievement_group group, uint8 arg_count, ...);
+void achievement_read_db(void);
+void achievement_db_reload(void);
+
+void do_init_achievement(void);
+void do_final_achievement(void);
+
+// Parser
+const char *av_parse_subexpr(const char *p,int limit, std::shared_ptr<struct av_condition> parent);
+const char *av_parse_simpleexpr(const char *p, std::shared_ptr<struct av_condition> parent);
+long long achievement_check_condition(std::shared_ptr<struct av_condition> condition, struct map_session_data *sd, const int *count);
+void achievement_script_free(std::shared_ptr<struct av_condition> condition);
+
+#endif /* _ACHIEVEMENT_HPP_ */
diff --git a/src/map/atcommand.c b/src/map/atcommand.cpp
similarity index 94%
rename from src/map/atcommand.c
rename to src/map/atcommand.cpp
index b27e806244a..e2897a48b5a 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.cpp
@@ -1,6 +1,11 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "atcommand.hpp"
+
+#include <stdlib.h>
+#include <math.h>
+
#include "../common/cbasetypes.h"
#include "../common/mmo.h"
#include "../common/timer.h"
@@ -11,33 +16,38 @@
#include "../common/socket.h"
#include "../common/strlib.h"
#include "../common/utils.h"
+#include "../common/utilities.hpp"
#include "../common/conf.h"
-#include "map.h"
-#include "atcommand.h"
-#include "battle.h"
-#include "chat.h"
-#include "channel.h"
-#include "chrif.h"
-#include "duel.h"
-#include "instance.h"
-#include "intif.h"
-#include "pet.h"
-#include "homunculus.h"
-#include "mail.h"
-#include "mercenary.h"
-#include "elemental.h"
-#include "party.h"
-#include "script.h"
-#include "storage.h"
-#include "trade.h"
-#include "mapreg.h"
-#include "quest.h"
-#include "pc.h"
-
-#include <stdlib.h>
-#include <math.h>
-
+#include "map.hpp"
+#include "battle.hpp"
+#include "chat.hpp"
+#include "channel.hpp"
+#include "chrif.hpp"
+#include "duel.hpp"
+#include "instance.hpp"
+#include "intif.hpp"
+#include "pet.hpp"
+#include "homunculus.hpp"
+#include "mail.hpp"
+#include "mercenary.hpp"
+#include "elemental.hpp"
+#include "party.hpp"
+#include "script.hpp"
+#include "storage.hpp"
+#include "trade.hpp"
+#include "mapreg.hpp"
+#include "quest.hpp"
+#include "pc.hpp"
+#include "pc_groups.hpp"
+#include "npc.hpp"
+#include "guild.hpp"
+#include "clif.hpp"
+#include "log.hpp"
+#include "itemdb.hpp" // MAX_ITEMGROUP
+#include "mob.hpp"
+#include "achievement.hpp"
+#include "clan.hpp"
#define ATCOMMAND_LENGTH 50
#define ACMD_FUNC(x) static int atcommand_ ## x (const int fd, struct map_session_data* sd, const char* command, const char* message)
@@ -79,6 +89,8 @@ static char atcmd_output[CHAT_SIZE_MAX];
static char atcmd_player_name[NAME_LENGTH];
const char *parent_cmd;
+struct atcmd_binding_data** atcmd_binding;
+
static AtCommandInfo* get_atcommandinfo_byname(const char *name); // @help
static const char* atcommand_checkalias(const char *aliasname); // @help
static void atcommand_get_suggestions(struct map_session_data* sd, const char *name, bool atcommand); // @help
@@ -185,12 +197,12 @@ ACMD_FUNC(send)
long num;
if(len)
{// show packet length
- sprintf(atcmd_output, msg_txt(sd,904), type, packet_db[sd->packet_ver][type].len); // Packet 0x%x length: %d
+ sprintf(atcmd_output, msg_txt(sd,904), type, packet_db[type].len); // Packet 0x%x length: %d
clif_displaymessage(fd, atcmd_output);
return 0;
}
- len=packet_db[sd->packet_ver][type].len;
+ len=packet_db[type].len;
off=2;
if(len == 0)
{// unknown packet - ERROR
@@ -341,7 +353,7 @@ ACMD_FUNC(send)
SKIP_VALUE(message);
}
- if(packet_db[sd->packet_ver][type].len == -1)
+ if(packet_db[type].len == -1)
{// send dynamic packet
WFIFOW(fd,2)=TOW(off);
WFIFOSET(fd,off);
@@ -427,8 +439,8 @@ static void warp_get_suggestions(struct map_session_data* sd, const char *name)
strcat(buffer, " ");
// swap elements
- swap(distance[i][0], distance[min][0]);
- swap(distance[i][1], distance[min][1]);
+ SWAP(distance[i][0], distance[min][0]);
+ SWAP(distance[i][1], distance[min][1]);
}
}
@@ -471,16 +483,16 @@ ACMD_FUNC(mapmove)
if ((x || y) && map_getcell(m, x, y, CELL_CHKNOPASS))
{ //This is to prevent the pc_setpos call from printing an error.
- clif_displaymessage(fd, msg_txt(sd,2));
+ clif_displaymessage(fd, msg_txt(sd,2)); // Invalid coordinates, using random target cell.
if (!map_search_freecell(NULL, m, &x, &y, 10, 10, 1))
x = y = 0; //Invalid cell, use random spot.
}
if ((map[m].flag.nowarpto && !pc_has_permission(sd, PC_PERM_WARP_ANYWHERE)) || !pc_job_can_entermap((enum e_job)sd->status.class_, m, sd->group_level)) {
- clif_displaymessage(fd, msg_txt(sd,247));
+ clif_displaymessage(fd, msg_txt(sd,247)); // You are not authorized to warp to this map.
return -1;
}
if (sd->bl.m >= 0 && map[sd->bl.m].flag.nowarp && !pc_has_permission(sd, PC_PERM_WARP_ANYWHERE)) {
- clif_displaymessage(fd, msg_txt(sd,248));
+ clif_displaymessage(fd, msg_txt(sd,248)); // You are not authorized to warp from your current map.
return -1;
}
if (pc_setpos(sd, mapindex, x, y, CLR_TELEPORT) != SETPOS_OK) {
@@ -502,7 +514,7 @@ ACMD_FUNC(where)
nullpo_retr(-1, sd);
memset(atcmd_player_name, '\0', sizeof atcmd_player_name);
- if (!message || !*message || sscanf(message, "%23s[^\n]", atcmd_player_name) < 1) {
+ if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
clif_displaymessage(fd, msg_txt(sd,910)); // Please enter a player name (usage: @where <char name>).
return -1;
}
@@ -531,12 +543,14 @@ ACMD_FUNC(jumpto)
nullpo_retr(-1, sd);
- if (!message || !*message) {
+ memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
+
+ if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
clif_displaymessage(fd, msg_txt(sd,911)); // Please enter a player name (usage: @jumpto/@warpto/@goto <char name/ID>).
return -1;
}
- if((pl_sd=map_nick2sd((char *)message,true)) == NULL && (pl_sd=map_charid2sd(atoi(message))) == NULL)
+ if((pl_sd=map_nick2sd(atcmd_player_name,true)) == NULL && (pl_sd=map_charid2sd(atoi(atcmd_player_name))) == NULL)
{
clif_displaymessage(fd, msg_txt(sd,3)); // Character not found.
return -1;
@@ -556,7 +570,7 @@ ACMD_FUNC(jumpto)
if( pc_isdead(sd) )
{
- clif_displaymessage(fd, msg_txt(sd,664));
+ clif_displaymessage(fd, msg_txt(sd,664)); // You cannot use this command when dead.
return -1;
}
@@ -587,13 +601,13 @@ ACMD_FUNC(jump)
if( pc_isdead(sd) )
{
- clif_displaymessage(fd, msg_txt(sd,664));
+ clif_displaymessage(fd, msg_txt(sd,664)); // You cannot use this command when dead.
return -1;
}
if ((x || y) && map_getcell(sd->bl.m, x, y, CELL_CHKNOPASS))
{ //This is to prevent the pc_setpos call from printing an error.
- clif_displaymessage(fd, msg_txt(sd,2));
+ clif_displaymessage(fd, msg_txt(sd,2)); // Invalid coordinates, using random target cell.
if (!map_search_freecell(NULL, sd->bl.m, &x, &y, 10, 10, 1))
x = y = 0; //Invalid cell, use random spot.
}
@@ -887,7 +901,7 @@ ACMD_FUNC(storage)
if (storage_storageopen(sd) == 1)
{ //Already open.
- clif_displaymessage(fd, msg_txt(sd,250));
+ clif_displaymessage(fd, msg_txt(sd,250)); // You have already opened your storage. Close it first.
return -1;
}
@@ -905,7 +919,7 @@ ACMD_FUNC(guildstorage)
nullpo_retr(-1, sd);
if (!sd->status.guild_id) {
- clif_displaymessage(fd, msg_txt(sd,252));
+ clif_displaymessage(fd, msg_txt(sd,252)); // You are not in a guild.
return -1;
}
@@ -913,17 +927,17 @@ ACMD_FUNC(guildstorage)
return -1;
if (sd->state.storage_flag == 1) {
- clif_displaymessage(fd, msg_txt(sd,250));
+ clif_displaymessage(fd, msg_txt(sd,250)); // You have already opened your storage. Close it first.
return -1;
}
if (sd->state.storage_flag == 2) {
- clif_displaymessage(fd, msg_txt(sd,251));
+ clif_displaymessage(fd, msg_txt(sd,251)); // You have already opened your guild storage. Close it first.
return -1;
}
if (sd->state.storage_flag == 3) {
- clif_displaymessage(fd, msg_txt(sd,250));
+ clif_displaymessage(fd, msg_txt(sd,250)); // You have already opened your storage. Close it first.
return -1;
}
@@ -992,7 +1006,7 @@ ACMD_FUNC(hide)
map_foreachinmovearea(clif_insight, &sd->bl, AREA_SIZE, sd->bl.x, sd->bl.y, BL_ALL, &sd->bl);
} else {
sd->sc.option |= OPTION_INVISIBLE;
- sd->vd.class_ = INVISIBLE_CLASS;
+ sd->vd.class_ = JT_INVISIBLE;
clif_displaymessage(fd, msg_txt(sd,11)); // Invisible: On
// decrement the number of pvp players on the map
@@ -1095,7 +1109,7 @@ ACMD_FUNC(alive)
nullpo_retr(-1, sd);
if (!status_revive(&sd->bl, 100, 100))
{
- clif_displaymessage(fd, msg_txt(sd,667));
+ clif_displaymessage(fd, msg_txt(sd,667)); // You're not dead.
return -1;
}
clif_skill_nodamage(&sd->bl,&sd->bl,ALL_RESURRECTION,4,1);
@@ -1204,7 +1218,7 @@ ACMD_FUNC(heal)
ACMD_FUNC(item)
{
char item_name[100];
- int number = 0, bound = BOUND_NONE;
+ int number = 0, bound = BOUND_NONE, costume = 0;
char flag = 0;
struct item item_tmp;
struct item_data *item_data[10];
@@ -1253,6 +1267,27 @@ ACMD_FUNC(item)
for(j--; j>=0; j--){ //produce items in list
unsigned short item_id = item_data[j]->nameid;
+ if (!strcmpi(command + 1, "costumeitem"))
+ {
+ if (!battle_config.reserved_costume_id)
+ {
+ clif_displaymessage(fd, "Costume convertion is disable. Set a value for reserved_cosutme_id on your battle.conf file.");
+ return -1;
+ }
+ if (!(item_data[j]->equip&EQP_HEAD_LOW) &&
+ !(item_data[j]->equip&EQP_HEAD_MID) &&
+ !(item_data[j]->equip&EQP_HEAD_TOP) &&
+ !(item_data[j]->equip&EQP_COSTUME_HEAD_LOW) &&
+ !(item_data[j]->equip&EQP_COSTUME_HEAD_MID) &&
+ !(item_data[j]->equip&EQP_COSTUME_HEAD_TOP) &&
+ !(item_data[j]->equip&EQP_GARMENT) &&
+ !(item_data[j]->equip&EQP_COSTUME_GARMENT))
+ {
+ clif_displaymessage(fd, "You cannot costume this item. Costume only work for headgears.");
+ return -1;
+ }
+ costume = 1;
+ }
//Check if it's stackable.
if (!itemdb_isstackable2(item_data[j]))
get_count = 1;
@@ -1263,6 +1298,11 @@ ACMD_FUNC(item)
memset(&item_tmp, 0, sizeof(item_tmp));
item_tmp.nameid = item_id;
item_tmp.identify = 1;
+ if (costume == 1) { // Costume item
+ item_tmp.card[0] = CARD0_CREATE;
+ item_tmp.card[2] = GetWord(battle_config.reserved_costume_id, 0);
+ item_tmp.card[3] = GetWord(battle_config.reserved_costume_id, 1);
+ }
item_tmp.bound = bound;
if ((flag = pc_additem(sd, &item_tmp, get_count, LOG_TYPE_COMMAND)))
clif_additem(sd, 0, 0, flag);
@@ -1420,6 +1460,8 @@ ACMD_FUNC(baselevelup)
status_calc_pc(sd, SCO_FORCE);
status_percent_heal(&sd->bl, 100, 100);
clif_misceffect(&sd->bl, 0);
+ achievement_update_objective(sd, AG_GOAL_LEVEL, 1, sd->status.base_level);
+ achievement_update_objective(sd, AG_GOAL_STATUS, 2, sd->status.base_level, sd->status.class_);
clif_displaymessage(fd, msg_txt(sd,21)); // Base level raised.
} else {
if (sd->status.base_level == 1) {
@@ -1481,6 +1523,7 @@ ACMD_FUNC(joblevelup)
sd->status.job_level += (unsigned int)level;
sd->status.skill_point += level;
clif_misceffect(&sd->bl, 1);
+ achievement_update_objective(sd, AG_GOAL_LEVEL, 1, sd->status.job_level);
clif_displaymessage(fd, msg_txt(sd,24)); // Job level raised.
} else {
if (sd->status.job_level == 1) {
@@ -1521,7 +1564,7 @@ ACMD_FUNC(help)
config_setting_t *help;
const char *text = NULL;
const char *command_name = NULL;
- char *default_command = "help";
+ const char *default_command = "help";
nullpo_retr(-1, sd);
@@ -1750,12 +1793,7 @@ ACMD_FUNC(bodystyle)
memset(atcmd_output, '\0', sizeof(atcmd_output));
- // Limit body styles to certain jobs since not all of them are released yet.
- if (!((sd->class_&MAPID_THIRDMASK) == MAPID_GUILLOTINE_CROSS || (sd->class_&MAPID_THIRDMASK) == MAPID_GENETIC
- || (sd->class_&MAPID_THIRDMASK) == MAPID_MECHANIC || (sd->class_&MAPID_THIRDMASK) == MAPID_ROYAL_GUARD
- || (sd->class_&MAPID_THIRDMASK) == MAPID_ARCH_BISHOP || (sd->class_&MAPID_THIRDMASK) == MAPID_RANGER
- || (sd->class_&MAPID_THIRDMASK) == MAPID_WARLOCK || (sd->class_&MAPID_THIRDMASK) == MAPID_SHADOW_CHASER
- || (sd->class_&MAPID_THIRDMASK) == MAPID_MINSTRELWANDERER)) {
+ if (!(sd->class_&JOBL_THIRD)) {
clif_displaymessage(fd, msg_txt(sd,740)); // This job has no alternate body styles.
return -1;
}
@@ -1891,7 +1929,7 @@ ACMD_FUNC(go)
{ MAP_NIFLHEIM, 21, 153 }, // 13=Niflheim
{ MAP_LOUYANG, 217, 40 }, // 14=Louyang
#ifdef RENEWAL
- { MAP_NOVICE, 97, 90 }, // 15=Training Grounds (Renewal)
+ { MAP_NOVICE, 18, 26 }, // 15=Training Grounds (Renewal)
#else
{ MAP_NOVICE, 53, 111 }, // 15=Training Grounds
#endif
@@ -1915,6 +1953,7 @@ ACMD_FUNC(go)
{ MAP_MALANGDO, 140, 114 }, // 33=Malangdo Island
{ MAP_MALAYA, 242, 211 }, // 34=Malaya Port
{ MAP_ECLAGE, 110, 39 }, // 35=Eclage
+ { MAP_LASAGNA, 193, 182 }, // 36=Lasagna
};
nullpo_retr(-1, sd);
@@ -2034,17 +2073,19 @@ ACMD_FUNC(go)
town = 34;
} else if (strncmp(map_name, "eclage", 3) == 0) {
town = 35;
+ } else if (strncmp(map_name, "lasagna", 2) == 0) {
+ town = 36;
}
if (town >= 0 && town < ARRAYLENGTH(data))
{
int16 m = map_mapname2mapid(data[town].map);
if (m >= 0 && map[m].flag.nowarpto && !pc_has_permission(sd, PC_PERM_WARP_ANYWHERE)) {
- clif_displaymessage(fd, msg_txt(sd,247));
+ clif_displaymessage(fd, msg_txt(sd,247)); // You are not authorized to warp to this map.
return -1;
}
if (sd->bl.m >= 0 && map[sd->bl.m].flag.nowarp && !pc_has_permission(sd, PC_PERM_WARP_ANYWHERE)) {
- clif_displaymessage(fd, msg_txt(sd,248));
+ clif_displaymessage(fd, msg_txt(sd,248)); // You are not authorized to warp from your current map.
return -1;
}
if (pc_setpos(sd, mapindex_name2id(data[town].map), data[town].x, data[town].y, CLR_TELEPORT) == SETPOS_OK) {
@@ -2272,6 +2313,7 @@ ACMD_FUNC(refine)
clif_additem(sd, i, 1, 0);
pc_equipitem(sd, i, current_position);
clif_misceffect(&sd->bl, 3);
+ achievement_update_objective(sd, AG_REFINE_SUCCESS, 2, sd->inventory_data[i]->wlv, sd->inventory.u.items_inventory[i].refine);
count++;
}
}
@@ -2361,7 +2403,7 @@ ACMD_FUNC(memo)
if( !message || !*message || sscanf(message, "%11d", &position) < 1 )
{
int i;
- clif_displaymessage(sd->fd, msg_txt(sd,668));
+ clif_displaymessage(sd->fd, msg_txt(sd,668)); // Your actual memo positions are:
for( i = 0; i < MAX_MEMOPOINTS; i++ )
{
if( sd->status.memo_point[i].map )
@@ -2735,7 +2777,9 @@ ACMD_FUNC(guildlevelup) {
*------------------------------------------*/
ACMD_FUNC(makeegg) {
struct item_data *item_data;
- int id, pet_id;
+ int id;
+ struct s_pet_db* pet;
+
nullpo_retr(-1, sd);
if (!message || !*message) {
@@ -2751,12 +2795,12 @@ ACMD_FUNC(makeegg) {
else
id = atoi(message);
- pet_id = search_petDB_index(id, PET_CLASS);
- if (pet_id < 0)
- pet_id = search_petDB_index(id, PET_EGG);
- if (pet_id >= 0) {
- sd->catch_target_class = pet_db[pet_id].class_;
- intif_create_pet(sd->status.account_id, sd->status.char_id, pet_db[pet_id].class_, mob_db(pet_db[pet_id].class_)->lv, pet_db[pet_id].EggID, 0, pet_db[pet_id].intimate, 100, 0, 1, pet_db[pet_id].jname);
+ pet = pet_db(id);
+ if (!pet)
+ pet = pet_db_search(id, PET_EGG);
+ if (pet != nullptr) {
+ sd->catch_target_class = pet->class_;
+ intif_create_pet(sd->status.account_id, sd->status.char_id, pet->class_, mob_db(pet->class_)->lv, pet->EggID, 0, pet->intimate, 100, 0, 1, pet->jname);
} else {
clif_displaymessage(fd, msg_txt(sd,180)); // The monster/egg name/id doesn't exist.
return -1;
@@ -2884,12 +2928,14 @@ ACMD_FUNC(recall) {
nullpo_retr(-1, sd);
- if (!message || !*message) {
+ memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
+
+ if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
clif_displaymessage(fd, msg_txt(sd,1018)); // Please enter a player name (usage: @recall <char name/ID>).
return -1;
}
- if((pl_sd=map_nick2sd((char *)message,true)) == NULL && (pl_sd=map_charid2sd(atoi(message))) == NULL)
+ if((pl_sd=map_nick2sd(atcmd_player_name,true)) == NULL && (pl_sd=map_charid2sd(atoi(atcmd_player_name))) == NULL)
{
clif_displaymessage(fd, msg_txt(sd,3)); // Character not found.
return -1;
@@ -3119,7 +3165,7 @@ ACMD_FUNC(doom)
if (pl_sd->fd != fd && pc_get_group_level(sd) >= pc_get_group_level(pl_sd))
{
status_kill(&pl_sd->bl);
- clif_specialeffect(&pl_sd->bl,450,AREA);
+ clif_specialeffect(&pl_sd->bl,EF_GRANDCROSS2,AREA);
clif_displaymessage(pl_sd->fd, msg_txt(sd,61)); // The holy messenger has given judgement.
}
}
@@ -3146,7 +3192,7 @@ ACMD_FUNC(doommap)
if (pl_sd->fd != fd && sd->bl.m == pl_sd->bl.m && pc_get_group_level(sd) >= pc_get_group_level(pl_sd))
{
status_kill(&pl_sd->bl);
- clif_specialeffect(&pl_sd->bl,450,AREA);
+ clif_specialeffect(&pl_sd->bl,EF_GRANDCROSS2,AREA);
clif_displaymessage(pl_sd->fd, msg_txt(sd,61)); // The holy messenger has given judgement.
}
}
@@ -3220,12 +3266,12 @@ ACMD_FUNC(kick)
memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
- if (!message || !*message) {
+ if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
clif_displaymessage(fd, msg_txt(sd,1026)); // Please enter a player name (usage: @kick <char name/ID>).
return -1;
}
- if((pl_sd=map_nick2sd((char *)message,false)) == NULL && (pl_sd=map_charid2sd(atoi(message))) == NULL)
+ if((pl_sd=map_nick2sd(atcmd_player_name,false)) == NULL && (pl_sd=map_charid2sd(atoi(atcmd_player_name))) == NULL)
{
clif_displaymessage(fd, msg_txt(sd,3)); // Character not found.
return -1;
@@ -3840,7 +3886,7 @@ ACMD_FUNC(reload) {
atcommand_doload();
pc_groups_reload();
- clif_displaymessage(fd, msg_txt(sd,254));
+ clif_displaymessage(fd, msg_txt(sd,254)); // GM command configuration has been reloaded.
} else if (strstr(command, "battleconf") || strncmp(message, "battleconf", 3) == 0) {
struct Battle_Config prev_config;
memcpy(&prev_config, &battle_config, sizeof(prev_config));
@@ -3887,16 +3933,16 @@ ACMD_FUNC(reload) {
mob_reload(); //Needed as well so rate changes take effect.
chrif_ragsrvinfo(battle_config.base_exp_rate, battle_config.job_exp_rate, battle_config.item_rate_common);
}
- clif_displaymessage(fd, msg_txt(sd,255));
+ clif_displaymessage(fd, msg_txt(sd,255)); // Battle configuration has been reloaded.
} else if (strstr(command, "statusdb") || strncmp(message, "statusdb", 3) == 0) {
status_readdb();
- clif_displaymessage(fd, msg_txt(sd,256));
+ clif_displaymessage(fd, msg_txt(sd,256)); // Status database has been reloaded.
} else if (strstr(command, "pcdb") || strncmp(message, "pcdb", 2) == 0) {
pc_readdb();
- clif_displaymessage(fd, msg_txt(sd,257));
+ clif_displaymessage(fd, msg_txt(sd,257)); // Player database has been reloaded.
} else if (strstr(command, "motd") || strncmp(message, "motd", 4) == 0) {
pc_read_motd();
- clif_displaymessage(fd, msg_txt(sd,268));
+ clif_displaymessage(fd, msg_txt(sd,268)); // Reloaded the Message of the Day.
} else if (strstr(command, "script") || strncmp(message, "script", 3) == 0) {
struct s_mapiterator* iter;
struct map_session_data* pl_sd;
@@ -3920,12 +3966,12 @@ ACMD_FUNC(reload) {
} else if (strstr(command, "questdb") || strncmp(message, "questdb", 3) == 0) {
do_reload_quest();
clif_displaymessage(fd, msg_txt(sd,1377)); // Quest database has been reloaded.
- } else if (strstr(command, "packetdb") || strncmp(message, "packetdb", 4) == 0) {
- packetdb_readdb(true);
- clif_displaymessage(fd, msg_txt(sd,1477)); // Packet database has been reloaded.
} else if (strstr(command, "instancedb") || strncmp(message, "instancedb", 4) == 0) {
instance_reload();
clif_displaymessage(fd, msg_txt(sd,516)); // Instance database has been reloaded.
+ } else if (strstr(command, "achievementdb") || strncmp(message, "achievementdb", 4) == 0) {
+ achievement_db_reload();
+ clif_displaymessage(fd, msg_txt(sd,771)); // Achievement database has been reloaded.
}
return 0;
@@ -4223,16 +4269,15 @@ ACMD_FUNC(mapinfo) {
{
struct npc_data *nd = map[m_id].npc[i];
switch(nd->ud.dir) {
- case 0: strcpy(direction, msg_txt(sd,491)); break; // North
- case 1: strcpy(direction, msg_txt(sd,492)); break; // North West
- case 2: strcpy(direction, msg_txt(sd,493)); break; // West
- case 3: strcpy(direction, msg_txt(sd,494)); break; // South West
- case 4: strcpy(direction, msg_txt(sd,495)); break; // South
- case 5: strcpy(direction, msg_txt(sd,496)); break; // South East
- case 6: strcpy(direction, msg_txt(sd,497)); break; // East
- case 7: strcpy(direction, msg_txt(sd,498)); break; // North East
- case 9: strcpy(direction, msg_txt(sd,491)); break; // North
- default: strcpy(direction, msg_txt(sd,499)); break; // Unknown
+ case DIR_NORTH: strcpy(direction, msg_txt(sd,491)); break; // North
+ case DIR_NORTHWEST: strcpy(direction, msg_txt(sd,492)); break; // North West
+ case DIR_WEST: strcpy(direction, msg_txt(sd,493)); break; // West
+ case DIR_SOUTHWEST: strcpy(direction, msg_txt(sd,494)); break; // South West
+ case DIR_SOUTH: strcpy(direction, msg_txt(sd,495)); break; // South
+ case DIR_SOUTHEAST: strcpy(direction, msg_txt(sd,496)); break; // South East
+ case DIR_EAST: strcpy(direction, msg_txt(sd,497)); break; // East
+ case DIR_NORTHEAST: strcpy(direction, msg_txt(sd,498)); break; // North East
+ default: strcpy(direction, msg_txt(sd,499)); break; // Unknown
}
if(strcmp(nd->name,nd->exname) == 0)
sprintf(atcmd_output, msg_txt(sd,490), // NPC %d: %s | Direction: %s | Sprite: %d | Location: %d %d
@@ -4610,13 +4655,13 @@ ACMD_FUNC(loadnpc)
}
if (!npc_addsrcfile(message, true)) {
- clif_displaymessage(fd, msg_txt(sd,261));
+ clif_displaymessage(fd, msg_txt(sd,261)); // Script could not be loaded.
return -1;
}
npc_read_event_script();
- clif_displaymessage(fd, msg_txt(sd,262));
+ clif_displaymessage(fd, msg_txt(sd,262)); // Script loaded.
return 0;
}
@@ -4925,7 +4970,7 @@ ACMD_FUNC(jailfor) {
clif_displaymessage(fd, atcmd_output);
}
} else if (jailtime < 0) {
- clif_displaymessage(fd, msg_txt(sd,1136));
+ clif_displaymessage(fd, msg_txt(sd,1136)); // Invalid time for jail command.
return -1;
}
@@ -5286,7 +5331,7 @@ ACMD_FUNC(email)
*------------------------------------------*/
ACMD_FUNC(effect)
{
- int type = 0, flag = 0;
+ int type = EF_NONE;
nullpo_retr(-1, sd);
if (!message || !*message || sscanf(message, "%11d", &type) < 1) {
@@ -5294,7 +5339,13 @@ ACMD_FUNC(effect)
return -1;
}
- clif_specialeffect(&sd->bl, type, (send_target)flag);
+ if( type <= EF_NONE || type >= EF_MAX ){
+ sprintf(atcmd_output, msg_txt(sd,1152),EF_NONE+1,EF_MAX-1); // Please enter a valid effect id in the range from %d to %d.
+ clif_displaymessage(fd, atcmd_output);
+ return -1;
+ }
+
+ clif_specialeffect(&sd->bl, type, ALL_CLIENT);
clif_displaymessage(fd, msg_txt(sd,229)); // Your effect has changed.
return 0;
}
@@ -5309,9 +5360,9 @@ ACMD_FUNC(killer)
sd->state.killer = !sd->state.killer;
if(sd->state.killer)
- clif_displaymessage(fd, msg_txt(sd,241));
+ clif_displaymessage(fd, msg_txt(sd,241)); // You can now attack and kill players freely.
else {
- clif_displaymessage(fd, msg_txt(sd,292));
+ clif_displaymessage(fd, msg_txt(sd,292)); // Killer state reset.
pc_stop_attack(sd);
}
return 0;
@@ -5327,9 +5378,9 @@ ACMD_FUNC(killable)
sd->state.killable = !sd->state.killable;
if(sd->state.killable)
- clif_displaymessage(fd, msg_txt(sd,242));
+ clif_displaymessage(fd, msg_txt(sd,242)); // You can now be attacked and killed by players.
else {
- clif_displaymessage(fd, msg_txt(sd,288));
+ clif_displaymessage(fd, msg_txt(sd,288)); // You are no longer killable.
map_foreachinallrange(atcommand_stopattack,&sd->bl, AREA_SIZE, BL_CHAR, sd->bl.id);
}
return 0;
@@ -5343,7 +5394,7 @@ ACMD_FUNC(skillon)
{
nullpo_retr(-1, sd);
map[sd->bl.m].flag.noskill = 0;
- clif_displaymessage(fd, msg_txt(sd,244));
+ clif_displaymessage(fd, msg_txt(sd,244)); // Skills have been enabled on this map.
return 0;
}
@@ -5355,7 +5406,7 @@ ACMD_FUNC(skilloff)
{
nullpo_retr(-1, sd);
map[sd->bl.m].flag.noskill = 1;
- clif_displaymessage(fd, msg_txt(sd,243));
+ clif_displaymessage(fd, msg_txt(sd,243)); // Skills have been disabled on this map.
return 0;
}
@@ -5365,7 +5416,7 @@ ACMD_FUNC(skilloff)
*------------------------------------------*/
ACMD_FUNC(npcmove)
{
- short x = 0, y = 0, m;
+ short x = 0, y = 0;
struct npc_data *nd = 0;
char npc_name[NPC_NAME_LENGTH];
@@ -5383,18 +5434,12 @@ ACMD_FUNC(npcmove)
return -1;
}
- if ((m=nd->bl.m) < 0 || nd->bl.prev == NULL)
- {
+ if ( npc_movenpc( nd, x, y ) )
+ { //actually failed to move
clif_displaymessage(fd, msg_txt(sd,1154)); // NPC is not on this map.
return -1; //Not on a map.
- }
-
- x = cap_value(x, 0, map[m].xs-1);
- y = cap_value(y, 0, map[m].ys-1);
- map_foreachinallrange(clif_outsight, &nd->bl, AREA_SIZE, BL_PC, &nd->bl);
- map_moveblock(&nd->bl, x, y, gettick());
- map_foreachinallrange(clif_insight, &nd->bl, AREA_SIZE, BL_PC, &nd->bl);
- clif_displaymessage(fd, msg_txt(sd,1155)); // NPC moved.
+ } else
+ clif_displaymessage(fd, msg_txt(sd,1155)); // NPC moved
return 0;
}
@@ -5444,7 +5489,9 @@ ACMD_FUNC(follow)
struct map_session_data *pl_sd = NULL;
nullpo_retr(-1, sd);
- if (!message || !*message) {
+ memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
+
+ if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
if (sd->followtarget == -1)
return -1;
@@ -5453,7 +5500,7 @@ ACMD_FUNC(follow)
return 0;
}
- if ( (pl_sd = map_nick2sd((char *)message,true)) == NULL )
+ if ( (pl_sd = map_nick2sd(atcmd_player_name,true)) == NULL )
{
clif_displaymessage(fd, msg_txt(sd,3)); // Character not found.
return -1;
@@ -5488,8 +5535,8 @@ ACMD_FUNC(dropall)
if( type != -1 && type != IT_HEALING && type != IT_USABLE && type != IT_ETC && type != IT_WEAPON &&
type != IT_ARMOR && type != IT_CARD && type != IT_PETEGG && type != IT_PETARMOR && type != IT_AMMO )
{
- clif_displaymessage(fd, msg_txt(sd,1492));
- clif_displaymessage(fd, msg_txt(sd,1493));
+ clif_displaymessage(fd, msg_txt(sd,1492)); // Usage: @dropall {<type>}
+ clif_displaymessage(fd, msg_txt(sd,1493)); // Type List: (default) all = -1, healing = 0, usable = 2, etc = 3, armor = 4, weapon = 5, card = 6, petegg = 7, petarmor = 8, ammo = 10
return -1;
}
}
@@ -5553,11 +5600,11 @@ ACMD_FUNC(clearstorage)
nullpo_retr(-1, sd);
if (sd->state.storage_flag == 1) {
- clif_displaymessage(fd, msg_txt(sd,250));
+ clif_displaymessage(fd, msg_txt(sd,250)); // You have already opened your storage. Close it first.
return -1;
}
if (sd->state.storage_flag == 3) {
- clif_displaymessage(fd, msg_txt(sd,250));
+ clif_displaymessage(fd, msg_txt(sd,250)); // You have already opened your storage. Close it first.
return -1;
}
@@ -5582,22 +5629,22 @@ ACMD_FUNC(cleargstorage)
g = sd->guild;
if (g == NULL) {
- clif_displaymessage(fd, msg_txt(sd,43));
+ clif_displaymessage(fd, msg_txt(sd,43)); // You're not in a guild.
return -1;
}
if (sd->state.storage_flag == 1) {
- clif_displaymessage(fd, msg_txt(sd,250));
+ clif_displaymessage(fd, msg_txt(sd,250)); // You have already opened your storage. Close it first.
return -1;
}
if (sd->state.storage_flag == 2) {
- clif_displaymessage(fd, msg_txt(sd,251));
+ clif_displaymessage(fd, msg_txt(sd,251)); // You have already opened your guild storage. Close it first.
return -1;
}
if (sd->state.storage_flag == 3) {
- clif_displaymessage(fd, msg_txt(sd,250));
+ clif_displaymessage(fd, msg_txt(sd,250)); // You have already opened your storage. Close it first.
return -1;
}
@@ -5674,7 +5721,7 @@ ACMD_FUNC(skillid) {
sprintf(atcmd_output, msg_txt(sd,1164), db_data2i(data), skill_db[idx]->desc, key.str); // skill %d: %s (%s)
clif_displaymessage(fd, atcmd_output);
} else if ( found < MAX_SKILLID_PARTIAL_RESULTS && ( stristr(key.str,message) || stristr(skill_db[idx]->desc,message) ) ) {
- snprintf(partials[found++], MAX_SKILLID_PARTIAL_RESULTS_LEN, msg_txt(sd,1164), db_data2i(data), skill_db[idx]->desc, key.str);
+ snprintf(partials[found++], MAX_SKILLID_PARTIAL_RESULTS_LEN, msg_txt(sd,1164), db_data2i(data), skill_db[idx]->desc, key.str); // // skill %d: %s (%s)
}
}
@@ -5702,16 +5749,18 @@ ACMD_FUNC(useskill)
struct block_list *bl;
uint16 skill_id;
uint16 skill_lv;
- char target[100];
nullpo_retr(-1, sd);
- if(!message || !*message || sscanf(message, "%6hu %6hu %23[^\n]", &skill_id, &skill_lv, target) != 3) {
- clif_displaymessage(fd, msg_txt(sd,1165)); // Usage: @useskill <skill ID> <skill level> <target>
+ memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
+
+ if(!message || !*message || sscanf(message, "%6hu %6hu %23[^\n]", &skill_id, &skill_lv, atcmd_player_name) != 3) {
+ clif_displaymessage(fd, msg_txt(sd,1165)); // Usage: @useskill <skill ID> <skill level> <char name>
return -1;
}
- if(!strcmp(target,"self")) pl_sd = sd; //quick keyword
- else if ( (pl_sd = map_nick2sd(target,true)) == NULL ){
+ if(!strcmp(atcmd_player_name,"self"))
+ pl_sd = sd; //quick keyword
+ else if ( (pl_sd = map_nick2sd(atcmd_player_name,true)) == NULL ){
clif_displaymessage(fd, msg_txt(sd,3)); // Character not found.
return -1;
}
@@ -5770,16 +5819,17 @@ ACMD_FUNC(skilltree)
struct map_session_data *pl_sd = NULL;
uint16 skill_id;
int meets, i, j, c=0;
- char target[NAME_LENGTH];
struct skill_tree_entry *ent;
nullpo_retr(-1, sd);
- if(!message || !*message || sscanf(message, "%6hu %23[^\r\n]", &skill_id, target) != 2) {
- clif_displaymessage(fd, msg_txt(sd,1167)); // Usage: @skilltree <skill ID> <target>
+ memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
+
+ if(!message || !*message || sscanf(message, "%6hu %23[^\n]", &skill_id, atcmd_player_name) != 2) {
+ clif_displaymessage(fd, msg_txt(sd,1167)); // Usage: @skilltree <skill ID> <char name>
return -1;
}
- if ( (pl_sd = map_nick2sd(target,true)) == NULL )
+ if ( (pl_sd = map_nick2sd(atcmd_player_name,true)) == NULL )
{
clif_displaymessage(fd, msg_txt(sd,3)); // Character not found.
return -1;
@@ -5847,17 +5897,18 @@ void getring (struct map_session_data* sd)
ACMD_FUNC(marry)
{
struct map_session_data *pl_sd = NULL;
- char player_name[NAME_LENGTH] = "";
nullpo_retr(-1, sd);
- if (!message || !*message || sscanf(message, "%23[^\n]", player_name) != 1) {
+ memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
+
+ if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
clif_displaymessage(fd, msg_txt(sd,1172)); // Usage: @marry <char name>
return -1;
}
- if ((pl_sd = map_nick2sd(player_name,false)) == NULL) {
- clif_displaymessage(fd, msg_txt(sd,3));
+ if ((pl_sd = map_nick2sd(atcmd_player_name,false)) == NULL) {
+ clif_displaymessage(fd, msg_txt(sd,3)); // Character not found.
return -1;
}
@@ -5979,6 +6030,8 @@ ACMD_FUNC(changegm)
struct map_session_data *pl_sd;
nullpo_retr(-1, sd);
+ memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
+
if (sd->status.guild_id == 0 || (g = sd->guild) == NULL || strcmp(g->master,sd->status.name)) {
clif_displaymessage(fd, msg_txt(sd,1181)); // You need to be a Guild Master to use this command.
return -1;
@@ -5989,12 +6042,12 @@ ACMD_FUNC(changegm)
return -1;
}
- if( !message[0] ) {
+ if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
clif_displaymessage(fd, msg_txt(sd,1183)); // Usage: @changegm <guild_member_name>
return -1;
}
- if((pl_sd=map_nick2sd((char *) message,false)) == NULL || pl_sd->status.guild_id != sd->status.guild_id) {
+ if((pl_sd=map_nick2sd(atcmd_player_name,false)) == NULL || pl_sd->status.guild_id != sd->status.guild_id) {
clif_displaymessage(fd, msg_txt(sd,1184)); // Target character must be online and be a guild member.
return -1;
}
@@ -6011,15 +6064,15 @@ ACMD_FUNC(changeleader)
{
nullpo_retr(-1, sd);
- if( !message[0] )
- {
+ memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
+
+ if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
clif_displaymessage(fd, msg_txt(sd,1185)); // Usage: @changeleader <party_member_name>
return -1;
}
- if (party_changeleader(sd, map_nick2sd((char *) message,false),NULL))
- return 0;
- return -1;
+ party_changeleader(sd, map_nick2sd(atcmd_player_name,false),NULL);
+ return 0;
}
/*==========================================
@@ -6035,7 +6088,7 @@ ACMD_FUNC(partyoption)
if (sd->status.party_id == 0 || (p = party_search(sd->status.party_id)) == NULL)
{
- clif_displaymessage(fd, msg_txt(sd,282));
+ clif_displaymessage(fd, msg_txt(sd,282)); // You need to be a party leader to use this command.
return -1;
}
@@ -6045,7 +6098,7 @@ ACMD_FUNC(partyoption)
if (!p->party.member[mi].leader)
{
- clif_displaymessage(fd, msg_txt(sd,282));
+ clif_displaymessage(fd, msg_txt(sd,282)); // You need to be a party leader to use this command.
return -1;
}
@@ -6061,7 +6114,7 @@ ACMD_FUNC(partyoption)
if (option != p->party.item)
party_changeoption(sd, p->party.exp, option);
else
- clif_displaymessage(fd, msg_txt(sd,286));
+ clif_displaymessage(fd, msg_txt(sd,286)); // There's been no change in the setting.
return 0;
}
@@ -6212,7 +6265,7 @@ ACMD_FUNC(autolootitem)
ACMD_FUNC(autoloottype)
{
uint8 action = 3; // 1=add, 2=remove, 3=help+list (default), 4=reset
- enum item_types type = -1;
+ enum item_types type= IT_UNKNOWN;
int ITEM_MAX = 1533;
nullpo_retr(-1, sd);
@@ -6289,7 +6342,7 @@ ACMD_FUNC(autoloottype)
clif_displaymessage(fd, msg_txt(sd,1490)); // Item types on your autoloottype list:
while (i < IT_MAX) {
if (sd->state.autoloottype&(1<<i)) {
- sprintf(atcmd_output, " '%s' {%d}", itemdb_typename(i), i);
+ sprintf(atcmd_output, " '%s' {%d}", itemdb_typename(static_cast<item_types>(i)), i);
clif_displaymessage(fd, atcmd_output);
}
i++;
@@ -6474,7 +6527,7 @@ ACMD_FUNC(clearweather)
map[sd->bl.m].flag.fireworks=0;
map[sd->bl.m].flag.leaves=0;
clif_weather(sd->bl.m);
- clif_displaymessage(fd, msg_txt(sd,291));
+ clif_displaymessage(fd, msg_txt(sd,291)); // Weather effects will dispell on warp/refresh
return 0;
}
@@ -6520,14 +6573,13 @@ ACMD_FUNC(mobsearch)
if ((mob_id = atoi(mob_name)) == 0)
mob_id = mobdb_searchname(mob_name);
- if(mob_id > 0 && mobdb_checkid(mob_id) == 0){
+ if( mobdb_checkid(mob_id) == 0){
snprintf(atcmd_output, sizeof atcmd_output, msg_txt(sd,1219),mob_name); // Invalid mob ID %s!
clif_displaymessage(fd, atcmd_output);
return -1;
}
- if(mob_id == atoi(mob_name) && mob_db(mob_id)->jname)
- strcpy(mob_name,mob_db(mob_id)->jname); // --ja--
-// strcpy(mob_name,mob_db(mob_id)->name); // --en--
+ strcpy(mob_name,mob_db(mob_id)->jname); // --ja--
+// strcpy(mob_name,mob_db(mob_id)->name); // --en--
snprintf(atcmd_output, sizeof atcmd_output, msg_txt(sd,1220), mob_name, mapindex_id2name(sd->mapindex)); // Mob Search... %s %s
clif_displaymessage(fd, atcmd_output);
@@ -6541,7 +6593,7 @@ ACMD_FUNC(mobsearch)
if( md->bl.m != sd->bl.m )
continue;
- if( mob_id != -1 && md->mob_id != mob_id )
+ if( md->mob_id != mob_id )
continue;
++number;
@@ -6649,7 +6701,7 @@ ACMD_FUNC(pettalk)
if(!sd->status.pet_id || !(pd=sd->pd))
{
- clif_displaymessage(fd, msg_txt(sd,184));
+ clif_displaymessage(fd, msg_txt(sd,184)); // Sorry, but you have no pet.
return -1;
}
@@ -6676,7 +6728,7 @@ ACMD_FUNC(pettalk)
};
int i;
ARR_FIND( 0, ARRAYLENGTH(emo), i, stricmp(message, emo[i]) == 0 );
- if( i == E_DICE1 ) i = rnd()%6 + E_DICE1; // randomize /dice
+ if( i == ET_DICE1 ) i = rnd()%6 + ET_DICE1; // randomize /dice
if( i < ARRAYLENGTH(emo) )
{
if (sd->emotionlasttime + 1 >= time(NULL)) { // not more than 1 per second
@@ -6794,7 +6846,7 @@ ACMD_FUNC(summon)
md->master_id=sd->bl.id;
md->special_state.ai=AI_ATTACK;
md->deletetimer=add_timer(tick+(duration*60000),mob_timer_delete,md->bl.id,0);
- clif_specialeffect(&md->bl,344,AREA);
+ clif_specialeffect(&md->bl,EF_ENTRY2,AREA);
mob_spawn(md);
sc_start4(NULL,&md->bl, SC_MODECHANGE, 100, 1, 0, MD_AGGRESSIVE, 0, 60000);
clif_skill_poseffect(&sd->bl,AM_CALLHOMUN,1,md->bl.x,md->bl.y,tick);
@@ -6839,12 +6891,14 @@ ACMD_FUNC(trade)
struct map_session_data *pl_sd = NULL;
nullpo_retr(-1, sd);
- if (!message || !*message) {
+ memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
+
+ if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
clif_displaymessage(fd, msg_txt(sd,1230)); // Please enter a player name (usage: @trade <char name>).
return -1;
}
- if ( (pl_sd = map_nick2sd((char *)message,true)) == NULL )
+ if ( (pl_sd = map_nick2sd(atcmd_player_name,true)) == NULL )
{
clif_displaymessage(fd, msg_txt(sd,3)); // Character not found.
return -1;
@@ -6891,12 +6945,14 @@ ACMD_FUNC(unmute)
struct map_session_data *pl_sd = NULL;
nullpo_retr(-1, sd);
- if (!message || !*message) {
+ memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
+
+ if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
clif_displaymessage(fd, msg_txt(sd,1234)); // Please enter a player name (usage: @unmute <char name>).
return -1;
}
- if ( (pl_sd = map_nick2sd((char *)message,false)) == NULL )
+ if ( (pl_sd = map_nick2sd(atcmd_player_name,false)) == NULL )
{
clif_displaymessage(fd, msg_txt(sd,3)); // Character not found.
return -1;
@@ -6931,7 +6987,7 @@ ACMD_FUNC(uptime)
minutes = seconds/minute;
seconds -= (seconds/minute>0)?(seconds/minute)*minute:0;
- snprintf(atcmd_output, sizeof(atcmd_output), msg_txt(sd,245), days, hours, minutes, seconds);
+ snprintf(atcmd_output, sizeof(atcmd_output), msg_txt(sd,245), days, hours, minutes, seconds); // Server Uptime: %ld days, %ld hours, %ld minutes, %ld seconds.
clif_displaymessage(fd, atcmd_output);
return 0;
@@ -6988,6 +7044,8 @@ ACMD_FUNC(mute)
int manner;
nullpo_retr(-1, sd);
+ memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
+
if (!message || !*message || sscanf(message, "%11d %23[^\n]", &manner, atcmd_player_name) < 1) {
clif_displaymessage(fd, msg_txt(sd,1237)); // Usage: @mute <time> <char name>
return -1;
@@ -7157,7 +7215,8 @@ ACMD_FUNC(mobinfo)
unsigned char melement[ELE_ALL][8] = { "Neutral", "Water", "Earth", "Fire", "Wind", "Poison", "Holy", "Dark", "Ghost", "Undead" };
char atcmd_output2[CHAT_SIZE_MAX];
struct item_data *item_data;
- struct mob_db *mob, *mob_array[MAX_SEARCH];
+ struct mob_db *mob;
+ uint16 mob_ids[MAX_SEARCH];
int count;
int i, k;
@@ -7172,10 +7231,10 @@ ACMD_FUNC(mobinfo)
// If monster identifier/name argument is a name
if ((i = mobdb_checkid(atoi(message))))
{
- mob_array[0] = mob_db(i);
+ mob_ids[0] = i;
count = 1;
} else
- count = mobdb_searchname_array(mob_array, MAX_SEARCH, message);
+ count = mobdb_searchname_array(message, mob_ids, MAX_SEARCH);
if (!count) {
clif_displaymessage(fd, msg_txt(sd,40)); // Invalid monster ID or name.
@@ -7189,7 +7248,7 @@ ACMD_FUNC(mobinfo)
}
for (k = 0; k < count; k++) {
unsigned int j,base_exp,job_exp;
- mob = mob_array[k];
+ mob = mob_db(mob_ids[k]);
base_exp = mob->base_exp;
job_exp = mob->job_exp;
@@ -7313,7 +7372,7 @@ ACMD_FUNC(showmobs)
if((mob_id = atoi(mob_name)) == 0)
mob_id = mobdb_searchname(mob_name);
- if(mob_id > 0 && mobdb_checkid(mob_id) == 0){
+ if(mobdb_checkid(mob_id) == 0){
snprintf(atcmd_output, sizeof atcmd_output, msg_txt(sd,1250),mob_name); // Invalid mob id %s!
clif_displaymessage(fd, atcmd_output);
return 0;
@@ -7386,7 +7445,7 @@ ACMD_FUNC(homlevel)
status_calc_homunculus(hd, SCO_NONE);
status_percent_heal(&hd->bl, 100, 100);
- clif_specialeffect(&hd->bl,568,AREA);
+ clif_specialeffect(&hd->bl,EF_HO_UP,AREA);
return 0;
}
@@ -7433,7 +7492,7 @@ ACMD_FUNC(hommutate)
if (m_class != -1 && m_id != -1 && m_class&HOM_EVO && m_id&HOM_S && sd->hd->homunculus.level >= 99) {
hom_mutate(sd->hd, homun_id);
} else {
- clif_emotion(&sd->hd->bl, E_SWT);
+ clif_emotion(&sd->hd->bl, ET_SWEAT);
}
return 0;
}
@@ -7447,7 +7506,7 @@ ACMD_FUNC(makehomun)
nullpo_retr(-1, sd);
if ( sd->status.hom_id ) {
- clif_displaymessage(fd, msg_txt(sd,450));
+ clif_displaymessage(fd, msg_txt(sd,450)); // You already have a homunculus
return -1;
}
@@ -7786,24 +7845,25 @@ ACMD_FUNC(whodrops)
ACMD_FUNC(whereis)
{
- struct mob_db *mob_array[MAX_SEARCH];
- int count;
- int i, j, k;
+ uint16 mob_ids[MAX_SEARCH] = {0};
+ int count = 0;
if (!message || !*message) {
clif_displaymessage(fd, msg_txt(sd,1288)); // Please enter a monster name/ID (usage: @whereis <monster_name_or_monster_ID>).
return -1;
}
-
- // If monster identifier/name argument is a name
- if ((i = mobdb_checkid(atoi(message))))
- {
- mob_array[0] = mob_db(i);
+
+ int i_message = atoi(message);
+ if (mobdb_checkid(i_message)) {
+ // ID given
+ mob_ids[0] = i_message;
count = 1;
- } else
- count = mobdb_searchname_array(mob_array, MAX_SEARCH, message);
-
- if (!count) {
+ } else {
+ // Name given, get all monster associated whith this name
+ count = mobdb_searchname_array(message, mob_ids, MAX_SEARCH);
+ }
+
+ if (count <= 0) {
clif_displaymessage(fd, msg_txt(sd,40)); // Invalid monster ID or name.
return -1;
}
@@ -7813,20 +7873,28 @@ ACMD_FUNC(whereis)
clif_displaymessage(fd, atcmd_output);
count = MAX_SEARCH;
}
- for (k = 0; k < count; k++) {
- struct mob_db *mob = mob_array[k];
+
+ for (int i = 0; i < count; i++) {
+ uint16 mob_id = mob_ids[i];
+ struct mob_db * mob = mob_db(mob_id);
+
snprintf(atcmd_output, sizeof atcmd_output, msg_txt(sd,1289), mob->jname); // %s spawns in:
clif_displaymessage(fd, atcmd_output);
-
- for (i = 0; i < ARRAYLENGTH(mob->spawn) && mob->spawn[i].qty; i++)
- {
- j = map_mapindex2mapid(mob->spawn[i].mapindex);
- if (j < 0) continue;
- snprintf(atcmd_output, sizeof atcmd_output, "%s (%d)", map[j].name, mob->spawn[i].qty);
- clif_displaymessage(fd, atcmd_output);
+
+ const std::vector<spawn_info> spawns = mob_get_spawns(mob_id);
+ if (spawns.size() <= 0) {
+ // This monster does not spawn normally.
+ clif_displaymessage(fd, msg_txt(sd,1290));
+ } else {
+ for(auto& spawn : spawns)
+ {
+ int16 mapid = map_mapindex2mapid(spawn.mapindex);
+ if (mapid < 0)
+ continue;
+ snprintf(atcmd_output, sizeof atcmd_output, "%s (%d)", map[mapid].name, spawn.qty);
+ clif_displaymessage(fd, atcmd_output);
+ }
}
- if (i == 0)
- clif_displaymessage(fd, msg_txt(sd,1290)); // This monster does not spawn normally.
}
return 0;
@@ -7968,9 +8036,9 @@ ACMD_FUNC(size)
sd->state.size = size;
if( size == SZ_MEDIUM )
- clif_specialeffect(&sd->bl,420,AREA);
+ clif_specialeffect(&sd->bl,EF_BABYBODY,AREA);
else if( size == SZ_BIG )
- clif_specialeffect(&sd->bl,422,AREA);
+ clif_specialeffect(&sd->bl,EF_GIANTBODY,AREA);
clif_displaymessage(fd, msg_txt(sd,1303)); // Size change applied.
return 0;
@@ -7995,9 +8063,9 @@ ACMD_FUNC(sizeall)
pl_sd->state.size = size;
if( size == SZ_MEDIUM )
- clif_specialeffect(&pl_sd->bl,420,AREA);
+ clif_specialeffect(&pl_sd->bl,EF_BABYBODY,AREA);
else if( size == SZ_BIG )
- clif_specialeffect(&pl_sd->bl,422,AREA);
+ clif_specialeffect(&pl_sd->bl,EF_GIANTBODY,AREA);
}
}
mapit_free(iter);
@@ -8037,9 +8105,9 @@ ACMD_FUNC(sizeguild)
pl_sd->state.size = size;
if( size == SZ_MEDIUM )
- clif_specialeffect(&pl_sd->bl,420,AREA);
+ clif_specialeffect(&pl_sd->bl,EF_BABYBODY,AREA);
else if( size == SZ_BIG )
- clif_specialeffect(&pl_sd->bl,422,AREA);
+ clif_specialeffect(&pl_sd->bl,EF_GIANTBODY,AREA);
}
}
@@ -8244,44 +8312,46 @@ ACMD_FUNC(showdelay)
ACMD_FUNC(invite)
{
unsigned int did = sd->duel_group;
- struct map_session_data *target_sd = map_nick2sd((char *)message,true);
+ struct map_session_data *target_sd = NULL;
- if(did == 0) {
- // "Duel: @invite without @duel."
- clif_displaymessage(fd, msg_txt(sd,350));
- return 0;
+ memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
+ memset(atcmd_output, '\0', sizeof(atcmd_output));
+
+ if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
+ sprintf(atcmd_output, msg_txt(sd, 435), command); // Please enter a player name (usage: %s <char name>).
+ clif_displaymessage(fd, atcmd_output);
+ return -1;
}
- if(duel_list[did].max_players_limit > 0 &&
- duel_list[did].members_count >= duel_list[did].max_players_limit) {
+ if(did == 0 || !duel_exist(did) ) {
+ clif_displaymessage(fd, msg_txt(sd,350)); // "Duel: @invite without @duel."
+ return 0;
+ }
- // "Duel: Limit of players is reached."
- clif_displaymessage(fd, msg_txt(sd,351));
+ if( !duel_check_player_limit( duel_get_duelid(did) ) ){
+ clif_displaymessage(fd, msg_txt(sd,351)); // "Duel: Limit of players is reached."
return 0;
}
- if(target_sd == NULL) {
- // "Duel: Player not found."
- clif_displaymessage(fd, msg_txt(sd,352));
+ if((target_sd = map_nick2sd(atcmd_player_name, true)) == NULL) {
+ clif_displaymessage(fd, msg_txt(sd,352)); // "Duel: Player not found."
return 0;
}
if(target_sd->duel_group > 0 || target_sd->duel_invite > 0) {
- // "Duel: Player already in duel."
- clif_displaymessage(fd, msg_txt(sd,353));
+ clif_displaymessage(fd, msg_txt(sd,353)); // "Duel: Player already in duel."
return 0;
}
if(battle_config.duel_only_on_same_map && target_sd->bl.m != sd->bl.m)
{
- sprintf(atcmd_output, msg_txt(sd,364), message);
+ sprintf(atcmd_output, msg_txt(sd,364), atcmd_player_name); // Duel: You can't invite %s because he/she isn't on the same map.
clif_displaymessage(fd, atcmd_output);
return 0;
}
duel_invite(did, sd, target_sd);
- // "Duel: Invitation has been sent."
- clif_displaymessage(fd, msg_txt(sd,354));
+ clif_displaymessage(fd, msg_txt(sd,354)); // "Duel: Invitation has been sent."
return 0;
}
@@ -8295,15 +8365,13 @@ ACMD_FUNC(duel)
}
if(sd->duel_invite > 0) {
- // "Duel: @duel without @reject."
- clif_displaymessage(fd, msg_txt(sd,355));
+ clif_displaymessage(fd, msg_txt(sd,355)); // "Duel: @duel without @reject."
return 0;
}
if(!duel_checktime(sd)) {
char output[CHAT_SIZE_MAX];
- // "Duel: You can take part in duel only one time per %d minutes."
- sprintf(output, msg_txt(sd,356), battle_config.duel_time_interval);
+ sprintf(output, msg_txt(sd,356), battle_config.duel_time_interval); // "Duel: You can take part in duel only one time per %d minutes."
clif_displaymessage(fd, output);
return 0;
}
@@ -8316,8 +8384,19 @@ ACMD_FUNC(duel)
}
duel_create(sd, maxpl);
} else {
- struct map_session_data *target_sd;
- target_sd = map_nick2sd((char *)message,true);
+ struct map_session_data *target_sd = NULL;
+
+ memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
+ memset(atcmd_output, '\0', sizeof(atcmd_output));
+
+ if (sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
+ sprintf(atcmd_output, msg_txt(sd, 435), command); // Please enter a player name (usage: %s <char name>).
+ clif_displaymessage(fd, atcmd_output);
+ return -1;
+ }
+
+ target_sd = map_nick2sd(atcmd_player_name,true);
+
if(target_sd != NULL) {
unsigned int newduel;
if((newduel = duel_create(sd, 2)) != -1) {
@@ -8329,8 +8408,7 @@ ACMD_FUNC(duel)
clif_displaymessage(fd, msg_txt(sd,354)); // "Duel: Invitation has been sent."
}
} else {
- // "Duel: Player not found."
- clif_displaymessage(fd, msg_txt(sd,352));
+ clif_displaymessage(fd, msg_txt(sd,352)); // "Duel: Player not found."
return 0;
}
}
@@ -8344,8 +8422,7 @@ ACMD_FUNC(duel)
ACMD_FUNC(leave)
{
if(sd->duel_group <= 0) {
- // "Duel: @leave without @duel."
- clif_displaymessage(fd, msg_txt(sd,358));
+ clif_displaymessage(fd, msg_txt(sd,358)); // "Duel: @leave without @duel."
return 0;
}
@@ -8358,42 +8435,36 @@ ACMD_FUNC(accept)
{
if(!duel_checktime(sd)) {
char output[CHAT_SIZE_MAX];
- // "Duel: You can take part in duel only one time per %d minutes."
- sprintf(output, msg_txt(sd,356), battle_config.duel_time_interval);
+ sprintf(output, msg_txt(sd,356), battle_config.duel_time_interval); // "Duel: You can take part in duel only one time per %d minutes."
clif_displaymessage(fd, output);
return 0;
}
- if(sd->duel_invite <= 0) {
- // "Duel: @accept without invititation."
- clif_displaymessage(fd, msg_txt(sd,360));
+ if(sd->duel_invite <= 0 || !duel_exist(sd->duel_invite) ) {
+ clif_displaymessage(fd, msg_txt(sd,360)); // "Duel: @accept without invititation."
return 0;
}
- if( duel_list[sd->duel_invite].max_players_limit > 0 && duel_list[sd->duel_invite].members_count >= duel_list[sd->duel_invite].max_players_limit )
+ if( !duel_check_player_limit( duel_get_duelid( sd->duel_invite ) ) )
{
- // "Duel: Limit of players is reached."
- clif_displaymessage(fd, msg_txt(sd,351));
+ clif_displaymessage(fd, msg_txt(sd,351)); // "Duel: Limit of players is reached."
return 0;
}
duel_accept(sd->duel_invite, sd);
- // "Duel: Invitation has been accepted."
- clif_displaymessage(fd, msg_txt(sd,361));
+ clif_displaymessage(fd, msg_txt(sd,361)); // "Duel: Invitation has been accepted."
return 0;
}
ACMD_FUNC(reject)
{
if(sd->duel_invite <= 0) {
- // "Duel: @reject without invititation."
- clif_displaymessage(fd, msg_txt(sd,362));
+ clif_displaymessage(fd, msg_txt(sd,362)); // "Duel: @reject without invititation."
return 0;
}
duel_reject(sd->duel_invite, sd);
- // "Duel: Invitation has been rejected."
- clif_displaymessage(fd, msg_txt(sd,363));
+ clif_displaymessage(fd, msg_txt(sd,363)); // "Duel: Invitation has been rejected."
return 0;
}
@@ -8470,12 +8541,14 @@ ACMD_FUNC(clone)
int x=0,y=0,flag=0,master=0,i=0;
struct map_session_data *pl_sd=NULL;
- if (!message || !*message) {
+ memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
+
+ if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
clif_displaymessage(sd->fd,msg_txt(sd,1323)); // You must enter a player name or ID.
return 0;
}
- if((pl_sd=map_nick2sd((char *)message,true)) == NULL && (pl_sd=map_charid2sd(atoi(message))) == NULL) {
+ if((pl_sd=map_nick2sd(atcmd_player_name,true)) == NULL && (pl_sd=map_charid2sd(atoi(atcmd_player_name))) == NULL) {
clif_displaymessage(fd, msg_txt(sd,3)); // Character not found.
return 0;
}
@@ -8513,7 +8586,7 @@ ACMD_FUNC(clone)
y = sd->bl.y;
}
- if((x = mob_clone_spawn(pl_sd, sd->bl.m, x, y, "", master, 0, flag?1:0, 0)) > 0) {
+ if((x = mob_clone_spawn(pl_sd, sd->bl.m, x, y, "", master, MD_NONE, flag?1:0, 0)) > 0) {
clif_displaymessage(fd, msg_txt(sd,128+flag*2)); // Evil Clone spawned. Clone spawned. Slave clone spawned.
return 0;
}
@@ -8639,7 +8712,7 @@ ACMD_FUNC(resetstat)
nullpo_retr(-1, sd);
pc_resetstate(sd);
- sprintf(atcmd_output, msg_txt(sd,207), sd->status.name);
+ sprintf(atcmd_output, msg_txt(sd,207), sd->status.name); // '%s' stats points reset.
clif_displaymessage(fd, atcmd_output);
return 0;
}
@@ -8649,7 +8722,7 @@ ACMD_FUNC(resetskill)
nullpo_retr(-1,sd);
pc_resetskill(sd,1);
- sprintf(atcmd_output, msg_txt(sd,206), sd->status.name);
+ sprintf(atcmd_output, msg_txt(sd,206), sd->status.name); // '%s' skill points reset.
clif_displaymessage(fd, atcmd_output);
return 0;
}
@@ -8744,37 +8817,37 @@ ACMD_FUNC(itemlist)
if( (it->equip&EQP_HELM) == EQP_HELM )
strcat(equipstr, msg_txt(sd,1347)); // Top/Mid/Lower Head,
if( (it->equip&EQP_COSTUME_HELM) == EQP_COSTUME_HEAD_LOW )
- strcat(equipstr, msg_txt(sd,518));
+ strcat(equipstr, msg_txt(sd,518)); // Lower Costume Head,
if( (it->equip&EQP_COSTUME_HELM) == EQP_COSTUME_HEAD_TOP )
- strcat(equipstr, msg_txt(sd,519));
+ strcat(equipstr, msg_txt(sd,519)); // Top Costume Head,
if( (it->equip&EQP_COSTUME_HELM) == (EQP_COSTUME_HEAD_LOW|EQP_COSTUME_HEAD_TOP) )
- strcat(equipstr, msg_txt(sd,520));
+ strcat(equipstr, msg_txt(sd,520)); // Top/Lower Costume Head,
if( (it->equip&EQP_COSTUME_HELM) == EQP_COSTUME_HEAD_MID )
- strcat(equipstr, msg_txt(sd,521));
+ strcat(equipstr, msg_txt(sd,521)); // Mid Costume Head,
if( (it->equip&EQP_COSTUME_HELM) == (EQP_COSTUME_HEAD_LOW|EQP_COSTUME_HEAD_MID) )
- strcat(equipstr, msg_txt(sd,522));
+ strcat(equipstr, msg_txt(sd,522)); // Mid/Lower Costume Head,
if( (it->equip&EQP_COSTUME_HELM) == EQP_COSTUME_HELM )
- strcat(equipstr, msg_txt(sd,523));
+ strcat(equipstr, msg_txt(sd,523)); // Top/Mid/Lower Costume Head,
if( it->equip&EQP_COSTUME_GARMENT )
- strcat(equipstr, msg_txt(sd,524));
+ strcat(equipstr, msg_txt(sd,524)); // Costume Robe,
//if( it->equip&EQP_COSTUME_FLOOR )
- //strcat(equipstr, msg_txt(sd,525));
+ //strcat(equipstr, msg_txt(sd,525)); // Costume Floor,
if( it->equip&EQP_AMMO )
- strcat(equipstr, msg_txt(sd,526));
+ strcat(equipstr, msg_txt(sd,526)); // Ammo,
if( it->equip&EQP_SHADOW_ARMOR )
- strcat(equipstr, msg_txt(sd,527));
+ strcat(equipstr, msg_txt(sd,527)); // Shadow Body,
if( (it->equip&EQP_SHADOW_ARMS) == EQP_SHADOW_WEAPON )
- strcat(equipstr, msg_txt(sd,528));
+ strcat(equipstr, msg_txt(sd,528)); // Shadow Right Hand,
if( (it->equip&EQP_SHADOW_ARMS) == EQP_SHADOW_SHIELD )
- strcat(equipstr, msg_txt(sd,529));
+ strcat(equipstr, msg_txt(sd,529)); // Shadow Left Hand,
if( (it->equip&EQP_SHADOW_ARMS) == EQP_SHADOW_ARMS )
- strcat(equipstr, msg_txt(sd,530));
+ strcat(equipstr, msg_txt(sd,530)); // Shadow Both Hands,
if( it->equip&EQP_SHADOW_SHOES )
- strcat(equipstr, msg_txt(sd,531));
+ strcat(equipstr, msg_txt(sd,531)); // Shadow Shoes,
if( it->equip&EQP_SHADOW_ACC_R )
- strcat(equipstr, msg_txt(sd,532));
+ strcat(equipstr, msg_txt(sd,532)); // Shadow Right Accessory,
if( it->equip&EQP_SHADOW_ACC_L )
- strcat(equipstr, msg_txt(sd,533));
+ strcat(equipstr, msg_txt(sd,533)); // Shadow Left Accessory,
// remove final ', '
equipstr[strlen(equipstr) - 2] = '\0';
StringBuf_AppendStr(&buf, equipstr);
@@ -9659,13 +9732,15 @@ ACMD_FUNC(fullstrip) {
TBL_PC *tsd;
nullpo_retr(-1,sd);
-
- if (!message || !*message) {
+
+ memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
+
+ if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
clif_displaymessage(fd, msg_txt(sd,349)); // Please enter a player name (usage: @fullstrip/@warpto/@goto <char name/ID>).
return -1;
}
- if((tsd=map_nick2sd((char *)message,false)) == NULL && (tsd=map_id2sd(atoi(message))) == NULL){
+ if((tsd=map_nick2sd(atcmd_player_name,false)) == NULL && (tsd=map_id2sd(atoi(atcmd_player_name))) == NULL){
clif_displaymessage(fd, msg_txt(sd,3)); // Character not found.
return -1;
}
@@ -9682,13 +9757,15 @@ ACMD_FUNC(costume) {
"Wedding",
"Xmas",
"Summer",
+ "Summer2",
"Hanbok",
- "Oktoberfest",
+ "Oktoberfest"
};
const int name2id[] = {
SC_WEDDING,
SC_XMAS,
SC_SUMMER,
+ SC_DRESSUP,
SC_HANBOK,
SC_OKTOBERFEST
};
@@ -9730,35 +9807,32 @@ ACMD_FUNC(costume) {
return -1;
}
- sc_start(&sd->bl, &sd->bl, (sc_type)name2id[k], 100, 0, -1);
+ sc_start(&sd->bl, &sd->bl, (sc_type)name2id[k], 100, name2id[k] == SC_DRESSUP ? 1 : 0, -1);
return 0;
}
/**
* Clone other player's equipments
-* Usage: @cloneequip <char_id or "char name">
+* Usage: @cloneequip <char name/ID>
* http://rathena.org/board/topic/95076-new-atcommands-suggestion/
* @author [Cydh], [Antares]
*/
ACMD_FUNC(cloneequip) {
struct map_session_data *pl_sd;
- uint32 char_id = 0;
nullpo_retr(-1, sd);
+ memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
memset(atcmd_output, '\0', sizeof(atcmd_output));
- if( !message || !*message || (sscanf(message, "%11d", &char_id) < 1 && sscanf(message, "\"%23[^\"]\"", atcmd_output) < 1) ) {
- clif_displaymessage(fd, msg_txt(sd, 735)); // Please enter char_id or \"char name\".
+
+ if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
+ sprintf(atcmd_output, msg_txt(sd, 735), command); // Usage: %s <char name/ID>
+ clif_displaymessage(fd, atcmd_output);
return -1;
}
- if (char_id)
- pl_sd = map_charid2sd(char_id);
- else
- pl_sd = map_nick2sd(atcmd_output,true);
-
- if (!pl_sd) {
+ if (!(pl_sd = map_nick2sd(atcmd_player_name, true)) && !(pl_sd = map_charid2sd(atoi(atcmd_player_name)))) {
clif_displaymessage(fd, msg_txt(sd, 3));
return -1;
}
@@ -9805,7 +9879,7 @@ ACMD_FUNC(cloneequip) {
}
}
memset(atcmd_output, '\0', sizeof(atcmd_output));
- sprintf(atcmd_output, msg_txt(sd, 738), "equip");
+ sprintf(atcmd_output, msg_txt(sd, 738), "equip"); // Clone '%s' is done.
clif_displaymessage(fd, atcmd_output);
return 0;
@@ -9813,29 +9887,26 @@ ACMD_FUNC(cloneequip) {
/**
* Clone other player's statuses/parameters using method same like ACMD_FUNC(param), doesn't use stat point
-* Usage: @clonestat <char_id or "char name">
+* Usage: @clonestat <char name/ID>
* http://rathena.org/board/topic/95076-new-atcommands-suggestion/
* @author [Cydh], [Antares]
*/
ACMD_FUNC(clonestat) {
struct map_session_data *pl_sd;
- uint32 char_id = 0;
nullpo_retr(-1, sd);
+ memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
memset(atcmd_output, '\0', sizeof(atcmd_output));
- if( !message || !*message || (sscanf(message, "%11d", &char_id) < 1 && sscanf(message, "\"%23[^\"]\"", atcmd_output) < 1) ) {
- clif_displaymessage(fd, msg_txt(sd, 735)); // Please enter char_id or \"char name\".
+
+ if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
+ sprintf(atcmd_output, msg_txt(sd, 735), command); // Usage: %s <char name/ID>
+ clif_displaymessage(fd, atcmd_output);
return -1;
}
- if (char_id)
- pl_sd = map_charid2sd(char_id);
- else
- pl_sd = map_nick2sd(atcmd_output,true);
-
- if (!pl_sd) {
- clif_displaymessage(fd, msg_txt(sd, 3));
+ if (!(pl_sd = map_nick2sd(atcmd_player_name, true)) && !(pl_sd = map_charid2sd(atoi(atcmd_player_name)))) {
+ clif_displaymessage(fd, msg_txt(sd, 3)); // Character not found.
return -1;
}
@@ -9894,7 +9965,7 @@ ACMD_FUNC(clonestat) {
status_calc_pc(sd, SCO_FORCE);
}
memset(atcmd_output, '\0', sizeof(atcmd_output));
- sprintf(atcmd_output, msg_txt(sd, 738), "status");
+ sprintf(atcmd_output, msg_txt(sd, 738), "status"); // Clone '%s' is done.
clif_displaymessage(fd, atcmd_output);
#undef clonestat_check
@@ -9922,7 +9993,7 @@ ACMD_FUNC(adopt)
return -1;
}
- if ((b_sd = map_nick2sd((char *)atcmd_player_name,false)) == NULL) {
+ if ((b_sd = map_nick2sd(atcmd_player_name,false)) == NULL) {
clif_displaymessage(fd, msg_txt(sd, 3)); // Character not found.
return -1;
}
@@ -10062,8 +10133,8 @@ void atcommand_basecommands(void) {
ACMD_DEF2("reloadmotd", reload),
ACMD_DEF2("reloadquestdb", reload),
ACMD_DEF2("reloadmsgconf", reload),
- ACMD_DEF2("reloadpacketdb", reload),
ACMD_DEF2("reloadinstancedb", reload),
+ ACMD_DEF2("reloadachievementdb",reload),
ACMD_DEF(partysharelvl),
ACMD_DEF(mapinfo),
ACMD_DEF(dye),
@@ -10237,6 +10308,7 @@ void atcommand_basecommands(void) {
ACMD_DEF(clonestat),
ACMD_DEF(bodystyle),
ACMD_DEF(adopt),
+ ACMD_DEF2("costumeitem", item),
ACMD_DEF(agitstart3),
ACMD_DEF(agitend3),
};
@@ -10337,7 +10409,7 @@ static void atcommand_get_suggestions(struct map_session_data* sd, const char *n
}
// Build the suggestion string
- strcpy(buffer, msg_txt(sd,205));
+ strcpy(buffer, msg_txt(sd,205)); // Maybe you meant:
strcat(buffer,"\n");
for(i=0; i < prefix_count; ++i) {
@@ -10402,7 +10474,7 @@ bool is_atcommand(const int fd, struct map_session_data* sd, const char* message
if ( type == 1 || type == 3) {
//Commands are disabled on maps flagged as 'nocommand'
if ( map[sd->bl.m].nocommand && pc_get_group_level(sd) < map[sd->bl.m].nocommand ) {
- clif_displaymessage(fd, msg_txt(sd,143));
+ clif_displaymessage(fd, msg_txt(sd,143)); // Commands are disabled on this map.
return false;
}
}
@@ -10612,7 +10684,7 @@ static void atcommand_config_read(const char* config_filename)
}
}
- ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' command aliases in '"CL_WHITE"%s"CL_RESET"'.\n", num_aliases, config_filename);
+ ShowStatus("Done reading '" CL_WHITE "%d" CL_RESET "' command aliases in '" CL_WHITE "%s" CL_RESET "'.\n", num_aliases, config_filename);
return;
}
void atcommand_db_load_groups(int* group_ids) {
@@ -10662,8 +10734,8 @@ void atcommand_db_clear(void) {
void atcommand_doload(void) {
atcommand_db_clear();
- atcommand_db = stridb_alloc(DB_OPT_DUP_KEY|DB_OPT_RELEASE_DATA, ATCOMMAND_LENGTH);
- atcommand_alias_db = stridb_alloc(DB_OPT_DUP_KEY|DB_OPT_RELEASE_DATA, ATCOMMAND_LENGTH);
+ atcommand_db = stridb_alloc((DBOptions)(DB_OPT_DUP_KEY|DB_OPT_RELEASE_DATA), ATCOMMAND_LENGTH);
+ atcommand_alias_db = stridb_alloc((DBOptions)(DB_OPT_DUP_KEY|DB_OPT_RELEASE_DATA), ATCOMMAND_LENGTH);
atcommand_basecommands(); //fills initial atcommand_db with known commands
atcommand_config_read(ATCOMMAND_CONF_FILENAME);
}
diff --git a/src/map/atcommand.h b/src/map/atcommand.hpp
similarity index 84%
rename from src/map/atcommand.h
rename to src/map/atcommand.hpp
index 6fd1bc0000f..ffce9a74129 100644
--- a/src/map/atcommand.h
+++ b/src/map/atcommand.hpp
@@ -1,13 +1,10 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _ATCOMMAND_H_
-#define _ATCOMMAND_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef _ATCOMMAND_HPP_
+#define _ATCOMMAND_HPP_
+#include "../common/cbasetypes.h"
#include "../common/mmo.h"
struct map_session_data;
@@ -23,10 +20,10 @@ extern char atcommand_symbol;
extern char charcommand_symbol;
extern int atcmd_binding_count;
-typedef enum {
+enum AtCommandType : uint8 {
COMMAND_ATCOMMAND = 1,
COMMAND_CHARCOMMAND = 2,
-} AtCommandType;
+} ;
typedef int (*AtCommandFunc)(const int fd, struct map_session_data* sd, const char* command, const char* message);
@@ -45,11 +42,7 @@ struct atcmd_binding_data {
int level;
int level2;
};
-struct atcmd_binding_data** atcmd_binding;
+extern struct atcmd_binding_data** atcmd_binding;
struct atcmd_binding_data* get_atcommandbind_byname(const char* name);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _ATCOMMAND_H_ */
+#endif /* _ATCOMMAND_HPP_ */
diff --git a/src/map/battle.c b/src/map/battle.cpp
similarity index 96%
rename from src/map/battle.c
rename to src/map/battle.cpp
index e2c50a9f27e..d28c5f0182a 100644
--- a/src/map/battle.c
+++ b/src/map/battle.cpp
@@ -1,6 +1,11 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "battle.hpp"
+
+#include <stdlib.h>
+#include <math.h>
+
#include "../common/cbasetypes.h"
#include "../common/timer.h"
#include "../common/nullpo.h"
@@ -12,19 +17,21 @@
#include "../common/strlib.h"
#include "../common/utils.h"
-#include "map.h"
-#include "path.h"
-#include "pc.h"
-#include "homunculus.h"
-#include "mercenary.h"
-#include "elemental.h"
-#include "pet.h"
-#include "party.h"
-#include "battleground.h"
-#include "chrif.h"
-
-#include <stdlib.h>
-#include <math.h>
+#include "map.hpp"
+#include "path.hpp"
+#include "pc.hpp"
+#include "homunculus.hpp"
+#include "mercenary.hpp"
+#include "elemental.hpp"
+#include "pet.hpp"
+#include "party.hpp"
+#include "battleground.hpp"
+#include "chrif.hpp"
+#include "guild.hpp"
+#include "clif.hpp"
+#include "mob.hpp"
+#include "log.hpp"
+#include "pc_groups.hpp"
int attr_fix_table[4][ELE_MAX][ELE_MAX];
@@ -1160,7 +1167,7 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam
//Kaupe blocks damage (skill or otherwise) from players, mobs, homuns, mercenaries.
if ((sce = sc->data[SC_KAUPE]) && rnd()%100 < sce->val2) {
- clif_specialeffect(bl, 462, AREA);
+ clif_specialeffect(bl, EF_STORMKICK4, AREA);
//Shouldn't end until Breaker's non-weapon part connects.
#ifndef RENEWAL
if (skill_id != ASC_BREAKER || !(flag&BF_WEAPON))
@@ -1176,7 +1183,7 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam
#endif
if( flag&BF_MAGIC && (sce=sc->data[SC_PRESTIGE]) && rnd()%100 < sce->val2) {
- clif_specialeffect(bl, 462, AREA); // Still need confirm it.
+ clif_specialeffect(bl, EF_STORMKICK4, AREA); // Still need confirm it.
return 0;
}
@@ -1185,7 +1192,7 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam
if (!status_isdead(src))
skill_counter_additional_effect( src, bl, skill_id, skill_lv, flag, gettick() );
if (sce) {
- clif_specialeffect(bl, 462, AREA);
+ clif_specialeffect(bl, EF_STORMKICK4, AREA);
skill_blown(src,bl,sce->val3,-1,BLOWN_NONE);
}
//Both need to be consumed if they are active.
@@ -1319,7 +1326,7 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam
if (sc->data[SC_SU_STOOP])
damage -= damage * 90 / 100;
- // Compressed code, fixed by map.h [Epoque]
+ // Compressed code, fixed by map.hpp [Epoque]
if (src->type == BL_MOB) {
if( sc->data[SC_MANU_DEF] && status_get_race2(src) == RC2_MANUK ){
damage -= damage * sc->data[SC_MANU_DEF]->val1 / 100;
@@ -1364,11 +1371,11 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam
if( (sce=sc->data[SC_MAGMA_FLOW]) && (rnd()%100 <= sce->val2) )
skill_castend_damage_id(bl,src,MH_MAGMA_FLOW,sce->val1,gettick(),0);
- if( damage > 0 && ((flag&(BF_WEAPON|BF_SHORT)) == (BF_WEAPON|BF_SHORT)) && (sce = sc->data[SC_STONEHARDSKIN]) ) {
+ if( damage > 0 && (sce = sc->data[SC_STONEHARDSKIN]) ) {
sce->val2 -= (int)cap_value(damage,INT_MIN,INT_MAX);
if( src->type == BL_MOB ) //using explicit call instead break_equip for duration
sc_start(src,src, SC_STRIPWEAPON, 30, 0, skill_get_time2(RK_STONEHARDSKIN, sce->val1));
- else
+ else if (flag&(BF_WEAPON|BF_SHORT))
skill_break_equip(src,src, EQP_WEAPON, 3000, BCT_SELF);
if( sce->val2 <= 0 )
status_change_end(bl, SC_STONEHARDSKIN, INVALID_TIMER);
@@ -1407,14 +1414,24 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam
status_change_end(bl, SC_KYRIE, INVALID_TIMER);
}
+ if ((sce = sc->data[SC_P_ALTER]) && damage > 0) {
+ clif_specialeffect(bl, EF_GUARD, AREA);
+ sce->val3 -= (int)cap_value(damage, INT_MIN, INT_MAX);
+ if (sce->val3 >= 0)
+ damage = 0;
+ else
+ damage = -sce->val3;
+ if (sce->val3 <= 0)
+ status_change_end(bl, SC_P_ALTER, INVALID_TIMER);
+ }
+
if ((sce = sc->data[SC_TUNAPARTY]) && damage > 0) {
- clif_specialeffect(bl, 336, AREA);
sce->val2 -= (int)cap_value(damage, INT_MIN, INT_MAX);
if (sce->val2 >= 0)
damage = 0;
else
damage = -sce->val2;
- if (/*(--sce->val3) <= 0 ||*/ (sce->val2 <= 0))
+ if (sce->val2 <= 0)
status_change_end(bl, SC_TUNAPARTY, INVALID_TIMER);
}
@@ -1891,11 +1908,16 @@ static int battle_calc_base_weapon_attack(struct block_list *src, struct status_
* Initial refactoring by Baalberith
* Refined and optimized by helvetica
*/
-static int64 battle_calc_base_damage(struct status_data *status, struct weapon_atk *wa, struct status_change *sc, unsigned short t_size, struct map_session_data *sd, int flag)
+static int64 battle_calc_base_damage(struct block_list *src, struct status_data *status, struct weapon_atk *wa, struct status_change *sc, unsigned short t_size, int flag)
{
unsigned int atkmin = 0, atkmax = 0;
short type = 0;
int64 damage = 0;
+ struct map_session_data *sd = NULL;
+
+ nullpo_retr(damage, src);
+
+ sd = BL_CAST(BL_PC, src);
if (!sd) { //Mobs/Pets
if(flag&4) {
@@ -1945,6 +1967,38 @@ static int64 battle_calc_base_damage(struct status_data *status, struct weapon_a
// Size fix only for players
if (!(sd->special_state.no_sizefix || (flag&8)))
damage = damage * (type == EQI_HAND_L ? sd->left_weapon.atkmods[t_size] : sd->right_weapon.atkmods[t_size]) / 100;
+ } else if (src->type == BL_ELEM) {
+ struct status_change *ele_sc = status_get_sc(src);
+ int ele_class = status_get_class(src);
+
+ if (ele_sc) {
+ switch (ele_class) {
+ case ELEMENTALID_AGNI_S:
+ case ELEMENTALID_AGNI_M:
+ case ELEMENTALID_AGNI_L:
+ if (ele_sc->data[SC_FIRE_INSIGNIA] && ele_sc->data[SC_FIRE_INSIGNIA]->val1 == 1)
+ damage += damage * 20 / 100;
+ break;
+ case ELEMENTALID_AQUA_S:
+ case ELEMENTALID_AQUA_M:
+ case ELEMENTALID_AQUA_L:
+ if (ele_sc->data[SC_WATER_INSIGNIA] && ele_sc->data[SC_WATER_INSIGNIA]->val1 == 1)
+ damage += damage * 20 / 100;
+ break;
+ case ELEMENTALID_VENTUS_S:
+ case ELEMENTALID_VENTUS_M:
+ case ELEMENTALID_VENTUS_L:
+ if (ele_sc->data[SC_WIND_INSIGNIA] && ele_sc->data[SC_WIND_INSIGNIA]->val1 == 1)
+ damage += damage * 20 / 100;
+ break;
+ case ELEMENTALID_TERA_S:
+ case ELEMENTALID_TERA_M:
+ case ELEMENTALID_TERA_L:
+ if (ele_sc->data[SC_EARTH_INSIGNIA] && ele_sc->data[SC_EARTH_INSIGNIA]->val1 == 1)
+ damage += damage * 20 / 100;
+ break;
+ }
+ }
}
//Finally, add baseatk
@@ -2186,16 +2240,16 @@ static int battle_skill_damage(struct block_list *src, struct block_list *target
/**
* Calculates Minstrel/Wanderer bonus for Chorus skills.
- * @param sd Player who has Chorus skill active
+ * @param sd: Player who has Chorus skill active
* @return Bonus value based on party count
*/
-static int battle_calc_chorusbonus(struct map_session_data *sd) {
+int battle_calc_chorusbonus(struct map_session_data *sd) {
int members = 0;
if (!sd || !sd->status.party_id)
return 0;
- members = party_foreachsamemap(party_sub_count_class, sd, MAPID_THIRDMASK, MAPID_MINSTRELWANDERER);
+ members = party_foreachsamemap(party_sub_count_class, sd, 0, MAPID_THIRDMASK, MAPID_MINSTRELWANDERER);
if (members < 3)
return 0; // Bonus remains 0 unless 3 or more Minstrels/Wanderers are in the party.
@@ -2359,7 +2413,7 @@ static bool is_attack_critical(struct Damage wd, struct block_list *src, struct
case 0:
if(sc && !sc->data[SC_AUTOCOUNTER])
break;
- clif_specialeffect(src, 131, AREA);
+ clif_specialeffect(src, EF_AUTOCOUNTER, AREA);
status_change_end(src, SC_AUTOCOUNTER, INVALID_TIMER);
case KN_AUTOCOUNTER:
if(battle_config.auto_counter_type &&
@@ -2431,7 +2485,7 @@ static int is_attack_piercing(struct Damage wd, struct block_list *src, struct b
return 0;
}
-static bool battle_skill_get_damage_properties(uint16 skill_id, int is_splash)
+static int battle_skill_get_damage_properties(uint16 skill_id, int is_splash)
{
int nk = skill_get_nk(skill_id);
if( !skill_id && is_splash ) //If flag, this is splash damage from Baphomet Card and it always hits.
@@ -2650,7 +2704,7 @@ static bool attack_ignores_def(struct Damage wd, struct block_list *src, struct
}
}
- return (nk&NK_IGNORE_DEF);
+ return (nk&NK_IGNORE_DEF) != 0;
}
/*================================================
@@ -2816,11 +2870,11 @@ static struct Damage battle_calc_element_damage(struct Damage wd, struct block_l
wd.damage2 = battle_attr_fix(src, target, wd.damage2, left_element ,tstatus->def_ele, tstatus->ele_lv);
if (sc && sc->data[SC_WATK_ELEMENT] && (wd.damage || wd.damage2)) {
// Descriptions indicate this means adding a percent of a normal attack in another element. [Skotlex]
- int64 damage = battle_calc_base_damage(sstatus, &sstatus->rhw, sc, tstatus->size, sd, (is_skill_using_arrow(src, skill_id)?2:0)) * sc->data[SC_WATK_ELEMENT]->val2 / 100;
+ int64 damage = battle_calc_base_damage(src, sstatus, &sstatus->rhw, sc, tstatus->size, (is_skill_using_arrow(src, skill_id)?2:0)) * sc->data[SC_WATK_ELEMENT]->val2 / 100;
wd.damage += battle_attr_fix(src, target, damage, sc->data[SC_WATK_ELEMENT]->val1, tstatus->def_ele, tstatus->ele_lv);
if (is_attack_left_handed(src, skill_id)) {
- damage = battle_calc_base_damage(sstatus, &sstatus->lhw, sc, tstatus->size, sd, (is_skill_using_arrow(src, skill_id)?2:0)) * sc->data[SC_WATK_ELEMENT]->val2 / 100;
+ damage = battle_calc_base_damage(src, sstatus, &sstatus->lhw, sc, tstatus->size, (is_skill_using_arrow(src, skill_id)?2:0)) * sc->data[SC_WATK_ELEMENT]->val2 / 100;
wd.damage2 += battle_attr_fix(src, target, damage, sc->data[SC_WATK_ELEMENT]->val1, tstatus->def_ele, tstatus->ele_lv);
}
}
@@ -2919,31 +2973,11 @@ static struct Damage battle_calc_attack_masteries(struct Damage wd, struct block
}
if (sc) { // Status change considered as masteries
- uint8 i;
-
#ifdef RENEWAL
if (sc->data[SC_NIBELUNGEN]) // With renewal, the level 4 weapon limitation has been removed
ATK_ADD(wd.masteryAtk, wd.masteryAtk2, sc->data[SC_NIBELUNGEN]->val2);
#endif
- if (sc->data[SC_MIRACLE])
- i = 2; //Star anger
- else
- ARR_FIND(0, MAX_PC_FEELHATE, i, t_class == sd->hate_mob[i]);
-
- if (i < MAX_PC_FEELHATE && (skill=pc_checkskill(sd,sg_info[i].anger_id))) {
- int skillratio = sd->status.base_level + sstatus->dex + sstatus->luk;
-
- if (i == 2)
- skillratio += sstatus->str; //Star Anger
- if (skill < 4)
- skillratio /= 12 - 3 * skill;
- ATK_ADDRATE(wd.damage, wd.damage2, skillratio);
-#ifdef RENEWAL
- ATK_ADDRATE(wd.masteryAtk, wd.masteryAtk2, skillratio);
-#endif
- }
-
if(sc->data[SC_CAMOUFLAGE]) {
ATK_ADD(wd.damage, wd.damage2, 30 * min(10, sc->data[SC_CAMOUFLAGE]->val3));
#ifdef RENEWAL
@@ -2954,6 +2988,12 @@ static struct Damage battle_calc_attack_masteries(struct Damage wd, struct block
ATK_ADD(wd.damage, wd.damage2, 10 * sc->data[SC_GN_CARTBOOST]->val1);
#ifdef RENEWAL
ATK_ADD(wd.masteryAtk, wd.masteryAtk2, 10 * sc->data[SC_GN_CARTBOOST]->val1);
+#endif
+ }
+ if (sc->data[SC_P_ALTER]) {
+ ATK_ADD(wd.damage, wd.damage2, sc->data[SC_P_ALTER]->val2);
+#ifdef RENEWAL
+ ATK_ADD(wd.masteryAtk, wd.masteryAtk2, sc->data[SC_P_ALTER]->val2);
#endif
}
}
@@ -3054,7 +3094,7 @@ struct Damage battle_calc_skill_base_damage(struct Damage wd, struct block_list
wd = battle_calc_damage_parts(wd, src, target, skill_id, skill_lv);
wd.masteryAtk = 0; // weapon mastery is ignored for spiral
} else {
- wd.damage = battle_calc_base_damage(sstatus, &sstatus->rhw, sc, tstatus->size, sd, 0); //Monsters have no weight and use ATK instead
+ wd.damage = battle_calc_base_damage(src, sstatus, &sstatus->rhw, sc, tstatus->size, 0); //Monsters have no weight and use ATK instead
}
switch (tstatus->size) { //Size-fix. Is this modified by weapon perfection?
@@ -3085,7 +3125,7 @@ struct Damage battle_calc_skill_base_damage(struct Damage wd, struct block_list
ATK_ADDRATE(wd.damage, wd.damage2, 50*skill_lv); //Skill modifier applies to weight only.
} else {
- wd.damage = battle_calc_base_damage(sstatus, &sstatus->rhw, sc, tstatus->size, sd, 0); //Monsters have no weight and use ATK instead
+ wd.damage = battle_calc_base_damage(src, sstatus, &sstatus->rhw, sc, tstatus->size, 0); //Monsters have no weight and use ATK instead
}
i = sstatus->str/10;
@@ -3174,9 +3214,9 @@ struct Damage battle_calc_skill_base_damage(struct Damage wd, struct block_list
i = (is_attack_critical(wd, src, target, skill_id, skill_lv, false)?1:0)|
(!skill_id && sc && sc->data[SC_CHANGE]?4:0);
- wd.damage = battle_calc_base_damage(sstatus, &sstatus->rhw, sc, tstatus->size, sd, i);
+ wd.damage = battle_calc_base_damage(src, sstatus, &sstatus->rhw, sc, tstatus->size, i);
if (is_attack_left_handed(src, skill_id))
- wd.damage2 = battle_calc_base_damage(sstatus, &sstatus->lhw, sc, tstatus->size, sd, i);
+ wd.damage2 = battle_calc_base_damage(src, sstatus, &sstatus->lhw, sc, tstatus->size, i);
}
#else
i = (is_attack_critical(wd, src, target, skill_id, skill_lv, false)?1:0)|
@@ -3198,9 +3238,9 @@ struct Damage battle_calc_skill_base_damage(struct Damage wd, struct block_list
break;
}
}
- wd.damage = battle_calc_base_damage(sstatus, &sstatus->rhw, sc, tstatus->size, sd, i);
+ wd.damage = battle_calc_base_damage(src, sstatus, &sstatus->rhw, sc, tstatus->size, i);
if (is_attack_left_handed(src, skill_id))
- wd.damage2 = battle_calc_base_damage(sstatus, &sstatus->lhw, sc, tstatus->size, sd, i);
+ wd.damage2 = battle_calc_base_damage(src, sstatus, &sstatus->lhw, sc, tstatus->size, i);
#endif
if (nk&NK_SPLASHSPLIT){ // Divide ATK among targets
if(wd.miscflag > 0) {
@@ -3282,19 +3322,23 @@ static struct Damage battle_calc_multi_attack(struct Damage wd, struct block_lis
if( sd && !skill_id ) { // if no skill_id passed, check for double attack [helvetica]
short i;
if( ( ( skill_lv = pc_checkskill(sd,TF_DOUBLE) ) > 0 && sd->weapontype1 == W_DAGGER )
- || ( sd->bonus.double_rate > 0 && sd->weapontype1 != W_FIST ) //Will fail bare-handed
- || ( sc && sc->data[SC_KAGEMUSYA] && sd->weapontype1 != W_FIST )) // Need confirmation
+ || ( sd->bonus.double_rate > 0 && sd->weapontype1 != W_FIST ) // Will fail bare-handed
+ || ( sc && sc->data[SC_KAGEMUSYA] && sd->weapontype1 != W_FIST )) // Will fail bare-handed
{ //Success chance is not added, the higher one is used [Skotlex]
- int max_rate = max(5*skill_lv,sd->bonus.double_rate);
- if(sc && sc->data[SC_KAGEMUSYA]) max_rate= max(max_rate,sc->data[SC_KAGEMUSYA]->val1*3);
-
+ int max_rate = 0;
+
+ if (sc && sc->data[SC_KAGEMUSYA])
+ max_rate = sc->data[SC_KAGEMUSYA]->val1 * 10; // Same rate as even levels of TF_DOUBLE
+ else
+ max_rate = max(5 * skill_lv, sd->bonus.double_rate);
+
if( rnd()%100 < max_rate ) {
wd.div_ = skill_get_num(TF_DOUBLE,skill_lv?skill_lv:1);
wd.type = DMG_MULTI_HIT;
}
}
else if( ((sd->weapontype1 == W_REVOLVER && (skill_lv = pc_checkskill(sd,GS_CHAINACTION)) > 0) //Normal Chain Action effect
- || (sc && sc->count && sc->data[SC_E_CHAIN] && (skill_lv = sc->data[SC_E_CHAIN]->val2) > 0)) //Chain Action of ETERNAL_CHAIN
+ || (sc && sc->count && sc->data[SC_E_CHAIN] && (skill_lv = sc->data[SC_E_CHAIN]->val1) > 0)) //Chain Action of ETERNAL_CHAIN
&& rnd()%100 < 5*skill_lv ) //Success rate
{
wd.div_ = skill_get_num(GS_CHAINACTION,skill_lv);
@@ -3324,6 +3368,9 @@ static struct Damage battle_calc_multi_attack(struct Damage wd, struct block_lis
if( tsc && (tsc->data[SC_BITE] || tsc->data[SC_ANKLE] || tsc->data[SC_ELECTRICSHOCKER]) )
wd.div_ = tstatus->size + 2 + ( (rnd()%100 < 50-tstatus->size*10) ? 1 : 0 );
break;
+ case RL_QD_SHOT:
+ wd.div_ = 1 + (sd ? sd->status.job_level : 1) / 20 + (tsc && tsc->data[SC_C_MARKER] ? 2 : 0);
+ break;
case SC_JYUMONJIKIRI:
if( tsc && tsc->data[SC_JYUMONJIKIRI] )
wd.div_ = wd.div_ * -1;// needs more info
@@ -3368,22 +3415,26 @@ static int battle_calc_attack_skill_ratio(struct Damage wd, struct block_list *s
if (sc->data[SC_CONCENTRATION] && (skill_id != RK_DRAGONBREATH && skill_id != RK_DRAGONBREATH_WATER))
skillratio += sc->data[SC_CONCENTRATION]->val2;
#endif
- if (sc->data[SC_CRUSHSTRIKE] && (!skill_id || skill_id == KN_AUTOCOUNTER)) {
- if (sd) { //ATK [{Weapon Level * (Weapon Upgrade Level + 6) * 100} + (Weapon ATK) + (Weapon Weight)]%
- short index = sd->equip_index[EQI_HAND_R];
+ if (!skill_id || skill_id == KN_AUTOCOUNTER) {
+ if (sc->data[SC_CRUSHSTRIKE]) {
+ if (sd) { //ATK [{Weapon Level * (Weapon Upgrade Level + 6) * 100} + (Weapon ATK) + (Weapon Weight)]%
+ short index = sd->equip_index[EQI_HAND_R];
- if (index >= 0 && sd->inventory_data[index] && sd->inventory_data[index]->type == IT_WEAPON)
- skillratio += -100 + sd->inventory_data[index]->weight / 10 + sstatus->rhw.atk +
- 100 * sd->inventory_data[index]->wlv * (sd->inventory.u.items_inventory[index].refine + 6);
+ if (index >= 0 && sd->inventory_data[index] && sd->inventory_data[index]->type == IT_WEAPON)
+ skillratio += -100 + sd->inventory_data[index]->weight / 10 + sd->inventory_data[index]->atk +
+ 100 * sd->inventory_data[index]->wlv * (sd->inventory.u.items_inventory[index].refine + 6);
+ }
+ status_change_end(src,SC_CRUSHSTRIKE,INVALID_TIMER);
+ skill_break_equip(src,src,EQP_WEAPON,2000,BCT_SELF);
+ } else {
+ if (sc->data[SC_GIANTGROWTH] && (sd->class_&MAPID_THIRDMASK) == MAPID_RUNE_KNIGHT) { // Increase damage again if Crush Strike is not active
+ if (map_flag_vs(src->m)) // Only half of the 2.5x increase on versus-type maps
+ skillratio += 125;
+ else
+ skillratio += 250;
+ }
}
- status_change_end(src,SC_CRUSHSTRIKE,INVALID_TIMER);
- skill_break_equip(src,src,EQP_WEAPON,2000,BCT_SELF);
}
- //!TODO: Verify this placement & skills that affected by these effects [Cydh]
- if (sc->data[SC_HEAT_BARREL])
- skillratio += 200;
- if (sc->data[SC_P_ALTER])
- skillratio += sc->data[SC_P_ALTER]->val2;
}
switch(skill_id) {
@@ -3659,16 +3710,20 @@ static int battle_calc_attack_skill_ratio(struct Damage wd, struct block_list *s
case GS_PIERCINGSHOT:
#ifdef RENEWAL
if (sd && sd->weapontype1 == W_RIFLE)
- skillratio += 50 + 30 * skill_lv;
+ skillratio += 150 + 30 * skill_lv;
else
+ skillratio += 100 + 20 * skill_lv;
+#else
+ skillratio += 20 * skill_lv;
#endif
- skillratio += 20 * skill_lv;
break;
case GS_RAPIDSHOWER:
skillratio += 400 + 50 * skill_lv;
break;
case GS_DESPERADO:
skillratio += 50 * (skill_lv - 1);
+ if (sc && sc->data[SC_FALLEN_ANGEL])
+ skillratio *= 2;
break;
case GS_DUST:
skillratio += 50 * skill_lv;
@@ -3678,7 +3733,7 @@ static int battle_calc_attack_skill_ratio(struct Damage wd, struct block_list *s
break;
case GS_SPREADATTACK:
#ifdef RENEWAL
- skillratio += 20 * skill_lv;
+ skillratio += 30 * skill_lv;
#else
skillratio += 20 * (skill_lv - 1);
#endif
@@ -3768,7 +3823,7 @@ static int battle_calc_attack_skill_ratio(struct Damage wd, struct block_list *s
skillratio += 100 * skill_lv;
break;
case RK_STORMBLAST:
- skillratio += -100 + (((sd) ? pc_checkskill(sd,RK_RUNEMASTERY) : 0) + (status_get_str(src) / 8)) * 100; // ATK = [{Rune Mastery Skill Level + (Caster's STR / 8)} x 100] %
+ skillratio += -100 + (((sd) ? pc_checkskill(sd,RK_RUNEMASTERY) : 0) + status_get_str(src) / 8) * 100; // ATK = [{Rune Mastery Skill Level + (Caster's STR / 8)} x 100] %
break;
case RK_PHANTOMTHRUST: // ATK = [{(Skill Level x 50) + (Spear Master Level x 10)} x Caster's Base Level / 150] %
skillratio += -100 + 50 * skill_lv + 10 * (sd ? pc_checkskill(sd,KN_SPEARMASTERY) : 5);
@@ -4220,53 +4275,67 @@ static int battle_calc_attack_skill_ratio(struct Damage wd, struct block_list *s
skillratio += -100 + 200 * skill_lv;
break;
case RL_FIREDANCE:
- skillratio += -100 + 100 * skill_lv;
- skillratio += (skillratio * status_get_lv(src)) / 300; //(custom)
+ skillratio += -100 + 200 * skill_lv;
+ skillratio += (sd ? pc_checkskill(sd, GS_DESPERADO) * 50 : 0);
break;
case RL_BANISHING_BUSTER:
- skillratio += -100 + (400 * skill_lv); //(custom)
+ skillratio += -100 + 2000 + 300 * skill_lv;
break;
case RL_S_STORM:
- skillratio += -100 + (200 * skill_lv); //(custom)
+ skillratio += -100 + 1700 + 200 * skill_lv;
break;
case RL_SLUGSHOT: {
- uint16 w = 50;
- int16 idx = -1;
+ uint16 w = 0;
+
+ if (sd) {
+ unsigned short slug[] = { ITEMID_SLUG_AMMUNITION_XH, ITEMID_SLUG_AMMUNITION_SH, ITEMID_SLUG_AMMUNITION_H, ITEMID_SLUG_AMMUNITION_M, ITEMID_SLUG_AMMUNITION_L }; // In order of priority
+ int16 index = -1;
- if (sd && (idx = sd->equip_index[EQI_AMMO]) >= 0 && sd->inventory_data[idx])
- w = sd->inventory_data[idx]->weight / 10;
- skillratio += -100 + (max(w,1) * skill_lv * 30); //(custom)
+ for (i = 0; i < ARRAYLENGTH(slug); i++) {
+ if ((index = pc_search_inventory(sd, slug[i])) >= 0) {
+ w = (sd->inventory_data[index]->weight / 10) * 32;
+ break;
+ }
+ }
+ }
+ if (target->type != BL_PC) // Monster
+ skillratio += -100 + 1200 * skill_lv;
+ else // Player
+ skillratio += -100 + 2000 * skill_lv;
+ switch(tstatus->size) {
+ case SZ_SMALL: skillratio += w * 2; break;
+ case SZ_MEDIUM: skillratio += w * 3; break;
+ case SZ_BIG: skillratio += w * 4; break;
+ }
}
break;
case RL_D_TAIL:
- skillratio += -100 + (2500 + 500 * skill_lv);
+ skillratio += -100 + 4000 + 1000 * skill_lv;
break;
case RL_R_TRIP:
- skillratio += -100 + 150 * skill_lv; //(custom)
+ skillratio += -100 + 1000 + 300 * skill_lv;
break;
case RL_R_TRIP_PLUSATK:
- skillratio += -100 + 100 * skill_lv + rnd()%10 + 100; //(custom)
+ skillratio += -100 + 300 + 300 * skill_lv;
break;
case RL_H_MINE:
- skillratio += 100 + 200 * skill_lv;
- //If damaged by Flicker, explosion damage (800%:1100%:1400%:1700%:2000%)
- if (sd && sd->flicker)
- skillratio += 800 + (skill_lv - 1) * 300;
+ if (sd && sd->flicker) // Flicker explosion damage: 500 + 300 * SkillLv
+ skillratio += -100 + 500 + 300 * skill_lv;
+ else // 200 + 200 * SkillLv
+ skillratio += -100 + 200 + 200 * skill_lv;
break;
case RL_HAMMER_OF_GOD:
- //! TODO: Please check the right formula. [Cydh]
- //kRO Update 2013-07-24. Ratio: 1600+lv*800
- //kRO Update 2014-02-12. Coins increase the damage
- skillratio += -100 + (2400 + (skill_lv - 1) * 800) + 10 *((sd) ? sd->spiritball_old : 1); //(custom)
- break;
- case RL_QD_SHOT:
- skillratio += -100 + (max(pc_checkskill(sd,GS_CHAINACTION),1) * status_get_dex(src) / 5); //(custom)
+ skillratio += -100 + 2800 + 1400 * skill_lv;
+ if (sd) {
+ if (tsc && tsc->data[SC_C_MARKER])
+ skillratio += 100 * sd->spiritball_old;
+ else if (sd->spiritball_old)
+ skillratio += 10 * sd->spiritball_old;
+ }
break;
case RL_FIRE_RAIN:
- skillratio += -100 + 2000 + (200 * (skill_lv - 1)) + status_get_dex(src); //(custom) //kRO Update 2013-07-24. 2,000% + caster's DEX (?) [Cydh]
- break;
case RL_AM_BLAST:
- skillratio += -100 + 300 * skill_lv + status_get_dex(src) / 5; //(custom)
+ skillratio += -100 + 3500 + 300 * skill_lv;
break;
case SU_BITE:
skillratio += 100;
@@ -4276,15 +4345,26 @@ static int battle_calc_attack_skill_ratio(struct Damage wd, struct block_list *s
break;
case SU_SCAROFTAROU:
skillratio += -100 + 100 * skill_lv;
+ if (sd && pc_checkskill(sd, SU_SPIRITOFLIFE))
+ skillratio += skillratio * status_get_hp(src) / status_get_max_hp(src);
break;
case SU_PICKYPECK:
case SU_PICKYPECK_DOUBLE_ATK:
skillratio += 100 + 100 * skill_lv;
- if (status_get_max_hp(target) / 100 <= 50)
+ if (status_get_hp(target) < status_get_max_hp(target) >> 1)
skillratio *= 2;
+ if (sd && pc_checkskill(sd, SU_SPIRITOFLIFE))
+ skillratio += skillratio * status_get_hp(src) / status_get_max_hp(src);
break;
case SU_LUNATICCARROTBEAT:
skillratio += 100 + 100 * skill_lv;
+ if (sd && pc_checkskill(sd, SU_SPIRITOFLIFE))
+ skillratio += skillratio * status_get_hp(src) / status_get_max_hp(src);
+ break;
+ case SU_SVG_SPIRIT:
+ skillratio += 150 + 150 * skill_lv;
+ if (sd && pc_checkskill(sd, SU_SPIRITOFLIFE))
+ skillratio += skillratio * status_get_hp(src) / status_get_max_hp(src);
break;
}
return skillratio;
@@ -4366,7 +4446,9 @@ struct Damage battle_attack_sc_bonus(struct Damage wd, struct block_list *src, s
struct map_session_data *sd = BL_CAST(BL_PC, src);
struct status_change *sc = status_get_sc(src);
struct status_data *sstatus = status_get_status_data(src);
+ struct status_data *tstatus = status_get_status_data(target);
int inf3 = skill_get_inf3(skill_id);
+ uint8 anger_id = 0; // SLS Anger
// Kagerou/Oboro Earth Charm effect +15% wATK
if(sd && sd->spiritcharm_type == CHARM_TYPE_LAND && sd->spiritcharm > 0) {
@@ -4389,9 +4471,14 @@ struct Damage battle_attack_sc_bonus(struct Damage wd, struct block_list *src, s
ATK_ADD(wd.equipAtk, wd.equipAtk2, sc->data[SC_DRUMBATTLE]->val2);
if (sc->data[SC_MADNESSCANCEL])
ATK_ADD(wd.equipAtk, wd.equipAtk2, 100);
+ if (sc->data[SC_MAGICALBULLET]) {
+ if (sstatus->matk_max > sstatus->matk_min) {
+ ATK_ADD(wd.weaponAtk, wd.weaponAtk2, i64max((sstatus->matk_min + rnd() % (sstatus->matk_max - sstatus->matk_min)) - (tstatus->mdef + tstatus->mdef2), 0));
+ } else {
+ ATK_ADD(wd.weaponAtk, wd.weaponAtk2, i64max(sstatus->matk_min - (tstatus->mdef + tstatus->mdef2), 0));
+ }
+ }
if (sc->data[SC_GATLINGFEVER]) {
- struct status_data *tstatus = status_get_status_data(target);
-
if (tstatus->size == SZ_SMALL) {
ATK_ADD(wd.equipAtk, wd.equipAtk2, 10 * sc->data[SC_GATLINGFEVER]->val1);
} else if (tstatus->size == SZ_MEDIUM) {
@@ -4500,7 +4587,10 @@ struct Damage battle_attack_sc_bonus(struct Damage wd, struct block_list *src, s
break;
}
}
-
+ if (sc->data[SC_HEAT_BARREL]) {
+ ATK_ADDRATE(wd.damage, wd.damage2, sc->data[SC_HEAT_BARREL]->val3);
+ RE_ALLATK_ADDRATE(wd, sc->data[SC_HEAT_BARREL]->val3);
+ }
if((wd.flag&(BF_LONG|BF_MAGIC)) == BF_LONG) {
if (sc->data[SC_MTF_RANGEATK]) { // Monster Transformation bonus
ATK_ADDRATE(wd.damage, wd.damage2, sc->data[SC_MTF_RANGEATK]->val1);
@@ -4520,17 +4610,38 @@ struct Damage battle_attack_sc_bonus(struct Damage wd, struct block_list *src, s
ATK_ADDRATE(wd.damage, wd.damage2, sc->data[SC_GVG_GIANT]->val3);
RE_ALLATK_ADDRATE(wd, sc->data[SC_GVG_GIANT]->val3);
}
+
+ if (sc->data[SC_MIRACLE])
+ anger_id = 2; // Always treat all monsters as star flagged monster when in miracle state
}
if ((wd.flag&(BF_LONG|BF_MAGIC)) == BF_LONG) {
if (sd && pc_checkskill(sd, SU_POWEROFLIFE) > 0) {
- if (pc_checkskill(sd, SU_SCAROFTAROU) == 5 && pc_checkskill(sd, SU_PICKYPECK) == 5 && pc_checkskill(sd, SU_ARCLOUSEDASH) == 5 && pc_checkskill(sd, SU_LUNATICCARROTBEAT) == 5) {
- ATK_ADDRATE(wd.damage, wd.damage2, 20);
- RE_ALLATK_ADDRATE(wd, 20);
+ if ((pc_checkskill(sd, SU_SCAROFTAROU) + pc_checkskill(sd, SU_PICKYPECK) + pc_checkskill(sd, SU_ARCLOUSEDASH) + pc_checkskill(sd, SU_LUNATICCARROTBEAT) +
+ pc_checkskill(sd, SU_HISS) + pc_checkskill(sd, SU_POWEROFFLOCK) + pc_checkskill(sd, SU_SVG_SPIRIT)) > 19) {
+ ATK_ADDRATE(wd.damage, wd.damage2, 20);
+ RE_ALLATK_ADDRATE(wd, 20);
}
}
}
+ if (sd != nullptr && !anger_id)
+ ARR_FIND(0, MAX_PC_FEELHATE, anger_id, status_get_class(target) == sd->hate_mob[anger_id]);
+
+ uint16 anger_level;
+ if (sd != nullptr && anger_id < MAX_PC_FEELHATE && (anger_level = pc_checkskill(sd, sg_info[anger_id].anger_id))) {
+ int skillratio = sd->status.base_level + sstatus->dex + sstatus->luk;
+
+ if (anger_id == 2)
+ skillratio += sstatus->str; // SG_STAR_ANGER additionally has STR added in its formula.
+ if (anger_level < 4)
+ skillratio /= 12 - 3 * anger_level;
+ ATK_ADDRATE(wd.damage, wd.damage2, skillratio);
+#ifdef RENEWAL
+ RE_ALLATK_ADDRATE(wd, skillratio);
+#endif
+ }
+
return wd;
}
@@ -4652,10 +4763,6 @@ struct Damage battle_calc_defense_reduction(struct Damage wd, struct block_list
if( src->type == BL_MOB && (skill = pc_checkskill(tsd, NC_RESEARCHFE)) > 0 &&
(sstatus->def_ele == ELE_FIRE || sstatus->def_ele == ELE_EARTH) )
vit_def += skill * 10;
- if( src->type == BL_MOB && //Only affected from mob
- tsc && tsc->count && tsc->data[SC_P_ALTER] && //If the Platinum Alter is activated
- (battle_check_undead(sstatus->race,sstatus->def_ele) || sstatus->race==RC_UNDEAD) ) //Undead attacker
- vit_def += tsc->data[SC_P_ALTER]->val3;
} else { //Mob-Pet vit-eq
#ifndef RENEWAL
//VIT + rnd(0,[VIT/20]^2-1)
@@ -5008,7 +5115,7 @@ struct Damage battle_calc_weapon_final_atk_modifiers(struct Damage wd, struct bl
int64 rdamage = 0;
int ratio = (int64)(status_get_hp(src) / 100) * tsc->data[SC_CRESCENTELBOW]->val1 * status_get_lv(target) / 125;
if (ratio > 5000) ratio = 5000; // Maximum of 5000% ATK
- rdamage = battle_calc_base_damage(tstatus,&tstatus->rhw,tsc,sstatus->size,tsd,0);
+ rdamage = battle_calc_base_damage(target,tstatus,&tstatus->rhw,tsc,sstatus->size,0);
rdamage = (int64)rdamage * ratio / 100 + wd.damage * (10 + tsc->data[SC_CRESCENTELBOW]->val1 * 20 / 10) / 10;
skill_blown(target, src, skill_get_blewcount(SR_CRESCENTELBOW_AUTOSPELL, tsc->data[SC_CRESCENTELBOW]->val1), unit_getdir(src), BLOWN_NONE);
clif_skill_damage(target, src, gettick(), status_get_amotion(src), 0, rdamage,
@@ -5450,7 +5557,6 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src, struct bl
switch(skill_id) {
#ifdef RENEWAL
case NJ_ISSEN:
- case GS_MAGICALBULLET:
case ASC_BREAKER:
case CR_ACIDDEMONSTRATION:
case GN_FIRE_EXPANSION_ACID:
@@ -5530,7 +5636,6 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src, struct bl
switch (skill_id) {
#ifdef RENEWAL
case NJ_ISSEN:
- case GS_MAGICALBULLET:
case ASC_BREAKER:
case CR_ACIDDEMONSTRATION:
case GN_FIRE_EXPANSION_ACID:
@@ -5617,6 +5722,10 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
if (skill_lv == 2)
s_ele = ELE_HOLY;
break;
+ case WL_HELLINFERNO:
+ if (mflag&ELE_DARK)
+ s_ele = ELE_DARK;
+ break;
case SO_PSYCHIC_WAVE:
if( sc && sc->count ) {
if( sc->data[SC_HEATER_OPTION] )
@@ -5730,9 +5839,6 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
ad.damage >>= 1;
#endif
break;
- case SU_SV_ROOTTWIST_ATK:
- ad.damage = 100;
- break;
default: {
if (sstatus->matk_max > sstatus->matk_min) {
MATK_ADD(sstatus->matk_min+rnd()%(sstatus->matk_max-sstatus->matk_min));
@@ -5969,7 +6075,7 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
skillratio += 400 + 100 * skill_lv;
RE_LVL_DMOD(100);
if (mflag > 0)
- skillratio += 100 * (9 - mflag);
+ skillratio += 100 * mflag;
break;
case WL_EARTHSTRAIN:
skillratio += 1900 + 100 * skill_lv;
@@ -6122,6 +6228,14 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
break;
}
+ if (sc) {// Insignia's increases the damage of offensive magic by a fixed percentage depending on the element.
+ if ((sc->data[SC_FIRE_INSIGNIA] && sc->data[SC_FIRE_INSIGNIA]->val1 == 3 && s_ele == ELE_FIRE) ||
+ (sc->data[SC_WATER_INSIGNIA] && sc->data[SC_WATER_INSIGNIA]->val1 == 3 && s_ele == ELE_WATER) ||
+ (sc->data[SC_WIND_INSIGNIA] && sc->data[SC_WIND_INSIGNIA]->val1 == 3 && s_ele == ELE_WIND) ||
+ (sc->data[SC_EARTH_INSIGNIA] && sc->data[SC_EARTH_INSIGNIA]->val1 == 3 && s_ele == ELE_EARTH))
+ skillratio += 25;
+ }
+
MATK_RATE(skillratio);
//Constant/misc additions from skills
@@ -6263,20 +6377,19 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
//Apply DAMAGE_DIV_FIX and check for min damage
ad = battle_apply_div_fix(ad, skill_id);
- switch(skill_id) { // These skills will do a GVG fix later
#ifdef RENEWAL
+ switch(skill_id) {
case ASC_BREAKER:
case CR_ACIDDEMONSTRATION:
return ad; //These skills will do a GVG fix later
-#endif
- default:
- ad.damage = battle_calc_damage(src,target,&ad,ad.damage,skill_id,skill_lv);
- if (map_flag_gvg2(target->m))
- ad.damage = battle_calc_gvg_damage(src,target,ad.damage,skill_id,ad.flag);
- else if (map[target->m].flag.battleground)
- ad.damage = battle_calc_bg_damage(src,target,ad.damage,skill_id,ad.flag);
- break;
}
+#endif
+
+ ad.damage = battle_calc_damage(src,target,&ad,ad.damage,skill_id,skill_lv);
+ if (map_flag_gvg2(target->m))
+ ad.damage = battle_calc_gvg_damage(src,target,ad.damage,skill_id,ad.flag);
+ else if (map[target->m].flag.battleground)
+ ad.damage = battle_calc_bg_damage(src,target,ad.damage,skill_id,ad.flag);
// Skill damage adjustment
#ifdef ADJUST_SKILL_DAMAGE
@@ -6393,25 +6506,6 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *
}
}
break;
-#ifdef RENEWAL
- case GS_MAGICALBULLET:
- {
- //Official renewal formula [exneval]
- //Damage = (Final ATK + Final MATK) * Skill modifiers - (eDEF + sDEF + eMDEF + sMDEF)
- short totaldef, totalmdef;
- struct Damage atk, matk;
-
- atk = battle_calc_weapon_attack(src,target,skill_id,skill_lv,md.miscflag);
- matk = battle_calc_magic_attack(src,target,skill_id,skill_lv,md.miscflag);
- md.damage = atk.damage + matk.damage;
- totaldef = (short)status_get_def(target) + tstatus->def2;
- totalmdef = tstatus->mdef + tstatus->mdef2;
- md.damage -= totaldef + totalmdef;
- md.flag |= BF_WEAPON;
- nk |= NK_IGNORE_FLEE; // Flee already checked in battle_calc_weapon_attack, so don't do it again here [exneval]
- }
- break;
-#endif
case BA_DISSONANCE:
md.damage = 30 + skill_lv * 10;
if (sd)
@@ -6571,11 +6665,13 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *
break;
case GN_HELLS_PLANT_ATK:
//[{( Hell Plant Skill Level x Casters Base Level ) x 10 } + {( Casters INT x 7 ) / 2 } x { 18 + ( Casters Job Level / 4 )] x ( 5 / ( 10 - Summon Flora Skill Level ))
- md.damage = ( skill_lv * status_get_lv(src) * 10 ) + ( status_get_int(src) * 7 / 2 ) * ( 18 + (sd?sd->status.job_level:0) / 4 ) * ( 5 / (10 - ((sd) ? pc_checkskill(sd,AM_CANNIBALIZE) : 0)) );
+ md.damage = skill_lv * status_get_lv(src) * 10 + status_get_int(src) * 7 / 2 * (18 + (sd ? sd->status.job_level : 0) / 4) * 5 / (10 - (sd ? pc_checkskill(sd, AM_CANNIBALIZE) : 0));
break;
case RL_B_TRAP:
// kRO 2014-02-12: Damage: Caster's DEX, Target's current HP, Skill Level
- md.damage = ((200 + status_get_dex(src)) * skill_lv * 10) + sstatus->hp; // (custom)
+ md.damage = status_get_dex(src) * 10 + (skill_lv * 3 * status_get_hp(target)) / 100;
+ if (status_bl_has_mode(target, MD_STATUS_IMMUNE))
+ md.damage /= 10;
break;
case MH_EQC:
md.damage = max(tstatus->hp - sstatus->hp, 0);
@@ -6586,6 +6682,9 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *
else
md.damage = 0;
break;
+ case SU_SV_ROOTTWIST_ATK:
+ md.damage = 100;
+ break;
}
if (nk&NK_SPLASHSPLIT) { // Divide ATK among targets
@@ -6639,15 +6738,7 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *
}
}
- switch(skill_id) {
-#ifdef RENEWAL
- case GS_MAGICALBULLET:
- break; // Card fix already done
-#endif
- default:
- md.damage += battle_calc_cardfix(BF_MISC, src, target, nk, s_ele, 0, md.damage, 0, md.flag);
- break;
- }
+ md.damage += battle_calc_cardfix(BF_MISC, src, target, nk, s_ele, 0, md.damage, 0, md.flag);
if (sd && (i = pc_skillatk_bonus(sd, skill_id)))
md.damage += (int64)md.damage*i/100;
@@ -6689,19 +6780,11 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *
break;
}
- switch(skill_id) {
-#ifdef RENEWAL
- case GS_MAGICALBULLET:
- break; // GVG fix already done
-#endif
- default:
- md.damage = battle_calc_damage(src,target,&md,md.damage,skill_id,skill_lv);
- if(map_flag_gvg2(target->m))
- md.damage = battle_calc_gvg_damage(src,target,md.damage,skill_id,md.flag);
- else if(map[target->m].flag.battleground)
- md.damage = battle_calc_bg_damage(src,target,md.damage,skill_id,md.flag);
- break;
- }
+ md.damage = battle_calc_damage(src,target,&md,md.damage,skill_id,skill_lv);
+ if(map_flag_gvg2(target->m))
+ md.damage = battle_calc_gvg_damage(src,target,md.damage,skill_id,md.flag);
+ else if(map[target->m].flag.battleground)
+ md.damage = battle_calc_bg_damage(src,target,md.damage,skill_id,md.flag);
// Skill damage adjustment
#ifdef ADJUST_SKILL_DAMAGE
@@ -6768,7 +6851,7 @@ int64 battle_calc_return_damage(struct block_list* bl, struct block_list *src, i
ssc = status_get_sc(src);
if (flag & BF_SHORT) {//Bounces back part of the damage.
- if ( !status_reflect && sd && sd->bonus.short_weapon_damage_return ) {
+ if ( sd && sd->bonus.short_weapon_damage_return ) {
rdamage += damage * sd->bonus.short_weapon_damage_return / 100;
rdamage = i64max(rdamage,1);
} else if( status_reflect && sc && sc->count ) {
@@ -7239,12 +7322,7 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t
}
if (sc->data[SC_GIANTGROWTH] && (wd.flag&BF_SHORT) && rnd()%100 < sc->data[SC_GIANTGROWTH]->val2 && !is_infinite_defense(target, wd.flag) && !vanish_damage) {
wd.damage <<= 1; // Double Damage
- if (!sc->data[SC_CRUSHSTRIKE]) { // Increase damage again if Crush Strike is not active
- if (map_flag_vs(src->m)) // Only half of the 2.5x increase on versus-type maps
- wd.damage += wd.damage * 125 / 100;
- else
- wd.damage += wd.damage * 250 / 100;
- }
+ skill_break_equip(src, src, EQP_WEAPON, 10, BCT_SELF); // Break chance happens on successful damage increase
}
if( sd && battle_config.arrow_decrement && sc->data[SC_FEARBREEZE] && sc->data[SC_FEARBREEZE]->val4 > 0) {
@@ -7530,7 +7608,7 @@ struct block_list* battle_get_master(struct block_list *src)
* (enemy, friend, party, guild, etc)
*------------------------------------------
* Usage:
- * See battle.h for possible values/combinations
+ * See battle.hpp for possible values/combinations
* to be used here (BCT_* constants)
* Return value is:
* 1: flag holds true (is enemy, party, etc)
@@ -7935,7 +8013,11 @@ static const struct _battle_data {
{ "player_damage_delay_rate", &battle_config.pc_damage_delay_rate, 100, 0, INT_MAX, },
{ "defunit_not_enemy", &battle_config.defnotenemy, 0, 0, 1, },
{ "gvg_traps_target_all", &battle_config.vs_traps_bctall, BL_PC, BL_NUL, BL_ALL, },
+#ifdef RENEWAL
+ { "traps_setting", &battle_config.traps_setting, 2, 0, 2, },
+#else
{ "traps_setting", &battle_config.traps_setting, 0, 0, 2, },
+#endif
{ "summon_flora_setting", &battle_config.summon_flora, 1|2, 0, 1|2, },
{ "clear_skills_on_death", &battle_config.clear_unit_ondeath, BL_NUL, BL_NUL, BL_ALL, },
{ "clear_skills_on_warp", &battle_config.clear_unit_onwarp, BL_ALL, BL_NUL, BL_ALL, },
@@ -8126,22 +8208,22 @@ static const struct _battle_data {
// eAthena additions
{ "item_logarithmic_drops", &battle_config.logarithmic_drops, 0, 0, 1, },
- { "item_drop_common_min", &battle_config.item_drop_common_min, 1, 1, 10000, },
+ { "item_drop_common_min", &battle_config.item_drop_common_min, 1, 0, 10000, },
{ "item_drop_common_max", &battle_config.item_drop_common_max, 10000, 1, 10000, },
- { "item_drop_equip_min", &battle_config.item_drop_equip_min, 1, 1, 10000, },
+ { "item_drop_equip_min", &battle_config.item_drop_equip_min, 1, 0, 10000, },
{ "item_drop_equip_max", &battle_config.item_drop_equip_max, 10000, 1, 10000, },
- { "item_drop_card_min", &battle_config.item_drop_card_min, 1, 1, 10000, },
+ { "item_drop_card_min", &battle_config.item_drop_card_min, 1, 0, 10000, },
{ "item_drop_card_max", &battle_config.item_drop_card_max, 10000, 1, 10000, },
- { "item_drop_mvp_min", &battle_config.item_drop_mvp_min, 1, 1, 10000, },
+ { "item_drop_mvp_min", &battle_config.item_drop_mvp_min, 1, 0, 10000, },
{ "item_drop_mvp_max", &battle_config.item_drop_mvp_max, 10000, 1, 10000, },
{ "item_drop_mvp_mode", &battle_config.item_drop_mvp_mode, 0, 0, 2, },
- { "item_drop_heal_min", &battle_config.item_drop_heal_min, 1, 1, 10000, },
+ { "item_drop_heal_min", &battle_config.item_drop_heal_min, 1, 0, 10000, },
{ "item_drop_heal_max", &battle_config.item_drop_heal_max, 10000, 1, 10000, },
- { "item_drop_use_min", &battle_config.item_drop_use_min, 1, 1, 10000, },
+ { "item_drop_use_min", &battle_config.item_drop_use_min, 1, 0, 10000, },
{ "item_drop_use_max", &battle_config.item_drop_use_max, 10000, 1, 10000, },
- { "item_drop_add_min", &battle_config.item_drop_adddrop_min, 1, 1, 10000, },
+ { "item_drop_add_min", &battle_config.item_drop_adddrop_min, 1, 0, 10000, },
{ "item_drop_add_max", &battle_config.item_drop_adddrop_max, 10000, 1, 10000, },
- { "item_drop_treasure_min", &battle_config.item_drop_treasure_min, 1, 1, 10000, },
+ { "item_drop_treasure_min", &battle_config.item_drop_treasure_min, 1, 0, 10000, },
{ "item_drop_treasure_max", &battle_config.item_drop_treasure_max, 10000, 1, 10000, },
{ "item_rate_mvp", &battle_config.item_rate_mvp, 100, 0, 1000000, },
{ "item_rate_common", &battle_config.item_rate_common, 100, 0, 1000000, },
@@ -8170,6 +8252,7 @@ static const struct _battle_data {
{ "equip_self_break_rate", &battle_config.equip_self_break_rate, 100, 0, INT_MAX, },
{ "equip_skill_break_rate", &battle_config.equip_skill_break_rate, 100, 0, INT_MAX, },
{ "pk_mode", &battle_config.pk_mode, 0, 0, 2, },
+ { "pk_mode_mes", &battle_config.pk_mode_mes, 1, 0, 1, },
{ "pk_level_range", &battle_config.pk_level_range, 0, 0, INT_MAX, },
{ "manner_system", &battle_config.manner_system, 0xFFF, 0, 0xFFF, },
{ "pet_equip_required", &battle_config.pet_equip_required, 0, 0, 1, },
@@ -8179,8 +8262,6 @@ static const struct _battle_data {
{ "night_at_start", &battle_config.night_at_start, 0, 0, 1, },
{ "show_mob_info", &battle_config.show_mob_info, 0, 0, 1|2|4, },
{ "ban_hack_trade", &battle_config.ban_hack_trade, 0, 0, INT_MAX, },
- { "packet_ver_flag", &battle_config.packet_ver_flag, 0x7FFFFFFF,0, INT_MAX, },
- { "packet_ver_flag2", &battle_config.packet_ver_flag2, 0x7FFFFFFF,0, INT_MAX, },
{ "min_hair_style", &battle_config.min_hair_style, 0, 0, INT_MAX, },
{ "max_hair_style", &battle_config.max_hair_style, 23, 0, INT_MAX, },
{ "min_hair_color", &battle_config.min_hair_color, 0, 0, INT_MAX, },
@@ -8252,6 +8333,7 @@ static const struct _battle_data {
{ "homunculus_show_growth", &battle_config.homunculus_show_growth, 0, 0, 1, },
{ "homunculus_friendly_rate", &battle_config.homunculus_friendly_rate, 100, 0, INT_MAX, },
{ "vending_tax", &battle_config.vending_tax, 0, 0, 10000, },
+ { "vending_tax_min", &battle_config.vending_tax_min, 0, 0, MAX_ZENY, },
{ "day_duration", &battle_config.day_duration, 0, 0, INT_MAX, },
{ "night_duration", &battle_config.night_duration, 0, 0, INT_MAX, },
{ "mob_remove_delay", &battle_config.mob_remove_delay, 60000, 1000, INT_MAX, },
@@ -8400,6 +8482,7 @@ static const struct _battle_data {
{ "exp_cost_inspiration", &battle_config.exp_cost_inspiration, 1, 0, 100, },
{ "mvp_exp_reward_message", &battle_config.mvp_exp_reward_message, 0, 0, 1, },
{ "can_damage_skill", &battle_config.can_damage_skill, 1, 0, BL_ALL, },
+ { "reserved_costume_id", &battle_config.reserved_costume_id, 999998, 0, INT_MAX, },
{ "atcommand_levelup_events", &battle_config.atcommand_levelup_events, 0, 0, 1, },
{ "block_account_in_same_party", &battle_config.block_account_in_same_party, 1, 0, 1, },
{ "tarotcard_equal_chance", &battle_config.tarotcard_equal_chance, 0, 0, 1, },
@@ -8414,6 +8497,13 @@ static const struct _battle_data {
{ "banana_bomb_duration", &battle_config.banana_bomb_duration, 0, 0, UINT16_MAX, },
{ "guild_leaderchange_delay", &battle_config.guild_leaderchange_delay, 1440, 0, INT32_MAX, },
{ "guild_leaderchange_woe", &battle_config.guild_leaderchange_woe, 0, 0, 1, },
+ { "guild_alliance_onlygm", &battle_config.guild_alliance_onlygm, 0, 0, 1, },
+ { "feature.achievement", &battle_config.feature_achievement, 1, 0, 1, },
+ { "allow_bound_sell", &battle_config.allow_bound_sell, 0, 0, 0x3, },
+ { "event_refine_chance", &battle_config.event_refine_chance, 0, 0, 1, },
+ { "autoloot_adjust", &battle_config.autoloot_adjust, 0, 0, 1, },
+ { "broadcast_hide_name", &battle_config.broadcast_hide_name, 2, 0, NAME_LENGTH, },
+ { "skill_drop_items_full", &battle_config.skill_drop_items_full, 0, 0, 1, },
#include "../custom/battle_config_init.inc"
};
@@ -8504,7 +8594,7 @@ void battle_adjust_conf()
#if PACKETVER > 20120000 && PACKETVER < 20130515 /* Exact date (when it started) not known */
if (battle_config.feature_auction) {
- ShowWarning("conf/battle/feature.conf:feature.auction is enabled but it is not stable on PACKETVER "EXPAND_AND_QUOTE(PACKETVER)", disabling...\n");
+ ShowWarning("conf/battle/feature.conf:feature.auction is enabled but it is not stable on PACKETVER " EXPAND_AND_QUOTE(PACKETVER) ", disabling...\n");
ShowWarning("conf/battle/feature.conf:feature.auction change value to '2' to silence this warning and maintain it enabled\n");
battle_config.feature_auction = 0;
}
@@ -8537,6 +8627,13 @@ void battle_adjust_conf()
}
#endif
+#if PACKETVER < 20150513
+ if (battle_config.feature_achievement) {
+ ShowWarning("conf/battle/feature.conf achievement is enabled but it requires PACKETVER 2015-05-13 or newer, disabling...\n");
+ battle_config.feature_achievement = 0;
+ }
+#endif
+
#ifndef CELL_NOSTACK
if (battle_config.custom_cell_stack_limit != 1)
ShowWarning("Battle setting 'custom_cell_stack_limit' takes no effect as this server was compiled without Cell Stack Limit support.\n");
@@ -8590,7 +8687,7 @@ int battle_config_read(const char* cfgName)
*--------------------------*/
void do_init_battle(void)
{
- delay_damage_ers = ers_new(sizeof(struct delay_damage),"battle.c::delay_damage_ers",ERS_OPT_CLEAR);
+ delay_damage_ers = ers_new(sizeof(struct delay_damage),"battle.cpp::delay_damage_ers",ERS_OPT_CLEAR);
add_timer_func_list(battle_delay_damage_sub, "battle_delay_damage_sub");
}
diff --git a/src/map/battle.h b/src/map/battle.hpp
similarity index 97%
rename from src/map/battle.h
rename to src/map/battle.hpp
index 1f11a667b5e..b8f36aaf000 100644
--- a/src/map/battle.h
+++ b/src/map/battle.hpp
@@ -1,30 +1,35 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _BATTLE_H_
-#define _BATTLE_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef _BATTLE_HPP_
+#define _BATTLE_HPP_
+#include "../common/cbasetypes.h"
#include "../common/mmo.h"
+
#include "../config/core.h"
-#include "clif.h" // e_damage_type
-#include "map.h" //ELE_MAX
+
+#include "map.hpp" //ELE_MAX
+
+//fwd declaration
+struct map_session_data;
+struct mob_data;
+struct block_list;
+enum e_damage_type : uint8;
+
/// State of a single attack attempt; used in flee/def penalty calculations when mobbed
-typedef enum damage_lv {
+enum damage_lv : uint8 {
ATK_NONE, /// Not an attack
ATK_LUCKY, /// Attack was lucky-dodged
ATK_FLEE, /// Attack was dodged
ATK_MISS, /// Attack missed because of element/race modifier.
ATK_BLOCK, /// Attack was blocked by some skills.
ATK_DEF /// Attack connected
-} damage_lv;
+};
/// Flag of the final calculation
-enum e_battle_flag {
+enum e_battle_flag : uint16 {
BF_WEAPON = 0x0001, /// Weapon attack
BF_MAGIC = 0x0002, /// Magic attack
BF_MISC = 0x0004, /// Misc attack
@@ -41,7 +46,7 @@ enum e_battle_flag {
};
/// Battle check target [Skotlex]
-enum e_battle_check_target {
+enum e_battle_check_target : uint32 {
BCT_NOONE = 0x000000, ///< No one
BCT_SELF = 0x010000, ///< Self
BCT_ENEMY = 0x020000, ///< Enemy
@@ -80,10 +85,6 @@ struct Damage {
//(Used in read pc.c,) attribute table (battle_attr_fix)
extern int attr_fix_table[4][ELE_MAX][ELE_MAX];
-struct map_session_data;
-struct mob_data;
-struct block_list;
-
// Damage Calculation
struct Damage battle_calc_attack(int attack_type,struct block_list *bl,struct block_list *target,uint16 skill_id,uint16 skill_lv,int flag);
@@ -106,6 +107,8 @@ int64 battle_calc_bg_damage(struct block_list *src,struct block_list *bl,int64 d
void battle_damage(struct block_list *src, struct block_list *target, int64 damage, int delay, uint16 skill_lv, uint16 skill_id, enum damage_lv dmg_lv, unsigned short attack_type, bool additional_effects, unsigned int tick, bool spdamage);
int battle_delay_damage (unsigned int tick, int amotion, struct block_list *src, struct block_list *target, int attack_type, uint16 skill_id, uint16 skill_lv, int64 damage, enum damage_lv dmg_lv, int ddelay, bool additional_effects, bool spdamage);
+int battle_calc_chorusbonus(struct map_session_data *sd);
+
// Summary normal attack treatment (basic attack)
enum damage_lv battle_weapon_attack( struct block_list *bl,struct block_list *target,unsigned int tick,int flag);
@@ -135,7 +138,7 @@ bool is_infinite_defense(struct block_list *target, int flag);
#define MIN_BODY_STYLE battle_config.min_body_style
#define MAX_BODY_STYLE battle_config.max_body_style
-extern struct Battle_Config
+struct Battle_Config
{
int warp_point_debug;
int enable_critical;
@@ -313,6 +316,7 @@ extern struct Battle_Config
int vending_max_value;
int vending_over_max;
int vending_tax;
+ int vending_tax_min;
int show_steal_in_same_party;
int party_share_type;
int party_hp_mode;
@@ -347,6 +351,7 @@ extern struct Battle_Config
int multi_level_up;
int max_exp_gain_rate; //Max amount of exp bar % you can get in one go.
int pk_mode;
+ int pk_mode_mes;
int pk_level_range;
int manner_system; // end additions [Valaris]
@@ -373,8 +378,6 @@ extern struct Battle_Config
int day_duration; // added by [Yor]
int night_duration; // added by [Yor]
int ban_hack_trade; // added by [Yor]
- int packet_ver_flag; // added by [Yor]
- int packet_ver_flag2; // expend of packet_ver_flag
int min_hair_style; // added by [MouseJstr]
int max_hair_style; // added by [MouseJstr]
@@ -615,6 +618,7 @@ extern struct Battle_Config
int exp_cost_inspiration;
int mvp_exp_reward_message;
int can_damage_skill; //Which BL types can damage traps
+ int reserved_costume_id;
int atcommand_levelup_events;
int block_account_in_same_party;
int tarotcard_equal_chance; //Official or equal chance for each card
@@ -629,9 +633,18 @@ extern struct Battle_Config
int banana_bomb_duration;
int guild_leaderchange_delay;
int guild_leaderchange_woe;
+ int guild_alliance_onlygm;
+ int feature_achievement;
+ int allow_bound_sell;
+ int event_refine_chance;
+ int autoloot_adjust;
+ int broadcast_hide_name;
+ int skill_drop_items_full;
#include "../custom/battle_config_struct.inc"
-} battle_config;
+};
+
+extern struct Battle_Config battle_config;
void do_init_battle(void);
void do_final_battle(void);
@@ -647,8 +660,4 @@ struct block_list* battle_getenemyarea(struct block_list *src, int x, int y, int
**/
int battle_damage_area( struct block_list *bl, va_list ap);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _BATTLE_H_ */
+#endif /* _BATTLE_HPP_ */
diff --git a/src/map/battleground.c b/src/map/battleground.cpp
similarity index 96%
rename from src/map/battleground.c
rename to src/map/battleground.cpp
index 5ad56ab2a42..6d11dbac06f 100644
--- a/src/map/battleground.c
+++ b/src/map/battleground.cpp
@@ -1,6 +1,8 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "battleground.hpp"
+
#include "../common/cbasetypes.h"
#include "../common/timer.h"
#include "../common/malloc.h"
@@ -8,14 +10,15 @@
#include "../common/showmsg.h"
#include "../common/strlib.h"
-#include "battleground.h"
-#include "battle.h"
-#include "clif.h"
-#include "npc.h"
-#include "pc.h"
-#include "pet.h"
-#include "homunculus.h"
-#include "mercenary.h"
+#include "battle.hpp"
+#include "clif.hpp"
+#include "npc.hpp"
+#include "pc.hpp"
+#include "pet.hpp"
+#include "homunculus.hpp"
+#include "mercenary.hpp"
+#include "guild.hpp"
+#include "mob.hpp"
static DBMap* bg_team_db; // int bg_id -> struct battleground_data*
static unsigned int bg_team_counter = 0; // Next bg_id
diff --git a/src/map/battleground.h b/src/map/battleground.hpp
similarity index 88%
rename from src/map/battleground.h
rename to src/map/battleground.hpp
index de46675ba28..507428320f6 100644
--- a/src/map/battleground.h
+++ b/src/map/battleground.hpp
@@ -1,15 +1,11 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _BATTLEGROUND_H_
-#define _BATTLEGROUND_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef _BATTLEGROUND_HPP_
+#define _BATTLEGROUND_HPP_
+#include "../common/cbasetypes.h"
#include "../common/mmo.h" // struct party
-#include "guild.h"
#define MAX_BG_MEMBERS 30
@@ -46,8 +42,4 @@ int bg_team_warp(int bg_id, unsigned short mapindex, short x, short y);
int bg_member_respawn(struct map_session_data *sd);
int bg_send_message(struct map_session_data *sd, const char *mes, int len);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _BATTLEGROUND_H_ */
+#endif /* _BATTLEGROUND_HPP_ */
diff --git a/src/map/buyingstore.c b/src/map/buyingstore.cpp
similarity index 97%
rename from src/map/buyingstore.c
rename to src/map/buyingstore.cpp
index 154e0e30db6..039b223fc31 100644
--- a/src/map/buyingstore.c
+++ b/src/map/buyingstore.cpp
@@ -1,21 +1,25 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "buyingstore.hpp" // struct s_buyingstore
+
+#include <stdlib.h> // atoi
+
#include "../common/nullpo.h"
#include "../common/db.h" // ARR_FIND
#include "../common/malloc.h" // aMalloc, aFree
#include "../common/showmsg.h" // ShowWarning
#include "../common/socket.h" // RBUF*
#include "../common/strlib.h" // safestrncpy
-#include "atcommand.h" // msg_txt
-#include "battle.h" // battle_config.*
-#include "buyingstore.h" // struct s_buyingstore
-#include "clif.h" // clif_buyingstore_*
-#include "log.h" // log_pick_pc, log_zeny
-#include "pc.h" // struct map_session_data
-#include "chrif.h"
+#include "../common/timer.h" // gettick
-#include <stdlib.h> // atoi
+#include "atcommand.hpp" // msg_txt
+#include "battle.hpp" // battle_config.*
+#include "clif.hpp" // clif_buyingstore_*
+#include "log.hpp" // log_pick_pc, log_zeny
+#include "pc.hpp" // struct map_session_data
+#include "chrif.hpp"
+#include "npc.hpp"
//Autotrader
static DBMap *buyingstore_autotrader_db; /// Holds autotrader info: char_id -> struct s_autotrader
@@ -628,7 +632,7 @@ void buyingstore_reopen( struct map_session_data* sd ){
// Immediate save
chrif_save(sd, CSAVE_AUTOTRADE);
- ShowInfo("Buyingstore loaded for '"CL_WHITE"%s"CL_RESET"' with '"CL_WHITE"%d"CL_RESET"' items at "CL_WHITE"%s (%d,%d)"CL_RESET"\n",
+ ShowInfo("Buyingstore loaded for '" CL_WHITE "%s" CL_RESET "' with '" CL_WHITE "%d" CL_RESET "' items at " CL_WHITE "%s (%d,%d)" CL_RESET "\n",
sd->status.name, count, mapindex_id2name(sd->mapindex), sd->bl.x, sd->bl.y);
}
aFree(data);
@@ -641,7 +645,7 @@ void buyingstore_reopen( struct map_session_data* sd ){
}
if (fail != 0) {
- ShowError("buyingstore_reopen: (Error:%d) Load failed for autotrader '"CL_WHITE"%s"CL_RESET"' (CID=%/AID=%d)\n", fail, sd->status.name, sd->status.char_id, sd->status.account_id);
+ ShowError("buyingstore_reopen: (Error:%d) Load failed for autotrader '" CL_WHITE "%s" CL_RESET "' (CID=%/AID=%d)\n", fail, sd->status.name, sd->status.char_id, sd->status.account_id);
map_quit(sd);
}
}
@@ -742,7 +746,7 @@ void do_init_buyingstore_autotrade( void ) {
}
dbi_destroy(iter);
- ShowStatus("Done loading '"CL_WHITE"%d"CL_RESET"' buyingstore autotraders with '"CL_WHITE"%d"CL_RESET"' items.\n", db_size(buyingstore_autotrader_db), items);
+ ShowStatus("Done loading '" CL_WHITE "%d" CL_RESET "' buyingstore autotraders with '" CL_WHITE "%d" CL_RESET "' items.\n", db_size(buyingstore_autotrader_db), items);
}
}
diff --git a/src/map/buyingstore.h b/src/map/buyingstore.hpp
similarity index 92%
rename from src/map/buyingstore.h
rename to src/map/buyingstore.hpp
index 985adf17293..812a50212ab 100644
--- a/src/map/buyingstore.h
+++ b/src/map/buyingstore.hpp
@@ -1,14 +1,15 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _BUYINGSTORE_H_
-#define _BUYINGSTORE_H_
+#ifndef _BUYINGSTORE_HPP_
+#define _BUYINGSTORE_HPP_
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "../common/cbasetypes.h"
+
+#include "map.hpp" //MESSAGE_SIZE
struct s_search_store_search;
+struct map_session_data;
#define MAX_BUYINGSTORE_SLOTS 5
@@ -68,8 +69,4 @@ void do_init_buyingstore(void);
void do_init_buyingstore_autotrade( void );
void buyingstore_reopen( struct map_session_data* sd );
-#ifdef __cplusplus
-}
-#endif
-
-#endif // _BUYINGSTORE_H_
+#endif // _BUYINGSTORE_HPP_
diff --git a/src/map/cashshop.c b/src/map/cashshop.cpp
similarity index 96%
rename from src/map/cashshop.c
rename to src/map/cashshop.cpp
index b8e45369366..10001153291 100644
--- a/src/map/cashshop.c
+++ b/src/map/cashshop.cpp
@@ -1,15 +1,19 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "cashshop.hpp"
+
+#include <string.h> // memset
+#include <stdlib.h> // atoi
+
#include "../common/cbasetypes.h" // uint16, uint32
#include "../common/malloc.h" // CREATE, RECREATE, aFree
#include "../common/showmsg.h" // ShowWarning, ShowStatus
-#include "cashshop.h"
-#include "pet.h" // pet_create_egg
-
-#include <string.h> // memset
-#include <stdlib.h> // atoi
+#include "pc.hpp" // s_map_session_data
+#include "pet.hpp" // pet_create_egg
+#include "clif.hpp"
+#include "log.hpp"
struct cash_item_db cash_shop_items[CASHSHOP_TAB_MAX];
#if PACKETVER_SUPPORTS_SALES
@@ -71,7 +75,7 @@ static bool cashshop_parse_dbrow(char* fields[], int columns, int current) {
static void cashshop_read_db_txt( void ){
const char* dbsubpath[] = {
"",
- "/"DBIMPORT,
+ "/" DBIMPORT,
};
int fi;
@@ -90,7 +94,7 @@ static void cashshop_read_db_txt( void ){
safesnprintf(dbsubpath2,n1,"%s%s",db_path,dbsubpath[fi]);
}
- sv_readdb(dbsubpath2, "item_cash_db.txt", ',', 3, 3, -1, &cashshop_parse_dbrow, fi);
+ sv_readdb(dbsubpath2, "item_cash_db.txt", ',', 3, 3, -1, &cashshop_parse_dbrow, fi > 0);
aFree(dbsubpath1);
aFree(dbsubpath2);
@@ -113,8 +117,10 @@ static int cashshop_read_db_sql( void ){
continue;
}
+
while( SQL_SUCCESS == Sql_NextRow( mmysql_handle ) ){
char* str[3];
+ char dummy[256] = "";
int i;
++lines;
@@ -123,7 +129,7 @@ static int cashshop_read_db_sql( void ){
Sql_GetData( mmysql_handle, i, &str[i], NULL );
if( str[i] == NULL ){
- str[i] = "";
+ str[i] = dummy;
}
}
@@ -137,7 +143,7 @@ static int cashshop_read_db_sql( void ){
Sql_FreeResult( mmysql_handle );
- ShowStatus( "Done reading '"CL_WHITE"%lu"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", count, cash_db_name[fi] );
+ ShowStatus( "Done reading '" CL_WHITE "%lu" CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'.\n", count, cash_db_name[fi] );
}
return 0;
@@ -203,6 +209,7 @@ static void sale_read_db_sql( void ){
while( SQL_SUCCESS == Sql_NextRow(mmysql_handle) ){
char* str[4];
+ char dummy[256] = "";
int i;
lines++;
@@ -211,7 +218,7 @@ static void sale_read_db_sql( void ){
Sql_GetData( mmysql_handle, i, &str[i], NULL );
if( str[i] == NULL ){
- str[i] = "";
+ str[i] = dummy;
}
}
@@ -225,7 +232,7 @@ static void sale_read_db_sql( void ){
Sql_FreeResult(mmysql_handle);
- ShowStatus( "Done reading '"CL_WHITE"%lu"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", count, sales_table );
+ ShowStatus( "Done reading '" CL_WHITE "%lu" CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'.\n", count, sales_table );
}
static int sale_end_timer( int tid, unsigned int tick, int id, intptr_t data ){
diff --git a/src/map/cashshop.h b/src/map/cashshop.hpp
similarity index 92%
rename from src/map/cashshop.h
rename to src/map/cashshop.hpp
index 2bdba0f55a7..fcf355f1def 100644
--- a/src/map/cashshop.h
+++ b/src/map/cashshop.hpp
@@ -1,15 +1,15 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _CASHSHOP_H_
-#define _CASHSHOP_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef _CASHSHOP_HPP_
+#define _CASHSHOP_HPP_
#include "../common/cbasetypes.h" // uint16, uint32
-#include "pc.h" // struct map_session_data
+#include "../common/timer.h" // ShowWarning, ShowStatus
+
+#include "../config/core.h"
+
+struct map_session_data;
void do_init_cashshop( void );
void do_final_cashshop( void );
@@ -96,8 +96,4 @@ bool sale_remove_item(uint16 nameid);
void sale_notify_login( struct map_session_data* sd );
#endif
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _CASHSHOP_H_ */
+#endif /* _CASHSHOP_HPP_ */
diff --git a/src/map/channel.c b/src/map/channel.cpp
similarity index 98%
rename from src/map/channel.c
rename to src/map/channel.cpp
index dc8bbcef907..d4a42fd30de 100644
--- a/src/map/channel.c
+++ b/src/map/channel.cpp
@@ -1,19 +1,25 @@
// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "channel.hpp"
+
+#include <stdlib.h>
+
#include "../common/cbasetypes.h"
#include "../common/malloc.h"
#include "../common/conf.h" //libconfig
#include "../common/showmsg.h"
-#include "../common/nullpo.h"
#include "../common/strlib.h" //safestrncpy
#include "../common/socket.h" //set_eof
+#include "../common/timer.h" // DIFF_TICK
+#include "../common/nullpo.h"
-#include "map.h" //msg_conf
-#include "clif.h" //clif_chsys_msg
-#include "channel.h"
-
-#include <stdlib.h>
+#include "map.hpp" //msg_conf
+#include "clif.hpp" //clif_chsys_msg
+#include "pc.hpp"
+#include "guild.hpp"
+#include "pc_groups.hpp"
+#include "battle.hpp"
static DBMap* channel_db; // channels
@@ -39,7 +45,7 @@ struct Channel* channel_create(struct Channel *tmp_chan) {
CREATE(channel, struct Channel, 1); //will exit on fail allocation
//channel->id = tmp_chan->id;
channel->users = idb_alloc(DB_OPT_BASE);
- channel->banned = idb_alloc(DB_OPT_BASE|DB_OPT_RELEASE_DATA);
+ channel->banned = idb_alloc(static_cast<DBOptions>(DB_OPT_BASE|DB_OPT_RELEASE_DATA) );
channel->opt = tmp_chan->opt;
channel->type = tmp_chan->type;
channel->color = tmp_chan->color;
@@ -115,6 +121,7 @@ struct Channel* channel_create_simple(char *name, char *pass, enum Channel_Type
tmp_chan.opt = channel_config.private_channel.opt;
tmp_chan.msg_delay = channel_config.private_channel.delay;
tmp_chan.color = channel_config.private_channel.color;
+ tmp_chan.char_id = owner;
break;
default:
return NULL;
@@ -562,7 +569,7 @@ int channel_pc_haschan(struct map_session_data *sd, struct Channel *channel){
* void: List of public channel and map and guild and number of users
* @return 0 on success or -1 on failure
*/
-int channel_display_list(struct map_session_data *sd, char *options){
+int channel_display_list(struct map_session_data *sd, const char *options){
if(!sd || !options)
return -1;
@@ -943,11 +950,12 @@ int channel_pcban(struct map_session_data *sd, char *chname, char *pname, int fl
if (channel->char_id != sd->status.char_id) {
sprintf(output, msg_txt(sd,1412), chname);// You're not the owner of channel '%s'.
clif_displaymessage(sd->fd, output);
+ return -1;
} else if (!channel_config.private_channel.ban) {
sprintf(output, msg_txt(sd,765), chname); // You're not allowed to ban a player.
clif_displaymessage(sd->fd, output);
+ return -1;
}
- return -1;
}
if(flag != 2 && flag != 3){
@@ -974,7 +982,7 @@ int channel_pcban(struct map_session_data *sd, char *chname, char *pname, int fl
if( !db_size(channel->banned) ) {
sprintf(output, msg_txt(sd,1439), chname);// Channel '%s' contains no banned players.
clif_displaymessage(sd->fd, output);
- return -1;
+ return 0;
}
}
@@ -1459,7 +1467,7 @@ void channel_read_config(void) {
}
}
- ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' channels in '"CL_WHITE"%s"CL_RESET"'.\n", db_size(channel_db), channel_conf);
+ ShowStatus("Done reading '" CL_WHITE "%d" CL_RESET "' channels in '" CL_WHITE "%s" CL_RESET "'.\n", db_size(channel_db), channel_conf);
config_destroy(&channels_conf);
}
}
@@ -1468,7 +1476,7 @@ void channel_read_config(void) {
* Initialise db and read configuration
*/
void do_init_channel(void) {
- channel_db = stridb_alloc(DB_OPT_DUP_KEY|DB_OPT_RELEASE_DATA, CHAN_NAME_LENGTH);
+ channel_db = stridb_alloc(static_cast<DBOptions>(DB_OPT_DUP_KEY|DB_OPT_RELEASE_DATA), CHAN_NAME_LENGTH);
memset(&channel_config.private_channel, 0, sizeof(struct Channel));
memset(&channel_config.ally_tmpl, 0, sizeof(struct Channel));
memset(&channel_config.map_tmpl, 0, sizeof(struct Channel));
diff --git a/src/map/channel.h b/src/map/channel.hpp
similarity index 95%
rename from src/map/channel.h
rename to src/map/channel.hpp
index 2ac96c7b4d7..438d9da609f 100644
--- a/src/map/channel.h
+++ b/src/map/channel.hpp
@@ -4,11 +4,14 @@
#ifndef CHANNEL_H
#define CHANNEL_H
-#include "pc.h"
+#include "../common/cbasetypes.h"
+#include "../common/mmo.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
+//namespace rA {
+
+struct map_session_data;
+struct guild;
+struct DBMap;
#define CHAN_NAME_LENGTH 20
#define CHAN_MSG_LENGTH 150
@@ -55,7 +58,8 @@ struct Channel {
struct chan_banentry {
uint32 char_id;
char char_name[NAME_LENGTH];
-} chan_banentry;
+};
+extern chan_banentry chan_banentry;
struct Channel_Config {
unsigned long *colors; ///< List of available colors
@@ -105,7 +109,7 @@ struct Channel* channel_name2channel(char *chname, struct map_session_data *sd,
int channel_haspc(struct Channel *channel,struct map_session_data *sd);
int channel_haspcbanned(struct Channel *channel,struct map_session_data *sd);
int channel_pc_haschan(struct map_session_data *sd, struct Channel *channel);
-int channel_display_list(struct map_session_data *sd, char *option);
+int channel_display_list(struct map_session_data *sd, const char *option);
void channel_autojoin(struct map_session_data *sd);
bool channel_pccheckgroup(struct Channel *channel, int group_id);
@@ -124,8 +128,4 @@ int channel_pcsetopt(struct map_session_data *sd, char *chname, const char *opti
void do_init_channel(void);
void do_final_channel(void);
-#ifdef __cplusplus
-}
-#endif
-
#endif /* CHANNEL_H */
diff --git a/src/map/chat.c b/src/map/chat.cpp
similarity index 95%
rename from src/map/chat.c
rename to src/map/chat.cpp
index 3cbc904b9f6..1ba3d65cbe5 100644
--- a/src/map/chat.c
+++ b/src/map/chat.cpp
@@ -1,20 +1,25 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "chat.hpp"
+
+#include <cstring>
+
#include "../common/cbasetypes.h"
#include "../common/malloc.h"
#include "../common/nullpo.h"
#include "../common/showmsg.h"
#include "../common/strlib.h"
#include "../common/mmo.h"
-#include "map.h"
-#include "atcommand.h" // msg_txt()
-#include "battle.h" // struct battle_config
-#include "clif.h"
-#include "npc.h" // npc_event_do()
-#include "pc.h"
-#include "chat.h"
+#include "map.hpp"
+#include "atcommand.hpp" // msg_txt()
+#include "battle.hpp" // struct battle_config
+#include "clif.hpp"
+#include "npc.hpp" // npc_event_do()
+#include "pc.hpp"
+#include "pc_groups.hpp"
+#include "achievement.hpp"
int chat_triggerevent(struct chat_data *cd); // forward declaration
@@ -102,6 +107,11 @@ int chat_createpcchat(struct map_session_data* sd, const char* title, const char
pc_stop_attack(sd);
clif_createchat(sd,0);
clif_dispchat(cd,0);
+
+ if (status_isdead(&sd->bl))
+ achievement_update_objective(sd, AG_CHAT_DYING, 1, 1);
+ else
+ achievement_update_objective(sd, AG_CHAT_CREATE, 1, 1);
} else
clif_createchat(sd,1);
@@ -162,6 +172,9 @@ int chat_joinchat(struct map_session_data* sd, int chatid, const char* pass)
clif_addchat(cd, sd); //Reports To the person who already in the chat
clif_dispchat(cd, 0); //Reported number of changes to the people around
+ if (cd->owner->type == BL_PC)
+ achievement_update_objective(map_id2sd(cd->owner->id), AG_CHAT_COUNT, 1, cd->users);
+
chat_triggerevent(cd); //Event
return 0;
diff --git a/src/map/chat.h b/src/map/chat.hpp
similarity index 91%
rename from src/map/chat.h
rename to src/map/chat.hpp
index 4666c55b046..b69697d6323 100644
--- a/src/map/chat.h
+++ b/src/map/chat.hpp
@@ -1,14 +1,10 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _CHAT_H_
-#define _CHAT_H_
+#ifndef _CHAT_HPP_
+#define _CHAT_HPP_
-#include "map.h" // struct block_list, CHATROOM_TITLE_SIZE
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "map.hpp" // struct block_list, CHATROOM_TITLE_SIZE
struct map_session_data;
struct chat_data;
@@ -47,8 +43,4 @@ int chat_npckickall(struct chat_data* cd);
int chat_npckickchat(struct chat_data* cd, const char* kickusername);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _CHAT_H_ */
+#endif /* _CHAT_HPP_ */
diff --git a/src/map/chrif.c b/src/map/chrif.cpp
similarity index 97%
rename from src/map/chrif.c
rename to src/map/chrif.cpp
index aeaa14e6a73..82c1a523468 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.cpp
@@ -1,6 +1,11 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "chrif.hpp"
+
+#include <cstdlib>
+#include <cstring>
+
#include "../common/cbasetypes.h"
#include "../common/malloc.h"
#include "../common/socket.h"
@@ -10,23 +15,23 @@
#include "../common/strlib.h"
#include "../common/ers.h"
-#include "map.h"
-#include "battle.h"
-#include "clan.h"
-#include "clif.h"
-#include "intif.h"
-#include "npc.h"
-#include "pc.h"
-#include "pet.h"
-#include "homunculus.h"
-#include "instance.h"
-#include "mercenary.h"
-#include "elemental.h"
-#include "chrif.h"
-#include "script.h" // script_config
-#include "storage.h"
-
-#include <stdlib.h>
+#include "map.hpp"
+#include "battle.hpp"
+#include "clan.hpp"
+#include "clif.hpp"
+#include "intif.hpp"
+#include "npc.hpp"
+#include "pc.hpp"
+#include "pc_groups.hpp"
+#include "pet.hpp"
+#include "homunculus.hpp"
+#include "instance.hpp"
+#include "mercenary.hpp"
+#include "elemental.hpp"
+#include "script.hpp" // script_config
+#include "storage.hpp"
+#include "guild.hpp"
+#include "log.hpp"
static int check_connect_char_server(int tid, unsigned int tick, int id, intptr_t data);
@@ -36,7 +41,7 @@ static bool char_init_done = false; //server already initialized? Used for Inter
static const int packet_len_table[0x3d] = { // U - used, F - free
60, 3,-1,-1,10,-1, 6,-1, // 2af8-2aff: U->2af8, U->2af9, U->2afa, U->2afb, U->2afc, U->2afd, U->2afe, U->2aff
- 6,-1,19, 7,-1,39,30, 10, // 2b00-2b07: U->2b00, U->2b01, U->2b02, U->2b03, U->2b04, U->2b05, U->2b06, U->2b07
+ 6,-1,18, 7,-1,39,30, 10, // 2b00-2b07: U->2b00, U->2b01, U->2b02, U->2b03, U->2b04, U->2b05, U->2b06, U->2b07
6,30, 10, -1,86, 7,44,34, // 2b08-2b0f: U->2b08, U->2b09, U->2b0a, U->2b0b, U->2b0c, U->2b0d, U->2b0e, U->2b0f
11,10,10, 0,11, -1,266,10, // 2b10-2b17: U->2b10, U->2b11, U->2b12, F->2b13, U->2b14, U->2b15, U->2b16, U->2b17
2,10, 2,-1,-1,-1, 2, 7, // 2b18-2b1f: U->2b18, U->2b19, U->2b1a, U->2b1b, U->2b1c, U->2b1d, U->2b1e, U->2b1f
@@ -261,7 +266,7 @@ int chrif_setip(const char* ip) {
safestrncpy(char_ip_str, ip, sizeof(char_ip_str));
- ShowInfo("Char Server IP Address : '"CL_WHITE"%s"CL_RESET"' -> '"CL_WHITE"%s"CL_RESET"'.\n", ip, ip2str(char_ip, ip_str));
+ ShowInfo("Char Server IP Address : '" CL_WHITE "%s" CL_RESET "' -> '" CL_WHITE "%s" CL_RESET "'.\n", ip, ip2str(char_ip, ip_str));
return 1;
}
@@ -362,6 +367,8 @@ int chrif_save(struct map_session_data *sd, int flag) {
elemental_save(sd->ed);
if( sd->save_quest )
intif_quest_save(sd);
+ if (sd->achievement_data.save)
+ intif_achievement_save(sd);
return 0;
}
@@ -455,7 +462,7 @@ int chrif_changemapserver(struct map_session_data* sd, uint32 ip, uint16 port) {
chrif_check(-1);
- WFIFOHEAD(char_fd,35);
+ WFIFOHEAD(char_fd,39);
WFIFOW(char_fd, 0) = 0x2b05;
WFIFOL(char_fd, 2) = sd->bl.id;
WFIFOL(char_fd, 6) = sd->login_id1;
@@ -508,7 +515,7 @@ int chrif_connectack(int fd) {
exit(EXIT_FAILURE);
}
- ShowStatus("Successfully logged on to Char Server (Connection: '"CL_WHITE"%d"CL_RESET"').\n",fd);
+ ShowStatus("Successfully logged on to Char Server (Connection: '" CL_WHITE "%d" CL_RESET "').\n",fd);
chrif_state = 1;
chrif_connected = 1;
@@ -606,14 +613,14 @@ int chrif_sendmapack(int fd) {
// Server name
memcpy(wisp_server_name, RFIFOP(fd,5), NAME_LENGTH);
- ShowStatus("Map-server connected to char-server '"CL_WHITE"%s"CL_RESET"'.\n", wisp_server_name);
+ ShowStatus("Map-server connected to char-server '" CL_WHITE "%s" CL_RESET "'.\n", wisp_server_name);
// Default map
memcpy(map_default.mapname, RFIFOP(fd, (offs+=NAME_LENGTH)), MAP_NAME_LENGTH);
map_default.x = RFIFOW(fd, (offs+=MAP_NAME_LENGTH));
map_default.y = RFIFOW(fd, (offs+=2));
if (battle_config.etc_log)
- ShowInfo("Received default map from char-server '"CL_WHITE"%s %d,%d"CL_RESET"'.\n", map_default.mapname, map_default.x, map_default.y);
+ ShowInfo("Received default map from char-server '" CL_WHITE "%s %d,%d" CL_RESET "'.\n", map_default.mapname, map_default.x, map_default.y);
chrif_on_ready();
@@ -696,7 +703,7 @@ void chrif_authok(int fd) {
login_id2 = RFIFOL(fd,12);
expiration_time = (time_t)(int32)RFIFOL(fd,16);
group_id = RFIFOL(fd,20);
- changing_mapservers = (RFIFOB(fd,24));
+ changing_mapservers = (RFIFOB(fd,24)) > 0;
status = (struct mmo_charstatus*)RFIFOP(fd,25);
char_id = status->char_id;
@@ -809,14 +816,13 @@ int chrif_charselectreq(struct map_session_data* sd, uint32 s_ip) {
chrif_check(-1);
- WFIFOHEAD(char_fd,19);
+ WFIFOHEAD(char_fd,18);
WFIFOW(char_fd, 0) = 0x2b02;
WFIFOL(char_fd, 2) = sd->bl.id;
WFIFOL(char_fd, 6) = sd->login_id1;
WFIFOL(char_fd,10) = sd->login_id2;
WFIFOL(char_fd,14) = htonl(s_ip);
- WFIFOB(char_fd,18) = sd->packet_ver;
- WFIFOSET(char_fd,19);
+ WFIFOSET(char_fd,18);
return 0;
}
@@ -1270,7 +1276,7 @@ int chrif_recvfamelist(int fd) {
total += num;
- ShowInfo("Received Fame List of '"CL_WHITE"%d"CL_RESET"' characters.\n", total);
+ ShowInfo("Received Fame List of '" CL_WHITE "%d" CL_RESET "' characters.\n", total);
return 0;
}
@@ -1999,7 +2005,7 @@ void do_init_chrif(void) {
}
auth_db = idb_alloc(DB_OPT_BASE);
- auth_db_ers = ers_new(sizeof(struct auth_node),"chrif.c::auth_db_ers",ERS_OPT_NONE);
+ auth_db_ers = ers_new(sizeof(struct auth_node),"chrif.cpp::auth_db_ers",ERS_OPT_NONE);
add_timer_func_list(check_connect_char_server, "check_connect_char_server");
add_timer_func_list(auth_db_cleanup, "auth_db_cleanup");
diff --git a/src/map/chrif.h b/src/map/chrif.hpp
similarity index 96%
rename from src/map/chrif.h
rename to src/map/chrif.hpp
index 70c5149f61a..c58a36d8118 100644
--- a/src/map/chrif.h
+++ b/src/map/chrif.hpp
@@ -1,16 +1,16 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _CHRIF_H_
-#define _CHRIF_H_
+#ifndef _CHRIF_HPP_
+#define _CHRIF_HPP_
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <time.h>
#include "../common/cbasetypes.h"
#include "../common/socket.h" // enum chrif_req_op
-#include <time.h>
+
+//fwd declaration
+struct map_session_data;
enum sd_state { ST_LOGIN, ST_LOGOUT, ST_MAPCHANGE };
@@ -92,8 +92,4 @@ void do_init_chrif(void);
int chrif_flush_fifo(void);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _CHRIF_H_ */
+#endif /* _CHRIF_HPP_ */
diff --git a/src/map/clan.c b/src/map/clan.cpp
similarity index 94%
rename from src/map/clan.c
rename to src/map/clan.cpp
index a6cf75c216b..d2480f8c47e 100644
--- a/src/map/clan.c
+++ b/src/map/clan.cpp
@@ -1,18 +1,22 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "clan.hpp"
+
+#include <string.h> //memset
+
#include "../common/cbasetypes.h"
#include "../common/mmo.h"
#include "../common/malloc.h"
#include "../common/nullpo.h"
#include "../common/showmsg.h"
-#include "clan.h"
-#include "clif.h"
-#include "intif.h"
-#include "pc.h"
-#include "script.h"
-#include "status.h"
+#include "clif.hpp"
+#include "intif.hpp"
+#include "pc.hpp"
+#include "script.hpp"
+#include "status.hpp"
+#include "log.hpp"
static DBMap* clan_db; // int clan_id -> struct clan*
@@ -47,7 +51,7 @@ void clan_load_clandata( int count, struct clan* clans ){
j++;
}
- ShowStatus( "Received '"CL_WHITE"%d"CL_RESET"' clans from char-server.\n", j );
+ ShowStatus( "Received '" CL_WHITE "%d" CL_RESET "' clans from char-server.\n", j );
}
struct clan* clan_search( int id ){
diff --git a/src/map/clan.h b/src/map/clan.h
deleted file mode 100644
index c3b70e0abd2..00000000000
--- a/src/map/clan.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder
-
-#ifndef _CLAN_H_
- #define _CLAN_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
- #include "../common/mmo.h"
- #include "status.h"
-
- void do_init_clan();
- void do_final_clan();
- struct clan* clan_search( int id );
- struct clan* clan_searchname( const char* name );
- void clan_load_clandata( int count, struct clan* clans );
- void clan_member_joined( struct map_session_data* sd );
- void clan_member_left( struct map_session_data* sd );
- bool clan_member_join( struct map_session_data *sd, int clan_id, uint32 account_id, uint32 char_id );
- bool clan_member_leave( struct map_session_data* sd, int clan_id, uint32 account_id, uint32 char_id );
- void clan_send_message( struct map_session_data *sd, const char *mes, int len );
- void clan_recv_message(int clan_id,uint32 account_id,const char *mes,int len);
- struct map_session_data* clan_getavailablesd( struct clan* clan );
- int clan_get_alliance_count( struct clan *clan, int flag );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/map/clan.hpp b/src/map/clan.hpp
new file mode 100644
index 00000000000..54c85ec60f5
--- /dev/null
+++ b/src/map/clan.hpp
@@ -0,0 +1,26 @@
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
+#ifndef _CLAN_HPP_
+#define _CLAN_HPP_
+
+#include "../common/mmo.h"
+
+struct clan;
+struct map_session_data;
+
+void do_init_clan();
+void do_final_clan();
+struct clan* clan_search( int id );
+struct clan* clan_searchname( const char* name );
+void clan_load_clandata( int count, struct clan* clans );
+void clan_member_joined( struct map_session_data* sd );
+void clan_member_left( struct map_session_data* sd );
+bool clan_member_join( struct map_session_data *sd, int clan_id, uint32 account_id, uint32 char_id );
+bool clan_member_leave( struct map_session_data* sd, int clan_id, uint32 account_id, uint32 char_id );
+void clan_send_message( struct map_session_data *sd, const char *mes, int len );
+void clan_recv_message(int clan_id,uint32 account_id,const char *mes,int len);
+struct map_session_data* clan_getavailablesd( struct clan* clan );
+int clan_get_alliance_count( struct clan *clan, int flag );
+
+#endif /* CLAN_H */
diff --git a/src/map/clif.c b/src/map/clif.cpp
similarity index 89%
rename from src/map/clif.c
rename to src/map/clif.cpp
index dddc4a4b6cf..eda5cb46346 100644
--- a/src/map/clif.c
+++ b/src/map/clif.cpp
@@ -1,6 +1,14 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "clif.hpp"
+
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cstdarg>
+#include <ctime>
+
#include "../common/cbasetypes.h"
#include "../common/socket.h"
#include "../common/timer.h"
@@ -14,62 +22,49 @@
#include "../common/ers.h"
#include "../common/conf.h"
-#include "map.h"
-#include "chrif.h"
-#include "pc.h"
-#include "status.h"
-#include "npc.h"
-#include "itemdb.h"
-#include "chat.h"
-#include "trade.h"
-#include "storage.h"
-#include "script.h"
-#include "skill.h"
-#include "atcommand.h"
-#include "intif.h"
-#include "battle.h"
-#include "battleground.h"
-#include "mob.h"
-#include "party.h"
-#include "unit.h"
-#include "guild.h"
-#include "vending.h"
-#include "pet.h"
-#include "homunculus.h"
-#include "instance.h"
-#include "mercenary.h"
-#include "elemental.h"
-#include "log.h"
-#include "clif.h"
-#include "mail.h"
-#include "quest.h"
-#include "cashshop.h"
-#include "channel.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <time.h>
+#include "map.hpp"
+#include "chrif.hpp"
+#include "pc.hpp"
+#include "pc_groups.hpp"
+#include "status.hpp"
+#include "npc.hpp"
+#include "itemdb.hpp"
+#include "chat.hpp"
+#include "trade.hpp"
+#include "storage.hpp"
+#include "script.hpp"
+#include "skill.hpp"
+#include "atcommand.hpp"
+#include "intif.hpp"
+#include "battle.hpp"
+#include "battleground.hpp"
+#include "mob.hpp"
+#include "party.hpp"
+#include "unit.hpp"
+#include "guild.hpp"
+#include "vending.hpp"
+#include "pet.hpp"
+#include "homunculus.hpp"
+#include "instance.hpp"
+#include "mercenary.hpp"
+#include "elemental.hpp"
+#include "log.hpp"
+#include "clif.hpp"
+#include "mail.hpp"
+#include "quest.hpp"
+#include "cashshop.hpp"
+#include "channel.hpp"
+#include "achievement.hpp"
+#include "clan.hpp"
/* for clif_clearunit_delayed */
static struct eri *delay_clearunit_ers;
-//#define DUMP_UNKNOWN_PACKET
-//#define DUMP_INVALID_PACKET
+struct s_packet_db packet_db[MAX_PACKET_DB + 1];
+int packet_db_ack[MAX_ACK_FUNC + 1];
+unsigned long color_table[COLOR_MAX];
-struct Clif_Config {
- int packet_db_ver; //Preferred packet version.
- int connect_cmd[MAX_PACKET_VER + 1]; //Store the connect command for all versions. [Skotlex]
-} clif_config;
-
-struct s_packet_db packet_db[MAX_PACKET_VER + 1][MAX_PACKET_DB + 1];
-int packet_db_ack[MAX_PACKET_VER + 1][MAX_ACK_FUNC + 1];
-#ifdef PACKET_OBFUSCATION
-static struct s_packet_keys *packet_keys[MAX_PACKET_VER + 1];
-static unsigned int clif_cryptKey[3]; // Used keys
-#endif
-static unsigned short clif_parse_cmd(int fd, struct map_session_data *sd);
+#include "clif_obfuscation.hpp"
static bool clif_session_isValid(struct map_session_data *sd);
#if PACKETVER >= 20150513
@@ -83,7 +78,7 @@ enum mail_type {
/** Converts item type to display it on client if necessary.
* @param nameid: Item ID
-* @return item type. For IT_PETEGG will be displayed as IT_WEAPON. If Shadow Weapon of IT_SHADOWGEAR as IT_WEAPON and else as IT_ARMOR
+* @return item type. For IT_PETEGG will be displayed as IT_ARMOR. If Shadow Weapon of IT_SHADOWGEAR as IT_WEAPON and else as IT_ARMOR
*/
static inline int itemtype(unsigned short nameid) {
struct item_data* id = itemdb_search(nameid); //Use itemdb_search, so non-existance item will use dummy data and won't crash the server. bugreport:8468
@@ -94,7 +89,7 @@ static inline int itemtype(unsigned short nameid) {
else
return IT_ARMOR;
}
- return ( type == IT_PETEGG ) ? IT_WEAPON : type;
+ return ( type == IT_PETEGG ) ? IT_ARMOR : type;
}
@@ -222,7 +217,7 @@ int clif_setip(const char* ip) {
}
safestrncpy(map_ip_str, ip, sizeof(map_ip_str));
- ShowInfo("Map Server IP Address : '"CL_WHITE"%s"CL_RESET"' -> '"CL_WHITE"%s"CL_RESET"'.\n", ip, ip2str(map_ip, ip_str));
+ ShowInfo("Map Server IP Address : '" CL_WHITE "%s" CL_RESET "' -> '" CL_WHITE "%s" CL_RESET "'.\n", ip, ip2str(map_ip, ip_str));
return 1;
}
@@ -231,7 +226,7 @@ void clif_setbindip(const char* ip)
bind_ip = host2ip(ip);
if (bind_ip) {
char ip_str[16];
- ShowInfo("Map Server Bind IP Address : '"CL_WHITE"%s"CL_RESET"' -> '"CL_WHITE"%s"CL_RESET"'.\n", ip, ip2str(bind_ip, ip_str));
+ ShowInfo("Map Server Bind IP Address : '" CL_WHITE "%s" CL_RESET "' -> '" CL_WHITE "%s" CL_RESET "'.\n", ip, ip2str(bind_ip, ip_str));
} else {
ShowWarning("Failed to Resolve Map Server Address! (%s)\n", ip);
}
@@ -295,9 +290,7 @@ static inline unsigned char clif_bl_type(struct block_list *bl) {
#endif
static bool clif_session_isValid(struct map_session_data *sd) {
- if (sd != NULL && sd->packet_ver <= MAX_PACKET_VER && session_isActive(sd->fd))
- return true;
- return false;
+ return ( sd != NULL && session_isActive(sd->fd) );
}
/*==========================================
@@ -373,10 +366,8 @@ static int clif_send_sub(struct block_list *bl, va_list ap)
return 0;
}
- if (packet_db[sd->packet_ver][RBUFW(buf,0)].len) { // packet must exist for the client version
- memcpy(WFIFOP(fd,0), buf, len);
- WFIFOSET(fd,len);
- }
+ memcpy(WFIFOP(fd,0), buf, len);
+ WFIFOSET(fd,len);
return 0;
}
@@ -404,14 +395,10 @@ int clif_send(const uint8* buf, int len, struct block_list* bl, enum send_target
case ALL_CLIENT: //All player clients.
iter = mapit_getallusers();
- while( (tsd = (TBL_PC*)mapit_next(iter)) != NULL )
- {
- if( packet_db[tsd->packet_ver][RBUFW(buf,0)].len )
- { // packet must exist for the client version
- WFIFOHEAD(tsd->fd, len);
- memcpy(WFIFOP(tsd->fd,0), buf, len);
- WFIFOSET(tsd->fd,len);
- }
+ while( (tsd = (TBL_PC*)mapit_next(iter)) != NULL ){
+ WFIFOHEAD(tsd->fd, len);
+ memcpy(WFIFOP(tsd->fd, 0), buf, len);
+ WFIFOSET(tsd->fd, len);
}
mapit_free(iter);
break;
@@ -420,8 +407,7 @@ int clif_send(const uint8* buf, int len, struct block_list* bl, enum send_target
iter = mapit_getallusers();
while( (tsd = (TBL_PC*)mapit_next(iter)) != NULL )
{
- if( bl->m == tsd->bl.m && packet_db[tsd->packet_ver][RBUFW(buf,0)].len )
- { // packet must exist for the client version
+ if( bl->m == tsd->bl.m ){
WFIFOHEAD(tsd->fd, len);
memcpy(WFIFOP(tsd->fd,0), buf, len);
WFIFOSET(tsd->fd,len);
@@ -458,13 +444,10 @@ int clif_send(const uint8* buf, int len, struct block_list* bl, enum send_target
for(i = 0; i < cd->users; i++) {
if (type == CHAT_WOS && cd->usersd[i] == sd)
continue;
- if (packet_db[cd->usersd[i]->packet_ver][RBUFW(buf,0)].len) { // packet must exist for the client version
- if ((fd=cd->usersd[i]->fd) >0 && session[fd]) // Added check to see if session exists [PoW]
- {
- WFIFOHEAD(fd,len);
- memcpy(WFIFOP(fd,0), buf, len);
- WFIFOSET(fd,len);
- }
+ if ((fd=cd->usersd[i]->fd) >0 && session[fd]){ // Added check to see if session exists [PoW]
+ WFIFOHEAD(fd,len);
+ memcpy(WFIFOP(fd,0), buf, len);
+ WFIFOSET(fd,len);
}
}
}
@@ -500,12 +483,9 @@ int clif_send(const uint8* buf, int len, struct block_list* bl, enum send_target
if( (type == PARTY_AREA || type == PARTY_AREA_WOS) && (sd->bl.x < x0 || sd->bl.y < y0 || sd->bl.x > x1 || sd->bl.y > y1) )
continue;
- if( packet_db[sd->packet_ver][RBUFW(buf,0)].len )
- { // packet must exist for the client version
- WFIFOHEAD(fd,len);
- memcpy(WFIFOP(fd,0), buf, len);
- WFIFOSET(fd,len);
- }
+ WFIFOHEAD(fd, len);
+ memcpy(WFIFOP(fd, 0), buf, len);
+ WFIFOSET(fd, len);
}
if (!enable_spy) //Skip unnecessary parsing. [Skotlex]
break;
@@ -513,8 +493,7 @@ int clif_send(const uint8* buf, int len, struct block_list* bl, enum send_target
iter = mapit_getallusers();
while( (tsd = (TBL_PC*)mapit_next(iter)) != NULL )
{
- if( tsd->partyspy == p->party.party_id && packet_db[tsd->packet_ver][RBUFW(buf,0)].len )
- { // packet must exist for the client version
+ if( tsd->partyspy == p->party.party_id ){
WFIFOHEAD(tsd->fd, len);
memcpy(WFIFOP(tsd->fd,0), buf, len);
WFIFOSET(tsd->fd,len);
@@ -533,8 +512,7 @@ int clif_send(const uint8* buf, int len, struct block_list* bl, enum send_target
{
if( type == DUEL_WOS && bl->id == tsd->bl.id )
continue;
- if( sd->duel_group == tsd->duel_group && packet_db[tsd->packet_ver][RBUFW(buf,0)].len )
- { // packet must exist for the client version
+ if( sd->duel_group == tsd->duel_group ){
WFIFOHEAD(tsd->fd, len);
memcpy(WFIFOP(tsd->fd,0), buf, len);
WFIFOSET(tsd->fd,len);
@@ -544,7 +522,7 @@ int clif_send(const uint8* buf, int len, struct block_list* bl, enum send_target
break;
case SELF:
- if (sd && (fd=sd->fd) && packet_db[sd->packet_ver][RBUFW(buf,0)].len) { // packet must exist for the client version
+ if (sd && (fd=sd->fd)) {
WFIFOHEAD(fd,len);
memcpy(WFIFOP(fd,0), buf, len);
WFIFOSET(fd,len);
@@ -585,12 +563,9 @@ int clif_send(const uint8* buf, int len, struct block_list* bl, enum send_target
if( (type == GUILD_AREA || type == GUILD_AREA_WOS) && (sd->bl.x < x0 || sd->bl.y < y0 || sd->bl.x > x1 || sd->bl.y > y1) )
continue;
- if( packet_db[sd->packet_ver][RBUFW(buf,0)].len )
- { // packet must exist for the client version
- WFIFOHEAD(fd,len);
- memcpy(WFIFOP(fd,0), buf, len);
- WFIFOSET(fd,len);
- }
+ WFIFOHEAD(fd,len);
+ memcpy(WFIFOP(fd,0), buf, len);
+ WFIFOSET(fd,len);
}
}
if (!enable_spy) //Skip unnecessary parsing. [Skotlex]
@@ -599,8 +574,7 @@ int clif_send(const uint8* buf, int len, struct block_list* bl, enum send_target
iter = mapit_getallusers();
while( (tsd = (TBL_PC*)mapit_next(iter)) != NULL )
{
- if( tsd->guildspy == g->guild_id && packet_db[tsd->packet_ver][RBUFW(buf,0)].len )
- { // packet must exist for the client version
+ if( tsd->guildspy == g->guild_id ){
WFIFOHEAD(tsd->fd, len);
memcpy(WFIFOP(tsd->fd,0), buf, len);
WFIFOSET(tsd->fd,len);
@@ -632,12 +606,9 @@ int clif_send(const uint8* buf, int len, struct block_list* bl, enum send_target
continue;
if( (type == BG_AREA || type == BG_AREA_WOS) && (sd->bl.x < x0 || sd->bl.y < y0 || sd->bl.x > x1 || sd->bl.y > y1) )
continue;
- if( packet_db[sd->packet_ver][RBUFW(buf,0)].len )
- { // packet must exist for the client version
- WFIFOHEAD(fd,len);
- memcpy(WFIFOP(fd,0), buf, len);
- WFIFOSET(fd,len);
- }
+ WFIFOHEAD(fd,len);
+ memcpy(WFIFOP(fd,0), buf, len);
+ WFIFOSET(fd,len);
}
}
break;
@@ -650,11 +621,9 @@ int clif_send(const uint8* buf, int len, struct block_list* bl, enum send_target
continue;
}
- if( packet_db[sd->packet_ver][RBUFW(buf,0)].len ){ // packet must exist for the client version
- WFIFOHEAD(fd,len);
- memcpy(WFIFOP(fd,0), buf, len);
- WFIFOSET(fd,len);
- }
+ WFIFOHEAD(fd,len);
+ memcpy(WFIFOP(fd,0), buf, len);
+ WFIFOSET(fd,len);
}
if (!enable_spy) //Skip unnecessary parsing. [Skotlex]
@@ -662,8 +631,7 @@ int clif_send(const uint8* buf, int len, struct block_list* bl, enum send_target
iter = mapit_getallusers();
while ((tsd = (TBL_PC*)mapit_next(iter)) != NULL){
- if (tsd->clanspy == clan->id && packet_db[tsd->packet_ver][RBUFW(buf, 0)].len)
- { // packet must exist for the client version
+ if (tsd->clanspy == clan->id){
WFIFOHEAD(tsd->fd, len);
memcpy(WFIFOP(tsd->fd, 0), buf, len);
WFIFOSET(tsd->fd, len);
@@ -1092,7 +1060,7 @@ static int clif_set_unit_idle(struct block_list* bl, unsigned char* buffer, bool
WBUFW(buf,24) = vd->head_top;
WBUFW(buf,26) = vd->head_mid;
- if( bl->type == BL_NPC && vd->class_ == FLAG_CLASS )
+ if( bl->type == BL_NPC && vd->class_ == JT_GUILD_FLAG )
{ //The hell, why flags work like this?
WBUFW(buf,22) = status_get_emblem_id(bl);
WBUFW(buf,24) = GetWord(status_get_guild_id(bl), 1);
@@ -1403,22 +1371,22 @@ static void clif_weather_check(struct map_session_data *sd)
|| map[m].flag.clouds2)
{
if (map[m].flag.snow)
- clif_specialeffect_single(&sd->bl, 162, fd);
+ clif_specialeffect_single(&sd->bl, EF_SNOW, fd);
if (map[m].flag.clouds)
- clif_specialeffect_single(&sd->bl, 233, fd);
+ clif_specialeffect_single(&sd->bl, EF_CLOUD3, fd);
if (map[m].flag.clouds2)
- clif_specialeffect_single(&sd->bl, 516, fd);
+ clif_specialeffect_single(&sd->bl, EF_CLOUD5, fd);
if (map[m].flag.fog)
- clif_specialeffect_single(&sd->bl, 515, fd);
+ clif_specialeffect_single(&sd->bl, EF_CLOUD4, fd);
if (map[m].flag.fireworks) {
- clif_specialeffect_single(&sd->bl, 297, fd);
- clif_specialeffect_single(&sd->bl, 299, fd);
- clif_specialeffect_single(&sd->bl, 301, fd);
+ clif_specialeffect_single(&sd->bl, EF_POKJUK, fd);
+ clif_specialeffect_single(&sd->bl, EF_THROWITEM2, fd);
+ clif_specialeffect_single(&sd->bl, EF_POKJUK_SOUND, fd);
}
if (map[m].flag.sakura)
- clif_specialeffect_single(&sd->bl, 163, fd);
+ clif_specialeffect_single(&sd->bl, EF_SAKURA, fd);
if (map[m].flag.leaves)
- clif_specialeffect_single(&sd->bl, 333, fd);
+ clif_specialeffect_single(&sd->bl, EF_MAPLE, fd);
}
}
/**
@@ -1447,7 +1415,7 @@ int clif_spawn(struct block_list *bl)
int len;
vd = status_get_viewdata(bl);
- if( !vd || vd->class_ == INVISIBLE_CLASS )
+ if( !vd || vd->class_ == JT_INVISIBLE )
return 0;
/**
@@ -1475,9 +1443,9 @@ int clif_spawn(struct block_list *bl)
if (sd->spiritball > 0)
clif_spiritball(&sd->bl);
if(sd->state.size==SZ_BIG) // tiny/big players [Valaris]
- clif_specialeffect(bl,423,AREA);
+ clif_specialeffect(bl,EF_GIANTBODY2,AREA);
else if(sd->state.size==SZ_MEDIUM)
- clif_specialeffect(bl,421,AREA);
+ clif_specialeffect(bl,EF_BABYBODY2,AREA);
if( sd->bg_id && map[sd->bl.m].flag.battleground )
clif_sendbgemblem_area(sd);
if (sd->spiritcharm_type != CHARM_TYPE_NONE && sd->spiritcharm > 0)
@@ -1492,19 +1460,20 @@ int clif_spawn(struct block_list *bl)
{
TBL_MOB *md = ((TBL_MOB*)bl);
if(md->special_state.size==SZ_BIG) // tiny/big mobs [Valaris]
- clif_specialeffect(&md->bl,423,AREA);
+ clif_specialeffect(&md->bl,EF_GIANTBODY2,AREA);
else if(md->special_state.size==SZ_MEDIUM)
- clif_specialeffect(&md->bl,421,AREA);
+ clif_specialeffect(&md->bl,EF_BABYBODY2,AREA);
}
break;
case BL_NPC:
{
TBL_NPC *nd = ((TBL_NPC*)bl);
if( nd->size == SZ_BIG )
- clif_specialeffect(&nd->bl,423,AREA);
+ clif_specialeffect(&nd->bl,EF_GIANTBODY2,AREA);
else if( nd->size == SZ_MEDIUM )
- clif_specialeffect(&nd->bl,421,AREA);
+ clif_specialeffect(&nd->bl,EF_BABYBODY2,AREA);
clif_efst_status_change_sub(bl, bl, AREA);
+ clif_progressbar_npc_area(nd);
}
break;
case BL_PET:
@@ -1754,9 +1723,9 @@ static void clif_move2(struct block_list *bl, struct view_data *vd, struct unit_
TBL_PC *sd = ((TBL_PC*)bl);
// clif_movepc(sd);
if(sd->state.size==SZ_BIG) // tiny/big players [Valaris]
- clif_specialeffect(&sd->bl,423,AREA);
+ clif_specialeffect(&sd->bl,EF_GIANTBODY2,AREA);
else if(sd->state.size==SZ_MEDIUM)
- clif_specialeffect(&sd->bl,421,AREA);
+ clif_specialeffect(&sd->bl,EF_BABYBODY2,AREA);
if (sd->status.robe)
clif_refreshlook(bl,bl->id,LOOK_ROBE,sd->status.robe,AREA);
}
@@ -1765,9 +1734,9 @@ static void clif_move2(struct block_list *bl, struct view_data *vd, struct unit_
{
TBL_MOB *md = ((TBL_MOB*)bl);
if(md->special_state.size==SZ_BIG) // tiny/big mobs [Valaris]
- clif_specialeffect(&md->bl,423,AREA);
+ clif_specialeffect(&md->bl,EF_GIANTBODY2,AREA);
else if(md->special_state.size==SZ_MEDIUM)
- clif_specialeffect(&md->bl,421,AREA);
+ clif_specialeffect(&md->bl,EF_BABYBODY2,AREA);
}
break;
case BL_PET:
@@ -1793,7 +1762,7 @@ void clif_move(struct unit_data *ud)
if (!vd )
return;
//This performance check is needed to keep GM-hidden objects from being notified to bots.
- else if( vd->class_ == INVISIBLE_CLASS ){
+ else if( vd->class_ == JT_INVISIBLE ){
// If the player was disguised we still need to update the disguised unit, since the main unit will be updated through clif_walkok
if(disguised(bl)) {
WBUFW(buf,0)=0x86;
@@ -1997,18 +1966,9 @@ void clif_selllist(struct map_session_data *sd)
{
if( sd->inventory.u.items_inventory[i].nameid > 0 && sd->inventory_data[i] )
{
- if( !itemdb_cansell(&sd->inventory.u.items_inventory[i], pc_get_group_level(sd)) )
+ if( !pc_can_sell_item(sd, &sd->inventory.u.items_inventory[i]))
continue;
- if( battle_config.hide_fav_sell && sd->inventory.u.items_inventory[i].favorite )
- continue; //Cannot sell favs [Jey]
-
- if( sd->inventory.u.items_inventory[i].expire_time || (sd->inventory.u.items_inventory[i].bound && !pc_can_give_bounded_items(sd)) )
- continue; // Cannot Sell Rental Items or Account Bounded Items
-
- if( sd->inventory.u.items_inventory[i].bound && !pc_can_give_bounded_items(sd))
- continue; // Don't allow sale of bound items
-
val=sd->inventory_data[i]->value_sell;
if( val < 0 )
continue;
@@ -2046,7 +2006,7 @@ void clif_npc_market_open(struct map_session_data *sd, struct npc_data *nd) {
if (sd->state.trading)
return;
- info = &packet_db[sd->packet_ver][cmd];
+ info = &packet_db[cmd];
if (!info || info->len == 0)
return;
@@ -2093,7 +2053,7 @@ void clif_npc_market_purchase_ack(struct map_session_data *sd, uint8 res, uint8
nullpo_retv(sd);
nullpo_retv((nd = map_id2nd(sd->npc_shopid)));
- info = &packet_db[sd->packet_ver][cmd];
+ info = &packet_db[cmd];
if (!info || info->len == 0)
return;
@@ -2137,7 +2097,7 @@ void clif_parse_NPCMarketPurchase(int fd, struct map_session_data *sd) {
if (!sd->npc_shopid)
return;
- info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ info = &packet_db[RFIFOW(fd,0)];
if (!info || info->len == 0)
return;
len = RFIFOW(fd,info->pos[0]);
@@ -2246,9 +2206,9 @@ void clif_scriptclear(struct map_session_data *sd, int npcid)
nullpo_retv(sd);
- cmd = packet_db_ack[sd->packet_ver][ZC_CLEAR_DIALOG];
+ cmd = packet_db_ack[ZC_CLEAR_DIALOG];
if(!cmd) cmd = 0x8d6; //default
- info = &packet_db[sd->packet_ver][cmd];
+ info = &packet_db[cmd];
len = info->len;
fd = sd->fd;
@@ -2493,7 +2453,7 @@ static void clif_addcards(unsigned char* buf, struct item* item)
/// Fills in part of the item buffers that calls for variable bonuses data. [Napster]
/// A maximum of 5 random options can be supported.
void clif_add_random_options(unsigned char* buf, struct item *it) {
-#if PACKETVER >= 20150226
+#if PACKETVER >= 20150225
int i;
for (i = 0; i < MAX_ITEM_RDM_OPT; i++) {
@@ -2528,7 +2488,7 @@ void clif_additem(struct map_session_data *sd, int n, int amount, unsigned char
header = 0x29a;
#elif PACKETVER < 20120925
header = 0x2d4;
-#elif PACKETVER < 20150226
+#elif PACKETVER < 20150225
header = 0x990;
#elif PACKETVER < 20160921
header = 0xa0c;
@@ -2568,7 +2528,7 @@ void clif_additem(struct map_session_data *sd, int n, int amount, unsigned char
#endif
#if PACKETVER >= 20071002
WFIFOW(fd,offs+27) = 0; // HireExpireDate
-#if PACKETVER >= 20150226
+#if PACKETVER >= 20150225
clif_add_random_options(WFIFOP(fd,offs+31), &sd->inventory.u.items_inventory[n]);
#if PACKETVER >= 20160921
WFIFOB(fd,offs+54) = 0; // Favorite
@@ -2608,7 +2568,7 @@ void clif_additem(struct map_session_data *sd, int n, int amount, unsigned char
/* Yellow color only for non-stackable item */
WFIFOW(fd,offs+27)=(sd->inventory.u.items_inventory[n].bound && !itemdb_isstackable(sd->inventory.u.items_inventory[n].nameid)) ? BOUND_DISPYELLOW : sd->inventory_data[n]->flag.bindOnEquip ? BOUND_ONEQUIP : 0;
#endif
-#if PACKETVER >= 20150226
+#if PACKETVER >= 20150225
clif_add_random_options(WFIFOP(fd,31), &sd->inventory.u.items_inventory[n]);
#if PACKETVER >= 20160921
WFIFOB(fd,offs+54) = sd->inventory.u.items_inventory[n].favorite;
@@ -2685,7 +2645,7 @@ void clif_item_sub_v5(unsigned char *buf, int n, int idx, struct item *it, struc
WBUFL(buf,n+22) = it->expire_time;
WBUFW(buf,n+26) = it->bound ? BOUND_DISPYELLOW : id->flag.bindOnEquip ? BOUND_ONEQUIP : 0; //bindOnEquipType
WBUFW(buf,n+28) = (id->equip&EQP_VISIBLE) ? id->look : 0;
-#if PACKETVER >= 20150226
+#if PACKETVER >= 20150225
//V6_ITEM_Option
WBUFB(buf,n+30) = 0; // nRandomOptionCnt
clif_add_random_options(WBUFP(buf, n+31), it);// optionData
@@ -2766,7 +2726,7 @@ void clif_inventorylist(struct map_session_data *sd) {
const int se = 26;
#elif PACKETVER < 20120925
const int se = 28;
-#elif PACKETVER < 20150226
+#elif PACKETVER < 20150225
const int se = 31;
#else
const int se = 57;
@@ -2814,7 +2774,7 @@ void clif_inventorylist(struct map_session_data *sd) {
WBUFW(bufe,0)=0xa4;
#elif PACKETVER < 20120925
WBUFW(bufe,0)=0x2d0;
-#elif PACKETVER < 20150226
+#elif PACKETVER < 20150225
WBUFW(bufe,0)=0x992;
#else
WBUFW(bufe,0)=0xa0d;
@@ -2846,7 +2806,7 @@ void clif_equiplist(struct map_session_data *sd)
const int cmd = 26;
#elif PACKETVER < 20120925
const int cmd = 28;
-#elif PACKETVER < 20150226
+#elif PACKETVER < 20150225
const int cmd = 31;
#else
const int cmd = 57;
@@ -2870,7 +2830,7 @@ void clif_equiplist(struct map_session_data *sd)
WBUFW(buf,0)=0xa4;
#elif PACKETVER < 20120925
WBUFW(buf,0)=0x2d0;
-#elif PACKETVER < 20150226
+#elif PACKETVER < 20150225
WBUFW(buf,0)=0x992;
#else
WBUFW(buf,0)=0xa0d;
@@ -2916,7 +2876,7 @@ void clif_storagelist(struct map_session_data* sd, struct item* items, int items
const int se = 28;
const int sidxe = 4;
const int cmde = 0x2d1;
-#elif PACKETVER < 20150226
+#elif PACKETVER < 20150225
const int se = 31;
const int sidxe = 4+24;
const int cmde = 0x996;
@@ -3004,7 +2964,7 @@ void clif_cartlist(struct map_session_data *sd)
const int cmd = 26;
#elif PACKETVER < 20120925
const int cmd = 28;
-#elif PACKETVER < 20150226
+#elif PACKETVER < 20150225
const int cmd = 31;
#else
const int cmd = 57;
@@ -3047,7 +3007,7 @@ void clif_cartlist(struct map_session_data *sd)
WBUFW(bufe,0)=0x122;
#elif PACKETVER < 20120925
WBUFW(bufe,0)=0x2d2;
-#elif PACKETVER < 20150226
+#elif PACKETVER < 20150225
WBUFW(bufe,0)=0x994;
#else
WBUFW(bufe,0)=0xa0f;
@@ -3181,6 +3141,7 @@ static int clif_hpmeter(struct map_session_data *sd)
/// 0121 <current count>.W <max count>.W <current weight>.L <max weight>.L (ZC_NOTIFY_CARTITEM_COUNTINFO)
/// 013a <atk range>.W (ZC_ATTACK_RANGE)
/// 0141 <status id>.L <base status>.L <plus status>.L (ZC_COUPLESTATUS)
+/// 0acb <var id>.W <value>.Q (ZC_LONGPAR_CHANGE2)
/// TODO: Extract individual packets.
/// FIXME: Packet lengths from packet_len(cmd)
void clif_updatestatus(struct map_session_data *sd,int type)
@@ -3297,6 +3258,28 @@ void clif_updatestatus(struct map_session_data *sd,int type)
WFIFOW(fd,0)=0xb1;
WFIFOL(fd,4)=sd->status.zeny;
break;
+#if PACKETVER >= 20170830
+ case SP_BASEEXP:
+ WFIFOW(fd,0)=0xacb;
+ WFIFOQ(fd,4)=sd->status.base_exp;
+ len = packet_len(0xacb);
+ break;
+ case SP_JOBEXP:
+ WFIFOW(fd,0)=0xacb;
+ WFIFOQ(fd,4)=sd->status.job_exp;
+ len = packet_len(0xacb);
+ break;
+ case SP_NEXTBASEEXP:
+ WFIFOW(fd,0)=0xacb;
+ WFIFOQ(fd,4)=pc_nextbaseexp(sd);
+ len = packet_len(0xacb);
+ break;
+ case SP_NEXTJOBEXP:
+ WFIFOW(fd,0)=0xacb;
+ WFIFOQ(fd,4)=pc_nextjobexp(sd);
+ len = packet_len(0xacb);
+ break;
+#else
case SP_BASEEXP:
WFIFOW(fd,0)=0xb1;
WFIFOL(fd,4)=sd->status.base_exp;
@@ -3313,6 +3296,7 @@ void clif_updatestatus(struct map_session_data *sd,int type)
WFIFOW(fd,0)=0xb1;
WFIFOL(fd,4)=pc_nextjobexp(sd);
break;
+#endif
/**
* SP_U<STAT> are used to update the amount of points necessary to increase that stat
@@ -3508,7 +3492,7 @@ void clif_changelook(struct block_list *bl, int type, int val) {
if (!sd)
break;
- if ( val == INVISIBLE_CLASS )
+ if ( val == JT_INVISIBLE )
return;
if (sd->sc.option&OPTION_COSTUME)
@@ -3814,8 +3798,8 @@ void clif_equipitemack(struct map_session_data *sd,int n,int pos,uint8 flag)
nullpo_retv(sd);
- cmd = packet_db_ack[sd->packet_ver][ZC_WEAR_EQUIP_ACK];
- if (!cmd || !(info = &packet_db[sd->packet_ver][cmd]) || !info->len)
+ cmd = packet_db_ack[ZC_WEAR_EQUIP_ACK];
+ if (!cmd || !(info = &packet_db[cmd]) || !info->len)
return;
fd = sd->fd;
@@ -3829,12 +3813,12 @@ void clif_equipitemack(struct map_session_data *sd,int n,int pos,uint8 flag)
switch (cmd) {
case 0xaa:
WFIFOW(fd, info->pos[1]) = pos;
- if (sd->packet_ver < date2version(20100629))
- WFIFOW(fd, info->pos[2]) = (flag == ITEM_EQUIP_ACK_OK ? 1 : 0);
- else {
- WFIFOL(fd, info->pos[2]) = look;
- WFIFOW(fd, info->pos[3]) = (flag == ITEM_EQUIP_ACK_OK ? 1 : 0);
- }
+#if PACKETVER < 20100629
+ WFIFOW(fd, info->pos[2]) = (flag == ITEM_EQUIP_ACK_OK ? 1 : 0);
+#else
+ WFIFOL(fd, info->pos[2]) = look;
+ WFIFOW(fd, info->pos[3]) = (flag == ITEM_EQUIP_ACK_OK ? 1 : 0);
+#endif
break;
case 0x8d0:
if (flag == ITEM_EQUIP_ACK_FAILLEVEL)
@@ -4343,7 +4327,7 @@ void clif_tradeadditem(struct map_session_data* sd, struct map_session_data* tsd
unsigned char *buf;
#if PACKETVER < 20100223
const int cmd = 0xe9;
-#elif PACKETVER < 20150226
+#elif PACKETVER < 20150225
const int cmd = 0x80f;
#else
const int cmd = 0xa09;
@@ -4373,7 +4357,7 @@ void clif_tradeadditem(struct map_session_data* sd, struct map_session_data* tsd
WBUFW(buf,13)= 0; //card (4w)
WBUFW(buf,15)= 0; //card (4w)
WBUFW(buf,17)= 0; //card (4w)
-#if PACKETVER >= 20150226
+#if PACKETVER >= 20150225
clif_add_random_options(WBUFP(buf, 19), &sd->inventory.u.items_inventory[index]);
#endif
}
@@ -4399,7 +4383,7 @@ void clif_tradeadditem(struct map_session_data* sd, struct map_session_data* tsd
WBUFB(buf,9) = sd->inventory.u.items_inventory[index].attribute; // attribute
WBUFB(buf,10)= sd->inventory.u.items_inventory[index].refine; //refine
clif_addcards(WBUFP(buf, 11), &sd->inventory.u.items_inventory[index]);
-#if PACKETVER >= 20150226
+#if PACKETVER >= 20150225
clif_add_random_options(WBUFP(buf, 19), &sd->inventory.u.items_inventory[index]);
#endif
}
@@ -4516,7 +4500,7 @@ void clif_storageitemadded(struct map_session_data* sd, struct item* i, int inde
{
#if PACKETVER < 5
const int cmd = 0xf4;
-#elif PACKETVER < 20150226
+#elif PACKETVER < 20150225
const int cmd = 0x1c4;
#else
const int cmd = 0xa0a;
@@ -4535,14 +4519,14 @@ void clif_storageitemadded(struct map_session_data* sd, struct item* i, int inde
WFIFOL(fd, 4) = amount; // amount
WFIFOW(fd, 8) = ( view > 0 ) ? view : i->nameid; // id
#if PACKETVER >= 5
- WFIFOB(fd,10) = itemdb_type(i->nameid); //type
+ WFIFOB(fd,10) = itemtype(i->nameid); //type
offset += 1;
#endif
WFIFOB(fd,10+offset) = i->identify; //identify flag
WFIFOB(fd,11+offset) = i->attribute; // attribute
WFIFOB(fd,12+offset) = i->refine; //refine
clif_addcards(WFIFOP(fd,13+offset), i);
-#if PACKETVER >= 20150226
+#if PACKETVER >= 20150225
clif_add_random_options(WFIFOP(fd,21+offset), i);
#endif
WFIFOSET(fd,packet_len(cmd));
@@ -4628,7 +4612,7 @@ void clif_getareachar_unit(struct map_session_data* sd,struct block_list *bl)
int len;
vd = status_get_viewdata(bl);
- if (!vd || vd->class_ == INVISIBLE_CLASS)
+ if (!vd || vd->class_ == JT_INVISIBLE)
return;
/**
@@ -4654,9 +4638,9 @@ void clif_getareachar_unit(struct map_session_data* sd,struct block_list *bl)
clif_getareachar_pc(sd, tsd);
if(tsd->state.size==SZ_BIG) // tiny/big players [Valaris]
- clif_specialeffect_single(bl,423,sd->fd);
+ clif_specialeffect_single(bl,EF_GIANTBODY2,sd->fd);
else if(tsd->state.size==SZ_MEDIUM)
- clif_specialeffect_single(bl,421,sd->fd);
+ clif_specialeffect_single(bl,EF_BABYBODY2,sd->fd);
if( tsd->bg_id && map[tsd->bl.m].flag.battleground )
clif_sendbgemblem_single(sd->fd,tsd);
if ( tsd->status.robe )
@@ -4675,19 +4659,20 @@ void clif_getareachar_unit(struct map_session_data* sd,struct block_list *bl)
if( nd->chat_id )
clif_dispchat((struct chat_data*)map_id2bl(nd->chat_id),sd->fd);
if( nd->size == SZ_BIG )
- clif_specialeffect_single(bl,423,sd->fd);
+ clif_specialeffect_single(bl,EF_GIANTBODY2,sd->fd);
else if( nd->size == SZ_MEDIUM )
- clif_specialeffect_single(bl,421,sd->fd);
+ clif_specialeffect_single(bl,EF_BABYBODY2,sd->fd);
clif_efst_status_change_sub(&sd->bl, bl, SELF);
+ clif_progressbar_npc(nd, sd);
}
break;
case BL_MOB:
{
TBL_MOB* md = (TBL_MOB*)bl;
if(md->special_state.size==SZ_BIG) // tiny/big mobs [Valaris]
- clif_specialeffect_single(bl,423,sd->fd);
+ clif_specialeffect_single(bl,EF_GIANTBODY2,sd->fd);
else if(md->special_state.size==SZ_MEDIUM)
- clif_specialeffect_single(bl,421,sd->fd);
+ clif_specialeffect_single(bl,EF_BABYBODY2,sd->fd);
#if PACKETVER >= 20120404
if (battle_config.monster_hp_bars_info && !map[bl->m].flag.hidemobhpbar) {
int i;
@@ -5167,7 +5152,7 @@ int clif_outsight(struct block_list *bl,va_list ap)
nullpo_ret(bl);
switch(bl->type){
case BL_PC:
- if(sd->vd.class_ != INVISIBLE_CLASS)
+ if(sd->vd.class_ != JT_INVISIBLE)
clif_clearunit_single(bl->id,CLR_OUTSIGHT,tsd->fd);
if(sd->chatID){
struct chat_data *cd;
@@ -5191,7 +5176,7 @@ int clif_outsight(struct block_list *bl,va_list ap)
clif_clearunit_single(bl->id,CLR_OUTSIGHT,tsd->fd);
break;
default:
- if((vd=status_get_viewdata(bl)) && vd->class_ != INVISIBLE_CLASS)
+ if((vd=status_get_viewdata(bl)) && vd->class_ != JT_INVISIBLE)
clif_clearunit_single(bl->id,CLR_OUTSIGHT,tsd->fd);
break;
}
@@ -5200,7 +5185,7 @@ int clif_outsight(struct block_list *bl,va_list ap)
nullpo_ret(tbl);
if(tbl->type == BL_SKILL) //Trap knocked out of sight
clif_clearchar_skillunit((struct skill_unit *)tbl,sd->fd);
- else if(((vd=status_get_viewdata(tbl)) && vd->class_ != INVISIBLE_CLASS) &&
+ else if(((vd=status_get_viewdata(tbl)) && vd->class_ != JT_INVISIBLE) &&
!(tbl->type == BL_NPC && (((TBL_NPC*)tbl)->sc.option&OPTION_INVISIBLE)))
clif_clearunit_single(tbl->id,CLR_OUTSIGHT,sd->fd);
}
@@ -6192,19 +6177,16 @@ void clif_displaymessage(const int fd, const char* mes)
void clif_broadcast(struct block_list* bl, const char* mes, int len, int type, enum send_target target)
{
int lp = (type&BC_COLOR_MASK) ? 4 : 0;
- unsigned char *buf = (unsigned char*)aMalloc((4 + lp + len)*sizeof(unsigned char));
+ std::unique_ptr<unsigned char> buf(new unsigned char[4+lp+len]);
- WBUFW(buf,0) = 0x9a;
- WBUFW(buf,2) = 4 + lp + len;
+ WBUFW(buf.get(),0) = 0x9a;
+ WBUFW(buf.get(),2) = 4 + lp + len;
if (type&BC_BLUE)
- WBUFL(buf,4) = 0x65756c62; //If there's "blue" at the beginning of the message, game client will display it in blue instead of yellow.
+ WBUFL(buf.get(),4) = 0x65756c62; //If there's "blue" at the beginning of the message, game client will display it in blue instead of yellow.
else if (type&BC_WOE)
- WBUFL(buf,4) = 0x73737373; //If there's "ssss", game client will recognize message as 'WoE broadcast'.
- memcpy(WBUFP(buf, 4 + lp), mes, len);
- clif_send(buf, WBUFW(buf,2), bl, target);
-
- if (buf)
- aFree(buf);
+ WBUFL(buf.get(),4) = 0x73737373; //If there's "ssss", game client will recognize message as 'WoE broadcast'.
+ memcpy(WBUFP(buf.get(), 4 + lp), mes, len);
+ clif_send(buf.get(), WBUFW(buf.get(),2), bl, target);
}
/*==========================================
@@ -6212,8 +6194,7 @@ void clif_broadcast(struct block_list* bl, const char* mes, int len, int type, e
* 008d <PacketLength>.W <GID>.L <message>.?B (ZC_NOTIFY_CHAT)
*------------------------------------------*/
void clif_GlobalMessage(struct block_list* bl, const char* message, enum send_target target) {
- char buf[8+CHAT_SIZE_MAX];
- int len;
+ size_t len;
nullpo_retv(bl);
if(!message)
@@ -6221,16 +6202,19 @@ void clif_GlobalMessage(struct block_list* bl, const char* message, enum send_ta
len = strlen(message)+1;
- if( len > sizeof(buf)-8 ) {
+ static_assert(CHAT_SIZE_MAX > 8, "CHAT_SIZE_MAX too small for packet");
+ if( len > CHAT_SIZE_MAX ) {
ShowWarning("clif_GlobalMessage: Truncating too long message '%s' (len=%d).\n", message, len);
- len = sizeof(buf)-8;
+ len = CHAT_SIZE_MAX;
}
+ std::unique_ptr<char> buf(new char[8+len]);
+
+ WBUFW(buf.get(),0)=0x8d;
+ WBUFW(buf.get(),2)=static_cast<uint16>(len+8);
+ WBUFL(buf.get(),4)=bl->id;
+ safestrncpy(WBUFCP(buf.get(),8),message,len);
- WBUFW(buf,0)=0x8d;
- WBUFW(buf,2)=len+8;
- WBUFL(buf,4)=bl->id;
- safestrncpy(WBUFCP(buf,8),message,len);
- clif_send((unsigned char *) buf,WBUFW(buf,2),bl,target);
+ clif_send((unsigned char *)buf.get(),WBUFW(buf.get(),2),bl,target);
}
@@ -6238,20 +6222,17 @@ void clif_GlobalMessage(struct block_list* bl, const char* message, enum send_ta
/// 01c3 <packet len>.W <fontColor>.L <fontType>.W <fontSize>.W <fontAlign>.W <fontY>.W <message>.?B
void clif_broadcast2(struct block_list* bl, const char* mes, int len, unsigned long fontColor, short fontType, short fontSize, short fontAlign, short fontY, enum send_target target)
{
- unsigned char *buf = (unsigned char*)aMalloc((16 + len)*sizeof(unsigned char));
+ std::unique_ptr<unsigned char> buf(new unsigned char[16+len]);
- WBUFW(buf,0) = 0x1c3;
- WBUFW(buf,2) = len + 16;
- WBUFL(buf,4) = fontColor;
- WBUFW(buf,8) = fontType;
- WBUFW(buf,10) = fontSize;
- WBUFW(buf,12) = fontAlign;
- WBUFW(buf,14) = fontY;
- memcpy(WBUFP(buf,16), mes, len);
- clif_send(buf, WBUFW(buf,2), bl, target);
-
- if (buf)
- aFree(buf);
+ WBUFW(buf.get(),0) = 0x1c3;
+ WBUFW(buf.get(),2) = len + 16;
+ WBUFL(buf.get(),4) = fontColor;
+ WBUFW(buf.get(),8) = fontType;
+ WBUFW(buf.get(),10) = fontSize;
+ WBUFW(buf.get(),12) = fontAlign;
+ WBUFW(buf.get(),14) = fontY;
+ memcpy(WBUFP(buf.get(),16), mes, len);
+ clif_send(buf.get(), WBUFW(buf.get(),2), bl, target);
}
/*
@@ -6464,8 +6445,13 @@ void clif_upgrademessage(int fd, int result, unsigned short item_id)
/// Whisper is transmitted to the destination player (ZC_WHISPER).
/// 0097 <packet len>.W <nick>.24B <message>.?B
/// 0097 <packet len>.W <nick>.24B <isAdmin>.L <message>.?B (PACKETVER >= 20091104)
-void clif_wis_message(int fd, const char* nick, const char* mes, int mes_len)
-{
+void clif_wis_message(struct map_session_data* sd, const char* nick, const char* mes, int mes_len, int gmlvl){
+ int fd;
+
+ nullpo_retv(sd);
+
+ fd = sd->fd;
+
#if PACKETVER < 20091104
WFIFOHEAD(fd, mes_len + NAME_LENGTH + 4);
WFIFOW(fd,0) = 0x97;
@@ -6480,7 +6466,11 @@ void clif_wis_message(int fd, const char* nick, const char* mes, int mes_len)
WFIFOW(fd,0) = 0x97;
WFIFOW(fd,2) = mes_len + NAME_LENGTH + 8;
safestrncpy(WFIFOCP(fd,4), nick, NAME_LENGTH);
- WFIFOL(fd,28) = (ssd && pc_get_group_level(ssd) == 99) ? 1 : 0; // isAdmin; if nonzero, also displays text above char
+ // If it is not a message from the server or a player from another map-server
+ if( ssd ){
+ gmlvl = pc_get_group_level(ssd);
+ }
+ WFIFOL(fd, 28) = (gmlvl == 99) ? 1 : 0; // isAdmin; if nonzero, also displays text above char
safestrncpy(WFIFOCP(fd,32), mes, mes_len);
WFIFOSET(fd,WFIFOW(fd,2));
#endif
@@ -6519,13 +6509,23 @@ void clif_wis_end(int fd, int result)
/// Returns character name requested by char_id (ZC_ACK_REQNAME_BYGID).
/// 0194 <char id>.L <name>.24B
+/// 0af7 <flag>.W <char id>.L <name>.24B
void clif_solved_charname(int fd, int charid, const char* name)
{
+#if PACKETVER >= 20180221
+ WFIFOHEAD(fd,packet_len(0xaf7));
+ WFIFOW(fd,0) = 0xaf7;
+ WFIFOW(fd,2) = name[0] ? 3 : 2;
+ WFIFOL(fd,4) = charid;
+ safestrncpy(WFIFOCP(fd, 8), name, NAME_LENGTH);
+ WFIFOSET(fd,packet_len(0x0af7));
+#else
WFIFOHEAD(fd,packet_len(0x194));
WFIFOW(fd,0)=0x194;
WFIFOL(fd,2)=charid;
safestrncpy(WFIFOCP(fd,6), name, NAME_LENGTH);
WFIFOSET(fd,packet_len(0x194));
+#endif
}
@@ -6798,7 +6798,7 @@ void clif_cart_additem(struct map_session_data *sd,int n,int amount,int fail)
{
#if PACKETVER < 5
const int cmd = 0x124;
-#elif PACKETVER < 20150226
+#elif PACKETVER < 20150225
const int cmd = 0x1c5;
#else
const int cmd = 0xa0b;
@@ -6830,7 +6830,7 @@ void clif_cart_additem(struct map_session_data *sd,int n,int amount,int fail)
WBUFB(buf,11+offset)=sd->cart.u.items_cart[n].attribute;
WBUFB(buf,12+offset)=sd->cart.u.items_cart[n].refine;
clif_addcards(WBUFP(buf,13+offset), &sd->cart.u.items_cart[n]);
-#if PACKETVER >= 20150226
+#if PACKETVER >= 20150225
clif_add_random_options(WBUFP(buf,21+offset), &sd->cart.u.items_cart[n]);
#endif
WFIFOSET(fd,packet_len(cmd));
@@ -6882,7 +6882,7 @@ void clif_parse_BankOpen(int fd, struct map_session_data* sd) {
return;
}
else {
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
int aid = RFIFOL(fd,info->pos[0]); //unused should we check vs fd ?
if(sd->status.account_id == aid){
sd->state.banking = 1;
@@ -6913,7 +6913,7 @@ void clif_bank_close(struct map_session_data *sd){
* 09B8 <aid>L ??? (dunno just wild guess checkme)
*/
void clif_parse_BankClose(int fd, struct map_session_data* sd) {
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
int aid = RFIFOL(fd,info->pos[0]); //unused should we check vs fd ?
nullpo_retv(sd);
@@ -6939,9 +6939,9 @@ void clif_Bank_Check(struct map_session_data* sd) {
nullpo_retv(sd);
- cmd = packet_db_ack[sd->packet_ver][ZC_BANKING_CHECK];
+ cmd = packet_db_ack[ZC_BANKING_CHECK];
if(!cmd) cmd = 0x09A6; //default
- info = &packet_db[sd->packet_ver][cmd];
+ info = &packet_db[cmd];
len = info->len;
if(!len) return; //version as packet disable
// sd->state.banking = 1; //mark opening and closing
@@ -6964,7 +6964,7 @@ void clif_parse_BankCheck(int fd, struct map_session_data* sd) {
return;
}
else {
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
int aid = RFIFOL(fd,info->pos[0]); //unused should we check vs fd ?
if(sd->status.account_id == aid) //since we have it let check it for extra security
clif_Bank_Check(sd);
@@ -6983,9 +6983,9 @@ void clif_bank_deposit(struct map_session_data *sd, enum e_BANKING_DEPOSIT_ACK r
nullpo_retv(sd);
- cmd = packet_db_ack[sd->packet_ver][ZC_ACK_BANKING_DEPOSIT];
+ cmd = packet_db_ack[ZC_ACK_BANKING_DEPOSIT];
if(!cmd) cmd = 0x09A8;
- info = &packet_db[sd->packet_ver][cmd];
+ info = &packet_db[cmd];
len = info->len;
if(!len) return; //version as packet disable
@@ -7008,7 +7008,7 @@ void clif_parse_BankDeposit(int fd, struct map_session_data* sd) {
return;
}
else {
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
int aid = RFIFOL(fd,info->pos[0]); //unused should we check vs fd ?
int money = RFIFOL(fd,info->pos[1]);
@@ -7031,9 +7031,9 @@ void clif_bank_withdraw(struct map_session_data *sd,enum e_BANKING_WITHDRAW_ACK
nullpo_retv(sd);
- cmd = packet_db_ack[sd->packet_ver][ZC_ACK_BANKING_WITHDRAW];
+ cmd = packet_db_ack[ZC_ACK_BANKING_WITHDRAW];
if(!cmd) cmd = 0x09AA;
- info = &packet_db[sd->packet_ver][cmd];
+ info = &packet_db[cmd];
len = info->len;
if(!len) return; //version as packet disable
@@ -7056,7 +7056,7 @@ void clif_parse_BankWithdraw(int fd, struct map_session_data* sd) {
return;
}
else {
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
int aid = RFIFOL(fd,info->pos[0]); //unused should we check vs fd ?
int money = RFIFOL(fd,info->pos[1]);
if(sd->status.account_id == aid){
@@ -7160,7 +7160,7 @@ void clif_vendinglist(struct map_session_data* sd, int id, struct s_vending* ven
const int offset = 12;
#endif
-#if PACKETVER < 20150226
+#if PACKETVER < 20150225
const int item_length = 22;
#elif PACKETVER < 20160921
const int item_length = 47;
@@ -7196,7 +7196,7 @@ void clif_vendinglist(struct map_session_data* sd, int id, struct s_vending* ven
WFIFOB(fd,offset+12+i*item_length) = vsd->cart.u.items_cart[index].attribute;
WFIFOB(fd,offset+13+i*item_length) = vsd->cart.u.items_cart[index].refine;
clif_addcards(WFIFOP(fd,offset+14+i*item_length), &vsd->cart.u.items_cart[index]);
-#if PACKETVER >= 20150226
+#if PACKETVER >= 20150225
clif_add_random_options(WFIFOP(fd,offset+22+i*item_length), &vsd->cart.u.items_cart[index]);
#if PACKETVER >= 20160921
WFIFOL(fd,offset+47+i*item_length) = pc_equippoint_sub(sd,data);
@@ -7258,7 +7258,7 @@ void clif_openvending(struct map_session_data* sd, int id, struct s_vending* ven
int i,fd;
int count;
-#if PACKETVER < 20150226
+#if PACKETVER < 20150225
const int item_length = 22;
#else
const int item_length = 47;
@@ -7285,7 +7285,7 @@ void clif_openvending(struct map_session_data* sd, int id, struct s_vending* ven
WFIFOB(fd,20+i*item_length) = sd->cart.u.items_cart[index].attribute;
WFIFOB(fd,21+i*item_length) = sd->cart.u.items_cart[index].refine;
clif_addcards(WFIFOP(fd,22+i*item_length), &sd->cart.u.items_cart[index]);
-#if PACKETVER >= 20150226
+#if PACKETVER >= 20150225
clif_add_random_options(WFIFOP(fd,30+i*item_length), &sd->cart.u.items_cart[index]);
#endif
}
@@ -7408,16 +7408,18 @@ void clif_party_member_info(struct party_data *p, struct map_session_data *sd)
/// 0a44 <packet len>.W <party name>.24B { <account id>.L <nick>.24B <map name>.16B <role>.B <state>.B <class>.W <base level>.W }* <item pickup rule>.B <item share rule>.B <unknown>.L
void clif_party_info(struct party_data* p, struct map_session_data *sd)
{
- unsigned char buf[2+2+NAME_LENGTH+(4+NAME_LENGTH+MAP_NAME_LENGTH_EXT+1+1)*MAX_PARTY];
struct map_session_data* party_sd = NULL;
int i, c;
#if PACKETVER < 20170502
+ const int M_SIZE = 46; // 4+NAME_LENGTH+MAP_NAME_LENGTH_EXT+1+1
+ unsigned char buf[2+2+NAME_LENGTH+46*MAX_PARTY];
int cmd = 0xfb;
- int size = 46;
#else
+ const int M_SIZE = 50; // 4+NAME_LENGTH+MAP_NAME_LENGTH_EXT+1+1+4
+ unsigned char buf[2+2+NAME_LENGTH+50*MAX_PARTY+6];
int cmd = 0xa44;
- int size = 50;
#endif
+ const int PRE_SIZE = 28; // cmd, actual cmd_size, party_name
nullpo_retv(p);
@@ -7430,24 +7432,24 @@ void clif_party_info(struct party_data* p, struct map_session_data *sd)
if(party_sd == NULL) party_sd = p->data[i].sd;
- WBUFL(buf,28+c*size) = m->account_id;
- safestrncpy(WBUFCP(buf,28+c*size+4), m->name, NAME_LENGTH);
- mapindex_getmapname_ext(mapindex_id2name(m->map), WBUFCP(buf,28+c*size+28));
- WBUFB(buf,28+c*size+44) = (m->leader) ? 0 : 1;
- WBUFB(buf,28+c*size+45) = (m->online) ? 0 : 1;
+ WBUFL(buf,PRE_SIZE+c*M_SIZE) = m->account_id;
+ safestrncpy(WBUFCP(buf,PRE_SIZE+c*M_SIZE+4), m->name, NAME_LENGTH);
+ mapindex_getmapname_ext(mapindex_id2name(m->map), WBUFCP(buf,PRE_SIZE+c*M_SIZE+PRE_SIZE));
+ WBUFB(buf,PRE_SIZE+c*M_SIZE+44) = (m->leader) ? 0 : 1;
+ WBUFB(buf,PRE_SIZE+c*M_SIZE+45) = (m->online) ? 0 : 1;
#if PACKETVER >= 20170502
- WBUFW(buf,28+c*size+46) = m->class_;
- WBUFW(buf,28+c*size+48) = m->lv;
+ WBUFW(buf,PRE_SIZE+c*M_SIZE+46) = m->class_;
+ WBUFW(buf,PRE_SIZE+c*M_SIZE+48) = m->lv;
#endif
c++;
}
#if PACKETVER < 20170502
- WBUFW(buf,2) = 28+c*size;
+ WBUFW(buf,2) = PRE_SIZE+c*M_SIZE;
#else
- WBUFB(buf,28+c*size) = (p->party.item & 1) ? 1 : 0;
- WBUFB(buf,28+c*size+1) = (p->party.item & 2) ? 1 : 0;
- WBUFL(buf,28+c*size+2) = 0; // unknown
- WBUFW(buf,2) = 28+c*size+6;
+ WBUFB(buf,PRE_SIZE+c*M_SIZE) = (p->party.item & 1) ? 1 : 0;
+ WBUFB(buf,PRE_SIZE+c*M_SIZE+1) = (p->party.item & 2) ? 1 : 0;
+ WBUFL(buf,PRE_SIZE+c*M_SIZE+2) = 0; // unknown
+ WBUFW(buf,2) = PRE_SIZE+c*M_SIZE+6;
#endif
if(sd) { // send only to self
@@ -7910,20 +7912,23 @@ void clif_send_petstatus(struct map_session_data *sd)
void clif_pet_emotion(struct pet_data *pd,int param)
{
unsigned char buf[16];
+ s_pet_db *pet_db_ptr;
nullpo_retv(pd);
+ pet_db_ptr = pd->get_pet_db();
+
memset(buf,0,packet_len(0x1aa));
WBUFW(buf,0)=0x1aa;
WBUFL(buf,2)=pd->bl.id;
- if(param >= 100 && pd->petDB->talk_convert_class) {
- if(pd->petDB->talk_convert_class < 0)
+ if(param >= 100 && pet_db_ptr->talk_convert_class) {
+ if(pet_db_ptr->talk_convert_class < 0)
return;
- else if(pd->petDB->talk_convert_class > 0) {
+ else if(pet_db_ptr->talk_convert_class > 0) {
// replace mob_id component of talk/act data
param -= (pd->pet.class_ - 100)*100;
- param += (pd->petDB->talk_convert_class - 100)*100;
+ param += (pet_db_ptr->talk_convert_class - 100)*100;
}
}
WBUFL(buf,6)=param;
@@ -9501,7 +9506,7 @@ void clif_name( struct block_list* src, struct block_list *bl, send_target targe
}
#if PACKETVER >= 20150513
- WBUFL(buf,102) = 0; // Title ID
+ WBUFL(buf,102) = sd->status.title_id; // Title ID
#endif
}
break;
@@ -9526,7 +9531,11 @@ void clif_name( struct block_list* src, struct block_list *bl, send_target targe
safestrncpy(WBUFCP(buf,6), md->name, NAME_LENGTH);
if( md->guardian_data && md->guardian_data->guild_id )
{
+#if PACKETVER >= 20150513
+ WBUFW(buf, 0) = cmd = 0xa30;
+#else
WBUFW(buf, 0) = cmd = 0x195;
+#endif
WBUFB(buf,30) = 0;
safestrncpy(WBUFCP(buf,54), md->guardian_data->guild_name, NAME_LENGTH);
safestrncpy(WBUFCP(buf,78), md->guardian_data->castle->castle_name, NAME_LENGTH);
@@ -9534,7 +9543,11 @@ void clif_name( struct block_list* src, struct block_list *bl, send_target targe
else if( battle_config.show_mob_info )
{
char mobhp[50], *str_p = mobhp;
+#if PACKETVER >= 20150513
+ WBUFW(buf, 0) = cmd = 0xa30;
+#else
WBUFW(buf, 0) = cmd = 0x195;
+#endif
if( battle_config.show_mob_info&4 )
str_p += sprintf(str_p, "Lv. %d | ", md->level);
if( battle_config.show_mob_info&1 )
@@ -9551,6 +9564,9 @@ void clif_name( struct block_list* src, struct block_list *bl, send_target targe
WBUFB(buf,78) = 0;
}
}
+#if PACKETVER >= 20150513
+ WBUFL(buf, 102) = 0; // Title ID
+#endif
}
break;
case BL_CHAT: //FIXME: Clients DO request this... what should be done about it? The chat's title may not fit... [Skotlex]
@@ -9794,7 +9810,7 @@ void clif_equipcheckbox(struct map_session_data* sd)
/// 0859 <packet len>.W <name>.24B <class>.W <hairstyle>.W <bottom-viewid>.W <mid-viewid>.W <up-viewid>.W <haircolor>.W <cloth-dye>.W <gender>.B {equip item}.28B* (ZC_EQUIPWIN_MICROSCOPE2, PACKETVER >= 20101124)
/// 0859 <packet len>.W <name>.24B <class>.W <hairstyle>.W <bottom-viewid>.W <mid-viewid>.W <up-viewid>.W <robe>.W <haircolor>.W <cloth-dye>.W <gender>.B {equip item}.28B* (ZC_EQUIPWIN_MICROSCOPE2, PACKETVER >= 20110111)
/// 0997 <packet len>.W <name>.24B <class>.W <hairstyle>.W <bottom-viewid>.W <mid-viewid>.W <up-viewid>.W <robe>.W <haircolor>.W <cloth-dye>.W <gender>.B {equip item}.31B* (ZC_EQUIPWIN_MICROSCOPE_V5, PACKETVER >= 20120925)
-/// 0a2d <packet len>.W <name>.24B <class>.W <hairstyle>.W <bottom-viewid>.W <mid-viewid>.W <up-viewid>.W <robe>.W <haircolor>.W <cloth-dye>.W <gender>.B {equip item}.57B* (ZC_EQUIPWIN_MICROSCOPE_V6, PACKETVER >= 20150226)
+/// 0a2d <packet len>.W <name>.24B <class>.W <hairstyle>.W <bottom-viewid>.W <mid-viewid>.W <up-viewid>.W <robe>.W <haircolor>.W <cloth-dye>.W <gender>.B {equip item}.57B* (ZC_EQUIPWIN_MICROSCOPE_V6, PACKETVER >= 20150225)
void clif_viewequip_ack(struct map_session_data* sd, struct map_session_data* tsd)
{
uint8* buf;
@@ -9803,7 +9819,7 @@ void clif_viewequip_ack(struct map_session_data* sd, struct map_session_data* ts
const int s = 26;
#elif PACKETVER < 20120925
const int s = 28;
-#elif PACKETVER < 20150226
+#elif PACKETVER < 20150225
const int s = 31;
#else
const int s = 57;
@@ -9819,7 +9835,7 @@ void clif_viewequip_ack(struct map_session_data* sd, struct map_session_data* ts
WBUFW(buf, 0) = 0x2d7;
#elif PACKETVER < 20120925
WBUFW(buf, 0) = 0x859;
-#elif PACKETVER < 20150226
+#elif PACKETVER < 20150225
WBUFW(buf, 0) = 0x997;
#else
WBUFW(buf, 0) = 0xa2d;
@@ -9905,7 +9921,7 @@ void clif_msg_skill(struct map_session_data* sd, uint16 skill_id, int msg_id)
/// Formats: false - <packet id>.w <packet len>.w (<name> : <message>).?B 00
/// true - <packet id>.w <packet len>.w <name>.24B <message>.?B 00
static bool clif_process_message(struct map_session_data* sd, bool whisperFormat, char* out_name, char* out_message, char* out_full_message ){
- char* seperator = " : ";
+ const char* seperator = " : ";
int fd;
struct s_packet_db* info;
uint16 packetLength, inputLength;
@@ -9914,7 +9930,7 @@ static bool clif_process_message(struct map_session_data* sd, bool whisperFormat
fd = sd->fd;
- info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ info = &packet_db[RFIFOW(fd,0)];
packetLength = RFIFOW(fd,info->pos[0]);
input = RFIFOCP(fd,info->pos[1]);
@@ -10036,8 +10052,30 @@ static bool clif_process_message(struct map_session_data* sd, bool whisperFormat
return true;
}
+/**
+ * Displays a message if the player enters a PK Zone (during pk_mode)
+ * @param sd: Player data
+ */
+inline void clif_pk_mode_message(struct map_session_data * sd)
+{
+ if (battle_config.pk_mode && battle_config.pk_mode_mes &&
+ sd && map[sd->bl.m].flag.pvp) {
+ if( (int)sd->status.base_level < battle_config.pk_min_level ) {
+ char output[CHAT_SIZE_MAX];
+ // 1504: You've entered a PK Zone (safe until level %d).
+ safesnprintf(output, CHAT_SIZE_MAX, msg_txt(sd,1504),
+ battle_config.pk_min_level);
+ clif_showscript(&sd->bl, output, SELF);
+ } else {
+ // 1503: You've entered a PK Zone.
+ clif_showscript(&sd->bl, msg_txt(sd,1503), SELF);
+ }
+ }
+ return;
+}
+
// ---------------------
-// clif_guess_PacketVer
+// clif_parse_wanttoconnect
// ---------------------
// Parses a WantToConnection packet to try to identify which is the packet version used. [Skotlex]
// error codes:
@@ -10049,73 +10087,32 @@ static bool clif_process_message(struct map_session_data* sd, bool whisperFormat
// 5 - Invalid client_tick (reserved)
// 6 - Invalid sex
// Only the first 'invalid' error that appears is used.
-static int clif_guess_PacketVer(int fd, int get_previous, int *error)
+static int clif_parse_WantToConnection_sub(int fd)
{
- static int err = 1;
- static int packet_ver = -1;
int packet_len, value; //Value is used to temporarily store account/char_id/sex
unsigned short cmd;
- if (get_previous)
- {//For quick reruns, since the normal code flow is to fetch this once to identify the packet version, then again in the wanttoconnect function. [Skotlex]
- if( error )
- *error = err;
- return packet_ver;
- }
-
//By default, start searching on the default one.
- err = 1;
- packet_ver = clif_config.packet_db_ver;
- cmd = clif_parse_cmd(fd, NULL);
+ cmd = RFIFOW(fd, 0);
packet_len = RFIFOREST(fd);
-#define SET_ERROR(n) \
- if( err == 1 )\
- err = n;\
-//define SET_ERROR
-
// FIXME: If the packet is not received at once, this will FAIL.
// Figure out, when it happens, that only part of the packet is
// received, or fix the function to be able to deal with that
// case.
-#define CHECK_PACKET_VER() \
- if( cmd != clif_config.connect_cmd[packet_ver] || packet_len != packet_db[packet_ver][cmd].len )\
- ;/* not wanttoconnection or wrong length */\
- else if( (value=(int)RFIFOL(fd, packet_db[packet_ver][cmd].pos[0])) < START_ACCOUNT_NUM || value > END_ACCOUNT_NUM )\
- { SET_ERROR(2); }/* invalid account_id */\
- else if( (value=(int)RFIFOL(fd, packet_db[packet_ver][cmd].pos[1])) <= 0 )\
- { SET_ERROR(3); }/* invalid char_id */\
- /* RFIFOL(fd, packet_db[packet_ver][cmd].pos[2]) - don't care about login_id1 */\
- /* RFIFOL(fd, packet_db[packet_ver][cmd].pos[3]) - don't care about client_tick */\
- else if( (value=(int)RFIFOB(fd, packet_db[packet_ver][cmd].pos[4])) != 0 && value != 1 )\
- { SET_ERROR(6); }/* invalid sex */\
- else\
- {\
- err = 0;\
- if( error )\
- *error = 0;\
- return packet_ver;\
- }\
-//define CHECK_PACKET_VER
-
- CHECK_PACKET_VER();//Default packet version found.
-
- for (packet_ver = MAX_PACKET_VER; packet_ver > 0; packet_ver--) { //Start guessing the version, giving priority to the newer ones. [Skotlex]
- CHECK_PACKET_VER();
- }
- if( error )
- *error = err;
- packet_ver = -1;
- return -1;
-#undef SET_ERROR
-#undef CHECK_PACKET_VER
-}
-
-// ------------
-// clif_parse_*
-// ------------
-// Parses incoming (player) connection
-
+ if( packet_len != packet_db[cmd].len )
+ return 1; /* wrong length */
+ else if( (value=(int)RFIFOL(fd, packet_db[cmd].pos[0])) < START_ACCOUNT_NUM || value > END_ACCOUNT_NUM )
+ return 2; /* invalid account_id */
+ else if( (value=(int)RFIFOL(fd, packet_db[cmd].pos[1])) <= 0 )
+ return 3; /* invalid char_id */
+ /* RFIFOL(fd, packet_db[cmd].pos[2]) - don't care about login_id1 */
+ /* RFIFOL(fd, packet_db[cmd].pos[3]) - don't care about client_tick */
+ else if( (value=(int)RFIFOB(fd, packet_db[cmd].pos[4])) != 0 && value != 1 )
+ return 6; /* invalid sex */
+ else
+ return 0;
+}
/// Request to connect to map-server.
/// 0072 <account id>.L <char id>.L <auth code>.L <client time>.L <gender>.B (CZ_ENTER)
@@ -10125,35 +10122,46 @@ void clif_parse_WantToConnection(int fd, struct map_session_data* sd)
{
struct block_list* bl;
struct auth_node* node;
- int cmd, account_id, char_id, login_id1, sex;
+ int cmd, account_id, char_id, login_id1, sex, err;
unsigned int client_tick; //The client tick is a tick, therefore it needs be unsigned. [Skotlex]
- int packet_ver; // 5: old, 6: 7july04, 7: 13july04, 8: 26july04, 9: 9aug04/16aug04/17aug04, 10: 6sept04, 11: 21sept04, 12: 18oct04, 13: 25oct04 (by [Yor])
if (sd) {
ShowError("clif_parse_WantToConnection : invalid request (character already logged in)\n");
return;
}
- // Only valid packet version get here
- packet_ver = clif_guess_PacketVer(fd, 1, NULL);
+ cmd = RFIFOW(fd, 0);
+ account_id = RFIFOL(fd, packet_db[cmd].pos[0]);
+ char_id = RFIFOL(fd, packet_db[cmd].pos[1]);
+ login_id1 = RFIFOL(fd, packet_db[cmd].pos[2]);
+ client_tick = RFIFOL(fd, packet_db[cmd].pos[3]);
+ sex = RFIFOB(fd, packet_db[cmd].pos[4]);
- cmd = RFIFOW(fd,0);
- account_id = RFIFOL(fd, packet_db[packet_ver][cmd].pos[0]);
- char_id = RFIFOL(fd, packet_db[packet_ver][cmd].pos[1]);
- login_id1 = RFIFOL(fd, packet_db[packet_ver][cmd].pos[2]);
- client_tick = RFIFOL(fd, packet_db[packet_ver][cmd].pos[3]);
- sex = RFIFOB(fd, packet_db[packet_ver][cmd].pos[4]);
-
- if( packet_ver < 5 || // reject really old client versions
- (packet_ver <= 9 && (battle_config.packet_ver_flag & 1) == 0) || // older than 6sept04
- (packet_ver > 9 && packet_ver <40 && (battle_config.packet_ver_flag & 1<<(packet_ver-9)) == 0) || // version not allowed
- (packet_ver >= 40 && packet_ver <=72 && (battle_config.packet_ver_flag2 & 1<<(packet_ver-40)) == 0) )
- {// packet version rejected
- ShowInfo("Rejected connection attempt, forbidden packet version (AID/CID: '"CL_WHITE"%d/%d"CL_RESET"', Packet Ver: '"CL_WHITE"%d"CL_RESET"', IP: '"CL_WHITE"%s"CL_RESET"').\n", account_id, char_id, packet_ver, ip2str(session[fd]->client_addr, NULL));
+ err = clif_parse_WantToConnection_sub(fd);
+
+ if( err ){ // connection rejected
+ ShowInfo("clif_parse: Disconnecting session #%d with unknown connect packet 0x%04x(length:%d)%s\n", fd, cmd, RFIFOREST(fd), (
+ err == 1 ? "." :
+ err == 2 ? ", possibly for having an invalid account_id." :
+ err == 3 ? ", possibly for having an invalid char_id." :
+ /* Uncomment when checks are added in clif_parse_WantToConnection_sub. [FlavioJS]
+ err == 4 ? ", possibly for having an invalid login_id1." :
+ err == 5 ? ", possibly for having an invalid client_tick." :
+ */
+ err == 6 ? ", possibly for having an invalid sex." :
+ ". ERROR invalid error code"));
+
WFIFOHEAD(fd,packet_len(0x6a));
WFIFOW(fd,0) = 0x6a;
- WFIFOB(fd,2) = 5; // Your Game's EXE file is not the latest version
+ WFIFOB(fd,2) = err;
WFIFOSET(fd,packet_len(0x6a));
+
+#ifdef DUMP_INVALID_PACKET
+ ShowDump(RFIFOP(fd, 0), RFIFOREST(fd));
+#endif
+
+ RFIFOSKIP(fd, RFIFOREST(fd));
+
set_eof(fd);
return;
}
@@ -10185,7 +10193,6 @@ void clif_parse_WantToConnection(int fd, struct map_session_data* sd)
CREATE(sd, TBL_PC, 1);
sd->fd = fd;
- sd->packet_ver = packet_ver;
#ifdef PACKET_OBFUSCATION
sd->cryptKey = (((((clif_cryptKey[0] * clif_cryptKey[1]) + clif_cryptKey[2]) & 0xFFFFFFFF) * clif_cryptKey[1]) + clif_cryptKey[2]) & 0xFFFFFFFF;
#endif
@@ -10502,6 +10509,8 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
// Instances do not need their own channels
if( channel_config.map_tmpl.name != NULL && (channel_config.map_tmpl.opt&CHAN_OPT_AUTOJOIN) && !map[sd->bl.m].flag.chmautojoin && !map[sd->bl.m].instance_id )
channel_mjoin(sd); //join new map
+
+ clif_pk_mode_message(sd);
} else if (sd->guild && (battle_config.guild_notice_changemap == 2 || guild_notice))
clif_guild_notice(sd); // Displays at end
@@ -10595,7 +10604,7 @@ void clif_notify_time(struct map_session_data* sd, unsigned long time)
/// There are various variants of this packet, some of them have padding between fields.
void clif_parse_TickSend(int fd, struct map_session_data *sd)
{
- sd->client_tick = RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
+ sd->client_tick = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
clif_notify_time(sd, gettick());
}
@@ -10638,7 +10647,7 @@ void clif_hotkeys_send(struct map_session_data *sd) {
/// Request to update a position on the hotkey row bar
void clif_parse_HotkeyRowShift(int fd, struct map_session_data *sd) {
int cmd = RFIFOW(fd, 0);
- sd->status.hotkey_rowshift = RFIFOB(fd, packet_db[sd->packet_ver][cmd].pos[0]);
+ sd->status.hotkey_rowshift = RFIFOB(fd, packet_db[cmd].pos[0]);
}
/// Request to update a position on the hotkey bar (CZ_SHORTCUT_KEY_CHANGE).
@@ -10646,7 +10655,7 @@ void clif_parse_HotkeyRowShift(int fd, struct map_session_data *sd) {
void clif_parse_Hotkey(int fd, struct map_session_data *sd) {
#ifdef HOTKEY_SAVING
unsigned short idx;
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
idx = RFIFOW(fd, info->pos[0]);
if (idx >= MAX_HOTKEYS) return;
@@ -10698,6 +10707,26 @@ void clif_parse_progressbar(int fd, struct map_session_data * sd)
npc_scriptcont(sd, npc_id, false);
}
+/// Displays cast-like progress bar on a NPC
+/// 09d1 <id>.L <color>.L <time>.L (ZC_PROGRESS_ACTOR)
+void clif_progressbar_npc( struct npc_data *nd, struct map_session_data* sd ){
+#if PACKETVER >= 20130821
+ unsigned char buf[14];
+
+ if( nd->progressbar.timeout > 0 ){
+ WBUFW(buf,0) = 0x9d1;
+ WBUFL(buf,2) = nd->bl.id;
+ WBUFL(buf,6) = nd->progressbar.color;
+ WBUFL(buf,10) = ( nd->progressbar.timeout - gettick() ) / 1000;
+
+ if( sd ){
+ clif_send(buf, packet_len(0x9d1), &sd->bl, SELF);
+ }else{
+ clif_send(buf, packet_len(0x9d1), &nd->bl, AREA);
+ }
+ }
+#endif
+}
/// Request to walk to a certain position on the current map.
/// 0085 <dest>.3B (CZ_REQUEST_MOVE)
@@ -10723,7 +10752,7 @@ void clif_parse_WalkToXY(int fd, struct map_session_data *sd)
if(sd->sc.data[SC_RUN] || sd->sc.data[SC_WUGDASH])
return;
- RFIFOPOS(fd, packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0], &x, &y, NULL);
+ RFIFOPOS(fd, packet_db[RFIFOW(fd,0)].pos[0], &x, &y, NULL);
//A move command one cell west is only valid if the target cell is free
if(battle_config.official_cell_stack_limit > 0
@@ -10734,6 +10763,7 @@ void clif_parse_WalkToXY(int fd, struct map_session_data *sd)
// not when you move each cell. This is official behaviour.
if (sd->sc.data[SC_CLOAKING])
skill_check_cloaking(&sd->bl, sd->sc.data[SC_CLOAKING]);
+ status_change_end(&sd->bl, SC_ROLLINGCUTTER, INVALID_TIMER); // If you move, you lose your counters. [malufett]
pc_delinvincibletimer(sd);
@@ -10769,7 +10799,7 @@ void clif_disconnect_ack(struct map_session_data* sd, short result)
void clif_parse_QuitGame(int fd, struct map_session_data *sd)
{
/* Rovert's prevent logout option fixed [Valaris] */
- //int type = RFIFOW(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
+ //int type = RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[0]);
if( !sd->sc.data[SC_CLOAKING] && !sd->sc.data[SC_HIDING] && !sd->sc.data[SC_CHASEWALK] && !sd->sc.data[SC_CLOAKINGEXCEED] && !sd->sc.data[SC_SUHIDE] &&
(!battle_config.prevent_logout || sd->canlog_tick == 0 || DIFF_TICK(gettick(), sd->canlog_tick) > battle_config.prevent_logout) )
{
@@ -10788,7 +10818,7 @@ void clif_parse_QuitGame(int fd, struct map_session_data *sd)
/// There are various variants of this packet, some of them have padding between fields.
void clif_parse_GetCharNameRequest(int fd, struct map_session_data *sd)
{
- int id = RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
+ int id = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
struct block_list* bl;
//struct status_change *sc;
@@ -10858,6 +10888,7 @@ void clif_parse_GlobalMessage(int fd, struct map_session_data* sd)
// Chat logging type 'O' / Global Chat
log_chat(LOG_CHAT_GLOBAL, 0, sd->status.char_id, sd->status.account_id, mapindex_id2name(sd->mapindex), sd->bl.x, sd->bl.y, NULL, message);
+ //achievement_update_objective(sd, AG_CHAT, 1, sd->bl.m); //! TODO: What's the official use of this achievement type?
}
@@ -10868,7 +10899,7 @@ void clif_parse_MapMove(int fd, struct map_session_data *sd)
{
char command[MAP_NAME_LENGTH_EXT+25];
char* map_name;
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
map_name = RFIFOCP(fd,info->pos[0]);
map_name[MAP_NAME_LENGTH_EXT-1]='\0';
@@ -10920,7 +10951,7 @@ void clif_changed_dir(struct block_list *bl, enum send_target target)
void clif_parse_ChangeDir(int fd, struct map_session_data *sd)
{
unsigned char headdir, dir;
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
headdir = RFIFOB(fd,info->pos[0]);
dir = RFIFOB(fd,info->pos[1]);
@@ -10936,10 +10967,10 @@ void clif_parse_ChangeDir(int fd, struct map_session_data *sd)
/// @see enum emotion_type
void clif_parse_Emotion(int fd, struct map_session_data *sd)
{
- int emoticon = RFIFOB(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
+ int emoticon = RFIFOB(fd,packet_db[RFIFOW(fd,0)].pos[0]);
if (battle_config.basic_skill_check == 0 || pc_checkskill(sd, NV_BASIC) >= 2 || pc_checkskill(sd, SU_BASIC_SKILL) >= 1) {
- if (emoticon == E_MUTE) {// prevent use of the mute emote [Valaris]
+ if (emoticon == ET_CHAT_PROHIBIT) {// prevent use of the mute emote [Valaris]
clif_skill_fail(sd, 1, USESKILL_FAIL_LEVEL, 1);
return;
}
@@ -10954,8 +10985,8 @@ void clif_parse_Emotion(int fd, struct map_session_data *sd)
if (battle_config.idletime_option&IDLE_EMOTION)
sd->idletime = last_tick;
- if(battle_config.client_reshuffle_dice && emoticon>=E_DICE1 && emoticon<=E_DICE6) {// re-roll dice
- emoticon = rnd()%6+E_DICE1;
+ if(battle_config.client_reshuffle_dice && emoticon>=ET_DICE1 && emoticon<=ET_DICE6) {// re-roll dice
+ emoticon = rnd()%6+ET_DICE1;
}
clif_emotion(&sd->bl, emoticon);
@@ -11095,7 +11126,7 @@ void clif_parse_ActionRequest_sub(struct map_session_data *sd, int action_type,
/// There are various variants of this packet, some of them have padding between fields.
void clif_parse_ActionRequest(int fd, struct map_session_data *sd)
{
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
clif_parse_ActionRequest_sub(sd,
RFIFOB(fd,info->pos[1]),
RFIFOL(fd,info->pos[0]),
@@ -11111,7 +11142,7 @@ void clif_parse_ActionRequest(int fd, struct map_session_data *sd)
/// 1 = char-select (disconnect)
void clif_parse_Restart(int fd, struct map_session_data *sd)
{
- switch(RFIFOB(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0])) {
+ switch(RFIFOB(fd,packet_db[RFIFOW(fd,0)].pos[0])) {
case 0x00:
pc_respawn(sd,CLR_OUTSIGHT);
break;
@@ -11214,7 +11245,7 @@ void clif_parse_WisMessage(int fd, struct map_session_data* sd)
// if there are 'Test' player on an other map-server and 'test' player on this map-server,
// and if we ask for 'Test', we must not contact 'test' player
// so, we send information to inter-server, which is the only one which decide (and copy correct name).
- intif_wis_message(sd, target, message, strlen(message));
+ intif_wis_message(sd, target, message, strlen(message) + 1);
return;
}
@@ -11230,7 +11261,7 @@ void clif_parse_WisMessage(int fd, struct map_session_data* sd)
// if player is autotrading
if (dstsd->state.autotrade == 1){
safesnprintf(output,sizeof(output),"%s is in autotrade mode and cannot receive whispered messages.", dstsd->status.name);
- clif_wis_message(fd, wisp_server_name, output, strlen(output) + 1);
+ clif_wis_message(sd, wisp_server_name, output, strlen(output) + 1, 0);
return;
}
@@ -11247,7 +11278,7 @@ void clif_parse_WisMessage(int fd, struct map_session_data* sd)
clif_wis_end(fd, 0); // 0: success to send wisper
// Normal message
- clif_wis_message(dstsd->fd, sd->status.name, message, strlen(message)+1 );
+ clif_wis_message(dstsd, sd->status.name, message, strlen(message)+1, 0);
}
@@ -11256,7 +11287,7 @@ void clif_parse_WisMessage(int fd, struct map_session_data* sd)
/// 0099 <packet len>.W <text>.?B 00
void clif_parse_Broadcast(int fd, struct map_session_data* sd) {
char command[CHAT_SIZE_MAX+11];
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
unsigned int len = RFIFOW(fd,info->pos[0])-4;
char* msg = RFIFOCP(fd,info->pos[1]);
@@ -11277,7 +11308,7 @@ void clif_parse_TakeItem(int fd, struct map_session_data *sd)
struct flooritem_data *fitem;
int map_object_id;
- map_object_id = RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
+ map_object_id = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
fitem = (struct flooritem_data*)map_id2bl(map_object_id);
@@ -11308,7 +11339,7 @@ void clif_parse_TakeItem(int fd, struct map_session_data *sd)
/// 0363 <index>.W <amount>.W (CZ_ITEM_THROW2)
/// There are various variants of this packet, some of them have padding between fields.
void clif_parse_DropItem(int fd, struct map_session_data *sd){
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
int item_index = RFIFOW(fd,info->pos[0]) -2;
int item_amount = RFIFOW(fd,info->pos[1]) ;
@@ -11359,7 +11390,7 @@ void clif_parse_UseItem(int fd, struct map_session_data *sd)
//Whether the item is used or not is irrelevant, the char ain't idle. [Skotlex]
if (battle_config.idletime_option&IDLE_USEITEM)
sd->idletime = last_tick;
- n = RFIFOW(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0])-2;
+ n = RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[0])-2;
if(n <0 || n >= MAX_INVENTORY)
return;
@@ -11374,7 +11405,7 @@ void clif_parse_UseItem(int fd, struct map_session_data *sd)
void clif_parse_EquipItem(int fd,struct map_session_data *sd)
{
int index;
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
if(pc_isdead(sd)) {
clif_clearunit_area(&sd->bl,CLR_DEAD);
@@ -11441,7 +11472,7 @@ void clif_parse_UnequipItem(int fd,struct map_session_data *sd)
else if (pc_cant_act2(sd))
return;
- index = RFIFOW(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0])-2;
+ index = RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[0])-2;
if (battle_config.idletime_option&IDLE_USEITEM)
sd->idletime = last_tick;
@@ -11457,7 +11488,7 @@ void clif_parse_UnequipItem(int fd,struct map_session_data *sd)
void clif_parse_NpcClicked(int fd,struct map_session_data *sd)
{
struct block_list *bl;
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
if(pc_isdead(sd)) {
clif_clearunit_area(&sd->bl,CLR_DEAD);
@@ -11489,8 +11520,16 @@ void clif_parse_NpcClicked(int fd,struct map_session_data *sd)
break;
}
#endif
- if( bl->m != -1 )// the user can't click floating npcs directly (hack attempt)
- npc_click(sd,(TBL_NPC*)bl);
+ if( bl->m != -1 ){ // the user can't click floating npcs directly (hack attempt)
+ struct npc_data* nd = (struct npc_data*)bl;
+
+ // Progressbar is running
+ if( nd->progressbar.timeout > 0 ){
+ return;
+ }
+
+ npc_click(sd,nd);
+ }
break;
}
}
@@ -11503,7 +11542,7 @@ void clif_parse_NpcClicked(int fd,struct map_session_data *sd)
/// 1 = sell
void clif_parse_NpcBuySellSelected(int fd,struct map_session_data *sd)
{
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
if (sd->state.trading)
return;
npc_buysellsel(sd,RFIFOL(fd,info->pos[0]),RFIFOB(fd,info->pos[1]));
@@ -11532,7 +11571,7 @@ void clif_npc_buy_result(struct map_session_data* sd, unsigned char result)
/// 00c8 <packet len>.W { <amount>.W <name id>.W }*
void clif_parse_NpcBuyListSend(int fd, struct map_session_data* sd)
{
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
uint16 n = (RFIFOW(fd,info->pos[0])-4) /4;
int result;
@@ -11568,7 +11607,7 @@ void clif_parse_NpcSellListSend(int fd,struct map_session_data *sd)
{
int fail=0,n;
unsigned short *item_list;
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
n = (RFIFOW(fd,info->pos[0])-4) /4; // (pktlen-(cmd+len))/listsize
item_list = (unsigned short*)RFIFOP(fd,info->pos[1]);
@@ -11590,7 +11629,7 @@ void clif_parse_NpcSellListSend(int fd,struct map_session_data *sd)
/// 1 = public
void clif_parse_CreateChatRoom(int fd, struct map_session_data* sd)
{
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
int len = RFIFOW(fd,info->pos[0])-15;
int limit = RFIFOW(fd,info->pos[1]);
bool pub = (RFIFOB(fd,info->pos[2]) != 0);
@@ -11628,7 +11667,7 @@ void clif_parse_CreateChatRoom(int fd, struct map_session_data* sd)
/// Chatroom join request (CZ_REQ_ENTER_ROOM).
/// 00d9 <chat ID>.L <passwd>.8B
void clif_parse_ChatAddMember(int fd, struct map_session_data* sd){
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
int chatid = RFIFOL(fd,info->pos[0]);
const char* password = RFIFOCP(fd,info->pos[1]); // not zero-terminated
@@ -11642,7 +11681,7 @@ void clif_parse_ChatAddMember(int fd, struct map_session_data* sd){
/// 0 = private
/// 1 = public
void clif_parse_ChatRoomStatusChange(int fd, struct map_session_data* sd){
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
int len = RFIFOW(fd,info->pos[0])-15;
int limit = RFIFOW(fd,info->pos[1]);
bool pub = (RFIFOB(fd,info->pos[2]) != 0);
@@ -11668,8 +11707,8 @@ void clif_parse_ChatRoomStatusChange(int fd, struct map_session_data* sd){
/// 1 = normal
void clif_parse_ChangeChatOwner(int fd, struct map_session_data* sd)
{
- //int role = RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
- chat_changechatowner(sd,RFIFOCP(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[1]));
+ //int role = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
+ chat_changechatowner(sd,RFIFOCP(fd,packet_db[RFIFOW(fd,0)].pos[1]));
}
@@ -11677,7 +11716,7 @@ void clif_parse_ChangeChatOwner(int fd, struct map_session_data* sd)
/// 00e2 <name>.24B
void clif_parse_KickFromChat(int fd,struct map_session_data *sd)
{
- chat_kickchat(sd,RFIFOCP(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]));
+ chat_kickchat(sd,RFIFOCP(fd,packet_db[RFIFOW(fd,0)].pos[0]));
}
@@ -11711,7 +11750,7 @@ void clif_parse_TradeRequest(int fd,struct map_session_data *sd)
{
struct map_session_data *t_sd;
- t_sd = map_id2sd(RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]));
+ t_sd = map_id2sd(RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]));
if(!sd->chatID && pc_cant_act(sd))
return; //You can trade while in a chatroom.
@@ -11752,7 +11791,7 @@ void clif_parse_TradeRequest(int fd,struct map_session_data *sd)
/// 4 = rejected
void clif_parse_TradeAck(int fd,struct map_session_data *sd)
{
- trade_tradeack(sd,RFIFOB(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]));
+ trade_tradeack(sd,RFIFOB(fd,packet_db[RFIFOW(fd,0)].pos[0]));
}
@@ -11760,7 +11799,7 @@ void clif_parse_TradeAck(int fd,struct map_session_data *sd)
/// 00e8 <index>.W <amount>.L
void clif_parse_TradeAddItem(int fd,struct map_session_data *sd)
{
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
short index = RFIFOW(fd,info->pos[0]);
int amount = RFIFOL(fd,info->pos[1]);
@@ -11808,7 +11847,7 @@ void clif_parse_StopAttack(int fd,struct map_session_data *sd)
/// 0126 <index>.W <amount>.L
void clif_parse_PutItemToCart(int fd,struct map_session_data *sd)
{
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
if (pc_istrading(sd))
return;
if (!pc_iscarton(sd))
@@ -11821,7 +11860,7 @@ void clif_parse_PutItemToCart(int fd,struct map_session_data *sd)
/// 0127 <index>.W <amount>.L
void clif_parse_GetItemFromCart(int fd,struct map_session_data *sd)
{
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
if (!pc_iscarton(sd))
return;
pc_getitemfromcart(sd,RFIFOW(fd,info->pos[0])-2,RFIFOL(fd,info->pos[1]));
@@ -11902,7 +11941,7 @@ void clif_parse_ChangeCart(int fd,struct map_session_data *sd)
}
#endif
- type = (int)RFIFOW(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
+ type = (int)RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[0]);
if(
#ifdef NEW_CARTS
@@ -11929,13 +11968,13 @@ void clif_parse_ChangeCart(int fd,struct map_session_data *sd)
/// Newer clients (2013-12-23 and newer) send the correct amount.
void clif_parse_StatusUp(int fd,struct map_session_data *sd)
{
- int increase_amount = RFIFOB(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[1]);
+ int increase_amount = RFIFOB(fd,packet_db[RFIFOW(fd,0)].pos[1]);
if( increase_amount < 0 ) {
ShowDebug("clif_parse_StatusUp: Negative 'increase' value sent by client! (fd: %d, value: %d)\n",
fd, increase_amount);
}
- pc_statusup(sd,RFIFOW(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]),increase_amount);
+ pc_statusup(sd,RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[0]),increase_amount);
}
@@ -11943,7 +11982,7 @@ void clif_parse_StatusUp(int fd,struct map_session_data *sd)
/// 0112 <skill id>.W
void clif_parse_SkillUp(int fd,struct map_session_data *sd)
{
- pc_skillup(sd,RFIFOW(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]));
+ pc_skillup(sd,RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[0]));
}
static void clif_parse_UseSkillToId_homun(struct homun_data *hd, struct map_session_data *sd, unsigned int tick, uint16 skill_id, uint16 skill_lv, int target_id)
@@ -11953,7 +11992,7 @@ static void clif_parse_UseSkillToId_homun(struct homun_data *hd, struct map_sess
if( !hd )
return;
if( skill_isNotOk_hom(hd, skill_id, skill_lv) ) {
- clif_emotion(&hd->bl, E_DOTS);
+ clif_emotion(&hd->bl, ET_THINK);
return;
}
if( hd->bl.id != target_id && skill_get_inf(skill_id)&INF_SELF_SKILL )
@@ -11961,7 +12000,7 @@ static void clif_parse_UseSkillToId_homun(struct homun_data *hd, struct map_sess
if( hd->ud.skilltimer != INVALID_TIMER ) {
if( skill_id != SA_CASTCANCEL && skill_id != SO_SPELLFIST ) return;
} else if( DIFF_TICK(tick, hd->ud.canact_tick) < 0 ) {
- clif_emotion(&hd->bl, E_DOTS);
+ clif_emotion(&hd->bl, ET_THINK);
if (hd->master)
clif_skill_fail(hd->master, skill_id, USESKILL_FAIL_SKILLINTERVAL, 0);
return;
@@ -11980,13 +12019,13 @@ static void clif_parse_UseSkillToPos_homun(struct homun_data *hd, struct map_ses
if( !hd )
return;
if( skill_isNotOk_hom(hd, skill_id, skill_lv) ) {
- clif_emotion(&hd->bl, E_DOTS);
+ clif_emotion(&hd->bl, ET_THINK);
return;
}
if( hd->ud.skilltimer != INVALID_TIMER ) {
if( skill_id != SA_CASTCANCEL && skill_id != SO_SPELLFIST ) return;
} else if( DIFF_TICK(tick, hd->ud.canact_tick) < 0 ) {
- clif_emotion(&hd->bl, E_DOTS);
+ clif_emotion(&hd->bl, ET_THINK);
if (hd->master)
clif_skill_fail(hd->master, skill_id, USESKILL_FAIL_SKILLINTERVAL, 0);
return;
@@ -12060,7 +12099,7 @@ void clif_parse_UseSkillToId(int fd, struct map_session_data *sd)
uint16 skill_id, skill_lv;
int inf,target_id;
unsigned int tick = gettick();
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
skill_lv = RFIFOW(fd,info->pos[0]);
skill_id = RFIFOW(fd,info->pos[1]);
@@ -12249,10 +12288,11 @@ static void clif_parse_UseSkillToPosSub(int fd, struct map_session_data *sd, uin
/// Request to use a ground skill.
/// 0116 <skill lv>.W <skill id>.W <x>.W <y>.W (CZ_USE_SKILL_TOGROUND)
/// 0366 <skill lv>.W <skill id>.W <x>.W <y>.W (CZ_USE_SKILL_TOGROUND2)
+/// 0AF4 <skill lv>.W <skill id>.W <x>.W <y>.W <unknown>.B (CZ_USE_SKILL_TOGROUND3)
/// There are various variants of this packet, some of them have padding between fields.
void clif_parse_UseSkillToPos(int fd, struct map_session_data *sd)
{
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
if (pc_cant_act(sd))
return;
if (pc_issit(sd))
@@ -12263,6 +12303,8 @@ void clif_parse_UseSkillToPos(int fd, struct map_session_data *sd)
RFIFOW(fd,info->pos[1]), //skill num
RFIFOW(fd,info->pos[2]), //pos x
RFIFOW(fd,info->pos[3]), //pos y
+ // TODO: find out what this is intended to do
+ //RFIFOB(fd, info->pos[4])
-1 //Skill more info.
);
}
@@ -12274,7 +12316,7 @@ void clif_parse_UseSkillToPos(int fd, struct map_session_data *sd)
/// There are various variants of this packet, some of them have padding between fields.
void clif_parse_UseSkillToPosMoreInfo(int fd, struct map_session_data *sd)
{
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
if (pc_cant_act(sd))
return;
if (pc_issit(sd))
@@ -12294,7 +12336,7 @@ void clif_parse_UseSkillToPosMoreInfo(int fd, struct map_session_data *sd)
/// 011b <skill id>.W <map name>.16B
void clif_parse_UseSkillMap(int fd, struct map_session_data* sd)
{
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
uint16 skill_id = RFIFOW(fd,info->pos[0]);
char map_name[MAP_NAME_LENGTH];
@@ -12327,7 +12369,7 @@ void clif_parse_RequestMemo(int fd,struct map_session_data *sd)
/// Answer to pharmacy item selection dialog (CZ_REQMAKINGITEM).
/// 018e <name id>.W { <material id>.W }*3
void clif_parse_ProduceMix(int fd,struct map_session_data *sd){
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
unsigned short nameid = RFIFOW(fd,info->pos[0]);
int slot1 = RFIFOW(fd,info->pos[1]);
int slot2 = RFIFOW(fd,info->pos[2]);
@@ -12365,7 +12407,7 @@ void clif_parse_ProduceMix(int fd,struct map_session_data *sd){
/// 5 = GN_MAKEBOMB
/// 6 = GN_S_PHARMACY
void clif_parse_Cooking(int fd,struct map_session_data *sd) {
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
int type = RFIFOW(fd,info->pos[0]);
unsigned short nameid = RFIFOW(fd,info->pos[1]);
int amount = sd->menuskill_val2 ? sd->menuskill_val2 : 1;
@@ -12399,11 +12441,11 @@ void clif_parse_RepairItem(int fd, struct map_session_data *sd)
clif_menuskill_clear(sd);
return;
}
- skill_repairweapon(sd,RFIFOW(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]));
- //nameid = RFIFOW(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[1]);
- //refine = RFIFOB(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[2]);
+ skill_repairweapon(sd,RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[0]));
+ //nameid = RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[1]);
+ //refine = RFIFOB(fd,packet_db[RFIFOW(fd,0)].pos[2]);
//for(i = 0; i<MAX_SLOTS; i++)
- // card[i] = RFIFOW(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[3+i]);
+ // card[i] = RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[3+i]);
clif_menuskill_clear(sd);
}
@@ -12422,7 +12464,7 @@ void clif_parse_WeaponRefine(int fd, struct map_session_data *sd)
clif_menuskill_clear(sd);
return;
}
- idx = RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
+ idx = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
skill_weaponrefine(sd, idx-2);
clif_menuskill_clear(sd);
}
@@ -12436,7 +12478,7 @@ void clif_parse_WeaponRefine(int fd, struct map_session_data *sd)
/// NOTE: If there were more than 254 items in the list, choice
/// overflows to choice%256.
void clif_parse_NpcSelectMenu(int fd,struct map_session_data *sd){
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
int npc_id = RFIFOL(fd,info->pos[0]);
uint8 select = RFIFOB(fd,info->pos[1]);
@@ -12462,14 +12504,14 @@ void clif_parse_NpcSelectMenu(int fd,struct map_session_data *sd){
/// 00b9 <npc id>.L
void clif_parse_NpcNextClicked(int fd,struct map_session_data *sd)
{
- npc_scriptcont(sd,RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]), false);
+ npc_scriptcont(sd,RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]), false);
}
/// NPC numeric input dialog value (CZ_INPUT_EDITDLG).
/// 0143 <npc id>.L <value>.L
void clif_parse_NpcAmountInput(int fd,struct map_session_data *sd){
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
int npcid = RFIFOL(fd,info->pos[0]);
int amount = (int)RFIFOL(fd,info->pos[1]);
@@ -12481,7 +12523,7 @@ void clif_parse_NpcAmountInput(int fd,struct map_session_data *sd){
/// NPC text input dialog value (CZ_INPUT_EDITDLGSTR).
/// 01d5 <packet len>.W <npc id>.L <string>.?B
void clif_parse_NpcStringInput(int fd, struct map_session_data* sd){
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
int message_len = RFIFOW(fd,info->pos[0])-8;
int npcid = RFIFOL(fd,info->pos[1]);
const char* message = RFIFOCP(fd,info->pos[2]);
@@ -12504,7 +12546,7 @@ void clif_parse_NpcCloseClicked(int fd,struct map_session_data *sd)
{
if (!sd->npc_id) //Avoid parsing anything when the script was done with. [Skotlex]
return;
- npc_scriptcont(sd, RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]), true);
+ npc_scriptcont(sd, RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]), true);
}
@@ -12513,7 +12555,7 @@ void clif_parse_NpcCloseClicked(int fd,struct map_session_data *sd)
/// index:
/// -1 = cancel
void clif_parse_ItemIdentify(int fd,struct map_session_data *sd) {
- short idx = RFIFOW(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]) - 2;
+ short idx = RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[0]) - 2;
if (sd->menuskill_id != MC_IDENTIFY)
return;
@@ -12538,7 +12580,7 @@ void clif_parse_ItemIdentify(int fd,struct map_session_data *sd) {
/// Answer to arrow crafting item selection dialog (CZ_REQ_MAKINGARROW).
/// 01ae <name id>.W
void clif_parse_SelectArrow(int fd,struct map_session_data *sd) {
- unsigned short nameid = RFIFOW(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
+ unsigned short nameid = RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[0]);
if (pc_istrading(sd)) {
//Make it fail to avoid shop exploits where you sell something different than you see.
clif_skill_fail(sd,sd->ud.skill_id,USESKILL_FAIL_LEVEL,0);
@@ -12574,7 +12616,7 @@ void clif_parse_AutoSpell(int fd,struct map_session_data *sd)
if (sd->menuskill_id != SA_AUTOSPELL)
return;
sd->state.workinprogress = WIP_DISABLE_NONE;
- skill_autospell(sd,RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]));
+ skill_autospell(sd,RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]));
clif_menuskill_clear(sd);
}
@@ -12585,7 +12627,7 @@ void clif_parse_UseCard(int fd,struct map_session_data *sd)
{
if (sd->state.trading != 0)
return;
- clif_use_card(sd,RFIFOW(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0])-2);
+ clif_use_card(sd,RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[0])-2);
}
@@ -12593,7 +12635,7 @@ void clif_parse_UseCard(int fd,struct map_session_data *sd)
/// 017c <card index>.W <equip index>.W
void clif_parse_InsertCard(int fd,struct map_session_data *sd)
{
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
if (sd->state.trading != 0)
return;
pc_insert_card(sd,RFIFOW(fd,info->pos[0])-2,RFIFOW(fd,info->pos[1])-2);
@@ -12608,7 +12650,7 @@ void clif_parse_SolveCharName(int fd, struct map_session_data *sd)
{
int charid;
- charid = RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
+ charid = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
map_reqnickdb(sd, charid);
}
@@ -12622,7 +12664,7 @@ void clif_parse_SolveCharName(int fd, struct map_session_data *sd)
void clif_parse_ResetChar(int fd, struct map_session_data *sd) {
char cmd[15];
- if( RFIFOW(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]) )
+ if( RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[0]) )
safesnprintf(cmd,sizeof(cmd),"%cresetskill",atcommand_symbol);
else
safesnprintf(cmd,sizeof(cmd),"%cresetstat",atcommand_symbol);
@@ -12636,7 +12678,7 @@ void clif_parse_ResetChar(int fd, struct map_session_data *sd) {
/// 019c <packet len>.W <text>.?B
void clif_parse_LocalBroadcast(int fd, struct map_session_data* sd)
{
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
char command[CHAT_SIZE_MAX+16];
unsigned int len = RFIFOW(fd,info->pos[0])-4;
char* msg = RFIFOCP(fd,info->pos[1]);
@@ -12656,7 +12698,7 @@ void clif_parse_LocalBroadcast(int fd, struct map_session_data* sd)
void clif_parse_MoveToKafra(int fd, struct map_session_data *sd)
{
int item_index, item_amount;
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
if (pc_istrading(sd))
return;
@@ -12683,7 +12725,7 @@ void clif_parse_MoveToKafra(int fd, struct map_session_data *sd)
void clif_parse_MoveFromKafra(int fd,struct map_session_data *sd)
{
int item_index, item_amount;
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
item_index = RFIFOW(fd,info->pos[0])-1;
item_amount = RFIFOL(fd,info->pos[1]);
@@ -12700,7 +12742,7 @@ void clif_parse_MoveFromKafra(int fd,struct map_session_data *sd)
/// Request to move an item from cart to storage (CZ_MOVE_ITEM_FROM_CART_TO_STORE).
/// 0129 <index>.W <amount>.L
void clif_parse_MoveToKafraFromCart(int fd, struct map_session_data *sd){
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
int idx = RFIFOW(fd,info->pos[0]) - 2;
int amount = RFIFOL(fd,info->pos[1]);
@@ -12722,7 +12764,7 @@ void clif_parse_MoveToKafraFromCart(int fd, struct map_session_data *sd){
/// Request to move an item from storage to cart (CZ_MOVE_ITEM_FROM_STORE_TO_CART).
/// 0128 <index>.W <amount>.L
void clif_parse_MoveFromKafraToCart(int fd, struct map_session_data *sd){
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
int idx = RFIFOW(fd,info->pos[0]) - 1;
int amount = RFIFOL(fd,info->pos[1]);
@@ -12781,7 +12823,7 @@ void clif_storagepassword(struct map_session_data* sd, short info)
/// 3 = check password
/// NOTE: This packet is only available on certain non-kRO clients.
void clif_parse_StoragePassword(int fd, struct map_session_data *sd){ //@TODO
-// struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+// struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
// int type = RFIFOW(fd,info->pos[0]);
// char* password = RFIFOP(fd,info->pos[1]);
// char* new_password = RFIFOP(fd,info->pos[2]);
@@ -12815,7 +12857,7 @@ void clif_storagepassword_result(struct map_session_data* sd, short result, shor
/// Party creation request
/// 00f9 <party name>.24B (CZ_MAKE_GROUP)
void clif_parse_CreateParty(int fd, struct map_session_data *sd){
- char* name = RFIFOCP(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
+ char* name = RFIFOCP(fd,packet_db[RFIFOW(fd,0)].pos[0]);
name[NAME_LENGTH-1] = '\0';
if( map[sd->bl.m].flag.partylock ) {// Party locked.
@@ -12832,7 +12874,7 @@ void clif_parse_CreateParty(int fd, struct map_session_data *sd){
/// 01e8 <party name>.24B <item pickup rule>.B <item share rule>.B (CZ_MAKE_GROUP2)
void clif_parse_CreateParty2(int fd, struct map_session_data *sd){
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
char* name = RFIFOCP(fd,info->pos[0]);
int item1 = RFIFOB(fd,info->pos[1]);
int item2 = RFIFOB(fd,info->pos[2]);
@@ -12862,7 +12904,7 @@ void clif_parse_PartyInvite(int fd, struct map_session_data *sd)
return;
}
- t_sd = map_id2sd(RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]));
+ t_sd = map_id2sd(RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]));
if(t_sd && t_sd->state.noask) {// @noask [LuzZza]
clif_noask_sub(sd, t_sd, 1);
@@ -12875,7 +12917,7 @@ void clif_parse_PartyInvite(int fd, struct map_session_data *sd)
/// 02c4 <char name>.24B (CZ_PARTY_JOIN_REQ)
void clif_parse_PartyInvite2(int fd, struct map_session_data *sd){
struct map_session_data *t_sd;
- char *name = RFIFOCP(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
+ char *name = RFIFOCP(fd,packet_db[RFIFOW(fd,0)].pos[0]);
name[NAME_LENGTH-1] = '\0';
if(map[sd->bl.m].flag.partylock) {// Party locked.
@@ -12902,14 +12944,14 @@ void clif_parse_PartyInvite2(int fd, struct map_session_data *sd){
/// 1 = accept
void clif_parse_ReplyPartyInvite(int fd,struct map_session_data *sd)
{
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
party_reply_invite(sd,RFIFOL(fd,info->pos[0]),
RFIFOL(fd,info->pos[1]));
}
//(CZ_PARTY_JOIN_REQ_ACK)
void clif_parse_ReplyPartyInvite2(int fd,struct map_session_data *sd)
{
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
party_reply_invite(sd,RFIFOL(fd,info->pos[0]),
RFIFOB(fd,info->pos[1]));
}
@@ -12931,7 +12973,7 @@ void clif_parse_LeaveParty(int fd, struct map_session_data *sd)
/// 0103 <account id>.L <char name>.24B
void clif_parse_RemovePartyMember(int fd, struct map_session_data *sd)
{
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
if(map[sd->bl.m].flag.partylock) {// Party locked.
clif_displaymessage(fd, msg_txt(sd,227));
return;
@@ -12949,7 +12991,7 @@ void clif_parse_PartyChangeOption(int fd, struct map_session_data *sd)
struct party_data *p;
int i,expflag;
int cmd = RFIFOW(fd,0);
- struct s_packet_db* info = &packet_db[sd->packet_ver][cmd];
+ struct s_packet_db* info = &packet_db[cmd];
if( !sd->status.party_id )
return;
@@ -12990,7 +13032,7 @@ void clif_parse_PartyMessage(int fd, struct map_session_data* sd){
/// Changes Party Leader (CZ_CHANGE_GROUP_MASTER).
/// 07da <account id>.L
void clif_parse_PartyChangeLeader(int fd, struct map_session_data* sd){
- party_changeleader(sd, map_id2sd(RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0])),NULL);
+ party_changeleader(sd, map_id2sd(RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0])),NULL);
}
@@ -13000,7 +13042,7 @@ void clif_parse_PartyChangeLeader(int fd, struct map_session_data* sd){
/// Request to register a party booking advertisment (CZ_PARTY_BOOKING_REQ_REGISTER).
/// 0802 <level>.W <map id>.W { <job>.W }*6
void clif_parse_PartyBookingRegisterReq(int fd, struct map_session_data* sd){
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
short level = RFIFOW(fd,info->pos[0]);
short mapid = RFIFOW(fd,info->pos[1]);
int idxpbj = info->pos[2];
@@ -13034,7 +13076,7 @@ void clif_PartyBookingRegisterAck(struct map_session_data *sd, int flag)
/// Request to search for party booking advertisments (CZ_PARTY_BOOKING_REQ_SEARCH).
/// 0804 <level>.W <map id>.W <job>.W <last index>.L <result count>.W
void clif_parse_PartyBookingSearchReq(int fd, struct map_session_data* sd){
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
short level = RFIFOW(fd,info->pos[0]);
short mapid = RFIFOW(fd,info->pos[1]);
short job = RFIFOW(fd,info->pos[2]);
@@ -13107,7 +13149,7 @@ void clif_parse_PartyBookingUpdateReq(int fd, struct map_session_data* sd)
{
short job[MAX_PARTY_BOOKING_JOBS];
int i;
- int idxpbu = packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0];
+ int idxpbu = packet_db[RFIFOW(fd,0)].pos[0];
for(i=0; i<MAX_PARTY_BOOKING_JOBS; i++)
job[i] = RFIFOW(fd,idxpbu+i*2);
@@ -13183,14 +13225,14 @@ void clif_parse_VendingListReq(int fd, struct map_session_data* sd)
if( sd->npc_id ) {// using an NPC
return;
}
- vending_vendinglistreq(sd,RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]));
+ vending_vendinglistreq(sd,RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]));
}
/// Shop item(s) purchase request (CZ_PC_PURCHASE_ITEMLIST_FROMMC).
/// 0134 <packet len>.W <account id>.L { <amount>.W <index>.W }*
void clif_parse_PurchaseReq(int fd, struct map_session_data* sd){
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
int len = (int)RFIFOW(fd,info->pos[0]) - 8;
int id = (int)RFIFOL(fd,info->pos[1]);
const uint8* data = (uint8*)RFIFOP(fd,info->pos[2]);
@@ -13205,7 +13247,7 @@ void clif_parse_PurchaseReq(int fd, struct map_session_data* sd){
/// Shop item(s) purchase request (CZ_PC_PURCHASE_ITEMLIST_FROMMC2).
/// 0801 <packet len>.W <account id>.L <unique id>.L { <amount>.W <index>.W }*
void clif_parse_PurchaseReq2(int fd, struct map_session_data* sd){
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
int len = (int)RFIFOW(fd,info->pos[0]) - 12;
int aid = (int)RFIFOL(fd,info->pos[1]);
int uid = (int)RFIFOL(fd,info->pos[2]);
@@ -13226,7 +13268,7 @@ void clif_parse_PurchaseReq2(int fd, struct map_session_data* sd){
/// 1 = open
void clif_parse_OpenVending(int fd, struct map_session_data* sd){
int cmd = RFIFOW(fd,0);
- struct s_packet_db* info = &packet_db[sd->packet_ver][cmd];
+ struct s_packet_db* info = &packet_db[cmd];
short len = (short)RFIFOW(fd,info->pos[0]);
const char* message = RFIFOCP(fd,info->pos[1]);
const uint8* data = (uint8*)RFIFOP(fd,info->pos[3]);
@@ -13238,7 +13280,7 @@ void clif_parse_OpenVending(int fd, struct map_session_data* sd){
bool flag;
len -= 85;
- flag = (bool)RFIFOB(fd,info->pos[2]);
+ flag = RFIFOB(fd,info->pos[2]) != 0;
if (!flag) {
sd->state.prevend = 0;
sd->state.workinprogress = WIP_DISABLE_NONE;
@@ -13266,8 +13308,8 @@ void clif_parse_OpenVending(int fd, struct map_session_data* sd){
/// Guild creation request (CZ_REQ_MAKE_GUILD).
/// 0165 <char id>.L <guild name>.24B
void clif_parse_CreateGuild(int fd,struct map_session_data *sd){
- //int charid = RFIFOL(fd,packet_db[sd->packet_ver][cmd].pos[0]);
- char* name = RFIFOCP(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[1]);
+ //int charid = RFIFOL(fd,packet_db[cmd].pos[0]);
+ char* name = RFIFOCP(fd,packet_db[RFIFOW(fd,0)].pos[1]);
name[NAME_LENGTH-1] = '\0';
if(map[sd->bl.m].flag.guildlock) { //Guild locked.
@@ -13304,7 +13346,7 @@ void clif_parse_GuildCheckMaster(int fd, struct map_session_data *sd)
/// 6 = notice
void clif_parse_GuildRequestInfo(int fd, struct map_session_data *sd)
{
- int type = RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
+ int type = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
if( !sd->status.guild_id && !sd->bg_id )
return;
@@ -13340,7 +13382,7 @@ void clif_parse_GuildRequestInfo(int fd, struct map_session_data *sd)
void clif_parse_GuildChangePositionInfo(int fd, struct map_session_data *sd)
{
int i;
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
int len = RFIFOW(fd,info->pos[0]);
int idxgpos = info->pos[1];
@@ -13358,7 +13400,7 @@ void clif_parse_GuildChangePositionInfo(int fd, struct map_session_data *sd)
void clif_parse_GuildChangeMemberPosition(int fd, struct map_session_data *sd)
{
int i;
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
int len = RFIFOW(fd,info->pos[0]);
int idxgpos = info->pos[1];
@@ -13397,7 +13439,7 @@ void clif_parse_GuildChangeMemberPosition(int fd, struct map_session_data *sd)
void clif_parse_GuildRequestEmblem(int fd,struct map_session_data *sd)
{
struct guild* g;
- int guild_id = RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
+ int guild_id = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
if( (g = guild_search(guild_id)) != NULL )
clif_guild_emblem(sd,g);
@@ -13443,7 +13485,7 @@ static enum e_result_validate_emblem clif_validate_emblem(const uint8* emblem, u
/// Request to update the guild emblem (CZ_REGISTER_GUILD_EMBLEM_IMG).
/// 0153 <packet len>.W <emblem data>.?B
void clif_parse_GuildChangeEmblem(int fd,struct map_session_data *sd){
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
unsigned long emblem_len = RFIFOW(fd,info->pos[0])-4;
const uint8* emblem = RFIFOP(fd,info->pos[1]);
int emb_val=0;
@@ -13474,7 +13516,7 @@ void clif_parse_GuildChangeEmblem(int fd,struct map_session_data *sd){
/// Guild notice update request (CZ_GUILD_NOTICE).
/// 016e <guild id>.L <msg1>.60B <msg2>.120B
void clif_parse_GuildChangeNotice(int fd, struct map_session_data* sd){
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
int guild_id = RFIFOL(fd,info->pos[0]);
char* msg1 = RFIFOCP(fd,info->pos[1]);
char* msg2 = RFIFOCP(fd,info->pos[2]);
@@ -13518,7 +13560,7 @@ int clif_sub_guild_invite(int fd, struct map_session_data *sd, struct map_sessio
/// Guild invite request (CZ_REQ_JOIN_GUILD).
/// 0168 <account id>.L <inviter account id>.L <inviter char id>.L
void clif_parse_GuildInvite(int fd,struct map_session_data *sd){
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
struct map_session_data *t_sd = map_id2sd(RFIFOL(fd,info->pos[0]));
// int inv_aid = RFIFOL(fd,info->pos[1]);
// int inv_cid = RFIFOL(fd,info->pos[2]);
@@ -13531,7 +13573,7 @@ void clif_parse_GuildInvite(int fd,struct map_session_data *sd){
/// 0916 <char name>.24B (CZ_REQ_JOIN_GUILD2)
void
clif_parse_GuildInvite2(int fd, struct map_session_data *sd) {
- struct map_session_data *t_sd = map_nick2sd(RFIFOCP(fd, packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]),false);
+ struct map_session_data *t_sd = map_nick2sd(RFIFOCP(fd, packet_db[RFIFOW(fd,0)].pos[0]),false);
if (clif_sub_guild_invite(fd, sd, t_sd))
return;
@@ -13544,7 +13586,7 @@ clif_parse_GuildInvite2(int fd, struct map_session_data *sd) {
/// 0 = refuse
/// 1 = accept
void clif_parse_GuildReplyInvite(int fd,struct map_session_data *sd){
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
guild_reply_invite(sd,RFIFOL(fd,info->pos[0]),
RFIFOL(fd,info->pos[1]));
}
@@ -13553,7 +13595,7 @@ void clif_parse_GuildReplyInvite(int fd,struct map_session_data *sd){
/// Request to leave guild (CZ_REQ_LEAVE_GUILD).
/// 0159 <guild id>.L <account id>.L <char id>.L <reason>.40B
void clif_parse_GuildLeave(int fd,struct map_session_data *sd){
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
if(map[sd->bl.m].flag.guildlock) { //Guild locked.
clif_displaymessage(fd, msg_txt(sd,228));
return;
@@ -13573,7 +13615,7 @@ void clif_parse_GuildLeave(int fd,struct map_session_data *sd){
/// Request to expel a member of a guild (CZ_REQ_BAN_GUILD).
/// 015b <guild id>.L <account id>.L <char id>.L <reason>.40B
void clif_parse_GuildExpulsion(int fd,struct map_session_data *sd){
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
if( map[sd->bl.m].flag.guildlock || sd->bg_id )
{ // Guild locked.
clif_displaymessage(fd, msg_txt(sd,228));
@@ -13616,9 +13658,9 @@ void clif_parse_GuildRequestAlliance(int fd, struct map_session_data *sd)
return;
}
- t_sd = map_id2sd(RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]));
- //inv_aid = RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[1]);
- //inv_cid = RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[2]);
+ t_sd = map_id2sd(RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]));
+ //inv_aid = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[1]);
+ //inv_cid = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[2]);
// @noask [LuzZza]
if(t_sd && t_sd->state.noask) {
@@ -13636,7 +13678,7 @@ void clif_parse_GuildRequestAlliance(int fd, struct map_session_data *sd)
/// 0 = refuse
/// 1 = accept
void clif_parse_GuildReplyAlliance(int fd, struct map_session_data *sd){
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
guild_reply_reqalliance(sd,
RFIFOL(fd,info->pos[0]),
RFIFOL(fd,info->pos[1]));
@@ -13649,7 +13691,7 @@ void clif_parse_GuildReplyAlliance(int fd, struct map_session_data *sd){
/// 0 = Ally
/// 1 = Enemy
void clif_parse_GuildDelAlliance(int fd, struct map_session_data *sd){
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
if(!sd->state.gmaster_flag)
return;
@@ -13677,7 +13719,7 @@ void clif_parse_GuildOpposition(int fd, struct map_session_data *sd)
return;
}
- t_sd = map_id2sd(RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]));
+ t_sd = map_id2sd(RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]));
// @noask [LuzZza]
if(t_sd && t_sd->state.noask) {
@@ -13700,7 +13742,7 @@ void clif_parse_GuildBreak(int fd, struct map_session_data *sd)
clif_displaymessage(fd, msg_txt(sd,228));
return;
}
- guild_break(sd,RFIFOCP(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]));
+ guild_break(sd,RFIFOCP(fd,packet_db[RFIFOW(fd,0)].pos[0]));
}
@@ -13716,14 +13758,14 @@ void clif_parse_GuildBreak(int fd, struct map_session_data *sd)
/// 3 = return to egg
/// 4 = unequip accessory
void clif_parse_PetMenu(int fd, struct map_session_data *sd){
- pet_menu(sd,RFIFOB(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]));
+ pet_menu(sd,RFIFOB(fd,packet_db[RFIFOW(fd,0)].pos[0]));
}
/// Attempt to tame a monster (CZ_TRYCAPTURE_MONSTER).
/// 019f <id>.L
void clif_parse_CatchPet(int fd, struct map_session_data *sd){
- pet_catch_process2(sd,RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]));
+ pet_catch_process2(sd,RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]));
}
@@ -13733,7 +13775,7 @@ void clif_parse_SelectEgg(int fd, struct map_session_data *sd){
if (sd->menuskill_id != SA_TAMINGMONSTER || sd->menuskill_val != -1)
return;
- pet_select_egg(sd,RFIFOW(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0])-2);
+ pet_select_egg(sd,RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[0])-2);
clif_menuskill_clear(sd);
}
@@ -13765,7 +13807,7 @@ void clif_parse_SelectEgg(int fd, struct map_session_data *sd){
void clif_parse_SendEmotion(int fd, struct map_session_data *sd)
{
if(sd->pd)
- clif_pet_emotion(sd->pd,RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]));
+ clif_pet_emotion(sd->pd,RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]));
}
@@ -13773,7 +13815,7 @@ void clif_parse_SendEmotion(int fd, struct map_session_data *sd)
/// 01a5 <name>.24B
void clif_parse_ChangePetName(int fd, struct map_session_data *sd)
{
- pet_change_name(sd,RFIFOCP(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]));
+ pet_change_name(sd,RFIFOCP(fd,packet_db[RFIFOW(fd,0)].pos[0]));
}
@@ -13786,7 +13828,7 @@ void clif_parse_GMKick(int fd, struct map_session_data *sd)
struct block_list *target;
int tid;
- tid = RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
+ tid = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
target = map_id2bl(tid);
if (!target) {
clif_GM_kickack(sd, 0);
@@ -13857,7 +13899,7 @@ void clif_parse_GMShift(int fd, struct map_session_data *sd)
char *player_name;
char command[NAME_LENGTH+8];
- player_name = RFIFOCP(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
+ player_name = RFIFOCP(fd,packet_db[RFIFOW(fd,0)].pos[0]);
player_name[NAME_LENGTH-1] = '\0';
safesnprintf(command,sizeof(command),"%cjumpto %s", atcommand_symbol, player_name);
@@ -13873,7 +13915,7 @@ void clif_parse_GMRemove2(int fd, struct map_session_data* sd)
uint32 account_id;
struct map_session_data* pl_sd;
- account_id = RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
+ account_id = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
if( (pl_sd = map_id2sd(account_id)) != NULL ) {
char command[NAME_LENGTH+8];
safesnprintf(command,sizeof(command),"%cjumpto %s", atcommand_symbol, pl_sd->status.name);
@@ -13894,7 +13936,7 @@ void clif_parse_GMRecall(int fd, struct map_session_data *sd)
char *player_name;
char command [NAME_LENGTH+8];
- player_name = RFIFOCP(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
+ player_name = RFIFOCP(fd,packet_db[RFIFOW(fd,0)].pos[0]);
player_name[NAME_LENGTH-1] = '\0';
safesnprintf(command,sizeof(command),"%crecall %s", atcommand_symbol, player_name);
@@ -13910,7 +13952,7 @@ void clif_parse_GMRecall2(int fd, struct map_session_data* sd)
uint32 account_id;
struct map_session_data* pl_sd;
- account_id = RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
+ account_id = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
if( (pl_sd = map_id2sd(account_id)) != NULL ) {
char command[NAME_LENGTH+8];
safesnprintf(command,sizeof(command),"%crecall %s", atcommand_symbol, pl_sd->status.name);
@@ -13934,7 +13976,7 @@ void clif_parse_GMRecall2(int fd, struct map_session_data* sd)
/// 09ce <item/mob name>.100B [Ind/Yommy]
void clif_parse_GM_Item_Monster(int fd, struct map_session_data *sd)
{
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
int mob_id = 0;
struct item_data *id = NULL;
struct mob_db *mob = NULL;
@@ -13998,7 +14040,7 @@ void clif_parse_GM_Item_Monster(int fd, struct map_session_data *sd)
/// TODO: Any OPTION_* ?
void clif_parse_GMHide(int fd, struct map_session_data *sd) {
char cmd[6];
- //int eff_st = RFIFOL(packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
+ //int eff_st = RFIFOL(packet_db[RFIFOW(fd,0)].pos[0]);
safesnprintf(cmd,sizeof(cmd),"%chide",atcommand_symbol);
is_atcommand(fd, sd, cmd, 1);
@@ -14016,7 +14058,7 @@ void clif_parse_GMReqNoChat(int fd,struct map_session_data *sd)
int id, type, value;
struct map_session_data *dstsd;
char command[NAME_LENGTH+15];
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
id = RFIFOL(fd,info->pos[0]);
@@ -14046,7 +14088,7 @@ void clif_parse_GMReqNoChat(int fd,struct map_session_data *sd)
void clif_parse_GMRc(int fd, struct map_session_data* sd)
{
char command[NAME_LENGTH+15];
- char *name = RFIFOCP(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
+ char *name = RFIFOCP(fd,packet_db[RFIFOW(fd,0)].pos[0]);
name[NAME_LENGTH-1] = '\0';
safesnprintf(command,sizeof(command),"%cmute %d %s", atcommand_symbol, 60, name);
@@ -14071,7 +14113,7 @@ void clif_account_name(int fd, uint32 account_id, const char* accname)
//! TODO: Figure out how does this actually work
void clif_parse_GMReqAccountName(int fd, struct map_session_data *sd)
{
- uint32 account_id = RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
+ uint32 account_id = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
/*
char query[30];
safesnprintf(query,sizeof(query),"%d", account_id);
@@ -14091,7 +14133,7 @@ void clif_parse_GMReqAccountName(int fd, struct map_session_data *sd)
void clif_parse_GMChangeMapType(int fd, struct map_session_data *sd)
{
int x,y,type;
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
if(! pc_has_permission(sd, PC_PERM_USE_CHANGEMAPTYPE) )
return;
@@ -14117,7 +14159,7 @@ void clif_parse_PMIgnore(int fd, struct map_session_data* sd)
char* nick;
uint8 type;
int i;
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
nick = RFIFOCP(fd,info->pos[0]);
nick[NAME_LENGTH-1] = '\0'; // to be sure that the player name has at most 23 characters
@@ -14168,7 +14210,7 @@ void clif_parse_PMIgnore(int fd, struct map_session_data* sd)
/// 1 = (/inall) allow all speech
void clif_parse_PMIgnoreAll(int fd, struct map_session_data *sd)
{
- int type = RFIFOB(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]), flag;
+ int type = RFIFOB(fd,packet_db[RFIFOW(fd,0)].pos[0]), flag;
if( type == 0 ) {// Deny all
if( sd->state.ignoreAll ) {
@@ -14274,6 +14316,7 @@ void clif_parse_NoviceExplosionSpirits(int fd, struct map_session_data *sd)
/// Toggles a single friend online/offline [Skotlex] (ZC_FRIENDS_STATE).
/// 0206 <account id>.L <char id>.L <state>.B
+/// 0206 <account id>.L <char id>.L <state>.B <name>.24B >= 20180221
/// state:
/// 0 = online
/// 1 = offline
@@ -14293,6 +14336,9 @@ void clif_friendslist_toggle(struct map_session_data *sd,uint32 account_id, uint
WFIFOL(fd, 2) = sd->status.friends[i].account_id;
WFIFOL(fd, 6) = sd->status.friends[i].char_id;
WFIFOB(fd,10) = !online; //Yeah, a 1 here means "logged off", go figure...
+#if PACKETVER >= 20180221
+ safestrncpy(WFIFOCP(fd, 11), sd->status.friends[i].name, NAME_LENGTH);
+#endif
WFIFOSET(fd, packet_len(0x206));
}
@@ -14311,21 +14357,29 @@ int clif_friendslist_toggle_sub(struct map_session_data *sd,va_list ap)
/// Sends the whole friends list (ZC_FRIENDS_LIST).
/// 0201 <packet len>.W { <account id>.L <char id>.L <name>.24B }*
+/// 0201 <packet len>.W { <account id>.L <char id>.L }* >= 20180221
void clif_friendslist_send(struct map_session_data *sd)
{
int i = 0, n, fd = sd->fd;
+#if PACKETVER >= 20180221
+ const int size = 8;
+#else
+ const int size = 8 + NAME_LENGTH;
+#endif
// Send friends list
- WFIFOHEAD(fd, MAX_FRIENDS * 32 + 4);
+ WFIFOHEAD(fd, MAX_FRIENDS * size + 4);
WFIFOW(fd, 0) = 0x201;
for(i = 0; i < MAX_FRIENDS && sd->status.friends[i].char_id; i++) {
- WFIFOL(fd, 4 + 32 * i + 0) = sd->status.friends[i].account_id;
- WFIFOL(fd, 4 + 32 * i + 4) = sd->status.friends[i].char_id;
- safestrncpy(WFIFOCP(fd, 4 + 32 * i + 8), sd->status.friends[i].name, NAME_LENGTH);
+ WFIFOL(fd, 4 + size * i + 0) = sd->status.friends[i].account_id;
+ WFIFOL(fd, 4 + size * i + 4) = sd->status.friends[i].char_id;
+#if PACKETVER < 20180221
+ safestrncpy(WFIFOCP(fd, 4 + size * i + 8), sd->status.friends[i].name, NAME_LENGTH);
+#endif
}
if (i) {
- WFIFOW(fd,2) = 4 + 32 * i;
+ WFIFOW(fd,2) = 4 + size * i;
WFIFOSET(fd, WFIFOW(fd,2));
}
@@ -14383,7 +14437,7 @@ void clif_parse_FriendsListAdd(int fd, struct map_session_data *sd)
struct map_session_data *f_sd;
int i;
- f_sd = map_nick2sd(RFIFOCP(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]),false);
+ f_sd = map_nick2sd(RFIFOCP(fd,packet_db[RFIFOW(fd,0)].pos[0]),false);
// Friend doesn't exist (no player with this name)
if (f_sd == NULL) {
@@ -14435,14 +14489,15 @@ void clif_parse_FriendsListReply(int fd, struct map_session_data *sd)
struct map_session_data *f_sd;
uint32 account_id;
char reply;
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
account_id = RFIFOL(fd,info->pos[0]);
//char_id = RFIFOL(fd,info->pos[1]);
- if(sd->packet_ver < 6)
- reply = RFIFOB(fd,info->pos[2]);
- else
- reply = RFIFOL(fd,info->pos[2]);
+#if PACKETVER < 6
+ reply = RFIFOB(fd,info->pos[2]);
+#else
+ reply = RFIFOL(fd,info->pos[2]);
+#endif
if( sd->bl.id == account_id ) {// adding oneself as friend
return;
@@ -14470,6 +14525,8 @@ void clif_parse_FriendsListReply(int fd, struct map_session_data *sd)
safestrncpy(f_sd->status.friends[i].name, sd->status.name, NAME_LENGTH);
clif_friendslist_reqack(f_sd, sd, 0);
+ achievement_update_objective(f_sd, AG_ADD_FRIEND, 1, i + 1);
+
if (battle_config.friend_auto_add) {
// Also add f_sd to sd's friendlist.
for (i = 0; i < MAX_FRIENDS; i++) {
@@ -14487,6 +14544,8 @@ void clif_parse_FriendsListReply(int fd, struct map_session_data *sd)
sd->status.friends[i].char_id = f_sd->status.char_id;
safestrncpy(sd->status.friends[i].name, f_sd->status.name, NAME_LENGTH);
clif_friendslist_reqack(sd, f_sd, 0);
+
+ achievement_update_objective(sd, AG_ADD_FRIEND, 1, i + 1);
}
}
}
@@ -14499,7 +14558,7 @@ void clif_parse_FriendsListRemove(int fd, struct map_session_data *sd)
struct map_session_data *f_sd = NULL;
uint32 account_id, char_id;
int i, j;
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
account_id = RFIFOL(fd,info->pos[0]);
char_id = RFIFOL(fd,info->pos[1]);
@@ -14579,8 +14638,8 @@ void clif_PVPInfo(struct map_session_data* sd)
void clif_parse_PVPInfo(int fd,struct map_session_data *sd)
{
// TODO: Is there a way to use this on an another player (char/acc id)?
- //int cid = RFIFOB(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
- //int aid = RFIFOB(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[1]);
+ //int cid = RFIFOB(fd,packet_db[RFIFOW(fd,0)].pos[0]);
+ //int aid = RFIFOB(fd,packet_db[RFIFOW(fd,0)].pos[1]);
clif_PVPInfo(sd);
}
@@ -14593,7 +14652,7 @@ void clif_parse_PVPInfo(int fd,struct map_session_data *sd)
void clif_parse_FeelSaveOk(int fd,struct map_session_data *sd)
{
int i;
- //int wich = RFIFOB(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
+ //int wich = RFIFOB(fd,packet_db[RFIFOW(fd,0)].pos[0]);
if (sd->menuskill_id != SG_FEEL)
return;
i = sd->menuskill_val-1;
@@ -14631,14 +14690,14 @@ void clif_feel_req(int fd, struct map_session_data *sd, uint16 skill_lv)
/// Request to change homunculus' name (CZ_RENAME_MER).
/// 0231 <name>.24B
void clif_parse_ChangeHomunculusName(int fd, struct map_session_data *sd){
- hom_change_name(sd,RFIFOCP(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]));
+ hom_change_name(sd,RFIFOCP(fd,packet_db[RFIFOW(fd,0)].pos[0]));
}
/// Request to warp/move homunculus/mercenary to it's owner (CZ_REQUEST_MOVETOOWNER).
/// 0234 <id>.L
void clif_parse_HomMoveToMaster(int fd, struct map_session_data *sd){
- int id = RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]); // Mercenary or Homunculus
+ int id = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]); // Mercenary or Homunculus
struct block_list *bl = NULL;
struct unit_data *ud = NULL;
@@ -14658,7 +14717,7 @@ void clif_parse_HomMoveToMaster(int fd, struct map_session_data *sd){
/// Request to move homunculus/mercenary (CZ_REQUEST_MOVENPC).
/// 0232 <id>.L <position data>.3B
void clif_parse_HomMoveTo(int fd, struct map_session_data *sd){
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
int id = RFIFOL(fd,info->pos[0]); // Mercenary or Homunculus
struct block_list *bl = NULL;
short x, y;
@@ -14683,7 +14742,7 @@ void clif_parse_HomMoveTo(int fd, struct map_session_data *sd){
void clif_parse_HomAttack(int fd,struct map_session_data *sd)
{
struct block_list *bl = NULL;
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
int id = RFIFOL(fd,info->pos[0]);
int target_id = RFIFOL(fd,info->pos[1]);
int action_type = RFIFOB(fd,info->pos[2]);
@@ -14710,11 +14769,11 @@ void clif_parse_HomAttack(int fd,struct map_session_data *sd)
void clif_parse_HomMenu(int fd, struct map_session_data *sd)
{ //[orn]
int cmd = RFIFOW(fd,0);
- //int type = RFIFOW(fd,packet_db[sd->packet_ver][cmd].pos[0]);
+ //int type = RFIFOW(fd,packet_db[cmd].pos[0]);
if(!hom_is_active(sd->hd))
return;
- hom_menu(sd,RFIFOB(fd,packet_db[sd->packet_ver][cmd].pos[1]));
+ hom_menu(sd,RFIFOB(fd,packet_db[cmd].pos[1]));
}
@@ -14802,7 +14861,7 @@ void clif_parse_Check(int fd, struct map_session_data *sd)
if(!pc_has_permission(sd, PC_PERM_USE_CHECK))
return;
- safestrncpy(charname, RFIFOCP(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]), sizeof(charname));
+ safestrncpy(charname, RFIFOCP(fd,packet_db[RFIFOW(fd,0)].pos[0]), sizeof(charname));
if( ( pl_sd = map_nick2sd(charname,false) ) == NULL || pc_get_group_level(sd) < pc_get_group_level(pl_sd) )
{
@@ -15015,6 +15074,8 @@ void clif_Mail_window(int fd, int flag)
/// { <mail id>.Q <read>.B <type>.B <sender>.24B <received>.L <expires>.L <title length>.W <title>.?B }*
/// 0a7d <packet len>.W <type>.B <amount>.B <last page>.B (ZC_ACK_MAIL_LIST2)
/// { <mail id>.Q <read>.B <type>.B <sender>.24B <received>.L <expires>.L <title length>.W <title>.?B }*
+/// 0ac2 <packet len>.W <unknown>.B (ZC_ACK_MAIL_LIST3)
+/// { <type>.B <mail id>.Q <read>.B <type>.B <sender>.24B <expires>.L <title length>.W <title>.?B }*
void clif_Mail_refreshinbox(struct map_session_data *sd,enum mail_inbox_type type,int64 mailID){
#if PACKETVER < 20150513
int fd = sd->fd;
@@ -15055,7 +15116,9 @@ void clif_Mail_refreshinbox(struct map_session_data *sd,enum mail_inbox_type typ
int i, j, k, offset, titleLength;
uint8 mailType, amount, remaining;
uint32 now = (uint32)time(NULL);
-#if PACKETVER >= 20160601
+#if PACKETVER >= 20170419
+ int cmd = 0xac2;
+#elif PACKETVER >= 20160601
int cmd = 0xa7d;
#else
int cmd = 0x9f0;
@@ -15065,6 +15128,10 @@ void clif_Mail_refreshinbox(struct map_session_data *sd,enum mail_inbox_type typ
mail_refresh_remaining_amount(sd);
}
+#if PACKETVER >= 20170419
+ // Always send all
+ i = md->amount;
+#else
// If a starting mail id was sent
if( mailID != 0 ){
ARR_FIND( 0, md->amount, i, md->msg[i].id == mailID );
@@ -15085,44 +15152,65 @@ void clif_Mail_refreshinbox(struct map_session_data *sd,enum mail_inbox_type typ
}else{
i = md->amount;
}
+#endif
// Count the remaining mails from the starting mail or the beginning
- // Only count mails of the target type and those that should not have been deleted already
+ // Only count mails of the target type(before 2017-04-19) and those that should not have been deleted already
for( j = i, remaining = 0; j >= 0; j-- ){
msg = &md->msg[j];
if (msg->id < 1)
continue;
+#if PACKETVER < 20170419
if (msg->type != type)
continue;
+#endif
if (msg->scheduled_deletion > 0 && msg->scheduled_deletion <= now)
continue;
remaining++;
}
+#if PACKETVER >= 20170419
+ // Always send all
+ amount = remaining;
+#else
if( remaining > MAIL_PAGE_SIZE ){
amount = MAIL_PAGE_SIZE;
}else{
amount = remaining;
}
+#endif
WFIFOHEAD(fd, 7 + ((44 + MAIL_TITLE_LENGTH) * amount));
WFIFOW(fd, 0) = cmd;
+#if PACKETVER >= 20170419
+ WFIFOB(fd, 4) = 1; // Unknown
+ offset = 5;
+#else
WFIFOB(fd, 4) = type;
WFIFOB(fd, 5) = amount;
WFIFOB(fd, 6) = ( remaining < MAIL_PAGE_SIZE ); // last page
+ offset = 7;
+#endif
- for( offset = 7, amount = 0; i >= 0; i-- ){
+ for( amount = 0; i >= 0; i-- ){
msg = &md->msg[i];
if (msg->id < 1)
continue;
+#if PACKETVER < 20170419
if (msg->type != type)
continue;
+#endif
if (msg->scheduled_deletion > 0 && msg->scheduled_deletion <= now)
continue;
+#if PACKETVER >= 20170419
+ WFIFOB(fd, offset) = msg->type;
+ offset += 1;
+#endif
+
WFIFOQ(fd, offset + 0) = (uint64)msg->id;
WFIFOB(fd, offset + 8) = (msg->status != MAIL_UNREAD);
@@ -15145,22 +15233,25 @@ void clif_Mail_refreshinbox(struct map_session_data *sd,enum mail_inbox_type typ
WFIFOB(fd, offset + 9) = mailType;
safestrncpy(WFIFOCP(fd, offset + 10), msg->send_name, NAME_LENGTH);
+#if PACKETVER < 20170419
// How much time has passed since you received the mail
WFIFOL(fd, offset + 34 ) = now - (uint32)msg->timestamp;
+ offset += 4;
+#endif
// If automatic return/deletion of mails is enabled, notify the client when it will kick in
if( msg->scheduled_deletion > 0 ){
- WFIFOL(fd, offset + 38) = (uint32)msg->scheduled_deletion - now;
+ WFIFOL(fd, offset + 34) = (uint32)msg->scheduled_deletion - now;
}else{
// Fake the scheduled deletion to one year in the future
// Sadly the client always displays the scheduled deletion after 24 hours no matter how high this value gets [Lemongrass]
- WFIFOL(fd, offset + 38) = 365 * 24 * 60 * 60;
+ WFIFOL(fd, offset + 34) = 365 * 24 * 60 * 60;
}
- WFIFOW(fd, offset + 42) = titleLength = (int16)(strlen(msg->title) + 1);
- safestrncpy(WFIFOCP(fd, offset + 44), msg->title, titleLength);
+ WFIFOW(fd, offset + 38) = titleLength = (int16)(strlen(msg->title) + 1);
+ safestrncpy(WFIFOCP(fd, offset + 40), msg->title, titleLength);
- offset += 44 + titleLength;
+ offset += 40 + titleLength;
}
WFIFOW(fd, 2) = (int16)offset;
WFIFOSET(fd, offset);
@@ -15172,6 +15263,8 @@ void clif_Mail_refreshinbox(struct map_session_data *sd,enum mail_inbox_type typ
/// 09e8 <mail tab>.B <mail id>.Q (CZ_OPEN_MAILBOX)
/// 09ee <mail tab>.B <mail id>.Q (CZ_REQ_NEXT_MAIL_LIST)
/// 09ef <mail tab>.B <mail id>.Q (CZ_REQ_REFRESH_MAIL_LIST)
+/// 0ac0 <mail id>.Q <unknown>.16B (CZ_OPEN_MAILBOX2)
+/// 0ac1 <mail id>.Q <unknown>.16B (CZ_REQ_REFRESH_MAIL_LIST2)
void clif_parse_Mail_refreshinbox(int fd, struct map_session_data *sd){
#if PACKETVER < 20150513
struct mail_data* md = &sd->mail.inbox;
@@ -15184,8 +15277,25 @@ void clif_parse_Mail_refreshinbox(int fd, struct map_session_data *sd){
mail_removeitem(sd, 0, sd->mail.item[0].index, sd->mail.item[0].amount);
mail_removezeny(sd, false);
#else
+ int cmd = RFIFOW(fd, 0);
+#if PACKETVER < 20170419
uint8 openType = RFIFOB(fd, 2);
uint64 mailId = RFIFOQ(fd, 3);
+#else
+ uint8 openType;
+ uint64 mailId = RFIFOQ(fd, 2);
+ int i;
+
+ ARR_FIND(0, MAIL_MAX_INBOX, i, sd->mail.inbox.msg[i].id == mailId);
+
+ if( i == MAIL_MAX_INBOX ){
+ openType = MAIL_INBOX_NORMAL;
+ mailId = 0;
+ }else{
+ openType = sd->mail.inbox.msg[i].type;
+ mailId = 0;
+ }
+#endif
switch( openType ){
case MAIL_INBOX_NORMAL:
@@ -15197,13 +15307,13 @@ void clif_parse_Mail_refreshinbox(int fd, struct map_session_data *sd){
return;
}
- if( sd->mail.changed || RFIFOW(fd,0) == 0x9ef ){
- intif_Mail_requestinbox(sd->status.char_id, 1, openType);
+ if( sd->mail.changed || ( cmd == 0x9ef || cmd == 0xac1 ) ){
+ intif_Mail_requestinbox(sd->status.char_id, 1, (enum mail_inbox_type)openType);
return;
}
// If it is not a next page request
- if( RFIFOW(fd,0) != 0x9ee ){
+ if( cmd != 0x9ee ){
mailId = 0;
}
@@ -15231,9 +15341,9 @@ void clif_Mail_read(struct map_session_data *sd, int mail_id)
struct mail_message *msg = &sd->mail.inbox.msg[i];
struct item *item;
struct item_data *data;
- int msg_len = strlen(msg->body), len, count = 0;
+ int msg_len = strlen(msg->body), len;
#if PACKETVER >= 20150513
- int offset, j, itemsize;
+ int offset, j, itemsize, count = 0;
#endif
if( msg_len == 0 ) {
@@ -15333,7 +15443,7 @@ void clif_Mail_read(struct map_session_data *sd, int mail_id)
/// 09ea <mail tab>.B <mail id>.Q (CZ_REQ_READ_MAIL)
void clif_parse_Mail_read(int fd, struct map_session_data *sd){
#if PACKETVER < 20150513
- int mail_id = RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
+ int mail_id = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
#else
//uint8 openType = RFIFOB(fd, 2);
int mail_id = (int)RFIFOQ(fd, 3);
@@ -15423,7 +15533,7 @@ void clif_parse_Mail_getattach( int fd, struct map_session_data *sd ){
int i;
struct mail_message* msg;
#if PACKETVER < 20150513
- int mail_id = RFIFOL(fd, packet_db[sd->packet_ver][RFIFOW(fd, 0)].pos[0]);
+ int mail_id = RFIFOL(fd, packet_db[RFIFOW(fd, 0)].pos[0]);
int attachment = MAIL_ATT_ALL;
#else
uint16 packet_id = RFIFOW(fd, 0);
@@ -15510,7 +15620,7 @@ void clif_parse_Mail_getattach( int fd, struct map_session_data *sd ){
memset(msg->item, 0, MAIL_MAX_ITEM*sizeof(struct item));
}
- intif_mail_getattach(sd,msg,attachment);
+ intif_mail_getattach(sd,msg, (enum mail_attachment_type)attachment);
clif_Mail_read(sd, mail_id);
}
@@ -15520,7 +15630,7 @@ void clif_parse_Mail_getattach( int fd, struct map_session_data *sd ){
/// 09f5 <mail tab>.B <mail id>.Q (CZ_REQ_DELETE_MAIL)
void clif_parse_Mail_delete(int fd, struct map_session_data *sd){
#if PACKETVER < 20150513
- int mail_id = RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
+ int mail_id = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
#else
//int openType = RFIFOB(fd, 2);
int mail_id = (int)RFIFOQ(fd, 3);
@@ -15563,8 +15673,8 @@ void clif_parse_Mail_delete(int fd, struct map_session_data *sd){
/// Request to return a mail (CZ_REQ_MAIL_RETURN).
/// 0273 <mail id>.L <receive name>.24B
void clif_parse_Mail_return(int fd, struct map_session_data *sd){
- int mail_id = RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
- //char *rec_name = RFIFOP(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[1]);
+ int mail_id = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
+ //char *rec_name = RFIFOP(fd,packet_db[RFIFOW(fd,0)].pos[1]);
int i;
if( mail_id <= 0 )
@@ -15584,7 +15694,7 @@ void clif_parse_Mail_return(int fd, struct map_session_data *sd){
/// 0247 <index>.W <amount>.L (CZ_MAIL_ADD_ITEM)
/// 0a04 <index>.W <amount>.W (CZ_REQ_ADD_ITEM_TO_MAIL)
void clif_parse_Mail_setattach(int fd, struct map_session_data *sd){
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
int idx = RFIFOW(fd,info->pos[0]);
#if PACKETVER < 20150513
int amount = RFIFOL(fd,info->pos[1]);
@@ -15627,7 +15737,7 @@ void clif_mail_removeitem( struct map_session_data* sd, bool success, int index,
void clif_parse_Mail_winopen(int fd, struct map_session_data *sd)
{
#if PACKETVER < 20150513
- int type = RFIFOW(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
+ int type = RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[0]);
if (type == 0 || type == 1)
mail_removeitem(sd, 0, sd->mail.item[0].index, sd->mail.item[0].amount);
@@ -15647,7 +15757,7 @@ void clif_parse_Mail_winopen(int fd, struct map_session_data *sd)
/// 0a6e <packet len>.W <recipient>.24B <sender>.24B <zeny>.Q <title length>.W <body length>.W <char id>.L <title>.?B <body>.?B (CZ_REQ_WRITE_MAIL2)
void clif_parse_Mail_send(int fd, struct map_session_data *sd){
#if PACKETVER < 20150513
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
if( !chrif_isconnected() )
return;
@@ -15806,7 +15916,7 @@ static void clif_Auction_setitem(int fd, int index, bool fail)
/// 1 = cancel (cancel pressed on register tab)
/// ? = junk, uninitialized value (ex. when switching between list filters)
void clif_parse_Auction_cancelreg(int fd, struct map_session_data *sd){
- //int type = RFIFOW(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
+ //int type = RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[0]);
if( sd->auction.amount > 0 )
clif_additem(sd, sd->auction.index, sd->auction.amount, 0);
@@ -15817,7 +15927,7 @@ void clif_parse_Auction_cancelreg(int fd, struct map_session_data *sd){
/// Request to add an item to the action (CZ_AUCTION_ADD_ITEM).
/// 024c <index>.W <count>.L
void clif_parse_Auction_setitem(int fd, struct map_session_data *sd){
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
int idx = RFIFOW(fd,info->pos[0]) - 2;
int amount = RFIFOL(fd,info->pos[1]); // Always 1
struct item_data *item;
@@ -15901,7 +16011,7 @@ void clif_parse_Auction_register(int fd, struct map_session_data *sd)
{
struct auction_data auction;
struct item_data *item;
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
if( !battle_config.feature_auction )
return;
@@ -15984,7 +16094,7 @@ void clif_parse_Auction_register(int fd, struct map_session_data *sd)
/// Cancels an auction (CZ_AUCTION_ADD_CANCEL).
/// 024e <auction id>.L
void clif_parse_Auction_cancel(int fd, struct map_session_data *sd){
- unsigned int auction_id = RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
+ unsigned int auction_id = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
intif_Auction_cancel(sd->status.char_id, auction_id);
}
@@ -15992,7 +16102,7 @@ void clif_parse_Auction_cancel(int fd, struct map_session_data *sd){
/// Closes an auction (CZ_AUCTION_REQ_MY_SELL_STOP).
/// 025d <auction id>.L
void clif_parse_Auction_close(int fd, struct map_session_data *sd){
- unsigned int auction_id = RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
+ unsigned int auction_id = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
intif_Auction_close(sd->status.char_id, auction_id);
}
@@ -16000,7 +16110,7 @@ void clif_parse_Auction_close(int fd, struct map_session_data *sd){
/// Places a bid on an auction (CZ_AUCTION_BUY).
/// 024f <auction id>.L <money>.L
void clif_parse_Auction_bid(int fd, struct map_session_data *sd){
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
unsigned int auction_id = RFIFOL(fd,info->pos[0]);
int bid = RFIFOL(fd,info->pos[1]);
@@ -16033,7 +16143,7 @@ void clif_parse_Auction_bid(int fd, struct map_session_data *sd){
/// 5 = auction id search
void clif_parse_Auction_search(int fd, struct map_session_data* sd){
char search_text[NAME_LENGTH];
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
short type = RFIFOW(fd,info->pos[0]);
int price = RFIFOL(fd,info->pos[1]); // FIXME: bug #5071
int page = RFIFOW(fd,info->pos[3]);
@@ -16055,7 +16165,7 @@ void clif_parse_Auction_search(int fd, struct map_session_data* sd){
/// 1 = buy (own bids)
void clif_parse_Auction_buysell(int fd, struct map_session_data* sd)
{
- short type = RFIFOW(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]) + 6;
+ short type = RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[0]) + 6;
if( !battle_config.feature_auction )
return;
@@ -16092,7 +16202,7 @@ void clif_parse_cashshop_close( int fd, struct map_session_data* sd ){
//0846 <tabid>.W (CZ_REQ_SE_CASH_TAB_CODE))
//08c0 <len>.W <openIdentity>.L <itemcount>.W (ZC_ACK_SE_CASH_ITEM_LIST2)
void clif_parse_CashShopReqTab(int fd, struct map_session_data *sd) {
- short tab = RFIFOW(fd, packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
+ short tab = RFIFOW(fd, packet_db[RFIFOW(fd,0)].pos[0]);
int j;
if( tab < 0 || tab >= CASHSHOP_TAB_MAX )
@@ -16162,10 +16272,11 @@ void clif_cashshop_show(struct map_session_data *sd, struct npc_data *nd)
nullpo_retv(sd);
nullpo_retv(nd);
- npc_shop_currency_type(sd, nd, cost, true);
-
fd = sd->fd;
sd->npc_shopid = nd->bl.id;
+
+ npc_shop_currency_type(sd, nd, cost, true);
+
WFIFOHEAD(fd,offset+nd->u.shop.count*11);
WFIFOW(fd,0) = 0x287;
WFIFOW(fd,2) = offset+nd->u.shop.count*11;
@@ -16242,7 +16353,7 @@ void clif_parse_cashshop_buy(int fd, struct map_session_data *sd){
nullpo_retv(sd);
- info = &packet_db[sd->packet_ver][cmd];
+ info = &packet_db[cmd];
if( sd->state.trading || !sd->npc_shopid ) {
clif_cashshop_ack(sd,1);
@@ -16317,7 +16428,7 @@ void clif_Adopt_request(struct map_session_data *sd, struct map_session_data *sr
/// 01f9 <account id>.L
void clif_parse_Adopt_request(int fd, struct map_session_data *sd)
{
- TBL_PC *tsd = map_id2sd(RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]));
+ TBL_PC *tsd = map_id2sd(RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]));
TBL_PC *p_sd = map_charid2sd(sd->status.partner_id);
if( pc_try_adopt(sd, p_sd, tsd) == ADOPT_ALLOWED )
@@ -16334,7 +16445,7 @@ void clif_parse_Adopt_request(int fd, struct map_session_data *sd)
/// 0 = rejected
/// 1 = accepted
void clif_parse_Adopt_reply(int fd, struct map_session_data *sd){
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
int p1_id = RFIFOL(fd,info->pos[0]);
int p2_id = RFIFOL(fd,info->pos[1]);
int result = RFIFOL(fd,info->pos[2]);
@@ -16360,25 +16471,37 @@ void clif_parse_Adopt_reply(int fd, struct map_session_data *sd){
/// Convex Mirror (ZC_BOSS_INFO).
/// 0293 <infoType>.B <x>.L <y>.L <minHours>.W <minMinutes>.W <maxHours>.W <maxMinutes>.W <monster name>.51B
/// infoType:
-/// 0 = No boss on this map (BOSS_INFO_NOT).
-/// 1 = Boss is alive (position update) (BOSS_INFO_ALIVE).
-/// 2 = Boss is alive (initial announce) (BOSS_INFO_ALIVE_WITHMSG).
-/// 3 = Boss is dead (BOSS_INFO_DEAD).
-void clif_bossmapinfo(int fd, struct mob_data *md, short flag)
+/// BOSS_INFO_NOT = No boss on this map.
+/// BOSS_INFO_ALIVE = Boss is alive (position update).
+/// BOSS_INFO_ALIVE_WITHMSG = Boss is alive (initial announce).
+/// BOSS_INFO_DEAD = Boss is dead.
+void clif_bossmapinfo(struct map_session_data *sd, struct mob_data *md, enum e_bossmap_info flag)
{
+ int fd = sd->fd;
+
WFIFOHEAD(fd,70);
memset(WFIFOP(fd,0),0,70);
WFIFOW(fd,0) = 0x293;
- if( md != NULL ) {
- if( md->bl.prev != NULL ) { // Boss on This Map
- if( flag ) {
- WFIFOB(fd,2) = 1;
- WFIFOL(fd,3) = md->bl.x;
- WFIFOL(fd,7) = md->bl.y;
- } else
- WFIFOB(fd,2) = 2; // First Time
- } else if (md->spawn_timer != INVALID_TIMER) { // Boss is Dead
+ switch (flag) {
+ case BOSS_INFO_NOT:
+ WFIFOB(fd,2) = BOSS_INFO_NOT;
+ // No data required
+ break;
+ case BOSS_INFO_ALIVE:
+ WFIFOB(fd,2) = BOSS_INFO_ALIVE;
+ // Update X/Y
+ WFIFOL(fd,3) = md->bl.x;
+ WFIFOL(fd,7) = md->bl.y;
+ break;
+ case BOSS_INFO_ALIVE_WITHMSG:
+ WFIFOB(fd,2) = BOSS_INFO_ALIVE_WITHMSG;
+ // Current X/Y
+ WFIFOL(fd,3) = md->bl.x;
+ WFIFOL(fd,7) = md->bl.y;
+ break;
+ case BOSS_INFO_DEAD:
+ {
const struct TimerData * timer_data = get_timer(md->spawn_timer);
unsigned int seconds;
int hours, minutes;
@@ -16388,13 +16511,17 @@ void clif_bossmapinfo(int fd, struct mob_data *md, short flag)
seconds = seconds - (60 * 60 * hours);
minutes = seconds / 60;
- WFIFOB(fd,2) = 3;
+ WFIFOB(fd,2) = BOSS_INFO_DEAD;
+ // Add respawn info
WFIFOW(fd,11) = hours; // Hours
WFIFOW(fd,13) = minutes; // Minutes
}
- safestrncpy(WFIFOCP(fd,19), md->db->jname, NAME_LENGTH);
+ break;
}
+ if (md != NULL)
+ safestrncpy(WFIFOCP(fd,19), md->db->jname, NAME_LENGTH);
+
WFIFOSET(fd,70);
}
@@ -16403,7 +16530,7 @@ void clif_bossmapinfo(int fd, struct mob_data *md, short flag)
/// 02d6 <account id>.L
void clif_parse_ViewPlayerEquip(int fd, struct map_session_data* sd)
{
- int aid = RFIFOL(fd, packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
+ int aid = RFIFOL(fd, packet_db[RFIFOW(fd,0)].pos[0]);
struct map_session_data* tsd = map_id2sd(aid);
if (!tsd)
@@ -16425,8 +16552,8 @@ void clif_parse_ViewPlayerEquip(int fd, struct map_session_data* sd)
/// 1 = enabled
void clif_parse_EquipTick(int fd, struct map_session_data* sd)
{
- //int type = RFIFOL(fd,packet_db[sd->packet_ver][cmd].pos[0]);
- bool flag = (bool)RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[1]);
+ //int type = RFIFOL(fd,packet_db[cmd].pos[0]);
+ bool flag = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[1]) != 0;
sd->status.show_equip = flag;
clif_equiptickack(sd, flag);
}
@@ -16459,10 +16586,10 @@ static void clif_quest_len(int def_len, int info_len, int avail_quests, int *lim
(*len_out) = ((*limit_out) * info_len) + def_len;
}
-/// Sends list of all quest states (ZC_ALL_QUEST_LIST).
-/// 02b1 <packet len>.W <num>.L { <quest id>.L <active>.B }*num
+/// Sends list of all quest states
+/// 02b1 <packet len>.W <num>.L { <quest id>.L <active>.B }*num (ZC_ALL_QUEST_LIST)
/// 097a <packet len>.W <num>.L { <quest id>.L <active>.B <remaining time>.L <time>.L <count>.W { <mob_id>.L <killed>.W <total>.W <mob name>.24B }*count }*num (ZC_ALL_QUEST_LIST2)
-/// 09f8 <packet len>.W <num>.L { <quest id>.L <active>.B <remaining time>.L <time>.L <count>.W { <mob_id>.L <killed>.W <total>.W <mob name>.24B }*count }*num (ZC_ALL_QUEST_LIST3) // TODO!
+/// 09f8 <packet len>.W <num>.L { <quest id>.L <active>.B <remaining time>.L <time>.L <count>.W { <hunt identification>.L <mob type>.L <mob_id>.L <min level>.W <max level>.W <killed>.W <total>.W <mob name>.24B }*count }*num (ZC_ALL_QUEST_LIST3)
void clif_quest_send_list(struct map_session_data *sd)
{
int fd = sd->fd;
@@ -16471,9 +16598,19 @@ void clif_quest_send_list(struct map_session_data *sd)
int limit = 0;
#if PACKETVER >= 20141022
- clif_quest_len(offset, 15 + ((10 + NAME_LENGTH) * MAX_QUEST_OBJECTIVES), sd->avail_quests, &limit, &i);
+#if PACKETVER >= 20150513
+ int size = 22 + NAME_LENGTH;
+#else
+ int size = 10 + NAME_LENGTH;
+#endif
+
+ clif_quest_len(offset, 15 + ( size * MAX_QUEST_OBJECTIVES), sd->avail_quests, &limit, &i);
WFIFOHEAD(fd,i);
+#if PACKETVER >= 20150513
+ WFIFOW(fd, 0) = 0x9f8;
+#else
WFIFOW(fd, 0) = 0x97a;
+#endif
WFIFOL(fd, 4) = limit;
for (i = 0; i < limit; i++) {
@@ -16497,8 +16634,20 @@ void clif_quest_send_list(struct map_session_data *sd)
for( j = 0; j < qi->objectives_count; j++ ){
mob = mob_db(qi->objectives[j].mob);
+#if PACKETVER >= 20150513
+ WFIFOL(fd, offset) = sd->quest_log[i].quest_id * 1000 + j;
+ offset += 4;
+ WFIFOL(fd, offset) = 0; // TODO: Find info - mobType
+ offset += 4;
+#endif
WFIFOL(fd, offset) = qi->objectives[j].mob;
offset += 4;
+#if PACKETVER >= 20150513
+ WFIFOW(fd, offset) = 0; // TODO: Find info - levelMin
+ offset += 2;
+ WFIFOW(fd, offset) = 0; // TODO: Find info - levelMax
+ offset += 2;
+#endif
WFIFOW(fd, offset) = sd->quest_log[i].count[j];
offset += 2;
WFIFOW(fd, offset) = qi->objectives[j].count;
@@ -16564,31 +16713,71 @@ void clif_quest_send_mission(struct map_session_data *sd)
}
-/// Notification about a new quest (ZC_ADD_QUEST).
-/// 02b3 <quest id>.L <active>.B <start time>.L <expire time>.L <mobs>.W { <mob id>.L <mob count>.W <mob name>.24B }*3
+/// Notification about a new quest
+/// 02b3 <quest id>.L <active>.B <start time>.L <expire time>.L <mobs>.W { <mob id>.L <mob count>.W <mob name>.24B }*3 (ZC_ADD_QUEST)
+/// 08fe <packet len>.W { <quest id>.L <mob id>.L <total count>.W <current count>.W }*3 (ZC_HUNTING_QUEST_INFO)
+/// 09f9 <quest id>.L <active>.B <start time>.L <expire time>.L <mobs>.W { <hunt identification>.L <mob type>.L <mob id>.L <min level>.W <max level>.W <mob count>.W <mob name>.24B }*3 (ZC_ADD_QUEST_EX)
void clif_quest_add(struct map_session_data *sd, struct quest *qd)
{
int fd = sd->fd;
- int i;
+ int i, offset;
struct quest_db *qi = quest_search(qd->quest_id);
+#if PACKETVER >= 20150513
+ int cmd = 0x9f9;
+#else
+ int cmd = 0x2b3;
+#endif
- WFIFOHEAD(fd, packet_len(0x2b3));
- WFIFOW(fd, 0) = 0x2b3;
+ WFIFOHEAD(fd, packet_len(cmd));
+ WFIFOW(fd, 0) = cmd;
WFIFOL(fd, 2) = qd->quest_id;
WFIFOB(fd, 6) = qd->state;
WFIFOB(fd, 7) = qd->time - qi->time;
WFIFOL(fd, 11) = qd->time;
WFIFOW(fd, 15) = qi->objectives_count;
- for (i = 0; i < qi->objectives_count; i++) {
+ for (i = 0, offset = 17; i < qi->objectives_count; i++) {
struct mob_db *mob;
- WFIFOL(fd, i*30+17) = qi->objectives[i].mob;
- WFIFOW(fd, i*30+21) = qd->count[i];
+#if PACKETVER >= 20150513
+ WFIFOL(fd, offset) = qd->quest_id * 1000 + i;
+ offset += 4;
+ WFIFOL(fd, offset) = 0; // TODO: Find info - mobType
+ offset += 4;
+#endif
+ WFIFOL(fd, offset) = qi->objectives[i].mob;
+ offset += 4;
+#if PACKETVER >= 20150513
+ WFIFOW(fd, offset) = 0; // TODO: Find info - levelMin
+ offset += 2;
+ WFIFOW(fd, offset) = 0; // TODO: Find info - levelMax
+ offset += 2;
+#endif
+ WFIFOW(fd, offset) = qd->count[i];
+ offset += 2;
mob = mob_db(qi->objectives[i].mob);
- safestrncpy(WFIFOCP(fd, i*30+23), mob->jname, NAME_LENGTH);
+ safestrncpy(WFIFOCP(fd, offset), mob->jname, NAME_LENGTH);
+ offset += NAME_LENGTH;
}
- WFIFOSET(fd, packet_len(0x2b3));
+ WFIFOSET(fd, packet_len(cmd));
+
+#if PACKETVER >= 20150513
+ int len = 4 + qi->objectives_count * 12;
+
+ WFIFOHEAD(fd, len);
+ WFIFOW(fd, 0) = 0x8fe;
+ WFIFOW(fd, 2) = len;
+
+ for( i = 0, offset = 4; i < qi->objectives_count; i++, offset += 12 ){
+ WFIFOL(fd, offset) = qd->quest_id * 1000 + i;
+ WFIFOL(fd, offset+4) = qi->objectives[i].mob;
+ WFIFOW(fd, offset + 10) = qi->objectives[i].count;
+ WFIFOW(fd, offset + 12) = qd->count[i];
+ }
+
+ WFIFOSET(fd, len);
+
+#endif
}
@@ -16605,30 +16794,45 @@ void clif_quest_delete(struct map_session_data *sd, int quest_id)
}
-/// Notification of an update to the hunting mission counter (ZC_UPDATE_MISSION_HUNT).
-/// 02b5 <packet len>.W <mobs>.W { <quest id>.L <mob id>.L <total count>.W <current count>.W }*3
+/// Notification of an update to the hunting mission counter
+/// 02b5 <packet len>.W <mobs>.W { <quest id>.L <mob id>.L <total count>.W <current count>.W }*3 (ZC_UPDATE_MISSION_HUNT)
+/// 09fa <packet len>.W <mobs>.W { <quest id>.L <hunt identification>.L <total count>.W <current count>.W }*3 (ZC_UPDATE_MISSION_HUNT_EX)
void clif_quest_update_objective(struct map_session_data *sd, struct quest *qd, int mobid)
{
int fd = sd->fd;
- int i;
+ int i, offset;
struct quest_db *qi = quest_search(qd->quest_id);
int len = qi->objectives_count * 12 + 6;
+#if PACKETVER >= 20150513
+ int cmd = 0x9fa;
+#else
+ int cmd = 0x2b5;
+#endif
WFIFOHEAD(fd, len);
- WFIFOW(fd, 0) = 0x2b5;
- WFIFOW(fd, 2) = len;
+ WFIFOW(fd, 0) = cmd;
WFIFOW(fd, 4) = qi->objectives_count;
- for (i = 0; i < qi->objectives_count; i++) {
+ for (i = 0, offset = 6; i < qi->objectives_count; i++) {
if (mobid == 0 || mobid == qi->objectives[i].mob) {
- WFIFOL(fd, i * 12 + 6) = qd->quest_id;
- WFIFOL(fd, i * 12 + 10) = qi->objectives[i].mob;
- WFIFOW(fd, i * 12 + 14) = qi->objectives[i].count;
- WFIFOW(fd, i * 12 + 16) = qd->count[i];
+ WFIFOL(fd, offset) = qd->quest_id;
+ offset += 4;
+#if PACKETVER >= 20150513
+ WFIFOL(fd, offset) = qd->quest_id * 1000 + i;
+ offset += 4;
+#else
+ WFIFOL(fd, offset) = qi->objectives[i].mob;
+ offset += 4;
+#endif
+ WFIFOW(fd, offset) = qi->objectives[i].count;
+ offset += 2;
+ WFIFOW(fd, offset) = qd->count[i];
+ offset += 2;
}
}
- WFIFOSET(fd, len);
+ WFIFOW(fd, 2) = offset;
+ WFIFOSET(fd, offset);
}
@@ -16636,7 +16840,7 @@ void clif_quest_update_objective(struct map_session_data *sd, struct quest *qd,
/// 02b6 <quest id>.L <active>.B
void clif_parse_questStateAck(int fd, struct map_session_data *sd)
{
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
quest_update_status(sd, RFIFOL(fd,info->pos[0]),
RFIFOB(fd,info->pos[1])?Q_ACTIVE:Q_INACTIVE);
}
@@ -16842,7 +17046,7 @@ void clif_mercenary_skillblock(struct map_session_data *sd)
/// 2 = delete
void clif_parse_mercenary_action(int fd, struct map_session_data* sd)
{
- int option = RFIFOB(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
+ int option = RFIFOB(fd,packet_db[RFIFOW(fd,0)].pos[0]);
if( sd->md == NULL )
return;
@@ -17210,8 +17414,9 @@ void clif_party_show_picker(struct map_session_data * sd, struct item * item_dat
}
-/** Display gained exp (ZC_NOTIFY_EXP).
- * 07f6 <account id>.L <amount>.L <var id>.W <exp type>.W
+/** Display gained exp.
+ * 07f6 <account id>.L <amount>.L <var id>.W <exp type>.W (ZC_NOTIFY_EXP)
+ * 0acc <account id>.L <amount>.Q <var id>.W <exp type>.W (ZC_NOTIFY_EXP2)
* amount: INT32_MIN ~ INT32_MAX
* var id:
* SP_BASEEXP, SP_JOBEXP
@@ -17227,18 +17432,30 @@ void clif_party_show_picker(struct map_session_data * sd, struct item * item_dat
void clif_displayexp(struct map_session_data *sd, unsigned int exp, char type, bool quest, bool lost)
{
int fd;
+ int offset;
+#if PACKETVER >= 20170830
+ int cmd = 0xacc;
+#else
+ int cmd = 0x7f6;
+#endif
nullpo_retv(sd);
fd = sd->fd;
- WFIFOHEAD(fd, packet_len(0x7f6));
- WFIFOW(fd,0) = 0x7f6;
+ WFIFOHEAD(fd, packet_len(cmd));
+ WFIFOW(fd,0) = cmd;
WFIFOL(fd,2) = sd->bl.id;
+#if PACKETVER >= 20170830
+ WFIFOQ(fd,6) = (int64)u64min((uint64)exp, INT_MAX) * (lost ? -1 : 1);
+ offset = 4;
+#else
WFIFOL(fd,6) = (int)umin(exp, INT_MAX) * (lost ? -1 : 1);
- WFIFOW(fd,10) = type;
- WFIFOW(fd,12) = (quest && type != SP_JOBEXP) ? 1 : 0; // NOTE: Somehow JobEXP always in yellow color
- WFIFOSET(fd,packet_len(0x7f6));
+ offset = 0;
+#endif
+ WFIFOW(fd,10+offset) = type;
+ WFIFOW(fd,12+offset) = (quest && type != SP_JOBEXP) ? 1 : 0; // NOTE: Somehow JobEXP always in yellow color
+ WFIFOSET(fd,packet_len(cmd));
}
@@ -17273,15 +17490,13 @@ void clif_showdigit(struct map_session_data* sd, unsigned char type, int value)
/// as the only skill unit, that is sent with 0x1c9 is
/// Graffiti.
void clif_parse_LessEffect(int fd, struct map_session_data* sd){
- int isLess = RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
+ int isLess = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
sd->state.lesseffect = ( isLess != 0 );
}
-/// S 07e4 <length>.w <option>.l <val>.l {<index>.w <amount>.w).4b* (CZ_ITEMLISTWIN_RES)
-/// S 0945 <length>.w <option>.l <val>.l {<index>.w <amount>.w).4b* (CZ_* RagexeRE 2012-04-10a)
-/// S 0281 <length>.w <option>.l <val>.l {<index>.w <amount>.w).4b* (CZ_* Ragexe 2013-08-07)
+/// 07e4 <length>.w <option>.l <val>.l {<index>.w <amount>.w).4b* (CZ_ITEMLISTWIN_RES)
void clif_parse_ItemListWindowSelected(int fd, struct map_session_data* sd) {
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
int n = (RFIFOW(fd,info->pos[0])-12) / 4;
int type = RFIFOL(fd,info->pos[1]);
int flag = RFIFOL(fd,info->pos[2]); // Button clicked: 0 = Cancel, 1 = OK
@@ -17398,7 +17613,7 @@ static void clif_parse_ReqOpenBuyingStore(int fd, struct map_session_data* sd)
unsigned char result;
int zenylimit;
unsigned int count, packet_len;
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
packet_len = RFIFOW(fd,info->pos[0]);
@@ -17532,7 +17747,7 @@ static void clif_parse_ReqClickBuyingStore(int fd, struct map_session_data* sd)
{
uint32 account_id;
- account_id = RFIFOL(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]);
+ account_id = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
buyingstore_open(sd, account_id);
}
@@ -17572,7 +17787,7 @@ static void clif_parse_ReqTradeBuyingStore(int fd, struct map_session_data* sd)
uint8* itemlist;
uint32 account_id;
unsigned int count, packet_len, buyer_id;
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
packet_len = RFIFOW(fd,info->pos[0]);
@@ -17704,7 +17919,7 @@ static void clif_parse_SearchStoreInfo(int fd, struct map_session_data* sd)
const uint8* cardlist;
unsigned char type;
unsigned int min_price, max_price, packet_len, count, item_count, card_count;
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
packet_len = RFIFOW(fd,info->pos[0]);
@@ -17752,7 +17967,7 @@ static void clif_parse_SearchStoreInfo(int fd, struct map_session_data* sd)
/// 1 = "next" label to retrieve more results
void clif_search_store_info_ack(struct map_session_data* sd)
{
-#if PACKETVER >= 20150226
+#if PACKETVER >= 20150225
const unsigned int blocksize = MESSAGE_SIZE+26+5*MAX_ITEM_RDM_OPT;
#else
const unsigned int blocksize = MESSAGE_SIZE+26;
@@ -17857,7 +18072,7 @@ static void clif_parse_SearchStoreInfoListItemClick(int fd, struct map_session_d
{
unsigned short nameid;
uint32 account_id, store_id;
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
account_id = RFIFOL(fd,info->pos[0]);
store_id = RFIFOL(fd,info->pos[1]);
@@ -17890,7 +18105,7 @@ void clif_parse_debug(int fd,struct map_session_data *sd)
cmd = RFIFOW(fd,0);
if( sd ) {
- packet_len = packet_db[sd->packet_ver][cmd].len;
+ packet_len = packet_db[cmd].len;
if( packet_len == 0 )
{// unknown
@@ -18135,7 +18350,7 @@ int clif_skill_itemlistwindow( struct map_session_data *sd, uint16 skill_id, uin
* RFIFOL(fd,2) - type (currently not used)
*------------------------------------------*/
void clif_parse_SkillSelectMenu(int fd, struct map_session_data *sd) {
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
//int type = RFIFOL(fd,info->pos[0]); //WHY_LOWERVER_COMPATIBILITY = 0x0, WHY_SC_AUTOSHADOWSPELL = 0x1,
if( sd->menuskill_id != SC_AUTOSHADOWSPELL )
return;
@@ -18176,7 +18391,7 @@ void clif_spiritcharm(struct map_session_data *sd) {
/// 1 = move item to normal tab
void clif_parse_MoveItem(int fd, struct map_session_data *sd) {
#if PACKETVER >= 20111122
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
int index = RFIFOW(fd,info->pos[0]) - 2;
int type = RFIFOB(fd, info->pos[1]);
@@ -18435,7 +18650,7 @@ void clif_ranklist(struct map_session_data *sd, int16 rankingType) {
* 3: /pk
* */
void clif_parse_ranklist(int fd,struct map_session_data *sd) {
- struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
+ struct s_packet_db* info = &packet_db[RFIFOW(fd,0)];
int16 rankingtype = RFIFOW(fd,info->pos[0]); //type
clif_ranklist(sd,rankingtype);
@@ -18603,8 +18818,8 @@ void clif_display_pinfo(struct map_session_data *sd, int cmdtype) {
details_penalty[3] = 0;
/* End - Penalty set*/
- cmd = packet_db_ack[sd->packet_ver][cmdtype];
- info = &packet_db[sd->packet_ver][cmd];
+ cmd = packet_db_ack[cmdtype];
+ info = &packet_db[cmd];
len = info->len; //this is the base len without details
if(!len) return; //version as packet disable
@@ -18674,10 +18889,10 @@ void clif_crimson_marker(struct map_session_data *sd, struct block_list *bl, boo
nullpo_retv(sd);
- cmd = packet_db_ack[sd->packet_ver][ZC_C_MARKERINFO];
+ cmd = packet_db_ack[ZC_C_MARKERINFO];
if (!cmd)
cmd = 0x09C1; //default
- info = &packet_db[sd->packet_ver][cmd];
+ info = &packet_db[cmd];
if (!(len = info->len))
return;
@@ -18697,8 +18912,8 @@ void clif_notify_bindOnEquip(struct map_session_data *sd, int n) {
nullpo_retv(sd);
- cmd = packet_db_ack[sd->packet_ver][ZC_NOTIFY_BIND_ON_EQUIP];
- info = &packet_db[sd->packet_ver][cmd];
+ cmd = packet_db_ack[ZC_NOTIFY_BIND_ON_EQUIP];
+ info = &packet_db[cmd];
if (!cmd || !info->len)
return;
@@ -18712,7 +18927,7 @@ void clif_notify_bindOnEquip(struct map_session_data *sd, int n) {
* [Ind/Hercules]
* 08b3 <Length>.W <id>.L <message>.?B (ZC_SHOWSCRIPT)
**/
-void clif_showscript(struct block_list* bl, const char* message) {
+void clif_showscript(struct block_list* bl, const char* message, enum send_target flag) {
char buf[256];
size_t len;
nullpo_retv(bl);
@@ -18731,7 +18946,7 @@ void clif_showscript(struct block_list* bl, const char* message) {
WBUFW(buf,2) = (uint16)(len+8);
WBUFL(buf,4) = bl->id;
safestrncpy(WBUFCP(buf,8), message, len);
- clif_send((unsigned char *) buf, WBUFW(buf,2), bl, AREA);
+ clif_send((unsigned char *) buf, WBUFW(buf,2), bl, flag);
}
/**
@@ -18888,25 +19103,58 @@ void clif_clan_leave( struct map_session_data* sd ){
}
/**
- * Decrypt packet identifier for player
- * @param fd
- * @param sd
- * @param packet_ver
- * Orig author [Ind/Hercules]
- **/
-static unsigned short clif_parse_cmd(int fd, struct map_session_data *sd) {
-#ifndef PACKET_OBFUSCATION
- return RFIFOW(fd, 0);
-#else
- unsigned short cmd = RFIFOW(fd,0); // Check if it is a player that tries to connect to the map server.
- if (sd)
- cmd = (cmd ^ ((sd->cryptKey >> 16) & 0x7FFF)); // Decrypt the current packet ID with the last key stored in the session.
- else
- cmd = (cmd ^ ((((clif_cryptKey[0] * clif_cryptKey[1]) + clif_cryptKey[2]) >> 16) & 0x7FFF)); // A player tries to connect - use the initial keys for the decryption of the packet ID.
- return cmd; // Return the decrypted packet ID.
+ * Acknowledge the client about change title result (ZC_ACK_CHANGE_TITLE).
+ * 0A2F <result>.B <title_id>.L
+ */
+void clif_change_title_ack(struct map_session_data *sd, unsigned char result, unsigned long title_id)
+{
+#if PACKETVER >= 20150513
+ int fd;
+
+ nullpo_retv(sd);
+
+ if (!clif_session_isValid(sd))
+ return;
+ fd = sd->fd;
+
+ WFIFOHEAD(fd, packet_len(0xa2f));
+ WFIFOW(fd, 0) = 0xa2f;
+ WFIFOB(fd, 2) = result;
+ WFIFOL(fd, 3) = title_id;
+ WFIFOSET(fd, packet_len(0xa2f));
#endif
}
+/**
+ * Parsing a request from the client change title (CZ_REQ_CHANGE_TITLE).
+ * 0A2E <title_id>.L
+ */
+void clif_parse_change_title(int fd, struct map_session_data *sd)
+{
+ int title_id;
+
+ nullpo_retv(sd);
+
+ title_id = RFIFOL(fd, 2);
+
+ if( title_id == sd->status.title_id ){
+ // It is exactly the same as the old one
+ return;
+ }else if( title_id <= 0 ){
+ sd->status.title_id = 0;
+ }else{
+ if (std::find(sd->titles.begin(), sd->titles.end(), title_id) == sd->titles.end()) {
+ clif_change_title_ack(sd, 1, title_id);
+ return;
+ }
+
+ sd->status.title_id = title_id;
+ }
+
+ clif_name_area(&sd->bl);
+ clif_change_title_ack(sd, 0, title_id);
+}
+
#ifdef DUMP_UNKNOWN_PACKET
void DumpUnknown(int fd,TBL_PC *sd,int cmd,int packet_len)
{
@@ -19039,7 +19287,7 @@ static void clif_roulette_recvitem_ack(struct map_session_data *sd, enum RECV_RO
nullpo_retv(sd);
- if (packet_db[sd->packet_ver][cmd].len == 0)
+ if (packet_db[cmd].len == 0)
return;
WBUFW(buf,0) = cmd;
@@ -19220,9 +19468,9 @@ void clif_merge_item_ack(struct map_session_data *sd, unsigned short index, unsi
if (!clif_session_isValid(sd))
return;
- if (!(cmd = packet_db_ack[sd->packet_ver][ZC_ACK_MERGE_ITEM]))
+ if (!(cmd = packet_db_ack[ZC_ACK_MERGE_ITEM]))
return;
- if (!(info = &packet_db[sd->packet_ver][cmd]) || info->len == 0)
+ if (!(info = &packet_db[cmd]) || info->len == 0)
return;
WBUFW(buf, 0) = cmd;
@@ -19287,9 +19535,9 @@ void clif_merge_item_open(struct map_session_data *sd) {
nullpo_retv(sd);
if (!clif_session_isValid(sd))
return;
- if (!(cmd = packet_db_ack[sd->packet_ver][ZC_MERGE_ITEM_OPEN]))
+ if (!(cmd = packet_db_ack[ZC_MERGE_ITEM_OPEN]))
return;
- if (!(info = &packet_db[sd->packet_ver][cmd]) || info->len == 0)
+ if (!(info = &packet_db[cmd]) || info->len == 0)
return;
// Get entries
@@ -19329,7 +19577,7 @@ void clif_parse_merge_item_req(int fd, struct map_session_data* sd) {
nullpo_retv(sd);
if (!clif_session_isValid(sd))
return;
- if (!(info = &packet_db[sd->packet_ver][RFIFOW(fd,0)]) || info->len == 0)
+ if (!(info = &packet_db[RFIFOW(fd,0)]) || info->len == 0)
return;
n = (RFIFOW(fd, info->pos[0]) - 4) / 2;
@@ -19388,7 +19636,7 @@ void clif_parse_merge_item_cancel(int fd, struct map_session_data* sd) {
/**
* 07fd <size>.W <type>.B <itemid>.W <charname_len>.B <charname>.24B <source_len>.B <containerid>.W (ZC_BROADCASTING_SPECIAL_ITEM_OBTAIN)
* 07fd <size>.W <type>.B <itemid>.W <charname_len>.B <charname>.24B <source_len>.B <srcname>.24B (ZC_BROADCASTING_SPECIAL_ITEM_OBTAIN)
- * type: ITEMOBTAIN_TYPE_BOXITEM & ITEMOBTAIN_TYPE_MONSTER_ITEM "[playername] ... [surcename] ... [itemname]" -> MsgStringTable[1629]
+ * type: ITEMOBTAIN_TYPE_BOXITEM & ITEMOBTAIN_TYPE_MONSTER_ITEM "[playername] ... [sourcename] ... [itemname]" -> MsgStringTable[1629]
* type: ITEMOBTAIN_TYPE_NPC "[playername] ... [itemname]" -> MsgStringTable[1870]
**/
void clif_broadcast_obtain_special_item(const char *char_name, unsigned short nameid, unsigned short container, enum BROADCASTING_SPECIAL_ITEM_OBTAIN type, const char *srcname) {
@@ -19396,17 +19644,25 @@ void clif_broadcast_obtain_special_item(const char *char_name, unsigned short na
unsigned short cmd = 0;
struct s_packet_db *info = NULL;
- if (!(cmd = packet_db_ack[clif_config.packet_db_ver][ZC_BROADCASTING_SPECIAL_ITEM_OBTAIN]))
+ if (!(cmd = packet_db_ack[ZC_BROADCASTING_SPECIAL_ITEM_OBTAIN]))
return;
- if (!(info = &packet_db[clif_config.packet_db_ver][cmd]) || info->len == 0)
+ if (!(info = &packet_db[cmd]) || info->len == 0)
return;
WBUFW(buf, 0) = 0x7fd;
WBUFB(buf, 4) = type;
WBUFW(buf, 5) = nameid;
WBUFB(buf, 7) = NAME_LENGTH;
- safestrncpy(WBUFCP(buf, 8), char_name, NAME_LENGTH);
+
+ if (battle_config.broadcast_hide_name) {
+ std::string dispname = std::string(char_name);
+ int hide = min(battle_config.broadcast_hide_name, dispname.length() - 1);
+ dispname.replace(dispname.length() - hide, hide, hide, '*');
+ safestrncpy(WBUFCP(buf, 8), dispname.c_str(), NAME_LENGTH);
+ }
+ else
+ safestrncpy(WBUFCP(buf, 8), char_name, NAME_LENGTH);
switch (type) {
case ITEMOBTAIN_TYPE_BOXITEM:
@@ -19454,7 +19710,7 @@ void clif_dressing_room(struct map_session_data *sd, int flag) {
/// 0A35 <result>.W
void clif_parse_Oneclick_Itemidentify(int fd, struct map_session_data *sd) {
#if PACKETVER >= 20150513
- short idx = RFIFOW(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]) - 2, magnifier_idx;
+ short idx = RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[0]) - 2, magnifier_idx;
// Ignore the request
// - Invalid item index
@@ -19829,14 +20085,128 @@ void clif_parse_sale_remove( int fd, struct map_session_data* sd ){
#endif
}
+/// Achievement System
+/// Author: Luxuri, Aleos
+
+/**
+ * Sends all achievement data to the client (ZC_ALL_AG_LIST).
+ * 0a23 <packetType>.W <packetLength>.W <ACHCount>.L <ACHPoint>.L
+ */
+void clif_achievement_list_all(struct map_session_data *sd)
+{
+ int i, j, len, fd, *info;
+ uint16 count = 0;
+
+ nullpo_retv(sd);
+
+ if (!battle_config.feature_achievement) {
+ clif_messagecolor(&sd->bl,color_table[COLOR_RED],msg_txt(sd,772),false,SELF); // Achievements are disabled.
+ return;
+ }
+
+ fd = sd->fd;
+ count = sd->achievement_data.count; // All achievements should be sent to the client
+ len = (50 * count) + 22;
+
+ if (len <= 22)
+ return;
+
+ info = achievement_level(sd, true);
+
+ WFIFOHEAD(fd,len);
+ WFIFOW(fd, 0) = 0xa23;
+ WFIFOW(fd, 2) = len;
+ WFIFOL(fd, 4) = count; // Amount of achievements the player has in their list (started/completed)
+ WFIFOL(fd, 8) = sd->achievement_data.total_score; // Top number
+ WFIFOW(fd, 12) = sd->achievement_data.level; // Achievement Level (gold circle)
+ WFIFOL(fd, 14) = info[0]; // Achievement EXP (left number in bar)
+ WFIFOL(fd, 18) = info[1]; // Achievement EXP TNL (right number in bar)
+
+ for (i = 0; i < count; i++) {
+ WFIFOL(fd, i * 50 + 22) = (uint32)sd->achievement_data.achievements[i].achievement_id;
+ WFIFOB(fd, i * 50 + 26) = (uint32)sd->achievement_data.achievements[i].completed > 0;
+ for (j = 0; j < MAX_ACHIEVEMENT_OBJECTIVES; j++)
+ WFIFOL(fd, (i * 50) + 27 + (j * 4)) = (uint32)sd->achievement_data.achievements[i].count[j];
+ WFIFOL(fd, i * 50 + 67) = (uint32)sd->achievement_data.achievements[i].completed;
+ WFIFOB(fd, i * 50 + 71) = sd->achievement_data.achievements[i].rewarded > 0;
+ }
+ WFIFOSET(fd, len);
+}
+
+/**
+ * Sends a single achievement's data to the client (ZC_AG_UPDATE).
+ * 0a24 <packetType>.W <ACHPoint>.L
+ */
+void clif_achievement_update(struct map_session_data *sd, struct achievement *ach, int count)
+{
+ int fd, i, *info;
+
+ nullpo_retv(sd);
+
+ if (!battle_config.feature_achievement) {
+ clif_messagecolor(&sd->bl,color_table[COLOR_RED],msg_txt(sd,772),false,SELF); // Achievements are disabled.
+ return;
+ }
+
+ fd = sd->fd;
+ info = achievement_level(sd, true);
+
+ WFIFOHEAD(fd, packet_len(0xa24));
+ WFIFOW(fd, 0) = 0xa24;
+ WFIFOL(fd, 2) = sd->achievement_data.total_score; // Total Achievement Points (top of screen)
+ WFIFOW(fd, 6) = sd->achievement_data.level; // Achievement Level (gold circle)
+ WFIFOL(fd, 8) = info[0]; // Achievement EXP (left number in bar)
+ WFIFOL(fd, 12) = info[1]; // Achievement EXP TNL (right number in bar)
+ if (ach) {
+ WFIFOL(fd, 16) = ach->achievement_id; // Achievement ID
+ WFIFOB(fd, 20) = ach->completed > 0; // Is it complete?
+ for (i = 0; i < MAX_ACHIEVEMENT_OBJECTIVES; i++)
+ WFIFOL(fd, 21 + (i * 4)) = (uint32)ach->count[i]; // 1~10 pre-reqs
+ WFIFOL(fd, 61) = (uint32)ach->completed; // Epoch time
+ WFIFOB(fd, 65) = ach->rewarded > 0; // Got reward?
+ } else
+ memset(WFIFOP(fd, 16), 0, 40);
+ WFIFOSET(fd, packet_len(0xa24));
+}
+
+/**
+ * Checks if an achievement reward can be rewarded (CZ_REQ_AG_REWARD).
+ * 0a25 <packetType>.W <achievementID>.L
+ */
+void clif_parse_AchievementCheckReward(int fd, struct map_session_data *sd)
+{
+ nullpo_retv(sd);
+
+ if( sd->achievement_data.save )
+ intif_achievement_save(sd);
+
+ achievement_check_reward(sd, RFIFOL(fd,2));
+}
+
+/**
+ * Returns the result of achievement_check_reward (ZC_REQ_AG_REWARD_ACK).
+ * 0a26 <packetType>.W <result>.W <achievementID>.L
+ */
+void clif_achievement_reward_ack(int fd, unsigned char result, int achievement_id)
+{
+ WFIFOHEAD(fd, packet_len(0xa26));
+ WFIFOW(fd, 0) = 0xa26;
+ WFIFOB(fd, 2) = result;
+ WFIFOL(fd, 3) = achievement_id;
+ WFIFOSET(fd, packet_len(0xa26));
+}
+
/*==========================================
* Main client packet processing function
*------------------------------------------*/
static int clif_parse(int fd)
{
- int cmd, packet_ver, packet_len, err;
+ int cmd, packet_len;
TBL_PC* sd;
int pnum;
+#ifdef PACKET_OBFUSCATION
+ int cmd2;
+#endif
//TODO apply delays or disconnect based on packet throughput [FlavioJS]
// Note: "click masters" can do 80+ clicks in 10 seconds
@@ -19852,11 +20222,11 @@ static int clif_parse(int fd)
//Disassociate character from the socket connection.
session[fd]->session_data = NULL;
sd->fd = 0;
- ShowInfo("Character '"CL_WHITE"%s"CL_RESET"' logged off (using @autotrade).\n", sd->status.name);
+ ShowInfo("Character '" CL_WHITE "%s" CL_RESET "' logged off (using @autotrade).\n", sd->status.name);
} else
if (sd->state.active) {
// Player logout display [Valaris]
- ShowInfo("Character '"CL_WHITE"%s"CL_RESET"' logged off.\n", sd->status.name);
+ ShowInfo("Character '" CL_WHITE "%s" CL_RESET "' logged off.\n", sd->status.name);
clif_quitsave(fd, sd);
} else {
//Unusual logout (during log on/off/map-changer procedure)
@@ -19864,7 +20234,7 @@ static int clif_parse(int fd)
map_quit(sd);
}
} else {
- ShowInfo("Closed connection from '"CL_WHITE"%s"CL_RESET"'.\n", ip2str(session[fd]->client_addr, NULL));
+ ShowInfo("Closed connection from '" CL_WHITE "%s" CL_RESET "'.\n", ip2str(session[fd]->client_addr, NULL));
}
do_close(fd);
return 0;
@@ -19873,52 +20243,54 @@ static int clif_parse(int fd)
if (RFIFOREST(fd) < 2)
return 0;
- cmd = clif_parse_cmd(fd, sd);
+ cmd = RFIFOW(fd, 0);
- // identify client's packet version
- if (sd) {
- packet_ver = sd->packet_ver;
- } else {
- // check authentification packet to know packet version
- packet_ver = clif_guess_PacketVer(fd, 0, &err);
- if( err ) {// failed to identify packet version
- ShowInfo("clif_parse: Disconnecting session #%d with unknown packet version%s (p:0x%04x,l:%d).\n", fd, (
- err == 1 ? "" :
- err == 2 ? ", possibly for having an invalid account_id" :
- err == 3 ? ", possibly for having an invalid char_id." :
- /* Uncomment when checks are added in clif_guess_PacketVer. [FlavioJS]
- err == 4 ? ", possibly for having an invalid login_id1." :
- err == 5 ? ", possibly for having an invalid client_tick." :
- */
- err == 6 ? ", possibly for having an invalid sex." :
- ". ERROR invalid error code"), cmd, RFIFOREST(fd));
- WFIFOHEAD(fd,packet_len(0x6a));
- WFIFOW(fd,0) = 0x6a;
- WFIFOB(fd,2) = 3; // Rejected from Server
- WFIFOSET(fd,packet_len(0x6a));
-
-#ifdef DUMP_INVALID_PACKET
- ShowDump(RFIFOP(fd,0), RFIFOREST(fd));
-#endif
+#ifdef PACKET_OBFUSCATION
+ // Check if it is a player that tries to connect to the map server.
+ if( sd ){
+ // Decrypt the current packet ID with the last key stored in the session.
+ cmd = (cmd ^ ((sd->cryptKey >> 16) & 0x7FFF));
+ }else{
+ // Store the original value for checking
+ cmd2 = cmd;
- RFIFOSKIP(fd, RFIFOREST(fd));
- set_eof(fd);
- return 0;
- }
+ // A player tries to connect - use the initial keys for the decryption of the packet ID.
+ cmd = (cmd ^ ((((clif_cryptKey[0] * clif_cryptKey[1]) + clif_cryptKey[2]) >> 16) & 0x7FFF));
}
+#endif
// filter out invalid / unsupported packets
- if (cmd > MAX_PACKET_DB || cmd < MIN_PACKET_DB || packet_db[packet_ver][cmd].len == 0) {
+ if (cmd > MAX_PACKET_DB || cmd < MIN_PACKET_DB || packet_db[cmd].len == 0) {
ShowWarning("clif_parse: Received unsupported packet (packet 0x%04x, %d bytes received), disconnecting session #%d.\n", cmd, RFIFOREST(fd), fd);
+
#ifdef DUMP_INVALID_PACKET
ShowDump(RFIFOP(fd,0), RFIFOREST(fd));
#endif
+
+#ifdef PACKET_OBFUSCATION_WARN
+ // If it is a connection attempt, check if the packet would have been valid without decrypting it
+ if( !sd ){
+#ifdef PACKET_OBFUSCATION
+ if( cmd2 >= MIN_PACKET_DB && cmd2 < MAX_PACKET_DB && packet_db[cmd2].len != 0 && packet_db[cmd2].func == clif_parse_WantToConnection ){
+ ShowWarning( "clif_parse: It looks like you have enabled PACKET_OBFUSCATION on server side, but disabled it on client side.\n" );
+ }
+#else
+ // Try to use the initial keys for the decryption of the packet ID.
+ cmd = (cmd ^ ((((clif_cryptKey[0] * clif_cryptKey[1]) + clif_cryptKey[2]) >> 16) & 0x7FFF));
+
+ if( cmd >= MIN_PACKET_DB && cmd < MAX_PACKET_DB && packet_db[cmd].len != 0 && packet_db[cmd].func == clif_parse_WantToConnection ){
+ ShowWarning( "clif_parse: It looks like you have disabled PACKET_OBFUSCATION on server side, but enabled it on client side.\n" );
+ }
+#endif
+ }
+#endif
+
set_eof(fd);
return 0;
}
// determine real packet length
- packet_len = packet_db[packet_ver][cmd].len;
+ packet_len = packet_db[cmd].len;
if (packet_len == -1) { // variable-length packet
if (RFIFOREST(fd) < 4)
return 0;
@@ -19942,16 +20314,16 @@ static int clif_parse(int fd)
sd->cryptKey = ((sd->cryptKey * clif_cryptKey[1]) + clif_cryptKey[2]) & 0xFFFFFFFF; // Update key for the next packet
#endif
- if( packet_db[packet_ver][cmd].func == clif_parse_debug )
- packet_db[packet_ver][cmd].func(fd, sd);
- else if( packet_db[packet_ver][cmd].func != NULL ) {
- if( !sd && packet_db[packet_ver][cmd].func != clif_parse_WantToConnection )
+ if( packet_db[cmd].func == clif_parse_debug )
+ packet_db[cmd].func(fd, sd);
+ else if( packet_db[cmd].func != NULL ) {
+ if( !sd && packet_db[cmd].func != clif_parse_WantToConnection )
; //Only valid packet when there is no session
else
- if( sd && sd->bl.prev == NULL && packet_db[packet_ver][cmd].func != clif_parse_LoadEndAck )
+ if( sd && sd->bl.prev == NULL && packet_db[cmd].func != clif_parse_LoadEndAck )
; //Only valid packet when player is not on a map
else
- packet_db[packet_ver][cmd].func(fd, sd);
+ packet_db[cmd].func(fd, sd);
}
#ifdef DUMP_UNKNOWN_PACKET
else DumpUnknown(fd,sd,cmd,packet_len);
@@ -19962,782 +20334,51 @@ static int clif_parse(int fd)
return 0;
}
-/*==========================================
- * Reads packet_db.txt and setups its array reference
- *------------------------------------------*/
-void packetdb_readdb(bool reload)
-{
- char line[1024];
- int cmd,i,j;
- int max_cmd=-1;
- bool skip_ver = false;
- int warned = 0;
- int packet_ver = MAX_PACKET_VER; // read into packet_db's version by default
-#ifdef PACKET_OBFUSCATION
- bool key_defined = false;
- int last_key_defined = -1;
-#endif
-
- int packet_len_table[MAX_PACKET_DB] = {
- 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- //#0x0040
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-#if PACKETVER <= 20081217
- 0, 0, 0, 0, 55, 17, 3, 37, 46, -1, 23, -1, 3,110, 3, 2,
-#else
- 0, 0, 0, 0, 55, 17, 3, 37, 46, -1, 23, -1, 3,114, 3, 2,
-#endif
-#if PACKETVER < 2
- 3, 28, 19, 11, 3, -1, 9, 5, 52, 51, 56, 58, 41, 2, 6, 6,
-#elif PACKETVER < 20071106 // 78-7b Lv99 effect for later Kameshima
- 3, 28, 19, 11, 3, -1, 9, 5, 54, 53, 58, 60, 41, 2, 6, 6,
-#elif PACKETVER <= 20081217 // change in 0x78 and 0x7c
- 3, 28, 19, 11, 3, -1, 9, 5, 55, 53, 58, 60, 42, 2, 6, 6,
-#else
- 3, 28, 19, 11, 3, -1, 9, 5, 55, 53, 58, 60, 44, 2, 6, 6,
-#endif
- //#0x0080
- 7, 3, 2, 2, 2, 5, 16, 12, 10, 7, 29, 2, -1, -1, -1, 0, // 0x8b changed to 2 (was 23)
- 7, 22, 28, 2, 6, 30, -1, -1, 3, -1, -1, 5, 9, 17, 17, 6,
-#if PACKETVER <= 20100622
- 23, 6, 6, -1, -1, -1, -1, 8, 7, 6, 7, 4, 7, 0, -1, 6,
-#else
- 23, 6, 6, -1, -1, -1, -1, 8, 7, 6, 9, 4, 7, 0, -1, 6, // 0xaa changed to 9 (was 7)
-#endif
- 8, 8, 3, 3, -1, 6, 6, -1, 7, 6, 2, 5, 6, 44, 5, 3,
- //#0x00C0
- 7, 2, 6, 8, 6, 7, -1, -1, -1, -1, 3, 3, 6, 3, 2, 27, // 0xcd change to 3 (was 6)
- 3, 4, 4, 2, -1, -1, 3, -1, 6, 14, 3, -1, 28, 29, -1, -1,
- 30, 30, 26, 2, 6, 26, 3, 3, 8, 19, 5, 2, 3, 2, 2, 2,
- 3, 2, 6, 8, 21, 8, 8, 2, 2, 26, 3, -1, 6, 27, 30, 10,
- //#0x0100
- 2, 6, 6, 30, 79, 31, 10, 10, -1, -1, 4, 6, 6, 2, 11, -1,
- 10, 39, 4, 10, 31, 35, 10, 18, 2, 13, 15, 20, 68, 2, 3, 16,
- 6, 14, -1, -1, 21, 8, 8, 8, 8, 8, 2, 2, 3, 4, 2, -1,
- 6, 86, 6, -1, -1, 7, -1, 6, 3, 16, 4, 4, 4, 6, 24, 26,
- //#0x0140
- 22, 14, 6, 10, 23, 19, 6, 39, 8, 9, 6, 27, -1, 2, 6, 6,
- 110, 6, -1, -1, -1, -1, -1, 6, -1, 54, 66, 54, 90, 42, 6, 42,
- -1, -1, -1, -1, -1, 30, -1, 3, 14, 3, 30, 10, 43, 14,186,182,
- 14, 30, 10, 3, -1, 6,106, -1, 4, 5, 4, -1, 6, 7, -1, -1,
- //#0x0180
- 6, 3,106, 10, 10, 34, 0, 6, 8, 4, 4, 4, 29, -1, 10, 6,
-#if PACKETVER < 1
- 90, 86, 24, 6, 30,102, 8, 4, 8, 4, 14, 10, -1, 6, 2, 6,
-#else // 196 comodo icon status display for later
- 90, 86, 24, 6, 30,102, 9, 4, 8, 4, 14, 10, -1, 6, 2, 6,
-#endif
-#if PACKETVER < 20081126
- 3, 3, 35, 5, 11, 26, -1, 4, 4, 6, 10, 12, 6, -1, 4, 4,
-#else // 0x1a2 changed (35->37)
- 3, 3, 37, 5, 11, 26, -1, 4, 4, 6, 10, 12, 6, -1, 4, 4,
-#endif
- 11, 7, -1, 67, 12, 18,114, 6, 3, 6, 26, 26, 26, 26, 2, 3,
- //#0x01C0, Set 0x1d5=-1
- 2, 14, 10, -1, 22, 22, 4, 2, 13, 97, 3, 9, 9, 30, 6, 28,
- 8, 14, 10, 35, 6, -1, 4, 11, 54, 53, 60, 2, -1, 47, 33, 6,
- 30, 8, 34, 14, 2, 6, 26, 2, 28, 81, 6, 10, 26, 2, -1, -1,
- -1, -1, 20, 10, 32, 9, 34, 14, 2, 6, 48, 56, -1, 4, 5, 10,
- //#0x0200
- 26, -1, 26, 10, 18, 26, 11, 34, 14, 36, 10, 0, 0, -1, 32, 10, // 0x20c change to 0 (was 19)
- 22, 0, 26, 26, 42, 6, 6, 2, 2,282,282, 10, 10, -1, -1, 66,
-#if PACKETVER < 20071106
- 10, -1, -1, 8, 10, 2,282, 18, 18, 15, 58, 57, 64, 5, 71, 5,
-#else // 0x22c changed
- 10, -1, -1, 8, 10, 2,282, 18, 18, 15, 58, 57, 65, 5, 71, 5,
-#endif
- 12, 26, 9, 11, -1, -1, 10, 2,282, 11, 4, 36, 6, -1, 4, 2,
- //#0x0240
- -1, -1, -1, -1, -1, 3, 4, 8, -1, 3, 70, 4, 8, 12, 4, 10,
- 3, 32, -1, 3, 3, 5, 5, 8, 2, 3, -1, 6, 4, 6, 4, 6,
- 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- //#0x0280
-#if PACKETVER < 20070711
- 0, 0, 0, 6, 14, 0, 0, -1, 6, 8, 18, 0, 0, 0, 0, 0,
-#else
- 0, 0, 0, 6, 14, 0, 0, -1, 10, 12, 18, 0, 0, 0, 0, 0, // 0x288, 0x289 increase by 4 (kafra points)
-#endif
- 0, 4, 0, 70, 10, 0, 0, 0, 8, 6, 27, 80, 0, -1, 0, 0,
- 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 85, -1, -1,107, 6, -1, 7, 7, 22,191, 0, 8, 0, 0, 0, 0,
- //#0x02C0
- 0, -1, 0, 0, 0, 30, 30, 0, 0, 3, 0, 65, 4, 71, 10, 0,
- -1, -1, -1, 0, 29, 0, 6, -1, 10, 10, 3, 0, -1, 32, 6, 36,
- 34, 33, 0, 0, 0, 0, 0, 0, -1, -1, -1, 13, 67, 59, 60, 8,
- 10, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- //#0x0300
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- //#0x0340
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- //#0x0380
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- //#0x03C0
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- //#0x0400
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 25,
- //#0x0440
- 10, 4, -1, 0, 0, 0, 14, 0, 0, 0, 6, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- //#0x0480
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- //#0x04C0
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- //#0x0500
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 25,
- //#0x0540
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- //#0x0580
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- //#0x05C0
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- //#0x0600
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 25,
- //#0x0640
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- //#0x0680
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- //#0x06C0
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- //#0x0700
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 25,
- //#0x0740
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- //#0x0780
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- //#0x07C0
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-#if PACKETVER < 20090617
- 6, 2, -1, 4, 4, 4, 4, 8, 8,254, 6, 8, 6, 54, 30, 54,
-#else // 0x7d9 changed
- 6, 2, -1, 4, 4, 4, 4, 8, 8,268, 6, 8, 6, 54, 30, 54,
-#endif
- 0, 15, 8, 6, -1, 8, 8, 32, -1, 5, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 14, -1, -1, -1, 8, 25, 10, 0, 26, 0,
- //#0x0800
-#if PACKETVER < 20091229
- -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 20,
-#else // for Party booking ( PACKETVER >= 20091229 )
- -1, -1, 18, 4, 8, 6, 2, 4, 14, 50, 18, 6, 2, 3, 14, 20,
-#endif
- 3, -1, 8, -1, 86, 2, 6, 6, -1, -1, 4, 10, 10, 0, 0, 0,
- 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, -1, -1, 3, 2, 66, 5, 2, 12, 6, 0, 0,
- //#0x0840
-#if PACKETVER < 20130000
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-#else
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 19, 0, 0, 0, 0,
-#endif
- 0, 0, 0, 0, 0, 0, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- //#0x0880
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- //#0x08C0
- 0, 0, 0, 0, 0, 0, 0, 20, 34, 0, 0, 0, 0, 0, 0, 10,
- 9, 7, 10, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24,
- //#0x0900
- 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, -1,
- 0, 0, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- //#0x0940
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, -1, 7,
- 0, 0, 0, 0, 2, 0, 0, 14, 6, 50, -1, 0, 0, 0, 12, -1,
- //#0x0980
- 7, 0, 0, 29, 28, 0, 0, 0, 6, 2, -1, 0, 0, -1, -1, 0,
- 31, 0, 0, 0, 0, 0, 0, -1, 8, 11, 9, 8, 0, 0, 0, 22,
- 0, 0, 0, 0, 0, 0, 12, 10, 14, 10, 14, 6, -1, 8, 17, 4,
- 8, 4, 8, 4, 6, 0, 6, 4, 6, 4, 0, 0, 6, 0, 0, 0,
- //#0x09C0
- 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 23, 17, 0, 0,102, 0,
- 0, 0, 0, 0, 2, 0, -1, -1, 2, 0, 0, -1, -1, -1, 0, 7,
- 0, 0, 0, 0, 0, 18, 22, 3, 11, 0, 11, -1, 0, 3, 11, 0,
- -1, 11, 12, 11, 0, 0, 0, 75, -1,143, 0, 0, 0, -1, -1, -1,
- //#0x0A00
-#if PACKETVER >= 20141022
- 269, 3, 4, 2, 6, 49, 6, 9, 26, 45, 47, 47, 56, -1, 14, -1,
-#else
- 269, 0, 0, 2, 6, 48, 6, 9, 26, 45, 47, 47, 56, -1, 14, 0,
-#endif
- -1, 0, 0, 26, 10, 0, 0, 0, 14, 2, 23, 2, -1, 2, 3, 2,
- 21, 3, 5, 0, 66, 0, 0, 8, 3, 0, 0, -1, 0, -1, 0, 0,
- 106, 0, 0, 0, 0, 4, 0, 59, 0, 0, 0, 0, 0, 0, 0, 0,
- //#0x0A40
- 0, 0, 0, 85, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- //#0x0A80
- 0, 0, 0, 0, 94, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0,
- //#0x0AC0
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //0x0AFF is currently defined as maximum
- };
- struct {
- void (*func)(int, struct map_session_data *);
- char *name;
- } clif_parse_func[]={
- {clif_parse_WantToConnection,"wanttoconnection"},
- {clif_parse_LoadEndAck,"loadendack"},
- {clif_parse_TickSend,"ticksend"},
- {clif_parse_WalkToXY,"walktoxy"},
- {clif_parse_QuitGame,"quitgame"},
- {clif_parse_GetCharNameRequest,"getcharnamerequest"},
- {clif_parse_GlobalMessage,"globalmessage"},
- {clif_parse_MapMove,"mapmove"},
- {clif_parse_ChangeDir,"changedir"},
- {clif_parse_Emotion,"emotion"},
- {clif_parse_HowManyConnections,"howmanyconnections"},
- {clif_parse_ActionRequest,"actionrequest"},
- {clif_parse_Restart,"restart"},
- {clif_parse_WisMessage,"wis"},
- {clif_parse_Broadcast,"broadcast"},
- {clif_parse_TakeItem,"takeitem"},
- {clif_parse_DropItem,"dropitem"},
- {clif_parse_UseItem,"useitem"},
- {clif_parse_EquipItem,"equipitem"},
- {clif_parse_UnequipItem,"unequipitem"},
- {clif_parse_NpcClicked,"npcclicked"},
- {clif_parse_NpcBuySellSelected,"npcbuysellselected"},
- {clif_parse_NpcBuyListSend,"npcbuylistsend"},
- {clif_parse_NpcSellListSend,"npcselllistsend"},
- {clif_parse_CreateChatRoom,"createchatroom"},
- {clif_parse_ChatAddMember,"chataddmember"},
- {clif_parse_ChatRoomStatusChange,"chatroomstatuschange"},
- {clif_parse_ChangeChatOwner,"changechatowner"},
- {clif_parse_KickFromChat,"kickfromchat"},
- {clif_parse_ChatLeave,"chatleave"},
- {clif_parse_TradeRequest,"traderequest"},
- {clif_parse_TradeAck,"tradeack"},
- {clif_parse_TradeAddItem,"tradeadditem"},
- {clif_parse_TradeOk,"tradeok"},
- {clif_parse_TradeCancel,"tradecancel"},
- {clif_parse_TradeCommit,"tradecommit"},
- {clif_parse_StopAttack,"stopattack"},
- {clif_parse_PutItemToCart,"putitemtocart"},
- {clif_parse_GetItemFromCart,"getitemfromcart"},
- {clif_parse_RemoveOption,"removeoption"},
- {clif_parse_ChangeCart,"changecart"},
- {clif_parse_StatusUp,"statusup"},
- {clif_parse_SkillUp,"skillup"},
- {clif_parse_UseSkillToId,"useskilltoid"},
- {clif_parse_UseSkillToPos,"useskilltopos"},
- {clif_parse_UseSkillToPosMoreInfo,"useskilltoposinfo"},
- {clif_parse_UseSkillMap,"useskillmap"},
- {clif_parse_RequestMemo,"requestmemo"},
- {clif_parse_ProduceMix,"producemix"},
- {clif_parse_Cooking,"cooking"},
- {clif_parse_NpcSelectMenu,"npcselectmenu"},
- {clif_parse_NpcNextClicked,"npcnextclicked"},
- {clif_parse_NpcAmountInput,"npcamountinput"},
- {clif_parse_NpcStringInput,"npcstringinput"},
- {clif_parse_NpcCloseClicked,"npccloseclicked"},
- {clif_parse_ItemIdentify,"itemidentify"},
- {clif_parse_SelectArrow,"selectarrow"},
- {clif_parse_AutoSpell,"autospell"},
- {clif_parse_UseCard,"usecard"},
- {clif_parse_InsertCard,"insertcard"},
- {clif_parse_RepairItem,"repairitem"},
- {clif_parse_WeaponRefine,"weaponrefine"},
- {clif_parse_SolveCharName,"solvecharname"},
- {clif_parse_ResetChar,"resetchar"},
- {clif_parse_LocalBroadcast,"localbroadcast"},
- {clif_parse_MoveToKafra,"movetokafra"},
- {clif_parse_MoveFromKafra,"movefromkafra"},
- {clif_parse_MoveToKafraFromCart,"movetokafrafromcart"},
- {clif_parse_MoveFromKafraToCart,"movefromkafratocart"},
- {clif_parse_CloseKafra,"closekafra"},
- {clif_parse_CreateParty,"createparty"},
- {clif_parse_CreateParty2,"createparty2"},
- {clif_parse_PartyInvite,"partyinvite"},
- {clif_parse_PartyInvite2,"partyinvite2"},
- {clif_parse_ReplyPartyInvite,"replypartyinvite"},
- {clif_parse_ReplyPartyInvite2,"replypartyinvite2"},
- {clif_parse_LeaveParty,"leaveparty"},
- {clif_parse_RemovePartyMember,"removepartymember"},
- {clif_parse_PartyChangeOption,"partychangeoption"},
- {clif_parse_PartyMessage,"partymessage"},
- {clif_parse_PartyChangeLeader,"partychangeleader"},
- {clif_parse_CloseVending,"closevending"},
- {clif_parse_VendingListReq,"vendinglistreq"},
- {clif_parse_PurchaseReq,"purchasereq"},
- {clif_parse_PurchaseReq2,"purchasereq2"},
- {clif_parse_OpenVending,"openvending"},
- {clif_parse_CreateGuild,"createguild"},
- {clif_parse_GuildCheckMaster,"guildcheckmaster"},
- {clif_parse_GuildRequestInfo,"guildrequestinfo"},
- {clif_parse_GuildChangePositionInfo,"guildchangepositioninfo"},
- {clif_parse_GuildChangeMemberPosition,"guildchangememberposition"},
- {clif_parse_GuildRequestEmblem,"guildrequestemblem"},
- {clif_parse_GuildChangeEmblem,"guildchangeemblem"},
- {clif_parse_GuildChangeNotice,"guildchangenotice"},
- {clif_parse_GuildInvite,"guildinvite"},
- {clif_parse_GuildReplyInvite,"guildreplyinvite"},
- {clif_parse_GuildLeave,"guildleave"},
- {clif_parse_GuildExpulsion,"guildexpulsion"},
- {clif_parse_GuildMessage,"guildmessage"},
- {clif_parse_GuildRequestAlliance,"guildrequestalliance"},
- {clif_parse_GuildReplyAlliance,"guildreplyalliance"},
- {clif_parse_GuildDelAlliance,"guilddelalliance"},
- {clif_parse_GuildOpposition,"guildopposition"},
- {clif_parse_GuildBreak,"guildbreak"},
- {clif_parse_PetMenu,"petmenu"},
- {clif_parse_CatchPet,"catchpet"},
- {clif_parse_SelectEgg,"selectegg"},
- {clif_parse_SendEmotion,"sendemotion"},
- {clif_parse_ChangePetName,"changepetname"},
-
- {clif_parse_GMKick,"gmkick"},
- {clif_parse_GMHide,"gmhide"},
- {clif_parse_GMReqNoChat,"gmreqnochat"},
- {clif_parse_GMReqAccountName,"gmreqaccname"},
- {clif_parse_GMKickAll,"killall"},
- {clif_parse_GMRecall,"recall"},
- {clif_parse_GMRecall,"summon"},
- {clif_parse_GM_Item_Monster,"itemmonster"},
- {clif_parse_GMShift,"remove"},
- {clif_parse_GMShift,"shift"},
- {clif_parse_GMChangeMapType,"changemaptype"},
- {clif_parse_GMRc,"rc"},
- {clif_parse_GMRecall2,"recall2"},
- {clif_parse_GMRemove2,"remove2"},
- {clif_parse_GMFullStrip,"gmfullstrip"},
-
- {clif_parse_NoviceDoriDori,"sndoridori"},
- {clif_parse_NoviceExplosionSpirits,"snexplosionspirits"},
- {clif_parse_PMIgnore,"wisexin"},
- {clif_parse_PMIgnoreList,"wisexlist"},
- {clif_parse_PMIgnoreAll,"wisall"},
- {clif_parse_FriendsListAdd,"friendslistadd"},
- {clif_parse_FriendsListRemove,"friendslistremove"},
- {clif_parse_FriendsListReply,"friendslistreply"},
- {clif_parse_Blacksmith,"blacksmith"},
- {clif_parse_Alchemist,"alchemist"},
- {clif_parse_Taekwon,"taekwon"},
- {clif_parse_RankingPk,"rankingpk"},
- {clif_parse_FeelSaveOk,"feelsaveok"},
- {clif_parse_debug,"debug"},
- {clif_parse_ChangeHomunculusName,"changehomunculusname"},
- {clif_parse_HomMoveToMaster,"hommovetomaster"},
- {clif_parse_HomMoveTo,"hommoveto"},
- {clif_parse_HomAttack,"homattack"},
- {clif_parse_HomMenu,"hommenu"},
- {clif_parse_StoragePassword,"storagepassword"},
- {clif_parse_Hotkey,"hotkey"},
- {clif_parse_AutoRevive,"autorevive"},
- {clif_parse_Check,"check"},
- {clif_parse_Adopt_request,"adoptrequest"},
- {clif_parse_Adopt_reply,"adoptreply"},
- // MAIL SYSTEM
- {clif_parse_Mail_refreshinbox,"mailrefresh"},
- {clif_parse_Mail_read,"mailread"},
- {clif_parse_Mail_getattach,"mailgetattach"},
- {clif_parse_Mail_delete,"maildelete"},
- {clif_parse_Mail_return,"mailreturn"},
- {clif_parse_Mail_setattach,"mailsetattach"},
- {clif_parse_Mail_winopen,"mailwinopen"},
- {clif_parse_Mail_send,"mailsend"},
- {clif_parse_Mail_beginwrite,"mailbegin"},
- {clif_parse_Mail_cancelwrite,"mailcancel"},
- {clif_parse_Mail_Receiver_Check,"mailreceiver"},
- // AUCTION SYSTEM
- {clif_parse_Auction_search,"auctionsearch"},
- {clif_parse_Auction_buysell,"auctionbuysell"},
- {clif_parse_Auction_setitem,"auctionsetitem"},
- {clif_parse_Auction_cancelreg,"auctioncancelreg"},
- {clif_parse_Auction_register,"auctionregister"},
- {clif_parse_Auction_cancel,"auctioncancel"},
- {clif_parse_Auction_close,"auctionclose"},
- {clif_parse_Auction_bid,"auctionbid"},
- // Quest Log System
- {clif_parse_questStateAck,"queststate"},
- {clif_parse_ViewPlayerEquip,"viewplayerequip"},
- {clif_parse_EquipTick,"equiptickbox"},
- {clif_parse_BattleChat,"battlechat"},
- {clif_parse_mercenary_action,"mermenu"},
- {clif_parse_progressbar,"progressbar"},
- {clif_parse_SkillSelectMenu,"skillselectmenu"},
- {clif_parse_ItemListWindowSelected,"itemlistwindowselected"},
-#if PACKETVER >= 20091229
- {clif_parse_PartyBookingRegisterReq,"bookingregreq"},
- {clif_parse_PartyBookingSearchReq,"bookingsearchreq"},
- {clif_parse_PartyBookingUpdateReq,"bookingupdatereq"},
- {clif_parse_PartyBookingDeleteReq,"bookingdelreq"},
-#endif
- {clif_parse_BankCheck,"bankcheck"},
- {clif_parse_BankDeposit,"bankdeposit"},
- {clif_parse_BankWithdraw,"bankwithdrawal"},
- {clif_parse_BankOpen,"bankopen"},
- {clif_parse_BankClose,"bankclose"},
-
- {clif_parse_PVPInfo,"pvpinfo"},
- {clif_parse_LessEffect,"lesseffect"},
- // Buying Store
- {clif_parse_ReqOpenBuyingStore,"reqopenbuyingstore"},
- {clif_parse_ReqCloseBuyingStore,"reqclosebuyingstore"},
- {clif_parse_ReqClickBuyingStore,"reqclickbuyingstore"},
- {clif_parse_ReqTradeBuyingStore,"reqtradebuyingstore"},
- // Store Search
- {clif_parse_SearchStoreInfo,"searchstoreinfo"},
- {clif_parse_SearchStoreInfoNextPage,"searchstoreinfonextpage"},
- {clif_parse_CloseSearchStoreInfo,"closesearchstoreinfo"},
- {clif_parse_SearchStoreInfoListItemClick,"searchstoreinfolistitemclick"},
- // Cashshop
- { clif_parse_cashshop_open_request, "cashshopopen" },
- { clif_parse_cashshop_close, "cashshopclose" },
- { clif_parse_cashshop_list_request, "cashshopitemlist" },
- { clif_parse_cashshop_buy, "cashshopbuy" },
- { clif_parse_CashShopReqTab, "cashshopreqtab"},
- /* */
- { clif_parse_MoveItem , "moveitem" },
- { clif_parse_PartyTick, "partytick" },
- { clif_parse_dull, "dull" },
- { clif_parse_GuildInvite2 , "guildinvite2" },
- { clif_parse_reqworldinfo, "reqworldinfo"},
- { clif_parse_client_version, "clientversion"},
- { clif_parse_blocking_playcancel, "booking_playcancel"},
- { clif_parse_ranklist, "ranklist"},
- // Market NPC
- { clif_parse_NPCShopClosed, "npcshopclosed" },
- { clif_parse_NPCMarketClosed, "npcmarketclosed" },
- { clif_parse_NPCMarketPurchase, "npcmarketpurchase" },
- // Roulette
- { clif_parse_RouletteOpen, "rouletteopen" },
- { clif_parse_RouletteInfo, "rouletteinfo" },
- { clif_parse_RouletteClose, "rouletteclose" },
- { clif_parse_RouletteGenerate, "roulettegenerate" },
- { clif_parse_RouletteRecvItem, "rouletterecvitem" },
- // Merge Item
- { clif_parse_merge_item_req, "mergeitem_req"},
- { clif_parse_merge_item_cancel, "mergeitem_cancel"},
- // HotkeyRowShift
- { clif_parse_HotkeyRowShift, "hotkeyrowshift"},
- // OneClick Item Identify
- { clif_parse_Oneclick_Itemidentify, "oneclick_itemidentify" },
- // NewChange Cart2
- { clif_parse_SelectCart, "selectcart" },
- // Clan System
- { clif_parse_clan_chat, "clanchat" },
- // Sale
- { clif_parse_sale_search, "salesearch" },
- { clif_parse_sale_add, "saleadd" },
- { clif_parse_sale_remove, "saleremove" },
- { clif_parse_sale_open, "saleopen" },
- { clif_parse_sale_close, "saleclose" },
- { clif_parse_sale_refresh, "salerefresh" },
- {NULL,NULL}
- };
- struct {
- char *name; //function name
- int funcidx; //
- } clif_ack_func[]={ //hash
- { "ZC_ACK_OPEN_BANKING", ZC_ACK_OPEN_BANKING},
- { "ZC_ACK_BANKING_DEPOSIT", ZC_ACK_BANKING_DEPOSIT},
- { "ZC_ACK_BANKING_WITHDRAW", ZC_ACK_BANKING_WITHDRAW},
- { "ZC_BANKING_CHECK", ZC_BANKING_CHECK},
- { "ZC_BANKING_CHECK", ZC_BANKING_CHECK},
- { "ZC_PERSONAL_INFOMATION", ZC_PERSONAL_INFOMATION},
- { "ZC_PERSONAL_INFOMATION_CHN", ZC_PERSONAL_INFOMATION_CHN},
- { "ZC_CLEAR_DIALOG", ZC_CLEAR_DIALOG},
- { "ZC_C_MARKERINFO", ZC_C_MARKERINFO},
- { "ZC_NOTIFY_BIND_ON_EQUIP", ZC_NOTIFY_BIND_ON_EQUIP },
- { "ZC_WEAR_EQUIP_ACK", ZC_WEAR_EQUIP_ACK },
- { "ZC_MERGE_ITEM_OPEN", ZC_MERGE_ITEM_OPEN },
- { "ZC_ACK_MERGE_ITEM", ZC_ACK_MERGE_ITEM },
- { "ZC_BROADCASTING_SPECIAL_ITEM_OBTAIN", ZC_BROADCASTING_SPECIAL_ITEM_OBTAIN },
- };
- const char *filename[] = { "packet_db.txt", DBIMPORT"/packet_db.txt"};
- int f;
-
- memset(packet_db,0,sizeof(packet_db));
- memset(packet_db_ack,0,sizeof(packet_db_ack));
-
- // initialize packet_db[SERVER] from hardcoded packet_len_table[] values
- for( i = 0; i < ARRAYLENGTH(packet_len_table); ++i )
- packet_len(i) = packet_len_table[i];
-
- clif_config.packet_db_ver = MAX_PACKET_VER;
- for(f = 0; f < ARRAYLENGTH(filename); f++) {
- FILE *fp;
- int ln = 0;
- int entries = 0;
- char *str[64], *p, *str2[64], *p2;
-
- sprintf(line, "%s/%s", db_path, filename[f]);
- if( (fp = fopen(line,"r")) == NULL ) {
- if (f == 0) {
- ShowFatalError("Can't read %s\n", line);
- exit(EXIT_FAILURE);
- }
- return;
- }
-
- while( fgets(line, sizeof(line), fp) ) {
- char w1[256],w2[256];
- ln++;
- if(line[0]=='/' && line[1]=='/')
- continue;
- if (sscanf(line,"%255[^:]: %255[^\r\n]",w1,w2) == 2) {
- if (strcmpi(w1,"packet_ver") == 0) {
- int prev_ver = packet_ver;
- skip_ver = false;
- packet_ver = atoi(w2);
- if ( packet_ver > MAX_PACKET_VER )
- { //Check to avoid overflowing. [Skotlex]
- if( (warned&1) == 0 )
- ShowWarning("The packet_db table only has support up to version %d.\n", MAX_PACKET_VER);
- warned &= 1;
- skip_ver = true;
- }
- else if( packet_ver < 0 )
- {
- if( (warned&2) == 0 )
- ShowWarning("Negative packet versions are not supported.\n");
- warned &= 2;
- skip_ver = true;
- }
- else if( packet_ver == SERVER )
- {
- if( (warned&4) == 0 )
- ShowWarning("Packet version %d is reserved for server use only.\n", SERVER);
- warned &= 4;
- skip_ver = true;
- }
+void packetdb_addpacket( uint16 cmd, uint16 length, void (*func)(int, struct map_session_data *), ... ){
+ va_list argp;
+ int i;
- if( skip_ver )
- {
- ShowWarning("Skipping packet version %d.\n", packet_ver);
- packet_ver = prev_ver;
- continue;
- }
- // copy from previous version into new version and continue
- // - indicating all following packets should be read into the newer version
- memcpy(&packet_db[packet_ver], &packet_db[prev_ver], sizeof(packet_db[0]));
- memcpy(&packet_db_ack[packet_ver], &packet_db_ack[prev_ver], sizeof(packet_db_ack[0]));
- continue;
- } else if(strcmpi(w1,"packet_db_ver")==0) {
- if (strcmpi(w2,"default") == 0) //This is the preferred version.
- clif_config.packet_db_ver = MAX_PACKET_VER;
- else // to manually set the packet DB version
- clif_config.packet_db_ver = cap_value(atoi(w2), 0, MAX_PACKET_VER);
- continue;
- }
-#ifdef PACKET_OBFUSCATION
- else if (!reload && strcmpi(w1,"packet_keys") == 0) {
- char key1[12] = { 0 }, key2[12] = { 0 }, key3[12] = { 0 };
- trim(w2);
- if (sscanf(w2, "%11[^,],%11[^,],%11[^ \r\n/]", key1, key2, key3) == 3) {
- if (!packet_keys[packet_ver])
- CREATE(packet_keys[packet_ver], struct s_packet_keys, 1);
- packet_keys[packet_ver]->keys[0] = strtol(key1, NULL, 0);
- packet_keys[packet_ver]->keys[1] = strtol(key2, NULL, 0);
- packet_keys[packet_ver]->keys[2] = strtol(key3, NULL, 0);
- last_key_defined = packet_ver;
- if (battle_config.etc_log)
- ShowInfo("Packet Ver:%d -> Keys: 0x%08X, 0x%08X, 0x%08X\n", packet_ver, packet_keys[packet_ver]->keys[0], packet_keys[packet_ver]->keys[1], packet_keys[packet_ver]->keys[2]);
- }
- continue;
- } else if (!reload && strcmpi(w1,"packet_keys_use") == 0) {
- char key1[12] = { 0 }, key2[12] = { 0 }, key3[12] = { 0 };
- trim(w2);
- if (strcmpi(w2,"default") == 0)
- continue;
- if (sscanf(w2, "%11[^,],%11[^,],%11[^ \r\n/]", key1, key2, key3) == 3) {
- clif_cryptKey[0] = strtol(key1, NULL, 0);
- clif_cryptKey[1] = strtol(key2, NULL, 0);
- clif_cryptKey[2] = strtol(key3, NULL, 0);
- key_defined = true;
- if (battle_config.etc_log)
- ShowInfo("Defined keys: 0x%08X, 0x%08X, 0x%08X\n", clif_cryptKey[0], clif_cryptKey[1], clif_cryptKey[2]);
- }
- continue;
- }
-#endif
- }
+ if(cmd <= 0 || cmd > MAX_PACKET_DB)
+ return;
- if( skip_ver )
- continue; // Skipping current packet version
+ packet_db[cmd].len = length;
+ packet_db[cmd].func = func;
- memset(str,0,sizeof(str));
- for (j = 0, p = line; j < 4 && p; ++j) {
- str[j] = p;
- p = strchr(p,',');
- if (p)
- *p++=0;
- }
- if (str[0] == NULL)
- continue;
- cmd = strtol(str[0],(char **)NULL,0);
+ va_start(argp, func);
- if(max_cmd < cmd)
- max_cmd = cmd;
- if(cmd <= 0 || cmd > MAX_PACKET_DB)
- continue;
- if(str[1]==NULL){
- ShowError("packet_db: packet len error\n");
- continue;
- }
+ for( i = 0; i < MAX_PACKET_POS; i++ ){
+ int offset = va_arg(argp, int);
- packet_db[packet_ver][cmd].len = (short)atoi(str[1]);
+ if( offset == 0 ){
+ break;
+ }
- if(str[2]==NULL){
- packet_db[packet_ver][cmd].func = NULL;
- ln++;
- continue;
- }
+ packet_db[cmd].pos[i] = offset;
+ }
- // look up processing function by name
- ARR_FIND( 0, ARRAYLENGTH(clif_parse_func), j, clif_parse_func[j].name != NULL && strcmp(str[2],clif_parse_func[j].name)==0 );
- if( j < ARRAYLENGTH(clif_parse_func) )
- packet_db[packet_ver][cmd].func = clif_parse_func[j].func;
- else { //search if it's a mapped ack func
- ARR_FIND( 0, ARRAYLENGTH(clif_ack_func), j, clif_ack_func[j].name != NULL && strcmp(str[2],clif_ack_func[j].name)==0 );
- if( j < ARRAYLENGTH(clif_ack_func)) {
- int fidx = clif_ack_func[j].funcidx;
- packet_db_ack[packet_ver][fidx] = cmd;
- //ShowInfo("Added %s, <=> %X i=%d for v=%d\n",clif_ack_func[j].name,cmd,fidx,packet_ver);
- }
- }
+ if( i == MAX_PACKET_POS ){
+ ShowError( "Too many positions found for packet 0x%04x (max=%d).\n", cmd, MAX_PACKET_POS );
+ }
- // set the identifying cmd for the packet_db version
- if (strcmp(str[2],"wanttoconnection")==0)
- clif_config.connect_cmd[packet_ver] = cmd;
+ va_end(argp);
+}
- if(str[3]==NULL){
- ShowError("packet_db: packet error\n");
- exit(EXIT_FAILURE);
- }
- for(j = 0, p2 = str[3]; p2; j++){
- short k;
- str2[j] = p2;
- p2 = strchr(p2,':');
- if(p2)
- *p2++=0;
- k = atoi(str2[j]);
- // if (packet_db[packet_ver][cmd].pos[j] != k && clif_config.prefer_packet_db) // not used for now
-
- if( j >= MAX_PACKET_POS )
- {
- ShowError("Too many positions found for packet 0x%04x (max=%d).\n", cmd, MAX_PACKET_POS);
- break;
- }
+/*==========================================
+ * Reads packets and setups its array reference
+ *------------------------------------------*/
+void packetdb_readdb(){
+ memset(packet_db,0,sizeof(packet_db));
+ memset(packet_db_ack,0,sizeof(packet_db_ack));
- packet_db[packet_ver][cmd].pos[j] = k;
- }
- entries++;
- }
- fclose(fp);
- if(max_cmd > MAX_PACKET_DB) {
- ShowWarning("Found packets up to 0x%X, ignored 0x%X and above.\n", max_cmd, MAX_PACKET_DB);
- ShowWarning("Please increase MAX_PACKET_DB and recompile.\n");
- }
- //Locate the nearest version that we still support. [Skotlex]
- if (!clif_config.connect_cmd[clif_config.packet_db_ver]) {
- for(j = clif_config.packet_db_ver; j >= 0 && !clif_config.connect_cmd[j]; j--);
+#include "clif_packetdb.hpp"
+#include "clif_shuffle.hpp"
- clif_config.packet_db_ver = j?j:MAX_PACKET_VER;
- }
- sprintf(line, "%s/%s", db_path,filename[f]);
- ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", entries, line);
- }
- ShowStatus("Using default packet version: "CL_WHITE"%d"CL_RESET".\n", clif_config.packet_db_ver);
+ ShowStatus("Using packet version: " CL_WHITE "%d" CL_RESET ".\n", PACKETVER);
#ifdef PACKET_OBFUSCATION
- if (!key_defined && !clif_cryptKey[0] && !clif_cryptKey[1] && !clif_cryptKey[2]) { // Not defined
- int use_key = last_key_defined;
-
- if (last_key_defined == -1)
- ShowError("Can't find packet obfuscation keys!\n");
- else {
- if (packet_keys[clif_config.packet_db_ver])
- use_key = clif_config.packet_db_ver;
-
- ShowInfo("Using default packet obfuscation keys for packet_db_ver: %d\n", use_key);
- memcpy(&clif_cryptKey, &packet_keys[use_key]->keys, sizeof(packet_keys[use_key]->keys));
- }
- }
- ShowStatus("Packet Obfuscation: "CL_GREEN"Enabled"CL_RESET". Keys: "CL_WHITE"0x%08X, 0x%08X, 0x%08X"CL_RESET"\n", clif_cryptKey[0], clif_cryptKey[1], clif_cryptKey[2]);
-
- for (i = 0; i < ARRAYLENGTH(packet_keys); i++) {
- if (packet_keys[i]) {
- aFree(packet_keys[i]);
- packet_keys[i] = NULL;
- }
- }
+ ShowStatus("Packet Obfuscation: " CL_GREEN "Enabled" CL_RESET ". Keys: " CL_WHITE "0x%08X, 0x%08X, 0x%08X" CL_RESET "\n", clif_cryptKey[0], clif_cryptKey[1], clif_cryptKey[2]);
+#else
+ ShowStatus("Packet Obfuscation: " CL_RED "Disabled" CL_RESET ".\n");
#endif
}
@@ -20762,27 +20403,21 @@ void do_init_clif(void) {
color_table[i] = (color_table[i] & 0x0000FF) << 16 | (color_table[i] & 0x00FF00) | (color_table[i] & 0xFF0000) >> 16;//RGB to BGR
}
- clif_config.packet_db_ver = -1; // the main packet version of the DB
- memset(clif_config.connect_cmd, 0, sizeof(clif_config.connect_cmd)); //The default connect command will be determined after reading the packet_db [Skotlex]
-#ifdef PACKET_OBFUSCATION
- memset(clif_cryptKey, 0, sizeof(clif_cryptKey));
-#endif
-
- //Using the packet_db file is the only way to set up packets now [Skotlex]
- packetdb_readdb(false);
+ packetdb_readdb();
set_defaultparse(clif_parse);
if( make_listen_bind(bind_ip,map_port) == -1 ) {
- ShowFatalError("Failed to bind to port '"CL_WHITE"%d"CL_RESET"'\n",map_port);
+ ShowFatalError("Failed to bind to port '" CL_WHITE "%d" CL_RESET "'\n",map_port);
exit(EXIT_FAILURE);
}
add_timer_func_list(clif_clearunit_delayed_sub, "clif_clearunit_delayed_sub");
add_timer_func_list(clif_delayquit, "clif_delayquit");
- delay_clearunit_ers = ers_new(sizeof(struct block_list),"clif.c::delay_clearunit_ers",ERS_OPT_CLEAR);
+ delay_clearunit_ers = ers_new(sizeof(struct block_list),"clif.cpp::delay_clearunit_ers",ERS_OPT_CLEAR);
}
void do_final_clif(void) {
ers_destroy(delay_clearunit_ers);
}
+
diff --git a/src/map/clif.h b/src/map/clif.hpp
similarity index 91%
rename from src/map/clif.h
rename to src/map/clif.hpp
index 0e7e488b35f..3993cb7bbaa 100644
--- a/src/map/clif.h
+++ b/src/map/clif.hpp
@@ -1,22 +1,20 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _CLIF_H_
-#define _CLIF_H_
+#ifndef _CLIF_HPP_
+#define _CLIF_HPP_
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <stdarg.h>
#include "../common/cbasetypes.h"
#include "../common/db.h" //dbmap
-//#include "../common/mmo.h"
+#include "../common/mmo.h"
struct Channel;
struct clan;
struct item;
struct s_storage;
-//#include "map.h"
+//#include "map.hpp"
struct block_list;
struct unit_data;
struct map_session_data;
@@ -34,22 +32,19 @@ struct guild;
struct battleground_data;
struct quest;
struct party_booking_ad_info;
-enum e_party_member_withdraw;
struct sale_item_data;
-enum mail_inbox_type;
struct mail_message;
-enum mail_attachment_type;
-#include <stdarg.h>
+struct achievement;
-enum { // packet DB
+enum e_PacketDBVersion { // packet DB
MIN_PACKET_DB = 0x064,
MAX_PACKET_DB = 0xAFF,
- MAX_PACKET_VER = 55,
MAX_PACKET_POS = 20,
};
-enum e_packet_ack {
+enum e_packet_ack : uint8_t{
ZC_ACK_OPEN_BANKING = 0,
+ ZC_ACK_CLOSE_BANKING,
ZC_ACK_BANKING_DEPOSIT,
ZC_ACK_BANKING_WITHDRAW,
ZC_BANKING_CHECK,
@@ -79,7 +74,7 @@ struct s_packet_keys {
};
#endif
-enum e_CASHSHOP_ACK {
+enum e_CASHSHOP_ACK : uint8_t{
ERROR_TYPE_NONE = 0, ///< The deal has successfully completed.
ERROR_TYPE_NPC = 1, ///< The Purchase has failed because the NPC does not exist.
ERROR_TYPE_SYSTEM = 2, ///< The Purchase has failed because the Kafra Shop System is not working correctly.
@@ -91,67 +86,67 @@ enum e_CASHSHOP_ACK {
ERROR_TYPE_PURCHASE_FAIL = 8, ///< Some items could not be purchased.
};
-enum e_BANKING_DEPOSIT_ACK {
+enum e_BANKING_DEPOSIT_ACK : uint8_t {
BDA_SUCCESS = 0x0,
BDA_ERROR = 0x1,
BDA_NO_MONEY = 0x2,
BDA_OVERFLOW = 0x3,
};
-enum e_BANKING_WITHDRAW_ACK {
+enum e_BANKING_WITHDRAW_ACK : uint8_t {
BWA_SUCCESS = 0x0,
BWA_NO_MONEY = 0x1,
BWA_UNKNOWN_ERROR = 0x2,
};
-enum RECV_ROULETTE_ITEM_REQ {
+enum RECV_ROULETTE_ITEM_REQ : uint8_t {
RECV_ITEM_SUCCESS = 0x0,
RECV_ITEM_FAILED = 0x1,
RECV_ITEM_OVERCOUNT = 0x2,
RECV_ITEM_OVERWEIGHT = 0x3,
};
-enum RECV_ROULETTE_ITEM_ACK {
+enum RECV_ROULETTE_ITEM_ACK : uint8_t {
RECV_ITEM_NORMAL = 0x0,
RECV_ITEM_LOSING = 0x1,
};
-enum GENERATE_ROULETTE_ACK {
+enum GENERATE_ROULETTE_ACK : uint8_t {
GENERATE_ROULETTE_SUCCESS = 0x0,
GENERATE_ROULETTE_FAILED = 0x1,
GENERATE_ROULETTE_NO_ENOUGH_POINT = 0x2,
GENERATE_ROULETTE_LOSING = 0x3,
};
-enum OPEN_ROULETTE_ACK {
+enum OPEN_ROULETTE_ACK : uint8_t {
OPEN_ROULETTE_SUCCESS = 0x0,
OPEN_ROULETTE_FAILED = 0x1,
};
-enum CLOSE_ROULETTE_ACK {
+enum CLOSE_ROULETTE_ACK : uint8_t {
CLOSE_ROULETTE_SUCCESS = 0x0,
CLOSE_ROULETTE_FAILED = 0x1,
};
-enum MERGE_ITEM_ACK {
+enum MERGE_ITEM_ACK : uint8_t {
MERGE_ITEM_SUCCESS = 0x0,
MERGE_ITEM_FAILED_NOT_MERGE = 0x1,
MERGE_ITEM_FAILED_MAX_COUNT = 0x2,
};
-enum BROADCASTING_SPECIAL_ITEM_OBTAIN {
+enum BROADCASTING_SPECIAL_ITEM_OBTAIN : uint8_t {
ITEMOBTAIN_TYPE_BOXITEM = 0x0,
ITEMOBTAIN_TYPE_MONSTER_ITEM = 0x1,
ITEMOBTAIN_TYPE_NPC = 0x2,
};
-enum e_adopt_reply {
+enum e_adopt_reply : uint8_t {
ADOPT_REPLY_MORE_CHILDREN = 0,
ADOPT_REPLY_LEVEL_70,
ADOPT_REPLY_MARRIED,
};
-enum e_wip_block {
+enum e_wip_block : uint8_t {
WIP_DISABLE_NONE = 0x0,
WIP_DISABLE_SKILLITEM = 0x1,
WIP_DISABLE_NPC = 0x2,
@@ -171,15 +166,21 @@ enum e_party_invite_reply {
PARTY_REPLY_INVALID_MAPPROPERTY_ME, ///< return=9 : !TODO "Cannot join a party in this map" -> MsgStringTable[1871] (since 20110205)
};
-// packet_db[SERVER] is reserved for server use
-#define SERVER 0
-#define packet_len(cmd) packet_db[SERVER][cmd].len
-extern struct s_packet_db packet_db[MAX_PACKET_VER+1][MAX_PACKET_DB+1];
-extern int packet_db_ack[MAX_PACKET_VER + 1][MAX_ACK_FUNC + 1];
+/// Enum for Convex Mirror (SC_BOSSMAPINFO)
+enum e_bossmap_info {
+ BOSS_INFO_NOT = 0,
+ BOSS_INFO_ALIVE,
+ BOSS_INFO_ALIVE_WITHMSG,
+ BOSS_INFO_DEAD,
+};
+
+#define packet_len(cmd) packet_db[cmd].len
+extern struct s_packet_db packet_db[MAX_PACKET_DB+1];
+extern int packet_db_ack[MAX_ACK_FUNC + 1];
// local define
-typedef enum send_target {
- ALL_CLIENT,
+enum send_target : uint8_t {
+ ALL_CLIENT = 0,
ALL_SAMEMAP,
AREA, // area
AREA_WOS, // area, without self
@@ -213,9 +214,9 @@ typedef enum send_target {
BG_AREA_WOS,
CLAN, // Clan System
-} send_target;
+};
-typedef enum broadcast_flags {
+enum broadcast_flags : uint8_t {
BC_ALL = 0,
BC_MAP = 1,
BC_AREA = 2,
@@ -232,111 +233,111 @@ typedef enum broadcast_flags {
BC_COLOR_MASK = 0x30, // BC_YELLOW|BC_BLUE|BC_WOE
BC_DEFAULT = BC_ALL|BC_PC|BC_YELLOW
-} broadcast_flags;
-
-typedef enum emotion_type {
- E_GASP = 0, // /!
- E_WHAT, // /?
- E_HO,
- E_LV,
- E_SWT,
- E_IC,
- E_AN,
- E_AG,
- E_CASH, // /$
- E_DOTS, // /...
- E_SCISSORS, // /gawi --- 10
- E_ROCK, // /bawi
- E_PAPER, // /bo
- E_KOREA,
- E_LV2,
- E_THX,
- E_WAH,
- E_SRY,
- E_HEH,
- E_SWT2,
- E_HMM, // --- 20
- E_NO1,
- E_NO, // /??
- E_OMG,
- E_OH,
- E_X,
- E_HLP,
- E_GO,
- E_SOB,
- E_GG,
- E_KIS, // --- 30
- E_KIS2,
- E_PIF,
- E_OK,
- E_MUTE, // red /... used for muted characters
- E_INDONESIA,
- E_BZZ, // /bzz, /stare
- E_RICE,
- E_AWSM, // /awsm, /cool
- E_MEH,
- E_SHY, // --- 40
- E_PAT, // /pat, /goodboy
- E_MP, // /mp, /sptime
- E_SLUR,
- E_COM, // /com, /comeon
- E_YAWN, // /yawn, /sleepy
- E_GRAT, // /grat, /congrats
- E_HP, // /hp, /hptime
- E_PHILIPPINES,
- E_MALAYSIA,
- E_SINGAPORE, // --- 50
- E_BRAZIL,
- E_FLASH, // /fsh
- E_SPIN, // /spin
- E_SIGH,
- E_DUM, // /dum
- E_LOUD, // /crwd
- E_OTL, // /otl, /desp
- E_DICE1,
- E_DICE2,
- E_DICE3, // --- 60
- E_DICE4,
- E_DICE5,
- E_DICE6,
- E_INDIA,
- E_LUV, // /love
- E_RUSSIA,
- E_VIRGIN,
- E_MOBILE,
- E_MAIL,
- E_CHINESE, // --- 70
- E_ANTENNA1,
- E_ANTENNA2,
- E_ANTENNA3,
- E_HUM,
- E_ABS,
- E_OOPS,
- E_SPIT,
- E_ENE,
- E_PANIC,
- E_WHISP, // --- 80
- E_YUT1,
- E_YUT2,
- E_YUT3,
- E_YUT4,
- E_YUT5,
- E_YUT6,
- E_YUT7,
+};
+
+enum emotion_type {
+ ET_SURPRISE = 0, // /!
+ ET_QUESTION, // /?
+ ET_DELIGHT,
+ ET_THROB,
+ ET_SWEAT,
+ ET_AHA,
+ ET_FRET,
+ ET_ANGER,
+ ET_MONEY, // /$
+ ET_THINK, // /...
+ ET_SCISSOR, // /gawi --- 10
+ ET_ROCK, // /bawi
+ ET_WRAP, // /bo
+ ET_FLAG,
+ ET_BIGTHROB,
+ ET_THANKS,
+ ET_KEK,
+ ET_SORRY,
+ ET_SMILE,
+ ET_PROFUSELY_SWEAT,
+ ET_SCRATCH, // --- 20
+ ET_BEST,
+ ET_STARE_ABOUT, // /??
+ ET_HUK,
+ ET_O,
+ ET_X,
+ ET_HELP,
+ ET_GO,
+ ET_CRY,
+ ET_KIK,
+ ET_CHUP, // --- 30
+ ET_CHUPCHUP,
+ ET_HNG,
+ ET_OK,
+ ET_CHAT_PROHIBIT, // red /... used for muted characters
+ ET_INDONESIA_FLAG,
+ ET_STARE, // /bzz, /stare
+ ET_HUNGRY,
+ ET_COOL, // /awsm, /cool
+ ET_MERONG,
+ ET_SHY, // --- 40
+ ET_GOODBOY, // /pat, /goodboy
+ ET_SPTIME, // /mp, /sptime
+ ET_SEXY,
+ ET_COMEON, // /com, /comeon
+ ET_SLEEPY, // /yawn, /sleepy
+ ET_CONGRATULATION, // /grat, /congrats
+ ET_HPTIME, // /hp, /hptime
+ ET_PH_FLAG,
+ ET_MY_FLAG,
+ ET_SI_FLAG, // --- 50
+ ET_BR_FLAG,
+ ET_SPARK, // /fsh
+ ET_CONFUSE, // /spin
+ ET_OHNO,
+ ET_HUM, // /dum
+ ET_BLABLA, // /crwd
+ ET_OTL, // /otl, /desp
+ ET_DICE1,
+ ET_DICE2,
+ ET_DICE3, // --- 60
+ ET_DICE4,
+ ET_DICE5,
+ ET_DICE6,
+ ET_INDIA_FLAG,
+ ET_LUV, // /love
+ ET_FLAG8,
+ ET_FLAG9,
+ ET_MOBILE,
+ ET_MAIL,
+ ET_ANTENNA0, // --- 70
+ ET_ANTENNA1,
+ ET_ANTENNA2,
+ ET_ANTENNA3,
+ ET_HUM2,
+ ET_ABS,
+ ET_OOPS,
+ ET_SPIT,
+ ET_ENE,
+ ET_PANIC,
+ ET_WHISP, // --- 80
+ ET_YUT1,
+ ET_YUT2,
+ ET_YUT3,
+ ET_YUT4,
+ ET_YUT5,
+ ET_YUT6,
+ ET_YUT7,
//
- E_MAX
-} emotion_type;
+ ET_MAX
+};
-typedef enum clr_type
+enum clr_type : uint8_t
{
CLR_OUTSIGHT = 0,
CLR_DEAD,
CLR_RESPAWN,
CLR_TELEPORT,
CLR_TRICKDEAD,
-} clr_type;
+};
-enum map_property
+enum map_property : uint8_t
{// clif_map_property
MAPPROPERTY_NOTHING = 0,
MAPPROPERTY_FREEPVPZONE = 1,
@@ -347,7 +348,7 @@ enum map_property
MAPPROPERTY_DENYSKILLZONE = 6,
};
-enum map_type
+enum map_type : uint8_t
{// clif_map_type
MAPTYPE_VILLAGE = 0,
MAPTYPE_VILLAGE_IN = 1,
@@ -376,7 +377,7 @@ enum map_type
MAPTYPE_UNUSED = 29,
};
-enum useskill_fail_cause
+enum useskill_fail_cause : uint8_t
{// clif_skill_fail
USESKILL_FAIL_LEVEL = 0,
USESKILL_FAIL_SP_INSUFFICIENT = 1,
@@ -449,6 +450,7 @@ enum useskill_fail_cause
//XXX_USESKILL_FAIL_II_HELLS_PLANT_BOTTLE = 68,
//XXX_USESKILL_FAIL_II_MANDRAGORA_FLOWERPOT = 69,
USESKILL_FAIL_MANUAL_NOTIFY = 70,
+ // CAUTION: client uses unidentified display name for displaying the required item. Still broken on 2017-05-31 [Lemongrass]
USESKILL_FAIL_NEED_ITEM = 71,
USESKILL_FAIL_NEED_EQUIPMENT = 72,
USESKILL_FAIL_COMBOSKILL = 73,
@@ -463,11 +465,12 @@ enum useskill_fail_cause
USESKILL_FAIL_STYLE_CHANGE_GRAPPLER = 82,
USESKILL_FAIL_THERE_ARE_NPC_AROUND = 83,
USESKILL_FAIL_NEED_MORE_BULLET = 84,
+ USESKILL_FAIL_COINS = 85,
USESKILL_FAIL_MAX
};
-enum clif_messages {
+enum clif_messages : uint16_t {
/* Constant values */
// clif_cart_additem_ack flags
ADDITEM_TO_CART_FAIL_WEIGHT = 0x0,
@@ -501,9 +504,15 @@ enum clif_messages {
MERGE_ITEM_NOT_AVAILABLE = 0x887,
GUILD_MASTER_WOE = 0xb93, /// <"Currently in WoE hours, unable to delegate Guild leader"
GUILD_MASTER_DELAY = 0xb94, /// <"You have to wait for one day before delegating a new Guild leader"
+ SKILL_NEED_GATLING = 0x9fa,
+ SKILL_NEED_SHOTGUN = 0x9fb,
+ SKILL_NEED_RIFLE = 0x9fc,
+ SKILL_NEED_REVOLVER = 0x9fd,
+ SKILL_NEED_HOLY_BULLET = 0x9fe,
+ SKILL_NEED_GRENADE = 0xa01,
};
-enum e_personalinfo {
+enum e_personalinfo : uint8_t {
PINFO_BASIC = 0,
PINFO_PREMIUM,
PINFO_SERVER,
@@ -511,7 +520,7 @@ enum e_personalinfo {
PINFO_MAX,
};
-enum e_damage_type {
+enum e_damage_type : uint8_t {
DMG_NORMAL = 0, /// damage [ damage: total damage, div: amount of hits, damage2: assassin dual-wield damage ]
DMG_PICKUP_ITEM, /// pick up item
DMG_SIT_DOWN, /// sit down
@@ -534,7 +543,6 @@ void clif_setport(uint16 port);
uint32 clif_getip(void);
uint32 clif_refresh_ip(void);
uint16 clif_getport(void);
-void packetdb_readdb(bool reload);
void clif_authok(struct map_session_data *sd);
void clif_authrefuse(int fd, uint8 error_code);
@@ -680,7 +688,7 @@ void clif_status_change(struct block_list *bl, int type, int flag, int tick, int
void clif_efst_status_change(struct block_list *bl, int tid, enum send_target target, int type, int tick, int val1, int val2, int val3);
void clif_efst_status_change_sub(struct block_list *tbl, struct block_list *bl, enum send_target target);
-void clif_wis_message(int fd, const char* nick, const char* mes, int mes_len);
+void clif_wis_message(struct map_session_data* sd, const char* nick, const char* mes, int mes_len, int gmlvl);
void clif_wis_end(int fd, int result);
void clif_solved_charname(int fd, int charid, const char* name);
@@ -878,7 +886,7 @@ void do_init_clif(void);
void do_final_clif(void);
// MAIL SYSTEM
-enum mail_send_result{
+enum mail_send_result : uint8_t {
WRITE_MAIL_SUCCESS = 0x0,
WRITE_MAIL_FAILED = 0x1,
WRITE_MAIL_FAILED_CNT = 0x2,
@@ -904,7 +912,7 @@ void clif_Auction_message(int fd, unsigned char flag);
void clif_Auction_close(int fd, unsigned char flag);
void clif_parse_Auction_cancelreg(int fd, struct map_session_data *sd);
-void clif_bossmapinfo(int fd, struct mob_data *md, short flag);
+void clif_bossmapinfo(struct map_session_data *sd, struct mob_data *md, enum e_bossmap_info flag);
void clif_cashshop_show(struct map_session_data *sd, struct npc_data *nd);
// ADOPTION
@@ -930,6 +938,8 @@ void clif_party_show_picker(struct map_session_data * sd, struct item * item_dat
// Progress Bar [Inkfish]
void clif_progressbar(struct map_session_data * sd, unsigned long color, unsigned int second);
void clif_progressbar_abort(struct map_session_data * sd);
+void clif_progressbar_npc(struct npc_data *nd, struct map_session_data* sd);
+#define clif_progressbar_npc_area(nd) clif_progressbar_npc((nd),NULL)
void clif_PartyBookingRegisterAck(struct map_session_data *sd, int flag);
void clif_PartyBookingDeleteAck(struct map_session_data* sd, int flag);
@@ -1027,7 +1037,7 @@ enum clif_colors {
COLOR_LIGHT_GREEN,
COLOR_MAX
};
-unsigned long color_table[COLOR_MAX];
+extern unsigned long color_table[COLOR_MAX];
void clif_channel_msg(struct Channel *channel, const char *msg, unsigned long color);
@@ -1038,7 +1048,7 @@ void clif_update_rankingpoint(struct map_session_data *sd, int rankingtype, int
void clif_crimson_marker(struct map_session_data *sd, struct block_list *bl, bool remove);
-void clif_showscript(struct block_list* bl, const char* message);
+void clif_showscript(struct block_list* bl, const char* message, enum send_target flag);
void clif_party_leaderchanged(struct map_session_data *sd, int prev_leader_aid, int new_leader_aid);
void clif_account_name(int fd, uint32 account_id, const char* accname);
@@ -1052,8 +1062,10 @@ void clif_dressing_room(struct map_session_data *sd, int flag);
void clif_navigateTo(struct map_session_data *sd, const char* mapname, uint16 x, uint16 y, uint8 flag, bool hideWindow, uint16 mob_id );
void clif_SelectCart(struct map_session_data *sd);
-#ifdef __cplusplus
-}
-#endif
+/// Achievement System
+void clif_achievement_list_all(struct map_session_data *sd);
+void clif_achievement_update(struct map_session_data *sd, struct achievement *ach, int count);
+void clif_pAchievementCheckReward(int fd, struct map_session_data *sd);
+void clif_achievement_reward_ack(int fd, unsigned char result, int ach_id);
-#endif /* _CLIF_H_ */
+#endif /* _CLIF_HPP_ */
diff --git a/src/map/clif_obfuscation.hpp b/src/map/clif_obfuscation.hpp
new file mode 100644
index 00000000000..ca76249f28d
--- /dev/null
+++ b/src/map/clif_obfuscation.hpp
@@ -0,0 +1,428 @@
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
+#ifndef _CLIF_OBFUSCATION_HPP_
+#define _CLIF_OBFUSCATION_HPP_
+
+#if defined(PACKET_OBFUSCATION) || defined(PACKET_OBFUSCATION_WARN)
+ #define packet_keys(a,b,c) static unsigned int clif_cryptKey[] = { a, b, c };
+
+ #if defined(PACKET_OBFUSCATION_KEY1) || defined(PACKET_OBFUSCATION_KEY2) || defined(PACKET_OBFUSCATION_KEY3)
+ #ifndef PACKET_OBFUSCATION_KEY1
+ #error You enabled custom packet obfuscation keys, but did not specify key number 1.
+ #endif
+ #ifndef PACKET_OBFUSCATION_KEY2
+ #error You enabled custom packet obfuscation keys, but did not specify key number 2.
+ #endif
+ #ifndef PACKET_OBFUSCATION_KEY3
+ #error You enabled custom packet obfuscation keys, but did not specify key number 3.
+ #endif
+
+ packet_keys(PACKET_OBFUSCATION_KEY1,PACKET_OBFUSCATION_KEY2,PACKET_OBFUSCATION_KEY3);
+ #elif PACKETVER == 20110817
+ packet_keys(0x053D5CED,0x3DED6DED,0x6DED6DED);
+ #elif PACKETVER == 20110824
+ packet_keys(0x35C91401,0x262A5556,0x28FA03AA);
+ #elif PACKETVER == 20110831
+ packet_keys(0x3AD67ED0,0x44703C69,0x6F876809);
+ #elif PACKETVER == 20110906
+ packet_keys(0x3AD67ED0,0x44703C69,0x6F876809); // unchanged from 2011-08-31
+ #elif PACKETVER == 20111005 // 2011-10-05aRagexeRE
+ packet_keys(0x291E6762,0x77CD391A,0x60AC2F16);
+ #elif PACKETVER == 20111012
+ packet_keys(0x7F3C2D29,0x59B01DE6,0x1DBB44CA);
+ #elif PACKETVER == 20111021
+ packet_keys(0x357D55DC,0x5A8D759F,0x245C30F5);
+ #elif PACKETVER == 20111025
+ packet_keys(0x50AE1A63,0x3CE579B5,0x29C10406);
+ #elif PACKETVER == 20111102 // 2011-11-02aRagexe
+ packet_keys(0x5324329D,0x5D545D52,0x06137269);
+ #elif PACKETVER == 20111109
+ packet_keys(0x0B642BDA,0x6ECB1D1C,0x61C7454B);
+ #elif PACKETVER == 20111122
+ packet_keys(0x3B550F07,0x1F666C7C,0x60304EF5);
+ #elif PACKETVER == 20111207
+ packet_keys(0x2A610886,0x3E09165E,0x57C11888);
+ #elif PACKETVER == 20111214
+ packet_keys(0x5151306B,0x7AE32886,0x53060628);
+ #elif PACKETVER == 20111220
+ packet_keys(0x05D53871,0x7D0027B4,0x29975333);
+ #elif PACKETVER == 20111228
+ packet_keys(0x0FF87E93,0x6CFF7860,0x3A3D1DEC);
+ #elif PACKETVER == 20120104
+ packet_keys(0x262034A1,0x674542A5,0x73A50BA5);
+ #elif PACKETVER == 20120111
+ packet_keys(0x2B412AFC,0x4FF94487,0x6705339D);
+ #elif PACKETVER == 20120120
+ packet_keys(0x504345D0,0x3D427B1B,0x794C2DCC);
+ #elif PACKETVER == 20120202
+ packet_keys(0x2CFC0A71,0x2BA91D8D,0x087E39E0);
+ #elif PACKETVER == 20120207
+ packet_keys(0x1D373F5D,0x5ACD604D,0x1C4D7C4D);
+ #elif PACKETVER == 20120214
+ packet_keys(0x7A255EFA,0x30977276,0x2D4A0448);
+ #elif PACKETVER == 20120229
+ packet_keys(0x520B4C64,0x2800407D,0x47651458);
+ #elif PACKETVER == 20120307 // 2012-03-07fRagexeRE
+ packet_keys(0x382A6DEF,0x5CBE7202,0x61F46637);
+ #elif PACKETVER == 20120314
+ packet_keys(0x689C1729,0x11812639,0x60F82967);
+ #elif PACKETVER == 20120321
+ packet_keys(0x21F9683F,0x710C5CA5,0x1FD910E9);
+ #elif PACKETVER == 20120328
+ packet_keys(0x75B8553B,0x37F20B12,0x385C2B40);
+ #elif PACKETVER == 20120404
+ packet_keys(0x0036310C,0x2DCD0BED,0x1EE62A78);
+ #elif PACKETVER == 20120410 // 2012-04-10aRagexeRE
+ packet_keys(0x01581359,0x452D6FFA,0x6AFB6E2E);
+ #elif PACKETVER == 20120418 // 2012-04-18aRagexeRE
+ packet_keys(0x01540E48,0x13041224,0x31247924);
+ #elif PACKETVER == 20120424
+ packet_keys(0x411D1DBB,0x4CBA4848,0x1A432FC4);
+ #elif PACKETVER == 20120509
+ packet_keys(0x16CF3301,0x1F472B9B,0x0B4A3CD2);
+ #elif PACKETVER == 20120515
+ packet_keys(0x4A715EF9,0x79103E4F,0x405C1238);
+ #elif PACKETVER == 20120525
+ packet_keys(0x70EB4CCB,0x0487713C,0x398D4B08);
+ #elif PACKETVER == 20120605
+ packet_keys(0x68CA3080,0x31B74BDD,0x505208F1);
+ #elif PACKETVER == 20120612
+ packet_keys(0x32E45D64,0x35643564,0x35643564);
+ #elif PACKETVER == 20120618 // 2012-06-18
+ packet_keys(0x261F261F,0x261F261F,0x261F261F);
+ #elif PACKETVER == 20120702 // 2012-07-02aRagexeRE
+ packet_keys(0x25733B31,0x53486CFD,0x398649BD);
+ #elif PACKETVER == 20120716
+ packet_keys(0x76052205,0x22052205,0x22052205);
+ #elif PACKETVER == 20130320 // 2013-03-20Ragexe
+ packet_keys(0x3F094C49,0x55F86C1E,0x58AA359A);
+ #elif PACKETVER == 20130515 // 2013-05-15aRagexe
+ packet_keys(0x75794A38,0x58A96BC1,0x296E6FB8);
+ #elif PACKETVER == 20130522 // 2013-05-22Ragexe
+ packet_keys(0x6948050B,0x06511D9D,0x725D4DF1);
+ #elif PACKETVER == 20130529 // 2013-05-29Ragexe
+ packet_keys(0x023A6C87,0x14BF1F1E,0x5CC70CC9);
+ #elif PACKETVER == 20130605 // 2013-06-05Ragexe
+ packet_keys(0x646E08D9,0x5F153AB5,0x61B509B5);
+ #elif PACKETVER == 20130612 // 2013-06-12Ragexe
+ packet_keys(0x6D166F66,0x3C000FCF,0x295B0FCB);
+ #elif PACKETVER == 20130618 // 2013-06-18Ragexe
+ packet_keys(0x434115DE,0x34A10FE9,0x6791428E);
+ #elif PACKETVER == 20130626 // 2013-06-26Ragexe
+ packet_keys(0x38F453EF,0x6A040FD8,0x65BD6668);
+ #elif PACKETVER == 20130703 // 2013-07-03Ragexe
+ packet_keys(0x4FF90E23,0x0F1432F2,0x4CFA1EDA);
+ #elif PACKETVER == 20130710 // 2013-07-10Ragexe
+ packet_keys(0x458F758F,0x4CCF3F8F,0x4A9C4237);
+ #elif PACKETVER == 20130717 // 2013-07-17Ragexe
+ packet_keys(0x2BED4F91,0x5F9E00CF,0x5EE5520C);
+ #elif PACKETVER == 20130807 // 2013-08-07Ragexe
+ packet_keys(0x7E241DE0,0x5E805580,0x3D807D80);
+ #elif PACKETVER == 20130814
+ packet_keys(0x23A23148,0x0C41420E,0x53785AD7);
+ #elif PACKETVER == 20131218
+ packet_keys(0x6A596301,0x76866D0E,0x32294A45);
+ #elif PACKETVER == 20131223 // 2013-12-23Ragexe
+ packet_keys(0x631C511C,0x111C111C,0x111C111C);
+ #elif PACKETVER == 20131230
+ packet_keys(0x611B7097,0x01F957A1,0x768A0FCB);
+ #elif PACKETVER == 20140115
+ packet_keys(0x63224335,0x0F3A1F27,0x6D217B24);
+ #elif PACKETVER == 20140205
+ packet_keys(0x63DC7BDC,0x7BDC7BDC,0x7BDC7BDC);
+ #elif PACKETVER == 20140305
+ packet_keys(0x116763F2,0x41117DAC,0x7FD13C45);
+ #elif PACKETVER == 20140402
+ packet_keys(0x15D3271C,0x004D725B,0x111A3A37);
+ #elif PACKETVER == 20140416
+ packet_keys(0x04810281,0x42814281,0x42814281);
+ #elif PACKETVER == 20141016 // 2014-10-16Ragexe
+ packet_keys(0x2DFF467C,0x444B37EE,0x2C1B634F);
+ #elif PACKETVER == 20141022 // 2014-10-22bRagexe
+ packet_keys(0x290551EA,0x2B952C75,0x2D67669B);
+ #elif PACKETVER == 20150107 // 2015-01-07aRagexeRE
+ packet_keys(0x6C494A14, 0x4DDB6427, 0x3E6D7B65);
+ #elif PACKETVER == 20150114 // 2015-01-14aRagexe
+ packet_keys(0x21C96102, 0x13142934, 0x1ABF4EA3);
+ #elif PACKETVER == 20150128 // 2015-01-28aRagexe
+ packet_keys(0x77CA2D55,0x28B608F0,0x75B47957);
+ #elif PACKETVER == 20150204 // 2015-02-04aRagexe
+ packet_keys(0x134529DB,0x5B4F6CEF,0x29EF11EF);
+ #elif PACKETVER == 20150225 || PACKETVER == 20150226 // 2015-02-25aRagexeRE or 2015-02-26aRagexeRE
+ packet_keys(0x57FD4B7B,0x19CC16FB,0x0D255D72);
+ #elif PACKETVER == 20150311 // 2015-03-11aRagexeRE
+ packet_keys(0x48C45D97,0x06CE09B0,0x5836642F);
+ #elif PACKETVER == 20150325 // 2015-03-25aRagexe
+ packet_keys(0x68F62B8C, 0x337C3468, 0x38FC0AC7);
+ #elif PACKETVER == 20150401 // 2015-04-01aRagexe
+ packet_keys(0x207F3A08,0x57E6160C,0x02A60382);
+ #elif PACKETVER == 20150422 // 2015-04-22aRagexeRE
+ packet_keys(0x10D22CE2,0x69E279E2,0x79E279E2);
+ #elif PACKETVER == 20150429 // 2015-04-29aRagexe
+ packet_keys(0x2BF61A71,0x565D5DDF,0x0FB90019);
+ #elif PACKETVER == 20150507 // 2015-05-07bRagexe
+ packet_keys(0x55B54373,0x58967821,0x67F41832);
+ #elif PACKETVER == 20150513 // 2015-05-13aRagexe
+ packet_keys(0x62C86D09,0x75944F17,0x112C133D);
+ #elif PACKETVER == 20150527 // 2015-05-27aRagexe
+ packet_keys(0x35AE7BAE,0x3BAE3BAE,0x3BAE3BAE);
+ #elif PACKETVER == 20150617 || PACKETVER == 20150618 // 2015-06-17aRagexeRE or 2015-06-18aRagexeRE
+ packet_keys(0x250F7E09,0x25416076,0x029A780E);
+ #elif PACKETVER == 20150819 // 2015-08-19aRagexeRE
+ packet_keys(0x1A2400E0,0x736E5686,0x10F315D5);
+ #elif PACKETVER == 20150826 // 2015-08-26aRagexeRE
+ packet_keys(0x77883C56,0x1829359F,0x0DE635B6);
+ #elif PACKETVER == 20150916 // 2015-09-16Ragexe
+ packet_keys(0x17F83A19,0x116944F4,0x1CC541E9);
+ #elif PACKETVER == 20151001 // 2015-10-01bRagexeRE
+ packet_keys(0x45B945B9,0x45B945B9,0x45B945B9);
+ #elif PACKETVER == 20151007 // 2015-10-07aRagexeRE
+ packet_keys(0x3C6447A8,0x032170D7,0x6490476C);
+ #elif PACKETVER == 20151014 // 2015-10-14bRagexeRE
+ packet_keys(0x402728A8,0x5D0E309F,0x240018FD);
+ #elif PACKETVER == 20151022 // 2015-10-22aRagexeRE
+ packet_keys(0x0311104D,0x46C326D6,0x00E82720);
+ #elif PACKETVER == 20151028 // 2015-10-28cRagexeRE
+ packet_keys(0x45B945B9,0x45B945B9,0x45B945B9);
+ #elif PACKETVER == 20151029 // 2015-10-29aRagexe
+ packet_keys(0x45B945B9,0x45B945B9,0x45B945B9);
+ #elif PACKETVER == 20151104 // 2015-11-04aRagexe
+ packet_keys(0x4C17382A,0x7ED174C9,0x29961E4F);
+ #elif PACKETVER == 20151111 // 2015-11-11aRagexeRE
+ packet_keys(0x46097C77,0x5F193871,0x29140A21);
+ #elif PACKETVER == 20151118 // 2015-11-18aRagexeRE
+ packet_keys(0x734C3241,0x6E846F34,0x731C06D6);
+ #elif PACKETVER == 20151125 // 2015-11-25dRagexeRE
+ packet_keys(0x237446C0,0x5EFB343A,0x0EDF06C5);
+ #elif PACKETVER == 20151202 // 2015-12-02bRagexeRE
+ packet_keys(0x4EDE52DE,0x52DE52DE,0x52DE52DE);
+ #elif PACKETVER == 20151209 // 2015-12-09aRagexeRE
+ packet_keys(0x652C5898,0x7A351FB3,0x67EA2886);
+ #elif PACKETVER == 20151216 // 2015-12-16aRagexeRE
+ packet_keys(0x25DD643D,0x61AC39DE,0x77A8206D);
+ #elif PACKETVER == 20151223 // 2015-12-23bRagexeRE
+ packet_keys(0x347D68D0,0x2C705320,0x7B4A199D);
+ #elif PACKETVER == 20160106 // 2016-01-06aRagexeRE
+ packet_keys(0x40520265,0x33FE26FC,0x7136294F);
+ #elif PACKETVER == 20160113 // 2016-01-13cRagexeRE
+ packet_keys(0x18005C4B,0x19A94A72,0x73F678EC);
+ #elif PACKETVER == 20160120 // 2016-01-20aRagexeRE
+ packet_keys(0x51495149,0x51495149,0x51495149);
+ #elif PACKETVER == 20160127 // 2016-01-27bRagexeRE
+ packet_keys(0x6B1E7146,0x612C47E6,0x274E56EE);
+ #elif PACKETVER == 20160203 // 2016-02-03aRagexeRE
+ packet_keys(0x3E1411AF,0x6C744497,0x7CFA1BDE);
+ #elif PACKETVER == 20160211 // 2016-02-11aRagexeRE
+ packet_keys(0x613813EA,0x05251DAB,0x1FD35E33);
+ #elif PACKETVER == 20160217 // 2016-02-17cRagexeRE
+ packet_keys(0x25895A8E,0x09421C19,0x763A2D7A);
+ #elif PACKETVER == 20160224 // 2016-02-24bRagexeRE
+ packet_keys(0x7088019A,0x13471F02,0x42356A7D);
+ #elif PACKETVER == 20160302 // 2016-03-02bRagexeRE
+ packet_keys(0x7B4441B9,0x5BBC63AF,0x45DA0E71);
+ #elif PACKETVER == 20160309 // 2016-03-09aRagexeRE
+ packet_keys(0x21587520,0x353A7706,0x1B722B25);
+ #elif PACKETVER == 20160316 // 2016-03-16aRagexeRE
+ packet_keys(0x62363E36,0x3E363E36,0x3E363E36);
+ #elif PACKETVER == 20160323 // 2016-03-23aRagexeRE
+ packet_keys(0x73E35A83,0x62142FA8,0x12BA36BD);
+ #elif PACKETVER == 20160330 // 2016-03-30aRagexeRE
+ packet_keys(0x02050940,0x545336FF,0x7E7D4902);
+ #elif PACKETVER == 20160406 // 2016-04-06aRagexeRE
+ packet_keys(0x568611EA,0x32457D8D,0x2B020477);
+ #elif PACKETVER == 20160414 // 2016-04-14bRagexeRE
+ packet_keys(0x31BD479A,0x40C61398,0x397C1A80);
+ #elif PACKETVER == 20160420 // 2016-04-20aRagexeRE
+ packet_keys(0x67D2163A,0x3068215B,0x4835474D);
+ #elif PACKETVER == 20160427 // 2016-04-27aRagexeRE
+ packet_keys(0x12DC378E,0x4E3E7EBE,0x0ABE2ABE);
+ #elif PACKETVER == 20160504 // 2016-05-04aRagexeRE
+ packet_keys(0x09E0544C,0x0231251D,0x2F4E195F);
+ #elif PACKETVER == 20160511 // 2016-05-11aRagexeRE
+ packet_keys(0x3C666FE2,0x27E84E3E,0x53E11BA5);
+ #elif PACKETVER == 20160518 // 2016-05-18aRagexeRE
+ packet_keys(0x57DB7CA1,0x1FEA1629,0x26DD244D);
+ #elif PACKETVER == 20160525 // 2016-05-25aRagexeRE
+ packet_keys(0x485C45B6,0x47DC6192,0x76B34A36);
+ #elif PACKETVER == 20160601 // 2016-06-01aRagexeRE
+ packet_keys(0x3DAD32C4,0x59F001BE,0x73F65E56);
+ #elif PACKETVER == 20160608 // 2016-06-08aRagexeRE
+ packet_keys(0x11D74609,0x77C43E8A,0x44290F53);
+ #elif PACKETVER == 20160615 // 2016-06-15aRagexeRE
+ packet_keys(0x062C5C26,0x6CF47E82,0x4DD53480);
+ #elif PACKETVER == 20160622 // 2016-06-22aRagexeRE
+ packet_keys(0x426548AB,0x5C0F5DD4,0x03022710);
+ #elif PACKETVER == 20160629 || PACKETVER == 20160630 // 2016-06-29aRagexeRE or 2016-06-30aRagexeRE
+ packet_keys(0x0DF31CCC,0x54281606,0x5C4C6855);
+ #elif PACKETVER == 20160706 // 2016-07-06cRagexeRE
+ packet_keys(0x33A766D0,0x743F04F8,0x0FA0276C);
+ #elif PACKETVER == 20160713 // 2016-07-13bRagexeRE
+ packet_keys(0x714F2495,0x7DDC6F32,0x3FD8533D);
+ #elif PACKETVER == 20160720 // 2016-07-20aRagexeRE
+ packet_keys(0x4F8A19C0,0x2D8E085C,0x37BB67D6);
+ #elif PACKETVER == 20160727 // 2016-07-27bRagexeRE
+ packet_keys(0x3C6952AB,0x26E4077F,0x37E25DF7);
+ #elif PACKETVER == 20160803 // 2016-08-03bRagexeRE
+ packet_keys(0x67F438C2,0x512A4EB7,0x2D353182);
+ #elif PACKETVER == 20160810 // 2016-08-10aRagexeRE
+ packet_keys(0x2F252886,0x242234A2,0x48BC5032);
+ #elif PACKETVER == 20160831 // 2016-08-31bRagexeRE
+ packet_keys(0x564E13B0,0x7F680549,0x382D273B);
+ #elif PACKETVER == 20160907 // 2016-09-07aRagexeRE
+ packet_keys(0x32E5237D,0x57BD4DBD,0x5DBD5DBD);
+ #elif PACKETVER == 20160913 // 2016-09-13aRagexeRE
+ packet_keys(0x7C79748F,0x1AA03B1D,0x6EAC4747);
+ #elif PACKETVER == 20160921 // 2016-09-21bRagexeRE
+ packet_keys(0x11CD15CD,0x15CD15CD,0x15CD15CD);
+ #elif PACKETVER == 20160928 // 2016-09-28dRagexeRE
+ packet_keys(0x2F8C67F5,0x22D42C38,0x57513774);
+ #elif PACKETVER == 20161005 // 2016-10-05aRagexeRE
+ packet_keys(0x5BAE21F8,0x021E2FFC,0x3BEB7C31);
+ #elif PACKETVER == 20161012 // 2016-10-12aRagexeRE
+ packet_keys(0x5E2311F2,0x14FD012C,0x76EB64F6);
+ #elif PACKETVER == 20161019 // 2016-10-19aRagexeRE
+ packet_keys(0x34882F11,0x7C870E70,0x7E61350D);
+ #elif PACKETVER == 20161026 // 2016-10-26bRagexeRE
+ packet_keys(0x2CB86AE6,0x7D12660E,0x1B004DEB);
+ #elif PACKETVER == 20161102 || PACKETVER == 20161103 // 2016-11-02aRagexeRE or 2016-11-03aRagexeRE
+ packet_keys(0x76725C17,0x72FE4EC1,0x07A91BFD);
+ #elif PACKETVER == 20161109 // 2016-11-09bRagexeRE
+ packet_keys(0x0A5277C0,0x2DB17506,0x0E8F26DA);
+ #elif PACKETVER == 20161116 // 2016-11-16cRagexeRE
+ packet_keys(0x780C5C3F,0x15E92272,0x2BA770C5);
+ #elif PACKETVER == 20161123 // 2016-11-23aRagexeRE
+ packet_keys(0x66FF559F,0x00D3535B,0x236246F7);
+ #elif PACKETVER == 20161130 // 2016-11-30bRagexeRE
+ packet_keys(0x2ED80296,0x0D837373,0x20266F9A);
+ #elif PACKETVER == 20161207 // 2016-12-07eRagexeRE
+ packet_keys(0x52D267AA,0x4FE42156,0x1292153E);
+ #elif PACKETVER == 20161214 // 2016-12-14bRagexeRE
+ packet_keys(0x4DDE217B,0x07863AE0,0x5B591656);
+ #elif PACKETVER == 20161221 // 2016-12-21aRagexeRE
+ packet_keys(0x69CB4F56,0x793C165E,0x673A2354);
+ #elif PACKETVER == 20161228 // 2016-12-28aRagexeRE
+ packet_keys(0x09366971,0x005672F1,0x6F3712AE);
+ #elif PACKETVER == 20170104 // 2017-01-04bRagexeRE
+ packet_keys(0x44416BC3,0x6C8D1817,0x072D75D5);
+ #elif PACKETVER == 20170111 // 2017-01-11aRagexeRE
+ packet_keys(0x19B637F9,0x0E9C378A,0x41673186);
+ #elif PACKETVER == 20170118 // 2017-01-18aRagexeRE
+ packet_keys(0x456B36EB,0x15EB34B0,0x18C42E43);
+ #elif PACKETVER == 20170125 // 2017-01-25aRagexeRE
+ packet_keys(0x066E04FE,0x3004224A,0x04FF0458);
+ #elif PACKETVER == 20170201 // 2017-02-01aRagexeRE
+ packet_keys(0x2011228E,0x00453005,0x628E7F0A);
+ #elif PACKETVER == 20170208 // 2017-02-08aRagexeRE
+ packet_keys(0x6A764E5F,0x0609570D,0x28AE07FA);
+ #elif PACKETVER == 20170215 // 2017-02-15aRagexeRE
+ packet_keys(0x50C01315,0x51012A42,0x679E16C3);
+ #elif PACKETVER == 20170222 // 2017-02-22aRagexeRE
+ packet_keys(0x5A242F2F,0x6C556187,0x73C022CB);
+ #elif PACKETVER == 20170228 // 2017-02-28aRagexeRE
+ packet_keys(0x771D4F2B,0x20EF1F4C,0x0D5135C8);
+ #elif PACKETVER == 20170308 // 2017-03-08bRagexeRE
+ packet_keys(0x653470A9,0x6B316A71,0x5C712C71);
+ #elif PACKETVER == 20170315 // 2017-03-15cRagexeRE
+ packet_keys(0x399A0856,0x56642A94,0x7F77157D);
+ #elif PACKETVER == 20170322 // 2017-03-22aRagexeRE
+ packet_keys(0x2050167B,0x01731233,0x40337033);
+ #elif PACKETVER == 20170329 // 2017-03-29dRagexeRE
+ packet_keys(0x18B31A80,0x1B0B1D56,0x16857D6A);
+ #elif PACKETVER == 20170405 // 2017-04-05bRagexeRE
+ packet_keys(0x1FDE7DAC,0x2F9F5B63,0x3F2062AF);
+ #elif PACKETVER == 20170412 // 2017-04-12aRagexeRE
+ packet_keys(0x39223393,0x5C847779,0x10217985);
+ #elif PACKETVER == 20170419 // 2017-04-19bRagexeRE
+ packet_keys(0x1F8F4B3F,0x2E481F03,0x39ED4178);
+ #elif PACKETVER == 20170426 // 2017-04-26dRagexeRE
+ packet_keys(0x167642A7,0x1DEC3D26,0x6D046D4C);
+ #elif PACKETVER == 20170502 // 2017-05-02dRagexeRE
+ packet_keys(0x05224194,0x466D4204,0x31F02EE0);
+ #elif PACKETVER == 20170517 // 2017-05-17aRagexeRE
+ packet_keys(0x2CC4749A,0x1FA954DC,0x72276857);
+ #elif PACKETVER == 20170524 // 2017-05-24aRagexeRE
+ packet_keys(0x0B4E03A6,0x2B93427C,0x583D4477);
+ #elif PACKETVER == 20170531 // 2017-05-31aRagexeRE
+ packet_keys(0x03FA5A97,0x20B802D5,0x339F1977);
+ #elif PACKETVER == 20170607 // 2017-06-07cRagexeRE
+ packet_keys(0x50564ACD,0x79CA4E15,0x405F4894);
+ #elif PACKETVER == 20170614 // 2017-06-14bRagexeRE
+ packet_keys(0x5ED10A48,0x667F4301,0x2E5D761F);
+ #elif PACKETVER == 20170621 // 2017-06-21aRagexeRE
+ packet_keys(0x155F34EC,0x2D943FA9,0x3D9170EB);
+ #elif PACKETVER == 20170628 // 2017-06-28bRagexeRE
+ packet_keys(0x04691C86,0x43C210E2,0x2FE277E2);
+ #elif PACKETVER == 20170705 // 2017-07-05aRagexeRE
+ packet_keys(0x7EB000AE,0x02FB1DBC,0x5CB131E6);
+ #elif PACKETVER == 20170712 // 2017-07-12bRagexeRE
+ packet_keys(0x2C3C202C,0x3F2C2F2C,0x2F2C2F2C);
+ #elif PACKETVER == 20170719 // 2017-07-19aRagexeRE
+ packet_keys(0x46465C88,0x10116F66,0x200866F9);
+ #elif PACKETVER == 20170726 // 2017-07-26cRagexeRE
+ packet_keys(0x102F23DB,0x7E767751,0x3BC172EF);
+ #elif PACKETVER == 20170801 // 2017-08-01aRagexeRE
+ packet_keys(0x26B52A7F,0x5377619D,0x4F580AC4);
+ //#elif PACKETVER == 20170809 // 2017-08-09cRagexeRE
+ #elif PACKETVER == 20170816 // 2017-08-16dRagexeRE
+ packet_keys(0x78914673,0x3F8B7634,0x55B814BC);
+ #elif PACKETVER == 20170823 // 2017-08-23aRagexeRE
+ packet_keys(0x22677205,0x393D1002,0x58DC6BB4);
+ #elif PACKETVER == 20170830 // 2017-08-30bRagexeRE
+ packet_keys(0x1D49592B,0x00970C17,0x1E640103);
+ #elif PACKETVER == 20170906 // 2017-09-06cRagexeRE
+ packet_keys(0x7DEF7677,0x351F36E6,0x52303485);
+ #elif PACKETVER == 20170913 // 2017-09-13bRagexeRE
+ packet_keys(0x7A645935,0x1DA05062,0x5A7A4C43);
+ #elif PACKETVER == 20170920 // 2017-09-20bRagexeRE
+ packet_keys(0x53024DA5,0x04EC212D,0x0BF87CD4);
+ #elif PACKETVER == 20170927 // 2017-09-27bRagexeRE or 2017-09-27dRagexeRE
+ packet_keys(0x15624100,0x0CE1463E,0x0E5D6534);
+ #elif PACKETVER == 20171002 // 2017-10-02cRagexeRE
+ packet_keys(0x15E1716C,0x4E765B63,0x357D2370);
+ #elif PACKETVER == 20171011 // 2017-10-11aRagexeRE or 2017-10-11bRagexeRE
+ packet_keys(0x4F121B3E,0x12670E17,0x19896C11);
+ #elif PACKETVER == 20171018 // 2017-10-18aRagexeRE
+ packet_keys(0x2CAA109C,0x158C1EC2,0x7A5E58F3);
+ #elif PACKETVER == 20171025 // 2017-10-25bRagexeRE or 2017-10-25cRagexeRE or 2017-10-25dRagexeRE or 2017-10-25eRagexeRE
+ packet_keys(0x165C565C,0x565C565C,0x565C565C);
+ #elif PACKETVER == 20171101 // 2017-11-01bRagexeRE
+ packet_keys(0x7056317F,0x7EEE0589,0x02672373);
+ #elif PACKETVER == 20171108 // 2017-11-08bRagexeRE
+ packet_keys(0x03695685,0x7FAC12CE,0x182F7A7B);
+ #elif PACKETVER == 20171115 // 2017-11-15aRagexeRE
+ packet_keys(0x23B97A3B,0x34610993,0x2892070E);
+ #elif PACKETVER == 20171122 // 2017-11-22bRagexeRE
+ packet_keys(0x03221B0E,0x73AB7A5F,0x0DD80FD4);
+ #elif PACKETVER == 20171129 // 2017-11-29aRagexeRE
+ packet_keys(0x581B77A7,0x62F74D7A,0x4F102173);
+ #elif PACKETVER == 20171206 // 2017-12-06aRagexeRE
+ packet_keys(0x39D54BD3,0x577A0C21,0x4C1C316E);
+ #elif PACKETVER == 20171213 // 2017-12-13bRagexeRE
+ packet_keys(0x44E41107,0x3B126921,0x00E06AAC);
+ #elif PACKETVER == 20171220 // 2017-12-20aRagexeRE
+ packet_keys(0x6EFE009A,0x440B7BFA,0x052339C8);
+ #elif PACKETVER == 20171227 // 2017-12-27aRagexeRE
+ packet_keys(0x257A2F6E,0x51140EEE,0x00FA4452);
+ #elif PACKETVER == 20180103 // 2018-01-03aRagexeRE or 2018-01-03bRagexeRE
+ packet_keys(0x348F4BD7,0x7A425A54,0x628F589A);
+ #elif PACKETVER == 20180117 // 2018-01-17aRagexeRE
+ packet_keys(0x21F477F4,0x37F437F4,0x37F437F4);
+ #elif PACKETVER == 20180124 // 2018-01-24bRagexeRE
+ packet_keys(0x7EAA1CE0,0x415D1CFD,0x4C8F19FA);
+ #elif PACKETVER == 20180207 // 2018-02-07bRagexeRE
+ packet_keys(0x45AA1B44,0x20E716B7,0x5388105C);
+ #elif PACKETVER == 20180213 // 2018-02-13aRagexeRE
+ packet_keys(0x189D69B2,0x43B85EAD,0x2B7A687E);
+ #elif PACKETVER == 20180221 // 2018-02-21aRagexeRE or 2018-02-21bRagexeRE
+ packet_keys(0x6E2F6233,0x193B0A66,0x0D1D2CA5);
+ #elif PACKETVER == 20180307 // 2018-03-07bRagexeRE
+ packet_keys(0x47DA10EB,0x4B922CCF,0x765C5055);
+ #elif PACKETVER > 20110817
+ #error Unsupported packet version.
+ #endif
+
+ #undef packet_keys
+#endif
+
+#endif /* _CLIF_OBFUSCATION_HPP_ */
diff --git a/src/map/clif_packetdb.hpp b/src/map/clif_packetdb.hpp
new file mode 100644
index 00000000000..0c0bdec3a25
--- /dev/null
+++ b/src/map/clif_packetdb.hpp
@@ -0,0 +1,2380 @@
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
+#ifndef _CLIF_PACKETDB_HPP_
+#define _CLIF_PACKETDB_HPP_
+
+ #define packet(cmd,length) packetdb_addpacket(cmd,length,NULL,0)
+ #define parseable_packet(cmd,length,func,...) packetdb_addpacket(cmd,length,func,__VA_ARGS__,0)
+ #define ack_packet(type,cmd,length,...) \
+ packetdb_addpacket(cmd,length,NULL,__VA_ARGS__,0); \
+ packet_db_ack[type] = cmd
+
+ packet(0x0064,55);
+ packet(0x0065,17);
+ packet(0x0066,6);
+ packet(0x0067,37);
+ packet(0x0068,46);
+ packet(0x0069,-1);
+ packet(0x006a,23);
+ packet(0x006b,-1);
+ packet(0x006c,3);
+ packet(0x006d,108);
+ packet(0x006e,3);
+ packet(0x006f,2);
+ packet(0x0070,6);
+ packet(0x0071,28);
+ parseable_packet(0x0072,19,clif_parse_WantToConnection,2,6,10,14,18);
+ packet(0x0073,11);
+ packet(0x0074,3);
+ packet(0x0075,-1);
+ packet(0x0076,9);
+ packet(0x0077,5);
+ packet(0x0078,54);
+ packet(0x0079,53);
+ packet(0x007a,58);
+ packet(0x007b,60);
+ packet(0x007c,41);
+ parseable_packet(0x007d,2,clif_parse_LoadEndAck,0);
+ parseable_packet(0x007e,6,clif_parse_TickSend,2);
+ packet(0x007f,6);
+ packet(0x0080,7);
+ packet(0x0081,3);
+ packet(0x0082,2);
+ packet(0x0083,2);
+ packet(0x0084,2);
+ parseable_packet(0x0085,5,clif_parse_WalkToXY,2);
+ packet(0x0086,16);
+ packet(0x0087,12);
+ packet(0x0088,10);
+ parseable_packet(0x0089,7,clif_parse_ActionRequest,2,6);
+ packet(0x008a,29);
+ packet(0x008b,2);
+ parseable_packet(0x008c,-1,clif_parse_GlobalMessage,2,4);
+ packet(0x008d,-1);
+ packet(0x008e,-1);
+ //packet(0x008f,-1);
+ parseable_packet(0x0090,7,clif_parse_NpcClicked,2,6);
+ packet(0x0091,22);
+ packet(0x0092,28);
+ packet(0x0093,2);
+ parseable_packet(0x0094,6,clif_parse_GetCharNameRequest,2);
+ packet(0x0095,30);
+ parseable_packet(0x0096,-1,clif_parse_WisMessage,2,4,28);
+ packet(0x0097,-1);
+ packet(0x0098,3);
+ parseable_packet(0x0099,-1,clif_parse_Broadcast,2,4);
+ packet(0x009a,-1);
+ parseable_packet(0x009b,5,clif_parse_ChangeDir,2,4);
+ packet(0x009c,9);
+ packet(0x009d,17);
+ packet(0x009e,17);
+ parseable_packet(0x009f,6,clif_parse_TakeItem,2);
+ packet(0x00a0,23);
+ packet(0x00a1,6);
+ parseable_packet(0x00a2,6,clif_parse_DropItem,2,4);
+ packet(0x00a3,-1);
+ packet(0x00a4,-1);
+ packet(0x00a5,-1);
+ packet(0x00a6,-1);
+ parseable_packet(0x00a7,8,clif_parse_UseItem,2,4);
+ packet(0x00a8,7);
+ parseable_packet(0x00a9,6,clif_parse_EquipItem,2,4);
+ ack_packet(ZC_WEAR_EQUIP_ACK,0x00aa,7,2,4,6);
+ parseable_packet(0x00ab,4,clif_parse_UnequipItem,2);
+ packet(0x00ac,7);
+ //packet(0x00ad,-1);
+ packet(0x00ae,-1);
+ packet(0x00af,6);
+ packet(0x00b0,8);
+ packet(0x00b1,8);
+ parseable_packet(0x00b2,3,clif_parse_Restart,2);
+ packet(0x00b3,3);
+ packet(0x00b4,-1);
+ packet(0x00b5,6);
+ packet(0x00b6,6);
+ packet(0x00b7,-1);
+ parseable_packet(0x00b8,7,clif_parse_NpcSelectMenu,2,6);
+ parseable_packet(0x00b9,6,clif_parse_NpcNextClicked,2);
+ packet(0x00ba,2);
+ parseable_packet(0x00bb,5,clif_parse_StatusUp,2,4);
+ packet(0x00bc,6);
+ packet(0x00bd,44);
+ packet(0x00be,5);
+ parseable_packet(0x00bf,3,clif_parse_Emotion,2);
+ packet(0x00c0,7);
+ parseable_packet(0x00c1,2,clif_parse_HowManyConnections,0);
+ packet(0x00c2,6);
+ packet(0x00c3,8);
+ packet(0x00c4,6);
+ parseable_packet(0x00c5,7,clif_parse_NpcBuySellSelected,2,6);
+ packet(0x00c6,-1);
+ packet(0x00c7,-1);
+ parseable_packet(0x00c8,-1,clif_parse_NpcBuyListSend,2,4);
+ parseable_packet(0x00c9,-1,clif_parse_NpcSellListSend,2,4);
+ packet(0x00ca,3);
+ packet(0x00cb,3);
+ parseable_packet(0x00cc,6,clif_parse_GMKick,2);
+ packet(0x00cd,3);
+ parseable_packet(0x00ce,2,clif_parse_GMKickAll,0);
+ parseable_packet(0x00cf,27,clif_parse_PMIgnore,2,26);
+ parseable_packet(0x00d0,3,clif_parse_PMIgnoreAll,2);
+ packet(0x00d1,4);
+ packet(0x00d2,4);
+ parseable_packet(0x00d3,2,clif_parse_PMIgnoreList,0);
+ packet(0x00d4,-1);
+ parseable_packet(0x00d5,-1,clif_parse_CreateChatRoom,2,4,6,7,15);
+ packet(0x00d6,3);
+ packet(0x00d7,-1);
+ packet(0x00d8,6);
+ parseable_packet(0x00d9,14,clif_parse_ChatAddMember,2,6);
+ packet(0x00da,3);
+ packet(0x00db,-1);
+ packet(0x00dc,28);
+ packet(0x00dd,29);
+ parseable_packet(0x00de,-1,clif_parse_ChatRoomStatusChange,2,4,6,7,15);
+ packet(0x00df,-1);
+ parseable_packet(0x00e0,30,clif_parse_ChangeChatOwner,2,6);
+ packet(0x00e1,30);
+ parseable_packet(0x00e2,26,clif_parse_KickFromChat,2);
+ parseable_packet(0x00e3,2,clif_parse_ChatLeave,0);
+ parseable_packet(0x00e4,6,clif_parse_TradeRequest,2);
+ packet(0x00e5,26);
+ parseable_packet(0x00e6,3,clif_parse_TradeAck,2);
+ packet(0x00e7,3);
+ parseable_packet(0x00e8,8,clif_parse_TradeAddItem,2,4);
+ packet(0x00e9,19);
+ packet(0x00ea,5);
+ parseable_packet(0x00eb,2,clif_parse_TradeOk,0);
+ packet(0x00ec,3);
+ parseable_packet(0x00ed,2,clif_parse_TradeCancel,0);
+ packet(0x00ee,2);
+ parseable_packet(0x00ef,2,clif_parse_TradeCommit,0);
+ packet(0x00f0,3);
+ packet(0x00f1,2);
+ packet(0x00f2,6);
+ parseable_packet(0x00f3,8,clif_parse_MoveToKafra,2,4);
+ packet(0x00f4,21);
+ parseable_packet(0x00f5,8,clif_parse_MoveFromKafra,2,4);
+ packet(0x00f6,8);
+ parseable_packet(0x00f7,2,clif_parse_CloseKafra,0);
+ packet(0x00f8,2);
+ parseable_packet(0x00f9,26,clif_parse_CreateParty,2);
+ packet(0x00fa,3);
+ packet(0x00fb,-1);
+ parseable_packet(0x00fc,6,clif_parse_PartyInvite,2);
+ packet(0x00fd,27);
+ packet(0x00fe,30);
+ parseable_packet(0x00ff,10,clif_parse_ReplyPartyInvite,2,6);
+ parseable_packet(0x0100,2,clif_parse_LeaveParty,0);
+ packet(0x0101,6);
+ parseable_packet(0x0102,6,clif_parse_PartyChangeOption,2);
+ parseable_packet(0x0103,30,clif_parse_RemovePartyMember,2,6);
+ packet(0x0104,79);
+ packet(0x0105,31);
+ packet(0x0106,10);
+ packet(0x0107,10);
+ parseable_packet(0x0108,-1,clif_parse_PartyMessage,2,4);
+ packet(0x0109,-1);
+ packet(0x010a,4);
+ packet(0x010b,6);
+ packet(0x010c,6);
+ packet(0x010d,2);
+ packet(0x010e,11);
+ packet(0x010f,-1);
+ packet(0x0110,10);
+ packet(0x0111,39);
+ parseable_packet(0x0112,4,clif_parse_SkillUp,2);
+ parseable_packet(0x0113,10,clif_parse_UseSkillToId,2,4,6);
+ packet(0x0114,31);
+ packet(0x0115,35);
+ parseable_packet(0x0116,10,clif_parse_UseSkillToPos,2,4,6,8);
+ packet(0x0117,18);
+ parseable_packet(0x0118,2,clif_parse_StopAttack,0);
+ packet(0x0119,13);
+ packet(0x011a,15);
+ parseable_packet(0x011b,20,clif_parse_UseSkillMap,2,4);
+ packet(0x011c,68);
+ parseable_packet(0x011d,2,clif_parse_RequestMemo,0);
+ packet(0x011e,3);
+ packet(0x011f,16);
+ packet(0x0120,6);
+ packet(0x0121,14);
+ packet(0x0122,-1);
+ packet(0x0123,-1);
+ packet(0x0124,21);
+ packet(0x0125,8);
+ parseable_packet(0x0126,8,clif_parse_PutItemToCart,2,4);
+ parseable_packet(0x0127,8,clif_parse_GetItemFromCart,2,4);
+ parseable_packet(0x0128,8,clif_parse_MoveFromKafraToCart,2,4);
+ parseable_packet(0x0129,8,clif_parse_MoveToKafraFromCart,2,4);
+ parseable_packet(0x012a,2,clif_parse_RemoveOption,0);
+ packet(0x012b,2);
+ packet(0x012c,3);
+ packet(0x012d,4);
+ parseable_packet(0x012e,2,clif_parse_CloseVending,0);
+ parseable_packet(0x012f,-1,clif_parse_OpenVending,2,4,0,84);
+ parseable_packet(0x0130,6,clif_parse_VendingListReq,2);
+ packet(0x0131,86);
+ packet(0x0132,6);
+ packet(0x0133,-1);
+ parseable_packet(0x0134,-1,clif_parse_PurchaseReq,2,4,8);
+ packet(0x0135,7);
+ packet(0x0136,-1);
+ packet(0x0137,6);
+ packet(0x0138,3);
+ packet(0x0139,16);
+ packet(0x013a,4);
+ packet(0x013b,4);
+ packet(0x013c,4);
+ packet(0x013d,6);
+ packet(0x013e,24);
+ parseable_packet(0x013f,26,clif_parse_GM_Item_Monster,2);
+ parseable_packet(0x0140,22,clif_parse_MapMove,2,18,20);
+ packet(0x0141,14);
+ packet(0x0142,6);
+ parseable_packet(0x0143,10,clif_parse_NpcAmountInput,2,6);
+ packet(0x0144,23);
+ packet(0x0145,19);
+ parseable_packet(0x0146,6,clif_parse_NpcCloseClicked,2);
+ packet(0x0147,39);
+ packet(0x0148,8);
+ parseable_packet(0x0149,9,clif_parse_GMReqNoChat,2,6,7);
+ packet(0x014a,6);
+ packet(0x014b,27);
+ packet(0x014c,-1);
+ parseable_packet(0x014d,2,clif_parse_GuildCheckMaster,0);
+ packet(0x014e,6);
+ parseable_packet(0x014f,6,clif_parse_GuildRequestInfo,2);
+ packet(0x0150,110);
+ parseable_packet(0x0151,6,clif_parse_GuildRequestEmblem,2);
+ packet(0x0152,-1);
+ parseable_packet(0x0153,-1,clif_parse_GuildChangeEmblem,2,4);
+ packet(0x0154,-1);
+ parseable_packet(0x0155,-1,clif_parse_GuildChangeMemberPosition,2,4);
+ packet(0x0156,-1);
+ packet(0x0157,6);
+ packet(0x0158,-1);
+ parseable_packet(0x0159,54,clif_parse_GuildLeave,2,6,10,14);
+ packet(0x015a,66);
+ parseable_packet(0x015b,54,clif_parse_GuildExpulsion,2,6,10,14);
+ packet(0x015c,90);
+ parseable_packet(0x015d,42,clif_parse_GuildBreak,2);
+ packet(0x015e,6);
+ packet(0x015f,42);
+ packet(0x0160,-1);
+ parseable_packet(0x0161,-1,clif_parse_GuildChangePositionInfo,2,4);
+ packet(0x0162,-1);
+ packet(0x0163,-1);
+ packet(0x0164,-1);
+ parseable_packet(0x0165,30,clif_parse_CreateGuild,2,6);
+ packet(0x0166,-1);
+ packet(0x0167,3);
+ parseable_packet(0x0168,14,clif_parse_GuildInvite,2,6,10);
+ packet(0x0169,3);
+ packet(0x016a,30);
+ parseable_packet(0x016b,10,clif_parse_GuildReplyInvite,2,6);
+ packet(0x016c,43);
+ packet(0x016d,14);
+ parseable_packet(0x016e,186,clif_parse_GuildChangeNotice,2,6,66);
+ packet(0x016f,182);
+ parseable_packet(0x0170,14,clif_parse_GuildRequestAlliance,2,6,10);
+ packet(0x0171,30);
+ parseable_packet(0x0172,10,clif_parse_GuildReplyAlliance,2,6);
+ packet(0x0173,3);
+ packet(0x0174,-1);
+ packet(0x0175,6);
+ packet(0x0176,106);
+ packet(0x0177,-1);
+ parseable_packet(0x0178,4,clif_parse_ItemIdentify,2);
+ packet(0x0179,5);
+ parseable_packet(0x017a,4,clif_parse_UseCard,2);
+ packet(0x017b,-1);
+ parseable_packet(0x017c,6,clif_parse_InsertCard,2,4);
+ packet(0x017d,7);
+ parseable_packet(0x017e,-1,clif_parse_GuildMessage,2,4);
+ packet(0x017f,-1);
+ parseable_packet(0x0180,6,clif_parse_GuildOpposition,2);
+ packet(0x0181,3);
+ packet(0x0182,106);
+ parseable_packet(0x0183,10,clif_parse_GuildDelAlliance,2,6);
+ packet(0x0184,10);
+ packet(0x0185,34);
+ //packet(0x0186,-1);
+ packet(0x0187,6);
+ packet(0x0188,8);
+ packet(0x0189,4);
+ parseable_packet(0x018a,4,clif_parse_QuitGame,2);
+ packet(0x018b,4);
+ packet(0x018c,29);
+ packet(0x018d,-1);
+ parseable_packet(0x018e,10,clif_parse_ProduceMix,2,4,6,8);
+ packet(0x018f,6);
+ parseable_packet(0x0190,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ packet(0x0191,86);
+ packet(0x0192,24);
+ parseable_packet(0x0193,6,clif_parse_SolveCharName,2);
+ packet(0x0194,30);
+ packet(0x0195,102);
+ packet(0x0196,9);
+ parseable_packet(0x0197,4,clif_parse_ResetChar,2);
+ parseable_packet(0x0198,8,clif_parse_GMChangeMapType,2,4,6);
+ packet(0x0199,4);
+ packet(0x019a,14);
+ packet(0x019b,10);
+ parseable_packet(0x019c,-1,clif_parse_LocalBroadcast,2,4);
+ parseable_packet(0x019d,6,clif_parse_GMHide,2);
+ packet(0x019e,2);
+ parseable_packet(0x019f,6,clif_parse_CatchPet,2);
+ packet(0x01a0,3);
+ parseable_packet(0x01a1,3,clif_parse_PetMenu,2);
+ packet(0x01a2,35);
+ packet(0x01a3,5);
+ packet(0x01a4,11);
+ parseable_packet(0x01a5,26,clif_parse_ChangePetName,2);
+ packet(0x01a6,-1);
+ parseable_packet(0x01a7,4,clif_parse_SelectEgg,2);
+ packet(0x01a8,4);
+ parseable_packet(0x01a9,6,clif_parse_SendEmotion,2);
+ packet(0x01aa,10);
+ packet(0x01ab,12);
+ packet(0x01ac,6);
+ packet(0x01ad,-1);
+ parseable_packet(0x01ae,4,clif_parse_SelectArrow,2);
+ parseable_packet(0x01af,4,clif_parse_ChangeCart,2);
+ packet(0x01b0,11);
+ packet(0x01b1,7);
+ parseable_packet(0x01b2,-1,clif_parse_OpenVending,2,4,84,85);
+ packet(0x01b3,67);
+ packet(0x01b4,12);
+ packet(0x01b5,18);
+ packet(0x01b6,114);
+ packet(0x01b7,6);
+ packet(0x01b8,3);
+ packet(0x01b9,6);
+ parseable_packet(0x01ba,26,clif_parse_GMShift,2);
+ parseable_packet(0x01bb,26,clif_parse_GMShift,2);
+ parseable_packet(0x01bc,26,clif_parse_GMRecall,2);
+ parseable_packet(0x01bd,26,clif_parse_GMRecall,2);
+ packet(0x01be,2);
+ packet(0x01bf,3);
+ packet(0x01c0,2);
+ packet(0x01c1,14);
+ packet(0x01c2,10);
+ packet(0x01c3,-1);
+ packet(0x01c4,22);
+ packet(0x01c5,22);
+ packet(0x01c6,4);
+ packet(0x01c7,2);
+ packet(0x01c8,13);
+ packet(0x01c9,97);
+ //packet(0x01ca,-1);
+ packet(0x01cb,9);
+ packet(0x01cc,9);
+ packet(0x01cd,30);
+ parseable_packet(0x01ce,6,clif_parse_AutoSpell,2);
+ packet(0x01cf,28);
+ packet(0x01d0,8);
+ packet(0x01d1,14);
+ packet(0x01d2,10);
+ packet(0x01d3,35);
+ packet(0x01d4,6);
+ parseable_packet(0x01d5,-1,clif_parse_NpcStringInput,2,4,8);
+ packet(0x01d6,4);
+ packet(0x01d7,11);
+ packet(0x01d8,54);
+ packet(0x01d9,53);
+ packet(0x01da,60);
+ packet(0x01db,2);
+ packet(0x01dc,-1);
+ packet(0x01dd,47);
+ packet(0x01de,33);
+ parseable_packet(0x01df,6,clif_parse_GMReqAccountName,2);
+ packet(0x01e0,30);
+ packet(0x01e1,8);
+ packet(0x01e2,34);
+ packet(0x01e3,14);
+ packet(0x01e4,2);
+ packet(0x01e5,6);
+ packet(0x01e6,26);
+ parseable_packet(0x01e7,2,clif_parse_NoviceDoriDori,0);
+ parseable_packet(0x01e8,28,clif_parse_CreateParty2,2,26,27);
+ packet(0x01e9,81);
+ packet(0x01ea,6);
+ packet(0x01eb,10);
+ packet(0x01ec,26);
+ parseable_packet(0x01ed,2,clif_parse_NoviceExplosionSpirits,0);
+ packet(0x01ee,-1);
+ packet(0x01ef,-1);
+ packet(0x01f0,-1);
+ packet(0x01f1,-1);
+ packet(0x01f2,20);
+ packet(0x01f3,10);
+ packet(0x01f4,32);
+ packet(0x01f5,9);
+ packet(0x01f6,34);
+ parseable_packet(0x01f7,14,clif_parse_Adopt_reply,2,6,10);
+ packet(0x01f8,2);
+ parseable_packet(0x01f9,6,clif_parse_Adopt_request,2);
+ packet(0x01fa,48);
+ packet(0x01fb,56);
+ packet(0x01fc,-1);
+ parseable_packet(0x01fd,4,clif_parse_RepairItem,2);
+ packet(0x01fe,5);
+ packet(0x01ff,10);
+ packet(0x0200,26);
+ packet(0x0201,-1);
+ parseable_packet(0x0202,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0203,10,clif_parse_FriendsListRemove,2,6);
+ packet(0x0204,18);
+ packet(0x0205,26);
+ packet(0x0206,11);
+ packet(0x0207,34);
+ parseable_packet(0x0208,11,clif_parse_FriendsListReply,2,6,10);
+ packet(0x0209,36);
+ packet(0x020a,10);
+ //packet(0x020b,-1);
+ //packet(0x020c,-1);
+ packet(0x020d,-1);
+ packet(0x8b3,-1);
+ ack_packet(ZC_CLEAR_DIALOG,0x8d6,6,2);
+
+// 2004-07-05aSakexe
+#if PACKETVER >= 20040705
+ parseable_packet(0x0072,22,clif_parse_WantToConnection,5,9,13,17,21);
+ parseable_packet(0x0085,8,clif_parse_WalkToXY,5);
+ parseable_packet(0x00a7,13,clif_parse_UseItem,5,9);
+ parseable_packet(0x0113,15,clif_parse_UseSkillToId,4,9,11);
+ parseable_packet(0x0116,15,clif_parse_UseSkillToPos,4,9,11,13);
+ parseable_packet(0x0190,95,clif_parse_UseSkillToPosMoreInfo,4,9,11,13,15);
+ parseable_packet(0x0208,14,clif_parse_FriendsListReply,2,6,10);
+ packet(0x020e,24);
+#endif
+
+// 2004-07-13aSakexe
+#if PACKETVER >= 20040713
+ parseable_packet(0x0072,39,clif_parse_WantToConnection,12,22,30,34,38);
+ parseable_packet(0x0085,9,clif_parse_WalkToXY,6);
+ parseable_packet(0x009b,13,clif_parse_ChangeDir,5,12);
+ parseable_packet(0x009f,10,clif_parse_TakeItem,6);
+ parseable_packet(0x00a7,17,clif_parse_UseItem,6,13);
+ parseable_packet(0x0113,19,clif_parse_UseSkillToId,7,9,15);
+ parseable_packet(0x0116,19,clif_parse_UseSkillToPos,7,9,15,17);
+ parseable_packet(0x0190,99,clif_parse_UseSkillToPosMoreInfo,7,9,15,17,19);
+#endif
+
+// 2004-07-26aSakexe
+#if PACKETVER >= 20040726
+ parseable_packet(0x0072,14,clif_parse_DropItem,5,12);
+ parseable_packet(0x007e,33,clif_parse_WantToConnection,12,18,24,28,32);
+ parseable_packet(0x0085,20,clif_parse_UseSkillToId,7,12,16);
+ parseable_packet(0x0089,15,clif_parse_GetCharNameRequest,11);
+ parseable_packet(0x008c,23,clif_parse_UseSkillToPos,3,6,17,21);
+ parseable_packet(0x0094,10,clif_parse_TakeItem,6);
+ parseable_packet(0x009b,6,clif_parse_WalkToXY,3);
+ parseable_packet(0x009f,13,clif_parse_ChangeDir,5,12);
+ parseable_packet(0x00a2,103,clif_parse_UseSkillToPosMoreInfo,3,6,17,21,23);
+ parseable_packet(0x00a7,12,clif_parse_SolveCharName,8);
+ parseable_packet(0x00f3,-1,clif_parse_GlobalMessage,2,4);
+ parseable_packet(0x00f5,17,clif_parse_UseItem,6,12);
+ parseable_packet(0x00f7,10,clif_parse_TickSend,6);
+ parseable_packet(0x0113,16,clif_parse_MoveToKafra,5,12);
+ parseable_packet(0x0116,2,clif_parse_CloseKafra,0);
+ parseable_packet(0x0190,26,clif_parse_MoveFromKafra,10,22);
+ parseable_packet(0x0193,9,clif_parse_ActionRequest,3,8);
+#endif
+
+// 2004-08-09aSakexe
+#if PACKETVER >= 20040809
+ parseable_packet(0x0072,17,clif_parse_DropItem,8,15);
+ parseable_packet(0x007e,37,clif_parse_WantToConnection,9,21,28,32,36);
+ parseable_packet(0x0085,26,clif_parse_UseSkillToId,11,18,22);
+ parseable_packet(0x0089,12,clif_parse_GetCharNameRequest,8);
+ parseable_packet(0x008c,40,clif_parse_UseSkillToPos,5,15,29,38);
+ parseable_packet(0x0094,13,clif_parse_TakeItem,9);
+ parseable_packet(0x009b,15,clif_parse_WalkToXY,12);
+ parseable_packet(0x009f,12,clif_parse_ChangeDir,7,11);
+ parseable_packet(0x00a2,120,clif_parse_UseSkillToPosMoreInfo,5,15,29,38,40);
+ parseable_packet(0x00a7,11,clif_parse_SolveCharName,7);
+ parseable_packet(0x00f5,24,clif_parse_UseItem,9,20);
+ parseable_packet(0x00f7,13,clif_parse_TickSend,9);
+ parseable_packet(0x0113,23,clif_parse_MoveToKafra,5,19);
+ parseable_packet(0x0190,26,clif_parse_MoveFromKafra,11,22);
+ parseable_packet(0x0193,18,clif_parse_ActionRequest,7,17);
+#endif
+
+// 2004-08-16aSakexe
+#if PACKETVER >= 20040816
+ parseable_packet(0x0212,26,clif_parse_GMRc,2);
+ parseable_packet(0x0213,26,clif_parse_Check,2);
+ packet(0x0214,42);
+#endif
+
+// 2004-08-17aSakexe
+#if PACKETVER >= 20040817
+ parseable_packet(0x020f,10,clif_parse_PVPInfo,2,6);
+ packet(0x0210,22);
+#endif
+
+// 2004-09-06aSakexe
+#if PACKETVER >= 20040906
+ parseable_packet(0x0072,20,clif_parse_UseItem,9,20);
+ parseable_packet(0x007e,19,clif_parse_MoveToKafra,3,15);
+ parseable_packet(0x0085,23,clif_parse_ActionRequest,9,22);
+ parseable_packet(0x0089,9,clif_parse_WalkToXY,6);
+ parseable_packet(0x008c,105,clif_parse_UseSkillToPosMoreInfo,10,14,18,23,25);
+ parseable_packet(0x0094,17,clif_parse_DropItem,6,15);
+ parseable_packet(0x009b,14,clif_parse_GetCharNameRequest,10);
+ parseable_packet(0x009f,-1,clif_parse_GlobalMessage,2,4);
+ parseable_packet(0x00a2,14,clif_parse_SolveCharName,10);
+ parseable_packet(0x00a7,25,clif_parse_UseSkillToPos,10,14,18,23);
+ parseable_packet(0x00f3,10,clif_parse_ChangeDir,4,9);
+ parseable_packet(0x00f5,34,clif_parse_WantToConnection,7,15,25,29,33);
+ parseable_packet(0x00f7,2,clif_parse_CloseKafra,0);
+ parseable_packet(0x0113,11,clif_parse_TakeItem,7);
+ parseable_packet(0x0116,11,clif_parse_TickSend,7);
+ parseable_packet(0x0190,22,clif_parse_UseSkillToId,9,15,18);
+ parseable_packet(0x0193,17,clif_parse_MoveFromKafra,3,13);
+#endif
+
+// 2004-09-20aSakexe
+#if PACKETVER >= 20040920
+ parseable_packet(0x0072,18,clif_parse_UseItem,10,14);
+ parseable_packet(0x007e,25,clif_parse_MoveToKafra,6,21);
+ parseable_packet(0x0085,9,clif_parse_ActionRequest,3,8);
+ parseable_packet(0x0089,14,clif_parse_WalkToXY,11);
+ parseable_packet(0x008c,109,clif_parse_UseSkillToPosMoreInfo,16,20,23,27,29);
+ parseable_packet(0x0094,19,clif_parse_DropItem,12,17);
+ parseable_packet(0x009b,10,clif_parse_GetCharNameRequest,6);
+ parseable_packet(0x00a2,10,clif_parse_SolveCharName,6);
+ parseable_packet(0x00a7,29,clif_parse_UseSkillToPos,6,20,23,27);
+ parseable_packet(0x00f3,18,clif_parse_ChangeDir,8,17);
+ parseable_packet(0x00f5,32,clif_parse_WantToConnection,10,17,23,27,31);
+ parseable_packet(0x0113,14,clif_parse_TakeItem,10);
+ parseable_packet(0x0116,14,clif_parse_TickSend,10);
+ parseable_packet(0x0190,14,clif_parse_UseSkillToId,4,7,10);
+ parseable_packet(0x0193,12,clif_parse_MoveFromKafra,4,8);
+#endif
+
+// 2004-10-05aSakexe
+#if PACKETVER >= 20041005
+ parseable_packet(0x0072,17,clif_parse_UseItem,6,13);
+ parseable_packet(0x007e,16,clif_parse_MoveToKafra,5,12);
+ parseable_packet(0x0089,6,clif_parse_WalkToXY,3);
+ parseable_packet(0x008c,103,clif_parse_UseSkillToPosMoreInfo,2,6,17,21,23);
+ parseable_packet(0x0094,14,clif_parse_DropItem,5,12);
+ parseable_packet(0x009b,15,clif_parse_GetCharNameRequest,11);
+ parseable_packet(0x00a2,12,clif_parse_SolveCharName,8);
+ parseable_packet(0x00a7,23,clif_parse_UseSkillToPos,3,6,17,21);
+ parseable_packet(0x00f3,13,clif_parse_ChangeDir,5,12);
+ parseable_packet(0x00f5,33,clif_parse_WantToConnection,12,18,24,28,32);
+ parseable_packet(0x0113,10,clif_parse_TakeItem,6);
+ parseable_packet(0x0116,10,clif_parse_TickSend,6);
+ parseable_packet(0x0190,20,clif_parse_UseSkillToId,7,12,16);
+ parseable_packet(0x0193,26,clif_parse_MoveFromKafra,10,22);
+#endif
+
+// 2004-10-25aSakexe
+#if PACKETVER >= 20041025
+ parseable_packet(0x0072,13,clif_parse_UseItem,5,9);
+ parseable_packet(0x007e,13,clif_parse_MoveToKafra,6,9);
+ parseable_packet(0x0085,15,clif_parse_ActionRequest,4,14);
+ parseable_packet(0x008c,108,clif_parse_UseSkillToPosMoreInfo,6,9,23,26,28);
+ parseable_packet(0x0094,12,clif_parse_DropItem,6,10);
+ parseable_packet(0x009b,10,clif_parse_GetCharNameRequest,6);
+ parseable_packet(0x00a2,16,clif_parse_SolveCharName,12);
+ parseable_packet(0x00a7,28,clif_parse_UseSkillToPos,6,9,23,26);
+ parseable_packet(0x00f3,15,clif_parse_ChangeDir,6,14);
+ parseable_packet(0x00f5,29,clif_parse_WantToConnection,5,14,20,24,28);
+ parseable_packet(0x0113,9,clif_parse_TakeItem,5);
+ parseable_packet(0x0116,9,clif_parse_TickSend,5);
+ parseable_packet(0x0190,26,clif_parse_UseSkillToId,4,10,22);
+ parseable_packet(0x0193,22,clif_parse_MoveFromKafra,12,18);
+#endif
+
+// 2004-11-01aSakexe
+#if PACKETVER >= 20041101
+ packet(0x0084,-1);
+ packet(0x0215,6);
+#endif
+
+// 2004-11-08aSakexe
+#if PACKETVER >= 20041108
+ packet(0x0084,2);
+ packet(0x0216,6);
+ parseable_packet(0x0217,2,clif_parse_Blacksmith,0);
+ parseable_packet(0x0218,2,clif_parse_Alchemist,0);
+ packet(0x0219,282);
+ packet(0x021a,282);
+ packet(0x021b,10);
+ packet(0x021c,10);
+#endif
+
+// 2004-11-15aSakexe
+#if PACKETVER >= 20041115
+ parseable_packet(0x021d,6,clif_parse_LessEffect,2);
+#endif
+
+// 2004-11-29aSakexe
+#if PACKETVER >= 20041129
+ parseable_packet(0x0072,22,clif_parse_UseSkillToId,8,12,18);
+ parseable_packet(0x007e,30,clif_parse_UseSkillToPos,4,9,22,28);
+ parseable_packet(0x0085,-1,clif_parse_GlobalMessage,2,4);
+ parseable_packet(0x0089,7,clif_parse_TickSend,3);
+ parseable_packet(0x008c,13,clif_parse_GetCharNameRequest,9);
+ parseable_packet(0x0094,14,clif_parse_MoveToKafra,4,10);
+ parseable_packet(0x009b,2,clif_parse_CloseKafra,0);
+ parseable_packet(0x009f,18,clif_parse_ActionRequest,6,17);
+ parseable_packet(0x00a2,7,clif_parse_TakeItem,3);
+ parseable_packet(0x00a7,7,clif_parse_WalkToXY,4);
+ parseable_packet(0x00f3,8,clif_parse_ChangeDir,3,7);
+ parseable_packet(0x00f5,29,clif_parse_WantToConnection,3,10,20,24,28);
+ parseable_packet(0x00f7,14,clif_parse_SolveCharName,10);
+ parseable_packet(0x0113,110,clif_parse_UseSkillToPosMoreInfo,4,9,22,28,30);
+ parseable_packet(0x0116,12,clif_parse_DropItem,4,10);
+ parseable_packet(0x0190,15,clif_parse_UseItem,3,11);
+ parseable_packet(0x0193,21,clif_parse_MoveFromKafra,4,17);
+ packet(0x0221,-1);
+ parseable_packet(0x0222,6,clif_parse_WeaponRefine,2);
+ packet(0x0223,8);
+#endif
+
+// 2004-12-13aSakexe
+#if PACKETVER >= 20041213
+ //skipped: many packets being set to -1
+ packet(0x0066,3);
+ packet(0x0070,3);
+ packet(0x01ca,3);
+ packet(0x021e,6);
+ packet(0x021f,66);
+ packet(0x0220,10);
+#endif
+
+// 2005-01-10bSakexe
+#if PACKETVER >= 20050110
+ parseable_packet(0x0072,26,clif_parse_UseSkillToId,8,16,22);
+ parseable_packet(0x007e,114,clif_parse_UseSkillToPosMoreInfo,10,18,22,32,34);
+ parseable_packet(0x0085,23,clif_parse_ChangeDir,12,22);
+ parseable_packet(0x0089,9,clif_parse_TickSend,5);
+ parseable_packet(0x008c,8,clif_parse_GetCharNameRequest,4);
+ parseable_packet(0x0094,20,clif_parse_MoveToKafra,10,16);
+ parseable_packet(0x009b,32,clif_parse_WantToConnection,3,12,23,27,31);
+ parseable_packet(0x009f,17,clif_parse_UseItem,5,13);
+ parseable_packet(0x00a2,11,clif_parse_SolveCharName,7);
+ parseable_packet(0x00a7,13,clif_parse_WalkToXY,10);
+ parseable_packet(0x00f3,-1,clif_parse_GlobalMessage,2,4);
+ parseable_packet(0x00f5,9,clif_parse_TakeItem,5);
+ parseable_packet(0x00f7,21,clif_parse_MoveFromKafra,11,17);
+ parseable_packet(0x0113,34,clif_parse_UseSkillToPos,10,18,22,32);
+ parseable_packet(0x0116,20,clif_parse_DropItem,15,18);
+ parseable_packet(0x0190,20,clif_parse_ActionRequest,9,19);
+ parseable_packet(0x0193,2,clif_parse_CloseKafra,0);
+#endif
+
+// 2005-03-28aSakexe
+#if PACKETVER >= 20050328
+ packet(0x0224,10);
+ parseable_packet(0x0225,2,clif_parse_Taekwon,0);
+ packet(0x0226,282);
+#endif
+
+// 2005-04-04aSakexe
+#if PACKETVER >= 20050404
+ packet(0x0227,18);
+ packet(0x0228,18);
+#endif
+
+// 2005-04-11aSakexe
+#if PACKETVER >= 20050411
+ packet(0x0229,15);
+ packet(0x022a,58);
+ packet(0x022b,57);
+ packet(0x022c,64);
+#endif
+
+// 2005-04-25aSakexe
+#if PACKETVER >= 20050425
+ parseable_packet(0x022d,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0232,9,clif_parse_HomMoveTo,2,6);
+ parseable_packet(0x0233,11,clif_parse_HomAttack,2,6,10);
+ parseable_packet(0x0234,6,clif_parse_HomMoveToMaster,2);
+#endif
+
+// 2005-05-09aSakexe
+#if PACKETVER >= 20050509
+ parseable_packet(0x0072,25,clif_parse_UseSkillToId,6,10,21);
+ parseable_packet(0x007e,102,clif_parse_UseSkillToPosMoreInfo,5,9,12,20,22);
+ parseable_packet(0x0085,11,clif_parse_ChangeDir,7,10);
+ parseable_packet(0x0089,8,clif_parse_TickSend,4);
+ parseable_packet(0x008c,11,clif_parse_GetCharNameRequest,7);
+ parseable_packet(0x0094,14,clif_parse_MoveToKafra,7,10);
+ parseable_packet(0x009b,26,clif_parse_WantToConnection,4,9,17,21,25);
+ parseable_packet(0x009f,14,clif_parse_UseItem,4,10);
+ parseable_packet(0x00a2,15,clif_parse_SolveCharName,11);
+ parseable_packet(0x00a7,8,clif_parse_WalkToXY,5);
+ parseable_packet(0x00f5,8,clif_parse_TakeItem,4);
+ parseable_packet(0x00f7,22,clif_parse_MoveFromKafra,14,18);
+ parseable_packet(0x0113,22,clif_parse_UseSkillToPos,5,9,12,20);
+ parseable_packet(0x0116,10,clif_parse_DropItem,5,8);
+ parseable_packet(0x0190,19,clif_parse_ActionRequest,5,18);
+#endif
+
+// 2005-05-23aSakexe
+#if PACKETVER >= 20050523
+ packet(0x022e,69);
+ packet(0x0230,12);
+#endif
+
+// 2005-05-30aSakexe
+#if PACKETVER >= 20050530
+ packet(0x022e,71);
+ packet(0x0235,-1);
+ packet(0x0236,10);
+ parseable_packet(0x0237,2,clif_parse_RankingPk,0);
+ packet(0x0238,282);
+#endif
+
+// 2005-05-31aSakexe
+#if PACKETVER >= 20050531
+ packet(0x0216,2);
+ packet(0x0239,11);
+#endif
+
+// 2005-06-08aSakexe
+#if PACKETVER >= 20050608
+ packet(0x0216,6);
+ parseable_packet(0x0217,2,clif_parse_Blacksmith,0);
+ packet(0x022f,5);
+ parseable_packet(0x0231,26,clif_parse_ChangeHomunculusName,2);
+ packet(0x023a,4);
+ parseable_packet(0x023b,36,clif_parse_StoragePassword,2,4,20);
+ packet(0x023c,6);
+#endif
+
+// 2005-06-22aSakexe
+#if PACKETVER >= 20050622
+ packet(0x022e,71);
+#endif
+
+// 2005-06-28aSakexe
+#if PACKETVER >= 20050628
+ parseable_packet(0x0072,34,clif_parse_UseSkillToId,6,17,30);
+ parseable_packet(0x007e,113,clif_parse_UseSkillToPosMoreInfo,12,15,18,31,33);
+ parseable_packet(0x0085,17,clif_parse_ChangeDir,8,16);
+ parseable_packet(0x0089,13,clif_parse_TickSend,9);
+ parseable_packet(0x008c,8,clif_parse_GetCharNameRequest,4);
+ parseable_packet(0x0094,31,clif_parse_MoveToKafra,16,27);
+ parseable_packet(0x009b,32,clif_parse_WantToConnection,9,15,23,27,31);
+ parseable_packet(0x009f,19,clif_parse_UseItem,9,15);
+ parseable_packet(0x00a2,9,clif_parse_SolveCharName,5);
+ parseable_packet(0x00a7,11,clif_parse_WalkToXY,8);
+ parseable_packet(0x00f5,13,clif_parse_TakeItem,9);
+ parseable_packet(0x00f7,18,clif_parse_MoveFromKafra,11,14);
+ parseable_packet(0x0113,33,clif_parse_UseSkillToPos,12,15,18,31);
+ parseable_packet(0x0116,12,clif_parse_DropItem,3,10);
+ parseable_packet(0x0190,24,clif_parse_ActionRequest,11,23);
+ packet(0x0216,-1);
+ packet(0x023d,-1);
+ packet(0x023e,4);
+#endif
+
+// 2005-07-18aSakexe
+#if PACKETVER >= 20050718
+ parseable_packet(0x0072,19,clif_parse_UseSkillToId,5,11,15);
+ parseable_packet(0x007e,110,clif_parse_UseSkillToPosMoreInfo,9,15,23,28,30);
+ parseable_packet(0x0085,11,clif_parse_ChangeDir,6,10);
+ parseable_packet(0x0089,7,clif_parse_TickSend,3);
+ parseable_packet(0x008c,11,clif_parse_GetCharNameRequest,7);
+ parseable_packet(0x0094,21,clif_parse_MoveToKafra,12,17);
+ parseable_packet(0x009b,31,clif_parse_WantToConnection,3,13,22,26,30);
+ parseable_packet(0x009f,12,clif_parse_UseItem,3,8);
+ parseable_packet(0x00a2,18,clif_parse_SolveCharName,14);
+ parseable_packet(0x00a7,15,clif_parse_WalkToXY,12);
+ parseable_packet(0x00f5,7,clif_parse_TakeItem,3);
+ parseable_packet(0x00f7,13,clif_parse_MoveFromKafra,5,9);
+ parseable_packet(0x0113,30,clif_parse_UseSkillToPos,9,15,23,28);
+ parseable_packet(0x0116,12,clif_parse_DropItem,6,10);
+ parseable_packet(0x0190,21,clif_parse_ActionRequest,5,20);
+ packet(0x0216,6);
+ parseable_packet(0x023f,2,clif_parse_Mail_refreshinbox,0);
+ packet(0x0240,8);
+ parseable_packet(0x0241,6,clif_parse_Mail_read,2);
+ packet(0x0242,-1);
+ parseable_packet(0x0243,6,clif_parse_Mail_delete,2);
+ parseable_packet(0x0244,6,clif_parse_Mail_getattach,2);
+ packet(0x0245,7);
+ parseable_packet(0x0246,4,clif_parse_Mail_winopen,2);
+ parseable_packet(0x0247,8,clif_parse_Mail_setattach,2,4);
+ packet(0x0248,68);
+ packet(0x0249,3);
+ packet(0x024a,70);
+ parseable_packet(0x024b,4,clif_parse_Auction_cancelreg,2);
+ parseable_packet(0x024c,8,clif_parse_Auction_setitem,2,4);
+ packet(0x024d,14);
+ parseable_packet(0x024e,6,clif_parse_Auction_cancel,2);
+ parseable_packet(0x024f,10,clif_parse_Auction_bid,2,6);
+ packet(0x0250,3);
+ packet(0x0251,2);
+ packet(0x0252,-1);
+#endif
+
+// 2005-07-19bSakexe
+#if PACKETVER >= 20050719
+ parseable_packet(0x0072,34,clif_parse_UseSkillToId,6,17,30);
+ parseable_packet(0x007e,113,clif_parse_UseSkillToPosMoreInfo,12,15,18,31,33);
+ parseable_packet(0x0085,17,clif_parse_ChangeDir,8,16);
+ parseable_packet(0x0089,13,clif_parse_TickSend,9);
+ parseable_packet(0x008c,8,clif_parse_GetCharNameRequest,4);
+ parseable_packet(0x0094,31,clif_parse_MoveToKafra,16,27);
+ parseable_packet(0x009b,32,clif_parse_WantToConnection,9,15,23,27,31);
+ parseable_packet(0x009f,19,clif_parse_UseItem,9,15);
+ parseable_packet(0x00a2,9,clif_parse_SolveCharName,5);
+ parseable_packet(0x00a7,11,clif_parse_WalkToXY,8);
+ parseable_packet(0x00f5,13,clif_parse_TakeItem,9);
+ parseable_packet(0x00f7,18,clif_parse_MoveFromKafra,11,14);
+ parseable_packet(0x0113,33,clif_parse_UseSkillToPos,12,15,18,31);
+ parseable_packet(0x0116,12,clif_parse_DropItem,3,10);
+ parseable_packet(0x0190,24,clif_parse_ActionRequest,11,23);
+#endif
+
+// 2005-08-01aSakexe
+#if PACKETVER >= 20050801
+ packet(0x0245,3);
+ packet(0x0251,4);
+#endif
+
+// 2005-08-08aSakexe
+#if PACKETVER >= 20050808
+ parseable_packet(0x024d,12,clif_parse_Auction_register,2,6,10);
+ packet(0x024e,4);
+#endif
+
+// 2005-08-17aSakexe
+#if PACKETVER >= 20050817
+ packet(0x0253,3);
+ parseable_packet(0x0254,3,clif_parse_FeelSaveOk,2);
+#endif
+
+// 2005-08-29aSakexe
+#if PACKETVER >= 20050829
+ packet(0x0240,-1);
+ parseable_packet(0x0248,-1,clif_parse_Mail_send,2,4,28,68,69);
+ packet(0x0255,5);
+ packet(0x0256,-1);
+ packet(0x0257,8);
+#endif
+
+// 2005-09-12bSakexe
+#if PACKETVER >= 20050912
+ packet(0x0256,5);
+ packet(0x0258,2);
+ packet(0x0259,3);
+#endif
+
+// 2005-10-10aSakexe
+#if PACKETVER >= 20051010
+ packet(0x020e,32);
+ packet(0x025a,-1);
+ parseable_packet(0x025b,6,clif_parse_Cooking,2,4);
+#endif
+
+// 2005-10-13aSakexe
+#if PACKETVER >= 20051013
+ packet(0x007a,6);
+ packet(0x0251,32);
+ parseable_packet(0x025c,4,clif_parse_Auction_buysell,2);
+#endif
+
+// 2005-10-17aSakexe
+#if PACKETVER >= 20051017
+ packet(0x007a,58);
+ parseable_packet(0x025d,6,clif_parse_Auction_close,2);
+ packet(0x025e,4);
+#endif
+
+// 2005-10-24aSakexe
+#if PACKETVER >= 20051024
+ packet(0x025f,6);
+ packet(0x0260,6);
+#endif
+
+// 2005-11-07aSakexe
+#if PACKETVER >= 20051107
+ parseable_packet(0x024e,6,clif_parse_Auction_cancel,2);
+ parseable_packet(0x0251,34,clif_parse_Auction_search,2,4,8,32);
+#endif
+
+// 2006-01-09aSakexe
+#if PACKETVER >= 20060109
+ packet(0x0261,11);
+ packet(0x0262,11);
+ packet(0x0263,11);
+ packet(0x0264,20);
+ packet(0x0265,20);
+ packet(0x0266,30);
+ packet(0x0267,4);
+ packet(0x0268,4);
+ packet(0x0269,4);
+ packet(0x026a,4);
+ packet(0x026b,4);
+ packet(0x026c,4);
+ packet(0x026d,4);
+ packet(0x026f,2);
+ packet(0x0270,2);
+ packet(0x0271,38);
+ packet(0x0272,44);
+#endif
+
+// 2006-01-26aSakexe
+#if PACKETVER >= 20060126
+ packet(0x0271,40);
+#endif
+
+// 2006-03-06aSakexe
+#if PACKETVER >= 20060306
+ packet(0x0273,6);
+ packet(0x0274,8);
+#endif
+
+// 2006-03-13aSakexe
+#if PACKETVER >= 20060313
+ parseable_packet(0x0273,30,clif_parse_Mail_return,2,6);
+#endif
+
+// 2006-03-27aSakexe
+#if PACKETVER >= 20060327
+ parseable_packet(0x0072,26,clif_parse_UseSkillToId,11,18,22);
+ parseable_packet(0x007e,120,clif_parse_UseSkillToPosMoreInfo,5,15,29,38,40);
+ parseable_packet(0x0085,12,clif_parse_ChangeDir,7,11);
+ //parseable_packet(0x0089,13,clif_parse_TickSend,9);
+ parseable_packet(0x008c,12,clif_parse_GetCharNameRequest,8);
+ parseable_packet(0x0094,23,clif_parse_MoveToKafra,5,19);
+ parseable_packet(0x009b,37,clif_parse_WantToConnection,9,21,28,32,36);
+ parseable_packet(0x009f,24,clif_parse_UseItem,9,20);
+ parseable_packet(0x00a2,11,clif_parse_SolveCharName,7);
+ parseable_packet(0x00a7,15,clif_parse_WalkToXY,12);
+ parseable_packet(0x00f5,13,clif_parse_TakeItem,9);
+ parseable_packet(0x00f7,26,clif_parse_MoveFromKafra,11,22);
+ parseable_packet(0x0113,40,clif_parse_UseSkillToPos,5,15,29,38);
+ parseable_packet(0x0116,17,clif_parse_DropItem,8,15);
+ parseable_packet(0x0190,18,clif_parse_ActionRequest,7,17);
+#endif
+
+// 2006-10-23aSakexe
+#if PACKETVER >= 20061023
+ packet(0x006d,110);
+#endif
+
+//2006-04-24aSakexe to 2007-01-02aSakexe
+#if PACKETVER >= 20060424
+ packet(0x023e,8);
+ packet(0x0277,84);
+ packet(0x0278,2);
+ packet(0x0279,2);
+ packet(0x027a,-1);
+ packet(0x027b,14);
+ packet(0x027c,60);
+ packet(0x027d,62);
+ packet(0x027e,-1);
+ packet(0x027f,8);
+ packet(0x0280,12);
+ packet(0x0281,4);
+ packet(0x0282,284);
+ packet(0x0283,6);
+ packet(0x0284,14);
+ packet(0x0285,6);
+ packet(0x0286,4);
+ packet(0x0287,-1);
+ packet(0x0288,6);
+ packet(0x0289,8);
+ packet(0x028a,18);
+ packet(0x028b,-1);
+ packet(0x028c,46);
+ packet(0x028d,34);
+ packet(0x028e,4);
+ packet(0x028f,6);
+ packet(0x0290,4);
+ packet(0x0291,4);
+ parseable_packet(0x0292,2,clif_parse_AutoRevive,0);
+ packet(0x0293,70);
+ packet(0x0294,10);
+ packet(0x0295,-1);
+ packet(0x0296,-1);
+ packet(0x0297,-1);
+ packet(0x0298,8);
+ packet(0x0299,6);
+ packet(0x029a,27);
+ packet(0x029c,66);
+ packet(0x029d,-1);
+ packet(0x029e,11);
+ parseable_packet(0x029f,3,clif_parse_mercenary_action,2);
+ packet(0x02a0,-1);
+ packet(0x02a1,-1);
+ packet(0x02a2,8);
+#endif
+
+// 2007-01-08aSakexe
+#if PACKETVER >= 20070108
+ parseable_packet(0x0072,30,clif_parse_UseSkillToId,10,14,26);
+ parseable_packet(0x007e,120,clif_parse_UseSkillToPosMoreInfo,10,19,23,38,40);
+ parseable_packet(0x0085,14,clif_parse_ChangeDir,10,13);
+ parseable_packet(0x0089,11,clif_parse_TickSend,7);
+ parseable_packet(0x008c,17,clif_parse_GetCharNameRequest,13);
+ parseable_packet(0x0094,17,clif_parse_MoveToKafra,4,13);
+ parseable_packet(0x009b,35,clif_parse_WantToConnection,7,21,26,30,34);
+ parseable_packet(0x009f,21,clif_parse_UseItem,7,17);
+ parseable_packet(0x00a2,10,clif_parse_SolveCharName,6);
+ parseable_packet(0x00a7,8,clif_parse_WalkToXY,5);
+ parseable_packet(0x00f5,11,clif_parse_TakeItem,7);
+ parseable_packet(0x00f7,15,clif_parse_MoveFromKafra,3,11);
+ parseable_packet(0x0113,40,clif_parse_UseSkillToPos,10,19,23,38);
+ parseable_packet(0x0116,19,clif_parse_DropItem,11,17);
+ parseable_packet(0x0190,10,clif_parse_ActionRequest,4,9);
+#endif
+
+// 2007-01-22aSakexe
+#if PACKETVER >= 20070122
+ packet(0x02a3,18);
+ packet(0x02a4,2);
+#endif
+
+// 2007-01-29aSakexe
+#if PACKETVER >= 20070129
+ packet(0x029b,72);
+ packet(0x02a3,-1);
+ packet(0x02a4,-1);
+ packet(0x02a5,8);
+#endif
+
+// 2007-02-05aSakexe
+#if PACKETVER >= 20070205
+ packet(0x02aa,4);
+ packet(0x02ab,36);
+ packet(0x02ac,6);
+#endif
+
+// 2007-02-12aSakexe
+#if PACKETVER >= 20070212
+ parseable_packet(0x0072,25,clif_parse_UseSkillToId,6,10,21);
+ parseable_packet(0x007e,102,clif_parse_UseSkillToPosMoreInfo,5,9,12,20,22);
+ parseable_packet(0x0085,11,clif_parse_ChangeDir,7,10);
+ parseable_packet(0x0089,8,clif_parse_TickSend,4);
+ parseable_packet(0x008c,11,clif_parse_GetCharNameRequest,7);
+ parseable_packet(0x0094,14,clif_parse_MoveToKafra,7,10);
+ parseable_packet(0x009b,26,clif_parse_WantToConnection,4,9,17,21,25);
+ parseable_packet(0x009f,14,clif_parse_UseItem,4,10);
+ parseable_packet(0x00a2,15,clif_parse_SolveCharName,11);
+ //parseable_packet(0x00a7,8,clif_parse_WalkToXY,5);
+ parseable_packet(0x00f5,8,clif_parse_TakeItem,4);
+ parseable_packet(0x00f7,22,clif_parse_MoveFromKafra,14,18);
+ parseable_packet(0x0113,22,clif_parse_UseSkillToPos,5,9,12,20);
+ parseable_packet(0x0116,10,clif_parse_DropItem,5,8);
+ parseable_packet(0x0190,19,clif_parse_ActionRequest,5,18);
+#endif
+
+// 2007-05-07aSakexe
+#if PACKETVER >= 20070507
+ parseable_packet(0x01fd,15,clif_parse_RepairItem,2,4,6,7,9,11,13);
+#endif
+
+// 2007-02-27aSakexe to 2007-10-02aSakexe
+#if PACKETVER >= 20070227
+ parseable_packet(0x0288,10,clif_parse_cashshop_buy,2,4,6);
+ packet(0x0289,12);
+ packet(0x02a6,22);
+ packet(0x02a7,22);
+ packet(0x02a8,162);
+ packet(0x02a9,58);
+ packet(0x02ad,8);
+ packet(0x02b0,85);
+ packet(0x02b1,-1);
+ packet(0x02b2,-1);
+ packet(0x02b3,107);
+ packet(0x02b4,6);
+ packet(0x02b5,-1);
+ parseable_packet(0x02b6,7,clif_parse_questStateAck,2,6);
+ packet(0x02b7,7);
+ packet(0x02b8,22);
+ packet(0x02b9,191);
+ parseable_packet(0x02ba,11,clif_parse_Hotkey,2,4,5,9);
+ packet(0x02bb,8);
+ packet(0x02bc,6);
+ packet(0x02bf,10);
+ packet(0x02c0,2);
+ packet(0x02c1,-1);
+ packet(0x02c2,-1);
+ parseable_packet(0x02c4,26,clif_parse_PartyInvite2,2);
+ packet(0x02c5,30);
+ packet(0x02c6,30);
+ parseable_packet(0x02c7,7,clif_parse_ReplyPartyInvite2,2,6);
+ parseable_packet(0x02c8,3,clif_parse_PartyTick,2);
+ packet(0x02c9,3);
+ packet(0x02ca,3);
+ packet(0x02cb,20);
+ packet(0x02cc,4);
+ packet(0x02cd,26);
+ packet(0x02ce,10);
+ packet(0x02cf,6);
+ packet(0x02d0,-1);
+ packet(0x02d1,-1);
+ packet(0x02d2,-1);
+ ack_packet(ZC_NOTIFY_BIND_ON_EQUIP,0x02d3,4,2);
+ packet(0x02d4,29);
+ packet(0x02d5,2);
+ parseable_packet(0x02d6,6,clif_parse_ViewPlayerEquip,2);
+ packet(0x02d7,-1);
+ parseable_packet(0x02d8,10,clif_parse_EquipTick,2,6);
+ packet(0x02d9,10);
+ packet(0x02da,3);
+ parseable_packet(0x02db,-1,clif_parse_BattleChat,2,4);
+ packet(0x02dc,-1);
+ packet(0x02dd,32);
+ packet(0x02de,6);
+ packet(0x02df,36);
+ packet(0x02e0,34);
+#endif
+
+// 2007-10-23aSakexe
+#if PACKETVER >= 20071023
+ packet(0x02cb,65);
+ packet(0x02cd,71);
+#endif
+
+// 2007-11-06aSakexe
+#if PACKETVER >= 20071106
+ packet(0x0078,55);
+ packet(0x007c,42);
+ packet(0x022c,65);
+ packet(0x029b,80);
+#endif
+
+// 2007-11-13aSakexe
+#if PACKETVER >= 20071113
+ packet(0x02e1,33);
+#endif
+
+// 2007-11-20aSakexe
+#if PACKETVER >= 20071120
+ //packet(0x01df,10 <- ???);
+ packet(0x02e2,14);
+ packet(0x02e3,25);
+ packet(0x02e4,8);
+ packet(0x02e5,8);
+ packet(0x02e6,6);
+#endif
+
+// 2007-11-27aSakexe
+#if PACKETVER >= 20071127
+ packet(0x02e7,-1);
+#endif
+
+// 2008-01-02aSakexe
+#if PACKETVER >= 20080102
+ parseable_packet(0x01df,6,clif_parse_GMReqAccountName,2);
+ packet(0x02e8,-1);
+ packet(0x02e9,-1);
+ packet(0x02ea,-1);
+ packet(0x02eb,13);
+ packet(0x02ec,67);
+ packet(0x02ed,59);
+ packet(0x02ee,60);
+ packet(0x02ef,8);
+#endif
+
+// 2008-03-18aSakexe
+#if PACKETVER >= 20080318
+ packet(0x02bf,-1);
+ packet(0x02c0,-1);
+ packet(0x02f0,10);
+ parseable_packet(0x02f1,2,clif_parse_progressbar,0);
+ packet(0x02f2,2);
+#endif
+
+// 2008-03-25bSakexe
+#if PACKETVER >= 20080325
+ packet(0x02f3,-1);
+ packet(0x02f4,-1);
+ packet(0x02f5,-1);
+ packet(0x02f6,-1);
+ packet(0x02f7,-1);
+ packet(0x02f8,-1);
+ packet(0x02f9,-1);
+ packet(0x02fa,-1);
+ packet(0x02fb,-1);
+ packet(0x02fc,-1);
+ packet(0x02fd,-1);
+ packet(0x02fe,-1);
+ packet(0x02ff,-1);
+ packet(0x0300,-1);
+#endif
+
+// 2008-04-01aSakexe
+#if PACKETVER >= 20080401
+ packet(0x0301,-1);
+ packet(0x0302,-1);
+ packet(0x0303,-1);
+ packet(0x0304,-1);
+ packet(0x0305,-1);
+ packet(0x0306,-1);
+ packet(0x0307,-1);
+ packet(0x0308,-1);
+ packet(0x0309,-1);
+ packet(0x030a,-1);
+ packet(0x030b,-1);
+ packet(0x030c,-1);
+ packet(0x030d,-1);
+ packet(0x030e,-1);
+ packet(0x030f,-1);
+ packet(0x0310,-1);
+ packet(0x0311,-1);
+ packet(0x0312,-1);
+ packet(0x0313,-1);
+ packet(0x0314,-1);
+ packet(0x0315,-1);
+ packet(0x0316,-1);
+ packet(0x0317,-1);
+ packet(0x0318,-1);
+ packet(0x0319,-1);
+ packet(0x031a,-1);
+ packet(0x031b,-1);
+ packet(0x031c,-1);
+ packet(0x031d,-1);
+ packet(0x031e,-1);
+ packet(0x031f,-1);
+ packet(0x0320,-1);
+ packet(0x0321,-1);
+ packet(0x0322,-1);
+ packet(0x0323,-1);
+ packet(0x0324,-1);
+ packet(0x0325,-1);
+ packet(0x0326,-1);
+ packet(0x0327,-1);
+ packet(0x0328,-1);
+ packet(0x0329,-1);
+ packet(0x032a,-1);
+ packet(0x032b,-1);
+ packet(0x032c,-1);
+ packet(0x032d,-1);
+ packet(0x032e,-1);
+ packet(0x032f,-1);
+ packet(0x0330,-1);
+ packet(0x0331,-1);
+ packet(0x0332,-1);
+ packet(0x0333,-1);
+ packet(0x0334,-1);
+ packet(0x0335,-1);
+ packet(0x0336,-1);
+ packet(0x0337,-1);
+ packet(0x0338,-1);
+ packet(0x0339,-1);
+ packet(0x033a,-1);
+ packet(0x033b,-1);
+ packet(0x033c,-1);
+ packet(0x033d,-1);
+ packet(0x033e,-1);
+ packet(0x033f,-1);
+ packet(0x0340,-1);
+ packet(0x0341,-1);
+ packet(0x0342,-1);
+ packet(0x0343,-1);
+ packet(0x0344,-1);
+ packet(0x0345,-1);
+ packet(0x0346,-1);
+ packet(0x0347,-1);
+ packet(0x0348,-1);
+ packet(0x0349,-1);
+ packet(0x034a,-1);
+ packet(0x034b,-1);
+ packet(0x034c,-1);
+ packet(0x034d,-1);
+ packet(0x034e,-1);
+ packet(0x034f,-1);
+ packet(0x0350,-1);
+ packet(0x0351,-1);
+ packet(0x0352,-1);
+ packet(0x0353,-1);
+ packet(0x0354,-1);
+ packet(0x0355,-1);
+ packet(0x0356,-1);
+ packet(0x0357,-1);
+ packet(0x0358,-1);
+ packet(0x0359,-1);
+ packet(0x035a,-1);
+#endif
+
+// 2008-05-27aSakexe
+#if PACKETVER >= 20080527
+ packet(0x035b,-1);
+ packet(0x035c,2);
+ packet(0x035d,-1);
+ packet(0x035e,2);
+ packet(0x035f,-1);
+ packet(0x0389,-1);
+#endif
+
+// 2008-08-20aSakexe
+#if PACKETVER >= 20080820
+ packet(0x040c,-1);
+ packet(0x040d,-1);
+ packet(0x040e,-1);
+ packet(0x040f,-1);
+ packet(0x0410,-1);
+ packet(0x0411,-1);
+ packet(0x0412,-1);
+ packet(0x0413,-1);
+ packet(0x0414,-1);
+ packet(0x0415,-1);
+ packet(0x0416,-1);
+ packet(0x0417,-1);
+ packet(0x0418,-1);
+ packet(0x0419,-1);
+ packet(0x041a,-1);
+ packet(0x041b,-1);
+ packet(0x041c,-1);
+ packet(0x041d,-1);
+ packet(0x041e,-1);
+ packet(0x041f,-1);
+ packet(0x0420,-1);
+ packet(0x0421,-1);
+ packet(0x0422,-1);
+ packet(0x0423,-1);
+ packet(0x0424,-1);
+ packet(0x0425,-1);
+ packet(0x0426,-1);
+ packet(0x0427,-1);
+ packet(0x0428,-1);
+ packet(0x0429,-1);
+ packet(0x042a,-1);
+ packet(0x042b,-1);
+ packet(0x042c,-1);
+ packet(0x042d,-1);
+ packet(0x042e,-1);
+ packet(0x042f,-1);
+ packet(0x0430,-1);
+ packet(0x0431,-1);
+ packet(0x0432,-1);
+ packet(0x0433,-1);
+ packet(0x0434,-1);
+ packet(0x0435,-1);
+#endif
+
+// 2008-09-10aSakexe
+#if PACKETVER >= 20080910
+ parseable_packet(0x0436,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0437,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0439,8,clif_parse_UseItem,2,4);
+#endif
+
+// 2008-11-13aSakexe
+#if PACKETVER >= 20081113
+ packet(0x043d,8);
+ packet(0x043e,-1);
+ packet(0x043f,8);
+#endif
+
+// 2008-11-26aSakexe
+#if PACKETVER >= 20081126
+ packet(0x01a2,37);
+ packet(0x0440,10);
+ packet(0x0441,4);
+#endif
+
+// 2008-12-10aSakexe
+#if PACKETVER >= 20081210
+ packet(0x0442,-1);
+ parseable_packet(0x0443,8,clif_parse_SkillSelectMenu,2,6);
+#endif
+
+// 2009-01-14aSakexe
+#if PACKETVER >= 20090114
+ packet(0x043f,25);
+ packet(0x0444,-1);
+ packet(0x0445,10);
+#endif
+
+// 2009-02-18aSakexe
+#if PACKETVER >= 20090218
+ packet(0x0446,14);
+#endif
+
+// 2009-02-25aSakexe
+#if PACKETVER >= 20090225
+ packet(0x0448,-1);
+#endif
+
+// 2009-03-30aSakexe
+#if PACKETVER >= 20090330
+ packet(0x0449,4);
+#endif
+
+// 2009-04-08aSakexe
+#if PACKETVER >= 20090408
+ packet(0x02a6,-1);
+ packet(0x02a7,-1);
+ parseable_packet(0x044a,6,clif_parse_client_version,2);
+#endif
+
+// Renewal Clients
+// 2008-08-27aRagexeRE
+#if PACKETVER >= 20080827
+ parseable_packet(0x0072,22,clif_parse_UseSkillToId,9,15,18);
+ packet(0x007c,44);
+ parseable_packet(0x007e,105,clif_parse_UseSkillToPosMoreInfo,10,14,18,23,25);
+ parseable_packet(0x0085,10,clif_parse_ChangeDir,4,9);
+ parseable_packet(0x0089,11,clif_parse_TickSend,7);
+ parseable_packet(0x008c,14,clif_parse_GetCharNameRequest,10);
+ parseable_packet(0x0094,19,clif_parse_MoveToKafra,3,15);
+ parseable_packet(0x009b,34,clif_parse_WantToConnection,7,15,25,29,33);
+ parseable_packet(0x009f,20,clif_parse_UseItem,7,20);
+ parseable_packet(0x00a2,14,clif_parse_SolveCharName,10);
+ parseable_packet(0x00a7,9,clif_parse_WalkToXY,6);
+ parseable_packet(0x00f5,11,clif_parse_TakeItem,7);
+ parseable_packet(0x00f7,17,clif_parse_MoveFromKafra,3,13);
+ parseable_packet(0x0113,25,clif_parse_UseSkillToPos,10,14,18,23);
+ parseable_packet(0x0116,17,clif_parse_DropItem,6,15);
+ parseable_packet(0x0190,23,clif_parse_ActionRequest,9,22);
+ packet(0x02e2,20);
+ packet(0x02e3,22);
+ packet(0x02e4,11);
+ packet(0x02e5,9);
+#endif
+
+// 2008-09-10aRagexeRE
+#if PACKETVER >= 20080910
+ parseable_packet(0x0436,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0437,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0439,8,clif_parse_UseItem,2,4);
+#endif
+
+// 2008-11-12aRagexeRE
+#if PACKETVER >= 20081112
+ packet(0x043d,8);
+ //packet(0x043e,-1);
+ packet(0x043f,8);
+#endif
+
+// 2008-12-17aRagexeRE
+#if PACKETVER >= 20081217
+ packet(0x01a2,37);
+ //packet(0x0440,10);
+ //packet(0x0441,4);
+ //packet(0x0442,8);
+ //packet(0x0443,8);
+#endif
+
+// 2008-12-17bRagexeRE
+#if PACKETVER >= 20081217
+ packet(0x006d,114);
+#endif
+
+// 2009-01-21aRagexeRE
+#if PACKETVER >= 20090121
+ packet(0x043f,25);
+ //packet(0x0444,-1);
+ //packet(0x0445,10);
+#endif
+
+// 2009-02-18aRagexeRE
+#if PACKETVER >= 20090218
+ //packet(0x0446,14);
+#endif
+
+// 2009-02-26cRagexeRE
+#if PACKETVER >= 20090226
+ //packet(0x0448,-1);
+#endif
+
+// 2009-04-01aRagexeRE
+#if PACKETVER >= 20090401
+ //packet(0x0449,4);
+#endif
+
+// 2009-05-14aRagexeRE
+#if PACKETVER >= 20090514
+ //packet(0x044b,2);
+#endif
+
+// 2009-05-20aRagexeRE
+#if PACKETVER >= 20090520
+ //packet(0x07d0,6);
+ //packet(0x07d1,2);
+ //packet(0x07d2,-1);
+ //packet(0x07d3,4);
+ //packet(0x07d4,4);
+ //packet(0x07d5,4);
+ //packet(0x07d6,4);
+ //packet(0x0447,2);
+#endif
+
+// 2009-06-03aRagexeRE
+#if PACKETVER >= 20090603
+ parseable_packet(0x07d7,8,clif_parse_PartyChangeOption,2,6,7);
+ packet(0x07d8,8);
+ packet(0x07d9,254);
+ parseable_packet(0x07da,6,clif_parse_PartyChangeLeader,2);
+#endif
+
+// 2009-06-10aRagexeRE
+#if PACKETVER >= 20090610
+ //packet(0x07db,8);
+#endif
+
+// 2009-06-17aRagexeRE
+#if PACKETVER >= 20090617
+ packet(0x07d9,268);
+ //packet(0x07dc,6);
+ //packet(0x07dd,54);
+ //packet(0x07de,30);
+ //packet(0x07df,54);
+#endif
+
+// 2009-07-01aRagexeRE
+#if PACKETVER >= 20090701
+ //packet(0x0275,37);
+ //packet(0x0276,-1);
+#endif
+
+// 2009-07-08aRagexeRE
+#if PACKETVER >= 20090708
+ //packet(0x07e0,58);
+#endif
+
+// 2009-07-15aRagexeRE
+#if PACKETVER >= 20090715
+ packet(0x07e1,15);
+#endif
+
+// 2009-08-05aRagexeRE
+#if PACKETVER >= 20090805
+ packet(0x07e2,8);
+#endif
+
+// 2009-08-18aRagexeRE
+#if PACKETVER >= 20090818
+ packet(0x07e3,6);
+ parseable_packet(0x07e4,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ packet(0x07e6,8);
+#endif
+
+// 2009-08-25aRagexeRE
+#if PACKETVER >= 20090825
+ //packet(0x07e6,28);
+ packet(0x07e7,5);
+#endif
+
+// 2009-09-22aRagexeRE
+#if PACKETVER >= 20090922
+ packet(0x07e5,8);
+ packet(0x07e6,8);
+ packet(0x07e7,32);
+ packet(0x07e8,-1);
+ packet(0x07e9,5);
+#endif
+
+// 2009-09-29aRagexeRE
+#if PACKETVER >= 20090929
+ //packet(0x07ea,2);
+ //packet(0x07eb,-1);
+ //packet(0x07ec,6);
+ //packet(0x07ed,8);
+ //packet(0x07ee,6);
+ //packet(0x07ef,8);
+ //packet(0x07f0,4);
+ //packet(0x07f2,4);
+ //packet(0x07f3,3);
+#endif
+
+// 2009-10-06aRagexeRE
+#if PACKETVER >= 20091006
+ //packet(0x07ec,8);
+ //packet(0x07ed,10);
+ //packet(0x07f0,8);
+ //packet(0x07f1,15);
+ //packet(0x07f2,6);
+ //packet(0x07f3,4);
+ //packet(0x07f4,3);
+#endif
+
+// 2009-10-27aRagexeRE
+#if PACKETVER >= 20091027
+ parseable_packet(0x07f5,6,clif_parse_GMFullStrip,2);
+ packet(0x07f6,14);
+#endif
+
+// 2009-11-03aRagexeRE
+#if PACKETVER >= 20091103
+ packet(0x07f7,-1);
+ packet(0x07f8,-1);
+ packet(0x07f9,-1);
+#endif
+
+// 2009-11-17aRagexeRE
+#if PACKETVER >= 20091117
+ packet(0x07fa,8);
+#endif
+
+// 2009-11-24aRagexeRE
+#if PACKETVER >= 20091124
+ packet(0x07fb,25);
+#endif
+
+// 2009-12-01aRagexeRE
+#if PACKETVER >= 20091201
+ packet(0x07fc,10);
+ ack_packet(ZC_BROADCASTING_SPECIAL_ITEM_OBTAIN,0x07fd,-1,0);
+ packet(0x07fe,26);
+ //packet(0x07ff,-1);
+#endif
+
+// 2009-12-15aRagexeRE
+#if PACKETVER >= 20091215
+ packet(0x0800,-1);
+ //packet(0x0801,-1);
+#endif
+
+// 2009-12-22aRagexeRE
+#if PACKETVER >= 2009122
+ parseable_packet(0x0802,18,clif_parse_PartyBookingRegisterReq,2,4,6); // Booking System
+ packet(0x0803,4);
+ packet(0x0804,8); // Booking System
+ packet(0x0805,-1);
+ parseable_packet(0x0806,4,clif_parse_PartyBookingDeleteReq,2); // Booking System
+ //packet(0x0807,2);
+ packet(0x0808,4); // Booking System
+ //packet(0x0809,14);
+ //packet(0x080A,50);
+ //packet(0x080B,18);
+ //packet(0x080C,6);
+#endif
+
+// 2009-12-29aRagexeRE
+#if PACKETVER >= 20091229
+ parseable_packet(0x0804,14,clif_parse_PartyBookingSearchReq,2,4,6,8,12); // Booking System
+ parseable_packet(0x0806,2,clif_parse_PartyBookingDeleteReq,0); // Booking System
+ packet(0x0807,4);
+ parseable_packet(0x0808,14,clif_parse_PartyBookingUpdateReq,2); // Booking System
+ packet(0x0809,50);
+ packet(0x080A,18);
+ packet(0x080B,6); // Booking System
+#endif
+
+// 2010-01-05aRagexeRE
+#if PACKETVER >= 20100105
+ parseable_packet(0x0801,-1,clif_parse_PurchaseReq2,2,4,8,12);
+#endif
+
+// 2010-01-26aRagexeRE
+#if PACKETVER >= 20100126
+ //packet(0x080C,2);
+ //packet(0x080D,3);
+ packet(0x080E,14);
+#endif
+
+// 2010-02-09aRagexeRE
+#if PACKETVER >= 20100209
+ //packet(0x07F0,6);
+#endif
+
+// 2010-02-23aRagexeRE
+#if PACKETVER >= 20100223
+ packet(0x080F,20);
+#endif
+
+// 2010-03-03aRagexeRE
+#if PACKETVER >= 20100303
+ packet(0x0810,3);
+ parseable_packet(0x0811,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ //packet(0x0812,86);
+ //packet(0x0813,6);
+ //packet(0x0814,6);
+ //packet(0x0815,-1);
+ //packet(0x0817,-1);
+ //packet(0x0818,6);
+ //packet(0x0819,4);
+#endif
+
+// 2010-03-09aRagexeRE
+#if PACKETVER >= 20100309
+ packet(0x0813,-1);
+ //packet(0x0814,2);
+ //packet(0x0815,6);
+ packet(0x0816,6);
+ packet(0x0818,-1);
+ //packet(0x0819,10);
+ //packet(0x081A,4);
+ //packet(0x081B,4);
+ //packet(0x081C,6);
+ packet(0x081d,22);
+ packet(0x081e,8);
+#endif
+
+// 2010-03-23aRagexeRE
+#if PACKETVER >= 20100323
+ //packet(0x081F,-1);
+#endif
+
+// 2010-04-06aRagexeRE
+#if PACKETVER >= 20100406
+ //packet(0x081A,6);
+#endif
+
+// 2010-04-13aRagexeRE
+#if PACKETVER >= 20100413
+ //packet(0x081A,10);
+ packet(0x0820,11);
+ //packet(0x0821,2);
+ //packet(0x0822,9);
+ //packet(0x0823,-1);
+#endif
+
+// 2010-04-14dRagexeRE
+#if PACKETVER >= 20100414
+ //packet(0x081B,8);
+#endif
+
+// 2010-04-20aRagexeRE
+#if PACKETVER >= 20100420
+ packet(0x0812,8);
+ packet(0x0814,86);
+ parseable_packet(0x0815,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0817,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0819,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ packet(0x081a,4);
+ packet(0x081b,10);
+ packet(0x081c,10);
+ packet(0x0824,6);
+#endif
+
+// 2010-06-01aRagexeRE
+#if PACKETVER >= 20100601
+ //packet(0x0825,-1);
+ //packet(0x0826,4);
+ parseable_packet(0x0835,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ packet(0x0836,-1);
+ packet(0x0837,3);
+ //packet(0x0838,3);
+#endif
+
+// 2010-06-08aRagexeRE
+#if PACKETVER >= 20100608
+ parseable_packet(0x0838,2,clif_parse_SearchStoreInfoNextPage,0);
+ packet(0x083A,4); // Search Stalls Feature
+ parseable_packet(0x083B,2,clif_parse_CloseSearchStoreInfo,0);
+ parseable_packet(0x083C,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ packet(0x083D,6);
+#endif
+
+// 2010-06-15aRagexeRE
+#if PACKETVER >= 20100615
+ //packet(0x083E,26);
+#endif
+
+// 2010-06-22aRagexeRE
+#if PACKETVER >= 20100622
+ //packet(0x083F,22);
+#endif
+
+// 2010-06-29aRagexeRE
+#if PACKETVER >= 20100629
+ ack_packet(ZC_WEAR_EQUIP_ACK,0x00AA,9,2,4,6,8);
+ //packet(0x07F1,18);
+ //packet(0x07F2,8);
+ //packet(0x07F3,6);
+#endif
+
+// 2010-07-01aRagexeRE
+#if PACKETVER >= 20100701
+ packet(0x083A,5); // Search Stalls Feature
+#endif
+
+// 2010-07-13aRagexeRE
+#if PACKETVER >= 20100713
+ //packet(0x0827,6);
+ //packet(0x0828,14);
+ //packet(0x0829,6);
+ //packet(0x082A,10);
+ //packet(0x082B,6);
+ //packet(0x082C,14);
+ //packet(0x0840,-1);
+ //packet(0x0841,19);
+#endif
+
+// 2010-07-14aRagexeRE
+#if PACKETVER >= 20100714
+ //packet(0x0841,4);
+#endif
+
+// 2010-08-03aRagexeRE
+#if PACKETVER >= 20100803
+ packet(0x0839,66);
+ parseable_packet(0x0842,6,clif_parse_GMRecall2,2);
+ parseable_packet(0x0843,6,clif_parse_GMRemove2,2);
+#endif
+
+// 2010-11-24aRagexeRE
+#if PACKETVER >= 20101124
+ parseable_packet(0x0288,-1,clif_parse_cashshop_buy,2,4,8,10);
+ parseable_packet(0x0436,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x035f,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0360,6,clif_parse_TickSend,2);
+ parseable_packet(0x0361,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0362,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0363,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0364,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0365,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0366,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0367,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0369,6,clif_parse_SolveCharName,2);
+ packet(0x0856,-1);
+ packet(0x0857,-1);
+ packet(0x0858,-1);
+ packet(0x0859,-1);
+ ack_packet(ZC_WEAR_EQUIP_ACK,0x08d0,9,2,4,6,8);
+#endif
+
+// 2011-10-05aRagexeRE
+#if PACKETVER >= 20111005
+ parseable_packet(0x0364,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0817,6,clif_parse_TickSend,2);
+ parseable_packet(0x0366,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0815,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0885,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0893,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0897,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0369,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x08ad,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x088a,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0838,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0439,8,clif_parse_UseItem,2,4);
+ packet(0x08d2,10);
+ packet(0x08d1,7);
+ parseable_packet(0x0846,4,clif_parse_CashShopReqTab,2); //2011-07-18
+#endif
+
+// 2011-11-02aRagexe
+#if PACKETVER >= 20111102
+ parseable_packet(0x0436,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0898,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0281,36,clif_parse_StoragePassword,2,4,20);
+ parseable_packet(0x088d,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x083c,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x08aa,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x02c4,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0811,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ packet(0x0890,8);
+ parseable_packet(0x08a5,18,clif_parse_PartyBookingRegisterReq,2,4,6);
+ parseable_packet(0x0835,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x089b,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x08a1,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x089e,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x08ab,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x088b,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x08a2,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ packet(0x08cf,10); //Amulet spirits
+#endif
+
+// 2012-03-07fRagexeRE
+#if PACKETVER >= 20120307
+ parseable_packet(0x086A,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0887,6,clif_parse_TickSend,2);
+ parseable_packet(0x0890,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0865,6,clif_parse_TakeItem,2);
+ parseable_packet(0x02C4,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x093B,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0963,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0863,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0861,36,clif_parse_StoragePassword,2,4,20);
+ parseable_packet(0x0929,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0885,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0889,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0870,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ //parseable_packet(0x0926,41,clif_parse_PartyBookingRegisterReq,2,4,6);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0884,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0439,8,clif_parse_UseItem,2,4);
+ parseable_packet(0x0365,41,clif_parse_PartyBookingRegisterReq,2,4,6);
+ // New Packet
+ packet(0x090F,-1); // ZC_NOTIFY_NEWENTRY7
+ packet(0x0914,-1); // ZC_NOTIFY_MOVEENTRY8
+ packet(0x0915,-1); // ZC_NOTIFY_STANDENTRY9
+#endif
+
+// 2012-04-10aRagexeRE
+#if PACKETVER >= 20120410
+ parseable_packet(0x01fd,15,clif_parse_RepairItem,2,4,6,7,9,11,13);
+ parseable_packet(0x089c,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0885,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0961,36,clif_parse_StoragePassword,2,4,20);
+ parseable_packet(0x0288,-1,clif_parse_cashshop_buy,2,4,8,10);
+ parseable_packet(0x091c,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x094b,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0439,8,clif_parse_UseItem,2,4);
+ parseable_packet(0x0945,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0886,6,clif_parse_TickSend,2);
+ parseable_packet(0x0871,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0938,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0891,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x086c,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x08a6,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0889,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0884,6,clif_parse_SolveCharName,2);
+ packet(0x08e6,4);
+ parseable_packet(0x08e7,10,clif_parse_PartyBookingSearchReq,2,4,6,8,12);
+ packet(0x08e8,-1);
+ parseable_packet(0x08e9,2,clif_parse_PartyBookingDeleteReq,0);
+ packet(0x08ea,4);
+ parseable_packet(0x08eb,39,clif_parse_PartyBookingUpdateReq,2);
+ packet(0x08ec,73);
+ packet(0x08ed,43);
+ packet(0x08ee,6);
+ parseable_packet(0x08ef,6,NULL,2);
+ packet(0x08f0,6);
+ parseable_packet(0x08f1,6,NULL,2);
+ packet(0x08f2,36);
+ packet(0x08f3,-1);
+ packet(0x08f4,6);
+ parseable_packet(0x08f5,-1,NULL,2,4);
+ packet(0x08f6,22);
+ packet(0x08f7,3);
+ packet(0x08f8,7);
+ packet(0x08f9,6);
+ packet(0x08fa,6);
+ parseable_packet(0x08fb,6,NULL,2);
+ parseable_packet(0x0907,5,clif_parse_MoveItem,2,4);
+ packet(0x0908,5);
+ parseable_packet(0x08d7,28,NULL,2,4);
+ packet(0x0977,14); //Monster HP Bar
+ parseable_packet(0x0916,26,clif_parse_GuildInvite2,2);
+ parseable_packet(0x091d,41,clif_parse_PartyBookingRegisterReq,2,4,6);
+ ack_packet(ZC_PERSONAL_INFOMATION,0x08cb,10,2,4,6,8,10,11,13,15); //Still need further information
+ // Merge Item
+ ack_packet(ZC_MERGE_ITEM_OPEN,0x096D,-1,2,4); // ZC_MERGE_ITEM_OPEN
+ parseable_packet(0x096E,-1,clif_parse_merge_item_req,2,4); // CZ_REQ_MERGE_ITEM
+ ack_packet(ZC_ACK_MERGE_ITEM,0x096F,7,2,4,6); // ZC_ACK_MERGE_ITEM
+ parseable_packet(0x0974,2,clif_parse_merge_item_cancel,0); // CZ_CANCEL_MERGE_ITEM
+ parseable_packet(0x0844,2,clif_parse_cashshop_open_request,0);
+ packet(0x0849,16); //clif_cashshop_result
+ parseable_packet(0x0848,-1,clif_parse_cashshop_buy,2,6,4,10);
+ parseable_packet(0x084a,2,clif_parse_cashshop_close,0);
+ parseable_packet(0x08c9,2,clif_parse_cashshop_list_request,0);
+#endif
+
+// 2012-04-18aRagexeRE [Special Thanks to Judas!]
+#if PACKETVER >= 20120418
+ parseable_packet(0x023B,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0361,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x08A8,36,clif_parse_StoragePassword,2,4,20);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x022D,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035F,6,clif_parse_TickSend,2);
+ parseable_packet(0x0202,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x07E4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x07EC,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x08E5,41,clif_parse_PartyBookingRegisterReq,2,4,6); //Added to prevent disconnections
+ packet(0x08d2,10);
+#endif
+
+// 2012-06-18
+#if PACKETVER >= 20120618
+ packet(0x0983,29); // ZC_MSG_STATE_CHANGE3
+ parseable_packet(0x0861,41,clif_parse_PartyBookingRegisterReq,2,4,6); //actually 12-05-03
+#endif
+
+// 2012-07-02aRagexeRE (unstable)
+#if PACKETVER >= 20120702
+ parseable_packet(0x0363,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0364,6,clif_parse_TickSend,2);
+ parseable_packet(0x085a,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0861,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0862,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0863,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0886,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0889,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x089e,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x089f,6,clif_parse_TakeItem,2);
+ parseable_packet(0x08a0,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x094a,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0953,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0960,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0879,41,clif_parse_PartyBookingRegisterReq,2,4,6);
+#endif
+
+#if PACKETVER >= 20121212
+ packet(0x08C7,20);
+#endif
+
+// 2013-03-20Ragexe (Judas)
+#if PACKETVER >= 20130320
+ parseable_packet(0x014f,6,clif_parse_GuildRequestInfo,2);
+ parseable_packet(0x01fd,15,clif_parse_RepairItem,2,4,6,7,9,11,13);
+ //parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035f,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0363,6,clif_parse_TickSend,2);
+ parseable_packet(0x0365,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0438,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0447,2,clif_parse_blocking_playcancel,0); // CZ_BLOCKING_PLAY_CANCEL
+ parseable_packet(0x044A,6,clif_parse_client_version,2);
+ parseable_packet(0x0844,2,clif_parse_cashshop_open_request,0);
+ packet(0x0849,16); //clif_cashshop_result
+ parseable_packet(0x0848,-1,clif_parse_cashshop_buy,2,6,4,10);
+ parseable_packet(0x084a,2,clif_parse_cashshop_close,0);
+ packet(0x084b,19); //fallitem4
+ parseable_packet(0x085a,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x085d,18,clif_parse_PartyBookingRegisterReq,2,4,6);
+ parseable_packet(0x0868,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x086d,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x086f,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0874,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0881,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0886,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0888,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x088e,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0897,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0898,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x089b,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x08ac,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x08c9,2,clif_parse_cashshop_list_request,0);
+ packet(0x08cf,10); //Amulet spirits
+ packet(0x08d2,10);
+ parseable_packet(0x0907,5,clif_parse_MoveItem,2,4);
+ packet(0x0908,5);
+ parseable_packet(0x0922,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ //parseable_packet(0x092e,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0933,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0938,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x093f,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0947,36,clif_parse_StoragePassword,2,4,20);
+ parseable_packet(0x094c,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x094e,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0959,10,clif_parse_UseSkillToPos,2,4,6,8);
+ //parseable_packet(0x095a,8,clif_parse_Mail_setattach,2,4);
+ packet(0x0977,14); //Monster HP Bar
+ parseable_packet(0x0978,6,clif_parse_reqworldinfo,2);
+ packet(0x0979,50); //ackworldinfo
+ ack_packet(ZC_PERSONAL_INFOMATION,0x097b,16,2,4,8,12,16,17,21,25); //Still need further information
+ //ack_packet(ZC_PERSONAL_INFOMATION_CHN,0x0981,12,2,4,6,8,12,13,15,17,10); // Disabled until further information is found.
+ packet(0x0990,31); //additem
+ packet(0x0991,-1); //inv itemlist normal
+ packet(0x0992,-1); //inv itemlist equip
+ packet(0x0993,-1); //cart itemlist normal
+ packet(0x0994,-1); //cart itemlist equip
+ packet(0x0995,-1); //store itemlist normal
+ packet(0x0996,-1); //store itemlist equip
+ packet(0x0997,-1); //ZC_EQUIPWIN_MICROSCOPE_V5
+ parseable_packet(0x0998,8,clif_parse_EquipItem,2,4); // CZ_REQ_WEAR_EQUIP_V5
+ ack_packet(ZC_WEAR_EQUIP_ACK,0x0999,11,2,4,8,10); // cz_wear_equipv5
+ packet(0x099a,9); // take_off_equipv5
+ packet(0x099b,8); //maptypeproperty2
+ // New Packets
+ packet(0x08C8,34); // ZC_NOTIFY_ACT3
+ packet(0x08ff,24); // ZC_EFST_SET_ENTER
+ packet(0x0984,28); // ZC_EFST_SET_ENTER2
+ packet(0x099f,22); // ZC_SKILL_ENTRY4
+#endif
+
+// 2013-06-05Ragexe
+#if PACKETVER >= 20130605
+ parseable_packet(0x097C,4,clif_parse_ranklist,2);
+#endif
+
+// 2013-07-10Ragexe
+#if PACKETVER >= 20130710
+ parseable_packet(0x0848,-1,clif_parse_cashshop_buy,2,6,4,10);
+ packet(0x097D,288); //ZC_ACK_RANKING
+ packet(0x097E,12); //ZC_UPDATE_RANKING_POINT
+#endif
+
+// 2013-07-17Ragexe
+#if PACKETVER >= 20130717
+ ack_packet(ZC_BANKING_CHECK,0x09A6,12,2,10);
+ parseable_packet(0x09A7,10,clif_parse_BankDeposit,2,6);
+ ack_packet(ZC_ACK_BANKING_DEPOSIT,0x09A8,16,2,4,12);
+ parseable_packet(0x09A9,10,clif_parse_BankWithdraw,2,6);
+ ack_packet(ZC_ACK_BANKING_WITHDRAW,0x09AA,16,2,4,12);
+ parseable_packet(0x09AB,6,clif_parse_BankCheck,2);
+ parseable_packet(0x09B6,6,clif_parse_BankOpen,2);
+ ack_packet(ZC_ACK_OPEN_BANKING,0x09B7,4,2);
+ parseable_packet(0x09B8,6,clif_parse_BankClose,2);
+ ack_packet(ZC_ACK_CLOSE_BANKING,0x09B9,4,2);
+#endif
+
+// 2013-07-31cRagexe
+#if PACKETVER >= 20130731
+ packet(0x09ca,23); // ZC_SKILL_ENTRY5
+ packet(0x09cb,17); // ZC_USE_SKILL2
+#endif
+
+// 2013-08-07Ragexe
+#if PACKETVER >= 20130807
+ ack_packet(ZC_C_MARKERINFO,0x09C1,10,2,6,8);
+ // Merge Item
+ ack_packet(ZC_MERGE_ITEM_OPEN,0x096D,-1,2,4); // ZC_MERGE_ITEM_OPEN
+ parseable_packet(0x096E,-1,clif_parse_merge_item_req,2,4); // CZ_REQ_MERGE_ITEM
+ ack_packet(ZC_ACK_MERGE_ITEM,0x096F,7,2,4,6,7); // ZC_ACK_MERGE_ITEM
+ parseable_packet(0x0974,2,clif_parse_merge_item_cancel,0); // CZ_CANCEL_MERGE_ITEM
+#endif
+
+// 2013-08-21bRagexe
+#if PACKETVER >= 20130821
+ packet(0x09D1,14);
+#endif
+
+// 2013-12-23Ragexe
+#if PACKETVER >= 20131223
+ //New Packets
+ parseable_packet(0x09CE,102,clif_parse_GM_Item_Monster,2);
+ parseable_packet(0x09D4,2,clif_parse_NPCShopClosed,0);
+ //NPC Market
+ packet(0x09D5,-1);
+ parseable_packet(0x09D6,-1,clif_parse_NPCMarketPurchase,2,4,6);
+ packet(0x09D7,-1);
+ parseable_packet(0x09D8,2,clif_parse_NPCMarketClosed,0);
+ // Clan System
+ packet(0x0988,6);
+ packet(0x0989,2);
+ packet(0x098A,-1);
+ parseable_packet(0x098D,-1,clif_parse_clan_chat,2,4);
+ packet(0x098E,-1);
+ // Sale
+ parseable_packet(0x09AC,-1,clif_parse_sale_search,2,4,8);
+ packet(0x09AD,8);
+ parseable_packet(0x09AE,17,clif_parse_sale_add,2,6,8,12,16);
+ packet(0x09AF,4);
+ parseable_packet(0x09B0,8,clif_parse_sale_remove,2,6);
+ packet(0x09B1,4);
+ packet(0x09B2,8);
+ packet(0x09B3,4);
+ parseable_packet(0x09B4,6,clif_parse_sale_open,2);
+ parseable_packet(0x09BC,6,clif_parse_sale_close,2);
+ parseable_packet(0x09C3,8,clif_parse_sale_refresh,2,6);
+ packet(0x09C4,8);
+ // New Packet
+ packet(0x097A,-1); // ZC_ALL_QUEST_LIST2
+ packet(0x09DB,-1); // ZC_NOTIFY_MOVEENTRY10
+ packet(0x09DC,-1); // ZC_NOTIFY_NEWENTRY10
+ packet(0x09DD,-1); // ZC_NOTIFY_STANDENTRY10
+ packet(0x09DF,7); // ZC_ACK_WHISPER02
+#endif
+
+// 2014-10-16Ragexe
+#if PACKETVER >= 20141016
+ packet(0x09DF,7);
+ // New packet
+ packet(0x0A00,269); // ZC_SHORTCUT_KEY_LIST_V3
+ parseable_packet(0x0A01,3,clif_parse_HotkeyRowShift,2); // CZ_SHORTCUTKEYBAR_ROTATE
+ packet(0x0A02,4); // ZC_DRESSROOM_OPEN
+ packet(0x0A0E,14); // ZC_BATTLEFIELD_NOTIFY_HP2
+ packet(0x09F7,75); // ZC_PROPERTY_HOMUN_2
+ packet(0x09E5,18); // ZC_DELETEITEM_FROM_MCSTORE2
+ packet(0x09E6,22); // ZC_UPDATE_ITEM_FROM_BUYING_STORE2
+ // Roulette System [Yommy]
+ parseable_packet(0x0A19,2,clif_parse_RouletteOpen,0); // CZ_REQ_OPEN_ROULETTE
+ packet(0x0A1A,23); // ZC_ACK_OPEN_ROULETTE
+ parseable_packet(0x0A1B,2,clif_parse_RouletteInfo,0); // CZ_REQ_ROULETTE_INFO
+ packet(0x0A1C,-1); // ZC_ACK_ROULETTE_INFO
+ parseable_packet(0x0A1D,2,clif_parse_RouletteClose,0); // CZ_REQ_CLOSE_ROULETTE
+ packet(0x0A1E,3); // ZC_ACK_CLOSE_ROULETTE
+ parseable_packet(0x0A1F,2,clif_parse_RouletteGenerate,0); // CZ_REQ_GENERATE_ROULETTE
+ packet(0x0A20,21); // ZC_ACK_GENERATE_ROULETTE
+ parseable_packet(0x0A21,3,clif_parse_RouletteRecvItem,2); // CZ_RECV_ROULETTE_ITEM
+ packet(0x0A22,5); // ZC_RECV_ROULETTE_ITEM
+#endif
+
+// 2014-10-22bRagexe
+#if PACKETVER >= 20141022
+ packet(0x006d,149);
+ packet(0x08e3,149);
+ // New Packet
+ packet(0x0A18,14); // ZC_ACCEPT_ENTER3
+ packet(0x0A27,8);
+ packet(0x0A28,3); // ZC_ACK_OPENSTORE2
+ packet(0x09FD,-1); // ZC_NOTIFY_MOVEENTRY11
+ packet(0x09FE,-1); // ZC_NOTIFY_NEWENTRY11
+ packet(0x09FF,-1); // ZC_NOTIFY_STANDENTRY11
+#endif
+
+// 2015-02-25aRagexeRE
+#if PACKETVER >= 20150225
+ packet(0x0A09,45); // ZC_ADD_EXCHANGE_ITEM3
+ packet(0x0A0A,47); // ZC_ADD_ITEM_TO_STORE3
+ packet(0x0A0B,47); // ZC_ADD_ITEM_TO_CART3
+ packet(0x0A0C,56); // ZC_ITEM_PICKUP_ACK_V6
+ packet(0x0A0D,-1); // ZC_INVENTORY_ITEMLIST_EQUIP_V6
+ packet(0x0A0F,-1); // ZC_CART_ITEMLIST_EQUIP_V6
+ packet(0x0A10,-1); // ZC_STORE_ITEMLIST_EQUIP_V6
+ packet(0x0A2D,-1); // ZC_EQUIPWIN_MICROSCOPE_V6
+#endif
+
+// 2015-05-13aRagexe
+#if PACKETVER >= 20150513
+ // New Packets
+ packet(0xA3B,-1); // ZC_HAT_EFFECT
+ // RODEX Mail system
+ packet(0x09E7,3); // ZC_NOTIFY_UNREADMAIL
+ parseable_packet(0x09E8,11,clif_parse_Mail_refreshinbox,2,3); // CZ_OPEN_MAILBOX
+ parseable_packet(0x09E9,2,clif_parse_dull,0); // CZ_CLOSE_MAILBOX
+ parseable_packet(0x09EA,11,clif_parse_Mail_read,2,3); // CZ_REQ_READ_MAIL
+ packet(0x09EB,-1); // ZC_ACK_READ_MAIL
+ parseable_packet(0x09EC,-1,clif_parse_Mail_send,2,4,28,52,60,62,64); // CZ_REQ_WRITE_MAIL
+ packet(0x09ED,3); // ZC_ACK_WRITE_MAIL
+ parseable_packet(0x09EE,11,clif_parse_Mail_refreshinbox,2,3); // CZ_REQ_NEXT_MAIL_LIST
+ parseable_packet(0x09EF,11,clif_parse_Mail_refreshinbox,2,3); // CZ_REQ_REFRESH_MAIL_LIST
+ packet(0x09F0,-1); // ZC_ACK_MAIL_LIST
+ parseable_packet(0x09F1,11,clif_parse_Mail_getattach,0); // CZ_REQ_ZENY_FROM_MAIL
+ packet(0x09F2,12); // ZC_ACK_ZENY_FROM_MAIL
+ parseable_packet(0x09F3,11,clif_parse_Mail_getattach,0); // CZ_REQ_ITEM_FROM_MAIL
+ packet(0x09F4,12); // ZC_ACK_ITEM_FROM_MAIL
+ parseable_packet(0x09F5,11,clif_parse_Mail_delete,0); // CZ_REQ_DELETE_MAIL
+ packet(0x09F6,11); // ZC_ACK_DELETE_MAIL
+ parseable_packet(0x0A03,2,clif_parse_Mail_cancelwrite,0); // CZ_REQ_CANCEL_WRITE_MAIL
+ parseable_packet(0x0A04,6,clif_parse_Mail_setattach,2,4); // CZ_REQ_ADD_ITEM_TO_MAIL
+ packet(0x0A05,53); // ZC_ACK_ADD_ITEM_TO_MAIL
+ parseable_packet(0x0A06,6,clif_parse_Mail_winopen,2,4); // CZ_REQ_REMOVE_ITEM_MAIL
+ packet(0x0A07,9); // ZC_ACK_REMOVE_ITEM_MAIL
+ parseable_packet(0x0A08,26,clif_parse_Mail_beginwrite,0); // CZ_REQ_OPEN_WRITE_MAIL
+ packet(0x0A12,27); // ZC_ACK_OPEN_WRITE_MAIL
+ parseable_packet(0x0A13,26,clif_parse_Mail_Receiver_Check,2); // CZ_CHECK_RECEIVE_CHARACTER_NAME
+ packet(0x0A14,10); // ZC_CHECK_RECEIVE_CHARACTER_NAME
+ packet(0x0A32,2); // ZC_OPEN_RODEX_THROUGH_NPC_ONLY
+ // OneClick Itemidentify
+ parseable_packet(0x0A35,4,clif_parse_Oneclick_Itemidentify,2); // CZ_REQ_ONECLICK_ITEMIDENTIFY
+ // Achievement System
+ packet(0x0A23,-1); // ZC_ALL_ACH_LIST
+ packet(0x0A24,66); // ZC_ACH_UPDATE
+ parseable_packet(0x0A25,6,clif_parse_AchievementCheckReward,0); // CZ_REQ_ACH_REWARD
+ packet(0x0A26,7); // ZC_REQ_ACH_REWARD_ACK
+ // Title System
+ parseable_packet(0x0A2E,6,clif_parse_change_title,0); // CZ_REQ_CHANGE_TITLE
+ packet(0x0A2F,7); // ZC_ACK_CHANGE_TITLE
+ packet(0x0A30,106); // ZC_ACK_REQNAMEALL2
+ // Pet Evolution System
+ parseable_packet(0x09FB,-1,clif_parse_dull,0); // CZ_PET_EVOLUTION
+ packet(0x09FC,6); // ZC_PET_EVOLUTION_RESULT
+
+ // Quest UI
+ packet(0x08FE,-1); // ZC_HUNTING_QUEST_INFO
+ packet(0x09F8,-1); // ZC_ALL_QUEST_LIST3
+ packet(0x09F9,143); // ZC_ADD_QUEST_EX
+ packet(0x09FA,-1); // ZC_UPDATE_MISSION_HUNT_EX
+#endif
+
+// 2015-05-20aRagexe
+#if PACKETVER >= 20150520
+ parseable_packet(0x0A3D,18,clif_parse_sale_add,2,6,8,12,16);
+#endif
+
+// 2015-09-16Ragexe
+#if PACKETVER >= 20150916
+ // New Packet
+ packet(0x097F,-1); // ZC_SELECTCART
+ parseable_packet(0x0980,7,clif_parse_SelectCart,2,6); // CZ_SELECTCART
+#endif
+
+// 2016-03-02bRagexe
+#if PACKETVER >= 20160302
+ packet(0x0A51,34);
+#endif
+
+// 2016-03-30aRagexe
+#if PACKETVER >= 20160330
+ parseable_packet(0x0A6E,-1,clif_parse_Mail_send,2,4,28,52,60,62,64,68); // CZ_REQ_WRITE_MAIL2
+#endif
+
+// 2016-06-01aRagexe
+#if PACKETVER >= 20160601
+ packet(0x0A7D,-1);
+#endif
+
+// 2016-06-22aRagexeRE
+#if PACKETVER >= 20160622
+ packet(0x0A84,94);
+#endif
+
+// 2016-09-21bRagexeRE
+#if PACKETVER >= 20160921
+ packet(0x0A37,59);
+#endif
+
+// 2016-09-28cRagexeRE
+#if PACKETVER >= 20160928
+ parseable_packet(0x0A97,8,clif_parse_dull,0);
+ parseable_packet(0x0A99,4,clif_parse_dull,0);
+ parseable_packet(0x0A9C,2,clif_parse_dull,0);
+#endif
+
+// 2016-10-26bRagexeRE
+#if PACKETVER >= 20161026
+ packet(0x0AA5,-1);
+#endif
+
+// 2017-04-19bRagexeRE
+#if PACKETVER >= 20170419
+ parseable_packet(0x0AC0,26,clif_parse_Mail_refreshinbox,2,10);
+ parseable_packet(0x0AC1,26,clif_parse_Mail_refreshinbox,2,10);
+#endif
+
+// 2017-05-02dRagexeRE
+#if PACKETVER >= 20170502
+ packet(0x0A43,85);
+ packet(0x0A44,-1);
+ packet(0x0ABD,10);
+ parseable_packet(0x0ACE,4,clif_parse_dull,0);
+#endif
+
+// 2017-08-30bRagexeRE
+#if PACKETVER >= 20170830
+ packet(0x0ACB,12);
+ packet(0x0ACC,18);
+#endif
+
+// 2018-02-07bRagexeRE
+#if PACKETVER >= 20180207
+ parseable_packet(0x0AF4,11,clif_parse_UseSkillToPos,2,4,6,8,10);
+#endif
+
+// 2018-02-21aRagexeRE or 2018-02-21bRagexeRE
+#if PACKETVER >= 20180221
+ packet(0x0206,35); // ZC_FRIENDS_STATE
+ packet(0x0af7,32);
+#endif
+
+// 2018-03-07bRagexeRE
+#if PACKETVER >= 20180307
+ parseable_packet(0x0A68,3,clif_parse_dull,0);
+ packet(0x0AE2,7);
+ parseable_packet(0x0AEF,2,clif_parse_dull,0);
+ packet(0x0AF0,10);
+#endif
+
+#endif /* _CLIF_PACKETDB_HPP_ */
diff --git a/src/map/clif_shuffle.hpp b/src/map/clif_shuffle.hpp
new file mode 100644
index 00000000000..cc65e0a8875
--- /dev/null
+++ b/src/map/clif_shuffle.hpp
@@ -0,0 +1,4723 @@
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
+#ifndef _CLIF_SHUFFLE_HPP_
+#define _CLIF_SHUFFLE_HPP_
+
+// 2013-05-15aRagexe
+#if PACKETVER == 20130515
+ parseable_packet(0x035F,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0362,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083C,10,clif_parse_UseSkillToId,2,4,6);
+ //parseable_packet(0x0862,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0887,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x08A1,6,clif_parse_TakeItem,2);
+ //parseable_packet(0x08AA,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x08AC,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x092D,18,clif_parse_PartyBookingRegisterReq,2,4,6);
+ parseable_packet(0x0931,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x093e,36,clif_parse_StoragePassword,2,4,20);
+ parseable_packet(0x0943,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0944,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0947,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0962,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0963,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2);
+// 2013-05-22Ragexe
+#elif PACKETVER == 20130522
+ parseable_packet(0x0360,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0362,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0368,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0369,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x07EC,6,clif_parse_TickSend,2);
+ parseable_packet(0x0811,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x086A,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x086E,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0874,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x087E,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x088e,36,clif_parse_StoragePassword,2,4,20);
+ parseable_packet(0x089B,18,clif_parse_PartyBookingRegisterReq,2,4,6);
+ parseable_packet(0x089C,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x08A2,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x08A9,19,clif_parse_WantToConnection,2,6,10,14,18);
+ //parseable_packet(0x08AC,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x08a3,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x08a6,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x08aa,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0925,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0926,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x093e,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0950,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0952,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x095C,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x095E,6,clif_parse_TakeItem,2);
+ parseable_packet(0x095b,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0964,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ //parseable_packet(0x0965,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+// 2013-05-29Ragexe
+#elif PACKETVER == 20130529
+ parseable_packet(0x023B,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x085A,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x085E,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0863,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0869,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0874,18,clif_parse_PartyBookingRegisterReq,2);
+ parseable_packet(0x0876,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0877,26,clif_parse_FriendsListAdd,2);
+ //parseable_packet(0x0888,4,NULL,0); // CZ_GANGSI_RANK
+ //parseable_packet(0x088E,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0890,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0892,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0895,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0897,6,clif_parse_TickSend,2);
+ parseable_packet(0x08A7,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x08A8,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0917,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0918,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0919,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0936,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0937,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0938,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0941,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0951,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0956,36,clif_parse_StoragePassword,2,4,20);
+ parseable_packet(0x0957,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0958,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0964,2,clif_parse_ReqCloseBuyingStore,0);
+// 2013-06-05Ragexe
+#elif PACKETVER == 20130605
+ parseable_packet(0x0202,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x022D,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x023B,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035F,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0361,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4,6);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0436,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07E4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07EC,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083C,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0883,36,clif_parse_StoragePassword,2,4,20);
+ parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2);
+// 2013-06-12Ragexe
+#elif PACKETVER == 20130612
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035F,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4,6);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0436,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07E4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07EC,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083C,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x087E,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0919,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x093A,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0940,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0964,36,clif_parse_StoragePassword,2,4,20);
+ parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2);
+// 2013-06-18Ragexe
+#elif PACKETVER == 20130618
+ parseable_packet(0x0281,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x02C4,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0363,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x085A,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0862,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0864,36,clif_parse_StoragePassword,2,4,20);
+ //parseable_packet(0x0878,4,NULL,0); // CZ_GANGSI_RANK
+ //parseable_packet(0x087A,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0885,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0887,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0889,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x088E,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0890,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0891,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x08A6,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x08A7,18,clif_parse_PartyBookingRegisterReq,2,4,6);
+ parseable_packet(0x0917,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0930,6,clif_parse_TickSend,2);
+ parseable_packet(0x0932,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0936,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0942,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0944,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0945,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x094F,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0951,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0953,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x095B,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0962,6,clif_parse_TakeItem,2);
+ parseable_packet(0x096A,10,clif_parse_UseSkillToPos,2,4,6,8);
+// 2013-06-26Ragexe
+#elif PACKETVER == 20130626
+ parseable_packet(0x035F,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0365,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083C,10,clif_parse_UseSkillToId,2,4,6);
+ //parseable_packet(0x0860,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x088B,6,clif_parse_TakeItem,2);
+ parseable_packet(0x088C,19,clif_parse_WantToConnection,2,6,10,14,18);
+ //parseable_packet(0x088F,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0894,18,clif_parse_PartyBookingRegisterReq,2,4,6);
+ parseable_packet(0x0895,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x08A5,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x08AB,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0921,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0930,36,clif_parse_StoragePassword,2,4,20);
+ parseable_packet(0x094D,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0952,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0960,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2);
+// 2013-07-03Ragexe
+#elif PACKETVER == 20130703
+ parseable_packet(0x0202,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x022D,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035F,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4,6);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0436,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07E4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07EC,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083C,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0873,36,clif_parse_StoragePassword,2,4,20);
+ parseable_packet(0x0930,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x094A,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2);
+// 2013-07-10Ragexe
+#elif PACKETVER == 20130710
+ parseable_packet(0x0202,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x022D,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x023B,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035F,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0361,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4,6);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0436,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07E4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07EC,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083C,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0880,36,clif_parse_StoragePassword,2,4,20);
+ parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2);
+// 2013-07-17Ragexe
+#elif PACKETVER == 20130717
+ parseable_packet(0x02C4,6,clif_parse_TickSend,2);
+ parseable_packet(0x0819,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x083C,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0862,18,clif_parse_PartyBookingRegisterReq,2,4,6);
+ parseable_packet(0x0863,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x086B,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ //parseable_packet(0x086C,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0882,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x088A,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x088C,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0897,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0898,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x089B,8,clif_parse_MoveToKafra,2,4);
+ //parseable_packet(0x08A6,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x08A9,6,clif_parse_TakeItem,2);
+ parseable_packet(0x08AA,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0917,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0918,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x091D,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x091E,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x092F,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x093B,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0952,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0956,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0958,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x095B,36,clif_parse_StoragePassword,2,4,20);
+ parseable_packet(0x0960,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0967,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x096A,2,clif_parse_ReqCloseBuyingStore,0);
+// 2013-08-07Ragexe
+#elif PACKETVER == 20130807
+ parseable_packet(0x0202,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x022D,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x023B,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035F,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0361,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4,6);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x436,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07E4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07EC,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083C,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0887,36,clif_parse_StoragePassword,2,4,20);
+ parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2);
+// 2013-12-23Ragexe
+#elif PACKETVER == 20131223
+ parseable_packet(0x0202,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x022D,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x023B,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035F,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0361,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4,6);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0436,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07E4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07EC,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083C,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x08A4,36,clif_parse_StoragePassword,2,4,20);
+ parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2);
+// 2014-10-16Ragexe
+#elif PACKETVER == 20141016
+ parseable_packet(0x022D,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035F,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07E4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07EC,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083C,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x086E,19,clif_parse_WantToConnection,2,6,10,14,18);
+ //parseable_packet(0x0922,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0936,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x094B,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0967,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2);
+// 2014-10-22bRagexe
+#elif PACKETVER == 20141022
+ parseable_packet(0x023b,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,36,clif_parse_StoragePassword,2,4,20);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0878,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x087d,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0896,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0899,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x08aa,8,clif_parse_MoveFromKafra,2,4);
+ //parseable_packet(0x08ab,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x08ad,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x091a,26,clif_parse_FriendsListAdd,2);
+ //parseable_packet(0x092b,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x093b,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0940,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x094e,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0955,18,clif_parse_PartyBookingRegisterReq,2,4,6);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2015-01-07aRagexeRE
+#elif PACKETVER == 20150107
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0436,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07e4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07ec,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x087c,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0895,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x092d,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0943,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0947,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2015-01-14aRagexe
+#elif PACKETVER == 20150114
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0436,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07e4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07ec,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0868,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0899,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0946,36,clif_parse_StoragePassword,0);
+ //parseable_packet(0x0955,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0957,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2015-01-28aRagexe
+#elif PACKETVER == 20150128
+ parseable_packet(0x0202,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x023b,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x035f,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0365,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ //parseable_packet(0x0368,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0838,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x085a,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0864,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x086d,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0870,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0874,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0875,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0876,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x087d,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0888,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x089a,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x08ab,6,clif_parse_TakeItem,2);
+ parseable_packet(0x091f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0927,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0929,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x092d,2,clif_parse_SearchStoreInfoNextPage,0);
+ //parseable_packet(0x0938,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x093a,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0944,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x094d,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x094e,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0952,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0963,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0968,6,clif_parse_DropItem,2,4);
+// 2015-02-04aRagexe
+#elif PACKETVER == 20150204
+ parseable_packet(0x0202,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x022d,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x023b,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0361,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0436,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07e4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07ec,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0966,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2015-02-25aRagexeRE or 2015-02-26aRagexeRE
+#elif PACKETVER == 20150225 || PACKETVER == 20150226
+ parseable_packet(0x02c4,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0362,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0436,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0819,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0867,18,clif_parse_PartyBookingRegisterReq,2,4);
+ //parseable_packet(0x0885,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0896,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ //parseable_packet(0x089b,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x089c,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x08a4,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0940,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0946,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0948,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x094f,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0952,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0955,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x096a,19,clif_parse_WantToConnection,2,6,10,14,18);
+// 2015-03-11aRagexeRE
+#elif PACKETVER == 20150311
+ parseable_packet(0x023b,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0360,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0436,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0438,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0838,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x086a,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x086c,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x087b,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0883,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0886,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0888,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0896,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x08a1,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x08a3,6,clif_parse_TakeItem,2);
+ parseable_packet(0x08a5,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x08a6,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x091c,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0928,5,clif_parse_ChangeDir,2,4);
+ //parseable_packet(0x092a,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x092e,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x093b,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0943,6,clif_parse_SolveCharName,2);
+ //parseable_packet(0x0946,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0957,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0958,6,clif_parse_TickSend,2);
+ parseable_packet(0x095b,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0963,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0964,8,clif_parse_MoveToKafra,2,4);
+// 2015-03-25aRagexe
+#elif PACKETVER == 20150325
+ parseable_packet(0x0202,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0363,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0365,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0438,2,clif_parse_SearchStoreInfoNextPage,0);
+ //parseable_packet(0x0802,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0819,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x085d,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x086f,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x087c,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x087e,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0883,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0885,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0891,6,clif_parse_GetCharNameRequest,2);
+ //parseable_packet(0x0893,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0897,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0899,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x08a1,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x08a7,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0919,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x092c,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0931,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0932,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0938,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0940,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0947,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x094a,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0950,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0954,6,clif_parse_TickSend,2);
+ parseable_packet(0x0969,8,clif_parse_MoveFromKafra,2,4);
+// 2015-04-01aRagexe
+#elif PACKETVER == 20150401
+ parseable_packet(0x0362,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0367,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0437,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x083c,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x085e,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x086f,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0875,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ //parseable_packet(0x087e,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x088c,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x088f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0895,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0898,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x089c,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x08a5,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x091b,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x091c,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0922,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0924,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0938,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0939,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x093a,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x093b,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x093e,2,clif_parse_SearchStoreInfoNextPage,0);
+ //parseable_packet(0x0946,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0949,6,clif_parse_TakeItem,2);
+ parseable_packet(0x094b,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0953,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x095f,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0964,5,clif_parse_ChangeDir,2,4);
+// 2015-04-22aRagexeRE
+#elif PACKETVER == 20150422
+ parseable_packet(0x0202,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x022d,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x023b,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0361,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0436,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07e4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07ec,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0955,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2015-04-29aRagexe
+#elif PACKETVER == 20150429
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0363,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0867,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x086a,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0886,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x088f,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0894,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0899,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x089f,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ //parseable_packet(0x08a6,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ //parseable_packet(0x08a8,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x08ad,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0929,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x093d,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0943,6,clif_parse_TakeItem,2);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2015-05-07bRagexe
+#elif PACKETVER == 20150507
+ parseable_packet(0x023b,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0362,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x085a,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0864,26,clif_parse_PartyInvite2,2);
+ //parseable_packet(0x0887,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0889,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0924,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x092e,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x093b,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0941,8,clif_parse_MoveFromKafra,2,4);
+ //parseable_packet(0x0942,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0953,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0955,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0958,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2015-05-13aRagexe
+#elif PACKETVER == 20150513
+ parseable_packet(0x022D,2,clif_parse_ReqCloseBuyingStore,0);
+ //parseable_packet(0x02C4,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x035F,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0363,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083C,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0864,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0879,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0883,18,clif_parse_PartyBookingRegisterReq,2,4,6);
+ parseable_packet(0x0885,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x08A8,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0923,36,clif_parse_StoragePassword,2,4,20);
+ parseable_packet(0x0924,5,clif_parse_ChangeDir,2,4);
+ //parseable_packet(0x0927,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x094A,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0958,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0960,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2);
+// 2015-05-27aRagexe
+#elif PACKETVER == 20150527
+ parseable_packet(0x0202,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x022d,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x023b,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0361,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0436,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07e4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07ec,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x083c,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0940,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2015-06-17aRagexeRE or 2015-06-18aRagexeRE
+#elif PACKETVER == 20150617 || PACKETVER == 20150618
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0362,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0363,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0365,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0436,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07ec,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ //parseable_packet(0x0811,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0869,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x086a,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x086b,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0870,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x087a,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0886,5,clif_parse_HomMenu,2,4);
+ //parseable_packet(0x0894,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0940,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x094e,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2015-08-19aRagexeRE
+#elif PACKETVER == 20150819
+ parseable_packet(0x0202,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x022d,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0281,6,clif_parse_TakeItem,2);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0436,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x085d,8,clif_parse_MoveFromKafra,2,4);
+ //parseable_packet(0x0862,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0865,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0871,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0888,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0919,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x091e,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0927,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0940,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0961,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0967,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2015-08-26aRagexeRE
+#elif PACKETVER == 20150826
+ parseable_packet(0x0362,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0368,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0436,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x07ec,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0819,6,clif_parse_ReqClickBuyingStore,2);
+ //parseable_packet(0x0861,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0865,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x086b,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0870,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x087b,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x088b,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x088d,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0890,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0891,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x08a0,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x08a1,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x08a4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x08a8,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0924,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0928,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x092e,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x093b,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0945,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x094f,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0951,6,clif_parse_TickSend,2);
+ parseable_packet(0x0959,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0964,19,clif_parse_WantToConnection,2,6,10,14,18);
+ //parseable_packet(0x0968,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0969,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+// 2015-09-16Ragexe
+#elif PACKETVER == 20150916
+ parseable_packet(0x022D,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0817,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0835,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x085E,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0869,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0873,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0877,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x087F,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0881,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x089B,18,clif_parse_PartyBookingRegisterReq,2,4,6);
+ parseable_packet(0x089C,6,clif_parse_TakeItem,2);
+ parseable_packet(0x089E,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x08AC,6,clif_parse_TickSend,2);
+ parseable_packet(0x0920,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0924,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x092E,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x092F,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0934,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0936,5,clif_parse_ChangeDir,2,4);
+ //parseable_packet(0x0938,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x093E,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0941,36,clif_parse_StoragePassword,2,4,20);
+ parseable_packet(0x0942,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0948,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ //parseable_packet(0x094F,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x095A,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0960,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0961,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0969,19,clif_parse_WantToConnection,2,6,10,14,18);
+// 2015-10-01bRagexeRE
+#elif PACKETVER == 20151001
+ parseable_packet(0x0202,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x022d,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x023b,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0361,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,NULL,2,4,6);
+ parseable_packet(0x0366,90,NULL,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0436,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07e4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07ec,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0860,36,clif_parse_StoragePassword,2,4,20);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2015-10-07aRagexeRE
+#elif PACKETVER == 20151007
+ parseable_packet(0x0202,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07e4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07ec,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ //parseable_packet(0x0862,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x093f,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x095f,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0961,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0967,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2015-10-14bRagexeRE
+#elif PACKETVER == 20151014
+ parseable_packet(0x0202,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0817,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0838,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x085a,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x085c,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0860,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0863,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0867,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0872,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0874,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0881,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0883,6,clif_parse_TickSend,2);
+ parseable_packet(0x0884,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0889,6,clif_parse_ReqClickBuyingStore,2);
+ //parseable_packet(0x088e,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ //parseable_packet(0x089a,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x089b,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x089f,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x08aa,6,clif_parse_TakeItem,2);
+ parseable_packet(0x091c,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x091d,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0930,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0934,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0944,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x094f,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0956,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x095e,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0961,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0964,19,clif_parse_WantToConnection,2,6,10,14,18);
+// 2015-10-22aRagexeRE
+#elif PACKETVER == 20151022
+ parseable_packet(0x023B,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x02C4,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x035F,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0361,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0436,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07E4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07EC,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083C,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x086A,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x091D,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0940,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2);
+// 2015-10-28cRagexeRE
+#elif PACKETVER == 20151028
+ parseable_packet(0x0202,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x022d,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x023b,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0361,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0436,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07e4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07ec,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0860,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2015-10-29aRagexe
+#elif PACKETVER == 20151029
+ parseable_packet(0x0202,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x022D,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x023B,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035F,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0361,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0436,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07E4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07EC,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083C,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0860,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2);
+// 2015-11-04aRagexe
+#elif PACKETVER == 20151104
+ parseable_packet(0x023B,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0360,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0363,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0436,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0437,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07EC,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0811,18,clif_parse_PartyBookingRegisterReq,2,4,6);
+ parseable_packet(0x0815,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083C,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0886,6,clif_parse_TickSend,2);
+ parseable_packet(0x0887,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x088B,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x088D,5,clif_parse_HomMenu,2,4);
+ //parseable_packet(0x08A3,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x08A5,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0928,5,clif_parse_ChangeDir,2,4);
+ //parseable_packet(0x0939,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x093A,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0940,36,clif_parse_StoragePassword,2,4,20);
+ parseable_packet(0x0964,6,clif_parse_TakeItem,2);
+// 2015-11-11aRagexeRE
+#elif PACKETVER == 20151111
+ parseable_packet(0x02C4,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x035F,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0362,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ //parseable_packet(0x0802,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083C,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x085D,-1,clif_parse_ItemListWindowSelected,2,4,8,8,12);
+ parseable_packet(0x0862,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0871,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0885,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x089C,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0942,18,clif_parse_PartyBookingRegisterReq,2,4,6);
+ parseable_packet(0x094A,6,clif_parse_TakeItem,2);
+ //parseable_packet(0x0958,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0966,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0967,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0969,36,clif_parse_StoragePassword,2,4,20);
+ parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2);
+// 2015-11-18aRagexeRE
+#elif PACKETVER == 20151118
+ parseable_packet(0x022d,6,clif_parse_TickSend,2);
+ parseable_packet(0x035f,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0365,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x086b,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x088b,36,clif_parse_StoragePassword,2,4,20);
+ parseable_packet(0x08ab,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0921,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0925,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x092e,5,clif_parse_ChangeDir,2,4);
+ //parseable_packet(0x092f,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x093c,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0943,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0946,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ //parseable_packet(0x0957,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x095c,18,clif_parse_PartyBookingRegisterReq,2,4,6);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2015-11-25dRagexeRE
+#elif PACKETVER == 20151125
+ parseable_packet(0x0361,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0365,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0366,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0368,-1,clif_parse_ItemListWindowSelected,2,4,8,8,12);
+ parseable_packet(0x0438,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0802,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0838,18,clif_parse_PartyBookingRegisterReq,2,4,6);
+ parseable_packet(0x085E,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x085F,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0863,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0883,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0884,36,clif_parse_StoragePassword,2,4,20);
+ //parseable_packet(0x0885,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x088C,6,clif_parse_TickSend,2);
+ parseable_packet(0x088D,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0899,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x089C,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x089F,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x08A9,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x08AD,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0920,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x092A,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x092E,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0939,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x093E,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0951,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0956,26,clif_parse_PartyInvite2,2);
+ //parseable_packet(0x0957,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0959,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+// 2015-12-02bRagexeRE
+#elif PACKETVER == 20151202
+ parseable_packet(0x0202,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x022d,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x023b,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0361,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4,6);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0436,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07e4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07ec,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0870,36,clif_parse_StoragePassword,2,4,20);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2015-12-09aRagexeRE
+#elif PACKETVER == 20151209
+ parseable_packet(0x0365,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0369,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x07E4,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x07EC,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0811,6,clif_parse_TickSend,2);
+ parseable_packet(0x0819,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x085B,36,clif_parse_StoragePassword,2,4,20);
+ parseable_packet(0x085D,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x085E,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0861,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0866,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0875,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x087A,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x087F,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x088E,10,clif_parse_UseSkillToId,2,4,6);
+ //parseable_packet(0x088F,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0894,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x08A1,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0920,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x092D,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0930,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0932,-1,clif_parse_ItemListWindowSelected,2,4,8,8,12);
+ parseable_packet(0x093B,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0948,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x094A,18,clif_parse_PartyBookingRegisterReq,2,4,6);
+ parseable_packet(0x0956,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ //parseable_packet(0x095C,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0961,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0964,26,clif_parse_FriendsListAdd,2);
+// 2015-12-16aRagexeRE
+#elif PACKETVER == 20151216
+ parseable_packet(0x022D,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0361,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0362,5,clif_parse_HomMenu,2,4);
+ //parseable_packet(0x0364,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0436,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083C,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x085B,6,clif_parse_TickSend,2);
+ parseable_packet(0x0864,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0865,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x086E,26,clif_parse_PartyInvite2,2);
+ //parseable_packet(0x086a,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0870,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0874,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0885,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x088B,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x089D,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x089E,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x08A2,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x08A9,6,clif_parse_TakeItem,2);
+ parseable_packet(0x08AC,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x091D,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0944,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0947,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0949,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0954,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0960,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0966,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0968,10,clif_parse_UseSkillToId,2,4,6);
+// 2015-12-23bRagexeRE
+#elif PACKETVER == 20151223
+ parseable_packet(0x02c4,8,clif_parse_MoveToKafra,2,4);
+ //parseable_packet(0x0362,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,6,clif_parse_TakeItem,2);
+ //parseable_packet(0x0802,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0815,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0864,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0866,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x086e,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0872,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0875,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0876,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0881,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0884,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0886,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x088d,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0890,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0891,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0898,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x08aa,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0918,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x091a,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x091b,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0920,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0923,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0924,6,clif_parse_TickSend,2);
+ parseable_packet(0x095e,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x095f,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0965,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0967,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+// 2016-01-06aRagexeRE
+#elif PACKETVER == 20160106
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07ec,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0861,6,clif_parse_TakeItem,2);
+ parseable_packet(0x086a,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x086c,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0878,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x087a,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x087f,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0885,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0889,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x088a,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0891,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x08a0,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x091d,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ //parseable_packet(0x0940,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2016-01-13cRagexeRE
+#elif PACKETVER == 20160113
+ parseable_packet(0x022d,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x023b,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x035f,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0815,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x085b,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0864,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x086d,5,clif_parse_HomMenu,2,4);
+ //parseable_packet(0x0873,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0875,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0888,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x088b,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x088c,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0892,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0893,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0899,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x089a,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x08a0,6,clif_parse_TickSend,2);
+ parseable_packet(0x08a6,6,clif_parse_TakeItem,2);
+ parseable_packet(0x08aa,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0919,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x091b,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0924,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0930,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0932,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x093c,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0941,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x094d,19,clif_parse_WantToConnection,2,6,10,14,18);
+ //parseable_packet(0x094f,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0967,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+// 2016-01-20aRagexeRE
+#elif PACKETVER == 20160120
+ parseable_packet(0x0202,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x022d,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x023b,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0361,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0436,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07e4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07ec,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0865,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2016-01-27bRagexeRE
+#elif PACKETVER == 20160127
+ parseable_packet(0x022d,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0436,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07e4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07ec,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x085e,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0922,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x095a,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0961,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2016-02-03aRagexeRE
+#elif PACKETVER == 20160203
+ parseable_packet(0x0202,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0361,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0436,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0437,6,clif_parse_TickSend,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07e4,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0811,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0835,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x086c,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0872,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0873,36,clif_parse_StoragePassword,0);
+ //parseable_packet(0x088c,4,NULL,0); // CZ_GANGSI_RANK
+ //parseable_packet(0x0918,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x093e,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0940,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0947,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0954,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x095a,6,clif_parse_TakeItem,2);
+ parseable_packet(0x095d,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2016-02-11aRagexeRE
+#elif PACKETVER == 20160211
+ parseable_packet(0x022d,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x023b,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0436,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07e4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07ec,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x086c,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0870,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0886,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2016-02-17cRagexeRE
+#elif PACKETVER == 20160217
+ parseable_packet(0x0202,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x023b,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0362,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0365,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0864,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0870,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0873,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x087a,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0888,6,clif_parse_TickSend,2);
+ parseable_packet(0x088d,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x088f,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0899,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x08a0,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x08a9,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x08ac,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x08ad,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x091d,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0920,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0926,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x092e,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x093b,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x093e,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0941,6,clif_parse_TakeItem,2);
+ parseable_packet(0x094a,10,clif_parse_UseSkillToPos,2,4,6,8);
+ //parseable_packet(0x094f,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x095e,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0966,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0967,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0969,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+// 2016-02-24bRagexeRE
+#elif PACKETVER == 20160224
+ parseable_packet(0x022d,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0364,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0436,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0861,19,clif_parse_WantToConnection,2,6,10,14,18);
+ //parseable_packet(0x086b,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0884,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0885,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0888,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x08a9,26,clif_parse_FriendsListAdd,2);
+ //parseable_packet(0x0920,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0929,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x092f,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0936,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0938,6,clif_parse_TakeItem,2);
+ parseable_packet(0x094c,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0961,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2016-03-02bRagexeRE
+#elif PACKETVER == 20160302
+ parseable_packet(0x022d,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0367,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0802,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0819,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x085b,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0864,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0865,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0867,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0868,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0873,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0875,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x087a,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x087d,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0883,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x08a6,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x08a9,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x091a,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0927,6,clif_parse_TakeItem,2);
+ //parseable_packet(0x092d,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x092f,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0945,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x094e,36,clif_parse_StoragePassword,0);
+ //parseable_packet(0x0950,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0957,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x095a,6,clif_parse_TickSend,2);
+ parseable_packet(0x0960,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0961,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0967,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0968,7,clif_parse_ActionRequest,2,6);
+// 2016-03-09aRagexeRE
+#elif PACKETVER == 20160309
+ parseable_packet(0x023b,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0281,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0361,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0364,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0819,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0838,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x083c,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x085a,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x085f,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0866,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x086a,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ //parseable_packet(0x0873,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x087c,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x087e,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x089b,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x089d,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x08a7,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x091d,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0920,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0922,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ //parseable_packet(0x0929,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x092a,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x092e,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0932,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x094f,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0956,6,clif_parse_TickSend,2);
+ parseable_packet(0x095e,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x096a,6,clif_parse_TakeItem,2);
+// 2016-03-16aRagexeRE
+#elif PACKETVER == 20160316
+ parseable_packet(0x0202,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x022d,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x023b,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0361,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0436,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07e4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07ec,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0922,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2016-03-23aRagexeRE
+#elif PACKETVER == 20160323
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0365,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ //parseable_packet(0x0867,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0869,6,clif_parse_TakeItem,2);
+ parseable_packet(0x086a,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0872,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0878,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0883,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0896,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x089a,5,clif_parse_HomMenu,2,4);
+ //parseable_packet(0x091b,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0926,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0927,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0933,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x093c,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2016-03-30aRagexeRE
+#elif PACKETVER == 20160330
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0365,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0867,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x086d,6,clif_parse_TakeItem,2);
+ //parseable_packet(0x0878,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x087f,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0889,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x088b,5,clif_parse_HomMenu,2,4);
+ //parseable_packet(0x088d,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0918,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0925,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x092a,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x092c,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0930,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0939,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x093b,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2016-04-06aRagexeRE
+#elif PACKETVER == 20160406
+ parseable_packet(0x0364,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x07e4,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0819,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x085a,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x085c,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0869,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0877,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0878,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0879,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0884,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0892,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0895,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0898,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x089b,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x089e,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x08a1,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x08a9,2,clif_parse_ReqCloseBuyingStore,0);
+ //parseable_packet(0x08ac,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0927,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x092d,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0933,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0934,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0940,6,clif_parse_TickSend,2);
+ parseable_packet(0x0949,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x094d,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0953,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x095d,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x095f,5,clif_parse_WalkToXY,2);
+ //parseable_packet(0x0962,4,NULL,0); // CZ_GANGSI_RANK
+// 2016-04-14bRagexeRE
+#elif PACKETVER == 20160414
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0362,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0363,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0862,19,clif_parse_WantToConnection,2,6,10,14,18);
+ //parseable_packet(0x087a,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0880,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0885,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x089e,26,clif_parse_PartyInvite2,2);
+ //parseable_packet(0x0918,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0922,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0927,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0931,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0934,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0945,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0953,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2016-04-20aRagexeRE
+#elif PACKETVER == 20160420
+ parseable_packet(0x022d,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x02c4,6,clif_parse_TickSend,2);
+ parseable_packet(0x035f,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0864,6,clif_parse_TakeItem,2);
+ //parseable_packet(0x0870,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0872,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0874,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0884,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0888,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x088b,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x08a5,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x092f,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0935,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x094e,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ //parseable_packet(0x095c,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2016-04-27aRagexeRE
+#elif PACKETVER == 20160427
+ parseable_packet(0x0202,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x022d,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x023b,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0361,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0436,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07e4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07ec,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0835,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0940,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2016-05-04aRagexeRE
+#elif PACKETVER == 20160504
+ parseable_packet(0x0202,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0363,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ //parseable_packet(0x0365,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x083c,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x085f,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x086b,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x087f,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0884,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0886,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0887,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x088a,6,clif_parse_TakeItem,2);
+ parseable_packet(0x088d,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x088f,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0890,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0893,18,clif_parse_PartyBookingRegisterReq,2,4);
+ //parseable_packet(0x0898,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x089d,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x08ad,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0918,6,clif_parse_TickSend,2);
+ parseable_packet(0x0921,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0922,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0924,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x093e,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0940,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0941,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0948,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0952,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x095b,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0969,36,clif_parse_StoragePassword,0);
+// 2016-05-11aRagexeRE
+#elif PACKETVER == 20160511
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07e4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07ec,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x085e,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0894,26,clif_parse_FriendsListAdd,2);
+ //parseable_packet(0x089b,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0918,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0920,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0940,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2016-05-18aRagexeRE
+#elif PACKETVER == 20160518
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0436,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07e4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07ec,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x086c,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0874,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x089a,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x08a9,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0928,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2016-05-25aRagexeRE
+#elif PACKETVER == 20160525
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ //parseable_packet(0x085a,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x085e,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0867,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x086a,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0899,6,clif_parse_TakeItem,2);
+ parseable_packet(0x089c,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x091d,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x092c,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0937,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0945,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x094a,8,clif_parse_MoveToKafra,2,4);
+ //parseable_packet(0x094e,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0951,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0956,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2016-06-01aRagexeRE
+#elif PACKETVER == 20160601
+ parseable_packet(0x0202,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x02c4,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0863,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0870,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x087d,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x088d,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x088f,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0895,5,clif_parse_HomMenu,2,4);
+ //parseable_packet(0x08a7,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x08ac,19,clif_parse_WantToConnection,2,6,10,14,18);
+ //parseable_packet(0x0924,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x095b,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x095f,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0961,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2016-06-08aRagexeRE
+#elif PACKETVER == 20160608
+ parseable_packet(0x022d,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x02c4,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x035f,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0436,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0437,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07ec,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0802,6,clif_parse_TickSend,2);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ //parseable_packet(0x085c,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0885,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0889,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0899,6,clif_parse_TakeItem,2);
+ parseable_packet(0x089b,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x08a6,8,clif_parse_MoveFromKafra,2,4);
+ //parseable_packet(0x093b,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x094d,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0958,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x095b,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0969,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2016-06-15aRagexeRE
+#elif PACKETVER == 20160615
+ parseable_packet(0x0281,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0363,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0364,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0369,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x083c,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0866,5,clif_parse_WalkToXY,2);
+ //parseable_packet(0x0870,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x087d,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x087e,6,clif_parse_TakeItem,2);
+ parseable_packet(0x087f,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ //parseable_packet(0x0884,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0887,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0888,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x088a,6,clif_parse_TickSend,2);
+ parseable_packet(0x088d,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0891,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0898,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x092f,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x093e,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0947,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0948,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x094a,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x094b,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0954,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0957,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0958,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x095c,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x095e,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0961,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+// 2016-06-22aRagexeRE
+#elif PACKETVER == 20160622
+ parseable_packet(0x023b,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x035f,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0361,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x07e4,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0861,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ //parseable_packet(0x0865,4,NULL,0); // CZ_GANGSI_RANK
+ //parseable_packet(0x0867,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0880,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0887,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0890,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0891,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0892,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x089a,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x089e,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x08a2,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x08a8,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x091c,6,clif_parse_TakeItem,2);
+ parseable_packet(0x092d,6,clif_parse_TickSend,2);
+ parseable_packet(0x092f,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0936,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0937,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x093b,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x093f,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0946,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0959,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0965,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0969,6,clif_parse_DropItem,2,4);
+// 2016-06-29aRagexeRE or 2016-06-30aRagexeRE
+#elif PACKETVER == 20160629 || PACKETVER == 20160630
+ parseable_packet(0x0202,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x022d,5,clif_parse_WalkToXY,2);
+ //parseable_packet(0x035f,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0363,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0368,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x085c,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ //parseable_packet(0x085e,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0860,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0861,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0863,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0867,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x086b,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0881,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0885,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x088e,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0893,6,clif_parse_TickSend,2);
+ parseable_packet(0x091e,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0922,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0925,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0926,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x093e,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0946,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0948,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x094a,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0957,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x095a,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0968,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0969,6,clif_parse_TakeItem,2);
+ parseable_packet(0x096a,8,clif_parse_MoveToKafra,2,4);
+// 2016-07-06cRagexeRE
+#elif PACKETVER == 20160706
+ parseable_packet(0x0362,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0436,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x085f,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0860,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0869,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x086b,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0884,26,clif_parse_FriendsListAdd,2);
+ //parseable_packet(0x0886,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0889,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0892,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0899,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x08a4,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x08a5,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x08a8,6,clif_parse_TickSend,2);
+ parseable_packet(0x0918,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x091b,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0924,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0926,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0927,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0929,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x092d,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0939,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x093d,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0944,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0945,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x094c,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0952,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0957,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0958,6,clif_parse_TakeItem,2);
+// 2016-07-13bRagexeRE
+#elif PACKETVER == 20160713
+ parseable_packet(0x022d,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0363,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0364,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0838,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0860,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0865,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0869,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0875,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0877,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x087b,6,clif_parse_TickSend,2);
+ parseable_packet(0x0883,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x088d,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0892,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x089a,26,clif_parse_PartyInvite2,2);
+ //parseable_packet(0x089f,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x08a2,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x08a4,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x091c,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x091d,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0921,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0922,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x092c,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0931,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0939,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0944,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0945,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0947,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0957,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x095b,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+// 2016-07-20aRagexeRE
+#elif PACKETVER == 20160720
+ parseable_packet(0x0362,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0363,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0365,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x07e4,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0819,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0838,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x085b,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x086a,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x086d,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x087f,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0883,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0887,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0897,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x089a,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x089c,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x089e,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x08a0,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x08aa,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ //parseable_packet(0x0917,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x091c,6,clif_parse_TakeItem,2);
+ parseable_packet(0x092a,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x093b,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x093e,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0946,6,clif_parse_TickSend,2);
+ parseable_packet(0x094d,6,clif_parse_SolveCharName,2);
+ //parseable_packet(0x0953,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x095b,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0960,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0969,26,clif_parse_PartyInvite2,2);
+// 2016-07-27bRagexeRE
+#elif PACKETVER == 20160727
+ parseable_packet(0x0202,5,clif_parse_ChangeDir,2,4);
+ //parseable_packet(0x023b,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0362,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0363,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0436,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0438,6,clif_parse_TickSend,2);
+ parseable_packet(0x07ec,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0866,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0868,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0869,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0874,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0877,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0883,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0887,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x088e,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0891,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x089f,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x08a2,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x08a4,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x08a7,6,clif_parse_TakeItem,2);
+ parseable_packet(0x092e,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0936,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0941,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0946,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0949,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0951,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x095f,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0966,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0969,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+// 2016-08-03bRagexeRE
+#elif PACKETVER == 20160803
+ parseable_packet(0x0364,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x085d,6,clif_parse_ReqClickBuyingStore,2);
+ //parseable_packet(0x0878,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x087f,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0881,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0886,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0887,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0888,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x088b,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0891,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0895,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x089c,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x089e,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x08a1,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x091b,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0929,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0930,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0932,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0934,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0937,10,clif_parse_UseSkillToPos,2,4,6,8);
+ //parseable_packet(0x093a,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x093e,6,clif_parse_TickSend,2);
+ parseable_packet(0x093f,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0952,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0955,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0956,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0959,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x095a,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x096a,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+// 2016-08-10aRagexeRE
+#elif PACKETVER == 20160810
+ parseable_packet(0x0361,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0819,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0838,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x085d,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x085e,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x085f,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0860,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x086f,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0875,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0879,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x087a,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0885,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0888,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0890,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x089d,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x089f,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x08a9,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x091a,6,clif_parse_TakeItem,2);
+ parseable_packet(0x091b,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x091c,10,clif_parse_UseSkillToId,2,4,6);
+ //parseable_packet(0x0926,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x092b,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x092d,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0935,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0943,6,clif_parse_TickSend,2);
+ parseable_packet(0x094b,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0959,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x095b,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0967,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+// 2016-08-31bRagexeRE
+#elif PACKETVER == 20160831
+ parseable_packet(0x022d,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0366,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x07ec,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0835,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0865,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x086d,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0870,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0874,26,clif_parse_PartyInvite2,2);
+ //parseable_packet(0x0876,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0878,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x087c,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x08a8,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x08a9,6,clif_parse_TickSend,2);
+ parseable_packet(0x0917,36,clif_parse_StoragePassword,0);
+ //parseable_packet(0x091b,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x092c,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x092e,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0938,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x093a,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0946,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x094a,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x094f,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0950,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0954,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0957,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x095e,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0960,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0964,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0967,10,clif_parse_UseSkillToId,2,4,6);
+// 2016-09-07aRagexeRE
+#elif PACKETVER == 20160907
+ parseable_packet(0x0202,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x022d,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x023b,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0361,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0436,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07e4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07ec,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x091c,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2016-09-13aRagexeRE
+#elif PACKETVER == 20160913
+ parseable_packet(0x0361,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0817,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x085b,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0865,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0874,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0875,6,clif_parse_TickSend,2);
+ parseable_packet(0x0879,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x087a,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x087b,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0887,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0889,6,clif_parse_TakeItem,2);
+ parseable_packet(0x088e,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x088f,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0891,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0892,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x089b,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x089c,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x08a5,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0928,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0935,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x093a,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0949,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x094a,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0950,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0952,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0954,5,clif_parse_WalkToXY,2);
+ //parseable_packet(0x0962,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0963,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0968,2,clif_parse_ReqCloseBuyingStore,0);
+// 2016-09-21bRagexeRE
+#elif PACKETVER == 20160921
+ parseable_packet(0x0202,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x022d,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x023b,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0361,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0436,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07e4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07ec,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x094a,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2016-09-28dRagexeRE
+#elif PACKETVER == 20160928
+ parseable_packet(0x0202,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035f,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0366,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0436,6,clif_parse_ReqClickBuyingStore,2);
+ //parseable_packet(0x0811,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0838,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0864,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0866,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x086d,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0872,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0878,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x087f,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0889,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x088e,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0897,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x089a,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x08a2,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x08a9,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0919,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x091e,6,clif_parse_TickSend,2);
+ parseable_packet(0x0927,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x092d,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0944,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x094d,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x094e,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0953,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0955,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0957,6,clif_parse_TakeItem,2);
+ //parseable_packet(0x095a,4,NULL,0); // CZ_GANGSI_RANK
+// 2016-10-05aRagexeRE
+#elif PACKETVER == 20161005
+ parseable_packet(0x0202,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0838,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0863,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0886,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x088e,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0891,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0892,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x089b,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x089c,6,clif_parse_TakeItem,2);
+ parseable_packet(0x08a0,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x08ac,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x08ad,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0918,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0919,6,clif_parse_SolveCharName,2);
+ //parseable_packet(0x091e,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x092b,6,clif_parse_TickSend,2);
+ parseable_packet(0x0931,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0932,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x093b,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0942,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0944,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0945,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x094a,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x094d,5,clif_parse_HomMenu,2,4);
+ //parseable_packet(0x0952,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x095a,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x095b,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0967,10,clif_parse_UseSkillToId,2,4,6);
+// 2016-10-12aRagexeRE
+#elif PACKETVER == 20161012
+ parseable_packet(0x023b,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0364,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0365,6,clif_parse_TickSend,2);
+ parseable_packet(0x0369,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x07ec,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0819,26,clif_parse_FriendsListAdd,2);
+ //parseable_packet(0x085b,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x085e,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0863,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0868,6,clif_parse_TakeItem,2);
+ parseable_packet(0x086d,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0872,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0875,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0880,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0893,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x08a0,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x092d,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0936,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0937,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0939,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0943,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0944,8,clif_parse_MoveFromKafra,2,4);
+ //parseable_packet(0x094f,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0951,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x095c,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0962,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0966,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0967,36,clif_parse_StoragePassword,0);
+// 2016-10-19aRagexeRE
+#elif PACKETVER == 20161019
+ parseable_packet(0x022d,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0361,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0437,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07e4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07ec,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0889,36,clif_parse_StoragePassword,0);
+ //parseable_packet(0x0892,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0946,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0963,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2016-10-26bRagexeRE
+#elif PACKETVER == 20161026
+ parseable_packet(0x0363,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0438,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0802,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x085a,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x085f,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0861,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0862,6,clif_parse_TickSend,2);
+ parseable_packet(0x086a,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x086c,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ //parseable_packet(0x086e,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x087a,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ //parseable_packet(0x087c,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x087f,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0886,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0891,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0894,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0898,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x091a,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x091b,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0926,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x092c,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x092e,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x092f,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0930,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x094b,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0953,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x095c,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x095e,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0962,5,clif_parse_ChangeDir,2,4);
+// 2016-11-02aRagexeRE or 2016-11-03aRagexeRE
+#elif PACKETVER == 20161102 || PACKETVER == 20161103
+ parseable_packet(0x0361,8,clif_parse_MoveFromKafra,2,4);
+ //parseable_packet(0x0367,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0436,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0802,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0838,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x083c,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x085f,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0869,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x086c,2,clif_parse_SearchStoreInfoNextPage,0);
+ //parseable_packet(0x086f,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0874,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0886,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x088f,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0890,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x089f,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x08a2,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x08aa,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x091b,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0922,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0925,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0928,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x092f,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0936,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0946,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0949,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x095e,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0964,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0965,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0966,6,clif_parse_TickSend,2);
+// 2016-11-09bRagexeRE
+#elif PACKETVER == 20161109
+ parseable_packet(0x02c4,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0361,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0362,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,6,clif_parse_TickSend,2);
+ parseable_packet(0x0366,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x085d,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x085e,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0865,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x086a,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x086d,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0870,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0876,6,clif_parse_ReqClickBuyingStore,2);
+ //parseable_packet(0x087a,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0881,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x088e,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0891,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0898,6,clif_parse_TakeItem,2);
+ parseable_packet(0x089a,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x089d,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ //parseable_packet(0x089f,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x08a7,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x08ad,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0927,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0937,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x093c,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x093f,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0954,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0956,5,clif_parse_ChangeDir,2,4);
+// 2016-11-16cRagexeRE
+#elif PACKETVER == 20161116
+ parseable_packet(0x0368,6,clif_parse_TickSend,2);
+ parseable_packet(0x0369,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0835,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x085f,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0864,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x086f,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0885,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x088b,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x088d,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x088f,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0890,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0892,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0893,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x08a1,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x08a2,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x08aa,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x08ac,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0920,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0925,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x092a,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0931,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x093c,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x094a,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0952,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0957,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x095b,36,clif_parse_StoragePassword,0);
+ //parseable_packet(0x095d,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x095f,2,clif_parse_SearchStoreInfoNextPage,0);
+ //parseable_packet(0x0967,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+// 2016-11-23aRagexeRE
+#elif PACKETVER == 20161123
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035f,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0362,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0437,6,clif_parse_TickSend,2);
+ parseable_packet(0x085c,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0861,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0862,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0866,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x086f,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0871,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x087f,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0880,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0882,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x088b,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x089c,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x08a9,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x08aa,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x091a,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0926,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x092a,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x092f,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0930,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0941,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x094d,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x094f,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ //parseable_packet(0x095a,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x095b,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0962,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x096a,6,clif_parse_SolveCharName,2);
+// 2016-11-30bRagexeRE
+#elif PACKETVER == 20161130
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035f,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0361,6,clif_parse_TickSend,2);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07e4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07ec,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ //parseable_packet(0x088f,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0931,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0943,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0954,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0959,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2016-12-07eRagexeRE
+#elif PACKETVER == 20161207
+ parseable_packet(0x023b,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0361,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0867,26,clif_parse_FriendsListAdd,2);
+ //parseable_packet(0x0868,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0875,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x087e,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0886,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x08a1,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x08a2,6,clif_parse_TakeItem,2);
+ parseable_packet(0x08ad,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0918,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x091d,8,clif_parse_MoveFromKafra,2,4);
+ //parseable_packet(0x0943,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x095d,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0965,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2016-12-14bRagexeRE
+#elif PACKETVER == 20161214
+ parseable_packet(0x022d,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0281,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x02c4,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0364,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0436,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ //parseable_packet(0x0819,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x085a,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0862,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x086d,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0887,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0895,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0899,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x08a6,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x092e,6,clif_parse_TakeItem,2);
+ parseable_packet(0x093d,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2016-12-21aRagexeRE
+#elif PACKETVER == 20161221
+ parseable_packet(0x035f,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0366,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0438,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0817,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x085b,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0866,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0876,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0881,6,clif_parse_GetCharNameRequest,2);
+ //parseable_packet(0x0884,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0885,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x088c,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0890,36,clif_parse_StoragePassword,0);
+ //parseable_packet(0x0899,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x089a,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x089b,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x08aa,6,clif_parse_TickSend,2);
+ parseable_packet(0x091e,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0926,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0928,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x092c,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x092e,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0930,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0943,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0946,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x094b,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x095a,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0964,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0965,5,clif_parse_ChangeDir,2,4);
+// 2016-12-28aRagexeRE
+#elif PACKETVER == 20161228
+ parseable_packet(0x0362,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x085a,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x085e,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0865,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x086a,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x086c,6,clif_parse_TakeItem,2);
+ parseable_packet(0x086d,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0870,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0871,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0875,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x087f,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0886,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0889,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0893,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x089f,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x08a2,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x08a3,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x08a5,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x08ab,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x08ac,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x08ad,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x091c,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0929,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x092c,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0934,26,clif_parse_PartyInvite2,2);
+ //parseable_packet(0x0935,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ //parseable_packet(0x0938,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x093d,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0944,6,clif_parse_TickSend,2);
+// 2017-01-04bRagexeRE
+#elif PACKETVER == 20170104
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0436,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x07e4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07ec,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x085a,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x087f,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0896,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x091b,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0940,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2017-01-11aRagexeRE
+#elif PACKETVER == 20170111
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0436,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x085d,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0877,26,clif_parse_FriendsListAdd,2);
+ //parseable_packet(0x087f,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x088a,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x08a1,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x08a3,6,clif_parse_TakeItem,2);
+ parseable_packet(0x08a6,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x091a,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x091b,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0940,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x094c,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0961,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0969,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2017-01-18aRagexeRE
+#elif PACKETVER == 20170118
+ parseable_packet(0x022d,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0364,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0436,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0862,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0865,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x086f,6,clif_parse_TakeItem,2);
+ //parseable_packet(0x0873,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x089e,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x08ad,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x091f,18,clif_parse_PartyBookingRegisterReq,2,4);
+ //parseable_packet(0x0927,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0933,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0958,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0962,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x096a,8,clif_parse_MoveToKafra,2,4);
+// 2017-01-25aRagexeRE
+#elif PACKETVER == 20170125
+ parseable_packet(0x0438,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0811,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x086e,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0876,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0877,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0879,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x087b,6,clif_parse_TakeItem,2);
+ parseable_packet(0x087d,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0881,5,clif_parse_ChangeDir,2,4);
+ //parseable_packet(0x0884,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0893,36,clif_parse_StoragePassword,0);
+ //parseable_packet(0x0894,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0895,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0898,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x089b,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x08a5,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x091b,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x091c,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x091d,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0920,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0929,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x092b,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0930,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x093c,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0943,6,clif_parse_TickSend,2);
+ parseable_packet(0x0944,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x095c,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0965,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0968,2,clif_parse_SearchStoreInfoNextPage,0);
+// 2017-02-01aRagexeRE
+#elif PACKETVER == 20170201
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0815,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x085d,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x085e,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0875,6,clif_parse_TakeItem,2);
+ //parseable_packet(0x0879,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0881,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0884,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0885,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0886,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x088b,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x08a4,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0919,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0920,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0938,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0940,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x094c,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0966,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0969,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2017-02-08aRagexeRE
+#elif PACKETVER == 20170208
+ //parseable_packet(0x02c4,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0367,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x085c,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0860,5,clif_parse_ChangeDir,2,4);
+ //parseable_packet(0x087a,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x088c,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0892,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x08a1,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x08ac,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0921,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0923,6,clif_parse_TakeItem,2);
+ parseable_packet(0x092d,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0932,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0937,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2017-02-15aRagexeRE
+#elif PACKETVER == 20170215
+ parseable_packet(0x02c4,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x035f,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0360,6,clif_parse_TickSend,2);
+ parseable_packet(0x0811,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x083c,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x085c,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0876,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x087c,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x087d,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x087e,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0883,6,clif_parse_SolveCharName,2);
+ //parseable_packet(0x0884,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x088a,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x088b,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x088c,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0890,10,clif_parse_UseSkillToPos,2,4,6,8);
+ //parseable_packet(0x0896,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x089b,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x08a2,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x08a8,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x091c,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0925,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x092b,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x092d,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0942,6,clif_parse_TakeItem,2);
+ parseable_packet(0x094e,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x095f,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0962,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0969,5,clif_parse_WalkToXY,2);
+// 2017-02-22aRagexeRE
+#elif PACKETVER == 20170222
+ parseable_packet(0x0202,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x085f,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0866,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0870,18,clif_parse_PartyBookingRegisterReq,2,4);
+ //parseable_packet(0x0871,4,NULL,0); // CZ_GANGSI_RANK
+ //parseable_packet(0x0877,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0889,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0894,6,clif_parse_TakeItem,2);
+ parseable_packet(0x08a3,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x08a8,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0937,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0939,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0943,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x095d,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0962,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2017-02-28aRagexeRE
+#elif PACKETVER == 20170228
+ parseable_packet(0x022d,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0360,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0362,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0819,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x085e,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0863,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x086b,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0873,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0874,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0876,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0883,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0884,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0889,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0893,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x089e,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x08a0,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x08a2,36,clif_parse_StoragePassword,0);
+ //parseable_packet(0x08a6,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x08a7,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x091f,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x092a,6,clif_parse_TakeItem,2);
+ parseable_packet(0x092e,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0937,6,clif_parse_TickSend,2);
+ //parseable_packet(0x093e,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0944,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0947,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0948,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0952,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0955,18,clif_parse_PartyBookingRegisterReq,2,4);
+// 2017-03-08bRagexeRE
+#elif PACKETVER == 20170308
+ parseable_packet(0x0202,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x022d,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x023b,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0361,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0436,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07e4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07ec,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x087d,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2017-03-15cRagexeRE
+#elif PACKETVER == 20170315
+ parseable_packet(0x02c4,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x035f,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0360,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0366,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0367,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0436,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x07ec,6,clif_parse_TickSend,2);
+ //parseable_packet(0x085c,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0863,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x086a,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0872,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x087b,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0884,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x088b,18,clif_parse_PartyBookingRegisterReq,2,4);
+ //parseable_packet(0x088d,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x088f,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0892,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x089c,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x08aa,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x091a,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x091b,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x091d,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0920,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0922,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0944,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x094a,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x094e,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0950,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0952,36,clif_parse_StoragePassword,0);
+// 2017-03-22aRagexeRE
+#elif PACKETVER == 20170322
+ parseable_packet(0x0202,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x022d,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x023b,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0361,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0436,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07e4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07ec,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x091a,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2017-03-29dRagexeRE
+#elif PACKETVER == 20170329
+ parseable_packet(0x0281,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0362,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0363,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x085d,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x087a,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0888,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x08a8,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0917,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0926,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0929,6,clif_parse_TakeItem,2);
+ parseable_packet(0x092e,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0937,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0939,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0949,8,clif_parse_MoveFromKafra,2,4);
+ //parseable_packet(0x095f,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2017-04-05bRagexeRE
+#elif PACKETVER == 20170405
+ parseable_packet(0x022d,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0281,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0362,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0363,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x085f,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0860,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0864,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0865,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x086f,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0893,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x08a5,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x094c,36,clif_parse_StoragePassword,0);
+ //parseable_packet(0x094f,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0964,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2017-04-12aRagexeRE
+#elif PACKETVER == 20170412
+ parseable_packet(0x023b,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0365,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0863,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0869,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x086d,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0878,5,clif_parse_WalkToXY,2);
+ //parseable_packet(0x0879,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x087b,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x088b,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0890,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0893,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0898,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x089a,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x089c,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x08a1,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x091a,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x091e,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0929,6,clif_parse_TickSend,2);
+ //parseable_packet(0x092e,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0938,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0942,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0945,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0949,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x094f,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0952,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0959,6,clif_parse_TakeItem,2);
+ parseable_packet(0x095b,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x095c,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x095d,36,clif_parse_StoragePassword,0);
+// 2017-04-19bRagexeRE
+#elif PACKETVER == 20170419
+ parseable_packet(0x0811,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0819,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0838,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x085a,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x085e,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0862,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0868,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x086a,18,clif_parse_PartyBookingRegisterReq,2,4);
+ //parseable_packet(0x0872,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0881,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x088d,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x088f,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0897,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0898,6,clif_parse_TickSend,2);
+ parseable_packet(0x089d,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x08aa,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x091b,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0920,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0922,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0930,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0931,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0935,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x093a,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x093f,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0942,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x095c,6,clif_parse_TakeItem,2);
+ parseable_packet(0x095d,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ //parseable_packet(0x0963,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0965,6,clif_parse_ReqClickBuyingStore,2);
+// 2017-04-26dRagexeRE
+#elif PACKETVER == 20170426
+ parseable_packet(0x0281,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0866,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ //parseable_packet(0x086f,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x087a,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0887,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0899,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x089c,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x08a2,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x08a4,6,clif_parse_TakeItem,2);
+ //parseable_packet(0x091f,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0927,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0940,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0958,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0963,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2017-05-02dRagexeRE
+#elif PACKETVER == 20170502
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035f,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0436,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07e4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07ec,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083c,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0875,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0894,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x089c,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x093c,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0950,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x096a,6,clif_parse_GetCharNameRequest,2);
+// 2017-05-17aRagexeRE
+#elif PACKETVER == 20170517
+ //parseable_packet(0x0364,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0367,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0437,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0802,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0815,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0817,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0868,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0875,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x087b,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x087d,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x088c,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x088d,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0894,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0896,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0899,26,clif_parse_PartyInvite2,2);
+ //parseable_packet(0x089e,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x089f,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x08a2,6,clif_parse_TickSend,2);
+ parseable_packet(0x08a8,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x08aa,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x091b,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0923,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x093b,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0945,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0946,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0947,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0958,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0960,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0964,6,clif_parse_TakeItem,2);
+// 2017-05-24aRagexeRE
+#elif PACKETVER == 20170524
+ parseable_packet(0x0364,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0368,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0802,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x085e,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x085f,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0860,6,clif_parse_TickSend,2);
+ parseable_packet(0x0864,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0866,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0868,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x086d,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0873,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0874,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x087d,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0882,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x088d,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0894,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x089c,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x08a1,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ //parseable_packet(0x091e,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0923,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0925,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0934,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0946,10,clif_parse_UseSkillToPos,2,4,6,8);
+ //parseable_packet(0x0958,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x095a,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x095b,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0964,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0967,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0968,6,clif_parse_SolveCharName,2);
+// 2017-05-31aRagexeRE
+#elif PACKETVER == 20170531
+ parseable_packet(0x0361,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0369,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x07e4,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x07ec,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0819,6,clif_parse_TickSend,2);
+ //parseable_packet(0x085b,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x085f,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0861,26,clif_parse_FriendsListAdd,2);
+ //parseable_packet(0x0868,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0873,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0875,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0878,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x087b,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0885,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x088b,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x088d,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0894,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x089a,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x089c,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x08a2,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x08ac,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x08ad,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x092d,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0933,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0937,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0940,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0945,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0963,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0968,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+// 2017-06-07cRagexeRE
+#elif PACKETVER == 20170607
+ parseable_packet(0x0361,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0364,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x07e4,6,clif_parse_TickSend,2);
+ parseable_packet(0x085a,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x085e,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0862,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0863,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0864,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0871,19,clif_parse_WantToConnection,2,6,10,14,18);
+ //parseable_packet(0x0873,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0875,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0885,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x088a,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0897,6,clif_parse_TakeItem,2);
+ parseable_packet(0x089d,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x08a9,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x08ab,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0917,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0918,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0919,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0925,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0927,10,clif_parse_UseSkillToPos,2,4,6,8);
+ //parseable_packet(0x0931,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0934,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0938,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x093d,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0942,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0944,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0949,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+// 2017-06-14bRagexeRE
+#elif PACKETVER == 20170614
+ parseable_packet(0x023B,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0361,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0364,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0367,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0437,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0838,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x083C,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0860,6,clif_parse_ReqClickBuyingStore,2);
+ //parseable_packet(0x0865,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0866,6,clif_parse_TickSend,2);
+ parseable_packet(0x0867,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x086B,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x086C,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0877,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0879,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x087D,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x087E,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0889,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0899,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x089D,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x08A2,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x08AD,6,clif_parse_TakeItem,2);
+ parseable_packet(0x091B,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0928,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x092F,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0936,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0944,19,clif_parse_WantToConnection,2,6,10,14,18);
+ //parseable_packet(0x0957,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0963,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+// 2017-06-21aRagexeRE
+#elif PACKETVER == 20170621
+ parseable_packet(0x0202,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x035F,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0361,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0365,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0366,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07E4,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0802,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x083C,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x085D,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x087D,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0885,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0889,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x08A8,5,clif_parse_HomMenu,2,4);
+ //parseable_packet(0x0956,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0957,36,clif_parse_StoragePassword,0);
+ //parseable_packet(0x095B,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x095C,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0961,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2);
+// 2017-06-28bRagexeRE
+#elif PACKETVER == 20170628
+ parseable_packet(0x0202,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x022D,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x023B,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035F,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0361,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0436,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07E4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07EC,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083C,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0863,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2);
+// 2017-07-05aRagexeRE
+#elif PACKETVER == 20170705
+ parseable_packet(0x0202,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x02C4,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x035F,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083C,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0879,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0886,26,clif_parse_FriendsListAdd,2);
+ //parseable_packet(0x088D,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x088E,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x089A,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x089D,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x091A,5,clif_parse_ChangeDir,2,4);
+ //parseable_packet(0x092F,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0930,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0932,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0934,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x094C,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2);
+// 2017-07-12bRagexeRE
+#elif PACKETVER == 20170712
+ parseable_packet(0x0202,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x022D,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x023B,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035F,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0361,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0436,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07E4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07EC,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083C,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0944,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2);
+// 2017-07-19aRagexeRE
+#elif PACKETVER == 20170719
+ parseable_packet(0x022D,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0367,2,clif_parse_ReqCloseBuyingStore,0);
+ //parseable_packet(0x0368,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0369,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x07E4,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x085A,6,clif_parse_TickSend,2);
+ parseable_packet(0x085E,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0863,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x086E,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x087D,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0881,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0882,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0885,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0891,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0898,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x089A,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x089D,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x08A6,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x08A8,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x091B,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x091F,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x092C,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x092E,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x092F,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x093D,5,clif_parse_WalkToXY,2);
+ //parseable_packet(0x093E,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0944,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0946,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0966,8,clif_parse_MoveToKafra,2,4);
+// 2017-07-26cRagexeRE
+#elif PACKETVER == 20170726
+ parseable_packet(0x0363,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0364,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0366,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0369,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0438,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0838,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0873,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0874,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0878,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0881,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0888,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x088E,5,clif_parse_WalkToXY,2);
+ //parseable_packet(0x08A3,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x08A7,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x08AA,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x08AB,6,clif_parse_TakeItem,2);
+ parseable_packet(0x08AC,6,clif_parse_TickSend,2);
+ parseable_packet(0x091D,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x091E,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x091F,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0921,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0923,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0943,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x094F,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0950,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0952,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0954,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x095A,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0963,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+// 2017-08-01aRagexeRE
+#elif PACKETVER == 20170801
+ parseable_packet(0x022D,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0281,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x035F,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0361,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0362,5,clif_parse_HomMenu,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07E4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07EC,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083C,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x087D,36,clif_parse_StoragePassword,0);
+ //parseable_packet(0x08A6,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x094F,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x095A,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2);
+// 2017-08-09cRagexeRE
+//#elif PACKETVER == 20170809
+// 2017-08-16dRagexeRE
+#elif PACKETVER == 20170816
+ parseable_packet(0x022D,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x035F,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0361,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0362,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0438,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x085A,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0862,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0864,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x087E,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0881,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0882,36,clif_parse_StoragePassword,0);
+ //parseable_packet(0x0884,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0888,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0889,6,clif_parse_TickSend,2);
+ parseable_packet(0x08A3,26,clif_parse_FriendsListAdd,2);
+ //parseable_packet(0x08A7,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x08A9,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x08AC,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x091C,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0921,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0925,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x092C,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x093A,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x093D,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0940,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0941,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0950,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0959,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0960,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+// 2017-08-23aRagexeRE
+#elif PACKETVER == 20170823
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035F,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0361,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0436,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07E4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07EC,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083C,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x086C,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x086D,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x08AC,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x095B,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2);
+// 2017-08-30bRagexeRE
+#elif PACKETVER == 20170830
+ parseable_packet(0x0281,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x02C4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0363,18,clif_parse_PartyBookingRegisterReq,2,4);
+ //parseable_packet(0x0364,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0860,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0865,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x086A,26,clif_parse_PartyInvite2,2);
+ //parseable_packet(0x0875,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0884,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0885,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0888,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0897,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0899,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x089A,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x089E,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x08A2,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x08A8,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x091E,6,clif_parse_TickSend,2);
+ parseable_packet(0x0921,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0925,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x092E,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0939,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x093E,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0940,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0942,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0943,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0947,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0951,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0959,10,clif_parse_UseSkillToPos,2,4,6,8);
+// 2017-09-06cRagexeRE
+#elif PACKETVER == 20170906
+ //parseable_packet(0x0202,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0281,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x02C4,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x035F,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0366,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0802,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083C,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0860,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0866,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ //parseable_packet(0x086C,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x087B,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x08A2,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x08A3,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x08A7,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x091A,6,clif_parse_TakeItem,2);
+ parseable_packet(0x091E,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0953,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0281,6,clif_parse_GetCharNameRequest,2);
+// 2017-09-13bRagexeRE
+#elif PACKETVER == 20170913
+ parseable_packet(0x035F,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0437,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x07E4,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0817,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0835,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x085A,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0860,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0865,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0866,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x088C,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0890,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0891,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0892,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x08A6,6,clif_parse_ReqClickBuyingStore,2);
+ //parseable_packet(0x08A7,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x08AA,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x08AB,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x08AC,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x08AD,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x091B,6,clif_parse_TickSend,2);
+ parseable_packet(0x091D,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x091E,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0920,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0923,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0925,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0927,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x095A,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x095C,6,clif_parse_SolveCharName,2);
+// 2017-09-20bRagexeRE
+#elif PACKETVER == 20170920
+ parseable_packet(0x0369,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0436,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x07EC,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x085A,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0861,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0862,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0864,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0865,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x086A,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x086C,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0874,2,clif_parse_ReqCloseBuyingStore,0);
+ //parseable_packet(0x0875,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0889,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x088E,6,clif_parse_TickSend,2);
+ parseable_packet(0x089B,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0919,10,clif_parse_UseSkillToPos,2,4,6,8);
+ //parseable_packet(0x091E,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0921,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0923,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0926,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x092E,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0937,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0939,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0945,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x094C,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x095D,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0961,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0966,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x096A,2,clif_parse_SearchStoreInfoNextPage,0);
+// 2017-09-27bRagexeRE or 2017-09-27dRagexeRE
+#elif PACKETVER == 20170927
+ parseable_packet(0x02C4,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x035F,6,clif_parse_GetCharNameRequest,2);
+ //parseable_packet(0x0361,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0362,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0366,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x085C,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0873,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0875,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x087D,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x087E,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x088B,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0899,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x089A,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x089B,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x08A3,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x08A5,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ //parseable_packet(0x08A6,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x08AD,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x091E,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0922,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0923,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0927,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x093B,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0942,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0945,6,clif_parse_TickSend,2);
+ parseable_packet(0x094B,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x094D,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0959,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x095A,10,clif_parse_UseSkillToPos,2,4,6,8);
+// 2017-10-02cRagexeRE
+#elif PACKETVER == 20171002
+ parseable_packet(0x022D,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x035F,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0363,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083C,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0885,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0897,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0899,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x089D,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0928,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x092D,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0934,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x093B,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x093D,6,clif_parse_TakeItem,2);
+ //parseable_packet(0x093E,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0943,26,clif_parse_PartyInvite2,2);
+ //parseable_packet(0x095F,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2);
+// 2017-10-11bRagexeRE
+#elif PACKETVER == 20171011
+ parseable_packet(0x023B,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035F,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0436,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0437,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07E4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07EC,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083C,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x087B,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0882,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0950,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0954,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2);
+// 2017-10-18aRagexeRE
+#elif PACKETVER == 20171018
+ parseable_packet(0x035F,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0363,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0364,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0436,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083C,10,clif_parse_UseSkillToId,2,4,6);
+ //parseable_packet(0x086A,4,NULL,0); // CZ_GANGSI_RANK
+ //parseable_packet(0x087A,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x087E,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0889,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x089A,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x089F,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x08A6,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0938,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0944,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x094A,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x094F,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2);
+// 2017-10-25bRagexeRE or 2017-10-25cRagexeRE or 2017-10-25dRagexeRE or 2017-10-25eRagexeRE
+#elif PACKETVER == 20171025
+ parseable_packet(0x0202,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x022D,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x023B,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035F,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0361,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0436,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07E4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07EC,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083C,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x08A2,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2);
+// 2017-11-01bRagexeRE
+#elif PACKETVER == 20171101
+ parseable_packet(0x022D,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0368,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0369,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0438,6,clif_parse_TickSend,2);
+ parseable_packet(0x0835,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x085B,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0860,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x086C,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0872,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0876,5,clif_parse_ChangeDir,2,4);
+ //parseable_packet(0x0886,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x088E,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0890,2,clif_parse_SearchStoreInfoNextPage,0);
+ //parseable_packet(0x0895,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0899,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x089B,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x089C,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x08A0,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x08AB,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x08AD,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x091B,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0939,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x094A,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x094D,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0952,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0957,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x095A,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0962,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0966,10,clif_parse_UseSkillToPos,2,4,6,8);
+// 2017-11-08bRagexeRE
+#elif PACKETVER == 20171108
+ parseable_packet(0x0202,6,clif_parse_TickSend,2);
+ parseable_packet(0x0361,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x07E4,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0815,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0819,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0838,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x085D,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0863,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0878,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x087E,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0884,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ //parseable_packet(0x0896,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0897,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x08A2,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x08A9,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x08AD,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x091D,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x091F,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0940,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0941,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0945,6,clif_parse_TakeItem,2);
+ //parseable_packet(0x0947,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0949,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x094E,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0958,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x095A,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0963,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0965,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0967,10,clif_parse_UseSkillToPos,2,4,6,8);
+// 2017-11-15aRagexeRE
+#elif PACKETVER == 20171115
+ parseable_packet(0x035F,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0365,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0436,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0802,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083C,10,clif_parse_UseSkillToId,2,4,6);
+ //parseable_packet(0x086D,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x086F,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x087E,8,clif_parse_MoveFromKafra,2,4);
+ //parseable_packet(0x0883,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x088B,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0890,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0898,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x08A4,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0926,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0958,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x095A,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2);
+// 2017-11-22bRagexeRE
+#elif PACKETVER == 20171122
+ parseable_packet(0x0281,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x02C4,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ //parseable_packet(0x035F,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0838,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x083C,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x085B,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0862,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0867,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0877,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ //parseable_packet(0x0885,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0890,6,clif_parse_TickSend,2);
+ parseable_packet(0x0891,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0893,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0897,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0898,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x089A,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x089E,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x08A6,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x08A9,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x091E,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0920,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0923,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0934,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x093B,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0945,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0946,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0947,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0962,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0968,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+// 2017-11-29aRagexeRE
+#elif PACKETVER == 20171129
+ parseable_packet(0x02C4,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x035F,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0361,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0363,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0365,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x083C,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0862,6,clif_parse_TakeItem,2);
+ parseable_packet(0x086D,18,clif_parse_PartyBookingRegisterReq,2,4);
+ //parseable_packet(0x0876,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0878,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x088A,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x089C,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x08A5,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0940,6,clif_parse_TickSend,2);
+ //parseable_packet(0x094B,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0953,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0966,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2);
+// 2017-12-06aRagexeRE
+#elif PACKETVER == 20171206
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083C,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0867,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x086A,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x086E,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0885,6,clif_parse_TickSend,2);
+ parseable_packet(0x0888,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0897,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x089D,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x08A2,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x08A4,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x091D,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0923,8,clif_parse_MoveToKafra,2,4);
+ //parseable_packet(0x092E,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0936,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0942,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0958,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0961,6,clif_parse_TakeItem,2);
+ parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2);
+// 2017-12-13bRagexeRE
+#elif PACKETVER == 20171213
+ parseable_packet(0x0202,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035F,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07E4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07EC,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083C,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0860,19,clif_parse_WantToConnection,2,6,10,14,18);
+ //parseable_packet(0x0881,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0890,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x091A,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0957,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2);
+// 2017-12-20aRagexeRE
+#elif PACKETVER == 20171220
+ parseable_packet(0x0281,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0366,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0369,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0436,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0437,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x085E,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0861,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0872,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0873,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0880,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0882,6,clif_parse_TickSend,2);
+ parseable_packet(0x0885,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x088C,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0899,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x089E,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x08A7,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x091B,6,clif_parse_TakeItem,2);
+ parseable_packet(0x091E,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0924,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0929,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0933,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x093E,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0941,6,clif_parse_ReqClickBuyingStore,2);
+ //parseable_packet(0x0946,4,NULL,0); // CZ_GANGSI_RANK
+ //parseable_packet(0x094E,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0951,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0957,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0960,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0964,26,clif_parse_PartyInvite2,2);
+// 2017-12-27aRagexeRE
+#elif PACKETVER == 20171227
+ parseable_packet(0x035F,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0361,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0802,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083C,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x087D,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0888,8,clif_parse_MoveFromKafra,2,4);
+ //parseable_packet(0x088A,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x088D,6,clif_parse_TakeItem,2);
+ parseable_packet(0x08A0,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x08A5,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x092C,19,clif_parse_WantToConnection,2,6,10,14,18);
+ //parseable_packet(0x092E,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0938,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0945,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0946,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0969,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x096A,18,clif_parse_PartyBookingRegisterReq,2,4);
+// 2018-01-03aRagexeRE or 2018-01-03bRagexeRE
+#elif PACKETVER == 20180103
+ parseable_packet(0x02C4,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0363,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,19,clif_parse_WantToConnection,2,6,10,14,18);
+ //parseable_packet(0x0865,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x086B,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x086D,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x0872,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0876,6,clif_parse_TickSend,2);
+ parseable_packet(0x0879,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x088E,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0899,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x089F,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x08A9,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x08AB,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x08AC,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x091D,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0922,2,clif_parse_SearchStoreInfoNextPage,0);
+ //parseable_packet(0x0926,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0927,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x092C,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0935,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0938,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0941,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0946,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0948,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x094E,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x095D,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x095F,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0960,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+// 2018-01-17aRagexeRE
+#elif PACKETVER == 20180117
+ parseable_packet(0x0202,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x022D,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x023B,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035F,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0361,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0436,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07E4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07EC,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083C,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0875,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2);
+// 2018-01-24bRagexeRE
+#elif PACKETVER == 20180124
+ parseable_packet(0x035F,6,clif_parse_TickSend,2);
+ parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0436,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0802,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083C,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x085F,36,clif_parse_StoragePassword,0);
+ //parseable_packet(0x0868,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x086A,18,clif_parse_PartyBookingRegisterReq,2,4);
+ //parseable_packet(0x086F,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x087A,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0888,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0890,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0919,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0940,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0946,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x094D,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0958,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0961,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2);
+// 2018-02-07bRagexeRE
+#elif PACKETVER == 20180207
+ parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x035F,6,clif_parse_ReqClickBuyingStore,2);
+ //parseable_packet(0x0360,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0362,6,clif_parse_DropItem,2,4);
+ //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0368,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0437,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x07E4,6,clif_parse_TakeItem,2);
+ parseable_packet(0x07EC,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0802,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x083C,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x0870,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0881,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x092C,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x092E,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0940,6,clif_parse_TickSend,2);
+ parseable_packet(0x0950,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2);
+// 2018-02-13aRagexeRE
+#elif PACKETVER == 20180213
+ parseable_packet(0x0369,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x0802,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0817,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x085A,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x086F,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x0874,6,clif_parse_TickSend,2);
+ parseable_packet(0x0875,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0878,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x087B,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0882,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x088C,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x0892,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0898,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ //parseable_packet(0x089C,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x08A3,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x08A5,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x08A9,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x08AD,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0917,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0922,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0924,10,clif_parse_UseSkillToPos,2,4,6,8);
+ //parseable_packet(0x0926,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0933,7,clif_parse_ActionRequest,2,6);
+ parseable_packet(0x0936,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x093C,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0943,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0955,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x095A,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0962,5,clif_parse_HomMenu,2,4);
+// 2018-02-21aRagexeRE or 2018-02-21bRagexeRE
+#elif PACKETVER == 20180221
+ parseable_packet(0x0202,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ //parseable_packet(0x0366,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0436,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x0838,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0867,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x086C,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x086F,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0871,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x0876,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0879,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x087D,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x0880,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0881,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0883,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x088F,6,clif_parse_SolveCharName,2);
+ //parseable_packet(0x0891,4,NULL,0); // CZ_GANGSI_RANK
+ parseable_packet(0x0897,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0899,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x089D,6,clif_parse_TickSend,2);
+ parseable_packet(0x0917,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x091E,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0929,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x093D,26,clif_parse_PartyInvite2,2);
+ parseable_packet(0x094B,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x094D,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x094E,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0957,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0964,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x096A,7,clif_parse_ActionRequest,2,6);
+// 2018-03-07bRagexeRE
+#elif PACKETVER == 20180307
+ parseable_packet(0x035F,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89);
+ parseable_packet(0x0437,6,clif_parse_DropItem,2,4);
+ parseable_packet(0x07E4,19,clif_parse_WantToConnection,2,6,10,14,18);
+ parseable_packet(0x0861,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
+ parseable_packet(0x0862,6,clif_parse_ReqClickBuyingStore,2);
+ parseable_packet(0x0864,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
+ parseable_packet(0x086C,6,clif_parse_TickSend,2);
+ parseable_packet(0x0870,-1,clif_parse_ItemListWindowSelected,2,4,8,12);
+ parseable_packet(0x0872,18,clif_parse_PartyBookingRegisterReq,2,4);
+ parseable_packet(0x0877,5,clif_parse_WalkToXY,2);
+ parseable_packet(0x088D,8,clif_parse_MoveFromKafra,2,4);
+ parseable_packet(0x0893,10,clif_parse_UseSkillToId,2,4,6);
+ parseable_packet(0x089B,12,clif_parse_SearchStoreInfoListItemClick,2,6,10);
+ parseable_packet(0x08A6,2,clif_parse_SearchStoreInfoNextPage,0);
+ parseable_packet(0x08AA,26,clif_parse_FriendsListAdd,2);
+ parseable_packet(0x08AB,5,clif_parse_ChangeDir,2,4);
+ parseable_packet(0x0917,10,clif_parse_UseSkillToPos,2,4,6,8);
+ parseable_packet(0x0920,8,clif_parse_MoveToKafra,2,4);
+ parseable_packet(0x0937,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12);
+ parseable_packet(0x0939,36,clif_parse_StoragePassword,0);
+ parseable_packet(0x093D,2,clif_parse_ReqCloseBuyingStore,0);
+ parseable_packet(0x0941,6,clif_parse_GetCharNameRequest,2);
+ parseable_packet(0x0944,5,clif_parse_HomMenu,2,4);
+ parseable_packet(0x0948,26,clif_parse_PartyInvite2,2);
+ //parseable_packet(0x0951,8,NULL,0); // CZ_JOIN_BATTLE_FIELD
+ parseable_packet(0x0954,6,clif_parse_TakeItem,2);
+ parseable_packet(0x0957,6,clif_parse_SolveCharName,2);
+ parseable_packet(0x0969,7,clif_parse_ActionRequest,2,6);
+ //parseable_packet(0x0281,4,NULL,0); // CZ_GANGSI_RANK
+#endif
+
+#endif /* _CLIF_SHUFFLE_HPP_ */
diff --git a/src/map/date.c b/src/map/date.cpp
similarity index 99%
rename from src/map/date.c
rename to src/map/date.cpp
index 5ce2f917f98..dca9bea1df4 100644
--- a/src/map/date.c
+++ b/src/map/date.cpp
@@ -1,7 +1,8 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#include "date.h"
+#include "date.hpp"
+
#include <time.h>
/*
diff --git a/src/map/date.h b/src/map/date.hpp
similarity index 87%
rename from src/map/date.h
rename to src/map/date.hpp
index 6df22934dfd..6859b0403df 100644
--- a/src/map/date.h
+++ b/src/map/date.hpp
@@ -1,15 +1,11 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _DATE_H_
-#define _DATE_H_
+#ifndef _DATE_HPP_
+#define _DATE_HPP_
#include "../common/cbasetypes.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
enum e_month{
JANUARY = 1,
FEBRUARY,
@@ -64,7 +60,4 @@ bool is_day_of_sun(void);
bool is_day_of_moon(void);
bool is_day_of_star(void);
-#ifdef __cplusplus
-}
-#endif
-#endif /* _DATE_H_ */
+#endif /* _DATE_HPP_ */
diff --git a/src/map/duel.c b/src/map/duel.cpp
similarity index 60%
rename from src/map/duel.c
rename to src/map/duel.cpp
index d1bac173f67..09e1f720574 100644
--- a/src/map/duel.c
+++ b/src/map/duel.cpp
@@ -2,21 +2,48 @@
// For more information, see LICENCE in the main folder
// Duel organizing functions [LuzZza]
-#include "../common/cbasetypes.h"
-
-#include "atcommand.h" // msg_txt
-#include "clif.h"
-#include "duel.h"
-#include "pc.h"
+#include "duel.hpp"
#include <stdio.h>
#include <string.h>
+#include <unordered_map>
+
+#include "../common/cbasetypes.h"
+#include "../common/timer.h"
-//global var (extern)
-struct duel duel_list[MAX_DUEL]; //list of current duel
-int duel_count = 0; //number of duel active
+#include "atcommand.hpp" // msg_txt
+#include "clif.hpp"
+#include "pc.hpp"
+#include "battle.hpp"
-static void duel_set(const unsigned int did, struct map_session_data* sd);
+//std::recursive_mutex> duel_list_mutex; //preparation for multithread
+std::unordered_map<size_t,struct duel> duel_list;
+
+std::unordered_map<size_t,struct duel> duel_get_list() { return duel_list; } //this could be exposed but not really necessarly, (hiden impl)
+bool duel_exist( size_t did ) { return duel_list.find( did ) != duel_list.end(); }
+duel& duel_get_duelid(size_t did) { return duel_list.at(did); }
+
+/**
+ * Number of duels created
+ * @return duel_list size
+ */
+size_t duel_counttotal() {
+ return duel_list.size();
+}
+
+/**
+ * Number of active duels (player has accepted the duel)
+ * @return active duels
+ */
+size_t duel_countactives()
+{
+ size_t count = 0;
+ for ( const auto& lcur : duel_list )
+ if ( lcur.second.members_count > 1 ) ++count;
+ return count;
+}
+
+static void duel_set(const size_t did, struct map_session_data* sd);
/*
* Save the current time of the duel in PC_LAST_DUEL_TIME
@@ -35,7 +62,7 @@ void duel_savetime(struct map_session_data* sd)
/*
* Check if the time elapsed between last duel is enough to launch another.
*/
-int duel_checktime(struct map_session_data* sd)
+bool duel_checktime(struct map_session_data* sd)
{
int diff;
time_t timer;
@@ -49,6 +76,18 @@ int duel_checktime(struct map_session_data* sd)
return !(diff >= 0 && diff < battle_config.duel_time_interval);
}
+/*
+ * Check if duel respect the member limit
+ */
+bool duel_check_player_limit(struct duel& pDuel)
+{
+ if(pDuel.max_players_limit > 0 &&
+ pDuel.members_count >= pDuel.max_players_limit) {
+ return false;
+ }
+ return true;
+}
+
/*
* Display opponents name of sd
*/
@@ -56,10 +95,11 @@ static int duel_showinfo_sub(struct map_session_data* sd, va_list va)
{
struct map_session_data *ssd = va_arg(va, struct map_session_data*);
int *p = va_arg(va, int*);
- char output[256];
- if (sd->duel_group != ssd->duel_group) return 0;
+ if (sd->duel_group != ssd->duel_group)
+ return 0;
+ char output[256];
sprintf(output, " %d. %s", ++(*p), sd->status.name);
clif_messagecolor(&ssd->bl, color_table[COLOR_LIGHT_GREEN], output, false, SELF);
return 1;
@@ -69,20 +109,24 @@ static int duel_showinfo_sub(struct map_session_data* sd, va_list va)
* Display duel infos,
* Number of duely...
*/
-void duel_showinfo(const unsigned int did, struct map_session_data* sd)
+void duel_showinfo(const size_t did, struct map_session_data* sd)
{
+ //std::lock_guard<std::recursive_mutex> _(duel_list_mutex); //or shared_ptr
+ if ( !duel_exist( did ) )
+ return;
+
int p=0;
char output[256];
if(duel_list[did].max_players_limit > 0)
sprintf(output, msg_txt(sd,370), //" -- Duels: %d/%d, Members: %d/%d, Max players: %d --"
- did, duel_count,
+ did, duel_counttotal(),
duel_list[did].members_count,
duel_list[did].members_count + duel_list[did].invites_count,
duel_list[did].max_players_limit);
else
sprintf(output, msg_txt(sd,371), //" -- Duels: %d/%d, Members: %d/%d --"
- did, duel_count,
+ did, duel_counttotal(),
duel_list[did].members_count,
duel_list[did].members_count + duel_list[did].invites_count);
@@ -93,7 +137,7 @@ void duel_showinfo(const unsigned int did, struct map_session_data* sd)
/*
* Moves sd to duel
*/
-static void duel_set(const unsigned int did, struct map_session_data* sd) {
+static void duel_set(const size_t did, struct map_session_data* sd) {
sd->state.changemap = 1;
sd->state.warping = 1;
@@ -112,27 +156,27 @@ static void duel_set(const unsigned int did, struct map_session_data* sd) {
/*
* Create a new duel for sd
+ * return new duel_id or 0 when fail
*/
-int duel_create(struct map_session_data* sd, const unsigned int maxpl)
+size_t duel_create(struct map_session_data* sd, const unsigned int maxpl)
{
- int i=1;
- char output[256];
-
- while(duel_list[i].members_count > 0 && i < MAX_DUEL) i++;
- if(i == MAX_DUEL) return 0;
-
- duel_count++;
- duel_set(i, sd);
- duel_list[i].members_count++;
- duel_list[i].invites_count = 0;
- duel_list[i].max_players_limit = maxpl;
+ static size_t lastID=0;
+ lastID++;
+
+ { //mutex scope
+ //std::lock_guard<std::recursive_mutex> _(duel_list_mutex);
+ duel_list[lastID].members_count++;
+ duel_list[lastID].invites_count = 0;
+ duel_list[lastID].max_players_limit = maxpl;
+ }
+ duel_set(lastID, sd);
+ char output[256];
strcpy(output, msg_txt(sd,372)); // " -- Duel has been created (@invite/@leave) --"
clif_messagecolor(&sd->bl, color_table[COLOR_LIGHT_GREEN], output, false, SELF);
-
clif_map_property(&sd->bl, MAPPROPERTY_FREEPVPZONE, SELF);
//clif_misceffect2(&sd->bl, 159);
- return i;
+ return lastID;
}
/*
@@ -141,20 +185,23 @@ int duel_create(struct map_session_data* sd, const unsigned int maxpl)
* @sd = inviting player
* @target_sd = invited player
*/
-void duel_invite(const unsigned int did, struct map_session_data* sd, struct map_session_data* target_sd)
+bool duel_invite(const size_t did, struct map_session_data* sd, struct map_session_data* target_sd)
{
- char output[256];
-
- // " -- Player %s invites %s to duel --"
- sprintf(output, msg_txt(sd,373), sd->status.name, target_sd->status.name);
- clif_disp_message(&sd->bl, output, strlen(output), DUEL_WOS);
+ //std::lock_guard<std::recursive_mutex> _(duel_list_mutex);
+ if ( !duel_exist( did ) )
+ return false;
target_sd->duel_invite = did;
duel_list[did].invites_count++;
+ char output[256];
+ // " -- Player %s invites %s to duel --"
+ sprintf(output, msg_txt(sd,373), sd->status.name, target_sd->status.name);
+ clif_disp_message(&sd->bl, output, strlen(output), DUEL_WOS);
// "Blue -- Player %s invites you to PVP duel (@accept/@reject) --"
sprintf(output, msg_txt(sd,374), sd->status.name);
clif_broadcast((struct block_list *)target_sd, output, strlen(output)+1, BC_BLUE, SELF);
+ return true;
}
/*
@@ -164,7 +211,7 @@ void duel_invite(const unsigned int did, struct map_session_data* sd, struct map
*/
static int duel_leave_sub(struct map_session_data* sd, va_list va)
{
- int did = va_arg(va, int);
+ size_t did = va_arg(va, size_t);
if (sd->duel_invite == did)
sd->duel_invite = 0;
return 0;
@@ -175,24 +222,27 @@ static int duel_leave_sub(struct map_session_data* sd, va_list va)
* @did = duel id
* @sd = leaving player
*/
-void duel_leave(const unsigned int did, struct map_session_data* sd)
+bool duel_leave(const size_t did, struct map_session_data* sd)
{
- char output[256];
-
- // " <- Player %s has left duel --"
- sprintf(output, msg_txt(sd,375), sd->status.name);
- clif_disp_message(&sd->bl, output, strlen(output), DUEL_WOS);
+ //std::lock_guard<std::recursive_mutex> _(duel_list_mutex);
+ if ( !duel_exist( did ) )
+ return false;
duel_list[did].members_count--;
if(duel_list[did].members_count == 0) {
map_foreachpc(duel_leave_sub, did);
- duel_count--;
+ duel_list.erase( did );
}
-
duel_set(0, sd);
duel_savetime(sd);
+
+ char output[256];
+ // " <- Player %s has left duel --"
+ sprintf(output, msg_txt(sd,375), sd->status.name);
+ clif_disp_message(&sd->bl, output, strlen(output), DUEL_WOS);
clif_map_property(&sd->bl, MAPPROPERTY_NOTHING, SELF);
+ return true;
}
/*
@@ -200,21 +250,26 @@ void duel_leave(const unsigned int did, struct map_session_data* sd)
* @did = duel id
* @sd = player accepting duel
*/
-void duel_accept(const unsigned int did, struct map_session_data* sd)
+bool duel_accept(const size_t did, struct map_session_data* sd)
{
- char output[256];
+ { //mutex scope
+ //std::lock_guard<std::recursive_mutex> _(duel_list_mutex);
+ if ( !duel_exist( did ) )
+ return false;
- duel_list[did].members_count++;
- duel_set(sd->duel_invite, sd);
- duel_list[did].invites_count--;
+ duel_list[did].members_count++;
+ duel_list[did].invites_count--;
+ }
+ duel_set( sd->duel_invite, sd );
sd->duel_invite = 0;
+ char output[256];
// " -> Player %s has accepted duel --"
sprintf(output, msg_txt(sd,376), sd->status.name);
clif_disp_message(&sd->bl, output, strlen(output), DUEL_WOS);
-
clif_map_property(&sd->bl, MAPPROPERTY_FREEPVPZONE, SELF);
//clif_misceffect2(&sd->bl, 159);
+ return true;
}
/*
@@ -222,16 +277,22 @@ void duel_accept(const unsigned int did, struct map_session_data* sd)
* @did = duel id
* @sd = player refusing duel
*/
-void duel_reject(const unsigned int did, struct map_session_data* sd)
+bool duel_reject(const size_t did, struct map_session_data* sd)
{
- char output[256];
+ {
+ //std::lock_guard<std::recursive_mutex> _(duel_list_mutex);
+ if ( !duel_exist( did ) )
+ return false;
+
+ duel_list[did].invites_count--;
+ sd->duel_invite = 0;
+ }
+ char output[256];
// " -- Player %s has rejected duel --"
sprintf(output, msg_txt(sd,377), sd->status.name);
clif_disp_message(&sd->bl, output, strlen(output), DUEL_WOS);
-
- duel_list[did].invites_count--;
- sd->duel_invite = 0;
+ return true;
}
/*
@@ -240,11 +301,12 @@ void duel_reject(const unsigned int did, struct map_session_data* sd)
*/
void do_final_duel(void)
{
+ duel_list.clear();
}
/*
* Initialisator of duel module
*/
void do_init_duel(void) {
- memset(&duel_list[0], 0, sizeof(duel_list));
+ duel_list.clear();
}
diff --git a/src/map/duel.h b/src/map/duel.h
deleted file mode 100644
index 4bf53ab015a..00000000000
--- a/src/map/duel.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder
-
-#ifndef _DUEL_H_
-#define _DUEL_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct duel {
- int members_count;
- int invites_count;
- int max_players_limit;
-};
-
-#define MAX_DUEL 1024 //max number of duels on server
-extern struct duel duel_list[MAX_DUEL]; //list of current duel
-extern int duel_count; //current number of duel on server
-
-//Duel functions // [LuzZza]
-int duel_create(struct map_session_data* sd, const unsigned int maxpl);
-void duel_invite(const unsigned int did, struct map_session_data* sd, struct map_session_data* target_sd);
-void duel_accept(const unsigned int did, struct map_session_data* sd);
-void duel_reject(const unsigned int did, struct map_session_data* sd);
-void duel_leave(const unsigned int did, struct map_session_data* sd);
-void duel_showinfo(const unsigned int did, struct map_session_data* sd);
-int duel_checktime(struct map_session_data* sd);
-
-void do_init_duel(void);
-void do_final_duel(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _DUEL_H_ */
diff --git a/src/map/duel.hpp b/src/map/duel.hpp
new file mode 100644
index 00000000000..03ac699dfbc
--- /dev/null
+++ b/src/map/duel.hpp
@@ -0,0 +1,34 @@
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+#pragma once
+#ifndef _DUEL_HPP_
+#define _DUEL_HPP_
+
+#include "../common/cbasetypes.h"
+
+struct duel {
+ int members_count;
+ int invites_count;
+ int max_players_limit;
+};
+
+duel& duel_get_duelid( size_t did );
+bool duel_exist( size_t did );
+size_t duel_counttotal();
+size_t duel_countactives();
+
+//Duel functions // [LuzZza]
+size_t duel_create(struct map_session_data* sd, const unsigned int maxpl);
+bool duel_invite(const size_t did, struct map_session_data* sd, struct map_session_data* target_sd);
+bool duel_accept(const size_t did, struct map_session_data* sd);
+bool duel_reject(const size_t did, struct map_session_data* sd);
+bool duel_leave(const size_t did, struct map_session_data* sd);
+void duel_showinfo(const size_t did, struct map_session_data* sd);
+bool duel_checktime(struct map_session_data* sd);
+bool duel_check_player_limit( struct duel& pDuel );
+
+void do_init_duel(void);
+void do_final_duel(void);
+
+
+#endif /* _DUEL_HPP_ */
diff --git a/src/map/elemental.c b/src/map/elemental.cpp
similarity index 98%
rename from src/map/elemental.c
rename to src/map/elemental.cpp
index 9add3f9b221..203c5d49eda 100644
--- a/src/map/elemental.c
+++ b/src/map/elemental.cpp
@@ -1,6 +1,13 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "elemental.hpp"
+
+#include <stdlib.h>
+#include <math.h>
+#include <ctgmath> //floor
+#include <cstring>
+
#include "../common/cbasetypes.h"
#include "../common/malloc.h"
#include "../common/timer.h"
@@ -11,17 +18,15 @@
#include "../common/strlib.h"
#include "../common/utils.h"
-#include "log.h"
-#include "clif.h"
-#include "intif.h"
-#include "itemdb.h"
-#include "pc.h"
-#include "party.h"
-#include "trade.h"
-#include "elemental.h"
-
-#include <stdlib.h>
-#include <math.h>
+#include "log.hpp"
+#include "clif.hpp"
+#include "intif.hpp"
+#include "itemdb.hpp"
+#include "pc.hpp"
+#include "party.hpp"
+#include "trade.hpp"
+#include "npc.hpp"
+#include "battle.hpp"
struct s_elemental_db elemental_db[MAX_ELEMENTAL_CLASS]; // Elemental Database
static uint16 elemental_count;
@@ -81,7 +86,7 @@ int elemental_create(struct map_session_data *sd, int class_, unsigned int lifet
//Caster's MDEF + (Caster's INT / (5 - Elemental Summon Skill Level)
ele.mdef = sd->battle_status.mdef + sd->battle_status.int_ / (5-i);
//Caster's FLEE + (Caster's Base Level / (5 - Elemental Summon Skill Level)
- ele.flee = sd->status.base_level / (5-i);
+ ele.flee = sd->battle_status.flee + sd->status.base_level / (5-i);
//per individual bonuses
switch(db->class_){
@@ -306,7 +311,7 @@ int elemental_clean_single_effect(struct elemental_data *ed, uint16 skill_id) {
case SC_CIRCLE_OF_FIRE_OPTION:
case SC_TIDAL_WEAPON_OPTION:
if( bl ) status_change_end(bl,type,INVALID_TIMER); // Master
- status_change_end(&ed->bl,type-1,INVALID_TIMER); // Elemental Spirit
+ status_change_end(&ed->bl,static_cast<sc_type>(type-1),INVALID_TIMER); // Elemental Spirit
break;
case SC_ZEPHYR:
if( bl ) status_change_end(bl,type,INVALID_TIMER);
@@ -823,7 +828,7 @@ void read_elementaldb(void) {
elemental_count = 0;
memset(elemental_db, 0, sizeof(elemental_db));
for(i = 0; i<ARRAYLENGTH(filename); i++){
- sv_readdb(db_path, filename[i], ',', 26, 26, -1, &read_elementaldb_sub, i);
+ sv_readdb(db_path, filename[i], ',', 26, 26, -1, &read_elementaldb_sub, i > 0);
}
}
@@ -871,7 +876,7 @@ void read_elemental_skilldb(void) {
const char *filename[] = { "elemental_skill_db.txt", DBIMPORT"/elemental_skill_db.txt" };
uint8 i;
for(i = 0; i<ARRAYLENGTH(filename); i++){
- sv_readdb(db_path, filename[i], ',', 4, 4, -1, &read_elemental_skilldb_sub, i);
+ sv_readdb(db_path, filename[i], ',', 4, 4, -1, &read_elemental_skilldb_sub, i > 0);
}
}
diff --git a/src/map/elemental.h b/src/map/elemental.hpp
similarity index 91%
rename from src/map/elemental.h
rename to src/map/elemental.hpp
index 7cdeeaec159..6c4df795ccf 100644
--- a/src/map/elemental.h
+++ b/src/map/elemental.hpp
@@ -1,15 +1,13 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _ELEMENTAL_H_
-#define _ELEMENTAL_H_
+#ifndef _ELEMENTAL_HPP_
+#define _ELEMENTAL_HPP_
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "../common/mmo.h"
-#include "status.h" // struct status_data, struct status_change
-#include "unit.h" // struct unit_data
+#include "status.hpp" // struct status_data, struct status_change
+#include "unit.hpp" // struct unit_data
#define MIN_ELETHINKTIME 100
#define MIN_ELEDISTANCE 2
@@ -20,14 +18,14 @@ extern "C" {
#define EL_MODE_PASSIVE MD_CANMOVE
///Enum of Elemental Skill Mode
-enum elemental_skillmode {
+enum elemental_skillmode : uint8 {
EL_SKILLMODE_PASSIVE = 0x1,
EL_SKILLMODE_ASSIST = 0x2,
EL_SKILLMODE_AGGRESSIVE = 0x4,
};
///Enum of Elemental ID
-enum elemental_elementalid {
+enum elemental_elementalid : uint16 {
ELEMENTALID_AGNI_S = 2114,
ELEMENTALID_AGNI_M,
ELEMENTALID_AGNI_L,
@@ -115,8 +113,4 @@ void reload_elemental_skilldb(void);
void do_init_elemental(void);
void do_final_elemental(void);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _ELEMENTAL_H_ */
+#endif /* _ELEMENTAL_HPP_ */
diff --git a/src/map/guild.c b/src/map/guild.cpp
similarity index 98%
rename from src/map/guild.c
rename to src/map/guild.cpp
index 2efc3e60a26..cd85673b163 100644
--- a/src/map/guild.c
+++ b/src/map/guild.cpp
@@ -1,6 +1,10 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "guild.hpp"
+
+#include <stdlib.h>
+
#include "../common/cbasetypes.h"
#include "../common/timer.h"
#include "../common/nullpo.h"
@@ -11,20 +15,18 @@
#include "../common/strlib.h"
#include "../common/utils.h"
-#include "map.h"
-#include "guild.h"
-#include "storage.h"
-#include "battle.h"
-#include "npc.h"
-#include "pc.h"
-#include "instance.h"
-#include "intif.h"
-#include "channel.h"
-#include "log.h"
-#include "trade.h"
-
-#include <stdlib.h>
-
+#include "map.hpp"
+#include "storage.hpp"
+#include "battle.hpp"
+#include "npc.hpp"
+#include "pc.hpp"
+#include "instance.hpp"
+#include "intif.hpp"
+#include "channel.hpp"
+#include "log.hpp"
+#include "trade.hpp"
+#include "clif.hpp"
+#include "mob.hpp"
static DBMap* guild_db; // int guild_id -> struct guild*
static DBMap* castle_db; // int castle_id -> struct guild_castle*
@@ -49,7 +51,7 @@ struct guild_expcache {
static struct eri *expcache_ers; //For handling of guild exp payment.
#define MAX_GUILD_SKILL_REQUIRE 5
-struct{
+struct s_guild_skill_tree {
int id;
int max;
struct{
@@ -163,12 +165,16 @@ int guild_check_skill_require(struct guild *g,int id) {
static bool guild_read_castledb(char* str[], int columns, int current) {// <castle id>,<map name>,<castle name>,<castle event>[,<reserved/unused switch flag>]
struct guild_castle *gc;
int mapindex = mapindex_name2id(str[1]);
-
+ const int castle_id = atoi(str[0]);
+
if (map_mapindex2mapid(mapindex) < 0) // Map not found or on another map-server
return false;
- CREATE(gc, struct guild_castle, 1);
- gc->castle_id = atoi(str[0]);
+ if ((gc = static_cast<guild_castle*>(idb_get(castle_db, castle_id))) == nullptr) {
+ CREATE(gc, struct guild_castle, 1);
+ }
+
+ gc->castle_id = castle_id;
gc->mapindex = mapindex;
safestrncpy(gc->castle_name, trim(str[2]), sizeof(gc->castle_name));
safestrncpy(gc->castle_event, trim(str[3]), sizeof(gc->castle_event));
@@ -1434,6 +1440,12 @@ int guild_reqalliance(struct map_session_data *sd,struct map_session_data *tsd)
if(tsd==NULL || tsd->status.guild_id<=0)
return 0;
+ // Check, is tsd guild master, if not - cancel alliance. [f0und3r]
+ if (battle_config.guild_alliance_onlygm && !tsd->state.gmaster_flag) {
+ clif_guild_allianceack(sd, 5);
+ return 0;
+ }
+
g[0]=sd->guild;
g[1]=tsd->guild;
@@ -1934,7 +1946,7 @@ void guild_castle_map_init(void) {
}
dbi_destroy(iter);
if (intif_guild_castle_dataload(num, castle_ids))
- ShowStatus("Requested '"CL_WHITE"%d"CL_RESET"' guild castles from char-server...\n", num);
+ ShowStatus("Requested '" CL_WHITE "%d" CL_RESET "' guild castles from char-server...\n", num);
aFree(castle_ids);
}
}
@@ -2081,7 +2093,7 @@ int guild_castledataloadack(int len, struct guild_castle *gc) {
}
}
}
- ShowStatus("Received '"CL_WHITE"%d"CL_RESET"' guild castles from char-server.\n", n);
+ ShowStatus("Received '" CL_WHITE "%d" CL_RESET "' guild castles from char-server.\n", n);
return 0;
}
@@ -2289,7 +2301,7 @@ void guild_flags_clear(void) {
void do_init_guild(void) {
const char* dbsubpath[] = {
"",
- "/"DBIMPORT,
+ "/" DBIMPORT,
};
int i;
@@ -2297,7 +2309,7 @@ void do_init_guild(void) {
castle_db = idb_alloc(DB_OPT_BASE);
guild_expcache_db = idb_alloc(DB_OPT_BASE);
guild_infoevent_db = idb_alloc(DB_OPT_BASE);
- expcache_ers = ers_new(sizeof(struct guild_expcache),"guild.c::expcache_ers",ERS_OPT_NONE);
+ expcache_ers = ers_new(sizeof(struct guild_expcache),"guild.cpp::expcache_ers",ERS_OPT_NONE);
guild_flags_count = 0;
@@ -2308,8 +2320,8 @@ void do_init_guild(void) {
char* dbsubpath1 = (char*)aMalloc(n1+1);
safesnprintf(dbsubpath1,n1+1,"%s%s",db_path,dbsubpath[i]);
- sv_readdb(dbsubpath1, "castle_db.txt", ',', 4, 4, -1, &guild_read_castledb, i);
- sv_readdb(dbsubpath1, "guild_skill_tree.txt", ',', 2+MAX_GUILD_SKILL_REQUIRE*2, 2+MAX_GUILD_SKILL_REQUIRE*2, -1, &guild_read_guildskill_tree_db, i); //guild skill tree [Komurka]
+ sv_readdb(dbsubpath1, "castle_db.txt", ',', 4, 4, -1, &guild_read_castledb, i > 0);
+ sv_readdb(dbsubpath1, "guild_skill_tree.txt", ',', 2+MAX_GUILD_SKILL_REQUIRE*2, 2+MAX_GUILD_SKILL_REQUIRE*2, -1, &guild_read_guildskill_tree_db, i > 0); //guild skill tree [Komurka]
aFree(dbsubpath1);
}
diff --git a/src/map/guild.h b/src/map/guild.hpp
similarity index 96%
rename from src/map/guild.h
rename to src/map/guild.hpp
index 95378778adf..df3303ee505 100644
--- a/src/map/guild.h
+++ b/src/map/guild.hpp
@@ -1,19 +1,18 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _GUILD_H_
-#define _GUILD_H_
+#ifndef _GUILD_HPP_
+#define _GUILD_HPP_
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "../common/cbasetypes.h"
+#include "../common/mmo.h"
+
+#include "map.hpp" // NAME_LENGTH
-//#include "../common/mmo.h"
struct guild;
struct guild_member;
struct guild_position;
struct guild_castle;
-#include "map.h" // NAME_LENGTH
struct map_session_data;
struct mob_data;
@@ -119,8 +118,4 @@ void guild_retrieveitembound(uint32 char_id,uint32 account_id,int guild_id);
void do_final_guild(void);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _GUILD_H_ */
+#endif /* _GUILD_HPP_ */
diff --git a/src/map/homunculus.c b/src/map/homunculus.cpp
similarity index 97%
rename from src/map/homunculus.c
rename to src/map/homunculus.cpp
index 0157916dfbc..f093d42ebd2 100644
--- a/src/map/homunculus.c
+++ b/src/map/homunculus.cpp
@@ -1,6 +1,10 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "homunculus.hpp"
+
+#include <stdlib.h>
+
#include "../common/cbasetypes.h"
#include "../common/malloc.h"
#include "../common/timer.h"
@@ -11,17 +15,15 @@
#include "../common/strlib.h"
#include "../common/utils.h"
-#include "log.h"
-#include "clif.h"
-#include "intif.h"
-#include "itemdb.h"
-#include "pc.h"
-#include "party.h"
-#include "trade.h"
-
-#include "homunculus.h"
-
-#include <stdlib.h>
+#include "log.hpp"
+#include "clif.hpp"
+#include "intif.hpp"
+#include "itemdb.hpp"
+#include "pc.hpp"
+#include "party.hpp"
+#include "trade.hpp"
+#include "npc.hpp"
+#include "battle.hpp"
struct s_homunculus_db homunculus_db[MAX_HOMUNCULUS_CLASS]; //[orn]
struct homun_skill_tree_entry hskill_tree[MAX_HOMUNCULUS_CLASS][MAX_HOM_SKILL_TREE];
@@ -198,7 +200,7 @@ int hom_dead(struct homun_data *hd)
//There's no intimacy penalties on death (from Tharis)
struct map_session_data *sd = hd->master;
- clif_emotion(&hd->bl, E_WAH);
+ clif_emotion(&hd->bl, ET_KEK);
//Delete timers when dead.
hom_hungry_timer_delete(hd);
@@ -207,7 +209,7 @@ int hom_dead(struct homun_data *hd)
if (!sd) //unit remove map will invoke unit free
return 3;
- clif_emotion(&sd->bl, E_SOB);
+ clif_emotion(&sd->bl, ET_CRY);
//Remove from map (if it has no intimacy, it is auto-removed from memory)
return 3;
}
@@ -562,7 +564,7 @@ int hom_evolution(struct homun_data *hd)
nullpo_ret(hd);
if(!hd->homunculusDB->evo_class || hd->homunculus.class_ == hd->homunculusDB->evo_class) {
- clif_emotion(&hd->bl, E_SWT);
+ clif_emotion(&hd->bl, ET_SWEAT);
return 0 ;
}
sd = hd->master;
@@ -593,8 +595,8 @@ int hom_evolution(struct homun_data *hd)
return 0;
clif_spawn(&hd->bl);
- clif_emotion(&sd->bl, E_NO1);
- clif_specialeffect(&hd->bl,568,AREA);
+ clif_emotion(&sd->bl, ET_BEST);
+ clif_specialeffect(&hd->bl,EF_HO_UP,AREA);
//status_Calc flag&1 will make current HP/SP be reloaded from hom structure
hom->hp = hd->battle_status.hp;
@@ -624,7 +626,7 @@ int hom_mutate(struct homun_data *hd, int homun_id)
m_id = hom_class2mapid(homun_id);
if( m_class == -1 || m_id == -1 || !(m_class&HOM_EVO) || !(m_id&HOM_S) ) {
- clif_emotion(&hd->bl, E_SWT);
+ clif_emotion(&hd->bl, ET_SWEAT);
return 0;
}
@@ -644,8 +646,8 @@ int hom_mutate(struct homun_data *hd, int homun_id)
return 0;
clif_spawn(&hd->bl);
- clif_emotion(&sd->bl, E_NO1);
- clif_specialeffect(&hd->bl,568,AREA);
+ clif_emotion(&sd->bl, ET_BEST);
+ clif_specialeffect(&hd->bl,EF_HO_UP,AREA);
//status_Calc flag&1 will make current HP/SP be reloaded from hom structure
hom = &hd->homunculus;
@@ -705,7 +707,7 @@ void hom_gainexp(struct homun_data *hd,int exp)
if( hd->exp_next == 0 )
hd->homunculus.exp = 0 ;
- clif_specialeffect(&hd->bl,568,AREA);
+ clif_specialeffect(&hd->bl,EF_HO_UP,AREA);
status_calc_homunculus(hd, SCO_NONE);
status_percent_heal(&hd->bl, 100, 100);
}
@@ -826,19 +828,19 @@ int hom_food(struct map_session_data *sd, struct homun_data *hd)
if ( hd->homunculus.hunger >= 91 ) {
hom_decrease_intimacy(hd, 50);
- emotion = E_WAH;
+ emotion = ET_KEK;
} else if ( hd->homunculus.hunger >= 76 ) {
hom_decrease_intimacy(hd, 5);
- emotion = E_SWT2;
+ emotion = ET_PROFUSELY_SWEAT;
} else if ( hd->homunculus.hunger >= 26 ) {
hom_increase_intimacy(hd, 75);
- emotion = E_HO;
+ emotion = ET_DELIGHT;
} else if ( hd->homunculus.hunger >= 11 ) {
hom_increase_intimacy(hd, 100);
- emotion = E_HO;
+ emotion = ET_DELIGHT;
} else {
hom_increase_intimacy(hd, 50);
- emotion = E_HO;
+ emotion = ET_DELIGHT;
}
hd->homunculus.hunger += 10; //dunno increase value for each food
@@ -854,7 +856,7 @@ int hom_food(struct map_session_data *sd, struct homun_data *hd)
// Too much food :/
if(hd->homunculus.intimacy == 0)
- return hom_delete(sd->hd, E_OMG);
+ return hom_delete(sd->hd, ET_HUK);
return 0;
}
@@ -883,18 +885,18 @@ static int hom_hungry(int tid, unsigned int tick, int id, intptr_t data)
hd->homunculus.hunger--;
if(hd->homunculus.hunger <= 10) {
- clif_emotion(&hd->bl, E_AN);
+ clif_emotion(&hd->bl, ET_FRET);
} else if(hd->homunculus.hunger == 25) {
- clif_emotion(&hd->bl, E_HMM);
+ clif_emotion(&hd->bl, ET_SCRATCH);
} else if(hd->homunculus.hunger == 75) {
- clif_emotion(&hd->bl, E_OK);
+ clif_emotion(&hd->bl, ET_OK);
}
if (hd->homunculus.hunger < 0) {
hd->homunculus.hunger = 0;
// Delete the homunculus if intimacy <= 100
if (!hom_decrease_intimacy(hd, 100))
- return hom_delete(hd, E_OMG);
+ return hom_delete(hd, ET_HUK);
clif_send_homdata(sd,SP_INTIMATE,hd->homunculus.intimacy / 100);
}
@@ -1071,7 +1073,7 @@ bool hom_call(struct map_session_data *sd)
// If homunc not yet loaded, load it
if (!sd->hd)
- return intif_homunculus_requestload(sd->status.account_id, sd->status.hom_id);
+ return intif_homunculus_requestload(sd->status.account_id, sd->status.hom_id) > 0;
hd = sd->hd;
@@ -1335,7 +1337,7 @@ int hom_shuffle(struct homun_data *hd)
clif_homskillinfoblock(sd);
status_calc_homunculus(hd, SCO_NONE);
status_percent_heal(&hd->bl, 100, 100);
- clif_specialeffect(&hd->bl,568,AREA);
+ clif_specialeffect(&hd->bl,EF_HO_UP,AREA);
return 1;
}
@@ -1514,7 +1516,7 @@ void read_homunculusdb(void) {
homunculus_count = 0;
memset(homunculus_db,0,sizeof(homunculus_db));
for(i = 0; i<ARRAYLENGTH(filename); i++){
- sv_readdb(db_path, filename[i], ',', 50, 50, MAX_HOMUNCULUS_CLASS, &read_homunculusdb_sub, i);
+ sv_readdb(db_path, filename[i], ',', 50, 50, MAX_HOMUNCULUS_CLASS, &read_homunculusdb_sub, i > 0);
}
}
@@ -1567,7 +1569,7 @@ static void read_homunculus_skilldb(void) {
int i;
memset(hskill_tree,0,sizeof(hskill_tree));
for (i = 0; i<ARRAYLENGTH(filename); i++) {
- sv_readdb(db_path, filename[i], ',', 15, 15, -1, &read_homunculus_skilldb_sub, i);
+ sv_readdb(db_path, filename[i], ',', 15, 15, -1, &read_homunculus_skilldb_sub, i > 0);
}
}
@@ -1577,7 +1579,7 @@ static void read_homunculus_skilldb(void) {
void read_homunculus_expdb(void)
{
int i;
- char *filename[]={
+ const char *filename[]={
DBPATH"exp_homun.txt",
DBIMPORT"/exp_homun.txt"
};
@@ -1609,7 +1611,7 @@ void read_homunculus_expdb(void)
hexptbl[MAX_LEVEL - 1] = 0;
}
fclose(fp);
- ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' levels in '"CL_WHITE"%s/%s"CL_RESET"'.\n", j, db_path, filename[i]);
+ ShowStatus("Done reading '" CL_WHITE "%d" CL_RESET "' levels in '" CL_WHITE "%s/%s" CL_RESET "'.\n", j, db_path, filename[i]);
}
}
diff --git a/src/map/homunculus.h b/src/map/homunculus.hpp
similarity index 92%
rename from src/map/homunculus.h
rename to src/map/homunculus.hpp
index 55838b41fcc..44371dc0b30 100644
--- a/src/map/homunculus.h
+++ b/src/map/homunculus.hpp
@@ -1,15 +1,13 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _HOMUNCULUS_H_
-#define _HOMUNCULUS_H_
+#ifndef _HOMUNCULUS_HPP_
+#define _HOMUNCULUS_HPP_
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "../common/cbasetypes.h"
-#include "status.h" // struct status_data, struct status_change
-#include "unit.h" // struct unit_data
+#include "status.hpp" // struct status_data, struct status_change
+#include "unit.hpp" // struct unit_data
#ifdef RENEWAL
#define HOMUN_LEVEL_STATWEIGHT_VALUE 0
@@ -38,17 +36,17 @@ struct s_homunculus_db {
};
extern struct s_homunculus_db homunculus_db[MAX_HOMUNCULUS_CLASS];
-enum e_hom_search_type { HOMUNCULUS_CLASS, HOMUNCULUS_FOOD };
+enum e_hom_search_type : uint8 { HOMUNCULUS_CLASS, HOMUNCULUS_FOOD };
-enum e_hom_mode { MH_MD_FIGHTING = 1, MH_MD_GRAPPLING };
+enum e_hom_mode : uint8 { MH_MD_FIGHTING = 1, MH_MD_GRAPPLING };
-enum e_hom_state {
+enum e_hom_state : uint8 {
HOM_ST_ACTIVE = 0,
HOM_ST_REST = 1,
HOM_ST_MORPH = 2,
};
-enum {
+enum e_hom_state2 : uint8 {
SP_ACK = 0x0,
SP_INTIMATE = 0x1,
SP_HUNGRY = 0x2,
@@ -111,7 +109,7 @@ enum homun_mapid {
};
/// Homunculus type
-enum homun_type {
+enum homun_type : int8 {
HT_REG = 0x1,
HT_EVO = 0x2,
HT_S = 0x4,
@@ -119,7 +117,7 @@ enum homun_type {
};
/// Homunculus battle_config setting
-enum homun_setting {
+enum homun_setting : uint8 {
HOMSET_NO_SUPPORT_SKILL = 0x01, /// Cannot be targetted by support skills, except for their master
HOMSET_NO_INSTANT_LAND_SKILL = 0x02, /// Unit/land skill doesn't applied immediately
HOMSET_FIRST_TARGET = 0x04, /// Mobs will always go after them instead of players until attacked
@@ -130,7 +128,7 @@ enum homun_setting {
HOMSET_RESET_REUSESKILL_TELEPORTED = 0x80, /// Skill re-use delay is reset when they are warped (by skill or item) with player.
};
-enum e_homun_grade {
+enum e_homun_grade : uint8 {
HOMGRADE_HATE_WITH_PASSION = 0,
HOMGRADE_HATE,
HOMGRADE_AWKWARD,
@@ -195,8 +193,4 @@ short hom_skill_get_index(uint16 skill_id);
void do_final_homunculus(void);
void do_init_homunculus(void);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _HOMUNCULUS_H_ */
+#endif /* _HOMUNCULUS_HPP_ */
diff --git a/src/map/instance.c b/src/map/instance.cpp
similarity index 98%
rename from src/map/instance.c
rename to src/map/instance.cpp
index 1a1c0abe989..3504f0cbbbf 100644
--- a/src/map/instance.c
+++ b/src/map/instance.cpp
@@ -1,6 +1,10 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "instance.hpp"
+
+#include <stdlib.h>
+
#include "../common/cbasetypes.h"
#include "../common/socket.h"
#include "../common/timer.h"
@@ -9,16 +13,15 @@
#include "../common/strlib.h"
#include "../common/db.h"
#include "../common/malloc.h"
+#include "../common/ers.h" // ers_destroy
-#include "clif.h"
-#include "guild.h"
-#include "instance.h"
-#include "map.h"
-#include "npc.h"
-#include "party.h"
-#include "pc.h"
-
-#include <stdlib.h>
+#include "clan.hpp"
+#include "clif.hpp"
+#include "guild.hpp"
+#include "map.hpp"
+#include "npc.hpp"
+#include "party.hpp"
+#include "pc.hpp"
#define INSTANCE_INTERVAL 60000 // Interval used to check when an instance is to be destroyed (ms)
@@ -924,6 +927,7 @@ static bool instance_readdb_sub(char* str[], int columns, int current)
aFree(db->maplist);
db->maplist = NULL;
}
+ db->maplist_count = 0;
}
StringBuf_AppendStr(db->name, str[1]);
@@ -1038,7 +1042,7 @@ void instance_readdb(void) {
int f;
for (f = 0; f<ARRAYLENGTH(filename); f++) {
- sv_readdb(db_path, filename[f], ',', 7, 7+MAX_MAP_PER_INSTANCE, -1, &instance_readdb_sub, f);
+ sv_readdb(db_path, filename[f], ',', 7, 7+MAX_MAP_PER_INSTANCE, -1, &instance_readdb_sub, f > 0);
}
}
@@ -1124,14 +1128,14 @@ void do_reload_instance(void)
void do_init_instance(void) {
InstanceDB = uidb_alloc(DB_OPT_BASE);
- InstanceNameDB = strdb_alloc(DB_OPT_DUP_KEY|DB_OPT_RELEASE_DATA,0);
+ InstanceNameDB = strdb_alloc((DBOptions)(DB_OPT_DUP_KEY|DB_OPT_RELEASE_DATA),0);
instance_readdb();
memset(instance_data, 0, sizeof(instance_data));
memset(&instance_wait, 0, sizeof(instance_wait));
instance_wait.timer = -1;
- instance_maps_ers = ers_new(sizeof(struct s_instance_map),"instance.c::instance_maps_ers", ERS_OPT_NONE);
+ instance_maps_ers = ers_new(sizeof(struct s_instance_map),"instance.cpp::instance_maps_ers", ERS_OPT_NONE);
add_timer_func_list(instance_delete_timer,"instance_delete_timer");
add_timer_func_list(instance_subscription_timer,"instance_subscription_timer");
diff --git a/src/map/instance.h b/src/map/instance.hpp
similarity index 92%
rename from src/map/instance.h
rename to src/map/instance.hpp
index ad120f9eb7a..f9d65a4f23c 100644
--- a/src/map/instance.h
+++ b/src/map/instance.hpp
@@ -1,16 +1,16 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _INSTANCE_H_
-#define _INSTANCE_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef _INSTANCE_HPP_
+#define _INSTANCE_HPP_
+#include "../common/cbasetypes.h"
#include "../common/mmo.h" // struct point
-#include "script.h" // struct reg_db
+#include "../common/strlib.h"
+#include "script.hpp" // struct reg_db
+
+enum send_target : uint8;
struct block_list;
#define MAX_INSTANCE_DATA 300 // Essentially how many instances we can create, but instance creation is primarily decided by MAX_MAP_PER_SERVER
@@ -18,11 +18,11 @@ struct block_list;
#define INSTANCE_NAME_LENGTH (60+1)
-typedef enum instance_state {
+enum instance_state {
INSTANCE_FREE,
INSTANCE_IDLE,
INSTANCE_BUSY
-} instance_state;
+};
enum instance_mode {
IM_NONE,
@@ -64,7 +64,7 @@ struct instance_db {
StringBuf *name; ///< Instance name
unsigned int limit, ///< Duration limit
timeout; ///< Timeout limit
- struct {
+ struct s_MapInfo {
StringBuf *mapname; ///< Mapname, the limit should be MAP_NAME_LENGTH_EXT
short x, y; ///< Map coordinates
} enter;
@@ -99,8 +99,4 @@ void do_final_instance(void);
#error Too many maps per instance defined! Please adjust MAX_MAP_PER_INSTANCE to a lower value.
#endif
-#ifdef __cplusplus
-}
-#endif
-
-#endif
+#endif /* _INSTANCE_HPP_ */
diff --git a/src/map/intif.c b/src/map/intif.cpp
similarity index 90%
rename from src/map/intif.c
rename to src/map/intif.cpp
index ee6c524cff8..4da47d8a675 100644
--- a/src/map/intif.c
+++ b/src/map/intif.cpp
@@ -1,30 +1,36 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "intif.hpp"
+
+#include <stdlib.h>
+
#include "../common/showmsg.h"
#include "../common/socket.h"
#include "../common/nullpo.h"
#include "../common/malloc.h"
#include "../common/strlib.h"
#include "../common/mmo.h"
-#include "map.h"
-#include "battle.h"
-#include "chrif.h"
-#include "clan.h"
-#include "clif.h"
-#include "pc.h"
-#include "intif.h"
-#include "storage.h"
-#include "party.h"
-#include "pet.h"
-#include "mercenary.h"
-#include "homunculus.h"
-#include "elemental.h"
-#include "mail.h"
-#include "quest.h"
-#include "status.h"
-
-#include <stdlib.h>
+#include "../common/timer.h"
+
+#include "map.hpp"
+#include "battle.hpp"
+#include "chrif.hpp"
+#include "clan.hpp"
+#include "guild.hpp"
+#include "clif.hpp"
+#include "pc.hpp"
+#include "storage.hpp"
+#include "party.hpp"
+#include "pet.hpp"
+#include "mercenary.hpp"
+#include "homunculus.hpp"
+#include "elemental.hpp"
+#include "mail.hpp"
+#include "quest.hpp"
+#include "status.hpp"
+#include "achievement.hpp"
+#include "log.hpp"
/// Received packet Lengths from inter-server
static const int packet_len_table[] = {
@@ -34,7 +40,7 @@ static const int packet_len_table[] = {
10,-1,15, 0, 79,19, 7,-1, 0,-1,-1,-1, 14,67,186,-1, //0x3830
-1, 0, 0,18, 0, 0, 0, 0, -1,75,-1,11, 11,-1, 38, 0, //0x3840
-1,-1, 7, 7, 7,11, 8,-1, 0, 0, 0, 0, 0, 0, 0, 0, //0x3850 Auctions [Zephyrus] itembound[Akinari]
- -1, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //0x3860 Quests [Kevin] [Inkfish]
+ -1, 7,-1, 7, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //0x3860 Quests [Kevin] [Inkfish] / Achievements [Aleos]
-1, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 3, 3, 0, //0x3870 Mercenaries [Zephyrus] / Elemental [pakpil]
12,-1, 7, 3, 0, 0, 0, 0, 0, 0,-1, 9, -1, 0, 0, 0, //0x3880 Pet System, Storages
-1,-1, 7, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //0x3890 Homunculus [albator]
@@ -297,6 +303,8 @@ int intif_main_message(struct map_session_data* sd, const char* message)
*/
int intif_wis_message(struct map_session_data *sd, char *nick, char *mes, int mes_len)
{
+ int headersize = 8 + 2 * NAME_LENGTH;
+
nullpo_ret(sd);
if (CheckForCharServer())
return 0;
@@ -307,12 +315,13 @@ int intif_wis_message(struct map_session_data *sd, char *nick, char *mes, int me
return 0;
}
- WFIFOHEAD(inter_fd,mes_len + 52);
+ WFIFOHEAD(inter_fd,mes_len + headersize);
WFIFOW(inter_fd,0) = 0x3001;
- WFIFOW(inter_fd,2) = mes_len + 52;
- memcpy(WFIFOP(inter_fd,4), sd->status.name, NAME_LENGTH);
- memcpy(WFIFOP(inter_fd,4+NAME_LENGTH), nick, NAME_LENGTH);
- memcpy(WFIFOP(inter_fd,4+2*NAME_LENGTH), mes, mes_len);
+ WFIFOW(inter_fd,2) = mes_len + headersize;
+ WFIFOL(inter_fd,4) = pc_get_group_level(sd);
+ safestrncpy(WFIFOCP(inter_fd,8), sd->status.name, NAME_LENGTH);
+ safestrncpy(WFIFOCP(inter_fd,8+NAME_LENGTH), nick, NAME_LENGTH);
+ safestrncpy(WFIFOCP(inter_fd,8+2*NAME_LENGTH), mes, mes_len);
WFIFOSET(inter_fd, WFIFOW(inter_fd,2));
if (battle_config.etc_log)
@@ -327,7 +336,7 @@ int intif_wis_message(struct map_session_data *sd, char *nick, char *mes, int me
* @param flag : 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
* @return 0=no char-serv connected, 1=msg sent
*/
-int intif_wis_replay(int id, int flag)
+int intif_wis_reply(int id, int flag)
{
if (CheckForCharServer())
return 0;
@@ -338,7 +347,7 @@ int intif_wis_replay(int id, int flag)
WFIFOSET(inter_fd,7);
if (battle_config.etc_log)
- ShowInfo("intif_wis_replay: id: %d, flag:%d\n", id, flag);
+ ShowInfo("intif_wis_reply: id: %d, flag:%d\n", id, flag);
return 1;
}
@@ -359,9 +368,9 @@ int intif_wis_message_to_gm(char *wisp_name, int permission, char *mes)
WFIFOHEAD(inter_fd, mes_len + 8 + NAME_LENGTH);
WFIFOW(inter_fd,0) = 0x3003;
WFIFOW(inter_fd,2) = mes_len + 32;
- memcpy(WFIFOP(inter_fd,4), wisp_name, NAME_LENGTH);
+ safestrncpy(WFIFOCP(inter_fd,4), wisp_name, NAME_LENGTH);
WFIFOL(inter_fd,4+NAME_LENGTH) = permission;
- memcpy(WFIFOP(inter_fd,8+NAME_LENGTH), mes, mes_len);
+ safestrncpy(WFIFOCP(inter_fd,8+NAME_LENGTH), mes, mes_len);
WFIFOSET(inter_fd, WFIFOW(inter_fd,2));
if (battle_config.etc_log)
@@ -399,6 +408,7 @@ int intif_saveregistry(struct map_session_data *sd)
for( data = iter->first(iter,&key); iter->exists(iter); data = iter->next(iter,&key) ) {
const char *varname = NULL;
struct script_reg_state *src = NULL;
+ bool lValid = false;
if( data->type != DB_DATA_PTR ) // it's a @number
continue;
@@ -414,13 +424,17 @@ int intif_saveregistry(struct map_session_data *sd)
continue;
src->update = false;
+ lValid = script_check_RegistryVariableLength(0,varname,&len);
+ ++len;
- len = strlen(varname)+1;
-
+ if (!lValid) { //this is sql colum size, must be retrive from config
+ ShowError("intif_saveregistry: Variable name length is too long (aid: %d, cid: %d): '%s' sz=%d\n", sd->status.account_id, sd->status.char_id, varname, len);
+ continue;
+ }
WFIFOB(inter_fd, plen) = (unsigned char)len; // won't be higher; the column size is 32
plen += 1;
- safestrncpy(WFIFOCP(inter_fd,plen), varname, len);
+ safestrncpy(WFIFOCP(inter_fd,plen), varname, len); //the key
plen += len;
WFIFOL(inter_fd, plen) = script_getvaridx(key.i64);
@@ -429,13 +443,19 @@ int intif_saveregistry(struct map_session_data *sd)
if( src->type ) {
struct script_reg_str *p = (struct script_reg_str *)src;
- WFIFOB(inter_fd, plen) = p->value ? 2 : 3;
+ WFIFOB(inter_fd, plen) = p->value ? 2 : 3; //var type
plen += 1;
if( p->value ) {
- len = strlen(p->value)+1;
+ lValid = script_check_RegistryVariableLength(1,p->value,&len);
+ ++len;
+ if ( !lValid ) { // error can't be higher; the column size is 254. (nb the transmission limit with be fixed with protobuf revamp)
+ ShowDebug( "intif_saveregistry: Variable value length is too long (aid: %d, cid: %d): '%s' sz=%d to be saved with current system and will be truncated\n",sd->status.account_id, sd->status.char_id,p->value,len);
+ len = 254;
+ p->value[len - 1] = '\0'; //this is backward for old char-serv but new one doesn't need this
+ }
- WFIFOB(inter_fd, plen) = (unsigned char)len; // won't be higher; the column size is 254
+ WFIFOB(inter_fd, plen) = (uint8)len;
plen += 1;
safestrncpy(WFIFOCP(inter_fd,plen), p->value, len);
@@ -640,7 +660,7 @@ int intif_party_changeoption(int party_id,uint32 account_id,int exp,int item)
* @param char_id : cid of player to leave
* @return 0:char-serv disconected, 1=msg sent
*/
-int intif_party_leave(int party_id, uint32 account_id, uint32 char_id, char *name, enum e_party_member_withdraw type)
+int intif_party_leave(int party_id, uint32 account_id, uint32 char_id, const char *name, enum e_party_member_withdraw type)
{
if (CheckForCharServer())
return 0;
@@ -1228,22 +1248,23 @@ int intif_parse_WisMessage(int fd)
struct map_session_data* sd;
char *wisp_source;
char name[NAME_LENGTH];
- int id, i;
+ int id, i, gmlvl;
id=RFIFOL(fd,4);
+ gmlvl=RFIFOL(fd,8);
- safestrncpy(name, RFIFOCP(fd,32), NAME_LENGTH);
+ safestrncpy(name, RFIFOCP(fd,12+NAME_LENGTH), NAME_LENGTH);
sd = map_nick2sd(name,false);
if(sd == NULL || strcmp(sd->status.name, name) != 0)
{ //Not found
- intif_wis_replay(id,1);
+ intif_wis_reply(id,1);
return 0;
}
if(sd->state.ignoreAll) {
- intif_wis_replay(id, 2);
+ intif_wis_reply(id, 2);
return 0;
}
- wisp_source = RFIFOCP(fd,8); // speed up [Yor]
+ wisp_source = RFIFOCP(fd,12); // speed up [Yor]
for(i=0; i < MAX_IGNORE_LIST &&
sd->ignore[i].name[0] != '\0' &&
strcmp(sd->ignore[i].name, wisp_source) != 0
@@ -1251,12 +1272,12 @@ int intif_parse_WisMessage(int fd)
if (i < MAX_IGNORE_LIST && sd->ignore[i].name[0] != '\0')
{ //Ignored
- intif_wis_replay(id, 2);
+ intif_wis_reply(id, 2);
return 0;
}
//Success to send whisper.
- clif_wis_message(sd->fd, wisp_source, RFIFOCP(fd,56),RFIFOW(fd,2)-56);
- intif_wis_replay(id,0); // success
+ clif_wis_message(sd, wisp_source, RFIFOCP(fd,12+2*NAME_LENGTH),RFIFOW(fd,2)-12+2*NAME_LENGTH, gmlvl);
+ intif_wis_reply(id,0); // success
return 1;
}
@@ -1296,7 +1317,7 @@ static int mapif_parse_WisToGM_sub(struct map_session_data* sd,va_list va)
wisp_name = va_arg(va, char*);
message = va_arg(va, char*);
len = va_arg(va, int);
- clif_wis_message(sd->fd, wisp_name, message, len);
+ clif_wis_message(sd, wisp_name, message, len,0);
return 1;
}
@@ -1317,8 +1338,8 @@ int mapif_parse_WisToGM(int fd)
mes_len = RFIFOW(fd,2) - 8+NAME_LENGTH;
message = (char *) aMalloc(mes_len+1);
- permission = RFIFOL(fd,4+NAME_LENGTH);
safestrncpy(Wisp_name, RFIFOCP(fd,4), NAME_LENGTH);
+ permission = RFIFOL(fd, 4 + NAME_LENGTH);
safestrncpy(message, RFIFOCP(fd,8+NAME_LENGTH), mes_len+1);
// information is sent to all online GM
map_foreachpc(mapif_parse_WisToGM_sub, permission, Wisp_name, message, mes_len);
@@ -1369,7 +1390,7 @@ void intif_parse_Registers(int fd)
}
// have it not complain about insertion of vars before loading, and not set those vars as new or modified
- reg_load = true;
+ pc_set_reg_load(true);
if( RFIFOW(fd, 14) ) {
char key[32];
@@ -1419,7 +1440,7 @@ void intif_parse_Registers(int fd)
}
}
- reg_load = false;
+ pc_set_reg_load(false);
if (flag && sd->vars_received&PRL_ACCG && sd->vars_received&PRL_ACCL && sd->vars_received&PRL_CHAR)
pc_reg_received(sd); //Received all registry values, execute init scripts and what-not. [Skotlex]
@@ -2076,6 +2097,163 @@ int intif_quest_save(struct map_session_data *sd)
return 1;
}
+/*==========================================
+ * Achievement System
+ *------------------------------------------*/
+
+/**
+ * Requests a character's achievement log entries to the inter server.
+ * @param char_id: Character ID
+ */
+void intif_request_achievements(uint32 char_id)
+{
+ if (CheckForCharServer())
+ return;
+
+ WFIFOHEAD(inter_fd, 6);
+ WFIFOW(inter_fd, 0) = 0x3062;
+ WFIFOL(inter_fd, 2) = char_id;
+ WFIFOSET(inter_fd, 6);
+}
+
+/**
+ * Receive a character's achievements
+ * @param fd: char-serv link
+ */
+void intif_parse_achievements(int fd)
+{
+ uint32 char_id = RFIFOL(fd, 4), num_received = (RFIFOW(fd, 2) - 8) / sizeof(struct achievement);
+ struct map_session_data *sd = map_charid2sd(char_id);
+
+ if (!sd) // User not online anymore
+ return;
+
+ if (num_received == 0) {
+ if (sd->achievement_data.achievements) {
+ aFree(sd->achievement_data.achievements);
+ sd->achievement_data.achievements = NULL;
+ sd->achievement_data.incompleteCount = 0;
+ sd->achievement_data.count = 0;
+ }
+ } else {
+ struct achievement *received = (struct achievement *)RFIFOP(fd, 8);
+ int i, k = num_received;
+
+ if (sd->achievement_data.achievements)
+ RECREATE(sd->achievement_data.achievements, struct achievement, num_received);
+ else
+ CREATE(sd->achievement_data.achievements, struct achievement, num_received);
+
+ for (i = 0; i < num_received; i++) {
+
+ if (!achievement_exists(received[i].achievement_id)) {
+ ShowError("intif_parse_achievementlog: Achievement %d not found in DB.\n", received[i].achievement_id);
+ continue;
+ }
+
+ auto &adb = achievement_get(received[i].achievement_id);
+
+ received[i].score = adb->score;
+
+ if (received[i].completed == 0) // Insert at the beginning
+ memcpy(&sd->achievement_data.achievements[sd->achievement_data.incompleteCount++], &received[i], sizeof(struct achievement));
+ else // Insert at the end
+ memcpy(&sd->achievement_data.achievements[--k], &received[i], sizeof(struct achievement));
+ sd->achievement_data.count++;
+ }
+ if (sd->achievement_data.incompleteCount < k) {
+ // sd->achievement_data.incompleteCount and k didn't meet in the middle: some entries were skipped
+ if (k < num_received) // Move the entries at the end to fill the gap
+ memmove(&sd->achievement_data.achievements[k], &sd->achievement_data.achievements[sd->achievement_data.incompleteCount], sizeof(struct achievement) * (num_received - k));
+ sd->achievement_data.achievements = (struct achievement *)aRealloc(sd->achievement_data.achievements, sizeof(struct achievement) * sd->achievement_data.count);
+ }
+ achievement_level(sd, false); // Calculate level info but don't give any AG_GOAL_ACHIEVE achievements
+ achievement_get_titles(sd->status.char_id); // Populate the title list for completed achievements
+ clif_achievement_update(sd, NULL, 0);
+ clif_achievement_list_all(sd);
+ }
+}
+
+/**
+ * Parses the achievement log save ack for a character from the inter server.
+ * Received in reply to the requests made by intif_achievement_save.
+ * @see intif_parse
+ * @param fd : char-serv link
+ */
+void intif_parse_achievementsave(int fd)
+{
+ int cid = RFIFOL(fd, 2);
+ struct map_session_data *sd = map_charid2sd(cid);
+
+ if (!sd) // User not online anymore
+ return;
+
+ if (!RFIFOB(fd, 6))
+ ShowError("intif_parse_achievementsave: Failed to save achievement(s) for character %s (%d)!\n", sd->status.name, cid);
+}
+
+/**
+ * Requests to the inter server to save a character's achievement log entries.
+ * @param sd: Character's data
+ * @return 0 in case of success, nonzero otherwise
+ */
+int intif_achievement_save(struct map_session_data *sd)
+{
+ int len = sizeof(struct achievement) * sd->achievement_data.count + 8;
+
+ if (CheckForCharServer())
+ return 0;
+
+ WFIFOHEAD(inter_fd, len);
+ WFIFOW(inter_fd, 0) = 0x3063;
+ WFIFOW(inter_fd, 2) = len;
+ WFIFOL(inter_fd, 4) = sd->status.char_id;
+ if (sd->achievement_data.count)
+ memcpy(WFIFOP(inter_fd, 8), sd->achievement_data.achievements, sizeof(struct achievement) * sd->achievement_data.count);
+ WFIFOSET(inter_fd, len);
+
+ sd->achievement_data.save = false;
+
+ return 1;
+}
+
+/**
+ * Parses the reply of the reward claiming for a achievement from the inter server.
+ * @see intif_parse
+ * @param fd : char-serv link
+ */
+void intif_parse_achievementreward(int fd){
+ struct map_session_data *sd = map_charid2sd(RFIFOL(fd,2));
+
+ // User not online anymore
+ if( !sd ){
+ return;
+ }
+
+ achievement_get_reward(sd, RFIFOL(fd, 6), RFIFOL(fd, 10));
+}
+
+/**
+ * Request the achievement rewards from the inter server.
+ */
+int intif_achievement_reward(struct map_session_data *sd, struct s_achievement_db *adb){
+ if( CheckForCharServer() ){
+ return 0;
+ }
+
+ WFIFOHEAD(inter_fd, 16+NAME_LENGTH+ACHIEVEMENT_NAME_LENGTH);
+ WFIFOW(inter_fd, 0) = 0x3064;
+ WFIFOL(inter_fd, 2) = sd->status.char_id;
+ WFIFOL(inter_fd, 6) = adb->achievement_id;
+ WFIFOW(inter_fd, 10) = adb->rewards.nameid;
+ WFIFOL(inter_fd, 12) = adb->rewards.amount;
+ safestrncpy(WFIFOCP(inter_fd, 16), sd->status.name, NAME_LENGTH);
+ safestrncpy(WFIFOCP(inter_fd, 16+NAME_LENGTH), adb->name.c_str(), ACHIEVEMENT_NAME_LENGTH);
+ WFIFOSET(inter_fd, 16+NAME_LENGTH+ACHIEVEMENT_NAME_LENGTH);
+
+ return 1;
+}
+
/*==========================================
* MAIL SYSTEM
* By Zephyrus
@@ -2136,7 +2314,7 @@ int intif_parse_Mail_inboxreceived(int fd)
// Refresh top right icon
clif_Mail_new(sd, 0, NULL, NULL);
#endif
- clif_Mail_refreshinbox(sd,RFIFOB(fd,9),0);
+ clif_Mail_refreshinbox(sd,static_cast<mail_inbox_type>(RFIFOB(fd,9)),0);
}else if( battle_config.mail_show_status && ( battle_config.mail_show_status == 1 || sd->mail.inbox.unread ) )
{
char output[128];
@@ -2253,8 +2431,7 @@ int intif_parse_Mail_delete(int fd)
{
uint32 char_id = RFIFOL(fd,2);
int mail_id = RFIFOL(fd,6);
- bool failed = RFIFOB(fd,10);
- enum mail_inbox_type type;
+ bool failed = RFIFOB(fd,10) > 0;
struct map_session_data *sd = map_charid2sd(char_id);
if (sd == NULL)
@@ -2269,14 +2446,14 @@ int intif_parse_Mail_delete(int fd)
ARR_FIND(0, MAIL_MAX_INBOX, i, sd->mail.inbox.msg[i].id == mail_id);
if( i < MAIL_MAX_INBOX )
{
+ enum mail_inbox_type type = sd->mail.inbox.msg[i].type;
clif_mail_delete(sd, &sd->mail.inbox.msg[i], !failed);
- type = sd->mail.inbox.msg[i].type;
memset(&sd->mail.inbox.msg[i], 0, sizeof(struct mail_message));
sd->mail.inbox.amount--;
- }
- if( sd->mail.inbox.full || sd->mail.inbox.unchecked > 0 )
- intif_Mail_requestinbox(sd->status.char_id, 1, type); // Free space is available for new mails
+ if( sd->mail.inbox.full || sd->mail.inbox.unchecked > 0 )
+ intif_Mail_requestinbox(sd->status.char_id, 1, type); // Free space is available for new mails
+ }
}
return 1;
@@ -2316,7 +2493,6 @@ int intif_parse_Mail_return(int fd)
struct map_session_data *sd = map_charid2sd(RFIFOL(fd,2));
int mail_id = RFIFOL(fd,6);
short fail = RFIFOB(fd,10);
- enum mail_inbox_type type;
if( sd == NULL )
{
@@ -2330,13 +2506,13 @@ int intif_parse_Mail_return(int fd)
ARR_FIND(0, MAIL_MAX_INBOX, i, sd->mail.inbox.msg[i].id == mail_id);
if( i < MAIL_MAX_INBOX )
{
- type = sd->mail.inbox.msg[i].type;
+ enum mail_inbox_type type = sd->mail.inbox.msg[i].type;
memset(&sd->mail.inbox.msg[i], 0, sizeof(struct mail_message));
sd->mail.inbox.amount--;
- }
- if( sd->mail.inbox.full )
- intif_Mail_requestinbox(sd->status.char_id, 1, type); // Free space is available for new mails
+ if( sd->mail.inbox.full )
+ intif_Mail_requestinbox(sd->status.char_id, 1, type); // Free space is available for new mails
+ }
}
clif_Mail_return(sd->fd, mail_id, fail);
@@ -2422,7 +2598,7 @@ static void intif_parse_Mail_new(int fd)
clif_Mail_new(sd, mail_id, sender_name, title);
#if PACKETVER >= 20150513
// Make sure the window gets refreshed when its open
- intif_Mail_requestinbox(sd->status.char_id, 1, RFIFOB(fd,74));
+ intif_Mail_requestinbox(sd->status.char_id, 1, static_cast<mail_inbox_type>(RFIFOB(fd,74)));
#endif
}
@@ -2757,7 +2933,7 @@ int intif_parse_mercenary_received(int fd)
return 0;
}
- mercenary_recv_data((struct s_mercenary*)RFIFOP(fd,5), RFIFOB(fd,4));
+ mercenary_recv_data((struct s_mercenary*)RFIFOP(fd,5), RFIFOB(fd,4) > 0);
return 1;
}
@@ -2882,7 +3058,7 @@ int intif_parse_elemental_received(int fd)
return 0;
}
- elemental_data_received((struct s_elemental*)RFIFOP(fd,5), RFIFOB(fd,4));
+ elemental_data_received((struct s_elemental*)RFIFOP(fd,5), RFIFOB(fd,4) > 0);
return 1;
}
@@ -3147,7 +3323,7 @@ void intif_itembound_guild_retrieve(uint32 char_id,uint32 account_id,int guild_i
WFIFOSET(inter_fd,12);
if (gstor)
gstor->lock = true; //Lock for retrieval process
- ShowInfo("Request guild bound item(s) retrieval for CID = "CL_WHITE"%d"CL_RESET", AID = %d, Guild ID = "CL_WHITE"%d"CL_RESET".\n", char_id, account_id, guild_id);
+ ShowInfo("Request guild bound item(s) retrieval for CID = " CL_WHITE "%d" CL_RESET ", AID = %d, Guild ID = " CL_WHITE "%d" CL_RESET ".\n", char_id, account_id, guild_id);
}
/**
@@ -3187,7 +3363,7 @@ void intif_parse_itembound_store2gstorage(int fd) {
if (!storage_guild_additem2(gstor, item, item->amount))
failed++;
}
- ShowInfo("Retrieved '"CL_WHITE"%d"CL_RESET"' (failed: %d) guild bound item(s) for Guild ID = "CL_WHITE"%d"CL_RESET".\n", count, failed, guild_id);
+ ShowInfo("Retrieved '" CL_WHITE "%d" CL_RESET "' (failed: %d) guild bound item(s) for Guild ID = " CL_WHITE "%d" CL_RESET ".\n", count, failed, guild_id);
gstor->lock = false;
gstor->status = false;
}
@@ -3275,7 +3451,7 @@ static bool intif_parse_StorageReceived(int fd)
status_set_viewdata(&sd->bl, sd->status.class_);
pc_load_combo(sd);
status_calc_pc(sd, (enum e_status_calc_opt)(SCO_FIRST|SCO_FORCE));
- status_calc_weight(sd, CALCWT_ITEM|CALCWT_MAXBONUS); // Refresh weight data
+ status_calc_weight(sd, (e_status_calc_weight_opt)(CALCWT_ITEM|CALCWT_MAXBONUS)); // Refresh weight data
chrif_scdata_request(sd->status.account_id, sd->status.char_id);
break;
}
@@ -3354,18 +3530,13 @@ void intif_parse_StorageInfo_recv(int fd) {
storage_db = NULL;
for (i = 0; i < count; i++) {
- char name[NAME_LENGTH + 1];
-
- safestrncpy(name, RFIFOCP(fd, 5 + size * i), NAME_LENGTH);
- if (name[0] == '\0')
- continue;
RECREATE(storage_db, struct s_storage_table, storage_count+1);
memcpy(&storage_db[storage_count], RFIFOP(fd, 4 + size * i), size);
storage_count++;
}
if (battle_config.etc_log)
- ShowInfo("Received '"CL_WHITE"%d"CL_RESET"' storage info from inter-server.\n", storage_count);
+ ShowInfo("Received '" CL_WHITE "%d" CL_RESET "' storage info from inter-server.\n", storage_count);
}
/**
@@ -3510,7 +3681,7 @@ int intif_parse_clan_onlinecount( int fd ){
* @return
* 0 (unknow packet).
* 1 sucess (no error)
- * 2 invalid lenght of packet (not enough data yet)
+ * 2 invalid length of packet (not enough data yet)
*/
int intif_parse(int fd)
{
@@ -3601,6 +3772,11 @@ int intif_parse(int fd)
case 0x3860: intif_parse_questlog(fd); break;
case 0x3861: intif_parse_questsave(fd); break;
+ //Achievement system
+ case 0x3862: intif_parse_achievements(fd); break;
+ case 0x3863: intif_parse_achievementsave(fd); break;
+ case 0x3864: intif_parse_achievementreward(fd); break;
+
// Mercenary System
case 0x3870: intif_parse_mercenary_received(fd); break;
case 0x3871: intif_parse_mercenary_deleted(fd); break;
diff --git a/src/map/intif.h b/src/map/intif.hpp
similarity index 93%
rename from src/map/intif.h
rename to src/map/intif.hpp
index db09f1cb7c5..ab1e4c8c412 100644
--- a/src/map/intif.h
+++ b/src/map/intif.hpp
@@ -1,14 +1,12 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _INTIF_H_
-#define _INTIF_H_
+#ifndef _INTIF_HPP_
+#define _INTIF_HPP_
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "../common/cbasetypes.h"
+#include "../common/mmo.h"
-//#include "../common/mmo.h"
struct party_member;
struct guild_member;
struct guild_position;
@@ -18,6 +16,8 @@ struct s_mercenary;
struct s_elemental;
struct mail_message;
struct auction_data;
+struct s_achievement_db;
+struct map_session_data;
int intif_parse(int fd);
@@ -41,7 +41,7 @@ int intif_request_partyinfo(int party_id, uint32 char_id);
int intif_party_addmember(int party_id,struct party_member *member);
int intif_party_changeoption(int party_id, uint32 account_id, int exp, int item);
-int intif_party_leave(int party_id, uint32 account_id, uint32 char_id, char *name, enum e_party_member_withdraw type);
+int intif_party_leave(int party_id, uint32 account_id, uint32 char_id, const char *name, enum e_party_member_withdraw type);
int intif_party_changemap(struct map_session_data *sd, int online);
int intif_break_party(int party_id);
int intif_party_message(int party_id, uint32 account_id, const char *mes,int len);
@@ -116,6 +116,10 @@ int intif_clan_requestclans();
int intif_clan_message(int clan_id,uint32 account_id,const char *mes,int len);
int intif_clan_member_joined( int clan_id );
int intif_clan_member_left( int clan_id );
+// ACHIEVEMENT SYSTEM
+void intif_request_achievements(uint32 char_id);
+int intif_achievement_save(struct map_session_data *sd);
+int intif_achievement_reward(struct map_session_data *sd, struct s_achievement_db *adb);
int intif_request_accinfo(int u_fd, int aid, int group_lv, char* query, char type);
@@ -125,8 +129,4 @@ bool intif_storage_save(struct map_session_data *sd, struct s_storage *stor);
int CheckForCharServer(void);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _INTIF_H_ */
+#endif /* _INTIF_HPP_ */
diff --git a/src/map/itemdb.c b/src/map/itemdb.cpp
similarity index 94%
rename from src/map/itemdb.c
rename to src/map/itemdb.cpp
index d32dc933c59..e84738d8ed9 100644
--- a/src/map/itemdb.c
+++ b/src/map/itemdb.cpp
@@ -1,18 +1,25 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "itemdb.hpp"
+
+#include <stdlib.h>
+
#include "../common/nullpo.h"
#include "../common/malloc.h"
#include "../common/random.h"
#include "../common/showmsg.h"
#include "../common/strlib.h"
#include "../common/utils.h"
-#include "itemdb.h"
-#include "battle.h" // struct battle_config
-#include "cashshop.h"
-#include "intif.h"
-#include <stdlib.h>
+#include "battle.hpp" // struct battle_config
+#include "cashshop.hpp"
+#include "intif.hpp"
+#include "pc.hpp"
+#include "status.hpp"
+#include "clif.hpp"
+#include "log.hpp"
+#include "mob.hpp"
static DBMap *itemdb; /// Item DB
static DBMap *itemdb_combo; /// Item Combo DB
@@ -22,6 +29,8 @@ static DBMap *itemdb_randomopt_group; /// Random option group DB
struct item_data *dummy_item; /// This is the default dummy item used for non-existant items. [Skotlex]
+struct s_roulette_db rd;
+
/**
* Check if combo exists
* @param combo_id
@@ -75,11 +84,11 @@ static int itemdb_searchname_sub(DBKey key, DBData *data, va_list ap)
dst2 = va_arg(ap,struct item_data **);
//Absolute priority to Aegis code name.
- if (strcmpi(item->name,str) == 0)
+ if (dst != NULL && strcmpi(item->name, str) == 0)
*dst = item;
//Second priority to Client displayed name.
- if (strcmpi(item->jname,str) == 0)
+ if (dst2 != NULL && strcmpi(item->jname, str) == 0)
*dst2 = item;
return 0;
}
@@ -87,14 +96,24 @@ static int itemdb_searchname_sub(DBKey key, DBData *data, va_list ap)
/*==========================================
* Return item data from item name. (lookup)
* @param str Item Name
+ * @param aegis_only
* @return item data
*------------------------------------------*/
-struct item_data* itemdb_searchname(const char *str)
+static struct item_data* itemdb_searchname1(const char *str, bool aegis_only)
{
struct item_data *item = NULL, * item2 = NULL;
- itemdb->foreach(itemdb,itemdb_searchname_sub,str,&item,&item2);
- return item ? item : item2;
+ if( !aegis_only )
+ itemdb->foreach(itemdb, itemdb_searchname_sub, str, &item, &item2);
+ else
+ itemdb->foreach(itemdb, itemdb_searchname_sub, str, &item, NULL);
+
+ return ((item) ? item : item2);
+}
+
+struct item_data* itemdb_searchname(const char *str)
+{
+ return itemdb_searchname1(str, false);
}
/**
@@ -182,7 +201,7 @@ unsigned short itemdb_searchrandomid(uint16 group_id, uint8 sub_group) {
* @param group_id: The group ID of item that obtained by player
* @param *group: struct s_item_group from itemgroup_db[group_id].random[idx] or itemgroup_db[group_id].must[sub_group][idx]
*/
-static void itemdb_pc_get_itemgroup_sub(struct map_session_data *sd, struct s_item_group_entry *data) {
+static void itemdb_pc_get_itemgroup_sub(struct map_session_data *sd, bool identify, struct s_item_group_entry *data) {
uint16 i, get_amt = 0;
struct item tmp;
@@ -192,7 +211,7 @@ static void itemdb_pc_get_itemgroup_sub(struct map_session_data *sd, struct s_it
tmp.nameid = data->nameid;
tmp.bound = data->bound;
- tmp.identify = 1;
+ tmp.identify = identify ? identify : itemdb_isidentified(data->nameid);
tmp.expire_time = (data->duration) ? (unsigned int)(time(NULL) + data->duration*60) : 0;
if (data->isNamed) {
tmp.card[0] = itemdb_isequip(data->nameid) ? CARD0_FORGE : CARD0_CREATE;
@@ -226,7 +245,7 @@ static void itemdb_pc_get_itemgroup_sub(struct map_session_data *sd, struct s_it
* @param nameid: The item that trigger this item group
* @return val: 0:success, 1:no sd, 2:invalid item group
*/
-char itemdb_pc_get_itemgroup(uint16 group_id, struct map_session_data *sd) {
+char itemdb_pc_get_itemgroup(uint16 group_id, bool identify, struct map_session_data *sd) {
uint16 i = 0;
struct s_item_group_db *group;
@@ -241,7 +260,7 @@ char itemdb_pc_get_itemgroup(uint16 group_id, struct map_session_data *sd) {
if (group->must_qty) {
for (i = 0; i < group->must_qty; i++)
if (&group->must[i])
- itemdb_pc_get_itemgroup_sub(sd,&group->must[i]);
+ itemdb_pc_get_itemgroup_sub(sd, identify, &group->must[i]);
}
// Get the 'random' item each random group
@@ -252,7 +271,7 @@ char itemdb_pc_get_itemgroup(uint16 group_id, struct map_session_data *sd) {
rand = rnd()%group->random[i].data_qty;
if (!(&group->random[i].data[rand]) || !group->random[i].data[rand].nameid)
continue;
- itemdb_pc_get_itemgroup_sub(sd,&group->random[i].data[rand]);
+ itemdb_pc_get_itemgroup_sub(sd, identify, &group->random[i].data[rand]);
}
return 0;
@@ -651,11 +670,11 @@ static bool itemdb_read_group(char* str[], int columns, int current) {
}
if( columns > 3 ) entry.amount = cap_value(atoi(str[3]),1,MAX_AMOUNT);
- if( columns > 5 ) entry.isAnnounced= atoi(str[5]);
+ if( columns > 5 ) entry.isAnnounced= atoi(str[5]) > 0;
if( columns > 6 ) entry.duration = cap_value(atoi(str[6]),0,UINT16_MAX);
- if( columns > 7 ) entry.GUID = atoi(str[7]);
+ if( columns > 7 ) entry.GUID = atoi(str[7]) > 0;
if( columns > 8 ) entry.bound = cap_value(atoi(str[8]),BOUND_NONE,BOUND_MAX-1);
- if( columns > 9 ) entry.isNamed = atoi(str[9]);
+ if( columns > 9 ) entry.isNamed = atoi(str[9]) > 0;
if (!(group = (struct s_item_group_db *) uidb_get(itemdb_group, group_id))) {
CREATE(group, struct s_item_group_db, 1);
@@ -907,6 +926,7 @@ static bool itemdb_read_flag(char* fields[], int columns, int current) {
if (flag&4 && itemdb_isstackable2(id)) id->flag.guid = set ? 1 : 0;
if (flag&8) id->flag.bindOnEquip = true;
if (flag&16) id->flag.broadcast = 1;
+ if (flag&32) id->flag.delay_consume = 2;
return true;
}
@@ -1056,7 +1076,7 @@ static void itemdb_read_combos(const char* basedir, bool silent) {
}
fclose(fp);
- ShowStatus("Done reading '"CL_WHITE"%lu"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n",count,path);
+ ShowStatus("Done reading '" CL_WHITE "%lu" CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'.\n",count,path);
return;
}
@@ -1150,7 +1170,7 @@ bool itemdb_parse_roulette_db(void)
}
}
- ShowStatus("Done reading '"CL_WHITE"%lu"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", count, roulette_table);
+ ShowStatus("Done reading '" CL_WHITE "%lu" CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'.\n", count, roulette_table);
return true;
}
@@ -1244,8 +1264,14 @@ static bool itemdb_parse_dbrow(char** str, const char* source, int line, int scr
nameid = atoi(str[0]);
//ID,Name,Jname,Type,Price,Sell,Weight,ATK,DEF,Range,Slot,Job,Job Upper,Gender,Loc,wLV,eLV,refineable,View
- if (!(id = itemdb_exists(nameid)))
+ if (!(id = itemdb_exists(nameid))) {
+ // Checks if the Itemname is already taken by another id
+ if( itemdb_searchname1(str[1], true) != NULL )
+ ShowWarning("itemdb_parse_dbrow: Duplicate item name for \"%s\"\n", str[1]);
+
+ // Adds a new Item ID
id = itemdb_create_item(nameid);
+ }
safestrncpy(id->name, str[1], sizeof(id->name));
safestrncpy(id->jname, str[2], sizeof(id->jname));
@@ -1393,6 +1419,12 @@ static int itemdb_readdb(void){
continue;
memset(str, 0, sizeof(str));
+ p = strstr(line,"//");
+
+ if( p != nullptr ){
+ *p = '\0';
+ }
+
p = line;
while( ISSPACE(*p) )
++p;
@@ -1420,14 +1452,14 @@ static int itemdb_readdb(void){
ShowError("itemdb_readdb: Invalid format (Script column) in line %d of \"%s\" (item with id %d), skipping.\n", lines, path, atoi(str[0]));
continue;
}
- str[19] = p;
+ str[19] = p + 1;
p = strstr(p+1,"},");
if( p == NULL )
{
ShowError("itemdb_readdb: Invalid format (Script column) in line %d of \"%s\" (item with id %d), skipping.\n", lines, path, atoi(str[0]));
continue;
}
- p[1] = '\0';
+ *p = '\0';
p += 2;
// OnEquip_Script
@@ -1436,14 +1468,14 @@ static int itemdb_readdb(void){
ShowError("itemdb_readdb: Invalid format (OnEquip_Script column) in line %d of \"%s\" (item with id %d), skipping.\n", lines, path, atoi(str[0]));
continue;
}
- str[20] = p;
+ str[20] = p + 1;
p = strstr(p+1,"},");
if( p == NULL )
{
ShowError("itemdb_readdb: Invalid format (OnEquip_Script column) in line %d of \"%s\" (item with id %d), skipping.\n", lines, path, atoi(str[0]));
continue;
}
- p[1] = '\0';
+ *p = '\0';
p += 2;
// OnUnequip_Script (last column)
@@ -1452,9 +1484,10 @@ static int itemdb_readdb(void){
ShowError("itemdb_readdb: Invalid format (OnUnequip_Script column) in line %d of \"%s\" (item with id %d), skipping.\n", lines, path, atoi(str[0]));
continue;
}
- str[21] = p;
+ str[21] = p + 1;
+ p = &str[21][strlen(str[21]) - 2];
- if ( str[21][strlen(str[21])-2] != '}' ) {
+ if ( *p != '}' ) {
/* lets count to ensure it's not something silly e.g. a extra space at line ending */
int v, lcurly = 0, rcurly = 0;
@@ -1470,8 +1503,9 @@ static int itemdb_readdb(void){
continue;
}
}
+ *p = '\0';
- if (!itemdb_parse_dbrow(str, path, lines, 0))
+ if (!itemdb_parse_dbrow(str, path, lines, SCRIPT_IGNORE_EXTERNAL_BRACKETS))
continue;
count++;
@@ -1479,7 +1513,7 @@ static int itemdb_readdb(void){
fclose(fp);
- ShowStatus("Done reading '"CL_WHITE"%lu"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", count, path);
+ ShowStatus("Done reading '" CL_WHITE "%lu" CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'.\n", count, path);
}
return 0;
@@ -1508,7 +1542,7 @@ static int itemdb_read_sqldb(void) {
// process rows one by one
while( SQL_SUCCESS == Sql_NextRow(mmysql_handle) ) {// wrap the result into a TXT-compatible format
char* str[22];
- char* dummy = "";
+ char dummy[256] = "";
int i;
++lines;
for( i = 0; i < 22; ++i ) {
@@ -1525,7 +1559,7 @@ static int itemdb_read_sqldb(void) {
// free the query result
Sql_FreeResult(mmysql_handle);
- ShowStatus("Done reading '"CL_WHITE"%lu"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", count, item_db_name[fi]);
+ ShowStatus("Done reading '" CL_WHITE "%lu" CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'.\n", count, item_db_name[fi]);
}
return 0;
@@ -1663,7 +1697,7 @@ static bool itemdb_read_randomopt(const char* basedir, bool silent) {
}
fclose(fp);
- ShowStatus("Done reading '"CL_WHITE"%lu"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", count, path);
+ ShowStatus("Done reading '" CL_WHITE "%lu" CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'.\n", count, path);
return true;
}
@@ -1748,7 +1782,7 @@ static void itemdb_read(void) {
int i;
const char* dbsubpath[] = {
"",
- "/"DBIMPORT,
+ "/" DBIMPORT,
};
if (db_use_sqldbs)
@@ -1772,27 +1806,27 @@ static void itemdb_read(void) {
safesnprintf(dbsubpath2,n1,"%s%s",db_path,dbsubpath[i]);
}
- sv_readdb(dbsubpath1, "item_avail.txt", ',', 2, 2, -1, &itemdb_read_itemavail, i);
- sv_readdb(dbsubpath2, "item_stack.txt", ',', 3, 3, -1, &itemdb_read_stack, i);
- sv_readdb(dbsubpath1, "item_nouse.txt", ',', 3, 3, -1, &itemdb_read_nouse, i);
- sv_readdb(dbsubpath2, "item_group_db.txt", ',', 2, 10, -1, &itemdb_read_group, i);
- sv_readdb(dbsubpath2, "item_bluebox.txt", ',', 2, 10, -1, &itemdb_read_group, i);
- sv_readdb(dbsubpath2, "item_violetbox.txt", ',', 2, 10, -1, &itemdb_read_group, i);
- sv_readdb(dbsubpath2, "item_cardalbum.txt", ',', 2, 10, -1, &itemdb_read_group, i);
- sv_readdb(dbsubpath1, "item_findingore.txt", ',', 2, 10, -1, &itemdb_read_group, i);
- sv_readdb(dbsubpath2, "item_giftbox.txt", ',', 2, 10, -1, &itemdb_read_group, i);
- sv_readdb(dbsubpath2, "item_misc.txt", ',', 2, 10, -1, &itemdb_read_group, i);
+ sv_readdb(dbsubpath1, "item_avail.txt", ',', 2, 2, -1, &itemdb_read_itemavail, i > 0);
+ sv_readdb(dbsubpath2, "item_stack.txt", ',', 3, 3, -1, &itemdb_read_stack, i > 0);
+ sv_readdb(dbsubpath1, "item_nouse.txt", ',', 3, 3, -1, &itemdb_read_nouse, i > 0);
+ sv_readdb(dbsubpath2, "item_group_db.txt", ',', 2, 10, -1, &itemdb_read_group, i > 0);
+ sv_readdb(dbsubpath2, "item_bluebox.txt", ',', 2, 10, -1, &itemdb_read_group, i > 0);
+ sv_readdb(dbsubpath2, "item_violetbox.txt", ',', 2, 10, -1, &itemdb_read_group, i > 0);
+ sv_readdb(dbsubpath2, "item_cardalbum.txt", ',', 2, 10, -1, &itemdb_read_group, i > 0);
+ sv_readdb(dbsubpath1, "item_findingore.txt", ',', 2, 10, -1, &itemdb_read_group, i > 0);
+ sv_readdb(dbsubpath2, "item_giftbox.txt", ',', 2, 10, -1, &itemdb_read_group, i > 0);
+ sv_readdb(dbsubpath2, "item_misc.txt", ',', 2, 10, -1, &itemdb_read_group, i > 0);
#ifdef RENEWAL
- sv_readdb(dbsubpath2, "item_package.txt", ',', 2, 10, -1, &itemdb_read_group, i);
+ sv_readdb(dbsubpath2, "item_package.txt", ',', 2, 10, -1, &itemdb_read_group, i > 0);
#endif
- itemdb_read_combos(dbsubpath2,i); //TODO change this to sv_read ? id#script ?
- itemdb_read_randomopt(dbsubpath2, i);
- sv_readdb(dbsubpath2, "item_noequip.txt", ',', 2, 2, -1, &itemdb_read_noequip, i);
- sv_readdb(dbsubpath2, "item_trade.txt", ',', 3, 3, -1, &itemdb_read_itemtrade, i);
- sv_readdb(dbsubpath2, "item_delay.txt", ',', 2, 3, -1, &itemdb_read_itemdelay, i);
- sv_readdb(dbsubpath2, "item_buyingstore.txt", ',', 1, 1, -1, &itemdb_read_buyingstore, i);
- sv_readdb(dbsubpath2, "item_flag.txt", ',', 2, 2, -1, &itemdb_read_flag, i);
- sv_readdb(dbsubpath2, "item_randomopt_group.txt", ',', 5, 2+5*MAX_ITEM_RDM_OPT, -1, &itemdb_read_randomopt_group, i);
+ itemdb_read_combos(dbsubpath2,i > 0); //TODO change this to sv_read ? id#script ?
+ itemdb_read_randomopt(dbsubpath2, i > 0);
+ sv_readdb(dbsubpath2, "item_noequip.txt", ',', 2, 2, -1, &itemdb_read_noequip, i > 0);
+ sv_readdb(dbsubpath2, "item_trade.txt", ',', 3, 3, -1, &itemdb_read_itemtrade, i > 0);
+ sv_readdb(dbsubpath2, "item_delay.txt", ',', 2, 3, -1, &itemdb_read_itemdelay, i > 0);
+ sv_readdb(dbsubpath2, "item_buyingstore.txt", ',', 1, 1, -1, &itemdb_read_buyingstore, i > 0);
+ sv_readdb(dbsubpath2, "item_flag.txt", ',', 2, 2, -1, &itemdb_read_flag, i > 0);
+ sv_readdb(dbsubpath2, "item_randomopt_group.txt", ',', 5, 2+5*MAX_ITEM_RDM_OPT, -1, &itemdb_read_randomopt_group, i > 0);
aFree(dbsubpath1);
aFree(dbsubpath2);
}
@@ -1887,40 +1921,6 @@ static int itemdb_randomopt_free(DBKey key, DBData *data, va_list ap) {
return 1;
}
-/**
- * Re-link monster drop data with item data
- * Fixes the need of a @reloadmobdb after a @reloaditemdb
- * @author Epoque
- */
-void itemdb_reload_itemmob_data(void) {
- int i;
-
- for( i = 0; i < MAX_MOB_DB; i++ ) {
- struct mob_db *entry = mob_db(i);
- int d, k;
-
- for(d = 0; d < MAX_MOB_DROP_TOTAL; d++) {
- struct item_data *id;
- if( !entry->dropitem[d].nameid )
- continue;
- id = itemdb_search(entry->dropitem[d].nameid);
-
- for (k = 0; k < MAX_SEARCH; k++) {
- if (id->mob[k].chance <= entry->dropitem[d].p)
- break;
- }
-
- if (k == MAX_SEARCH)
- continue;
-
- if (id->mob[k].id != i)
- memmove(&id->mob[k+1], &id->mob[k], (MAX_SEARCH-k-1)*sizeof(id->mob[0]));
- id->mob[k].chance = entry->dropitem[d].p;
- id->mob[k].id = i;
- }
- }
-}
-
/**
* Reload Item DB
*/
@@ -1943,7 +1943,7 @@ void itemdb_reload(void) {
if (battle_config.feature_roulette)
itemdb_parse_roulette_db();
- itemdb_reload_itemmob_data();
+ mob_reload_itemmob_data();
// readjust itemdb pointer cache for each player
iter = mapit_geteachpc();
diff --git a/src/map/itemdb.h b/src/map/itemdb.hpp
similarity index 96%
rename from src/map/itemdb.h
rename to src/map/itemdb.hpp
index 6cbd10b758f..27e2f0a3e9c 100644
--- a/src/map/itemdb.h
+++ b/src/map/itemdb.hpp
@@ -1,16 +1,11 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _ITEMDB_H_
-#define _ITEMDB_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef _ITEMDB_HPP_
+#define _ITEMDB_HPP_
#include "../common/db.h"
#include "../common/mmo.h" // ITEM_NAME_LENGTH
-#include "map.h"
///Maximum allowed Item ID (range: 1 ~ 65,534)
#define MAX_ITEMID USHRT_MAX
@@ -81,6 +76,7 @@ enum item_itemid
ITEMID_PHRACON = 1010,
ITEMID_EMVERETARCON = 1011,
ITEMID_TRAP = 1065,
+ ITEMID_ANGRA_MANYU = 1599,
ITEMID_PAINT_BRUSH = 6122,
ITEMID_MAGIC_GEAR_FUEL = 6146,
ITEMID_STRANGE_EMBRYO = 6415,
@@ -97,34 +93,33 @@ enum item_itemid
ITEMID_CATNIP_FRUIT = 11602,
ITEMID_MERCENARY_RED_POTION = 12184,
ITEMID_MERCENARY_BLUE_POTION = 12185,
- ITEMID_BATTLE_MANUAL = 12208,
- ITEMID_BUBBLE_GUM = 12210,
ITEMID_GIANT_FLY_WING = 12212,
ITEMID_NEURALIZER = 12213,
ITEMID_M_CENTER_POTION = 12241,
ITEMID_M_AWAKENING_POTION = 12242,
ITEMID_M_BERSERK_POTION = 12243,
- ITEMID_COMP_BATTLE_MANUAL = 12263,
- ITEMID_THICK_BATTLE_MANUAL = 12312,
ITEMID_N_FLY_WING = 12323,
ITEMID_N_BUTTERFLY_WING = 12324,
ITEMID_NOVICE_MAGNIFIER = 12325,
ITEMID_ANCILLA = 12333,
ITEMID_DUN_TELE_SCROLL3 = 12352,
ITEMID_REINS_OF_MOUNT = 12622,
- ITEMID_COMP_BUBBLE_GUM = 12264,
ITEMID_NOBLE_NAMEPLATE = 12705,
+ ITEMID_SILVER_BULLET = 13201,
+ ITEMID_SLUG_AMMUNITION_L = 13210,
+ ITEMID_SLUG_AMMUNITION_M = 13211,
+ ITEMID_SLUG_AMMUNITION_H = 13212,
+ ITEMID_SLUG_AMMUNITION_SH = 13213,
+ ITEMID_SLUG_AMMUNITION_XH = 13214,
+ ITEMID_PURIFICATION_BULLET = 13220,
+ ITEMID_SILVER_BULLET_ = 13221,
ITEMID_DUN_TELE_SCROLL1 = 14527,
- ITEMID_BATTLE_MANUAL25 = 14532,
- ITEMID_BATTLE_MANUAL100 = 14533,
- ITEMID_BATTLE_MANUAL300 = 14545,
ITEMID_DUN_TELE_SCROLL2 = 14581,
ITEMID_WOB_RUNE = 14582,
ITEMID_WOB_SCHWALTZ = 14583,
ITEMID_WOB_RACHEL = 14584,
ITEMID_WOB_LOCAL = 14585,
ITEMID_SIEGE_TELEPORT_SCROLL = 14591,
- ITEMID_JOB_MANUAL50 = 14592,
};
///Rune Knight
@@ -721,7 +716,6 @@ enum e_random_item_group {
IG_SOMETHING_CANDY_HOLDER,
IG_MYSTERIOUS_EGG,
IG_AGUST_LUCKY_SCROLL,
- IG_RUNE,
IG_ELEMENT,
IG_POISON,
IG_CASH_FOOD,
@@ -739,6 +733,14 @@ enum e_random_item_group {
IG_SANTA_GIFT,
};
+/// Enum for bound/sell restricted selling
+enum e_itemshop_restrictions {
+ ISR_NONE = 0x0,
+ ISR_BOUND = 0x1,
+ ISR_SELLABLE = 0x2,
+ ISR_ALL = 0x3,
+};
+
///Item combo struct
struct item_combo
{
@@ -784,7 +786,8 @@ struct s_roulette_db {
*qty[MAX_ROULETTE_LEVEL]; /// Amount of Item ID
int *flag[MAX_ROULETTE_LEVEL]; /// Whether the item is for loss or win
int items[MAX_ROULETTE_LEVEL]; /// Number of items in the list for each
-} rd;
+};
+extern struct s_roulette_db rd;
///Main item data struct
struct item_data
@@ -829,7 +832,7 @@ struct item_data
unsigned available : 1;
uint32 no_equip;
unsigned no_refine : 1; // [celest]
- unsigned delay_consume : 1; // Signifies items that are not consumed immediately upon double-click [Skotlex]
+ unsigned delay_consume : 2; // 1 - Signifies items that are not consumed immediately upon double-click; 2 - Signifies items that are not removed on consumption [Skotlex]
unsigned trade_restriction : 9; //Item restrictions mask [Skotlex]
unsigned autoequip: 1;
unsigned buyingstore : 1;
@@ -945,21 +948,16 @@ struct item_combo *itemdb_combo_exists(unsigned short combo_id);
struct s_item_group_db *itemdb_group_exists(unsigned short group_id);
bool itemdb_group_item_exists(unsigned short group_id, unsigned short nameid);
-char itemdb_pc_get_itemgroup(uint16 group_id, struct map_session_data *sd);
+char itemdb_pc_get_itemgroup(uint16 group_id, bool identify, struct map_session_data *sd);
bool itemdb_parse_roulette_db(void);
struct s_random_opt_data *itemdb_randomopt_exists(short id);
struct s_random_opt_group *itemdb_randomopt_group_exists(int id);
-void itemdb_reload_itemmob_data(void);
void itemdb_reload(void);
void do_final_itemdb(void);
void do_init_itemdb(void);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _ITEMDB_H_ */
+#endif /* _ITEMDB_HPP_ */
diff --git a/src/map/log.c b/src/map/log.cpp
similarity index 96%
rename from src/map/log.c
rename to src/map/log.cpp
index b8f3e794ca3..fbf01b98513 100644
--- a/src/map/log.c
+++ b/src/map/log.cpp
@@ -1,21 +1,23 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "log.hpp"
+
+#include <stdlib.h>
+
#include "../common/cbasetypes.h"
#include "../common/sql.h" // SQL_INNODB
#include "../common/strlib.h"
#include "../common/nullpo.h"
#include "../common/showmsg.h"
-#include "map.h"
-#include "battle.h"
-#include "itemdb.h"
-#include "homunculus.h"
-#include "log.h"
-#include "mob.h"
-#include "pet.h"
-#include "pc.h"
-#include <stdlib.h>
+#include "map.hpp"
+#include "battle.hpp"
+#include "itemdb.hpp"
+#include "homunculus.hpp"
+#include "mob.hpp"
+#include "pet.hpp"
+#include "pc.hpp"
static char log_timestamp_format[20];
@@ -219,11 +221,11 @@ void log_pick(int id, int16 m, e_log_pick_type type, int amount, struct item* it
#ifdef BETA_THREAD_TEST
char entry[512];
int e_length = 0;
- e_length = sprintf(entry, LOG_QUERY " INTO `%s` (`time`, `char_id`, `type`, `nameid`, `amount`, `refine`, `card0`, `card1`, `card2`, `card3`, `map`, `unique_id`, `bound`) VALUES (NOW(), '%d', '%c', '%hu', '%d', '%d', '%hu', '%hu', '%hu', '%hu', '%s', '%"PRIu64"', '%d')",
+ e_length = sprintf(entry, LOG_QUERY " INTO `%s` (`time`, `char_id`, `type`, `nameid`, `amount`, `refine`, `card0`, `card1`, `card2`, `card3`, `map`, `unique_id`, `bound`) VALUES (NOW(), '%d', '%c', '%hu', '%d', '%d', '%hu', '%hu', '%hu', '%hu', '%s', '%" PRIu64 "', '%d')",
log_config.log_pick, id, log_picktype2char(type), itm->nameid, amount, itm->refine, itm->card[0], itm->card[1], itm->card[2], itm->card[3], map[m].name?map[m].name:"", itm->unique_id, itm->bound);
queryThread_log(entry,e_length);
#else
- if( SQL_ERROR == Sql_Query(logmysql_handle, LOG_QUERY " INTO `%s` (`time`, `char_id`, `type`, `nameid`, `amount`, `refine`, `card0`, `card1`, `card2`, `card3`, `map`, `unique_id`, `bound`) VALUES (NOW(), '%d', '%c', '%hu', '%d', '%d', '%hu', '%hu', '%hu', '%hu', '%s', '%"PRIu64"', '%d')",
+ if( SQL_ERROR == Sql_Query(logmysql_handle, LOG_QUERY " INTO `%s` (`time`, `char_id`, `type`, `nameid`, `amount`, `refine`, `card0`, `card1`, `card2`, `card3`, `map`, `unique_id`, `bound`) VALUES (NOW(), '%d', '%c', '%hu', '%d', '%d', '%hu', '%hu', '%hu', '%hu', '%s', '%" PRIu64 "', '%d')",
log_config.log_pick, id, log_picktype2char(type), itm->nameid, amount, itm->refine, itm->card[0], itm->card[1], itm->card[2], itm->card[3], map[m].name?map[m].name:"", itm->unique_id, itm->bound) )
{
Sql_ShowDebug(logmysql_handle);
@@ -241,7 +243,7 @@ void log_pick(int id, int16 m, e_log_pick_type type, int amount, struct item* it
return;
time(&curtime);
strftime(timestring, sizeof(timestring), log_timestamp_format, localtime(&curtime));
- fprintf(logfp,"%s - %d\t%c\t%hu,%d,%d,%hu,%hu,%hu,%hu,%s,'%"PRIu64"',%d\n", timestring, id, log_picktype2char(type), itm->nameid, amount, itm->refine, itm->card[0], itm->card[1], itm->card[2], itm->card[3], map[m].name?map[m].name:"", itm->unique_id, itm->bound);
+ fprintf(logfp,"%s - %d\t%c\t%hu,%d,%d,%hu,%hu,%hu,%hu,%s,'%" PRIu64 "',%d\n", timestring, id, log_picktype2char(type), itm->nameid, amount, itm->refine, itm->card[0], itm->card[1], itm->card[2], itm->card[3], map[m].name?map[m].name:"", itm->unique_id, itm->bound);
fclose(logfp);
}
}
@@ -559,11 +561,11 @@ void log_feeding(struct map_session_data *sd, e_log_feeding_type type, unsigned
#ifdef BETA_THREAD_TEST
char entry[512];
int e_length = 0;
- e_length = sprintf(entry, LOG_QUERY " INTO `%s` (`time`, `char_id`, `target_id`, `target_class`, `type`, `intimacy`, `item_id`, `map`, `x`, `y`) VALUES ( NOW(), '%"PRIu32"', '%"PRIu32"', '%hu', '%c', '%"PRIu32"', '%hu', '%s', '%hu', '%hu' )",
+ e_length = sprintf(entry, LOG_QUERY " INTO `%s` (`time`, `char_id`, `target_id`, `target_class`, `type`, `intimacy`, `item_id`, `map`, `x`, `y`) VALUES ( NOW(), '%" PRIu32 "', '%" PRIu32 "', '%hu', '%c', '%" PRIu32 "', '%hu', '%s', '%hu', '%hu' )",
log_config.log_feeding, sd->status.char_id, target_id, target_class, log_feedingtype2char(type), intimacy, nameid, mapindex_id2name(sd->mapindex), sd->bl.x, sd->bl.y);
queryThread_log(entry, e_length);
#else
- if (SQL_ERROR == Sql_Query(logmysql_handle, LOG_QUERY " INTO `%s` (`time`, `char_id`, `target_id`, `target_class`, `type`, `intimacy`, `item_id`, `map`, `x`, `y`) VALUES ( NOW(), '%"PRIu32"', '%"PRIu32"', '%hu', '%c', '%"PRIu32"', '%hu', '%s', '%hu', '%hu' )",
+ if (SQL_ERROR == Sql_Query(logmysql_handle, LOG_QUERY " INTO `%s` (`time`, `char_id`, `target_id`, `target_class`, `type`, `intimacy`, `item_id`, `map`, `x`, `y`) VALUES ( NOW(), '%" PRIu32 "', '%" PRIu32 "', '%hu', '%c', '%" PRIu32 "', '%hu', '%s', '%hu', '%hu' )",
log_config.log_feeding, sd->status.char_id, target_id, target_class, log_feedingtype2char(type), intimacy, nameid, mapindex_id2name(sd->mapindex), sd->bl.x, sd->bl.y))
{
Sql_ShowDebug(logmysql_handle);
@@ -623,7 +625,7 @@ int log_config_read(const char* cfgName)
if( strcmpi(w1, "enable_logs") == 0 )
log_config.enable_logs = (e_log_pick_type)config_switch(w2);
else if( strcmpi(w1, "sql_logs") == 0 )
- log_config.sql_logs = (bool)config_switch(w2);
+ log_config.sql_logs = config_switch(w2) > 0;
//start of common filter settings
else if( strcmpi(w1, "rare_items_log") == 0 )
log_config.rare_items_log = atoi(w2);
@@ -641,7 +643,7 @@ int log_config_read(const char* cfgName)
else if( strcmpi(w1, "log_zeny") == 0 )
log_config.zeny = config_switch(w2);
else if( strcmpi( w1, "log_cash" ) == 0 )
- log_config.cash = config_switch( w2 );
+ log_config.cash = config_switch( w2 ) > 0;
else if( strcmpi(w1, "log_commands") == 0 )
log_config.commands = config_switch(w2);
else if( strcmpi(w1, "log_npc") == 0 )
@@ -653,7 +655,7 @@ int log_config_read(const char* cfgName)
else if( strcmpi(w1, "log_feeding") == 0 )
log_config.feeding = config_switch(w2);
else if( strcmpi(w1, "log_chat_woe_disable") == 0 )
- log_config.log_chat_woe_disable = (bool)config_switch(w2);
+ log_config.log_chat_woe_disable = config_switch(w2) > 0;
else if( strcmpi(w1, "log_branch_db") == 0 )
safestrncpy(log_config.log_branch, w2, sizeof(log_config.log_branch));
else if( strcmpi(w1, "log_pick_db") == 0 )
diff --git a/src/map/log.h b/src/map/log.hpp
similarity index 90%
rename from src/map/log.h
rename to src/map/log.hpp
index a883f50aa47..a0b80accad4 100644
--- a/src/map/log.h
+++ b/src/map/log.hpp
@@ -1,20 +1,17 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _LOG_H_
-#define _LOG_H_
+#ifndef _LOG_HPP_
+#define _LOG_HPP_
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "../common/cbasetypes.h"
-//#include "map.h"
struct block_list;
struct map_session_data;
struct mob_data;
struct item;
-typedef enum e_log_chat_type
+enum e_log_chat_type : uint8
{
LOG_CHAT_GLOBAL = 0x01,
LOG_CHAT_WHISPER = 0x02,
@@ -24,9 +21,9 @@ typedef enum e_log_chat_type
LOG_CHAT_CLAN = 0x20,
// all
LOG_CHAT_ALL = 0xFF,
-} e_log_chat_type;
+};
-typedef enum e_log_pick_type
+enum e_log_pick_type : uint32
{
LOG_TYPE_NONE = 0,
LOG_TYPE_TRADE = 0x000001,
@@ -56,18 +53,19 @@ typedef enum e_log_pick_type
LOG_TYPE_LOOT = LOG_TYPE_PICKDROP_MONSTER|LOG_TYPE_CONSUME,
// all
LOG_TYPE_ALL = 0xFFFFFF,
-} e_log_pick_type;
+};
-typedef enum e_log_cash_type
+enum e_log_cash_type : uint8
{
LOG_CASH_TYPE_CASH = 0x1,
LOG_CASH_TYPE_KAFRA = 0x2
-} e_log_cash_type;
+};
-typedef enum e_log_feeding_type {
+enum e_log_feeding_type : uint8
+{
LOG_FEED_HOMUNCULUS = 0x1,
LOG_FEED_PET = 0x2,
-} e_log_feeding_type;
+};
/// new logs
void log_pick_pc(struct map_session_data* sd, e_log_pick_type type, int amount, struct item* itm);
@@ -106,8 +104,4 @@ extern struct Log_Config
} logThreadData;
#endif
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _LOG_H_ */
+#endif /* _LOG_HPP_ */
diff --git a/src/map/mail.c b/src/map/mail.cpp
similarity index 96%
rename from src/map/mail.c
rename to src/map/mail.cpp
index 1880f221aca..ee9c9635f30 100644
--- a/src/map/mail.c
+++ b/src/map/mail.cpp
@@ -1,17 +1,21 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "mail.hpp"
+
#include "../common/nullpo.h"
#include "../common/showmsg.h"
#include "../common/strlib.h"
+#include "../common/timer.h"
-#include "mail.h"
-#include "atcommand.h"
-#include "itemdb.h"
-#include "clif.h"
-#include "pc.h"
-#include "intif.h"
-#include "date.h" // date_get_dayofyear
+#include "atcommand.hpp"
+#include "itemdb.hpp"
+#include "clif.hpp"
+#include "pc.hpp"
+#include "intif.hpp"
+#include "date.hpp" // date_get_dayofyear
+#include "log.hpp"
+#include "battle.hpp"
void mail_clear(struct map_session_data *sd)
{
@@ -110,7 +114,7 @@ bool mail_removezeny( struct map_session_data *sd, bool flag ){
* @param sd : player attaching the content
* @param idx 0 - Zeny; >= 2 - Inventory item
* @param amount : amout of zeny or number of item
-* @return see enum mail_attach_result in mail.h
+* @return see enum mail_attach_result in mail.hpp
*/
enum mail_attach_result mail_setitem(struct map_session_data *sd, short idx, uint32 amount) {
if( pc_istrading(sd) )
@@ -132,7 +136,10 @@ enum mail_attach_result mail_setitem(struct map_session_data *sd, short idx, uin
// clif_updatestatus(sd, SP_ZENY);
return MAIL_ATTACH_SUCCESS;
} else { // Item Transfer
- int i, j, total = 0;
+ int i;
+#if PACKETVER >= 20150513
+ int j, total = 0;
+#endif
idx -= 2;
diff --git a/src/map/mail.h b/src/map/mail.hpp
similarity index 91%
rename from src/map/mail.h
rename to src/map/mail.hpp
index 665a989a497..99594b0c134 100644
--- a/src/map/mail.h
+++ b/src/map/mail.hpp
@@ -1,12 +1,8 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _MAIL_H_
-#define _MAIL_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef _MAIL_HPP_
+#define _MAIL_HPP_
#include "../common/mmo.h"
@@ -37,8 +33,4 @@ bool mail_invalid_operation(struct map_session_data *sd);
void mail_send(struct map_session_data *sd, const char *dest_name, const char *title, const char *body_msg, int body_len);
void mail_refresh_remaining_amount( struct map_session_data* sd );
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _MAIL_H_ */
+#endif /* _MAIL_HPP_ */
diff --git a/src/map/map-server.vcxproj b/src/map/map-server.vcxproj
index f47578fb561..107b105b1ff 100644
--- a/src/map/map-server.vcxproj
+++ b/src/map/map-server.vcxproj
@@ -27,26 +27,26 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
@@ -94,6 +94,7 @@
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>$(DefineConstants);WIN32;FD_SETSIZE=4096;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\yaml-cpp\include\</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4018</DisableSpecificWarnings>
</ClCompile>
<Link>
@@ -110,6 +111,7 @@
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>$(DefineConstants);WIN32;FD_SETSIZE=4096;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\yaml-cpp\include\</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4018</DisableSpecificWarnings>
</ClCompile>
<Link>
@@ -128,6 +130,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>$(DefineConstants);WIN32;FD_SETSIZE=4096;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\yaml-cpp\include\</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4018</DisableSpecificWarnings>
</ClCompile>
<Link>
@@ -148,6 +151,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>$(DefineConstants);WIN32;FD_SETSIZE=4096;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\yaml-cpp\include\</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4018</DisableSpecificWarnings>
</ClCompile>
<Link>
@@ -159,90 +163,95 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClInclude Include="atcommand.h" />
- <ClInclude Include="battle.h" />
- <ClInclude Include="battleground.h" />
- <ClInclude Include="buyingstore.h" />
- <ClInclude Include="cashshop.h" />
- <ClInclude Include="channel.h" />
- <ClInclude Include="chat.h" />
- <ClInclude Include="chrif.h" />
- <ClInclude Include="clan.h" />
- <ClInclude Include="clif.h" />
- <ClInclude Include="date.h" />
- <ClInclude Include="duel.h" />
- <ClInclude Include="elemental.h" />
- <ClInclude Include="guild.h" />
- <ClInclude Include="homunculus.h" />
- <ClInclude Include="instance.h" />
- <ClInclude Include="intif.h" />
- <ClInclude Include="itemdb.h" />
- <ClInclude Include="log.h" />
- <ClInclude Include="mail.h" />
- <ClInclude Include="map.h" />
- <ClInclude Include="mapreg.h" />
- <ClInclude Include="mercenary.h" />
- <ClInclude Include="mob.h" />
- <ClInclude Include="npc.h" />
- <ClInclude Include="party.h" />
- <ClInclude Include="path.h" />
- <ClInclude Include="pc.h" />
- <ClInclude Include="pc_groups.h" />
- <ClInclude Include="pet.h" />
- <ClInclude Include="quest.h" />
- <ClInclude Include="script.h" />
- <ClInclude Include="script_constants.h" />
- <ClInclude Include="searchstore.h" />
- <ClInclude Include="skill.h" />
- <ClInclude Include="status.h" />
- <ClInclude Include="storage.h" />
- <ClInclude Include="trade.h" />
- <ClInclude Include="unit.h" />
- <ClInclude Include="vending.h" />
+ <ClInclude Include="achievement.hpp" />
+ <ClInclude Include="atcommand.hpp" />
+ <ClInclude Include="battle.hpp" />
+ <ClInclude Include="battleground.hpp" />
+ <ClInclude Include="buyingstore.hpp" />
+ <ClInclude Include="cashshop.hpp" />
+ <ClInclude Include="channel.hpp" />
+ <ClInclude Include="chat.hpp" />
+ <ClInclude Include="chrif.hpp" />
+ <ClInclude Include="clan.hpp" />
+ <ClInclude Include="clif.hpp" />
+ <ClInclude Include="clif_obfuscation.hpp" />
+ <ClInclude Include="clif_packetdb.hpp" />
+ <ClInclude Include="clif_shuffle.hpp" />
+ <ClInclude Include="date.hpp" />
+ <ClInclude Include="duel.hpp" />
+ <ClInclude Include="elemental.hpp" />
+ <ClInclude Include="guild.hpp" />
+ <ClInclude Include="homunculus.hpp" />
+ <ClInclude Include="instance.hpp" />
+ <ClInclude Include="intif.hpp" />
+ <ClInclude Include="itemdb.hpp" />
+ <ClInclude Include="log.hpp" />
+ <ClInclude Include="mail.hpp" />
+ <ClInclude Include="map.hpp" />
+ <ClInclude Include="mapreg.hpp" />
+ <ClInclude Include="mercenary.hpp" />
+ <ClInclude Include="mob.hpp" />
+ <ClInclude Include="npc.hpp" />
+ <ClInclude Include="party.hpp" />
+ <ClInclude Include="path.hpp" />
+ <ClInclude Include="pc.hpp" />
+ <ClInclude Include="pc_groups.hpp" />
+ <ClInclude Include="pet.hpp" />
+ <ClInclude Include="quest.hpp" />
+ <ClInclude Include="script.hpp" />
+ <ClInclude Include="script_constants.hpp" />
+ <ClInclude Include="searchstore.hpp" />
+ <ClInclude Include="skill.hpp" />
+ <ClInclude Include="status.hpp" />
+ <ClInclude Include="storage.hpp" />
+ <ClInclude Include="trade.hpp" />
+ <ClInclude Include="unit.hpp" />
+ <ClInclude Include="vending.hpp" />
</ItemGroup>
<ItemGroup>
- <ClCompile Include="atcommand.c" />
- <ClCompile Include="battle.c" />
- <ClCompile Include="battleground.c" />
- <ClCompile Include="buyingstore.c" />
- <ClCompile Include="cashshop.c" />
- <ClCompile Include="channel.c" />
- <ClCompile Include="chat.c" />
- <ClCompile Include="chrif.c" />
- <ClCompile Include="clan.c" />
- <ClCompile Include="clif.c" />
- <ClCompile Include="date.c" />
- <ClCompile Include="duel.c" />
- <ClCompile Include="elemental.c" />
- <ClCompile Include="guild.c" />
- <ClCompile Include="homunculus.c" />
- <ClCompile Include="instance.c" />
- <ClCompile Include="intif.c" />
- <ClCompile Include="itemdb.c" />
- <ClCompile Include="log.c" />
- <ClCompile Include="mail.c" />
- <ClCompile Include="map.cpp">
- <CompileAs>CompileAsCpp</CompileAs>
+ <ClCompile Include="achievement.cpp" />
+ <ClCompile Include="atcommand.cpp" />
+ <ClCompile Include="battle.cpp" />
+ <ClCompile Include="battleground.cpp" />
+ <ClCompile Include="buyingstore.cpp" />
+ <ClCompile Include="cashshop.cpp" />
+ <ClCompile Include="channel.cpp" />
+ <ClCompile Include="chat.cpp" />
+ <ClCompile Include="chrif.cpp" />
+ <ClCompile Include="clan.cpp" />
+ <ClCompile Include="clif.cpp" />
+ <ClCompile Include="date.cpp" />
+ <ClCompile Include="duel.cpp" />
+ <ClCompile Include="elemental.cpp" />
+ <ClCompile Include="guild.cpp" />
+ <ClCompile Include="homunculus.cpp" />
+ <ClCompile Include="instance.cpp" />
+ <ClCompile Include="intif.cpp" />
+ <ClCompile Include="itemdb.cpp" />
+ <ClCompile Include="log.cpp" />
+ <ClCompile Include="mail.cpp" />
+ <ClCompile Include="map.cpp" />
+ <ClCompile Include="mapreg.cpp" />
+ <ClCompile Include="mercenary.cpp" />
+ <ClCompile Include="mob.cpp">
+ <Optimization Condition="'$(Configuration)'=='Release'">Disabled</Optimization>
</ClCompile>
- <ClCompile Include="mapreg.c" />
- <ClCompile Include="mercenary.c" />
- <ClCompile Include="mob.c" />
- <ClCompile Include="npc.c" />
- <ClCompile Include="npc_chat.c" />
- <ClCompile Include="party.c" />
- <ClCompile Include="path.c" />
- <ClCompile Include="pc.c" />
- <ClCompile Include="pc_groups.c" />
- <ClCompile Include="pet.c" />
- <ClCompile Include="quest.c" />
- <ClCompile Include="script.c" />
- <ClCompile Include="searchstore.c" />
- <ClCompile Include="skill.c" />
- <ClCompile Include="status.c" />
- <ClCompile Include="storage.c" />
- <ClCompile Include="trade.c" />
- <ClCompile Include="unit.c" />
- <ClCompile Include="vending.c" />
+ <ClCompile Include="npc.cpp" />
+ <ClCompile Include="npc_chat.cpp" />
+ <ClCompile Include="party.cpp" />
+ <ClCompile Include="path.cpp" />
+ <ClCompile Include="pc.cpp" />
+ <ClCompile Include="pc_groups.cpp" />
+ <ClCompile Include="pet.cpp" />
+ <ClCompile Include="quest.cpp" />
+ <ClCompile Include="script.cpp" />
+ <ClCompile Include="searchstore.cpp" />
+ <ClCompile Include="skill.cpp" />
+ <ClCompile Include="status.cpp" />
+ <ClCompile Include="storage.cpp" />
+ <ClCompile Include="trade.cpp" />
+ <ClCompile Include="unit.cpp" />
+ <ClCompile Include="vending.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
@@ -265,7 +274,7 @@
<Copy SourceFiles="$(SolutionDir)conf\import-tmpl\battle_conf.txt" DestinationFolder="$(SolutionDir)conf\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)conf\import\battle_conf.txt')" />
<Copy SourceFiles="$(SolutionDir)conf\import-tmpl\char_conf.txt" DestinationFolder="$(SolutionDir)conf\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)conf\import\char_conf.txt')" />
<Copy SourceFiles="$(SolutionDir)conf\import-tmpl\inter_conf.txt" DestinationFolder="$(SolutionDir)conf\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)conf\import\inter_conf.txt')" />
- <Copy SourceFiles="$(SolutionDir)conf\import-tmpl\inter_server.conf" DestinationFolder="$(SolutionDir)conf\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)conf\import\inter_server.conf')" />
+ <Copy SourceFiles="$(SolutionDir)conf\import-tmpl\inter_server.yml" DestinationFolder="$(SolutionDir)conf\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)conf\import\inter_server.yml')" />
<Copy SourceFiles="$(SolutionDir)conf\import-tmpl\log_conf.txt" DestinationFolder="$(SolutionDir)conf\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)conf\import\log_conf.txt')" />
<Copy SourceFiles="$(SolutionDir)conf\import-tmpl\login_conf.txt" DestinationFolder="$(SolutionDir)conf\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)conf\import\login_conf.txt')" />
<Copy SourceFiles="$(SolutionDir)conf\import-tmpl\map_conf.txt" DestinationFolder="$(SolutionDir)conf\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)conf\import\map_conf.txt')" />
@@ -282,8 +291,10 @@
<Copy SourceFiles="$(SolutionDir)conf\msg_conf\import-tmpl\map_msg_spn_conf.txt" DestinationFolder="$(SolutionDir)conf\msg_conf\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)conf\msg_conf\import\map_msg_spn_conf.txt')" />
<Copy SourceFiles="$(SolutionDir)conf\msg_conf\import-tmpl\map_msg_tha_conf.txt" DestinationFolder="$(SolutionDir)conf\msg_conf\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)conf\msg_conf\import\map_msg_tha_conf.txt')" />
<Copy SourceFiles="$(SolutionDir)db\import-tmpl\abra_db.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\abra_db.txt')" />
+ <Copy SourceFiles="$(SolutionDir)db\import-tmpl\achievement_db.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\achievement_db.yml')" />
<Copy SourceFiles="$(SolutionDir)db\import-tmpl\attr_fix.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\attr_fix.txt')" />
<Copy SourceFiles="$(SolutionDir)db\import-tmpl\castle_db.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\castle_db.txt')" />
+ <Copy SourceFiles="$(SolutionDir)db\import-tmpl\const.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\const.txt')" />
<Copy SourceFiles="$(SolutionDir)db\import-tmpl\create_arrow_db.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\create_arrow_db.txt')" />
<Copy SourceFiles="$(SolutionDir)db\import-tmpl\elemental_db.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\elemental_db.txt')" />
<Copy SourceFiles="$(SolutionDir)db\import-tmpl\elemental_skill_db.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\elemental_skill_db.txt')" />
@@ -338,11 +349,10 @@
<Copy SourceFiles="$(SolutionDir)db\import-tmpl\mob_race2_db.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\mob_race2_db.txt')" />
<Copy SourceFiles="$(SolutionDir)db\import-tmpl\mob_random_db.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\mob_random_db.txt')" />
<Copy SourceFiles="$(SolutionDir)db\import-tmpl\mob_skill_db.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\mob_skill_db.txt')" />
- <Copy SourceFiles="$(SolutionDir)db\import-tmpl\packet_db.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\packet_db.txt')" />
<Copy SourceFiles="$(SolutionDir)db\import-tmpl\pet_db.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\pet_db.txt')" />
<Copy SourceFiles="$(SolutionDir)db\import-tmpl\produce_db.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\produce_db.txt')" />
<Copy SourceFiles="$(SolutionDir)db\import-tmpl\quest_db.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\quest_db.txt')" />
- <Copy SourceFiles="$(SolutionDir)db\import-tmpl\refine_db.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\refine_db.txt')" />
+ <Copy SourceFiles="$(SolutionDir)db\import-tmpl\refine_db.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\refine_db.yml')" />
<Copy SourceFiles="$(SolutionDir)db\import-tmpl\size_fix.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\size_fix.txt')" />
<Copy SourceFiles="$(SolutionDir)db\import-tmpl\skill_cast_db.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\skill_cast_db.txt')" />
<Copy SourceFiles="$(SolutionDir)db\import-tmpl\skill_castnodex_db.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\skill_castnodex_db.txt')" />
@@ -361,3 +371,4 @@
<Copy SourceFiles="$(SolutionDir)db\import-tmpl\status_disabled.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\status_disabled.txt')" />
</Target>
</Project>
+
diff --git a/src/map/map-server.vcxproj.filters b/src/map/map-server.vcxproj.filters
index b78f42f62af..073acf159df 100644
--- a/src/map/map-server.vcxproj.filters
+++ b/src/map/map-server.vcxproj.filters
@@ -11,246 +11,261 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="atcommand.h">
+ <ClInclude Include="achievement.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="battle.h">
+ <ClInclude Include="atcommand.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="battleground.h">
+ <ClInclude Include="battle.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="buyingstore.h">
+ <ClInclude Include="battleground.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="cashshop.h">
+ <ClInclude Include="buyingstore.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="channel.h">
+ <ClInclude Include="cashshop.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="chat.h">
+ <ClInclude Include="channel.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="chrif.h">
+ <ClInclude Include="chat.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="clif.h">
+ <ClInclude Include="chrif.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="date.h">
+ <ClInclude Include="clan.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="duel.h">
+ <ClInclude Include="clif.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="elemental.h">
+ <ClInclude Include="clif_obfuscation.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="guild.h">
+ <ClInclude Include="clif_packetdb.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="homunculus.h">
+ <ClInclude Include="clif_shuffle.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="instance.h">
+ <ClInclude Include="date.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="intif.h">
+ <ClInclude Include="duel.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="itemdb.h">
+ <ClInclude Include="elemental.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="log.h">
+ <ClInclude Include="guild.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="mail.h">
+ <ClInclude Include="homunculus.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="map.h">
+ <ClInclude Include="instance.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="mapreg.h">
+ <ClInclude Include="intif.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="mercenary.h">
+ <ClInclude Include="itemdb.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="mob.h">
+ <ClInclude Include="log.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="npc.h">
+ <ClInclude Include="mail.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="party.h">
+ <ClInclude Include="map.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="path.h">
+ <ClInclude Include="mapreg.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="pc.h">
+ <ClInclude Include="mercenary.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="pc_groups.h">
+ <ClInclude Include="mob.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="pet.h">
+ <ClInclude Include="npc.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="quest.h">
+ <ClInclude Include="party.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="script.h">
+ <ClInclude Include="path.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="script_constants.h">
+ <ClInclude Include="pc.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="searchstore.h">
+ <ClInclude Include="pc_groups.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="skill.h">
+ <ClInclude Include="pet.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="status.h">
+ <ClInclude Include="quest.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="storage.h">
+ <ClInclude Include="script.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="trade.h">
+ <ClInclude Include="script_constants.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="unit.h">
+ <ClInclude Include="searchstore.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="vending.h">
+ <ClInclude Include="skill.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="clan.h">
+ <ClInclude Include="status.hpp">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="storage.hpp">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="trade.hpp">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="unit.hpp">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="vending.hpp">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="atcommand.c">
+ <ClCompile Include="achievement.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="battle.c">
+ <ClCompile Include="atcommand.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="battleground.c">
+ <ClCompile Include="battle.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="buyingstore.c">
+ <ClCompile Include="battleground.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="cashshop.c">
+ <ClCompile Include="buyingstore.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="channel.c">
+ <ClCompile Include="cashshop.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="chat.c">
+ <ClCompile Include="channel.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="chrif.c">
+ <ClCompile Include="chat.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="clif.c">
+ <ClCompile Include="chrif.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="date.c">
+ <ClCompile Include="clan.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="duel.c">
+ <ClCompile Include="clif.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="elemental.c">
+ <ClCompile Include="date.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="guild.c">
+ <ClCompile Include="duel.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="homunculus.c">
+ <ClCompile Include="elemental.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="instance.c">
+ <ClCompile Include="guild.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="intif.c">
+ <ClCompile Include="homunculus.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="itemdb.c">
+ <ClCompile Include="instance.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="log.c">
+ <ClCompile Include="intif.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="mail.c">
+ <ClCompile Include="itemdb.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="map.cpp">
+ <ClCompile Include="log.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="mapreg.c">
+ <ClCompile Include="mail.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="map.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="mercenary.c">
+ <ClCompile Include="mapreg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="mob.c">
+ <ClCompile Include="mercenary.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="npc.c">
+ <ClCompile Include="mob.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="npc_chat.c">
+ <ClCompile Include="npc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="party.c">
+ <ClCompile Include="npc_chat.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="path.c">
+ <ClCompile Include="party.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="pc.c">
+ <ClCompile Include="path.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="pc_groups.c">
+ <ClCompile Include="pc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="pet.c">
+ <ClCompile Include="pc_groups.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="quest.c">
+ <ClCompile Include="pet.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="script.c">
+ <ClCompile Include="quest.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="searchstore.c">
+ <ClCompile Include="script.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="skill.c">
+ <ClCompile Include="searchstore.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="status.c">
+ <ClCompile Include="skill.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="storage.c">
+ <ClCompile Include="status.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="trade.c">
+ <ClCompile Include="storage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="unit.c">
+ <ClCompile Include="trade.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="vending.c">
+ <ClCompile Include="unit.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="clan.c">
+ <ClCompile Include="vending.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
diff --git a/src/map/map.cpp b/src/map/map.cpp
index 6dec394ce54..3b06cd032cc 100644
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -1,6 +1,11 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "map.hpp"
+
+#include <stdlib.h>
+#include <math.h>
+
#include "../common/cbasetypes.h"
#include "../common/core.h"
#include "../common/timer.h"
@@ -15,38 +20,34 @@
#include "../common/cli.h"
#include "../common/ers.h"
-#include "map.h"
-#include "path.h"
-#include "chrif.h"
-#include "clan.h"
-#include "clif.h"
-#include "duel.h"
-#include "intif.h"
-#include "npc.h"
-#include "pc.h"
-#include "chat.h"
-#include "storage.h"
-#include "trade.h"
-#include "party.h"
-#include "battleground.h"
-#include "quest.h"
-#include "mapreg.h"
-#include "pet.h"
-#include "homunculus.h"
-#include "instance.h"
-#include "mercenary.h"
-#include "elemental.h"
-#include "cashshop.h"
-#include "channel.h"
-
-#include <stdlib.h>
-#include <math.h>
-#ifndef _WIN32
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "path.hpp"
+#include "chrif.hpp"
+#include "clan.hpp"
+#include "clif.hpp"
+#include "duel.hpp"
+#include "intif.hpp"
+#include "npc.hpp"
+#include "pc.hpp"
+#include "chat.hpp"
+#include "storage.hpp"
+#include "trade.hpp"
+#include "party.hpp"
+#include "battleground.hpp"
+#include "quest.hpp"
+#include "mapreg.hpp"
+#include "pet.hpp"
+#include "homunculus.hpp"
+#include "instance.hpp"
+#include "mercenary.hpp"
+#include "elemental.hpp"
+#include "cashshop.hpp"
+#include "channel.hpp"
+#include "achievement.hpp"
+#include "guild.hpp"
+#include "atcommand.hpp"
+#include "battle.hpp"
+#include "log.hpp"
+#include "mob.hpp"
char default_codepage[32] = "";
@@ -114,7 +115,9 @@ static int block_free_count = 0, block_free_lock = 0;
static struct block_list *bl_list[BL_LIST_MAX];
static int bl_list_count = 0;
-#define MAP_MAX_MSG 1550
+#ifndef MAP_MAX_MSG
+ #define MAP_MAX_MSG 1550
+#endif
struct map_data map[MAX_MAP_PER_SERVER];
int map_num = 0;
@@ -161,6 +164,16 @@ char help2_txt[256] = "conf/help2.txt";
char charhelp_txt[256] = "conf/charhelp.txt";
char channel_conf[256] = "conf/channels.conf";
+const char *MSG_CONF_NAME_RUS;
+const char *MSG_CONF_NAME_SPN;
+const char *MSG_CONF_NAME_GRM;
+const char *MSG_CONF_NAME_CHN;
+const char *MSG_CONF_NAME_MAL;
+const char *MSG_CONF_NAME_IDN;
+const char *MSG_CONF_NAME_FRN;
+const char *MSG_CONF_NAME_POR;
+const char *MSG_CONF_NAME_THA;
+
char wisp_server_name[NAME_LENGTH] = "Server"; // can be modified in char-server configuration file
struct s_map_default map_default;
@@ -400,17 +413,20 @@ int map_moveblock(struct block_list *bl, int x1, int y1, unsigned int tick)
sc = status_get_sc(bl);
skill_unit_move(bl,tick,2);
- status_change_end(bl, SC_CLOSECONFINE, INVALID_TIMER);
- status_change_end(bl, SC_CLOSECONFINE2, INVALID_TIMER);
- status_change_end(bl, SC_TINDER_BREAKER, INVALID_TIMER);
- status_change_end(bl, SC_TINDER_BREAKER2, INVALID_TIMER);
-// status_change_end(bl, SC_BLADESTOP, INVALID_TIMER); //Won't stop when you are knocked away, go figure...
- status_change_end(bl, SC_TATAMIGAESHI, INVALID_TIMER);
- status_change_end(bl, SC_MAGICROD, INVALID_TIMER);
- status_change_end(bl, SC_SU_STOOP, INVALID_TIMER);
- if (sc->data[SC_PROPERTYWALK] &&
- sc->data[SC_PROPERTYWALK]->val3 >= skill_get_maxcount(sc->data[SC_PROPERTYWALK]->val1,sc->data[SC_PROPERTYWALK]->val2) )
- status_change_end(bl,SC_PROPERTYWALK,INVALID_TIMER);
+ if ( sc && sc->count ) //at least one to cancel
+ {
+ status_change_end(bl, SC_CLOSECONFINE, INVALID_TIMER);
+ status_change_end(bl, SC_CLOSECONFINE2, INVALID_TIMER);
+ status_change_end(bl, SC_TINDER_BREAKER, INVALID_TIMER);
+ status_change_end(bl, SC_TINDER_BREAKER2, INVALID_TIMER);
+ // status_change_end(bl, SC_BLADESTOP, INVALID_TIMER); //Won't stop when you are knocked away, go figure...
+ status_change_end(bl, SC_TATAMIGAESHI, INVALID_TIMER);
+ status_change_end(bl, SC_MAGICROD, INVALID_TIMER);
+ status_change_end(bl, SC_SU_STOOP, INVALID_TIMER);
+ if (sc->data[SC_PROPERTYWALK] &&
+ sc->data[SC_PROPERTYWALK]->val3 >= skill_get_maxcount(sc->data[SC_PROPERTYWALK]->val1,sc->data[SC_PROPERTYWALK]->val2) )
+ status_change_end(bl,SC_PROPERTYWALK,INVALID_TIMER);
+ }
} else
if (bl->type == BL_NPC)
npc_unsetcells((TBL_NPC*)bl);
@@ -696,9 +712,9 @@ int map_foreachinareaV(int(*func)(struct block_list*, va_list), int16 m, int16 x
return 0;
if (x1 < x0)
- swap(x0, x1);
+ SWAP(x0, x1);
if (y1 < y0)
- swap(y0, y1);
+ SWAP(y0, y1);
x0 = i16max(x0, 0);
y0 = i16max(y0, 0);
@@ -862,9 +878,9 @@ int map_forcountinarea(int (*func)(struct block_list*,va_list), int16 m, int16 x
return 0;
if ( x1 < x0 )
- swap(x0, x1);
+ SWAP(x0, x1);
if ( y1 < y0 )
- swap(y0, y1);
+ SWAP(y0, y1);
x0 = i16max(x0, 0);
y0 = i16max(y0, 0);
@@ -929,9 +945,9 @@ int map_foreachinmovearea(int (*func)(struct block_list*,va_list), struct block_
y1 = center->y + range;
if ( x1 < x0 )
- swap(x0, x1);
+ SWAP(x0, x1);
if ( y1 < y0 )
- swap(y0, y1);
+ SWAP(y0, y1);
if( dx == 0 || dy == 0 ) {
//Movement along one axis only.
@@ -1157,9 +1173,9 @@ int map_foreachinpath(int (*func)(struct block_list*,va_list),int16 m,int16 x0,i
//The two fors assume mx0 < mx1 && my0 < my1
if ( mx0 > mx1 )
- swap(mx0, mx1);
+ SWAP(mx0, mx1);
if ( my0 > my1 )
- swap(my0, my1);
+ SWAP(my0, my1);
mx0 = max(mx0, 0);
my0 = max(my0, 0);
@@ -1307,9 +1323,9 @@ int map_foreachindir(int(*func)(struct block_list*, va_list), int16 m, int16 x0,
//The following assumes mx0 < mx1 && my0 < my1
if (mx0 > mx1)
- swap(mx0, mx1);
+ SWAP(mx0, mx1);
if (my0 > my1)
- swap(my0, my1);
+ SWAP(my0, my1);
//Apply width to the path by turning 90 degrees
mx0 -= abs(range*dirx[(dir + 2) % 8]);
@@ -1500,7 +1516,7 @@ int map_clearflooritem_timer(int tid, unsigned int tick, int id, intptr_t data)
}
- if (search_petDB_index(fitem->item.nameid, PET_EGG) >= 0)
+ if (pet_db_search(fitem->item.nameid, PET_EGG))
intif_delete_petdata(MakeDWord(fitem->item.card[1], fitem->item.card[2]));
clif_clearflooritem(fitem, 0);
@@ -1849,6 +1865,12 @@ void map_reqnickdb(struct map_session_data * sd, int charid)
nullpo_retv(sd);
+ if (battle_config.reserved_costume_id && battle_config.reserved_costume_id == charid)
+ {
+ clif_solved_charname(sd->fd, charid, "Costume");
+ return;
+ }
+
tsd = map_charid2sd(charid);
if( tsd )
{
@@ -2000,6 +2022,7 @@ int map_quit(struct map_session_data *sd) {
status_change_end(&sd->bl, SC_CBC, INVALID_TIMER);
status_change_end(&sd->bl, SC_EQC, INVALID_TIMER);
status_change_end(&sd->bl, SC_SPRITEMABLE, INVALID_TIMER);
+ status_change_end(&sd->bl, SC_SV_ROOTTWIST, INVALID_TIMER);
// Remove visuals effect from headgear
status_change_end(&sd->bl, SC_MOONSTAR, INVALID_TIMER);
status_change_end(&sd->bl, SC_SUPER_STAR, INVALID_TIMER);
@@ -2020,7 +2043,6 @@ int map_quit(struct map_session_data *sd) {
// Both these statuses are removed on logout. [L0ne_W0lf]
status_change_end(&sd->bl, SC_SLOWCAST, INVALID_TIMER);
status_change_end(&sd->bl, SC_CRITICALWOUND, INVALID_TIMER);
- status_change_end(&sd->bl, SC_HEAT_BARREL_AFTER, INVALID_TIMER);
status_change_end(&sd->bl, SC_H_MINE, INVALID_TIMER);
status_change_end(&sd->bl, SC_ANTI_M_BLAST, INVALID_TIMER);
status_change_end(&sd->bl, SC_B_TRAP, INVALID_TIMER);
@@ -2703,7 +2725,7 @@ int map_addmobtolist(unsigned short m, struct spawn_data *spawn)
if( i < MAX_MOB_LIST_PER_MAP )
{
map[m].moblist[i] = spawn;
- return i;
+ return static_cast<int>(i);
}
return -1;
}
@@ -4384,6 +4406,7 @@ void do_final(void)
do_final_clif();
do_final_npc();
do_final_quest();
+ do_final_achievement();
do_final_script();
do_final_instance();
do_final_itemdb();
@@ -4394,7 +4417,7 @@ void do_final(void)
do_final_pet();
do_final_homunculus();
do_final_mercenary();
- do_final_mob();
+ do_final_mob(false);
do_final_msg();
do_final_skill();
do_final_status();
@@ -4696,7 +4719,7 @@ int do_init(int argc, char *argv[])
iwall_db = strdb_alloc(DB_OPT_RELEASE_DATA,2*NAME_LENGTH+2+1); // [Zephyrus] Invisible Walls
#ifdef ADJUST_SKILL_DAMAGE
- map_skill_damage_ers = ers_new(sizeof(struct s_skill_damage), "map.c:map_skill_damage_ers", ERS_OPT_NONE);
+ map_skill_damage_ers = ers_new(sizeof(struct s_skill_damage), "map.cpp:map_skill_damage_ers", ERS_OPT_NONE);
#endif
map_sql_init();
@@ -4738,6 +4761,7 @@ int do_init(int argc, char *argv[])
do_init_mercenary();
do_init_elemental();
do_init_quest();
+ do_init_achievement();
do_init_npc();
do_init_unit();
do_init_battleground();
@@ -4757,10 +4781,6 @@ int do_init(int argc, char *argv[])
shutdown_callback = do_shutdown;
runflag = MAPSERVER_ST_RUNNING;
}
-#if defined(BUILDBOT)
- if( buildbotflag )
- exit(EXIT_FAILURE);
-#endif
if( console ){ //start listening
add_timer_func_list(parse_console_timer, "parse_console_timer");
@@ -4770,6 +4790,3 @@ int do_init(int argc, char *argv[])
return 0;
}
-#ifdef __cplusplus
-}
-#endif
diff --git a/src/map/map.h b/src/map/map.hpp
similarity index 97%
rename from src/map/map.h
rename to src/map/map.hpp
index d790b42fe71..8aad2c79093 100644
--- a/src/map/map.h
+++ b/src/map/map.hpp
@@ -1,12 +1,10 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _MAP_H_
-#define _MAP_H_
+#ifndef _MAP_HPP_
+#define _MAP_HPP_
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <stdarg.h>
#include "../common/cbasetypes.h"
#include "../common/core.h" // CORE_ST_LAST
@@ -17,7 +15,17 @@ extern "C" {
#include "../config/core.h"
-#include <stdarg.h>
+extern "C" {
+ //Options read in cli (c-linkage for now)
+ extern const char*INTER_CONF_NAME;
+ extern const char*LOG_CONF_NAME;
+ extern const char*MAP_CONF_NAME;
+ extern const char*BATTLE_CONF_FILENAME;
+ extern const char*ATCOMMAND_CONF_FILENAME;
+ extern const char*SCRIPT_CONF_NAME;
+ extern const char*MSG_CONF_NAME_EN;
+ extern const char*GRF_PATH_FILENAME;
+}
struct npc_data;
struct item_data;
@@ -244,7 +252,7 @@ enum e_mapid {
//This stackable implementation does not means a BL can be more than one type at a time, but it's
//meant to make it easier to check for multiple types at a time on invocations such as map_foreach* calls [Skotlex]
-enum bl_type {
+enum bl_type : uint16{
BL_NUL = 0x000,
BL_PC = 0x001,
BL_MOB = 0x002,
@@ -264,7 +272,7 @@ enum bl_type {
#define BL_CHAR (BL_PC|BL_MOB|BL_HOM|BL_MER|BL_ELEM)
/// NPC Subtype
-enum npc_subtype {
+enum npc_subtype : uint8{
NPCTYPE_WARP, /// Warp
NPCTYPE_SHOP, /// Shop
NPCTYPE_SCRIPT, /// Script
@@ -275,7 +283,7 @@ enum npc_subtype {
NPCTYPE_MARKETSHOP, /// Marketshop
};
-enum e_race {
+enum e_race : int8{
RC_NONE_ = -1, //don't give us bonus
RC_FORMLESS = 0,
RC_UNDEAD,
@@ -292,7 +300,7 @@ enum e_race {
RC_MAX //auto upd enum for array size
};
-enum e_classAE {
+enum e_classAE : int8{
CLASS_NONE = -1, //don't give us bonus
CLASS_NORMAL = 0,
CLASS_BOSS,
@@ -302,7 +310,7 @@ enum e_classAE {
CLASS_MAX //auto upd enum for array len
};
-enum e_race2 {
+enum e_race2 : uint8{
RC2_NONE = 0,
RC2_GOBLIN,
RC2_KOBOLD,
@@ -321,7 +329,7 @@ enum e_race2 {
};
/// Element list
-enum e_element {
+enum e_element : int8{
ELE_NONE=-1,
ELE_NEUTRAL=0,
ELE_WATER,
@@ -509,7 +517,7 @@ enum _look {
};
// used by map_setcell()
-typedef enum {
+enum cell_t{
CELL_WALKABLE,
CELL_SHOOTABLE,
CELL_WATER,
@@ -522,10 +530,10 @@ typedef enum {
CELL_MAELSTROM,
CELL_ICEWALL,
-} cell_t;
+};
// used by map_getcell()
-typedef enum {
+enum cell_chk : uint8 {
CELL_GETTYPE, // Retrieves a cell's 'gat' type
CELL_CHKWALL, // Whether the cell is a wall (gat type 1)
@@ -546,7 +554,7 @@ typedef enum {
CELL_CHKMAELSTROM, // Whether the cell has Maelstrom
CELL_CHKICEWALL, // Whether the cell has Ice Wall
-} cell_chk;
+};
struct mapcell
{
@@ -930,25 +938,16 @@ void map_skill_damage_add(struct map_data *m, uint16 skill_id, int pc, int mob,
#define CHK_RACE2(race2) ((race2) >= RC2_NONE && (race2) < RC2_MAX) /// Check valid Race2
#define CHK_CLASS(class_) ((class_) > CLASS_NONE && (class_) < CLASS_MAX) /// Check valid Class
-//Options read in cli
-extern const char*INTER_CONF_NAME;
-extern const char*LOG_CONF_NAME;
-extern const char*MAP_CONF_NAME;
-extern const char*BATTLE_CONF_FILENAME;
-extern const char*ATCOMMAND_CONF_FILENAME;
-extern const char*SCRIPT_CONF_NAME;
-extern const char*MSG_CONF_NAME_EN;
-extern const char*GRF_PATH_FILENAME;
//Other languages supported
-const char*MSG_CONF_NAME_RUS;
-const char*MSG_CONF_NAME_SPN;
-const char*MSG_CONF_NAME_GRM;
-const char*MSG_CONF_NAME_CHN;
-const char*MSG_CONF_NAME_MAL;
-const char*MSG_CONF_NAME_IDN;
-const char*MSG_CONF_NAME_FRN;
-const char*MSG_CONF_NAME_POR;
-const char*MSG_CONF_NAME_THA;
+extern const char*MSG_CONF_NAME_RUS;
+extern const char*MSG_CONF_NAME_SPN;
+extern const char*MSG_CONF_NAME_GRM;
+extern const char*MSG_CONF_NAME_CHN;
+extern const char*MSG_CONF_NAME_MAL;
+extern const char*MSG_CONF_NAME_IDN;
+extern const char*MSG_CONF_NAME_FRN;
+extern const char*MSG_CONF_NAME_POR;
+extern const char*MSG_CONF_NAME_THA;
//Useful typedefs from jA [Skotlex]
typedef struct map_session_data TBL_PC;
@@ -1006,8 +1005,4 @@ extern char roulette_table[32];
void do_shutdown(void);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _MAP_H_ */
+#endif /* _MAP_HPP_ */
diff --git a/src/map/mapreg.c b/src/map/mapreg.cpp
similarity index 94%
rename from src/map/mapreg.c
rename to src/map/mapreg.cpp
index 500c42b57ba..77facc29f15 100644
--- a/src/map/mapreg.c
+++ b/src/map/mapreg.cpp
@@ -1,6 +1,10 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "mapreg.hpp"
+
+#include <stdlib.h>
+
#include "../common/cbasetypes.h"
#include "../common/db.h"
#include "../common/ers.h"
@@ -10,11 +14,8 @@
#include "../common/strlib.h"
#include "../common/timer.h"
-#include "map.h" // mmysql_handle
-#include "mapreg.h"
-#include "script.h"
-
-#include <stdlib.h>
+#include "map.hpp" // mmysql_handle
+#include "script.hpp"
static struct eri *mapreg_ers;
@@ -22,6 +23,7 @@ bool skip_insert = false;
static char mapreg_table[32] = "mapreg";
static bool mapreg_dirty = false; // Whether there are modified regs to be saved
+struct reg_db regs;
#define MAPREG_AUTOSAVE_INTERVAL (300*1000)
@@ -65,7 +67,7 @@ bool mapreg_setreg(int64 uid, int val)
const char* name = get_str(num);
if (val != 0) {
- if ((m = i64db_get(regs.vars, uid))) {
+ if ((m = static_cast<mapreg_save *>(i64db_get(regs.vars, uid)))) {
m->u.i = val;
if (name[1] != '@') {
m->save = true;
@@ -93,7 +95,7 @@ bool mapreg_setreg(int64 uid, int val)
} else { // val == 0
if (i)
script_array_update(®s, uid, true);
- if ((m = i64db_get(regs.vars, uid))) {
+ if ((m = static_cast<mapreg_save *>(i64db_get(regs.vars, uid)))) {
ers_free(mapreg_ers, m);
}
i64db_remove(regs.vars, uid);
@@ -132,14 +134,14 @@ bool mapreg_setregstr(int64 uid, const char* str)
if (SQL_ERROR == Sql_Query(mmysql_handle, "DELETE FROM `%s` WHERE `varname`='%s' AND `index`='%d'", mapreg_table, esc_name, i))
Sql_ShowDebug(mmysql_handle);
}
- if ((m = i64db_get(regs.vars, uid))) {
+ if ((m = static_cast<mapreg_save *>(i64db_get(regs.vars, uid)))) {
if (m->u.str != NULL)
aFree(m->u.str);
ers_free(mapreg_ers, m);
}
i64db_remove(regs.vars, uid);
} else {
- if ((m = i64db_get(regs.vars, uid))) {
+ if ((m = static_cast<mapreg_save *>(i64db_get(regs.vars, uid)))) {
if (m->u.str != NULL)
aFree(m->u.str);
m->u.str = aStrdup(str);
@@ -233,7 +235,7 @@ static void script_save_mapreg(void)
if (mapreg_dirty) {
DBIterator *iter = db_iterator(regs.vars);
struct mapreg_save *m;
- for (m = dbi_first(iter); dbi_exists(iter); m = dbi_next(iter)) {
+ for (m = static_cast<mapreg_save *>(dbi_first(iter)); dbi_exists(iter); m = static_cast<mapreg_save *>(dbi_next(iter))) {
if (m->save) {
int num = script_getvarid(m->uid);
int i = script_getvaridx(m->uid);
@@ -280,7 +282,7 @@ int mapreg_destroyreg(DBKey key, DBData *data, va_list ap)
if (data->type != DB_DATA_PTR) // Sanity check
return 0;
- m = db_data2ptr(data);
+ m = static_cast<mapreg_save *>(db_data2ptr(data));
if (m->is_string) {
if (m->u.str)
diff --git a/src/map/mapreg.h b/src/map/mapreg.hpp
similarity index 81%
rename from src/map/mapreg.h
rename to src/map/mapreg.hpp
index b73b731fa68..48b101fb8d0 100644
--- a/src/map/mapreg.h
+++ b/src/map/mapreg.hpp
@@ -1,14 +1,11 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _MAPREG_H_
-#define _MAPREG_H_
+#ifndef _MAPREG_HPP_
+#define _MAPREG_HPP_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "script.h"
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
struct mapreg_save {
int64 uid; ///< Unique ID
@@ -20,7 +17,7 @@ struct mapreg_save {
bool save; ///< Whether a save operation is pending
};
-struct reg_db regs;
+extern struct reg_db regs;
extern bool skip_insert;
void mapreg_reload(void);
@@ -34,8 +31,4 @@ bool mapreg_setreg(int64 uid, int val);
bool mapreg_setregstr(int64 uid, const char* str);
int mapreg_destroyreg(DBKey key, DBData *data, va_list ap);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _MAPREG_H_ */
+#endif /* _MAPREG_HPP_ */
diff --git a/src/map/mercenary.c b/src/map/mercenary.cpp
similarity index 77%
rename from src/map/mercenary.c
rename to src/map/mercenary.cpp
index 29d4f9d6c0e..dc85e6d7814 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.cpp
@@ -1,6 +1,12 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "mercenary.hpp"
+
+#include <stdlib.h>
+#include <map>
+#include <math.h>
+
#include "../common/cbasetypes.h"
#include "../common/malloc.h"
#include "../common/timer.h"
@@ -11,39 +17,28 @@
#include "../common/strlib.h"
#include "../common/utils.h"
-#include "log.h"
-#include "clif.h"
-#include "intif.h"
-#include "itemdb.h"
-#include "pc.h"
-#include "party.h"
-#include "trade.h"
-#include "mercenary.h"
-
-#include <stdlib.h>
-#include <math.h>
-
-struct s_mercenary_db mercenary_db[MAX_MERCENARY_CLASS]; // Mercenary Database
-static uint16 mercenary_count;
+#include "log.hpp"
+#include "clif.hpp"
+#include "intif.hpp"
+#include "itemdb.hpp"
+#include "pc.hpp"
+#include "party.hpp"
+#include "trade.hpp"
+#include "npc.hpp"
-/**
-* Search Mercenary by class
-* @param class_ Class ID of Mercenary
-* @return The index of mercenary on mercenary_db, or -1 if not found
-**/
-static int16 mercenary_search_index(int class_) {
- int16 i;
- ARR_FIND(0, mercenary_count, i, mercenary_db[i].class_ == class_);
- return (i == mercenary_count)?-1:i;
-}
+std::map<uint16, struct s_mercenary_db> mercenary_db_data;
/**
-* Check if the Class ID is a Mercenary
-* @param class_ The Class ID
-* @return true if Class ID is a Mercenary, false otherwise
-**/
-bool mercenary_class(int class_){
- return (bool)(mercenary_search_index(class_) > -1);
+ * Search Mercenary by class
+ * @param class_ Class ID of Mercenary
+ * @return A pointer to the mercenary db entry or nullptr if not found
+ **/
+struct s_mercenary_db *mercenary_db( uint16 class_ ){
+ if( mercenary_db_data.find(class_) != mercenary_db_data.end() ){
+ return &mercenary_db_data.at(class_);
+ }else{
+ return nullptr;
+ }
}
/**
@@ -51,12 +46,14 @@ bool mercenary_class(int class_){
* @param class_ The Class ID
* @return View Data of Mercenary
**/
-struct view_data * mercenary_get_viewdata(int class_){
- int i = mercenary_search_index(class_);
- if( i < 0 )
- return 0;
+struct view_data *mercenary_get_viewdata( uint16 class_ ){
+ struct s_mercenary_db *db = mercenary_db(class_);
- return &mercenary_db[i].vd;
+ if( db ){
+ return &db->vd;
+ }else{
+ return nullptr;
+ }
}
/**
@@ -80,16 +77,17 @@ short mercenary_skill_get_index(uint16 skill_id) {
* @param lifetime Contract duration
* @return false if failed, true otherwise
**/
-bool mercenary_create(struct map_session_data *sd, int class_, unsigned int lifetime) {
+bool mercenary_create(struct map_session_data *sd, uint16 class_, unsigned int lifetime) {
struct s_mercenary merc;
struct s_mercenary_db *db;
- int16 i;
nullpo_retr(false,sd);
- if( (i = mercenary_search_index(class_)) < 0 )
+ db = mercenary_db(class_);
+
+ if( !db ){
return false;
+ }
- db = &mercenary_db[i];
memset(&merc,0,sizeof(struct s_mercenary));
merc.char_id = sd->status.char_id;
@@ -121,24 +119,24 @@ int mercenary_get_lifetime(struct mercenary_data *md) {
/**
* Get Guild type of Mercenary
* @param md Mercenary
-* @return -1 if not found, 0 - ARCH_MERC_GUILD, 1 - SPEAR_MERC_GUILD, or 2 - SWORD_MERC_GUILD
+* @return enum e_MercGuildType
**/
-int mercenary_get_guild(struct mercenary_data *md){
+enum e_MercGuildType mercenary_get_guild(struct mercenary_data *md){
uint16 class_;
if( md == NULL || md->db == NULL )
- return -1;
+ return NONE_MERC_GUILD;
class_ = md->db->class_;
- if( class_ >= 6017 && class_ <= 6026 )
+ if( class_ >= MERID_MER_ARCHER01 && class_ <= MERID_MER_ARCHER10 )
return ARCH_MERC_GUILD;
- if( class_ >= 6027 && class_ <= 6036 )
+ if( class_ >= MERID_MER_LANCER01 && class_ <= MERID_MER_LANCER10 )
return SPEAR_MERC_GUILD;
- if( class_ >= 6037 && class_ <= 6046 )
+ if( class_ >= MERID_MER_SWORDMAN01 && class_ <= MERID_MER_SWORDMAN10 )
return SWORD_MERC_GUILD;
- return -1;
+ return NONE_MERC_GUILD;
}
/**
@@ -148,21 +146,24 @@ int mercenary_get_guild(struct mercenary_data *md){
**/
int mercenary_get_faith(struct mercenary_data *md) {
struct map_session_data *sd;
- uint16 class_;
+ enum e_MercGuildType guild;
if( md == NULL || md->db == NULL || (sd = md->master) == NULL )
return 0;
- class_ = md->db->class_;
-
- if( class_ >= 6017 && class_ <= 6026 )
- return sd->status.arch_faith;
- if( class_ >= 6027 && class_ <= 6036 )
- return sd->status.spear_faith;
- if( class_ >= 6037 && class_ <= 6046 )
- return sd->status.sword_faith;
-
- return 0;
+ guild = mercenary_get_guild(md);
+
+ switch( guild ){
+ case ARCH_MERC_GUILD:
+ return sd->status.arch_faith;
+ case SPEAR_MERC_GUILD:
+ return sd->status.spear_faith;
+ case SWORD_MERC_GUILD:
+ return sd->status.sword_faith;
+ case NONE_MERC_GUILD:
+ default:
+ return 0;
+ }
}
/**
@@ -172,22 +173,27 @@ int mercenary_get_faith(struct mercenary_data *md) {
**/
void mercenary_set_faith(struct mercenary_data *md, int value) {
struct map_session_data *sd;
- uint16 class_;
+ enum e_MercGuildType guild;
int *faith;
if( md == NULL || md->db == NULL || (sd = md->master) == NULL )
return;
- class_ = md->db->class_;
-
- if( class_ >= 6017 && class_ <= 6026 )
- faith = &sd->status.arch_faith;
- else if( class_ >= 6027 && class_ <= 6036 )
- faith = &sd->status.spear_faith;
- else if( class_ >= 6037 && class_ <= 6046 )
- faith = &sd->status.sword_faith;
- else
- return;
+ guild = mercenary_get_guild(md);
+
+ switch( guild ){
+ case ARCH_MERC_GUILD:
+ faith = &sd->status.arch_faith;
+ break;
+ case SPEAR_MERC_GUILD:
+ faith = &sd->status.spear_faith;
+ break;
+ case SWORD_MERC_GUILD:
+ faith = &sd->status.sword_faith;
+ break;
+ case NONE_MERC_GUILD:
+ return;
+ }
*faith += value;
*faith = cap_value(*faith, 0, SHRT_MAX);
@@ -201,21 +207,24 @@ void mercenary_set_faith(struct mercenary_data *md, int value) {
**/
int mercenary_get_calls(struct mercenary_data *md) {
struct map_session_data *sd;
- uint16 class_;
+ enum e_MercGuildType guild;
if( md == NULL || md->db == NULL || (sd = md->master) == NULL )
return 0;
- class_ = md->db->class_;
-
- if( class_ >= 6017 && class_ <= 6026 )
- return sd->status.arch_calls;
- if( class_ >= 6027 && class_ <= 6036 )
- return sd->status.spear_calls;
- if( class_ >= 6037 && class_ <= 6046 )
- return sd->status.sword_calls;
-
- return 0;
+ guild = mercenary_get_guild(md);
+
+ switch( guild ){
+ case ARCH_MERC_GUILD:
+ return sd->status.arch_calls;
+ case SPEAR_MERC_GUILD:
+ return sd->status.spear_calls;
+ case SWORD_MERC_GUILD:
+ return sd->status.sword_calls;
+ case NONE_MERC_GUILD:
+ default:
+ return 0;
+ }
}
/**
@@ -225,22 +234,27 @@ int mercenary_get_calls(struct mercenary_data *md) {
**/
void mercenary_set_calls(struct mercenary_data *md, int value) {
struct map_session_data *sd;
- uint16 class_;
+ enum e_MercGuildType guild;
int *calls;
if( md == NULL || md->db == NULL || (sd = md->master) == NULL )
return;
- class_ = md->db->class_;
-
- if( class_ >= 6017 && class_ <= 6026 )
- calls = &sd->status.arch_calls;
- else if( class_ >= 6027 && class_ <= 6036 )
- calls = &sd->status.spear_calls;
- else if( class_ >= 6037 && class_ <= 6046 )
- calls = &sd->status.sword_calls;
- else
- return;
+ guild = mercenary_get_guild(md);
+
+ switch( guild ){
+ case ARCH_MERC_GUILD:
+ calls = &sd->status.arch_calls;
+ break;
+ case SPEAR_MERC_GUILD:
+ calls = &sd->status.spear_calls;
+ break;
+ case SWORD_MERC_GUILD:
+ calls = &sd->status.sword_calls;
+ break;
+ case NONE_MERC_GUILD:
+ return;
+ }
*calls += value;
*calls = cap_value(*calls, 0, INT_MAX);
@@ -345,16 +359,16 @@ bool mercenary_recv_data(struct s_mercenary *merc, bool flag)
struct map_session_data *sd;
struct mercenary_data *md;
struct s_mercenary_db *db;
- int i = mercenary_search_index(merc->class_);
+
+ db = mercenary_db(merc->class_);
if( (sd = map_charid2sd(merc->char_id)) == NULL )
return false;
- if( !flag || i < 0 ) { // Not created - loaded - DB info
+ if( !flag || !db ){ // Not created - loaded - DB info
sd->status.mer_id = 0;
return false;
}
- db = &mercenary_db[i];
if( !sd->md ) {
sd->md = md = (struct mercenary_data*)aCalloc(1,sizeof(struct mercenary_data));
md->bl.type = BL_MER;
@@ -475,16 +489,11 @@ int mercenary_checkskill(struct mercenary_data *md, uint16 skill_id) {
static bool mercenary_readdb_sub(char* str[], int columns, int current)
{
int ele;
- uint16 i, class_ = atoi(str[0]);
+ uint16 class_ = atoi(str[0]);
struct s_mercenary_db *db;
struct status_data *status;
- //Find the ID, already exist or not in mercenary_db
- ARR_FIND(0,mercenary_count,i,mercenary_db[i].class_ == class_);
- if (i >= mercenary_count)
- db = &mercenary_db[mercenary_count];
- else
- db = &mercenary_db[i];
+ db = &mercenary_db_data[class_];
db->class_ = class_;
safestrncpy(db->sprite, str[1], NAME_LENGTH);
@@ -532,8 +541,6 @@ static bool mercenary_readdb_sub(char* str[], int columns, int current)
status->amotion = atoi(str[24]);
status->dmotion = atoi(str[25]);
- if (i >= mercenary_count)
- mercenary_count++;
return true;
}
@@ -544,10 +551,10 @@ void mercenary_readdb(void) {
const char *filename[]={ "mercenary_db.txt",DBIMPORT"/mercenary_db.txt"};
uint8 i;
- mercenary_count = 0; //Reset the counter
- memset(mercenary_db,0,sizeof(mercenary_db));
+ mercenary_db_data.clear();
+
for(i = 0; i<ARRAYLENGTH(filename); i++){
- sv_readdb(db_path, filename[i], ',', 26, 26, MAX_MERCENARY_CLASS, &mercenary_readdb_sub, i);
+ sv_readdb(db_path, filename[i], ',', 26, 26, -1, &mercenary_readdb_sub, i > 0);
}
}
@@ -558,13 +565,11 @@ static bool mercenary_read_skilldb_sub(char* str[], int columns, int current)
{// <merc id>,<skill id>,<skill level>
struct s_mercenary_db *db;
uint16 class_, skill_id, skill_lv;
- uint8 i = 0;
short idx = -1;
class_ = atoi(str[0]);
- ARR_FIND(0, MAX_MERCENARY_CLASS, i, class_ == mercenary_db[i].class_);
- if( i == MAX_MERCENARY_CLASS )
- {
+ db = mercenary_db(class_);
+ if( !db ){
ShowError("read_mercenary_skilldb : Class %d not found in mercenary_db for skill entry.\n", class_);
return false;
}
@@ -575,7 +580,6 @@ static bool mercenary_read_skilldb_sub(char* str[], int columns, int current)
return false;
}
- db = &mercenary_db[i];
skill_lv = atoi(str[2]);
db->skill[idx].id = skill_id;
@@ -592,7 +596,7 @@ void mercenary_read_skilldb(void){
uint8 i;
for(i = 0; i<ARRAYLENGTH(filename); i++){
- sv_readdb(db_path, filename[i], ',', 3, 3, -1, &mercenary_read_skilldb_sub, i);
+ sv_readdb(db_path, filename[i], ',', 3, 3, -1, &mercenary_read_skilldb_sub, i > 0);
}
}
@@ -610,5 +614,5 @@ void do_init_mercenary(void){
* Do Final Mercenary datas
**/
void do_final_mercenary(void){
- //Nothing to do yet
+ mercenary_db_data.clear();
}
diff --git a/src/map/mercenary.h b/src/map/mercenary.hpp
similarity index 72%
rename from src/map/mercenary.h
rename to src/map/mercenary.hpp
index 6a2d17e8ffa..6d3a4471289 100644
--- a/src/map/mercenary.h
+++ b/src/map/mercenary.hpp
@@ -1,25 +1,33 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _MERCENARY_H_
-#define _MERCENARY_H_
+#ifndef _MERCENARY_HPP_
+#define _MERCENARY_HPP_
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "../common/cbasetypes.h"
-#include "status.h" // struct status_data, struct status_change
-#include "unit.h" // struct unit_data
+#include "status.hpp" // struct status_data, struct status_change
+#include "unit.hpp" // struct unit_data
// number of cells that a mercenary can walk to from it's master before being warped
#define MAX_MER_DISTANCE 15
-enum {
+enum e_MercGuildType {
+ NONE_MERC_GUILD = -1,
ARCH_MERC_GUILD,
SPEAR_MERC_GUILD,
SWORD_MERC_GUILD,
};
+enum MERID {
+ MERID_MER_ARCHER01 = 6017,
+ MERID_MER_ARCHER10 = 6026,
+ MERID_MER_LANCER01,
+ MERID_MER_LANCER10 = 6036,
+ MERID_MER_SWORDMAN01,
+ MERID_MER_SWORDMAN10 = 6046
+};
+
struct s_mercenary_db {
int class_;
char sprite[NAME_LENGTH], name[NAME_LENGTH];
@@ -32,8 +40,6 @@ struct s_mercenary_db {
} skill[MAX_MERCSKILL];
};
-extern struct s_mercenary_db mercenary_db[MAX_MERCENARY_CLASS];
-
struct mercenary_data {
struct block_list bl;
struct unit_data ud;
@@ -53,10 +59,10 @@ struct mercenary_data {
unsigned devotion_flag : 1;
};
-bool mercenary_class(int class_);
-struct view_data * mercenary_get_viewdata(int class_);
+struct s_mercenary_db *mercenary_db(uint16 class_);
+struct view_data * mercenary_get_viewdata(uint16 class_);
-bool mercenary_create(struct map_session_data *sd, int class_, unsigned int lifetime);
+bool mercenary_create(struct map_session_data *sd, uint16 class_, unsigned int lifetime);
bool mercenary_recv_data(struct s_mercenary *merc, bool flag);
void mercenary_save(struct mercenary_data *md);
@@ -67,7 +73,7 @@ int mercenary_delete(struct mercenary_data *md, int reply);
void mercenary_contract_stop(struct mercenary_data *md);
int mercenary_get_lifetime(struct mercenary_data *md);
-int mercenary_get_guild(struct mercenary_data *md);
+enum e_MercGuildType mercenary_get_guild(struct mercenary_data *md);
int mercenary_get_faith(struct mercenary_data *md);
void mercenary_set_faith(struct mercenary_data *md, int value);
int mercenary_get_calls(struct mercenary_data *md);
@@ -86,8 +92,4 @@ void mercenary_read_skilldb(void);
void do_init_mercenary(void);
void do_final_mercenary(void);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _MERCENARY_H_ */
+#endif /* _MERCENARY_HPP_ */
diff --git a/src/map/mob.c b/src/map/mob.cpp
similarity index 89%
rename from src/map/mob.c
rename to src/map/mob.cpp
index 6549ce4b239..22791c68e3c 100644
--- a/src/map/mob.c
+++ b/src/map/mob.cpp
@@ -1,6 +1,12 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "mob.hpp"
+
+#include <stdlib.h>
+#include <map>
+#include <math.h>
+
#include "../common/cbasetypes.h"
#include "../common/timer.h"
#include "../common/db.h"
@@ -13,20 +19,26 @@
#include "../common/utils.h"
#include "../common/socket.h"
-#include "map.h"
-#include "path.h"
-#include "clif.h"
-#include "intif.h"
-#include "pc.h"
-#include "pet.h"
-#include "homunculus.h"
-#include "mercenary.h"
-#include "elemental.h"
-#include "party.h"
-#include "quest.h"
-
-#include <stdlib.h>
-#include <math.h>
+#include "map.hpp"
+#include "path.hpp"
+#include "clif.hpp"
+#include "intif.hpp"
+#include "pc.hpp"
+#include "pet.hpp"
+#include "homunculus.hpp"
+#include "mercenary.hpp"
+#include "elemental.hpp"
+#include "party.hpp"
+#include "quest.hpp"
+#include "npc.hpp"
+#include "guild.hpp"
+#include "battle.hpp"
+#include "log.hpp"
+#include "achievement.hpp"
+
+#include <vector>
+#include <unordered_map>
+#include <algorithm>
#define ACTIVE_AI_RANGE 2 //Distance added on top of 'AREA_SIZE' at which mobs enter active AI mode.
@@ -41,7 +53,6 @@
#define MOB_MAX_DELAY (24*3600*1000)
#define MAX_MINCHASE 30 //Max minimum chase value to use for mobs.
#define RUDE_ATTACKED_COUNT 1 //After how many rude-attacks should the skill be used?
-#define MAX_MOB_CHAT 50 //Max Skill's messages
// On official servers, monsters will only seek targets that are closer to walk to than their
// search range. The search range is affected depending on if the monster is walking or not.
@@ -52,16 +63,38 @@
// Disable this to make monsters not do any path search when looking for a target (old behavior).
#define ACTIVEPATHSEARCH
-//Dynamic mob database, allows saving of memory when there's big gaps in the mob_db [Skotlex]
-//!NOTE: Mob ID is used also as index in mob db
-struct mob_db *mob_db_data[MAX_MOB_DB+1];
-struct mob_db *mob_dummy = NULL; //Dummy mob to be returned when a non-existant one is requested.
+// Limits for the monster database
+#define MIN_MOB_DB 1000
+#define MAX_MOB_DB 3999
+#define MIN_MOB_DB2 20020
+#define MAX_MOB_DB2 31999
+
+// These define the range of available IDs for clones. [Valaris]
+#define MOB_CLONE_START MAX_MOB_DB
+#define MOB_CLONE_END MIN_MOB_DB2
+
+//Dynamic mob database
+std::map<uint16, struct mob_db> mob_db_data;
+struct mob_db *mob_db( int mob_id ){
+ if( mob_db_data.find( mob_id ) != mob_db_data.end() ){
+ return &mob_db_data.at(mob_id);
+ }else{
+ return nullptr;
+ }
+}
-struct mob_db *mob_db(int mob_id) { if (mob_id < 0 || mob_id > MAX_MOB_DB || mob_db_data[mob_id] == NULL) return mob_dummy; return mob_db_data[mob_id]; }
+// holds Monster Spawn informations
+std::unordered_map<uint16, std::vector<spawn_info>> mob_spawn_data;
//Dynamic mob chat database
-struct mob_chat *mob_chat_db[MAX_MOB_CHAT+1];
-struct mob_chat *mob_chat(short id) { if(id<=0 || id>MAX_MOB_CHAT || mob_chat_db[id]==NULL) return (struct mob_chat*)NULL; return mob_chat_db[id]; }
+std::map<short,struct mob_chat> mob_chat_db;
+struct mob_chat *mob_chat(short id) {
+ if( mob_chat_db.find(id) != mob_chat_db.end() ){
+ return &mob_chat_db.at(id);
+ }else{
+ return nullptr;
+ }
+}
//Dynamic item drop ratio database for per-item drop ratio modifiers overriding global drop ratios.
#define MAX_ITEMRATIO_MOBS 10
@@ -80,14 +113,6 @@ struct s_mob_skill {
};
static DBMap *mob_skill_db; /// Monster skill temporary db. s_mob_skill -> mobid
-struct mob_db *mobdb_exists(uint16 mob_id) {
- struct mob_db *db = mob_db(mob_id);
-
- if (db == mob_dummy)
- return NULL;
- return db;
-}
-
static struct eri *item_drop_ers; //For loot drops delay structures.
static struct eri *item_drop_list_ers;
@@ -107,38 +132,9 @@ static DBMap *mob_summon_db; /// Random Summon DB. struct s_randomsummon_group -
/*==========================================
* Local prototype declaration (only required thing)
*------------------------------------------*/
-static int mob_makedummymobdb(int);
static int mob_spawn_guardian_sub(int tid, unsigned int tick, int id, intptr_t data);
int mob_skill_id2skill_idx(int mob_id,uint16 skill_id);
-/*==========================================
- * Mob is searched with a name.
- *------------------------------------------*/
-int mobdb_searchname(const char *str)
-{
- int i;
- for(i=0;i<=MAX_MOB_DB;i++){
- struct mob_db *mob = mob_db(i);
- if(mob == mob_dummy) //Skip dummy mobs.
- continue;
- if(strcmpi(mob->name,str)==0 || strcmpi(mob->jname,str)==0 || strcmpi(mob->sprite,str)==0)
- return i;
- }
- return 0;
-}
-static int mobdb_searchname_array_sub(struct mob_db* mob, const char *str)
-{
- if (mob == mob_dummy)
- return 1;
- if(!mob->base_exp && !mob->job_exp && mob->spawn[0].qty < 1)
- return 1; // Monsters with no base/job exp and no spawn point are, by this criteria, considered "slave mobs" and excluded from search results
- if(stristr(mob->jname,str))
- return 0;
- if(stristr(mob->name,str))
- return 0;
- return strcmpi(mob->jname,str);
-}
-
/*========================================== [Playtester]
* Removes all characters that spotted the monster but are no longer online
* @param md: Monster whose spotted log should be cleaned
@@ -297,32 +293,79 @@ void mvptomb_destroy(struct mob_data *md) {
md->tomb_nid = 0;
}
+/**
+ * Sub function for mob namesearch. Here is defined which are accepted.
+*/
+static bool mobdb_searchname_sub(uint16 mob_id, const char * const str, bool full_cmp)
+{
+ const struct mob_db * const mob = mob_db(mob_id);
+
+ if( mobdb_checkid(mob_id) <= 0 )
+ return false; // invalid mob_id (includes clone check)
+ if(!mob->base_exp && !mob->job_exp && !mob_has_spawn(mob_id))
+ return false; // Monsters with no base/job exp and no spawn point are, by this criteria, considered "slave mobs" and excluded from search results
+ if( full_cmp ) {
+ // str must equal the db value
+ if( strcmpi(mob->name, str) == 0 ||
+ strcmpi(mob->jname, str) == 0 ||
+ strcmpi(mob->sprite, str) == 0 )
+ return true;
+ } else {
+ // str must be in the db value
+ if( stristr(mob->name, str) != NULL ||
+ stristr(mob->jname, str) != NULL ||
+ stristr(mob->sprite, str) != NULL )
+ return true;
+ }
+ return false;
+}
+
+/**
+ * Searches for the Mobname
+*/
+uint16 mobdb_searchname_(const char * const str, bool full_cmp)
+{
+ for( auto const &mobdb_pair : mob_db_data ) {
+ const uint16 mob_id = mobdb_pair.first;
+ if( mobdb_searchname_sub(mob_id, str, full_cmp) )
+ return mob_id;
+ }
+ return 0;
+}
+
+uint16 mobdb_searchname(const char * const str)
+{
+ return mobdb_searchname_(str, true);
+}
/*==========================================
* Founds up to N matches. Returns number of matches [Skotlex]
*------------------------------------------*/
-int mobdb_searchname_array(struct mob_db** data, int size, const char *str)
+int mobdb_searchname_array_(const char *str, uint16 * out, int size, bool full_cmp)
{
- int count = 0, i;
- struct mob_db* mob;
- for(i=0;i<=MAX_MOB_DB;i++){
- mob = mob_db(i);
- if (mob == mob_dummy || mob_is_clone(i) ) //keep clones out (or you leak player stats)
- continue;
- if (!mobdb_searchname_array_sub(mob, str)) {
- if (count < size)
- data[count] = mob;
+ unsigned short count = 0;
+ for( auto const &mobdb_pair : mob_db_data ) {
+ const uint16 mob_id = mobdb_pair.first;
+ if( mobdb_searchname_sub(mob_id, str, full_cmp) ) {
+ if( count < size )
+ out[count] = mob_id;
count++;
}
}
+
return count;
}
+int mobdb_searchname_array(const char *str, uint16 * out, int size)
+{
+ return mobdb_searchname_array_(str, out, size, false);
+}
+
/*==========================================
* Id Mob is checked.
*------------------------------------------*/
int mobdb_checkid(const int id)
{
- if (mob_db(id) == mob_dummy)
+ if (mob_db(id) == NULL)
return 0;
if (mob_is_clone(id)) //checkid is used mostly for random ID based code, therefore clone mobs are out of the question.
return 0;
@@ -334,10 +377,52 @@ int mobdb_checkid(const int id)
*------------------------------------------*/
struct view_data * mob_get_viewdata(int mob_id)
{
- if (mob_db(mob_id) == mob_dummy)
- return 0;
- return &mob_db(mob_id)->vd;
+ struct mob_db* db = mob_db(mob_id);
+
+ if( !db ) return nullptr;
+
+ return &db->vd;
+}
+
+/**
+ * Create unique view data associated to a spawned monster.
+ * @param md: Mob to adjust
+ */
+void mob_set_dynamic_viewdata( struct mob_data* md ){
+ // If it is a valid monster and it has not already been created
+ if( md && !md->vd_changed ){
+ // Allocate a dynamic entry
+ struct view_data* vd = (struct view_data*)aMalloc( sizeof( struct view_data ) );
+
+ // Copy the current values
+ memcpy( vd, md->vd, sizeof( struct view_data ) );
+
+ // Update the pointer to the new entry
+ md->vd = vd;
+
+ // Flag it as changed so it is freed later on
+ md->vd_changed = true;
+ }
+}
+
+/**
+ * Free any view data associated to a spawned monster.
+ * @param md: Mob to free
+ */
+void mob_free_dynamic_viewdata( struct mob_data* md ){
+ // If it is a valid monster and it has already been allocated
+ if( md && md->vd_changed ){
+ // Free it
+ aFree( md->vd );
+
+ // Remove the reference
+ md->vd = NULL;
+
+ // Unflag it as changed
+ md->vd_changed = false;
+ }
}
+
/*==========================================
* Cleans up mob-spawn data to make it "valid"
*------------------------------------------*/
@@ -418,7 +503,7 @@ int mob_get_random_id(int type, int flag, int lv)
struct mob_db *mob;
int i = 0, mob_id = 0, rand = 0;
struct s_randomsummon_group *msummon = (struct s_randomsummon_group *)idb_get(mob_summon_db, type);
- struct s_randomsummon_entry *entry = NULL;
+ struct s_randomsummon_entry *entry = nullptr;
if (type == MOBG_Bloody_Dead_Branch)
flag &= ~4;
@@ -438,17 +523,19 @@ int mob_get_random_id(int type, int flag, int lv)
mob_id = entry->mob_id;
mob = mob_db(mob_id);
} while ((rand == 0 || // Skip default first
- mob == mob_dummy ||
+ mob == nullptr ||
mob_is_clone(mob_id) ||
(flag&0x01 && (entry->rate < 1000000 && entry->rate <= rnd() % 1000000)) ||
(flag&0x02 && lv < mob->lv) ||
(flag&0x04 && status_has_mode(&mob->status,MD_STATUS_IMMUNE) ) ||
- (flag&0x08 && mob->spawn[0].qty < 1) ||
+ (flag&0x08 && !mob_has_spawn(mob_id)) ||
(flag&0x10 && status_has_mode(&mob->status,MD_IGNOREMELEE|MD_IGNOREMAGIC|MD_IGNORERANGED|MD_IGNOREMISC) )
) && (i++) < MAX_MOB_DB && msummon->count > 1);
- if (i >= MAX_MOB_DB && &msummon->list[0]) // no suitable monster found, use fallback for given list
+ if (i >= MAX_MOB_DB && &msummon->list[0]) {
+ ShowError("mob_get_random_id: no suitable monster found, use fallback for given list. Last_MobID: %d\n", mob_id);
mob_id = msummon->list[0].mob_id;
+ }
return mob_id;
}
@@ -470,14 +557,14 @@ bool mob_ksprotected (struct block_list *src, struct block_list *target)
if( !(md = BL_CAST(BL_MOB,target)) )
return false; // Tarjet is not MOB
- if( (s_bl = battle_get_master(src)) == NULL )
+ if( (s_bl = battle_get_master(src)) == nullptr )
s_bl = src;
if( !(sd = BL_CAST(BL_PC,s_bl)) )
return false; // Master is not PC
t_bl = map_id2bl(md->target_id);
- if( !t_bl || (s_bl = battle_get_master(t_bl)) == NULL )
+ if( !t_bl || (s_bl = battle_get_master(t_bl)) == nullptr )
s_bl = t_bl;
t_sd = BL_CAST(BL_PC,s_bl);
@@ -493,7 +580,7 @@ bool mob_ksprotected (struct block_list *src, struct block_list *target)
if( md->db->mexp || md->master_id )
return false; // MVP, Slaves mobs ignores KS
- if( (sce = md->sc.data[SC_KSPROTECTED]) == NULL )
+ if( (sce = md->sc.data[SC_KSPROTECTED]) == nullptr )
break; // No KS Protected
if( sd->bl.id == sce->val1 || // Same Owner
@@ -539,11 +626,11 @@ bool mob_ksprotected (struct block_list *src, struct block_list *target)
return false;
}
-struct mob_data *mob_once_spawn_sub(struct block_list *bl, int16 m, int16 x, int16 y, const char *mobname, int mob_id, const char *event, unsigned int size, unsigned int ai)
+struct mob_data *mob_once_spawn_sub(struct block_list *bl, int16 m, int16 x, int16 y, const char *mobname, int mob_id, const char *event, unsigned int size, enum mob_ai ai)
{
struct spawn_data data;
- memset(&data, 0, sizeof(struct spawn_data));
+ memset(&data, 0, sizeof(struct spawn_data)); //why ? this might screw attribute object and cause leak..
data.m = m;
data.num = 1;
data.id = mob_id;
@@ -573,7 +660,7 @@ struct mob_data *mob_once_spawn_sub(struct block_list *bl, int16 m, int16 x, int
data.y = y;
if (!mob_parse_dataset(&data))
- return NULL;
+ return nullptr;
return mob_spawn_dataset(&data);
}
@@ -581,9 +668,9 @@ struct mob_data *mob_once_spawn_sub(struct block_list *bl, int16 m, int16 x, int
/*==========================================
* Spawn a single mob on the specified coordinates.
*------------------------------------------*/
-int mob_once_spawn(struct map_session_data* sd, int16 m, int16 x, int16 y, const char* mobname, int mob_id, int amount, const char* event, unsigned int size, unsigned int ai)
+int mob_once_spawn(struct map_session_data* sd, int16 m, int16 x, int16 y, const char* mobname, int mob_id, int amount, const char* event, unsigned int size, enum mob_ai ai)
{
- struct mob_data* md = NULL;
+ struct mob_data* md = nullptr;
int count, lv;
if (m < 0 || amount <= 0)
@@ -602,7 +689,7 @@ int mob_once_spawn(struct map_session_data* sd, int16 m, int16 x, int16 y, const
if (mob_id == MOBID_EMPERIUM)
{
struct guild_castle* gc = guild_mapindex2gc(map[m].index);
- struct guild* g = (gc) ? guild_search(gc->guild_id) : NULL;
+ struct guild* g = (gc) ? guild_search(gc->guild_id) : nullptr;
if (gc)
{
md->guardian_data = (struct guardian_data*)aCalloc(1, sizeof(struct guardian_data));
@@ -633,7 +720,7 @@ int mob_once_spawn(struct map_session_data* sd, int16 m, int16 x, int16 y, const
/*==========================================
* Spawn mobs in the specified area.
*------------------------------------------*/
-int mob_once_spawn_area(struct map_session_data* sd, int16 m, int16 x0, int16 y0, int16 x1, int16 y1, const char* mobname, int mob_id, int amount, const char* event, unsigned int size, unsigned int ai)
+int mob_once_spawn_area(struct map_session_data* sd, int16 m, int16 x0, int16 y0, int16 x1, int16 y1, const char* mobname, int mob_id, int amount, const char* event, unsigned int size, enum mob_ai ai)
{
int i, max, id = 0;
int lx = -1, ly = -1;
@@ -643,9 +730,9 @@ int mob_once_spawn_area(struct map_session_data* sd, int16 m, int16 x0, int16 y0
// normalize x/y coordinates
if (x0 > x1)
- swap(x0, x1);
+ SWAP(x0, x1);
if (y0 > y1)
- swap(y0, y1);
+ SWAP(y0, y1);
// choose a suitable max. number of attempts
max = (y1 - y0 + 1)*(x1 - x0 + 1)*3;
@@ -694,7 +781,7 @@ static int mob_spawn_guardian_sub(int tid, unsigned int tick, int id, intptr_t d
struct guild* g;
int guardup_lv;
- if (bl == NULL) //It is possible mob was already removed from map when the castle has no owner. [Skotlex]
+ if (bl == nullptr) //It is possible mob was already removed from map when the castle has no owner. [Skotlex]
return 0;
if (bl->type != BL_MOB)
@@ -707,7 +794,7 @@ static int mob_spawn_guardian_sub(int tid, unsigned int tick, int id, intptr_t d
nullpo_ret(md->guardian_data);
g = guild_search((int)data);
- if (g == NULL)
+ if (g == nullptr)
{ //Liberate castle, if the guild is not found this is an error! [Skotlex]
ShowError("mob_spawn_guardian_sub: Couldn't load guild %d!\n", (int)data);
if (md->mob_id == MOBID_EMPERIUM)
@@ -739,12 +826,12 @@ static int mob_spawn_guardian_sub(int tid, unsigned int tick, int id, intptr_t d
*------------------------------------------*/
int mob_spawn_guardian(const char* mapname, int16 x, int16 y, const char* mobname, int mob_id, const char* event, int guardian, bool has_index)
{
- struct mob_data *md=NULL;
+ struct mob_data *md=nullptr;
struct spawn_data data;
- struct guild *g=NULL;
+ struct guild *g=nullptr;
struct guild_castle *gc;
int16 m;
- memset(&data, 0, sizeof(struct spawn_data));
+ memset(&data, 0, sizeof(struct spawn_data)); //fixme
data.num = 1;
m=map_mapname2mapid(mapname);
@@ -844,7 +931,7 @@ int mob_spawn_guardian(const char* mapname, int16 x, int16 y, const char* mobnam
*------------------------------------------*/
int mob_spawn_bg(const char* mapname, int16 x, int16 y, const char* mobname, int mob_id, const char* event, unsigned int bg_id)
{
- struct mob_data *md = NULL;
+ struct mob_data *md = nullptr;
struct spawn_data data;
int16 m;
@@ -1187,7 +1274,7 @@ static int mob_ai_sub_hard_activesearch(struct block_list *bl,va_list ap)
nullpo_ret(bl);
md=va_arg(ap,struct mob_data *);
target= va_arg(ap,struct block_list**);
- mode= va_arg(ap,enum e_mode);
+ mode= static_cast<enum e_mode>(va_arg(ap, int));
//If can't seek yet, not an enemy, or you can't attack it, skip.
if ((*target) == bl || !status_check_skilluse(&md->bl, bl, 0, 0))
@@ -1294,7 +1381,7 @@ static int mob_ai_sub_hard_lootsearch(struct block_list *bl,va_list ap)
dist = distance_bl(&md->bl, bl);
if (mob_can_reach(md,bl,dist+1, MSS_LOOT) && (
- (*target) == NULL ||
+ (*target) == nullptr ||
(battle_config.monster_loot_search_type && md->target_id > bl->id) ||
(!battle_config.monster_loot_search_type && !check_distance_bl(&md->bl, *target, dist)) // New target closer than previous one.
))
@@ -1349,7 +1436,7 @@ static int mob_ai_sub_hard_slavemob(struct mob_data *md,unsigned int tick)
status_kill(&md->bl);
return 1;
}
- if (bl->prev == NULL)
+ if (bl->prev == nullptr)
return 0; //Master not on a map? Could be warping, do not process.
if(status_has_mode(&md->status,MD_CANMOVE))
@@ -1396,7 +1483,7 @@ static int mob_ai_sub_hard_slavemob(struct mob_data *md,unsigned int tick)
md->last_linktime = tick;
if (ud) {
- struct block_list *tbl=NULL;
+ struct block_list *tbl=nullptr;
if (ud->target && ud->state.attack_continue)
tbl = map_id2bl(ud->target);
else if (ud->target_to && ud->state.attack_continue)
@@ -1405,7 +1492,7 @@ static int mob_ai_sub_hard_slavemob(struct mob_data *md,unsigned int tick)
tbl = map_id2bl(ud->skilltarget);
//Required check as skilltarget is not always an enemy. [Skotlex]
if (tbl && battle_check_target(&md->bl, tbl, BCT_ENEMY) <= 0)
- tbl = NULL;
+ tbl = nullptr;
}
if (tbl && status_check_skilluse(&md->bl, tbl, 0, 0)) {
md->target_id=tbl->id;
@@ -1571,7 +1658,7 @@ int mob_randomwalk(struct mob_data *md,unsigned int tick)
int mob_warpchase(struct mob_data *md, struct block_list *target)
{
- struct npc_data *warp = NULL;
+ struct npc_data *warp = nullptr;
int distance = AREA_SIZE;
if (!(target && battle_config.mob_ai&0x40 && battle_config.mob_warp&1))
return 0; //Can't warp chase.
@@ -1597,11 +1684,11 @@ int mob_warpchase(struct mob_data *md, struct block_list *target)
*------------------------------------------*/
static bool mob_ai_sub_hard(struct mob_data *md, unsigned int tick)
{
- struct block_list *tbl = NULL, *abl = NULL;
+ struct block_list *tbl = nullptr, *abl = nullptr;
enum e_mode mode;
int view_range, can_move;
- if(md->bl.prev == NULL || md->status.hp == 0)
+ if(md->bl.prev == nullptr || md->status.hp == 0)
return false;
if (DIFF_TICK(tick, md->last_thinktime) < MIN_MOBTHINKTIME)
@@ -2109,17 +2196,17 @@ static void mob_item_drop(struct mob_data *md, struct item_drop_list *dlist, str
if( test_autoloot ) { //Autoloot.
struct party_data *p = party_search(sd->status.party_id);
+ if ((itemdb_search(ditem->item_data.nameid))->flag.broadcast &&
+ (!p || !(p->party.item & 2)) // Somehow, if party's pickup distribution is 'Even Share', no announcemet
+ )
+ intif_broadcast_obtain_special_item(sd, ditem->item_data.nameid, md->mob_id, ITEMOBTAIN_TYPE_MONSTER_ITEM);
+
if (party_share_loot(party_search(sd->status.party_id),
sd, &ditem->item_data, sd->status.char_id) == 0
) {
ers_free(item_drop_ers, ditem);
return;
}
-
- if ((itemdb_search(ditem->item_data.nameid))->flag.broadcast &&
- (!p || !(p->party.item&2)) // Somehow, if party's pickup distribution is 'Even Share', no announcemet
- )
- intif_broadcast_obtain_special_item(sd, ditem->item_data.nameid, md->mob_id, ITEMOBTAIN_TYPE_MONSTER_ITEM);
}
ditem->next = dlist->item;
dlist->item = ditem;
@@ -2659,7 +2746,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
drop_rate = i32max(drop_rate, cap_value(drop_rate_bonus, 0, 9000));
if (pc_isvip(sd)) { // Increase item drop rate for VIP.
- drop_rate += (int)(0.5 + (drop_rate * battle_config.vip_drop_increase) / 100);
+ drop_rate += (int)(0.5 + drop_rate * battle_config.vip_drop_increase / 100.);
drop_rate = min(drop_rate,10000); //cap it to 100%
}
}
@@ -2691,7 +2778,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
}
// Announce first, or else ditem will be freed. [Lance]
// By popular demand, use base drop rate for autoloot code. [Skotlex]
- mob_item_drop(md, dlist, ditem, 0, md->db->dropitem[i].p, homkillonly);
+ mob_item_drop(md, dlist, ditem, 0, battle_config.autoloot_adjust ? drop_rate : md->db->dropitem[i].p, homkillonly);
}
// Ore Discovery [Celest]
@@ -2883,7 +2970,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
}
if (sd) {
- struct mob_db *mission_mdb = mobdb_exists(sd->mission_mobid);
+ struct mob_db *mission_mdb = mob_db(sd->mission_mobid);
if ((sd->mission_mobid == md->mob_id) ||
(battle_config.taekwon_mission_mobname == 1 && mission_mdb && status_get_race2(&md->bl) == RC2_GOBLIN && mission_mdb->race2 == RC2_GOBLIN) ||
@@ -2905,6 +2992,9 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
else if (sd->avail_quests)
quest_update_objective(sd, md->mob_id);
+ if (achievement_mobexists(md->mob_id))
+ achievement_update_objective(sd, AG_BATTLE, 1, md->mob_id);
+
if (sd->md && src && src->type == BL_MER && mob_db(md->mob_id)->lv > sd->status.base_level / 2)
mercenary_kills(sd->md);
}
@@ -2953,8 +3043,12 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
}
- if(!md->spawn) //Tell status_damage to remove it from memory.
- return 5; // Note: Actually, it's 4. Oh well...
+ if(!md->spawn){ //Tell status_damage to remove it from memory.
+ struct unit_data *ud = unit_bl2ud(&md->bl);
+
+ // If the unit is currently in a walk script, it will be removed there
+ return ud->state.walk_script ? 3 : 5; // Note: Actually, it's 4. Oh well...
+ }
// MvP tomb [GreenBox]
if (battle_config.mvp_tomb_enabled && md->spawn->state.boss && map[md->bl.m].flag.notomb != 1)
@@ -3035,7 +3129,7 @@ int mob_guardian_guildchange(struct mob_data *md)
/*==========================================
* Pick a random class for the mob
*------------------------------------------*/
-int mob_random_class (int *value, size_t count)
+int mob_random_class(int *value, size_t count)
{
nullpo_ret(value);
@@ -3054,6 +3148,62 @@ int mob_random_class (int *value, size_t count)
return mobdb_checkid(value[rnd()%count]);
}
+/**
+* Returns the SpawnInfos of the mob_db entry (mob_spawn_data[mobid])
+* if mobid is not in mob_spawn_data returns empty spawn_info vector
+* @param mob_id - Looking for spawns of this Monster ID
+*/
+const std::vector<spawn_info> mob_get_spawns(uint16 mob_id)
+{
+ auto mob_spawn_it = mob_spawn_data.find(mob_id);
+ if ( mob_spawn_it != mob_spawn_data.end() )
+ return mob_spawn_it->second;
+ return std::vector<spawn_info>();
+}
+
+/**
+ * Checks if a monster is spawned. Returns true if yes, false otherwise.
+ * @param mob_id - Monster ID which is checked
+*/
+bool mob_has_spawn(uint16 mob_id)
+{
+ // It's enough to check if the monster is in mob_spawn_data, because
+ // none or empty spawns are ignored. Thus the monster is spawned.
+ return mob_spawn_data.find(mob_id) != mob_spawn_data.end();
+}
+
+/**
+ * Adds a spawn info to the specific mob. (To mob_spawn_data)
+ * @param mob_id - Monster ID spawned
+ * @param new_spawn - spawn_info holding the map and quantity of the spawn
+*/
+void mob_add_spawn(uint16 mob_id, const struct spawn_info& new_spawn)
+{
+ unsigned short m = new_spawn.mapindex;
+
+ if( new_spawn.qty <= 0 )
+ return; //ignore empty spawns
+
+ std::vector<spawn_info>& spawns = mob_spawn_data[mob_id];
+ // Search if the map is already in spawns
+ auto itSameMap = std::find_if(spawns.begin(), spawns.end(),
+ [&m] (const spawn_info &s) { return (s.mapindex == m); });
+
+ if( itSameMap != spawns.end() )
+ itSameMap->qty += new_spawn.qty; // add quantity, if map is found
+ else
+ spawns.push_back(new_spawn); // else, add the whole spawn info
+
+ // sort spawns by spawn quantity
+ std::sort(spawns.begin(), spawns.end(),
+ [](const spawn_info & a, const spawn_info & b) -> bool
+ { return a.qty > b.qty; });
+/** Note
+ Spawns are sorted after every addition. This makes reloadscript slower, but
+ some spawns may be added directly by loadscript or something similar.
+*/
+}
+
/*==========================================
* Change mob base class
*------------------------------------------*/
@@ -3244,7 +3394,7 @@ int mob_summonslave(struct mob_data *md2,int *value,int amount,uint16 skill_id)
if (mobdb_checkid(data.id) == 0)
continue;
- if (map_search_freecell(&md2->bl, 0, &x, &y, MOB_SLAVEDISTANCE, MOB_SLAVEDISTANCE, 0)) {
+ if (skill_id != NPC_DEATHSUMMON && map_search_freecell(&md2->bl, 0, &x, &y, MOB_SLAVEDISTANCE, MOB_SLAVEDISTANCE, 0)) {
data.x = x;
data.y = y;
} else {
@@ -3599,12 +3749,16 @@ int mobskill_use(struct mob_data *md, unsigned int tick, int event)
//Skill used. Post-setups...
if ( ms[ i ].msg_id ){ //Display color message [SnakeDrak]
struct mob_chat *mc = mob_chat(ms[i].msg_id);
- char temp[CHAT_SIZE_MAX];
- char name[NAME_LENGTH];
- snprintf(name, sizeof name,"%s", md->name);
- strtok(name, "#"); // discard extra name identifier if present [Daegaladh]
- snprintf(temp, sizeof temp,"%s : %s", name, mc->msg);
- clif_messagecolor(&md->bl, mc->color, temp, true, AREA_CHAT_WOC);
+
+ if (mc) {
+ char temp[CHAT_SIZE_MAX];
+ char name[NAME_LENGTH];
+
+ snprintf(name, sizeof name,"%s", md->name);
+ strtok(name, "#"); // discard extra name identifier if present [Daegaladh]
+ snprintf(temp, sizeof temp,"%s : %s", name, mc->msg);
+ clif_messagecolor(&md->bl, mc->color, temp, true, AREA_CHAT_WOC);
+ }
}
if(!(battle_config.mob_ai&0x200)) { //pass on delay to same skill.
for (j = 0; j < md->db->maxskill; j++)
@@ -3657,7 +3811,7 @@ int mob_is_clone(int mob_id)
{
if(mob_id < MOB_CLONE_START || mob_id > MOB_CLONE_END)
return 0;
- if (mob_db(mob_id) == mob_dummy)
+ if (mob_db(mob_id) == NULL)
return 0;
return mob_id;
}
@@ -3696,11 +3850,17 @@ int mob_clone_spawn(struct map_session_data *sd, int16 m, int16 x, int16 y, cons
if(pc_isdead(sd) && master_id && flag&1)
return 0;
- ARR_FIND( MOB_CLONE_START, MOB_CLONE_END, mob_id, mob_db_data[mob_id] == NULL );
+ ARR_FIND( MOB_CLONE_START, MOB_CLONE_END, mob_id, mob_db(mob_id) == NULL );
if(mob_id >= MOB_CLONE_END)
return 0;
- db = mob_db_data[mob_id]=(struct mob_db*)aCalloc(1, sizeof(struct mob_db));
+ try{
+ db = &mob_db_data[mob_id];
+ }catch( std::bad_alloc ){
+ ShowError( "mob_clone_spawn: Memory allocation for clone %hu failed.\n", mob_id );
+ return 0;
+ }
+
status = &db->status;
strcpy(db->sprite,sd->status.name);
strcpy(db->name,sd->status.name);
@@ -3716,7 +3876,7 @@ int mob_clone_spawn(struct map_session_data *sd, int16 m, int16 x, int16 y, cons
if (mode) //User provided mode.
status->mode = mode;
else if (flag&1) //Friendly Character, remove looting.
- status->mode &= ~MD_LOOTER;
+ status->mode = static_cast<enum e_mode>(status->mode&(~MD_LOOTER));
status->hp = status->max_hp;
status->sp = status->max_sp;
memcpy(&db->vd, &sd->vd, sizeof(struct view_data));
@@ -3766,6 +3926,7 @@ int mob_clone_spawn(struct map_session_data *sd, int16 m, int16 x, int16 y, cons
ms[i].cancel = 0;
ms[i].casttime = skill_castfix(&sd->bl,skill_id, ms[i].skill_lv);
ms[i].delay = 5000+skill_delayfix(&sd->bl,skill_id, ms[i].skill_lv);
+ ms[i].msg_id = 0;
inf = skill_get_inf(skill_id);
if (inf&INF_ATTACK_SKILL) {
@@ -3879,69 +4040,19 @@ int mob_clone_spawn(struct map_session_data *sd, int16 m, int16 x, int16 y, cons
return md->bl.id;
}
-int mob_clone_delete(struct mob_data *md)
-{
+int mob_clone_delete(struct mob_data *md){
const int mob_id = md->mob_id;
if (mob_id >= MOB_CLONE_START && mob_id < MOB_CLONE_END
- && mob_db_data[mob_id]!=NULL) {
- aFree(mob_db_data[mob_id]);
- mob_db_data[mob_id]=NULL;
+ && mob_db(mob_id)!=NULL) {
+ mob_db_data.erase(mob_id);
//Clear references to the db
- md->db = mob_dummy;
+ md->db = NULL;
md->vd = NULL;
return 1;
}
return 0;
}
-//
-// Initialization
-//
-/*==========================================
- * Since un-setting [ mob ] up was used, it is an initial provisional value setup.
- *------------------------------------------*/
-static int mob_makedummymobdb(int mob_id)
-{
- if (mob_dummy != NULL)
- {
- if (mob_db(mob_id) == mob_dummy)
- return 1; //Using the mob_dummy data already. [Skotlex]
- if (mob_id > 0 && mob_id <= MAX_MOB_DB)
- { //Remove the mob data so that it uses the dummy data instead.
- aFree(mob_db_data[mob_id]);
- mob_db_data[mob_id] = NULL;
- }
- return 0;
- }
- //Initialize dummy data.
- mob_dummy = (struct mob_db*)aCalloc(1, sizeof(struct mob_db)); //Initializing the dummy mob.
- sprintf(mob_dummy->sprite,"DUMMY");
- sprintf(mob_dummy->name,"Dummy");
- sprintf(mob_dummy->jname,"Dummy");
- mob_dummy->lv=1;
- mob_dummy->status.max_hp=1000;
- mob_dummy->status.max_sp=1;
- mob_dummy->status.rhw.range=1;
- mob_dummy->status.rhw.atk=7;
- mob_dummy->status.rhw.atk2=10;
- mob_dummy->status.str=1;
- mob_dummy->status.agi=1;
- mob_dummy->status.vit=1;
- mob_dummy->status.int_=1;
- mob_dummy->status.dex=6;
- mob_dummy->status.luk=2;
- mob_dummy->status.speed=300;
- mob_dummy->status.adelay=1000;
- mob_dummy->status.amotion=500;
- mob_dummy->status.dmotion=500;
- mob_dummy->base_exp=2;
- mob_dummy->job_exp=1;
- mob_dummy->range2=10;
- mob_dummy->range3=10;
-
- return 0;
-}
-
//Adjusts the drop rate of item according to the criteria given. [Skotlex]
static unsigned int mob_drop_adjust(int baserate, int rate_adjust, unsigned short rate_min, unsigned short rate_max)
{
@@ -3993,39 +4104,29 @@ static bool mob_parse_dbrow(char** str)
mob_id = atoi(str[0]);
- if (mob_id <= 1000 || mob_id > MAX_MOB_DB) {
- ShowError("mob_parse_dbrow: Invalid monster ID %d, must be in range %d-%d.\n", mob_id, 1000, MAX_MOB_DB);
- return false;
- }
- if (pcdb_checkid(mob_id)) {
- ShowError("mob_parse_dbrow: Invalid monster ID %d, reserved for player classes.\n", mob_id);
- return false;
- }
-
- if (mob_id >= MOB_CLONE_START && mob_id < MOB_CLONE_END) {
- ShowError("mob_parse_dbrow: Invalid monster ID %d. Range %d-%d is reserved for player clones. Please increase MAX_MOB_DB (%d).\n", mob_id, MOB_CLONE_START, MOB_CLONE_END-1, MAX_MOB_DB);
+ if (!((mob_id > MIN_MOB_DB && mob_id < MAX_MOB_DB) || (mob_id > MIN_MOB_DB2 && mob_id < MAX_MOB_DB2))) {
+ ShowError("mob_parse_dbrow: Invalid monster ID %d, must be in range %d-%d or %d-%d.\n", mob_id, MIN_MOB_DB, MAX_MOB_DB, MIN_MOB_DB2, MAX_MOB_DB2);
return false;
}
memset(&entry, 0, sizeof(entry));
- db = &entry;
- status = &db->status;
+ status = &entry.status;
- db->vd.class_ = mob_id;
- safestrncpy(db->sprite, str[1], sizeof(db->sprite));
- safestrncpy(db->jname, str[2], sizeof(db->jname));
- safestrncpy(db->name, str[3], sizeof(db->name));
- db->lv = atoi(str[4]);
- db->lv = cap_value(db->lv, 1, USHRT_MAX);
+ entry.vd.class_ = mob_id;
+ safestrncpy(entry.sprite, str[1], sizeof(entry.sprite));
+ safestrncpy(entry.jname, str[2], sizeof(entry.jname));
+ safestrncpy(entry.name, str[3], sizeof(entry.name));
+ entry.lv = atoi(str[4]);
+ entry.lv = cap_value(entry.lv, 1, USHRT_MAX);
status->max_hp = atoi(str[5]);
status->max_sp = atoi(str[6]);
exp = (double)atoi(str[7]) * (double)battle_config.base_exp_rate / 100.;
- db->base_exp = (unsigned int)cap_value(exp, 0, UINT_MAX);
+ entry.base_exp = (unsigned int)cap_value(exp, 0, UINT_MAX);
exp = (double)atoi(str[8]) * (double)battle_config.job_exp_rate / 100.;
- db->job_exp = (unsigned int)cap_value(exp, 0, UINT_MAX);
+ entry.job_exp = (unsigned int)cap_value(exp, 0, UINT_MAX);
status->rhw.range = atoi(str[9]);
status->rhw.atk = atoi(str[10]);
@@ -4046,20 +4147,20 @@ static bool mob_parse_dbrow(char** str)
if (status->dex < 1) status->dex = 1;
if (status->luk < 1) status->luk = 1;
- db->range2 = atoi(str[20]);
- db->range3 = atoi(str[21]);
+ entry.range2 = atoi(str[20]);
+ entry.range3 = atoi(str[21]);
if (battle_config.view_range_rate != 100) {
- db->range2 = db->range2 * battle_config.view_range_rate / 100;
- if (db->range2 < 1)
- db->range2 = 1;
+ entry.range2 = entry.range2 * battle_config.view_range_rate / 100;
+ if (entry.range2 < 1)
+ entry.range2 = 1;
}
if (battle_config.chase_range_rate != 100) {
- db->range3 = db->range3 * battle_config.chase_range_rate / 100;
- if (db->range3 < db->range2)
- db->range3 = db->range2;
+ entry.range3 = entry.range3 * battle_config.chase_range_rate / 100;
+ if (entry.range3 < entry.range2)
+ entry.range3 = entry.range2;
}
//Tests showed that chase range is effectively 2 cells larger than expected [Playtester]
- db->range3 += 2;
+ entry.range3 += 2;
status->size = atoi(str[22]);
status->race = atoi(str[23]);
@@ -4076,9 +4177,9 @@ static bool mob_parse_dbrow(char** str)
return false;
}
- status->mode = (int)strtol(str[25], NULL, 0);
+ status->mode = static_cast<enum e_mode>(strtol(str[25], NULL, 0));
if (!battle_config.monster_active_enable)
- status->mode &= ~MD_AGGRESSIVE;
+ status->mode = static_cast<enum e_mode>(status->mode&(~MD_AGGRESSIVE));
if (status_has_mode(status,MD_STATUS_IMMUNE|MD_KNOCKBACK_IMMUNE|MD_DETECTOR))
status->class_ = CLASS_BOSS;
@@ -4101,18 +4202,18 @@ static bool mob_parse_dbrow(char** str)
// Fill in remaining status data by using a dummy monster.
data.bl.type = BL_MOB;
- data.level = db->lv;
+ data.level = entry.lv;
memcpy(&data.status, status, sizeof(struct status_data));
- status_calc_misc(&data.bl, status, db->lv);
+ status_calc_misc(&data.bl, status, entry.lv);
// MVP EXP Bonus: MEXP
// Some new MVP's MEXP multipled by high exp-rate cause overflow. [LuzZza]
exp = (double)atoi(str[30]) * (double)battle_config.mvp_exp_rate / 100.;
- db->mexp = (unsigned int)cap_value(exp, 0, UINT_MAX);
+ entry.mexp = (unsigned int)cap_value(exp, 0, UINT_MAX);
//Now that we know if it is an mvp or not, apply battle_config modifiers [Skotlex]
maxhp = (double)status->max_hp;
- if (db->mexp > 0) { //Mvp
+ if (entry.mexp > 0) { //Mvp
if (battle_config.mvp_hp_rate != 100)
maxhp = maxhp * (double)battle_config.mvp_hp_rate / 100.;
} else //Normal mob
@@ -4128,49 +4229,54 @@ static bool mob_parse_dbrow(char** str)
// MVP Drops: MVP1id,MVP1per,MVP2id,MVP2per,MVP3id,MVP3per
for(i = 0; i < MAX_MVP_DROP; i++) {
- db->mvpitem[i].nameid = atoi(str[31+i*2]);
+ entry.mvpitem[i].nameid = atoi(str[31+i*2]);
- if( db->mvpitem[i].nameid ){
- if( itemdb_search(db->mvpitem[i].nameid) ){
- db->mvpitem[i].p = atoi(str[32+i*2]);
+ if( entry.mvpitem[i].nameid ){
+ if( itemdb_search(entry.mvpitem[i].nameid) ){
+ entry.mvpitem[i].p = atoi(str[32+i*2]);
continue;
}else{
- ShowWarning( "Monster \"%s\"(id: %d) is dropping an unknown item \"%s\"(MVP-Drop %d)\n", db->name, mob_id, str[31+i*2], ( i / 2 ) + 1 );
+ ShowWarning( "Monster \"%s\"(id: %d) is dropping an unknown item \"%s\"(MVP-Drop %d)\n", entry.name, mob_id, str[31+i*2], ( i / 2 ) + 1 );
}
}
// Delete the item
- db->mvpitem[i].nameid = 0;
- db->mvpitem[i].p = 0;
+ entry.mvpitem[i].nameid = 0;
+ entry.mvpitem[i].p = 0;
}
for(i = 0; i < MAX_MOB_DROP; i++) {
int k = 31 + MAX_MVP_DROP*2 + i*2;
- db->dropitem[i].nameid = atoi(str[k]);
+ entry.dropitem[i].nameid = atoi(str[k]);
- if( db->dropitem[i].nameid ){
- if( itemdb_search( db->dropitem[i].nameid ) ){
- db->dropitem[i].p = atoi(str[k+1]);
+ if( entry.dropitem[i].nameid ){
+ if( itemdb_search( entry.dropitem[i].nameid ) ){
+ entry.dropitem[i].p = atoi(str[k+1]);
continue;
}else{
- ShowWarning( "Monster \"%s\"(id: %d) is dropping an unknown item \"%s\"(Drop %d)\n", db->name, mob_id, str[k], ( i / 2 ) + 1 );
+ ShowWarning( "Monster \"%s\"(id: %d) is dropping an unknown item \"%s\"(Drop %d)\n", entry.name, mob_id, str[k], ( i / 2 ) + 1 );
}
}
// Delete the item
- db->dropitem[i].nameid = 0;
- db->dropitem[i].p = 0;
+ entry.dropitem[i].nameid = 0;
+ entry.dropitem[i].p = 0;
}
+ db = mob_db(mob_id);
+
// Finally insert monster's data into the database.
- if (mob_db_data[mob_id] == NULL)
- mob_db_data[mob_id] = (struct mob_db*)aCalloc(1, sizeof(struct mob_db));
- else
- //Copy over spawn data
- memcpy(&db->spawn, mob_db_data[mob_id]->spawn, sizeof(db->spawn));
+ if (db == NULL) {
+ try{
+ db = &mob_db_data[mob_id];
+ }catch( std::bad_alloc ){
+ ShowError( "Memory allocation for monster %hu failed.\n", mob_id );
+ return false;
+ }
+ }
- memcpy(mob_db_data[mob_id], db, sizeof(struct mob_db));
+ memcpy(db, &entry, sizeof(struct mob_db));
return true;
}
@@ -4230,7 +4336,7 @@ static int mob_read_sqldb(void)
// free the query result
Sql_FreeResult(mmysql_handle);
- ShowStatus("Done reading '"CL_WHITE"%lu"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", count, mob_db_name[fi]);
+ ShowStatus("Done reading '" CL_WHITE "%lu" CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'.\n", count, mob_db_name[fi]);
}
return 0;
}
@@ -4241,10 +4347,11 @@ static int mob_read_sqldb(void)
static bool mob_readdb_mobavail(char* str[], int columns, int current)
{
int mob_id, sprite_id;
+ struct mob_db *db;
mob_id = atoi(str[0]);
- if(mob_db(mob_id) == mob_dummy) // invalid class (probably undefined in db)
+ if( (db=mob_db(mob_id)) == NULL) // invalid class (probably undefined in db)
{
ShowWarning("mob_readdb_mobavail: Unknown mob id %d.\n", mob_id);
return false;
@@ -4252,31 +4359,31 @@ static bool mob_readdb_mobavail(char* str[], int columns, int current)
sprite_id = atoi(str[1]);
- memset(&mob_db_data[mob_id]->vd, 0, sizeof(struct view_data));
- mob_db_data[mob_id]->vd.class_ = sprite_id;
+ memset(&db->vd, 0, sizeof(struct view_data));
+ db->vd.class_ = sprite_id;
//Player sprites
if(pcdb_checkid(sprite_id) && columns==12) {
- mob_db_data[mob_id]->vd.sex=atoi(str[2]);
- mob_db_data[mob_id]->vd.hair_style=atoi(str[3]);
- mob_db_data[mob_id]->vd.hair_color=atoi(str[4]);
- mob_db_data[mob_id]->vd.weapon=atoi(str[5]);
- mob_db_data[mob_id]->vd.shield=atoi(str[6]);
- mob_db_data[mob_id]->vd.head_top=atoi(str[7]);
- mob_db_data[mob_id]->vd.head_mid=atoi(str[8]);
- mob_db_data[mob_id]->vd.head_bottom=atoi(str[9]);
- mob_db_data[mob_id]->option=atoi(str[10])&~(OPTION_HIDE|OPTION_CLOAK|OPTION_INVISIBLE);
- mob_db_data[mob_id]->vd.cloth_color=atoi(str[11]); // Monster player dye option - Valaris
+ db->vd.sex=atoi(str[2]);
+ db->vd.hair_style=atoi(str[3]);
+ db->vd.hair_color=atoi(str[4]);
+ db->vd.weapon=atoi(str[5]);
+ db->vd.shield=atoi(str[6]);
+ db->vd.head_top=atoi(str[7]);
+ db->vd.head_mid=atoi(str[8]);
+ db->vd.head_bottom=atoi(str[9]);
+ db->option=atoi(str[10])&~(OPTION_HIDE|OPTION_CLOAK|OPTION_INVISIBLE);
+ db->vd.cloth_color=atoi(str[11]); // Monster player dye option - Valaris
#ifdef NEW_CARTS
- if( mob_db_data[mob_id]->option & OPTION_CART ){
+ if( db->option & OPTION_CART ){
ShowWarning("mob_readdb_mobavail: You tried to use a cart for mob id %d. This does not work with setting an option anymore.\n", mob_id );
- mob_db_data[mob_id]->option &= ~OPTION_CART;
+ db->option &= ~OPTION_CART;
}
#endif
}
else if(columns==3)
- mob_db_data[mob_id]->vd.head_bottom=atoi(str[2]); // mob equipment [Valaris]
+ db->vd.head_bottom=atoi(str[2]); // mob equipment [Valaris]
else if( columns != 2 )
return false;
@@ -4301,13 +4408,13 @@ static bool mob_readdb_group(char* str[], int columns, int current){
}
mob_id = atoi(str[1]);
- if (mob_id != 0 && mob_db(mob_id) == mob_dummy) {
+ if (mob_id != 0 && mob_db(mob_id) == NULL) {
ShowError("mob_readdb_group: Invalid random monster group '%s'\n", str[0]);
return false;
}
else if (mob_id == 0){
mob_id = atoi(str[3]);
- if (mob_db(mob_id) == mob_dummy) {
+ if (mob_db(mob_id) == NULL) {
ShowError("mob_readdb_group: Invalid random monster group '%s'\n", str[0]);
return false;
}
@@ -4344,15 +4451,22 @@ static bool mob_parse_row_chatdb(char* fields[], int columns, int current)
msg_id = atoi(fields[0]);
- if (msg_id <= 0 || msg_id > MAX_MOB_CHAT){
+ if (msg_id <= 0){
ShowError("mob_parse_row_chatdb: Invalid chat ID '%d' in line %d\n", msg_id, current);
return false;
}
- if (mob_chat_db[msg_id] == NULL)
- mob_chat_db[msg_id] = (struct mob_chat*)aCalloc(1, sizeof (struct mob_chat));
+ ms = mob_chat(msg_id);
- ms = mob_chat_db[msg_id];
+ if( ms == NULL ){
+ try{
+ ms = &mob_chat_db[msg_id];
+ }catch( std::bad_alloc ){
+ ShowError( "mob_parse_row_chatdb: Memory allocation for chat ID '%d' failed.\n", msg_id );
+ return false;
+ }
+ }
+
//MSG ID
ms->msg_id=msg_id;
//Color
@@ -4465,10 +4579,11 @@ static bool mob_parse_row_mobskilldb(char** str, int columns, int current)
struct mob_skill *ms = NULL;
int mob_id;
int i = 0, j, tmp;
+ struct mob_db *mob;
mob_id = atoi(str[0]);
- if (mob_id > 0 && mob_db(mob_id) == mob_dummy)
+ if (mob_id > 0 && (mob = mob_db(mob_id)) == NULL)
{
if (mob_id != last_mob_id) {
ShowError("mob_parse_row_mobskilldb: Non existant Mob id %d\n", mob_id);
@@ -4494,7 +4609,7 @@ static bool mob_parse_row_mobskilldb(char** str, int columns, int current)
if( i == MAX_MOBSKILL )
{
if (mob_id != last_mob_id) {
- ShowError("mob_parse_row_mobskilldb: Too many skills for monster %d[%s]\n", mob_id, mob_db_data[mob_id]->sprite);
+ ShowError("mob_parse_row_mobskilldb: Too many skills for monster %d[%s]\n", mob_id, mob->sprite);
last_mob_id = mob_id;
}
return false;
@@ -4518,7 +4633,7 @@ static bool mob_parse_row_mobskilldb(char** str, int columns, int current)
if (mob_id < 0)
ShowError("mob_parse_row_mobskilldb: Invalid Skill ID (%d) for all mobs\n", j);
else
- ShowError("mob_parse_row_mobskilldb: Invalid Skill ID (%d) for mob %d (%s)\n", j, mob_id, mob_db_data[mob_id]->sprite);
+ ShowError("mob_parse_row_mobskilldb: Invalid Skill ID (%d) for mob %d (%s)\n", j, mob_id, mob->sprite);
return false;
}
ms->skill_id = j;
@@ -4563,13 +4678,13 @@ static bool mob_parse_row_mobskilldb(char** str, int columns, int current)
{
ShowWarning("mob_parse_row_mobskilldb: Wrong mob skill target for ground skill %d (%s) for %s.\n",
ms->skill_id, skill_get_name(ms->skill_id),
- mob_id < 0 ? "all mobs" : mob_db_data[mob_id]->sprite);
+ mob_id < 0 ? "all mobs" : mob->sprite);
ms->target = MST_TARGET;
}
} else if (ms->target > MST_MASTER) {
ShowWarning("mob_parse_row_mobskilldb: Wrong mob skill target 'around' for non-ground skill %d (%s) for %s.\n",
ms->skill_id, skill_get_name(ms->skill_id),
- mob_id < 0 ? "all mobs" : mob_db_data[mob_id]->sprite);
+ mob_id < 0 ? "all mobs" : mob->sprite);
ms->target = MST_TARGET;
}
@@ -4616,7 +4731,7 @@ static bool mob_parse_row_mobskilldb(char** str, int columns, int current)
else
ms->emotion = -1;
- if(str[18] != NULL && mob_chat_db[atoi(str[18])]!=NULL)
+ if(str[18] != NULL && mob_chat(atoi(str[18]))!=NULL)
ms->msg_id = atoi(str[18]);
else
ms->msg_id = 0;
@@ -4670,13 +4785,14 @@ static int mob_read_sqlskilldb(void)
while( SQL_SUCCESS == Sql_NextRow(mmysql_handle) ) {
// wrap the result into a TXT-compatible format
char* str[19];
- char* dummy = "";
+ char dummy[255] = "";
int i;
++lines;
for( i = 0; i < 19; ++i )
{
Sql_GetData(mmysql_handle, i, &str[i], NULL);
- if( str[i] == NULL ) str[i] = dummy; // get rid of NULL columns
+ if( str[i] == NULL )
+ str[i] = dummy; // get rid of NULL columns
}
if (!mob_parse_row_mobskilldb(str, 19, count))
@@ -4688,7 +4804,7 @@ static int mob_read_sqlskilldb(void)
// free the query result
Sql_FreeResult(mmysql_handle);
- ShowStatus("Done reading '"CL_WHITE"%lu"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", count, mob_skill_db_name[fi]);
+ ShowStatus("Done reading '" CL_WHITE "%lu" CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'.\n", count, mob_skill_db_name[fi]);
}
return 0;
}
@@ -4714,18 +4830,19 @@ static bool mob_readdb_race2(char* fields[], int columns, int current)
for(i = 1; i < columns; i++) {
int mob_id = atoi(fields[i]);
+ struct mob_db* db = mob_db(mob_id);
- if (mob_db(mob_id) == mob_dummy) {
+ if (db == NULL) {
ShowWarning("mob_readdb_race2: Unknown mob id %d for race2 %d.\n", mob_id, race);
continue;
}
- mob_db_data[mob_id]->race2 = (enum e_race2)race;
+ db->race2 = (enum e_race2)race;
// Apply Aegis Class
if (race == RC2_GUARDIAN)
- mob_db_data[mob_id]->status.class_ = CLASS_GUARDIAN;
+ db->status.class_ = CLASS_GUARDIAN;
else if (race == RC2_BATTLEFIELD)
- mob_db_data[mob_id]->status.class_ = CLASS_BATTLEFIELD;
+ db->status.class_ = CLASS_BATTLEFIELD;
}
return true;
}
@@ -4754,7 +4871,7 @@ static bool mob_readdb_itemratio(char* str[], int columns, int current)
memset(item_ratio->mob_id, 0, sizeof(item_ratio->mob_id));
for (i = 0; i < columns-2; i++) {
uint16 mob_id = atoi(str[i+2]);
- if (mob_db(mob_id) == mob_dummy)
+ if (mob_db(mob_id) == NULL)
ShowError("mob_readdb_itemratio: Invalid monster with ID %hu (Item:%hu Col:%d).\n", mob_id, nameid, columns);
else
item_ratio->mob_id[i] = atoi(str[i+2]);
@@ -4779,7 +4896,7 @@ static bool mob_readdb_drop(char* str[], int columns, int current) {
struct s_mob_drop *drop;
mobid = atoi(str[0]);
- if ((mob = mob_db(mobid)) == mob_dummy) {
+ if ((mob = mob_db(mobid)) == NULL) {
ShowError("mob_readdb_drop: Invalid monster with ID %s.\n", str[0]);
return false;
}
@@ -4856,23 +4973,19 @@ static int mob_item_drop_ratio_free(DBKey key, DBData *data, va_list ap) {
* Adjust drop ratio for each monster
**/
static void mob_drop_ratio_adjust(void){
- unsigned short i;
-
- for( i = 0; i <= MAX_MOB_DB; i++ ){
+ for( auto &pair : mob_db_data ){
struct mob_db *mob;
struct item_data *id;
unsigned short nameid;
int j, rate, rate_adjust = 0, mob_id;
- mob = mob_db(i);
+ mob_id = pair.first;
+ mob = &pair.second;
- // Skip dummy mobs.
- if( mob == mob_dummy ){
+ if( mob_is_clone( mob_id ) ){
continue;
}
- mob_id = i;
-
for( j = 0; j < MAX_MVP_DROP_TOTAL; j++ ){
nameid = mob->mvpitem[j].nameid;
rate = mob->mvpitem[j].p;
@@ -4895,7 +5008,7 @@ static void mob_drop_ratio_adjust(void){
// Item is not known anymore(should never happen)
if( !id ){
- ShowWarning( "Monster \"%s\"(id:%d) is dropping an unknown item(id: %d)\n", mob->name, mob_id, nameid );
+ ShowWarning( "Monster \"%s\"(id:%hu) is dropping an unknown item(id: %d)\n", mob->name, mob_id, nameid );
mob->mvpitem[j].nameid = 0;
mob->mvpitem[j].p = 0;
continue;
@@ -4925,7 +5038,7 @@ static void mob_drop_ratio_adjust(void){
// Item is not known anymore(should never happen)
if( !id ){
- ShowWarning( "Monster \"%s\"(id:%d) is dropping an unknown item(id: %d)\n", mob->name, mob_id, nameid );
+ ShowWarning( "Monster \"%s\"(id:%hu) is dropping an unknown item(id: %d)\n", mob->name, mob_id, nameid );
mob->dropitem[j].nameid = 0;
mob->dropitem[j].p = 0;
continue;
@@ -5041,30 +5154,27 @@ static void mob_skill_db_set_single_sub(struct mob_db *mob, struct s_mob_skill *
* @param skill
**/
static void mob_skill_db_set_single(struct s_mob_skill *skill) {
- struct mob_db *mob = NULL;
-
nullpo_retv(skill);
// Specific monster
if (skill->mob_id >= 0) {
- mob = mob_db(skill->mob_id);
- if (mob != mob_dummy)
- //memcpy(&mob->skill, skill, sizeof(skill));
+ struct mob_db *mob = mob_db(skill->mob_id);
+ if (mob != NULL)
mob_skill_db_set_single_sub(mob, skill);
}
// Global skill
else {
- uint16 i, id = skill->mob_id;
+ uint16 id = skill->mob_id;
id *= -1;
- for (i = 0; i < MAX_MOB_DB; i++) {
- mob = mob_db(i);
- if (mob == mob_dummy)
+ for( auto &pair : mob_db_data ){
+ if ( mob_is_clone(pair.first) ){
continue;
- if ( (!(id&1) && status_has_mode(&mob->status,MD_STATUS_IMMUNE)) // Bosses
- || (!(id&2) && !status_has_mode(&mob->status,MD_STATUS_IMMUNE)) // Normal monsters
+ }
+ if ( (!(id&1) && status_has_mode(&pair.second.status,MD_STATUS_IMMUNE)) // Bosses
+ || (!(id&2) && !status_has_mode(&pair.second.status,MD_STATUS_IMMUNE)) // Normal monsters
)
continue;
- mob_skill_db_set_single_sub(mob, skill);
+ mob_skill_db_set_single_sub(&pair.second, skill);
}
}
@@ -5118,10 +5228,9 @@ static void mob_skill_db_set(void) {
*/
static void mob_load(void)
{
- int i;
const char* dbsubpath[] = {
"",
- "/"DBIMPORT,
+ "/" DBIMPORT,
};
// First we parse all the possible monsters to add additional data in the second loop
@@ -5129,53 +5238,54 @@ static void mob_load(void)
mob_read_sqldb();
mob_read_sqlskilldb();
}else{
- for(i=0; i<ARRAYLENGTH(dbsubpath); i++){
+ for(int i = 0; i < ARRAYLENGTH(dbsubpath); i++){
int n2 = strlen(db_path)+strlen(DBPATH)+strlen(dbsubpath[i])+1;
char* dbsubpath2 = (char*)aMalloc(n2+1);
+ bool silent = i > 0;
- if( i == 0 ){
+ if( i == 0 ) {
safesnprintf(dbsubpath2,n2,"%s/%s%s",db_path,DBPATH,dbsubpath[i]);
- }else{
+ } else {
safesnprintf(dbsubpath2,n2,"%s%s",db_path,dbsubpath[i]);
}
- sv_readdb(dbsubpath2, "mob_db.txt", ',', 31+2*MAX_MVP_DROP+2*MAX_MOB_DROP, 31+2*MAX_MVP_DROP+2*MAX_MOB_DROP, -1, &mob_readdb_sub, i);
+ sv_readdb(dbsubpath2, "mob_db.txt", ',', 31+2*MAX_MVP_DROP+2*MAX_MOB_DROP, 31+2*MAX_MVP_DROP+2*MAX_MOB_DROP, -1, &mob_readdb_sub, silent);
aFree(dbsubpath2);
}
}
- for(i=0; i<ARRAYLENGTH(dbsubpath); i++){
+ for(int i = 0; i < ARRAYLENGTH(dbsubpath); i++){
int n1 = strlen(db_path)+strlen(dbsubpath[i])+1;
int n2 = strlen(db_path)+strlen(DBPATH)+strlen(dbsubpath[i])+1;
char* dbsubpath1 = (char*)aMalloc(n1+1);
char* dbsubpath2 = (char*)aMalloc(n2+1);
+ bool silent = i > 0;
if(i==0) {
safesnprintf(dbsubpath1,n1,"%s%s",db_path,dbsubpath[i]);
safesnprintf(dbsubpath2,n2,"%s/%s%s",db_path,DBPATH,dbsubpath[i]);
- }
- else {
+ } else {
safesnprintf(dbsubpath1,n1,"%s%s",db_path,dbsubpath[i]);
safesnprintf(dbsubpath2,n1,"%s%s",db_path,dbsubpath[i]);
}
if( !db_use_sqldbs ){
- mob_readskilldb(dbsubpath2,i);
+ mob_readskilldb(dbsubpath2, silent);
}
- sv_readdb(dbsubpath1, "mob_avail.txt", ',', 2, 12, -1, &mob_readdb_mobavail, i);
- sv_readdb(dbsubpath2, "mob_race2_db.txt", ',', 2, MAX_RACE2_MOBS, -1, &mob_readdb_race2, i);
- sv_readdb(dbsubpath1, "mob_item_ratio.txt", ',', 2, 2+MAX_ITEMRATIO_MOBS, -1, &mob_readdb_itemratio, i);
- sv_readdb(dbsubpath1, "mob_chat_db.txt", '#', 3, 3, MAX_MOB_CHAT, &mob_parse_row_chatdb, i);
- sv_readdb(dbsubpath2, "mob_random_db.txt", ',', 4, 4, -1, &mob_readdb_group, i );
- sv_readdb(dbsubpath2, "mob_branch.txt", ',', 4, 4, -1, &mob_readdb_group, i );
- sv_readdb(dbsubpath2, "mob_poring.txt", ',', 4, 4, -1, &mob_readdb_group, i );
- sv_readdb(dbsubpath2, "mob_boss.txt", ',', 4, 4, -1, &mob_readdb_group, i );
- sv_readdb(dbsubpath1, "mob_pouch.txt", ',', 4, 4, -1, &mob_readdb_group, i );
- sv_readdb(dbsubpath1, "mob_classchange.txt", ',', 4, 4, -1, &mob_readdb_group, i );
- sv_readdb(dbsubpath2, "mob_drop.txt", ',', 3, 5, -1, &mob_readdb_drop, i );
+ sv_readdb(dbsubpath1, "mob_avail.txt", ',', 2, 12, -1, &mob_readdb_mobavail,silent);
+ sv_readdb(dbsubpath2, "mob_race2_db.txt", ',', 2, MAX_RACE2_MOBS, -1, &mob_readdb_race2, silent);
+ sv_readdb(dbsubpath1, "mob_item_ratio.txt", ',', 2, 2+MAX_ITEMRATIO_MOBS, -1, &mob_readdb_itemratio, silent);
+ sv_readdb(dbsubpath1, "mob_chat_db.txt", '#', 3, 3, -1, &mob_parse_row_chatdb, silent);
+ sv_readdb(dbsubpath2, "mob_random_db.txt", ',', 4, 4, -1, &mob_readdb_group, silent);
+ sv_readdb(dbsubpath2, "mob_branch.txt", ',', 4, 4, -1, &mob_readdb_group, silent);
+ sv_readdb(dbsubpath2, "mob_poring.txt", ',', 4, 4, -1, &mob_readdb_group, silent);
+ sv_readdb(dbsubpath2, "mob_boss.txt", ',', 4, 4, -1, &mob_readdb_group, silent);
+ sv_readdb(dbsubpath1, "mob_pouch.txt", ',', 4, 4, -1, &mob_readdb_group, silent);
+ sv_readdb(dbsubpath1, "mob_classchange.txt", ',', 4, 4, -1, &mob_readdb_group, silent);
+ sv_readdb(dbsubpath2, "mob_drop.txt", ',', 3, 5, -1, &mob_readdb_drop, silent);
aFree(dbsubpath1);
aFree(dbsubpath2);
@@ -5185,45 +5295,129 @@ static void mob_load(void)
mob_skill_db_set();
}
-void mob_reload(void) {
- int i;
+/**
+ * Initialize monster data
+ */
+void mob_db_load(bool is_reload){
+ if( !is_reload ) {
+ // on mobdbreload it's not neccessary to execute this
+ // item ers needs to be allocated only once
+ item_drop_ers = ers_new(sizeof(struct item_drop),"mob.cpp::item_drop_ers",ERS_OPT_CLEAN);
+ item_drop_list_ers = ers_new(sizeof(struct item_drop_list),"mob.cpp::item_drop_list_ers",ERS_OPT_NONE);
+ }
+ mob_item_drop_ratio = idb_alloc(DB_OPT_BASE);
+ mob_skill_db = idb_alloc(DB_OPT_BASE);
+ mob_summon_db = idb_alloc(DB_OPT_BASE);
+ mob_load();
+}
+
+/**
+ * Re-link monster drop data with item data
+ * Fixes the need of a @reloadmobdb after a @reloaditemdb
+ * @author Epoque
+ */
+void mob_reload_itemmob_data(void) {
+ for( auto const &pair : mob_db_data ){
+ int d, k;
- //Mob skills need to be cleared before re-reading them. [Skotlex]
- for (i = 0; i < MAX_MOB_DB; i++) {
- if (mob_db_data[i]) {
- memset(&mob_db_data[i]->skill,0,sizeof(mob_db_data[i]->skill));
- mob_db_data[i]->maxskill = 0;
+ if( mob_is_clone( pair.first ) ){
+ continue;
+ }
+
+ for(d = 0; d < MAX_MOB_DROP_TOTAL; d++) {
+ struct item_data *id;
+ if( !pair.second.dropitem[d].nameid )
+ continue;
+ id = itemdb_search(pair.second.dropitem[d].nameid);
+
+ for (k = 0; k < MAX_SEARCH; k++) {
+ if (id->mob[k].chance <= pair.second.dropitem[d].p)
+ break;
+ }
+
+ if (k == MAX_SEARCH)
+ continue;
+
+ if (id->mob[k].id != pair.first)
+ memmove(&id->mob[k+1], &id->mob[k], (MAX_SEARCH-k-1)*sizeof(id->mob[0]));
+ id->mob[k].chance = pair.second.dropitem[d].p;
+ id->mob[k].id = pair.first;
}
}
+}
- // Clear item_drop_ratio_db
- mob_item_drop_ratio->clear(mob_item_drop_ratio, mob_item_drop_ratio_free);
- mob_skill_db->clear(mob_skill_db, mob_skill_db_free);
- mob_summon_db->clear(mob_summon_db, mob_summon_db_free);
- mob_load();
+/**
+ * Apply the proper view data on monsters during mob_db reload.
+ * @param md: Mob to adjust
+ * @param args: va_list of arguments
+ * @return 0
+ */
+static int mob_reload_sub( struct mob_data *md, va_list args ){
+ // Relink the mob to the new database entry
+ md->db = mob_db(md->mob_id);
+
+ // If the view data was not overwritten manually
+ if( !md->vd_changed ){
+ // Get the new view data from the mob database
+ md->vd = mob_get_viewdata(md->mob_id);
+
+ // If they are spawned right now
+ if( md->bl.prev != NULL ){
+ // Respawn all mobs on client side so that they are displayed correctly(if their view id changed)
+ clif_clearunit_area(&md->bl, CLR_OUTSIGHT);
+ clif_spawn(&md->bl);
+ }
+ }
+
+ return 0;
}
+/**
+ * Apply the proper view data on NPCs during mob_db reload.
+ * @param md: NPC to adjust
+ * @param args: va_list of arguments
+ * @return 0
+ */
+static int mob_reload_sub_npc( struct npc_data *nd, va_list args ){
+ // If the view data points to a mob
+ if( mobdb_checkid(nd->class_) ){
+ // Get the new view data from the mob database
+ nd->vd = mob_get_viewdata(nd->class_);
+
+ // If they are spawned right now
+ if( nd->bl.prev != NULL ){
+ // Respawn all NPCs on client side so that they are displayed correctly(if their view id changed)
+ clif_clearunit_area(&nd->bl, CLR_OUTSIGHT);
+ clif_spawn(&nd->bl);
+ }
+ }
+
+ return 0;
+}
+
+/**
+ * Reload monster data
+ */
+void mob_reload(void) {
+ do_final_mob(true);
+ mob_db_load(true);
+ map_foreachmob(mob_reload_sub);
+ map_foreachnpc(mob_reload_sub_npc);
+}
+
+/**
+ * Clear spawn data for all monsters
+ */
void mob_clear_spawninfo()
{ //Clears spawn related information for a script reload.
- int i;
- for (i = 0; i < MAX_MOB_DB; i++)
- if (mob_db_data[i])
- memset(&mob_db_data[i]->spawn,0,sizeof(mob_db_data[i]->spawn));
+ mob_spawn_data.clear();
}
/*==========================================
* Circumference initialization of mob
*------------------------------------------*/
void do_init_mob(void){
- memset(mob_db_data,0,sizeof(mob_db_data)); //Clear the array
- mob_db_data[0] = (struct mob_db*)aCalloc(1, sizeof (struct mob_db)); //This mob is used for random spawns
- mob_makedummymobdb(0); //The first time this is invoked, it creates the dummy mob
- item_drop_ers = ers_new(sizeof(struct item_drop),"mob.c::item_drop_ers",ERS_OPT_CLEAN);
- item_drop_list_ers = ers_new(sizeof(struct item_drop_list),"mob.c::item_drop_list_ers",ERS_OPT_NONE);
- mob_item_drop_ratio = idb_alloc(DB_OPT_BASE);
- mob_skill_db = idb_alloc(DB_OPT_BASE);
- mob_summon_db = idb_alloc(DB_OPT_BASE);
- mob_load();
+ mob_db_load(false);
add_timer_func_list(mob_delayspawn,"mob_delayspawn");
add_timer_func_list(mob_delay_item_drop,"mob_delay_item_drop");
@@ -5240,32 +5434,15 @@ void do_init_mob(void){
/*==========================================
* Clean memory usage.
*------------------------------------------*/
-void do_final_mob(void){
- int i;
- if (mob_dummy)
- {
- aFree(mob_dummy);
- mob_dummy = NULL;
- }
- for (i = 0; i <= MAX_MOB_DB; i++)
- {
- if (mob_db_data[i] != NULL)
- {
- aFree(mob_db_data[i]);
- mob_db_data[i] = NULL;
- }
- }
- for (i = 0; i <= MAX_MOB_CHAT; i++)
- {
- if (mob_chat_db[i] != NULL)
- {
- aFree(mob_chat_db[i]);
- mob_chat_db[i] = NULL;
- }
- }
+void do_final_mob(bool is_reload){
+ mob_db_data.clear();
+ mob_chat_db.clear();
+
mob_item_drop_ratio->destroy(mob_item_drop_ratio,mob_item_drop_ratio_free);
mob_skill_db->destroy(mob_skill_db, mob_skill_db_free);
mob_summon_db->destroy(mob_summon_db, mob_summon_db_free);
- ers_destroy(item_drop_ers);
- ers_destroy(item_drop_list_ers);
+ if( !is_reload ) {
+ ers_destroy(item_drop_ers);
+ ers_destroy(item_drop_list_ers);
+ }
}
diff --git a/src/map/mob.h b/src/map/mob.hpp
similarity index 89%
rename from src/map/mob.h
rename to src/map/mob.hpp
index 36bedac84f9..efad1f2fdfc 100644
--- a/src/map/mob.h
+++ b/src/map/mob.hpp
@@ -1,24 +1,17 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _MOB_H_
-#define _MOB_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef _MOB_HPP_
+#define _MOB_HPP_
#include "../common/mmo.h" // struct item
-#include "guild.h" // struct guardian_data
-#include "map.h" // struct status_data, struct view_data, struct mob_skill
-#include "status.h" // struct status data, struct status_change
-#include "unit.h" // unit_stop_walking(), unit_stop_attack()
-#include "npc.h"
-// Change this to increase the table size in your mob_db to accomodate a larger mob database.
-// Be sure to note that IDs 4001 to 4048 are reserved for advanced/baby/expanded classes.
-// Notice that the last 1000 entries are used for player clones, so always set this to desired value +1000
-#define MAX_MOB_DB 5000
+#include "status.hpp" // struct status data, struct status_change
+#include "unit.hpp" // unit_stop_walking(), unit_stop_attack()
+
+#include <vector>
+
+struct guardian_data;
//The number of drops all mobs have and the max drop-slot that the steal skill will attempt to steal from.
#define MAX_MOB_DROP 10
@@ -41,10 +34,6 @@ extern "C" {
//Distance that slaves should keep from their master.
#define MOB_SLAVEDISTANCE 2
-// These define the range of available IDs for clones. [Valaris]
-#define MOB_CLONE_START (MAX_MOB_DB-999)
-#define MOB_CLONE_END MAX_MOB_DB
-
//Used to determine default enemy type of mobs (for use in eachinrange calls)
#define DEFAULT_ENEMY_TYPE(md) (md->special_state.ai?BL_CHAR:BL_MOB|BL_PC|BL_HOM|BL_MER)
@@ -55,6 +44,11 @@ extern "C" {
enum MOBID {
MOBID_PORING = 1002,
MOBID_RED_PLANT = 1078,
+ MOBID_BLUE_PLANT,
+ MOBID_GREEN_PLANT,
+ MOBID_YELLOW_PLANT,
+ MOBID_WHITE_PLANT,
+ MOBID_SHINING_PLANT,
MOBID_BLACK_MUSHROOM = 1084,
MOBID_MARINE_SPHERE = 1142,
MOBID_EMPERIUM = 1288,
@@ -166,23 +160,23 @@ struct mob_db {
unsigned int option;
int maxskill;
struct mob_skill skill[MAX_MOBSKILL];
- struct spawn_info spawn[10];
};
struct mob_data {
struct block_list bl;
struct unit_data ud;
struct view_data *vd;
+ bool vd_changed;
struct status_data status, *base_status; //Second one is in case of leveling up mobs, or tiny/large mobs.
struct status_change sc;
struct mob_db *db; //For quick data access (saves doing mob_db(md->mob_id) all the time) [Skotlex]
char name[NAME_LENGTH];
- struct {
+ struct s_specialState {
unsigned int size : 2; //Small/Big monsters.
enum mob_ai ai; //Special ai for summoned monsters.
unsigned int clone : 1;/* is clone? 1:0 */
} special_state; //Special mob information that does not needs to be zero'ed on mob respawn.
- struct {
+ struct s_MobState {
unsigned int aggressive : 1; //Signals whether the mob AI is in aggressive mode or reactive mode. [Skotlex]
unsigned int steal_coin_flag : 1;
unsigned int soul_change_flag : 1; // Celest
@@ -293,19 +287,20 @@ struct item_drop_list {
};
struct mob_db *mob_db(int mob_id);
-struct mob_db *mobdb_exists(uint16 mob_id);
-int mobdb_searchname(const char *str);
-int mobdb_searchname_array(struct mob_db** data, int size, const char *str);
+uint16 mobdb_searchname(const char * const str);
+int mobdb_searchname_array(const char *str, uint16 * out, int size);
int mobdb_checkid(const int id);
struct view_data* mob_get_viewdata(int mob_id);
+void mob_set_dynamic_viewdata( struct mob_data* md );
+void mob_free_dynamic_viewdata( struct mob_data* md );
-struct mob_data *mob_once_spawn_sub(struct block_list *bl, int16 m, int16 x, int16 y, const char *mobname, int mob_id, const char *event, unsigned int size, unsigned int ai);
+struct mob_data *mob_once_spawn_sub(struct block_list *bl, int16 m, int16 x, int16 y, const char *mobname, int mob_id, const char *event, unsigned int size, enum mob_ai ai);
int mob_once_spawn(struct map_session_data* sd, int16 m, int16 x, int16 y,
- const char* mobname, int mob_id, int amount, const char* event, unsigned int size, unsigned int ai);
+ const char* mobname, int mob_id, int amount, const char* event, unsigned int size, enum mob_ai ai);
int mob_once_spawn_area(struct map_session_data* sd, int16 m,
- int16 x0, int16 y0, int16 x1, int16 y1, const char* mobname, int mob_id, int amount, const char* event, unsigned int size, unsigned int ai);
+ int16 x0, int16 y0, int16 x1, int16 y1, const char* mobname, int mob_id, int amount, const char* event, unsigned int size, enum mob_ai ai);
bool mob_ksprotected (struct block_list *src, struct block_list *target);
@@ -334,7 +329,7 @@ void mob_heal(struct mob_data *md,unsigned int heal);
void mob_clear_spawninfo();
void do_init_mob(void);
-void do_final_mob(void);
+void do_final_mob(bool is_reload);
int mob_timer_delete(int tid, unsigned int tick, int id, intptr_t data);
int mob_deleteslave(struct mob_data *md);
@@ -356,7 +351,11 @@ int mob_is_clone(int mob_id);
int mob_clone_spawn(struct map_session_data *sd, int16 m, int16 x, int16 y, const char *event, int master_id, enum e_mode mode, int flag, unsigned int duration);
int mob_clone_delete(struct mob_data *md);
+void mob_reload_itemmob_data(void);
void mob_reload(void);
+void mob_add_spawn(uint16 mob_id, const struct spawn_info& new_spawn);
+const std::vector<spawn_info> mob_get_spawns(uint16 mob_id);
+bool mob_has_spawn(uint16 mob_id);
// MvP Tomb System
int mvptomb_setdelayspawn(struct npc_data *nd);
@@ -368,8 +367,4 @@ void mob_setdropitem_option(struct item *itm, struct s_mob_drop *mobdrop);
#define CHK_MOBSIZE(size) ((size) >= SZ_SMALL && (size) < SZ_MAX) /// Check valid Monster Size
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _MOB_H_ */
+#endif /* _MOB_HPP_ */
diff --git a/src/map/npc.c b/src/map/npc.cpp
similarity index 94%
rename from src/map/npc.c
rename to src/map/npc.cpp
index f629a78914e..ca9c2d7104c 100644
--- a/src/map/npc.c
+++ b/src/map/npc.cpp
@@ -1,6 +1,11 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "npc.hpp"
+
+#include <stdlib.h>
+#include <errno.h>
+
#include "../common/cbasetypes.h"
#include "../common/timer.h"
#include "../common/nullpo.h"
@@ -10,20 +15,21 @@
#include "../common/utils.h"
#include "../common/ers.h"
#include "../common/db.h"
-#include "map.h"
-#include "log.h"
-#include "clif.h"
-#include "date.h" // days of week enum
-#include "intif.h"
-#include "pc.h"
-#include "pet.h"
-#include "instance.h"
-#include "chat.h"
-#include "script.h" // script_config
-
-#include <stdlib.h>
-#include <errno.h>
+#include "map.hpp"
+#include "log.hpp"
+#include "clif.hpp"
+#include "date.hpp" // days of week enum
+#include "intif.hpp"
+#include "pc.hpp"
+#include "pet.hpp"
+#include "instance.hpp"
+#include "chat.hpp"
+#include "script.hpp" // script_config
+#include "guild.hpp"
+#include "battle.hpp"
+#include "mob.hpp"
+#include "log.hpp"
struct npc_data* fake_nd;
@@ -42,6 +48,8 @@ static int npc_mob=0;
static int npc_delay_mob=0;
static int npc_cache_mob=0;
+struct eri *npc_sc_display_ers;
+
// Market Shop
#if PACKETVER >= 20131223
struct s_npc_market {
@@ -109,9 +117,9 @@ static struct script_event_s
struct view_data* npc_get_viewdata(int class_)
{ //Returns the viewdata for normal npc classes.
- if( class_ == INVISIBLE_CLASS )
+ if( class_ == JT_INVISIBLE )
return &npc_viewdb[0];
- if (npcdb_checkid(class_) || class_ == WARP_CLASS){
+ if (npcdb_checkid(class_)){
if( class_ > MAX_NPC_CLASS2_START ){
return &npc_viewdb2[class_-MAX_NPC_CLASS2_START];
}else{
@@ -232,7 +240,7 @@ int npc_enable(const char* name, int flag)
clif_clearunit_area(&nd->bl,CLR_OUTSIGHT); // Hack to trick maya purple card [Xazax]
}
- if (nd->class_ == WARP_CLASS || nd->class_ == FLAG_CLASS)
+ if (nd->class_ == JT_WARPNPC || nd->class_ == JT_GUILD_FLAG)
{ //Client won't display option changes for these classes [Toms]
if (nd->sc.option&(OPTION_HIDE|OPTION_INVISIBLE))
clif_clearunit_area(&nd->bl, CLR_OUTSIGHT);
@@ -296,7 +304,7 @@ int npc_rr_secure_timeout_timer(int tid, unsigned int tick, int id, intptr_t dat
/*==========================================
* Dequeue event and add timer for execution (100ms)
*------------------------------------------*/
-int npc_event_dequeue(struct map_session_data* sd)
+int npc_event_dequeue(struct map_session_data* sd,bool free_script_stack)
{
nullpo_ret(sd);
@@ -306,7 +314,7 @@ int npc_event_dequeue(struct map_session_data* sd)
clif_clearunit_single(sd->npc_id, CLR_OUTSIGHT, sd->fd);
sd->state.using_fake_npc = 0;
}
- if (sd->st) {
+ if (free_script_stack&&sd->st) {
script_free_state(sd->st);
sd->st = NULL;
}
@@ -339,10 +347,21 @@ static int npc_event_export(struct npc_data *nd, int i)
struct event_data *ev;
char buf[EVENT_NAME_LENGTH];
+ if (nd->bl.m > -1 && map[nd->bl.m].instance_id > 0) { // Block script events in instances
+ int j;
+
+ for (j = 0; j < NPCE_MAX; j++) {
+ if (strcmpi(npc_get_script_event_name(j), lname) == 0) {
+ ShowWarning("npc_event_export: attempting to duplicate a script event in an instance (%s::%s), ignoring\n", nd->name, lname);
+ return 0;
+ }
+ }
+ }
+
// NPC:<name> the prefix uses 4 characters
if( !strncasecmp( lname, script_config.onwhisper_event_name, NAME_LENGTH ) && strlen(nd->exname) > ( NAME_LENGTH - 4 ) ){
// The client only allows that many character so that NPC could not be whispered by unmodified clients
- ShowWarning( "Whisper event in npc '"CL_WHITE"%s"CL_RESET"' was ignored, because it's name is too long.\n", nd->exname );
+ ShowWarning( "Whisper event in npc '" CL_WHITE "%s" CL_RESET "' was ignored, because it's name is too long.\n", nd->exname );
return 0;
}
@@ -438,7 +457,7 @@ int npc_event_doall(const char* name)
// runs the specified event(global only) and reports call count
void npc_event_runall( const char* eventname ){
- ShowStatus( "Event '"CL_WHITE"%s"CL_RESET"' executed with '"CL_WHITE"%d"CL_RESET"' NPCs.\n", eventname, npc_event_doall( eventname ) );
+ ShowStatus( "Event '" CL_WHITE "%s" CL_RESET "' executed with '" CL_WHITE "%d" CL_RESET "' NPCs.\n", eventname, npc_event_doall( eventname ) );
}
// runs the specified event, with a RID attached (global only)
@@ -754,11 +773,11 @@ void npc_timerevent_quit(struct map_session_data* sd)
char buf[EVENT_NAME_LENGTH];
struct event_data *ev;
- snprintf(buf, ARRAYLENGTH(buf), "%s::OnTimerQuit", nd->exname);
+ snprintf(buf, ARRAYLENGTH(buf), "%s::%s", nd->exname, script_config.timer_quit_event_name);
ev = (struct event_data*)strdb_get(ev_db, buf);
if( ev && ev->nd != nd )
{
- ShowWarning("npc_timerevent_quit: Unable to execute \"OnTimerQuit\", two NPCs have the same event name [%s]!\n",buf);
+ ShowWarning("npc_timerevent_quit: Unable to execute \"%s\", two NPCs have the same event name [%s]!\n",script_config.timer_quit_event_name,buf);
ev = NULL;
}
if( ev )
@@ -1399,19 +1418,23 @@ static enum e_CASHSHOP_ACK npc_cashshop_process_payment(struct npc_data *nd, int
{
struct item_data *id = itemdb_exists(nd->u.shop.itemshop_nameid);
+ if (!id) { // Item Data is checked at script parsing but in case of item_db reload, check again.
+ ShowWarning("Failed to find sellitem %hu for itemshop NPC '%s' (%s, %d, %d)!\n", nd->u.shop.itemshop_nameid, nd->exname, map[nd->bl.m].name, nd->bl.x, nd->bl.y);
+ return ERROR_TYPE_PURCHASE_FAIL;
+ }
if (cost[0] < (price - points)) {
char output[CHAT_SIZE_MAX];
memset(output, '\0', sizeof(output));
- sprintf(output, msg_txt(sd, 712), (id) ? id->jname : "NULL", (id) ? id->nameid : 0); // You do not have enough %s (%hu).
+ sprintf(output, msg_txt(sd, 712), id->jname, id->nameid); // You do not have enough %s (%hu).
clif_messagecolor(&sd->bl, color_table[COLOR_RED], output, false, SELF);
return ERROR_TYPE_PURCHASE_FAIL;
}
- if (id)
- pc_delitem(sd, pc_search_inventory(sd, nd->u.shop.itemshop_nameid), price - points, 0, 0, LOG_TYPE_NPC);
- else
- ShowWarning("Failed to delete item %hu from itemshop NPC '%s' (%s, %d, %d)!\n", nd->u.shop.itemshop_nameid, nd->exname, map[nd->bl.m].name, nd->bl.x, nd->bl.y);
+ if (pc_delitem(sd, pc_search_inventory(sd, nd->u.shop.itemshop_nameid), price - points, 0, 0, LOG_TYPE_NPC)) {
+ ShowWarning("Failed to delete item %hu from '%s' at itemshop NPC '%s' (%s, %d, %d)!\n", nd->u.shop.itemshop_nameid, sd->status.name, nd->exname, map[nd->bl.m].name, nd->bl.x, nd->bl.y);
+ return ERROR_TYPE_PURCHASE_FAIL;
+ }
}
break;
case NPCTYPE_POINTSHOP:
@@ -1563,7 +1586,7 @@ void npc_shop_currency_type(struct map_session_data *sd, struct npc_data *nd, in
}
for (i = 0; i < MAX_INVENTORY; i++) {
- if (sd->inventory.u.items_inventory[i].nameid == id->nameid)
+ if (sd->inventory.u.items_inventory[i].amount > 0 && sd->inventory.u.items_inventory[i].nameid == id->nameid && pc_can_sell_item(sd, &sd->inventory.u.items_inventory[i]))
total += sd->inventory.u.items_inventory[i].amount;
}
}
@@ -1700,7 +1723,7 @@ static int npc_buylist_sub(struct map_session_data* sd, uint16 n, struct s_npc_b
}
// invoke event
- snprintf(npc_ev, ARRAYLENGTH(npc_ev), "%s::OnBuyItem", nd->exname);
+ snprintf(npc_ev, ARRAYLENGTH(npc_ev), "%s::%s", nd->exname, script_config.onbuy_event_name);
npc_event(sd, npc_ev, 0);
return 0;
@@ -1864,6 +1887,7 @@ static int npc_selllist_sub(struct map_session_data* sd, int n, unsigned short*
{
char npc_ev[EVENT_NAME_LENGTH];
char card_slot[NAME_LENGTH];
+ char option_id[NAME_LENGTH], option_val[NAME_LENGTH], option_param[NAME_LENGTH];
int i, j;
int key_nameid = 0;
int key_amount = 0;
@@ -1871,6 +1895,7 @@ static int npc_selllist_sub(struct map_session_data* sd, int n, unsigned short*
int key_attribute = 0;
int key_identify = 0;
int key_card[MAX_SLOTS];
+ int key_option_id[MAX_ITEM_RDM_OPT], key_option_val[MAX_ITEM_RDM_OPT], key_option_param[MAX_ITEM_RDM_OPT];
// discard old contents
script_cleararray_pc(sd, "@sold_nameid", (void*)0);
@@ -1886,12 +1911,21 @@ static int npc_selllist_sub(struct map_session_data* sd, int n, unsigned short*
script_cleararray_pc(sd, card_slot, (void*)0);
}
+ for (j = 0; j < MAX_ITEM_RDM_OPT; j++) { // Clear each of the item option entries
+ key_option_id[j] = key_option_val[j] = key_option_param[j] = 0;
+
+ snprintf(option_id, sizeof(option_id), "@sold_option_id%d", j + 1);
+ script_cleararray_pc(sd, option_id, (void *)0);
+ snprintf(option_val, sizeof(option_val), "@sold_option_val%d", j + 1);
+ script_cleararray_pc(sd, option_val, (void *)0);
+ snprintf(option_param, sizeof(option_param), "@sold_option_param%d", j + 1);
+ script_cleararray_pc(sd, option_param, (void *)0);
+ }
+
// save list of to be sold items
for( i = 0; i < n; i++ )
{
- int idx;
-
- idx = item_list[i*2]-2;
+ int idx = item_list[i * 2] - 2;
script_setarray_pc(sd, "@sold_nameid", i, (void*)(intptr_t)sd->inventory.u.items_inventory[idx].nameid, &key_nameid);
script_setarray_pc(sd, "@sold_quantity", i, (void*)(intptr_t)item_list[i*2+1], &key_amount);
@@ -1907,11 +1941,20 @@ static int npc_selllist_sub(struct map_session_data* sd, int n, unsigned short*
snprintf(card_slot, sizeof(card_slot), "@sold_card%d", j + 1);
script_setarray_pc(sd, card_slot, i, (void*)(intptr_t)sd->inventory.u.items_inventory[idx].card[j], &key_card[j]);
}
+
+ for (j = 0; j < MAX_ITEM_RDM_OPT; j++) { // Store each of the item options in the array
+ snprintf(option_id, sizeof(option_id), "@sold_option_id%d", j + 1);
+ script_setarray_pc(sd, option_id, i, (void*)(intptr_t)sd->inventory.u.items_inventory[idx].option[j].id, &key_option_id[j]);
+ snprintf(option_val, sizeof(option_val), "@sold_option_val%d", j + 1);
+ script_setarray_pc(sd, option_val, i, (void*)(intptr_t)sd->inventory.u.items_inventory[idx].option[j].value, &key_option_val[j]);
+ snprintf(option_param, sizeof(option_param), "@sold_option_param%d", j + 1);
+ script_setarray_pc(sd, option_param, i, (void*)(intptr_t)sd->inventory.u.items_inventory[idx].option[j].param, &key_option_param[j]);
+ }
}
}
// invoke event
- snprintf(npc_ev, ARRAYLENGTH(npc_ev), "%s::OnSellItem", nd->exname);
+ snprintf(npc_ev, ARRAYLENGTH(npc_ev), "%s::%s", nd->exname, script_config.onsell_event_name);
npc_event(sd, npc_ev, 0);
return 0;
}
@@ -1983,7 +2026,7 @@ uint8 npc_selllist(struct map_session_data* sd, int n, unsigned short *item_list
if( sd->inventory_data[idx]->type == IT_PETEGG && sd->inventory.u.items_inventory[idx].card[0] == CARD0_PET )
{
- if( search_petDB_index(sd->inventory.u.items_inventory[idx].nameid, PET_EGG) >= 0 )
+ if( pet_db_search(sd->inventory.u.items_inventory[idx].nameid, PET_EGG) )
{
intif_delete_petdata(MakeDWord(sd->inventory.u.items_inventory[idx].card[1], sd->inventory.u.items_inventory[idx].card[2]));
}
@@ -2357,7 +2400,7 @@ static void npc_parsename(struct npc_data* nd, const char* name, const char* sta
* Support for using Constants in place of NPC View IDs.
*/
int npc_parseview(const char* w4, const char* start, const char* buffer, const char* filepath) {
- int val = -1, i = 0;
+ int val = JT_FAKENPC, i = 0;
char viewid[1024]; // Max size of name from const.txt, see read_constdb.
// Extract view ID / constant
@@ -2374,8 +2417,8 @@ int npc_parseview(const char* w4, const char* start, const char* buffer, const c
if(!npc_viewisid(viewid)) {
// Check if constant exists and get its value.
if(!script_get_constant(viewid, &val)) {
- ShowWarning("npc_parseview: Invalid NPC constant '%s' specified in file '%s', line'%d'. Defaulting to INVISIBLE_CLASS. \n", viewid, filepath, strline(buffer,start-buffer));
- val = INVISIBLE_CLASS;
+ ShowWarning("npc_parseview: Invalid NPC constant '%s' specified in file '%s', line'%d'. Defaulting to INVISIBLE. \n", viewid, filepath, strline(buffer,start-buffer));
+ val = JT_INVISIBLE;
}
} else {
// NPC has an ID specified for view id.
@@ -2390,7 +2433,7 @@ int npc_parseview(const char* w4, const char* start, const char* buffer, const c
*/
bool npc_viewisid(const char * viewid)
{
- if(atoi(viewid) != -1) {
+ if(atoi(viewid) != JT_FAKENPC) {
// Loop through view, looking for non-numeric character.
while (*viewid) {
if (ISDIGIT(*viewid++) == 0) return false;
@@ -2418,6 +2461,7 @@ struct npc_data *npc_create_npc(int16 m, int16 x, int16 y){
nd->bl.y = y;
nd->sc_display = NULL;
nd->sc_display_count = 0;
+ nd->progressbar.timeout = 0;
return nd;
}
@@ -2455,16 +2499,16 @@ struct npc_data* npc_add_warp(char* name, short from_mapid, short from_x, short
safestrncpy(nd->name, nd->exname, ARRAYLENGTH(nd->name));
if( battle_config.warp_point_debug )
- nd->class_ = WARP_DEBUG_CLASS;
+ nd->class_ = JT_GUILD_FLAG;
else
- nd->class_ = WARP_CLASS;
+ nd->class_ = JT_WARPNPC;
nd->speed = 200;
nd->u.warp.mapindex = to_mapindex;
nd->u.warp.x = to_x;
nd->u.warp.y = to_y;
nd->u.warp.xs = xs;
- nd->u.warp.ys = xs;
+ nd->u.warp.ys = ys;
nd->bl.type = BL_NPC;
nd->subtype = NPCTYPE_WARP;
nd->trigger_on_hidden = false;
@@ -2527,9 +2571,9 @@ static const char* npc_parse_warp(char* w1, char* w2, char* w3, char* w4, const
npc_parsename(nd, w3, start, buffer, filepath);
if (!battle_config.warp_point_debug)
- nd->class_ = WARP_CLASS;
+ nd->class_ = JT_WARPNPC;
else
- nd->class_ = WARP_DEBUG_CLASS;
+ nd->class_ = JT_GUILD_FLAG;
nd->speed = 200;
nd->u.warp.mapindex = i;
@@ -2757,11 +2801,11 @@ static const char* npc_parse_shop(char* w1, char* w2, char* w3, char* w4, const
if (type != NPCTYPE_SHOP) {
if (type == NPCTYPE_ITEMSHOP) nd->u.shop.itemshop_nameid = nameid; // Item shop currency
else if (type == NPCTYPE_POINTSHOP) safestrncpy(nd->u.shop.pointshop_str,point_str,strlen(point_str)+1); // Point shop currency
- nd->u.shop.discount = is_discount;
+ nd->u.shop.discount = is_discount > 0;
}
npc_parsename(nd, w3, start, buffer, filepath);
- nd->class_ = m == -1 ? -1 : npc_parseview(w4, start, buffer, filepath);
+ nd->class_ = m == -1 ? JT_FAKENPC : npc_parseview(w4, start, buffer, filepath);
nd->speed = 200;
++npc_shop;
@@ -2780,12 +2824,14 @@ static const char* npc_parse_shop(char* w1, char* w2, char* w3, char* w4, const
map_addnpc(m,nd);
if(map_addblock(&nd->bl))
return strchr(start,'\n');
- status_set_viewdata(&nd->bl, nd->class_);
status_change_init(&nd->bl);
unit_dataset(&nd->bl);
nd->ud.dir = (uint8)dir;
- if( map[nd->bl.m].users )
- clif_spawn(&nd->bl);
+ if( nd->class_ != JT_FAKENPC ){
+ status_set_viewdata(&nd->bl, nd->class_);
+ if( map[nd->bl.m].users )
+ clif_spawn(&nd->bl);
+ }
} else
{// 'floating' shop?
map_addiddb(&nd->bl);
@@ -2996,7 +3042,7 @@ static const char* npc_parse_script(char* w1, char* w2, char* w3, char* w4, cons
}
npc_parsename(nd, w3, start, buffer, filepath);
- nd->class_ = m == -1 ? -1 : npc_parseview(w4, start, buffer, filepath);
+ nd->class_ = m == -1 ? JT_FAKENPC : npc_parseview(w4, start, buffer, filepath);
nd->speed = 200;
nd->u.scr.script = script;
nd->u.scr.label_list = label_list;
@@ -3015,7 +3061,7 @@ static const char* npc_parse_script(char* w1, char* w2, char* w3, char* w4, cons
npc_setcells(nd);
if(map_addblock(&nd->bl))
return NULL;
- if( nd->class_ >= 0 )
+ if( nd->class_ != JT_FAKENPC )
{
status_set_viewdata(&nd->bl, nd->class_);
if( map[nd->bl.m].users )
@@ -3045,7 +3091,7 @@ static const char* npc_parse_script(char* w1, char* w2, char* w3, char* w4, cons
char evname[EVENT_NAME_LENGTH];
struct event_data *ev;
- snprintf(evname, ARRAYLENGTH(evname), "%s::OnInit", nd->exname);
+ snprintf(evname, ARRAYLENGTH(evname), "%s::%s", nd->exname, script_config.init_event_name);
if( ( ev = (struct event_data*)strdb_get(ev_db, evname) ) ) {
@@ -3124,7 +3170,7 @@ const char* npc_parse_duplicate(char* w1, char* w2, char* w3, char* w4, const ch
nd = npc_create_npc(m, x, y);
npc_parsename(nd, w3, start, buffer, filepath);
- nd->class_ = m == -1 ? -1 : npc_parseview(w4, start, buffer, filepath);
+ nd->class_ = m == -1 ? JT_FAKENPC : npc_parseview(w4, start, buffer, filepath);
nd->speed = 200;
nd->src_id = src_id;
nd->bl.type = BL_NPC;
@@ -3152,9 +3198,9 @@ const char* npc_parse_duplicate(char* w1, char* w2, char* w3, char* w4, const ch
case NPCTYPE_WARP:
++npc_warp;
if( !battle_config.warp_point_debug )
- nd->class_ = WARP_CLASS;
+ nd->class_ = JT_WARPNPC;
else
- nd->class_ = WARP_DEBUG_CLASS;
+ nd->class_ = JT_GUILD_FLAG;
nd->u.warp.xs = xs;
nd->u.warp.ys = ys;
nd->u.warp.mapindex = dnd->u.warp.mapindex;
@@ -3173,7 +3219,7 @@ const char* npc_parse_duplicate(char* w1, char* w2, char* w3, char* w4, const ch
npc_setcells(nd);
if(map_addblock(&nd->bl))
return end;
- if( nd->class_ >= 0 ) {
+ if( nd->class_ != JT_FAKENPC ) {
status_set_viewdata(&nd->bl, nd->class_);
if( map[nd->bl.m].users )
clif_spawn(&nd->bl);
@@ -3241,7 +3287,7 @@ int npc_duplicate4instance(struct npc_data *snd, int16 m) {
map_addnpc(m, wnd);
safestrncpy(wnd->name, "", ARRAYLENGTH(wnd->name));
safestrncpy(wnd->exname, newname, ARRAYLENGTH(wnd->exname));
- wnd->class_ = WARP_CLASS;
+ wnd->class_ = JT_WARPNPC;
wnd->speed = 200;
wnd->u.warp.mapindex = map_id2index(imap);
wnd->u.warp.x = snd->u.warp.x;
@@ -3315,7 +3361,7 @@ int npc_instancedestroy(struct npc_data* nd)
**/
void npc_market_tosql(const char *exname, struct npc_item_list *list) {
SqlStmt* stmt = SqlStmt_Malloc(mmysql_handle);
- if (SQL_ERROR == SqlStmt_Prepare(stmt, "REPLACE INTO `%s` (`name`,`nameid`,`price`,`amount`,`flag`) VALUES ('%s','%hu','%d','%hu','%"PRIu8"')",
+ if (SQL_ERROR == SqlStmt_Prepare(stmt, "REPLACE INTO `%s` (`name`,`nameid`,`price`,`amount`,`flag`) VALUES ('%s','%hu','%d','%hu','%" PRIu8 "')",
market_table, exname, list->nameid, list->value, list->qty, list->flag) ||
SQL_ERROR == SqlStmt_Execute(stmt))
SqlStmt_ShowDebug(stmt);
@@ -3429,9 +3475,9 @@ static void npc_market_checkall(void) {
if (!db_size(NPCMarketDB))
return;
else {
- ShowInfo("Checking '"CL_WHITE"%d"CL_RESET"' NPC Markets...\n", db_size(NPCMarketDB));
+ ShowInfo("Checking '" CL_WHITE "%d" CL_RESET "' NPC Markets...\n", db_size(NPCMarketDB));
NPCMarketDB->foreach(NPCMarketDB, npc_market_checkall_sub);
- ShowStatus("Done checking '"CL_WHITE"%d"CL_RESET"' NPC Markets.\n", db_size(NPCMarketDB));
+ ShowStatus("Done checking '" CL_WHITE "%d" CL_RESET "' NPC Markets.\n", db_size(NPCMarketDB));
NPCMarketDB->clear(NPCMarketDB, npc_market_free);
}
}
@@ -3472,7 +3518,7 @@ static void npc_market_fromsql(void) {
}
Sql_FreeResult(mmysql_handle);
- ShowStatus("Done loading '"CL_WHITE"%d"CL_RESET"' entries for '"CL_WHITE"%d"CL_RESET"' NPC Markets from '"CL_WHITE"%s"CL_RESET"' table.\n", count, db_size(NPCMarketDB), market_table);
+ ShowStatus("Done loading '" CL_WHITE "%d" CL_RESET "' entries for '" CL_WHITE "%d" CL_RESET "' NPC Markets from '" CL_WHITE "%s" CL_RESET "' table.\n", count, db_size(NPCMarketDB), market_table);
}
#endif
@@ -3549,10 +3595,11 @@ void npc_unsetcells(struct npc_data* nd)
map_foreachinallarea( npc_unsetcells_sub, m, x0, y0, x1, y1, BL_NPC, nd->bl.id );
}
-void npc_movenpc(struct npc_data* nd, int16 x, int16 y)
+bool npc_movenpc(struct npc_data* nd, int16 x, int16 y)
{
const int16 m = nd->bl.m;
- if (m < 0 || nd->bl.prev == NULL) return; //Not on a map.
+ if (m < 0 || nd->bl.prev == NULL)
+ return false; //Not on a map.
x = cap_value(x, 0, map[m].xs-1);
y = cap_value(y, 0, map[m].ys-1);
@@ -3560,6 +3607,7 @@ void npc_movenpc(struct npc_data* nd, int16 x, int16 y)
map_foreachinallrange(clif_outsight, &nd->bl, AREA_SIZE, BL_PC, &nd->bl);
map_moveblock(&nd->bl, x, y, gettick());
map_foreachinallrange(clif_insight, &nd->bl, AREA_SIZE, BL_PC, &nd->bl);
+ return true;
}
/// Changes the display name of the npc.
@@ -3718,11 +3766,11 @@ void npc_parse_mob2(struct spawn_data* mob)
static const char* npc_parse_mob(char* w1, char* w2, char* w3, char* w4, const char* start, const char* buffer, const char* filepath)
{
- int num, class_, i, j, mob_lv = -1, ai = -1, size = -1, w1count;
+ int num, mob_id, mob_lv = -1, size = -1, w1count;
short m,x,y,xs = -1, ys = -1;
char mapname[MAP_NAME_LENGTH_EXT], mobname[NAME_LENGTH];
struct spawn_data mob, *data;
- struct mob_db* db;
+ int ai; // mob_ai
memset(&mob, 0, sizeof(struct spawn_data));
@@ -3733,7 +3781,7 @@ static const char* npc_parse_mob(char* w1, char* w2, char* w3, char* w4, const c
// w4=<mob id>,<amount>{,<delay1>{,<delay2>{,<event>{,<mob size>{,<mob ai>}}}}}
if( ( w1count = sscanf(w1, "%15[^,],%6hd,%6hd,%6hd,%6hd", mapname, &x, &y, &xs, &ys) ) < 3
|| sscanf(w3, "%23[^,],%11d", mobname, &mob_lv) < 1
- || sscanf(w4, "%11d,%11d,%11u,%11u,%77[^,],%11d,%11d[^\t\r\n]", &class_, &num, &mob.delay1, &mob.delay2, mob.eventname, &size, &ai) < 2 )
+ || sscanf(w4, "%11d,%11d,%11u,%11u,%77[^,],%11d,%11d[^\t\r\n]", &mob_id, &num, &mob.delay1, &mob.delay2, mob.eventname, &size, &ai) < 2 )
{
ShowError("npc_parse_mob: Invalid mob definition in file '%s', line '%d'.\n * w1=%s\n * w2=%s\n * w3=%s\n * w4=%s\n", filepath, strline(buffer,start-buffer), w1, w2, w3, w4);
return strchr(start,'\n');// skip and continue
@@ -3755,9 +3803,9 @@ static const char* npc_parse_mob(char* w1, char* w2, char* w3, char* w4, const c
}
// check monster ID if exists!
- if( mobdb_checkid(class_) == 0 )
+ if( mobdb_checkid(mob_id) == 0 )
{
- ShowError("npc_parse_mob: Unknown mob ID %d (file '%s', line '%d').\n", class_, filepath, strline(buffer,start-buffer));
+ ShowError("npc_parse_mob: Unknown mob ID %d (file '%s', line '%d').\n", mob_id, filepath, strline(buffer,start-buffer));
return strchr(start,'\n');// skip and continue
}
@@ -3769,25 +3817,25 @@ static const char* npc_parse_mob(char* w1, char* w2, char* w3, char* w4, const c
if( mob.state.size > SZ_BIG && size != -1 )
{
- ShowError("npc_parse_mob: Invalid size number %d for mob ID %d (file '%s', line '%d').\n", mob.state.size, class_, filepath, strline(buffer, start - buffer));
+ ShowError("npc_parse_mob: Invalid size number %d for mob ID %d (file '%s', line '%d').\n", mob.state.size, mob_id, filepath, strline(buffer, start - buffer));
return strchr(start, '\n');
}
if( (mob.state.ai < AI_NONE || mob.state.ai >= AI_MAX) && ai != -1 )
{
- ShowError("npc_parse_mob: Invalid ai %d for mob ID %d (file '%s', line '%d').\n", mob.state.ai, class_, filepath, strline(buffer, start - buffer));
+ ShowError("npc_parse_mob: Invalid ai %d for mob ID %d (file '%s', line '%d').\n", mob.state.ai, mob_id, filepath, strline(buffer, start - buffer));
return strchr(start, '\n');
}
if( (mob_lv == 0 || mob_lv > MAX_LEVEL) && mob_lv != -1 )
{
- ShowError("npc_parse_mob: Invalid level %d for mob ID %d (file '%s', line '%d').\n", mob_lv, class_, filepath, strline(buffer, start - buffer));
+ ShowError("npc_parse_mob: Invalid level %d for mob ID %d (file '%s', line '%d').\n", mob_lv, mob_id, filepath, strline(buffer, start - buffer));
return strchr(start, '\n');
}
mob.num = (unsigned short)num;
mob.active = 0;
- mob.id = (short) class_;
+ mob.id = (short) mob_id;
mob.x = (unsigned short)x;
mob.y = (unsigned short)y;
mob.xs = (signed short)xs;
@@ -3797,18 +3845,18 @@ static const char* npc_parse_mob(char* w1, char* w2, char* w3, char* w4, const c
if (size > SZ_SMALL && size <= SZ_BIG)
mob.state.size = size;
if (ai > AI_NONE && ai <= AI_MAX)
- mob.state.ai = ai;
+ mob.state.ai = static_cast<enum mob_ai>(ai);
if (mob.xs < 0) {
if (w1count > 3) {
- ShowWarning("npc_parse_mob: Negative x-span %hd for mob ID %d (file '%s', line '%d').\n", mob.xs, class_, filepath, strline(buffer, start - buffer));
+ ShowWarning("npc_parse_mob: Negative x-span %hd for mob ID %d (file '%s', line '%d').\n", mob.xs, mob_id, filepath, strline(buffer, start - buffer));
}
mob.xs = 0;
}
if (mob.ys < 0) {
if (w1count > 4) {
- ShowWarning("npc_parse_mob: Negative y-span %hd for mob ID %d (file '%s', line '%d').\n", mob.ys, class_, filepath, strline(buffer, start - buffer));
+ ShowWarning("npc_parse_mob: Negative y-span %hd for mob ID %d (file '%s', line '%d').\n", mob.ys, mob_id, filepath, strline(buffer, start - buffer));
}
mob.ys = 0;
}
@@ -3840,37 +3888,13 @@ static const char* npc_parse_mob(char* w1, char* w2, char* w3, char* w4, const c
//Verify dataset.
if( !mob_parse_dataset(&mob) )
{
- ShowError("npc_parse_mob: Invalid dataset for monster ID %d (file '%s', line '%d').\n", class_, filepath, strline(buffer,start-buffer));
+ ShowError("npc_parse_mob: Invalid dataset for monster ID %d (file '%s', line '%d').\n", mob_id, filepath, strline(buffer,start-buffer));
return strchr(start,'\n');// skip and continue
}
//Update mob spawn lookup database
- db = mob_db(class_);
- for( i = 0; i < ARRAYLENGTH(db->spawn); ++i )
- {
- if (map[mob.m].index == db->spawn[i].mapindex)
- { //Update total
- db->spawn[i].qty += mob.num;
- //Re-sort list
- for( j = i; j > 0 && db->spawn[j-1].qty < db->spawn[i].qty; --j );
- if( j != i )
- {
- xs = db->spawn[i].mapindex;
- ys = db->spawn[i].qty;
- memmove(&db->spawn[j+1], &db->spawn[j], (i-j)*sizeof(db->spawn[0]));
- db->spawn[j].mapindex = xs;
- db->spawn[j].qty = ys;
- }
- break;
- }
- if (mob.num > db->spawn[i].qty)
- { //Insert into list
- memmove(&db->spawn[i+1], &db->spawn[i], sizeof(db->spawn) -(i+1)*sizeof(db->spawn[0]));
- db->spawn[i].mapindex = map[mob.m].index;
- db->spawn[i].qty = mob.num;
- break;
- }
- }
+ struct spawn_info spawn = { map[mob.m].index, mob.num };
+ mob_add_spawn(mob_id, spawn);
//Now that all has been validated. We allocate the actual memory that the re-spawn data will use.
data = (struct spawn_data*)aMalloc(sizeof(struct spawn_data));
@@ -4438,23 +4462,36 @@ int npc_script_event(struct map_session_data* sd, enum npce_event type)
return i;
}
+const char *npc_get_script_event_name(int npce_index)
+{
+ switch (npce_index) {
+ case NPCE_LOGIN:
+ return script_config.login_event_name;
+ case NPCE_LOGOUT:
+ return script_config.logout_event_name;
+ case NPCE_LOADMAP:
+ return script_config.loadmap_event_name;
+ case NPCE_BASELVUP:
+ return script_config.baselvup_event_name;
+ case NPCE_JOBLVUP:
+ return script_config.joblvup_event_name;
+ case NPCE_DIE:
+ return script_config.die_event_name;
+ case NPCE_KILLPC:
+ return script_config.kill_pc_event_name;
+ case NPCE_KILLNPC:
+ return script_config.kill_mob_event_name;
+ case NPCE_STATCALC:
+ return script_config.stat_calc_event_name;
+ default:
+ ShowError("npc_get_script_event_name: npce_index is outside the array limits: %d (max: %d).\n", npce_index, NPCE_MAX);
+ return NULL;
+ }
+}
+
void npc_read_event_script(void)
{
int i;
- struct {
- char *name;
- const char *event_name;
- } config[] = {
- {"Login Event",script_config.login_event_name},
- {"Logout Event",script_config.logout_event_name},
- {"Load Map Event",script_config.loadmap_event_name},
- {"Base LV Up Event",script_config.baselvup_event_name},
- {"Job LV Up Event",script_config.joblvup_event_name},
- {"Die Event",script_config.die_event_name},
- {"Kill PC Event",script_config.kill_pc_event_name},
- {"Kill NPC Event",script_config.kill_mob_event_name},
- {"Stat Calc Event",script_config.stat_calc_event_name},
- };
for (i = 0; i < NPCE_MAX; i++)
{
@@ -4463,7 +4500,7 @@ void npc_read_event_script(void)
DBData *data;
char name[EVENT_NAME_LENGTH];
- safesnprintf(name,EVENT_NAME_LENGTH,"::%s",config[i].event_name);
+ safesnprintf(name,EVENT_NAME_LENGTH,"::%s", npc_get_script_event_name(i));
script_event[i].event_count = 0;
iter = db_iterator(ev_db);
@@ -4475,7 +4512,7 @@ void npc_read_event_script(void)
if( count >= ARRAYLENGTH(script_event[i].event) )
{
- ShowWarning("npc_read_event_script: too many occurences of event '%s'!\n", config[i].event_name);
+ ShowWarning("npc_read_event_script: too many occurences of event '%s'!\n", npc_get_script_event_name(i));
break;
}
@@ -4492,7 +4529,7 @@ void npc_read_event_script(void)
if (battle_config.etc_log) {
//Print summary.
for (i = 0; i < NPCE_MAX; i++)
- ShowInfo("%s: %d '%s' events.\n", config[i].name, script_event[i].event_count, config[i].event_name);
+ ShowInfo("%d '%s' events.\n", script_event[i].event_count, npc_get_script_event_name(i));
}
}
@@ -4579,16 +4616,16 @@ int npc_reload(void) {
//TODO: the following code is copy-pasted from do_init_npc(); clean it up
// Reloading npcs now
for (nsl = npc_src_files; nsl; nsl = nsl->next) {
- ShowStatus("Loading NPC file: %s"CL_CLL"\r", nsl->name);
+ ShowStatus("Loading NPC file: %s" CL_CLL "\r", nsl->name);
npc_parsesrcfile(nsl->name,false);
}
- ShowInfo ("Done loading '"CL_WHITE"%d"CL_RESET"' NPCs:"CL_CLL"\n"
- "\t-'"CL_WHITE"%d"CL_RESET"' Warps\n"
- "\t-'"CL_WHITE"%d"CL_RESET"' Shops\n"
- "\t-'"CL_WHITE"%d"CL_RESET"' Scripts\n"
- "\t-'"CL_WHITE"%d"CL_RESET"' Spawn sets\n"
- "\t-'"CL_WHITE"%d"CL_RESET"' Mobs Cached\n"
- "\t-'"CL_WHITE"%d"CL_RESET"' Mobs Not Cached\n",
+ ShowInfo ("Done loading '" CL_WHITE "%d" CL_RESET "' NPCs:" CL_CLL "\n"
+ "\t-'" CL_WHITE "%d" CL_RESET "' Warps\n"
+ "\t-'" CL_WHITE "%d" CL_RESET "' Shops\n"
+ "\t-'" CL_WHITE "%d" CL_RESET "' Scripts\n"
+ "\t-'" CL_WHITE "%d" CL_RESET "' Spawn sets\n"
+ "\t-'" CL_WHITE "%d" CL_RESET "' Mobs Cached\n"
+ "\t-'" CL_WHITE "%d" CL_RESET "' Mobs Not Cached\n",
npc_id - npc_new_min, npc_warp, npc_shop, npc_script, npc_mob, npc_cache_mob, npc_delay_mob);
//Re-read the NPC Script Events cache.
@@ -4703,7 +4740,7 @@ void do_init_npc(void){
//Stock view data for normal npcs.
memset(&npc_viewdb, 0, sizeof(npc_viewdb));
- npc_viewdb[0].class_ = INVISIBLE_CLASS; //Invisible class is stored here.
+ npc_viewdb[0].class_ = JT_INVISIBLE; //Invisible class is stored here.
for( i = 1; i < MAX_NPC_CLASS; i++ )
npc_viewdb[i].class_ = i;
for( i = MAX_NPC_CLASS2_START; i < MAX_NPC_CLASS2_END; i++ )
@@ -4711,28 +4748,28 @@ void do_init_npc(void){
ev_db = strdb_alloc((DBOptions)(DB_OPT_DUP_KEY|DB_OPT_RELEASE_DATA), EVENT_NAME_LENGTH);
npcname_db = strdb_alloc(DB_OPT_BASE, NPC_NAME_LENGTH+1);
- npc_path_db = strdb_alloc(DB_OPT_BASE|DB_OPT_DUP_KEY|DB_OPT_RELEASE_DATA,80);
+ npc_path_db = strdb_alloc((DBOptions)(DB_OPT_BASE|DB_OPT_DUP_KEY|DB_OPT_RELEASE_DATA),80);
#if PACKETVER >= 20131223
NPCMarketDB = strdb_alloc(DB_OPT_BASE, NPC_NAME_LENGTH+1);
npc_market_fromsql();
#endif
- timer_event_ers = ers_new(sizeof(struct timer_event_data),"npc.c::timer_event_ers",ERS_OPT_NONE);
- npc_sc_display_ers = ers_new(sizeof(struct sc_display_entry), "npc.c:npc_sc_display_ers", ERS_OPT_NONE);
+ timer_event_ers = ers_new(sizeof(struct timer_event_data),"npc.cpp::timer_event_ers",ERS_OPT_NONE);
+ npc_sc_display_ers = ers_new(sizeof(struct sc_display_entry), "npc.cpp:npc_sc_display_ers", ERS_OPT_NONE);
// process all npc files
ShowStatus("Loading NPCs...\r");
for( file = npc_src_files; file != NULL; file = file->next ) {
- ShowStatus("Loading NPC file: %s"CL_CLL"\r", file->name);
+ ShowStatus("Loading NPC file: %s" CL_CLL "\r", file->name);
npc_parsesrcfile(file->name,false);
}
- ShowInfo ("Done loading '"CL_WHITE"%d"CL_RESET"' NPCs:"CL_CLL"\n"
- "\t-'"CL_WHITE"%d"CL_RESET"' Warps\n"
- "\t-'"CL_WHITE"%d"CL_RESET"' Shops\n"
- "\t-'"CL_WHITE"%d"CL_RESET"' Scripts\n"
- "\t-'"CL_WHITE"%d"CL_RESET"' Spawn sets\n"
- "\t-'"CL_WHITE"%d"CL_RESET"' Mobs Cached\n"
- "\t-'"CL_WHITE"%d"CL_RESET"' Mobs Not Cached\n",
+ ShowInfo ("Done loading '" CL_WHITE "%d" CL_RESET "' NPCs:" CL_CLL "\n"
+ "\t-'" CL_WHITE "%d" CL_RESET "' Warps\n"
+ "\t-'" CL_WHITE "%d" CL_RESET "' Shops\n"
+ "\t-'" CL_WHITE "%d" CL_RESET "' Scripts\n"
+ "\t-'" CL_WHITE "%d" CL_RESET "' Spawn sets\n"
+ "\t-'" CL_WHITE "%d" CL_RESET "' Mobs Cached\n"
+ "\t-'" CL_WHITE "%d" CL_RESET "' Mobs Not Cached\n",
npc_id - START_NPC_NUM, npc_warp, npc_shop, npc_script, npc_mob, npc_cache_mob, npc_delay_mob);
// set up the events cache
@@ -4754,7 +4791,7 @@ void do_init_npc(void){
fake_nd = (struct npc_data *)aCalloc(1,sizeof(struct npc_data));
fake_nd->bl.m = -1;
fake_nd->bl.id = npc_get_new_npc_id();
- fake_nd->class_ = -1;
+ fake_nd->class_ = JT_FAKENPC;
fake_nd->speed = 200;
strcpy(fake_nd->name,"FAKE_NPC");
memcpy(fake_nd->exname, fake_nd->name, 9);
diff --git a/src/map/npc.h b/src/map/npc.h
deleted file mode 100644
index 2130f664194..00000000000
--- a/src/map/npc.h
+++ /dev/null
@@ -1,231 +0,0 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder
-
-#ifndef _NPC_H_
-#define _NPC_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "map.h" // struct block_list
-#include "status.h" // struct status_change
-#include "unit.h" // struct unit_data
-
-struct block_list;
-struct npc_data;
-struct view_data;
-
-struct npc_timerevent_list {
- int timer,pos;
-};
-
-struct npc_label_list {
- char name[NAME_LENGTH+1];
- int pos;
-};
-
-/// Item list for NPC sell/buy list
-struct npc_item_list {
- unsigned short nameid;
- unsigned int value;
-#if PACKETVER >= 20131223
- unsigned short qty; ///< Stock counter (Market shop)
- uint8 flag; ///< 1: Item added by npcshopitem/npcshopadditem, force load! (Market shop)
-#endif
-};
-
-/// List of bought/sold item for NPC shops
-struct s_npc_buy_list {
- unsigned short qty; ///< Amount of item will be bought
- unsigned short nameid; ///< ID of item will be bought
-};
-
-struct npc_data {
- struct block_list bl;
- struct unit_data ud; //Because they need to be able to move....
- struct view_data *vd;
- struct status_change sc; //They can't have status changes, but.. they want the visual opt values.
- struct npc_data *master_nd;
- short class_,speed,instance_id;
- char name[NPC_NAME_LENGTH+1];// display name
- char exname[NPC_NAME_LENGTH+1];// unique npc name
- int chat_id,touching_id;
- unsigned int next_walktime;
-
- unsigned size : 2;
-
- struct status_data status;
- unsigned int level,stat_point;
- struct s_npc_params {
- unsigned short str, agi, vit, int_, dex, luk;
- } params;
-
- void* chatdb; // pointer to a npc_parse struct (see npc_chat.c)
- char* path;/* path dir */
- enum npc_subtype subtype;
- bool trigger_on_hidden;
- int src_id;
- union {
- struct {
- struct script_code *script;
- short xs,ys; // OnTouch area radius
- int guild_id;
- int timer,timerid,timeramount,rid;
- unsigned int timertick;
- struct npc_timerevent_list *timer_event;
- int label_list_num;
- struct npc_label_list *label_list;
- } scr;
- struct {
- struct npc_item_list *shop_item;
- uint16 count;
- unsigned short itemshop_nameid; // Item Shop cost item ID
- char pointshop_str[32]; // Point Shop cost variable name
- bool discount;
- } shop;
- struct {
- short xs,ys; // OnTouch area radius
- short x,y; // destination coords
- unsigned short mapindex; // destination map
- } warp;
- struct {
- struct mob_data *md;
- time_t kill_time;
- char killer_name[NAME_LENGTH];
- int spawn_timer;
- } tomb;
- } u;
-
- struct sc_display_entry **sc_display;
- unsigned char sc_display_count;
-};
-
-struct eri *npc_sc_display_ers;
-
-#define START_NPC_NUM 110000000
-
-enum actor_classes
-{
- WARP_CLASS = 45,
- HIDDEN_WARP_CLASS = 139,
- WARP_DEBUG_CLASS = 722,
- FLAG_CLASS = 722,
- INVISIBLE_CLASS = 32767,
-};
-
-// Old NPC range
-#define MAX_NPC_CLASS 1000
-// New NPC range
-#define MAX_NPC_CLASS2_START 10000
-#define MAX_NPC_CLASS2_END 10255
-
-//Checks if a given id is a valid npc id. [Skotlex]
-//Since new npcs are added all the time, the max valid value is the one before the first mob (Scorpion = 1001)
-#define npcdb_checkid(id) ( ( (id) >= 46 && (id) <= 125) || (id) == HIDDEN_WARP_CLASS || ( (id) > 400 && (id) < MAX_NPC_CLASS ) || (id) == INVISIBLE_CLASS || ( id > MAX_NPC_CLASS2_START && id < MAX_NPC_CLASS2_END ) )
-
-#ifdef PCRE_SUPPORT
-void npc_chat_finalize(struct npc_data* nd);
-#endif
-
-//Script NPC events.
-enum npce_event {
- NPCE_LOGIN,
- NPCE_LOGOUT,
- NPCE_LOADMAP,
- NPCE_BASELVUP,
- NPCE_JOBLVUP,
- NPCE_DIE,
- NPCE_KILLPC,
- NPCE_KILLNPC,
- NPCE_STATCALC,
- NPCE_MAX
-};
-struct view_data* npc_get_viewdata(int class_);
-int npc_chat_sub(struct block_list* bl, va_list ap);
-int npc_event_dequeue(struct map_session_data* sd);
-int npc_event(struct map_session_data* sd, const char* eventname, int ontouch);
-int npc_touch_areanpc(struct map_session_data* sd, int16 m, int16 x, int16 y);
-int npc_touch_areanpc2(struct mob_data *md); // [Skotlex]
-int npc_check_areanpc(int flag, int16 m, int16 x, int16 y, int16 range);
-int npc_touchnext_areanpc(struct map_session_data* sd,bool leavemap);
-int npc_click(struct map_session_data* sd, struct npc_data* nd);
-int npc_scriptcont(struct map_session_data* sd, int id, bool closing);
-struct npc_data* npc_checknear(struct map_session_data* sd, struct block_list* bl);
-int npc_buysellsel(struct map_session_data* sd, int id, int type);
-uint8 npc_buylist(struct map_session_data* sd, uint16 n, struct s_npc_buy_list *item_list);
-uint8 npc_selllist(struct map_session_data* sd, int n, unsigned short *item_list);
-void npc_parse_mob2(struct spawn_data* mob);
-bool npc_viewisid(const char * viewid);
-struct npc_data* npc_add_warp(char* name, short from_mapid, short from_x, short from_y, short xs, short ys, unsigned short to_mapindex, short to_x, short to_y);
-int npc_globalmessage(const char* name,const char* mes);
-
-void npc_setcells(struct npc_data* nd);
-void npc_unsetcells(struct npc_data* nd);
-void npc_movenpc(struct npc_data* nd, int16 x, int16 y);
-int npc_enable(const char* name, int flag);
-void npc_setdisplayname(struct npc_data* nd, const char* newname);
-void npc_setclass(struct npc_data* nd, short class_);
-struct npc_data* npc_name2id(const char* name);
-int npc_isnear_sub(struct block_list* bl, va_list args);
-bool npc_isnear(struct block_list * bl);
-
-int npc_get_new_npc_id(void);
-
-int npc_addsrcfile(const char* name, bool loadscript);
-void npc_delsrcfile(const char* name);
-int npc_parsesrcfile(const char* filepath, bool runOnInit);
-void do_clear_npc(void);
-void do_final_npc(void);
-void do_init_npc(void);
-void npc_event_do_oninit(void);
-
-int npc_event_do(const char* name);
-int npc_event_do_id(const char* name, int rid);
-int npc_event_doall(const char* name);
-void npc_event_runall( const char* eventname );
-int npc_event_doall_id(const char* name, int rid);
-
-int npc_timerevent_start(struct npc_data* nd, int rid);
-int npc_timerevent_stop(struct npc_data* nd);
-void npc_timerevent_quit(struct map_session_data* sd);
-int npc_gettimerevent_tick(struct npc_data* nd);
-int npc_settimerevent_tick(struct npc_data* nd, int newtimer);
-int npc_remove_map(struct npc_data* nd);
-void npc_unload_duplicates (struct npc_data* nd);
-int npc_unload(struct npc_data* nd, bool single);
-int npc_reload(void);
-void npc_read_event_script(void);
-int npc_script_event(struct map_session_data* sd, enum npce_event type);
-
-int npc_duplicate4instance(struct npc_data *snd, int16 m);
-int npc_instanceinit(struct npc_data* nd);
-int npc_instancedestroy(struct npc_data* nd);
-int npc_cashshop_buy(struct map_session_data *sd, unsigned short nameid, int amount, int points);
-
-void npc_shop_currency_type(struct map_session_data *sd, struct npc_data *nd, int cost[2], bool display);
-
-extern struct npc_data* fake_nd;
-
-int npc_cashshop_buylist(struct map_session_data *sd, int points, int count, unsigned short* item_list);
-bool npc_shop_discount(enum npc_subtype type, bool discount);
-
-#if PACKETVER >= 20131223
-void npc_market_tosql(const char *exname, struct npc_item_list *list);
-void npc_market_delfromsql_(const char *exname, unsigned short nameid, bool clear);
-#endif
-
-#ifdef SECURE_NPCTIMEOUT
- int npc_rr_secure_timeout_timer(int tid, unsigned int tick, int id, intptr_t data);
-#endif
-
-// @commands (script-based)
-int npc_do_atcmd_event(struct map_session_data* sd, const char* command, const char* message, const char* eventname);
-
-bool npc_unloadfile( const char* path );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _NPC_H_ */
diff --git a/src/map/npc.hpp b/src/map/npc.hpp
new file mode 100644
index 00000000000..2cdf32192cf
--- /dev/null
+++ b/src/map/npc.hpp
@@ -0,0 +1,1213 @@
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
+#ifndef _NPC_HPP_
+#define _NPC_HPP_
+
+#include "map.hpp" // struct block_list
+#include "status.hpp" // struct status_change
+#include "unit.hpp" // struct unit_data
+
+struct block_list;
+struct npc_data;
+struct view_data;
+
+struct npc_timerevent_list {
+ int timer,pos;
+};
+
+struct npc_label_list {
+ char name[NAME_LENGTH+1];
+ int pos;
+};
+
+/// Item list for NPC sell/buy list
+struct npc_item_list {
+ unsigned short nameid;
+ unsigned int value;
+#if PACKETVER >= 20131223
+ unsigned short qty; ///< Stock counter (Market shop)
+ uint8 flag; ///< 1: Item added by npcshopitem/npcshopadditem, force load! (Market shop)
+#endif
+};
+
+/// List of bought/sold item for NPC shops
+struct s_npc_buy_list {
+ unsigned short qty; ///< Amount of item will be bought
+ unsigned short nameid; ///< ID of item will be bought
+};
+
+struct npc_data {
+ struct block_list bl;
+ struct unit_data ud; //Because they need to be able to move....
+ struct view_data *vd;
+ struct status_change sc; //They can't have status changes, but.. they want the visual opt values.
+ struct npc_data *master_nd;
+ short class_,speed,instance_id;
+ char name[NPC_NAME_LENGTH+1];// display name
+ char exname[NPC_NAME_LENGTH+1];// unique npc name
+ int chat_id,touching_id;
+ unsigned int next_walktime;
+
+ unsigned size : 2;
+
+ struct status_data status;
+ unsigned int level,stat_point;
+ struct s_npc_params {
+ unsigned short str, agi, vit, int_, dex, luk;
+ } params;
+
+ void* chatdb; // pointer to a npc_parse struct (see npc_chat.c)
+ char* path;/* path dir */
+ enum npc_subtype subtype;
+ bool trigger_on_hidden;
+ int src_id;
+ union {
+ struct {
+ struct script_code *script;
+ short xs,ys; // OnTouch area radius
+ int guild_id;
+ int timer,timerid,timeramount,rid;
+ unsigned int timertick;
+ struct npc_timerevent_list *timer_event;
+ int label_list_num;
+ struct npc_label_list *label_list;
+ } scr;
+ struct {
+ struct npc_item_list *shop_item;
+ uint16 count;
+ unsigned short itemshop_nameid; // Item Shop cost item ID
+ char pointshop_str[32]; // Point Shop cost variable name
+ bool discount;
+ } shop;
+ struct {
+ short xs,ys; // OnTouch area radius
+ short x,y; // destination coords
+ unsigned short mapindex; // destination map
+ } warp;
+ struct {
+ struct mob_data *md;
+ time_t kill_time;
+ char killer_name[NAME_LENGTH];
+ int spawn_timer;
+ } tomb;
+ } u;
+
+ struct sc_display_entry **sc_display;
+ unsigned char sc_display_count;
+
+ struct {
+ unsigned int timeout;
+ unsigned long color;
+ } progressbar;
+};
+
+struct eri;
+extern struct eri *npc_sc_display_ers;
+
+#define START_NPC_NUM 110000000
+
+enum e_job_types
+{
+ NPC_RANGE1_START = 44,
+ JT_WARPNPC,
+ JT_1_ETC_01,
+ JT_1_M_01,
+ JT_1_M_02,
+ JT_1_M_03,
+ JT_1_M_04,
+ JT_1_M_BARD,
+ JT_1_M_HOF,
+ JT_1_M_INNKEEPER,
+ JT_1_M_JOBGUIDER,
+ JT_1_M_JOBTESTER,
+ JT_1_M_KNIGHTMASTER,
+ JT_1_M_LIBRARYMASTER,
+ JT_1_M_MERCHANT,
+ JT_1_M_ORIENT01,
+ JT_1_M_PASTOR,
+ JT_1_M_PUBMASTER,
+ JT_1_M_SIZ,
+ JT_1_M_SMITH,
+ JT_1_M_WIZARD,
+ JT_1_M_YOUNGKNIGHT,
+ JT_1_F_01,
+ JT_1_F_02,
+ JT_1_F_03,
+ JT_1_F_04,
+ JT_1_F_GYPSY,
+ JT_1_F_LIBRARYGIRL,
+ JT_1_F_MARIA,
+ JT_1_F_MERCHANT_01,
+ JT_1_F_MERCHANT_02,
+ JT_1_F_ORIENT_01,
+ JT_1_F_ORIENT_02,
+ JT_1_F_ORIENT_03,
+ JT_1_F_ORIENT_04,
+ JT_1_F_PRIEST,
+ JT_1_F_PUBGIRL,
+ JT_4_DOG01,
+ JT_4_KID01,
+ JT_4_M_01,
+ JT_4_M_02,
+ JT_4_M_03,
+ JT_4_M_04,
+ JT_4_M_BARBER,
+ JT_4_M_ORIENT01,
+ JT_4_M_ORIENT02,
+ JT_4_F_01,
+ JT_4_F_02,
+ JT_4_F_03,
+ JT_4_F_04,
+ JT_4_F_MAID,
+ JT_4_F_SISTER,
+ JT_4W_KID,
+ JT_4W_M_01,
+ JT_4W_M_02,
+ JT_4W_M_03,
+ JT_4W_SAILOR,
+ JT_4W_F_01,
+ JT_8_F,
+ JT_8_F_GRANDMOTHER,
+ JT_EFFECTLAUNCHER,
+ JT_8W_SOLDIER,
+ JT_1_M_MOC_LORD,
+ JT_1_M_PAY_ELDER,
+ JT_1_M_PRON_KING,
+ JT_4_M_MANAGER,
+ JT_4_M_MINISTER,
+ JT_HIDDEN_NPC,
+ JT_4_F_KAFRA6,
+ JT_4_F_KAFRA5,
+ JT_4_F_KAFRA4,
+ JT_4_F_KAFRA3,
+ JT_4_F_KAFRA2,
+ JT_4_F_KAFRA1,
+ JT_2_M_THIEFMASTER,
+ JT_2_M_SWORDMASTER,
+ JT_2_M_PHARMACIST,
+ JT_2_M_MOLGENSTEIN,
+ JT_2_M_DYEINGER,
+ JT_2_F_MAGICMASTER,
+ JT_4_F_TELEPORTER,
+ JT_4_M_TELEPORTER,
+ NPC_RANGE1_END,
+
+ JT_HIDDEN_WARP_NPC = 139,
+
+ NPC_RANGE2_START = 400,
+ JT_4_M_MUT2,
+ JT_4_M_SCIENCE,
+ JT_4_F_VALKYRIE2,
+ JT_4_M_UNCLEKNIGHT,
+ JT_4_M_YOUNGKNIGHT,
+ JT_2_MONEMUS,
+ JT_4_M_ATEIL,
+ JT_4_F_ANNIVERSARY,
+ JT_4_M_GREATPO,
+ JT_4_M_NOVELIST,
+ JT_4_M_CHAMPSOUL,
+ JT_4_M_OLDFRIAR,
+ JT_4_M_CRU_SOLD,
+ JT_4_M_CRU_KNT,
+ JT_4_M_CRU_HEAD,
+ JT_4_M_CRU_CRUA,
+ JT_4_M_KY_SOLD,
+ JT_4_M_KY_KNT,
+ JT_4_M_KY_HEAD,
+ JT_4_M_KY_KIYOM,
+ JT_4_M_BOSSCAT,
+ JT_4_M_BABYCAT,
+ JT_4W_F_KAFRA2,
+ JT_4_F_MUNAK,
+ JT_4_M_BONGUN,
+ JT_4_BEAR,
+ JT_4_BLUEWOLF,
+ JT_4_PECOPECO,
+ JT_4_M_JP_MID,
+ JT_4_M_JP_RUN,
+ JT_4_ORCLADY,
+ JT_4_ORCLADY2,
+ JT_4_ORCWARRIOR,
+ JT_4_ORCWARRIOR2,
+ JT_4_F_FAIRY,
+ JT_4_F_FAIRYKID,
+ JT_4_F_FAIRYKID2,
+ JT_4_F_FAIRYKID3,
+ JT_4_F_FAIRYKID4,
+ JT_4_F_FAIRYKID5,
+ JT_4_F_FAIRYKID6,
+ JT_4_M_FAIRYKID,
+ JT_4_M_FAIRYKID2,
+ JT_4_M_FAIRYKID3,
+ JT_4_M_FAIRYKID4,
+ JT_4_M_FAIRYKID5,
+ JT_4_M_FAIRYSOLDIER,
+ JT_4_M_TUFFOLD,
+ JT_4_MAN_BENKUNI,
+ JT_4_MAN_GALTUN,
+ JT_4_MAN_JERUTOO,
+ JT_4_MAN_LAVAIL,
+ JT_4_MAN_NITT,
+ JT_4_MAN_PIOM,
+ JT_4_MAN_PIOM2,
+ JT_4_M_DSTMAN,
+ JT_4_M_DSTMANDEAD,
+ JT_4_BABYLEOPARD,
+ JT_4_M_REDSWORD,
+ JT_4_MAN_PIOM3,
+ JT_4_M_FAIRYSOLDIER2,
+ JT_4_F_FAIRYSOLDIER,
+ JT_4_DRAGON_EGG,
+ JT_4_MIMIC,
+ JT_4_F_FAIRY1,
+ JT_4_F_GUILLOTINE,
+ JT_4_M_GUILLOTINE,
+ JT_4_M_KNIGHT_BLACK,
+ JT_4_M_KNIGHT_GOLD,
+ JT_4_M_KNIGHT_SILVER,
+ JT_4_SKULL_MUD,
+ JT_4_M_BRZ_INDIAN,
+ JT_4_F_BRZ_INDIAN,
+ JT_4_F_BRZ_INDOLD,
+ JT_4_M_BRZ_JACI,
+ JT_4_M_BRZ_MAN1,
+ JT_4_M_BRZ_MAN2,
+ JT_4_F_BRZ_WOMAN,
+ JT_4_M_MINSTREL,
+ JT_4_M_MINSTREL1,
+ JT_4_M_SHADOWCHASER,
+ JT_4_F_SHADOWCHASER,
+ JT_4_M_SURA,
+ JT_4_F_SURA,
+ JT_4_F_WANDERER,
+ JT_4_M_BARD,
+ JT_1_FLAG_NOFEAR,
+ JT_4_M_NOFEARGUY,
+ JT_4_MAN_PIOM6,
+ JT_4_MAN_PIOM4,
+ JT_4_MAN_PIOM5,
+ JT_4_MAN_GALTUN1,
+ JT_4_HUMAN_GERUTOO,
+ JT_4_M_ROKI,
+ JT_4_M_MERCAT1,
+ JT_4_M_MERCAT2,
+ JT_4_M_CATMAN1,
+ JT_4_M_CATMAN2,
+ JT_4_F_BRZ_WOMAN2,
+ JT_4_M_JP_DISH,
+ JT_4_F_JP_NOAH,
+ JT_4_F_JP_OZ,
+ JT_4_F_JP_CHROME,
+ JT_4_F_JP_RINNE,
+ JT_4_WHITETIGER,
+ JT_4_VENDING_MACHINE,
+ JT_4_MISTY,
+ JT_4_NECORING,
+ JT_4_ELEPHANT,
+ JT_4_F_NYDHOG,
+ JT_4_F_NYDHOG2,
+ JT_4_M_ROKI2,
+ JT_4_M_DOGTRAVELER,
+ JT_4_M_DOGTRAVELER2,
+ JT_4_F_DOGTRAVELER,
+ JT_4_M_RAFLE_GR,
+ JT_4_M_RAFLE_OLD,
+ JT_4_F_RAFLE_PK,
+ JT_4_M_LYINGDOG,
+ JT_4_F_MORAFINE1,
+ JT_4_F_MORAFINE2,
+ JT_4_M_RAFLE_OR,
+ JT_4_F_RAFLE_YE,
+ JT_4_M_RAFLE_VI,
+ JT_4_F_RAFLE_VI,
+ JT_4_M_ARDHA,
+ JT_4_CREEPER,
+ JT_JP_RUFAKU,
+ JT_JP_SUPIKA,
+ JT_JP_SABIKU,
+ JT_JP_ARUGORU,
+ JT_JP_ARUNA,
+ JT_JP_AIRI,
+ JT_4_M_DEWOLDMAN,
+ JT_4_M_DEWOLDWOMAN,
+ JT_4_M_DEWMAN,
+ JT_4_M_DEWWOMAN,
+ JT_4_M_DEWBOY,
+ JT_4_M_DEWGIRL,
+ JT_4_M_DEWZATICHIEF,
+ JT_4_M_DEWZATIMAN,
+ JT_4_M_ALCHE_E,
+ JT_4_MASK_SMOKEY,
+ JT_4_CAT_SAILOR1,
+ JT_4_CAT_SAILOR2,
+ JT_4_CAT_SAILOR3,
+ JT_4_CAT_SAILOR4,
+ JT_4_CAT_CHEF,
+ JT_4_CAT_MERMASTER,
+ JT_4_CRACK,
+ JT_4_ASTER,
+ JT_4_F_STARFISHGIRL,
+ JT_4_CAT_DOWN,
+ JT_4_CAT_REST,
+ JT_4_CAT_3COLOR,
+ JT_4_CAT_ADMIRAL,
+ JT_4_SOIL,
+ JT_4_F_ALCHE_A,
+ JT_4_CAT_ADV1,
+ JT_4_CAT_ADV2,
+ JT_4_CAT_SAILOR5,
+ JT_2_DROP_MACHINE,
+ JT_2_SLOT_MACHINE,
+ JT_2_VENDING_MACHINE1,
+ JT_MOB_TOMB,
+ JT_4_MYSTCASE,
+ JT_4_M_SIT_NOVICE,
+ JT_4_OCTOPUS_LEG,
+ JT_4_F_NURSE,
+ JT_4_MAL_SOLDIER,
+ JT_4_MAL_CAPTAIN,
+ JT_4_MAL_BUDIDAI,
+ JT_4_M_MAYOR,
+ JT_4_M_BARYO_OLD,
+ JT_4_F_BARYO_OLD,
+ JT_4_F_BARYO_GIRL,
+ JT_4_M_BARYO_BOY,
+ JT_4_M_BARYO_MAN,
+ JT_4_F_BARYO_WOMAN,
+ JT_4_BARYO_CHIEF,
+ JT_4_MAL_KAFRA,
+ JT_4_M_MALAYA,
+ JT_4_F_MALAYA,
+ JT_4_F_PATIENT,
+ JT_4_M_PATIENT,
+ JT_4_F_KR_TIGER,
+ JT_4_M_KR_BOY,
+ JT_4_M_KAGE_OLD,
+ JT_4_WHIKEBAIN,
+ JT_4_EREND,
+ JT_4_RAWREL,
+ JT_4_ARMAIA,
+ JT_4_KAVAC,
+ JT_4_YGNIZEM,
+ JT_4_EREMES,
+ JT_4_MAGALETA,
+ JT_4_KATRINN,
+ JT_4_SHECIL,
+ JT_4_SEYREN,
+ JT_4_HARWORD,
+ JT_4_F_JP_CYNTHIA,
+ JT_4_M_JP_GUSTON,
+ JT_4_M_JP_BERKUT,
+ JT_4_F_JP_DARK_ADELAIDE,
+ JT_4_M_JP_DARK_DARIUS,
+ JT_4_M_JP_JESTER,
+ JT_XMAS_SMOKEY_B,
+ JT_XMAS_SMOKEY_R,
+ JT_XMAS_SMOKEY_Y,
+ JT_4_F_CLOCKDOLL,
+ JT_4_F_FAIRY2,
+ JT_4_F_PINKWOMAN,
+ JT_4_FAIRYDEADLEAF,
+ JT_4_FROG,
+ JT_4_M_BLACKMAN,
+ JT_4_M_BLUEMAN,
+ JT_4_M_FAIRYANG,
+ JT_4_M_FAIRYAVANT,
+ JT_4_M_FAIRYFREAK,
+ JT_4_M_FAIRYKID6,
+ JT_4_M_FAIRYSCHOLAR,
+ JT_4_M_FAIRYSCHOLAR_DIRTY,
+ JT_4_M_FARIY_HISIE,
+ JT_4_M_FARIYKING,
+ JT_4_M_NEWOZ,
+ JT_4_M_OLIVER,
+ JT_4_M_PROFESSORWORM,
+ JT_4_M_REDMAN,
+ JT_4_F_GELKA,
+ JT_4_M_ROTERT,
+ JT_4_BLACKDRAGON,
+ JT_4_M_GUNSLINGER,
+ JT_4_F_GUNSLINGER,
+ JT_4_M_ARCHER,
+ JT_4_M_SWORDMAN,
+ JT_4_M_NINJA_RED,
+ JT_4_M_NINJA_BLUE,
+ JT_4_M_THIEF_RUMIN,
+ JT_4_M_NOV_RUMIN,
+ JT_4_F_MAYSEL,
+ JT_4_F_ACOLYTE,
+ JT_4_M_NOV_HUNT,
+ JT_4_F_GENETIC,
+ JT_4_F_TAEKWON,
+ JT_4_F_SWORDMAN,
+ JT_4_F_IU,
+ JT_4_M_RAGI,
+ JT_4_M_MELODY,
+ JT_4_TRACE,
+ JT_4_F_HIMEL,
+ JT_4_LEVITATEMAN,
+ JT_4_M_HEINRICH,
+ JT_4_M_ROYALGUARD,
+ JT_4_M_BARMUND,
+ JT_4_F_KHALITZBURG,
+ JT_4_F_HIMEL2,
+ JT_4_WHITEKNIGHT,
+ JT_4_COCO,
+ JT_4_M_ALADDIN,
+ JT_4_M_GENIE,
+ JT_4_F_GENIE,
+ JT_4_JP_MID_SWIM,
+ JT_4_JP_RUNE_SWIM,
+ JT_4_F_FENRIR,
+ JT_4_F_GEFFEN_FAY,
+ JT_4_F_IRIS,
+ JT_4_F_LUCILE,
+ JT_4_F_SARAH_BABY,
+ JT_4_GEFFEN_01,
+ JT_4_GEFFEN_02,
+ JT_4_GEFFEN_03,
+ JT_4_GEFFEN_04,
+ JT_4_GEFFEN_05,
+ JT_4_GEFFEN_06,
+ JT_4_GEFFEN_07,
+ JT_4_GEFFEN_08,
+ JT_4_GEFFEN_09,
+ JT_4_GEFFEN_10,
+ JT_4_GEFFEN_11,
+ JT_4_GEFFEN_12,
+ JT_4_GEFFEN_13,
+ JT_4_GEFFEN_14,
+ JT_4_M_CHAOS,
+ JT_4_M_CHIEF_IRIN,
+ JT_4_M_SAKRAY,
+ JT_4_M_SAKRAYROYAL,
+ JT_4_TOWER_01,
+ JT_4_TOWER_02,
+ JT_4_TOWER_03,
+ JT_4_TOWER_04,
+ JT_4_TOWER_05,
+ JT_4_TOWER_06,
+ JT_4_TOWER_07,
+ JT_4_TOWER_08,
+ JT_4_TOWER_09,
+ JT_4_TOWER_10,
+ JT_4_TOWER_11,
+ JT_4_TOWER_12,
+ JT_4_TOWER_13,
+ JT_8_F_GIRL,
+ JT_4_F_GODEMOM,
+ JT_4_F_GON,
+ JT_4_F_KID2,
+ JT_4_M_BIBI,
+ JT_4_M_GEF_SOLDIER,
+ JT_4_M_KID1,
+ JT_4_M_MOC_SOLDIER,
+ JT_4_M_PAY_SOLDIER,
+ JT_4_M_SEAMAN,
+ JT_4_M_SNOWMAN,
+ JT_4_F_05,
+ JT_4_M_05,
+ JT_4_M_06,
+ JT_4_F_06,
+ JT_4_M_PIERROT,
+ JT_4_M_KID2,
+ JT_4_F_KID3,
+ JT_4_M_SANTA,
+ JT_4_F_NACORURI,
+ JT_4_F_SHAMAN,
+ JT_4_F_KAFRA7,
+ JT_GUILD_FLAG,
+ JT_1_SHADOW_NPC,
+ JT_4_F_07,
+ JT_4_F_JOB_ASSASSIN,
+ JT_4_F_JOB_BLACKSMITH,
+ JT_4_F_JOB_HUNTER,
+ JT_4_F_JOB_KNIGHT,
+ JT_4_F_NOVICE,
+ JT_4_M_JOB_ASSASSIN,
+ JT_4_M_JOB_BLACKSMITH,
+ JT_4_M_JOB_HUNTER,
+ JT_4_M_JOB_KNIGHT1,
+ JT_4_M_JOB_KNIGHT2,
+ JT_4_M_JOB_WIZARD,
+ JT_4_BAPHOMET,
+ JT_4_DARKLORD,
+ JT_4_DEVIRUCHI,
+ JT_8_DOPPEL,
+ JT_2_M_ALCHE,
+ JT_2_M_BARD_ORIENT,
+ JT_2_M_SAGE_B,
+ JT_2_M_SAGE_OLD,
+ JT_4_F_ALCHE,
+ JT_4_F_CRU,
+ JT_4_F_MONK,
+ JT_4_F_ROGUE,
+ JT_4_M_ALCHE_A,
+ JT_4_M_ALCHE_B,
+ JT_4_M_ALCHE_C,
+ JT_4_M_CRU,
+ JT_4_M_CRU_OLD,
+ JT_4_M_MONK,
+ JT_4_M_SAGE_A,
+ JT_4_M_SAGE_C,
+ JT_4_F_SON,
+ JT_4_F_JPN2,
+ JT_4_F_JPN,
+ JT_4_F_JPNCHIBI,
+ JT_4_F_JPNOBA2,
+ JT_4_F_JPNOBA,
+ JT_4_M_JPN2,
+ JT_4_M_JPN,
+ JT_4_M_JPNCHIBI,
+ JT_4_M_JPNOJI2,
+ JT_4_M_JPNOJI,
+ JT_8_M_JPNSOLDIER,
+ JT_8_M_JPNMASTER,
+ JT_4_F_JPNMU,
+ JT_4_F_TWGIRL,
+ JT_4_F_TWGRANDMOM,
+ JT_4_F_TWMASKGIRL,
+ JT_4_F_TWMIDWOMAN,
+ JT_4_M_TWBOY,
+ JT_4_M_TWMASKMAN,
+ JT_4_M_TWMIDMAN,
+ JT_4_M_TWOLDMAN,
+ JT_4_M_TWTEAMAN,
+ JT_4_M_YOYOROGUE,
+ JT_8_M_TWSOLDIER,
+ JT_4_F_UMGIRL,
+ JT_4_F_UMOLDWOMAN,
+ JT_4_F_UMWOMAN,
+ JT_4_M_UMCHIEF,
+ JT_4_M_UMDANCEKID2,
+ JT_4_M_UMDANCEKID,
+ JT_4_M_UMKID,
+ JT_4_M_UMOLDMAN,
+ JT_4_M_UMSOLDIER,
+ JT_4_M_SALVATION,
+ JT_4_F_NFDEADKAFRA,
+ JT_4_F_NFDEADMGCIAN,
+ JT_4_F_NFLOSTGIRL,
+ JT_4_M_NFDEADMAN2,
+ JT_4_M_NFDEADMAN,
+ JT_4_M_NFDEADSWDMAN,
+ JT_4_M_NFLOSTMAN,
+ JT_4_M_NFMAN,
+ JT_4_NFBAT,
+ JT_4_NFCOCK,
+ JT_4_NFCOFFIN,
+ JT_4_NFWISP,
+ JT_1_F_SIGNZISK,
+ JT_1_M_SIGN1,
+ JT_1_M_SIGNALCHE,
+ JT_1_M_SIGNART,
+ JT_1_M_SIGNMCNT,
+ JT_1_M_SIGNMONK2,
+ JT_1_M_SIGNMONK,
+ JT_1_M_SIGNROGUE,
+ JT_4_F_VALKYRIE,
+ JT_TW_TOWER,
+ JT_2_M_OLDBLSMITH,
+ JT_4_F_CHNDOCTOR,
+ JT_4_F_CHNDRESS1,
+ JT_4_F_CHNDRESS2,
+ JT_4_F_CHNDRESS3,
+ JT_4_F_CHNWOMAN,
+ JT_4_M_CHN8GUEK,
+ JT_4_M_CHNCOOK,
+ JT_4_M_CHNGENERL,
+ JT_4_M_CHNMAN,
+ JT_4_M_CHNMONK,
+ JT_4_M_CHNOLD,
+ JT_4_M_CHNSOLDIER,
+ JT_4_M_DWARF,
+ JT_4_M_GRANDMONK,
+ JT_4_M_ROGUE,
+ JT_4_M_DOMINO,
+ JT_4_F_DOMINO,
+ JT_4_F_ZONDAGIRL,
+ JT_4_M_REIDIN_KURS,
+ JT_4_M_ZONDAOYAJI,
+ JT_4_M_BUDDHIST,
+ JT_2_BOARD1,
+ JT_2_BOARD2,
+ JT_2_BULLETIN_BOARD,
+ JT_4_F_THAIAYO,
+ JT_4_F_THAIGIRL,
+ JT_4_F_THAISHAMAN,
+ JT_4_M_THAIAYO,
+ JT_4_M_THAIOLD,
+ JT_4_M_THAIONGBAK,
+ JT_CLEAR_NPC,
+ JT_4_F_RACING,
+ JT_4_F_EINOLD,
+ JT_4_M_EINOLD,
+ JT_4_M_EINMINER,
+ JT_4_M_DIEMAN,
+ JT_4_F_EINWOMAN,
+ JT_4_M_REPAIR,
+ JT_4_M_EIN_SOLDIER,
+ JT_4_M_YURI,
+ JT_4_M_EINMAN2,
+ JT_4_M_EINMAN,
+ JT_2_F_SIGN1,
+ JT_4_BOARD3,
+ JT_4_BULLETIN_BOARD2,
+ JT_4_F_AGENTKAFRA,
+ JT_4_F_KAFRA8,
+ JT_4_F_KAFRA9,
+ JT_4_F_LGTGIRL,
+ JT_4_F_LGTGRAND,
+ JT_4_F_OPERATION,
+ JT_4_LGTSCIENCE,
+ JT_4_M_LGTGRAND,
+ JT_4_M_LGTGUARD2,
+ JT_4_M_LGTGUARD,
+ JT_4_M_LGTMAN,
+ JT_4_M_LGTPOOR,
+ JT_4_M_OPERATION,
+ JT_4_M_PRESIDENT,
+ JT_4_M_REINDEER,
+ JT_4_M_ZONDAMAN,
+ JT_4_M_PECOKNIGHT,
+ JT_4_CAT,
+ JT_4_F_YUNYANG,
+ JT_4_M_OILMAN,
+ JT_4_F_CAPEGIRL,
+ JT_4_M_MASKMAN,
+ JT_4_M_SITDOWN,
+ JT_4_F_SITDOWN,
+ JT_4_M_ALCHE_D,
+ JT_4_M_ACROSS,
+ JT_4_F_ACROSS,
+ JT_4_COOK,
+ JT_4_M_LIEMAN,
+ JT_2_POSTBOX,
+ JT_4_BULL,
+ JT_4_LAM,
+ JT_4_F_HUGIRL,
+ JT_4_F_HUGRANMA,
+ JT_4_F_HUWOMAN,
+ JT_4_F_KHELLISIA,
+ JT_4_F_KHELLY,
+ JT_4_M_HUBOY,
+ JT_4_M_HUGRANFA,
+ JT_4_M_HUMAN_01,
+ JT_4_M_HUMAN_02,
+ JT_4_M_HUMERCHANT,
+ JT_4_M_HUOLDARMY,
+ JT_4_M_KHKIEL,
+ JT_4_M_KHKYEL,
+ JT_4_M_KHMAN,
+ JT_4_F_KHWOMAN,
+ JT_4_F_KHGIRL,
+ JT_4_M_KHBOY,
+ JT_4_M_PHILMAN,
+ JT_4_PORING,
+ JT_2_COLAVEND,
+ JT_4_F_SOCCER,
+ JT_4_M_SOCCER7,
+ JT_4_M_SOCCER9,
+ JT_4_F_CHILD,
+ JT_4_F_MADAME,
+ JT_4_F_MASK1,
+ JT_4_F_MASK,
+ JT_4_F_RACHOLD,
+ JT_4_F_SHABBY,
+ JT_4_F_TRAINEE,
+ JT_4_M_CHILD1,
+ JT_4_M_CHILD,
+ JT_4_M_DOCTOR,
+ JT_4_M_FROZEN1,
+ JT_4_M_FROZEN,
+ JT_4_M_MASK1,
+ JT_4_M_MASK,
+ JT_4_M_MIDDLE1,
+ JT_4_M_MIDDLE,
+ JT_4_M_RACHMAN2,
+ JT_4_M_RACHMAN1,
+ JT_4_M_RACHOLD1,
+ JT_4_M_RACHOLD,
+ JT_4_M_RASWORD,
+ JT_4_M_TRAINEE,
+ JT_4_F_ARUNA_POP,
+ JT_4_M_ARUNA_NFM1,
+ JT_4_DST_CAMEL,
+ JT_4_DST_SOLDIER,
+ JT_4_F_DESERT,
+ JT_4_F_DST_CHILD,
+ JT_4_F_DST_GRAND,
+ JT_4_M_DESERT,
+ JT_4_M_DST_CHILD,
+ JT_4_M_DST_GRAND,
+ JT_4_M_DST_MASTER,
+ JT_4_M_DST_TOUGH,
+ JT_4_ANGELING,
+ JT_4_ARCHANGELING,
+ JT_4_GHOSTRING,
+ JT_4_F_EDEN_MASTER,
+ JT_4_F_EDEN_OFFICER,
+ JT_4_M_EDEN_GUARDER,
+ JT_4_M_PATRICK,
+ JT_4_DONKEY,
+ JT_4_M_TRISTAN,
+ JT_4_WHITE_COW,
+ JT_4_F_RUSCHILD,
+ JT_4_F_RUSWOMAN1,
+ JT_4_F_RUSWOMAN2,
+ JT_4_F_RUSWOMAN3,
+ JT_4_M_RUSCHILD,
+ JT_4_M_GUSLIMAN,
+ JT_4_M_RUSBALD,
+ JT_4_M_RUSKING,
+ JT_4_M_RUSKNIGHT,
+ JT_4_M_RUSMAN1,
+ JT_4_M_RUSMAN2,
+ JT_4_M_DRAKE,
+ JT_4_F_BABAYAGA,
+ JT_4_F_RUSGREEN,
+ JT_4_RUS_DWOLF,
+ JT_1_FLAG_LION,
+ JT_1_FLAG_EAGLE,
+ JT_4_M_MIKID,
+ JT_4_BLUE_FLOWER,
+ JT_4_RED_FLOWER,
+ JT_4_YELL_FLOWER,
+ JT_4_F_CAVE1,
+ JT_4_F_MUT1,
+ JT_4_F_MUT2,
+ JT_4_F_SCIENCE,
+ JT_4_M_1STPRIN1,
+ JT_4_M_1STPRIN2,
+ JT_4_M_2NDPRIN1,
+ JT_4_M_2NDPRIN2,
+ JT_4_M_3RDPRIN1,
+ JT_4_M_3RDPRIN2,
+ JT_4_M_4THPRIN1,
+ JT_4_M_4THPRIN2,
+ JT_4_M_5THPRIN1,
+ JT_4_M_5THPRIN2,
+ JT_4_M_6THPRIN1,
+ JT_4_M_6THPRIN2,
+ JT_4_M_CASMAN1,
+ JT_4_M_CAVE1,
+ JT_4_M_MOCASS1,
+ JT_4_M_MOCASS2,
+ JT_4_M_MUT1,
+ NPC_RANGE2_END, // Official JT_MON_BEGIN
+
+ NPC_RANGE3_START = 10000, // Official JT_NEW_NPC_3RD_BEGIN
+ JT_4_TOWER_14,
+ JT_4_TOWER_15,
+ JT_4_TOWER_16,
+ JT_4_TOWER_17,
+ JT_4_TREASURE_BOX,
+ JT_ACADEMY_MASTER,
+ JT_PORTAL,
+ JT_THANATOS_BATTLE,
+ JT_THANATOS_KEEP,
+ JT_4_F_LYDIA,
+ JT_4_LUDE,
+ JT_4_ALIZA,
+ JT_4_ALICE,
+ JT_4_ARCHER_SKEL,
+ JT_4_JACK,
+ JT_4_SOLDIER_SKEL,
+ JT_4_LOLI_RURI,
+ JT_4_M_SAKRAY_TIED,
+ JT_4_M_ANTONIO,
+ JT_4_M_COOKIE,
+ JT_4_M_BELIEVER01,
+ JT_4_F_BELIEVER01,
+ JT_4_M_BELIEVER02,
+ JT_4_ROPEPILE,
+ JT_4_BRICKPILE,
+ JT_4_WOODPILE,
+ JT_4_M_TAMARIN,
+ JT_4_M_DEATH,
+ JT_4_GHOST_STAND,
+ JT_4_GHOST_COLLAPSE,
+ JT_4_COOKIEHOUSE,
+ JT_4_F_SKULL06GIRL,
+ JT_4_NONMYSTCASE,
+ JT_4_F_KIMI,
+ JT_4_M_FROZEN_GC,
+ JT_4_M_FROZEN_KN,
+ JT_4_SNAKE_LORD,
+ JT_4_F_MOCBOY,
+ JT_4_F_RUNAIN,
+ JT_4_M_ROEL,
+ JT_4_F_SHALOSH,
+ JT_4_ENERGY_RED,
+ JT_4_ENERGY_BLUE,
+ JT_4_ENERGY_YELLOW,
+ JT_4_ENERGY_BLACK,
+ JT_4_ENERGY_WHITE,
+ JT_4_F_PERE01,
+ JT_4_JITTERBUG,
+ JT_4_SEA_OTTER,
+ JT_4_GALAPAGO,
+ JT_4_DESERTWOLF_B,
+ JT_4_BB_PORING,
+ JT_4_F_CHARLESTON01,
+ JT_4_F_CHARLESTON02,
+ JT_4_F_CHARLESTON03,
+ JT_4_M_IAN,
+ JT_4_M_OLDSCHOLAR,
+ JT_4_F_LAPERM,
+ JT_4_M_DEBON,
+ JT_4_M_BIRMAN,
+ JT_4_F_SHAM,
+ JT_4_M_REBELLION,
+ JT_4_F_REBELLION,
+ JT_4_CHN_SHAOTH,
+ JT_4_SHOAL,
+ JT_4_F_SARAH,
+ JT_4_GIGANTES_BIG,
+ JT_4_GIGANTES,
+ JT_4_GIGANTES_SMALL,
+ JT_4_GARGOYLE_STATUE,
+ JT_4_AIRA,
+ JT_4_EZELLA,
+ JT_4_KULUNA,
+ JT_4_LUNE,
+ JT_4_MALLINA,
+ JT_4_MORIN,
+ JT_4_NASARIN,
+ JT_4_F_BERRYTEA,
+ JT_4_F_FRUIT,
+ JT_4_SCR_MT_ROBOTS,
+ JT_4_MACHINE_DEVICE,
+ JT_4_GC109,
+ JT_4_SYS_MSG,
+ JT_4_M_TATIO,
+ JT_4_M_REKENBER,
+ JT_4_XMAS_CAT1,
+ JT_4_XMAS_CAT2,
+ JT_4_XMAS_CAT3,
+ JT_4_XMAS_CAT4,
+ JT_4_XMAS_CAT5,
+ JT_4_XMAS_CAT6,
+ JT_4_M_DEATH2,
+ JT_4_S_KADOMATSU,
+ JT_4_B_KADOMATSU,
+ JT_4_F_08,
+ JT_4_F_08_STATUE,
+ JT_4_M_DARKPRIEST,
+ JT_4_JP_GARM_H,
+ JT_4_JP_MEDUSA_H,
+ JT_4_CHN_GVG_01,
+ JT_4_SPRING_RABBIT,
+ JT_4_PD_TYRA,
+ JT_4_PD_TYRANOS,
+ JT_4_PD_PLESI,
+ JT_4_PD_PLESIO,
+ JT_4_PD_BRACHI,
+ JT_4_PD_BRACHIOS,
+ JT_4_PD_GOLDDRAGON,
+ JT_4_PD_ZAEROG,
+ JT_4_PD_TAMADORA,
+ JT_4_JP_EDGA_H,
+ JT_4_JP_BRAGOLEM_H,
+ JT_4_EL_AQUA,
+ JT_4_EP16_NIHIL,
+ JT_4_EP16_SPICA,
+ JT_4_EP16_SKIA,
+ JT_4_EP16_PETER,
+ JT_4_EP16_CRUX,
+ JT_4_EP16_GRANZ,
+ JT_4_EP16_STOLZ,
+ JT_4_EP16_EGEO,
+ JT_4_EP16_COOK,
+ JT_4_EP16_MARK,
+ JT_4_EP16_TAMARIN,
+ JT_4_EP16_POE,
+ JT_4_EP16_ISAAC,
+ JT_4_EP16_HELMUT,
+ JT_4_EP16_WOLF,
+ JT_4_EP16_MEYER,
+ JT_4_EP16_AGNES,
+ JT_4_EP16_FOOD,
+ JT_4_EP16_LOUVIERE,
+ JT_4_EP16_MAX,
+ JT_4_EP16_SPIEGEL,
+ JT_4_MOONLIGHT,
+ JT_4_MISTRESS,
+ JT_4_DRACULA,
+ JT_4_STORMKNIGHT,
+ JT_4_TATTER,
+ JT_4_AS_RAGGED_GOLEM,
+ JT_4_AS_BLOODY_KNIGHT,
+ JT_4_AS_WIND_GHOST,
+ JT_4_F_BIJOU,
+ JT_4_EP16_COOK2,
+ JT_4_SERVICE_30_M_01,
+ JT_4_SERVICE_30_F_01,
+ JT_4_SCR_AT_ROBOTS,
+ JT_4_F_RANGER,
+ JT_4_WAG,
+ JT_4_NPC_TRAP,
+ JT_4_RAGGLER,
+ JT_4_DR_PEPE,
+ JT_4_DR_GAMBERI,
+ JT_4_DR_AGLIO,
+ JT_4_DR_OLIO,
+ JT_4_DR_STELO,
+ JT_4_DR_TORTEL,
+ JT_4_BASIL_SLAVE,
+ JT_4_DOU_JINDO,
+ JT_4_DOU_SIBA,
+ JT_4_TARUTUPI,
+ JT_4_DR_SOLDIER,
+ JT_4_DR_M_01,
+ JT_4_DR_M_02,
+ JT_4_DR_F_01,
+ JT_4_DR_F_02,
+ JT_4_DR_KID_01,
+ JT_4_JP_2015EVT,
+ JT_4_ALLIGATOR,
+ JT_4_ANOLIAN,
+ JT_4_TACNU,
+ JT_4_CENERE,
+ JT_4_F_ARUNA_POP2,
+ JT_4_JACK_HEAD,
+ JT_4_INJUSTICE,
+ JT_4_BLOODYMAN,
+ JT_4_GIBBET,
+ JT_4_DULLAHAN,
+ JT_4_M_LAZY,
+ JT_4_M_GONY,
+ JT_4_M_ROOKIE,
+ JT_4_M_PHILOFONTES,
+ JT_4_F_ESTLOVELOY,
+ JT_4_F_LEEDSH,
+ JT_4_F_DIENE,
+ JT_4_F_COATNEIS,
+ JT_4_M_RUPERT,
+ JT_4_M_FALLENGONY,
+ JT_4_M_EISEN,
+ JT_4_F_DEADEVIL,
+ JT_4_F_HUNTER_EVIL,
+ JT_4_F_ELENA,
+ JT_4_F_ANYA,
+ JT_4_M_SEIREN_UC,
+ JT_4_M_GUNSLINGER2,
+ JT_4_M_GUNSLINGER3,
+ JT_4_M_REBELLION2,
+ JT_4_M_REBELLION3,
+ JT_4_F_GUNSLINGER2,
+ JT_4_F_GUNSLINGER3,
+ JT_4_F_REBELLION2,
+ JT_4_F_REBELLION3,
+ JT_4_M_ILYA,
+
+ JT_4_ELDER = 10205,
+ JT_4_LUNATIC,
+ JT_4_F_NOVICE2,
+ JT_4_WICKEDNYMPH,
+ JT_4_F_PREMI,
+ JT_4_M_COSTELL,
+ JT_4_M_YATTWARP,
+ JT_4_M_EVOKASCUDI,
+ JT_4_M_JOHNNYJAMES,
+ JT_4_M_ALBERTFORD,
+ JT_4_M_SEANMCCURDY,
+ JT_4_M_KARAMPUCCI,
+ JT_4_M_CACTUSMAN1,
+ JT_4_M_CACTUSMAN2,
+ JT_4_M_CACTUSMAN3,
+ JT_4_M_CACTUSLADY,
+ JT_4_M_GAST,
+ JT_4_M_CACTUSCHILD,
+ JT_4_KING,
+ JT_4_F_BOMI,
+ JT_4_M_CACTUSCHIEF,
+ JT_4_F_CACTUSCHILD2,
+ JT_4_F_CACTUSLADY2,
+ JT_4_F_CACTUSLADY3,
+ JT_4_M_CACTUS,
+ JT_4_M_COWRAIDERS1,
+ JT_4_M_COWRAIDERS2,
+ JT_4_M_COWRAIDERS3,
+ JT_4_F_JP14THEVT,
+ JT_4_M_POORSCHOLAR,
+ JT_4_M_PEPPERROTI,
+ JT_JP_NPC01,
+ JT_4_PURPLE_WARP,
+ JT_4_F_NARIN,
+ JT_4_M_URGENT_MAN,
+ JT_4_M_KEEN_SOLDIER,
+ JT_4_F_SLOPPY_WOMAN,
+ JT_4_F_DRKAFRA01,
+ JT_4_M_DRZONDA01,
+ JT_4_M_SWD_RENO,
+ JT_4_M_KNG_RENO,
+ JT_4_M_AC_RUMIN,
+ JT_4_M_HIGH_WIZARD,
+ JT_4_SYSTEM_BOX,
+ JT_4_STEELBOX,
+ JT_4_WOODBOX,
+ JT_4_M_POPFESTA,
+ JT_4_BONFIRE,
+ JT_4_PCCOUNT,
+ JT_4_LAVAGOLEM,
+ JT_4_F_IA,
+ JT_4_LOCKE,
+ JT_4_LIL_LIF,
+ JT_4_LIL_LIF2,
+ JT_4_F_DRAGONHAT,
+ JT_4_M_DRAGONHAT,
+ JT_JP_NPC02,
+ JT_JP_NPC03,
+ JT_JP_NPC04,
+ JT_JP_NPC05,
+ JT_JP_NPC06,
+ JT_JP_NPC07,
+ JT_JP_NPC08,
+ JT_JP_NPC09,
+ JT_JP_NPC10,
+ JT_4_FIRERING,
+ JT_4_SCATLETON,
+ JT_4_JP_AB_NPC_001,
+ JT_4_JP_AB_NPC_002,
+ JT_4_JP_AB_NPC_003,
+ JT_4_JP_AB_NPC_004,
+ JT_4_JP_AB_NPC_005,
+ JT_4_JP_AB_NPC_006,
+ JT_4_JP_AB_NPC_007,
+ JT_4_JP_AB_NPC_008,
+ JT_4_JJAK,
+ JT_4_M_SNOWMAN_B,
+ JT_4_M_SNOWMAN_R,
+ JT_4_M_SNOWMAN_G,
+ JT_WARPEFFECTNPC,
+
+ JT_4_F_DANGDANG = 10286,
+ JT_4_M_DANGDANG,
+ JT_4_F_DANGDANG1,
+ JT_4_LEAFCAT,
+ JT_4_NASARIAN,
+ JT_4_NASARIAN_EM,
+ JT_4_TEDDY_BEAR_W,
+ JT_4_TEDDY_BEAR_B,
+ JT_4_TEDDY_BEAR_B_L,
+ NPC_RANGE3_END, // Official: JT_NEW_NPC_3RD_END=19999
+
+ // Unofficial
+ JT_INVISIBLE = 32767,
+ JT_FAKENPC = -1
+};
+
+// Old NPC range
+#define MAX_NPC_CLASS NPC_RANGE2_END
+// New NPC range
+#define MAX_NPC_CLASS2_START NPC_RANGE3_START
+#define MAX_NPC_CLASS2_END NPC_RANGE3_END
+
+//Checks if a given id is a valid npc id. [Skotlex]
+//Since new npcs are added all the time, the max valid value is the one before the first mob (Scorpion = 1001)
+#define npcdb_checkid(id) ( ( (id) > NPC_RANGE1_START && (id) < NPC_RANGE1_END ) || (id) == JT_HIDDEN_WARP_NPC || ( (id) > NPC_RANGE2_START && (id) < NPC_RANGE2_END ) || (id) == JT_INVISIBLE || ( (id) > NPC_RANGE3_START && (id) < NPC_RANGE3_END ) )
+
+#ifdef PCRE_SUPPORT
+void npc_chat_finalize(struct npc_data* nd);
+#endif
+
+//Script NPC events.
+enum npce_event : uint8 {
+ NPCE_LOGIN,
+ NPCE_LOGOUT,
+ NPCE_LOADMAP,
+ NPCE_BASELVUP,
+ NPCE_JOBLVUP,
+ NPCE_DIE,
+ NPCE_KILLPC,
+ NPCE_KILLNPC,
+ NPCE_STATCALC,
+ NPCE_MAX
+};
+struct view_data* npc_get_viewdata(int class_);
+int npc_chat_sub(struct block_list* bl, va_list ap);
+int npc_event_dequeue(struct map_session_data* sd,bool free_script_stack=true);
+int npc_event(struct map_session_data* sd, const char* eventname, int ontouch);
+int npc_touch_areanpc(struct map_session_data* sd, int16 m, int16 x, int16 y);
+int npc_touch_areanpc2(struct mob_data *md); // [Skotlex]
+int npc_check_areanpc(int flag, int16 m, int16 x, int16 y, int16 range);
+int npc_touchnext_areanpc(struct map_session_data* sd,bool leavemap);
+int npc_click(struct map_session_data* sd, struct npc_data* nd);
+int npc_scriptcont(struct map_session_data* sd, int id, bool closing);
+struct npc_data* npc_checknear(struct map_session_data* sd, struct block_list* bl);
+int npc_buysellsel(struct map_session_data* sd, int id, int type);
+uint8 npc_buylist(struct map_session_data* sd, uint16 n, struct s_npc_buy_list *item_list);
+uint8 npc_selllist(struct map_session_data* sd, int n, unsigned short *item_list);
+void npc_parse_mob2(struct spawn_data* mob);
+bool npc_viewisid(const char * viewid);
+struct npc_data* npc_add_warp(char* name, short from_mapid, short from_x, short from_y, short xs, short ys, unsigned short to_mapindex, short to_x, short to_y);
+int npc_globalmessage(const char* name,const char* mes);
+const char *npc_get_script_event_name(int npce_index);
+
+void npc_setcells(struct npc_data* nd);
+void npc_unsetcells(struct npc_data* nd);
+bool npc_movenpc(struct npc_data* nd, int16 x, int16 y);
+int npc_enable(const char* name, int flag);
+void npc_setdisplayname(struct npc_data* nd, const char* newname);
+void npc_setclass(struct npc_data* nd, short class_);
+struct npc_data* npc_name2id(const char* name);
+int npc_isnear_sub(struct block_list* bl, va_list args);
+bool npc_isnear(struct block_list * bl);
+
+int npc_get_new_npc_id(void);
+
+int npc_addsrcfile(const char* name, bool loadscript);
+void npc_delsrcfile(const char* name);
+int npc_parsesrcfile(const char* filepath, bool runOnInit);
+void do_clear_npc(void);
+void do_final_npc(void);
+void do_init_npc(void);
+void npc_event_do_oninit(void);
+
+int npc_event_do(const char* name);
+int npc_event_do_id(const char* name, int rid);
+int npc_event_doall(const char* name);
+void npc_event_runall( const char* eventname );
+int npc_event_doall_id(const char* name, int rid);
+
+int npc_timerevent_start(struct npc_data* nd, int rid);
+int npc_timerevent_stop(struct npc_data* nd);
+void npc_timerevent_quit(struct map_session_data* sd);
+int npc_gettimerevent_tick(struct npc_data* nd);
+int npc_settimerevent_tick(struct npc_data* nd, int newtimer);
+int npc_remove_map(struct npc_data* nd);
+void npc_unload_duplicates (struct npc_data* nd);
+int npc_unload(struct npc_data* nd, bool single);
+int npc_reload(void);
+void npc_read_event_script(void);
+int npc_script_event(struct map_session_data* sd, enum npce_event type);
+
+int npc_duplicate4instance(struct npc_data *snd, int16 m);
+int npc_instanceinit(struct npc_data* nd);
+int npc_instancedestroy(struct npc_data* nd);
+int npc_cashshop_buy(struct map_session_data *sd, unsigned short nameid, int amount, int points);
+
+void npc_shop_currency_type(struct map_session_data *sd, struct npc_data *nd, int cost[2], bool display);
+
+extern struct npc_data* fake_nd;
+
+int npc_cashshop_buylist(struct map_session_data *sd, int points, int count, unsigned short* item_list);
+bool npc_shop_discount(enum npc_subtype type, bool discount);
+
+#if PACKETVER >= 20131223
+void npc_market_tosql(const char *exname, struct npc_item_list *list);
+void npc_market_delfromsql_(const char *exname, unsigned short nameid, bool clear);
+#endif
+
+#ifdef SECURE_NPCTIMEOUT
+ int npc_rr_secure_timeout_timer(int tid, unsigned int tick, int id, intptr_t data);
+#endif
+
+// @commands (script-based)
+int npc_do_atcmd_event(struct map_session_data* sd, const char* command, const char* message, const char* eventname);
+
+bool npc_unloadfile( const char* path );
+
+#endif /* _NPC_HPP_ */
diff --git a/src/map/npc_chat.c b/src/map/npc_chat.cpp
similarity index 99%
rename from src/map/npc_chat.c
rename to src/map/npc_chat.cpp
index 6033b83c113..8d8e5d13029 100644
--- a/src/map/npc_chat.c
+++ b/src/map/npc_chat.cpp
@@ -3,15 +3,17 @@
#ifdef PCRE_SUPPORT
+#include "npc.hpp"
+
+#include "../../3rdparty/pcre/include/pcre.h"
+
#include "../common/timer.h"
#include "../common/malloc.h"
#include "../common/showmsg.h"
#include "../common/strlib.h"
-#include "mob.h" // struct mob_data
-#include "pc.h" // struct map_session_data
-
-#include "../../3rdparty/pcre/include/pcre.h"
+#include "mob.hpp" // struct mob_data
+#include "pc.hpp" // struct map_session_data
/**
diff --git a/src/map/party.c b/src/map/party.cpp
similarity index 97%
rename from src/map/party.c
rename to src/map/party.cpp
index 9159ec34954..061da8c2c54 100644
--- a/src/map/party.c
+++ b/src/map/party.cpp
@@ -1,6 +1,10 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "party.hpp"
+
+#include <stdlib.h>
+
#include "../common/cbasetypes.h"
#include "../common/timer.h"
#include "../common/socket.h" // last_tick
@@ -11,16 +15,18 @@
#include "../common/utils.h"
#include "../common/strlib.h"
-#include "party.h"
-#include "atcommand.h" //msg_txt()
-#include "pc.h"
-#include "instance.h"
-#include "intif.h"
-#include "mapreg.h"
-#include "trade.h"
-
-#include <stdlib.h>
-
+#include "atcommand.hpp" //msg_txt()
+#include "pc.hpp"
+#include "instance.hpp"
+#include "intif.hpp"
+#include "mapreg.hpp"
+#include "trade.hpp"
+#include "clif.hpp"
+#include "battle.hpp"
+#include "mob.hpp"
+#include "log.hpp"
+#include "pc_groups.hpp"
+#include "achievement.hpp"
static DBMap* party_db; // int party_id -> struct party_data* (releases data)
static DBMap* party_booking_db; // uint32 char_id -> struct party_booking_ad_info* (releases data) // Party Booking [Spiria]
@@ -175,6 +181,8 @@ void party_created(uint32 account_id,uint32 char_id,int fail,int party_id,char *
sd->status.party_id = party_id;
clif_party_created(sd,0); // Success message
+ achievement_update_objective(sd, AG_PARTY, 1, 1);
+
// We don't do any further work here because the char-server sends a party info packet right after creating the party
if(party_create_byscript) { // returns party id in $@party_create_id if party is created by script
mapreg_setreg(add_str("$@party_create_id"),party_id);
@@ -956,6 +964,7 @@ int party_skill_check(struct map_session_data *sd, int party_id, uint16 skill_id
if(!party_id || (p = party_search(party_id)) == NULL)
return 0;
+ party_check_state(p);
switch(skill_id) {
case TK_COUNTER: //Increase Triple Attack rate of Monks.
if (!p->state.monk) return 0;
@@ -1199,9 +1208,12 @@ int party_send_dot_remove(struct map_session_data *sd)
return 0;
}
-// To use for Taekwon's "Fighting Chant"
-// int c = 0;
-// party_foreachsamemap(party_sub_count, sd, 0, &c);
+/**
+ * Check whether a party member is in autotrade or idle for count functions
+ * @param bl: Object invoking the counter
+ * @param ap: List of parameters
+ * @return 1 when neither autotrading and not idle or 0 otherwise
+ */
int party_sub_count(struct block_list *bl, va_list ap)
{
struct map_session_data *sd = (TBL_PC *)bl;
@@ -1215,7 +1227,12 @@ int party_sub_count(struct block_list *bl, va_list ap)
return 1;
}
-// To use for counting classes in a party.
+/**
+ * To use for counting classes in a party.
+ * @param bl: Object invoking the counter
+ * @param ap: List of parameters: Class_Mask, Class_ID
+ * @return 1 when class exists in party or 0 otherwise
+ */
int party_sub_count_class(struct block_list *bl, va_list ap)
{
struct map_session_data *sd = (TBL_PC *)bl;
diff --git a/src/map/party.h b/src/map/party.hpp
similarity index 97%
rename from src/map/party.h
rename to src/map/party.hpp
index 30461a1544d..3abb9708283 100644
--- a/src/map/party.h
+++ b/src/map/party.hpp
@@ -1,21 +1,18 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _PARTY_H_
-#define _PARTY_H_
+#ifndef _PARTY_HPP_
+#define _PARTY_HPP_
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <stdarg.h>
#include "../common/mmo.h" // struct party
+
struct block_list;
struct map_session_data;
struct party;
struct item;
-#include <stdarg.h>
-
#define MAX_PARTY_BOOKING_JOBS 6
#define MAX_PARTY_BOOKING_RESULTS 10
@@ -102,8 +99,4 @@ void party_booking_update(struct map_session_data *sd, short* job);
void party_booking_search(struct map_session_data *sd, short level, short mapid, short job, unsigned long lastindex, short resultcount);
bool party_booking_delete(struct map_session_data *sd);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _PARTY_H_ */
+#endif /* _PARTY_HPP_ */
diff --git a/src/map/path.c b/src/map/path.cpp
similarity index 96%
rename from src/map/path.c
rename to src/map/path.cpp
index fa33937f44f..8fd10d0eade 100644
--- a/src/map/path.c
+++ b/src/map/path.cpp
@@ -1,20 +1,22 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "path.hpp"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
#include "../common/cbasetypes.h"
#include "../common/db.h"
#include "../common/malloc.h"
#include "../common/nullpo.h"
#include "../common/random.h"
#include "../common/showmsg.h"
-#include "map.h"
-#include "battle.h"
-#include "path.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
+#include "map.hpp"
+#include "battle.hpp"
#define SET_OPEN 0
#define SET_CLOSED 1
@@ -54,7 +56,7 @@ static BHEAP_STRUCT_VAR(node_heap, g_open_set); // use static heap for all path
/// @}
// Translates dx,dy into walking direction
-static const unsigned char walk_choices [3][3] =
+static const char walk_choices [3][3] =
{
{DIR_NORTHWEST,DIR_NORTH,DIR_NORTHEAST},
{DIR_WEST,DIR_CENTER,DIR_EAST},
@@ -145,8 +147,8 @@ bool path_search_long(struct shootpath_data *spd,int16 m,int16 x0,int16 y0,int16
dx = (x1 - x0);
if (dx < 0) {
- swap(x0, x1);
- swap(y0, y1);
+ SWAP(x0, x1);
+ SWAP(y0, y1);
dx = -dx;
}
dy = (y1 - y0);
@@ -197,11 +199,14 @@ bool path_search_long(struct shootpath_data *spd,int16 m,int16 x0,int16 y0,int16
/// Pushes path_node to the binary node_heap.
/// Ensures there is enough space in array to store new element.
+
+#define swap_ptrcast_pathnode(a, b) swap_ptrcast(struct path_node *, a, b)
+
static void heap_push_node(struct node_heap *heap, struct path_node *node)
{
#ifndef __clang_analyzer__ // TODO: Figure out why clang's static analyzer doesn't like this
- BHEAP_ENSURE(*heap, 1, 256);
- BHEAP_PUSH2(*heap, node, NODE_MINTOPCMP, swap_ptr);
+ BHEAP_ENSURE2(*heap, 1, 256, struct path_node **);
+ BHEAP_PUSH2(*heap, node, NODE_MINTOPCMP, swap_ptrcast_pathnode);
#endif // __clang_analyzer__
}
@@ -214,7 +219,7 @@ static int heap_update_node(struct node_heap *heap, struct path_node *node)
ShowError("heap_update_node: node not found\n");
return 1;
}
- BHEAP_UPDATE(*heap, i, NODE_MINTOPCMP, swap_ptr);
+ BHEAP_UPDATE(*heap, i, NODE_MINTOPCMP, swap_ptrcast_pathnode);
return 0;
}
@@ -371,7 +376,7 @@ bool path_search(struct walkpath_data *wpd, int16 m, int16 x0, int16 y0, int16 x
}
current = BHEAP_PEEK(g_open_set); // Look for the lowest f_cost node in the 'open' set
- BHEAP_POP2(g_open_set, NODE_MINTOPCMP, swap_ptr); // Remove it from 'open' set
+ BHEAP_POP2(g_open_set, NODE_MINTOPCMP, swap_ptrcast_pathnode); // Remove it from 'open' set
x = current->x;
y = current->y;
diff --git a/src/map/path.h b/src/map/path.hpp
similarity index 93%
rename from src/map/path.h
rename to src/map/path.hpp
index b671600288a..5227bcccc26 100644
--- a/src/map/path.h
+++ b/src/map/path.hpp
@@ -1,14 +1,12 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _PATH_H_
-#define _PATH_H_
+#ifndef _PATH_HPP_
+#define _PATH_HPP_
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "../common/cbasetypes.h"
-#include "map.h" // enum cell_chk
+enum cell_chk : uint8;
#define MOVE_COST 10
#define MOVE_DIAGONAL_COST 14
@@ -26,7 +24,7 @@ struct shootpath_data {
int y[MAX_WALKPATH];
};
-enum directions{
+enum directions : int8 {
DIR_CENTER = -1,
DIR_NORTH = 0,
DIR_NORTHWEST = 1,
@@ -74,9 +72,4 @@ int distance_client(int dx, int dy);
void do_init_path();
void do_final_path();
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* _PATH_H_ */
+#endif /* _PATH_HPP_ */
diff --git a/src/map/pc.c b/src/map/pc.cpp
similarity index 96%
rename from src/map/pc.c
rename to src/map/pc.cpp
index a2df01a678a..015381e857a 100755
--- a/src/map/pc.c
+++ b/src/map/pc.cpp
@@ -1,7 +1,10 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#include "pc.h"
+#include "pc.hpp"
+
+#include <stdlib.h>
+#include <math.h>
#include "../common/cbasetypes.h"
#include "../common/core.h" // get_svn_revision()
@@ -14,29 +17,41 @@
#include "../common/timer.h"
#include "../common/utils.h"
#include "../common/mmo.h" //NAME_LENGTH
-
-#include "atcommand.h" // get_atcommand_level()
-#include "map.h"
-#include "battle.h" // battle_config
-#include "battleground.h"
-#include "channel.h"
-#include "chat.h"
-#include "chrif.h"
-#include "clan.h"
-#include "date.h" // is_day_of_*()
-#include "duel.h"
-#include "intif.h"
-#include "homunculus.h"
-#include "instance.h"
-#include "mercenary.h"
-#include "elemental.h"
-#include "pet.h" // pet_unlocktarget()
-#include "party.h" // party_search()
-#include "storage.h"
-#include "quest.h"
-
-#include <stdlib.h>
-#include <math.h>
+#include "../common/ers.h" // ers_destroy
+
+#include "atcommand.hpp" // get_atcommand_level()
+#include "map.hpp"
+#include "battle.hpp" // battle_config
+#include "battleground.hpp"
+#include "channel.hpp"
+#include "chat.hpp"
+#include "chrif.hpp"
+#include "date.hpp" // is_day_of_*()
+#include "duel.hpp"
+#include "intif.hpp"
+#include "homunculus.hpp"
+#include "instance.hpp"
+#include "mercenary.hpp"
+#include "elemental.hpp"
+#include "pet.hpp" // pet_unlocktarget()
+#include "party.hpp" // party_search()
+#include "storage.hpp"
+#include "quest.hpp"
+#include "npc.hpp"
+#include "guild.hpp"
+#include "clif.hpp"
+#include "buyingstore.hpp" // struct s_buyingstore
+#include "itemdb.hpp" // MAX_ITEMGROUP
+#include "script.hpp" // struct script_reg, struct script_regstr
+#include "searchstore.hpp" // struct s_search_store_info
+#include "status.hpp" // OPTION_*, struct weapon_atk
+#include "unit.hpp" // unit_stop_attack(), unit_stop_walking()
+#include "vending.hpp" // struct s_vending
+#include "mob.hpp"
+#include "log.hpp"
+#include "pc_groups.hpp"
+#include "achievement.hpp"
+#include "clan.hpp"
int pc_split_atoui(char* str, unsigned int* val, char sep, int max);
@@ -57,15 +72,21 @@ int night_timer_tid = INVALID_TIMER;
struct eri *pc_sc_display_ers = NULL;
struct eri *pc_itemgrouphealrate_ers = NULL;
+struct eri *num_reg_ers;
+struct eri *str_reg_ers;
int pc_expiration_tid = INVALID_TIMER;
struct fame_list smith_fame_list[MAX_FAME_LIST];
struct fame_list chemist_fame_list[MAX_FAME_LIST];
struct fame_list taekwon_fame_list[MAX_FAME_LIST];
+struct s_job_info job_info[CLASS_COUNT];
+
#define MOTD_LINE_SIZE 128
static char motd_text[MOTD_LINE_SIZE][CHAT_SIZE_MAX]; // Message of the day buffer [Valaris]
+bool reg_load;
+
/**
* Translation table from athena equip index to aegis bitmask
*/
@@ -100,6 +121,10 @@ const struct sg_data sg_info[MAX_PC_FEELHATE] = {
{ SG_STAR_ANGER, SG_STAR_BLESS, SG_STAR_COMFORT, "PC_FEEL_STAR", "PC_HATE_MOB_STAR", is_day_of_star }
};
+void pc_set_reg_load( bool val ){
+ reg_load = val;
+}
+
/**
* Item Cool Down Delay Saving
* Struct item_cd is not a member of struct map_session_data
@@ -130,7 +155,7 @@ int pc_class2idx(int class_) {
* @param sd
* @return Group ID
*/
-inline int pc_get_group_id(struct map_session_data *sd) {
+int pc_get_group_id(struct map_session_data *sd) {
return sd->group_id;
}
@@ -138,7 +163,7 @@ inline int pc_get_group_id(struct map_session_data *sd) {
* @param sd
* @return Group Level
*/
-inline int pc_get_group_level(struct map_session_data *sd) {
+int pc_get_group_level(struct map_session_data *sd) {
return sd->group_level;
}
@@ -569,6 +594,43 @@ void pc_inventory_rental_add(struct map_session_data *sd, unsigned int seconds)
sd->rental_timer = add_timer(gettick() + umin(tick,3600000), pc_inventory_rental_end, sd->bl.id, 0);
}
+/**
+ * Check if the player can sell the current item
+ * @param sd: map_session_data of the player
+ * @param item: struct of the checking item
+ * @return bool 'true' is sellable, 'false' otherwise
+ */
+bool pc_can_sell_item(struct map_session_data *sd, struct item *item) {
+ struct npc_data *nd;
+
+ if (sd == NULL || item == NULL)
+ return false;
+
+ nd = map_id2nd(sd->npc_shopid);
+
+ if (battle_config.hide_fav_sell && item->favorite)
+ return false; //Cannot sell favs (optional config)
+
+ if (item->expire_time)
+ return false; // Cannot Sell Rental Items
+
+ if (nd && nd->subtype == NPCTYPE_ITEMSHOP) {
+ struct item_data *itd;
+
+ if (item->bound && battle_config.allow_bound_sell&ISR_BOUND)
+ return true; // NPCTYPE_ITEMSHOP and bound item config is sellable
+ if ((itd = itemdb_search(item->nameid)) && itd->flag.trade_restriction&8 && battle_config.allow_bound_sell&ISR_SELLABLE)
+ return true; // NPCTYPE_ITEMSHOP and sell restricted item config is sellable
+ }
+
+ if (!itemdb_cansell(item, pc_get_group_level(sd)))
+ return false;
+
+ if (item->bound && !pc_can_give_bounded_items(sd))
+ return false; // Don't allow sale of bound items
+ return true;
+}
+
/**
* Determines if player can give / drop / trade / vend items
*/
@@ -676,13 +738,15 @@ int pc_equippoint_sub(struct map_session_data *sd,struct item_data* id){
return 0; //Not equippable by players.
ep = id->equip;
- if(id->look == W_DAGGER ||
- id->look == W_1HSWORD ||
- id->look == W_1HAXE) {
- if(ep == EQP_HAND_R && (pc_checkskill(sd,AS_LEFT) > 0 || (sd->class_&MAPID_UPPERMASK) == MAPID_ASSASSIN ||
- (sd->class_&MAPID_UPPERMASK) == MAPID_KAGEROUOBORO))//Kagerou and Oboro can dual wield daggers. [Rytech]
- return EQP_ARMS;
+ if(id->look == W_DAGGER || id->look == W_1HSWORD || id->look == W_1HAXE) {
+ if(pc_checkskill(sd,AS_LEFT) > 0 || (sd->class_&MAPID_UPPERMASK) == MAPID_ASSASSIN || (sd->class_&MAPID_UPPERMASK) == MAPID_KAGEROUOBORO) { //Kagerou and Oboro can dual wield daggers. [Rytech]
+ if (ep == EQP_WEAPON)
+ return EQP_ARMS;
+ if (ep == EQP_SHADOW_WEAPON)
+ return EQP_SHADOW_ARMS;
+ }
}
+
return ep;
}
@@ -694,7 +758,18 @@ int pc_equippoint_sub(struct map_session_data *sd,struct item_data* id){
int pc_equippoint(struct map_session_data *sd,int n){
nullpo_ret(sd);
- return pc_equippoint_sub(sd,sd->inventory_data[n]);
+ int ep = pc_equippoint_sub(sd, sd->inventory_data[n]);
+
+ if (battle_config.reserved_costume_id &&
+ sd->inventory.u.items_inventory[n].card[0] == CARD0_CREATE &&
+ MakeDWord(sd->inventory.u.items_inventory[n].card[2], sd->inventory.u.items_inventory[n].card[3]) == battle_config.reserved_costume_id)
+ { // Costume Item - Converted
+ if (ep&EQP_HEAD_TOP) { ep &= ~EQP_HEAD_TOP; ep |= EQP_COSTUME_HEAD_TOP; }
+ if (ep&EQP_HEAD_LOW) { ep &= ~EQP_HEAD_LOW; ep |= EQP_COSTUME_HEAD_LOW; }
+ if (ep&EQP_HEAD_MID) { ep &= ~EQP_HEAD_MID; ep |= EQP_COSTUME_HEAD_MID; }
+ if (ep&EQP_GARMENT) { ep &= ~EQP_GARMENT; ep |= EQP_COSTUME_GARMENT; }
+ }
+ return ep;
}
/**
@@ -943,11 +1018,20 @@ bool pc_adoption(struct map_session_data *p1_sd, struct map_session_data *p2_sd,
// Baby Skills
pc_skill(b_sd, WE_BABY, 1, ADDSKILL_PERMANENT);
pc_skill(b_sd, WE_CALLPARENT, 1, ADDSKILL_PERMANENT);
+ pc_skill(b_sd, WE_CHEERUP, 1, ADDSKILL_PERMANENT);
// Parents Skills
pc_skill(p1_sd, WE_CALLBABY, 1, ADDSKILL_PERMANENT);
pc_skill(p2_sd, WE_CALLBABY, 1, ADDSKILL_PERMANENT);
+ chrif_save(p1_sd, CSAVE_NORMAL);
+ chrif_save(p2_sd, CSAVE_NORMAL);
+ chrif_save(b_sd, CSAVE_NORMAL);
+
+ achievement_update_objective(b_sd, AG_BABY, 1, 1);
+ achievement_update_objective(p1_sd, AG_BABY, 1, 2);
+ achievement_update_objective(p2_sd, AG_BABY, 1, 2);
+
return true;
}
@@ -1027,6 +1111,10 @@ uint8 pc_isequip(struct map_session_data *sd,int n)
if(item->sex != 2 && sd->status.sex != item->sex)
return ITEM_EQUIP_ACK_FAIL;
+ //fail to equip if item is restricted
+ if (!battle_config.allow_equip_restricted_item && itemdb_isNoEquip(item, sd->bl.m))
+ return ITEM_EQUIP_ACK_FAIL;
+
if (sd->sc.count) {
if(item->equip & EQP_ARMS && item->type == IT_WEAPON && sd->sc.data[SC_STRIPWEAPON]) // Also works with left-hand weapons [DracoRPG]
return ITEM_EQUIP_ACK_FAIL;
@@ -1038,7 +1126,9 @@ uint8 pc_isequip(struct map_session_data *sd,int n)
return ITEM_EQUIP_ACK_FAIL;
if(item->equip & EQP_ACC && sd->sc.data[SC__STRIPACCESSORY])
return ITEM_EQUIP_ACK_FAIL;
- if(item->equip && sd->sc.data[SC_KYOUGAKU])
+ if (item->equip & EQP_ARMS && sd->sc.data[SC__WEAKNESS])
+ return ITEM_EQUIP_ACK_FAIL;
+ if(item->equip && (sd->sc.data[SC_KYOUGAKU] || sd->sc.data[SC_SUHIDE]))
return ITEM_EQUIP_ACK_FAIL;
if (sd->sc.data[SC_SPIRIT] && sd->sc.data[SC_SPIRIT]->val2 == SL_SUPERNOVICE) {
@@ -1059,15 +1149,11 @@ uint8 pc_isequip(struct map_session_data *sd,int n)
}
}
- //fail to equip if item is restricted
- if (!battle_config.allow_equip_restricted_item && itemdb_isNoEquip(item, sd->bl.m))
- return ITEM_EQUIP_ACK_FAIL;
-
//Not equipable by class. [Skotlex]
- if (!(1ULL<<(sd->class_&MAPID_BASEMASK)&item->class_base[(sd->class_&JOBL_2_1)?1:((sd->class_&JOBL_2_2)?2:0)]))
+ if (!(1ULL << (sd->class_&MAPID_BASEMASK)&item->class_base[(sd->class_&JOBL_2_1) ? 1 : ((sd->class_&JOBL_2_2) ? 2 : 0)]))
return ITEM_EQUIP_ACK_FAIL;
-
- if (!pc_isItemClass(sd,item))
+
+ if (!pc_isItemClass(sd, item))
return ITEM_EQUIP_ACK_FAIL;
return ITEM_EQUIP_ACK_OK;
@@ -1226,12 +1312,12 @@ bool pc_authok(struct map_session_data *sd, uint32 login_id2, time_t expiration_
sd->die_counter=-1;
//display login notice
- ShowInfo("'"CL_WHITE"%s"CL_RESET"' logged in."
- " (AID/CID: '"CL_WHITE"%d/%d"CL_RESET"',"
- " Packet Ver: '"CL_WHITE"%d"CL_RESET"', IP: '"CL_WHITE"%d.%d.%d.%d"CL_RESET"',"
- " Group '"CL_WHITE"%d"CL_RESET"').\n",
+ ShowInfo("'" CL_WHITE "%s" CL_RESET "' logged in."
+ " (AID/CID: '" CL_WHITE "%d/%d" CL_RESET "',"
+ " IP: '" CL_WHITE "%d.%d.%d.%d" CL_RESET "',"
+ " Group '" CL_WHITE "%d" CL_RESET "').\n",
sd->status.name, sd->status.account_id, sd->status.char_id,
- sd->packet_ver, CONVIP(ip), sd->group_id);
+ CONVIP(ip), sd->group_id);
// Send friends list
clif_friendslist_send(sd);
@@ -1276,6 +1362,8 @@ bool pc_authok(struct map_session_data *sd, uint32 login_id2, time_t expiration_
sd->hatEffectCount = 0;
#endif
+ sd->catch_target_class = PET_CATCH_FAIL;
+
// Check EXP overflow, since in previous revision EXP on Max Level can be more than 'official' Max EXP
if (pc_is_maxbaselv(sd) && sd->status.base_exp > MAX_LEVEL_BASE_EXP) {
sd->status.base_exp = MAX_LEVEL_BASE_EXP;
@@ -1454,13 +1542,23 @@ void pc_reg_received(struct map_session_data *sd)
intif_Mail_requestinbox(sd->status.char_id, 0, MAIL_INBOX_NORMAL); // MAIL SYSTEM - Request Mail Inbox
intif_request_questlog(sd);
+ if (battle_config.feature_achievement) {
+ sd->achievement_data.total_score = 0;
+ sd->achievement_data.level = 0;
+ sd->achievement_data.save = false;
+ sd->achievement_data.count = 0;
+ sd->achievement_data.incompleteCount = 0;
+ sd->achievement_data.achievements = NULL;
+ intif_request_achievements(sd->status.char_id);
+ }
+
if (sd->state.connect_new == 0 && sd->fd) { //Character already loaded map! Gotta trigger LoadEndAck manually.
sd->state.connect_new = 1;
clif_parse_LoadEndAck(sd->fd, sd);
}
if( pc_isinvisible(sd) ) {
- sd->vd.class_ = INVISIBLE_CLASS;
+ sd->vd.class_ = JT_INVISIBLE;
clif_displaymessage( sd->fd, msg_txt( sd, 11 ) ); // Invisible: On
// decrement the number of pvp players on the map
map[sd->bl.m].users_pvp--;
@@ -2484,7 +2582,8 @@ void pc_bonus(struct map_session_data *sd,int type,int val)
case SP_BASE_ATK:
if(sd->state.lr_flag != 2) {
#ifdef RENEWAL
- sd->bonus.eatk += val;
+ bonus = sd->bonus.eatk + val;
+ sd->bonus.eatk = cap_value(bonus, SHRT_MIN, SHRT_MAX);
#else
bonus = status->batk + val;
status->batk = cap_value(bonus, 0, USHRT_MAX);
@@ -3067,9 +3166,12 @@ void pc_bonus(struct map_session_data *sd,int type,int val)
else if (current_equip_combo_pos > 0) {
ShowWarning("pc_bonus: unknown bonus type %d %d in a combo with item #%d\n", type, val, sd->inventory_data[pc_checkequip( sd, current_equip_combo_pos )]->nameid);
}
- else {
+ else if (current_equip_card_id > 0 || current_equip_item_index > 0) {
ShowWarning("pc_bonus: unknown bonus type %d %d in item #%d\n", type, val, current_equip_card_id ? current_equip_card_id : sd->inventory_data[current_equip_item_index]->nameid);
}
+ else {
+ ShowWarning("pc_bonus: unknown bonus type %d %d in unknown usage. Report this!\n", type, val);
+ }
break;
}
}
@@ -3748,9 +3850,12 @@ void pc_bonus2(struct map_session_data *sd,int type,int type2,int val)
}
else if (current_equip_combo_pos > 0) {
ShowWarning("pc_bonus2: unknown bonus type %d %d %d in a combo with item #%d\n", type, type2, val, sd->inventory_data[pc_checkequip( sd, current_equip_combo_pos )]->nameid);
+ }
+ else if (current_equip_card_id > 0 || current_equip_item_index > 0) {
+ ShowWarning("pc_bonus2: unknown bonus type %d %d %d in item #%d\n", type, type2, val, current_equip_card_id ? current_equip_card_id : sd->inventory_data[current_equip_item_index]->nameid);
}
else {
- ShowWarning("pc_bonus2: unknown bonus type %d %d %d in item #%d\n", type, type2, val, current_equip_card_id ? current_equip_card_id : sd->inventory_data[current_equip_item_index]->nameid);
+ ShowWarning("pc_bonus2: unknown bonus type %d %d %d in unknown usage. Report this!\n", type, type2, val);
}
break;
}
@@ -3872,9 +3977,12 @@ void pc_bonus3(struct map_session_data *sd,int type,int type2,int type3,int val)
else if (current_equip_combo_pos > 0) {
ShowWarning("pc_bonus3: unknown bonus type %d %d %d %d in a combo with item #%d\n", type, type2, type3, val, sd->inventory_data[pc_checkequip( sd, current_equip_combo_pos )]->nameid);
}
- else {
+ else if (current_equip_card_id > 0 || current_equip_item_index > 0) {
ShowWarning("pc_bonus3: unknown bonus type %d %d %d %d in item #%d\n", type, type2, type3, val, current_equip_card_id ? current_equip_card_id : sd->inventory_data[current_equip_item_index]->nameid);
}
+ else {
+ ShowWarning("pc_bonus3: unknown bonus type %d %d %d %d in unknown usage. Report this!\n", type, type2, type3, val);
+ }
break;
}
}
@@ -3955,9 +4063,12 @@ void pc_bonus4(struct map_session_data *sd,int type,int type2,int type3,int type
else if (current_equip_combo_pos > 0) {
ShowWarning("pc_bonus4: unknown bonus type %d %d %d %d %d in a combo with item #%d\n", type, type2, type3, type4, val, sd->inventory_data[pc_checkequip( sd, current_equip_combo_pos )]->nameid);
}
- else {
+ else if (current_equip_card_id > 0 || current_equip_item_index > 0) {
ShowWarning("pc_bonus4: unknown bonus type %d %d %d %d %d in item #%d\n", type, type2, type3, type4, val, current_equip_card_id ? current_equip_card_id : sd->inventory_data[current_equip_item_index]->nameid);
}
+ else {
+ ShowWarning("pc_bonus4: unknown bonus type %d %d %d %d %d in unknown usage. Report this!\n", type, type2, type3, type4, val);
+ }
break;
}
}
@@ -4004,9 +4115,12 @@ void pc_bonus5(struct map_session_data *sd,int type,int type2,int type3,int type
else if (current_equip_combo_pos > 0) {
ShowWarning("pc_bonus5: unknown bonus type %d %d %d %d %d %d in a combo with item #%d\n", type, type2, type3, type4, type5, val, sd->inventory_data[pc_checkequip( sd, current_equip_combo_pos )]->nameid);
}
- else {
+ else if (current_equip_card_id > 0 || current_equip_item_index > 0) {
ShowWarning("pc_bonus5: unknown bonus type %d %d %d %d %d %d in item #%d\n", type, type2, type3, type4, type5, val, current_equip_card_id ? current_equip_card_id : sd->inventory_data[current_equip_item_index]->nameid);
}
+ else {
+ ShowWarning("pc_bonus5: unknown bonus type %d %d %d %d %d %d in unknown usage. Report this!\n", type, type2, type3, type4, type5, val);
+ }
break;
}
}
@@ -4311,6 +4425,8 @@ char pc_getzeny(struct map_session_data *sd, int zeny, enum e_log_pick_type type
clif_messagecolor(&sd->bl, color_table[COLOR_LIGHT_GREEN], output, false, SELF);
}
+ achievement_update_objective(sd, AG_GET_ZENY, 1, sd->status.zeny);
+
return 0;
}
@@ -4554,6 +4670,8 @@ char pc_additem(struct map_session_data *sd,struct item *item,int amount,e_log_p
}
}
+ achievement_update_objective(sd, AG_GET_ITEM, 1, id->value_sell);
+
return ADDITEM_SUCCESS;
}
@@ -4804,25 +4922,6 @@ bool pc_isUseitem(struct map_session_data *sd,int n)
if( map[sd->bl.m].flag.noreturn && nameid != ITEMID_WING_OF_FLY && nameid != ITEMID_GIANT_FLY_WING && nameid != ITEMID_N_FLY_WING )
return false;
break;
- case ITEMID_BUBBLE_GUM:
- case ITEMID_COMP_BUBBLE_GUM:
- if( sd->sc.data[SC_ITEMBOOST] )
- return false;
- break;
- case ITEMID_BATTLE_MANUAL:
- case ITEMID_COMP_BATTLE_MANUAL:
- case ITEMID_THICK_BATTLE_MANUAL:
- case ITEMID_NOBLE_NAMEPLATE:
- case ITEMID_BATTLE_MANUAL25:
- case ITEMID_BATTLE_MANUAL100:
- case ITEMID_BATTLE_MANUAL300:
- if( sd->sc.data[SC_EXPBOOST] )
- return false;
- break;
- case ITEMID_JOB_MANUAL50:
- if( sd->sc.data[SC_JEXPBOOST] )
- return false;
- break;
case ITEMID_MERCENARY_RED_POTION:
case ITEMID_MERCENARY_BLUE_POTION:
case ITEMID_M_CENTER_POTION:
@@ -4847,17 +4946,6 @@ bool pc_isUseitem(struct map_session_data *sd,int n)
if( itemdb_group_item_exists(IG_MERCENARY, nameid) && sd->md != NULL )
return false; // Mercenary Scrolls
- /**
- * Only Rune Knights may use runes
- **/
- if( itemdb_group_item_exists(IG_RUNE, nameid) && (sd->class_&MAPID_THIRDMASK) != MAPID_RUNE_KNIGHT )
- return false;
- /**
- * Only GCross may use poisons
- **/
- else if( itemdb_group_item_exists(IG_POISON, nameid) && (sd->class_&MAPID_THIRDMASK) != MAPID_GUILLOTINE_CROSS )
- return false;
-
if( item->flag.group || item->type == IT_CASH) { //safe check type cash disappear when overweight [Napster]
if( pc_is90overweight(sd) ) {
clif_msg(sd, ITEM_CANT_OBTAIN_WEIGHT);
@@ -4897,7 +4985,6 @@ bool pc_isUseitem(struct map_session_data *sd,int n)
sd->sc.data[SC_CRYSTALIZE] ||
sd->sc.data[SC_KAGEHUMI] ||
(sd->sc.data[SC_NOCHAT] && sd->sc.data[SC_NOCHAT]->val1&MANNER_NOITEM) ||
- sd->sc.data[SC_HEAT_BARREL_AFTER] ||
sd->sc.data[SC_KINGS_GRACE] ||
sd->sc.data[SC_SUHIDE]))
return false;
@@ -4988,8 +5075,8 @@ int pc_useitem(struct map_session_data *sd,int n)
sd->itemid = item.nameid;
sd->itemindex = n;
- if(sd->catch_target_class != -1) //Abort pet catching.
- sd->catch_target_class = -1;
+ if(sd->catch_target_class != PET_CATCH_FAIL) //Abort pet catching.
+ sd->catch_target_class = PET_CATCH_FAIL;
amount = item.amount;
script = id->script;
@@ -5006,13 +5093,8 @@ int pc_useitem(struct map_session_data *sd,int n)
else
clif_useitemack(sd, n, 0, false);
}
- if(item.card[0]==CARD0_CREATE &&
- pc_famerank(MakeDWord(item.card[2],item.card[3]), MAPID_ALCHEMIST))
- {
+ if (item.card[0]==CARD0_CREATE && pc_famerank(MakeDWord(item.card[2],item.card[3]), MAPID_ALCHEMIST))
potion_flag = 2; // Famous player's potions have 50% more efficiency
- if (sd->sc.data[SC_SPIRIT] && sd->sc.data[SC_SPIRIT]->val2 == SL_ROGUE)
- potion_flag = 3; //Even more effective potions.
- }
//Update item use time.
sd->canuseitem_tick = tick + battle_config.item_use_interval;
@@ -5329,22 +5411,23 @@ int pc_steal_item(struct map_session_data *sd,struct block_list *bl, uint16 skil
*------------------------------------------*/
int pc_steal_coin(struct map_session_data *sd,struct block_list *target)
{
- int rate,skill;
+ int rate, target_lv;
struct mob_data *md;
+
if(!sd || !target || target->type != BL_MOB)
return 0;
md = (TBL_MOB*)target;
+ target_lv = status_get_lv(target);
if (md->state.steal_coin_flag || md->sc.data[SC_STONE] || md->sc.data[SC_FREEZE] || status_bl_has_mode(target,MD_STATUS_IMMUNE) || status_get_race2(&md->bl) == RC2_TREASURE)
return 0;
- // FIXME: This formula is either custom or outdated.
- skill = pc_checkskill(sd,RG_STEALCOIN)*10;
- rate = skill + (sd->status.base_level - md->level)*3 + sd->battle_status.dex*2 + sd->battle_status.luk*2;
+ rate = sd->battle_status.dex / 2 + 2 * (sd->status.base_level - target_lv) + (10 * pc_checkskill(sd, RG_STEALCOIN)) + sd->battle_status.luk / 2;
if(rnd()%1000 < rate)
{
- int amount = md->level*10 + rnd()%100;
+ // Zeny Steal Amount: (rnd() % (10 * target_lv + 1 - 8 * target_lv)) + 8 * target_lv
+ int amount = (rnd() % (2 * target_lv + 1)) + 8 * target_lv; // Reduced formula
pc_getzeny(sd, amount, LOG_TYPE_STEAL, NULL);
md->state.steal_coin_flag = 1;
@@ -5390,24 +5473,26 @@ enum e_setpos pc_setpos(struct map_session_data* sd, unsigned short mapindex, in
sd->state.warping = 1;
sd->state.workinprogress = WIP_DISABLE_NONE;
- if(map[sd->bl.m].instance_id && sd->state.changemap && !map[m].instance_id) {
- bool instance_found = false;
- struct party_data *p = NULL;
- struct guild *g = NULL;
-
- if (sd->instance_id) {
- instance_delusers(sd->instance_id);
- instance_found = true;
- }
- if (!instance_found && sd->status.party_id && (p = party_search(sd->status.party_id)) != NULL && p->instance_id) {
- instance_delusers(p->instance_id);
- instance_found = true;
- }
- if (!instance_found && sd->status.guild_id && (g = guild_search(sd->status.guild_id)) != NULL && g->instance_id)
- instance_delusers(g->instance_id);
- }
if( sd->state.changemap ) { // Misc map-changing settings
int i;
+
+ if(map[sd->bl.m].instance_id && !map[m].instance_id) {
+ bool instance_found = false;
+ struct party_data *p = NULL;
+ struct guild *g = NULL;
+
+ if (sd->instance_id) {
+ instance_delusers(sd->instance_id);
+ instance_found = true;
+ }
+ if (!instance_found && sd->status.party_id && (p = party_search(sd->status.party_id)) != NULL && p->instance_id) {
+ instance_delusers(p->instance_id);
+ instance_found = true;
+ }
+ if (!instance_found && sd->status.guild_id && (g = guild_search(sd->status.guild_id)) != NULL && g->instance_id)
+ instance_delusers(g->instance_id);
+ }
+
sd->state.pmap = sd->bl.m;
if (sd->sc.count) { // Cancel some map related stuff.
if (sd->sc.data[SC_JAILED])
@@ -5453,12 +5538,19 @@ enum e_setpos pc_setpos(struct map_session_data* sd, unsigned short mapindex, in
{
uint32 ip;
uint16 port;
+ struct script_state *st;
+
//if can't find any map-servers, just abort setting position.
if(!sd->mapindex || map_mapname2ipport(mapindex,&ip,&port))
return SETPOS_NO_MAPSERVER;
- if (sd->npc_id)
- npc_event_dequeue(sd);
+ if (sd->npc_id){
+ npc_event_dequeue(sd,false);
+ st = sd->st;
+ }else{
+ st = nullptr;
+ }
+
npc_script_event(sd, NPCE_LOGOUT);
//remove from map, THEN change x/y coordinates
unit_remove_map_pc(sd,clrtype);
@@ -5472,6 +5564,11 @@ enum e_setpos pc_setpos(struct map_session_data* sd, unsigned short mapindex, in
//Free session data from this map server [Kevin]
unit_free_pc(sd);
+ if( st ){
+ // Has to be done here, because otherwise unit_free_pc will free the stack already
+ st->state = END;
+ }
+
return SETPOS_OK;
}
@@ -5666,6 +5763,8 @@ int pc_get_skillcooldown(struct map_session_data *sd, uint16 skill_id, uint16 sk
if (!idx) return 0;
if (skill_db[idx]->cooldown[skill_lv - 1])
cooldown = skill_db[idx]->cooldown[skill_lv - 1];
+ if (skill_id == SU_TUNABELLY && pc_checkskill(sd, SU_SPIRITOFSEA))
+ cooldown -= skill_get_time(SU_TUNABELLY, skill_lv);
ARR_FIND(0, cooldownlen, i, sd->skillcooldown[i].id == skill_id);
if (i < cooldownlen) {
@@ -5772,8 +5871,8 @@ short pc_checkequip(struct map_session_data *sd,int pos)
* Check if sd has nameid equipped somewhere
* @sd : the player session
* @nameid : id of the item to check
- * @min : : see pc.h enum equip_index from ? to @max
- * @max : see pc.h enum equip_index for @min to ?
+ * @min : : see pc.hpp enum equip_index from ? to @max
+ * @max : see pc.hpp enum equip_index for @min to ?
* -return true,false
*------------------------------------------*/
bool pc_checkequip2(struct map_session_data *sd, unsigned short nameid, int min, int max)
@@ -6318,9 +6417,11 @@ const char* job_name(int class_)
return msg_txt(NULL,695);
case JOB_SUMMONER:
+ return msg_txt(NULL,697);
case JOB_BABY_SUMMONER:
+ return msg_txt(NULL,698);
case JOB_BABY_NINJA:
- return msg_txt(NULL,697 - JOB_SUMMONER+class_);
+ return msg_txt(NULL,699);
case JOB_BABY_KAGEROU:
case JOB_BABY_OBORO:
@@ -6362,7 +6463,7 @@ int pc_follow_timer(int tid, unsigned int tick, int id, intptr_t data)
sd->followtimer = INVALID_TIMER;
tbl = map_id2bl(sd->followtarget);
- if (tbl == NULL || pc_isdead(sd) || status_isdead(tbl))
+ if (tbl == NULL || pc_isdead(sd))
{
pc_stop_following(sd);
return 0;
@@ -6466,6 +6567,8 @@ int pc_checkbaselevelup(struct map_session_data *sd) {
party_send_levelup(sd);
pc_baselevelchanged(sd);
+ achievement_update_objective(sd, AG_GOAL_LEVEL, 1, sd->status.base_level);
+ achievement_update_objective(sd, AG_GOAL_STATUS, 2, sd->status.base_level, sd->status.class_);
return 1;
}
@@ -6513,6 +6616,7 @@ int pc_checkjoblevelup(struct map_session_data *sd)
clif_status_change(&sd->bl,SI_DEVIL, 1, 0, 0, 0, 1); //Permanent blind effect from SG_DEVIL.
npc_script_event(sd, NPCE_JOBLVUP);
+ achievement_update_objective(sd, AG_GOAL_LEVEL, 1, sd->status.job_level);
return 1;
}
@@ -6874,7 +6978,7 @@ int pc_need_status_point(struct map_session_data* sd, int type, int val)
high = low + val;
if ( val < 0 )
- swap(low, high);
+ SWAP(low, high);
for ( ; low < high; low++ )
sp += PC_STATUS_POINT_COST(low);
@@ -6966,6 +7070,8 @@ bool pc_statusup(struct map_session_data* sd, int type, int increase)
if( final_value > 255 )
clif_updatestatus(sd, type); // send after the 'ack' to override the truncated value
+ achievement_update_objective(sd, AG_GOAL_STATUS, 1, final_value);
+
return true;
}
@@ -7622,7 +7728,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src)
if(sd->status.pet_id > 0 && sd->pd) {
struct pet_data *pd = sd->pd;
if( !map[sd->bl.m].flag.noexppenalty ) {
- pet_set_intimate(pd, pd->pet.intimate - pd->petDB->die);
+ pet_set_intimate(pd, pd->pet.intimate - pd->get_pet_db()->die);
if( pd->pet.intimate < 0 )
pd->pet.intimate = 0;
clif_send_petdata(sd,sd->pd,1,pd->pet.intimate);
@@ -8257,8 +8363,8 @@ bool pc_setparam(struct map_session_data *sd,int type,int val)
*------------------------------------------*/
void pc_heal(struct map_session_data *sd,unsigned int hp,unsigned int sp, int type)
{
- if (type) {
- if (hp)
+ if (type&2) {
+ if (hp || type&4)
clif_heal(sd->fd,SP_HP,hp);
if (sp)
clif_heal(sd->fd,SP_SP,sp);
@@ -8271,56 +8377,59 @@ void pc_heal(struct map_session_data *sd,unsigned int hp,unsigned int sp, int ty
return;
}
-/*==========================================
- * HP/SP Recovery
- * Heal player hp and/or sp linearly.
- * Calculate bonus by status.
- *------------------------------------------*/
-int pc_itemheal(struct map_session_data *sd,int itemid, int hp,int sp)
+/**
+ * Heal player HP and/or SP linearly. Calculate any bonus based on active statuses.
+ * @param sd: Player data
+ * @param itemid: Item ID
+ * @param hp: HP to heal
+ * @param sp: SP to heal
+ * @return Amount healed to an object
+ */
+int pc_itemheal(struct map_session_data *sd, int itemid, int hp, int sp)
{
int bonus, tmp, penalty = 0;
- if(hp) {
+ if (hp) {
int i;
- bonus = 100 + (sd->battle_status.vit<<1)
- + pc_checkskill(sd,SM_RECOVERY)*10
- + pc_checkskill(sd,AM_LEARNINGPOTION)*5;
+
+ bonus = 100 + (sd->battle_status.vit << 1) + pc_checkskill(sd, SM_RECOVERY) * 10 + pc_checkskill(sd, AM_LEARNINGPOTION) * 5;
// A potion produced by an Alchemist in the Fame Top 10 gets +50% effect [DracoRPG]
- if (potion_flag > 1)
- bonus += bonus*(potion_flag-1)*50/100;
+ if (potion_flag == 2) {
+ bonus += 50;
+ if (sd->sc.data[SC_SPIRIT] && sd->sc.data[SC_SPIRIT]->val2 == SL_ROGUE)
+ bonus += 100; // Receive an additional +100% effect from ranked potions to HP only
+ }
//All item bonuses.
bonus += sd->bonus.itemhealrate2;
//Item Group bonuses
- bonus += bonus*pc_get_itemgroup_bonus(sd, itemid)/100;
+ bonus += pc_get_itemgroup_bonus(sd, itemid);
//Individual item bonuses.
- for(i = 0; i < ARRAYLENGTH(sd->itemhealrate) && sd->itemhealrate[i].nameid; i++)
- {
+ for(i = 0; i < ARRAYLENGTH(sd->itemhealrate) && sd->itemhealrate[i].nameid; i++) {
if (sd->itemhealrate[i].nameid == itemid) {
- bonus += bonus*sd->itemhealrate[i].rate/100;
+ bonus += sd->itemhealrate[i].rate;
break;
}
}
- tmp = hp * bonus / 100; // overflow check
- if(bonus != 100 && tmp > hp)
- hp = tmp;
-
// Recovery Potion
- if( sd->sc.data[SC_INCHEALRATE] )
- hp += (int)(hp * sd->sc.data[SC_INCHEALRATE]->val1/100.);
+ if (sd->sc.data[SC_INCHEALRATE])
+ bonus += sd->sc.data[SC_INCHEALRATE]->val1;
// 2014 Halloween Event : Pumpkin Bonus
- if(sd->sc.data[SC_MTF_PUMPKIN] && itemid == ITEMID_PUMPKIN)
- hp += (int)(hp * sd->sc.data[SC_MTF_PUMPKIN]->val1 / 100.);
+ if (sd->sc.data[SC_MTF_PUMPKIN] && itemid == ITEMID_PUMPKIN)
+ bonus += sd->sc.data[SC_MTF_PUMPKIN]->val1;
+
+ tmp = hp * bonus / 100; // Overflow check
+ if (bonus != 100 && tmp > hp)
+ hp = tmp;
}
- if(sp) {
- bonus = 100 + (sd->battle_status.int_<<1)
- + pc_checkskill(sd,MG_SRECOVERY)*10
- + pc_checkskill(sd,AM_LEARNINGPOTION)*5;
- if (potion_flag > 1)
- bonus += bonus*(potion_flag-1)*50/100;
-
- tmp = sp * bonus / 100;
- if(bonus != 100 && tmp > sp)
+ if (sp) {
+ bonus = 100 + (sd->battle_status.int_ << 1) + pc_checkskill(sd, MG_SRECOVERY) * 10 + pc_checkskill(sd, AM_LEARNINGPOTION) * 5;
+ // A potion produced by an Alchemist in the Fame Top 10 gets +50% effect [DracoRPG]
+ if (potion_flag == 2)
+ bonus += 50;
+
+ tmp = sp * bonus / 100; // Overflow check
+ if (bonus != 100 && tmp > sp)
sp = tmp;
}
if (sd->sc.count) {
@@ -8334,11 +8443,6 @@ int pc_itemheal(struct map_session_data *sd,int itemid, int hp,int sp)
if (sd->sc.data[SC_NORECOVER_STATE])
penalty = 100;
- if (penalty > 0) {
- hp -= hp * penalty / 100;
- sp -= sp * penalty / 100;
- }
-
if (sd->sc.data[SC_VITALITYACTIVATION]) {
hp += hp / 2; // 1.5 times
sp -= sp / 2;
@@ -8348,6 +8452,12 @@ int pc_itemheal(struct map_session_data *sd,int itemid, int hp,int sp)
hp += hp / 10;
sp += sp / 10;
}
+
+ if (penalty > 0) {
+ hp -= hp * penalty / 100;
+ sp -= sp * penalty / 100;
+ }
+
#ifdef RENEWAL
if (sd->sc.data[SC_EXTREMITYFIST2])
sp = 0;
@@ -8609,6 +8719,7 @@ bool pc_jobchange(struct map_session_data *sd,int job, char upper)
pc_checkallowskill(sd);
pc_equiplookall(sd);
pc_show_questinfo(sd);
+ achievement_update_objective(sd, AG_JOB_CHANGE, 2, sd->status.base_level, job);
if( sd->status.party_id ){
struct party_data* p;
@@ -8845,7 +8956,7 @@ bool pc_setcart(struct map_session_data *sd,int type) {
default:/* everything else is an allowed ID so we can move on */
if( !sd->sc.data[SC_PUSH_CART] ) { /* first time, so fill cart data */
clif_cartlist(sd);
- status_calc_cart_weight(sd, CALCWT_ITEM|CALCWT_MAXBONUS|CALCWT_CARTSTATE);
+ status_calc_cart_weight(sd, (e_status_calc_weight_opt)(CALCWT_ITEM|CALCWT_MAXBONUS|CALCWT_CARTSTATE));
}
clif_updatestatus(sd, SP_CARTINFO);
sc_start(&sd->bl, &sd->bl, SC_PUSH_CART, 100, type, 0);
@@ -8930,12 +9041,11 @@ bool pc_candrop(struct map_session_data *sd, struct item *item)
bool pc_can_attack( struct map_session_data *sd, int target_id ) {
nullpo_retr(false, sd);
- if (!&sd->sc)
- return true;
+ if( pc_is90overweight(sd) || pc_isridingwug(sd) )
+ return false;
if( sd->sc.data[SC_BASILICA] ||
sd->sc.data[SC__SHADOWFORM] ||
- sd->sc.data[SC__MANHOLE] ||
sd->sc.data[SC_CURSEDCIRCLE_ATKER] ||
sd->sc.data[SC_CURSEDCIRCLE_TARGET] ||
sd->sc.data[SC_CRYSTALIZE] ||
@@ -9167,12 +9277,19 @@ int pc_setregistry_str(struct map_session_data *sd, int64 reg, const char *val)
struct script_reg_str *p = NULL;
const char *regname = get_str(script_getvarid(reg));
unsigned int index = script_getvaridx(reg);
+ size_t vlen = 0;
if (!reg_load && !sd->vars_ok) {
ShowError("pc_setregistry_str : refusing to set %s until vars are received.\n", regname);
return 0;
}
+ if ( !script_check_RegistryVariableLength(1, val, &vlen ) )
+ {
+ ShowError("pc_check_RegistryVariableLength: Variable value length is too long (aid: %d, cid: %d): '%s' sz=%zu\n", sd->status.account_id, sd->status.char_id, val, vlen);
+ return 0;
+ }
+
if( (p = (struct script_reg_str *)i64db_get(sd->regs.vars, reg) ) ) {
if( val[0] ) {
if( p->value )
@@ -9244,9 +9361,9 @@ bool pc_setreg2(struct map_session_data *sd, const char *reg, int val) {
case '@':
return pc_setreg(sd, add_str(reg), val);
case '#':
- return (reg[1] == '#') ? pc_setaccountreg2(sd, add_str(reg), val) : pc_setaccountreg(sd, add_str(reg), val);
+ return (reg[1] == '#') ? pc_setaccountreg2(sd, add_str(reg), val) > 0 : pc_setaccountreg(sd, add_str(reg), val) > 0;
default:
- return pc_setglobalreg(sd, add_str(reg), val);
+ return pc_setglobalreg(sd, add_str(reg), val) > 0;
}
return false;
@@ -9411,6 +9528,7 @@ static int pc_checkcombo(struct map_session_data *sd, struct item_data *data) {
for( i = 0; i < data->combos_count; i++ ) {
struct itemchk {
int idx;
+ unsigned short nameid;
short card[MAX_SLOTS];
} *combo_idx;
int idx, j;
@@ -9431,6 +9549,7 @@ static int pc_checkcombo(struct map_session_data *sd, struct item_data *data) {
CREATE(combo_idx,struct itemchk,nb_itemCombo);
for(j=0; j < nb_itemCombo; j++){
combo_idx[j].idx=-1;
+ combo_idx[j].nameid=-1;
memset(combo_idx[j].card,-1,MAX_SLOTS);
}
@@ -9454,28 +9573,29 @@ static int pc_checkcombo(struct map_session_data *sd, struct item_data *data) {
bool do_continue = false; //used to continue that specific loop with some check that also use some loop
uint8 z;
for (z = 0; z < nb_itemCombo-1; z++)
- if(combo_idx[z].idx == index) //we already have that index recorded
+ if(combo_idx[z].idx == index && combo_idx[z].nameid == id) //we already have that index recorded
do_continue=true;
if(do_continue)
continue;
}
+ combo_idx[j].nameid = id;
combo_idx[j].idx = index;
pos |= sd->inventory.u.items_inventory[index].equip;
found = true;
break;
- } else { //Cards
+ } else { //Cards and enchants
uint16 z;
- if ( sd->inventory_data[index]->slot == 0 || itemdb_isspecial(sd->inventory.u.items_inventory[index].card[0]) )
+ if ( itemdb_isspecial(sd->inventory.u.items_inventory[index].card[0]) )
continue;
- for (z = 0; z < sd->inventory_data[index]->slot; z++) {
+ for (z = 0; z < MAX_SLOTS; z++) {
bool do_continue=false;
if (sd->inventory.u.items_inventory[index].card[z] != id)
continue;
if(j>0){
int c1, c2;
for (c1 = 0; c1 < nb_itemCombo-1; c1++){
- if(combo_idx[c1].idx == index){
- for (c2 = 0; c2 < sd->inventory_data[index]->slot; c2++){
+ if(combo_idx[c1].idx == index && combo_idx[c1].nameid == id){
+ for (c2 = 0; c2 < MAX_SLOTS; c2++){
if(combo_idx[c1].card[c2] == id){ //we already have that card recorded (at this same idx)
do_continue = true;
break;
@@ -9486,6 +9606,7 @@ static int pc_checkcombo(struct map_session_data *sd, struct item_data *data) {
}
if(do_continue)
continue;
+ combo_idx[j].nameid = id;
combo_idx[j].idx = index;
combo_idx[j].card[z] = id;
pos |= sd->inventory.u.items_inventory[index].equip;
@@ -9695,16 +9816,21 @@ bool pc_equipitem(struct map_session_data *sd,short n,int req_pos)
pos = sd->equip_index[EQI_ACC_R] >= 0 ? EQP_ACC_L : EQP_ACC_R;
}
+ if(pos == EQP_ARMS && id->equip == EQP_HAND_R) { //Dual wield capable weapon.
+ pos = (req_pos&EQP_ARMS);
+ if (pos == EQP_ARMS) //User specified both slots, pick one for them.
+ pos = sd->equip_index[EQI_HAND_R] >= 0 ? EQP_HAND_L : EQP_HAND_R;
+ }
+
if(pos == EQP_SHADOW_ACC) { // Shadow System
pos = req_pos&EQP_SHADOW_ACC;
if (pos == EQP_SHADOW_ACC)
pos = sd->equip_index[EQI_SHADOW_ACC_L] >= 0 ? EQP_SHADOW_ACC_R : EQP_SHADOW_ACC_L;
}
-
- if(pos == EQP_ARMS && id->equip == EQP_HAND_R) { //Dual wield capable weapon.
- pos = (req_pos&EQP_ARMS);
- if (pos == EQP_ARMS) //User specified both slots, pick one for them.
- pos = sd->equip_index[EQI_HAND_R] >= 0 ? EQP_HAND_L : EQP_HAND_R;
+ if(pos == EQP_SHADOW_ARMS && id->equip == EQP_SHADOW_WEAPON) {
+ pos = (req_pos&EQP_SHADOW_ARMS);
+ if( pos == EQP_SHADOW_ARMS )
+ pos = (sd->equip_index[EQI_SHADOW_WEAPON] >= 0 ? EQP_SHADOW_SHIELD : EQP_SHADOW_WEAPON);
}
if (pos&EQP_HAND_R && battle_config.use_weapon_skill_range&BL_PC) {
@@ -9773,7 +9899,7 @@ bool pc_equipitem(struct map_session_data *sd,short n,int req_pos)
if(itemdb_isspecial(sd->inventory.u.items_inventory[n].card[0]))
; //No cards
else {
- for( i = 0; i < id->slot; i++ ) {
+ for( i = 0; i < MAX_SLOTS; i++ ) {
struct item_data *data;
if (!sd->inventory.u.items_inventory[n].card[i])
continue;
@@ -9796,7 +9922,7 @@ bool pc_equipitem(struct map_session_data *sd,short n,int req_pos)
if(itemdb_isspecial(sd->inventory.u.items_inventory[n].card[0]))
; //No cards
else {
- for( i = 0; i < id->slot; i++ ) {
+ for( i = 0; i < MAX_SLOTS; i++ ) {
struct item_data *data;
if (!sd->inventory.u.items_inventory[n].card[i])
continue;
@@ -9822,7 +9948,7 @@ bool pc_equipitem(struct map_session_data *sd,short n,int req_pos)
*------------------------------------------*/
bool pc_unequipitem(struct map_session_data *sd, int n, int flag) {
int i, iflag;
- bool status_cacl = false;
+ bool status_calc = false;
nullpo_retr(false,sd);
@@ -9886,7 +10012,6 @@ bool pc_unequipitem(struct map_session_data *sd, int n, int flag) {
skill_enchant_elemental_end(&sd->bl, SC_NONE);
status_change_end(&sd->bl, SC_FEARBREEZE, INVALID_TIMER);
status_change_end(&sd->bl, SC_EXEEDBREAK, INVALID_TIMER);
- status_change_end(&sd->bl, SC_P_ALTER, INVALID_TIMER);
}
// On armor change
@@ -9898,7 +10023,7 @@ bool pc_unequipitem(struct map_session_data *sd, int n, int flag) {
}
// On ammo change
- if (sd->inventory_data[n]->type == IT_AMMO)
+ if (sd->inventory_data[n]->type == IT_AMMO && (sd->inventory_data[n]->nameid != ITEMID_SILVER_BULLET || sd->inventory_data[n]->nameid != ITEMID_PURIFICATION_BULLET || sd->inventory_data[n]->nameid != ITEMID_SILVER_BULLET_))
status_change_end(&sd->bl, SC_P_ALTER, INVALID_TIMER);
if (sd->state.autobonus&sd->inventory.u.items_inventory[n].equip)
@@ -9911,11 +10036,12 @@ bool pc_unequipitem(struct map_session_data *sd, int n, int flag) {
if ( sd->inventory_data[n] ) {
if( sd->inventory_data[n]->combos_count ) {
if( pc_removecombo(sd,sd->inventory_data[n]) )
- status_cacl = true;
- } if(itemdb_isspecial(sd->inventory.u.items_inventory[n].card[0]))
+ status_calc = true;
+ }
+ if(itemdb_isspecial(sd->inventory.u.items_inventory[n].card[0]))
; //No cards
else {
- for( i = 0; i < sd->inventory_data[n]->slot; i++ ) {
+ for( i = 0; i < MAX_SLOTS; i++ ) {
struct item_data *data;
if (!sd->inventory.u.items_inventory[n].card[i])
@@ -9923,14 +10049,14 @@ bool pc_unequipitem(struct map_session_data *sd, int n, int flag) {
if ( ( data = itemdb_exists(sd->inventory.u.items_inventory[n].card[i]) ) != NULL ) {
if( data->combos_count ) {
if( pc_removecombo(sd,data) )
- status_cacl = true;
+ status_calc = true;
}
}
}
}
}
- if(flag&1 || status_cacl) {
+ if(flag&1 || status_calc) {
pc_checkallowskill(sd);
status_calc_pc(sd,SCO_NONE);
}
@@ -9945,7 +10071,7 @@ bool pc_unequipitem(struct map_session_data *sd, int n, int flag) {
if(itemdb_isspecial(sd->inventory.u.items_inventory[n].card[0]))
; //No cards
else {
- for( i = 0; i < sd->inventory_data[n]->slot; i++ ) {
+ for( i = 0; i < MAX_SLOTS; i++ ) {
struct item_data *data;
if (!sd->inventory.u.items_inventory[n].card[i])
continue;
@@ -10160,6 +10286,10 @@ bool pc_marriage(struct map_session_data *sd,struct map_session_data *dstsd)
return false;
sd->status.partner_id = dstsd->status.char_id;
dstsd->status.partner_id = sd->status.char_id;
+
+ achievement_update_objective(sd, AG_MARRY, 1, 1);
+ achievement_update_objective(dstsd, AG_MARRY, 1, 1);
+
return true;
}
@@ -10756,10 +10886,15 @@ static bool pc_readdb_skilltree(char* fields[], int columns, int current)
baselv = (uint32)atoi(fields[3]);
joblv = (uint32)atoi(fields[4]);
offset = 5;
- } else {
+ }
+ else if (columns == 3 + MAX_PC_SKILL_REQUIRE * 2) {
baselv = joblv = 0;
offset = 3;
}
+ else {
+ ShowWarning("pc_readdb_skilltree: Invalid number of colums in skill %hu of job %d's tree.\n", skill_id, class_);
+ return false;
+ }
if(!pcdb_checkid(class_))
{
@@ -11174,7 +11309,7 @@ static int pc_read_statsdb(const char *basedir, int last_s, bool silent){
sprintf(line, "%s/statpoint.txt", basedir);
fp=fopen(line,"r");
if(fp == NULL){
- if(silent==0) ShowWarning("Can't read '"CL_WHITE"%s"CL_RESET"'... Generating DB.\n",line);
+ if(silent==0) ShowWarning("Can't read '" CL_WHITE "%s" CL_RESET "'... Generating DB.\n",line);
return max(last_s,i);
} else {
int entries=0;
@@ -11193,7 +11328,7 @@ static int pc_read_statsdb(const char *basedir, int last_s, bool silent){
entries++;
}
fclose(fp);
- ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s/%s"CL_RESET"'.\n", entries, basedir,"statpoint.txt");
+ ShowStatus("Done reading '" CL_WHITE "%d" CL_RESET "' entries in '" CL_WHITE "%s/%s" CL_RESET "'.\n", entries, basedir,"statpoint.txt");
}
return max(last_s,i);
}
@@ -11211,7 +11346,7 @@ void pc_readdb(void) {
int i, k, s = 1;
const char* dbsubpath[] = {
"",
- "/"DBIMPORT,
+ "/" DBIMPORT,
//add other path here
};
@@ -11254,22 +11389,22 @@ void pc_readdb(void) {
safesnprintf(dbsubpath2,n1,"%s%s",db_path,dbsubpath[i]);
}
- s = pc_read_statsdb(dbsubpath2,s,i);
+ s = pc_read_statsdb(dbsubpath2,s,i > 0);
if (i == 0)
#ifdef RENEWAL_ASPD
- sv_readdb(dbsubpath1, "re/job_db1.txt",',',6+MAX_WEAPON_TYPE,6+MAX_WEAPON_TYPE,CLASS_COUNT,&pc_readdb_job1, i);
+ sv_readdb(dbsubpath1, "re/job_db1.txt",',',6+MAX_WEAPON_TYPE,6+MAX_WEAPON_TYPE,CLASS_COUNT,&pc_readdb_job1, i > 0);
#else
- sv_readdb(dbsubpath1, "pre-re/job_db1.txt",',',5+MAX_WEAPON_TYPE,5+MAX_WEAPON_TYPE,CLASS_COUNT,&pc_readdb_job1, i);
+ sv_readdb(dbsubpath1, "pre-re/job_db1.txt",',',5+MAX_WEAPON_TYPE,5+MAX_WEAPON_TYPE,CLASS_COUNT,&pc_readdb_job1, i > 0);
#endif
else
- sv_readdb(dbsubpath1, "job_db1.txt",',',5+MAX_WEAPON_TYPE,6+MAX_WEAPON_TYPE,CLASS_COUNT,&pc_readdb_job1, i);
- sv_readdb(dbsubpath1, "job_db2.txt",',',1,1+MAX_LEVEL,CLASS_COUNT,&pc_readdb_job2, i);
- sv_readdb(dbsubpath2, "job_exp.txt",',',4,1000+3,CLASS_COUNT*2,&pc_readdb_job_exp, i); //support till 1000lvl
+ sv_readdb(dbsubpath1, "job_db1.txt",',',5+MAX_WEAPON_TYPE,6+MAX_WEAPON_TYPE,CLASS_COUNT,&pc_readdb_job1, i > 0);
+ sv_readdb(dbsubpath1, "job_db2.txt",',',1,1+MAX_LEVEL,CLASS_COUNT,&pc_readdb_job2, i > 0);
+ sv_readdb(dbsubpath2, "job_exp.txt",',',4,1000+3,CLASS_COUNT*2,&pc_readdb_job_exp, i > 0); //support till 1000lvl
#ifdef HP_SP_TABLES
- sv_readdb(dbsubpath2, "job_basehpsp_db.txt", ',', 4, 4+500, CLASS_COUNT*2, &pc_readdb_job_basehpsp, i); //Make it support until lvl 500!
+ sv_readdb(dbsubpath2, "job_basehpsp_db.txt", ',', 4, 4+500, CLASS_COUNT*2, &pc_readdb_job_basehpsp, i > 0); //Make it support until lvl 500!
#endif
- sv_readdb(dbsubpath2, "job_param_db.txt", ',', 2, PARAM_MAX+1, CLASS_COUNT, &pc_readdb_job_param, i);
- sv_readdb(dbsubpath2, "job_noenter_map.txt", ',', 3, 3, CLASS_COUNT, &pc_readdb_job_noenter_map, i);
+ sv_readdb(dbsubpath2, "job_param_db.txt", ',', 2, PARAM_MAX+1, CLASS_COUNT, &pc_readdb_job_param, i > 0);
+ sv_readdb(dbsubpath2, "job_noenter_map.txt", ',', 3, 3, CLASS_COUNT, &pc_readdb_job_noenter_map, i > 0);
aFree(dbsubpath1);
aFree(dbsubpath2);
}
@@ -11338,7 +11473,7 @@ int pc_read_motd(void)
char * ptr;
buf[len] = 0;
if( ( ptr = strstr(buf, " :") ) != NULL && ptr-buf >= NAME_LENGTH ) // crashes newer clients
- ShowWarning("Found sequence '"CL_WHITE" :"CL_RESET"' on line '"CL_WHITE"%u"CL_RESET"' in '"CL_WHITE"%s"CL_RESET"'. This can cause newer clients to crash.\n", lines, motd_txt);
+ ShowWarning("Found sequence '" CL_WHITE " :" CL_RESET "' on line '" CL_WHITE "%u" CL_RESET "' in '" CL_WHITE "%s" CL_RESET "'. This can cause newer clients to crash.\n", lines, motd_txt);
}
else {// empty line
buf[0] = ' ';
@@ -11348,10 +11483,10 @@ int pc_read_motd(void)
entries++;
}
fclose(fp);
- ShowStatus("Done reading '"CL_WHITE"%u"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", entries, motd_txt);
+ ShowStatus("Done reading '" CL_WHITE "%u" CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'.\n", entries, motd_txt);
}
else
- ShowWarning("File '"CL_WHITE"%s"CL_RESET"' not found.\n", motd_txt);
+ ShowWarning("File '" CL_WHITE "%s" CL_RESET "' not found.\n", motd_txt);
return 0;
}
@@ -11556,7 +11691,7 @@ void pc_scdata_received(struct map_session_data *sd) {
if (pc_iscarton(sd)) {
sd->cart_weight_max = 0; // Force a client refesh
- status_calc_cart_weight(sd, CALCWT_ITEM|CALCWT_MAXBONUS|CALCWT_CARTSTATE);
+ status_calc_cart_weight(sd, (e_status_calc_weight_opt)(CALCWT_ITEM|CALCWT_MAXBONUS|CALCWT_CARTSTATE));
}
}
@@ -11574,7 +11709,7 @@ void pc_check_expiration(struct map_session_data *sd) {
char tmpstr[1024];
strftime(tmpstr,sizeof(tmpstr) - 1,msg_txt(sd,501),localtime(&exp_time)); // "Your account time limit is: %d-%m-%Y %H:%M:%S."
- clif_wis_message(sd->fd,wisp_server_name,tmpstr,strlen(tmpstr) + 1);
+ clif_wis_message(sd,wisp_server_name,tmpstr,strlen(tmpstr) + 1,0);
pc_expire_check(sd);
}
@@ -12162,6 +12297,8 @@ void pc_show_questinfo(struct map_session_data *sd) {
return;
if (!map[sd->bl.m].qi_count || !map[sd->bl.m].qi_data)
return;
+ if (map[sd->bl.m].qi_count != sd->qi_count)
+ return; // init was not called yet
for(i = 0; i < map[sd->bl.m].qi_count; i++) {
qi = &map[sd->bl.m].qi_data[i];
@@ -12403,10 +12540,10 @@ void do_init_pc(void) {
do_init_pc_groups();
- pc_sc_display_ers = ers_new(sizeof(struct sc_display_entry), "pc.c:pc_sc_display_ers", ERS_OPT_FLEX_CHUNK);
- pc_itemgrouphealrate_ers = ers_new(sizeof(struct s_pc_itemgrouphealrate), "pc.c:pc_itemgrouphealrate_ers", ERS_OPT_NONE);
- num_reg_ers = ers_new(sizeof(struct script_reg_num), "pc.c:num_reg_ers", ERS_OPT_CLEAN|ERS_OPT_FLEX_CHUNK);
- str_reg_ers = ers_new(sizeof(struct script_reg_str), "pc.c:str_reg_ers", ERS_OPT_CLEAN|ERS_OPT_FLEX_CHUNK);
+ pc_sc_display_ers = ers_new(sizeof(struct sc_display_entry), "pc.cpp:pc_sc_display_ers", ERS_OPT_FLEX_CHUNK);
+ pc_itemgrouphealrate_ers = ers_new(sizeof(struct s_pc_itemgrouphealrate), "pc.cpp:pc_itemgrouphealrate_ers", ERS_OPT_NONE);
+ num_reg_ers = ers_new(sizeof(struct script_reg_num), "pc.cpp:num_reg_ers", (ERSOptions)(ERS_OPT_CLEAN|ERS_OPT_FLEX_CHUNK));
+ str_reg_ers = ers_new(sizeof(struct script_reg_str), "pc.cpp:str_reg_ers", (ERSOptions)(ERS_OPT_CLEAN|ERS_OPT_FLEX_CHUNK));
ers_chunk_size(pc_sc_display_ers, 150);
ers_chunk_size(num_reg_ers, 300);
diff --git a/src/map/pc.h b/src/map/pc.hpp
similarity index 96%
rename from src/map/pc.h
rename to src/map/pc.hpp
index 3853d8294d3..f7f58a9488a 100644
--- a/src/map/pc.h
+++ b/src/map/pc.hpp
@@ -1,31 +1,30 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#pragma once
+#ifndef _PC_HPP_
+#define _PC_HPP_
-#ifndef _PC_H_
-#define _PC_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <vector>
#include "../common/mmo.h" // JOB_*, MAX_FAME_LIST, struct fame_list, struct mmo_charstatus
-#include "../common/ers.h"
-#include "../common/timer.h" // INVALID_TIMER
#include "../common/strlib.h"// StringBuf
-#include "map.h" // RC_ALL
-#include "atcommand.h" // AtCommandType
-#include "battle.h" // battle_config
-#include "buyingstore.h" // struct s_buyingstore
-#include "clan.h"
-#include "itemdb.h" // MAX_ITEMGROUP
-#include "script.h" // struct script_reg, struct script_regstr
-#include "searchstore.h" // struct s_search_store_info
-#include "status.h" // OPTION_*, struct weapon_atk
-#include "unit.h" // unit_stop_attack(), unit_stop_walking()
-#include "vending.h" // struct s_vending
-#include "mob.h"
-#include "log.h"
-#include "pc_groups.h"
+
+#include "map.hpp" // RC_ALL
+#include "itemdb.hpp" // MAX_ITEMGROUP
+#include "searchstore.hpp" // struct s_search_store_info
+#include "vending.hpp" // struct s_vending
+#include "buyingstore.hpp" // struct s_buyingstore
+#include "unit.hpp" // unit_data
+#include "status.hpp" // unit_data
+#include "script.hpp" // struct script_reg, struct script_regstr
+#include "mob.hpp" //e_size
+#include "clif.hpp" //e_wip_block
+
+enum AtCommandType : uint8;
+//enum e_log_chat_type : uint8;
+enum e_log_pick_type : uint32;
+enum sc_type : int16;
+enum si_type : short;
#define MAX_PC_BONUS 10 /// Max bonus, usually used by item bonus
#define MAX_PC_SKILL_REQUIRE 5 /// Max skill tree requirement
@@ -41,8 +40,8 @@ extern "C" {
#define ROULETTE_GOLD_VAR "RouletteGold"
//Update this max as necessary. 55 is the value needed for Super Baby currently
-//Raised to 84 since Expanded Super Novice needs it.
-#define MAX_SKILL_TREE 84
+//Raised to 85 since Expanded Super Baby needs it.
+#define MAX_SKILL_TREE 85
//Total number of classes (for data storage)
#define CLASS_COUNT (JOB_MAX - JOB_NOVICE_HIGH + JOB_MAX_BASIC)
@@ -263,7 +262,7 @@ struct map_session_data {
unsigned disable_atcommand_on_npc : 1; //Prevent to use atcommand while talking with NPC [Kichi]
uint8 isBoundTrading; // Player is currently add bound item to trade list [Cydh]
bool ignoretimeout; // Prevent the SECURE_NPCTIMEOUT function from closing current script.
- unsigned int workinprogress : 2; // See clif.h::e_workinprogress
+ unsigned int workinprogress : 2; // See clif.hpp::e_workinprogress
bool pc_loaded; // Ensure inventory data and status data is loaded before we calculate player stats
bool keepshop; // Whether shop data should be removed when the player disconnects
bool mail_writing; // Whether the player is currently writing a mail in RODEX or not
@@ -289,7 +288,6 @@ struct map_session_data {
int count_rewarp; //count how many time we being rewarped
int langtype;
- uint32 packet_ver; // 5: old, 6: 7july04, 7: 13july04, 8: 26july04, 9: 9aug04/16aug04/17aug04, 10: 6sept04, 11: 21sept04, 12: 18oct04, 13: 25oct04 ... 18
struct mmo_charstatus status;
// Item Storages
@@ -500,7 +498,7 @@ struct map_session_data {
int itemid;
short itemindex; //Used item's index in sd->inventory [Skotlex]
- short catch_target_class; // pet catching, stores a pet class to catch (short now) [zzo]
+ uint16 catch_target_class; // pet catching, stores a pet class to catch [zzo]
int8 spiritball, spiritball_old;
int spirit_timer[MAX_SPIRITBALL];
@@ -574,8 +572,8 @@ struct map_session_data {
char fakename[NAME_LENGTH]; // fake names [Valaris]
- int duel_group; // duel vars [LuzZza]
- int duel_invite;
+ size_t duel_group; // duel vars [LuzZza]
+ size_t duel_invite;
int killerrid, killedrid;
@@ -604,6 +602,19 @@ struct map_session_data {
struct quest *quest_log; ///< Quest log entries (note: Q_COMPLETE quests follow the first <avail_quests>th enties
bool save_quest; ///< Whether the quest_log entries were modified and are waitin to be saved
+ // Achievement log system
+ struct s_achievement_data {
+ int total_score; ///< Total achievement points
+ int level; ///< Achievement level
+ bool save; ///< Flag to know if achievements need to be saved
+ uint16 count; ///< Total achievements in log
+ uint16 incompleteCount; ///< Total incomplete achievements in log
+ struct achievement *achievements; ///< Achievement log entries
+ } achievement_data;
+
+ // Title system
+ std::vector<int> titles;
+
/* ShowEvent Data Cache flags from map */
bool *qi_display;
unsigned short qi_count;
@@ -730,10 +741,8 @@ extern struct eri *pc_itemgrouphealrate_ers; /// Player's Item Group Heal Rate t
/**
* ERS for the bulk of pc vars
**/
-struct eri *num_reg_ers;
-struct eri *str_reg_ers;
-/* */
-bool reg_load;
+extern struct eri *num_reg_ers;
+extern struct eri *str_reg_ers;
/* Global Expiration Timer ID */
extern int pc_expiration_tid;
@@ -771,6 +780,7 @@ enum weapon_type {
W_DOUBLE_DS, // dagger + sword
W_DOUBLE_DA, // dagger + axe
W_DOUBLE_SA, // sword + axe
+ MAX_WEAPON_TYPE_ALL,
};
#define WEAPON_TYPE_ALL ((1<<MAX_WEAPON_TYPE)-1)
@@ -820,7 +830,7 @@ enum item_check {
ITMCHK_ALL = ITMCHK_INVENTORY|ITMCHK_CART|ITMCHK_STORAGE,
};
-struct {
+struct s_job_info {
unsigned int base_hp[MAX_LEVEL], base_sp[MAX_LEVEL]; //Storage for the first calculation with hp/sp factor and multiplicator
int hp_factor, hp_multiplicator, sp_factor;
int max_weight_base;
@@ -839,7 +849,8 @@ struct {
uint32 zone;
uint8 group_lv;
} noenter_map;
-} job_info[CLASS_COUNT];
+};
+extern struct s_job_info job_info[CLASS_COUNT];
#define EQP_WEAPON EQP_HAND_R
#define EQP_SHIELD EQP_HAND_L
@@ -972,10 +983,12 @@ short pc_maxaspd(struct map_session_data *sd);
)
#endif
+void pc_set_reg_load(bool val);
int pc_split_atoi(char* str, int* val, char sep, int max);
int pc_class2idx(int class_);
int pc_get_group_level(struct map_session_data *sd);
int pc_get_group_id(struct map_session_data *sd);
+bool pc_can_sell_item(struct map_session_data* sd, struct item * item);
bool pc_can_give_items(struct map_session_data *sd);
bool pc_can_give_bounded_items(struct map_session_data *sd);
@@ -1281,6 +1294,8 @@ void pc_baselevelchanged(struct map_session_data *sd);
void pc_damage_log_add(struct map_session_data *sd, int id);
void pc_damage_log_clear(struct map_session_data *sd, int id);
+enum e_BANKING_DEPOSIT_ACK : uint8;
+enum e_BANKING_WITHDRAW_ACK : uint8;
enum e_BANKING_DEPOSIT_ACK pc_bank_deposit(struct map_session_data *sd, int money);
enum e_BANKING_WITHDRAW_ACK pc_bank_withdraw(struct map_session_data *sd, int money);
@@ -1316,8 +1331,4 @@ bool pc_job_can_entermap(enum e_job jobid, int m, int group_lv);
int pc_level_penalty_mod(int level_diff, uint32 mob_class, enum e_mode mode, int type);
#endif
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _PC_H_ */
+#endif /* _PC_HPP_ */
diff --git a/src/map/pc_groups.c b/src/map/pc_groups.cpp
similarity index 97%
rename from src/map/pc_groups.c
rename to src/map/pc_groups.cpp
index ce08b9c32e3..5e74b240a67 100644
--- a/src/map/pc_groups.c
+++ b/src/map/pc_groups.cpp
@@ -1,6 +1,8 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "pc_groups.hpp"
+
#include "../common/conf.h"
#include "../common/db.h"
#include "../common/malloc.h"
@@ -8,9 +10,8 @@
#include "../common/strlib.h" // strcmp
#include "../common/socket.h"
-#include "atcommand.h" // AtCommandType
-#include "pc_groups.h"
-#include "pc.h" // e_pc_permission
+#include "atcommand.hpp" // AtCommandType
+#include "pc.hpp" // e_pc_permission
typedef struct GroupSettings GroupSettings;
@@ -125,7 +126,7 @@ static void read_config(void)
group_settings->id = id;
group_settings->level = level;
group_settings->name = groupname;
- group_settings->log_commands = (bool)log_commands;
+ group_settings->log_commands = log_commands != 0;
group_settings->inherit = config_setting_get_member(group, "inherit");
group_settings->commands = config_setting_get_member(group, "commands");
group_settings->permissions = config_setting_get_member(group, "permissions");
@@ -270,7 +271,7 @@ static void read_config(void)
dbi_destroy(iter);
}
- ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' groups in '"CL_WHITE"%s"CL_RESET"'.\n", group_count, config_filename);
+ ShowStatus("Done reading '" CL_WHITE "%d" CL_RESET "' groups in '" CL_WHITE "%s" CL_RESET "'.\n", group_count, config_filename);
if( ( pc_group_max = group_count ) ) {
@@ -333,12 +334,12 @@ bool pc_group_can_use_command(int group_id, const char *command, AtCommandType t
// <commandname> : <bool> (only atcommand)
if (type == COMMAND_ATCOMMAND && config_setting_lookup_bool(commands, command, &result))
- return (bool)result;
+ return result != 0;
// <commandname> : [ <bool>, <bool> ] ([ atcommand, charcommand ])
if ((cmd = config_setting_get_member(commands, command)) != NULL &&
config_setting_is_aggregate(cmd) && config_setting_length(cmd) == 2)
- return (bool)config_setting_get_bool_elem(cmd, AtCommandType2idx(type));
+ return config_setting_get_bool_elem(cmd, AtCommandType2idx(type)) != 0;
}
return false;
}
diff --git a/src/map/pc_groups.h b/src/map/pc_groups.hpp
similarity index 93%
rename from src/map/pc_groups.h
rename to src/map/pc_groups.hpp
index 45e8b559b32..932ae0513c3 100644
--- a/src/map/pc_groups.h
+++ b/src/map/pc_groups.hpp
@@ -1,10 +1,12 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _PC_GROUPS_H_
-#define _PC_GROUPS_H_
+#ifndef _PC_GROUPS_HPP_
+#define _PC_GROUPS_HPP_
-#include "atcommand.h" // AtCommandType
+#include "../common/cbasetypes.h"
+
+enum AtCommandType : uint8;
extern int pc_group_max;
@@ -20,7 +22,7 @@ void do_init_pc_groups(void);
void do_final_pc_groups(void);
void pc_groups_reload(void);
-enum e_pc_permission {
+enum e_pc_permission : uint32 {
PC_PERM_NONE = 0,
PC_PERM_TRADE = 0x00000001,
PC_PERM_PARTY = 0x00000002,
@@ -54,7 +56,7 @@ enum e_pc_permission {
PC_PERM_ALLPERMISSION = 0xFFFFFFFF,
};
-static const struct {
+static const struct s_pcg_permission_name {
const char *name;
enum e_pc_permission permission;
} pc_g_permission_name[] = {
@@ -89,4 +91,4 @@ static const struct {
{ "all_permission", PC_PERM_ALLPERMISSION },
};
-#endif // _PC_GROUPS_H_
+#endif // _PC_GROUPS_HPP_
diff --git a/src/map/pet.c b/src/map/pet.cpp
similarity index 85%
rename from src/map/pet.c
rename to src/map/pet.cpp
index d9205518a0c..179b46aaad1 100644
--- a/src/map/pet.c
+++ b/src/map/pet.cpp
@@ -1,6 +1,12 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "pet.hpp"
+
+#include <map>
+
+#include <stdlib.h>
+
#include "../common/db.h"
#include "../common/timer.h"
#include "../common/nullpo.h"
@@ -11,17 +17,27 @@
#include "../common/utils.h"
#include "../common/ers.h"
-#include "pc.h"
-#include "intif.h"
-#include "chrif.h"
-#include "pet.h"
-
-#include <stdlib.h>
-
+#include "pc.hpp"
+#include "intif.hpp"
+#include "chrif.hpp"
+#include "npc.hpp"
+#include "clif.hpp"
+#include "mob.hpp"
+#include "battle.hpp"
+#include "log.hpp"
+#include "achievement.hpp"
#define MIN_PETTHINKTIME 100
-struct s_pet_db pet_db[MAX_PET_DB];
+//Dynamic pet database
+std::map<uint16, struct s_pet_db> pet_db_data;
+struct s_pet_db *pet_db( uint16 pet_id ){
+ if( pet_db_data.find(pet_id) != pet_db_data.end() ){
+ return &pet_db_data.at(pet_id);
+ }else{
+ return nullptr;
+ }
+}
static struct eri *item_drop_ers; //For loot drops delay structures.
static struct eri *item_drop_list_ers;
@@ -72,38 +88,35 @@ void pet_set_intimate(struct pet_data *pd, int value)
* Create a pet egg.
* @param sd : player requesting
* @param item_id : item ID of tamer
- * @return 1:success, 0:failure
+ * @return true:success, false:failure
*/
-int pet_create_egg(struct map_session_data *sd, unsigned short item_id)
+bool pet_create_egg(struct map_session_data *sd, unsigned short item_id)
{
- int pet_id = search_petDB_index(item_id, PET_EGG);
+ struct s_pet_db* pet = pet_db_search(item_id, PET_EGG);
- if (pet_id < 0)
- return 0; //No pet egg here.
+ if (!pet)
+ return false; //No pet egg here.
if (!pc_inventoryblank(sd))
- return 0; // Inventory full
+ return false; // Inventory full
- sd->catch_target_class = pet_db[pet_id].class_;
- intif_create_pet(sd->status.account_id, sd->status.char_id, pet_db[pet_id].class_, mob_db(pet_db[pet_id].class_)->lv, pet_db[pet_id].EggID, 0, pet_db[pet_id].intimate, 100, 0, 1, pet_db[pet_id].jname);
+ sd->catch_target_class = pet->class_;
+ intif_create_pet(sd->status.account_id, sd->status.char_id, pet->class_, mob_db(pet->class_)->lv, pet->EggID, 0, pet->intimate, 100, 0, 1, pet->jname);
- return 1;
+ return true;
}
/**
* Make pet drop target.
* @param pd : pet requesting
- * @return 0
*/
-int pet_unlocktarget(struct pet_data *pd)
+void pet_unlocktarget(struct pet_data *pd)
{
- nullpo_ret(pd);
+ nullpo_retv(pd);
pd->target_id = 0;
pet_stop_attack(pd);
pet_stop_walking(pd,1);
-
- return 0;
}
/**
@@ -154,11 +167,14 @@ int pet_attackskill(struct pet_data *pd, int target_id)
int pet_target_check(struct pet_data *pd,struct block_list *bl,int type)
{
int rate;
+ s_pet_db* pet_db_ptr;
nullpo_ret(pd);
Assert((pd->master == 0) || (pd->master->pd == pd));
+ pet_db_ptr = pd->get_pet_db();
+
if(bl == NULL || bl->type != BL_MOB || bl->prev == NULL ||
pd->pet.intimate < battle_config.pet_support_min_friendly ||
pd->pet.hungry < 1 ||
@@ -178,21 +194,21 @@ int pet_target_check(struct pet_data *pd,struct block_list *bl,int type)
return 0;
if(!type) {
- rate = pd->petDB->attack_rate;
+ rate = pet_db_ptr->attack_rate;
rate = rate * pd->rate_fix / 1000;
- if(pd->petDB->attack_rate > 0 && rate <= 0)
+ if(pet_db_ptr->attack_rate > 0 && rate <= 0)
rate = 1;
} else {
- rate = pd->petDB->defence_attack_rate;
+ rate = pet_db_ptr->defence_attack_rate;
rate = rate * pd->rate_fix / 1000;
- if(pd->petDB->defence_attack_rate > 0 && rate <= 0)
+ if(pet_db_ptr->defence_attack_rate > 0 && rate <= 0)
rate = 1;
}
if(rnd()%10000 < rate) {
- if(pd->target_id == 0 || rnd()%10000 < pd->petDB->change_target_rate)
+ if(pd->target_id == 0 || rnd()%10000 < pet_db_ptr->change_target_rate)
pd->target_id = bl->id;
}
@@ -236,6 +252,7 @@ static int pet_hungry(int tid, unsigned int tick, int id, intptr_t data)
{
struct map_session_data *sd;
struct pet_data *pd;
+ s_pet_db *pet_db_ptr;
int interval;
sd = map_id2sd(id);
@@ -247,6 +264,7 @@ static int pet_hungry(int tid, unsigned int tick, int id, intptr_t data)
return 1;
pd = sd->pd;
+ pet_db_ptr = pd->get_pet_db();
if(pd->pet_hungry_timer != tid) {
ShowError("pet_hungry_timer %d != %d\n",pd->pet_hungry_timer,tid);
@@ -277,9 +295,9 @@ static int pet_hungry(int tid, unsigned int tick, int id, intptr_t data)
clif_send_petdata(sd,pd,2,pd->pet.hungry);
if(battle_config.pet_hungry_delay_rate != 100)
- interval = (pd->petDB->hungry_delay*battle_config.pet_hungry_delay_rate)/100;
+ interval = (pet_db_ptr->hungry_delay*battle_config.pet_hungry_delay_rate)/100;
else
- interval = pd->petDB->hungry_delay;
+ interval = pet_db_ptr->hungry_delay;
if(interval <= 0)
interval = 1;
@@ -292,29 +310,25 @@ static int pet_hungry(int tid, unsigned int tick, int id, intptr_t data)
/**
* Search pet database for given value and type.
* @param key : value to search for
- * @param type : pet type to search for (Class, Catch, Egg, Equip, Food)
- * @return Pet ID on success, -1 on failure
+ * @param type : pet type to search for (Catch, Egg, Equip, Food)
+ * @return Pet DB pointer on success, NULL on failure
*/
-int search_petDB_index(int key,int type)
-{
- int i;
-
- for( i = 0; i < MAX_PET_DB; i++ ) {
- if(pet_db[i].class_ <= 0)
- continue;
+struct s_pet_db* pet_db_search( int key, enum e_pet_itemtype type ){
+ for( auto &pair : pet_db_data ){
+ struct s_pet_db* pet = &pair.second;
switch(type) {
- case PET_CLASS: if(pet_db[i].class_ == key) return i; break;
- case PET_CATCH: if(pet_db[i].itemID == key) return i; break;
- case PET_EGG: if(pet_db[i].EggID == key) return i; break;
- case PET_EQUIP: if(pet_db[i].AcceID == key) return i; break;
- case PET_FOOD: if(pet_db[i].FoodID == key) return i; break;
+ case PET_CATCH: if(pet->itemID == key) return pet; break;
+ case PET_EGG: if(pet->EggID == key) return pet; break;
+ case PET_EQUIP: if(pet->AcceID == key) return pet; break;
+ case PET_FOOD: if(pet->FoodID == key) return pet; break;
default:
- return -1;
+ ShowError( "pet_db_search: Unsupported type %d\n", type );
+ return nullptr;
}
}
- return -1;
+ return nullptr;
}
/**
@@ -345,7 +359,7 @@ static int pet_performance(struct map_session_data *sd, struct pet_data *pd)
int val;
if (pd->pet.intimate > 900)
- val = (pd->petDB->s_perfor > 0) ? 4 : 3;
+ val = (pd->get_pet_db()->s_perfor > 0) ? 4 : 3;
else if(pd->pet.intimate > 750) //TODO: this is way too high
val = 2;
else
@@ -371,7 +385,7 @@ static int pet_return_egg(struct map_session_data *sd, struct pet_data *pd)
pet_lootitem_drop(pd,sd);
memset(&tmp_item,0,sizeof(tmp_item));
- tmp_item.nameid = pd->petDB->EggID;
+ tmp_item.nameid = pd->get_pet_db()->EggID;
tmp_item.identify = 1;
tmp_item.card[0] = CARD0_PET;
tmp_item.card[1] = GetWord(pd->pet.pet_id,0);
@@ -396,20 +410,22 @@ static int pet_return_egg(struct map_session_data *sd, struct pet_data *pd)
* Load initial pet data when hatching/creating.
* @param sd : player requesting
* @param pet : pet requesting
+ * @return True on success or false otherwise
*/
-int pet_data_init(struct map_session_data *sd, struct s_pet *pet)
+bool pet_data_init(struct map_session_data *sd, struct s_pet *pet)
{
struct pet_data *pd;
- int i = 0, interval = 0;
+ struct s_pet_db *pet_db_ptr;
+ int interval = 0;
- nullpo_retr(1, sd);
+ nullpo_retr(false, sd);
Assert((sd->status.pet_id == 0 || sd->pd == 0) || sd->pd->master == sd);
if(sd->status.account_id != pet->account_id || sd->status.char_id != pet->char_id) {
sd->status.pet_id = 0;
- return 1;
+ return false;
}
if (sd->status.pet_id != pet->pet_id) {
@@ -419,18 +435,19 @@ int pet_data_init(struct map_session_data *sd, struct s_pet *pet)
intif_save_petdata(sd->status.account_id,pet);
sd->status.pet_id = 0;
- return 1;
+ return false;
}
//The pet_id value was lost? odd... restore it.
sd->status.pet_id = pet->pet_id;
}
- i = search_petDB_index(pet->class_,PET_CLASS);
- if(i < 0) {
+ pet_db_ptr = pet_db(pet->class_);
+
+ if( !pet_db_ptr ){
sd->status.pet_id = 0;
- return 1;
+ return false;
}
sd->pd = pd = (struct pet_data *)aCalloc(1,sizeof(struct pet_data));
@@ -438,7 +455,6 @@ int pet_data_init(struct map_session_data *sd, struct s_pet *pet)
pd->bl.id = npc_get_new_npc_id();
pd->master = sd;
- pd->petDB = &pet_db[i];
pd->db = mob_db(pet->class_);
memcpy(&pd->pet, pet, sizeof(struct s_pet));
status_set_viewdata(&pd->bl, pet->class_);
@@ -459,16 +475,16 @@ int pet_data_init(struct map_session_data *sd, struct s_pet *pet)
pd->state.skillbonus = 0;
if( battle_config.pet_status_support )
- run_script(pet_db[i].pet_script,0,sd->bl.id,0);
+ run_script(pet_db_ptr->pet_script,0,sd->bl.id,0);
- if( pd->petDB ) {
- if( pd->petDB->pet_loyal_script )
+ if( pd->get_pet_db() ) {
+ if( pet_db_ptr->pet_loyal_script )
status_calc_pc(sd,SCO_NONE);
if( battle_config.pet_hungry_delay_rate != 100 )
- interval = pd->petDB->hungry_delay * battle_config.pet_hungry_delay_rate / 100;
+ interval = pet_db_ptr->hungry_delay * battle_config.pet_hungry_delay_rate / 100;
else
- interval = pd->petDB->hungry_delay;
+ interval = pet_db_ptr->hungry_delay;
}
if( interval <= 0 )
@@ -477,7 +493,7 @@ int pet_data_init(struct map_session_data *sd, struct s_pet *pet)
pd->pet_hungry_timer = add_timer(gettick() + interval, pet_hungry, sd->bl.id, 0);
pd->masterteleport_timer = INVALID_TIMER;
- return 0;
+ return true;
}
/**
@@ -502,9 +518,7 @@ int pet_birth_process(struct map_session_data *sd, struct s_pet *pet)
pet->char_id = sd->status.char_id;
sd->status.pet_id = pet->pet_id;
- if(pet_data_init(sd, pet)) {
- sd->status.pet_id = 0;
-
+ if(!pet_data_init(sd, pet)) {
return 1;
}
@@ -634,7 +648,8 @@ int pet_catch_process1(struct map_session_data *sd,int target_class)
int pet_catch_process2(struct map_session_data* sd, int target_id)
{
struct mob_data* md;
- int i = 0, pet_catch_rate = 0;
+ int pet_catch_rate = 0;
+ struct s_pet_db* pet;
nullpo_retr(1, sd);
@@ -642,28 +657,35 @@ int pet_catch_process2(struct map_session_data* sd, int target_id)
if(!md || md->bl.type != BL_MOB || md->bl.prev == NULL) { // Invalid inputs/state, abort capture.
clif_pet_roulette(sd,0);
- sd->catch_target_class = -1;
+ sd->catch_target_class = PET_CATCH_FAIL;
sd->itemid = sd->itemindex = -1;
return 1;
}
//FIXME: delete taming item here, if this was an item-invoked capture and the item was flagged as delay-consume [ultramage]
- i = search_petDB_index(md->mob_id,PET_CLASS);
+ pet = pet_db(md->mob_id);
- //catch_target_class == 0 is used for universal lures (except bosses for now). [Skotlex]
- if (sd->catch_target_class == 0 && !status_has_mode(&md->status,MD_STATUS_IMMUNE))
- sd->catch_target_class = md->mob_id;
+ // If the target is a valid pet, we have a few exceptions
+ if( pet ){
+ //catch_target_class == PET_CATCH_UNIVERSAL is used for universal lures (except bosses for now). [Skotlex]
+ if (sd->catch_target_class == PET_CATCH_UNIVERSAL && !status_has_mode(&md->status,MD_STATUS_IMMUNE)){
+ sd->catch_target_class = md->mob_id;
+ //catch_target_class == PET_CATCH_UNIVERSAL_ITEM is used for catching any monster required the lure item used
+ }else if (sd->catch_target_class == PET_CATCH_UNIVERSAL_ITEM && sd->itemid == pet->itemID){
+ sd->catch_target_class = md->mob_id;
+ }
+ }
- if(i < 0 || sd->catch_target_class != md->mob_id) {
- clif_emotion(&md->bl, E_AG); //mob will do /ag if wrong lure is used on them.
+ if(sd->catch_target_class != md->mob_id || !pet) {
+ clif_emotion(&md->bl, ET_ANGER); //mob will do /ag if wrong lure is used on them.
clif_pet_roulette(sd,0);
- sd->catch_target_class = -1;
+ sd->catch_target_class = PET_CATCH_FAIL;
return 1;
}
- pet_catch_rate = (pet_db[i].capture + (sd->status.base_level - md->level)*30 + sd->battle_status.luk*20)*(200 - get_percentage(md->status.hp, md->status.max_hp))/100;
+ pet_catch_rate = (pet->capture + (sd->status.base_level - md->level)*30 + sd->battle_status.luk*20)*(200 - get_percentage(md->status.hp, md->status.max_hp))/100;
if(pet_catch_rate < 1)
pet_catch_rate = 1;
@@ -672,13 +694,14 @@ int pet_catch_process2(struct map_session_data* sd, int target_id)
pet_catch_rate = (pet_catch_rate*battle_config.pet_catch_rate)/100;
if(rnd()%10000 < pet_catch_rate) {
+ achievement_update_objective(sd, AG_TAMING, 1, md->mob_id);
unit_remove_map(&md->bl,CLR_OUTSIGHT);
status_kill(&md->bl);
clif_pet_roulette(sd,1);
- intif_create_pet(sd->status.account_id, sd->status.char_id, pet_db[i].class_, mob_db(pet_db[i].class_)->lv, pet_db[i].EggID, 0, pet_db[i].intimate, 100, 0, 1, pet_db[i].jname);
+ intif_create_pet(sd->status.account_id, sd->status.char_id, pet->class_, mob_db(pet->class_)->lv, pet->EggID, 0, pet->intimate, 100, 0, 1, pet->jname);
} else {
clif_pet_roulette(sd,0);
- sd->catch_target_class = -1;
+ sd->catch_target_class = PET_CATCH_FAIL;
}
return 0;
@@ -696,7 +719,8 @@ int pet_catch_process2(struct map_session_data* sd, int target_id)
bool pet_get_egg(uint32 account_id, short pet_class, int pet_id ) {
struct map_session_data *sd;
struct item tmp_item;
- int i = 0, ret = 0;
+ int ret = 0;
+ struct s_pet_db* pet;
if( pet_id == 0 || pet_class == 0 )
return false;
@@ -711,17 +735,17 @@ bool pet_get_egg(uint32 account_id, short pet_class, int pet_id ) {
// Before this change in cases where more than one pet egg were requested in a short
// period of time it wasn't possible to know which kind of egg was being requested after
// the first request. [Panikon]
- i = search_petDB_index(pet_class,PET_CLASS);
- sd->catch_target_class = -1;
+ pet = pet_db(pet_class);
+ sd->catch_target_class = PET_CATCH_FAIL;
- if(i < 0) {
+ if(!pet) {
intif_delete_petdata(pet_id);
return false;
}
memset(&tmp_item,0,sizeof(tmp_item));
- tmp_item.nameid = pet_db[i].EggID;
+ tmp_item.nameid = pet->EggID;
tmp_item.identify = 1;
tmp_item.card[0] = CARD0_PET;
tmp_item.card[1] = GetWord(pet_id,0);
@@ -758,7 +782,7 @@ int pet_menu(struct map_session_data *sd,int menunum)
if(!sd->status.pet_id || sd->pd->pet.intimate <= 0 || sd->pd->pet.incubate)
return 1;
- egg_id = itemdb_exists(sd->pd->petDB->EggID);
+ egg_id = itemdb_exists(sd->pd->get_pet_db()->EggID);
if (egg_id) {
if ((egg_id->flag.trade_restriction&0x01) && !pc_inventoryblank(sd)) {
@@ -854,6 +878,7 @@ int pet_change_name_ack(struct map_session_data *sd, char* name, int flag)
int pet_equipitem(struct map_session_data *sd,int index)
{
struct pet_data *pd;
+ s_pet_db *pet_db_ptr;
unsigned short nameid;
nullpo_retr(1, sd);
@@ -862,10 +887,13 @@ int pet_equipitem(struct map_session_data *sd,int index)
if (!pd)
return 1;
+
+ if((pet_db_ptr = pd->get_pet_db()) == nullptr)
+ return 1;
nameid = sd->inventory.u.items_inventory[index].nameid;
- if(pd->petDB->AcceID == 0 || nameid != pd->petDB->AcceID || pd->pet.equip != 0) {
+ if(pet_db_ptr->AcceID == 0 || nameid != pet_db_ptr->AcceID || pd->pet.equip != 0) {
clif_equipitemack(sd,0,0,ITEM_EQUIP_ACK_FAIL);
return 1;
}
@@ -951,9 +979,13 @@ static int pet_unequipitem(struct map_session_data *sd, struct pet_data *pd)
*/
static int pet_food(struct map_session_data *sd, struct pet_data *pd)
{
+ nullpo_retr(1, sd);
+ nullpo_retr(1, pd);
+
+ s_pet_db *pet_db_ptr = pd->get_pet_db();
int i,k;
- k = pd->petDB->FoodID;
+ k = pet_db_ptr->FoodID;
i = pc_search_inventory(sd,k);
if( i < 0 ) {
@@ -965,12 +997,12 @@ static int pet_food(struct map_session_data *sd, struct pet_data *pd)
pc_delitem(sd,i,1,0,0,LOG_TYPE_CONSUME);
if( pd->pet.hungry > 90 )
- pet_set_intimate(pd, pd->pet.intimate - pd->petDB->r_full);
+ pet_set_intimate(pd, pd->pet.intimate - pet_db_ptr->r_full);
else {
if( battle_config.pet_friendly_rate != 100 )
- k = (pd->petDB->r_hungry * battle_config.pet_friendly_rate) / 100;
+ k = (pet_db_ptr->r_hungry * battle_config.pet_friendly_rate) / 100;
else
- k = pd->petDB->r_hungry;
+ k = pet_db_ptr->r_hungry;
if( pd->pet.hungry > 75 ) {
k = k >> 1;
@@ -989,16 +1021,16 @@ static int pet_food(struct map_session_data *sd, struct pet_data *pd)
pd->pet.intimate = 1000;
status_calc_pet(pd,SCO_NONE);
- pd->pet.hungry += pd->petDB->fullness;
+ pd->pet.hungry += pet_db_ptr->fullness;
if( pd->pet.hungry > 100 )
pd->pet.hungry = 100;
- log_feeding(sd, LOG_FEED_PET, pd->petDB->FoodID);
+ log_feeding(sd, LOG_FEED_PET, pet_db_ptr->FoodID);
clif_send_petdata(sd,pd,2,pd->pet.hungry);
clif_send_petdata(sd,pd,1,pd->pet.intimate);
- clif_pet_food(sd,pd->petDB->FoodID,1);
+ clif_pet_food(sd, pet_db_ptr->FoodID,1);
return 0;
}
@@ -1116,11 +1148,11 @@ static int pet_ai_sub_hard(struct pet_data *pd, struct map_session_data *sd, uns
}
// Return speed to normal.
- if (pd->status.speed != pd->petDB->speed) {
+ if (pd->status.speed != pd->get_pet_db()->speed) {
if (pd->ud.walktimer != INVALID_TIMER)
return 0; // Wait until the pet finishes walking back to master.
- pd->status.speed = pd->petDB->speed;
+ pd->status.speed = pd->get_pet_db()->speed;
pd->ud.state.change_walk_target = pd->ud.state.speed_changed = 1;
}
@@ -1426,7 +1458,7 @@ int pet_recovery_timer(int tid, unsigned int tick, int id, intptr_t data)
//Detoxify is chosen for now.
clif_skill_nodamage(&pd->bl,&sd->bl,TF_DETOXIFY,1,1);
status_change_end(&sd->bl, pd->recovery->type, INVALID_TIMER);
- clif_emotion(&pd->bl, E_OK);
+ clif_emotion(&pd->bl, ET_OK);
}
pd->recovery->timer = INVALID_TIMER;
@@ -1533,30 +1565,16 @@ int pet_skill_support_timer(int tid, unsigned int tick, int id, intptr_t data)
*/
void read_petdb()
{
- char* filename[] = {
+ const char* filename[] = {
DBPATH"pet_db.txt",
DBIMPORT"/pet_db.txt"
};
unsigned short nameid;
- int i,j;
-
- // Remove any previous scripts in case reloaddb was invoked.
- for( j = 0; j < MAX_PET_DB; j++ ) {
- if( pet_db[j].pet_script ) {
- script_free_code(pet_db[j].pet_script);
- pet_db[j].pet_script = NULL;
- }
-
- if( pet_db[j].pet_loyal_script ) {
- script_free_code(pet_db[j].pet_loyal_script);
- pet_db[j].pet_loyal_script = NULL;
- }
- }
+ int i;
// clear database
- memset(pet_db,0,sizeof(pet_db));
+ pet_db_data.clear();
- j = 0; // entry counter
for( i = 0; i < ARRAYLENGTH(filename); i++ ) {
char line[1024];
int lines, entries;
@@ -1573,7 +1591,7 @@ void read_petdb()
lines = entries = 0;
- while( fgets(line, sizeof(line), fp) && j < MAX_PET_DB ) {
+ while( fgets(line, sizeof(line), fp) ) {
char *str[22], *p;
unsigned k;
lines++;
@@ -1639,46 +1657,44 @@ void read_petdb()
continue;
}
- pet_db[j].class_ = nameid;
- safestrncpy(pet_db[j].name,str[1],NAME_LENGTH);
- safestrncpy(pet_db[j].jname,str[2],NAME_LENGTH);
- pet_db[j].itemID=atoi(str[3]);
- pet_db[j].EggID=atoi(str[4]);
- pet_db[j].AcceID=atoi(str[5]);
- pet_db[j].FoodID=atoi(str[6]);
- pet_db[j].fullness=atoi(str[7]);
- pet_db[j].hungry_delay=atoi(str[8])*1000;
- pet_db[j].r_hungry=atoi(str[9]);
- if( pet_db[j].r_hungry <= 0 )
- pet_db[j].r_hungry=1;
- pet_db[j].r_full=atoi(str[10]);
- pet_db[j].intimate=atoi(str[11]);
- pet_db[j].die=atoi(str[12]);
- pet_db[j].capture=atoi(str[13]);
- pet_db[j].speed=atoi(str[14]);
- pet_db[j].s_perfor=(char)atoi(str[15]);
- pet_db[j].talk_convert_class=atoi(str[16]);
- pet_db[j].attack_rate=atoi(str[17]);
- pet_db[j].defence_attack_rate=atoi(str[18]);
- pet_db[j].change_target_rate=atoi(str[19]);
- pet_db[j].pet_script = NULL;
- pet_db[j].pet_loyal_script = NULL;
+ struct s_pet_db* pet = &pet_db_data[nameid];
+
+ pet->class_ = nameid;
+ safestrncpy(pet->name,str[1],NAME_LENGTH);
+ safestrncpy(pet->jname,str[2],NAME_LENGTH);
+ pet->itemID=atoi(str[3]);
+ pet->EggID=atoi(str[4]);
+ pet->AcceID=atoi(str[5]);
+ pet->FoodID=atoi(str[6]);
+ pet->fullness=atoi(str[7]);
+ pet->hungry_delay=atoi(str[8])*1000;
+ pet->r_hungry=atoi(str[9]);
+ if( pet->r_hungry <= 0 )
+ pet->r_hungry=1;
+ pet->r_full=atoi(str[10]);
+ pet->intimate=atoi(str[11]);
+ pet->die=atoi(str[12]);
+ pet->capture=atoi(str[13]);
+ pet->speed=atoi(str[14]);
+ pet->s_perfor=(char)atoi(str[15]);
+ pet->talk_convert_class=atoi(str[16]);
+ pet->attack_rate=atoi(str[17]);
+ pet->defence_attack_rate=atoi(str[18]);
+ pet->change_target_rate=atoi(str[19]);
+ pet->pet_script = nullptr;
+ pet->pet_loyal_script = nullptr;
if( *str[20] )
- pet_db[j].pet_script = parse_script(str[20], filename[i], lines, 0);
+ pet->pet_script = parse_script(str[20], filename[i], lines, 0);
if( *str[21] )
- pet_db[j].pet_loyal_script = parse_script(str[21], filename[i], lines, 0);
+ pet->pet_loyal_script = parse_script(str[21], filename[i], lines, 0);
- j++;
entries++;
}
- if( j >= MAX_PET_DB )
- ShowWarning("read_petdb: Reached max number of pets [%d]. Remaining pets were not read.\n ", MAX_PET_DB);
-
fclose(fp);
- ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' pets in '"CL_WHITE"%s/%s"CL_RESET"'.\n", entries, db_path, filename[i]);
+ ShowStatus("Done reading '" CL_WHITE "%d" CL_RESET "' pets in '" CL_WHITE "%s/%s" CL_RESET "'.\n", entries, db_path, filename[i]);
}
}
@@ -1689,8 +1705,8 @@ void do_init_pet(void)
{
read_petdb();
- item_drop_ers = ers_new(sizeof(struct item_drop),"pet.c::item_drop_ers",ERS_OPT_NONE);
- item_drop_list_ers = ers_new(sizeof(struct item_drop_list),"pet.c::item_drop_list_ers",ERS_OPT_NONE);
+ item_drop_ers = ers_new(sizeof(struct item_drop),"pet.cpp::item_drop_ers",ERS_OPT_NONE);
+ item_drop_list_ers = ers_new(sizeof(struct item_drop_list),"pet.cpp::item_drop_list_ers",ERS_OPT_NONE);
add_timer_func_list(pet_hungry,"pet_hungry");
add_timer_func_list(pet_ai_hard,"pet_ai_hard");
@@ -1707,19 +1723,7 @@ void do_init_pet(void)
*/
void do_final_pet(void)
{
- int i;
-
- for( i = 0; i < MAX_PET_DB; i++ ) {
- if( pet_db[i].pet_script ) {
- script_free_code(pet_db[i].pet_script);
- pet_db[i].pet_script = NULL;
- }
-
- if( pet_db[i].pet_loyal_script ) {
- script_free_code(pet_db[i].pet_loyal_script);
- pet_db[i].pet_loyal_script = NULL;
- }
- }
+ pet_db_data.clear();
ers_destroy(item_drop_ers);
ers_destroy(item_drop_list_ers);
diff --git a/src/map/pet.h b/src/map/pet.hpp
similarity index 83%
rename from src/map/pet.h
rename to src/map/pet.hpp
index 4f649c5079d..1436a4d519e 100644
--- a/src/map/pet.h
+++ b/src/map/pet.hpp
@@ -1,14 +1,16 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _PET_H_
-#define _PET_H_
+#ifndef _PET_HPP_
+#define _PET_HPP_
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "../common/cbasetypes.h"
+#include "../common/mmo.h"
+
+#include "script.hpp"
+#include "status.hpp"
+#include "unit.hpp"
-#define MAX_PET_DB 300
#define MAX_PETLOOT_SIZE 30
/// Pet DB
@@ -36,10 +38,26 @@ struct s_pet_db {
struct script_code
*pet_script, ///< Script since pet hatched
*pet_loyal_script; ///< Script when pet is loyal
+
+ ~s_pet_db()
+ {
+ if( this->pet_script ){
+ script_free_code(this->pet_script);
+ }
+
+ if( this->pet_loyal_script ){
+ script_free_code(this->pet_loyal_script);
+ }
+ }
};
-extern struct s_pet_db pet_db[MAX_PET_DB];
-enum { PET_CLASS,PET_CATCH,PET_EGG,PET_EQUIP,PET_FOOD };
+enum e_pet_itemtype : uint8 { PET_CATCH,PET_EGG,PET_EQUIP,PET_FOOD };
+
+enum e_pet_catch : uint16 {
+ PET_CATCH_FAIL = 0, ///< A catch attempt failed
+ PET_CATCH_UNIVERSAL = 1, ///< The catch attempt is universal (ignoring MD_STATUS_IMMUNE/Boss)
+ PET_CATCH_UNIVERSAL_ITEM = 2,
+};
struct pet_recovery { //Stat recovery
enum sc_type type; //Status Change id
@@ -80,6 +98,8 @@ struct pet_loot {
unsigned short max;
};
+struct s_pet_db *pet_db(uint16 pet_id);
+
struct pet_data {
struct block_list bl;
struct unit_data ud;
@@ -87,7 +107,6 @@ struct pet_data {
struct s_pet pet;
struct status_data status;
struct mob_db *db;
- struct s_pet_db *petDB;
int pet_hungry_timer;
int target_id;
struct {
@@ -105,19 +124,21 @@ struct pet_data {
int masterteleport_timer;
struct map_session_data *master;
-};
-
+ s_pet_db* get_pet_db() {
+ return pet_db(this->pet.class_);
+ }
+};
-int pet_create_egg(struct map_session_data *sd, unsigned short item_id);
+bool pet_create_egg(struct map_session_data *sd, unsigned short item_id);
int pet_hungry_val(struct pet_data *pd);
void pet_set_intimate(struct pet_data *pd, int value);
int pet_target_check(struct pet_data *pd,struct block_list *bl,int type);
-int pet_unlocktarget(struct pet_data *pd);
+void pet_unlocktarget(struct pet_data *pd);
int pet_sc_check(struct map_session_data *sd, int type); //Skotlex
-int search_petDB_index(int key,int type);
+struct s_pet_db* pet_db_search(int key, enum e_pet_itemtype type);
int pet_hungry_timer_delete(struct pet_data *pd);
-int pet_data_init(struct map_session_data *sd, struct s_pet *pet);
+bool pet_data_init(struct map_session_data *sd, struct s_pet *pet);
int pet_birth_process(struct map_session_data *sd, struct s_pet *pet);
int pet_recv_petdata(uint32 account_id,struct s_pet *p,int flag);
int pet_select_egg(struct map_session_data *sd,short egg_index);
@@ -142,8 +163,4 @@ void read_petdb(void);
void do_init_pet(void);
void do_final_pet(void);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _PET_H_ */
+#endif /* _PET_HPP_ */
diff --git a/src/map/quest.c b/src/map/quest.cpp
similarity index 97%
rename from src/map/quest.c
rename to src/map/quest.cpp
index cbbd0c5709f..79d680514f4 100644
--- a/src/map/quest.c
+++ b/src/map/quest.cpp
@@ -1,6 +1,10 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "quest.hpp"
+
+#include <stdlib.h>
+
#include "../common/cbasetypes.h"
#include "../common/socket.h"
#include "../common/malloc.h"
@@ -9,18 +13,20 @@
#include "../common/showmsg.h"
#include "../common/strlib.h"
-#include "itemdb.h"
-#include "map.h"
-#include "pc.h"
-#include "party.h"
-#include "quest.h"
-#include "chrif.h"
-#include "intif.h"
-
-#include <stdlib.h>
+#include "itemdb.hpp"
+#include "map.hpp"
+#include "pc.hpp"
+#include "party.hpp"
+#include "chrif.hpp"
+#include "intif.hpp"
+#include "clif.hpp"
+#include "mob.hpp"
+#include "battle.hpp"
+#include "log.hpp"
static DBMap *questdb;
static void questdb_free_sub(struct quest_db *quest, bool free);
+struct quest_db quest_dummy;
/**
* Searches a quest by ID.
@@ -508,7 +514,7 @@ void quest_read_txtdb(void)
if (!mob_id)
continue;
- if (mobdb_exists(mob_id) == NULL) {
+ if (mob_db(mob_id) == NULL) {
ShowWarning("quest_read_txtdb: Invalid monster as objective '%d' in line %d.\n", mob_id, ln);
continue;
}
@@ -523,7 +529,7 @@ void quest_read_txtdb(void)
if (!nameid)
continue;
- if (!itemdb_exists(nameid) || (mob_id && mobdb_exists(mob_id) == NULL)) {
+ if (!itemdb_exists(nameid) || (mob_id && mob_db(mob_id) == NULL)) {
ShowWarning("quest_read_txtdb: Invalid item reward '%d' (mob %d, optional) in line %d.\n", nameid, mob_id, ln);
continue;
}
@@ -546,7 +552,7 @@ void quest_read_txtdb(void)
}
fclose(fp);
- ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", count, filename);
+ ShowStatus("Done reading '" CL_WHITE "%d" CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'.\n", count, filename);
}
}
diff --git a/src/map/quest.h b/src/map/quest.hpp
similarity index 84%
rename from src/map/quest.h
rename to src/map/quest.hpp
index 89ed5162778..bb02651df3e 100644
--- a/src/map/quest.h
+++ b/src/map/quest.hpp
@@ -1,12 +1,15 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _QUEST_H_
-#define _QUEST_H_
+#ifndef _QUEST_HPP_
+#define _QUEST_HPP_
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "../common/cbasetypes.h"
+#include "../common/strlib.h"
+
+#include "map.hpp"
+
+struct map_session_data;
struct quest_dropitem {
uint16 nameid;
@@ -35,7 +38,7 @@ struct quest_db {
StringBuf name;
};
-struct quest_db quest_dummy; ///< Dummy entry for invalid quest lookups
+extern struct quest_db quest_dummy; ///< Dummy entry for invalid quest lookups
// Questlog check types
enum quest_check_type {
@@ -60,8 +63,4 @@ void do_init_quest(void);
void do_final_quest(void);
void do_reload_quest(void);
-#ifdef __cplusplus
-}
-#endif
-
-#endif
+#endif /* _QUEST_HPP_ */
diff --git a/src/map/script.c b/src/map/script.cpp
similarity index 95%
rename from src/map/script.c
rename to src/map/script.cpp
index e7bcfbae7a0..70127734b0c 100644
--- a/src/map/script.c
+++ b/src/map/script.cpp
@@ -7,6 +7,13 @@
//#define DEBUG_HASH
//#define DEBUG_DUMP_STACK
+#include "script.hpp"
+
+#include <math.h>
+#include <stdlib.h> // atoi, strtol, strtoll, exit
+#include <setjmp.h>
+#include <errno.h>
+
#ifdef PCRE_SUPPORT
#include "../../3rdparty/pcre/include/pcre.h" // preg_match
#endif
@@ -21,6 +28,7 @@
#include "../common/strlib.h"
#include "../common/timer.h"
#include "../common/utils.h"
+#include "../common/ers.h" // ers_destroy
#ifdef BETA_THREAD_TEST
#include "../common/atomic.h"
#include "../common/spinlock.h"
@@ -28,35 +36,43 @@
#include "../common/mutex.h"
#endif
-#include "map.h"
-#include "path.h"
-#include "clan.h"
-#include "clif.h"
-#include "chrif.h"
-#include "date.h" // date type enum, date_get()
-#include "itemdb.h"
-#include "pc.h"
-#include "storage.h"
-#include "pet.h"
-#include "mapreg.h"
-#include "homunculus.h"
-#include "instance.h"
-#include "mercenary.h"
-#include "intif.h"
-#include "chat.h"
-#include "battleground.h"
-#include "party.h"
-#include "mail.h"
-#include "quest.h"
-#include "elemental.h"
-#include "channel.h"
-
-#include <math.h>
-#include <stdlib.h> // atoi, strtol, strtoll, exit
-#include <setjmp.h>
-#include <errno.h>
-
-
+#include "map.hpp"
+#include "path.hpp"
+#include "clan.hpp"
+#include "clif.hpp"
+#include "chrif.hpp"
+#include "date.hpp" // date type enum, date_get()
+#include "itemdb.hpp"
+#include "pc.hpp"
+#include "pc_groups.hpp"
+#include "storage.hpp"
+#include "pet.hpp"
+#include "mapreg.hpp"
+#include "homunculus.hpp"
+#include "instance.hpp"
+#include "mercenary.hpp"
+#include "intif.hpp"
+#include "chat.hpp"
+#include "battleground.hpp"
+#include "party.hpp"
+#include "mail.hpp"
+#include "quest.hpp"
+#include "elemental.hpp"
+#include "npc.hpp"
+#include "guild.hpp"
+#include "atcommand.hpp"
+#include "battle.hpp"
+#include "log.hpp"
+#include "mob.hpp"
+#include "channel.hpp"
+#include "achievement.hpp"
+
+struct eri *array_ers;
+DBMap *st_db;
+unsigned int active_scripts;
+unsigned int next_id;
+struct eri *st_ers;
+struct eri *stack_ers;
static bool script_rid2sd_( struct script_state *st, struct map_session_data** sd, const char *func );
@@ -256,6 +272,8 @@ struct Script_Config script_config = {
"OnTouchNPC", //ontouchnpc_event_name (run whenever a monster walks into the OnTouch area)
"OnWhisperGlobal", //onwhisper_event_name (is executed when a player sends a whisper message to the NPC)
"OnCommand", //oncommand_event_name (is executed by script command cmdothernpc)
+ "OnBuyItem", //onbuy_event_name (is executed when items are bought)
+ "OnSellItem", //onsell_event_name (is executed when items are sold)
// Init related
"OnInit", //init_event_name (is executed on all npcs when all npcs were loaded)
"OnInterIfInit", //inter_init_event_name (is executed on inter server connection)
@@ -273,6 +291,7 @@ struct Script_Config script_config = {
"OnAgitEnd3", //agit_end3_event_name (is executed when WoE TE has ended)
// Timer related
"OnTimer", //timer_event_name (is executed by a timer at the specific second)
+ "OnTimerQuit", //timer_quit_event_name (is executed when a timer is aborted)
"OnMinute", //timer_minute_event_name (is executed by a timer at the specific minute)
"OnHour", //timer_hour_event_name (is executed by a timer at the specific hour)
"OnClock", //timer_clock_event_name (is executed by a timer at the specific hour and minute)
@@ -598,7 +617,7 @@ static void script_reportdata(struct script_data* data)
ShowDebug("Data: nothing (nil)\n");
break;
case C_INT:// number
- ShowDebug("Data: number value=%"PRId64"\n", data->u.num);
+ ShowDebug("Data: number value=%" PRId64 "\n", data->u.num);
break;
case C_STR:
case C_CONSTSTR:// string
@@ -622,7 +641,7 @@ static void script_reportdata(struct script_data* data)
}
break;
case C_POS:// label
- ShowDebug("Data: label pos=%"PRId64"\n", data->u.num);
+ ShowDebug("Data: label pos=%" PRId64 "\n", data->u.num);
break;
default:
ShowDebug("Data: %s\n", script_op2name(data->type));
@@ -729,6 +748,21 @@ static unsigned int calc_hash(const char* p)
return h % SCRIPT_HASH_SIZE;
}
+bool script_check_RegistryVariableLength(int pType, const char *val, size_t* vlen)
+{
+ size_t len = strlen(val);
+
+ if (vlen)
+ *vlen = len;
+ switch (pType) {
+ case 0:
+ return (len < 33); // key check
+ case 1:
+ return (len < 255); // value check
+ default:
+ return false;
+ }
+}
/*==========================================
* str_data manipulation functions
@@ -938,7 +972,7 @@ const char* skip_space(const char* p)
for(;;)
{
if( *p == '\0' ) {
- disp_warning_message("script:script->skip_space: end of file while parsing block comment. expected "CL_BOLD"*/"CL_NORM, p);
+ disp_warning_message("script:script->skip_space: end of file while parsing block comment. expected " CL_BOLD "*/" CL_NORM, p);
return p;
}
if( *p == '*' && p[1] == '/' )
@@ -1042,12 +1076,9 @@ const char* parse_callfunc(const char* p, int require_paren, int is_custom)
if( *arg != '*' )
++arg; // count func as argument
} else {
-#ifdef SCRIPT_CALLFUNC_CHECK
const char* name = get_str(func);
if( !is_custom && strdb_get(userfunc_db, name) == NULL ) {
-#endif
disp_error_message("parse_line: expect command, missing function name or calling undeclared function",p);
-#ifdef SCRIPT_CALLFUNC_CHECK
} else {;
add_scriptl(buildin_callfunc_ref);
add_scriptc(C_ARG);
@@ -1057,7 +1088,6 @@ const char* parse_callfunc(const char* p, int require_paren, int is_custom)
arg = buildin_func[str_data[buildin_callfunc_ref].val].arg;
if( *arg != '*' ) ++ arg;
}
-#endif
}
p = skip_word(p);
@@ -1400,14 +1430,12 @@ const char* parse_simpleexpr(const char *p)
l=add_word(p);
if( str_data[l].type == C_FUNC || str_data[l].type == C_USERFUNC || str_data[l].type == C_USERFUNC_POS)
return parse_callfunc(p,1,0);
-#ifdef SCRIPT_CALLFUNC_CHECK
else {
const char* name = get_str(l);
if( strdb_get(userfunc_db,name) != NULL ) {
return parse_callfunc(p,1,1);
}
}
-#endif
if( (pv = parse_variable(p)) )
{// successfully processed a variable assignment
@@ -1470,8 +1498,8 @@ const char* parse_subexpr(const char* p,int limit)
p = skip_space(p);
while((
(op=C_OP3,opl=0,len=1,*p=='?') ||
- (op=C_ADD,opl=9,len=1,*p=='+') ||
- (op=C_SUB,opl=9,len=1,*p=='-') ||
+ ((op=C_ADD,opl=9,len=1,*p=='+') && p[1]!='+') ||
+ ((op=C_SUB,opl=9,len=1,*p=='-') && p[1]!='-') ||
(op=C_MUL,opl=10,len=1,*p=='*') ||
(op=C_DIV,opl=10,len=1,*p=='/') ||
(op=C_MOD,opl=10,len=1,*p=='%') ||
@@ -2293,6 +2321,20 @@ static void add_buildin_func(void)
}
}
+/// Retrieves the value of a constant parameter.
+bool script_get_parameter(const char* name, int* value)
+{
+ int n = search_str(name);
+
+ if (n == -1 || str_data[n].type != C_PARAM)
+ {// not found or not a parameter
+ return false;
+ }
+ value[0] = str_data[n].val;
+
+ return true;
+}
+
/// Retrieves the value of a constant.
bool script_get_constant(const char* name, int* value)
{
@@ -2335,46 +2377,49 @@ void script_set_constant(const char* name, int value, bool isparameter, bool dep
}
}
+static bool read_constdb_sub( char* fields[], int columns, int current ){
+ char name[1024], val[1024];
+ int type = 0;
+
+ if( columns > 1 ){
+ if( sscanf(fields[0], "%1023[A-Za-z0-9/_]", name) != 1 ||
+ sscanf(fields[1], "%1023[A-Za-z0-9/_]", val) != 1 ||
+ ( columns >= 2 && sscanf(fields[2], "%11d", &type) != 1 ) ){
+ ShowWarning("Skipping line '" CL_WHITE "%d" CL_RESET "', invalid constant definition\n", current);
+ return false;
+ }
+ }else{
+ if( sscanf(fields[0], "%1023[A-Za-z0-9/_] %1023[A-Za-z0-9/_-] %11d", name, val, &type) < 2 ){
+ ShowWarning( "Skipping line '" CL_WHITE "%d" CL_RESET "', invalid constant definition\n", current );
+ return false;
+ }
+ }
+
+ script_set_constant(name, (int)strtol(val, NULL, 0), (type != 0), false);
+
+ return true;
+}
+
/*==========================================
* Reading constant databases
* const.txt
*------------------------------------------*/
-static void read_constdb(void)
-{
- FILE *fp;
- char line[1024],name[1024],val[1024];
- int type;
- int entries=0, skipped=0, linenum=0;
+static void read_constdb(void){
+ const char* dbsubpath[] = {
+ "",
+ "/" DBIMPORT,
+ };
- sprintf(line, "%s/const.txt", db_path);
- fp=fopen(line, "r");
- if(fp==NULL){
- ShowError("can't read %s\n", line);
- return ;
- }
- while(fgets(line, sizeof(line), fp))
- {
- linenum++;
- if( line[0] == '\0' || line[0] == '\n' || line[0] == '\r') //ignore empty line
- continue;
- if(line[0]=='/' && line[1]=='/') //ignore commented line
- continue;
-
- type=0;
- if(sscanf(line,"%1023[A-Za-z0-9/_],%1023[A-Za-z0-9/_-],%11d",name,val,&type)>=2 ||
- sscanf(line,"%1023[A-Za-z0-9/_] %1023[A-Za-z0-9/_-] %11d",name,val,&type)>=2){
- entries++;
- script_set_constant(name, (int)strtol(val, NULL, 0), (bool)type, false);
- }
- else {
- skipped++;
- ShowWarning("Skipping line '"CL_WHITE"%d"CL_RESET"', invalid constant definition\n",linenum);
- }
- }
- fclose(fp);
- ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s/const.txt"CL_RESET"'.\n", entries, db_path);
- if(skipped){
- ShowWarning("Skipped '"CL_WHITE"%d"CL_RESET"', entries\n",skipped);
+ for( int i = 0; i < ARRAYLENGTH(dbsubpath); i++ ){
+ int n2 = strlen(db_path) + strlen(dbsubpath[i]) + 1;
+ char* dbsubpath2 = (char*)aMalloc(n2 + 1);
+ bool silent = i > 0;
+
+ safesnprintf(dbsubpath2, n2, "%s%s", db_path, dbsubpath[i]);
+
+ sv_readdb(dbsubpath2, "const.txt", ',', 1, 3, -1, &read_constdb_sub, silent);
+
+ aFree(dbsubpath2);
}
}
@@ -2382,7 +2427,7 @@ static void read_constdb(void)
* Sets source-end constants for NPC scripts to access.
**/
void script_hardcoded_constants(void) {
- #include "script_constants.h"
+ #include "script_constants.hpp"
}
/*==========================================
@@ -2467,7 +2512,7 @@ struct script_code* parse_script(const char *src,const char *file,int line,int o
const char *p,*tmpp;
int i;
struct script_code* code = NULL;
- static int first=1;
+ static bool first=true;
char end;
bool unresolved_names = false;
@@ -2483,7 +2528,7 @@ struct script_code* parse_script(const char *src,const char *file,int line,int o
add_buildin_func();
read_constdb();
script_hardcoded_constants();
- first=0;
+ first=false;
}
script_buf=(unsigned char *)aMalloc(SCRIPT_BLOCK_SIZE*sizeof(unsigned char));
@@ -2699,7 +2744,7 @@ void get_val_(struct script_state* st, struct script_data* data, struct map_sess
if( postfix == '$' ) {// string variable
ShowWarning("script:get_val: cannot access player variable '%s', defaulting to \"\"\n", name);
data->type = C_CONSTSTR;
- data->u.str = "";
+ data->u.str = const_cast<char *>("");
} else {// integer variable
ShowWarning("script:get_val: cannot access player variable '%s', defaulting to 0\n", name);
data->type = C_INT;
@@ -2754,7 +2799,7 @@ void get_val_(struct script_state* st, struct script_data* data, struct map_sess
if( data->u.str == NULL || data->u.str[0] == '\0' ) {// empty string
data->type = C_CONSTSTR;
- data->u.str = "";
+ data->u.str = const_cast<char *>("");
} else {// duplicate string
data->type = C_STR;
data->u.str = aStrdup(data->u.str);
@@ -2868,7 +2913,7 @@ void script_array_ensure_zero(struct script_state *st, struct map_session_data *
}
if (src && src->arrays) {
- struct script_array *sa = idb_get(src->arrays, script_getvarid(uid));
+ struct script_array *sa = static_cast<script_array *>(idb_get(src->arrays, script_getvarid(uid)));
if (sa) {
unsigned int i;
@@ -2895,7 +2940,7 @@ unsigned int script_array_size(struct script_state *st, struct map_session_data
struct reg_db *src = script_array_src(st, sd, name, ref);
if (src && src->arrays)
- sa = idb_get(src->arrays, search_str(name));
+ sa = static_cast<script_array *>(idb_get(src->arrays, search_str(name)));
return sa ? sa->size : 0;
}
@@ -2913,7 +2958,7 @@ unsigned int script_array_highest_key(struct script_state *st, struct map_sessio
script_array_ensure_zero(st,sd,reference_uid(key, 0), ref);
- if( ( sa = idb_get(src->arrays, key) ) ) {
+ if( ( sa = static_cast<script_array *>(idb_get(src->arrays, key)) ) ) {
unsigned int i, highest_key = 0;
for(i = 0; i < sa->size; i++) {
@@ -2930,7 +2975,7 @@ unsigned int script_array_highest_key(struct script_state *st, struct map_sessio
int script_free_array_db(DBKey key, DBData *data, va_list ap)
{
- struct script_array *sa = db_data2ptr(data);
+ struct script_array *sa = static_cast<script_array *>(db_data2ptr(data));
aFree(sa->members);
ers_free(array_ers, sa);
return SCRIPT_CMD_SUCCESS;
@@ -3046,7 +3091,7 @@ void script_array_update(struct reg_db *src, int64 num, bool empty)
if (!src->arrays) {
src->arrays = idb_alloc(DB_OPT_BASE);
} else {
- sa = idb_get(src->arrays, id);
+ sa = static_cast<script_array *>(idb_get(src->arrays, id));
}
if( sa ) {
@@ -3091,9 +3136,15 @@ void script_array_update(struct reg_db *src, int64 num, bool empty)
*
* TODO: return values are screwed up, have been for some time (reaad: years), e.g. some functions return 1 failure and success.
*------------------------------------------*/
-int set_reg(struct script_state* st, TBL_PC* sd, int64 num, const char* name, const void* value, struct reg_db *ref)
+int set_reg(struct script_state* st, struct map_session_data* sd, int64 num, const char* name, const void* value, struct reg_db *ref)
{
char prefix = name[0];
+ size_t vlen = 0;
+ if ( !script_check_RegistryVariableLength(0,name,&vlen) )
+ {
+ ShowError("set_reg: Variable name length is too long (aid: %d, cid: %d): '%s' sz=%d\n", sd?sd->status.account_id:-1, sd?sd->status.char_id:-1, name, vlen);
+ return 0;
+ }
if( is_string_variable(name) ) {// string variable
const char *str = (const char*)value;
@@ -3217,7 +3268,7 @@ int set_var(struct map_session_data* sd, char* name, void* val)
return set_reg(NULL, sd, reference_uid(add_str(name),0), name, val, NULL);
}
-void setd_sub(struct script_state *st, TBL_PC *sd, const char *varname, int elem, void *value, struct reg_db *ref)
+void setd_sub(struct script_state *st, struct map_session_data *sd, const char *varname, int elem, void *value, struct reg_db *ref)
{
set_reg(st, sd, reference_uid(add_str(varname),elem), varname, value, ref);
}
@@ -3239,7 +3290,7 @@ const char* conv_str_(struct script_state* st, struct script_data* data, struct
else if( data_isint(data) )
{// int -> string
CREATE(p, char, ITEM_NAME_LENGTH);
- snprintf(p, ITEM_NAME_LENGTH, "%"PRId64"", data->u.num);
+ snprintf(p, ITEM_NAME_LENGTH, "%" PRId64 "", data->u.num);
p[ITEM_NAME_LENGTH-1] = '\0';
data->type = C_STR;
data->u.str = p;
@@ -3256,7 +3307,7 @@ const char* conv_str_(struct script_state* st, struct script_data* data, struct
script_reportdata(data);
script_reportsrc(st);
data->type = C_CONSTSTR;
- data->u.str = "";
+ data->u.str = const_cast<char *>("");
}
return data->u.str;
}
@@ -3446,6 +3497,7 @@ void pop_stack(struct script_state* st, int start, int end)
}
data->type = C_NOP;
}
+
// move the rest of the elements
if( stack->sp > end )
{
@@ -3453,13 +3505,26 @@ void pop_stack(struct script_state* st, int start, int end)
for( i = start + stack->sp - end; i < stack->sp; ++i )
stack->stack_data[i].type = C_NOP;
}
+
// adjust stack pointers
- if( st->start > end ) st->start -= end - start;
- else if( st->start > start ) st->start = start;
- if( st->end > end ) st->end -= end - start;
- else if( st->end > start ) st->end = start;
- if( stack->defsp > end ) stack->defsp -= end - start;
- else if( stack->defsp > start ) stack->defsp = start;
+ if( st->start > end ){
+ st->start -= end - start;
+ }else if( st->start > start ){
+ st->start = start;
+ }
+
+ if( st->end > end ){
+ st->end -= end - start;
+ }else if( st->end > start ){
+ st->end = start;
+ }
+
+ if( stack->defsp > end ){
+ stack->defsp -= end - start;
+ }else if( stack->defsp > start ){
+ stack->defsp = start;
+ }
+
stack->sp -= end - start;
}
@@ -4071,7 +4136,7 @@ void script_stop_scriptinstances(struct script_code *code) {
iter = db_iterator(st_db);
- for( st = dbi_first(iter); dbi_exists(iter); st = dbi_next(iter) ) {
+ for( st = static_cast<script_state *>(dbi_first(iter)); dbi_exists(iter); st = static_cast<script_state *>(dbi_next(iter)) ) {
if( st->script == code )
script_free_state(st);
}
@@ -4427,7 +4492,7 @@ int script_config_read(const char *cfgName)
*/
static int db_script_free_code_sub(DBKey key, DBData *data, va_list ap)
{
- struct script_code *code = db_data2ptr(data);
+ struct script_code *code = static_cast<script_code *>(db_data2ptr(data));
if (code)
script_free_code(code);
return 0;
@@ -4482,7 +4547,7 @@ void script_cleararray_pc(struct map_session_data* sd, const char* varname, void
if( value )
script_array_ensure_zero(NULL,sd,reference_uid(key,0), NULL);
- if( !(sa = idb_get(src->arrays, key)) ) /* non-existent array, nothing to empty */
+ if( !(sa = static_cast<script_array *>(idb_get(src->arrays, key))) ) /* non-existent array, nothing to empty */
return;
size = sa->size;
@@ -4525,7 +4590,7 @@ int script_reg_destroy(DBKey key, DBData *data, va_list ap)
if( data->type != DB_DATA_PTR ) // got no need for those!
return 0;
- src = db_data2ptr(data);
+ src = static_cast<script_reg_state *>(db_data2ptr(data));
if( src->type ) {
struct script_reg_str *p = (struct script_reg_str *)src;
@@ -4827,7 +4892,7 @@ void do_final_script() {
aFree(generic_ui_array);
iter = db_iterator(st_db);
- for(st = dbi_first(iter); dbi_exists(iter); st = dbi_next(iter))
+ for( st = static_cast<script_state *>(dbi_first(iter)); dbi_exists(iter); st = static_cast<script_state *>(dbi_next(iter)) )
script_free_state(st);
dbi_destroy(iter);
@@ -4880,9 +4945,9 @@ void do_init_script(void) {
scriptlabel_db = strdb_alloc(DB_OPT_DUP_KEY,50);
autobonus_db = strdb_alloc(DB_OPT_DUP_KEY,0);
- st_ers = ers_new(sizeof(struct script_state), "script.c::st_ers", ERS_CACHE_OPTIONS);
- stack_ers = ers_new(sizeof(struct script_stack), "script.c::script_stack", ERS_OPT_FLEX_CHUNK);
- array_ers = ers_new(sizeof(struct script_array), "script.c:array_ers", ERS_OPT_CLEAN|ERS_OPT_CLEAR); // TODO: This value is not yet in the enum
+ st_ers = ers_new(sizeof(struct script_state), "script.cpp::st_ers", ERS_CACHE_OPTIONS);
+ stack_ers = ers_new(sizeof(struct script_stack), "script.cpp::script_stack", ERS_OPT_FLEX_CHUNK);
+ array_ers = ers_new(sizeof(struct script_array), "script.cpp:array_ers", ERS_CLEAN_OPTIONS);
ers_chunk_size(st_ers, 10);
ers_chunk_size(stack_ers, 10);
@@ -4953,7 +5018,7 @@ void script_reload(void) {
atcmd_binding_count = 0;
iter = db_iterator(st_db);
- for(st = dbi_first(iter); dbi_exists(iter); st = dbi_next(iter))
+ for( st = static_cast<script_state *>(dbi_first(iter)); dbi_exists(iter); st = static_cast<script_state *>(dbi_next(iter)) )
script_free_state(st);
dbi_destroy(iter);
db_clear(st_db);
@@ -5022,6 +5087,20 @@ BUILDIN_FUNC(next)
return SCRIPT_CMD_SUCCESS;
}
+/// Clears the dialog and continues the script without a next button.
+///
+/// clear;
+BUILDIN_FUNC(clear)
+{
+ TBL_PC* sd;
+
+ if (!script_rid2sd(sd))
+ return SCRIPT_CMD_FAILURE;
+
+ clif_scriptclear(sd, st->oid);
+ return SCRIPT_CMD_SUCCESS;
+}
+
/// Ends the script and displays the button 'close' on the npc dialog.
/// The dialog is closed when the button is pressed.
///
@@ -5588,13 +5667,6 @@ BUILDIN_FUNC(return)
get_val(st, data); // current scope, convert to value
if( data->ref && data->ref->vars == st->stack->stack_data[st->stack->defsp-1].u.ri->scope.vars )
data->ref = NULL; // Reference to the parent scope, remove reference pointer
- } else if( name[0] == '.' && !data->ref ) { // script variable, link to current script
- data->ref = (struct reg_db *)aCalloc(sizeof(struct reg_db), 1);
- data->ref->vars = st->script->local.vars;
-
- if (!st->script->local.arrays)
- st->script->local.arrays = idb_alloc(DB_OPT_BASE);
- data->ref->arrays = st->script->local.arrays;
}
}
}
@@ -5621,7 +5693,7 @@ BUILDIN_FUNC(rand)
int max = script_getnum(st,3);
min = script_getnum(st,2);
if( max < min )
- swap(min, max);
+ SWAP(min, max);
range = max - min + 1;
}
else
@@ -5730,8 +5802,8 @@ BUILDIN_FUNC(areawarp)
y3 = 0;
} else if( x3 && y3 ) {
// normalize x3/y3 coordinates
- if( x3 < x2 ) swap(x3,x2);
- if( y3 < y2 ) swap(y3,y2);
+ if( x3 < x2 ) SWAP(x3,x2);
+ if( y3 < y2 ) SWAP(y3,y2);
}
}
@@ -6482,7 +6554,7 @@ BUILDIN_FUNC(deletearray)
script_array_ensure_zero(st, NULL, data->u.num, reference_getref(data));
- if ( !(sa = idb_get(src->arrays, id)) ) { // non-existent array, nothing to empty
+ if ( !(sa = static_cast<script_array *>(idb_get(src->arrays, id))) ) { // non-existent array, nothing to empty
return SCRIPT_CMD_SUCCESS;// not a variable
}
@@ -6576,7 +6648,7 @@ BUILDIN_FUNC(getelementofarray)
i = script_getnum(st, 3);
if (i < 0 || i >= SCRIPT_MAX_ARRAYSIZE) {
- ShowWarning("script:getelementofarray: index out of range (%"PRId64")\n", i);
+ ShowWarning("script:getelementofarray: index out of range (%" PRId64 ")\n", i);
script_reportdata(data);
script_pushnil(st);
st->state = END;
@@ -6670,7 +6742,7 @@ BUILDIN_FUNC(viewpoint)
* @param x First position of random option id array from the script
**/
static int script_getitem_randomoption(struct script_state *st, struct item *it, const char *funcname, int x) {
- int i, opt_id_n, opt_val_n, opt_param_n;
+ int i, opt_id_n;
struct script_data *opt_id = script_getdata(st,x);
struct script_data *opt_val = script_getdata(st,x+1);
struct script_data *opt_param = script_getdata(st,x+2);
@@ -6682,17 +6754,17 @@ static int script_getitem_randomoption(struct script_state *st, struct item *it,
int32 opt_param_id, opt_param_idx;
struct reg_db *opt_id_ref = NULL, *opt_val_ref = NULL, *opt_param_ref = NULL;
- if (opt_id_var[strlen(opt_id_var)-1] == '$') {
+ if (is_string_variable(opt_id_var)) {
ShowError("buildin_%s: The array %s is not numeric type.\n", funcname, opt_id_var);
return SCRIPT_CMD_FAILURE;
}
- if (opt_val_var[strlen(opt_val_var)-1] == '$') {
+ if (is_string_variable(opt_val_var)) {
ShowError("buildin_%s: The array %s is not numeric type.\n", funcname, opt_val_var);
return SCRIPT_CMD_FAILURE;
}
- if (opt_param_var[strlen(opt_param_var)-1] == '$') {
+ if (is_string_variable(opt_param_var)) {
ShowError("buildin_%s: The array %s is not numeric type.\n", funcname, opt_param_var);
return SCRIPT_CMD_FAILURE;
}
@@ -6708,18 +6780,6 @@ static int script_getitem_randomoption(struct script_state *st, struct item *it,
opt_val_ref = reference_getref(opt_val);
opt_param_ref = reference_getref(opt_param);
- opt_val_n = script_array_highest_key(st, NULL, opt_val_var, opt_val_ref);
- opt_param_n = script_array_highest_key(st, NULL, opt_param_var, opt_param_ref);
-
- if (opt_val_n < 1) {
- ShowError("buildin_%s: No option value listed.\n", funcname);
- return SCRIPT_CMD_FAILURE;
- }
- if (opt_param_n < 1) {
- ShowError("buildin_%s: No option parameter listed.\n", funcname);
- return SCRIPT_CMD_FAILURE;
- }
-
opt_id_id = reference_getid(opt_id);
opt_val_id = reference_getid(opt_val);
opt_param_id = reference_getid(opt_param);
@@ -6729,11 +6789,11 @@ static int script_getitem_randomoption(struct script_state *st, struct item *it,
opt_param_idx = reference_getindex(opt_param);
for (i = 0; i < opt_id_n && i < MAX_ITEM_RDM_OPT; i++) {
- it->option[i].id = (short)__64BPRTSIZE(get_val2(st,reference_uid(opt_id_id,opt_id_idx+i),opt_id_ref));
+ it->option[i].id = static_cast<short>((int32)__64BPRTSIZE(get_val2(st,reference_uid(opt_id_id,opt_id_idx+i),opt_id_ref)));
script_removetop(st, -1, 0);
- it->option[i].value = (short)__64BPRTSIZE(get_val2(st,reference_uid(opt_val_id,opt_val_idx+i),opt_val_ref));
+ it->option[i].value = static_cast<short>((int32)__64BPRTSIZE(get_val2(st,reference_uid(opt_val_id,opt_val_idx+i),opt_val_ref)));
script_removetop(st, -1, 0);
- it->option[i].param = (char)__64BPRTSIZE(get_val2(st,reference_uid(opt_param_id,opt_param_idx+i),opt_param_ref));
+ it->option[i].param = static_cast<char>((int32)__64BPRTSIZE(get_val2(st,reference_uid(opt_param_id,opt_param_idx+i),opt_param_ref)));
script_removetop(st, -1, 0);
}
return SCRIPT_CMD_SUCCESS;
@@ -8137,12 +8197,15 @@ BUILDIN_FUNC(readparam)
{
int value;
struct script_data *data = script_getdata(st, 2);
- TBL_PC *sd;
+ TBL_PC *sd = NULL;
if( script_hasdata(st, 3) ){
- if( script_isint(st, 3) ){
+ struct script_data *data2 = script_getdata(st, 3);
+
+ get_val(st, data2);
+ if (data_isint(data2) || script_getnum(st, 3)) {
script_charid2sd(3, sd);
- }else{
+ } else if (data_isstring(data2)) {
script_nick2sd(3, sd);
}
}else{
@@ -8849,24 +8912,31 @@ BUILDIN_FUNC(getequipweaponlv)
* return (npc)
* x : refine chance
* 0 : false (max refine level or unequip..)
- * getequippercentrefinery(<equipment slot>{,<char_id>})
+ * getequippercentrefinery(<equipment slot>{,<enriched>,<char_id>})
*------------------------------------------*/
BUILDIN_FUNC(getequippercentrefinery)
{
int i = -1,num;
+ bool enriched = false;
TBL_PC *sd;
num = script_getnum(st,2);
+ if (script_hasdata(st, 3))
+ enriched = script_getnum(st, 3) != 0;
- if (!script_charid2sd(3, sd)) {
+ if (!script_charid2sd(4, sd)) {
script_pushint(st,0);
return SCRIPT_CMD_FAILURE;
}
if (equip_index_check(num))
i = pc_checkequip(sd,equip_bitmask[num]);
- if(i >= 0 && sd->inventory.u.items_inventory[i].nameid && sd->inventory.u.items_inventory[i].refine < MAX_REFINE)
- script_pushint(st,status_get_refine_chance((enum refine_type)itemdb_wlv(sd->inventory.u.items_inventory[i].nameid), (int)sd->inventory.u.items_inventory[i].refine));
+ if (i >= 0 && sd->inventory.u.items_inventory[i].nameid && sd->inventory.u.items_inventory[i].refine < MAX_REFINE) {
+ enum refine_type type = REFINE_TYPE_SHADOW;
+ if (sd->inventory_data[i]->type != IT_SHADOWGEAR)
+ type = (enum refine_type)sd->inventory_data[i]->wlv;
+ script_pushint(st, status_get_refine_chance(type, (int)sd->inventory.u.items_inventory[i].refine, enriched));
+ }
else
script_pushint(st,0);
@@ -8918,6 +8988,7 @@ BUILDIN_FUNC(successrefitem) {
clif_additem(sd,i,1,0);
pc_equipitem(sd,i,ep);
clif_misceffect(&sd->bl,3);
+ achievement_update_objective(sd, AG_REFINE_SUCCESS, 2, sd->inventory_data[i]->wlv, sd->inventory.u.items_inventory[i].refine);
if (sd->inventory.u.items_inventory[i].refine == MAX_REFINE &&
sd->inventory.u.items_inventory[i].card[0] == CARD0_FORGE &&
sd->status.char_id == (int)MakeDWord(sd->inventory.u.items_inventory[i].card[2],sd->inventory.u.items_inventory[i].card[3]))
@@ -8967,6 +9038,7 @@ BUILDIN_FUNC(failedrefitem) {
clif_refine(sd->fd,1,i,sd->inventory.u.items_inventory[i].refine); //notify client of failure
pc_delitem(sd,i,1,0,2,LOG_TYPE_SCRIPT);
clif_misceffect(&sd->bl,2); // display failure effect
+ achievement_update_objective(sd, AG_REFINE_FAIL, 1, 1);
script_pushint(st, 1);
return SCRIPT_CMD_SUCCESS;
}
@@ -9015,6 +9087,7 @@ BUILDIN_FUNC(downrefitem) {
clif_additem(sd,i,1,0);
pc_equipitem(sd,i,ep);
clif_misceffect(&sd->bl,2);
+ achievement_update_objective(sd, AG_REFINE_FAIL, 1, sd->inventory.u.items_inventory[i].refine);
script_pushint(st, sd->inventory.u.items_inventory[i].refine);
return SCRIPT_CMD_SUCCESS;
}
@@ -9911,22 +9984,32 @@ BUILDIN_FUNC(gettime)
return SCRIPT_CMD_SUCCESS;
}
-/*==========================================
- * GetTimeStr("TimeFMT", Length);
- *------------------------------------------*/
+/**
+ * Returns the current server time or the provided time in a readable format.
+ * gettimestr(<"time_format">,<max_length>{,<time_tick>});
+ */
BUILDIN_FUNC(gettimestr)
{
char *tmpstr;
const char *fmtstr;
int maxlen;
- time_t now = time(NULL);
+ time_t now;
- fmtstr=script_getstr(st,2);
- maxlen=script_getnum(st,3);
+ fmtstr = script_getstr(st,2);
+ maxlen = script_getnum(st,3);
- tmpstr=(char *)aMalloc((maxlen+1)*sizeof(char));
+ if (script_hasdata(st, 4)) {
+ if (script_getnum(st, 4) < 0) {
+ ShowWarning("buildin_gettimestr: a positive value must be supplied to be valid.\n");
+ return SCRIPT_CMD_FAILURE;
+ } else
+ now = (time_t)script_getnum(st, 4);
+ } else
+ now = time(NULL);
+
+ tmpstr = (char *)aMalloc((maxlen+1)*sizeof(char));
strftime(tmpstr,maxlen,fmtstr,localtime(&now));
- tmpstr[maxlen]='\0';
+ tmpstr[maxlen] = '\0';
script_pushstr(st,tmpstr);
return SCRIPT_CMD_SUCCESS;
@@ -10027,23 +10110,24 @@ BUILDIN_FUNC(cooking)
*------------------------------------------*/
BUILDIN_FUNC(makepet)
{
- TBL_PC* sd;
- int id,pet_id;
+ struct map_session_data* sd;
+ uint16 mob_id;
+ struct s_pet_db* pet;
if( !script_rid2sd(sd) )
- return SCRIPT_CMD_SUCCESS;
-
- id=script_getnum(st,2);
+ return SCRIPT_CMD_FAILURE;
- pet_id = search_petDB_index(id, PET_CLASS);
+ mob_id = script_getnum(st,2);
+ pet = pet_db(mob_id);
- if (pet_id < 0)
- pet_id = search_petDB_index(id, PET_EGG);
- if (pet_id >= 0 && sd) {
- sd->catch_target_class = pet_db[pet_id].class_;
- intif_create_pet(sd->status.account_id, sd->status.char_id, pet_db[pet_id].class_, mob_db(pet_db[pet_id].class_)->lv, pet_db[pet_id].EggID, 0, pet_db[pet_id].intimate, 100, 0, 1, pet_db[pet_id].jname);
+ if( !pet ){
+ ShowError( "buildin_makepet: failed to create a pet with mob id %hu\n", mob_id);
+ return SCRIPT_CMD_FAILURE;
}
+ sd->catch_target_class = mob_id;
+ intif_create_pet( sd->status.account_id, sd->status.char_id, pet->class_, mob_db(pet->class_)->lv, pet->EggID, 0, pet->intimate, 100, 0, 1, pet->jname );
+
return SCRIPT_CMD_SUCCESS;
}
@@ -10132,7 +10216,7 @@ BUILDIN_FUNC(monster)
int amount = script_getnum(st,7);
const char* event = "";
unsigned int size = SZ_SMALL;
- unsigned int ai = AI_NONE;
+ enum mob_ai ai = AI_NONE;
struct map_session_data* sd;
int16 m;
@@ -10152,7 +10236,7 @@ BUILDIN_FUNC(monster)
}
if (script_hasdata(st, 10)) {
- ai = script_getnum(st, 10);
+ ai = static_cast<enum mob_ai>(script_getnum(st, 10));
if (ai >= AI_MAX) {
ShowWarning("buildin_monster: Attempted to spawn non-existing ai %d for monster class %d\n", ai, class_);
return SCRIPT_CMD_FAILURE;
@@ -10233,7 +10317,7 @@ BUILDIN_FUNC(areamonster)
int amount = script_getnum(st,9);
const char* event = "";
unsigned int size = SZ_SMALL;
- unsigned int ai = AI_NONE;
+ enum mob_ai ai = AI_NONE;
struct map_session_data* sd;
int16 m;
@@ -10253,7 +10337,7 @@ BUILDIN_FUNC(areamonster)
}
if (script_hasdata(st, 12)) {
- ai = script_getnum(st, 12);
+ ai = static_cast<enum mob_ai>(script_getnum(st, 12));
if (ai >= AI_MAX) {
ShowWarning("buildin_monster: Attempted to spawn non-existing ai %d for monster class %d\n", ai, class_);
return SCRIPT_CMD_FAILURE;
@@ -10387,7 +10471,7 @@ BUILDIN_FUNC(clone)
TBL_PC *sd, *msd=NULL;
uint32 char_id, master_id = 0, x, y, flag = 0;
int16 m;
- enum e_mode mode = 0;
+ enum e_mode mode = MD_NONE;
unsigned int duration = 0;
const char *mapname,*event;
@@ -10402,7 +10486,7 @@ BUILDIN_FUNC(clone)
master_id=script_getnum(st,7);
if( script_hasdata(st,8) )
- mode=script_getnum(st,8);
+ mode=static_cast<e_mode>(script_getnum(st,8));
if( script_hasdata(st,9) )
flag=script_getnum(st,9);
@@ -11275,6 +11359,40 @@ BUILDIN_FUNC(sc_end)
return SCRIPT_CMD_SUCCESS;
}
+/**
+ * Ends all status effects from any learned skill on the attached player.
+ * if <job_id> was given it will end the effect of that class for the attached player
+ * sc_end_class {<char_id>{,<job_id>}};
+ */
+BUILDIN_FUNC(sc_end_class)
+{
+ struct map_session_data *sd;
+ uint16 skill_id;
+ int class_;
+
+ if (!script_charid2sd(2, sd))
+ return SCRIPT_CMD_FAILURE;
+
+ if (script_hasdata(st, 3))
+ class_ = script_getnum(st, 3);
+ else
+ class_ = sd->status.class_;
+
+ if (!pcdb_checkid(class_)) {
+ ShowError("buildin_sc_end_class: Invalid job ID '%d' given.\n", script_getnum(st, 3));
+ return SCRIPT_CMD_FAILURE;
+ }
+
+ for (int i = 0; i < MAX_SKILL_TREE && (skill_id = skill_tree[pc_class2idx(class_)][i].skill_id) > 0; i++) {
+ enum sc_type sc = status_skill2sc(skill_id);
+
+ if (sc > SC_COMMON_MAX && sd->sc.data[sc])
+ status_change_end(&sd->bl, sc, INVALID_TIMER);
+ }
+
+ return SCRIPT_CMD_SUCCESS;
+}
+
/*==========================================
* @FIXME atm will return reduced tick, 0 immune, 1 no tick
*------------------------------------------*/
@@ -11313,7 +11431,7 @@ BUILDIN_FUNC(getstatus)
if( id <= SC_NONE || id >= SC_MAX )
{// invalid status type given
- ShowWarning("script.c:getstatus: Invalid status type given (%d).\n", id);
+ ShowWarning("script.cpp:getstatus: Invalid status type given (%d).\n", id);
return SCRIPT_CMD_SUCCESS;
}
@@ -11389,7 +11507,7 @@ BUILDIN_FUNC(homunculus_evolution)
if (sd->hd->homunculus.intimacy >= battle_config.homunculus_evo_intimacy_need)
hom_evolution(sd->hd);
else
- clif_emotion(&sd->hd->bl, E_SWT);
+ clif_emotion(&sd->hd->bl, ET_SWEAT);
}
return SCRIPT_CMD_SUCCESS;
}
@@ -11424,9 +11542,9 @@ BUILDIN_FUNC(homunculus_mutate)
script_pushint(st, 1);
return SCRIPT_CMD_SUCCESS;
} else
- clif_emotion(&sd->bl, E_SWT);
+ clif_emotion(&sd->bl, ET_SWEAT);
} else
- clif_emotion(&sd->bl, E_SWT);
+ clif_emotion(&sd->bl, ET_SWEAT);
script_pushint(st, 0);
@@ -11456,16 +11574,16 @@ BUILDIN_FUNC(morphembryo)
if( (i = pc_additem(sd, &item_tmp, 1, LOG_TYPE_SCRIPT)) ) {
clif_additem(sd, 0, 0, i);
- clif_emotion(&sd->bl, E_SWT); // Fail to avoid item drop exploit.
+ clif_emotion(&sd->bl, ET_SWEAT); // Fail to avoid item drop exploit.
} else {
hom_vaporize(sd, HOM_ST_MORPH);
script_pushint(st, 1);
return SCRIPT_CMD_SUCCESS;
}
} else
- clif_emotion(&sd->hd->bl, E_SWT);
+ clif_emotion(&sd->hd->bl, ET_SWEAT);
} else
- clif_emotion(&sd->bl, E_SWT);
+ clif_emotion(&sd->bl, ET_SWEAT);
script_pushint(st, 0);
@@ -12624,38 +12742,28 @@ BUILDIN_FUNC(gvgoff3)
return SCRIPT_CMD_SUCCESS;
}
-/*==========================================
- * Shows an emoticon on top of the player/npc
- * emotion emotion#, <target: 0 - NPC, 1 - PC>, <NPC/PC name>
- *------------------------------------------*/
-//Optional second parameter added by [Skotlex]
+/**
+ * Shows an emotion on top of a NPC by default or the given GID
+ * emotion <emotion ID>{,<target ID>};
+ */
BUILDIN_FUNC(emotion)
{
- int type;
- int player=0;
-
- type=script_getnum(st,2);
- if(type < 0 || type > 100)
- return SCRIPT_CMD_SUCCESS;
+ struct block_list *bl = NULL;
+ int type = script_getnum(st,2);
- if( script_hasdata(st,3) )
- player=script_getnum(st,3);
+ if (type < ET_SURPRISE || type >= ET_MAX) {
+ ShowWarning("buildin_emotion: Unknown emotion %d (min=%d, max=%d).\n", type, ET_SURPRISE, (ET_MAX-1));
+ return SCRIPT_CMD_FAILURE;
+ }
- if (player) {
- TBL_PC *sd = NULL;
+ if (script_hasdata(st, 3) && !script_rid2bl(3, bl)) {
+ ShowWarning("buildin_emotion: Unknown game ID supplied %d.\n", script_getnum(st, 3));
+ return SCRIPT_CMD_FAILURE;
+ }
+ if (!bl)
+ bl = map_id2bl(st->oid);
- if( script_nick2sd(4,sd) ){
- clif_emotion(&sd->bl, type);
- }
- } else
- if( script_hasdata(st,4) )
- {
- TBL_NPC *nd = npc_name2id(script_getstr(st,4));
- if(nd)
- clif_emotion(&nd->bl,type);
- }
- else
- clif_emotion(map_id2bl(st->oid),type);
+ clif_emotion(bl, type);
return SCRIPT_CMD_SUCCESS;
}
@@ -13459,7 +13567,7 @@ BUILDIN_FUNC(setwall)
y = script_getnum(st,4);
size = script_getnum(st,5);
dir = script_getnum(st,6);
- shootable = script_getnum(st,7);
+ shootable = script_getnum(st,7) != 0;
name = script_getstr(st,8);
if( (m = map_mapname2mapid(mapname)) < 0 )
@@ -13932,6 +14040,13 @@ BUILDIN_FUNC(misceffect)
int type;
type=script_getnum(st,2);
+
+ if( type <= EF_NONE || type >= EF_MAX ){
+ ShowError( "buildin_misceffect: unsupported effect id %d\n", type );
+ return SCRIPT_CMD_FAILURE;
+ }
+
+
if(st->oid && st->oid != fake_nd->bl.id) {
struct block_list *bl = map_id2bl(st->oid);
if (bl)
@@ -14295,6 +14410,11 @@ BUILDIN_FUNC(specialeffect)
if(bl==NULL)
return SCRIPT_CMD_SUCCESS;
+ if( type <= EF_NONE || type >= EF_MAX ){
+ ShowError( "buildin_specialeffect: unsupported effect id %d\n", type );
+ return SCRIPT_CMD_FAILURE;
+ }
+
if( script_hasdata(st,4) )
{
TBL_NPC *nd = npc_name2id(script_getstr(st,4));
@@ -14322,6 +14442,11 @@ BUILDIN_FUNC(specialeffect2)
int type = script_getnum(st,2);
enum send_target target = script_hasdata(st,3) ? (send_target)script_getnum(st,3) : AREA;
+ if( type <= EF_NONE || type >= EF_MAX ){
+ ShowError( "buildin_specialeffect2: unsupported effect id %d\n", type );
+ return SCRIPT_CMD_FAILURE;
+ }
+
clif_specialeffect(&sd->bl, type, target);
}
return SCRIPT_CMD_SUCCESS;
@@ -14433,7 +14558,7 @@ int recovery_sub(struct map_session_data* sd, int revive)
if(revive&(1|4) && pc_isdead(sd)) {
status_revive(&sd->bl, 100, 100);
clif_displaymessage(sd->fd,msg_txt(sd,16)); // You've been revived!
- clif_specialeffect(&sd->bl, 77, AREA);
+ clif_specialeffect(&sd->bl, EF_RESURRECTION, AREA);
} else if(revive&(1|2) && !pc_isdead(sd)) {
status_percent_heal(&sd->bl, 100, 100);
clif_displaymessage(sd->fd,msg_txt(sd,680)); // You have been recovered!
@@ -15109,7 +15234,7 @@ BUILDIN_FUNC(mapid2name)
uint16 m = script_getnum(st, 2);
if (m < 0 || m >= MAX_MAP_PER_SERVER) {
- script_pushstr(st, "");
+ script_pushconststr(st, "");
return SCRIPT_CMD_FAILURE;
}
@@ -15164,7 +15289,7 @@ BUILDIN_FUNC(summon)
delete_timer(md->deletetimer, mob_timer_delete);
md->deletetimer = add_timer(tick+(timeout>0?timeout:60000),mob_timer_delete,md->bl.id,0);
mob_spawn (md); //Now it is ready for spawning.
- clif_specialeffect(&md->bl,344,AREA);
+ clif_specialeffect(&md->bl,EF_ENTRY2,AREA);
sc_start4(NULL,&md->bl, SC_MODECHANGE, 100, 1, 0, MD_AGGRESSIVE, 0, 60000);
}
script_pushint(st, md->bl.id);
@@ -16336,7 +16461,7 @@ BUILDIN_FUNC(setnpcdisplay)
{
const char* name;
const char* newname = NULL;
- int class_ = -1, size = -1;
+ int class_ = JT_FAKENPC, size = -1;
struct script_data* data;
struct npc_data* nd;
@@ -16376,7 +16501,7 @@ BUILDIN_FUNC(setnpcdisplay)
else
size = -1;
- if( class_ != -1 && nd->class_ != class_ )
+ if( class_ != JT_FAKENPC && nd->class_ != class_ )
npc_setclass(nd, class_);
else if( size != -1 )
{ // Required to update the visual size
@@ -16982,7 +17107,7 @@ BUILDIN_FUNC(addmonsterdrop)
if(c) { //Fill in the slot with the item and rate
mob->dropitem[c].nameid = item_id;
mob->dropitem[c].p = (rate > 10000)?10000:rate;
- itemdb_reload_itemmob_data(); // Reload the mob search data stored in the item_data
+ mob_reload_itemmob_data(); // Reload the mob search data stored in the item_data
script_pushint(st,1);
} else //No place to put the new drop
script_pushint(st,0);
@@ -17028,7 +17153,7 @@ BUILDIN_FUNC(delmonsterdrop)
if(mob->dropitem[i].nameid == item_id) {
mob->dropitem[i].nameid = 0;
mob->dropitem[i].p = 0;
- itemdb_reload_itemmob_data(); // Reload the mob search data stored in the item_data
+ mob_reload_itemmob_data(); // Reload the mob search data stored in the item_data
script_pushint(st,1);
return SCRIPT_CMD_SUCCESS;
}
@@ -17373,6 +17498,9 @@ BUILDIN_FUNC(getunitdata)
case BL_MER: mc = map_id2mc(bl->id); break;
case BL_ELEM: ed = map_id2ed(bl->id); break;
case BL_NPC: nd = map_id2nd(bl->id); break;
+ default:
+ ShowWarning("buildin_getunitdata: Invalid object type!\n");
+ return SCRIPT_CMD_FAILURE;
}
name = reference_getname(data);
@@ -17728,6 +17856,23 @@ BUILDIN_FUNC(setunitdata)
md->base_status = (struct status_data*)aCalloc(1, sizeof(struct status_data));
memcpy(md->base_status, &md->db->status, sizeof(struct status_data));
}
+
+ // Check if the view data will be modified
+ switch( type ){
+ case UMOB_SEX:
+ //case UMOB_CLASS: // Called by status_set_viewdata
+ case UMOB_HAIRSTYLE:
+ case UMOB_HAIRCOLOR:
+ case UMOB_HEADBOTTOM:
+ case UMOB_HEADMIDDLE:
+ case UMOB_HEADTOP:
+ case UMOB_CLOTHCOLOR:
+ case UMOB_SHIELD:
+ case UMOB_WEAPON:
+ mob_set_dynamic_viewdata( md );
+ break;
+ }
+
switch (type) {
case UMOB_SIZE: md->base_status->size = (unsigned char)value; calc_status = true; break;
case UMOB_LEVEL: md->level = (unsigned short)value; break;
@@ -17741,8 +17886,8 @@ BUILDIN_FUNC(setunitdata)
case UMOB_MODE: md->base_status->mode = (enum e_mode)value; calc_status = true; break;
case UMOB_AI: md->special_state.ai = (enum mob_ai)value; break;
case UMOB_SCOPTION: md->sc.option = (unsigned short)value; break;
- case UMOB_SEX: md->vd->sex = (char)value; break;
- case UMOB_CLASS: status_set_viewdata(bl, (unsigned short)value); break;
+ case UMOB_SEX: md->vd->sex = (char)value; clif_clearunit_area(bl, CLR_OUTSIGHT); clif_spawn(bl); break;
+ case UMOB_CLASS: status_set_viewdata(bl, (unsigned short)value); clif_clearunit_area(bl, CLR_OUTSIGHT); clif_spawn(bl); break;
case UMOB_HAIRSTYLE: clif_changelook(bl, LOOK_HAIR, (unsigned short)value); break;
case UMOB_HAIRCOLOR: clif_changelook(bl, LOOK_HAIR_COLOR, (unsigned short)value); break;
case UMOB_HEADBOTTOM: clif_changelook(bl, LOOK_HEAD_BOTTOM, (unsigned short)value); break;
@@ -17772,7 +17917,7 @@ BUILDIN_FUNC(setunitdata)
md->state.copy_master_mode = 0;
calc_status = true;
break;
- case UMOB_DMGIMMUNE: md->ud.immune_attack = (bool)value > 0 ? 1 : 0; break;
+ case UMOB_DMGIMMUNE: md->ud.immune_attack = value > 0; break;
case UMOB_ATKRANGE: md->base_status->rhw.range = (unsigned short)value; calc_status = true; break;
case UMOB_ATKMIN: md->base_status->rhw.atk = (unsigned short)value; calc_status = true; break;
case UMOB_ATKMAX: md->base_status->rhw.atk2 = (unsigned short)value; calc_status = true; break;
@@ -17825,7 +17970,7 @@ BUILDIN_FUNC(setunitdata)
case UHOM_INT: hd->base_status.int_ = (unsigned short)value; status_calc_misc(bl, &hd->base_status, hd->homunculus.level); calc_status = true; break;
case UHOM_DEX: hd->base_status.dex = (unsigned short)value; status_calc_misc(bl, &hd->base_status, hd->homunculus.level); calc_status = true; break;
case UHOM_LUK: hd->base_status.luk = (unsigned short)value; status_calc_misc(bl, &hd->base_status, hd->homunculus.level); calc_status = true; break;
- case UHOM_DMGIMMUNE: hd->ud.immune_attack = (bool)value > 0 ? 1 : 0; break;
+ case UHOM_DMGIMMUNE: hd->ud.immune_attack = value > 0; break;
case UHOM_ATKRANGE: hd->base_status.rhw.range = (unsigned short)value; calc_status = true; break;
case UHOM_ATKMIN: hd->base_status.rhw.atk = (unsigned short)value; calc_status = true; break;
case UHOM_ATKMAX: hd->base_status.rhw.atk2 = (unsigned short)value; calc_status = true; break;
@@ -17876,7 +18021,7 @@ BUILDIN_FUNC(setunitdata)
case UPET_INT: pd->status.int_ = (unsigned short)value; status_calc_misc(bl, &pd->status, pd->pet.level); break;
case UPET_DEX: pd->status.dex = (unsigned short)value; status_calc_misc(bl, &pd->status, pd->pet.level); break;
case UPET_LUK: pd->status.luk = (unsigned short)value; status_calc_misc(bl, &pd->status, pd->pet.level); break;
- case UPET_DMGIMMUNE: pd->ud.immune_attack = (bool)value > 0 ? 1 : 0; break;
+ case UPET_DMGIMMUNE: pd->ud.immune_attack = value > 0; break;
case UPET_ATKRANGE: pd->status.rhw.range = (unsigned short)value; break;
case UPET_ATKMIN: pd->status.rhw.atk = (unsigned short)value; break;
case UPET_ATKMAX: pd->status.rhw.atk2 = (unsigned short)value; break;
@@ -17924,7 +18069,7 @@ BUILDIN_FUNC(setunitdata)
case UMER_INT: mc->base_status.int_ = (unsigned short)value; status_calc_misc(bl, &mc->base_status, mc->db->lv); calc_status = true; break;
case UMER_DEX: mc->base_status.dex = (unsigned short)value; status_calc_misc(bl, &mc->base_status, mc->db->lv); calc_status = true; break;
case UMER_LUK: mc->base_status.luk = (unsigned short)value; status_calc_misc(bl, &mc->base_status, mc->db->lv); calc_status = true; break;
- case UMER_DMGIMMUNE: mc->ud.immune_attack = (bool)value > 0 ? 1 : 0; break;
+ case UMER_DMGIMMUNE: mc->ud.immune_attack = value > 0; break;
case UMER_ATKRANGE: mc->base_status.rhw.range = (unsigned short)value; calc_status = true; break;
case UMER_ATKMIN: mc->base_status.rhw.atk = (unsigned short)value; calc_status = true; break;
case UMER_ATKMAX: mc->base_status.rhw.atk2 = (unsigned short)value; calc_status = true; break;
@@ -17976,7 +18121,7 @@ BUILDIN_FUNC(setunitdata)
case UELE_INT: ed->base_status.int_ = (unsigned short)value; status_calc_misc(bl, &ed->base_status, ed->db->lv); calc_status = true; break;
case UELE_DEX: ed->base_status.dex = (unsigned short)value; status_calc_misc(bl, &ed->base_status, ed->db->lv); calc_status = true; break;
case UELE_LUK: ed->base_status.luk = (unsigned short)value; status_calc_misc(bl, &ed->base_status, ed->db->lv); calc_status = true; break;
- case UELE_DMGIMMUNE: ed->ud.immune_attack = (bool)value > 0 ? 1 : 0; break;
+ case UELE_DMGIMMUNE: ed->ud.immune_attack = value > 0; break;
case UELE_ATKRANGE: ed->base_status.rhw.range = (unsigned short)value; calc_status = true; break;
case UELE_ATKMIN: ed->base_status.rhw.atk = (unsigned short)value; calc_status = true; break;
case UELE_ATKMAX: ed->base_status.rhw.atk2 = (unsigned short)value; calc_status = true; break;
@@ -18112,6 +18257,9 @@ BUILDIN_FUNC(setunitname)
case BL_MOB: md = map_id2md(bl->id); break;
case BL_HOM: hd = map_id2hd(bl->id); break;
case BL_PET: pd = map_id2pd(bl->id); break;
+ default:
+ ShowWarning("buildin_setunitname: Invalid object type!\n");
+ return SCRIPT_CMD_FAILURE;
}
switch (bl->type) {
@@ -18255,7 +18403,7 @@ BUILDIN_FUNC(unitattack)
int actiontype = 0;
if (!script_rid2bl(2,unit_bl)) {
- script_pushint(st, 0);
+ script_pushint(st, false);
return SCRIPT_CMD_FAILURE;
}
@@ -18270,7 +18418,7 @@ BUILDIN_FUNC(unitattack)
target_bl = map_id2bl(conv_num(st, data));
if (!target_bl) {
- script_pushint(st, 0);
+ script_pushint(st, false);
return SCRIPT_CMD_FAILURE;
}
@@ -18278,10 +18426,13 @@ BUILDIN_FUNC(unitattack)
actiontype = script_getnum(st,4);
switch(unit_bl->type) {
- case BL_PC:
- clif_parse_ActionRequest_sub(((TBL_PC *)unit_bl), actiontype > 0 ? 0x07 : 0x00, target_bl->id, gettick());
- script_pushint(st, 1);
+ case BL_PC: {
+ struct map_session_data* sd = (struct map_session_data*)unit_bl;
+
+ clif_parse_ActionRequest_sub(sd, actiontype > 0 ? 0x07 : 0x00, target_bl->id, gettick());
+ script_pushint(st, sd->ud.target == target_bl->id);
return SCRIPT_CMD_SUCCESS;
+ }
case BL_MOB:
((TBL_MOB *)unit_bl)->target_id = target_bl->id;
break;
@@ -18290,7 +18441,7 @@ BUILDIN_FUNC(unitattack)
break;
default:
ShowError("buildin_unitattack: Unsupported source unit type %d.\n", unit_bl->type);
- script_pushint(st, 0);
+ script_pushint(st, false);
return SCRIPT_CMD_FAILURE;
}
@@ -18317,13 +18468,17 @@ BUILDIN_FUNC(unitstopattack)
/// Makes the unit stop walking.
///
-/// unitstopwalk <unit_id>;
+/// unitstopwalk <unit_id>{,<flag>};
BUILDIN_FUNC(unitstopwalk)
{
struct block_list* bl;
+ int flag = USW_NONE;
+
+ if (script_hasdata(st, 3))
+ flag = script_getnum(st, 3);
if(script_rid2bl(2,bl))
- unit_stop_walking(bl, 0);
+ unit_stop_walking(bl, flag);
return SCRIPT_CMD_SUCCESS;
}
@@ -18371,7 +18526,7 @@ BUILDIN_FUNC(unittalk)
///
/// unitemote <unit_id>,<emotion>;
///
-/// @see e_* in db/const.txt
+/// @see ET_* in script_constants.h
BUILDIN_FUNC(unitemote)
{
int emotion;
@@ -18379,7 +18534,12 @@ BUILDIN_FUNC(unitemote)
emotion = script_getnum(st,3);
- if(script_rid2bl(2,bl))
+ if (emotion < ET_SURPRISE || emotion >= ET_MAX) {
+ ShowWarning("buildin_emotion: Unknown emotion %d (min=%d, max=%d).\n", emotion, ET_SURPRISE, (ET_MAX-1));
+ return SCRIPT_CMD_FAILURE;
+ }
+
+ if (script_rid2bl(2,bl))
clif_emotion(bl, emotion);
return SCRIPT_CMD_SUCCESS;
@@ -18453,7 +18613,7 @@ BUILDIN_FUNC(unitskillusepos)
/// Pauses the execution of the script, detaching the player
///
-/// sleep <mili seconds>;
+/// sleep <milli seconds>;
BUILDIN_FUNC(sleep)
{
// First call(by function call)
@@ -18463,7 +18623,7 @@ BUILDIN_FUNC(sleep)
ticks = script_getnum(st, 2);
if (ticks <= 0) {
- ShowError("buildin_sleep2: negative amount('%d') of milli seconds is not supported\n", ticks);
+ ShowError("buildin_sleep: negative or zero amount('%d') of milli seconds is not supported\n", ticks);
return SCRIPT_CMD_FAILURE;
}
@@ -18496,7 +18656,7 @@ BUILDIN_FUNC(sleep2)
ticks = script_getnum(st, 2);
if (ticks <= 0) {
- ShowError( "buildin_sleep2: negative amount('%d') of milli seconds is not supported\n", ticks );
+ ShowError( "buildin_sleep2: negative or zero amount('%d') of milli seconds is not supported\n", ticks );
return SCRIPT_CMD_FAILURE;
}
@@ -18542,7 +18702,7 @@ BUILDIN_FUNC(awake)
iter = db_iterator(st_db);
- for (tst = dbi_first(iter); dbi_exists(iter); tst = dbi_next(iter)) {
+ for (tst = static_cast<script_state *>(dbi_first(iter)); dbi_exists(iter); tst = static_cast<script_state *>(dbi_next(iter))) {
if (tst->oid == nd->bl.id) {
if (tst->sleep.timer == INVALID_TIMER) { // already awake ???
continue;
@@ -18713,12 +18873,12 @@ BUILDIN_FUNC(setcell)
int16 x2 = script_getnum(st,5);
int16 y2 = script_getnum(st,6);
cell_t type = (cell_t)script_getnum(st,7);
- bool flag = (bool)script_getnum(st,8);
+ bool flag = script_getnum(st,8) != 0;
int x,y;
- if( x1 > x2 ) swap(x1,x2);
- if( y1 > y2 ) swap(y1,y2);
+ if( x1 > x2 ) SWAP(x1,x2);
+ if( y1 > y2 ) SWAP(y1,y2);
for( y = y1; y <= y2; ++y )
for( x = x1; x <= x2; ++x )
@@ -18834,7 +18994,7 @@ BUILDIN_FUNC(mercenary_create)
class_ = script_getnum(st,2);
- if( !mercenary_class(class_) )
+ if( !mercenary_db(class_) )
return SCRIPT_CMD_SUCCESS;
contract_time = script_getnum(st,3);
@@ -19617,7 +19777,7 @@ unsigned short script_instancegetid(struct script_state* st)
struct guild *gd = NULL;
struct clan *cd = NULL;
- if (script_rid2sd(sd)) {
+ if ((sd = map_id2sd(st->rid))) {
if (sd->instance_id)
instance_id = sd->instance_id;
if (instance_id == 0 && sd->status.party_id && (pd = party_search(sd->status.party_id)) != NULL && pd->instance_id)
@@ -19642,7 +19802,7 @@ BUILDIN_FUNC(instance_create)
int owner_id = 0;
if (script_hasdata(st, 3)) {
- mode = script_getnum(st, 3);
+ mode = static_cast<instance_mode>(script_getnum(st, 3));
if (mode < IM_NONE || mode >= IM_MAX) {
ShowError("buildin_instance_create: Unknown instance mode %d for '%s'\n", mode, script_getstr(st, 2));
@@ -20134,7 +20294,7 @@ BUILDIN_FUNC(instance_info)
case IIT_MAP:
if( !script_hasdata(st, 4) || script_isstring(st, 4) ){
ShowError( "buildin_instance_info: Type IIT_MAP requires a numeric index argument.\n" );
- script_pushstr(st, "");
+ script_pushconststr(st, "");
return SCRIPT_CMD_FAILURE;
}
@@ -20142,13 +20302,13 @@ BUILDIN_FUNC(instance_info)
if( index < 0 ){
ShowError( "buildin_instance_info: Type IIT_MAP does not support a negative index argument.\n" );
- script_pushstr(st, "");
+ script_pushconststr(st, "");
return SCRIPT_CMD_FAILURE;
}
if( index > UINT8_MAX ){
ShowError( "buildin_instance_info: Type IIT_MAP does only support up to index %hu.\n", UINT8_MAX );
- script_pushstr(st, "");
+ script_pushconststr(st, "");
return SCRIPT_CMD_FAILURE;
}
@@ -20260,7 +20420,10 @@ BUILDIN_FUNC(areamobuseskill)
return SCRIPT_CMD_SUCCESS;
}
-
+/**
+ * Display a progress bar above a character
+ * progressbar "<color>",<seconds>;
+ */
BUILDIN_FUNC(progressbar)
{
struct map_session_data * sd;
@@ -20283,6 +20446,60 @@ BUILDIN_FUNC(progressbar)
return SCRIPT_CMD_SUCCESS;
}
+/**
+ * Display a progress bar above an NPC
+ * progressbar_npc "<color>",<seconds>{,<"NPC Name">};
+ */
+BUILDIN_FUNC(progressbar_npc){
+ struct npc_data* nd = NULL;
+
+ if( script_hasdata(st, 4) ){
+ const char* name = script_getstr(st, 4);
+
+ nd = npc_name2id(name);
+
+ if( !nd ){
+ ShowError( "buildin_progressbar_npc: NPC \"%s\" was not found.\n", name );
+ return SCRIPT_CMD_FAILURE;
+ }
+ }else{
+ nd = map_id2nd(st->oid);
+ }
+
+ // First call(by function call)
+ if( !nd->progressbar.timeout ){
+ const char *color;
+ int second;
+
+ color = script_getstr(st, 2);
+ second = script_getnum(st, 3);
+
+ if( second < 0 ){
+ ShowError( "buildin_progressbar_npc: negative amount('%d') of seconds is not supported\n", second );
+ return SCRIPT_CMD_FAILURE;
+ }
+
+ // detach the player
+ script_detach_rid(st);
+
+ // sleep for the target amount of time
+ st->state = RERUNLINE;
+ st->sleep.tick = second * 1000;
+ nd->progressbar.timeout = gettick() + second * 1000;
+ nd->progressbar.color = strtol(color, (char **)NULL, 0);
+
+ clif_progressbar_npc_area(nd);
+ // Second call(by timer after sleeping time is over)
+ } else {
+ // Continue the script
+ st->state = RUN;
+ st->sleep.tick = 0;
+ nd->progressbar.timeout = nd->progressbar.color = 0;
+ }
+
+ return SCRIPT_CMD_SUCCESS;
+}
+
BUILDIN_FUNC(pushpc)
{
uint8 dir;
@@ -20318,7 +20535,7 @@ BUILDIN_FUNC(pushpc)
dx = dirx[dir];
dy = diry[dir];
- unit_blown(&sd->bl, dx, dy, cells, 0);
+ unit_blown(&sd->bl, dx, dy, cells, BLOWN_NONE);
return SCRIPT_CMD_SUCCESS;
}
@@ -20496,7 +20713,7 @@ BUILDIN_FUNC(ismounting) {
if (!script_charid2sd(2,sd))
return SCRIPT_CMD_FAILURE;
- if( &sd->sc && sd->sc.data[SC_ALL_RIDING] )
+ if( sd->sc.data[SC_ALL_RIDING] )
script_pushint(st,1);
else
script_pushint(st,0);
@@ -20514,11 +20731,11 @@ BUILDIN_FUNC(setmounting) {
if (!script_charid2sd(2,sd))
return SCRIPT_CMD_FAILURE;
- if( &sd->sc && sd->sc.option&(OPTION_WUGRIDER|OPTION_RIDING|OPTION_DRAGON|OPTION_MADOGEAR) ) {
+ if( sd->sc.option&(OPTION_WUGRIDER|OPTION_RIDING|OPTION_DRAGON|OPTION_MADOGEAR) ) {
clif_msg(sd, NEED_REINS_OF_MOUNT);
script_pushint(st,0); //can't mount with one of these
} else {
- if( &sd->sc && sd->sc.data[SC_ALL_RIDING] )
+ if( sd->sc.data[SC_ALL_RIDING] )
status_change_end(&sd->bl, SC_ALL_RIDING, INVALID_TIMER); //release mount
else
sc_start(NULL, &sd->bl, SC_ALL_RIDING, 10000, 1, INVALID_TIMER); //mount
@@ -20623,7 +20840,7 @@ BUILDIN_FUNC(get_githash) {
if ( git[0] != UNKNOWN_VERSION )
script_pushstr(st,buf);
else
- script_pushstr(st,"Unknown"); //unknown
+ script_pushconststr(st,"Unknown"); //unknown
return SCRIPT_CMD_SUCCESS;
}
/**
@@ -20648,7 +20865,7 @@ BUILDIN_FUNC(freeloop) {
BUILDIN_FUNC(bindatcmd) {
const char* atcmd;
const char* eventName;
- int i, level = 0, level2 = 0;
+ int i, level = 0, level2 = 100;
bool create = false;
atcmd = script_getstr(st,2);
@@ -20790,16 +21007,16 @@ BUILDIN_FUNC(checkre)
return SCRIPT_CMD_SUCCESS;
}
-/* getrandgroupitem <group_id>{,<quantity>{,<sub_group>}} */
+/* getrandgroupitem <group_id>{,<quantity>{,<sub_group>{,<identify>{,<char_id>}}}} */
BUILDIN_FUNC(getrandgroupitem) {
TBL_PC* sd;
- int i, get_count = 0;
+ int i, get_count = 0, identify = 0;
uint16 group, qty = 0;
uint8 sub_group = 1;
struct item item_tmp;
struct s_item_group_entry *entry = NULL;
- if (!script_rid2sd(sd))
+ if (!script_charid2sd(6, sd))
return SCRIPT_CMD_SUCCESS;
group = script_getnum(st,2);
@@ -20811,6 +21028,7 @@ BUILDIN_FUNC(getrandgroupitem) {
FETCH(3, qty);
FETCH(4, sub_group);
+ FETCH(5, identify);
entry = itemdb_get_randgroupitem(group,sub_group);
if (!entry)
@@ -20818,7 +21036,7 @@ BUILDIN_FUNC(getrandgroupitem) {
memset(&item_tmp,0,sizeof(item_tmp));
item_tmp.nameid = entry->nameid;
- item_tmp.identify = itemdb_isidentified(entry->nameid);
+ item_tmp.identify = identify ? 1 : itemdb_isidentified(entry->nameid);
if (!qty)
qty = entry->amount;
@@ -20848,17 +21066,17 @@ BUILDIN_FUNC(getrandgroupitem) {
return SCRIPT_CMD_SUCCESS;
}
-/* getgroupitem <group_id>{,<char_id>};
+/* getgroupitem <group_id>{,<identify>{,<char_id>}};
* Gives item(s) to the attached player based on item group contents
*/
BUILDIN_FUNC(getgroupitem) {
TBL_PC *sd;
int group_id = script_getnum(st,2);
- if (!script_charid2sd(3,sd))
+ if (!script_charid2sd(4,sd))
return SCRIPT_CMD_SUCCESS;
- if (itemdb_pc_get_itemgroup(group_id,sd)) {
+ if (itemdb_pc_get_itemgroup(group_id, (script_hasdata(st, 3) ? script_getnum(st, 3) != 0 : false), sd)) {
ShowError("buildin_getgroupitem: Invalid group id '%d' specified.\n",group_id);
return SCRIPT_CMD_FAILURE;
}
@@ -20948,9 +21166,9 @@ BUILDIN_FUNC(npcskill)
status_calc_npc(nd, SCO_NONE);
if (skill_get_inf(skill_id)&INF_GROUND_SKILL)
- unit_skilluse_pos(&nd->bl, sd->bl.x, sd->bl.y, skill_id, skill_level);
+ unit_skilluse_pos2(&nd->bl, sd->bl.x, sd->bl.y, skill_id, skill_level,0,0);
else
- unit_skilluse_id(&nd->bl, sd->bl.id, skill_id, skill_level);
+ unit_skilluse_id2(&nd->bl, sd->bl.id, skill_id, skill_level,0,0);
return SCRIPT_CMD_SUCCESS;
}
@@ -21284,36 +21502,6 @@ BUILDIN_FUNC(party_destroy)
return SCRIPT_CMD_SUCCESS;
}
-/** Checks if a player's client version meets a required version or date.
-* @param type: 0 - check by version number; 1 - check by date
-* @param data: Input
-*/
-BUILDIN_FUNC(is_clientver) {
- TBL_PC *sd = NULL;
- int type;
- int data;
- int ret = 0;
-
- if ( !script_charid2sd(4,sd) ) {
- script_pushint(st,0);
- return SCRIPT_CMD_FAILURE;
- }
-
- type = script_getnum(st,2);
- data = script_getnum(st,3);
-
- switch(type){
- case 0:
- ret = (sd->packet_ver >= data)?1:0;
- break;
- case 1:
- ret = (sd->packet_ver >= date2version(data))?1:0;
- break;
- }
- script_pushint(st,ret);
- return SCRIPT_CMD_SUCCESS;
-}
-
/** Returns various information about a player's VIP status. Need to enable VIP system
* vip_status <type>,{"<character name>"};
* @param type: Info type, see enum vip_status_type
@@ -21531,7 +21719,7 @@ BUILDIN_FUNC(bonus_script_clear) {
return SCRIPT_CMD_FAILURE;
if (script_hasdata(st,2))
- flag = script_getnum(st,2);
+ flag = script_getnum(st,2) != 0;
pc_bonus_script_clear(sd,(flag ? BSF_PERMANENT : BSF_REM_ALL));
return SCRIPT_CMD_SUCCESS;
@@ -21955,12 +22143,16 @@ BUILDIN_FUNC(getvar) {
/**
* Display script message
- * showscript "<message>"{,<GID>};
+ * showscript "<message>"{,<GID>,<flag>};
+ * @param flag: Specify target
+ * AREA - Message is sent to players in the vicinity of the source (default).
+ * SELF - Message is sent only to player attached.
**/
BUILDIN_FUNC(showscript) {
struct block_list *bl = NULL;
const char *msg = script_getstr(st,2);
int id = 0;
+ send_target target = AREA;
if (script_hasdata(st,3)) {
id = script_getnum(st,3);
@@ -21976,7 +22168,15 @@ BUILDIN_FUNC(showscript) {
return SCRIPT_CMD_FAILURE;
}
- clif_showscript(bl, msg);
+ if (script_hasdata(st, 4)) {
+ target = static_cast<send_target>(script_getnum(st, 4));
+ if (target == SELF && map_id2sd(bl->id) == NULL) {
+ ShowWarning("script: showscript: self can't be used for non-players objects.\n");
+ return SCRIPT_CMD_FAILURE;
+ }
+ }
+
+ clif_showscript(bl, msg, target);
script_pushint(st,1);
return SCRIPT_CMD_SUCCESS;
@@ -22401,6 +22601,114 @@ BUILDIN_FUNC(getexp2) {
return SCRIPT_CMD_SUCCESS;
}
+/*==========================================
+* Costume Items
+*------------------------------------------*/
+BUILDIN_FUNC(costume)
+{
+ int i = -1, num, ep;
+ TBL_PC *sd;
+
+ num = script_getnum(st, 2); // Equip Slot
+
+ if (!script_rid2sd(sd))
+ return SCRIPT_CMD_FAILURE;
+
+ if (equip_index_check(num))
+ i = pc_checkequip(sd, equip_bitmask[num]);
+ if (i < 0)
+ return SCRIPT_CMD_FAILURE;
+
+ ep = sd->inventory.u.items_inventory[i].equip;
+ if (!(ep&EQP_HEAD_LOW) && !(ep&EQP_HEAD_MID) && !(ep&EQP_HEAD_TOP) && !(ep&EQP_GARMENT)) {
+ ShowError("buildin_costume: Attempted to convert non-cosmetic item to costume.");
+ return SCRIPT_CMD_FAILURE;
+ }
+ log_pick_pc(sd, LOG_TYPE_SCRIPT, -1, &sd->inventory.u.items_inventory[i]);
+ pc_unequipitem(sd, i, 2);
+ clif_delitem(sd, i, 1, 3);
+ // --------------------------------------------------------------------
+ sd->inventory.u.items_inventory[i].refine = 0;
+ sd->inventory.u.items_inventory[i].attribute = 0;
+ sd->inventory.u.items_inventory[i].card[0] = CARD0_CREATE;
+ sd->inventory.u.items_inventory[i].card[1] = 0;
+ sd->inventory.u.items_inventory[i].card[2] = GetWord(battle_config.reserved_costume_id, 0);
+ sd->inventory.u.items_inventory[i].card[3] = GetWord(battle_config.reserved_costume_id, 1);
+
+ if (ep&EQP_HEAD_TOP) { ep &= ~EQP_HEAD_TOP; ep |= EQP_COSTUME_HEAD_TOP; }
+ if (ep&EQP_HEAD_LOW) { ep &= ~EQP_HEAD_LOW; ep |= EQP_COSTUME_HEAD_LOW; }
+ if (ep&EQP_HEAD_MID) { ep &= ~EQP_HEAD_MID; ep |= EQP_COSTUME_HEAD_MID; }
+ if (ep&EQP_GARMENT) { ep &= EQP_GARMENT; ep |= EQP_COSTUME_GARMENT; }
+ // --------------------------------------------------------------------
+ log_pick_pc(sd, LOG_TYPE_SCRIPT, 1, &sd->inventory.u.items_inventory[i]);
+
+ clif_additem(sd, i, 1, 0);
+ pc_equipitem(sd, i, ep);
+ clif_misceffect(&sd->bl, 3);
+
+ return SCRIPT_CMD_SUCCESS;
+}
+
+/*===============================
+ * getcostumeitem <item id>;
+ * getcostumeitem <"item name">;
+ *===============================*/
+BUILDIN_FUNC(getcostumeitem)
+{
+ unsigned short nameid;
+ struct item item_tmp;
+ TBL_PC *sd;
+ struct script_data *data;
+
+ if (!script_rid2sd(sd))
+ { // No player attached.
+ script_pushint(st, 0);
+ return SCRIPT_CMD_SUCCESS;
+ }
+
+ data = script_getdata(st, 2);
+ get_val(st, data);
+ if (data_isstring(data)) {
+ int ep;
+ const char *name = conv_str(st, data);
+ struct item_data *item_data = itemdb_searchname(name);
+ if (item_data == NULL)
+ { //Failed
+ script_pushint(st, 0);
+ return SCRIPT_CMD_SUCCESS;
+ }
+ ep = item_data->equip;
+ if (!(ep&EQP_HEAD_LOW) && !(ep&EQP_HEAD_MID) && !(ep&EQP_HEAD_TOP) && !(ep&EQP_GARMENT)){
+ ShowError("buildin_getcostumeitem: Attempted to convert non-cosmetic item to costume.");
+ return SCRIPT_CMD_FAILURE;
+ }
+ nameid = item_data->nameid;
+ }
+ else
+ nameid = conv_num(st, data);
+
+ if (!itemdb_exists(nameid))
+ { // Item does not exist.
+ script_pushint(st, 0);
+ return SCRIPT_CMD_SUCCESS;
+ }
+
+ memset(&item_tmp, 0, sizeof(item_tmp));
+ item_tmp.nameid = nameid;
+ item_tmp.amount = 1;
+ item_tmp.identify = 1;
+ item_tmp.card[0] = CARD0_CREATE;
+ item_tmp.card[2] = GetWord(battle_config.reserved_costume_id, 0);
+ item_tmp.card[3] = GetWord(battle_config.reserved_costume_id, 1);
+ if (pc_additem(sd, &item_tmp, 1, LOG_TYPE_SCRIPT)) {
+ script_pushint(st, 0);
+ return SCRIPT_CMD_SUCCESS; //Failed to add item, we will not drop if they don't fit
+ }
+
+ script_pushint(st, 1);
+ return SCRIPT_CMD_SUCCESS;
+}
+
/**
* Force stat recalculation of sd
* recalculatestat;
@@ -22428,6 +22736,11 @@ BUILDIN_FUNC(hateffect){
effectID = script_getnum(st,2);
enable = script_getnum(st,3) ? true : false;
+ if( effectID <= HAT_EF_MIN || effectID >= HAT_EF_MAX ){
+ ShowError( "buildin_hateffect: unsupported hat effect id %d\n", effectID );
+ return SCRIPT_CMD_FAILURE;
+ }
+
ARR_FIND( 0, sd->hatEffectCount, i, sd->hatEffectIDs[i] == effectID );
if( enable ){
@@ -23186,6 +23499,10 @@ BUILDIN_FUNC(unloadnpc) {
if( nd == NULL ){
ShowError( "buildin_unloadnpc: npc '%s' was not found.\n", name );
return SCRIPT_CMD_FAILURE;
+ } else if ( nd->bl.id == st->oid ) {
+ // Supporting self-unload isn't worth the problem it may cause. [Secret]
+ ShowError("buildin_unloadnpc: You cannot self-unload NPC '%s'.\n.", name);
+ return SCRIPT_CMD_FAILURE;
}
npc_unload_duplicates(nd);
@@ -23195,6 +23512,348 @@ BUILDIN_FUNC(unloadnpc) {
return SCRIPT_CMD_SUCCESS;
}
+/**
+ * Add an achievement to the player's log
+ * achievementadd(<achievement ID>{,<char ID>});
+ */
+BUILDIN_FUNC(achievementadd) {
+ struct map_session_data *sd;
+ int achievement_id = script_getnum(st, 2);
+
+ if (!script_charid2sd(3, sd)) {
+ script_pushint(st, false);
+ return SCRIPT_CMD_FAILURE;
+ }
+
+ if (achievement_exists(achievement_id) == false) {
+ ShowWarning("buildin_achievementadd: Achievement '%d' doesn't exist.\n", achievement_id);
+ script_pushint(st, false);
+ return SCRIPT_CMD_FAILURE;
+ }
+
+ if( !sd->state.pc_loaded ){
+ if( !running_npc_stat_calc_event ){
+ ShowError( "buildin_achievementadd: call was too early. Character %s(CID: '%u') was not loaded yet.\n", sd->status.name, sd->status.char_id );
+ return SCRIPT_CMD_FAILURE;
+ }else{
+ // Simply ignore it on the first call, because the status will be recalculated after loading anyway
+ return SCRIPT_CMD_SUCCESS;
+ }
+ }
+
+ if (achievement_add(sd, achievement_id))
+ script_pushint(st, true);
+ else
+ script_pushint(st, false);
+ return SCRIPT_CMD_SUCCESS;
+}
+
+/**
+ * Removes an achievement on a player.
+ * achievementremove(<achievement ID>{,<char ID>});
+ * Just for Atemo. ;)
+ */
+BUILDIN_FUNC(achievementremove) {
+ struct map_session_data *sd;
+ int achievement_id = script_getnum(st, 2);
+
+ if (!script_charid2sd(3, sd)) {
+ script_pushint(st, false);
+ return SCRIPT_CMD_FAILURE;
+ }
+
+ if (achievement_exists(achievement_id) == false) {
+ ShowWarning("buildin_achievementremove: Achievement '%d' doesn't exist.\n", achievement_id);
+ script_pushint(st, false);
+ return SCRIPT_CMD_SUCCESS;
+ }
+
+ if( !sd->state.pc_loaded ){
+ if( !running_npc_stat_calc_event ){
+ ShowError( "buildin_achievementremove: call was too early. Character %s(CID: '%u') was not loaded yet.\n", sd->status.name, sd->status.char_id );
+ return SCRIPT_CMD_FAILURE;
+ }else{
+ // Simply ignore it on the first call, because the status will be recalculated after loading anyway
+ return SCRIPT_CMD_SUCCESS;
+ }
+ }
+
+ if (achievement_remove(sd, achievement_id))
+ script_pushint(st, true);
+ else
+ script_pushint(st, false);
+ return SCRIPT_CMD_SUCCESS;
+}
+
+/**
+ * Returns achievement progress
+ * achievementinfo(<achievement ID>,<type>{,<char ID>});
+ */
+BUILDIN_FUNC(achievementinfo) {
+ struct map_session_data *sd;
+ int achievement_id = script_getnum(st, 2);
+
+ if (!script_charid2sd(4, sd)) {
+ script_pushint(st, false);
+ return SCRIPT_CMD_FAILURE;
+ }
+
+ if (achievement_exists(achievement_id) == false) {
+ ShowWarning("buildin_achievementinfo: Achievement '%d' doesn't exist.\n", achievement_id);
+ script_pushint(st, false);
+ return SCRIPT_CMD_FAILURE;
+ }
+
+ if( !sd->state.pc_loaded ){
+ script_pushint(st, false);
+ if( !running_npc_stat_calc_event ){
+ ShowError( "buildin_achievementinfo: call was too early. Character %s(CID: '%u') was not loaded yet.\n", sd->status.name, sd->status.char_id );
+ return SCRIPT_CMD_FAILURE;
+ }else{
+ // Simply ignore it on the first call, because the status will be recalculated after loading anyway
+ return SCRIPT_CMD_SUCCESS;
+ }
+ }
+
+ script_pushint(st, achievement_check_progress(sd, achievement_id, script_getnum(st, 3)));
+ return SCRIPT_CMD_SUCCESS;
+}
+
+/**
+ * Award an achievement; Ignores requirements
+ * achievementcomplete(<achievement ID>{,<char ID>});
+ */
+BUILDIN_FUNC(achievementcomplete) {
+ struct map_session_data *sd;
+ int i, achievement_id = script_getnum(st, 2);
+
+ if (!script_charid2sd(3, sd)) {
+ script_pushint(st, false);
+ return SCRIPT_CMD_FAILURE;
+ }
+
+ if (achievement_exists(achievement_id) == false) {
+ ShowWarning("buildin_achievementcomplete: Achievement '%d' doesn't exist.\n", achievement_id);
+ script_pushint(st, false);
+ return SCRIPT_CMD_FAILURE;
+ }
+
+ if( !sd->state.pc_loaded ){
+ if( !running_npc_stat_calc_event ){
+ ShowError( "buildin_achievementcomplete: call was too early. Character %s(CID: '%u') was not loaded yet.\n", sd->status.name, sd->status.char_id );
+ return SCRIPT_CMD_FAILURE;
+ }else{
+ // Simply ignore it on the first call, because the status will be recalculated after loading anyway
+ return SCRIPT_CMD_SUCCESS;
+ }
+ }
+
+ ARR_FIND(0, sd->achievement_data.count, i, sd->achievement_data.achievements[i].achievement_id == achievement_id);
+ if (i == sd->achievement_data.count)
+ achievement_add(sd, achievement_id);
+ achievement_update_achievement(sd, achievement_id, true);
+ script_pushint(st, true);
+ return SCRIPT_CMD_SUCCESS;
+}
+
+/**
+ * Checks if the achievement exists on player.
+ * achievementexists(<achievement ID>{,<char ID>});
+ */
+BUILDIN_FUNC(achievementexists) {
+ struct map_session_data *sd;
+ int i, achievement_id = script_getnum(st, 2);
+
+ if (!script_charid2sd(3, sd)) {
+ script_pushint(st, false);
+ return SCRIPT_CMD_FAILURE;
+ }
+
+ if (achievement_exists(achievement_id) == false) {
+ ShowWarning("buildin_achievementexists: Achievement '%d' doesn't exist.\n", achievement_id);
+ script_pushint(st, false);
+ return SCRIPT_CMD_SUCCESS;
+ }
+
+ if( !sd->state.pc_loaded ){
+ script_pushint(st, false);
+ if( !running_npc_stat_calc_event ){
+ ShowError( "buildin_achievementexists: call was too early. Character %s(CID: '%u') was not loaded yet.\n", sd->status.name, sd->status.char_id );
+ return SCRIPT_CMD_FAILURE;
+ }else{
+ // Simply ignore it on the first call, because the status will be recalculated after loading anyway
+ return SCRIPT_CMD_SUCCESS;
+ }
+ }
+
+ ARR_FIND(0, sd->achievement_data.count, i, sd->achievement_data.achievements[i].achievement_id == achievement_id);
+ script_pushint(st, i < sd->achievement_data.count ? true : false);
+ return SCRIPT_CMD_SUCCESS;
+}
+
+/**
+ * Updates an achievement's value.
+ * achievementupdate(<achievement ID>,<type>,<value>{,<char ID>});
+ */
+BUILDIN_FUNC(achievementupdate) {
+ struct map_session_data *sd;
+ int i, achievement_id, type, value;
+
+ achievement_id = script_getnum(st, 2);
+ type = script_getnum(st, 3);
+ value = script_getnum(st, 4);
+
+ if (!script_charid2sd(5, sd)) {
+ script_pushint(st, false);
+ return SCRIPT_CMD_FAILURE;
+ }
+
+ if (achievement_exists(achievement_id) == false) {
+ ShowWarning("buildin_achievementupdate: Achievement '%d' doesn't exist.\n", achievement_id);
+ script_pushint(st, false);
+ return SCRIPT_CMD_FAILURE;
+ }
+
+ if( !sd->state.pc_loaded ){
+ if( !running_npc_stat_calc_event ){
+ ShowError( "buildin_achievementupdate: call was too early. Character %s(CID: '%u') was not loaded yet.\n", sd->status.name, sd->status.char_id );
+ return SCRIPT_CMD_FAILURE;
+ }else{
+ // Simply ignore it on the first call, because the status will be recalculated after loading anyway
+ return SCRIPT_CMD_SUCCESS;
+ }
+ }
+
+ ARR_FIND(0, sd->achievement_data.count, i, sd->achievement_data.achievements[i].achievement_id == achievement_id);
+ if (i == sd->achievement_data.count)
+ achievement_add(sd, achievement_id);
+
+ ARR_FIND(0, sd->achievement_data.count, i, sd->achievement_data.achievements[i].achievement_id == achievement_id);
+ if (i == sd->achievement_data.count) {
+ script_pushint(st, false);
+ return SCRIPT_CMD_SUCCESS;
+ }
+
+ if (type >= ACHIEVEINFO_COUNT1 && type <= ACHIEVEINFO_COUNT10)
+ sd->achievement_data.achievements[i].count[type - 1] = value;
+ else if (type == ACHIEVEINFO_COMPLETE || type == ACHIEVEINFO_COMPLETEDATE)
+ sd->achievement_data.achievements[i].completed = value;
+ else if (type == ACHIEVEINFO_GOTREWARD)
+ sd->achievement_data.achievements[i].rewarded = value;
+ else {
+ ShowWarning("buildin_achievementupdate: Unknown type '%d'.\n", type);
+ script_pushint(st, false);
+ return SCRIPT_CMD_FAILURE;
+ }
+
+ achievement_update_achievement(sd, achievement_id, false);
+ script_pushint(st, true);
+ return SCRIPT_CMD_SUCCESS;
+}
+
+/**
+ * Get an equipment's refine cost
+ * getequiprefinecost(<equipment slot>,<type>,<information>{,<char id>})
+ * returns -1 on fail
+ */
+BUILDIN_FUNC(getequiprefinecost) {
+ int i = -1, slot, type, info;
+ map_session_data *sd;
+
+ slot = script_getnum(st, 2);
+ type = script_getnum(st, 3);
+ info = script_getnum(st, 4);
+
+ if (!script_charid2sd(5, sd)) {
+ script_pushint(st, 0);
+ return SCRIPT_CMD_FAILURE;
+ }
+
+ if (type < 0 || type >= REFINE_COST_MAX) {
+ script_pushint(st, -1);
+ return SCRIPT_CMD_SUCCESS;
+ }
+
+ if (equip_index_check(slot))
+ i = pc_checkequip(sd, equip_bitmask[slot]);
+
+ if (i < 0) {
+ script_pushint(st, -1);
+ return SCRIPT_CMD_SUCCESS;
+ }
+
+ int weapon_lv = sd->inventory_data[i]->wlv;
+ if (sd->inventory_data[i]->type == IT_SHADOWGEAR) {
+ if (sd->inventory_data[i]->equip == EQP_SHADOW_WEAPON)
+ weapon_lv = REFINE_TYPE_WEAPON4;
+ else
+ weapon_lv = REFINE_TYPE_SHADOW;
+ }
+
+ script_pushint(st, status_get_refine_cost(weapon_lv, type, info != 0));
+
+ return SCRIPT_CMD_SUCCESS;
+}
+
+/**
+ * Round, floor, ceiling a number to arbitrary integer precision.
+ * round(<number>,<precision>);
+ * ceil(<number>,<precision>);
+ * floor(<number>,<precision>);
+ */
+BUILDIN_FUNC(round) {
+ int num = script_getnum(st, 2);
+ int precision = script_getnum(st, 3);
+ char* func = script_getfuncname(st);
+
+ if (precision <= 0) {
+ ShowError("buildin_round: Attempted to use zero or negative number as arbitrary precision.\n");
+ return SCRIPT_CMD_FAILURE;
+ }
+
+ if (strcasecmp(func, "floor") == 0) {
+ script_pushint(st, num - (num % precision));
+ }
+ else if (strcasecmp(func, "ceil") == 0) {
+ script_pushint(st, num + precision - (num % precision));
+ }
+ else {
+ script_pushint(st, (int)(round(num / (precision * 1.))) * precision);
+ }
+
+ return SCRIPT_CMD_SUCCESS;
+}
+
+BUILDIN_FUNC(getequiptradability) {
+ int i, num;
+ TBL_PC *sd;
+
+ num = script_getnum(st, 2);
+
+ if (!script_charid2sd(3, sd)) {
+ return SCRIPT_CMD_FAILURE;
+ }
+
+ if (equip_index_check(num))
+ i = pc_checkequip(sd, equip_bitmask[num]);
+ else{
+ ShowError("buildin_getequiptradability: Unknown equip index '%d'\n",num);
+ return SCRIPT_CMD_FAILURE;
+ }
+
+ if (i >= 0) {
+ bool tradable = (sd->inventory.u.items_inventory[i].expire_time == 0 &&
+ (!sd->inventory.u.items_inventory[i].bound || pc_can_give_bounded_items(sd)) &&
+ itemdb_cantrade(&sd->inventory.u.items_inventory[i], pc_get_group_level(sd), pc_get_group_level(sd))
+ );
+ script_pushint(st, tradable);
+ }
+ else
+ script_pushint(st, false);
+
+ return SCRIPT_CMD_SUCCESS;
+}
+
#include "../custom/script.inc"
// declarations that were supposed to be exported from npc_chat.c
@@ -23249,6 +23908,7 @@ struct script_function buildin_func[] = {
// NPC interaction
BUILDIN_DEF(mes,"s*"),
BUILDIN_DEF(next,""),
+ BUILDIN_DEF(clear,""),
BUILDIN_DEF(close,""),
BUILDIN_DEF(close2,""),
BUILDIN_DEF(menu,"sl*"),
@@ -23371,7 +24031,7 @@ struct script_function buildin_func[] = {
BUILDIN_DEF(savepoint,"sii???"),
BUILDIN_DEF(gettimetick,"i"),
BUILDIN_DEF(gettime,"i"),
- BUILDIN_DEF(gettimestr,"si"),
+ BUILDIN_DEF(gettimestr,"si?"),
BUILDIN_DEF(openstorage,""),
BUILDIN_DEF(guildopenstorage,""),
BUILDIN_DEF(itemskill,"vi?"),
@@ -23413,11 +24073,14 @@ struct script_function buildin_func[] = {
BUILDIN_DEF2(sc_start,"sc_start2","iiii???"),
BUILDIN_DEF2(sc_start,"sc_start4","iiiiii???"),
BUILDIN_DEF(sc_end,"i?"),
+ BUILDIN_DEF(sc_end_class,"??"),
BUILDIN_DEF(getstatus, "i??"),
BUILDIN_DEF(getscrate,"ii?"),
BUILDIN_DEF(debugmes,"s"),
BUILDIN_DEF2(catchpet,"pet","i"),
BUILDIN_DEF2(birthpet,"bpet",""),
+ BUILDIN_DEF(catchpet,"i"),
+ BUILDIN_DEF(birthpet,""),
BUILDIN_DEF(resetlvl,"i?"),
BUILDIN_DEF(resetstatus,"?"),
BUILDIN_DEF(resetskill,"?"),
@@ -23448,7 +24111,7 @@ struct script_function buildin_func[] = {
BUILDIN_DEF(pvpoff,"s"),
BUILDIN_DEF(gvgon,"s"),
BUILDIN_DEF(gvgoff,"s"),
- BUILDIN_DEF(emotion,"i??"),
+ BUILDIN_DEF(emotion,"i?"),
BUILDIN_DEF(maprespawnguildid,"sii"),
BUILDIN_DEF(agitstart,""), // <Agit>
BUILDIN_DEF(agitend,""),
@@ -23622,9 +24285,9 @@ struct script_function buildin_func[] = {
BUILDIN_DEF(unitwarp,"isii"),
BUILDIN_DEF(unitattack,"iv?"),
BUILDIN_DEF(unitstopattack,"i"),
- BUILDIN_DEF(unitstopwalk,"i"),
+ BUILDIN_DEF(unitstopwalk,"i?"),
BUILDIN_DEF(unittalk,"is?"),
- BUILDIN_DEF(unitemote,"ii"),
+ BUILDIN_DEF_DEPRECATED(unitemote,"ii","20170811"),
BUILDIN_DEF(unitskilluseid,"ivi??"), // originally by Qamera [Celest]
BUILDIN_DEF(unitskillusepos,"iviii?"), // [Celest]
// <--- [zBuffer] List of unit control commands
@@ -23662,6 +24325,7 @@ struct script_function buildin_func[] = {
BUILDIN_DEF(setfont,"i"),
BUILDIN_DEF(areamobuseskill,"siiiiviiiii"),
BUILDIN_DEF(progressbar,"si"),
+ BUILDIN_DEF(progressbar_npc, "si?"),
BUILDIN_DEF(pushpc,"ii"),
BUILDIN_DEF(buyingstore,"i"),
BUILDIN_DEF(searchstores,"ii"),
@@ -23717,7 +24381,7 @@ struct script_function buildin_func[] = {
BUILDIN_DEF(get_revision,""),
BUILDIN_DEF(get_githash,""),
BUILDIN_DEF(freeloop,"?"),
- BUILDIN_DEF(getrandgroupitem,"i??"),
+ BUILDIN_DEF(getrandgroupitem,"i????"),
BUILDIN_DEF(cleanmap,"s"),
BUILDIN_DEF2(cleanmap,"cleanarea","siiii"),
BUILDIN_DEF(npcskill,"viii"),
@@ -23758,14 +24422,13 @@ struct script_function buildin_func[] = {
BUILDIN_DEF(clan_join,"i?"),
BUILDIN_DEF(clan_leave,"?"),
- BUILDIN_DEF(is_clientver,"ii?"),
BUILDIN_DEF2(montransform, "transform", "vi?????"), // Monster Transform [malufett/Hercules]
BUILDIN_DEF2(montransform, "active_transform", "vi?????"),
BUILDIN_DEF(vip_status,"i?"),
BUILDIN_DEF(vip_time,"i?"),
BUILDIN_DEF(bonus_script,"si????"),
BUILDIN_DEF(bonus_script_clear,"??"),
- BUILDIN_DEF(getgroupitem,"i?"),
+ BUILDIN_DEF(getgroupitem,"i??"),
BUILDIN_DEF(enable_command,""),
BUILDIN_DEF(disable_command,""),
BUILDIN_DEF(getguildmember,"i??"),
@@ -23777,7 +24440,7 @@ struct script_function buildin_func[] = {
BUILDIN_DEF(npcshopupdate,"sii?"),
BUILDIN_DEF(getattachedrid,""),
BUILDIN_DEF(getvar,"vi"),
- BUILDIN_DEF(showscript,"s?"),
+ BUILDIN_DEF(showscript,"s??"),
BUILDIN_DEF(ignoretimeout,"i?"),
BUILDIN_DEF(geteleminfo,"i?"),
BUILDIN_DEF(setquestinfo_level,"iii"),
@@ -23788,6 +24451,8 @@ struct script_function buildin_func[] = {
BUILDIN_DEF(getguildalliance,"ii"),
BUILDIN_DEF(adopt,"vv"),
BUILDIN_DEF(getexp2,"ii?"),
+ BUILDIN_DEF(costume, "i"),
+ BUILDIN_DEF(getcostumeitem, "v"),
BUILDIN_DEF(recalculatestat,""),
BUILDIN_DEF(hateffect,"ii"),
BUILDIN_DEF(getrandomoptinfo, "i"),
@@ -23826,6 +24491,20 @@ struct script_function buildin_func[] = {
BUILDIN_DEF2(delitem2,"delitem3","viiiiiiiirrr?"),
BUILDIN_DEF2(countitem,"countitem3","viiiiiiirrr?"),
+ // Achievement System
+ BUILDIN_DEF(achievementinfo,"ii?"),
+ BUILDIN_DEF(achievementadd,"i?"),
+ BUILDIN_DEF(achievementremove,"i?"),
+ BUILDIN_DEF(achievementcomplete,"i?"),
+ BUILDIN_DEF(achievementexists,"i?"),
+ BUILDIN_DEF(achievementupdate,"iii?"),
+
+
+ BUILDIN_DEF(getequiprefinecost,"iii?"),
+ BUILDIN_DEF2(round, "round", "i"),
+ BUILDIN_DEF2(round, "ceil", "i"),
+ BUILDIN_DEF2(round, "floor", "i"),
+ BUILDIN_DEF(getequiptradability, "i?"),
#include "../custom/script_def.inc"
{NULL,NULL,NULL},
diff --git a/src/map/script.h b/src/map/script.h
deleted file mode 100644
index 12ac404c4c9..00000000000
--- a/src/map/script.h
+++ /dev/null
@@ -1,787 +0,0 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder
-
-#ifndef _SCRIPT_H_
-#define _SCRIPT_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "../common/cbasetypes.h"
-#include "map.h"
-
-#define NUM_WHISPER_VAR 10
-
-///////////////////////////////////////////////////////////////////////////////
-//## TODO possible enhancements: [FlavioJS]
-// - 'callfunc' supporting labels in the current npc "::LabelName"
-// - 'callfunc' supporting labels in other npcs "NpcName::LabelName"
-// - 'function FuncName;' function declarations reverting to global functions
-// if local label isn't found
-// - join callfunc and callsub's functionality
-// - remove dynamic allocation in add_word()
-// - remove GETVALUE / SETVALUE
-// - clean up the set_reg / set_val / setd_sub mess
-// - detect invalid label references at parse-time
-
-//
-// struct script_state* st;
-//
-
-/// Returns the script_data at the target index
-#define script_getdata(st,i) ( &((st)->stack->stack_data[(st)->start + (i)]) )
-/// Returns if the stack contains data at the target index
-#define script_hasdata(st,i) ( (st)->end > (st)->start + (i) )
-/// Returns the index of the last data in the stack
-#define script_lastdata(st) ( (st)->end - (st)->start - 1 )
-/// Pushes an int into the stack
-#define script_pushint(st,val) push_val((st)->stack, C_INT, (val))
-/// Pushes a string into the stack (script engine frees it automatically)
-#define script_pushstr(st,val) push_str((st)->stack, C_STR, (val))
-/// Pushes a copy of a string into the stack
-#define script_pushstrcopy(st,val) push_str((st)->stack, C_STR, aStrdup(val))
-/// Pushes a constant string into the stack (must never change or be freed)
-#define script_pushconststr(st,val) push_str((st)->stack, C_CONSTSTR, (val))
-/// Pushes a nil into the stack
-#define script_pushnil(st) push_val((st)->stack, C_NOP, 0)
-/// Pushes a copy of the data in the target index
-#define script_pushcopy(st,i) push_copy((st)->stack, (st)->start + (i))
-
-#define script_isstring(st,i) data_isstring(script_getdata(st,i))
-#define script_isint(st,i) data_isint(script_getdata(st,i))
-
-#define script_getnum(st,val) conv_num(st, script_getdata(st,val))
-#define script_getstr(st,val) conv_str(st, script_getdata(st,val))
-#define script_getref(st,val) ( script_getdata(st,val)->ref )
-// Returns name of currently running function
-#define script_getfuncname(st) ( st->funcname )
-
-// Note: "top" functions/defines use indexes relative to the top of the stack
-// -1 is the index of the data at the top
-
-/// Returns the script_data at the target index relative to the top of the stack
-#define script_getdatatop(st,i) ( &((st)->stack->stack_data[(st)->stack->sp + (i)]) )
-/// Pushes a copy of the data in the target index relative to the top of the stack
-#define script_pushcopytop(st,i) push_copy((st)->stack, (st)->stack->sp + (i))
-/// Removes the range of values [start,end[ relative to the top of the stack
-#define script_removetop(st,start,end) ( pop_stack((st), ((st)->stack->sp + (start)), (st)->stack->sp + (end)) )
-
-//
-// struct script_data* data;
-//
-
-/// Returns if the script data is a string
-#define data_isstring(data) ( (data)->type == C_STR || (data)->type == C_CONSTSTR )
-/// Returns if the script data is an int
-#define data_isint(data) ( (data)->type == C_INT )
-/// Returns if the script data is a reference
-#define data_isreference(data) ( (data)->type == C_NAME )
-/// Returns if the script data is a label
-#define data_islabel(data) ( (data)->type == C_POS )
-/// Returns if the script data is an internal script function label
-#define data_isfunclabel(data) ( (data)->type == C_USERFUNC_POS )
-
-/// Returns if this is a reference to a constant
-#define reference_toconstant(data) ( str_data[reference_getid(data)].type == C_INT )
-/// Returns if this a reference to a param
-#define reference_toparam(data) ( str_data[reference_getid(data)].type == C_PARAM )
-/// Returns if this a reference to a variable
-//##TODO confirm it's C_NAME [FlavioJS]
-#define reference_tovariable(data) ( str_data[reference_getid(data)].type == C_NAME )
-/// Returns the unique id of the reference (id and index)
-#define reference_getuid(data) ( (data)->u.num )
-/// Returns the id of the reference
-#define reference_getid(data) ( (int32)(int64)(reference_getuid(data) & 0xffffffff) )
-/// Returns the array index of the reference
-#define reference_getindex(data) ( (uint32)(int64)((reference_getuid(data) >> 32) & 0xffffffff) )
-/// Returns the name of the reference
-#define reference_getname(data) ( str_buf + str_data[reference_getid(data)].str )
-/// Returns the linked list of uid-value pairs of the reference (can be NULL)
-#define reference_getref(data) ( (data)->ref )
-/// Returns the value of the constant
-#define reference_getconstant(data) ( str_data[reference_getid(data)].val )
-/// Returns the type of param
-#define reference_getparamtype(data) ( str_data[reference_getid(data)].val )
-
-/// Composes the uid of a reference from the id and the index
-#define reference_uid(id,idx) ( (int64) ((uint64)(id) & 0xFFFFFFFF) | ((uint64)(idx) << 32) )
-
-/// Checks whether two references point to the same variable (or array)
-#define is_same_reference(data1, data2) \
- ( reference_getid(data1) == reference_getid(data2) \
- && ( (data1->ref == data2->ref && data1->ref == NULL) \
- || (data1->ref != NULL && data2->ref != NULL && data1->ref->vars == data2->ref->vars \
- ) ) )
-
-#define script_getvarid(var) ( (int32)(int64)(var & 0xFFFFFFFF) )
-#define script_getvaridx(var) ( (uint32)(int64)((var >> 32) & 0xFFFFFFFF) )
-
-#define not_server_variable(prefix) ( (prefix) != '$' && (prefix) != '.' && (prefix) != '\'')
-#define is_string_variable(name) ( (name)[strlen(name) - 1] == '$' )
-
-#define FETCH(n, t) \
- if( script_hasdata(st,n) ) \
- (t)=script_getnum(st,n);
-
-/// Maximum amount of elements in script arrays
-#define SCRIPT_MAX_ARRAYSIZE (UINT_MAX - 1)
-
-enum script_cmd_result {
- SCRIPT_CMD_SUCCESS = 0, ///when a buildin cmd was correctly done
- SCRIPT_CMD_FAILURE = 1, ///when an errors appear in cmd, show_debug will follow
-};
-
-#define SCRIPT_BLOCK_SIZE 512
-enum { LABEL_NEXTLINE = 1, LABEL_START };
-
-struct map_session_data;
-struct eri;
-
-extern int potion_flag; //For use on Alchemist improved potions/Potion Pitcher. [Skotlex]
-extern int potion_hp, potion_per_hp, potion_sp, potion_per_sp;
-extern int potion_target;
-extern unsigned int *generic_ui_array;
-extern unsigned int generic_ui_array_size;
-
-extern struct Script_Config {
- unsigned warn_func_mismatch_argtypes : 1;
- unsigned warn_func_mismatch_paramnum : 1;
- int check_cmdcount;
- int check_gotocount;
- int input_min_value;
- int input_max_value;
-
- // PC related
- const char *die_event_name;
- const char *kill_pc_event_name;
- const char *kill_mob_event_name;
- const char *login_event_name;
- const char *logout_event_name;
- const char *loadmap_event_name;
- const char *baselvup_event_name;
- const char *joblvup_event_name;
- const char *stat_calc_event_name;
-
- // NPC related
- const char* ontouch_event_name;
- const char* ontouch2_event_name;
- const char* ontouchnpc_event_name;
- const char* onwhisper_event_name;
- const char* oncommand_event_name;
-
- // Init related
- const char* init_event_name;
- const char* inter_init_event_name;
- const char* inter_init_once_event_name;
-
- // Guild related
- const char* guild_break_event_name;
- const char* agit_start_event_name;
- const char* agit_init_event_name;
- const char* agit_end_event_name;
- const char* agit_start2_event_name;
- const char* agit_init2_event_name;
- const char* agit_end2_event_name;
- const char* agit_start3_event_name;
- const char* agit_init3_event_name;
- const char* agit_end3_event_name;
-
- // Timer related
- const char* timer_event_name;
- const char* timer_minute_event_name;
- const char* timer_hour_event_name;
- const char* timer_clock_event_name;
- const char* timer_day_event_name;
- const char* timer_sunday_event_name;
- const char* timer_monday_event_name;
- const char* timer_tuesday_event_name;
- const char* timer_wednesday_event_name;
- const char* timer_thursday_event_name;
- const char* timer_friday_event_name;
- const char* timer_saturday_event_name;
-
- // Instance related
- const char* instance_init_event_name;
- const char* instance_destroy_event_name;
-} script_config;
-
-typedef enum c_op {
- C_NOP, // end of script/no value (nil)
- C_POS,
- C_INT, // number
- C_PARAM, // parameter variable (see pc_readparam/pc_setparam)
- C_FUNC, // buildin function call
- C_STR, // string (free'd automatically)
- C_CONSTSTR, // string (not free'd)
- C_ARG, // start of argument list
- C_NAME,
- C_EOL, // end of line (extra stack values are cleared)
- C_RETINFO,
- C_USERFUNC, // internal script function
- C_USERFUNC_POS, // internal script function label
- C_REF, // the next call to c_op2 should push back a ref to the left operand
-
- // operators
- C_OP3, // a ? b : c
- C_LOR, // a || b
- C_LAND, // a && b
- C_LE, // a <= b
- C_LT, // a < b
- C_GE, // a >= b
- C_GT, // a > b
- C_EQ, // a == b
- C_NE, // a != b
- C_XOR, // a ^ b
- C_OR, // a | b
- C_AND, // a & b
- C_ADD, // a + b
- C_SUB, // a - b
- C_MUL, // a * b
- C_DIV, // a / b
- C_MOD, // a % b
- C_NEG, // - a
- C_LNOT, // ! a
- C_NOT, // ~ a
- C_R_SHIFT, // a >> b
- C_L_SHIFT, // a << b
- C_ADD_POST, // a++
- C_SUB_POST, // a--
- C_ADD_PRE, // ++a
- C_SUB_PRE, // --a
-} c_op;
-
-/**
- * Generic reg database abstraction to be used with various types of regs/script variables.
- */
-struct reg_db {
- struct DBMap *vars;
- struct DBMap *arrays;
-};
-
-struct script_retinfo {
- struct reg_db scope; ///< scope variables
- struct script_code* script; ///< script code
- int pos; ///< script location
- int nargs; ///< argument count
- int defsp; ///< default stack pointer
-};
-
-struct script_data {
- enum c_op type;
- union script_data_val {
- int64 num;
- char *str;
- struct script_retinfo* ri;
- } u;
- struct reg_db *ref;
-};
-
-// Moved defsp from script_state to script_stack since
-// it must be saved when script state is RERUNLINE. [Eoe / jA 1094]
-struct script_code {
- int script_size;
- unsigned char* script_buf;
- struct reg_db local;
- unsigned short instances;
-};
-
-struct script_stack {
- int sp; ///< number of entries in the stack
- int sp_max; ///< capacity of the stack
- int defsp;
- struct script_data *stack_data; ///< stack
- struct reg_db scope; ///< scope variables
-};
-
-
-//
-// Script state
-//
-enum e_script_state { RUN,STOP,END,RERUNLINE,GOTO,RETFUNC,CLOSE };
-
-struct script_state {
- struct script_stack* stack;
- int start,end;
- int pos;
- enum e_script_state state;
- int rid,oid;
- struct script_code *script;
- struct sleep_data {
- int tick,timer,charid;
- } sleep;
- //For backing up purposes
- struct script_state *bk_st;
- int bk_npcid;
- unsigned freeloop : 1;// used by buildin_freeloop
- unsigned op2ref : 1;// used by op_2
- unsigned npc_item_flag : 1;
- unsigned mes_active : 1; // Store if invoking character has a NPC dialog box open.
- char* funcname; // Stores the current running function name
- unsigned int id;
-};
-
-struct script_reg {
- int64 index;
- int data;
-};
-
-struct script_regstr {
- int64 index;
- char* data;
-};
-
-struct script_array {
- unsigned int id; ///< the first 32b of the 64b uid, aka the id
- unsigned int size; ///< how many members
- unsigned int *members; ///< member list
-};
-
-enum script_parse_options {
- SCRIPT_USE_LABEL_DB = 0x1,// records labels in scriptlabel_db
- SCRIPT_IGNORE_EXTERNAL_BRACKETS = 0x2,// ignores the check for {} brackets around the script
- SCRIPT_RETURN_EMPTY_SCRIPT = 0x4// returns the script object instead of NULL for empty scripts
-};
-
-enum monsterinfo_types {
- MOB_NAME = 0,
- MOB_LV,
- MOB_MAXHP,
- MOB_BASEEXP,
- MOB_JOBEXP,
- MOB_ATK1,
- MOB_ATK2,
- MOB_DEF,
- MOB_MDEF,
- MOB_STR,
- MOB_AGI,
- MOB_VIT,
- MOB_INT,
- MOB_DEX,
- MOB_LUK,
- MOB_RANGE,
- MOB_RANGE2,
- MOB_RANGE3,
- MOB_SIZE,
- MOB_RACE,
- MOB_ELEMENT,
- MOB_MODE,
- MOB_MVPEXP
-};
-
-enum petinfo_types {
- PETINFO_ID = 0,
- PETINFO_CLASS,
- PETINFO_NAME,
- PETINFO_INTIMATE,
- PETINFO_HUNGRY,
- PETINFO_RENAMED,
- PETINFO_LEVEL,
- PETINFO_BLOCKID
-};
-
-enum questinfo_types {
- QTYPE_QUEST = 0,
- QTYPE_QUEST2,
- QTYPE_JOB,
- QTYPE_JOB2,
- QTYPE_EVENT,
- QTYPE_EVENT2,
- QTYPE_WARG,
- // 7 = free
- QTYPE_WARG2 = 8,
- // 9 - 9998 = free
- QTYPE_NONE = 9999
-};
-
-#ifndef WIN32
- // These are declared in wingdi.h
- /* Font Weights */
- #define FW_DONTCARE 0
- #define FW_THIN 100
- #define FW_EXTRALIGHT 200
- #define FW_LIGHT 300
- #define FW_NORMAL 400
- #define FW_MEDIUM 500
- #define FW_SEMIBOLD 600
- #define FW_BOLD 700
- #define FW_EXTRABOLD 800
- #define FW_HEAVY 900
-#endif
-
-enum getmapxy_types {
- UNITTYPE_PC = 0,
- UNITTYPE_NPC,
- UNITTYPE_PET,
- UNITTYPE_MOB,
- UNITTYPE_HOM,
- UNITTYPE_MER,
- UNITTYPE_ELEM,
-};
-
-enum unitdata_mobtypes {
- UMOB_SIZE = 0,
- UMOB_LEVEL,
- UMOB_HP,
- UMOB_MAXHP,
- UMOB_MASTERAID,
- UMOB_MAPID,
- UMOB_X,
- UMOB_Y,
- UMOB_SPEED,
- UMOB_MODE,
- UMOB_AI,
- UMOB_SCOPTION,
- UMOB_SEX,
- UMOB_CLASS,
- UMOB_HAIRSTYLE,
- UMOB_HAIRCOLOR,
- UMOB_HEADBOTTOM,
- UMOB_HEADMIDDLE,
- UMOB_HEADTOP,
- UMOB_CLOTHCOLOR,
- UMOB_SHIELD,
- UMOB_WEAPON,
- UMOB_LOOKDIR,
- UMOB_CANMOVETICK,
- UMOB_STR,
- UMOB_AGI,
- UMOB_VIT,
- UMOB_INT,
- UMOB_DEX,
- UMOB_LUK,
- UMOB_SLAVECPYMSTRMD,
- UMOB_DMGIMMUNE,
- UMOB_ATKRANGE,
- UMOB_ATKMIN,
- UMOB_ATKMAX,
- UMOB_MATKMIN,
- UMOB_MATKMAX,
- UMOB_DEF,
- UMOB_MDEF,
- UMOB_HIT,
- UMOB_FLEE,
- UMOB_PDODGE,
- UMOB_CRIT,
- UMOB_RACE,
- UMOB_ELETYPE,
- UMOB_ELELEVEL,
- UMOB_AMOTION,
- UMOB_ADELAY,
- UMOB_DMOTION,
-};
-
-enum unitdata_homuntypes {
- UHOM_SIZE = 0,
- UHOM_LEVEL,
- UHOM_HP,
- UHOM_MAXHP,
- UHOM_SP,
- UHOM_MAXSP,
- UHOM_MASTERCID,
- UHOM_MAPID,
- UHOM_X,
- UHOM_Y,
- UHOM_HUNGER,
- UHOM_INTIMACY,
- UHOM_SPEED,
- UHOM_LOOKDIR,
- UHOM_CANMOVETICK,
- UHOM_STR,
- UHOM_AGI,
- UHOM_VIT,
- UHOM_INT,
- UHOM_DEX,
- UHOM_LUK,
- UHOM_DMGIMMUNE,
- UHOM_ATKRANGE,
- UHOM_ATKMIN,
- UHOM_ATKMAX,
- UHOM_MATKMIN,
- UHOM_MATKMAX,
- UHOM_DEF,
- UHOM_MDEF,
- UHOM_HIT,
- UHOM_FLEE,
- UHOM_PDODGE,
- UHOM_CRIT,
- UHOM_RACE,
- UHOM_ELETYPE,
- UHOM_ELELEVEL,
- UHOM_AMOTION,
- UHOM_ADELAY,
- UHOM_DMOTION,
-};
-
-enum unitdata_pettypes {
- UPET_SIZE = 0,
- UPET_LEVEL,
- UPET_HP,
- UPET_MAXHP,
- UPET_MASTERAID,
- UPET_MAPID,
- UPET_X,
- UPET_Y,
- UPET_HUNGER,
- UPET_INTIMACY,
- UPET_SPEED,
- UPET_LOOKDIR,
- UPET_CANMOVETICK,
- UPET_STR,
- UPET_AGI,
- UPET_VIT,
- UPET_INT,
- UPET_DEX,
- UPET_LUK,
- UPET_DMGIMMUNE,
- UPET_ATKRANGE,
- UPET_ATKMIN,
- UPET_ATKMAX,
- UPET_MATKMIN,
- UPET_MATKMAX,
- UPET_DEF,
- UPET_MDEF,
- UPET_HIT,
- UPET_FLEE,
- UPET_PDODGE,
- UPET_CRIT,
- UPET_RACE,
- UPET_ELETYPE,
- UPET_ELELEVEL,
- UPET_AMOTION,
- UPET_ADELAY,
- UPET_DMOTION,
-};
-
-enum unitdata_merctypes {
- UMER_SIZE = 0,
- UMER_HP,
- UMER_MAXHP,
- UMER_MASTERCID,
- UMER_MAPID,
- UMER_X,
- UMER_Y,
- UMER_KILLCOUNT,
- UMER_LIFETIME,
- UMER_SPEED,
- UMER_LOOKDIR,
- UMER_CANMOVETICK,
- UMER_STR,
- UMER_AGI,
- UMER_VIT,
- UMER_INT,
- UMER_DEX,
- UMER_LUK,
- UMER_DMGIMMUNE,
- UMER_ATKRANGE,
- UMER_ATKMIN,
- UMER_ATKMAX,
- UMER_MATKMIN,
- UMER_MATKMAX,
- UMER_DEF,
- UMER_MDEF,
- UMER_HIT,
- UMER_FLEE,
- UMER_PDODGE,
- UMER_CRIT,
- UMER_RACE,
- UMER_ELETYPE,
- UMER_ELELEVEL,
- UMER_AMOTION,
- UMER_ADELAY,
- UMER_DMOTION,
-};
-
-enum unitdata_elemtypes {
- UELE_SIZE = 0,
- UELE_HP,
- UELE_MAXHP,
- UELE_SP,
- UELE_MAXSP,
- UELE_MASTERCID,
- UELE_MAPID,
- UELE_X,
- UELE_Y,
- UELE_LIFETIME,
- UELE_MODE,
- UELE_SPEED,
- UELE_LOOKDIR,
- UELE_CANMOVETICK,
- UELE_STR,
- UELE_AGI,
- UELE_VIT,
- UELE_INT,
- UELE_DEX,
- UELE_LUK,
- UELE_DMGIMMUNE,
- UELE_ATKRANGE,
- UELE_ATKMIN,
- UELE_ATKMAX,
- UELE_MATKMIN,
- UELE_MATKMAX,
- UELE_DEF,
- UELE_MDEF,
- UELE_HIT,
- UELE_FLEE,
- UELE_PDODGE,
- UELE_CRIT,
- UELE_RACE,
- UELE_ELETYPE,
- UELE_ELELEVEL,
- UELE_AMOTION,
- UELE_ADELAY,
- UELE_DMOTION,
-};
-
-enum unitdata_npctypes {
- UNPC_DISPLAY = 0,
- UNPC_LEVEL,
- UNPC_HP,
- UNPC_MAXHP,
- UNPC_MAPID,
- UNPC_X,
- UNPC_Y,
- UNPC_LOOKDIR,
- UNPC_STR,
- UNPC_AGI,
- UNPC_VIT,
- UNPC_INT,
- UNPC_DEX,
- UNPC_LUK,
- UNPC_PLUSALLSTAT,
- UNPC_DMGIMMUNE,
- UNPC_ATKRANGE,
- UNPC_ATKMIN,
- UNPC_ATKMAX,
- UNPC_MATKMIN,
- UNPC_MATKMAX,
- UNPC_DEF,
- UNPC_MDEF,
- UNPC_HIT,
- UNPC_FLEE,
- UNPC_PDODGE,
- UNPC_CRIT,
- UNPC_RACE,
- UNPC_ELETYPE,
- UNPC_ELELEVEL,
- UNPC_AMOTION,
- UNPC_ADELAY,
- UNPC_DMOTION,
-};
-
-enum navigation_service {
- NAV_NONE = 0, ///< 0
- NAV_AIRSHIP_ONLY = 1, ///< 1 (actually 1-9)
- NAV_SCROLL_ONLY = 10, ///< 10
- NAV_AIRSHIP_AND_SCROLL = NAV_AIRSHIP_ONLY + NAV_SCROLL_ONLY, ///< 11 (actually 11-99)
- NAV_KAFRA_ONLY = 100, ///< 100
- NAV_KAFRA_AND_AIRSHIP = NAV_KAFRA_ONLY + NAV_AIRSHIP_ONLY, ///< 101 (actually 101-109)
- NAV_KAFRA_AND_SCROLL = NAV_KAFRA_ONLY + NAV_SCROLL_ONLY, ///< 110
- NAV_ALL = NAV_AIRSHIP_ONLY + NAV_SCROLL_ONLY + NAV_KAFRA_ONLY ///< 111 (actually 111-255)
-};
-
-enum random_option_attribute {
- ROA_ID = 0,
- ROA_VALUE,
- ROA_PARAM,
-};
-
-enum instance_info_type {
- IIT_ID,
- IIT_TIME_LIMIT,
- IIT_IDLE_TIMEOUT,
- IIT_ENTER_MAP,
- IIT_ENTER_X,
- IIT_ENTER_Y,
- IIT_MAPCOUNT,
- IIT_MAP
-};
-
-enum vip_status_type {
- VIP_STATUS_ACTIVE = 1,
- VIP_STATUS_EXPIRE,
- VIP_STATUS_REMAINING
-};
-
-/**
- * used to generate quick script_array entries
- **/
-struct eri *array_ers;
-DBMap *st_db;
-unsigned int active_scripts;
-unsigned int next_id;
-struct eri *st_ers;
-struct eri *stack_ers;
-
-const char* skip_space(const char* p);
-void script_error(const char* src, const char* file, int start_line, const char* error_msg, const char* error_pos);
-void script_warning(const char* src, const char* file, int start_line, const char* error_msg, const char* error_pos);
-
-struct script_code* parse_script(const char* src,const char* file,int line,int options);
-void run_script(struct script_code *rootscript,int pos,int rid,int oid);
-
-int set_reg(struct script_state* st, TBL_PC* sd, int64 num, const char* name, const void* value, struct reg_db *ref);
-int set_var(struct map_session_data *sd, char *name, void *val);
-int conv_num(struct script_state *st,struct script_data *data);
-const char* conv_str(struct script_state *st,struct script_data *data);
-void pop_stack(struct script_state* st, int start, int end);
-int run_script_timer(int tid, unsigned int tick, int id, intptr_t data);
-void script_stop_sleeptimers(int id);
-struct linkdb_node *script_erase_sleepdb(struct linkdb_node *n);
-void run_script_main(struct script_state *st);
-
-void script_stop_scriptinstances(struct script_code *code);
-void script_free_code(struct script_code* code);
-void script_free_vars(struct DBMap *storage);
-struct script_state* script_alloc_state(struct script_code* rootscript, int pos, int rid, int oid);
-void script_free_state(struct script_state* st);
-
-struct DBMap* script_get_label_db(void);
-struct DBMap* script_get_userfunc_db(void);
-void script_run_autobonus(const char *autobonus, struct map_session_data *sd, unsigned int pos);
-
-bool script_get_constant(const char* name, int* value);
-void script_set_constant(const char* name, int value, bool isparameter, bool deprecated);
-void script_hardcoded_constants(void);
-
-void script_cleararray_pc(struct map_session_data* sd, const char* varname, void* value);
-void script_setarray_pc(struct map_session_data* sd, const char* varname, uint32 idx, void* value, int* refcache);
-
-int script_config_read(const char *cfgName);
-void do_init_script(void);
-void do_final_script(void);
-int add_str(const char* p);
-const char* get_str(int id);
-void script_reload(void);
-
-// @commands (script based)
-void setd_sub(struct script_state *st, TBL_PC *sd, const char *varname, int elem, void *value, struct reg_db *ref);
-
-/**
- * Array Handling
- **/
-struct reg_db *script_array_src(struct script_state *st, struct map_session_data *sd, const char *name, struct reg_db *ref);
-void script_array_update(struct reg_db *src, int64 num, bool empty);
-void script_array_delete(struct reg_db *src, struct script_array *sa);
-void script_array_remove_member(struct reg_db *src, struct script_array *sa, unsigned int idx);
-void script_array_add_member(struct script_array *sa, unsigned int idx);
-unsigned int script_array_size(struct script_state *st, struct map_session_data *sd, const char *name, struct reg_db *ref);
-unsigned int script_array_highest_key(struct script_state *st, struct map_session_data *sd, const char *name, struct reg_db *ref);
-void script_array_ensure_zero(struct script_state *st, struct map_session_data *sd, int64 uid, struct reg_db *ref);
-int script_free_array_db(DBKey key, DBData *data, va_list ap);
-/* */
-void script_reg_destroy_single(struct map_session_data *sd, int64 reg, struct script_reg_state *data);
-int script_reg_destroy(DBKey key, DBData *data, va_list ap);
-/* */
-void script_generic_ui_array_expand(unsigned int plus);
-unsigned int *script_array_cpy_list(struct script_array *sa);
-
-#ifdef BETA_THREAD_TEST
-void queryThread_log(char * entry, int length);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _SCRIPT_H_ */
diff --git a/src/map/script.hpp b/src/map/script.hpp
new file mode 100644
index 00000000000..fa5f0e8c60a
--- /dev/null
+++ b/src/map/script.hpp
@@ -0,0 +1,1975 @@
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
+#ifndef _SCRIPT_HPP_
+#define _SCRIPT_HPP_
+
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
+#include "../common/mmo.h"
+
+#define NUM_WHISPER_VAR 10
+
+///////////////////////////////////////////////////////////////////////////////
+//## TODO possible enhancements: [FlavioJS]
+// - 'callfunc' supporting labels in the current npc "::LabelName"
+// - 'callfunc' supporting labels in other npcs "NpcName::LabelName"
+// - 'function FuncName;' function declarations reverting to global functions
+// if local label isn't found
+// - join callfunc and callsub's functionality
+// - remove dynamic allocation in add_word()
+// - remove GETVALUE / SETVALUE
+// - clean up the set_reg / set_val / setd_sub mess
+// - detect invalid label references at parse-time
+
+//
+// struct script_state* st;
+//
+
+/// Returns the script_data at the target index
+#define script_getdata(st,i) ( &((st)->stack->stack_data[(st)->start + (i)]) )
+/// Returns if the stack contains data at the target index
+#define script_hasdata(st,i) ( (st)->end > (st)->start + (i) )
+/// Returns the index of the last data in the stack
+#define script_lastdata(st) ( (st)->end - (st)->start - 1 )
+/// Pushes an int into the stack
+#define script_pushint(st,val) push_val((st)->stack, C_INT, (val))
+/// Pushes a string into the stack (script engine frees it automatically)
+#define script_pushstr(st,val) push_str((st)->stack, C_STR, (val))
+/// Pushes a copy of a string into the stack
+#define script_pushstrcopy(st,val) push_str((st)->stack, C_STR, aStrdup(val))
+/// Pushes a constant string into the stack (must never change or be freed)
+#define script_pushconststr(st,val) push_str((st)->stack, C_CONSTSTR, const_cast<char *>(val))
+/// Pushes a nil into the stack
+#define script_pushnil(st) push_val((st)->stack, C_NOP, 0)
+/// Pushes a copy of the data in the target index
+#define script_pushcopy(st,i) push_copy((st)->stack, (st)->start + (i))
+
+#define script_isstring(st,i) data_isstring(script_getdata(st,i))
+#define script_isint(st,i) data_isint(script_getdata(st,i))
+
+#define script_getnum(st,val) conv_num(st, script_getdata(st,val))
+#define script_getstr(st,val) conv_str(st, script_getdata(st,val))
+#define script_getref(st,val) ( script_getdata(st,val)->ref )
+// Returns name of currently running function
+#define script_getfuncname(st) ( st->funcname )
+
+// Note: "top" functions/defines use indexes relative to the top of the stack
+// -1 is the index of the data at the top
+
+/// Returns the script_data at the target index relative to the top of the stack
+#define script_getdatatop(st,i) ( &((st)->stack->stack_data[(st)->stack->sp + (i)]) )
+/// Pushes a copy of the data in the target index relative to the top of the stack
+#define script_pushcopytop(st,i) push_copy((st)->stack, (st)->stack->sp + (i))
+/// Removes the range of values [start,end[ relative to the top of the stack
+#define script_removetop(st,start,end) ( pop_stack((st), ((st)->stack->sp + (start)), (st)->stack->sp + (end)) )
+
+//
+// struct script_data* data;
+//
+
+/// Returns if the script data is a string
+#define data_isstring(data) ( (data)->type == C_STR || (data)->type == C_CONSTSTR )
+/// Returns if the script data is an int
+#define data_isint(data) ( (data)->type == C_INT )
+/// Returns if the script data is a reference
+#define data_isreference(data) ( (data)->type == C_NAME )
+/// Returns if the script data is a label
+#define data_islabel(data) ( (data)->type == C_POS )
+/// Returns if the script data is an internal script function label
+#define data_isfunclabel(data) ( (data)->type == C_USERFUNC_POS )
+
+/// Returns if this is a reference to a constant
+#define reference_toconstant(data) ( str_data[reference_getid(data)].type == C_INT )
+/// Returns if this a reference to a param
+#define reference_toparam(data) ( str_data[reference_getid(data)].type == C_PARAM )
+/// Returns if this a reference to a variable
+//##TODO confirm it's C_NAME [FlavioJS]
+#define reference_tovariable(data) ( str_data[reference_getid(data)].type == C_NAME )
+/// Returns the unique id of the reference (id and index)
+#define reference_getuid(data) ( (data)->u.num )
+/// Returns the id of the reference
+#define reference_getid(data) ( (int32)(int64)(reference_getuid(data) & 0xffffffff) )
+/// Returns the array index of the reference
+#define reference_getindex(data) ( (uint32)(int64)((reference_getuid(data) >> 32) & 0xffffffff) )
+/// Returns the name of the reference
+#define reference_getname(data) ( str_buf + str_data[reference_getid(data)].str )
+/// Returns the linked list of uid-value pairs of the reference (can be NULL)
+#define reference_getref(data) ( (data)->ref )
+/// Returns the value of the constant
+#define reference_getconstant(data) ( str_data[reference_getid(data)].val )
+/// Returns the type of param
+#define reference_getparamtype(data) ( str_data[reference_getid(data)].val )
+
+/// Composes the uid of a reference from the id and the index
+#define reference_uid(id,idx) ( (int64) ((uint64)(id) & 0xFFFFFFFF) | ((uint64)(idx) << 32) )
+
+/// Checks whether two references point to the same variable (or array)
+#define is_same_reference(data1, data2) \
+ ( reference_getid(data1) == reference_getid(data2) \
+ && ( (data1->ref == data2->ref && data1->ref == NULL) \
+ || (data1->ref != NULL && data2->ref != NULL && data1->ref->vars == data2->ref->vars \
+ ) ) )
+
+#define script_getvarid(var) ( (int32)(int64)(var & 0xFFFFFFFF) )
+#define script_getvaridx(var) ( (uint32)(int64)((var >> 32) & 0xFFFFFFFF) )
+
+#define not_server_variable(prefix) ( (prefix) != '$' && (prefix) != '.' && (prefix) != '\'')
+#define is_string_variable(name) ( (name)[strlen(name) - 1] == '$' )
+
+#define FETCH(n, t) \
+ if( script_hasdata(st,n) ) \
+ (t)=script_getnum(st,n);
+
+/// Maximum amount of elements in script arrays
+#define SCRIPT_MAX_ARRAYSIZE (UINT_MAX - 1)
+
+enum script_cmd_result {
+ SCRIPT_CMD_SUCCESS = 0, ///when a buildin cmd was correctly done
+ SCRIPT_CMD_FAILURE = 1, ///when an errors appear in cmd, show_debug will follow
+};
+
+#define SCRIPT_BLOCK_SIZE 512
+enum e_labelType { LABEL_NEXTLINE = 1, LABEL_START };
+
+struct map_session_data;
+struct eri;
+
+extern int potion_flag; //For use on Alchemist improved potions/Potion Pitcher. [Skotlex]
+extern int potion_hp, potion_per_hp, potion_sp, potion_per_sp;
+extern int potion_target;
+extern unsigned int *generic_ui_array;
+extern unsigned int generic_ui_array_size;
+
+struct Script_Config {
+ unsigned warn_func_mismatch_argtypes : 1;
+ unsigned warn_func_mismatch_paramnum : 1;
+ int check_cmdcount;
+ int check_gotocount;
+ int input_min_value;
+ int input_max_value;
+
+ // PC related
+ const char *die_event_name;
+ const char *kill_pc_event_name;
+ const char *kill_mob_event_name;
+ const char *login_event_name;
+ const char *logout_event_name;
+ const char *loadmap_event_name;
+ const char *baselvup_event_name;
+ const char *joblvup_event_name;
+ const char *stat_calc_event_name;
+
+ // NPC related
+ const char* ontouch_event_name;
+ const char* ontouch2_event_name;
+ const char* ontouchnpc_event_name;
+ const char* onwhisper_event_name;
+ const char* oncommand_event_name;
+ const char* onbuy_event_name;
+ const char* onsell_event_name;
+
+ // Init related
+ const char* init_event_name;
+ const char* inter_init_event_name;
+ const char* inter_init_once_event_name;
+
+ // Guild related
+ const char* guild_break_event_name;
+ const char* agit_start_event_name;
+ const char* agit_init_event_name;
+ const char* agit_end_event_name;
+ const char* agit_start2_event_name;
+ const char* agit_init2_event_name;
+ const char* agit_end2_event_name;
+ const char* agit_start3_event_name;
+ const char* agit_init3_event_name;
+ const char* agit_end3_event_name;
+
+ // Timer related
+ const char* timer_event_name;
+ const char* timer_quit_event_name;
+ const char* timer_minute_event_name;
+ const char* timer_hour_event_name;
+ const char* timer_clock_event_name;
+ const char* timer_day_event_name;
+ const char* timer_sunday_event_name;
+ const char* timer_monday_event_name;
+ const char* timer_tuesday_event_name;
+ const char* timer_wednesday_event_name;
+ const char* timer_thursday_event_name;
+ const char* timer_friday_event_name;
+ const char* timer_saturday_event_name;
+
+ // Instance related
+ const char* instance_init_event_name;
+ const char* instance_destroy_event_name;
+};
+extern struct Script_Config script_config;
+
+typedef enum c_op {
+ C_NOP, // end of script/no value (nil)
+ C_POS,
+ C_INT, // number
+ C_PARAM, // parameter variable (see pc_readparam/pc_setparam)
+ C_FUNC, // buildin function call
+ C_STR, // string (free'd automatically)
+ C_CONSTSTR, // string (not free'd)
+ C_ARG, // start of argument list
+ C_NAME,
+ C_EOL, // end of line (extra stack values are cleared)
+ C_RETINFO,
+ C_USERFUNC, // internal script function
+ C_USERFUNC_POS, // internal script function label
+ C_REF, // the next call to c_op2 should push back a ref to the left operand
+
+ // operators
+ C_OP3, // a ? b : c
+ C_LOR, // a || b
+ C_LAND, // a && b
+ C_LE, // a <= b
+ C_LT, // a < b
+ C_GE, // a >= b
+ C_GT, // a > b
+ C_EQ, // a == b
+ C_NE, // a != b
+ C_XOR, // a ^ b
+ C_OR, // a | b
+ C_AND, // a & b
+ C_ADD, // a + b
+ C_SUB, // a - b
+ C_MUL, // a * b
+ C_DIV, // a / b
+ C_MOD, // a % b
+ C_NEG, // - a
+ C_LNOT, // ! a
+ C_NOT, // ~ a
+ C_R_SHIFT, // a >> b
+ C_L_SHIFT, // a << b
+ C_ADD_POST, // a++
+ C_SUB_POST, // a--
+ C_ADD_PRE, // ++a
+ C_SUB_PRE, // --a
+} c_op;
+
+/**
+ * Generic reg database abstraction to be used with various types of regs/script variables.
+ */
+struct reg_db {
+ struct DBMap *vars;
+ struct DBMap *arrays;
+};
+
+struct script_retinfo {
+ struct reg_db scope; ///< scope variables
+ struct script_code* script; ///< script code
+ int pos; ///< script location
+ int nargs; ///< argument count
+ int defsp; ///< default stack pointer
+};
+
+struct script_data {
+ enum c_op type;
+ union script_data_val {
+ int64 num;
+ char *str;
+ struct script_retinfo* ri;
+ } u;
+ struct reg_db *ref;
+};
+
+// Moved defsp from script_state to script_stack since
+// it must be saved when script state is RERUNLINE. [Eoe / jA 1094]
+struct script_code {
+ int script_size;
+ unsigned char* script_buf;
+ struct reg_db local;
+ unsigned short instances;
+};
+
+struct script_stack {
+ int sp; ///< number of entries in the stack
+ int sp_max; ///< capacity of the stack
+ int defsp;
+ struct script_data *stack_data; ///< stack
+ struct reg_db scope; ///< scope variables
+};
+
+
+//
+// Script state
+//
+enum e_script_state { RUN,STOP,END,RERUNLINE,GOTO,RETFUNC,CLOSE };
+
+struct script_state {
+ struct script_stack* stack;
+ int start,end;
+ int pos;
+ enum e_script_state state;
+ int rid,oid;
+ struct script_code *script;
+ struct sleep_data {
+ int tick,timer,charid;
+ } sleep;
+ //For backing up purposes
+ struct script_state *bk_st;
+ int bk_npcid;
+ unsigned freeloop : 1;// used by buildin_freeloop
+ unsigned op2ref : 1;// used by op_2
+ unsigned npc_item_flag : 1;
+ unsigned mes_active : 1; // Store if invoking character has a NPC dialog box open.
+ char* funcname; // Stores the current running function name
+ unsigned int id;
+};
+
+struct script_reg {
+ int64 index;
+ int data;
+};
+
+struct script_regstr {
+ int64 index;
+ char* data;
+};
+
+struct script_array {
+ unsigned int id; ///< the first 32b of the 64b uid, aka the id
+ unsigned int size; ///< how many members
+ unsigned int *members; ///< member list
+};
+
+enum script_parse_options {
+ SCRIPT_USE_LABEL_DB = 0x1,// records labels in scriptlabel_db
+ SCRIPT_IGNORE_EXTERNAL_BRACKETS = 0x2,// ignores the check for {} brackets around the script
+ SCRIPT_RETURN_EMPTY_SCRIPT = 0x4// returns the script object instead of NULL for empty scripts
+};
+
+enum monsterinfo_types {
+ MOB_NAME = 0,
+ MOB_LV,
+ MOB_MAXHP,
+ MOB_BASEEXP,
+ MOB_JOBEXP,
+ MOB_ATK1,
+ MOB_ATK2,
+ MOB_DEF,
+ MOB_MDEF,
+ MOB_STR,
+ MOB_AGI,
+ MOB_VIT,
+ MOB_INT,
+ MOB_DEX,
+ MOB_LUK,
+ MOB_RANGE,
+ MOB_RANGE2,
+ MOB_RANGE3,
+ MOB_SIZE,
+ MOB_RACE,
+ MOB_ELEMENT,
+ MOB_MODE,
+ MOB_MVPEXP
+};
+
+enum petinfo_types {
+ PETINFO_ID = 0,
+ PETINFO_CLASS,
+ PETINFO_NAME,
+ PETINFO_INTIMATE,
+ PETINFO_HUNGRY,
+ PETINFO_RENAMED,
+ PETINFO_LEVEL,
+ PETINFO_BLOCKID
+};
+
+enum questinfo_types {
+ QTYPE_QUEST = 0,
+ QTYPE_QUEST2,
+ QTYPE_JOB,
+ QTYPE_JOB2,
+ QTYPE_EVENT,
+ QTYPE_EVENT2,
+ QTYPE_WARG,
+ // 7 = free
+ QTYPE_WARG2 = 8,
+ // 9 - 9998 = free
+ QTYPE_NONE = 9999
+};
+
+#ifndef WIN32
+ // These are declared in wingdi.h
+ /* Font Weights */
+ #define FW_DONTCARE 0
+ #define FW_THIN 100
+ #define FW_EXTRALIGHT 200
+ #define FW_LIGHT 300
+ #define FW_NORMAL 400
+ #define FW_MEDIUM 500
+ #define FW_SEMIBOLD 600
+ #define FW_BOLD 700
+ #define FW_EXTRABOLD 800
+ #define FW_HEAVY 900
+#endif
+
+enum getmapxy_types {
+ UNITTYPE_PC = 0,
+ UNITTYPE_NPC,
+ UNITTYPE_PET,
+ UNITTYPE_MOB,
+ UNITTYPE_HOM,
+ UNITTYPE_MER,
+ UNITTYPE_ELEM,
+};
+
+enum unitdata_mobtypes {
+ UMOB_SIZE = 0,
+ UMOB_LEVEL,
+ UMOB_HP,
+ UMOB_MAXHP,
+ UMOB_MASTERAID,
+ UMOB_MAPID,
+ UMOB_X,
+ UMOB_Y,
+ UMOB_SPEED,
+ UMOB_MODE,
+ UMOB_AI,
+ UMOB_SCOPTION,
+ UMOB_SEX,
+ UMOB_CLASS,
+ UMOB_HAIRSTYLE,
+ UMOB_HAIRCOLOR,
+ UMOB_HEADBOTTOM,
+ UMOB_HEADMIDDLE,
+ UMOB_HEADTOP,
+ UMOB_CLOTHCOLOR,
+ UMOB_SHIELD,
+ UMOB_WEAPON,
+ UMOB_LOOKDIR,
+ UMOB_CANMOVETICK,
+ UMOB_STR,
+ UMOB_AGI,
+ UMOB_VIT,
+ UMOB_INT,
+ UMOB_DEX,
+ UMOB_LUK,
+ UMOB_SLAVECPYMSTRMD,
+ UMOB_DMGIMMUNE,
+ UMOB_ATKRANGE,
+ UMOB_ATKMIN,
+ UMOB_ATKMAX,
+ UMOB_MATKMIN,
+ UMOB_MATKMAX,
+ UMOB_DEF,
+ UMOB_MDEF,
+ UMOB_HIT,
+ UMOB_FLEE,
+ UMOB_PDODGE,
+ UMOB_CRIT,
+ UMOB_RACE,
+ UMOB_ELETYPE,
+ UMOB_ELELEVEL,
+ UMOB_AMOTION,
+ UMOB_ADELAY,
+ UMOB_DMOTION,
+};
+
+enum unitdata_homuntypes {
+ UHOM_SIZE = 0,
+ UHOM_LEVEL,
+ UHOM_HP,
+ UHOM_MAXHP,
+ UHOM_SP,
+ UHOM_MAXSP,
+ UHOM_MASTERCID,
+ UHOM_MAPID,
+ UHOM_X,
+ UHOM_Y,
+ UHOM_HUNGER,
+ UHOM_INTIMACY,
+ UHOM_SPEED,
+ UHOM_LOOKDIR,
+ UHOM_CANMOVETICK,
+ UHOM_STR,
+ UHOM_AGI,
+ UHOM_VIT,
+ UHOM_INT,
+ UHOM_DEX,
+ UHOM_LUK,
+ UHOM_DMGIMMUNE,
+ UHOM_ATKRANGE,
+ UHOM_ATKMIN,
+ UHOM_ATKMAX,
+ UHOM_MATKMIN,
+ UHOM_MATKMAX,
+ UHOM_DEF,
+ UHOM_MDEF,
+ UHOM_HIT,
+ UHOM_FLEE,
+ UHOM_PDODGE,
+ UHOM_CRIT,
+ UHOM_RACE,
+ UHOM_ELETYPE,
+ UHOM_ELELEVEL,
+ UHOM_AMOTION,
+ UHOM_ADELAY,
+ UHOM_DMOTION,
+};
+
+enum unitdata_pettypes {
+ UPET_SIZE = 0,
+ UPET_LEVEL,
+ UPET_HP,
+ UPET_MAXHP,
+ UPET_MASTERAID,
+ UPET_MAPID,
+ UPET_X,
+ UPET_Y,
+ UPET_HUNGER,
+ UPET_INTIMACY,
+ UPET_SPEED,
+ UPET_LOOKDIR,
+ UPET_CANMOVETICK,
+ UPET_STR,
+ UPET_AGI,
+ UPET_VIT,
+ UPET_INT,
+ UPET_DEX,
+ UPET_LUK,
+ UPET_DMGIMMUNE,
+ UPET_ATKRANGE,
+ UPET_ATKMIN,
+ UPET_ATKMAX,
+ UPET_MATKMIN,
+ UPET_MATKMAX,
+ UPET_DEF,
+ UPET_MDEF,
+ UPET_HIT,
+ UPET_FLEE,
+ UPET_PDODGE,
+ UPET_CRIT,
+ UPET_RACE,
+ UPET_ELETYPE,
+ UPET_ELELEVEL,
+ UPET_AMOTION,
+ UPET_ADELAY,
+ UPET_DMOTION,
+};
+
+enum unitdata_merctypes {
+ UMER_SIZE = 0,
+ UMER_HP,
+ UMER_MAXHP,
+ UMER_MASTERCID,
+ UMER_MAPID,
+ UMER_X,
+ UMER_Y,
+ UMER_KILLCOUNT,
+ UMER_LIFETIME,
+ UMER_SPEED,
+ UMER_LOOKDIR,
+ UMER_CANMOVETICK,
+ UMER_STR,
+ UMER_AGI,
+ UMER_VIT,
+ UMER_INT,
+ UMER_DEX,
+ UMER_LUK,
+ UMER_DMGIMMUNE,
+ UMER_ATKRANGE,
+ UMER_ATKMIN,
+ UMER_ATKMAX,
+ UMER_MATKMIN,
+ UMER_MATKMAX,
+ UMER_DEF,
+ UMER_MDEF,
+ UMER_HIT,
+ UMER_FLEE,
+ UMER_PDODGE,
+ UMER_CRIT,
+ UMER_RACE,
+ UMER_ELETYPE,
+ UMER_ELELEVEL,
+ UMER_AMOTION,
+ UMER_ADELAY,
+ UMER_DMOTION,
+};
+
+enum unitdata_elemtypes {
+ UELE_SIZE = 0,
+ UELE_HP,
+ UELE_MAXHP,
+ UELE_SP,
+ UELE_MAXSP,
+ UELE_MASTERCID,
+ UELE_MAPID,
+ UELE_X,
+ UELE_Y,
+ UELE_LIFETIME,
+ UELE_MODE,
+ UELE_SPEED,
+ UELE_LOOKDIR,
+ UELE_CANMOVETICK,
+ UELE_STR,
+ UELE_AGI,
+ UELE_VIT,
+ UELE_INT,
+ UELE_DEX,
+ UELE_LUK,
+ UELE_DMGIMMUNE,
+ UELE_ATKRANGE,
+ UELE_ATKMIN,
+ UELE_ATKMAX,
+ UELE_MATKMIN,
+ UELE_MATKMAX,
+ UELE_DEF,
+ UELE_MDEF,
+ UELE_HIT,
+ UELE_FLEE,
+ UELE_PDODGE,
+ UELE_CRIT,
+ UELE_RACE,
+ UELE_ELETYPE,
+ UELE_ELELEVEL,
+ UELE_AMOTION,
+ UELE_ADELAY,
+ UELE_DMOTION,
+};
+
+enum unitdata_npctypes {
+ UNPC_DISPLAY = 0,
+ UNPC_LEVEL,
+ UNPC_HP,
+ UNPC_MAXHP,
+ UNPC_MAPID,
+ UNPC_X,
+ UNPC_Y,
+ UNPC_LOOKDIR,
+ UNPC_STR,
+ UNPC_AGI,
+ UNPC_VIT,
+ UNPC_INT,
+ UNPC_DEX,
+ UNPC_LUK,
+ UNPC_PLUSALLSTAT,
+ UNPC_DMGIMMUNE,
+ UNPC_ATKRANGE,
+ UNPC_ATKMIN,
+ UNPC_ATKMAX,
+ UNPC_MATKMIN,
+ UNPC_MATKMAX,
+ UNPC_DEF,
+ UNPC_MDEF,
+ UNPC_HIT,
+ UNPC_FLEE,
+ UNPC_PDODGE,
+ UNPC_CRIT,
+ UNPC_RACE,
+ UNPC_ELETYPE,
+ UNPC_ELELEVEL,
+ UNPC_AMOTION,
+ UNPC_ADELAY,
+ UNPC_DMOTION,
+};
+
+enum navigation_service {
+ NAV_NONE = 0, ///< 0
+ NAV_AIRSHIP_ONLY = 1, ///< 1 (actually 1-9)
+ NAV_SCROLL_ONLY = 10, ///< 10
+ NAV_AIRSHIP_AND_SCROLL = NAV_AIRSHIP_ONLY + NAV_SCROLL_ONLY, ///< 11 (actually 11-99)
+ NAV_KAFRA_ONLY = 100, ///< 100
+ NAV_KAFRA_AND_AIRSHIP = NAV_KAFRA_ONLY + NAV_AIRSHIP_ONLY, ///< 101 (actually 101-109)
+ NAV_KAFRA_AND_SCROLL = NAV_KAFRA_ONLY + NAV_SCROLL_ONLY, ///< 110
+ NAV_ALL = NAV_AIRSHIP_ONLY + NAV_SCROLL_ONLY + NAV_KAFRA_ONLY ///< 111 (actually 111-255)
+};
+
+enum random_option_attribute {
+ ROA_ID = 0,
+ ROA_VALUE,
+ ROA_PARAM,
+};
+
+enum instance_info_type {
+ IIT_ID,
+ IIT_TIME_LIMIT,
+ IIT_IDLE_TIMEOUT,
+ IIT_ENTER_MAP,
+ IIT_ENTER_X,
+ IIT_ENTER_Y,
+ IIT_MAPCOUNT,
+ IIT_MAP
+};
+
+enum vip_status_type {
+ VIP_STATUS_ACTIVE = 1,
+ VIP_STATUS_EXPIRE,
+ VIP_STATUS_REMAINING
+};
+
+enum e_special_effects {
+ EF_NONE = -1,
+ EF_HIT1,
+ EF_HIT2,
+ EF_HIT3,
+ EF_HIT4,
+ EF_HIT5,
+ EF_HIT6,
+ EF_ENTRY,
+ EF_EXIT,
+ EF_WARP,
+ EF_ENHANCE,
+ EF_COIN,
+ EF_ENDURE,
+ EF_BEGINSPELL,
+ EF_GLASSWALL,
+ EF_HEALSP,
+ EF_SOULSTRIKE,
+ EF_BASH,
+ EF_MAGNUMBREAK,
+ EF_STEAL,
+ EF_HIDING,
+ EF_PATTACK,
+ EF_DETOXICATION,
+ EF_SIGHT,
+ EF_STONECURSE,
+ EF_FIREBALL,
+ EF_FIREWALL,
+ EF_ICEARROW,
+ EF_FROSTDIVER,
+ EF_FROSTDIVER2,
+ EF_LIGHTBOLT,
+ EF_THUNDERSTORM,
+ EF_FIREARROW,
+ EF_NAPALMBEAT,
+ EF_RUWACH,
+ EF_TELEPORTATION,
+ EF_READYPORTAL,
+ EF_PORTAL,
+ EF_INCAGILITY,
+ EF_DECAGILITY,
+ EF_AQUA,
+ EF_SIGNUM,
+ EF_ANGELUS,
+ EF_BLESSING,
+ EF_INCAGIDEX,
+ EF_SMOKE,
+ EF_FIREFLY,
+ EF_SANDWIND,
+ EF_TORCH,
+ EF_SPRAYPOND,
+ EF_FIREHIT,
+ EF_FIRESPLASHHIT,
+ EF_COLDHIT,
+ EF_WINDHIT,
+ EF_POISONHIT,
+ EF_BEGINSPELL2,
+ EF_BEGINSPELL3,
+ EF_BEGINSPELL4,
+ EF_BEGINSPELL5,
+ EF_BEGINSPELL6,
+ EF_BEGINSPELL7,
+ EF_LOCKON,
+ EF_WARPZONE,
+ EF_SIGHTRASHER,
+ EF_BARRIER,
+ EF_ARROWSHOT,
+ EF_INVENOM,
+ EF_CURE,
+ EF_PROVOKE,
+ EF_MVP,
+ EF_SKIDTRAP,
+ EF_BRANDISHSPEAR,
+ EF_CONE,
+ EF_SPHERE,
+ EF_BOWLINGBASH,
+ EF_ICEWALL,
+ EF_GLORIA,
+ EF_MAGNIFICAT,
+ EF_RESURRECTION,
+ EF_RECOVERY,
+ EF_EARTHSPIKE,
+ EF_SPEARBMR,
+ EF_PIERCE,
+ EF_TURNUNDEAD,
+ EF_SANCTUARY,
+ EF_IMPOSITIO,
+ EF_LEXAETERNA,
+ EF_ASPERSIO,
+ EF_LEXDIVINA,
+ EF_SUFFRAGIUM,
+ EF_STORMGUST,
+ EF_LORD,
+ EF_BENEDICTIO,
+ EF_METEORSTORM,
+ EF_YUFITEL,
+ EF_YUFITELHIT,
+ EF_QUAGMIRE,
+ EF_FIREPILLAR,
+ EF_FIREPILLARBOMB,
+ EF_HASTEUP,
+ EF_FLASHER,
+ EF_REMOVETRAP,
+ EF_REPAIRWEAPON,
+ EF_CRASHEARTH,
+ EF_PERFECTION,
+ EF_MAXPOWER,
+ EF_BLASTMINE,
+ EF_BLASTMINEBOMB,
+ EF_CLAYMORE,
+ EF_FREEZING,
+ EF_BUBBLE,
+ EF_GASPUSH,
+ EF_SPRINGTRAP,
+ EF_KYRIE,
+ EF_MAGNUS,
+ EF_BOTTOM,
+ EF_BLITZBEAT,
+ EF_WATERBALL,
+ EF_WATERBALL2,
+ EF_FIREIVY,
+ EF_DETECTING,
+ EF_CLOAKING,
+ EF_SONICBLOW,
+ EF_SONICBLOWHIT,
+ EF_GRIMTOOTH,
+ EF_VENOMDUST,
+ EF_ENCHANTPOISON,
+ EF_POISONREACT,
+ EF_POISONREACT2,
+ EF_OVERTHRUST,
+ EF_SPLASHER,
+ EF_TWOHANDQUICKEN,
+ EF_AUTOCOUNTER,
+ EF_GRIMTOOTHATK,
+ EF_FREEZE,
+ EF_FREEZED,
+ EF_ICECRASH,
+ EF_SLOWPOISON,
+ EF_BOTTOM2,
+ EF_FIREPILLARON,
+ EF_SANDMAN,
+ EF_REVIVE,
+ EF_PNEUMA,
+ EF_HEAVENSDRIVE,
+ EF_SONICBLOW2,
+ EF_BRANDISH2,
+ EF_SHOCKWAVE,
+ EF_SHOCKWAVEHIT,
+ EF_EARTHHIT,
+ EF_PIERCESELF,
+ EF_BOWLINGSELF,
+ EF_SPEARSTABSELF,
+ EF_SPEARBMRSELF,
+ EF_HOLYHIT,
+ EF_CONCENTRATION,
+ EF_REFINEOK,
+ EF_REFINEFAIL,
+ EF_JOBCHANGE,
+ EF_LVUP,
+ EF_JOBLVUP,
+ EF_TOPRANK,
+ EF_PARTY,
+ EF_RAIN,
+ EF_SNOW,
+ EF_SAKURA,
+ EF_STATUS_STATE,
+ EF_BANJJAKII,
+ EF_MAKEBLUR,
+ EF_TAMINGSUCCESS,
+ EF_TAMINGFAILED,
+ EF_ENERGYCOAT,
+ EF_CARTREVOLUTION,
+ EF_VENOMDUST2,
+ EF_CHANGEDARK,
+ EF_CHANGEFIRE,
+ EF_CHANGECOLD,
+ EF_CHANGEWIND,
+ EF_CHANGEFLAME,
+ EF_CHANGEEARTH,
+ EF_CHAINGEHOLY,
+ EF_CHANGEPOISON,
+ EF_HITDARK,
+ EF_MENTALBREAK,
+ EF_MAGICALATTHIT,
+ EF_SUI_EXPLOSION,
+ EF_DARKATTACK,
+ EF_SUICIDE,
+ EF_COMBOATTACK1,
+ EF_COMBOATTACK2,
+ EF_COMBOATTACK3,
+ EF_COMBOATTACK4,
+ EF_COMBOATTACK5,
+ EF_GUIDEDATTACK,
+ EF_POISONATTACK,
+ EF_SILENCEATTACK,
+ EF_STUNATTACK,
+ EF_PETRIFYATTACK,
+ EF_CURSEATTACK,
+ EF_SLEEPATTACK,
+ EF_TELEKHIT,
+ EF_PONG,
+ EF_LEVEL99,
+ EF_LEVEL99_2,
+ EF_LEVEL99_3,
+ EF_GUMGANG,
+ EF_POTION1,
+ EF_POTION2,
+ EF_POTION3,
+ EF_POTION4,
+ EF_POTION5,
+ EF_POTION6,
+ EF_POTION7,
+ EF_POTION8,
+ EF_DARKBREATH,
+ EF_DEFFENDER,
+ EF_KEEPING,
+ EF_SUMMONSLAVE,
+ EF_BLOODDRAIN,
+ EF_ENERGYDRAIN,
+ EF_POTION_CON,
+ EF_POTION_,
+ EF_POTION_BERSERK,
+ EF_POTIONPILLAR,
+ EF_DEFENDER,
+ EF_GANBANTEIN,
+ EF_WIND,
+ EF_VOLCANO,
+ EF_GRANDCROSS,
+ EF_INTIMIDATE,
+ EF_CHOOKGI,
+ EF_CLOUD,
+ EF_CLOUD2,
+ EF_MAPPILLAR,
+ EF_LINELINK,
+ EF_CLOUD3,
+ EF_SPELLBREAKER,
+ EF_DISPELL,
+ EF_DELUGE,
+ EF_VIOLENTGALE,
+ EF_LANDPROTECTOR,
+ EF_BOTTOM_VO,
+ EF_BOTTOM_DE,
+ EF_BOTTOM_VI,
+ EF_BOTTOM_LA,
+ EF_FASTMOVE,
+ EF_MAGICROD,
+ EF_HOLYCROSS,
+ EF_SHIELDCHARGE,
+ EF_MAPPILLAR2,
+ EF_PROVIDENCE,
+ EF_SHIELDBOOMERANG,
+ EF_SPEARQUICKEN,
+ EF_DEVOTION,
+ EF_REFLECTSHIELD,
+ EF_ABSORBSPIRITS,
+ EF_STEELBODY,
+ EF_FLAMELAUNCHER,
+ EF_FROSTWEAPON,
+ EF_LIGHTNINGLOADER,
+ EF_SEISMICWEAPON,
+ EF_MAPPILLAR3,
+ EF_MAPPILLAR4,
+ EF_GUMGANG2,
+ EF_TEIHIT1,
+ EF_GUMGANG3,
+ EF_TEIHIT2,
+ EF_TANJI,
+ EF_TEIHIT1X,
+ EF_CHIMTO,
+ EF_STEALCOIN,
+ EF_STRIPWEAPON,
+ EF_STRIPSHIELD,
+ EF_STRIPARMOR,
+ EF_STRIPHELM,
+ EF_CHAINCOMBO,
+ EF_RG_COIN,
+ EF_BACKSTAP,
+ EF_TEIHIT3,
+ EF_BOTTOM_DISSONANCE,
+ EF_BOTTOM_LULLABY,
+ EF_BOTTOM_RICHMANKIM,
+ EF_BOTTOM_ETERNALCHAOS,
+ EF_BOTTOM_DRUMBATTLEFIELD,
+ EF_BOTTOM_RINGNIBELUNGEN,
+ EF_BOTTOM_ROKISWEIL,
+ EF_BOTTOM_INTOABYSS,
+ EF_BOTTOM_SIEGFRIED,
+ EF_BOTTOM_WHISTLE,
+ EF_BOTTOM_ASSASSINCROSS,
+ EF_BOTTOM_POEMBRAGI,
+ EF_BOTTOM_APPLEIDUN,
+ EF_BOTTOM_UGLYDANCE,
+ EF_BOTTOM_HUMMING,
+ EF_BOTTOM_DONTFORGETME,
+ EF_BOTTOM_FORTUNEKISS,
+ EF_BOTTOM_SERVICEFORYOU,
+ EF_TALK_FROSTJOKE,
+ EF_TALK_SCREAM,
+ EF_POKJUK,
+ EF_THROWITEM,
+ EF_THROWITEM2,
+ EF_CHEMICALPROTECTION,
+ EF_POKJUK_SOUND,
+ EF_DEMONSTRATION,
+ EF_CHEMICAL2,
+ EF_TELEPORTATION2,
+ EF_PHARMACY_OK,
+ EF_PHARMACY_FAIL,
+ EF_FORESTLIGHT,
+ EF_THROWITEM3,
+ EF_FIRSTAID,
+ EF_SPRINKLESAND,
+ EF_LOUD,
+ EF_HEAL,
+ EF_HEAL2,
+ EF_EXIT2,
+ EF_GLASSWALL2,
+ EF_READYPORTAL2,
+ EF_PORTAL2,
+ EF_BOTTOM_MAG,
+ EF_BOTTOM_SANC,
+ EF_HEAL3,
+ EF_WARPZONE2,
+ EF_FORESTLIGHT2,
+ EF_FORESTLIGHT3,
+ EF_FORESTLIGHT4,
+ EF_HEAL4,
+ EF_FOOT,
+ EF_FOOT2,
+ EF_BEGINASURA,
+ EF_TRIPLEATTACK,
+ EF_HITLINE,
+ EF_HPTIME,
+ EF_SPTIME,
+ EF_MAPLE,
+ EF_BLIND,
+ EF_POISON,
+ EF_GUARD,
+ EF_JOBLVUP50,
+ EF_ANGEL2,
+ EF_MAGNUM2,
+ EF_CALLZONE,
+ EF_PORTAL3,
+ EF_COUPLECASTING,
+ EF_HEARTCASTING,
+ EF_ENTRY2,
+ EF_SAINTWING,
+ EF_SPHEREWIND,
+ EF_COLORPAPER,
+ EF_LIGHTSPHERE,
+ EF_WATERFALL,
+ EF_WATERFALL_90,
+ EF_WATERFALL_SMALL,
+ EF_WATERFALL_SMALL_90,
+ EF_WATERFALL_T2,
+ EF_WATERFALL_T2_90,
+ EF_WATERFALL_SMALL_T2,
+ EF_WATERFALL_SMALL_T2_90,
+ EF_MINI_TETRIS,
+ EF_GHOST,
+ EF_BAT,
+ EF_BAT2,
+ EF_SOULBREAKER,
+ EF_LEVEL99_4,
+ EF_VALLENTINE,
+ EF_VALLENTINE2,
+ EF_PRESSURE,
+ EF_BASH3D,
+ EF_AURABLADE,
+ EF_REDBODY,
+ EF_LKCONCENTRATION,
+ EF_BOTTOM_GOSPEL,
+ EF_ANGEL,
+ EF_DEVIL,
+ EF_DRAGONSMOKE,
+ EF_BOTTOM_BASILICA,
+ EF_ASSUMPTIO,
+ EF_HITLINE2,
+ EF_BASH3D2,
+ EF_ENERGYDRAIN2,
+ EF_TRANSBLUEBODY,
+ EF_MAGICCRASHER,
+ EF_LIGHTSPHERE2,
+ EF_LIGHTBLADE,
+ EF_ENERGYDRAIN3,
+ EF_LINELINK2,
+ EF_LINKLIGHT,
+ EF_TRUESIGHT,
+ EF_FALCONASSAULT,
+ EF_TRIPLEATTACK2,
+ EF_PORTAL4,
+ EF_MELTDOWN,
+ EF_CARTBOOST,
+ EF_REJECTSWORD,
+ EF_TRIPLEATTACK3,
+ EF_SPHEREWIND2,
+ EF_LINELINK3,
+ EF_PINKBODY,
+ EF_LEVEL99_5,
+ EF_LEVEL99_6,
+ EF_BASH3D3,
+ EF_BASH3D4,
+ EF_NAPALMVALCAN,
+ EF_PORTAL5,
+ EF_MAGICCRASHER2,
+ EF_BOTTOM_SPIDER,
+ EF_BOTTOM_FOGWALL,
+ EF_SOULBURN,
+ EF_SOULCHANGE,
+ EF_BABY,
+ EF_SOULBREAKER2,
+ EF_RAINBOW,
+ EF_PEONG,
+ EF_TANJI2,
+ EF_PRESSEDBODY,
+ EF_SPINEDBODY,
+ EF_KICKEDBODY,
+ EF_AIRTEXTURE,
+ EF_HITBODY,
+ EF_DOUBLEGUMGANG,
+ EF_REFLECTBODY,
+ EF_BABYBODY,
+ EF_BABYBODY2,
+ EF_GIANTBODY,
+ EF_GIANTBODY2,
+ EF_ASURABODY,
+ EF_4WAYBODY,
+ EF_QUAKEBODY,
+ EF_ASURABODY_MONSTER,
+ EF_HITLINE3,
+ EF_HITLINE4,
+ EF_HITLINE5,
+ EF_HITLINE6,
+ EF_ELECTRIC,
+ EF_ELECTRIC2,
+ EF_HITLINE7,
+ EF_STORMKICK,
+ EF_HALFSPHERE,
+ EF_ATTACKENERGY,
+ EF_ATTACKENERGY2,
+ EF_CHEMICAL3,
+ EF_ASSUMPTIO2,
+ EF_BLUECASTING,
+ EF_RUN,
+ EF_STOPRUN,
+ EF_STOPEFFECT,
+ EF_JUMPBODY,
+ EF_LANDBODY,
+ EF_FOOT3,
+ EF_FOOT4,
+ EF_TAE_READY,
+ EF_GRANDCROSS2,
+ EF_SOULSTRIKE2,
+ EF_YUFITEL2,
+ EF_NPC_STOP,
+ EF_DARKCASTING,
+ EF_GUMGANGNPC,
+ EF_AGIUP,
+ EF_JUMPKICK,
+ EF_QUAKEBODY2,
+ EF_STORMKICK1,
+ EF_STORMKICK2,
+ EF_STORMKICK3,
+ EF_STORMKICK4,
+ EF_STORMKICK5,
+ EF_STORMKICK6,
+ EF_STORMKICK7,
+ EF_SPINEDBODY2,
+ EF_BEGINASURA1,
+ EF_BEGINASURA2,
+ EF_BEGINASURA3,
+ EF_BEGINASURA4,
+ EF_BEGINASURA5,
+ EF_BEGINASURA6,
+ EF_BEGINASURA7,
+ EF_AURABLADE2,
+ EF_DEVIL1,
+ EF_DEVIL2,
+ EF_DEVIL3,
+ EF_DEVIL4,
+ EF_DEVIL5,
+ EF_DEVIL6,
+ EF_DEVIL7,
+ EF_DEVIL8,
+ EF_DEVIL9,
+ EF_DEVIL10,
+ EF_DOUBLEGUMGANG2,
+ EF_DOUBLEGUMGANG3,
+ EF_BLACKDEVIL,
+ EF_FLOWERCAST,
+ EF_FLOWERCAST2,
+ EF_FLOWERCAST3,
+ EF_MOCHI,
+ EF_LAMADAN,
+ EF_EDP,
+ EF_SHIELDBOOMERANG2,
+ EF_RG_COIN2,
+ EF_GUARD2,
+ EF_SLIM,
+ EF_SLIM2,
+ EF_SLIM3,
+ EF_CHEMICALBODY,
+ EF_CASTSPIN,
+ EF_PIERCEBODY,
+ EF_SOULLINK,
+ EF_CHOOKGI2,
+ EF_MEMORIZE,
+ EF_SOULLIGHT,
+ EF_MAPAE,
+ EF_ITEMPOKJUK,
+ EF_05VAL,
+ EF_BEGINASURA11,
+ EF_NIGHT,
+ EF_CHEMICAL2DASH,
+ EF_GROUNDSAMPLE,
+ EF_GI_EXPLOSION,
+ EF_CLOUD4,
+ EF_CLOUD5,
+ EF_BOTTOM_HERMODE,
+ EF_CARTTER,
+ EF_ITEMFAST,
+ EF_SHIELDBOOMERANG3,
+ EF_DOUBLECASTBODY,
+ EF_GRAVITATION,
+ EF_TAROTCARD1,
+ EF_TAROTCARD2,
+ EF_TAROTCARD3,
+ EF_TAROTCARD4,
+ EF_TAROTCARD5,
+ EF_TAROTCARD6,
+ EF_TAROTCARD7,
+ EF_TAROTCARD8,
+ EF_TAROTCARD9,
+ EF_TAROTCARD10,
+ EF_TAROTCARD11,
+ EF_TAROTCARD12,
+ EF_TAROTCARD13,
+ EF_TAROTCARD14,
+ EF_ACIDDEMON,
+ EF_GREENBODY,
+ EF_THROWITEM4,
+ EF_BABYBODY_BACK,
+ EF_THROWITEM5,
+ EF_BLUEBODY,
+ EF_HATED,
+ EF_REDLIGHTBODY,
+ EF_RO2YEAR,
+ EF_SMA_READY,
+ EF_STIN,
+ EF_RED_HIT,
+ EF_BLUE_HIT,
+ EF_QUAKEBODY3,
+ EF_SMA,
+ EF_SMA2,
+ EF_STIN2,
+ EF_HITTEXTURE,
+ EF_STIN3,
+ EF_SMA3,
+ EF_BLUEFALL,
+ EF_BLUEFALL_90,
+ EF_FASTBLUEFALL,
+ EF_FASTBLUEFALL_90,
+ EF_BIG_PORTAL,
+ EF_BIG_PORTAL2,
+ EF_SCREEN_QUAKE,
+ EF_HOMUNCASTING,
+ EF_HFLIMOON1,
+ EF_HFLIMOON2,
+ EF_HFLIMOON3,
+ EF_HO_UP,
+ EF_HAMIDEFENCE,
+ EF_HAMICASTLE,
+ EF_HAMIBLOOD,
+ EF_HATED2,
+ EF_TWILIGHT1,
+ EF_TWILIGHT2,
+ EF_TWILIGHT3,
+ EF_ITEM_THUNDER,
+ EF_ITEM_CLOUD,
+ EF_ITEM_CURSE,
+ EF_ITEM_ZZZ,
+ EF_ITEM_RAIN,
+ EF_ITEM_LIGHT,
+ EF_ANGEL3,
+ EF_M01,
+ EF_M02,
+ EF_M03,
+ EF_M04,
+ EF_M05,
+ EF_M06,
+ EF_M07,
+ EF_KAIZEL,
+ EF_KAAHI,
+ EF_CLOUD6,
+ EF_FOOD01,
+ EF_FOOD02,
+ EF_FOOD03,
+ EF_FOOD04,
+ EF_FOOD05,
+ EF_FOOD06,
+ EF_SHRINK,
+ EF_THROWITEM6,
+ EF_SIGHT2,
+ EF_QUAKEBODY4,
+ EF_FIREHIT2,
+ EF_NPC_STOP2,
+ EF_NPC_STOP2_DEL,
+ EF_FVOICE,
+ EF_WINK,
+ EF_COOKING_OK,
+ EF_COOKING_FAIL,
+ EF_TEMP_OK,
+ EF_TEMP_FAIL,
+ EF_HAPGYEOK,
+ EF_THROWITEM7,
+ EF_THROWITEM8,
+ EF_THROWITEM9,
+ EF_THROWITEM10,
+ EF_BUNSINJYUTSU,
+ EF_KOUENKA,
+ EF_HYOUSENSOU,
+ EF_BOTTOM_SUITON,
+ EF_STIN4,
+ EF_THUNDERSTORM2,
+ EF_CHEMICAL4,
+ EF_STIN5,
+ EF_MADNESS_BLUE,
+ EF_MADNESS_RED,
+ EF_RG_COIN3,
+ EF_BASH3D5,
+ EF_CHOOKGI3,
+ EF_KIRIKAGE,
+ EF_TATAMI,
+ EF_KASUMIKIRI,
+ EF_ISSEN,
+ EF_KAEN,
+ EF_BAKU,
+ EF_HYOUSYOURAKU,
+ EF_DESPERADO,
+ EF_LIGHTNING_S,
+ EF_BLIND_S,
+ EF_POISON_S,
+ EF_FREEZING_S,
+ EF_FLARE_S,
+ EF_RAPIDSHOWER,
+ EF_MAGICALBULLET,
+ EF_SPREADATTACK,
+ EF_TRACKCASTING,
+ EF_TRACKING,
+ EF_TRIPLEACTION,
+ EF_BULLSEYE,
+ EF_MAP_MAGICZONE,
+ EF_MAP_MAGICZONE2,
+ EF_DAMAGE1,
+ EF_DAMAGE1_2,
+ EF_DAMAGE1_3,
+ EF_UNDEADBODY,
+ EF_UNDEADBODY_DEL,
+ EF_GREEN_NUMBER,
+ EF_BLUE_NUMBER,
+ EF_RED_NUMBER,
+ EF_PURPLE_NUMBER,
+ EF_BLACK_NUMBER,
+ EF_WHITE_NUMBER,
+ EF_YELLOW_NUMBER,
+ EF_PINK_NUMBER,
+ EF_BUBBLE_DROP,
+ EF_NPC_EARTHQUAKE,
+ EF_DA_SPACE,
+ EF_DRAGONFEAR,
+ EF_BLEEDING,
+ EF_WIDECONFUSE,
+ EF_BOTTOM_RUNNER,
+ EF_BOTTOM_TRANSFER,
+ EF_CRYSTAL_BLUE,
+ EF_BOTTOM_EVILLAND,
+ EF_GUARD3,
+ EF_NPC_SLOWCAST,
+ EF_CRITICALWOUND,
+ EF_GREEN99_3,
+ EF_GREEN99_5,
+ EF_GREEN99_6,
+ EF_MAPSPHERE,
+ EF_POK_LOVE,
+ EF_POK_WHITE,
+ EF_POK_VALEN,
+ EF_POK_BIRTH,
+ EF_POK_CHRISTMAS,
+ EF_MAP_MAGICZONE3,
+ EF_MAP_MAGICZONE4,
+ EF_DUST,
+ EF_TORCH_RED,
+ EF_TORCH_GREEN,
+ EF_MAP_GHOST,
+ EF_GLOW1,
+ EF_GLOW2,
+ EF_GLOW4,
+ EF_TORCH_PURPLE,
+ EF_CLOUD7,
+ EF_CLOUD8,
+ EF_FLOWERLEAF,
+ EF_MAPSPHERE2,
+ EF_GLOW11,
+ EF_GLOW12,
+ EF_CIRCLELIGHT,
+ EF_ITEM315,
+ EF_ITEM316,
+ EF_ITEM317,
+ EF_ITEM318,
+ EF_STORM_MIN,
+ EF_POK_JAP,
+ EF_MAP_GREENLIGHT,
+ EF_MAP_MAGICWALL,
+ EF_MAP_GREENLIGHT2,
+ EF_YELLOWFLY1,
+ EF_YELLOWFLY2,
+ EF_BOTTOM_BLUE,
+ EF_BOTTOM_BLUE2,
+ EF_WEWISH,
+ EF_FIREPILLARON2,
+ EF_FORESTLIGHT5,
+ EF_SOULBREAKER3,
+ EF_ADO_STR,
+ EF_IGN_STR,
+ EF_CHIMTO2,
+ EF_WINDCUTTER,
+ EF_DETECT2,
+ EF_FROSTMYSTY,
+ EF_CRIMSON_STR,
+ EF_HELL_STR,
+ EF_SPR_MASH,
+ EF_SPR_SOULE,
+ EF_DHOWL_STR,
+ EF_EARTHWALL,
+ EF_SOULBREAKER4,
+ EF_CHAINL_STR,
+ EF_CHOOKGI_FIRE,
+ EF_CHOOKGI_WIND,
+ EF_CHOOKGI_WATER,
+ EF_CHOOKGI_GROUND,
+ EF_MAGENTA_TRAP,
+ EF_COBALT_TRAP,
+ EF_MAIZE_TRAP,
+ EF_VERDURE_TRAP,
+ EF_NORMAL_TRAP,
+ EF_CLOAKING2,
+ EF_AIMED_STR,
+ EF_ARROWSTORM_STR,
+ EF_LAULAMUS_STR,
+ EF_LAUAGNUS_STR,
+ EF_MILSHIELD_STR,
+ EF_CONCENTRATION2,
+ EF_FIREBALL2,
+ EF_BUNSINJYUTSU2,
+ EF_CLEARTIME,
+ EF_GLASSWALL3,
+ EF_ORATIO,
+ EF_POTION_BERSERK2,
+ EF_CIRCLEPOWER,
+ EF_ROLLING1,
+ EF_ROLLING2,
+ EF_ROLLING3,
+ EF_ROLLING4,
+ EF_ROLLING5,
+ EF_ROLLING6,
+ EF_ROLLING7,
+ EF_ROLLING8,
+ EF_ROLLING9,
+ EF_ROLLING10,
+ EF_PURPLEBODY,
+ EF_STIN6,
+ EF_RG_COIN4,
+ EF_POISONWAV,
+ EF_POISONSMOKE,
+ EF_GUMGANG4,
+ EF_SHIELDBOOMERANG4,
+ EF_CASTSPIN2,
+ EF_VULCANWAV,
+ EF_AGIUP2,
+ EF_DETECT3,
+ EF_AGIUP3,
+ EF_DETECT4,
+ EF_ELECTRIC3,
+ EF_GUARD4,
+ EF_BOTTOM_BARRIER,
+ EF_BOTTOM_STEALTH,
+ EF_REPAIRTIME,
+ EF_NC_ANAL,
+ EF_FIRETHROW,
+ EF_VENOMIMPRESS,
+ EF_FROSTMISTY,
+ EF_BURNING,
+ EF_COLDTHROW,
+ EF_MAKEHALLU,
+ EF_HALLUTIME,
+ EF_INFRAREDSCAN,
+ EF_CRASHAXE,
+ EF_GTHUNDER,
+ EF_STONERING,
+ EF_INTIMIDATE2,
+ EF_STASIS,
+ EF_REDLINE,
+ EF_FROSTDIVER3,
+ EF_BOTTOM_BASILICA2,
+ EF_RECOGNIZED,
+ EF_TETRA,
+ EF_TETRACASTING,
+ EF_FIREBALL3,
+ EF_INTIMIDATE3,
+ EF_RECOGNIZED2,
+ EF_CLOAKING3,
+ EF_INTIMIDATE4,
+ EF_STRETCH,
+ EF_BLACKBODY,
+ EF_ENERVATION,
+ EF_ENERVATION2,
+ EF_ENERVATION3,
+ EF_ENERVATION4,
+ EF_ENERVATION5,
+ EF_ENERVATION6,
+ EF_LINELINK4,
+ EF_RG_COIN5,
+ EF_WATERFALL_ANI,
+ EF_BOTTOM_MANHOLE,
+ EF_MANHOLE,
+ EF_MAKEFEINT,
+ EF_FORESTLIGHT6,
+ EF_DARKCASTING2,
+ EF_BOTTOM_ANI,
+ EF_BOTTOM_MAELSTROM,
+ EF_BOTTOM_BLOODYLUST,
+ EF_BEGINSPELL_N1,
+ EF_BEGINSPELL_N2,
+ EF_HEAL_N,
+ EF_CHOOKGI_N,
+ EF_JOBLVUP50_2,
+ EF_CHEMICAL2DASH2,
+ EF_CHEMICAL2DASH3,
+ EF_ROLLINGCAST,
+ EF_WATER_BELOW,
+ EF_WATER_FADE,
+ EF_BEGINSPELL_N3,
+ EF_BEGINSPELL_N4,
+ EF_BEGINSPELL_N5,
+ EF_BEGINSPELL_N6,
+ EF_BEGINSPELL_N7,
+ EF_BEGINSPELL_N8,
+ EF_WATER_SMOKE,
+ EF_DANCE1,
+ EF_DANCE2,
+ EF_LINKPARTICLE,
+ EF_SOULLIGHT2,
+ EF_SPR_PARTICLE,
+ EF_SPR_PARTICLE2,
+ EF_SPR_PLANT,
+ EF_CHEMICAL_V,
+ EF_SHOOTPARTICLE,
+ EF_BOT_REVERB,
+ EF_RAIN_PARTICLE,
+ EF_CHEMICAL_V2,
+ EF_SECRA,
+ EF_BOT_REVERB2,
+ EF_CIRCLEPOWER2,
+ EF_SECRA2,
+ EF_CHEMICAL_V3,
+ EF_ENERVATION7,
+ EF_CIRCLEPOWER3,
+ EF_SPR_PLANT2,
+ EF_CIRCLEPOWER4,
+ EF_SPR_PLANT3,
+ EF_RG_COIN6,
+ EF_SPR_PLANT4,
+ EF_CIRCLEPOWER5,
+ EF_SPR_PLANT5,
+ EF_CIRCLEPOWER6,
+ EF_SPR_PLANT6,
+ EF_CIRCLEPOWER7,
+ EF_SPR_PLANT7,
+ EF_CIRCLEPOWER8,
+ EF_SPR_PLANT8,
+ EF_HEARTASURA,
+ EF_BEGINSPELL_150,
+ EF_LEVEL99_150,
+ EF_PRIMECHARGE,
+ EF_GLASSWALL4,
+ EF_GRADIUS_LASER,
+ EF_BASH3D6,
+ EF_GUMGANG5,
+ EF_HITLINE8,
+ EF_ELECTRIC4,
+ EF_TEIHIT1T,
+ EF_SPINMOVE,
+ EF_FIREBALL4,
+ EF_TRIPLEATTACK4,
+ EF_CHEMICAL3S,
+ EF_GROUNDSHAKE,
+ EF_DQ9_CHARGE,
+ EF_DQ9_CHARGE2,
+ EF_DQ9_CHARGE3,
+ EF_DQ9_CHARGE4,
+ EF_BLUELINE,
+ EF_SELFSCROLL,
+ EF_SPR_LIGHTPRINT,
+ EF_PNG_TEST,
+ EF_BEGINSPELL_YB,
+ EF_CHEMICAL2DASH4,
+ EF_GROUNDSHAKE2,
+ EF_PRESSURE2,
+ EF_RG_COIN7,
+ EF_PRIMECHARGE2,
+ EF_PRIMECHARGE3,
+ EF_PRIMECHARGE4,
+ EF_GREENCASTING,
+ EF_WALLOFTHORN,
+ EF_FIREBALL5,
+ EF_THROWITEM11,
+ EF_SPR_PLANT9,
+ EF_DEMONICFIRE,
+ EF_DEMONICFIRE2,
+ EF_DEMONICFIRE3,
+ EF_HELLSPLANT,
+ EF_FIREWALL2,
+ EF_VACUUM,
+ EF_SPR_PLANT10,
+ EF_SPR_LIGHTPRINT2,
+ EF_POISONSMOKE2,
+ EF_MAKEHALLU2,
+ EF_SHOCKWAVE2,
+ EF_SPR_PLANT11,
+ EF_COLDTHROW2,
+ EF_DEMONICFIRE4,
+ EF_PRESSURE3,
+ EF_LINKPARTICLE2,
+ EF_SOULLIGHT3,
+ EF_CHAREFFECT,
+ EF_GUMGANG6,
+ EF_FIREBALL6,
+ EF_GUMGANG7,
+ EF_GUMGANG8,
+ EF_GUMGANG9,
+ EF_BOTTOM_DE2,
+ EF_COLDSTATUS,
+ EF_SPR_LIGHTPRINT3,
+ EF_WATERBALL3,
+ EF_HEAL_N2,
+ EF_RAIN_PARTICLE2,
+ EF_CLOUD9,
+ EF_YELLOWFLY3,
+ EF_EL_GUST,
+ EF_EL_BLAST,
+ EF_EL_AQUAPLAY,
+ EF_EL_UPHEAVAL,
+ EF_EL_WILD_STORM,
+ EF_EL_CHILLY_AIR,
+ EF_EL_CURSED_SOIL,
+ EF_EL_COOLER,
+ EF_EL_TROPIC,
+ EF_EL_PYROTECHNIC,
+ EF_EL_PETROLOGY,
+ EF_EL_HEATER,
+ EF_POISON_MIST,
+ EF_ERASER_CUTTER,
+ EF_SILENT_BREEZE,
+ EF_MAGMA_FLOW,
+ EF_GRAYBODY,
+ EF_LAVA_SLIDE,
+ EF_SONIC_CLAW,
+ EF_TINDER_BREAKER,
+ EF_MIDNIGHT_FRENZY,
+ EF_MACRO,
+ EF_CHEMICAL_ALLRANGE,
+ EF_TETRA_FIRE,
+ EF_TETRA_WATER,
+ EF_TETRA_WIND,
+ EF_TETRA_GROUND,
+ EF_EMITTER,
+ EF_VOLCANIC_ASH,
+ EF_LEVEL99_ORB1,
+ EF_LEVEL99_ORB2,
+ EF_LEVEL150,
+ EF_LEVEL150_SUB,
+ EF_THROWITEM4_1,
+ EF_THROW_HAPPOKUNAI,
+ EF_THROW_MULTIPLE_COIN,
+ EF_THROW_BAKURETSU,
+ EF_ROTATE_HUUMARANKA,
+ EF_ROTATE_BG,
+ EF_ROTATE_LINE_GRAY,
+ EF_2011RWC,
+ EF_2011RWC2,
+ EF_KAIHOU,
+ EF_GROUND_EXPLOSION,
+ EF_KG_KAGEHUMI,
+ EF_KO_ZENKAI_WATER,
+ EF_KO_ZENKAI_LAND,
+ EF_KO_ZENKAI_FIRE,
+ EF_KO_ZENKAI_WIND,
+ EF_KO_JYUMONJIKIRI,
+ EF_KO_SETSUDAN,
+ EF_RED_CROSS,
+ EF_KO_IZAYOI,
+ EF_ROTATE_LINE_BLUE,
+ EF_KG_KYOMU,
+ EF_KO_HUUMARANKA,
+ EF_BLUELIGHTBODY,
+ EF_KAGEMUSYA,
+ EF_OB_GENSOU,
+ EF_NO100_FIRECRACKER,
+ EF_KO_MAKIBISHI,
+ EF_KAIHOU1,
+ EF_AKAITSUKI,
+ EF_ZANGETSU,
+ EF_GENSOU,
+ EF_HAT_EFFECT,
+ EF_CHERRYBLOSSOM,
+ EF_EVENT_CLOUD,
+ EF_RUN_MAKE_OK,
+ EF_RUN_MAKE_FAILURE,
+ EF_MIRESULT_MAKE_OK,
+ EF_MIRESULT_MAKE_FAIL,
+ EF_ALL_RAY_OF_PROTECTION,
+ EF_VENOMFOG,
+ EF_DUSTSTORM,
+ EF_LEVEL160,
+ EF_LEVEL160_SUB,
+ EF_MAPCHAIN,
+ EF_MAGIC_FLOOR,
+ EF_ICEMINE,
+ EF_FLAMECORSS,
+ EF_ICEMINE_1,
+ EF_DANCE_BLADE_ATK,
+ EF_DARKPIERCING,
+ EF_INVINCIBLEOFF2,
+ EF_MAXPAIN,
+ EF_DEATHSUMMON,
+ EF_MOONSTAR,
+ EF_STRANGELIGHTS,
+ EF_SUPER_STAR,
+ EF_YELLOBODY,
+ EF_COLORPAPER2,
+ EF_EVILS_PAW,
+ EF_GC_DARKCROW,
+ EF_RK_DRAGONBREATH_WATER,
+ EF_ALL_FULL_THROTTLE,
+ EF_SR_FLASHCOMBO,
+ EF_RK_LUXANIMA,
+ EF_CLOUD10,
+ EF_SO_ELEMENTAL_SHIELD,
+ EF_AB_OFFERTORIUM,
+ EF_WL_TELEKINESIS_INTENSE,
+ EF_GN_ILLUSIONDOPING,
+ EF_NC_MAGMA_ERUPTION,
+ EF_LG_KINGS_GRACE,
+ EF_BLOODDRAIN2,
+ EF_NPC_WIDEWEB,
+ EF_NPC_BURNT,
+ EF_NPC_CHILL,
+ EF_RA_UNLIMIT,
+ EF_AB_OFFERTORIUM_RING,
+ EF_SC_ESCAPE,
+ EF_WM_FRIGG_SONG,
+ EF_FLICKER,
+ EF_C_MAKER,
+ EF_HAMMER_OF_GOD,
+ EF_MASS_SPIRAL,
+ EF_FIRE_RAIN,
+ EF_WHITEBODY,
+ EF_BANISHING_BUSTER,
+ EF_SLUGSHOT,
+ EF_D_TAIL,
+ EF_BIND_TRAP1,
+ EF_BIND_TRAP2,
+ EF_BIND_TRAP3,
+ EF_JUMPBODY1,
+ EF_ANIMATED_EMITTER,
+ EF_RL_EXPLOSION,
+ EF_C_MAKER_1,
+ EF_QD_SHOT,
+ EF_P_ALTER,
+ EF_S_STORM,
+ EF_MUSIC_HAT,
+ EF_CLOUD_KILL,
+ EF_ESCAPE,
+ EF_XENO_SLASHER,
+ EF_FLOWERSMOKE,
+ EF_FSTONE,
+ EF_QSCARABA,
+ EF_LJOSALFAR,
+ EF_HAPPINESSSTAR,
+ EF_POWER_OF_GAIA,
+ EF_MAPLE_FALLS,
+ EF_MARKING_USE_CHANGEMONSTER,
+ EF_MAGICAL_FEATHER,
+ EF_MERMAID_LONGING,
+ EF_GIFT_OF_SNOW,
+ EF_ACH_COMPLETE,
+ EF_TIME_ACCESSORY,
+ EF_SPRITEMABLE,
+ EF_TUNAPARTY,
+ EF_MAX
+};
+
+enum e_hat_effects {
+ HAT_EF_MIN = 0,
+ HAT_EF_BLOSSOM_FLUTTERING,
+ HAT_EF_MERMAID_LONGING,
+ HAT_EF_RL_BANISHING_BUSTER,
+ HAT_EF_LJOSALFAR,
+ HAT_EF_CLOCKING,
+ HAT_EF_SNOW,
+ HAT_EF_MAKEBLUR,
+ HAT_EF_SLEEPATTACK,
+ HAT_EF_GUMGANG,
+ HAT_EF_TALK_FROSTJOKE,
+ HAT_EF_DEMONSTRATION,
+ HAT_EF_FLUTTER_BUTTERFLY,
+ HAT_EF_ANGEL_FLUTTERING,
+ HAT_EF_BLESSING_OF_ANGELS,
+ HAT_EF_ELECTRIC,
+ HAT_EF_GREEN_FLOOR,
+ HAT_EF_SHRINK,
+ HAT_EF_VALHALLA_IDOL,
+ HAT_EF_ANGEL_STAIRS,
+ HAT_EF_GLOW_OF_NEW_YEAR,
+ HAT_EF_BOTTOM_FORTUNEKISS,
+ HAT_EF_PINKBODY,
+ HAT_EF_DOUBLEGUMGANG,
+ HAT_EF_GIANTBODY,
+ HAT_EF_GREEN99_6,
+ HAT_EF_CIRCLEPOWER,
+ HAT_EF_BOTTOM_BLOODYLUST,
+ HAT_EF_WATER_BELOW,
+ HAT_EF_LEVEL99_150,
+ HAT_EF_YELLOWFLY3,
+ HAT_EF_KAGEMUSYA,
+ HAT_EF_CHERRYBLOSSOM,
+ HAT_EF_STRANGELIGHTS,
+ HAT_EF_WL_TELEKINESIS_INTENSE,
+ HAT_EF_AB_OFFERTORIUM_RING,
+ HAT_EF_WHITEBODY2,
+ HAT_EF_SAKURA,
+ HAT_EF_CLOUD2,
+ HAT_EF_FEATHER_FLUTTERING,
+ HAT_EF_CAMELLIA_HAIR_PIN,
+ HAT_EF_JP_EV_EFFECT01,
+ HAT_EF_JP_EV_EFFECT02,
+ HAT_EF_JP_EV_EFFECT03,
+ HAT_EF_FLORAL_WALTZ,
+ HAT_EF_MAGICAL_FEATHER,
+ HAT_EF_HAT_EFFECT,
+ HAT_EF_BAKURETSU_HADOU,
+ HAT_EF_GOLD_SHOWER,
+ HAT_EF_WHITEBODY,
+ HAT_EF_WATER_BELOW2,
+ HAT_EF_FIREWORK,
+ HAT_EF_RETURN_TW_1ST_HAT,
+ HAT_EF_C_FLUTTERBUTTERFLY_BL,
+ HAT_EF_QSCARABA,
+ HAT_EF_FSTONE,
+ HAT_EF_MAGICCIRCLE,
+ HAT_EF_GODCLASS,
+ HAT_EF_GODCLASS2,
+ HAT_EF_LEVEL99_RED,
+ HAT_EF_LEVEL99_ULTRAMARINE,
+ HAT_EF_LEVEL99_CYAN,
+ HAT_EF_LEVEL99_LIME,
+ HAT_EF_LEVEL99_VIOLET,
+ HAT_EF_LEVEL99_LILAC,
+ HAT_EF_LEVEL99_SUN_ORANGE,
+ HAT_EF_LEVEL99_DEEP_PINK,
+ HAT_EF_LEVEL99_BLACK,
+ HAT_EF_LEVEL99_WHITE,
+ HAT_EF_LEVEL160_RED,
+ HAT_EF_LEVEL160_ULTRAMARINE,
+ HAT_EF_LEVEL160_CYAN,
+ HAT_EF_LEVEL160_LIME,
+ HAT_EF_LEVEL160_VIOLET,
+ HAT_EF_LEVEL160_LILAC,
+ HAT_EF_LEVEL160_SUN_ORANGE,
+ HAT_EF_LEVEL160_DEEP_PINK,
+ HAT_EF_LEVEL160_BLACK,
+ HAT_EF_LEVEL160_WHITE,
+ HAT_EF_FULL_BLOOMCHERRY_TREE,
+ HAT_EF_MAX
+};
+
+/**
+ * used to generate quick script_array entries
+ **/
+extern struct eri *array_ers;
+extern DBMap *st_db;
+extern unsigned int active_scripts;
+extern unsigned int next_id;
+extern struct eri *st_ers;
+extern struct eri *stack_ers;
+
+const char* skip_space(const char* p);
+void script_error(const char* src, const char* file, int start_line, const char* error_msg, const char* error_pos);
+void script_warning(const char* src, const char* file, int start_line, const char* error_msg, const char* error_pos);
+
+bool is_number(const char *p);
+struct script_code* parse_script(const char* src,const char* file,int line,int options);
+void run_script(struct script_code *rootscript,int pos,int rid,int oid);
+
+int set_reg(struct script_state* st, struct map_session_data* sd, int64 num, const char* name, const void* value, struct reg_db *ref);
+int set_var(struct map_session_data *sd, char *name, void *val);
+int conv_num(struct script_state *st,struct script_data *data);
+const char* conv_str(struct script_state *st,struct script_data *data);
+void pop_stack(struct script_state* st, int start, int end);
+int run_script_timer(int tid, unsigned int tick, int id, intptr_t data);
+void script_stop_sleeptimers(int id);
+struct linkdb_node *script_erase_sleepdb(struct linkdb_node *n);
+void run_script_main(struct script_state *st);
+
+void script_stop_scriptinstances(struct script_code *code);
+void script_free_code(struct script_code* code);
+void script_free_vars(struct DBMap *storage);
+struct script_state* script_alloc_state(struct script_code* rootscript, int pos, int rid, int oid);
+void script_free_state(struct script_state* st);
+
+struct DBMap* script_get_label_db(void);
+struct DBMap* script_get_userfunc_db(void);
+void script_run_autobonus(const char *autobonus, struct map_session_data *sd, unsigned int pos);
+
+bool script_get_parameter(const char* name, int* value);
+bool script_get_constant(const char* name, int* value);
+void script_set_constant(const char* name, int value, bool isparameter, bool deprecated);
+void script_hardcoded_constants(void);
+
+void script_cleararray_pc(struct map_session_data* sd, const char* varname, void* value);
+void script_setarray_pc(struct map_session_data* sd, const char* varname, uint32 idx, void* value, int* refcache);
+
+int script_config_read(const char *cfgName);
+void do_init_script(void);
+void do_final_script(void);
+int add_str(const char* p);
+const char* get_str(int id);
+void script_reload(void);
+
+// @commands (script based)
+void setd_sub(struct script_state *st, struct map_session_data *sd, const char *varname, int elem, void *value, struct reg_db *ref);
+
+/**
+ * Array Handling
+ **/
+struct reg_db *script_array_src(struct script_state *st, struct map_session_data *sd, const char *name, struct reg_db *ref);
+void script_array_update(struct reg_db *src, int64 num, bool empty);
+void script_array_delete(struct reg_db *src, struct script_array *sa);
+void script_array_remove_member(struct reg_db *src, struct script_array *sa, unsigned int idx);
+void script_array_add_member(struct script_array *sa, unsigned int idx);
+unsigned int script_array_size(struct script_state *st, struct map_session_data *sd, const char *name, struct reg_db *ref);
+unsigned int script_array_highest_key(struct script_state *st, struct map_session_data *sd, const char *name, struct reg_db *ref);
+void script_array_ensure_zero(struct script_state *st, struct map_session_data *sd, int64 uid, struct reg_db *ref);
+int script_free_array_db(DBKey key, DBData *data, va_list ap);
+/* */
+void script_reg_destroy_single(struct map_session_data *sd, int64 reg, struct script_reg_state *data);
+int script_reg_destroy(DBKey key, DBData *data, va_list ap);
+/* */
+void script_generic_ui_array_expand(unsigned int plus);
+unsigned int *script_array_cpy_list(struct script_array *sa);
+
+#ifdef BETA_THREAD_TEST
+void queryThread_log(char * entry, int length);
+#endif
+
+bool script_check_RegistryVariableLength(int pType, const char *val, size_t* vlen);
+
+#endif /* _SCRIPT_HPP_ */
diff --git a/src/map/script_constants.h b/src/map/script_constants.hpp
similarity index 60%
rename from src/map/script_constants.h
rename to src/map/script_constants.hpp
index 232b0f63b35..2f7f44d3b16 100644
--- a/src/map/script_constants.h
+++ b/src/map/script_constants.hpp
@@ -1,11 +1,12 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _SCRIPT_CONSTANTS_H_
- #define _SCRIPT_CONSTANTS_H_
+#ifndef _SCRIPT_CONSTANTS_HPP_
+ #define _SCRIPT_CONSTANTS_HPP_
#define export_constant(a) script_set_constant(#a,a,false,false)
#define export_constant2(a,b) script_set_constant(a,b,false,false)
+ #define export_constant_offset(a,offset) script_set_constant(#a + (offset),a,false,false)
#define export_parameter(a,b) script_set_constant(a,b,true,false)
/* min and maximum variable value */
@@ -1368,7 +1369,7 @@
export_constant(SC_MOONSTAR);
export_constant(SC_SUPER_STAR);
export_constant(SC_HEAT_BARREL);
- export_constant(SC_HEAT_BARREL_AFTER);
+ export_constant(SC_MAGICALBULLET);
export_constant(SC_P_ALTER);
export_constant(SC_E_CHAIN);
export_constant(SC_C_MARKER);
@@ -1469,6 +1470,18 @@
export_constant(SC_DAILYSENDMAILCNT);
export_constant(SC_DORAM_BUF_01);
export_constant(SC_DORAM_BUF_02);
+ export_constant(SC_HISS);
+ export_constant(SC_NYANGGRASS);
+ export_constant(SC_GROOMING);
+ export_constant(SC_SHRIMPBLESSING);
+ export_constant(SC_CHATTERING);
+ export_constant(SC_DORAM_WALKSPEED);
+ export_constant(SC_DORAM_MATK);
+ export_constant(SC_DORAM_FLEE2);
+ export_constant(SC_DORAM_SVSP);
+ export_constant(SC_FALLEN_ANGEL);
+ export_constant(SC_CHEERUP);
+ export_constant(SC_DRESSUP);
#ifdef RENEWAL
export_constant(SC_EXTREMITYFIST2);
#endif
@@ -2519,6 +2532,7 @@
export_constant(SI_GLOOM_CARD);
export_constant(SI_PHARAOH_CARD);
export_constant(SI_KIEL_CARD);
+ export_constant(SI_CHEERUP);
export_constant(SI_S_MANAPOTION);
export_constant(SI_M_DEFSCROLL);
@@ -2608,94 +2622,184 @@
export_constant2("ATF_SKILL",ATF_MAGIC|ATF_MISC);
/* emoticons */
- export_constant(E_GASP);
- export_constant(E_WHAT);
- export_constant(E_HO);
- export_constant(E_LV);
- export_constant(E_SWT);
- export_constant(E_IC);
- export_constant(E_AN);
- export_constant(E_AG);
- export_constant(E_CASH);
- export_constant(E_DOTS);
- export_constant(E_SCISSORS);
- export_constant(E_ROCK);
- export_constant(E_PAPER);
- export_constant(E_KOREA);
- export_constant(E_LV2);
- export_constant(E_THX);
- export_constant(E_WAH);
- export_constant(E_SRY);
- export_constant(E_HEH);
- export_constant(E_SWT2);
- export_constant(E_HMM);
- export_constant(E_NO1);
- export_constant(E_NO);
- export_constant(E_OMG);
- export_constant(E_OH);
- export_constant(E_X);
- export_constant(E_HLP);
- export_constant(E_GO);
- export_constant(E_SOB);
- export_constant(E_GG);
- export_constant(E_KIS);
- export_constant(E_KIS2);
- export_constant(E_PIF);
- export_constant(E_OK);
- export_constant(E_MUTE);
- export_constant(E_INDONESIA);
- export_constant(E_BZZ);
- export_constant(E_RICE);
- export_constant(E_AWSM);
- export_constant(E_MEH);
- export_constant(E_SHY);
- export_constant(E_PAT);
- export_constant(E_MP);
- export_constant(E_SLUR);
- export_constant(E_COM);
- export_constant(E_YAWN);
- export_constant(E_GRAT);
- export_constant(E_HP);
- export_constant(E_PHILIPPINES);
- export_constant(E_MALAYSIA);
- export_constant(E_SINGAPORE);
- export_constant(E_BRAZIL);
- export_constant(E_FLASH);
- export_constant(E_SPIN);
- export_constant(E_SIGH);
- export_constant(E_DUM);
- export_constant(E_LOUD);
- export_constant(E_OTL);
- export_constant(E_DICE1);
- export_constant(E_DICE2);
- export_constant(E_DICE3);
- export_constant(E_DICE4);
- export_constant(E_DICE5);
- export_constant(E_DICE6);
- export_constant(E_INDIA);
- export_constant(E_LUV);
- export_constant(E_RUSSIA);
- export_constant(E_VIRGIN);
- export_constant(E_MOBILE);
- export_constant(E_MAIL);
- export_constant(E_CHINESE);
- export_constant(E_ANTENNA1);
- export_constant(E_ANTENNA2);
- export_constant(E_ANTENNA3);
- export_constant(E_HUM);
- export_constant(E_ABS);
- export_constant(E_OOPS);
- export_constant(E_SPIT);
- export_constant(E_ENE);
- export_constant(E_PANIC);
- export_constant(E_WHISP);
- export_constant(E_YUT1);
- export_constant(E_YUT2);
- export_constant(E_YUT3);
- export_constant(E_YUT4);
- export_constant(E_YUT5);
- export_constant(E_YUT6);
- export_constant(E_YUT7);
+ export_constant(ET_SURPRISE);
+ export_constant(ET_QUESTION);
+ export_constant(ET_DELIGHT);
+ export_constant(ET_THROB);
+ export_constant(ET_SWEAT);
+ export_constant(ET_AHA);
+ export_constant(ET_FRET);
+ export_constant(ET_ANGER);
+ export_constant(ET_MONEY);
+ export_constant(ET_THINK);
+ export_constant(ET_SCISSOR);
+ export_constant(ET_ROCK);
+ export_constant(ET_WRAP);
+ export_constant(ET_FLAG);
+ export_constant(ET_BIGTHROB);
+ export_constant(ET_THANKS);
+ export_constant(ET_KEK);
+ export_constant(ET_SORRY);
+ export_constant(ET_SMILE);
+ export_constant(ET_PROFUSELY_SWEAT);
+ export_constant(ET_SCRATCH);
+ export_constant(ET_BEST);
+ export_constant(ET_STARE_ABOUT);
+ export_constant(ET_HUK);
+ export_constant(ET_O);
+ export_constant(ET_X);
+ export_constant(ET_HELP);
+ export_constant(ET_GO);
+ export_constant(ET_CRY);
+ export_constant(ET_KIK);
+ export_constant(ET_CHUP);
+ export_constant(ET_CHUPCHUP);
+ export_constant(ET_HNG);
+ export_constant(ET_OK);
+ export_constant(ET_CHAT_PROHIBIT);
+ export_constant(ET_INDONESIA_FLAG);
+ export_constant(ET_STARE);
+ export_constant(ET_HUNGRY);
+ export_constant(ET_COOL);
+ export_constant(ET_MERONG);
+ export_constant(ET_SHY);
+ export_constant(ET_GOODBOY);
+ export_constant(ET_SPTIME);
+ export_constant(ET_SEXY);
+ export_constant(ET_COMEON);
+ export_constant(ET_SLEEPY);
+ export_constant(ET_CONGRATULATION);
+ export_constant(ET_HPTIME);
+ export_constant(ET_PH_FLAG);
+ export_constant(ET_MY_FLAG);
+ export_constant(ET_SI_FLAG);
+ export_constant(ET_BR_FLAG);
+ export_constant(ET_SPARK);
+ export_constant(ET_CONFUSE);
+ export_constant(ET_OHNO);
+ export_constant(ET_HUM);
+ export_constant(ET_BLABLA);
+ export_constant(ET_OTL);
+ export_constant(ET_DICE1);
+ export_constant(ET_DICE2);
+ export_constant(ET_DICE3);
+ export_constant(ET_DICE4);
+ export_constant(ET_DICE5);
+ export_constant(ET_DICE6);
+ export_constant(ET_INDIA_FLAG);
+ export_constant(ET_LUV);
+ export_constant(ET_FLAG8);
+ export_constant(ET_FLAG9);
+ export_constant(ET_MOBILE);
+ export_constant(ET_MAIL);
+ export_constant(ET_ANTENNA0);
+ export_constant(ET_ANTENNA1);
+ export_constant(ET_ANTENNA2);
+ export_constant(ET_ANTENNA3);
+ export_constant(ET_HUM2);
+ export_constant(ET_ABS);
+ export_constant(ET_OOPS);
+ export_constant(ET_SPIT);
+ export_constant(ET_ENE);
+ export_constant(ET_PANIC);
+ export_constant(ET_WHISP);
+ export_constant(ET_YUT1);
+ export_constant(ET_YUT2);
+ export_constant(ET_YUT3);
+ export_constant(ET_YUT4);
+ export_constant(ET_YUT5);
+ export_constant(ET_YUT6);
+ export_constant(ET_YUT7);
+
+ /* emoticons deprecated */
+ script_set_constant("E_GASP",ET_SURPRISE,false,true);
+ script_set_constant("E_WHAT",ET_QUESTION,false,true);
+ script_set_constant("E_HO",ET_DELIGHT,false,true);
+ script_set_constant("E_LV",ET_THROB,false,true);
+ script_set_constant("E_SWT",ET_SWEAT,false,true);
+ script_set_constant("E_IC",ET_AHA,false,true);
+ script_set_constant("E_AN",ET_FRET,false,true);
+ script_set_constant("E_AG",ET_ANGER,false,true);
+ script_set_constant("E_CASH",ET_MONEY,false,true);
+ script_set_constant("E_DOTS",ET_THINK,false,true);
+ script_set_constant("E_SCISSORS",ET_SCISSOR,false,true);
+ script_set_constant("E_ROCK",ET_ROCK,false,true);
+ script_set_constant("E_PAPER",ET_WRAP,false,true);
+ script_set_constant("E_KOREA",ET_FLAG,false,true);
+ script_set_constant("E_LV2",ET_BIGTHROB,false,true);
+ script_set_constant("E_THX",ET_THANKS,false,true);
+ script_set_constant("E_WAH",ET_KEK,false,true);
+ script_set_constant("E_SRY",ET_SORRY,false,true);
+ script_set_constant("E_HEH",ET_SMILE,false,true);
+ script_set_constant("E_SWT2",ET_PROFUSELY_SWEAT,false,true);
+ script_set_constant("E_HMM",ET_SCRATCH,false,true);
+ script_set_constant("E_NO1",ET_BEST,false,true);
+ script_set_constant("E_NO",ET_STARE_ABOUT,false,true);
+ script_set_constant("E_OMG",ET_HUK,false,true);
+ script_set_constant("E_OH",ET_O,false,true);
+ script_set_constant("E_X",ET_X,false,true);
+ script_set_constant("E_HLP",ET_HELP,false,true);
+ script_set_constant("E_GO",ET_GO,false,true);
+ script_set_constant("E_SOB",ET_CRY,false,true);
+ script_set_constant("E_GG",ET_KIK,false,true);
+ script_set_constant("E_KIS",ET_CHUP,false,true);
+ script_set_constant("E_KIS2",ET_CHUPCHUP,false,true);
+ script_set_constant("E_PIF",ET_HNG,false,true);
+ script_set_constant("E_OK",ET_OK,false,true);
+ script_set_constant("E_MUTE",ET_CHAT_PROHIBIT,false,true);
+ script_set_constant("E_INDONESIA",ET_INDONESIA_FLAG,false,true);
+ script_set_constant("E_BZZ",ET_STARE,false,true);
+ script_set_constant("E_RICE",ET_HUNGRY,false,true);
+ script_set_constant("E_AWSM",ET_COOL,false,true);
+ script_set_constant("E_MEH",ET_MERONG,false,true);
+ script_set_constant("E_SHY",ET_SHY,false,true);
+ script_set_constant("E_PAT",ET_GOODBOY,false,true);
+ script_set_constant("E_MP",ET_SPTIME,false,true);
+ script_set_constant("E_SLUR",ET_SEXY,false,true);
+ script_set_constant("E_COM",ET_COMEON,false,true);
+ script_set_constant("E_YAWN",ET_SLEEPY,false,true);
+ script_set_constant("E_GRAT",ET_CONGRATULATION,false,true);
+ script_set_constant("E_HP",ET_HPTIME,false,true);
+ script_set_constant("E_PHILIPPINES",ET_PH_FLAG,false,true);
+ script_set_constant("E_MALAYSIA",ET_MY_FLAG,false,true);
+ script_set_constant("E_SINGAPORE",ET_SI_FLAG,false,true);
+ script_set_constant("E_BRAZIL",ET_BR_FLAG,false,true);
+ script_set_constant("E_FLASH",ET_SPARK,false,true);
+ script_set_constant("E_SPIN",ET_CONFUSE,false,true);
+ script_set_constant("E_SIGH",ET_OHNO,false,true);
+ script_set_constant("E_DUM",ET_HUM,false,true);
+ script_set_constant("E_LOUD",ET_BLABLA,false,true);
+ script_set_constant("E_OTL",ET_OTL,false,true);
+ script_set_constant("E_DICE1",ET_DICE1,false,true);
+ script_set_constant("E_DICE2",ET_DICE2,false,true);
+ script_set_constant("E_DICE3",ET_DICE3,false,true);
+ script_set_constant("E_DICE4",ET_DICE4,false,true);
+ script_set_constant("E_DICE5",ET_DICE5,false,true);
+ script_set_constant("E_DICE6",ET_DICE6,false,true);
+ script_set_constant("E_INDIA",ET_INDIA_FLAG,false,true);
+ script_set_constant("E_LUV",ET_LUV,false,true);
+ script_set_constant("E_RUSSIA",ET_FLAG8,false,true);
+ script_set_constant("E_VIRGIN",ET_FLAG9,false,true);
+ script_set_constant("E_MOBILE",ET_MOBILE,false,true);
+ script_set_constant("E_MAIL",ET_MAIL,false,true);
+ script_set_constant("E_CHINESE",ET_ANTENNA0,false,true);
+ script_set_constant("E_ANTENNA1",ET_ANTENNA1,false,true);
+ script_set_constant("E_ANTENNA2",ET_ANTENNA2,false,true);
+ script_set_constant("E_ANTENNA3",ET_ANTENNA3,false,true);
+ script_set_constant("E_HUM",ET_HUM2,false,true);
+ script_set_constant("E_ABS",ET_ABS,false,true);
+ script_set_constant("E_OOPS",ET_OOPS,false,true);
+ script_set_constant("E_SPIT",ET_SPIT,false,true);
+ script_set_constant("E_ENE",ET_ENE,false,true);
+ script_set_constant("E_PANIC",ET_PANIC,false,true);
+ script_set_constant("E_WHISP",ET_WHISP,false,true);
+ script_set_constant("E_YUT1",ET_YUT1,false,true);
+ script_set_constant("E_YUT2",ET_YUT2,false,true);
+ script_set_constant("E_YUT3",ET_YUT3,false,true);
+ script_set_constant("E_YUT4",ET_YUT4,false,true);
+ script_set_constant("E_YUT5",ET_YUT5,false,true);
+ script_set_constant("E_YUT6",ET_YUT6,false,true);
+ script_set_constant("E_YUT7",ET_YUT7,false,true);
/* send targets */
export_constant(ALL_CLIENT);
@@ -2782,6 +2886,7 @@
export_constant(W_DOUBLE_DS);
export_constant(W_DOUBLE_DA);
export_constant(W_DOUBLE_SA);
+ export_constant(MAX_WEAPON_TYPE_ALL);
/* ammunition types */
export_constant(A_ARROW);
@@ -3788,7 +3893,6 @@
export_constant(IG_SOMETHING_CANDY_HOLDER);
export_constant(IG_MYSTERIOUS_EGG);
export_constant(IG_AGUST_LUCKY_SCROLL);
- export_constant(IG_RUNE);
export_constant(IG_ELEMENT);
export_constant(IG_POISON);
export_constant(IG_CASH_FOOD);
@@ -3805,8 +3909,2266 @@
export_constant(IG_SPECIAL_CHRISTMAS_BOX);
export_constant(IG_SANTA_GIFT);
+ /* unit stop walking */
+ export_constant(USW_NONE);
+ export_constant(USW_FIXPOS);
+ export_constant(USW_MOVE_ONCE);
+ export_constant(USW_MOVE_FULL_CELL);
+ export_constant(USW_FORCE_STOP);
+ export_constant(USW_ALL);
+
+ /* achievement groups */
+ export_constant2("AG_ADD_FRIEND", AG_ADD_FRIEND);
+ export_constant2("AG_ADVENTURE", AG_ADVENTURE);
+ export_constant2("AG_BABY", AG_BABY);
+ export_constant2("AG_BATTLE", AG_BATTLE);
+ export_constant2("AG_CHATTING", AG_CHAT);
+ export_constant2("AG_CHATTING_COUNT", AG_CHAT_COUNT);
+ export_constant2("AG_CHATTING_CREATE", AG_CHAT_CREATE);
+ export_constant2("AG_CHATTING_DYING", AG_CHAT_DYING);
+ export_constant2("AG_EAT", AG_EAT);
+ export_constant2("AG_GET_ITEM", AG_GET_ITEM);
+ export_constant2("AG_GET_ZENY", AG_GET_ZENY);
+ export_constant2("AG_GOAL_ACHIEVE", AG_GOAL_ACHIEVE);
+ export_constant2("AG_GOAL_LEVEL", AG_GOAL_LEVEL);
+ export_constant2("AG_GOAL_STATUS", AG_GOAL_STATUS);
+ export_constant2("AG_HEAR", AG_HEAR);
+ export_constant2("AG_JOB_CHANGE", AG_JOB_CHANGE);
+ export_constant2("AG_MARRY", AG_MARRY);
+ export_constant2("AG_PARTY", AG_PARTY);
+ export_constant2("AG_ENCHANT_FAIL", AG_REFINE_FAIL);
+ export_constant2("AG_ENCHANT_SUCCESS", AG_REFINE_SUCCESS);
+ export_constant2("AG_SEE", AG_SEE);
+ export_constant2("AG_SPEND_ZENY", AG_SPEND_ZENY);
+ export_constant2("AG_TAMING", AG_TAMING);
+
+ /* achievement info */
+ export_constant(ACHIEVEINFO_COUNT1);
+ export_constant(ACHIEVEINFO_COUNT2);
+ export_constant(ACHIEVEINFO_COUNT3);
+ export_constant(ACHIEVEINFO_COUNT4);
+ export_constant(ACHIEVEINFO_COUNT5);
+ export_constant(ACHIEVEINFO_COUNT6);
+ export_constant(ACHIEVEINFO_COUNT7);
+ export_constant(ACHIEVEINFO_COUNT8);
+ export_constant(ACHIEVEINFO_COUNT9);
+ export_constant(ACHIEVEINFO_COUNT10);
+ export_constant(ACHIEVEINFO_COMPLETE);
+ export_constant(ACHIEVEINFO_COMPLETEDATE);
+ export_constant(ACHIEVEINFO_GOTREWARD);
+ export_constant(ACHIEVEINFO_LEVEL);
+ export_constant(ACHIEVEINFO_SCORE);
+ export_constant(ACHIEVEINFO_MAX);
+
+ /* refine cost types */
+ export_constant(REFINE_COST_NORMAL);
+ export_constant(REFINE_COST_OVER10);
+ export_constant(REFINE_COST_HD);
+ export_constant(REFINE_COST_ENRICHED);
+ export_constant(REFINE_COST_OVER10_HD);
+ export_constant(REFINE_COST_MAX);
+
+ /* refine information types */
+ script_set_constant("REFINE_MATERIAL_ID", 0, false, false);
+ script_set_constant("REFINE_ZENY_COST", 1, false, false);
+
+ /* NPC view ids */
+ // Special macro to strip the prefix 'JT_'
+ #define export_constant_npc(a) export_constant_offset(a,3)
+
+ export_constant_npc(JT_WARPNPC);
+ export_constant_npc(JT_1_ETC_01);
+ export_constant_npc(JT_1_M_01);
+ export_constant_npc(JT_1_M_02);
+ export_constant_npc(JT_1_M_03);
+ export_constant_npc(JT_1_M_04);
+ export_constant_npc(JT_1_M_BARD);
+ export_constant_npc(JT_1_M_HOF);
+ export_constant_npc(JT_1_M_INNKEEPER);
+ export_constant_npc(JT_1_M_JOBGUIDER);
+ export_constant_npc(JT_1_M_JOBTESTER);
+ export_constant_npc(JT_1_M_KNIGHTMASTER);
+ export_constant_npc(JT_1_M_LIBRARYMASTER);
+ export_constant_npc(JT_1_M_MERCHANT);
+ export_constant_npc(JT_1_M_ORIENT01);
+ export_constant_npc(JT_1_M_PASTOR);
+ export_constant_npc(JT_1_M_PUBMASTER);
+ export_constant_npc(JT_1_M_SIZ);
+ export_constant_npc(JT_1_M_SMITH);
+ export_constant_npc(JT_1_M_WIZARD);
+ export_constant_npc(JT_1_M_YOUNGKNIGHT);
+ export_constant_npc(JT_1_F_01);
+ export_constant_npc(JT_1_F_02);
+ export_constant_npc(JT_1_F_03);
+ export_constant_npc(JT_1_F_04);
+ export_constant_npc(JT_1_F_GYPSY);
+ export_constant_npc(JT_1_F_LIBRARYGIRL);
+ export_constant_npc(JT_1_F_MARIA);
+ export_constant_npc(JT_1_F_MERCHANT_01);
+ export_constant_npc(JT_1_F_MERCHANT_02);
+ export_constant_npc(JT_1_F_ORIENT_01);
+ export_constant_npc(JT_1_F_ORIENT_02);
+ export_constant_npc(JT_1_F_ORIENT_03);
+ export_constant_npc(JT_1_F_ORIENT_04);
+ export_constant_npc(JT_1_F_PRIEST);
+ export_constant_npc(JT_1_F_PUBGIRL);
+ export_constant_npc(JT_4_DOG01);
+ export_constant_npc(JT_4_KID01);
+ export_constant_npc(JT_4_M_01);
+ export_constant_npc(JT_4_M_02);
+ export_constant_npc(JT_4_M_03);
+ export_constant_npc(JT_4_M_04);
+ export_constant_npc(JT_4_M_BARBER);
+ export_constant_npc(JT_4_M_ORIENT01);
+ export_constant_npc(JT_4_M_ORIENT02);
+ export_constant_npc(JT_4_F_01);
+ export_constant_npc(JT_4_F_02);
+ export_constant_npc(JT_4_F_03);
+ export_constant_npc(JT_4_F_04);
+ export_constant_npc(JT_4_F_MAID);
+ export_constant_npc(JT_4_F_SISTER);
+ export_constant_npc(JT_4W_KID);
+ export_constant_npc(JT_4W_M_01);
+ export_constant_npc(JT_4W_M_02);
+ export_constant_npc(JT_4W_M_03);
+ export_constant_npc(JT_4W_SAILOR);
+ export_constant_npc(JT_4W_F_01);
+ export_constant_npc(JT_8_F);
+ export_constant_npc(JT_8_F_GRANDMOTHER);
+ export_constant_npc(JT_EFFECTLAUNCHER);
+ export_constant_npc(JT_8W_SOLDIER);
+ export_constant_npc(JT_1_M_MOC_LORD);
+ export_constant_npc(JT_1_M_PAY_ELDER);
+ export_constant_npc(JT_1_M_PRON_KING);
+ export_constant_npc(JT_4_M_MANAGER);
+ export_constant_npc(JT_4_M_MINISTER);
+ export_constant_npc(JT_HIDDEN_NPC);
+ export_constant_npc(JT_4_F_KAFRA6);
+ export_constant_npc(JT_4_F_KAFRA5);
+ export_constant_npc(JT_4_F_KAFRA4);
+ export_constant_npc(JT_4_F_KAFRA3);
+ export_constant_npc(JT_4_F_KAFRA2);
+ export_constant_npc(JT_4_F_KAFRA1);
+ export_constant_npc(JT_2_M_THIEFMASTER);
+ export_constant_npc(JT_2_M_SWORDMASTER);
+ export_constant_npc(JT_2_M_PHARMACIST);
+ export_constant_npc(JT_2_M_MOLGENSTEIN);
+ export_constant_npc(JT_2_M_DYEINGER);
+ export_constant_npc(JT_2_F_MAGICMASTER);
+ export_constant_npc(JT_4_F_TELEPORTER);
+ export_constant_npc(JT_4_M_TELEPORTER);
+ export_constant_npc(JT_HIDDEN_WARP_NPC);
+ export_constant_npc(JT_4_M_MUT2);
+ export_constant_npc(JT_4_M_SCIENCE);
+ export_constant_npc(JT_4_F_VALKYRIE2);
+ export_constant_npc(JT_4_M_UNCLEKNIGHT);
+ export_constant_npc(JT_4_M_YOUNGKNIGHT);
+ export_constant_npc(JT_2_MONEMUS);
+ export_constant_npc(JT_4_M_ATEIL);
+ export_constant_npc(JT_4_F_ANNIVERSARY);
+ export_constant_npc(JT_4_M_GREATPO);
+ export_constant_npc(JT_4_M_NOVELIST);
+ export_constant_npc(JT_4_M_CHAMPSOUL);
+ export_constant_npc(JT_4_M_OLDFRIAR);
+ export_constant_npc(JT_4_M_CRU_SOLD);
+ export_constant_npc(JT_4_M_CRU_KNT);
+ export_constant_npc(JT_4_M_CRU_HEAD);
+ export_constant_npc(JT_4_M_CRU_CRUA);
+ export_constant_npc(JT_4_M_KY_SOLD);
+ export_constant_npc(JT_4_M_KY_KNT);
+ export_constant_npc(JT_4_M_KY_HEAD);
+ export_constant_npc(JT_4_M_KY_KIYOM);
+ export_constant_npc(JT_4_M_BOSSCAT);
+ export_constant_npc(JT_4_M_BABYCAT);
+ export_constant_npc(JT_4W_F_KAFRA2);
+ export_constant_npc(JT_4_F_MUNAK);
+ export_constant_npc(JT_4_M_BONGUN);
+ export_constant_npc(JT_4_BEAR);
+ export_constant_npc(JT_4_BLUEWOLF);
+ export_constant_npc(JT_4_PECOPECO);
+ export_constant_npc(JT_4_M_JP_MID);
+ export_constant_npc(JT_4_M_JP_RUN);
+ export_constant_npc(JT_4_ORCLADY);
+ export_constant_npc(JT_4_ORCLADY2);
+ export_constant_npc(JT_4_ORCWARRIOR);
+ export_constant_npc(JT_4_ORCWARRIOR2);
+ export_constant_npc(JT_4_F_FAIRY);
+ export_constant_npc(JT_4_F_FAIRYKID);
+ export_constant_npc(JT_4_F_FAIRYKID2);
+ export_constant_npc(JT_4_F_FAIRYKID3);
+ export_constant_npc(JT_4_F_FAIRYKID4);
+ export_constant_npc(JT_4_F_FAIRYKID5);
+ export_constant_npc(JT_4_F_FAIRYKID6);
+ export_constant_npc(JT_4_M_FAIRYKID);
+ export_constant_npc(JT_4_M_FAIRYKID2);
+ export_constant_npc(JT_4_M_FAIRYKID3);
+ export_constant_npc(JT_4_M_FAIRYKID4);
+ export_constant_npc(JT_4_M_FAIRYKID5);
+ export_constant_npc(JT_4_M_FAIRYSOLDIER);
+ export_constant_npc(JT_4_M_TUFFOLD);
+ export_constant_npc(JT_4_MAN_BENKUNI);
+ export_constant_npc(JT_4_MAN_GALTUN);
+ export_constant_npc(JT_4_MAN_JERUTOO);
+ export_constant_npc(JT_4_MAN_LAVAIL);
+ export_constant_npc(JT_4_MAN_NITT);
+ export_constant_npc(JT_4_MAN_PIOM);
+ export_constant_npc(JT_4_MAN_PIOM2);
+ export_constant_npc(JT_4_M_DSTMAN);
+ export_constant_npc(JT_4_M_DSTMANDEAD);
+ export_constant_npc(JT_4_BABYLEOPARD);
+ export_constant_npc(JT_4_M_REDSWORD);
+ export_constant_npc(JT_4_MAN_PIOM3);
+ export_constant_npc(JT_4_M_FAIRYSOLDIER2);
+ export_constant_npc(JT_4_F_FAIRYSOLDIER);
+ export_constant_npc(JT_4_DRAGON_EGG);
+ export_constant_npc(JT_4_MIMIC);
+ export_constant_npc(JT_4_F_FAIRY1);
+ export_constant_npc(JT_4_F_GUILLOTINE);
+ export_constant_npc(JT_4_M_GUILLOTINE);
+ export_constant_npc(JT_4_M_KNIGHT_BLACK);
+ export_constant_npc(JT_4_M_KNIGHT_GOLD);
+ export_constant_npc(JT_4_M_KNIGHT_SILVER);
+ export_constant_npc(JT_4_SKULL_MUD);
+ export_constant_npc(JT_4_M_BRZ_INDIAN);
+ export_constant_npc(JT_4_F_BRZ_INDIAN);
+ export_constant_npc(JT_4_F_BRZ_INDOLD);
+ export_constant_npc(JT_4_M_BRZ_JACI);
+ export_constant_npc(JT_4_M_BRZ_MAN1);
+ export_constant_npc(JT_4_M_BRZ_MAN2);
+ export_constant_npc(JT_4_F_BRZ_WOMAN);
+ export_constant_npc(JT_4_M_MINSTREL);
+ export_constant_npc(JT_4_M_MINSTREL1);
+ export_constant_npc(JT_4_M_SHADOWCHASER);
+ export_constant_npc(JT_4_F_SHADOWCHASER);
+ export_constant_npc(JT_4_M_SURA);
+ export_constant_npc(JT_4_F_SURA);
+ export_constant_npc(JT_4_F_WANDERER);
+ export_constant_npc(JT_4_M_BARD);
+ export_constant_npc(JT_1_FLAG_NOFEAR);
+ export_constant_npc(JT_4_M_NOFEARGUY);
+ export_constant_npc(JT_4_MAN_PIOM6);
+ export_constant_npc(JT_4_MAN_PIOM4);
+ export_constant_npc(JT_4_MAN_PIOM5);
+ export_constant_npc(JT_4_MAN_GALTUN1);
+ export_constant_npc(JT_4_HUMAN_GERUTOO);
+ export_constant_npc(JT_4_M_ROKI);
+ export_constant_npc(JT_4_M_MERCAT1);
+ export_constant_npc(JT_4_M_MERCAT2);
+ export_constant_npc(JT_4_M_CATMAN1);
+ export_constant_npc(JT_4_M_CATMAN2);
+ export_constant_npc(JT_4_F_BRZ_WOMAN2);
+ export_constant_npc(JT_4_M_JP_DISH);
+ export_constant_npc(JT_4_F_JP_NOAH);
+ export_constant_npc(JT_4_F_JP_OZ);
+ export_constant_npc(JT_4_F_JP_CHROME);
+ export_constant_npc(JT_4_F_JP_RINNE);
+ export_constant_npc(JT_4_WHITETIGER);
+ export_constant_npc(JT_4_VENDING_MACHINE);
+ export_constant_npc(JT_4_MISTY);
+ export_constant_npc(JT_4_NECORING);
+ export_constant_npc(JT_4_ELEPHANT);
+ export_constant_npc(JT_4_F_NYDHOG);
+ export_constant_npc(JT_4_F_NYDHOG2);
+ export_constant_npc(JT_4_M_ROKI2);
+ export_constant_npc(JT_4_M_DOGTRAVELER);
+ export_constant_npc(JT_4_M_DOGTRAVELER2);
+ export_constant_npc(JT_4_F_DOGTRAVELER);
+ export_constant_npc(JT_4_M_RAFLE_GR);
+ export_constant_npc(JT_4_M_RAFLE_OLD);
+ export_constant_npc(JT_4_F_RAFLE_PK);
+ export_constant_npc(JT_4_M_LYINGDOG);
+ export_constant_npc(JT_4_F_MORAFINE1);
+ export_constant_npc(JT_4_F_MORAFINE2);
+ export_constant_npc(JT_4_M_RAFLE_OR);
+ export_constant_npc(JT_4_F_RAFLE_YE);
+ export_constant_npc(JT_4_M_RAFLE_VI);
+ export_constant_npc(JT_4_F_RAFLE_VI);
+ export_constant_npc(JT_4_M_ARDHA);
+ export_constant_npc(JT_4_CREEPER);
+ export_constant_npc(JT_JP_RUFAKU);
+ export_constant_npc(JT_JP_SUPIKA);
+ export_constant_npc(JT_JP_SABIKU);
+ export_constant_npc(JT_JP_ARUGORU);
+ export_constant_npc(JT_JP_ARUNA);
+ export_constant_npc(JT_JP_AIRI);
+ export_constant_npc(JT_4_M_DEWOLDMAN);
+ export_constant_npc(JT_4_M_DEWOLDWOMAN);
+ export_constant_npc(JT_4_M_DEWMAN);
+ export_constant_npc(JT_4_M_DEWWOMAN);
+ export_constant_npc(JT_4_M_DEWBOY);
+ export_constant_npc(JT_4_M_DEWGIRL);
+ export_constant_npc(JT_4_M_DEWZATICHIEF);
+ export_constant_npc(JT_4_M_DEWZATIMAN);
+ export_constant_npc(JT_4_M_ALCHE_E);
+ export_constant_npc(JT_4_MASK_SMOKEY);
+ export_constant_npc(JT_4_CAT_SAILOR1);
+ export_constant_npc(JT_4_CAT_SAILOR2);
+ export_constant_npc(JT_4_CAT_SAILOR3);
+ export_constant_npc(JT_4_CAT_SAILOR4);
+ export_constant_npc(JT_4_CAT_CHEF);
+ export_constant_npc(JT_4_CAT_MERMASTER);
+ export_constant_npc(JT_4_CRACK);
+ export_constant_npc(JT_4_ASTER);
+ export_constant_npc(JT_4_F_STARFISHGIRL);
+ export_constant_npc(JT_4_CAT_DOWN);
+ export_constant_npc(JT_4_CAT_REST);
+ export_constant_npc(JT_4_CAT_3COLOR);
+ export_constant_npc(JT_4_CAT_ADMIRAL);
+ export_constant_npc(JT_4_SOIL);
+ export_constant_npc(JT_4_F_ALCHE_A);
+ export_constant_npc(JT_4_CAT_ADV1);
+ export_constant_npc(JT_4_CAT_ADV2);
+ export_constant_npc(JT_4_CAT_SAILOR5);
+ export_constant_npc(JT_2_DROP_MACHINE);
+ export_constant_npc(JT_2_SLOT_MACHINE);
+ export_constant_npc(JT_2_VENDING_MACHINE1);
+ export_constant_npc(JT_MOB_TOMB);
+ export_constant_npc(JT_4_MYSTCASE);
+ export_constant_npc(JT_4_M_SIT_NOVICE);
+ export_constant_npc(JT_4_OCTOPUS_LEG);
+ export_constant_npc(JT_4_F_NURSE);
+ export_constant_npc(JT_4_MAL_SOLDIER);
+ export_constant_npc(JT_4_MAL_CAPTAIN);
+ export_constant_npc(JT_4_MAL_BUDIDAI);
+ export_constant_npc(JT_4_M_MAYOR);
+ export_constant_npc(JT_4_M_BARYO_OLD);
+ export_constant_npc(JT_4_F_BARYO_OLD);
+ export_constant_npc(JT_4_F_BARYO_GIRL);
+ export_constant_npc(JT_4_M_BARYO_BOY);
+ export_constant_npc(JT_4_M_BARYO_MAN);
+ export_constant_npc(JT_4_F_BARYO_WOMAN);
+ export_constant_npc(JT_4_BARYO_CHIEF);
+ export_constant_npc(JT_4_MAL_KAFRA);
+ export_constant_npc(JT_4_M_MALAYA);
+ export_constant_npc(JT_4_F_MALAYA);
+ export_constant_npc(JT_4_F_PATIENT);
+ export_constant_npc(JT_4_M_PATIENT);
+ export_constant_npc(JT_4_F_KR_TIGER);
+ export_constant_npc(JT_4_M_KR_BOY);
+ export_constant_npc(JT_4_M_KAGE_OLD);
+ export_constant_npc(JT_4_WHIKEBAIN);
+ export_constant_npc(JT_4_EREND);
+ export_constant_npc(JT_4_RAWREL);
+ export_constant_npc(JT_4_ARMAIA);
+ export_constant_npc(JT_4_KAVAC);
+ export_constant_npc(JT_4_YGNIZEM);
+ export_constant_npc(JT_4_EREMES);
+ export_constant_npc(JT_4_MAGALETA);
+ export_constant_npc(JT_4_KATRINN);
+ export_constant_npc(JT_4_SHECIL);
+ export_constant_npc(JT_4_SEYREN);
+ export_constant_npc(JT_4_HARWORD);
+ export_constant_npc(JT_4_F_JP_CYNTHIA);
+ export_constant_npc(JT_4_M_JP_GUSTON);
+ export_constant_npc(JT_4_M_JP_BERKUT);
+ export_constant_npc(JT_4_F_JP_DARK_ADELAIDE);
+ export_constant_npc(JT_4_M_JP_DARK_DARIUS);
+ export_constant_npc(JT_4_M_JP_JESTER);
+ export_constant_npc(JT_XMAS_SMOKEY_B);
+ export_constant_npc(JT_XMAS_SMOKEY_R);
+ export_constant_npc(JT_XMAS_SMOKEY_Y);
+ export_constant_npc(JT_4_F_CLOCKDOLL);
+ export_constant_npc(JT_4_F_FAIRY2);
+ export_constant_npc(JT_4_F_PINKWOMAN);
+ export_constant_npc(JT_4_FAIRYDEADLEAF);
+ export_constant_npc(JT_4_FROG);
+ export_constant_npc(JT_4_M_BLACKMAN);
+ export_constant_npc(JT_4_M_BLUEMAN);
+ export_constant_npc(JT_4_M_FAIRYANG);
+ export_constant_npc(JT_4_M_FAIRYAVANT);
+ export_constant_npc(JT_4_M_FAIRYFREAK);
+ export_constant_npc(JT_4_M_FAIRYKID6);
+ export_constant_npc(JT_4_M_FAIRYSCHOLAR);
+ export_constant_npc(JT_4_M_FAIRYSCHOLAR_DIRTY);
+ export_constant_npc(JT_4_M_FARIY_HISIE);
+ export_constant_npc(JT_4_M_FARIYKING);
+ export_constant_npc(JT_4_M_NEWOZ);
+ export_constant_npc(JT_4_M_OLIVER);
+ export_constant_npc(JT_4_M_PROFESSORWORM);
+ export_constant_npc(JT_4_M_REDMAN);
+ export_constant_npc(JT_4_F_GELKA);
+ export_constant_npc(JT_4_M_ROTERT);
+ export_constant_npc(JT_4_BLACKDRAGON);
+ export_constant_npc(JT_4_M_GUNSLINGER);
+ export_constant_npc(JT_4_F_GUNSLINGER);
+ export_constant_npc(JT_4_M_ARCHER);
+ export_constant_npc(JT_4_M_SWORDMAN);
+ export_constant_npc(JT_4_M_NINJA_RED);
+ export_constant_npc(JT_4_M_NINJA_BLUE);
+ export_constant_npc(JT_4_M_THIEF_RUMIN);
+ export_constant_npc(JT_4_M_NOV_RUMIN);
+ export_constant_npc(JT_4_F_MAYSEL);
+ export_constant_npc(JT_4_F_ACOLYTE);
+ export_constant_npc(JT_4_M_NOV_HUNT);
+ export_constant_npc(JT_4_F_GENETIC);
+ export_constant_npc(JT_4_F_TAEKWON);
+ export_constant_npc(JT_4_F_SWORDMAN);
+ export_constant_npc(JT_4_F_IU);
+ export_constant_npc(JT_4_M_RAGI);
+ export_constant_npc(JT_4_M_MELODY);
+ export_constant_npc(JT_4_TRACE);
+ export_constant_npc(JT_4_F_HIMEL);
+ export_constant_npc(JT_4_LEVITATEMAN);
+ export_constant_npc(JT_4_M_HEINRICH);
+ export_constant_npc(JT_4_M_ROYALGUARD);
+ export_constant_npc(JT_4_M_BARMUND);
+ export_constant_npc(JT_4_F_KHALITZBURG);
+ export_constant_npc(JT_4_F_HIMEL2);
+ export_constant_npc(JT_4_WHITEKNIGHT);
+ export_constant_npc(JT_4_COCO);
+ export_constant_npc(JT_4_M_ALADDIN);
+ export_constant_npc(JT_4_M_GENIE);
+ export_constant_npc(JT_4_F_GENIE);
+ export_constant_npc(JT_4_JP_MID_SWIM);
+ export_constant_npc(JT_4_JP_RUNE_SWIM);
+ export_constant_npc(JT_4_F_FENRIR);
+ export_constant_npc(JT_4_F_GEFFEN_FAY);
+ export_constant_npc(JT_4_F_IRIS);
+ export_constant_npc(JT_4_F_LUCILE);
+ export_constant_npc(JT_4_F_SARAH_BABY);
+ export_constant_npc(JT_4_GEFFEN_01);
+ export_constant_npc(JT_4_GEFFEN_02);
+ export_constant_npc(JT_4_GEFFEN_03);
+ export_constant_npc(JT_4_GEFFEN_04);
+ export_constant_npc(JT_4_GEFFEN_05);
+ export_constant_npc(JT_4_GEFFEN_06);
+ export_constant_npc(JT_4_GEFFEN_07);
+ export_constant_npc(JT_4_GEFFEN_08);
+ export_constant_npc(JT_4_GEFFEN_09);
+ export_constant_npc(JT_4_GEFFEN_10);
+ export_constant_npc(JT_4_GEFFEN_11);
+ export_constant_npc(JT_4_GEFFEN_12);
+ export_constant_npc(JT_4_GEFFEN_13);
+ export_constant_npc(JT_4_GEFFEN_14);
+ export_constant_npc(JT_4_M_CHAOS);
+ export_constant_npc(JT_4_M_CHIEF_IRIN);
+ export_constant_npc(JT_4_M_SAKRAY);
+ export_constant_npc(JT_4_M_SAKRAYROYAL);
+ export_constant_npc(JT_4_TOWER_01);
+ export_constant_npc(JT_4_TOWER_02);
+ export_constant_npc(JT_4_TOWER_03);
+ export_constant_npc(JT_4_TOWER_04);
+ export_constant_npc(JT_4_TOWER_05);
+ export_constant_npc(JT_4_TOWER_06);
+ export_constant_npc(JT_4_TOWER_07);
+ export_constant_npc(JT_4_TOWER_08);
+ export_constant_npc(JT_4_TOWER_09);
+ export_constant_npc(JT_4_TOWER_10);
+ export_constant_npc(JT_4_TOWER_11);
+ export_constant_npc(JT_4_TOWER_12);
+ export_constant_npc(JT_4_TOWER_13);
+ export_constant_npc(JT_8_F_GIRL);
+ export_constant_npc(JT_4_F_GODEMOM);
+ export_constant_npc(JT_4_F_GON);
+ export_constant_npc(JT_4_F_KID2);
+ export_constant_npc(JT_4_M_BIBI);
+ export_constant_npc(JT_4_M_GEF_SOLDIER);
+ export_constant_npc(JT_4_M_KID1);
+ export_constant_npc(JT_4_M_MOC_SOLDIER);
+ export_constant_npc(JT_4_M_PAY_SOLDIER);
+ export_constant_npc(JT_4_M_SEAMAN);
+ export_constant_npc(JT_4_M_SNOWMAN);
+ export_constant_npc(JT_4_F_05);
+ export_constant_npc(JT_4_M_05);
+ export_constant_npc(JT_4_M_06);
+ export_constant_npc(JT_4_F_06);
+ export_constant_npc(JT_4_M_PIERROT);
+ export_constant_npc(JT_4_M_KID2);
+ export_constant_npc(JT_4_F_KID3);
+ export_constant_npc(JT_4_M_SANTA);
+ export_constant_npc(JT_4_F_NACORURI);
+ export_constant_npc(JT_4_F_SHAMAN);
+ export_constant_npc(JT_4_F_KAFRA7);
+ export_constant_npc(JT_GUILD_FLAG);
+ export_constant_npc(JT_1_SHADOW_NPC);
+ export_constant_npc(JT_4_F_07);
+ export_constant_npc(JT_4_F_JOB_ASSASSIN);
+ export_constant_npc(JT_4_F_JOB_BLACKSMITH);
+ export_constant_npc(JT_4_F_JOB_HUNTER);
+ export_constant_npc(JT_4_F_JOB_KNIGHT);
+ export_constant_npc(JT_4_F_NOVICE);
+ export_constant_npc(JT_4_M_JOB_ASSASSIN);
+ export_constant_npc(JT_4_M_JOB_BLACKSMITH);
+ export_constant_npc(JT_4_M_JOB_HUNTER);
+ export_constant_npc(JT_4_M_JOB_KNIGHT1);
+ export_constant_npc(JT_4_M_JOB_KNIGHT2);
+ export_constant_npc(JT_4_M_JOB_WIZARD);
+ export_constant_npc(JT_4_BAPHOMET);
+ export_constant_npc(JT_4_DARKLORD);
+ export_constant_npc(JT_4_DEVIRUCHI);
+ export_constant_npc(JT_8_DOPPEL);
+ export_constant_npc(JT_2_M_ALCHE);
+ export_constant_npc(JT_2_M_BARD_ORIENT);
+ export_constant_npc(JT_2_M_SAGE_B);
+ export_constant_npc(JT_2_M_SAGE_OLD);
+ export_constant_npc(JT_4_F_ALCHE);
+ export_constant_npc(JT_4_F_CRU);
+ export_constant_npc(JT_4_F_MONK);
+ export_constant_npc(JT_4_F_ROGUE);
+ export_constant_npc(JT_4_M_ALCHE_A);
+ export_constant_npc(JT_4_M_ALCHE_B);
+ export_constant_npc(JT_4_M_ALCHE_C);
+ export_constant_npc(JT_4_M_CRU);
+ export_constant_npc(JT_4_M_CRU_OLD);
+ export_constant_npc(JT_4_M_MONK);
+ export_constant_npc(JT_4_M_SAGE_A);
+ export_constant_npc(JT_4_M_SAGE_C);
+ export_constant_npc(JT_4_F_SON);
+ export_constant_npc(JT_4_F_JPN2);
+ export_constant_npc(JT_4_F_JPN);
+ export_constant_npc(JT_4_F_JPNCHIBI);
+ export_constant_npc(JT_4_F_JPNOBA2);
+ export_constant_npc(JT_4_F_JPNOBA);
+ export_constant_npc(JT_4_M_JPN2);
+ export_constant_npc(JT_4_M_JPN);
+ export_constant_npc(JT_4_M_JPNCHIBI);
+ export_constant_npc(JT_4_M_JPNOJI2);
+ export_constant_npc(JT_4_M_JPNOJI);
+ export_constant_npc(JT_8_M_JPNSOLDIER);
+ export_constant_npc(JT_8_M_JPNMASTER);
+ export_constant_npc(JT_4_F_JPNMU);
+ export_constant_npc(JT_4_F_TWGIRL);
+ export_constant_npc(JT_4_F_TWGRANDMOM);
+ export_constant_npc(JT_4_F_TWMASKGIRL);
+ export_constant_npc(JT_4_F_TWMIDWOMAN);
+ export_constant_npc(JT_4_M_TWBOY);
+ export_constant_npc(JT_4_M_TWMASKMAN);
+ export_constant_npc(JT_4_M_TWMIDMAN);
+ export_constant_npc(JT_4_M_TWOLDMAN);
+ export_constant_npc(JT_4_M_TWTEAMAN);
+ export_constant_npc(JT_4_M_YOYOROGUE);
+ export_constant_npc(JT_8_M_TWSOLDIER);
+ export_constant_npc(JT_4_F_UMGIRL);
+ export_constant_npc(JT_4_F_UMOLDWOMAN);
+ export_constant_npc(JT_4_F_UMWOMAN);
+ export_constant_npc(JT_4_M_UMCHIEF);
+ export_constant_npc(JT_4_M_UMDANCEKID2);
+ export_constant_npc(JT_4_M_UMDANCEKID);
+ export_constant_npc(JT_4_M_UMKID);
+ export_constant_npc(JT_4_M_UMOLDMAN);
+ export_constant_npc(JT_4_M_UMSOLDIER);
+ export_constant_npc(JT_4_M_SALVATION);
+ export_constant_npc(JT_4_F_NFDEADKAFRA);
+ export_constant_npc(JT_4_F_NFDEADMGCIAN);
+ export_constant_npc(JT_4_F_NFLOSTGIRL);
+ export_constant_npc(JT_4_M_NFDEADMAN2);
+ export_constant_npc(JT_4_M_NFDEADMAN);
+ export_constant_npc(JT_4_M_NFDEADSWDMAN);
+ export_constant_npc(JT_4_M_NFLOSTMAN);
+ export_constant_npc(JT_4_M_NFMAN);
+ export_constant_npc(JT_4_NFBAT);
+ export_constant_npc(JT_4_NFCOCK);
+ export_constant_npc(JT_4_NFCOFFIN);
+ export_constant_npc(JT_4_NFWISP);
+ export_constant_npc(JT_1_F_SIGNZISK);
+ export_constant_npc(JT_1_M_SIGN1);
+ export_constant_npc(JT_1_M_SIGNALCHE);
+ export_constant_npc(JT_1_M_SIGNART);
+ export_constant_npc(JT_1_M_SIGNMCNT);
+ export_constant_npc(JT_1_M_SIGNMONK2);
+ export_constant_npc(JT_1_M_SIGNMONK);
+ export_constant_npc(JT_1_M_SIGNROGUE);
+ export_constant_npc(JT_4_F_VALKYRIE);
+ export_constant_npc(JT_TW_TOWER);
+ export_constant_npc(JT_2_M_OLDBLSMITH);
+ export_constant_npc(JT_4_F_CHNDOCTOR);
+ export_constant_npc(JT_4_F_CHNDRESS1);
+ export_constant_npc(JT_4_F_CHNDRESS2);
+ export_constant_npc(JT_4_F_CHNDRESS3);
+ export_constant_npc(JT_4_F_CHNWOMAN);
+ export_constant_npc(JT_4_M_CHN8GUEK);
+ export_constant_npc(JT_4_M_CHNCOOK);
+ export_constant_npc(JT_4_M_CHNGENERL);
+ export_constant_npc(JT_4_M_CHNMAN);
+ export_constant_npc(JT_4_M_CHNMONK);
+ export_constant_npc(JT_4_M_CHNOLD);
+ export_constant_npc(JT_4_M_CHNSOLDIER);
+ export_constant_npc(JT_4_M_DWARF);
+ export_constant_npc(JT_4_M_GRANDMONK);
+ export_constant_npc(JT_4_M_ROGUE);
+ export_constant_npc(JT_4_M_DOMINO);
+ export_constant_npc(JT_4_F_DOMINO);
+ export_constant_npc(JT_4_F_ZONDAGIRL);
+ export_constant_npc(JT_4_M_REIDIN_KURS);
+ export_constant_npc(JT_4_M_ZONDAOYAJI);
+ export_constant_npc(JT_4_M_BUDDHIST);
+ export_constant_npc(JT_2_BOARD1);
+ export_constant_npc(JT_2_BOARD2);
+ export_constant_npc(JT_2_BULLETIN_BOARD);
+ export_constant_npc(JT_4_F_THAIAYO);
+ export_constant_npc(JT_4_F_THAIGIRL);
+ export_constant_npc(JT_4_F_THAISHAMAN);
+ export_constant_npc(JT_4_M_THAIAYO);
+ export_constant_npc(JT_4_M_THAIOLD);
+ export_constant_npc(JT_4_M_THAIONGBAK);
+ export_constant_npc(JT_CLEAR_NPC);
+ export_constant_npc(JT_4_F_RACING);
+ export_constant_npc(JT_4_F_EINOLD);
+ export_constant_npc(JT_4_M_EINOLD);
+ export_constant_npc(JT_4_M_EINMINER);
+ export_constant_npc(JT_4_M_DIEMAN);
+ export_constant_npc(JT_4_F_EINWOMAN);
+ export_constant_npc(JT_4_M_REPAIR);
+ export_constant_npc(JT_4_M_EIN_SOLDIER);
+ export_constant_npc(JT_4_M_YURI);
+ export_constant_npc(JT_4_M_EINMAN2);
+ export_constant_npc(JT_4_M_EINMAN);
+ export_constant_npc(JT_2_F_SIGN1);
+ export_constant_npc(JT_4_BOARD3);
+ export_constant_npc(JT_4_BULLETIN_BOARD2);
+ export_constant_npc(JT_4_F_AGENTKAFRA);
+ export_constant_npc(JT_4_F_KAFRA8);
+ export_constant_npc(JT_4_F_KAFRA9);
+ export_constant_npc(JT_4_F_LGTGIRL);
+ export_constant_npc(JT_4_F_LGTGRAND);
+ export_constant_npc(JT_4_F_OPERATION);
+ export_constant_npc(JT_4_LGTSCIENCE);
+ export_constant_npc(JT_4_M_LGTGRAND);
+ export_constant_npc(JT_4_M_LGTGUARD2);
+ export_constant_npc(JT_4_M_LGTGUARD);
+ export_constant_npc(JT_4_M_LGTMAN);
+ export_constant_npc(JT_4_M_LGTPOOR);
+ export_constant_npc(JT_4_M_OPERATION);
+ export_constant_npc(JT_4_M_PRESIDENT);
+ export_constant_npc(JT_4_M_REINDEER);
+ export_constant_npc(JT_4_M_ZONDAMAN);
+ export_constant_npc(JT_4_M_PECOKNIGHT);
+ export_constant_npc(JT_4_CAT);
+ export_constant_npc(JT_4_F_YUNYANG);
+ export_constant_npc(JT_4_M_OILMAN);
+ export_constant_npc(JT_4_F_CAPEGIRL);
+ export_constant_npc(JT_4_M_MASKMAN);
+ export_constant_npc(JT_4_M_SITDOWN);
+ export_constant_npc(JT_4_F_SITDOWN);
+ export_constant_npc(JT_4_M_ALCHE_D);
+ export_constant_npc(JT_4_M_ACROSS);
+ export_constant_npc(JT_4_F_ACROSS);
+ export_constant_npc(JT_4_COOK);
+ export_constant_npc(JT_4_M_LIEMAN);
+ export_constant_npc(JT_2_POSTBOX);
+ export_constant_npc(JT_4_BULL);
+ export_constant_npc(JT_4_LAM);
+ export_constant_npc(JT_4_F_HUGIRL);
+ export_constant_npc(JT_4_F_HUGRANMA);
+ export_constant_npc(JT_4_F_HUWOMAN);
+ export_constant_npc(JT_4_F_KHELLISIA);
+ export_constant_npc(JT_4_F_KHELLY);
+ export_constant_npc(JT_4_M_HUBOY);
+ export_constant_npc(JT_4_M_HUGRANFA);
+ export_constant_npc(JT_4_M_HUMAN_01);
+ export_constant_npc(JT_4_M_HUMAN_02);
+ export_constant_npc(JT_4_M_HUMERCHANT);
+ export_constant_npc(JT_4_M_HUOLDARMY);
+ export_constant_npc(JT_4_M_KHKIEL);
+ export_constant_npc(JT_4_M_KHKYEL);
+ export_constant_npc(JT_4_M_KHMAN);
+ export_constant_npc(JT_4_F_KHWOMAN);
+ export_constant_npc(JT_4_F_KHGIRL);
+ export_constant_npc(JT_4_M_KHBOY);
+ export_constant_npc(JT_4_M_PHILMAN);
+ export_constant_npc(JT_4_PORING);
+ export_constant_npc(JT_2_COLAVEND);
+ export_constant_npc(JT_4_F_SOCCER);
+ export_constant_npc(JT_4_M_SOCCER7);
+ export_constant_npc(JT_4_M_SOCCER9);
+ export_constant_npc(JT_4_F_CHILD);
+ export_constant_npc(JT_4_F_MADAME);
+ export_constant_npc(JT_4_F_MASK1);
+ export_constant_npc(JT_4_F_MASK);
+ export_constant_npc(JT_4_F_RACHOLD);
+ export_constant_npc(JT_4_F_SHABBY);
+ export_constant_npc(JT_4_F_TRAINEE);
+ export_constant_npc(JT_4_M_CHILD1);
+ export_constant_npc(JT_4_M_CHILD);
+ export_constant_npc(JT_4_M_DOCTOR);
+ export_constant_npc(JT_4_M_FROZEN1);
+ export_constant_npc(JT_4_M_FROZEN);
+ export_constant_npc(JT_4_M_MASK1);
+ export_constant_npc(JT_4_M_MASK);
+ export_constant_npc(JT_4_M_MIDDLE1);
+ export_constant_npc(JT_4_M_MIDDLE);
+ export_constant_npc(JT_4_M_RACHMAN2);
+ export_constant_npc(JT_4_M_RACHMAN1);
+ export_constant_npc(JT_4_M_RACHOLD1);
+ export_constant_npc(JT_4_M_RACHOLD);
+ export_constant_npc(JT_4_M_RASWORD);
+ export_constant_npc(JT_4_M_TRAINEE);
+ export_constant_npc(JT_4_F_ARUNA_POP);
+ export_constant_npc(JT_4_M_ARUNA_NFM1);
+ export_constant_npc(JT_4_DST_CAMEL);
+ export_constant_npc(JT_4_DST_SOLDIER);
+ export_constant_npc(JT_4_F_DESERT);
+ export_constant_npc(JT_4_F_DST_CHILD);
+ export_constant_npc(JT_4_F_DST_GRAND);
+ export_constant_npc(JT_4_M_DESERT);
+ export_constant_npc(JT_4_M_DST_CHILD);
+ export_constant_npc(JT_4_M_DST_GRAND);
+ export_constant_npc(JT_4_M_DST_MASTER);
+ export_constant_npc(JT_4_M_DST_TOUGH);
+ export_constant_npc(JT_4_ANGELING);
+ export_constant_npc(JT_4_ARCHANGELING);
+ export_constant_npc(JT_4_GHOSTRING);
+ export_constant_npc(JT_4_F_EDEN_MASTER);
+ export_constant_npc(JT_4_F_EDEN_OFFICER);
+ export_constant_npc(JT_4_M_EDEN_GUARDER);
+ export_constant_npc(JT_4_M_PATRICK);
+ export_constant_npc(JT_4_DONKEY);
+ export_constant_npc(JT_4_M_TRISTAN);
+ export_constant_npc(JT_4_WHITE_COW);
+ export_constant_npc(JT_4_F_RUSCHILD);
+ export_constant_npc(JT_4_F_RUSWOMAN1);
+ export_constant_npc(JT_4_F_RUSWOMAN2);
+ export_constant_npc(JT_4_F_RUSWOMAN3);
+ export_constant_npc(JT_4_M_RUSCHILD);
+ export_constant_npc(JT_4_M_GUSLIMAN);
+ export_constant_npc(JT_4_M_RUSBALD);
+ export_constant_npc(JT_4_M_RUSKING);
+ export_constant_npc(JT_4_M_RUSKNIGHT);
+ export_constant_npc(JT_4_M_RUSMAN1);
+ export_constant_npc(JT_4_M_RUSMAN2);
+ export_constant_npc(JT_4_M_DRAKE);
+ export_constant_npc(JT_4_F_BABAYAGA);
+ export_constant_npc(JT_4_F_RUSGREEN);
+ export_constant_npc(JT_4_RUS_DWOLF);
+ export_constant_npc(JT_1_FLAG_LION);
+ export_constant_npc(JT_1_FLAG_EAGLE);
+ export_constant_npc(JT_4_M_MIKID);
+ export_constant_npc(JT_4_BLUE_FLOWER);
+ export_constant_npc(JT_4_RED_FLOWER);
+ export_constant_npc(JT_4_YELL_FLOWER);
+ export_constant_npc(JT_4_F_CAVE1);
+ export_constant_npc(JT_4_F_MUT1);
+ export_constant_npc(JT_4_F_MUT2);
+ export_constant_npc(JT_4_F_SCIENCE);
+ export_constant_npc(JT_4_M_1STPRIN1);
+ export_constant_npc(JT_4_M_1STPRIN2);
+ export_constant_npc(JT_4_M_2NDPRIN1);
+ export_constant_npc(JT_4_M_2NDPRIN2);
+ export_constant_npc(JT_4_M_3RDPRIN1);
+ export_constant_npc(JT_4_M_3RDPRIN2);
+ export_constant_npc(JT_4_M_4THPRIN1);
+ export_constant_npc(JT_4_M_4THPRIN2);
+ export_constant_npc(JT_4_M_5THPRIN1);
+ export_constant_npc(JT_4_M_5THPRIN2);
+ export_constant_npc(JT_4_M_6THPRIN1);
+ export_constant_npc(JT_4_M_6THPRIN2);
+ export_constant_npc(JT_4_M_CASMAN1);
+ export_constant_npc(JT_4_M_CAVE1);
+ export_constant_npc(JT_4_M_MOCASS1);
+ export_constant_npc(JT_4_M_MOCASS2);
+ export_constant_npc(JT_4_M_MUT1);
+ export_constant_npc(JT_4_TOWER_14);
+ export_constant_npc(JT_4_TOWER_15);
+ export_constant_npc(JT_4_TOWER_16);
+ export_constant_npc(JT_4_TOWER_17);
+ export_constant_npc(JT_4_TREASURE_BOX);
+ export_constant_npc(JT_ACADEMY_MASTER);
+ export_constant_npc(JT_PORTAL);
+ export_constant_npc(JT_THANATOS_BATTLE);
+ export_constant_npc(JT_THANATOS_KEEP);
+ export_constant_npc(JT_4_F_LYDIA);
+ export_constant_npc(JT_4_LUDE);
+ export_constant_npc(JT_4_ALIZA);
+ export_constant_npc(JT_4_ALICE);
+ export_constant_npc(JT_4_ARCHER_SKEL);
+ export_constant_npc(JT_4_JACK);
+ export_constant_npc(JT_4_SOLDIER_SKEL);
+ export_constant_npc(JT_4_LOLI_RURI);
+ export_constant_npc(JT_4_M_SAKRAY_TIED);
+ export_constant_npc(JT_4_M_ANTONIO);
+ export_constant_npc(JT_4_M_COOKIE);
+ export_constant_npc(JT_4_M_BELIEVER01);
+ export_constant_npc(JT_4_F_BELIEVER01);
+ export_constant_npc(JT_4_M_BELIEVER02);
+ export_constant_npc(JT_4_ROPEPILE);
+ export_constant_npc(JT_4_BRICKPILE);
+ export_constant_npc(JT_4_WOODPILE);
+ export_constant_npc(JT_4_M_TAMARIN);
+ export_constant_npc(JT_4_M_DEATH);
+ export_constant_npc(JT_4_GHOST_STAND);
+ export_constant_npc(JT_4_GHOST_COLLAPSE);
+ export_constant_npc(JT_4_COOKIEHOUSE);
+ export_constant_npc(JT_4_F_SKULL06GIRL);
+ export_constant_npc(JT_4_NONMYSTCASE);
+ export_constant_npc(JT_4_F_KIMI);
+ export_constant_npc(JT_4_M_FROZEN_GC);
+ export_constant_npc(JT_4_M_FROZEN_KN);
+ export_constant_npc(JT_4_SNAKE_LORD);
+ export_constant_npc(JT_4_F_MOCBOY);
+ export_constant_npc(JT_4_F_RUNAIN);
+ export_constant_npc(JT_4_M_ROEL);
+ export_constant_npc(JT_4_F_SHALOSH);
+ export_constant_npc(JT_4_ENERGY_RED);
+ export_constant_npc(JT_4_ENERGY_BLUE);
+ export_constant_npc(JT_4_ENERGY_YELLOW);
+ export_constant_npc(JT_4_ENERGY_BLACK);
+ export_constant_npc(JT_4_ENERGY_WHITE);
+ export_constant_npc(JT_4_F_PERE01);
+ export_constant_npc(JT_4_JITTERBUG);
+ export_constant_npc(JT_4_SEA_OTTER);
+ export_constant_npc(JT_4_GALAPAGO);
+ export_constant_npc(JT_4_DESERTWOLF_B);
+ export_constant_npc(JT_4_BB_PORING);
+ export_constant_npc(JT_4_F_CHARLESTON01);
+ export_constant_npc(JT_4_F_CHARLESTON02);
+ export_constant_npc(JT_4_F_CHARLESTON03);
+ export_constant_npc(JT_4_M_IAN);
+ export_constant_npc(JT_4_M_OLDSCHOLAR);
+ export_constant_npc(JT_4_F_LAPERM);
+ export_constant_npc(JT_4_M_DEBON);
+ export_constant_npc(JT_4_M_BIRMAN);
+ export_constant_npc(JT_4_F_SHAM);
+ export_constant_npc(JT_4_M_REBELLION);
+ export_constant_npc(JT_4_F_REBELLION);
+ export_constant_npc(JT_4_CHN_SHAOTH);
+ export_constant_npc(JT_4_SHOAL);
+ export_constant_npc(JT_4_F_SARAH);
+ export_constant_npc(JT_4_GIGANTES_BIG);
+ export_constant_npc(JT_4_GIGANTES);
+ export_constant_npc(JT_4_GIGANTES_SMALL);
+ export_constant_npc(JT_4_GARGOYLE_STATUE);
+ export_constant_npc(JT_4_AIRA);
+ export_constant_npc(JT_4_EZELLA);
+ export_constant_npc(JT_4_KULUNA);
+ export_constant_npc(JT_4_LUNE);
+ export_constant_npc(JT_4_MALLINA);
+ export_constant_npc(JT_4_MORIN);
+ export_constant_npc(JT_4_NASARIN);
+ export_constant_npc(JT_4_F_BERRYTEA);
+ export_constant_npc(JT_4_F_FRUIT);
+ export_constant_npc(JT_4_SCR_MT_ROBOTS);
+ export_constant_npc(JT_4_MACHINE_DEVICE);
+ export_constant_npc(JT_4_GC109);
+ export_constant_npc(JT_4_SYS_MSG);
+ export_constant_npc(JT_4_M_TATIO);
+ export_constant_npc(JT_4_M_REKENBER);
+ export_constant_npc(JT_4_XMAS_CAT1);
+ export_constant_npc(JT_4_XMAS_CAT2);
+ export_constant_npc(JT_4_XMAS_CAT3);
+ export_constant_npc(JT_4_XMAS_CAT4);
+ export_constant_npc(JT_4_XMAS_CAT5);
+ export_constant_npc(JT_4_XMAS_CAT6);
+ export_constant_npc(JT_4_M_DEATH2);
+ export_constant_npc(JT_4_S_KADOMATSU);
+ export_constant_npc(JT_4_B_KADOMATSU);
+ export_constant_npc(JT_4_F_08);
+ export_constant_npc(JT_4_F_08_STATUE);
+ export_constant_npc(JT_4_M_DARKPRIEST);
+ export_constant_npc(JT_4_JP_GARM_H);
+ export_constant_npc(JT_4_JP_MEDUSA_H);
+ export_constant_npc(JT_4_CHN_GVG_01);
+ export_constant_npc(JT_4_SPRING_RABBIT);
+ export_constant_npc(JT_4_PD_TYRA);
+ export_constant_npc(JT_4_PD_TYRANOS);
+ export_constant_npc(JT_4_PD_PLESI);
+ export_constant_npc(JT_4_PD_PLESIO);
+ export_constant_npc(JT_4_PD_BRACHI);
+ export_constant_npc(JT_4_PD_BRACHIOS);
+ export_constant_npc(JT_4_PD_GOLDDRAGON);
+ export_constant_npc(JT_4_PD_ZAEROG);
+ export_constant_npc(JT_4_PD_TAMADORA);
+ export_constant_npc(JT_4_JP_EDGA_H);
+ export_constant_npc(JT_4_JP_BRAGOLEM_H);
+ export_constant_npc(JT_4_EL_AQUA);
+ export_constant_npc(JT_4_EP16_NIHIL);
+ export_constant_npc(JT_4_EP16_SPICA);
+ export_constant_npc(JT_4_EP16_SKIA);
+ export_constant_npc(JT_4_EP16_PETER);
+ export_constant_npc(JT_4_EP16_CRUX);
+ export_constant_npc(JT_4_EP16_GRANZ);
+ export_constant_npc(JT_4_EP16_STOLZ);
+ export_constant_npc(JT_4_EP16_EGEO);
+ export_constant_npc(JT_4_EP16_COOK);
+ export_constant_npc(JT_4_EP16_MARK);
+ export_constant_npc(JT_4_EP16_TAMARIN);
+ export_constant_npc(JT_4_EP16_POE);
+ export_constant_npc(JT_4_EP16_ISAAC);
+ export_constant_npc(JT_4_EP16_HELMUT);
+ export_constant_npc(JT_4_EP16_WOLF);
+ export_constant_npc(JT_4_EP16_MEYER);
+ export_constant_npc(JT_4_EP16_AGNES);
+ export_constant_npc(JT_4_EP16_FOOD);
+ export_constant_npc(JT_4_EP16_LOUVIERE);
+ export_constant_npc(JT_4_EP16_MAX);
+ export_constant_npc(JT_4_EP16_SPIEGEL);
+ export_constant_npc(JT_4_MOONLIGHT);
+ export_constant_npc(JT_4_MISTRESS);
+ export_constant_npc(JT_4_DRACULA);
+ export_constant_npc(JT_4_STORMKNIGHT);
+ export_constant_npc(JT_4_TATTER);
+ export_constant_npc(JT_4_AS_RAGGED_GOLEM);
+ export_constant_npc(JT_4_AS_BLOODY_KNIGHT);
+ export_constant_npc(JT_4_AS_WIND_GHOST);
+ export_constant_npc(JT_4_F_BIJOU);
+ export_constant_npc(JT_4_EP16_COOK2);
+ export_constant_npc(JT_4_SERVICE_30_M_01);
+ export_constant_npc(JT_4_SERVICE_30_F_01);
+ export_constant_npc(JT_4_SCR_AT_ROBOTS);
+ export_constant_npc(JT_4_F_RANGER);
+ export_constant_npc(JT_4_WAG);
+ export_constant_npc(JT_4_NPC_TRAP);
+ export_constant_npc(JT_4_RAGGLER);
+ export_constant_npc(JT_4_DR_PEPE);
+ export_constant_npc(JT_4_DR_GAMBERI);
+ export_constant_npc(JT_4_DR_AGLIO);
+ export_constant_npc(JT_4_DR_OLIO);
+ export_constant_npc(JT_4_DR_STELO);
+ export_constant_npc(JT_4_DR_TORTEL);
+ export_constant_npc(JT_4_BASIL_SLAVE);
+ export_constant_npc(JT_4_DOU_JINDO);
+ export_constant_npc(JT_4_DOU_SIBA);
+ export_constant_npc(JT_4_TARUTUPI);
+ export_constant_npc(JT_4_DR_SOLDIER);
+ export_constant_npc(JT_4_DR_M_01);
+ export_constant_npc(JT_4_DR_M_02);
+ export_constant_npc(JT_4_DR_F_01);
+ export_constant_npc(JT_4_DR_F_02);
+ export_constant_npc(JT_4_DR_KID_01);
+ export_constant_npc(JT_4_JP_2015EVT);
+ export_constant_npc(JT_4_ALLIGATOR);
+ export_constant_npc(JT_4_ANOLIAN);
+ export_constant_npc(JT_4_TACNU);
+ export_constant_npc(JT_4_CENERE);
+ export_constant_npc(JT_4_F_ARUNA_POP2);
+ export_constant_npc(JT_4_JACK_HEAD);
+ export_constant_npc(JT_4_INJUSTICE);
+ export_constant_npc(JT_4_BLOODYMAN);
+ export_constant_npc(JT_4_GIBBET);
+ export_constant_npc(JT_4_DULLAHAN);
+ export_constant_npc(JT_4_M_LAZY);
+ export_constant_npc(JT_4_M_GONY);
+ export_constant_npc(JT_4_M_ROOKIE);
+ export_constant_npc(JT_4_M_PHILOFONTES);
+ export_constant_npc(JT_4_F_ESTLOVELOY);
+ export_constant_npc(JT_4_F_LEEDSH);
+ export_constant_npc(JT_4_F_DIENE);
+ export_constant_npc(JT_4_F_COATNEIS);
+ export_constant_npc(JT_4_M_RUPERT);
+ export_constant_npc(JT_4_M_FALLENGONY);
+ export_constant_npc(JT_4_M_EISEN);
+ export_constant_npc(JT_4_F_DEADEVIL);
+ export_constant_npc(JT_4_F_HUNTER_EVIL);
+ export_constant_npc(JT_4_F_ELENA);
+ export_constant_npc(JT_4_F_ANYA);
+ export_constant_npc(JT_4_M_SEIREN_UC);
+ export_constant_npc(JT_4_M_GUNSLINGER2);
+ export_constant_npc(JT_4_M_GUNSLINGER3);
+ export_constant_npc(JT_4_M_REBELLION2);
+ export_constant_npc(JT_4_M_REBELLION3);
+ export_constant_npc(JT_4_F_GUNSLINGER2);
+ export_constant_npc(JT_4_F_GUNSLINGER3);
+ export_constant_npc(JT_4_F_REBELLION2);
+ export_constant_npc(JT_4_F_REBELLION3);
+ export_constant_npc(JT_4_M_ILYA);
+ export_constant_npc(JT_4_ELDER);
+ export_constant_npc(JT_4_LUNATIC);
+ export_constant_npc(JT_4_F_NOVICE2);
+ export_constant_npc(JT_4_WICKEDNYMPH);
+ export_constant_npc(JT_4_F_PREMI);
+ export_constant_npc(JT_4_M_COSTELL);
+ export_constant_npc(JT_4_M_YATTWARP);
+ export_constant_npc(JT_4_M_EVOKASCUDI);
+ export_constant_npc(JT_4_M_JOHNNYJAMES);
+ export_constant_npc(JT_4_M_ALBERTFORD);
+ export_constant_npc(JT_4_M_SEANMCCURDY);
+ export_constant_npc(JT_4_M_KARAMPUCCI);
+ export_constant_npc(JT_4_M_CACTUSMAN1);
+ export_constant_npc(JT_4_M_CACTUSMAN2);
+ export_constant_npc(JT_4_M_CACTUSMAN3);
+ export_constant_npc(JT_4_M_CACTUSLADY);
+ export_constant_npc(JT_4_M_GAST);
+ export_constant_npc(JT_4_M_CACTUSCHILD);
+ export_constant_npc(JT_4_KING);
+ export_constant_npc(JT_4_F_BOMI);
+ export_constant_npc(JT_4_M_CACTUSCHIEF);
+ export_constant_npc(JT_4_F_CACTUSCHILD2);
+ export_constant_npc(JT_4_F_CACTUSLADY2);
+ export_constant_npc(JT_4_F_CACTUSLADY3);
+ export_constant_npc(JT_4_M_CACTUS);
+ export_constant_npc(JT_4_M_COWRAIDERS1);
+ export_constant_npc(JT_4_M_COWRAIDERS2);
+ export_constant_npc(JT_4_M_COWRAIDERS3);
+ export_constant_npc(JT_4_F_JP14THEVT);
+ export_constant_npc(JT_4_M_POORSCHOLAR);
+ export_constant_npc(JT_4_M_PEPPERROTI);
+ export_constant_npc(JT_JP_NPC01);
+ export_constant_npc(JT_4_PURPLE_WARP);
+ export_constant_npc(JT_4_F_NARIN);
+ export_constant_npc(JT_4_M_URGENT_MAN);
+ export_constant_npc(JT_4_M_KEEN_SOLDIER);
+ export_constant_npc(JT_4_F_SLOPPY_WOMAN);
+ export_constant_npc(JT_4_F_DRKAFRA01);
+ export_constant_npc(JT_4_M_DRZONDA01);
+ export_constant_npc(JT_4_M_SWD_RENO);
+ export_constant_npc(JT_4_M_KNG_RENO);
+ export_constant_npc(JT_4_M_AC_RUMIN);
+ export_constant_npc(JT_4_M_HIGH_WIZARD);
+ export_constant_npc(JT_4_SYSTEM_BOX);
+ export_constant_npc(JT_4_STEELBOX);
+ export_constant_npc(JT_4_WOODBOX);
+ export_constant_npc(JT_4_M_POPFESTA);
+ export_constant_npc(JT_4_BONFIRE);
+ export_constant_npc(JT_4_PCCOUNT);
+ export_constant_npc(JT_4_LAVAGOLEM);
+ export_constant_npc(JT_4_F_IA);
+ export_constant_npc(JT_4_LOCKE);
+ export_constant_npc(JT_4_LIL_LIF);
+ export_constant_npc(JT_4_LIL_LIF2);
+ export_constant_npc(JT_4_F_DRAGONHAT);
+ export_constant_npc(JT_4_M_DRAGONHAT);
+ export_constant_npc(JT_JP_NPC02);
+ export_constant_npc(JT_JP_NPC03);
+ export_constant_npc(JT_JP_NPC04);
+ export_constant_npc(JT_JP_NPC05);
+ export_constant_npc(JT_JP_NPC06);
+ export_constant_npc(JT_JP_NPC07);
+ export_constant_npc(JT_JP_NPC08);
+ export_constant_npc(JT_JP_NPC09);
+ export_constant_npc(JT_JP_NPC10);
+ export_constant_npc(JT_4_FIRERING);
+ export_constant_npc(JT_4_SCATLETON);
+ export_constant_npc(JT_4_JP_AB_NPC_001);
+ export_constant_npc(JT_4_JP_AB_NPC_002);
+ export_constant_npc(JT_4_JP_AB_NPC_003);
+ export_constant_npc(JT_4_JP_AB_NPC_004);
+ export_constant_npc(JT_4_JP_AB_NPC_005);
+ export_constant_npc(JT_4_JP_AB_NPC_006);
+ export_constant_npc(JT_4_JP_AB_NPC_007);
+ export_constant_npc(JT_4_JP_AB_NPC_008);
+ export_constant_npc(JT_4_JJAK);
+ export_constant_npc(JT_4_M_SNOWMAN_B);
+ export_constant_npc(JT_4_M_SNOWMAN_R);
+ export_constant_npc(JT_4_M_SNOWMAN_G);
+ export_constant_npc(JT_WARPEFFECTNPC);
+ export_constant_npc(JT_4_F_DANGDANG);
+ export_constant_npc(JT_4_M_DANGDANG);
+ export_constant_npc(JT_4_F_DANGDANG1);
+ export_constant_npc(JT_4_LEAFCAT);
+ export_constant_npc(JT_4_NASARIAN);
+ export_constant_npc(JT_4_NASARIAN_EM);
+ export_constant_npc(JT_4_TEDDY_BEAR_W);
+ export_constant_npc(JT_4_TEDDY_BEAR_B);
+ export_constant_npc(JT_4_TEDDY_BEAR_B_L);
+ #undef export_constant_npc
+
+ /* special effects */
+ export_constant(EF_NONE);
+ export_constant(EF_HIT1);
+ export_constant(EF_HIT2);
+ export_constant(EF_HIT3);
+ export_constant(EF_HIT4);
+ export_constant(EF_HIT5);
+ export_constant(EF_HIT6);
+ export_constant(EF_ENTRY);
+ export_constant(EF_EXIT);
+ export_constant(EF_WARP);
+ export_constant(EF_ENHANCE);
+ export_constant(EF_COIN);
+ export_constant(EF_ENDURE);
+ export_constant(EF_BEGINSPELL);
+ export_constant(EF_GLASSWALL);
+ export_constant(EF_HEALSP);
+ export_constant(EF_SOULSTRIKE);
+ export_constant(EF_BASH);
+ export_constant(EF_MAGNUMBREAK);
+ export_constant(EF_STEAL);
+ export_constant(EF_HIDING);
+ export_constant(EF_PATTACK);
+ export_constant(EF_DETOXICATION);
+ export_constant(EF_SIGHT);
+ export_constant(EF_STONECURSE);
+ export_constant(EF_FIREBALL);
+ export_constant(EF_FIREWALL);
+ export_constant(EF_ICEARROW);
+ export_constant(EF_FROSTDIVER);
+ export_constant(EF_FROSTDIVER2);
+ export_constant(EF_LIGHTBOLT);
+ export_constant(EF_THUNDERSTORM);
+ export_constant(EF_FIREARROW);
+ export_constant(EF_NAPALMBEAT);
+ export_constant(EF_RUWACH);
+ export_constant(EF_TELEPORTATION);
+ export_constant(EF_READYPORTAL);
+ export_constant(EF_PORTAL);
+ export_constant(EF_INCAGILITY);
+ export_constant(EF_DECAGILITY);
+ export_constant(EF_AQUA);
+ export_constant(EF_SIGNUM);
+ export_constant(EF_ANGELUS);
+ export_constant(EF_BLESSING);
+ export_constant(EF_INCAGIDEX);
+ export_constant(EF_SMOKE);
+ export_constant(EF_FIREFLY);
+ export_constant(EF_SANDWIND);
+ export_constant(EF_TORCH);
+ export_constant(EF_SPRAYPOND);
+ export_constant(EF_FIREHIT);
+ export_constant(EF_FIRESPLASHHIT);
+ export_constant(EF_COLDHIT);
+ export_constant(EF_WINDHIT);
+ export_constant(EF_POISONHIT);
+ export_constant(EF_BEGINSPELL2);
+ export_constant(EF_BEGINSPELL3);
+ export_constant(EF_BEGINSPELL4);
+ export_constant(EF_BEGINSPELL5);
+ export_constant(EF_BEGINSPELL6);
+ export_constant(EF_BEGINSPELL7);
+ export_constant(EF_LOCKON);
+ export_constant(EF_WARPZONE);
+ export_constant(EF_SIGHTRASHER);
+ export_constant(EF_BARRIER);
+ export_constant(EF_ARROWSHOT);
+ export_constant(EF_INVENOM);
+ export_constant(EF_CURE);
+ export_constant(EF_PROVOKE);
+ export_constant(EF_MVP);
+ export_constant(EF_SKIDTRAP);
+ export_constant(EF_BRANDISHSPEAR);
+ export_constant(EF_CONE);
+ export_constant(EF_SPHERE);
+ export_constant(EF_BOWLINGBASH);
+ export_constant(EF_ICEWALL);
+ export_constant(EF_GLORIA);
+ export_constant(EF_MAGNIFICAT);
+ export_constant(EF_RESURRECTION);
+ export_constant(EF_RECOVERY);
+ export_constant(EF_EARTHSPIKE);
+ export_constant(EF_SPEARBMR);
+ export_constant(EF_PIERCE);
+ export_constant(EF_TURNUNDEAD);
+ export_constant(EF_SANCTUARY);
+ export_constant(EF_IMPOSITIO);
+ export_constant(EF_LEXAETERNA);
+ export_constant(EF_ASPERSIO);
+ export_constant(EF_LEXDIVINA);
+ export_constant(EF_SUFFRAGIUM);
+ export_constant(EF_STORMGUST);
+ export_constant(EF_LORD);
+ export_constant(EF_BENEDICTIO);
+ export_constant(EF_METEORSTORM);
+ export_constant(EF_YUFITEL);
+ export_constant(EF_YUFITELHIT);
+ export_constant(EF_QUAGMIRE);
+ export_constant(EF_FIREPILLAR);
+ export_constant(EF_FIREPILLARBOMB);
+ export_constant(EF_HASTEUP);
+ export_constant(EF_FLASHER);
+ export_constant(EF_REMOVETRAP);
+ export_constant(EF_REPAIRWEAPON);
+ export_constant(EF_CRASHEARTH);
+ export_constant(EF_PERFECTION);
+ export_constant(EF_MAXPOWER);
+ export_constant(EF_BLASTMINE);
+ export_constant(EF_BLASTMINEBOMB);
+ export_constant(EF_CLAYMORE);
+ export_constant(EF_FREEZING);
+ export_constant(EF_BUBBLE);
+ export_constant(EF_GASPUSH);
+ export_constant(EF_SPRINGTRAP);
+ export_constant(EF_KYRIE);
+ export_constant(EF_MAGNUS);
+ export_constant(EF_BOTTOM);
+ export_constant(EF_BLITZBEAT);
+ export_constant(EF_WATERBALL);
+ export_constant(EF_WATERBALL2);
+ export_constant(EF_FIREIVY);
+ export_constant(EF_DETECTING);
+ export_constant(EF_CLOAKING);
+ export_constant(EF_SONICBLOW);
+ export_constant(EF_SONICBLOWHIT);
+ export_constant(EF_GRIMTOOTH);
+ export_constant(EF_VENOMDUST);
+ export_constant(EF_ENCHANTPOISON);
+ export_constant(EF_POISONREACT);
+ export_constant(EF_POISONREACT2);
+ export_constant(EF_OVERTHRUST);
+ export_constant(EF_SPLASHER);
+ export_constant(EF_TWOHANDQUICKEN);
+ export_constant(EF_AUTOCOUNTER);
+ export_constant(EF_GRIMTOOTHATK);
+ export_constant(EF_FREEZE);
+ export_constant(EF_FREEZED);
+ export_constant(EF_ICECRASH);
+ export_constant(EF_SLOWPOISON);
+ export_constant(EF_BOTTOM2);
+ export_constant(EF_FIREPILLARON);
+ export_constant(EF_SANDMAN);
+ export_constant(EF_REVIVE);
+ export_constant(EF_PNEUMA);
+ export_constant(EF_HEAVENSDRIVE);
+ export_constant(EF_SONICBLOW2);
+ export_constant(EF_BRANDISH2);
+ export_constant(EF_SHOCKWAVE);
+ export_constant(EF_SHOCKWAVEHIT);
+ export_constant(EF_EARTHHIT);
+ export_constant(EF_PIERCESELF);
+ export_constant(EF_BOWLINGSELF);
+ export_constant(EF_SPEARSTABSELF);
+ export_constant(EF_SPEARBMRSELF);
+ export_constant(EF_HOLYHIT);
+ export_constant(EF_CONCENTRATION);
+ export_constant(EF_REFINEOK);
+ export_constant(EF_REFINEFAIL);
+ export_constant(EF_JOBCHANGE);
+ export_constant(EF_LVUP);
+ export_constant(EF_JOBLVUP);
+ export_constant(EF_TOPRANK);
+ export_constant(EF_PARTY);
+ export_constant(EF_RAIN);
+ export_constant(EF_SNOW);
+ export_constant(EF_SAKURA);
+ export_constant(EF_STATUS_STATE);
+ export_constant(EF_BANJJAKII);
+ export_constant(EF_MAKEBLUR);
+ export_constant(EF_TAMINGSUCCESS);
+ export_constant(EF_TAMINGFAILED);
+ export_constant(EF_ENERGYCOAT);
+ export_constant(EF_CARTREVOLUTION);
+ export_constant(EF_VENOMDUST2);
+ export_constant(EF_CHANGEDARK);
+ export_constant(EF_CHANGEFIRE);
+ export_constant(EF_CHANGECOLD);
+ export_constant(EF_CHANGEWIND);
+ export_constant(EF_CHANGEFLAME);
+ export_constant(EF_CHANGEEARTH);
+ export_constant(EF_CHAINGEHOLY);
+ export_constant(EF_CHANGEPOISON);
+ export_constant(EF_HITDARK);
+ export_constant(EF_MENTALBREAK);
+ export_constant(EF_MAGICALATTHIT);
+ export_constant(EF_SUI_EXPLOSION);
+ export_constant(EF_DARKATTACK);
+ export_constant(EF_SUICIDE);
+ export_constant(EF_COMBOATTACK1);
+ export_constant(EF_COMBOATTACK2);
+ export_constant(EF_COMBOATTACK3);
+ export_constant(EF_COMBOATTACK4);
+ export_constant(EF_COMBOATTACK5);
+ export_constant(EF_GUIDEDATTACK);
+ export_constant(EF_POISONATTACK);
+ export_constant(EF_SILENCEATTACK);
+ export_constant(EF_STUNATTACK);
+ export_constant(EF_PETRIFYATTACK);
+ export_constant(EF_CURSEATTACK);
+ export_constant(EF_SLEEPATTACK);
+ export_constant(EF_TELEKHIT);
+ export_constant(EF_PONG);
+ export_constant(EF_LEVEL99);
+ export_constant(EF_LEVEL99_2);
+ export_constant(EF_LEVEL99_3);
+ export_constant(EF_GUMGANG);
+ export_constant(EF_POTION1);
+ export_constant(EF_POTION2);
+ export_constant(EF_POTION3);
+ export_constant(EF_POTION4);
+ export_constant(EF_POTION5);
+ export_constant(EF_POTION6);
+ export_constant(EF_POTION7);
+ export_constant(EF_POTION8);
+ export_constant(EF_DARKBREATH);
+ export_constant(EF_DEFFENDER);
+ export_constant(EF_KEEPING);
+ export_constant(EF_SUMMONSLAVE);
+ export_constant(EF_BLOODDRAIN);
+ export_constant(EF_ENERGYDRAIN);
+ export_constant(EF_POTION_CON);
+ export_constant(EF_POTION_);
+ export_constant(EF_POTION_BERSERK);
+ export_constant(EF_POTIONPILLAR);
+ export_constant(EF_DEFENDER);
+ export_constant(EF_GANBANTEIN);
+ export_constant(EF_WIND);
+ export_constant(EF_VOLCANO);
+ export_constant(EF_GRANDCROSS);
+ export_constant(EF_INTIMIDATE);
+ export_constant(EF_CHOOKGI);
+ export_constant(EF_CLOUD);
+ export_constant(EF_CLOUD2);
+ export_constant(EF_MAPPILLAR);
+ export_constant(EF_LINELINK);
+ export_constant(EF_CLOUD3);
+ export_constant(EF_SPELLBREAKER);
+ export_constant(EF_DISPELL);
+ export_constant(EF_DELUGE);
+ export_constant(EF_VIOLENTGALE);
+ export_constant(EF_LANDPROTECTOR);
+ export_constant(EF_BOTTOM_VO);
+ export_constant(EF_BOTTOM_DE);
+ export_constant(EF_BOTTOM_VI);
+ export_constant(EF_BOTTOM_LA);
+ export_constant(EF_FASTMOVE);
+ export_constant(EF_MAGICROD);
+ export_constant(EF_HOLYCROSS);
+ export_constant(EF_SHIELDCHARGE);
+ export_constant(EF_MAPPILLAR2);
+ export_constant(EF_PROVIDENCE);
+ export_constant(EF_SHIELDBOOMERANG);
+ export_constant(EF_SPEARQUICKEN);
+ export_constant(EF_DEVOTION);
+ export_constant(EF_REFLECTSHIELD);
+ export_constant(EF_ABSORBSPIRITS);
+ export_constant(EF_STEELBODY);
+ export_constant(EF_FLAMELAUNCHER);
+ export_constant(EF_FROSTWEAPON);
+ export_constant(EF_LIGHTNINGLOADER);
+ export_constant(EF_SEISMICWEAPON);
+ export_constant(EF_MAPPILLAR3);
+ export_constant(EF_MAPPILLAR4);
+ export_constant(EF_GUMGANG2);
+ export_constant(EF_TEIHIT1);
+ export_constant(EF_GUMGANG3);
+ export_constant(EF_TEIHIT2);
+ export_constant(EF_TANJI);
+ export_constant(EF_TEIHIT1X);
+ export_constant(EF_CHIMTO);
+ export_constant(EF_STEALCOIN);
+ export_constant(EF_STRIPWEAPON);
+ export_constant(EF_STRIPSHIELD);
+ export_constant(EF_STRIPARMOR);
+ export_constant(EF_STRIPHELM);
+ export_constant(EF_CHAINCOMBO);
+ export_constant(EF_RG_COIN);
+ export_constant(EF_BACKSTAP);
+ export_constant(EF_TEIHIT3);
+ export_constant(EF_BOTTOM_DISSONANCE);
+ export_constant(EF_BOTTOM_LULLABY);
+ export_constant(EF_BOTTOM_RICHMANKIM);
+ export_constant(EF_BOTTOM_ETERNALCHAOS);
+ export_constant(EF_BOTTOM_DRUMBATTLEFIELD);
+ export_constant(EF_BOTTOM_RINGNIBELUNGEN);
+ export_constant(EF_BOTTOM_ROKISWEIL);
+ export_constant(EF_BOTTOM_INTOABYSS);
+ export_constant(EF_BOTTOM_SIEGFRIED);
+ export_constant(EF_BOTTOM_WHISTLE);
+ export_constant(EF_BOTTOM_ASSASSINCROSS);
+ export_constant(EF_BOTTOM_POEMBRAGI);
+ export_constant(EF_BOTTOM_APPLEIDUN);
+ export_constant(EF_BOTTOM_UGLYDANCE);
+ export_constant(EF_BOTTOM_HUMMING);
+ export_constant(EF_BOTTOM_DONTFORGETME);
+ export_constant(EF_BOTTOM_FORTUNEKISS);
+ export_constant(EF_BOTTOM_SERVICEFORYOU);
+ export_constant(EF_TALK_FROSTJOKE);
+ export_constant(EF_TALK_SCREAM);
+ export_constant(EF_POKJUK);
+ export_constant(EF_THROWITEM);
+ export_constant(EF_THROWITEM2);
+ export_constant(EF_CHEMICALPROTECTION);
+ export_constant(EF_POKJUK_SOUND);
+ export_constant(EF_DEMONSTRATION);
+ export_constant(EF_CHEMICAL2);
+ export_constant(EF_TELEPORTATION2);
+ export_constant(EF_PHARMACY_OK);
+ export_constant(EF_PHARMACY_FAIL);
+ export_constant(EF_FORESTLIGHT);
+ export_constant(EF_THROWITEM3);
+ export_constant(EF_FIRSTAID);
+ export_constant(EF_SPRINKLESAND);
+ export_constant(EF_LOUD);
+ export_constant(EF_HEAL);
+ export_constant(EF_HEAL2);
+ export_constant(EF_EXIT2);
+ export_constant(EF_GLASSWALL2);
+ export_constant(EF_READYPORTAL2);
+ export_constant(EF_PORTAL2);
+ export_constant(EF_BOTTOM_MAG);
+ export_constant(EF_BOTTOM_SANC);
+ export_constant(EF_HEAL3);
+ export_constant(EF_WARPZONE2);
+ export_constant(EF_FORESTLIGHT2);
+ export_constant(EF_FORESTLIGHT3);
+ export_constant(EF_FORESTLIGHT4);
+ export_constant(EF_HEAL4);
+ export_constant(EF_FOOT);
+ export_constant(EF_FOOT2);
+ export_constant(EF_BEGINASURA);
+ export_constant(EF_TRIPLEATTACK);
+ export_constant(EF_HITLINE);
+ export_constant(EF_HPTIME);
+ export_constant(EF_SPTIME);
+ export_constant(EF_MAPLE);
+ export_constant(EF_BLIND);
+ export_constant(EF_POISON);
+ export_constant(EF_GUARD);
+ export_constant(EF_JOBLVUP50);
+ export_constant(EF_ANGEL2);
+ export_constant(EF_MAGNUM2);
+ export_constant(EF_CALLZONE);
+ export_constant(EF_PORTAL3);
+ export_constant(EF_COUPLECASTING);
+ export_constant(EF_HEARTCASTING);
+ export_constant(EF_ENTRY2);
+ export_constant(EF_SAINTWING);
+ export_constant(EF_SPHEREWIND);
+ export_constant(EF_COLORPAPER);
+ export_constant(EF_LIGHTSPHERE);
+ export_constant(EF_WATERFALL);
+ export_constant(EF_WATERFALL_90);
+ export_constant(EF_WATERFALL_SMALL);
+ export_constant(EF_WATERFALL_SMALL_90);
+ export_constant(EF_WATERFALL_T2);
+ export_constant(EF_WATERFALL_T2_90);
+ export_constant(EF_WATERFALL_SMALL_T2);
+ export_constant(EF_WATERFALL_SMALL_T2_90);
+ export_constant(EF_MINI_TETRIS);
+ export_constant(EF_GHOST);
+ export_constant(EF_BAT);
+ export_constant(EF_BAT2);
+ export_constant(EF_SOULBREAKER);
+ export_constant(EF_LEVEL99_4);
+ export_constant(EF_VALLENTINE);
+ export_constant(EF_VALLENTINE2);
+ export_constant(EF_PRESSURE);
+ export_constant(EF_BASH3D);
+ export_constant(EF_AURABLADE);
+ export_constant(EF_REDBODY);
+ export_constant(EF_LKCONCENTRATION);
+ export_constant(EF_BOTTOM_GOSPEL);
+ export_constant(EF_ANGEL);
+ export_constant(EF_DEVIL);
+ export_constant(EF_DRAGONSMOKE);
+ export_constant(EF_BOTTOM_BASILICA);
+ export_constant(EF_ASSUMPTIO);
+ export_constant(EF_HITLINE2);
+ export_constant(EF_BASH3D2);
+ export_constant(EF_ENERGYDRAIN2);
+ export_constant(EF_TRANSBLUEBODY);
+ export_constant(EF_MAGICCRASHER);
+ export_constant(EF_LIGHTSPHERE2);
+ export_constant(EF_LIGHTBLADE);
+ export_constant(EF_ENERGYDRAIN3);
+ export_constant(EF_LINELINK2);
+ export_constant(EF_LINKLIGHT);
+ export_constant(EF_TRUESIGHT);
+ export_constant(EF_FALCONASSAULT);
+ export_constant(EF_TRIPLEATTACK2);
+ export_constant(EF_PORTAL4);
+ export_constant(EF_MELTDOWN);
+ export_constant(EF_CARTBOOST);
+ export_constant(EF_REJECTSWORD);
+ export_constant(EF_TRIPLEATTACK3);
+ export_constant(EF_SPHEREWIND2);
+ export_constant(EF_LINELINK3);
+ export_constant(EF_PINKBODY);
+ export_constant(EF_LEVEL99_5);
+ export_constant(EF_LEVEL99_6);
+ export_constant(EF_BASH3D3);
+ export_constant(EF_BASH3D4);
+ export_constant(EF_NAPALMVALCAN);
+ export_constant(EF_PORTAL5);
+ export_constant(EF_MAGICCRASHER2);
+ export_constant(EF_BOTTOM_SPIDER);
+ export_constant(EF_BOTTOM_FOGWALL);
+ export_constant(EF_SOULBURN);
+ export_constant(EF_SOULCHANGE);
+ export_constant(EF_BABY);
+ export_constant(EF_SOULBREAKER2);
+ export_constant(EF_RAINBOW);
+ export_constant(EF_PEONG);
+ export_constant(EF_TANJI2);
+ export_constant(EF_PRESSEDBODY);
+ export_constant(EF_SPINEDBODY);
+ export_constant(EF_KICKEDBODY);
+ export_constant(EF_AIRTEXTURE);
+ export_constant(EF_HITBODY);
+ export_constant(EF_DOUBLEGUMGANG);
+ export_constant(EF_REFLECTBODY);
+ export_constant(EF_BABYBODY);
+ export_constant(EF_BABYBODY2);
+ export_constant(EF_GIANTBODY);
+ export_constant(EF_GIANTBODY2);
+ export_constant(EF_ASURABODY);
+ export_constant(EF_4WAYBODY);
+ export_constant(EF_QUAKEBODY);
+ export_constant(EF_ASURABODY_MONSTER);
+ export_constant(EF_HITLINE3);
+ export_constant(EF_HITLINE4);
+ export_constant(EF_HITLINE5);
+ export_constant(EF_HITLINE6);
+ export_constant(EF_ELECTRIC);
+ export_constant(EF_ELECTRIC2);
+ export_constant(EF_HITLINE7);
+ export_constant(EF_STORMKICK);
+ export_constant(EF_HALFSPHERE);
+ export_constant(EF_ATTACKENERGY);
+ export_constant(EF_ATTACKENERGY2);
+ export_constant(EF_CHEMICAL3);
+ export_constant(EF_ASSUMPTIO2);
+ export_constant(EF_BLUECASTING);
+ export_constant(EF_RUN);
+ export_constant(EF_STOPRUN);
+ export_constant(EF_STOPEFFECT);
+ export_constant(EF_JUMPBODY);
+ export_constant(EF_LANDBODY);
+ export_constant(EF_FOOT3);
+ export_constant(EF_FOOT4);
+ export_constant(EF_TAE_READY);
+ export_constant(EF_GRANDCROSS2);
+ export_constant(EF_SOULSTRIKE2);
+ export_constant(EF_YUFITEL2);
+ export_constant(EF_NPC_STOP);
+ export_constant(EF_DARKCASTING);
+ export_constant(EF_GUMGANGNPC);
+ export_constant(EF_AGIUP);
+ export_constant(EF_JUMPKICK);
+ export_constant(EF_QUAKEBODY2);
+ export_constant(EF_STORMKICK1);
+ export_constant(EF_STORMKICK2);
+ export_constant(EF_STORMKICK3);
+ export_constant(EF_STORMKICK4);
+ export_constant(EF_STORMKICK5);
+ export_constant(EF_STORMKICK6);
+ export_constant(EF_STORMKICK7);
+ export_constant(EF_SPINEDBODY2);
+ export_constant(EF_BEGINASURA1);
+ export_constant(EF_BEGINASURA2);
+ export_constant(EF_BEGINASURA3);
+ export_constant(EF_BEGINASURA4);
+ export_constant(EF_BEGINASURA5);
+ export_constant(EF_BEGINASURA6);
+ export_constant(EF_BEGINASURA7);
+ export_constant(EF_AURABLADE2);
+ export_constant(EF_DEVIL1);
+ export_constant(EF_DEVIL2);
+ export_constant(EF_DEVIL3);
+ export_constant(EF_DEVIL4);
+ export_constant(EF_DEVIL5);
+ export_constant(EF_DEVIL6);
+ export_constant(EF_DEVIL7);
+ export_constant(EF_DEVIL8);
+ export_constant(EF_DEVIL9);
+ export_constant(EF_DEVIL10);
+ export_constant(EF_DOUBLEGUMGANG2);
+ export_constant(EF_DOUBLEGUMGANG3);
+ export_constant(EF_BLACKDEVIL);
+ export_constant(EF_FLOWERCAST);
+ export_constant(EF_FLOWERCAST2);
+ export_constant(EF_FLOWERCAST3);
+ export_constant(EF_MOCHI);
+ export_constant(EF_LAMADAN);
+ export_constant(EF_EDP);
+ export_constant(EF_SHIELDBOOMERANG2);
+ export_constant(EF_RG_COIN2);
+ export_constant(EF_GUARD2);
+ export_constant(EF_SLIM);
+ export_constant(EF_SLIM2);
+ export_constant(EF_SLIM3);
+ export_constant(EF_CHEMICALBODY);
+ export_constant(EF_CASTSPIN);
+ export_constant(EF_PIERCEBODY);
+ export_constant(EF_SOULLINK);
+ export_constant(EF_CHOOKGI2);
+ export_constant(EF_MEMORIZE);
+ export_constant(EF_SOULLIGHT);
+ export_constant(EF_MAPAE);
+ export_constant(EF_ITEMPOKJUK);
+ export_constant(EF_05VAL);
+ export_constant(EF_BEGINASURA11);
+ export_constant(EF_NIGHT);
+ export_constant(EF_CHEMICAL2DASH);
+ export_constant(EF_GROUNDSAMPLE);
+ export_constant(EF_GI_EXPLOSION);
+ export_constant(EF_CLOUD4);
+ export_constant(EF_CLOUD5);
+ export_constant(EF_BOTTOM_HERMODE);
+ export_constant(EF_CARTTER);
+ export_constant(EF_ITEMFAST);
+ export_constant(EF_SHIELDBOOMERANG3);
+ export_constant(EF_DOUBLECASTBODY);
+ export_constant(EF_GRAVITATION);
+ export_constant(EF_TAROTCARD1);
+ export_constant(EF_TAROTCARD2);
+ export_constant(EF_TAROTCARD3);
+ export_constant(EF_TAROTCARD4);
+ export_constant(EF_TAROTCARD5);
+ export_constant(EF_TAROTCARD6);
+ export_constant(EF_TAROTCARD7);
+ export_constant(EF_TAROTCARD8);
+ export_constant(EF_TAROTCARD9);
+ export_constant(EF_TAROTCARD10);
+ export_constant(EF_TAROTCARD11);
+ export_constant(EF_TAROTCARD12);
+ export_constant(EF_TAROTCARD13);
+ export_constant(EF_TAROTCARD14);
+ export_constant(EF_ACIDDEMON);
+ export_constant(EF_GREENBODY);
+ export_constant(EF_THROWITEM4);
+ export_constant(EF_BABYBODY_BACK);
+ export_constant(EF_THROWITEM5);
+ export_constant(EF_BLUEBODY);
+ export_constant(EF_HATED);
+ export_constant(EF_REDLIGHTBODY);
+ export_constant(EF_RO2YEAR);
+ export_constant(EF_SMA_READY);
+ export_constant(EF_STIN);
+ export_constant(EF_RED_HIT);
+ export_constant(EF_BLUE_HIT);
+ export_constant(EF_QUAKEBODY3);
+ export_constant(EF_SMA);
+ export_constant(EF_SMA2);
+ export_constant(EF_STIN2);
+ export_constant(EF_HITTEXTURE);
+ export_constant(EF_STIN3);
+ export_constant(EF_SMA3);
+ export_constant(EF_BLUEFALL);
+ export_constant(EF_BLUEFALL_90);
+ export_constant(EF_FASTBLUEFALL);
+ export_constant(EF_FASTBLUEFALL_90);
+ export_constant(EF_BIG_PORTAL);
+ export_constant(EF_BIG_PORTAL2);
+ export_constant(EF_SCREEN_QUAKE);
+ export_constant(EF_HOMUNCASTING);
+ export_constant(EF_HFLIMOON1);
+ export_constant(EF_HFLIMOON2);
+ export_constant(EF_HFLIMOON3);
+ export_constant(EF_HO_UP);
+ export_constant(EF_HAMIDEFENCE);
+ export_constant(EF_HAMICASTLE);
+ export_constant(EF_HAMIBLOOD);
+ export_constant(EF_HATED2);
+ export_constant(EF_TWILIGHT1);
+ export_constant(EF_TWILIGHT2);
+ export_constant(EF_TWILIGHT3);
+ export_constant(EF_ITEM_THUNDER);
+ export_constant(EF_ITEM_CLOUD);
+ export_constant(EF_ITEM_CURSE);
+ export_constant(EF_ITEM_ZZZ);
+ export_constant(EF_ITEM_RAIN);
+ export_constant(EF_ITEM_LIGHT);
+ export_constant(EF_ANGEL3);
+ export_constant(EF_M01);
+ export_constant(EF_M02);
+ export_constant(EF_M03);
+ export_constant(EF_M04);
+ export_constant(EF_M05);
+ export_constant(EF_M06);
+ export_constant(EF_M07);
+ export_constant(EF_KAIZEL);
+ export_constant(EF_KAAHI);
+ export_constant(EF_CLOUD6);
+ export_constant(EF_FOOD01);
+ export_constant(EF_FOOD02);
+ export_constant(EF_FOOD03);
+ export_constant(EF_FOOD04);
+ export_constant(EF_FOOD05);
+ export_constant(EF_FOOD06);
+ export_constant(EF_SHRINK);
+ export_constant(EF_THROWITEM6);
+ export_constant(EF_SIGHT2);
+ export_constant(EF_QUAKEBODY4);
+ export_constant(EF_FIREHIT2);
+ export_constant(EF_NPC_STOP2);
+ export_constant(EF_NPC_STOP2_DEL);
+ export_constant(EF_FVOICE);
+ export_constant(EF_WINK);
+ export_constant(EF_COOKING_OK);
+ export_constant(EF_COOKING_FAIL);
+ export_constant(EF_TEMP_OK);
+ export_constant(EF_TEMP_FAIL);
+ export_constant(EF_HAPGYEOK);
+ export_constant(EF_THROWITEM7);
+ export_constant(EF_THROWITEM8);
+ export_constant(EF_THROWITEM9);
+ export_constant(EF_THROWITEM10);
+ export_constant(EF_BUNSINJYUTSU);
+ export_constant(EF_KOUENKA);
+ export_constant(EF_HYOUSENSOU);
+ export_constant(EF_BOTTOM_SUITON);
+ export_constant(EF_STIN4);
+ export_constant(EF_THUNDERSTORM2);
+ export_constant(EF_CHEMICAL4);
+ export_constant(EF_STIN5);
+ export_constant(EF_MADNESS_BLUE);
+ export_constant(EF_MADNESS_RED);
+ export_constant(EF_RG_COIN3);
+ export_constant(EF_BASH3D5);
+ export_constant(EF_CHOOKGI3);
+ export_constant(EF_KIRIKAGE);
+ export_constant(EF_TATAMI);
+ export_constant(EF_KASUMIKIRI);
+ export_constant(EF_ISSEN);
+ export_constant(EF_KAEN);
+ export_constant(EF_BAKU);
+ export_constant(EF_HYOUSYOURAKU);
+ export_constant(EF_DESPERADO);
+ export_constant(EF_LIGHTNING_S);
+ export_constant(EF_BLIND_S);
+ export_constant(EF_POISON_S);
+ export_constant(EF_FREEZING_S);
+ export_constant(EF_FLARE_S);
+ export_constant(EF_RAPIDSHOWER);
+ export_constant(EF_MAGICALBULLET);
+ export_constant(EF_SPREADATTACK);
+ export_constant(EF_TRACKCASTING);
+ export_constant(EF_TRACKING);
+ export_constant(EF_TRIPLEACTION);
+ export_constant(EF_BULLSEYE);
+ export_constant(EF_MAP_MAGICZONE);
+ export_constant(EF_MAP_MAGICZONE2);
+ export_constant(EF_DAMAGE1);
+ export_constant(EF_DAMAGE1_2);
+ export_constant(EF_DAMAGE1_3);
+ export_constant(EF_UNDEADBODY);
+ export_constant(EF_UNDEADBODY_DEL);
+ export_constant(EF_GREEN_NUMBER);
+ export_constant(EF_BLUE_NUMBER);
+ export_constant(EF_RED_NUMBER);
+ export_constant(EF_PURPLE_NUMBER);
+ export_constant(EF_BLACK_NUMBER);
+ export_constant(EF_WHITE_NUMBER);
+ export_constant(EF_YELLOW_NUMBER);
+ export_constant(EF_PINK_NUMBER);
+ export_constant(EF_BUBBLE_DROP);
+ export_constant(EF_NPC_EARTHQUAKE);
+ export_constant(EF_DA_SPACE);
+ export_constant(EF_DRAGONFEAR);
+ export_constant(EF_BLEEDING);
+ export_constant(EF_WIDECONFUSE);
+ export_constant(EF_BOTTOM_RUNNER);
+ export_constant(EF_BOTTOM_TRANSFER);
+ export_constant(EF_CRYSTAL_BLUE);
+ export_constant(EF_BOTTOM_EVILLAND);
+ export_constant(EF_GUARD3);
+ export_constant(EF_NPC_SLOWCAST);
+ export_constant(EF_CRITICALWOUND);
+ export_constant(EF_GREEN99_3);
+ export_constant(EF_GREEN99_5);
+ export_constant(EF_GREEN99_6);
+ export_constant(EF_MAPSPHERE);
+ export_constant(EF_POK_LOVE);
+ export_constant(EF_POK_WHITE);
+ export_constant(EF_POK_VALEN);
+ export_constant(EF_POK_BIRTH);
+ export_constant(EF_POK_CHRISTMAS);
+ export_constant(EF_MAP_MAGICZONE3);
+ export_constant(EF_MAP_MAGICZONE4);
+ export_constant(EF_DUST);
+ export_constant(EF_TORCH_RED);
+ export_constant(EF_TORCH_GREEN);
+ export_constant(EF_MAP_GHOST);
+ export_constant(EF_GLOW1);
+ export_constant(EF_GLOW2);
+ export_constant(EF_GLOW4);
+ export_constant(EF_TORCH_PURPLE);
+ export_constant(EF_CLOUD7);
+ export_constant(EF_CLOUD8);
+ export_constant(EF_FLOWERLEAF);
+ export_constant(EF_MAPSPHERE2);
+ export_constant(EF_GLOW11);
+ export_constant(EF_GLOW12);
+ export_constant(EF_CIRCLELIGHT);
+ export_constant(EF_ITEM315);
+ export_constant(EF_ITEM316);
+ export_constant(EF_ITEM317);
+ export_constant(EF_ITEM318);
+ export_constant(EF_STORM_MIN);
+ export_constant(EF_POK_JAP);
+ export_constant(EF_MAP_GREENLIGHT);
+ export_constant(EF_MAP_MAGICWALL);
+ export_constant(EF_MAP_GREENLIGHT2);
+ export_constant(EF_YELLOWFLY1);
+ export_constant(EF_YELLOWFLY2);
+ export_constant(EF_BOTTOM_BLUE);
+ export_constant(EF_BOTTOM_BLUE2);
+ export_constant(EF_WEWISH);
+ export_constant(EF_FIREPILLARON2);
+ export_constant(EF_FORESTLIGHT5);
+ export_constant(EF_SOULBREAKER3);
+ export_constant(EF_ADO_STR);
+ export_constant(EF_IGN_STR);
+ export_constant(EF_CHIMTO2);
+ export_constant(EF_WINDCUTTER);
+ export_constant(EF_DETECT2);
+ export_constant(EF_FROSTMYSTY);
+ export_constant(EF_CRIMSON_STR);
+ export_constant(EF_HELL_STR);
+ export_constant(EF_SPR_MASH);
+ export_constant(EF_SPR_SOULE);
+ export_constant(EF_DHOWL_STR);
+ export_constant(EF_EARTHWALL);
+ export_constant(EF_SOULBREAKER4);
+ export_constant(EF_CHAINL_STR);
+ export_constant(EF_CHOOKGI_FIRE);
+ export_constant(EF_CHOOKGI_WIND);
+ export_constant(EF_CHOOKGI_WATER);
+ export_constant(EF_CHOOKGI_GROUND);
+ export_constant(EF_MAGENTA_TRAP);
+ export_constant(EF_COBALT_TRAP);
+ export_constant(EF_MAIZE_TRAP);
+ export_constant(EF_VERDURE_TRAP);
+ export_constant(EF_NORMAL_TRAP);
+ export_constant(EF_CLOAKING2);
+ export_constant(EF_AIMED_STR);
+ export_constant(EF_ARROWSTORM_STR);
+ export_constant(EF_LAULAMUS_STR);
+ export_constant(EF_LAUAGNUS_STR);
+ export_constant(EF_MILSHIELD_STR);
+ export_constant(EF_CONCENTRATION2);
+ export_constant(EF_FIREBALL2);
+ export_constant(EF_BUNSINJYUTSU2);
+ export_constant(EF_CLEARTIME);
+ export_constant(EF_GLASSWALL3);
+ export_constant(EF_ORATIO);
+ export_constant(EF_POTION_BERSERK2);
+ export_constant(EF_CIRCLEPOWER);
+ export_constant(EF_ROLLING1);
+ export_constant(EF_ROLLING2);
+ export_constant(EF_ROLLING3);
+ export_constant(EF_ROLLING4);
+ export_constant(EF_ROLLING5);
+ export_constant(EF_ROLLING6);
+ export_constant(EF_ROLLING7);
+ export_constant(EF_ROLLING8);
+ export_constant(EF_ROLLING9);
+ export_constant(EF_ROLLING10);
+ export_constant(EF_PURPLEBODY);
+ export_constant(EF_STIN6);
+ export_constant(EF_RG_COIN4);
+ export_constant(EF_POISONWAV);
+ export_constant(EF_POISONSMOKE);
+ export_constant(EF_GUMGANG4);
+ export_constant(EF_SHIELDBOOMERANG4);
+ export_constant(EF_CASTSPIN2);
+ export_constant(EF_VULCANWAV);
+ export_constant(EF_AGIUP2);
+ export_constant(EF_DETECT3);
+ export_constant(EF_AGIUP3);
+ export_constant(EF_DETECT4);
+ export_constant(EF_ELECTRIC3);
+ export_constant(EF_GUARD4);
+ export_constant(EF_BOTTOM_BARRIER);
+ export_constant(EF_BOTTOM_STEALTH);
+ export_constant(EF_REPAIRTIME);
+ export_constant(EF_NC_ANAL);
+ export_constant(EF_FIRETHROW);
+ export_constant(EF_VENOMIMPRESS);
+ export_constant(EF_FROSTMISTY);
+ export_constant(EF_BURNING);
+ export_constant(EF_COLDTHROW);
+ export_constant(EF_MAKEHALLU);
+ export_constant(EF_HALLUTIME);
+ export_constant(EF_INFRAREDSCAN);
+ export_constant(EF_CRASHAXE);
+ export_constant(EF_GTHUNDER);
+ export_constant(EF_STONERING);
+ export_constant(EF_INTIMIDATE2);
+ export_constant(EF_STASIS);
+ export_constant(EF_REDLINE);
+ export_constant(EF_FROSTDIVER3);
+ export_constant(EF_BOTTOM_BASILICA2);
+ export_constant(EF_RECOGNIZED);
+ export_constant(EF_TETRA);
+ export_constant(EF_TETRACASTING);
+ export_constant(EF_FIREBALL3);
+ export_constant(EF_INTIMIDATE3);
+ export_constant(EF_RECOGNIZED2);
+ export_constant(EF_CLOAKING3);
+ export_constant(EF_INTIMIDATE4);
+ export_constant(EF_STRETCH);
+ export_constant(EF_BLACKBODY);
+ export_constant(EF_ENERVATION);
+ export_constant(EF_ENERVATION2);
+ export_constant(EF_ENERVATION3);
+ export_constant(EF_ENERVATION4);
+ export_constant(EF_ENERVATION5);
+ export_constant(EF_ENERVATION6);
+ export_constant(EF_LINELINK4);
+ export_constant(EF_RG_COIN5);
+ export_constant(EF_WATERFALL_ANI);
+ export_constant(EF_BOTTOM_MANHOLE);
+ export_constant(EF_MANHOLE);
+ export_constant(EF_MAKEFEINT);
+ export_constant(EF_FORESTLIGHT6);
+ export_constant(EF_DARKCASTING2);
+ export_constant(EF_BOTTOM_ANI);
+ export_constant(EF_BOTTOM_MAELSTROM);
+ export_constant(EF_BOTTOM_BLOODYLUST);
+ export_constant(EF_BEGINSPELL_N1);
+ export_constant(EF_BEGINSPELL_N2);
+ export_constant(EF_HEAL_N);
+ export_constant(EF_CHOOKGI_N);
+ export_constant(EF_JOBLVUP50_2);
+ export_constant(EF_CHEMICAL2DASH2);
+ export_constant(EF_CHEMICAL2DASH3);
+ export_constant(EF_ROLLINGCAST);
+ export_constant(EF_WATER_BELOW);
+ export_constant(EF_WATER_FADE);
+ export_constant(EF_BEGINSPELL_N3);
+ export_constant(EF_BEGINSPELL_N4);
+ export_constant(EF_BEGINSPELL_N5);
+ export_constant(EF_BEGINSPELL_N6);
+ export_constant(EF_BEGINSPELL_N7);
+ export_constant(EF_BEGINSPELL_N8);
+ export_constant(EF_WATER_SMOKE);
+ export_constant(EF_DANCE1);
+ export_constant(EF_DANCE2);
+ export_constant(EF_LINKPARTICLE);
+ export_constant(EF_SOULLIGHT2);
+ export_constant(EF_SPR_PARTICLE);
+ export_constant(EF_SPR_PARTICLE2);
+ export_constant(EF_SPR_PLANT);
+ export_constant(EF_CHEMICAL_V);
+ export_constant(EF_SHOOTPARTICLE);
+ export_constant(EF_BOT_REVERB);
+ export_constant(EF_RAIN_PARTICLE);
+ export_constant(EF_CHEMICAL_V2);
+ export_constant(EF_SECRA);
+ export_constant(EF_BOT_REVERB2);
+ export_constant(EF_CIRCLEPOWER2);
+ export_constant(EF_SECRA2);
+ export_constant(EF_CHEMICAL_V3);
+ export_constant(EF_ENERVATION7);
+ export_constant(EF_CIRCLEPOWER3);
+ export_constant(EF_SPR_PLANT2);
+ export_constant(EF_CIRCLEPOWER4);
+ export_constant(EF_SPR_PLANT3);
+ export_constant(EF_RG_COIN6);
+ export_constant(EF_SPR_PLANT4);
+ export_constant(EF_CIRCLEPOWER5);
+ export_constant(EF_SPR_PLANT5);
+ export_constant(EF_CIRCLEPOWER6);
+ export_constant(EF_SPR_PLANT6);
+ export_constant(EF_CIRCLEPOWER7);
+ export_constant(EF_SPR_PLANT7);
+ export_constant(EF_CIRCLEPOWER8);
+ export_constant(EF_SPR_PLANT8);
+ export_constant(EF_HEARTASURA);
+ export_constant(EF_BEGINSPELL_150);
+ export_constant(EF_LEVEL99_150);
+ export_constant(EF_PRIMECHARGE);
+ export_constant(EF_GLASSWALL4);
+ export_constant(EF_GRADIUS_LASER);
+ export_constant(EF_BASH3D6);
+ export_constant(EF_GUMGANG5);
+ export_constant(EF_HITLINE8);
+ export_constant(EF_ELECTRIC4);
+ export_constant(EF_TEIHIT1T);
+ export_constant(EF_SPINMOVE);
+ export_constant(EF_FIREBALL4);
+ export_constant(EF_TRIPLEATTACK4);
+ export_constant(EF_CHEMICAL3S);
+ export_constant(EF_GROUNDSHAKE);
+ export_constant(EF_DQ9_CHARGE);
+ export_constant(EF_DQ9_CHARGE2);
+ export_constant(EF_DQ9_CHARGE3);
+ export_constant(EF_DQ9_CHARGE4);
+ export_constant(EF_BLUELINE);
+ export_constant(EF_SELFSCROLL);
+ export_constant(EF_SPR_LIGHTPRINT);
+ export_constant(EF_PNG_TEST);
+ export_constant(EF_BEGINSPELL_YB);
+ export_constant(EF_CHEMICAL2DASH4);
+ export_constant(EF_GROUNDSHAKE2);
+ export_constant(EF_PRESSURE2);
+ export_constant(EF_RG_COIN7);
+ export_constant(EF_PRIMECHARGE2);
+ export_constant(EF_PRIMECHARGE3);
+ export_constant(EF_PRIMECHARGE4);
+ export_constant(EF_GREENCASTING);
+ export_constant(EF_WALLOFTHORN);
+ export_constant(EF_FIREBALL5);
+ export_constant(EF_THROWITEM11);
+ export_constant(EF_SPR_PLANT9);
+ export_constant(EF_DEMONICFIRE);
+ export_constant(EF_DEMONICFIRE2);
+ export_constant(EF_DEMONICFIRE3);
+ export_constant(EF_HELLSPLANT);
+ export_constant(EF_FIREWALL2);
+ export_constant(EF_VACUUM);
+ export_constant(EF_SPR_PLANT10);
+ export_constant(EF_SPR_LIGHTPRINT2);
+ export_constant(EF_POISONSMOKE2);
+ export_constant(EF_MAKEHALLU2);
+ export_constant(EF_SHOCKWAVE2);
+ export_constant(EF_SPR_PLANT11);
+ export_constant(EF_COLDTHROW2);
+ export_constant(EF_DEMONICFIRE4);
+ export_constant(EF_PRESSURE3);
+ export_constant(EF_LINKPARTICLE2);
+ export_constant(EF_SOULLIGHT3);
+ export_constant(EF_CHAREFFECT);
+ export_constant(EF_GUMGANG6);
+ export_constant(EF_FIREBALL6);
+ export_constant(EF_GUMGANG7);
+ export_constant(EF_GUMGANG8);
+ export_constant(EF_GUMGANG9);
+ export_constant(EF_BOTTOM_DE2);
+ export_constant(EF_COLDSTATUS);
+ export_constant(EF_SPR_LIGHTPRINT3);
+ export_constant(EF_WATERBALL3);
+ export_constant(EF_HEAL_N2);
+ export_constant(EF_RAIN_PARTICLE2);
+ export_constant(EF_CLOUD9);
+ export_constant(EF_YELLOWFLY3);
+ export_constant(EF_EL_GUST);
+ export_constant(EF_EL_BLAST);
+ export_constant(EF_EL_AQUAPLAY);
+ export_constant(EF_EL_UPHEAVAL);
+ export_constant(EF_EL_WILD_STORM);
+ export_constant(EF_EL_CHILLY_AIR);
+ export_constant(EF_EL_CURSED_SOIL);
+ export_constant(EF_EL_COOLER);
+ export_constant(EF_EL_TROPIC);
+ export_constant(EF_EL_PYROTECHNIC);
+ export_constant(EF_EL_PETROLOGY);
+ export_constant(EF_EL_HEATER);
+ export_constant(EF_POISON_MIST);
+ export_constant(EF_ERASER_CUTTER);
+ export_constant(EF_SILENT_BREEZE);
+ export_constant(EF_MAGMA_FLOW);
+ export_constant(EF_GRAYBODY);
+ export_constant(EF_LAVA_SLIDE);
+ export_constant(EF_SONIC_CLAW);
+ export_constant(EF_TINDER_BREAKER);
+ export_constant(EF_MIDNIGHT_FRENZY);
+ export_constant(EF_MACRO);
+ export_constant(EF_CHEMICAL_ALLRANGE);
+ export_constant(EF_TETRA_FIRE);
+ export_constant(EF_TETRA_WATER);
+ export_constant(EF_TETRA_WIND);
+ export_constant(EF_TETRA_GROUND);
+ export_constant(EF_EMITTER);
+ export_constant(EF_VOLCANIC_ASH);
+ export_constant(EF_LEVEL99_ORB1);
+ export_constant(EF_LEVEL99_ORB2);
+ export_constant(EF_LEVEL150);
+ export_constant(EF_LEVEL150_SUB);
+ export_constant(EF_THROWITEM4_1);
+ export_constant(EF_THROW_HAPPOKUNAI);
+ export_constant(EF_THROW_MULTIPLE_COIN);
+ export_constant(EF_THROW_BAKURETSU);
+ export_constant(EF_ROTATE_HUUMARANKA);
+ export_constant(EF_ROTATE_BG);
+ export_constant(EF_ROTATE_LINE_GRAY);
+ export_constant(EF_2011RWC);
+ export_constant(EF_2011RWC2);
+ export_constant(EF_KAIHOU);
+ export_constant(EF_GROUND_EXPLOSION);
+ export_constant(EF_KG_KAGEHUMI);
+ export_constant(EF_KO_ZENKAI_WATER);
+ export_constant(EF_KO_ZENKAI_LAND);
+ export_constant(EF_KO_ZENKAI_FIRE);
+ export_constant(EF_KO_ZENKAI_WIND);
+ export_constant(EF_KO_JYUMONJIKIRI);
+ export_constant(EF_KO_SETSUDAN);
+ export_constant(EF_RED_CROSS);
+ export_constant(EF_KO_IZAYOI);
+ export_constant(EF_ROTATE_LINE_BLUE);
+ export_constant(EF_KG_KYOMU);
+ export_constant(EF_KO_HUUMARANKA);
+ export_constant(EF_BLUELIGHTBODY);
+ export_constant(EF_KAGEMUSYA);
+ export_constant(EF_OB_GENSOU);
+ export_constant(EF_NO100_FIRECRACKER);
+ export_constant(EF_KO_MAKIBISHI);
+ export_constant(EF_KAIHOU1);
+ export_constant(EF_AKAITSUKI);
+ export_constant(EF_ZANGETSU);
+ export_constant(EF_GENSOU);
+ export_constant(EF_HAT_EFFECT);
+ export_constant(EF_CHERRYBLOSSOM);
+ export_constant(EF_EVENT_CLOUD);
+ export_constant(EF_RUN_MAKE_OK);
+ export_constant(EF_RUN_MAKE_FAILURE);
+ export_constant(EF_MIRESULT_MAKE_OK);
+ export_constant(EF_MIRESULT_MAKE_FAIL);
+ export_constant(EF_ALL_RAY_OF_PROTECTION);
+ export_constant(EF_VENOMFOG);
+ export_constant(EF_DUSTSTORM);
+ export_constant(EF_LEVEL160);
+ export_constant(EF_LEVEL160_SUB);
+ export_constant(EF_MAPCHAIN);
+ export_constant(EF_MAGIC_FLOOR);
+ export_constant(EF_ICEMINE);
+ export_constant(EF_FLAMECORSS);
+ export_constant(EF_ICEMINE_1);
+ export_constant(EF_DANCE_BLADE_ATK);
+ export_constant(EF_DARKPIERCING);
+ export_constant(EF_INVINCIBLEOFF2);
+ export_constant(EF_MAXPAIN);
+ export_constant(EF_DEATHSUMMON);
+ export_constant(EF_MOONSTAR);
+ export_constant(EF_STRANGELIGHTS);
+ export_constant(EF_SUPER_STAR);
+ export_constant(EF_YELLOBODY);
+ export_constant(EF_COLORPAPER2);
+ export_constant(EF_EVILS_PAW);
+ export_constant(EF_GC_DARKCROW);
+ export_constant(EF_RK_DRAGONBREATH_WATER);
+ export_constant(EF_ALL_FULL_THROTTLE);
+ export_constant(EF_SR_FLASHCOMBO);
+ export_constant(EF_RK_LUXANIMA);
+ export_constant(EF_CLOUD10);
+ export_constant(EF_SO_ELEMENTAL_SHIELD);
+ export_constant(EF_AB_OFFERTORIUM);
+ export_constant(EF_WL_TELEKINESIS_INTENSE);
+ export_constant(EF_GN_ILLUSIONDOPING);
+ export_constant(EF_NC_MAGMA_ERUPTION);
+ export_constant(EF_LG_KINGS_GRACE);
+ export_constant(EF_BLOODDRAIN2);
+ export_constant(EF_NPC_WIDEWEB);
+ export_constant(EF_NPC_BURNT);
+ export_constant(EF_NPC_CHILL);
+ export_constant(EF_RA_UNLIMIT);
+ export_constant(EF_AB_OFFERTORIUM_RING);
+ export_constant(EF_SC_ESCAPE);
+ export_constant(EF_WM_FRIGG_SONG);
+ export_constant(EF_FLICKER);
+ export_constant(EF_C_MAKER);
+ export_constant(EF_HAMMER_OF_GOD);
+ export_constant(EF_MASS_SPIRAL);
+ export_constant(EF_FIRE_RAIN);
+ export_constant(EF_WHITEBODY);
+ export_constant(EF_BANISHING_BUSTER);
+ export_constant(EF_SLUGSHOT);
+ export_constant(EF_D_TAIL);
+ export_constant(EF_BIND_TRAP1);
+ export_constant(EF_BIND_TRAP2);
+ export_constant(EF_BIND_TRAP3);
+ export_constant(EF_JUMPBODY1);
+ export_constant(EF_ANIMATED_EMITTER);
+ export_constant(EF_RL_EXPLOSION);
+ export_constant(EF_C_MAKER_1);
+ export_constant(EF_QD_SHOT);
+ export_constant(EF_P_ALTER);
+ export_constant(EF_S_STORM);
+ export_constant(EF_MUSIC_HAT);
+ export_constant(EF_CLOUD_KILL);
+ export_constant(EF_ESCAPE);
+ export_constant(EF_XENO_SLASHER);
+ export_constant(EF_FLOWERSMOKE);
+ export_constant(EF_FSTONE);
+ export_constant(EF_QSCARABA);
+ export_constant(EF_LJOSALFAR);
+ export_constant(EF_HAPPINESSSTAR);
+ export_constant(EF_POWER_OF_GAIA);
+ export_constant(EF_MAPLE_FALLS);
+ export_constant(EF_MARKING_USE_CHANGEMONSTER);
+ export_constant(EF_MAGICAL_FEATHER);
+ export_constant(EF_MERMAID_LONGING);
+ export_constant(EF_GIFT_OF_SNOW);
+ export_constant(EF_ACH_COMPLETE);
+ export_constant(EF_TIME_ACCESSORY);
+ export_constant(EF_SPRITEMABLE);
+ export_constant(EF_TUNAPARTY);
+
+ /* hat effects */
+ export_constant(HAT_EF_BLOSSOM_FLUTTERING);
+ export_constant(HAT_EF_MERMAID_LONGING);
+ export_constant(HAT_EF_RL_BANISHING_BUSTER);
+ export_constant(HAT_EF_LJOSALFAR);
+ export_constant(HAT_EF_CLOCKING);
+ export_constant(HAT_EF_SNOW);
+ export_constant(HAT_EF_MAKEBLUR);
+ export_constant(HAT_EF_SLEEPATTACK);
+ export_constant(HAT_EF_GUMGANG);
+ export_constant(HAT_EF_TALK_FROSTJOKE);
+ export_constant(HAT_EF_DEMONSTRATION);
+ export_constant(HAT_EF_FLUTTER_BUTTERFLY);
+ export_constant(HAT_EF_ANGEL_FLUTTERING);
+ export_constant(HAT_EF_BLESSING_OF_ANGELS);
+ export_constant(HAT_EF_ELECTRIC);
+ export_constant(HAT_EF_GREEN_FLOOR);
+ export_constant(HAT_EF_SHRINK);
+ export_constant(HAT_EF_VALHALLA_IDOL);
+ export_constant(HAT_EF_ANGEL_STAIRS);
+ export_constant(HAT_EF_GLOW_OF_NEW_YEAR);
+ export_constant(HAT_EF_BOTTOM_FORTUNEKISS);
+ export_constant(HAT_EF_PINKBODY);
+ export_constant(HAT_EF_DOUBLEGUMGANG);
+ export_constant(HAT_EF_GIANTBODY);
+ export_constant(HAT_EF_GREEN99_6);
+ export_constant(HAT_EF_CIRCLEPOWER);
+ export_constant(HAT_EF_BOTTOM_BLOODYLUST);
+ export_constant(HAT_EF_WATER_BELOW);
+ export_constant(HAT_EF_LEVEL99_150);
+ export_constant(HAT_EF_YELLOWFLY3);
+ export_constant(HAT_EF_KAGEMUSYA);
+ export_constant(HAT_EF_CHERRYBLOSSOM);
+ export_constant(HAT_EF_STRANGELIGHTS);
+ export_constant(HAT_EF_WL_TELEKINESIS_INTENSE);
+ export_constant(HAT_EF_AB_OFFERTORIUM_RING);
+ export_constant(HAT_EF_WHITEBODY2);
+ export_constant(HAT_EF_SAKURA);
+ export_constant(HAT_EF_CLOUD2);
+ export_constant(HAT_EF_FEATHER_FLUTTERING);
+ export_constant(HAT_EF_CAMELLIA_HAIR_PIN);
+ export_constant(HAT_EF_JP_EV_EFFECT01);
+ export_constant(HAT_EF_JP_EV_EFFECT02);
+ export_constant(HAT_EF_JP_EV_EFFECT03);
+ export_constant(HAT_EF_FLORAL_WALTZ);
+ export_constant(HAT_EF_MAGICAL_FEATHER);
+ export_constant(HAT_EF_HAT_EFFECT);
+ export_constant(HAT_EF_BAKURETSU_HADOU);
+ export_constant(HAT_EF_GOLD_SHOWER);
+ export_constant(HAT_EF_WHITEBODY);
+ export_constant(HAT_EF_WATER_BELOW2);
+ export_constant(HAT_EF_FIREWORK);
+ export_constant(HAT_EF_RETURN_TW_1ST_HAT);
+ export_constant(HAT_EF_C_FLUTTERBUTTERFLY_BL);
+ export_constant(HAT_EF_QSCARABA);
+ export_constant(HAT_EF_FSTONE);
+ export_constant(HAT_EF_MAGICCIRCLE);
+ export_constant(HAT_EF_GODCLASS);
+ export_constant(HAT_EF_GODCLASS2);
+ export_constant(HAT_EF_LEVEL99_RED);
+ export_constant(HAT_EF_LEVEL99_ULTRAMARINE);
+ export_constant(HAT_EF_LEVEL99_CYAN);
+ export_constant(HAT_EF_LEVEL99_LIME);
+ export_constant(HAT_EF_LEVEL99_VIOLET);
+ export_constant(HAT_EF_LEVEL99_LILAC);
+ export_constant(HAT_EF_LEVEL99_SUN_ORANGE);
+ export_constant(HAT_EF_LEVEL99_DEEP_PINK);
+ export_constant(HAT_EF_LEVEL99_BLACK);
+ export_constant(HAT_EF_LEVEL99_WHITE);
+ export_constant(HAT_EF_LEVEL160_RED);
+ export_constant(HAT_EF_LEVEL160_ULTRAMARINE);
+ export_constant(HAT_EF_LEVEL160_CYAN);
+ export_constant(HAT_EF_LEVEL160_LIME);
+ export_constant(HAT_EF_LEVEL160_VIOLET);
+ export_constant(HAT_EF_LEVEL160_LILAC);
+ export_constant(HAT_EF_LEVEL160_SUN_ORANGE);
+ export_constant(HAT_EF_LEVEL160_DEEP_PINK);
+ export_constant(HAT_EF_LEVEL160_BLACK);
+ export_constant(HAT_EF_LEVEL160_WHITE);
+ export_constant(HAT_EF_FULL_BLOOMCHERRY_TREE);
+
+ /* pet catch */
+ export_constant(PET_CATCH_UNIVERSAL);
+ export_constant(PET_CATCH_UNIVERSAL_ITEM);
+
+ /* monster modes */
+ export_constant(MD_NONE);
+ export_constant(MD_CANMOVE);
+ export_constant(MD_LOOTER);
+ export_constant(MD_AGGRESSIVE);
+ export_constant(MD_ASSIST);
+ export_constant(MD_CASTSENSOR_IDLE);
+ export_constant(MD_NORANDOM_WALK);
+ export_constant(MD_NOCAST_SKILL);
+ export_constant(MD_CANATTACK);
+ export_constant(MD_CASTSENSOR_CHASE);
+ export_constant(MD_CHANGECHASE);
+ export_constant(MD_ANGRY);
+ export_constant(MD_CHANGETARGET_MELEE);
+ export_constant(MD_CHANGETARGET_CHASE);
+ export_constant(MD_TARGETWEAK);
+ export_constant(MD_RANDOMTARGET);
+ export_constant(MD_IGNOREMELEE);
+ export_constant(MD_IGNOREMAGIC);
+ export_constant(MD_IGNORERANGED);
+ export_constant(MD_MVP);
+ export_constant(MD_IGNOREMISC);
+ export_constant(MD_KNOCKBACK_IMMUNE);
+ export_constant(MD_TELEPORT_BLOCK);
+ export_constant(MD_FIXED_ITEMDROP);
+ export_constant(MD_DETECTOR);
+ export_constant(MD_STATUS_IMMUNE);
+ export_constant(MD_SKILL_IMMUNE);
+
#undef export_constant
#undef export_constant2
#undef export_parameter
+ #undef export_constant_offset
-#endif /* _SCRIPT_CONSTANTS_H_ */
+#endif /* _SCRIPT_CONSTANTS_HPP_ */
diff --git a/src/map/searchstore.c b/src/map/searchstore.cpp
similarity index 98%
rename from src/map/searchstore.c
rename to src/map/searchstore.cpp
index 183ce8f5656..0ba554af8a6 100644
--- a/src/map/searchstore.c
+++ b/src/map/searchstore.cpp
@@ -1,14 +1,16 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "searchstore.hpp" // struct s_search_store_info
+
#include "../common/cbasetypes.h"
#include "../common/malloc.h" // aMalloc, aRealloc, aFree
#include "../common/showmsg.h" // ShowError, ShowWarning
#include "../common/strlib.h" // safestrncpy
-#include "battle.h" // battle_config.*
-#include "clif.h" // clif_open_search_store_info, clif_search_store_info_*
-#include "pc.h" // struct map_session_data
-#include "searchstore.h" // struct s_search_store_info
+
+#include "battle.hpp" // battle_config.*
+#include "clif.hpp" // clif_open_search_store_info, clif_search_store_info_*
+#include "pc.hpp" // struct map_session_data
/// Failure constants for clif functions
enum e_searchstore_failure
@@ -185,7 +187,7 @@ void searchstore_query(struct map_session_data* sd, unsigned char type, unsigned
}
if( max_price < min_price )
- swap(min_price, max_price);
+ SWAP(min_price, max_price);
sd->searchstore.uses--;
sd->searchstore.type = type;
diff --git a/src/map/searchstore.h b/src/map/searchstore.hpp
similarity index 92%
rename from src/map/searchstore.h
rename to src/map/searchstore.hpp
index faf90ebc46c..c52b8820d50 100644
--- a/src/map/searchstore.h
+++ b/src/map/searchstore.hpp
@@ -1,12 +1,13 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _SEARCHSTORE_H_
-#define _SEARCHSTORE_H_
+#ifndef _SEARCHSTORE_HPP_
+#define _SEARCHSTORE_HPP_
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "../common/cbasetypes.h"
+#include "../common/mmo.h"
+
+#include "map.hpp"
#define SEARCHSTORE_RESULTS_PER_PAGE 10
@@ -55,8 +56,4 @@ bool searchstore_queryremote(struct map_session_data* sd, uint32 account_id);
void searchstore_clearremote(struct map_session_data* sd);
bool searchstore_result(struct map_session_data* sd, int store_id, uint32 account_id, const char* store_name, unsigned short nameid, unsigned short amount, unsigned int price, const unsigned short* card, unsigned char refine);
-#ifdef __cplusplus
-}
-#endif
-
-#endif // _SEARCHSTORE_H_
+#endif /* _SEARCHSTORE_HPP_ */
diff --git a/src/map/server/CMakeLists.txt b/src/map/server/CMakeLists.txt
deleted file mode 100644
index d1270f3673a..00000000000
--- a/src/map/server/CMakeLists.txt
+++ /dev/null
@@ -1,116 +0,0 @@
-
-#
-# map server
-#
-if( BUILD_SERVERS )
-message( STATUS "Creating target map-server" )
-set( MAP_HEADERS
- "${SERVER_MAP_SOURCE_DIR}/atcommand.h"
- "${SERVER_MAP_SOURCE_DIR}/battle.h"
- "${SERVER_MAP_SOURCE_DIR}/battleground.h"
- "${SERVER_MAP_SOURCE_DIR}/buyingstore.h"
- "${SERVER_MAP_SOURCE_DIR}/chat.h"
- "${SERVER_MAP_SOURCE_DIR}/chrif.h"
- "${SERVER_MAP_SOURCE_DIR}/clif.h"
- "${SERVER_MAP_SOURCE_DIR}/date.h"
- "${SERVER_MAP_SOURCE_DIR}/duel.h"
- "${SERVER_MAP_SOURCE_DIR}/elemental.h"
- "${SERVER_MAP_SOURCE_DIR}/guild.h"
- "${SERVER_MAP_SOURCE_DIR}/homunculus.h"
- "${SERVER_MAP_SOURCE_DIR}/instance.h"
- "${SERVER_MAP_SOURCE_DIR}/intif.h"
- "${SERVER_MAP_SOURCE_DIR}/itemdb.h"
- "${SERVER_MAP_SOURCE_DIR}/log.h"
- "${SERVER_MAP_SOURCE_DIR}/mail.h"
- "${SERVER_MAP_SOURCE_DIR}/map.h"
- "${SERVER_MAP_SOURCE_DIR}/mapreg.h"
- "${SERVER_MAP_SOURCE_DIR}/mercenary.h"
- "${SERVER_MAP_SOURCE_DIR}/mob.h"
- "${SERVER_MAP_SOURCE_DIR}/npc.h"
- "${SERVER_MAP_SOURCE_DIR}/party.h"
- "${SERVER_MAP_SOURCE_DIR}/path.h"
- "${SERVER_MAP_SOURCE_DIR}/pc.h"
- "${SERVER_MAP_SOURCE_DIR}/pc_groups.h"
- "${SERVER_MAP_SOURCE_DIR}/pet.h"
- "${SERVER_MAP_SOURCE_DIR}/quest.h"
- "${SERVER_MAP_SOURCE_DIR}/script.h"
- "${SERVER_MAP_SOURCE_DIR}/searchstore.h"
- "${SERVER_MAP_SOURCE_DIR}/skill.h"
- "${SERVER_MAP_SOURCE_DIR}/status.h"
- "${SERVER_MAP_SOURCE_DIR}/storage.h"
- "${SERVER_MAP_SOURCE_DIR}/trade.h"
- "${SERVER_MAP_SOURCE_DIR}/unit.h"
- "${SERVER_MAP_SOURCE_DIR}/vending.h"
- "${SERVER_MAP_SOURCE_DIR}/cashshop.h"
- "${SERVER_MAP_SOURCE_DIR}/channel.h"
- )
-set( MAP_SOURCES
- "${SERVER_MAP_SOURCE_DIR}/atcommand.c"
- "${SERVER_MAP_SOURCE_DIR}/battle.c"
- "${SERVER_MAP_SOURCE_DIR}/battleground.c"
- "${SERVER_MAP_SOURCE_DIR}/buyingstore.c"
- "${SERVER_MAP_SOURCE_DIR}/chat.c"
- "${SERVER_MAP_SOURCE_DIR}/chrif.c"
- "${SERVER_MAP_SOURCE_DIR}/clif.c"
- "${SERVER_MAP_SOURCE_DIR}/date.c"
- "${SERVER_MAP_SOURCE_DIR}/duel.c"
- "${SERVER_MAP_SOURCE_DIR}/elemental.c"
- "${SERVER_MAP_SOURCE_DIR}/guild.c"
- "${SERVER_MAP_SOURCE_DIR}/homunculus.c"
- "${SERVER_MAP_SOURCE_DIR}/instance.c"
- "${SERVER_MAP_SOURCE_DIR}/intif.c"
- "${SERVER_MAP_SOURCE_DIR}/itemdb.c"
- "${SERVER_MAP_SOURCE_DIR}/log.c"
- "${SERVER_MAP_SOURCE_DIR}/mail.c"
- "${SERVER_MAP_SOURCE_DIR}/map.c"
- "${SERVER_MAP_SOURCE_DIR}/mapreg.c"
- "${SERVER_MAP_SOURCE_DIR}/mercenary.c"
- "${SERVER_MAP_SOURCE_DIR}/mob.c"
- "${SERVER_MAP_SOURCE_DIR}/npc.c"
- "${SERVER_MAP_SOURCE_DIR}/npc_chat.c"
- "${SERVER_MAP_SOURCE_DIR}/party.c"
- "${SERVER_MAP_SOURCE_DIR}/path.c"
- "${SERVER_MAP_SOURCE_DIR}/pc.c"
- "${SERVER_MAP_SOURCE_DIR}/pc_groups.c"
- "${SERVER_MAP_SOURCE_DIR}/pet.c"
- "${SERVER_MAP_SOURCE_DIR}/quest.c"
- "${SERVER_MAP_SOURCE_DIR}/script.c"
- "${SERVER_MAP_SOURCE_DIR}/searchstore.c"
- "${SERVER_MAP_SOURCE_DIR}/skill.c"
- "${SERVER_MAP_SOURCE_DIR}/status.c"
- "${SERVER_MAP_SOURCE_DIR}/storage.c"
- "${SERVER_MAP_SOURCE_DIR}/trade.c"
- "${SERVER_MAP_SOURCE_DIR}/unit.c"
- "${SERVER_MAP_SOURCE_DIR}/vending.c"
- "${SERVER_MAP_SOURCE_DIR}/cashshop.c"
- "${SERVER_MAP_SOURCE_DIR}/channel.c"
- )
-set( DEPENDENCIES common )
-set( LIBRARIES ${GLOBAL_LIBRARIES} )
-set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${COMMON_BASE_INCLUDE_DIRS} )
-set( DEFINITIONS "${GLOBAL_DEFINITIONS} ${COMMON_BASE_DEFINITIONS}" )
-if( WITH_PCRE )
- message( STATUS "Enabled PCRE code" )
- set( LIBRARIES ${LIBRARIES} ${PCRE_LIBRARIES} )
- set( INCLUDE_DIRS ${INCLUDE_DIRS} ${PCRE_INCLUDE_DIRS} )
- set( DEFINITIONS "${DEFINITIONS} -DPCRE_SUPPORT" )
-else()
- message( STATUS "Disabled PCRE code" )
-endif()
-set( SOURCE_FILES ${COMMON_BASE_HEADERS} ${COMMON_HEADERS} ${MAP_HEADERS} ${MAP_SOURCES} )
-source_group( common FILES ${COMMON_BASE_HEADERS} ${COMMON_HEADERS} )
-source_group( map FILES ${MAP_HEADERS} ${MAP_SOURCES} )
-include_directories( ${INCLUDE_DIRS} )
-add_executable( map-server ${SOURCE_FILES} )
-add_dependencies( map-server ${DEPENDENCIES} )
-target_link_libraries( map-server ${LIBRARIES} ${DEPENDENCIES} )
-set_target_properties( map-server PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" )
-if( INSTALL_COMPONENT_RUNTIME )
- cpack_add_component( Runtime_mapserver DESCRIPTION "map-server" DISPLAY_NAME "map-server" GROUP Runtime )
- install( TARGETS map-server
- DESTINATION "."
- COMPONENT Runtime_mapserver )
-endif( INSTALL_COMPONENT_RUNTIME )
-set( TARGET_LIST ${TARGET_LIST} map-server CACHE INTERNAL "" )
-message( STATUS "Creating target map-server - done" )
-endif( BUILD_SERVERS )
diff --git a/src/map/skill.c b/src/map/skill.cpp
similarity index 96%
rename from src/map/skill.c
rename to src/map/skill.cpp
index b2633efec58..1f5584f3620 100755
--- a/src/map/skill.c
+++ b/src/map/skill.cpp
@@ -1,6 +1,14 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "skill.hpp"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <math.h>
+
#include "../common/cbasetypes.h"
#include "../common/timer.h"
#include "../common/nullpo.h"
@@ -11,35 +19,30 @@
#include "../common/utils.h"
#include "../common/ers.h"
-#include "map.h"
-#include "path.h"
-#include "clif.h"
-#include "pc.h"
-#include "status.h"
-#include "skill.h"
-#include "pet.h"
-#include "homunculus.h"
-#include "mercenary.h"
-#include "elemental.h"
-#include "mob.h"
-#include "npc.h"
-#include "battle.h"
-#include "battleground.h"
-#include "party.h"
-#include "itemdb.h"
-#include "script.h"
-#include "intif.h"
-#include "log.h"
-#include "chrif.h"
-#include "guild.h"
-#include "date.h"
-#include "unit.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <math.h>
+#include "map.hpp"
+#include "path.hpp"
+#include "clif.hpp"
+#include "pc.hpp"
+#include "status.hpp"
+#include "pet.hpp"
+#include "homunculus.hpp"
+#include "mercenary.hpp"
+#include "elemental.hpp"
+#include "mob.hpp"
+#include "npc.hpp"
+#include "battle.hpp"
+#include "battleground.hpp"
+#include "party.hpp"
+#include "itemdb.hpp"
+#include "script.hpp"
+#include "intif.hpp"
+#include "log.hpp"
+#include "chrif.hpp"
+#include "guild.hpp"
+#include "date.hpp"
+#include "unit.hpp"
+#include "achievement.hpp"
+#include "pc_groups.hpp"
#define SKILLUNITTIMER_INTERVAL 100
#define TIMERSKILL_INTERVAL 150
@@ -239,7 +242,7 @@ static void skill_chk2(int *idx) {
#define skill_get3(id,x,var) { skill_chk(&id); if (!id) return 0; skill_chk2(&x); return var; }
// Skill DB
-enum e_damage_type skill_get_hit( uint16 skill_id ) { skill_get (skill_id, skill_db[skill_id]->hit); }
+enum e_damage_type skill_get_hit( uint16 skill_id ) { skill_chk(&skill_id); if (!skill_id) return DMG_NORMAL; return static_cast<e_damage_type>(skill_db[skill_id]->hit); }
int skill_get_inf( uint16 skill_id ) { skill_get (skill_id, skill_db[skill_id]->inf); }
int skill_get_ele( uint16 skill_id , uint16 skill_lv ) { skill_get2 (skill_id, skill_lv, skill_db[skill_id]->element); }
int skill_get_nk( uint16 skill_id ) { skill_get (skill_id, skill_db[skill_id]->nk); }
@@ -421,21 +424,24 @@ unsigned short skill_dummy2skill_id(unsigned short skill_id) {
return RL_R_TRIP;
case NPC_MAXPAIN_ATK:
return NPC_MAXPAIN;
+ case SU_SV_ROOTTWIST_ATK:
+ return SU_SV_ROOTTWIST;
}
return skill_id;
}
/**
* Calculates heal value of skill's effect
- * @param src
- * @param target
- * @param skill_id
- * @param skill_lv
- * @param heal
+ * @param src: Unit casting heal
+ * @param target: Target of src
+ * @param skill_id: Skill ID used
+ * @param skill_lv: Skill Level used
+ * @param heal: True if it's the heal part or false if it's the damage part of the skill
* @return modified heal value
*/
int skill_calc_heal(struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, bool heal) {
- int skill, hp = 0;
+ int skill, hp = 0, hp_bonus = 0;
+ double global_bonus = 1;
struct map_session_data *sd = BL_CAST(BL_PC, src);
struct map_session_data *tsd = BL_CAST(BL_PC, target);
struct status_change *sc, *tsc;
@@ -460,8 +466,16 @@ int skill_calc_heal(struct block_list *src, struct block_list *target, uint16 sk
hp = (skill_lv > 6) ? 666 : skill_lv * 100;
break;
case AB_HIGHNESSHEAL:
- hp = ((status_get_lv(src) + status_get_int(src)) / 8) * (4 + ((sd ? pc_checkskill(sd,AL_HEAL) : 1) * 8));
- hp = (hp * (17 + 3 * skill_lv)) / 10;
+ hp = ((status_get_int(src) + status_get_lv(src)) / 5) * 30;
+
+ if (sd && ((skill = pc_checkskill(sd, HP_MEDITATIO)) > 0))
+ hp_bonus += skill * 2;
+ break;
+ case SU_FRESHSHRIMP:
+ hp = (status_get_lv(src) + status_get_int(src)) / 5 * 6;
+ break;
+ case SU_BUNCHOFSHRIMP:
+ hp = (status_get_lv(src) + status_get_int(src)) / 5 * 15;
break;
default:
if (skill_lv >= battle_config.max_heal_lv)
@@ -476,54 +490,45 @@ int skill_calc_heal(struct block_list *src, struct block_list *target, uint16 sk
hp = (status_get_lv(src) + status_get_int(src)) / 8 * (4 + (skill_lv * 8));
#endif
if( sd && ((skill = pc_checkskill(sd, HP_MEDITATIO)) > 0) )
- hp += hp * skill * 2 / 100;
- else if( src->type == BL_HOM && (skill = hom_checkskill(((TBL_HOM*)src), HLIF_BRAIN)) > 0 )
- hp += hp * skill * 2 / 100;
+ hp_bonus += skill * 2;
+ else if (src->type == BL_HOM && (skill = hom_checkskill(((TBL_HOM*)src), HLIF_BRAIN)) > 0)
+ hp_bonus += skill * 2;
if( sd && tsd && sd->status.partner_id == tsd->status.char_id && (sd->class_&MAPID_UPPERMASK) == MAPID_SUPER_NOVICE && sd->status.sex == 0 )
hp *= 2;
- if (sd && ((skill = pc_checkskill(sd, SU_POWEROFSEA)) > 0)) {
- hp += hp * 10 / 100;
- if (pc_checkskill(sd, SU_TUNABELLY) == 5 && pc_checkskill(sd, SU_TUNAPARTY) == 5 && pc_checkskill(sd, SU_BUNCHOFSHRIMP) == 5 && pc_checkskill(sd, SU_FRESHSHRIMP) == 5)
- hp += hp * 20 / 100;
- }
break;
}
if( (!heal || (target && target->type == BL_MER)) && skill_id != NPC_EVILLAND )
hp >>= 1;
+ if (sd && ((skill = pc_checkskill(sd, SU_POWEROFSEA)) > 0)) {
+ hp_bonus += 10;
+
+ if (pc_checkskill(sd, SU_TUNABELLY) == 5 && pc_checkskill(sd, SU_TUNAPARTY) == 5 && pc_checkskill(sd, SU_BUNCHOFSHRIMP) == 5 && pc_checkskill(sd, SU_FRESHSHRIMP) == 5)
+ hp_bonus += 20;
+ }
+
if( sd && (skill = pc_skillheal_bonus(sd, skill_id)) )
- hp += hp * skill / 100;
+ hp_bonus += skill;
if( tsd && (skill = pc_skillheal2_bonus(tsd, skill_id)) )
- hp += hp * skill / 100;
+ hp_bonus += skill;
+
+ if( sc && sc->data[SC_OFFERTORIUM] && (skill_id == AB_HIGHNESSHEAL || skill_id == AB_CHEAL || skill_id == PR_SANCTUARY || skill_id == AL_HEAL) )
+ hp_bonus += sc->data[SC_OFFERTORIUM]->val2;
- if( sc && sc->data[SC_OFFERTORIUM] && (skill_id == AB_HIGHNESSHEAL || skill_id == AB_CHEAL ||
- skill_id == PR_SANCTUARY || skill_id == AL_HEAL) )
- hp += hp * sc->data[SC_OFFERTORIUM]->val2 / 100;
if (tsc && tsc->count) {
if (skill_id != NPC_EVILLAND && skill_id != BA_APPLEIDUN) {
if (tsc->data[SC_INCHEALRATE])
- hp += hp * tsc->data[SC_INCHEALRATE]->val1 / 100; //Only affects Heal, Sanctuary and PotionPitcher.(like bHealPower) [Inkfish]
+ hp_bonus += tsc->data[SC_INCHEALRATE]->val1; //Only affects Heal, Sanctuary and PotionPitcher.(like bHealPower) [Inkfish]
if (tsc->data[SC_EXTRACT_WHITE_POTION_Z])
- hp += hp * tsc->data[SC_EXTRACT_WHITE_POTION_Z]->val1 / 100;
- if (tsc->data[SC_WATER_INSIGNIA] && tsc->data[SC_WATER_INSIGNIA]->val1 == 2)
- hp += hp / 10;
- }
- if (heal) {
- uint8 penalty = 0;
-
- if (tsc->data[SC_CRITICALWOUND])
- penalty += tsc->data[SC_CRITICALWOUND]->val2;
- if (tsc->data[SC_DEATHHURT])
- penalty += 20;
- if (tsc->data[SC_NORECOVER_STATE])
- penalty = 100;
- if (penalty > 0)
- hp -= hp * penalty / 100;
+ hp_bonus += tsc->data[SC_EXTRACT_WHITE_POTION_Z]->val1;
}
}
+ if (hp_bonus)
+ hp += hp * hp_bonus / 100;
+
#ifdef RENEWAL
// MATK part of the RE heal formula [malufett]
// Note: in this part matk bonuses from items or skills are not applied
@@ -561,7 +566,36 @@ int skill_calc_heal(struct block_list *src, struct block_list *target, uint16 sk
}
}
#endif
- return hp;
+
+ // Global multipliers are applied after the MATK is applied
+ if (tsc && tsc->count) {
+ if (skill_id != NPC_EVILLAND && skill_id != BA_APPLEIDUN) {
+ if (tsc->data[SC_WATER_INSIGNIA] && tsc->data[SC_WATER_INSIGNIA]->val1 == 2)
+ global_bonus *= 1.1f;
+ }
+ }
+
+ if (skill_id == AB_HIGHNESSHEAL)
+ global_bonus *= 2 + 0.3f * (skill_lv - 1);
+
+ if (heal && tsc && tsc->count) {
+ uint8 penalty = 0;
+
+ if (tsc->data[SC_CRITICALWOUND])
+ penalty += tsc->data[SC_CRITICALWOUND]->val2;
+ if (tsc->data[SC_DEATHHURT])
+ penalty += 20;
+ if (tsc->data[SC_NORECOVER_STATE])
+ penalty = 100;
+ if (penalty > 0) {
+ penalty = cap_value(penalty, 1, 100);
+ global_bonus *= (100 - penalty) / 100.f;
+ }
+ }
+
+ hp = (int)(hp * global_bonus);
+
+ return (heal) ? max(1, hp) : hp;
}
/**
@@ -683,6 +717,7 @@ bool skill_isNotOk(uint16 skill_id, struct map_session_data *sd)
case SC_FATALMENACE:
case SC_DIMENSIONDOOR:
case ALL_ODINS_RECALL:
+ case WE_CALLALLFAMILY:
if(map[m].flag.noteleport) {
clif_skill_teleportmessage(sd,0);
return true;
@@ -931,7 +966,7 @@ bool skill_isNotOk_npcRange(struct block_list *src, uint16 skill_id, uint16 skil
if (pos_x <= 0) pos_x = src->x;
if (pos_y <= 0) pos_y = src->y;
- return skill_check_unit_range2(src,pos_x,pos_y,skill_id,skill_lv,true);
+ return skill_check_unit_range2(src,pos_x,pos_y,skill_id,skill_lv,true) != 0;
}
struct s_skill_unit_layout *skill_get_unit_layout(uint16 skill_id, uint16 skill_lv, struct block_list* src, int x, int y)
@@ -1003,7 +1038,6 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1
enum sc_type status;
int skill;
int rate;
- int chorusbonus = 0;
nullpo_ret(src);
nullpo_ret(bl);
@@ -1058,16 +1092,6 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1
//So if the target can't be inflicted with statuses, this is pointless.
return 0;
- // Minstrel/Wanderer number check for chorus skills.
- // Bonus remains 0 unless 3 or more Minstrels/Wanderers are in the party.
- if( sd && sd->status.party_id ) {
- chorusbonus = party_foreachsamemap(party_sub_count_class, sd, AREA_SIZE, MAPID_THIRDMASK, MAPID_MINSTRELWANDERER);
- if( chorusbonus > 7 )
- chorusbonus = 5; // Maximum effect possible from 7 or more Minstrels/Wanderers
- else if( chorusbonus > 2 )
- chorusbonus = chorusbonus - 2; // Effect bonus from additional Minstrels/Wanderers if not above the max possible.
- }
-
if( sd )
{ // These statuses would be applied anyway even if the damage was blocked by some skills. [Inkfish]
if( skill_id != WS_CARTTERMINATION && skill_id != AM_DEMONSTRATION && skill_id != CR_REFLECTSHIELD && skill_id != MS_REFLECTSHIELD && skill_id != ASC_BREAKER ) {
@@ -1119,7 +1143,7 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1
if( skill_id != sd->addeff_onskill[i].skill_id || !sd->addeff_onskill[i].rate )
continue;
type = sd->addeff_onskill[i].sc;
- time = sd->addeff[i].duration;
+ time = sd->addeff_onskill[i].duration;
if( sd->addeff_onskill[i].target&ATF_TARGET )
status_change_start(src,bl,type,sd->addeff_onskill[i].rate,7,0,0,0,time,SCSTART_NONE);
@@ -1130,7 +1154,7 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1
if (dmg_lv == ATK_BLOCK && skill_id == AM_ACIDTERROR) {
sc_start2(src,bl,SC_BLEEDING,(skill_lv*3),skill_lv,src->id,skill_get_time2(skill_id,skill_lv));
if (skill_break_equip(src,bl, EQP_ARMOR, 100*skill_get_time(skill_id,skill_lv), BCT_ENEMY))
- clif_emotion(bl,E_OMG);
+ clif_emotion(bl,ET_HUK);
}
}
}
@@ -1299,7 +1323,7 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1
case AM_ACIDTERROR:
sc_start2(src,bl,SC_BLEEDING,(skill_lv*3),skill_lv,src->id,skill_get_time2(skill_id,skill_lv));
if (skill_break_equip(src,bl, EQP_ARMOR, 100*skill_get_time(skill_id,skill_lv), BCT_ENEMY))
- clif_emotion(bl,E_OMG);
+ clif_emotion(bl,ET_HUK);
break;
case AM_DEMONSTRATION:
@@ -1397,8 +1421,15 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1
skill_break_equip(src,bl, EQP_SHIELD, 150*skill_lv, BCT_ENEMY);
break;
- case CH_TIGERFIST:
- sc_start(src,bl,SC_STOP,(10+skill_lv*10),0,skill_get_time2(skill_id,skill_lv));
+ case CH_TIGERFIST: {
+ uint16 basetime = skill_get_time(skill_id, skill_lv);
+ uint16 mintime = 30 * (status_get_lv(src) + 100);
+
+ if (status_get_class_(bl) == CLASS_BOSS)
+ basetime /= 5;
+ basetime = min((basetime * status_get_agi(bl)) / -200 + basetime, mintime) / 2;
+ sc_start(src, bl, SC_STOP, (1 + skill_lv) * 10, 0, basetime);
+ }
break;
case LK_SPIRALPIERCE:
@@ -1489,9 +1520,8 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1
sc_start(src,bl,SC_FLING,100, sd?sd->spiritball_old:5,skill_get_time(skill_id,skill_lv));
break;
case GS_DISARM:
- rate = 3*skill_lv;
- if (sstatus->dex > tstatus->dex)
- rate += (sstatus->dex - tstatus->dex)/5; //TODO: Made up formula
+ rate = sstatus->dex / (4 * (7 - skill_lv)) + sstatus->luk / (4 * (6 - skill_lv));
+ rate = rate + status_get_lv(src) - (tstatus->agi * rate / 100) - tstatus->luk - status_get_lv(bl);
skill_strip_equip(src,bl, EQP_WEAPON, rate, skill_lv, skill_get_time(skill_id,skill_lv));
clif_skill_nodamage(src,bl,skill_id,skill_lv,1);
break;
@@ -1647,6 +1677,7 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1
break;
case SR_EARTHSHAKER:
sc_start(src,bl,SC_STUN, 25 + 5 * skill_lv,skill_lv,skill_get_time(skill_id,skill_lv));
+ status_change_end(bl, SC_SV_ROOTTWIST, INVALID_TIMER);
break;
case SR_HOWLINGOFLION:
sc_start(src,bl, SC_FEAR, 5 + 5 * skill_lv, skill_lv, skill_get_time(skill_id, skill_lv));
@@ -1658,7 +1689,7 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1
tsc->data[SC_GLOOMYDAY] || tsc->data[SC_GLOOMYDAY_SK] || tsc->data[SC_SONGOFMANA] ||
tsc->data[SC_DANCEWITHWUG] || tsc->data[SC_SATURDAYNIGHTFEVER] || tsc->data[SC_LERADSDEW] ||
tsc->data[SC_MELODYOFSINK] || tsc->data[SC_BEYONDOFWARCRY] || tsc->data[SC_UNLIMITEDHUMMINGVOICE] ) &&
- rnd()%100 < 4 * skill_lv + 2 * ((sd) ? pc_checkskill(sd, WM_LESSON) : skill_get_max(WM_LESSON)) + 10 * chorusbonus) {
+ rnd()%100 < 4 * skill_lv + 2 * ((sd) ? pc_checkskill(sd, WM_LESSON) : skill_get_max(WM_LESSON)) + 10 * battle_calc_chorusbonus(sd)) {
status_change_start(src, bl, SC_STUN, 10000, skill_lv, 0, 0, 0, skill_get_time(skill_id,skill_lv), SCSTART_NOTICKDEF);
status_change_end(bl, SC_DANCING, INVALID_TIMER);
status_change_end(bl, SC_RICHMANKIM, INVALID_TIMER);
@@ -1783,29 +1814,22 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1
case MH_XENO_SLASHER:
sc_start4(src, bl, SC_BLEEDING, skill_lv, skill_lv, src->id, 0, 0, skill_get_time2(skill_id, skill_lv));
break;
- case WL_HELLINFERNO:
- sc_start4(src,bl,SC_BURNING,55+5*skill_lv,skill_lv,1000,src->id,0,skill_get_time(skill_id,skill_lv));
- break;
case NC_MAGMA_ERUPTION:
if (attack_type&BF_WEAPON) // Stun effect from 'slam'
sc_start(src, bl, SC_STUN, 90, skill_lv, skill_get_time(skill_id, skill_lv));
if (attack_type&BF_MISC) // Burning effect from 'eruption'
sc_start4(src, bl, SC_BURNING, 10 * skill_lv, skill_lv, 1000, src->id, 0, skill_get_time2(skill_id, skill_lv));
break;
- case GC_DARKCROW:
- sc_start(src,bl,SC_DARKCROW,100,skill_lv,skill_get_time(skill_id,skill_lv));
- break;
case GN_ILLUSIONDOPING:
if( sc_start(src,bl,SC_ILLUSIONDOPING,100 - skill_lv * 10,skill_lv,skill_get_time(skill_id,skill_lv)) )
sc_start(src,bl,SC_HALLUCINATION,100,skill_lv,skill_get_time(skill_id,skill_lv));
break;
case RL_MASS_SPIRAL:
- sc_start2(src,bl,SC_BLEEDING,10 * skill_lv + rnd()%50,skill_lv,src->id,skill_get_time2(skill_id,skill_lv)); //(custom)
+ sc_start2(src,bl,SC_BLEEDING,30 + 10 * skill_lv,skill_lv,src->id,skill_get_time2(skill_id,skill_lv));
break;
case RL_SLUGSHOT:
- if (bl->type != BL_PC)
- sc_start(src,bl,SC_STUN,10 * skill_lv + rnd()%50,skill_lv,skill_get_time2(skill_id,skill_lv)); //(custom)
+ sc_start(src,bl,SC_STUN,100,skill_lv,skill_get_time2(skill_id,skill_lv));
break;
case RL_BANISHING_BUSTER: {
uint16 i, n = skill_lv;
@@ -1816,7 +1840,7 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1
if (status_isimmune(bl))
break;
- if (dstsd && (dstsd->class_&MAPID_UPPERMASK) == MAPID_SOUL_LINKER) {
+ if ((dstsd && (dstsd->class_&MAPID_UPPERMASK) == MAPID_SOUL_LINKER) || rnd()%100 >= 50 + 10 * skill_lv) {
if (sd)
clif_skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0);
break;
@@ -1868,7 +1892,7 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1
case SC_MOONSTAR: case SC_SUPER_STAR: case SC_ALL_RIDING:
case SC_MTF_ASPD: case SC_MTF_RANGEATK: case SC_MTF_MATK:
case SC_MTF_MLEATKED: case SC_MTF_CRIDAMAGE: case SC_HEAT_BARREL:
- case SC_HEAT_BARREL_AFTER: case SC_P_ALTER: case SC_E_CHAIN:
+ case SC_P_ALTER: case SC_E_CHAIN:
case SC_C_MARKER: case SC_B_TRAP: case SC_H_MINE:
case SC_STRANGELIGHTS: case SC_DECORATION_OF_MUSIC: case SC_GN_CARTBOOST:
case SC_RECOGNIZEDSPELL: case SC_CHASEWALK2: case SC_BITE:
@@ -1891,6 +1915,8 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1
case SC_CLAN_INFO: case SC_SWORDCLAN: case SC_ARCWANDCLAN:
case SC_GOLDENMACECLAN: case SC_CROSSBOWCLAN:
case SC_DAILYSENDMAILCNT:
+ case SC_WEDDING: case SC_XMAS: case SC_SUMMER:
+ case SC_DRESSUP: case SC_HANBOK: case SC_OKTOBERFEST:
continue;
case SC_WHISTLE: case SC_ASSNCROS: case SC_POEMBRAGI:
case SC_APPLEIDUN: case SC_HUMMING: case SC_DONTFORGETME:
@@ -1914,23 +1940,18 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1
}
break;
case RL_S_STORM:
- //kRO update 2014-02-12. Break 1 Equipment by minimum chance 5%/10%/15%/20%/25%
- {
- uint16 pos[] = { EQP_HEAD_LOW, EQP_HEAD_MID, EQP_HEAD_TOP, EQP_HAND_R, EQP_HAND_L, EQP_ARMOR, EQP_SHOES, EQP_GARMENT, EQP_ACC_L, EQP_ACC_R };
- skill_break_equip(src,bl,pos[rnd()%ARRAYLENGTH(pos)],
- max(skill_lv * 500,(sstatus->dex * skill_lv * 10) - (tstatus->agi * 20)), //(custom)
- BCT_ENEMY);
- }
+ //kRO update 2014-02-12. Break a headgear by minimum chance 5%/10%/15%/20%/25%
+ skill_break_equip(src, bl, EQP_HEAD_TOP, max(skill_lv * 500, (sstatus->dex * skill_lv * 10) - (tstatus->agi * 20)), BCT_ENEMY); //! TODO: Figure out break chance formula
break;
case RL_AM_BLAST:
- sc_start(src,bl,SC_ANTI_M_BLAST,10 * skill_lv + rnd()%50,skill_lv,skill_get_time2(skill_id,skill_lv)); //(custom)
+ sc_start(src,bl,SC_ANTI_M_BLAST,20 + 10 * skill_lv,skill_lv,skill_get_time2(skill_id,skill_lv));
break;
case RL_HAMMER_OF_GOD:
sc_start(src,bl,SC_STUN,100,skill_lv,skill_get_time2(skill_id,skill_lv));
status_change_end(bl, SC_C_MARKER, INVALID_TIMER);
break;
case SU_SCRATCH:
- sc_start2(src, bl, SC_BLEEDING, (skill_lv * 3), skill_lv, src->id, skill_get_time2(skill_id, skill_lv)); // TODO: What's the chance/time?
+ sc_start2(src, bl, SC_BLEEDING, skill_lv * 10 + 70, skill_lv, src->id, skill_get_time(skill_id, skill_lv));
break;
case SU_SV_STEMSPEAR:
sc_start2(src, bl, SC_BLEEDING, 10, skill_lv, src->id, skill_get_time2(skill_id, skill_lv));
@@ -1939,9 +1960,9 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1
if (skill_area_temp[3] == 1)
sc_start(src, bl, SC_CURSE, 20, skill_lv, skill_get_time2(skill_id, skill_lv));
break;
- //case SU_SCAROFTAROU:
- // sc_start(src, bl, SC_STUN, 10, skill_lv, skill_get_time2(skill_id, skill_lv)); // TODO: What's the chance/time?
- // break;
+ case SU_SCAROFTAROU:
+ sc_start(src, bl, SC_STUN, 10, skill_lv, skill_get_time2(skill_id, skill_lv)); //! TODO: What's the chance/time?
+ break;
case SU_LUNATICCARROTBEAT:
if (skill_area_temp[3] == 1)
sc_start(src, bl, SC_STUN, 20, skill_lv, skill_get_time2(skill_id, skill_lv));
@@ -1978,8 +1999,6 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1
rate = battle_config.equip_natural_break_rate;
if( sc )
{
- if(sc->data[SC_GIANTGROWTH])
- rate += 10;
if(sc->data[SC_OVERTHRUST])
rate += 10;
if(sc->data[SC_MAXOVERTHRUST])
@@ -2386,6 +2405,13 @@ int skill_counter_additional_effect (struct block_list* src, struct block_list *
}
}
+ if (dstsd && !status_isdead(bl) && !(skill_id && skill_get_nk(skill_id)&NK_NO_DAMAGE)) {
+ struct status_change *sc = status_get_sc(bl);
+
+ if (sc && sc->data[SC_DORAM_SVSP] && attack_type&(BF_MAGIC|BF_LONG))
+ skill_castend_damage_id(bl, src, SU_SV_STEMSPEAR, (pc_checkskill(dstsd, SU_SV_STEMSPEAR) ? pc_checkskill(dstsd, SU_SV_STEMSPEAR) : 1), tick, 0);
+ }
+
// Trigger counter-spells to retaliate against damage causing skills.
if(dstsd && !status_isdead(bl) && dstsd->autospell2[0].id &&
!(skill_id && skill_get_nk(skill_id)&NK_NO_DAMAGE))
@@ -2676,8 +2702,12 @@ short skill_blown(struct block_list* src, struct block_list* target, char count,
dy = -diry[dir];
}
- if (tsc && tsc->data[SC_SU_STOOP]) // Any knockback will cancel it.
- status_change_end(target, SC_SU_STOOP, INVALID_TIMER);
+ if (tsc) {
+ if (tsc->data[SC_SU_STOOP]) // Any knockback will cancel it.
+ status_change_end(target, SC_SU_STOOP, INVALID_TIMER);
+ if (tsc->data[SC_SV_ROOTTWIST]) // Shouldn't move.
+ return 0;
+ }
return unit_blown(target, dx, dy, count, flag); // Send over the proper flag
}
@@ -2710,10 +2740,14 @@ static int skill_magic_reflect(struct block_list* src, struct block_list* bl, in
return 0;
// Kaite reflection - Does not bypass Boss check
- if( sc->data[SC_KAITE] && (src->type == BL_PC || status_get_lv(src) <= 80) ) {
+ if( sc->data[SC_KAITE] && (src->type == BL_PC || status_get_lv(src) <= 80)
+#ifdef RENEWAL
+ && type // Does not reflect AoE
+#endif
+ ) {
// Kaite only works against non-players if they are low-level.
// Kyomu doesn't disable Kaite, but the "skill fail chance" part of Kyomu applies to it.
- clif_specialeffect(bl, 438, AREA);
+ clif_specialeffect(bl, EF_ATTACKENERGY2, AREA);
if( --sc->data[SC_KAITE]->val2 <= 0 )
status_change_end(bl, SC_KAITE, INVALID_TIMER);
return 2;
@@ -3032,14 +3066,14 @@ void skill_attack_blow(struct block_list *src, struct block_list *dsrc, struct b
switch( skill_id ) {
case LG_OVERBRAND_BRANDISH:
// Give knockback damage bonus only hits the wall. (bugreport:9096)
- if (skill_blown(dsrc,target,blewcount,dir,BLOWN_NO_KNOCKBACK_MAP|BLOWN_MD_KNOCKBACK_IMMUNE|BLOWN_TARGET_NO_KNOCKBACK|BLOWN_TARGET_BASILICA) < blewcount)
+ if (skill_blown(dsrc,target,blewcount,dir,(enum e_skill_blown)(BLOWN_NO_KNOCKBACK_MAP|BLOWN_MD_KNOCKBACK_IMMUNE|BLOWN_TARGET_NO_KNOCKBACK|BLOWN_TARGET_BASILICA)) < blewcount)
skill_addtimerskill(src, tick + status_get_amotion(src), target->id, 0, 0, LG_OVERBRAND_PLUSATK, skill_lv, BF_WEAPON, flag|SD_ANIMATION);
break;
case SR_KNUCKLEARROW:
// Ignore knockback damage bonus if in WOE (player cannot be knocked in WOE)
// Boss & Immune Knockback stay in place and don't get bonus damage
// Give knockback damage bonus only hits the wall. (bugreport:9096)
- if (skill_blown(dsrc, target, blewcount, dir_ka, BLOWN_IGNORE_NO_KNOCKBACK|BLOWN_NO_KNOCKBACK_MAP|BLOWN_MD_KNOCKBACK_IMMUNE|BLOWN_TARGET_NO_KNOCKBACK|BLOWN_TARGET_BASILICA) < blewcount)
+ if (skill_blown(dsrc, target, blewcount, dir_ka, (enum e_skill_blown)(BLOWN_IGNORE_NO_KNOCKBACK|BLOWN_NO_KNOCKBACK_MAP|BLOWN_MD_KNOCKBACK_IMMUNE|BLOWN_TARGET_NO_KNOCKBACK|BLOWN_TARGET_BASILICA)) < blewcount)
skill_addtimerskill(src, tick + 300 * ((flag&2) ? 1 : 2), target->id, 0, 0, skill_id, skill_lv, BF_WEAPON, flag|4);
dir_ka = -1;
break;
@@ -3047,10 +3081,6 @@ void skill_attack_blow(struct block_list *src, struct block_list *dsrc, struct b
if (skill_blown(dsrc,target,blewcount,dir,BLOWN_NONE) < blewcount)
skill_addtimerskill(src, tick + status_get_amotion(src), target->id, 0, 0, RL_R_TRIP_PLUSATK, skill_lv, BF_WEAPON, flag|SD_ANIMATION);
break;
- case RL_SLUGSHOT:
- skill_blown(dsrc,target,blewcount,dir, BLOWN_NONE);
- skill_addtimerskill(src, tick + status_get_amotion(src), target->id, 0, 0, skill_id, skill_lv, skill_get_type(skill_id), flag|SD_ANIMATION);
- break;
default:
skill_blown(dsrc,target,blewcount,dir, BLOWN_NONE);
if (!blewcount && target->type == BL_SKILL && damage > 0) {
@@ -3267,6 +3297,10 @@ int64 skill_attack (int attack_type, struct block_list* src, struct block_list *
dmg_type = (skill_id == 0) ? DMG_SPLASH : skill_get_hit(skill_id);
switch( skill_id ) {
+ case WL_HELLINFERNO:
+ if (dmg.dmg_lv == ATK_DEF && !(flag&ELE_DARK)) // Burning only starts if the fire attack successfully lands
+ sc_start4(src, bl, SC_BURNING, 55 + 5 * skill_lv, skill_lv, 1000, src->id, 0, skill_get_time(skill_id, skill_lv));
+ break;
case SC_TRIANGLESHOT:
if( rnd()%100 > (1 + skill_lv) )
dmg.blewcount = 0;
@@ -3386,6 +3420,7 @@ int64 skill_attack (int attack_type, struct block_list* src, struct block_list *
case KO_BAKURETSU:
case GN_CRAZYWEED_ATK:
case NC_MAGMA_ERUPTION:
+ case SU_SV_ROOTTWIST_ATK:
dmg.dmotion = clif_skill_damage(src,bl,tick,dmg.amotion,dmg.dmotion,damage,dmg.div_,skill_id,-1,DMG_SPLASH);
break;
case GN_FIRE_EXPANSION_ACID:
@@ -3400,10 +3435,6 @@ int64 skill_attack (int attack_type, struct block_list* src, struct block_list *
case WM_SEVERE_RAINSTORM_MELEE:
dmg.dmotion = clif_skill_damage(src,bl,tick,dmg.amotion,dmg.dmotion,damage,dmg.div_,WM_SEVERE_RAINSTORM,-2,DMG_SPLASH);
break;
- case WM_REVERBERATION_MELEE:
- case WM_REVERBERATION_MAGIC:
- dmg.dmotion = clif_skill_damage(src,bl,tick,dmg.amotion,dmg.dmotion,damage,dmg.div_,WM_REVERBERATION,-2,DMG_SKILL);
- break;
case SR_TIGERCANNON:
dmg.dmotion = clif_skill_damage(src, bl, tick, status_get_amotion(bl), dmg.dmotion, damage, dmg.div_, skill_id, skill_lv, DMG_SKILL);
break;
@@ -3426,9 +3457,7 @@ int64 skill_attack (int attack_type, struct block_list* src, struct block_list *
dmg.dmotion = clif_skill_damage(src, bl, tick, dmg.amotion, dmg.dmotion, damage, dmg.div_, skill_id, (flag&SD_LEVEL) ? -1 : skill_lv, DMG_SPLASH);
break;
case RL_R_TRIP_PLUSATK:
- case RL_BANISHING_BUSTER:
case RL_S_STORM:
- case RL_SLUGSHOT:
dmg.dmotion = clif_skill_damage(dsrc,bl,tick,status_get_amotion(src),dmg.dmotion,damage,dmg.div_,skill_id,-1,DMG_SPLASH);
break;
case AB_DUPLELIGHT_MELEE:
@@ -3541,8 +3570,12 @@ int64 skill_attack (int attack_type, struct block_list* src, struct block_list *
rate = rate + (status_get_lv(src) - status_get_lv(bl));
if(rnd()%100 < rate)
skill_addtimerskill(src,tick + 800,bl->id,0,0,skill_id,skill_lv,0,flag);
- } else if( skill_id == SC_FATALMENACE )
- skill_addtimerskill(src,tick + 800,bl->id,skill_area_temp[4],skill_area_temp[5],skill_id,skill_lv,0,flag);
+ } else if( skill_id == SC_FATALMENACE ) {
+ int16 x = skill_area_temp[4], y = skill_area_temp[5];
+
+ map_search_freecell(NULL, bl->m, &x, &y, 2, 2, 1);
+ skill_addtimerskill(bl,tick + 800,bl->id,x,y,skill_id,skill_lv,0,flag);
+ }
}
if(skill_id == CR_GRANDCROSS || skill_id == NPC_GRANDDARKNESS)
@@ -3933,8 +3966,8 @@ int skill_area_sub_count (struct block_list *src, struct block_list *target, uin
return 0;
{
struct status_change *tsc = status_get_sc(target);
- // Only counts marked target with SC_C_MARKER by caster
- if (!tsc || !tsc->data[SC_C_MARKER] || tsc->data[SC_C_MARKER]->val2 != src->id)
+ // Only counts marked target with SC_C_MARKER
+ if (!tsc || !tsc->data[SC_C_MARKER])
return 0;
}
break;
@@ -4076,18 +4109,18 @@ static int skill_timerskill(int tid, unsigned int tick, int id, intptr_t data)
}
break;
case WL_CHAINLIGHTNING_ATK: {
- skill_attack(BF_MAGIC,src,src,target,skl->skill_id,skl->skill_lv,tick,skl->flag); // Hit a Lightning on the current Target
skill_toggle_magicpower(src, skl->skill_id); // Only the first hit will be amplified
+ skill_attack(BF_MAGIC,src,src,target,skl->skill_id,skl->skill_lv,tick,9 - skl->type); // Hit a Lightning on the current Target
if( skl->type < (4 + skl->skill_lv - 1) && skl->x < 3 )
{ // Remaining Chains Hit
struct block_list *nbl = NULL; // Next Target of Chain
nbl = battle_getenemyarea(src, target->x, target->y, (skl->type>2)?2:3, // After 2 bounces, it will bounce to other targets in 7x7 range.
- BL_CHAR|BL_SKILL, target->id); // Search for a new Target around current one...
+ splash_target(src), target->id); // Search for a new Target around current one...
if( nbl == NULL )
skl->x++;
else
- skl->x = 0;
- skill_addtimerskill(src, tick + 651, (nbl?nbl:target)->id, skl->x, 0, WL_CHAINLIGHTNING_ATK, skl->skill_lv, skl->type + 1, skl->flag);
+ skl->x = 0;
+ skill_addtimerskill(src, tick + 650, (nbl?nbl:target)->id, skl->x, 0, WL_CHAINLIGHTNING_ATK, skl->skill_lv, skl->type + 1, 0);
}
}
break;
@@ -4111,7 +4144,7 @@ static int skill_timerskill(int tid, unsigned int tick, int id, intptr_t data)
}
if (j) {
i = applyeffects[rnd()%j];
- status_change_start(src, target, i, 10000, skl->skill_lv,
+ status_change_start(src, target, static_cast<sc_type>(i), 10000, skl->skill_lv,
(i == SC_BURNING ? 1000 : (i == SC_BLEEDING ? src->id : 0)),
(i == SC_BURNING ? src->id : 0), 0,
(i == SC_BURNING ? 15000 : (i == SC_FREEZING ? 40000 :
@@ -4122,16 +4155,10 @@ static int skill_timerskill(int tid, unsigned int tick, int id, intptr_t data)
break;
case WM_REVERBERATION_MELEE:
case WM_REVERBERATION_MAGIC:
- skill_castend_damage_id(src,target,skl->skill_id,skl->skill_lv,tick,skl->flag);
+ skill_castend_damage_id(src,target,skl->skill_id,skl->skill_lv,tick,skl->flag|SD_LEVEL|SD_ANIMATION);
break;
case SC_FATALMENACE:
- if( src == target ) // Casters Part
- unit_warp(src, -1, skl->x, skl->y, CLR_TELEPORT);
- else { // Target's Part
- short x = skl->x, y = skl->y;
- map_search_freecell(NULL, target->m, &x, &y, 2, 2, 1);
- unit_warp(target,-1,x,y,CLR_TELEPORT);
- }
+ unit_warp(src, -1, skl->x, skl->y, CLR_TELEPORT);
break;
case LG_MOONSLASHER:
case SR_WINDMILL:
@@ -4175,9 +4202,16 @@ static int skill_timerskill(int tid, unsigned int tick, int id, intptr_t data)
skill_castend_damage_id(src, target, skl->skill_id, pc_checkskill(((TBL_PC *)src), skl->skill_id), tick, 0);
}
break;
- case RL_SLUGSHOT:
- if (target->type == BL_PC)
- sc_start(src, target, SC_SITDOWN_FORCE, 100, skl->skill_lv, skill_get_time(skl->skill_id, skl->skill_lv));
+
+ case SU_SV_ROOTTWIST_ATK: {
+ struct status_change *tsc = status_get_sc(target);
+
+ if (tsc && tsc->data[SC_SV_ROOTTWIST]) {
+ if (check_distance_bl(src, target, 32)) // Only damage if caster is within 32x32 area
+ skill_attack(skl->type, src, target, target, skl->skill_id, skl->skill_lv, tick, skl->flag);
+ skill_addtimerskill(src, tick + 1000, target->id, 0, 0, skl->skill_id, skl->skill_lv, skl->type, skl->flag);
+ }
+ }
break;
default:
skill_attack(skl->type,src,src,target,skl->skill_id,skl->skill_lv,tick,skl->flag);
@@ -4209,25 +4243,11 @@ static int skill_timerskill(int tid, unsigned int tick, int id, intptr_t data)
case RL_FIRE_RAIN: {
int dummy = 1, i = skill_get_splash(skl->skill_id,skl->skill_lv);
- map_foreachinallarea(skill_cell_overlap,src->m,skl->x-i,skl->y-i,skl->x+i,skl->y+i,BL_SKILL,skl->skill_id,&dummy,src);
+ if (rnd() % 100 < (15 + 5 * skl->skill_lv))
+ map_foreachinallarea(skill_cell_overlap,src->m,skl->x-i,skl->y-i,skl->x+i,skl->y+i,BL_SKILL,skl->skill_id,&dummy,src);
skill_unitsetting(src,skl->skill_id,skl->skill_lv,skl->x,skl->y,0);
}
break;
- case RL_FALLEN_ANGEL:
- {
- struct map_session_data *sd = (src->type == BL_PC) ? map_id2sd(src->id): NULL;
- if (sd) {
- if (!skill_check_condition_castend(sd,GS_DESPERADO,skl->skill_lv))
- break;
- sd->state.autocast = 1;
- }
- skill_castend_pos2(src,skl->x,skl->y,GS_DESPERADO,skl->skill_lv,tick,skl->flag);
- if (sd) {
- battle_consume_ammo(sd,GS_DESPERADO,skl->skill_lv);
- sd->state.autocast = 0;
- }
- }
- break;
case NC_MAGMA_ERUPTION:
skill_unitsetting(src,skl->skill_id,skl->skill_lv,skl->x,skl->y,0);
break;
@@ -4650,8 +4670,8 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
case WM_GREAT_ECHO:
case GN_SLINGITEM_RANGEMELEEATK:
case KO_SETSUDAN:
- case GC_DARKCROW:
case RL_MASS_SPIRAL:
+ case RL_BANISHING_BUSTER:
case RL_SLUGSHOT:
case RL_AM_BLAST:
skill_attack(BF_WEAPON,src,src,bl,skill_id,skill_lv,tick,flag);
@@ -4857,9 +4877,15 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
clif_skill_nodamage(src, bl, skill_id, skill_lv, 1);
case SU_BITE:
skill_attack(BF_WEAPON, src, src, bl, skill_id, skill_lv, tick, flag);
- if (status_get_lv(src) >= 30 && (rnd() % 100 < (int)(status_get_lv(src) / 30) + 10)) // TODO: Need activation chance.
+ if (status_get_lv(src) > 29 && (rnd() % 100 < (int)((status_get_lv(src) / 30) * 10 + 10)))
skill_addtimerskill(src, tick + skill_get_delay(skill_id, skill_lv), bl->id, 0, 0, skill_id, skill_lv, BF_WEAPON, flag);
break;
+ case SU_SVG_SPIRIT:
+ skill_area_temp[1] = bl->id;
+ map_foreachinpath(skill_attack_area, src->m, src->x, src->y, bl->x, bl->y,
+ skill_get_splash(skill_id, skill_lv), skill_get_maxcount(skill_id, skill_lv), splash_target(src),
+ skill_get_type(skill_id), src, src, skill_id, skill_lv, tick, flag, BCT_ENEMY);
+ break;
//Splash attack skills.
case AS_GRIMTOOTH:
@@ -4911,7 +4937,6 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
case KO_BAKURETSU:
case GN_ILLUSIONDOPING:
case RL_FIREDANCE:
- case RL_BANISHING_BUSTER:
case RL_S_STORM:
case RL_R_TRIP:
case MH_XENO_SLASHER:
@@ -4941,7 +4966,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
clif_skill_nodamage(NULL, src, AL_HEAL, heal, 1);
status_heal(src,heal,0,0);
}
- if (skill_id == SU_SCRATCH && status_get_lv(src) >= 30 && (rnd() % 100 < (int)(status_get_lv(src) / 30) + 10)) // TODO: Need activation chance.
+ if (skill_id == SU_SCRATCH && status_get_lv(src) > 29 && (rnd() % 100 < (int)((status_get_lv(src) / 30) * 10 + 10)))
skill_addtimerskill(src, tick + skill_get_delay(skill_id, skill_lv), bl->id, 0, 0, skill_id, skill_lv, BF_WEAPON, flag);
} else {
int starget = BL_CHAR|BL_SKILL;
@@ -5158,6 +5183,8 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
skill_attack(BF_MAGIC,src,src,bl,skill_id,skill_lv,tick,flag);
break;
+ case AL_HOLYLIGHT:
+ status_change_end(bl, SC_P_ALTER, INVALID_TIMER);
case MG_SOULSTRIKE:
case NPC_DARKSTRIKE:
case MG_COLDBOLT:
@@ -5165,7 +5192,6 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
case MG_LIGHTNINGBOLT:
case WZ_EARTHSPIKE:
case AL_HEAL:
- case AL_HOLYLIGHT:
case NPC_DARKTHUNDER:
case PR_ASPERSIO:
case MG_FROSTDIVER:
@@ -5181,7 +5207,6 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
case WM_METALICSOUND:
case KO_KAIHOU:
case MH_ERASER_CUTTER:
- case RL_B_TRAP:
skill_attack(BF_MAGIC,src,src,bl,skill_id,skill_lv,tick,flag);
break;
@@ -5234,20 +5259,20 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
break;
case NPC_DARKBREATH:
- clif_emotion(src,E_AG);
+ clif_emotion(src,ET_ANGER);
case SN_FALCONASSAULT:
case PA_PRESSURE:
case CR_ACIDDEMONSTRATION:
case TF_THROWSTONE:
#ifdef RENEWAL
case ASC_BREAKER:
- case GS_MAGICALBULLET:
#endif
case NPC_SMOKING:
case GS_FLING:
case NJ_ZENYNAGE:
case GN_THORNS_TRAP:
case GN_HELLS_PLANT_ATK:
+ case RL_B_TRAP:
skill_attack(BF_MISC,src,src,bl,skill_id,skill_lv,tick,flag);
break;
#ifdef RENEWAL
@@ -5418,10 +5443,12 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
status_change_end(bl, SC__SHADOWFORM, INVALID_TIMER); // Should only end, no damage dealt.
}
break;
- case WL_CHAINLIGHTNING:
- clif_skill_nodamage(src,bl,skill_id,skill_lv,1);
- skill_addtimerskill(src,tick + status_get_amotion(src),bl->id,0,0,WL_CHAINLIGHTNING_ATK,skill_lv,0,flag);
+
+ case GC_DARKCROW:
+ skill_attack(BF_WEAPON, src, src, bl, skill_id, skill_lv, tick, flag);
+ sc_start(src, bl, status_skill2sc(skill_id), 100, skill_lv, skill_get_time(skill_id, skill_lv)); // Should be applied even on miss
break;
+
case WL_DRAINLIFE:
{
int heal = (int)skill_attack(skill_get_type(skill_id), src, src, bl, skill_id, skill_lv, tick, flag);
@@ -5457,12 +5484,12 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
for( i = 0; i <= j - 2; i++ )
for( k = i + 1; k <= j - 1; k++ )
if( positions[i] < positions[k] ) {
- swap(positions[i],positions[k]);
- swap(spheres[i],spheres[k]);
+ SWAP(positions[i],positions[k]);
+ SWAP(spheres[i],spheres[k]);
}
if(j == 5) { // If 5 spheres, remove last one and only do 4 actions (Official behavior)
- status_change_end(src, spheres[4], INVALID_TIMER);
+ status_change_end(src, static_cast<sc_type>(spheres[4]), INVALID_TIMER);
j = 4;
}
@@ -5476,7 +5503,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
}
skill_addtimerskill(src, tick + i * 200, bl->id, k, 0, subskill, skill_lv, i, flag);
clif_skill_nodamage(src, bl, subskill, skill_lv, 1);
- status_change_end(src, spheres[i], INVALID_TIMER);
+ status_change_end(src, static_cast<sc_type>(spheres[i]), INVALID_TIMER);
}
}
break;
@@ -5505,7 +5532,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
pres_skill_id = sc->data[i]->val1;
pres_skill_lv = sc->data[i]->val2;
point = sc->data[i]->val3;
- status_change_end(src, (sc_type)i, INVALID_TIMER);
+ status_change_end(src, static_cast<sc_type>(i), INVALID_TIMER);
}else //something went wrong :(
break;
@@ -5568,8 +5595,8 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
for( k = i + 1; k <= j - 1; k++ )
if( positions[i] > positions[k] )
{
- swap(positions[i],positions[k]);
- swap(spheres[i],spheres[k]);
+ SWAP(positions[i],positions[k]);
+ SWAP(spheres[i],spheres[k]);
}
if( skill_lv == 1 ) j = 1; // Limit only to one ball
@@ -5578,7 +5605,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
int skele = WL_RELEASE - 5 + sc->data[spheres[i]]->val1 - WLS_FIRE; // Convert Ball Element into Skill ATK for balls
// WL_SUMMON_ATK_FIRE, WL_SUMMON_ATK_WIND, WL_SUMMON_ATK_WATER, WL_SUMMON_ATK_GROUND
skill_addtimerskill(src,tick+status_get_adelay(src)*i,bl->id,0,0,skele,sc->data[spheres[i]]->val3,BF_MAGIC,flag|SD_LEVEL);
- status_change_end(src, spheres[i], INVALID_TIMER); // Eliminate ball
+ status_change_end(src, static_cast<sc_type>(spheres[i]), INVALID_TIMER); // Eliminate ball
}
clif_skill_nodamage(src,bl,skill_id,0,1);
}
@@ -5593,7 +5620,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
break;
case WL_HELLINFERNO:
skill_attack(BF_MAGIC,src,src,bl,skill_id,skill_lv,tick,flag);
- skill_attack(BF_MAGIC,src,src,bl,skill_id,skill_lv,tick,flag|ELE_DARK);
+ skill_addtimerskill(src,tick + 200,bl->id,0,0,skill_id,skill_lv,BF_MAGIC,flag|ELE_DARK);
break;
case RA_WUGSTRIKE:
if( sd && pc_isridingwug(sd) ){
@@ -5852,7 +5879,8 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
struct elemental_data *ele = BL_CAST(BL_ELEM,src);
struct status_change *tsc_ele = status_get_sc(&ele->bl);
sc_type type = status_skill2sc(skill_id), type2;
- type2 = type-1;
+
+ type2 = static_cast<sc_type>(type - 1);
clif_skill_nodamage(src,battle_get_master(src),skill_id,skill_lv,1);
clif_skill_damage(src, src, tick, status_get_amotion(src), 0, -30000, 1, skill_id, skill_lv, DMG_SKILL);
@@ -5941,41 +5969,38 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
break;
}
- // First attack. If target is marked by SC_C_MARKER, do another splash damage!
- if (tsc && tsc->data[SC_C_MARKER] && tsc->data[SC_C_MARKER]->val2 == src->id) {
- map_foreachinrange(skill_area_sub, bl, skill_get_splash(skill_id, skill_lv), BL_CHAR|BL_SKILL,
- src, skill_id, skill_lv, tick, flag|BCT_ENEMY|1, skill_castend_damage_id);
- status_change_end(bl, SC_C_MARKER, INVALID_TIMER);
- }
- }
- else
+ map_foreachinrange(skill_area_sub, bl, skill_get_splash(skill_id, skill_lv), BL_CHAR|BL_SKILL, src, skill_id, skill_lv, tick, flag|BCT_ENEMY|1, skill_castend_damage_id);
+ } else
skill_attack(skill_get_type(skill_id), src, src, bl, skill_id, skill_lv, tick, flag);
- if ((flag&8))
- flag |= 1;
break;
case RL_QD_SHOT:
+ if (sd)
+ status_change_end(&sd->bl, SC_QD_SHOT_READY, INVALID_TIMER);
case RL_D_TAIL:
- if (!sd || (sd && tsc && tsc->data[SC_C_MARKER] && tsc->data[SC_C_MARKER]->val2 == src->id)) {
+ if (!sd || (sd && tsc && tsc->data[SC_C_MARKER])) {
int sflag = flag;
if (skill_id == RL_QD_SHOT && skill_area_temp[1] == bl->id )
break;
if (flag&1)
sflag = (skill_area_temp[0]&0xFFF)|(flag&SD_LEVEL ? SD_LEVEL : 0)|(flag&SD_ANIMATION ? SD_ANIMATION : 0);
skill_attack(skill_get_type(skill_id), src, src, bl, skill_id, skill_lv, tick, sflag);
- if (sd) {
- if (skill_id != RL_D_TAIL)
- status_change_end(bl, SC_C_MARKER, INVALID_TIMER);
- }
+ if (sd && skill_id == RL_D_TAIL)
+ status_change_end(bl, SC_C_MARKER, INVALID_TIMER);
}
break;
case SU_SCAROFTAROU:
- sc_start(src, bl, status_skill2sc(skill_id), 10, skill_lv, skill_get_time(skill_id, skill_lv)); // TODO: What's the activation chance for the Bite effect?
case SU_SV_STEMSPEAR:
+ if (skill_id == SU_SCAROFTAROU)
+ sc_start(src, bl, status_skill2sc(skill_id), 10, skill_lv, skill_get_time(skill_id, skill_lv)); //! TODO: What's the activation chance for the Bite effect?
+ else {
+ if (sd && pc_checkskill(sd, SU_SPIRITOFLAND))
+ sc_start(src, src, SC_DORAM_WALKSPEED, 100, 50, skill_get_time(SU_SPIRITOFLAND, 1));
+ }
skill_attack(skill_get_type(skill_id), src, src, bl, skill_id, skill_lv, tick, flag);
- if (status_get_lv(src) >= 30 && (rnd() % 100 < (int)(status_get_lv(src) / 30) + 10)) // TODO: Need activation chance.
- skill_addtimerskill(src, tick + skill_get_delay(skill_id, skill_lv), bl->id, 0, 0, skill_id, skill_lv, (skill_id == SU_SV_STEMSPEAR) ? BF_MAGIC : BF_WEAPON, flag);
+ if (status_get_lv(src) > 29 && (rnd() % 100 < (int)((status_get_lv(src) / 30) * 10 + 10)))
+ skill_addtimerskill(src, tick + skill_get_delay(skill_id, skill_lv), bl->id, 0, 0, skill_id, skill_lv, skill_get_type(skill_id), flag);
break;
case 0:/* no skill - basic/normal attack */
@@ -6042,7 +6067,6 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
struct status_data *sstatus, *tstatus;
struct status_change *tsc;
struct status_change_entry *tsce;
- int chorusbonus = 0;
int i = 0;
enum sc_type type;
@@ -6074,6 +6098,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
case PR_REDEMPTIO:
case ALL_RESURRECTION:
case WM_DEADHILLHERE:
+ case WE_ONEFOREVER:
break;
default:
return 1;
@@ -6083,16 +6108,6 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
tstatus = status_get_status_data(bl);
sstatus = status_get_status_data(src);
- // Minstrel/Wanderer number check for chorus skills.
- // Bonus remains 0 unless 3 or more Minstrels/Wanderers are in the party.
- if( sd && sd->status.party_id ) {
- chorusbonus = party_foreachsamemap(party_sub_count_class, sd, AREA_SIZE, MAPID_THIRDMASK, MAPID_MINSTRELWANDERER);
- if( chorusbonus > 7 )
- chorusbonus = 5; // Maximum effect possible from 7 or more Minstrels/Wanderers
- else if( chorusbonus > 2 )
- chorusbonus = chorusbonus - 2; // Effect bonus from additional Minstrels/Wanderers if not above the max possible.
- }
-
//Check for undead skills that convert a no-damage skill into a damage one. [Skotlex]
switch (skill_id) {
case HLIF_HEAL: //[orn]
@@ -6387,7 +6402,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
status_kill(src);
break;
case SA_QUESTION:
- clif_emotion(src,E_WHAT);
+ clif_emotion(src,ET_QUESTION);
case SA_GRAVITY:
clif_skill_nodamage(src,bl,skill_id,skill_lv,1);
break;
@@ -6432,10 +6447,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
break;
case SA_TAMINGMONSTER:
clif_skill_nodamage(src,bl,skill_id,skill_lv,1);
- if (sd && dstmd) {
- ARR_FIND( 0, MAX_PET_DB, i, dstmd->mob_id == pet_db[i].class_ );
- if( i < MAX_PET_DB )
- pet_catch_process1(sd, dstmd->mob_id);
+ if (sd && dstmd && pet_db(dstmd->mob_id)) {
+ pet_catch_process1(sd, dstmd->mob_id);
}
break;
@@ -6497,30 +6510,21 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
case SA_FROSTWEAPON:
case SA_LIGHTNINGLOADER:
case SA_SEISMICWEAPON:
- if (dstsd) {
- if(dstsd->status.weapon == W_FIST ||
- (dstsd->sc.count && !dstsd->sc.data[type] &&
- ( //Allow re-enchanting to lenghten time. [Skotlex]
- dstsd->sc.data[SC_FIREWEAPON] ||
- dstsd->sc.data[SC_WATERWEAPON] ||
- dstsd->sc.data[SC_WINDWEAPON] ||
- dstsd->sc.data[SC_EARTHWEAPON] ||
- dstsd->sc.data[SC_SHADOWWEAPON] ||
- dstsd->sc.data[SC_GHOSTWEAPON] ||
- dstsd->sc.data[SC_ENCPOISON]
- ))
- ) {
- if (sd) clif_skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0);
- clif_skill_nodamage(src,bl,skill_id,skill_lv,0);
- break;
- }
+ if (dstsd && dstsd->status.weapon == W_FIST) {
+ if (sd)
+ clif_skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0);
+ clif_skill_nodamage(src,bl,skill_id,skill_lv,0);
+ break;
}
// 100% success rate at lv4 & 5, but lasts longer at lv5
if(!clif_skill_nodamage(src,bl,skill_id,skill_lv, sc_start(src,bl,type,(60+skill_lv*10),skill_lv, skill_get_time(skill_id,skill_lv)))) {
+ if (dstsd){
+ short index = dstsd->equip_index[EQI_HAND_R];
+ if (index&EQP_WEAPON && dstsd->inventory_data[index]->type == IT_WEAPON)
+ pc_unequipitem(dstsd, index, 3); //Must unequip the weapon instead of breaking it [Daegaladh]
+ }
if (sd)
clif_skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0);
- if (skill_break_equip(src,bl, EQP_WEAPON, 10000, BCT_PARTY) && sd && sd != dstsd)
- clif_displaymessage(sd->fd, msg_txt(sd,669));
}
break;
@@ -6559,6 +6563,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
case PR_KYRIE:
case MER_KYRIE:
case SU_TUNAPARTY:
+ case SU_GROOMING:
+ case SU_CHATTERING:
clif_skill_nodamage(bl,bl,skill_id,skill_lv,
sc_start(src,bl,type,100,skill_lv,skill_get_time(skill_id,skill_lv)));
break;
@@ -6635,6 +6641,9 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
case GS_MADNESSCANCEL:
case GS_ADJUSTMENT:
case GS_INCREASING:
+#ifdef RENEWAL
+ case GS_MAGICALBULLET:
+#endif
case NJ_KASUMIKIRI:
case NJ_UTSUSEMI:
case NJ_NEN:
@@ -6682,11 +6691,6 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
sc_start(src, bl, type, skill_lv*20, skill_lv, skill_get_time2(skill_id, skill_lv)));
break;
- case SU_STOOP:
- clif_skill_nodamage(src, bl, skill_id, skill_lv, 1);
- sc_start(src, bl, type, 100, skill_lv, skill_get_time(skill_id, skill_lv));
- break;
-
case KN_AUTOCOUNTER:
sc_start(src,bl,type,100,skill_lv,skill_get_time(skill_id,skill_lv));
skill_addtimerskill(src,tick + 100,bl->id,0,0,skill_id,skill_lv,BF_WEAPON,flag);
@@ -6964,7 +6968,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
case MO_ABSORBSPIRITS:
i = 0;
- if (dstsd && dstsd->spiritball && (sd == dstsd || map_flag_vs(src->m) || (sd && sd->duel_group && sd->duel_group == dstsd->duel_group)) &&
+ if (dstsd && (sd == dstsd || map_flag_vs(src->m) || (sd && sd->duel_group && sd->duel_group == dstsd->duel_group)) &&
((dstsd->class_&MAPID_BASEMASK) != MAPID_GUNSLINGER || (dstsd->class_&MAPID_UPPERMASK) != MAPID_REBELLION)) { // split the if for readability, and included gunslingers in the check so that their coins cannot be removed [Reddozen]
if (dstsd->spiritball > 0) {
i = dstsd->spiritball * 7;
@@ -7916,7 +7920,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
case SC_REBOUND: case SC_TELEKINESIS_INTENSE: case SC_MOONSTAR:
case SC_SUPER_STAR: case SC_ALL_RIDING: case SC_MTF_ASPD:
case SC_MTF_RANGEATK: case SC_MTF_MATK: case SC_MTF_MLEATKED:
- case SC_MTF_CRIDAMAGE: case SC_HEAT_BARREL: case SC_HEAT_BARREL_AFTER:
+ case SC_MTF_CRIDAMAGE: case SC_HEAT_BARREL:
case SC_P_ALTER: case SC_E_CHAIN: case SC_C_MARKER:
case SC_B_TRAP: case SC_H_MINE: case SC_STRANGELIGHTS:
case SC_DECORATION_OF_MUSIC: case SC_GN_CARTBOOST: case SC_CHASEWALK2:
@@ -7946,6 +7950,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
case SC_CROSSBOWCLAN:
case SC_JUMPINGCLAN:
case SC_DAILYSENDMAILCNT:
+ case SC_WEDDING: case SC_XMAS: case SC_SUMMER:
+ case SC_DRESSUP: case SC_HANBOK: case SC_OKTOBERFEST:
continue;
case SC_WHISTLE:
case SC_ASSNCROS:
@@ -7976,8 +7982,9 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
break;
case TF_BACKSLIDING: //This is the correct implementation as per packet logging information. [Skotlex]
- if (skill_blown(src,bl,skill_get_blewcount(skill_id,skill_lv),unit_getdir(bl),BLOWN_IGNORE_NO_KNOCKBACK))
- clif_skill_nodamage(src, bl, skill_id, skill_lv, 1);
+ skill_blown(src,bl,skill_get_blewcount(skill_id,skill_lv),unit_getdir(bl),(enum e_skill_blown)(BLOWN_IGNORE_NO_KNOCKBACK|BLOWN_DONT_SEND_PACKET));
+ clif_skill_nodamage(src, bl, skill_id, skill_lv, 1);
+ clif_blown(src); // Always blow, otherwise it shows a casting animation. [Lemongrass]
break;
case TK_HIGHJUMP:
@@ -8188,6 +8195,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
case NPC_SUMMONSLAVE:
case NPC_SUMMONMONSTER:
+ case NPC_DEATHSUMMON:
if(md && md->skill_idx >= 0)
mob_summonslave(md,md->db->skill[md->skill_idx].val,skill_lv,skill_id);
break;
@@ -8339,6 +8347,75 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
}
break;
+ case WE_CALLALLFAMILY:
+ if (sd) {
+ struct map_session_data *p_sd = pc_get_partner(sd);
+ struct map_session_data *c_sd = pc_get_child(sd);
+
+ if (!p_sd && !c_sd) { // Fail if no family members are found
+ clif_skill_fail(sd, skill_id, USESKILL_FAIL_LEVEL, 0);
+ map_freeblock_unlock();
+ return 1;
+ }
+
+ // Partner must be on the same map and in same party
+ if (p_sd && !status_isdead(&p_sd->bl) && p_sd->bl.m == sd->bl.m && p_sd->status.party_id == sd->status.party_id)
+ pc_setpos(p_sd, map_id2index(sd->bl.m), sd->bl.x, sd->bl.y, CLR_TELEPORT);
+ // Child must be on the same map and in same party as the parent casting
+ if (c_sd && !status_isdead(&c_sd->bl) && c_sd->bl.m == sd->bl.m && c_sd->status.party_id == sd->status.party_id)
+ pc_setpos(c_sd, map_id2index(sd->bl.m), sd->bl.x, sd->bl.y, CLR_TELEPORT);
+ }
+ break;
+
+ case WE_ONEFOREVER:
+ if (sd) {
+ struct map_session_data *p_sd = pc_get_partner(sd);
+ struct map_session_data *c_sd = pc_get_child(sd);
+
+ if (!p_sd && !c_sd && !dstsd) { // Fail if no family members are found
+ clif_skill_fail(sd, skill_id, USESKILL_FAIL_LEVEL, 0);
+ map_freeblock_unlock();
+ return 1;
+ }
+ if ((map_flag_gvg2(bl->m) || map[bl->m].flag.battleground)) { // No reviving in WoE grounds!
+ clif_skill_fail(sd, skill_id, USESKILL_FAIL_LEVEL, 0);
+ break;
+ }
+ if (status_isdead(bl)) {
+ int per = 30, sper = 0;
+
+ if (battle_check_undead(tstatus->race, tstatus->def_ele))
+ break;
+ if (tsc && tsc->data[SC_HELLPOWER])
+ break;
+ if (map[bl->m].flag.pvp && dstsd->pvp_point < 0)
+ break;
+ if (dstsd->special_state.restart_full_recover)
+ per = sper = 100;
+ if ((dstsd == p_sd || dstsd == c_sd) && status_revive(bl, per, sper)) // Only family members can be revived
+ clif_skill_nodamage(src, bl, skill_id, skill_lv, 1);
+ }
+ }
+ break;
+
+ case WE_CHEERUP:
+ if (sd) {
+ struct map_session_data *f_sd = pc_get_father(sd);
+ struct map_session_data *m_sd = pc_get_mother(sd);
+
+ if (!f_sd && !m_sd && !dstsd) { // Fail if no family members are found
+ clif_skill_fail(sd, skill_id, USESKILL_FAIL_LEVEL, 0);
+ map_freeblock_unlock();
+ return 1;
+ }
+ if (flag&1) { // Buff can only be given to parents in 7x7 AoE around baby
+ if (dstsd == f_sd || dstsd == m_sd)
+ clif_skill_nodamage(src, bl, skill_id, skill_lv, sc_start(src, bl, type, 100, skill_lv, skill_get_time(skill_id, skill_lv)));
+ } else
+ map_foreachinrange(skill_area_sub, bl, skill_get_splash(skill_id, skill_lv), BL_PC, src, skill_id, skill_lv, tick, flag|BCT_ALL|1, skill_castend_nodamage_id);
+ }
+ break;
+
case PF_HPCONVERSION:
{
int hp, sp;
@@ -8619,7 +8696,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
}
status_zap(src,0,skill_get_sp(skill_id,skill_lv)); // consume sp only if succeeded [Inkfish]
card = skill_tarotcard(src, bl, skill_id, skill_lv, tick); // actual effect is executed here
- clif_specialeffect((card == 6) ? src : bl, 522 + card, AREA);
+ clif_specialeffect((card == 6) ? src : bl, EF_TAROTCARD1 + card - 1, AREA);
clif_skill_nodamage(src,bl,skill_id,skill_lv,1);
}
break;
@@ -8648,7 +8725,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
{ //Erase death count 1% of the casts
dstsd->die_counter = 0;
pc_setglobalreg(dstsd, add_str("PC_DIE_COUNTER"), 0);
- clif_specialeffect(bl, 0x152, AREA);
+ clif_specialeffect(bl, EF_ANGEL2, AREA);
//SC_SPIRIT invokes status_calc_pc for us.
}
clif_skill_nodamage(src,bl,skill_id,skill_lv,
@@ -9023,7 +9100,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
break;
case RK_FIGHTINGSPIRIT: {
- // val1: ATKBonus: Caster: 70 + 7 * PartyMember. Member: 70 + 7 * PartyMember / 2
+ // val1: ATKBonus: Caster: 70 + 7 * PartyMember. Member: (70 + 7 * PartyMember) / 2
// val2: ASPD boost: [RK_RUNEMASTERYlevel * 4 / 10] * 10 ==> RK_RUNEMASTERYlevel * 4
if( flag&1 ) {
if( skill_area_temp[1] == bl->id )
@@ -9034,7 +9111,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
if( sd && sd->status.party_id ) {
skill_area_temp[0] = party_foreachsamemap(skill_area_sub,sd,skill_get_splash(skill_id,skill_lv),src,skill_id,skill_lv,tick,BCT_PARTY,skill_area_sub_count);
skill_area_temp[1] = src->id;
- skill_area_temp[3] = 70 + 7 * skill_area_temp[0] / 2;
+ skill_area_temp[3] = (70 + 7 * skill_area_temp[0]) / 2;
skill_area_temp[4] = skill_get_time(skill_id,skill_lv);
party_foreachsamemap(skill_area_sub,sd,skill_get_splash(skill_id,skill_lv),src,skill_id,skill_lv,tick,flag|BCT_PARTY|1,skill_castend_nodamage_id);
}
@@ -9321,7 +9398,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
case SC_MOONSTAR: case SC_SUPER_STAR: case SC_ALL_RIDING:
case SC_MTF_ASPD: case SC_MTF_RANGEATK: case SC_MTF_MATK:
case SC_MTF_MLEATKED: case SC_MTF_CRIDAMAGE: case SC_HEAT_BARREL:
- case SC_HEAT_BARREL_AFTER: case SC_P_ALTER: case SC_E_CHAIN:
+ case SC_P_ALTER: case SC_E_CHAIN:
case SC_C_MARKER: case SC_B_TRAP: case SC_H_MINE:
case SC_STRANGELIGHTS: case SC_DECORATION_OF_MUSIC: case SC_GN_CARTBOOST:
case SC_RECOGNIZEDSPELL: case SC_CHASEWALK2: case SC_ACTIVE_MONSTER_TRANSFORM:
@@ -9344,6 +9421,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
case SC_CLAN_INFO: case SC_SWORDCLAN: case SC_ARCWANDCLAN:
case SC_GOLDENMACECLAN: case SC_CROSSBOWCLAN:
case SC_DAILYSENDMAILCNT:
+ case SC_WEDDING: case SC_XMAS: case SC_SUMMER:
+ case SC_DRESSUP: case SC_HANBOK: case SC_OKTOBERFEST:
continue;
case SC_ASSUMPTIO:
if( bl->type == BL_MOB )
@@ -9375,6 +9454,10 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
}
break;
+ case WL_CHAINLIGHTNING:
+ skill_addtimerskill(src, tick + status_get_amotion(src), bl->id, 0, 0, WL_CHAINLIGHTNING_ATK, skill_lv, 0, 0);
+ break;
+
case WL_WHITEIMPRISON:
if( (src == bl || battle_check_target(src, bl, BCT_ENEMY)>0) && status_get_class_(bl) != CLASS_BOSS && !status_isimmune(bl) ) // Should not work with Bosses.
{
@@ -9878,7 +9961,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
case SR_ASSIMILATEPOWER:
if (flag&1) {
i = 0;
- if (dstsd && dstsd->spiritball && (sd == dstsd || map_flag_vs(src->m)) && (dstsd->class_&MAPID_BASEMASK)!=MAPID_GUNSLINGER) {
+ if (dstsd && (sd == dstsd || map_flag_vs(src->m)) && (dstsd->class_&MAPID_BASEMASK)!=MAPID_GUNSLINGER) {
if (dstsd->spiritball > 0) {
i = dstsd->spiritball;
pc_delspiritball(dstsd,dstsd->spiritball,0);
@@ -10057,10 +10140,10 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
if( flag&1 ) { // These affect to to all party members near the caster.
struct status_change *sc = status_get_sc(src);
if( sc && sc->data[type] ) {
- sc_start2(src,bl,type,100,skill_lv,chorusbonus,skill_get_time(skill_id,skill_lv));
+ sc_start2(src,bl,type,100,skill_lv,battle_calc_chorusbonus(sd),skill_get_time(skill_id,skill_lv));
}
} else if( sd ) {
- if( sc_start2(src,bl,type,100,skill_lv,chorusbonus,skill_get_time(skill_id,skill_lv)) )
+ if( sc_start2(src,bl,type,100,skill_lv,battle_calc_chorusbonus(sd),skill_get_time(skill_id,skill_lv)) )
party_foreachsamemap(skill_area_sub,sd,skill_get_splash(skill_id,skill_lv),src,skill_id,skill_lv,tick,flag|BCT_PARTY|1,skill_castend_nodamage_id);
clif_skill_nodamage(src,bl,skill_id,skill_lv,1);
}
@@ -10069,9 +10152,9 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
case WM_MELODYOFSINK:
case WM_BEYOND_OF_WARCRY:
if( flag&1 ) {
- sc_start2(src,bl,type,100,skill_lv,chorusbonus,skill_get_time(skill_id,skill_lv));
+ sc_start2(src,bl,type,100,skill_lv,battle_calc_chorusbonus(sd),skill_get_time(skill_id,skill_lv));
} else { // These affect to all targets arround the caster.
- if( rnd()%100 < 15 + 5 * skill_lv * 5 * chorusbonus ) {
+ if( rnd()%100 < 15 + 5 * skill_lv * 5 * battle_calc_chorusbonus(sd) ) {
map_foreachinallrange(skill_area_sub, src, skill_get_splash(skill_id,skill_lv),BL_PC, src, skill_id, skill_lv, tick, flag|BCT_ENEMY|1, skill_castend_nodamage_id);
clif_skill_nodamage(src,bl,skill_id,skill_lv,1);
}
@@ -10270,8 +10353,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
break;
}
switch( skill_lv ) {// Select mode bassed on skill level used.
- case 2: mode = EL_MODE_ASSIST; break;
- case 3: mode = EL_MODE_AGGRESSIVE; break;
+ case 2: mode = static_cast<e_mode>(EL_MODE_ASSIST); break;
+ case 3: mode = static_cast<e_mode>(EL_MODE_AGGRESSIVE); break;
}
if( !elemental_change_mode(sd->ed,mode) ) {
clif_skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0);
@@ -10306,17 +10389,20 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
case SO_EL_CURE:
if( sd ) {
struct elemental_data *ed = sd->ed;
- int s_hp = sd->battle_status.hp * 10 / 100, s_sp = sd->battle_status.sp * 10 / 100;
- int e_hp, e_sp;
+ int s_hp, s_sp;
+
+ if( !ed )
+ break;
+
+ s_hp = sd->battle_status.hp * 10 / 100;
+ s_sp = sd->battle_status.sp * 10 / 100;
- if( !ed ) break;
if( !status_charge(&sd->bl,s_hp,s_sp) ) {
clif_skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0);
break;
}
- e_hp = ed->battle_status.max_hp * 10 / 100;
- e_sp = ed->battle_status.max_sp * 10 / 100;
- status_heal(&ed->bl,e_hp,e_sp,3);
+
+ status_heal(&ed->bl,s_hp,s_sp,3);
clif_skill_nodamage(src,&ed->bl,skill_id,skill_lv,1);
}
break;
@@ -10607,21 +10693,12 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
}
break;
case MH_OVERED_BOOST:
- if (hd) {
- struct block_list *s_bl = battle_get_master(src);
- if(hd->homunculus.hunger>50) //reduce hunger
- hd->homunculus.hunger = hd->homunculus.hunger/2;
- else
- hd->homunculus.hunger = min(1,hd->homunculus.hunger);
- if(s_bl && s_bl->type==BL_PC) {
- status_set_sp(s_bl,status_get_max_sp(s_bl)/2,0); //master drain 50% sp
- clif_send_homdata(((TBL_PC *)s_bl), SP_HUNGRY, hd->homunculus.hunger); //refresh hunger info
- sc_start(src,s_bl, type, 100, skill_lv, skill_get_time(skill_id, skill_lv)); //gene bonus
- }
- sc_start(src,bl, type, 100, skill_lv, skill_get_time(skill_id, skill_lv));
- skill_blockhomun_start(hd, skill_id, skill_get_cooldown(skill_id, skill_lv));
- }
- break;
+ if (hd && battle_get_master(src)) {
+ sc_start(src, battle_get_master(src), type, 100, skill_lv, skill_get_time(skill_id, skill_lv));
+ sc_start(src, bl, type, 100, skill_lv, skill_get_time(skill_id, skill_lv));
+ skill_blockhomun_start(hd, skill_id, skill_get_cooldown(skill_id, skill_lv));
+ }
+ break;
case MH_GRANITIC_ARMOR:
case MH_PYROCLASTIC:
if(hd) {
@@ -10701,11 +10778,9 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
break;
case RL_C_MARKER:
if (sd) {
- // If marked by someone else, failed
- if (tsce && tsce->val2 != src->id) {
- clif_skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0);
- break;
- }
+ // If marked by someone else remove it
+ if (tsce && tsce->val2 != src->id)
+ status_change_end(bl, type, INVALID_TIMER);
// Check if marked before
ARR_FIND(0, MAX_SKILL_CRIMSON_MARKER, i, sd->c_marker[i] == bl->id);
@@ -10729,15 +10804,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
}
break;
case RL_D_TAIL:
- if (sd) {
- skill_area_temp[0] = map_foreachinrange(skill_area_sub, src, skill_get_splash(skill_id, skill_lv), BL_CHAR, src, skill_id, skill_lv, tick, BCT_ENEMY, skill_area_sub_count);
- if (!skill_area_temp[0]) {
- clif_skill_fail(sd, skill_id, USESKILL_FAIL_LEVEL, 0);
- break;
- }
- }
map_foreachinrange(skill_area_sub, bl, skill_get_splash(skill_id, skill_lv), BL_CHAR, src, skill_id, skill_lv, tick, flag|BCT_ENEMY|SD_SPLASH|SD_ANIMATION|1, skill_castend_damage_id);
- skill_area_temp[0] = 0;
break;
case RL_QD_SHOT:
if (sd) {
@@ -10762,17 +10829,15 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
break;
case RL_FLICKER:
if (sd) {
- int16 splash = skill_get_splash(skill_id, skill_lv);
sd->flicker = true;
skill_area_temp[1] = 0;
clif_skill_nodamage(src, bl, skill_id, skill_lv, 1);
// Detonate RL_B_TRAP
- if ((i = pc_checkskill(sd, RL_B_TRAP))) {
+ if (pc_checkskill(sd, RL_B_TRAP))
map_foreachinallrange(skill_bind_trap, src, AREA_SIZE, BL_SKILL, src);
- }
// Detonate RL_H_MINE
if ((i = pc_checkskill(sd, RL_H_MINE)))
- map_foreachinallrange(skill_area_sub, src, splash, BL_CHAR, src, RL_H_MINE, i, tick, flag|BCT_ENEMY|SD_SPLASH, skill_castend_damage_id);
+ map_foreachinallrange(skill_area_sub, src, skill_get_splash(skill_id, skill_lv), BL_CHAR, src, RL_H_MINE, i, tick, flag|BCT_ENEMY|SD_SPLASH, skill_castend_damage_id);
sd->flicker = false;
}
break;
@@ -10806,26 +10871,70 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
sc_start(src, bl, type, 100, skill_lv, skill_get_time(skill_id, skill_lv));
break;
+ case SU_STOOP:
+ clif_skill_nodamage(src, bl, skill_id, skill_lv, 1);
+ sc_start(src, bl, type, 100, skill_lv, skill_get_time(skill_id, skill_lv));
+ break;
+
+ case SU_SV_ROOTTWIST:
+ clif_skill_nodamage(src, bl, skill_id, skill_lv, 1);
+ if (sd && status_get_class_(bl) == CLASS_BOSS) {
+ clif_skill_fail(sd, skill_id, USESKILL_FAIL_TOTARGET, 0);
+ break;
+ }
+ if (tsc && tsc->count && tsc->data[type]) // Refresh the status only if it's already active.
+ sc_start(src, bl, type, 100, skill_lv, skill_get_time(skill_id, skill_lv));
+ else {
+ sc_start(src, bl, type, 100, skill_lv, skill_get_time(skill_id, skill_lv));
+ if (sd && pc_checkskill(sd, SU_SPIRITOFLAND))
+ sc_start(src, src, SC_DORAM_MATK, 100, sd->status.base_level, skill_get_time(SU_SPIRITOFLAND, 1));
+ skill_addtimerskill(src, tick + 1000, bl->id, 0, 0, SU_SV_ROOTTWIST_ATK, skill_lv, skill_get_type(SU_SV_ROOTTWIST_ATK), flag);
+ }
+ break;
+
case SU_TUNABELLY:
{
- unsigned int heal;
+ unsigned int heal = 0;
if (dstmd && (dstmd->mob_id == MOBID_EMPERIUM || status_get_class_(bl) == CLASS_BATTLEFIELD))
heal = 0;
- else {
+ else if (status_get_hp(bl) != status_get_max_hp(bl))
heal = ((2 * skill_lv - 1) * 10) * status_get_max_hp(bl) / 100;
- status_heal(bl, heal, 0, 0);
- }
+ status_heal(bl, heal, 0, 1|2|4);
- clif_skill_nodamage(src, bl, skill_id, heal, 1);
+ clif_skill_nodamage(src, bl, skill_id, skill_lv, 1);
}
break;
case SU_BUNCHOFSHRIMP:
- if (sd == NULL || sd->status.party_id == 0 || flag&1)
- clif_skill_nodamage(bl, bl, skill_id, skill_lv, sc_start(src, bl, type, 100, skill_lv, skill_get_time(skill_id, skill_lv)));
- else if (sd)
+ case SU_HISS:
+ case SU_PURRING:
+ case SU_SHRIMPARTY:
+ case SU_MEOWMEOW:
+ if (sd == NULL || sd->status.party_id == 0 || flag&1) {
+ int duration = skill_get_time(skill_id, skill_lv);
+
+ if (skill_id == SU_BUNCHOFSHRIMP && pc_checkskill(sd, SU_SPIRITOFSEA))
+ duration += skill_get_time2(SU_BUNCHOFSHRIMP, skill_lv);
+ clif_skill_nodamage(bl, bl, skill_id, skill_lv, sc_start(src, bl, type, 100, skill_lv, duration));
+ } else if (sd) {
+ if (skill_id == SU_SHRIMPARTY)
+ sc_start(src, bl, SC_SHRIMPBLESSING, 100, skill_lv, skill_get_time2(skill_id, skill_lv));
party_foreachsamemap(skill_area_sub, sd, skill_get_splash(skill_id, skill_lv), src, skill_id, skill_lv, tick, flag|BCT_PARTY|1, skill_castend_nodamage_id);
+ }
+ break;
+
+ case SU_POWEROFFLOCK:
+ if (flag&1) {
+ sc_start(src, bl, SC_FEAR, 100, skill_lv, skill_get_time(skill_id, skill_lv));
+ sc_start(src, bl, SC_FREEZE, 100, skill_lv, skill_get_time2(skill_id, skill_lv)); //! TODO: What's the duration?
+ } else {
+ clif_skill_nodamage(src, bl, skill_id, skill_lv, 1);
+ if (battle_config.skill_wall_check)
+ map_foreachinshootrange(skill_area_sub, bl, skill_get_splash(skill_id, skill_lv), BL_CHAR, src, skill_id, skill_lv, tick, flag|BCT_ENEMY|1, skill_castend_nodamage_id);
+ else
+ map_foreachinrange(skill_area_sub, bl, skill_get_splash(skill_id, skill_lv), BL_CHAR, src, skill_id, skill_lv, tick, flag|BCT_ENEMY|1, skill_castend_nodamage_id);
+ }
break;
default:
@@ -10935,6 +11044,20 @@ static int8 skill_castend_id_check(struct block_list *src, struct block_list *ta
return USESKILL_FAIL_MAX;
}
break;
+ case RL_D_TAIL:
+ if (src) {
+ int count = 0;
+
+ if (battle_config.skill_wall_check)
+ count = map_foreachinshootrange(skill_area_sub, src, skill_get_splash(skill_id, skill_lv), BL_CHAR, src, skill_id, skill_lv, 0, BCT_ENEMY, skill_area_sub_count);
+ else
+ count = map_foreachinrange(skill_area_sub, src, skill_get_splash(skill_id, skill_lv), BL_CHAR, src, skill_id, skill_lv, 0, BCT_ENEMY, skill_area_sub_count);
+
+ if (!count) {
+ return USESKILL_FAIL_LEVEL;
+ }
+ }
+ break;
}
if (inf&INF_ATTACK_SKILL ||
@@ -11030,10 +11153,9 @@ int skill_castend_id(int tid, unsigned int tick, int id, intptr_t data)
if( sd && ud->skilltimer != INVALID_TIMER && (pc_checkskill(sd,SA_FREECAST) > 0 || ud->skill_id == LG_EXEEDBREAK) )
{// restore original walk speed
ud->skilltimer = INVALID_TIMER;
- status_calc_bl(&sd->bl, SCB_SPEED);
- }
-
- ud->skilltimer = INVALID_TIMER;
+ status_calc_bl(&sd->bl, SCB_SPEED|SCB_ASPD);
+ } else
+ ud->skilltimer = INVALID_TIMER;
}
if (ud->skilltarget == id)
@@ -11091,7 +11213,6 @@ int skill_castend_id(int tid, unsigned int tick, int id, intptr_t data)
case GN_WALLOFTHORN:
case SC_ESCAPE:
case SU_CN_POWDERING:
- case SU_SV_ROOTTWIST:
ud->skillx = target->x;
ud->skilly = target->y;
ud->skilltimer = tid;
@@ -11202,11 +11323,11 @@ int skill_castend_id(int tid, unsigned int tick, int id, intptr_t data)
else
skill_castend_damage_id(src,target,ud->skill_id,ud->skill_lv,tick,flag);
- if (ud->skill_id != RA_CAMOUFLAGE)
- status_change_end(src, SC_CAMOUFLAGE, INVALID_TIMER); // Applies to the first skill if active
-
sc = status_get_sc(src);
if(sc && sc->count) {
+ if (ud->skill_id != RA_CAMOUFLAGE)
+ status_change_end(src, SC_CAMOUFLAGE, INVALID_TIMER); // Applies to the first skill if active
+
if(sc->data[SC_SPIRIT] &&
sc->data[SC_SPIRIT]->val2 == SL_WIZARD &&
sc->data[SC_SPIRIT]->val3 == ud->skill_id &&
@@ -11312,9 +11433,9 @@ int skill_castend_pos(int tid, unsigned int tick, int id, intptr_t data)
if( sd && ud->skilltimer != INVALID_TIMER && ( pc_checkskill(sd,SA_FREECAST) > 0 || ud->skill_id == LG_EXEEDBREAK ) )
{// restore original walk speed
ud->skilltimer = INVALID_TIMER;
- status_calc_bl(&sd->bl, SCB_SPEED);
- }
- ud->skilltimer = INVALID_TIMER;
+ status_calc_bl(&sd->bl, SCB_SPEED|SCB_ASPD);
+ } else
+ ud->skilltimer = INVALID_TIMER;
do {
int maxcount=0;
@@ -11326,7 +11447,7 @@ int skill_castend_pos(int tid, unsigned int tick, int id, intptr_t data)
skill_check_unit_range(src,ud->skillx,ud->skilly,ud->skill_id,ud->skill_lv)
)
{
- if (sd) clif_skill_fail(sd,ud->skill_id,USESKILL_FAIL_DUPLICATE_RANGEIN,0);
+ if (sd) clif_skill_fail(sd,ud->skill_id,USESKILL_FAIL_LEVEL,0);
break;
}
if( skill_get_unit_flag(ud->skill_id)&UF_NOFOOTSET &&
@@ -11478,7 +11599,6 @@ int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, ui
case HW_GANBANTEIN:
case LG_EARTHDRIVE:
case SC_ESCAPE:
- case RL_HAMMER_OF_GOD:
case SU_CN_METEOR:
break; //Effect is displayed on respective switch case.
default:
@@ -11647,8 +11767,6 @@ int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, ui
case MH_XENO_SLASHER:
case LG_KINGS_GRACE:
case RL_B_TRAP:
- case SU_CN_POWDERING:
- case SU_SV_ROOTTWIST:
flag|=1;//Set flag to 1 to prevent deleting ammo (it will be deleted on group-delete).
case GS_GROUNDDRIFT: //Ammo should be deleted right away.
case GN_WALLOFTHORN:
@@ -11695,16 +11813,31 @@ int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, ui
skill_unitsetting(src,skill_id,skill_lv,x,y,0);
break;
+ case SU_CN_POWDERING:
+ case SU_NYANGGRASS:
+ if (sd && pc_checkskill(sd, SU_SPIRITOFLAND)) {
+ if (skill_id == SU_CN_POWDERING)
+ sc_start(src, src, SC_DORAM_FLEE2, 100, sd->status.base_level / 12, skill_get_time(SU_SPIRITOFLAND, 1));
+ else
+ sc_start(src, src, SC_DORAM_MATK, 100, sd->status.base_level, skill_get_time(SU_SPIRITOFLAND, 1));
+ }
+ flag |= 1;
+ skill_unitsetting(src, skill_id, skill_lv, x, y, 0);
+ break;
+
case WZ_METEOR:
case SU_CN_METEOR: {
int area = skill_get_splash(skill_id, skill_lv);
short tmpx = 0, tmpy = 0;
if (sd && skill_id == SU_CN_METEOR) {
short item_idx = pc_search_inventory(sd, ITEMID_CATNIP_FRUIT);
+
if (item_idx >= 0) {
pc_delitem(sd, item_idx, 1, 0, 1, LOG_TYPE_CONSUME);
flag |= 1;
}
+ if (pc_checkskill(sd, SU_SPIRITOFLAND))
+ sc_start(src, src, SC_DORAM_SVSP, 100, 100, skill_get_time(SU_SPIRITOFLAND, 1));
}
for (i = 1; i <= skill_get_time(skill_id, skill_lv)/skill_get_unit_interval(skill_id); i++) {
// Creates a random Cell in the Splash Area
@@ -11749,14 +11882,14 @@ int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, ui
{
int summons[5] = { MOBID_G_MANDRAGORA, MOBID_G_HYDRA, MOBID_G_FLORA, MOBID_G_PARASITE, MOBID_G_GEOGRAPHER };
int class_ = skill_id==AM_SPHEREMINE?MOBID_MARINE_SPHERE:summons[skill_lv-1];
- int ai = (skill_id == AM_SPHEREMINE) ? AI_SPHERE : AI_FLORA;
+ enum mob_ai ai = (skill_id == AM_SPHEREMINE) ? AI_SPHERE : AI_FLORA;
struct mob_data *md;
// Correct info, don't change any of this! [celest]
md = mob_once_spawn_sub(src, src->m, x, y, status_get_name(src), class_, "", SZ_SMALL, ai);
if (md) {
md->master_id = src->id;
- md->special_state.ai = (enum mob_ai)ai;
+ md->special_state.ai = ai;
if( md->deletetimer != INVALID_TIMER )
delete_timer(md->deletetimer, mob_timer_delete);
md->deletetimer = add_timer (gettick() + skill_get_time(skill_id,skill_lv), mob_timer_delete, md->bl.id, 0);
@@ -11852,16 +11985,38 @@ int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, ui
if (rnd()%100 < 50) {
clif_skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0);
} else {
- TBL_MOB* md = mob_once_spawn_sub(src, src->m, x, y, "--ja--",(skill_lv < 2 ? MOBID_BLACK_MUSHROOM + rnd()%2 : MOBID_RED_PLANT + rnd()%6),"", SZ_SMALL, AI_NONE);
- int t;
- if (!md) break;
+ TBL_MOB* md = NULL;
+ int t, mob_id;
+
+ if (skill_lv == 1)
+ mob_id = MOBID_BLACK_MUSHROOM + rnd() % 2;
+ else {
+ int rand_val = rnd() % 100;
+
+ if (rand_val < 30)
+ mob_id = MOBID_GREEN_PLANT;
+ else if (rand_val < 55)
+ mob_id = MOBID_RED_PLANT;
+ else if (rand_val < 80)
+ mob_id = MOBID_YELLOW_PLANT;
+ else if (rand_val < 90)
+ mob_id = MOBID_WHITE_PLANT;
+ else if (rand_val < 98)
+ mob_id = MOBID_BLUE_PLANT;
+ else
+ mob_id = MOBID_SHINING_PLANT;
+ }
+
+ md = mob_once_spawn_sub(src, src->m, x, y, "--ja--", mob_id, "", SZ_SMALL, AI_NONE);
+ if (!md)
+ break;
if ((t = skill_get_time(skill_id, skill_lv)) > 0)
{
if( md->deletetimer != INVALID_TIMER )
delete_timer(md->deletetimer, mob_timer_delete);
md->deletetimer = add_timer (tick + t, mob_timer_delete, md->bl.id, 0);
}
- mob_spawn (md);
+ mob_spawn(md);
}
}
break;
@@ -12169,53 +12324,37 @@ int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, ui
case RL_FALLEN_ANGEL:
if (unit_movepos(src,x,y,1,1)) {
- uint8 skill_use_lv = sd ? pc_checkskill(sd,GS_DESPERADO) : 5;
- if (!skill_use_lv) {
- clif_skill_nodamage(src, src, skill_id, skill_lv, 0);
- break;
- }
- clif_fixpos(src);
- clif_skill_nodamage(src, src, skill_id, skill_lv, 1);
- skill_addtimerskill(src, tick+500, 0, x, y, RL_FALLEN_ANGEL, skill_use_lv, BF_WEAPON, flag|SD_LEVEL|SD_ANIMATION|SD_SPLASH);
- }
- else {
+ clif_snap(src, src->x, src->y);
+ sc_start(src, src, type, 100, skill_id, skill_get_time(skill_id, skill_lv));
+ } else {
if (sd)
clif_skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0);
}
break;
- case RL_HAMMER_OF_GOD:
- {
- i = skill_get_splash(skill_id, skill_lv);
- if (sd) {
- skill_area_temp[0] = map_foreachinarea(skill_area_sub, src->m, x-i, y-i, x+i, y+i, BL_CHAR, src, skill_id, skill_lv, tick, BCT_ENEMY, skill_area_sub_count);
- if (!skill_area_temp[0]) {
- // This skill doesn't have area effect, apply self? :P
- //clif_skill_poseffect(src, skill_id, skill_lv, x, y, tick+500);
- clif_skill_nodamage(src, src, skill_id, 0, 1);
- break;
- }
- }
- map_foreachinarea(skill_area_sub, src->m, x-i, y-i, x+i, y+i, BL_CHAR, src, skill_id, skill_lv, tick, flag|BCT_ENEMY|SD_SPLASH|SD_ANIMATION|8, skill_castend_damage_id);
- skill_area_temp[0] = 0;
- break;
- }
- break;
case RL_FIRE_RAIN: {
int w, wave = skill_lv + 5, dir = map_calc_dir(src,x,y);
int sx = x = src->x, sy = y = src->y;
- for (w = 1; w <= wave; w++) {
+ for (w = 0; w <= wave; w++) {
switch (dir) {
- case 0: sy = y + w; break;
- case 1: sy = y + w; sx = x - w; break;
- case 2: sx = x - w; break;
- case 3: sx = x - w; sy = y - w; break;
- case 4: sy = y - w; break;
- case 5: sx = x + w; sy = y - w; break;
- case 6: sx = x + w; break;
- case 7: sy = y + w; sx = x + w; break;
+ case DIR_NORTH:
+ case DIR_NORTHWEST:
+ case DIR_NORTHEAST:
+ sy = y + w;
+ break;
+ case DIR_WEST:
+ sx = x - w;
+ break;
+ case DIR_SOUTHWEST:
+ case DIR_SOUTH:
+ case DIR_SOUTHEAST:
+ sy = y - w;
+ break;
+ case DIR_EAST:
+ sx = x + w;
+ break;
}
- skill_addtimerskill(src,gettick() + (40 * w),0,sx,sy,skill_id,skill_lv,dir,flag);
+ skill_addtimerskill(src,gettick() + (80 * w),0,sx,sy,skill_id,skill_lv,dir,flag);
}
}
break;
@@ -12230,16 +12369,25 @@ int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, ui
skill_addtimerskill(src,gettick()+500,0,x,y,skill_id,skill_lv,BF_MISC,flag);
}
break;
-
case SU_LOPE:
- if (map[src->m].flag.noteleport && !(map[src->m].flag.battleground || map_flag_gvg2(src->m))) {
- x = src->x;
- y = src->y;
- }
- clif_skill_nodamage(src, src, SU_LOPE, skill_lv, 1);
- if (!map_count_oncell(src->m, x, y, BL_PC|BL_NPC|BL_MOB, 0) && path_search(NULL, src->m, src->x, src->y, x, y, 1, CELL_CHKNOREACH)) {
- clif_slide(src, x, y);
- unit_movepos(src, x, y, 1, 0);
+ {
+ uint8 dir = map_calc_dir(src, x, y);
+
+ // Fails on noteleport maps, except for GvG and BG maps
+ if (map[src->m].flag.noteleport && !(map[src->m].flag.battleground || map_flag_gvg2(src->m))) {
+ x = src->x;
+ y = src->y;
+ } else if (dir%2) { // Diagonal
+ x += dirx[dir] * (skill_lv * 4) / 3;
+ y += diry[dir] * (skill_lv * 4) / 3;
+ } else {
+ x += dirx[dir] * skill_lv * 2;
+ y += diry[dir] * skill_lv * 2;
+ }
+
+ clif_skill_nodamage(src, src, skill_id, skill_lv, 1);
+ if (!map_count_oncell(src->m, x, y, BL_PC|BL_NPC|BL_MOB, 0) && map_getcell(src->m, x, y, CELL_CHKREACH) && unit_movepos(src, x, y, 1, 0))
+ clif_blown(src);
}
break;
@@ -12626,8 +12774,8 @@ struct skill_unit_group *skill_unitsetting(struct block_list *src, uint16 skill_
ARR_FIND(0, MAX_SKILL_ITEM_REQUIRE, i, req.itemid[i] && (req.itemid[i] == ITEMID_TRAP || req.itemid[i] == ITEMID_TRAP_ALLOY));
if( i != MAX_SKILL_ITEM_REQUIRE && req.itemid[i] )
req_item = req.itemid[i];
- if( map_flag_gvg2(src->m) || map[src->m].flag.battleground )
- limit *= 4; // longer trap times in WOE [celest]
+ if (skill_id == RL_B_TRAP) // Target type should not change on GvG maps.
+ break;
if( battle_config.vs_traps_bctall && map_flag_vs(src->m) && (src->type&battle_config.vs_traps_bctall) )
target = BCT_ALL;
}
@@ -13216,6 +13364,10 @@ static int skill_unit_onplace(struct skill_unit *unit, struct block_list *bl, un
case UNT_VOLCANO:
case UNT_DELUGE:
case UNT_VIOLENTGALE:
+ case UNT_FIRE_INSIGNIA:
+ case UNT_WATER_INSIGNIA:
+ case UNT_WIND_INSIGNIA:
+ case UNT_EARTH_INSIGNIA:
if(!sce)
sc_start(ss, bl,type,100,sg->skill_lv,sg->limit);
break;
@@ -13383,6 +13535,11 @@ static int skill_unit_onplace(struct skill_unit *unit, struct block_list *bl, un
sc_start(ss, bl, type, 100, sg->skill_lv, skill_get_time(sg->skill_id, sg->skill_lv));
break;
+ case UNT_NYANGGRASS:
+ if (!sce)
+ sc_start(ss, bl, type, 100, sg->skill_lv, skill_get_time(sg->skill_id, sg->skill_lv));
+ break;
+
case UNT_GD_LEADERSHIP:
case UNT_GD_GLORYWOUNDS:
case UNT_GD_SOULCOLD:
@@ -14007,29 +14164,6 @@ int skill_unit_onplace_timer(struct skill_unit *unit, struct block_list *bl, uns
sc_start(ss, bl, type, 100, sg->skill_lv, sg->interval);
break;
- case UNT_FIRE_INSIGNIA:
- case UNT_WATER_INSIGNIA:
- case UNT_WIND_INSIGNIA:
- case UNT_EARTH_INSIGNIA:
- sc_start(ss, bl, type, 100, sg->skill_lv, sg->interval);
- if (!battle_check_undead(tstatus->race, tstatus->def_ele)) {
- int hp = tstatus->max_hp / 100; //+1% each 5s
- if ((sg->val3) % 5) { //each 5s
- if (tstatus->def_ele == skill_get_ele(sg->skill_id,sg->skill_lv)){
- status_heal(bl, hp, 0, 2);
- } else if((sg->unit_id == UNT_FIRE_INSIGNIA && tstatus->def_ele == ELE_EARTH)
- ||(sg->unit_id == UNT_WATER_INSIGNIA && tstatus->def_ele == ELE_FIRE)
- ||(sg->unit_id == UNT_WIND_INSIGNIA && tstatus->def_ele == ELE_WATER)
- ||(sg->unit_id == UNT_EARTH_INSIGNIA && tstatus->def_ele == ELE_WIND)
- ){
- status_heal(bl, -hp, 0, 0);
- }
- }
- sg->val3++; //timer
- if (sg->val3 > 5) sg->val3 = 0;
- }
- break;
-
case UNT_VACUUM_EXTREME:
if (tsc && (tsc->data[SC_HALLUCINATIONWALK] || tsc->data[SC_HOVERING] || tsc->data[SC_VACUUM_EXTREME] ||
(tsc->data[SC_VACUUM_EXTREME_POSTDELAY] && tsc->data[SC_VACUUM_EXTREME_POSTDELAY]->val2 == sg->group_id))) // Ignore post delay from other vacuum (this will make stack effect enabled)
@@ -14124,28 +14258,6 @@ int skill_unit_onplace_timer(struct skill_unit *unit, struct block_list *bl, uns
skill_attack(skill_get_type(sg->skill_id),ss,&unit->bl,bl,sg->skill_id,sg->skill_lv,tick,SD_ANIMATION|SD_SPLASH),
1,sg->skill_id,sg->skill_lv,DMG_SKILL);
break;
-
- case UNT_SV_ROOTTWIST:
- if (status_bl_has_mode(bl,MD_STATUS_IMMUNE))
- break;
- if (tsc) {
- if (!sg->val2) {
- int sec = skill_get_time(sg->skill_id, sg->skill_lv);
-
- if (sc_start2(ss, bl, type, 100, sg->skill_lv, sg->group_id, sec)) {
- const struct TimerData* td = tsc->data[type]?get_timer(tsc->data[type]->timer):NULL;
-
- if(td)
- sec = DIFF_TICK(td->tick, tick);
- clif_fixpos(bl);
- sg->val2 = bl->id;
- } else // Couldn't trap it?
- sec = 7000;
- sg->limit = DIFF_TICK(tick, sg->tick) + sec;
- } else if (tsc->data[type] && bl->id == sg->val2)
- skill_attack(skill_get_type(SU_SV_ROOTTWIST_ATK), ss, &unit->bl, bl, SU_SV_ROOTTWIST_ATK, sg->skill_lv, tick, SD_LEVEL|SD_ANIMATION);
- }
- break;
}
if (bl->type == BL_MOB && ss != bl)
@@ -14293,6 +14405,7 @@ int skill_unit_onleft(uint16 skill_id, struct block_list *bl, unsigned int tick)
case LG_KINGS_GRACE:
case NC_STEALTHFIELD:
case NC_NEUTRALBARRIER:
+ case SU_NYANGGRASS:
if (sce)
status_change_end(bl, type, INVALID_TIMER);
break;
@@ -14557,7 +14670,7 @@ int skill_check_pc_partner(struct map_session_data *sd, uint16 skill_id, uint16
static int c=0;
static int p_sd[MAX_PARTY];
int i;
- bool is_chorus = ( skill_get_inf2(skill_id)&INF2_CHORUS_SKILL );
+ bool is_chorus = ( skill_get_inf2(skill_id)&INF2_CHORUS_SKILL ) != 0;
if (!sd)
return 0;
@@ -14780,7 +14893,7 @@ bool skill_check_condition_castbegin(struct map_session_data* sd, uint16 skill_i
}
//Consume
sd->itemid = sd->itemindex = -1;
- if( skill_id == WZ_EARTHSPIKE && sc && sc->data[SC_EARTHSCROLL] && rnd()%100 > sc->data[SC_EARTHSCROLL]->val2 ) // [marquis007]
+ if( (skill_id == WZ_EARTHSPIKE && sc && sc->data[SC_EARTHSCROLL] && rnd()%100 > sc->data[SC_EARTHSCROLL]->val2) || sd->inventory_data[i]->flag.delay_consume == 2 ) // [marquis007]
; //Do not consume item.
else if( sd->inventory.u.items_inventory[i].expire_time == 0 )
pc_delitem(sd,i,1,0,0,LOG_TYPE_CONSUME); // Rental usable items are not consumed until expiration
@@ -14880,6 +14993,12 @@ bool skill_check_condition_castbegin(struct map_session_data* sd, uint16 skill_i
return false;
}
break;
+ case AL_HOLYWATER:
+ if(pc_search_inventory(sd,ITEMID_EMPTY_BOTTLE) < 0) {
+ clif_skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0);
+ return false;
+ }
+ break;
case MO_CALLSPIRITS:
if(sc && sc->data[SC_RAISINGDRAGON])
skill_lv += sc->data[SC_RAISINGDRAGON]->val1;
@@ -15123,6 +15242,7 @@ bool skill_check_condition_castbegin(struct map_session_data* sd, uint16 skill_i
break;
case GS_GLITTERING:
+ case RL_RICHS_COIN:
if(sd->spiritball >= 10) {
clif_skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0);
return false;
@@ -15196,7 +15316,6 @@ bool skill_check_condition_castbegin(struct map_session_data* sd, uint16 skill_i
if( skill_check_pc_partner(sd,skill_id,&skill_lv,1,0) <= 0 && require.itemid[0]
&& sd->special_state.no_gemstone == 0
&& ((i = pc_search_inventory(sd,require.itemid[0])) < 0 || sd->inventory.u.items_inventory[i].amount < require.amount[0]) ) {
- //clif_skill_fail(sd,skill_id,USESKILL_FAIL_NEED_ITEM,require.amount[0],require.itemid[0]);
clif_skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0);
return false;
}
@@ -15538,20 +15657,38 @@ bool skill_check_condition_castbegin(struct map_session_data* sd, uint16 skill_i
}
}
- //check if equipped item
+ // Check for equipped item(s)
if (require.eqItem_count) {
+ uint8 count = require.eqItem_count;
+
for (i = 0; i < require.eqItem_count; i++) {
uint16 reqeqit = require.eqItem[i];
if (!reqeqit)
- break; //no required item; get out of here
- if (!pc_checkequip2(sd,reqeqit,EQI_ACC_L,EQI_MAX)) {
- if (i == require.eqItem_count) {
- clif_skill_fail(sd,skill_id,USESKILL_FAIL_THIS_WEAPON,0);
- return false;
- }
- } else
- break; // Wearing an applicable item.
+ break; // Skill has no required item(s); get out of here
+ switch(skill_id) { // Specific skills require multiple items while default will handle singular cases
+ case NC_PILEBUNKER:
+ case RL_P_ALTER:
+ if (!pc_checkequip2(sd,reqeqit,EQI_ACC_L,EQI_MAX)) {
+ count--;
+ if (!count) {
+ if( skill_id == RL_P_ALTER ){
+ clif_msg( sd, SKILL_NEED_HOLY_BULLET );
+ }else{
+ clif_skill_fail(sd,skill_id,USESKILL_FAIL_THIS_WEAPON,0);
+ }
+ return false;
+ } else
+ continue;
+ }
+ break;
+ default:
+ if (!pc_checkequip2(sd,reqeqit,EQI_ACC_L,EQI_MAX)) {
+ clif_skill_fail(sd,skill_id,USESKILL_FAIL_NEED_EQUIPMENT,reqeqit<<16);
+ return false;
+ }
+ break;
+ }
}
}
@@ -15563,8 +15700,32 @@ bool skill_check_condition_castbegin(struct map_session_data* sd, uint16 skill_i
}
if( require.weapon && !pc_check_weapontype(sd,require.weapon) ) {
- clif_skill_fail(sd,skill_id,USESKILL_FAIL_THIS_WEAPON,0);
- return false;
+ switch(skill_id) {
+ case RA_AIMEDBOLT:
+ break;
+ default:
+ switch((unsigned int)log2(require.weapon)) {
+ case W_REVOLVER:
+ clif_msg(sd, SKILL_NEED_REVOLVER);
+ break;
+ case W_RIFLE:
+ clif_msg(sd, SKILL_NEED_RIFLE);
+ break;
+ case W_GATLING:
+ clif_msg(sd, SKILL_NEED_GATLING);
+ break;
+ case W_SHOTGUN:
+ clif_msg(sd, SKILL_NEED_SHOTGUN);
+ break;
+ case W_GRENADE:
+ clif_msg(sd, SKILL_NEED_GRENADE);
+ break;
+ default:
+ clif_skill_fail(sd, skill_id, USESKILL_FAIL_THIS_WEAPON, 0);
+ break;
+ }
+ return false;
+ }
}
if( require.sp > 0 && status->sp < (unsigned int)require.sp) {
@@ -15577,9 +15738,12 @@ bool skill_check_condition_castbegin(struct map_session_data* sd, uint16 skill_i
return false;
}
- if( (require.spiritball > 0 && sd->spiritball < require.spiritball) ||
- (require.spiritball == -1 && sd->spiritball < 1) ) {
- clif_skill_fail(sd,skill_id,USESKILL_FAIL_SPIRITS,(require.spiritball == -1)? 1: require.spiritball);
+ if ((require.spiritball > 0 && sd->spiritball < require.spiritball) ||
+ (require.spiritball == -1 && sd->spiritball < 1)) {
+ if ((sd->class_&MAPID_BASEMASK) == MAPID_GUNSLINGER || (sd->class_&MAPID_UPPERMASK) == MAPID_REBELLION)
+ clif_skill_fail(sd, skill_id, USESKILL_FAIL_COINS, (require.spiritball == -1) ? 1 : require.spiritball);
+ else
+ clif_skill_fail(sd, skill_id, USESKILL_FAIL_SPIRITS, (require.spiritball == -1) ? 1 : require.spiritball);
return false;
}
@@ -15650,7 +15814,7 @@ bool skill_check_condition_castend(struct map_session_data* sd, uint16 skill_id,
case AM_CANNIBALIZE:
case AM_SPHEREMINE: {
int c=0;
- int summons[5] = { MOBID_G_MANDRAGORA, MOBID_G_HYDRA, MOBID_G_FLORA, MOBID_G_PARASITE, MOBID_G_MANDRAGORA };
+ int summons[5] = { MOBID_G_MANDRAGORA, MOBID_G_HYDRA, MOBID_G_FLORA, MOBID_G_PARASITE, MOBID_G_GEOGRAPHER };
int maxcount = (skill_id==AM_CANNIBALIZE)? 6-skill_lv : skill_get_maxcount(skill_id,skill_lv);
int mob_class = (skill_id==AM_CANNIBALIZE)? summons[skill_lv-1] :MOBID_MARINE_SPHERE;
if(battle_config.land_skill_limit && maxcount>0 && (battle_config.land_skill_limit&BL_PC)) {
@@ -15767,15 +15931,17 @@ bool skill_check_condition_castend(struct map_session_data* sd, uint16 skill_id,
clif_skill_fail(sd,skill_id,USESKILL_FAIL_PAINTBRUSH,0); //Paint brush is required.
else if( require.itemid[i] == ITEMID_ANCILLA )
clif_skill_fail(sd,skill_id,USESKILL_FAIL_ANCILLA,0); //Ancilla is required.
- else {
- char output[CHAT_SIZE_MAX];
- //Official is using msgstringtable.txt for each requirement failure
- //clif_skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0);
- sprintf(output, msg_txt(sd,720), itemdb_jname(require.itemid[i])); // %s is required.
- clif_messagecolor(&sd->bl,color_table[COLOR_RED],output,false,SELF);
+ else if(skill_id == RL_SLUGSHOT) {
+ if (i < MAX_SKILL_ITEM_REQUIRE - 1) // Check all Slug types
+ continue;
+ else
+ clif_skill_fail(sd, RL_SLUGSHOT, USESKILL_FAIL_NEED_MORE_BULLET, 0); // Bullet is required.
+ } else {
+ clif_skill_fail( sd, skill_id, USESKILL_FAIL_NEED_ITEM, ( require.itemid[i] << 16 ) | require.amount[i] ); // [%s] required '%d' amount.
}
return false;
- }
+ } else if (skill_id == RL_SLUGSHOT) // Slug found - simulate priority and cancel the loop
+ break;
}
/* check the status required */
@@ -15883,6 +16049,9 @@ void skill_consume_requirement(struct map_session_data *sd, uint16 skill_id, uin
if( (n = pc_search_inventory(sd,require.itemid[i])) >= 0 )
pc_delitem(sd,n,require.amount[i],0,1,LOG_TYPE_CONSUME);
+
+ if (skill_id == RL_SLUGSHOT && n > -1) // Slug found - simulate priority and cancel the loop
+ break;
}
}
}
@@ -16621,7 +16790,7 @@ void skill_weaponrefine(struct map_session_data *sd, int idx)
clif_upgrademessage(sd->fd, 3, material[ditem->wlv]);
return;
}
- per = status_get_refine_chance(ditem->wlv, (int)item->refine);
+ per = status_get_refine_chance(static_cast<refine_type>(ditem->wlv), (int)item->refine, false);
if( sd->class_&JOBL_THIRD )
per += 10;
else
@@ -16641,6 +16810,7 @@ void skill_weaponrefine(struct map_session_data *sd, int idx)
clif_upgrademessage(sd->fd, 0, item->nameid);
clif_inventorylist(sd);
clif_refine(sd->fd,0,idx,item->refine);
+ achievement_update_objective(sd, AG_REFINE_SUCCESS, 2, ditem->wlv, item->refine);
if (ep)
pc_equipitem(sd,idx,ep);
clif_misceffect(&sd->bl,3);
@@ -16666,9 +16836,10 @@ void skill_weaponrefine(struct map_session_data *sd, int idx)
pc_unequipitem(sd,idx,3);
clif_upgrademessage(sd->fd, 1, item->nameid);
clif_refine(sd->fd,1,idx,item->refine);
+ achievement_update_objective(sd, AG_REFINE_FAIL, 1, 1);
pc_delitem(sd,idx,1,0,2, LOG_TYPE_OTHER);
clif_misceffect(&sd->bl,2);
- clif_emotion(&sd->bl, E_OMG);
+ clif_emotion(&sd->bl, ET_HUK);
}
}
}
@@ -17094,9 +17265,9 @@ int skill_detonator(struct block_list *bl, va_list ap)
}
/**
-* Rebellion's Bind Trap explosion
-* @author [Cydh]
-**/
+ * Rebellion's Bind Trap explosion
+ * @author [Cydh]
+ */
static int skill_bind_trap(struct block_list *bl, va_list ap) {
struct skill_unit *su = NULL;
struct block_list *src = NULL;
@@ -17108,7 +17279,7 @@ static int skill_bind_trap(struct block_list *bl, va_list ap) {
if (bl->type != BL_SKILL || !(su = (struct skill_unit *)bl) || !(su->group))
return 0;
- if (su->group->unit_id != UNT_B_TRAP || su->group->src_id != src->id )
+ if (su->group->unit_id != UNT_B_TRAP || su->group->src_id != src->id)
return 0;
map_foreachinallrange(skill_trap_splash, bl, su->range, BL_CHAR, bl,su->group->tick);
@@ -17975,9 +18146,13 @@ int skill_delunitgroup_(struct skill_unit_group *group, const char* file, int li
case NC_NEUTRALBARRIER:
{
struct status_change *sc = NULL;
- if( (sc = status_get_sc(src)) != NULL && sc->data[SC_NEUTRALBARRIER_MASTER] ) {
- sc->data[SC_NEUTRALBARRIER_MASTER]->val2 = 0;
- status_change_end(src,SC_NEUTRALBARRIER_MASTER,INVALID_TIMER);
+ if( (sc = status_get_sc(src)) != NULL ) {
+ if ( sc->data[SC_NEUTRALBARRIER_MASTER] )
+ {
+ sc->data[SC_NEUTRALBARRIER_MASTER]->val2 = 0;
+ status_change_end(src,SC_NEUTRALBARRIER_MASTER,INVALID_TIMER);
+ }
+ status_change_end(src,SC_NEUTRALBARRIER,INVALID_TIMER);
}
}
break;
@@ -18824,7 +18999,7 @@ bool skill_produce_mix(struct map_session_data *sd, uint16 skill_id, unsigned sh
data = itemdb_search(nameid);
if (runemastery_skill_lv >= 10) temp_qty = 1 + rnd()%3;
- else if (runemastery_skill_lv > 5) temp_qty = 1 + rnd()%2;
+ else if (runemastery_skill_lv > 4) temp_qty = 1 + rnd()%2;
else temp_qty = 1;
if (data->stack.inventory) {
@@ -19251,7 +19426,7 @@ bool skill_produce_mix(struct map_session_data *sd, uint16 skill_id, unsigned sh
break;
default: //Those that don't require a skill?
if (skill_produce_db[idx].itemlv > 10 && skill_produce_db[idx].itemlv <= 20) { //Cooking items.
- clif_specialeffect(&sd->bl, 608, AREA);
+ clif_specialeffect(&sd->bl, EF_COOKING_OK, AREA);
if (sd->cook_mastery < 1999)
pc_setglobalreg(sd, add_str("COOK_MASTERY"), sd->cook_mastery + ( 1 << ( (skill_produce_db[idx].itemlv - 11) / 2 ) ) * 5);
}
@@ -19272,7 +19447,9 @@ bool skill_produce_mix(struct map_session_data *sd, uint16 skill_id, unsigned sh
for (l = 0; l < total_qty; l += tmp_item.amount) {
if ((flag = pc_additem(sd,&tmp_item,tmp_item.amount,LOG_TYPE_PRODUCE))) {
clif_additem(sd,0,0,flag);
- map_addflooritem(&tmp_item,tmp_item.amount,sd->bl.m,sd->bl.x,sd->bl.y,0,0,0,0,0);
+ if( battle_config.skill_drop_items_full ){
+ map_addflooritem(&tmp_item,tmp_item.amount,sd->bl.m,sd->bl.x,sd->bl.y,0,0,0,0,0);
+ }
}
}
k++;
@@ -19290,7 +19467,9 @@ bool skill_produce_mix(struct map_session_data *sd, uint16 skill_id, unsigned sh
} else if (tmp_item.amount) { //Success
if ((flag = pc_additem(sd,&tmp_item,tmp_item.amount,LOG_TYPE_PRODUCE))) {
clif_additem(sd,0,0,flag);
- map_addflooritem(&tmp_item,tmp_item.amount,sd->bl.m,sd->bl.x,sd->bl.y,0,0,0,0,0);
+ if( battle_config.skill_drop_items_full ){
+ map_addflooritem(&tmp_item,tmp_item.amount,sd->bl.m,sd->bl.x,sd->bl.y,0,0,0,0,0);
+ }
}
if (skill_id == GN_MIX_COOKING || skill_id == GN_MAKEBOMB || skill_id == GN_S_PHARMACY) {
clif_produceeffect(sd,6,nameid);
@@ -19347,7 +19526,9 @@ bool skill_produce_mix(struct map_session_data *sd, uint16 skill_id, unsigned sh
tmp_item.identify = 1;
if ((flag = pc_additem(sd,&tmp_item,tmp_item.amount,LOG_TYPE_PRODUCE))) {
clif_additem(sd,0,0,flag);
- map_addflooritem(&tmp_item,tmp_item.amount,sd->bl.m,sd->bl.x,sd->bl.y,0,0,0,0,0);
+ if( battle_config.skill_drop_items_full ){
+ map_addflooritem(&tmp_item,tmp_item.amount,sd->bl.m,sd->bl.x,sd->bl.y,0,0,0,0,0);
+ }
}
clif_produceeffect(sd,7,nameid);
clif_misceffect(&sd->bl,6);
@@ -19363,7 +19544,7 @@ bool skill_produce_mix(struct map_session_data *sd, uint16 skill_id, unsigned sh
break;
default:
if (skill_produce_db[idx].itemlv > 10 && skill_produce_db[idx].itemlv <= 20 ) { //Cooking items.
- clif_specialeffect(&sd->bl, 609, AREA);
+ clif_specialeffect(&sd->bl, EF_COOKING_FAIL, AREA);
if (sd->cook_mastery > 0)
pc_setglobalreg(sd, add_str("COOK_MASTERY"), sd->cook_mastery - ( 1 << ((skill_produce_db[idx].itemlv - 11) / 2) ) - ( ( ( 1 << ((skill_produce_db[idx].itemlv - 11) / 2) ) >> 1 ) * 3 ));
}
@@ -19456,7 +19637,8 @@ int skill_poisoningweapon(struct map_session_data *sd, unsigned short nameid)
clif_skill_fail(sd,GC_POISONINGWEAPON,USESKILL_FAIL_LEVEL,0);
return 0;
}
-
+
+ status_change_end(&sd->bl, SC_POISONINGWEAPON, INVALID_TIMER); // End the status so a new poison can be applied (if changed)
chance = 2 + 2 * sd->menuskill_val; // 2 + 2 * skill_lv
sc_start4(&sd->bl,&sd->bl, SC_POISONINGWEAPON, 100, pc_checkskill(sd, GC_RESEARCHNEWPOISON), //in Aegis it store the level of GC_RESEARCHNEWPOISON in val1
type, chance, val4, skill_get_time(GC_POISONINGWEAPON, sd->menuskill_val));
@@ -19958,7 +20140,7 @@ void skill_usave_trigger(struct map_session_data *sd)
struct skill_usave *sus = NULL;
struct skill_unit_group *group = NULL;
- if (!(sus = idb_get(skillusave_db,sd->status.char_id)))
+ if (!(sus = static_cast<skill_usave *>(idb_get(skillusave_db,sd->status.char_id))))
return;
if ((group = skill_unitsetting(&sd->bl, sus->skill_id, sus->skill_lv, sd->bl.x, sd->bl.y, 0)))
@@ -20563,7 +20745,6 @@ int skill_disable_check(struct status_change *sc, uint16 skill_id)
case KO_YAMIKUMO:
case RA_WUGDASH:
case RA_CAMOUFLAGE:
- case SU_HIDE:
if( sc->data[status_skill2sc(skill_id)] )
return 1;
break;
@@ -20603,6 +20784,8 @@ int skill_get_elemental_type( uint16 skill_id , uint16 skill_lv ) {
* @return True:If unit can be moved, False:If check on flags are met or unit cannot be moved.
**/
static bool skill_check_unit_movepos(uint8 check_flag, struct block_list *bl, short dst_x, short dst_y, int easy, bool checkpath) {
+ struct status_change *sc;
+
nullpo_retr(false, bl);
if (check_flag&1 && map[bl->m].flag.battleground)
@@ -20612,6 +20795,10 @@ static bool skill_check_unit_movepos(uint8 check_flag, struct block_list *bl, sh
if (check_flag&4 && map_flag_gvg2(bl->m))
return false;
+ sc = status_get_sc(bl);
+ if (sc && sc->data[SC_SV_ROOTTWIST])
+ return false;
+
return unit_movepos(bl, dst_x, dst_y, easy, checkpath);
}
@@ -20787,6 +20974,11 @@ static bool skill_parse_row_requiredb(char* split[], int columns, int current)
trim(split[11]);
if (split[11][0] != '\0' || atoi(split[11])) {
int require[MAX_SKILL_STATUS_REQUIRE];
+
+ if( skill_db[idx]->require.status_count > 0 ){
+ aFree(skill_db[idx]->require.status);
+ }
+
if ((skill_db[idx]->require.status_count = skill_split_atoi2(split[11], require, ":", SC_STONE, ARRAYLENGTH(require)))) {
CREATE(skill_db[idx]->require.status, enum sc_type, skill_db[idx]->require.status_count);
for (i = 0; i < skill_db[idx]->require.status_count; i++){
@@ -20814,6 +21006,10 @@ static bool skill_parse_row_requiredb(char* split[], int columns, int current)
if (split[33][0] != '\0' || atoi(split[33])) {
int require[MAX_SKILL_EQUIP_REQUIRE];
+ if( skill_db[idx]->require.eqItem_count > 0 ){
+ aFree(skill_db[idx]->require.eqItem);
+ }
+
if ((skill_db[idx]->require.eqItem_count = skill_split_atoi2(split[33], require, ":", 500, ARRAYLENGTH(require)))) {
CREATE(skill_db[idx]->require.eqItem, uint16, skill_db[idx]->require.eqItem_count);
for (i = 0; i < skill_db[idx]->require.eqItem_count; i++){
@@ -20888,6 +21084,7 @@ static bool skill_parse_row_unitdb(char* split[], int columns, int current)
skill_split_atoi(split[4],skill_db[idx]->unit_range);
skill_db[idx]->unit_interval = atoi(split[5]);
+ trim(split[6]);
if( strcmpi(split[6],"noenemy")==0 ) skill_db[idx]->unit_target = BCT_NOENEMY;
else if( strcmpi(split[6],"friend")==0 ) skill_db[idx]->unit_target = BCT_NOENEMY;
else if( strcmpi(split[6],"party")==0 ) skill_db[idx]->unit_target = BCT_PARTY;
@@ -21342,7 +21539,7 @@ static void skill_readdb(void)
int i;
const char* dbsubpath[] = {
"",
- "/"DBIMPORT,
+ "/" DBIMPORT,
//add other path here
};
@@ -21363,8 +21560,8 @@ static void skill_readdb(void)
skill_changematerial_count = skill_spellbook_count = skill_magicmushroom_count = 0;
for(i=0; i<ARRAYLENGTH(dbsubpath); i++){
- int n1 = strlen(db_path)+strlen(dbsubpath[i])+1;
- int n2 = strlen(db_path)+strlen(DBPATH)+strlen(dbsubpath[i])+1;
+ size_t n1 = strlen(db_path)+strlen(dbsubpath[i])+1;
+ size_t n2 = strlen(db_path)+strlen(DBPATH)+strlen(dbsubpath[i])+1;
char* dbsubpath1 = (char*)aMalloc(n1+1);
char* dbsubpath2 = (char*)aMalloc(n2+1);
@@ -21376,24 +21573,24 @@ static void skill_readdb(void)
safesnprintf(dbsubpath2,n1,"%s%s",db_path,dbsubpath[i]);
}
- sv_readdb(dbsubpath2, "skill_db.txt" , ',', 18, 18, -1, skill_parse_row_skilldb, i);
- sv_readdb(dbsubpath2, "skill_require_db.txt" , ',', 34, 34, -1, skill_parse_row_requiredb, i);
- sv_readdb(dbsubpath2, "skill_cast_db.txt" , ',', 7, 8, -1, skill_parse_row_castdb, i);
- sv_readdb(dbsubpath2, "skill_castnodex_db.txt", ',', 2, 3, -1, skill_parse_row_castnodexdb, i);
- sv_readdb(dbsubpath2, "skill_unit_db.txt" , ',', 8, 8, -1, skill_parse_row_unitdb, i);
- sv_readdb(dbsubpath2, "skill_nocast_db.txt" , ',', 2, 2, -1, skill_parse_row_nocastdb, i);
-
- sv_readdb(dbsubpath2, "produce_db.txt" , ',', 5, 5+2*MAX_PRODUCE_RESOURCE, MAX_SKILL_PRODUCE_DB, skill_parse_row_producedb, i);
- sv_readdb(dbsubpath1, "create_arrow_db.txt" , ',', 1+2, 1+2*MAX_ARROW_RESULT, MAX_SKILL_ARROW_DB, skill_parse_row_createarrowdb, i);
- sv_readdb(dbsubpath1, "abra_db.txt" , ',', 3, 3, MAX_SKILL_ABRA_DB, skill_parse_row_abradb, i);
- sv_readdb(dbsubpath1, "spellbook_db.txt" , ',', 3, 3, MAX_SKILL_SPELLBOOK_DB, skill_parse_row_spellbookdb, i);
- sv_readdb(dbsubpath1, "magicmushroom_db.txt" , ',', 1, 2, MAX_SKILL_MAGICMUSHROOM_DB, skill_parse_row_magicmushroomdb, i);
- sv_readdb(dbsubpath1, "skill_copyable_db.txt" , ',', 2, 4, -1, skill_parse_row_copyabledb, i);
- sv_readdb(dbsubpath1, "skill_improvise_db.txt" , ',', 2, 2, MAX_SKILL_IMPROVISE_DB, skill_parse_row_improvisedb, i);
- sv_readdb(dbsubpath1, "skill_changematerial_db.txt" , ',', 5, 5+2*MAX_SKILL_CHANGEMATERIAL_SET, MAX_SKILL_CHANGEMATERIAL_DB, skill_parse_row_changematerialdb, i);
- sv_readdb(dbsubpath1, "skill_nonearnpc_db.txt" , ',', 2, 3, -1, skill_parse_row_nonearnpcrangedb, i);
+ sv_readdb(dbsubpath2, "skill_db.txt" , ',', 18, 18, -1, skill_parse_row_skilldb, i > 0);
+ sv_readdb(dbsubpath2, "skill_require_db.txt" , ',', 34, 34, -1, skill_parse_row_requiredb, i > 0);
+ sv_readdb(dbsubpath2, "skill_cast_db.txt" , ',', 7, 8, -1, skill_parse_row_castdb, i > 0);
+ sv_readdb(dbsubpath2, "skill_castnodex_db.txt", ',', 2, 3, -1, skill_parse_row_castnodexdb, i > 0);
+ sv_readdb(dbsubpath2, "skill_unit_db.txt" , ',', 8, 8, -1, skill_parse_row_unitdb, i > 0);
+ sv_readdb(dbsubpath2, "skill_nocast_db.txt" , ',', 2, 2, -1, skill_parse_row_nocastdb, i > 0);
+
+ sv_readdb(dbsubpath2, "produce_db.txt" , ',', 5, 5+2*MAX_PRODUCE_RESOURCE, MAX_SKILL_PRODUCE_DB, skill_parse_row_producedb, i > 0);
+ sv_readdb(dbsubpath1, "create_arrow_db.txt" , ',', 1+2, 1+2*MAX_ARROW_RESULT, MAX_SKILL_ARROW_DB, skill_parse_row_createarrowdb, i > 0);
+ sv_readdb(dbsubpath1, "abra_db.txt" , ',', 3, 3, MAX_SKILL_ABRA_DB, skill_parse_row_abradb, i > 0);
+ sv_readdb(dbsubpath1, "spellbook_db.txt" , ',', 3, 3, MAX_SKILL_SPELLBOOK_DB, skill_parse_row_spellbookdb, i > 0);
+ sv_readdb(dbsubpath1, "magicmushroom_db.txt" , ',', 1, 2, MAX_SKILL_MAGICMUSHROOM_DB, skill_parse_row_magicmushroomdb, i > 0);
+ sv_readdb(dbsubpath1, "skill_copyable_db.txt" , ',', 2, 4, -1, skill_parse_row_copyabledb, i > 0);
+ sv_readdb(dbsubpath1, "skill_improvise_db.txt" , ',', 2, 2, MAX_SKILL_IMPROVISE_DB, skill_parse_row_improvisedb, i > 0);
+ sv_readdb(dbsubpath1, "skill_changematerial_db.txt" , ',', 5, 5+2*MAX_SKILL_CHANGEMATERIAL_SET, MAX_SKILL_CHANGEMATERIAL_DB, skill_parse_row_changematerialdb, i > 0);
+ sv_readdb(dbsubpath1, "skill_nonearnpc_db.txt" , ',', 2, 3, -1, skill_parse_row_nonearnpcrangedb, i > 0);
#ifdef ADJUST_SKILL_DAMAGE
- sv_readdb(dbsubpath1, "skill_damage_db.txt" , ',', 4, 7, -1, skill_parse_row_skilldamage, i);
+ sv_readdb(dbsubpath1, "skill_damage_db.txt" , ',', 4, 7, -1, skill_parse_row_skilldamage, i > 0);
#endif
aFree(dbsubpath1);
aFree(dbsubpath2);
@@ -21424,7 +21621,7 @@ void skill_reload (void) {
*------------------------------------------*/
void do_init_skill(void)
{
- skilldb_name2id = strdb_alloc(DB_OPT_DUP_KEY|DB_OPT_RELEASE_DATA, 0);
+ skilldb_name2id = strdb_alloc((enum DBOptions)(DB_OPT_DUP_KEY|DB_OPT_RELEASE_DATA), 0);
skill_readdb();
@@ -21432,8 +21629,8 @@ void do_init_skill(void)
skillunit_db = idb_alloc(DB_OPT_BASE);
skillusave_db = idb_alloc(DB_OPT_RELEASE_DATA);
bowling_db = idb_alloc(DB_OPT_BASE);
- skill_unit_ers = ers_new(sizeof(struct skill_unit_group),"skill.c::skill_unit_ers",ERS_CACHE_OPTIONS);
- skill_timer_ers = ers_new(sizeof(struct skill_timerskill),"skill.c::skill_timer_ers",ERS_CACHE_OPTIONS);
+ skill_unit_ers = ers_new(sizeof(struct skill_unit_group),"skill.cpp::skill_unit_ers",ERS_CACHE_OPTIONS);
+ skill_timer_ers = ers_new(sizeof(struct skill_timerskill),"skill.cpp::skill_timer_ers",ERS_CACHE_OPTIONS);
ers_chunk_size(skill_unit_ers, 150);
ers_chunk_size(skill_timer_ers, 150);
diff --git a/src/map/skill.h b/src/map/skill.hpp
similarity index 98%
rename from src/map/skill.h
rename to src/map/skill.hpp
index 4d19342e6bc..84450c49021 100644
--- a/src/map/skill.h
+++ b/src/map/skill.hpp
@@ -1,17 +1,19 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _SKILL_H_
-#define _SKILL_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef _SKILL_HPP_
+#define _SKILL_HPP_
+#include "../common/cbasetypes.h"
#include "../common/mmo.h" // MAX_SKILL, struct square
#include "../common/db.h"
-#include "map.h" // struct block_list
-#include "battle.h" // enum damage_lv
+
+#include "map.hpp" // struct block_list
+
+enum damage_lv : uint8;
+enum sc_type : int16;
+enum send_target : uint8;
+enum e_damage_type : uint8;
struct map_session_data;
struct homun_data;
struct skill_unit;
@@ -1789,6 +1791,25 @@ enum e_skill {
SU_TUNAPARTY,
SU_BUNCHOFSHRIMP,
SU_FRESHSHRIMP,
+ SU_CN_METEOR2,
+ SU_LUNATICCARROTBEAT2,
+ SU_SOULATTACK,
+ SU_POWEROFFLOCK,
+ SU_SVG_SPIRIT,
+ SU_HISS,
+ SU_NYANGGRASS,
+ SU_GROOMING,
+ SU_PURRING,
+ SU_SHRIMPARTY,
+ SU_SPIRITOFLIFE,
+ SU_MEOWMEOW,
+ SU_SPIRITOFLAND,
+ SU_CHATTERING,
+ SU_SPIRITOFSEA,
+
+ WE_CALLALLFAMILY = 5063,
+ WE_ONEFOREVER,
+ WE_CHEERUP,
HLIF_HEAL = 8001,
HLIF_AVOID,
@@ -2061,7 +2082,7 @@ enum s_skill_unit_id {
UNT_FIRE_RAIN,
UNT_CATNIPPOWDER,
- UNT_SV_ROOTTWIST,
+ UNT_NYANGGRASS,
/**
* Guild Auras
@@ -2171,8 +2192,4 @@ enum e_skill_damage_caster {
#define SKILL_CHK_ELEM(skill_id) ( (skill_id) >= EL_SKILLBASE && (skill_id) < EL_SKILLBASE+MAX_ELEMENTALSKILL )
#define SKILL_CHK_GUILD(skill_id) ( (skill_id) >= GD_SKILLBASE && (skill_id) < GD_SKILLBASE+MAX_GUILDSKILL )
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _SKILL_H_ */
+#endif /* _SKILL_HPP_ */
diff --git a/src/map/status.c b/src/map/status.cpp
similarity index 94%
rename from src/map/status.c
rename to src/map/status.cpp
index 89e1d16c8b8..a296f7b89ee 100644
--- a/src/map/status.c
+++ b/src/map/status.cpp
@@ -1,6 +1,14 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "status.hpp"
+
+#include <stdlib.h>
+#include <math.h>
+#include <string>
+#include <functional>
+#include <yaml-cpp/yaml.h>
+
#include "../common/cbasetypes.h"
#include "../common/timer.h"
#include "../common/nullpo.h"
@@ -11,19 +19,22 @@
#include "../common/ers.h"
#include "../common/strlib.h"
-#include "battle.h"
-#include "itemdb.h"
-#include "map.h"
-#include "path.h"
-#include "pc.h"
-#include "pet.h"
-#include "battleground.h"
-#include "homunculus.h"
-#include "mercenary.h"
-#include "elemental.h"
-
-#include <stdlib.h>
-#include <math.h>
+#include "battle.hpp"
+#include "itemdb.hpp"
+#include "map.hpp"
+#include "path.hpp"
+#include "pc.hpp"
+#include "pet.hpp"
+#include "battleground.hpp"
+#include "homunculus.hpp"
+#include "mercenary.hpp"
+#include "elemental.hpp"
+#include "script.hpp"
+#include "npc.hpp"
+#include "guild.hpp"
+#include "clif.hpp"
+#include "mob.hpp"
+#include "pc_groups.hpp"
// Regen related flags.
enum e_regen {
@@ -36,9 +47,10 @@ enum e_regen {
// Bonus values and upgrade chances for refining equipment
static struct {
- int chance[MAX_REFINE]; /// Success chance
+ int chance[REFINE_CHANCE_TYPE_MAX][MAX_REFINE]; /// Success chance
int bonus[MAX_REFINE]; /// Cumulative fixed bonus damage
int randombonus_max[MAX_REFINE]; /// Cumulative maximum random bonus damage
+ struct refine_cost cost[REFINE_COST_MAX];
} refine_info[REFINE_TYPE_MAX];
static int atkmods[3][MAX_WEAPON_TYPE]; /// ATK weapon modification for size (size_fix.txt)
@@ -55,6 +67,14 @@ short current_equip_opt_index; /// Contains random option index of an equipped i
unsigned int SCDisabled[SC_MAX]; ///< List of disabled SC on map zones. [Cydh]
+sc_type SkillStatusChangeTable[MAX_SKILL];
+int StatusIconChangeTable[SC_MAX];
+unsigned int StatusChangeFlagTable[SC_MAX];
+int StatusSkillChangeTable[SC_MAX];
+int StatusRelevantBLTypes[SI_MAX];
+unsigned int StatusChangeStateTable[SC_MAX];
+unsigned int StatusDisplayType[SC_MAX];
+
static unsigned short status_calc_str(struct block_list *,struct status_change *,int);
static unsigned short status_calc_agi(struct block_list *,struct status_change *,int);
static unsigned short status_calc_vit(struct block_list *,struct status_change *,int);
@@ -93,7 +113,7 @@ static unsigned int status_calc_maxhpsp_pc(struct map_session_data* sd, unsigned
static int status_get_sc_interval(enum sc_type type);
static bool status_change_isDisabledOnMap_(sc_type type, bool mapIsVS, bool mapIsPVP, bool mapIsGVG, bool mapIsBG, unsigned int mapZone, bool mapIsTE);
-#define status_change_isDisabledOnMap(type, m) ( status_change_isDisabledOnMap_((type), map_flag_vs2((m)), map[(m)].flag.pvp, map_flag_gvg2_no_te((m)), map[(m)].flag.battleground, map[(m)].zone << 3, map_flag_gvg2_te((m))) )
+#define status_change_isDisabledOnMap(type, m) ( status_change_isDisabledOnMap_((type), map_flag_vs2((m)), map[(m)].flag.pvp != 0, map_flag_gvg2_no_te((m)), map[(m)].flag.battleground != 0, (map[(m)].zone << 3) != 0, map_flag_gvg2_te((m))) )
/**
* Returns the status change associated with a skill.
@@ -490,6 +510,9 @@ void initChangeTables(void)
#endif
set_sc( GS_ADJUSTMENT , SC_ADJUSTMENT , SI_ADJUSTMENT , SCB_HIT|SCB_FLEE );
set_sc( GS_INCREASING , SC_INCREASING , SI_ACCURACY , SCB_AGI|SCB_DEX|SCB_HIT );
+#ifdef RENEWAL
+ set_sc( GS_MAGICALBULLET , SC_MAGICALBULLET , SI_GS_MAGICAL_BULLET , SCB_NONE );
+#endif
set_sc( GS_GATLINGFEVER , SC_GATLINGFEVER , SI_GATLINGFEVER ,
#ifndef RENEWAL
SCB_BATK|SCB_FLEE|SCB_SPEED|SCB_ASPD );
@@ -758,9 +781,9 @@ void initChangeTables(void)
set_sc( SO_WARMER , SC_WARMER , SI_WARMER , SCB_NONE );
set_sc( SO_VACUUM_EXTREME , SC_VACUUM_EXTREME , SI_VACUUM_EXTREME , SCB_NONE );
set_sc( SO_ARRULLO , SC_DEEPSLEEP , SI_DEEPSLEEP , SCB_NONE );
- set_sc( SO_FIRE_INSIGNIA , SC_FIRE_INSIGNIA , SI_FIRE_INSIGNIA , SCB_MATK|SCB_BATK|SCB_WATK|SCB_ATK_ELE|SCB_REGEN );
+ set_sc( SO_FIRE_INSIGNIA , SC_FIRE_INSIGNIA , SI_FIRE_INSIGNIA , SCB_MATK|SCB_WATK|SCB_ATK_ELE|SCB_REGEN );
set_sc( SO_WATER_INSIGNIA , SC_WATER_INSIGNIA , SI_WATER_INSIGNIA , SCB_WATK|SCB_ATK_ELE|SCB_REGEN );
- set_sc( SO_WIND_INSIGNIA , SC_WIND_INSIGNIA , SI_WIND_INSIGNIA , SCB_WATK|SCB_ATK_ELE|SCB_REGEN );
+ set_sc( SO_WIND_INSIGNIA , SC_WIND_INSIGNIA , SI_WIND_INSIGNIA , SCB_WATK|SCB_ASPD|SCB_ATK_ELE|SCB_REGEN );
set_sc( SO_EARTH_INSIGNIA , SC_EARTH_INSIGNIA , SI_EARTH_INSIGNIA , SCB_MDEF|SCB_DEF|SCB_MAXHP|SCB_MAXSP|SCB_WATK|SCB_ATK_ELE|SCB_REGEN );
/* Genetic */
@@ -824,8 +847,9 @@ void initChangeTables(void)
set_sc( RL_B_TRAP , SC_B_TRAP , SI_B_TRAP , SCB_SPEED );
set_sc( RL_E_CHAIN , SC_E_CHAIN , SI_E_CHAIN , SCB_NONE );
set_sc( RL_P_ALTER , SC_P_ALTER , SI_P_ALTER , SCB_NONE );
+ set_sc( RL_FALLEN_ANGEL , SC_FALLEN_ANGEL, SI_BLANK, SCB_NONE );
set_sc( RL_SLUGSHOT , SC_STUN , SI_SLUGSHOT , SCB_NONE );
- set_sc( RL_HEAT_BARREL , SC_HEAT_BARREL , SI_HEAT_BARREL , SCB_FLEE|SCB_ASPD );
+ set_sc( RL_HEAT_BARREL , SC_HEAT_BARREL , SI_HEAT_BARREL , SCB_HIT|SCB_ASPD );
set_sc_with_vfx( RL_C_MARKER , SC_C_MARKER , SI_C_MARKER , SCB_FLEE );
set_sc_with_vfx( RL_AM_BLAST , SC_ANTI_M_BLAST , SI_ANTI_M_BLAST , SCB_NONE );
@@ -852,16 +876,24 @@ void initChangeTables(void)
add_sc( SU_SCRATCH , SC_BLEEDING );
set_sc( SU_STOOP , SC_SU_STOOP , SI_SU_STOOP , SCB_NONE );
add_sc( SU_SV_STEMSPEAR , SC_BLEEDING );
- set_sc( SU_CN_POWDERING , SC_CATNIPPOWDER , SI_CATNIPPOWDER , SCB_WATK|SCB_SPEED|SCB_REGEN );
+ set_sc( SU_CN_POWDERING , SC_CATNIPPOWDER , SI_CATNIPPOWDER , SCB_WATK|SCB_MATK|SCB_SPEED|SCB_REGEN );
add_sc( SU_CN_METEOR , SC_CURSE );
- set_sc_with_vfx( SU_SV_ROOTTWIST , SC_SV_ROOTTWIST , SI_SV_ROOTTWIST , SCB_NONE );
- //add_sc( SU_SCAROFTAROU , SC_STUN );
+ set_sc_with_vfx( SU_SV_ROOTTWIST, SC_SV_ROOTTWIST , SI_SV_ROOTTWIST , SCB_NONE );
set_sc( SU_SCAROFTAROU , SC_BITESCAR , SI_BITESCAR , SCB_NONE );
set_sc( SU_ARCLOUSEDASH , SC_ARCLOUSEDASH , SI_ARCLOUSEDASH , SCB_AGI|SCB_SPEED );
add_sc( SU_LUNATICCARROTBEAT , SC_STUN );
set_sc( SU_TUNAPARTY , SC_TUNAPARTY , SI_TUNAPARTY , SCB_NONE );
set_sc( SU_BUNCHOFSHRIMP , SC_SHRIMP , SI_SHRIMP , SCB_BATK|SCB_MATK );
set_sc( SU_FRESHSHRIMP , SC_FRESHSHRIMP , SI_FRESHSHRIMP , SCB_NONE );
+ set_sc( SU_HISS , SC_HISS , SI_HISS , SCB_FLEE2 );
+ set_sc( SU_NYANGGRASS , SC_NYANGGRASS , SI_NYANGGRASS , SCB_DEF|SCB_MDEF );
+ set_sc( SU_GROOMING , SC_GROOMING , SI_GROOMING , SCB_FLEE );
+ add_sc( SU_PURRING , SC_GROOMING );
+ add_sc( SU_SHRIMPARTY , SC_FRESHSHRIMP );
+ add_sc( SU_MEOWMEOW , SC_CHATTERING );
+ set_sc( SU_CHATTERING , SC_CHATTERING , SI_CHATTERING , SCB_WATK|SCB_MATK );
+
+ set_sc( WE_CHEERUP , SC_CHEERUP , SI_CHEERUP , SCB_STR|SCB_AGI|SCB_VIT|SCB_INT|SCB_DEX|SCB_LUK );
/* Storing the target job rather than simply SC_SPIRIT simplifies code later on */
SkillStatusChangeTable[skill_get_index(SL_ALCHEMIST)] = (sc_type)MAPID_ALCHEMIST,
@@ -1038,7 +1070,6 @@ void initChangeTables(void)
StatusIconChangeTable[SC_MTF_MLEATKED] = SI_MTF_MLEATKED;
StatusIconChangeTable[SC_MTF_CRIDAMAGE] = SI_MTF_CRIDAMAGE;
StatusIconChangeTable[SC_QD_SHOT_READY] = SI_E_QD_SHOT_READY;
- StatusIconChangeTable[SC_HEAT_BARREL_AFTER] = SI_HEAT_BARREL_AFTER;
StatusIconChangeTable[SC_QUEST_BUFF1] = SI_QUEST_BUFF1;
StatusIconChangeTable[SC_QUEST_BUFF2] = SI_QUEST_BUFF2;
StatusIconChangeTable[SC_QUEST_BUFF3] = SI_QUEST_BUFF3;
@@ -1083,6 +1114,7 @@ void initChangeTables(void)
/* Summoners status icons */
StatusIconChangeTable[SC_SPRITEMABLE] = SI_SPRITEMABLE;
+ StatusIconChangeTable[SC_SHRIMPBLESSING] = SI_PROTECTIONOFSHRIMP;
StatusIconChangeTable[SC_DORAM_BUF_01] = SI_DORAM_BUF_01;
StatusIconChangeTable[SC_DORAM_BUF_02] = SI_DORAM_BUF_02;
@@ -1115,12 +1147,14 @@ void initChangeTables(void)
// Geffen Magic Tournament Buffs
StatusIconChangeTable[SC_GEFFEN_MAGIC1] = SI_GEFFEN_MAGIC1;
- StatusIconChangeTable[SC_GEFFEN_MAGIC2] = SI_GEFFEN_MAGIC2;
- StatusIconChangeTable[SC_GEFFEN_MAGIC3] = SI_GEFFEN_MAGIC3;
+ StatusIconChangeTable[SC_GEFFEN_MAGIC2] = SI_GEFFEN_MAGIC2;
+ StatusIconChangeTable[SC_GEFFEN_MAGIC3] = SI_GEFFEN_MAGIC3;
// RODEX
StatusIconChangeTable[SC_DAILYSENDMAILCNT] = SI_DAILYSENDMAILCNT;
+ StatusIconChangeTable[SC_DRESSUP] = SI_DRESS_UP;
+
/* Other SC which are not necessarily associated to skills */
StatusChangeFlagTable[SC_ASPDPOTION0] |= SCB_ASPD;
StatusChangeFlagTable[SC_ASPDPOTION1] |= SCB_ASPD;
@@ -1268,7 +1302,11 @@ void initChangeTables(void)
// RODEX
StatusChangeFlagTable[SC_DAILYSENDMAILCNT] |= SCB_NONE;
- // Doram Buffs
+ // Summoner
+ StatusChangeFlagTable[SC_SHRIMPBLESSING] |= SCB_REGEN;
+ StatusChangeFlagTable[SC_DORAM_WALKSPEED] |= SCB_SPEED;
+ StatusChangeFlagTable[SC_DORAM_MATK] |= SCB_MATK;
+ StatusChangeFlagTable[SC_DORAM_FLEE2] |= SCB_FLEE2;
StatusChangeFlagTable[SC_DORAM_BUF_01] |= SCB_REGEN;
StatusChangeFlagTable[SC_DORAM_BUF_02] |= SCB_REGEN;
@@ -1315,6 +1353,7 @@ void initChangeTables(void)
StatusDisplayType[SC_C_MARKER] = BL_PC;
StatusDisplayType[SC_ANTI_M_BLAST] = BL_PC;
StatusDisplayType[SC_SPRITEMABLE] = BL_PC;
+ StatusDisplayType[SC_SV_ROOTTWIST] = BL_PC;
// Costumes
StatusDisplayType[SC_MOONSTAR] = BL_PC;
@@ -1333,6 +1372,7 @@ void initChangeTables(void)
// Clans
StatusDisplayType[SC_CLAN_INFO] = BL_PC|BL_NPC;
+ StatusDisplayType[SC_DRESSUP] = BL_PC;
/* StatusChangeState (SCS_) NOMOVE */
StatusChangeStateTable[SC_ANKLE] |= SCS_NOMOVE;
@@ -1402,7 +1442,6 @@ void initChangeTables(void)
StatusChangeStateTable[SC_SATURDAYNIGHTFEVER] |= SCS_NOCAST;
StatusChangeStateTable[SC_CURSEDCIRCLE_TARGET] |= SCS_NOCAST;
StatusChangeStateTable[SC_KINGS_GRACE] |= SCS_NOCAST;
- StatusChangeStateTable[SC_HEAT_BARREL_AFTER] |= SCS_NOCAST;
/* StatusChangeState (SCS_) NOCHAT (skills) */
StatusChangeStateTable[SC_BERSERK] |= SCS_NOCHAT;
@@ -1660,7 +1699,7 @@ int status_damage(struct block_list *src,struct block_list *target,int64 dhp, in
* Endure count is only reduced by non-players on non-gvg maps.
* val4 signals infinite endure.
**/
- if (src && src->type != BL_PC && !map_flag_gvg2(target->m) && !map[target->m].flag.battleground && --(sce->val2) < 0)
+ if (src && src->type != BL_PC && !map_flag_gvg2(target->m) && !map[target->m].flag.battleground && --(sce->val2) <= 0)
status_change_end(target, SC_ENDURE, INVALID_TIMER);
}
if ((sce=sc->data[SC_GRAVITATION]) && sce->val3 == BCT_SELF) {
@@ -1817,7 +1856,8 @@ int status_damage(struct block_list *src,struct block_list *target,int64 dhp, in
* @param bl: Object to heal [PC|MOB|HOM|MER|ELEM]
* @param hhp: How much HP to heal
* @param hsp: How much SP to heal
- * @param flag: Whether it's Forced(&1) or gives HP/SP(&2) heal effect \n
+ * @param flag: Whether it's Forced(&1), gives HP/SP(&2) heal effect,
+ * or gives HP(&4) heal effect with 0 heal
* Forced healing overrides heal impedement statuses (Berserk)
* @return hp+sp
*/
@@ -1868,7 +1908,7 @@ int status_heal(struct block_list *bl,int64 hhp,int64 hsp, int flag)
sp = status->max_sp - status->sp;
}
- if(!sp && !hp)
+ if(!sp && !hp && !(flag&4))
return 0;
status->hp += hp;
@@ -1884,7 +1924,7 @@ int status_heal(struct block_list *bl,int64 hhp,int64 hsp, int flag)
// Send HP update to client
switch(bl->type) {
- case BL_PC: pc_heal((TBL_PC*)bl,hp,sp,flag&2?1:0); break;
+ case BL_PC: pc_heal((TBL_PC*)bl,hp,sp,flag); break;
case BL_MOB: mob_heal((TBL_MOB*)bl,hp); break;
case BL_HOM: hom_heal((TBL_HOM*)bl); break;
case BL_MER: mercenary_heal((TBL_MER*)bl,hp,sp); break;
@@ -2087,11 +2127,11 @@ bool status_check_skilluse(struct block_list *src, struct block_list *target, ui
if (flag == 1 && sc->data[SC_CURSEDCIRCLE_TARGET] && skill_id == MO_ABSORBSPIRITS) // Absorb Spirits fails to go through
return false;
- if (skill_id != RK_REFRESH && sc->opt1 && sc->opt1 != OPT1_BURNING && skill_id != SR_GENTLETOUCH_CURE) { // Stuned/Frozen/etc
+ if (skill_id != RK_REFRESH && skill_id != SU_GROOMING && sc->opt1 && sc->opt1 != OPT1_BURNING && skill_id != SR_GENTLETOUCH_CURE) { // Stuned/Frozen/etc
if (flag != 1) // Can't cast, casted stuff can't damage.
return false;
- if (!(skill_get_inf(skill_id)&INF_GROUND_SKILL))
- return false; // Targetted spells can't come off.
+ if (skill_get_casttype(skill_id) == CAST_DAMAGE)
+ return false; // Damage spells stop casting.
}
if (
@@ -2105,7 +2145,7 @@ bool status_check_skilluse(struct block_list *src, struct block_list *target, ui
if (sc->data[SC_WINKCHARM] && target && !flag) { // Prevents skill usage
if (unit_bl2ud(src) && (unit_bl2ud(src))->walktimer == INVALID_TIMER)
unit_walktobl(src, map_id2bl(sc->data[SC_WINKCHARM]->val2), 3, 1);
- clif_emotion(src, E_LV);
+ clif_emotion(src, ET_THROB);
return false;
}
@@ -2291,7 +2331,7 @@ int status_check_visibility(struct block_list *src, struct block_list *target)
}
break;
default:
- if (((tsc->option&(OPTION_HIDE|OPTION_CLOAK|OPTION_CHASEWALK)) || tsc->data[SC_CAMOUFLAGE] || tsc->data[SC_STEALTHFIELD]) && !is_boss && !is_detector)
+ if (((tsc->option&(OPTION_HIDE|OPTION_CLOAK|OPTION_CHASEWALK)) || tsc->data[SC_CAMOUFLAGE] || tsc->data[SC_STEALTHFIELD] || tsc->data[SC_SUHIDE]) && !is_boss && !is_detector)
return 0;
}
}
@@ -2311,38 +2351,52 @@ int status_base_amotion_pc(struct map_session_data* sd, struct status_data* stat
int amotion;
int classidx = pc_class2idx(sd->status.class_);
#ifdef RENEWAL_ASPD
- short mod = -1;
-
- switch( sd->weapontype2 ) { // Adjustment for dual weilding
- case W_DAGGER: mod = 0; break; // 0, 1, 1
- case W_1HSWORD:
- case W_1HAXE: mod = 1;
- if( (sd->class_&MAPID_THIRDMASK) == MAPID_GUILLOTINE_CROSS ) // 0, 2, 3
- mod = sd->weapontype2 / W_1HSWORD + W_1HSWORD / sd->weapontype2 ;
- }
+ int16 skill_lv, val = 0;
+ float temp_aspd = 0;
- amotion = ( sd->status.weapon < MAX_WEAPON_TYPE && mod < 0 )
- ? (job_info[classidx].aspd_base[sd->status.weapon]) // Single weapon
- : ((job_info[classidx].aspd_base[sd->weapontype2] // Dual-wield
- + job_info[classidx].aspd_base[sd->weapontype2]) * 6 / 10 + 10 * mod
- - job_info[classidx].aspd_base[sd->weapontype2]
- + job_info[classidx].aspd_base[sd->weapontype1]);
-
- if ( sd->status.shield )
- amotion += ( 2000 - job_info[classidx].aspd_base[W_FIST] ) +
- ( job_info[classidx].aspd_base[MAX_WEAPON_TYPE] - 2000 );
+ amotion = job_info[classidx].aspd_base[sd->weapontype1]; // Single weapon
+ if (sd->status.shield)
+ amotion += job_info[classidx].aspd_base[MAX_WEAPON_TYPE];
+ else if (sd->weapontype2 && sd->equip_index[EQI_HAND_R] != sd->equip_index[EQI_HAND_L])
+ amotion += job_info[classidx].aspd_base[sd->weapontype2] / 4; // Dual-wield
+ switch(sd->status.weapon) {
+ case W_BOW:
+ case W_MUSICAL:
+ case W_WHIP:
+ case W_REVOLVER:
+ case W_RIFLE:
+ case W_GATLING:
+ case W_SHOTGUN:
+ case W_GRENADE:
+ temp_aspd = status->dex * status->dex / 7.0f + status->agi * status->agi * 0.5f;
+ break;
+ default:
+ temp_aspd = status->dex * status->dex / 5.0f + status->agi * status->agi * 0.5f;
+ break;
+ }
+ temp_aspd = (float)(sqrt(temp_aspd) * 0.25f) + 0xc4;
+ if ((skill_lv = pc_checkskill(sd,SA_ADVANCEDBOOK)) > 0 && sd->status.weapon == W_BOOK)
+ val += (skill_lv - 1) / 2 + 1;
+ if ((skill_lv = pc_checkskill(sd,GS_SINGLEACTION)) > 0 && (sd->status.weapon >= W_REVOLVER && sd->status.weapon <= W_GRENADE))
+ val += ((skill_lv + 1) / 2);
+ amotion = ((int)(temp_aspd + ((float)(status_calc_aspd(&sd->bl, &sd->sc, true) + val) * status->agi / 200)) - min(amotion, 200));
#else
+ // Angra Manyu disregards aspd_base and similar
+ if (pc_checkequip2(sd, ITEMID_ANGRA_MANYU, EQI_ACC_L, EQI_MAX))
+ return 0;
+
// Base weapon delay
amotion = (sd->status.weapon < MAX_WEAPON_TYPE)
? (job_info[classidx].aspd_base[sd->status.weapon]) // Single weapon
- : (job_info[classidx].aspd_base[sd->weapontype1] + job_info[classidx].aspd_base[sd->weapontype2])*7/10; // Dual-wield
+ : (job_info[classidx].aspd_base[sd->weapontype1] + job_info[classidx].aspd_base[sd->weapontype2]) * 7 / 10; // Dual-wield
// Percentual delay reduction from stats
- amotion -= amotion * (4*status->agi + status->dex)/1000;
-#endif
+ amotion -= amotion * (4 * status->agi + status->dex) / 1000;
+
// Raw delay adjustment from bAspd bonus
amotion += sd->bonus.aspd_add;
+#endif
return amotion;
}
@@ -2420,7 +2474,7 @@ unsigned int status_weapon_atk(struct weapon_atk wa, struct map_session_data *sd
float str = sd->base_status.str;
int weapon_atk_bonus = 0;
- if (wa.range > 3)
+ if (wa.range > 3 && !pc_checkskill(sd, SU_SOULATTACK))
str = sd->base_status.dex;
if (sd->bonus.weapon_atk_rate)
weapon_atk_bonus = wa.atk * sd->bonus.weapon_atk_rate / 100;
@@ -2736,22 +2790,21 @@ int status_calc_mob_(struct mob_data* md, enum e_status_calc_opt opt)
ShowError("status_calc_mob: No castle set at map %s\n", map[md->bl.m].name);
else if(gc->castle_id < 24 || md->mob_id == MOBID_EMPERIUM) {
#ifdef RENEWAL
- status->max_hp += 50 * gc->defense;
- status->max_sp += 70 * gc->defense;
+ status->max_hp += 50 * (gc->defense / 5);
#else
status->max_hp += 1000 * gc->defense;
- status->max_sp += 200 * gc->defense;
#endif
status->hp = status->max_hp;
- status->sp = status->max_sp;
status->def += (gc->defense+2)/3;
status->mdef += (gc->defense+2)/3;
}
if(md->mob_id != MOBID_EMPERIUM) {
- status->batk += status->batk * 10*md->guardian_data->guardup_lv/100;
- status->rhw.atk += status->rhw.atk * 10*md->guardian_data->guardup_lv/100;
- status->rhw.atk2 += status->rhw.atk2 * 10*md->guardian_data->guardup_lv/100;
- status->aspd_rate -= 100*md->guardian_data->guardup_lv;
+ status->max_hp += 1000 * gc->defense;
+ status->hp = status->max_hp;
+ status->batk += 2 * md->guardian_data->guardup_lv + 8;
+ status->rhw.atk += 2 * md->guardian_data->guardup_lv + 8;
+ status->rhw.atk2 += 2 * md->guardian_data->guardup_lv + 8;
+ status->aspd_rate -= 2 * md->guardian_data->guardup_lv + 3;
}
}
@@ -2773,7 +2826,7 @@ int status_calc_mob_(struct mob_data* md, enum e_status_calc_opt opt)
break;
case AM_CANNIBALIZE:
status->max_hp = 1500 + 200*ud->skill_lv + 10*status_get_lv(mbl);
- status->mode|= MD_CANATTACK|MD_AGGRESSIVE;
+ status->mode = static_cast<e_mode>(status->mode|MD_CANATTACK|MD_AGGRESSIVE);
break;
case MH_SUMMON_LEGION:
{
@@ -2831,11 +2884,11 @@ void status_calc_pet_(struct pet_data *pd, enum e_status_calc_opt opt)
memcpy(&pd->status, &pd->db->status, sizeof(struct status_data));
pd->status.mode = MD_CANMOVE; // Pets discard all modes, except walking
pd->status.class_ = CLASS_NORMAL;
- pd->status.speed = pd->petDB->speed;
+ pd->status.speed = pd->get_pet_db()->speed;
if(battle_config.pet_attack_support || battle_config.pet_damage_support) {
// Attack support requires the pet to be able to attack
- pd->status.mode |= MD_CANATTACK;
+ pd->status.mode = static_cast<e_mode>(pd->status.mode|MD_CANATTACK);
}
}
@@ -2911,8 +2964,9 @@ static int status_get_hpbonus(struct block_list *bl, enum e_status_bonus type) {
bonus += 1000;
if (pc_checkskill(sd, SU_POWEROFSEA) > 0) {
bonus += 1000;
- if (pc_checkskill(sd, SU_TUNABELLY) == 5 && pc_checkskill(sd, SU_TUNAPARTY) == 5 && pc_checkskill(sd, SU_BUNCHOFSHRIMP) == 5 && pc_checkskill(sd, SU_FRESHSHRIMP) == 5)
- bonus += 2000;
+ if ((pc_checkskill(sd, SU_TUNABELLY) + pc_checkskill(sd, SU_TUNAPARTY) + pc_checkskill(sd, SU_BUNCHOFSHRIMP) + pc_checkskill(sd, SU_FRESHSHRIMP) +
+ pc_checkskill(sd, SU_GROOMING) + pc_checkskill(sd, SU_PURRING) + pc_checkskill(sd, SU_SHRIMPARTY)) > 19)
+ bonus += 2000;
}
#ifndef HP_SP_TABLES
if ((sd->class_&MAPID_UPPERMASK) == MAPID_SUPER_NOVICE && sd->status.base_level >= 99)
@@ -3047,8 +3101,9 @@ static int status_get_spbonus(struct block_list *bl, enum e_status_bonus type) {
bonus += 100;
if (pc_checkskill(sd, SU_POWEROFSEA) > 0) {
bonus += 100;
- if (pc_checkskill(sd, SU_TUNABELLY) == 5 && pc_checkskill(sd, SU_TUNAPARTY) == 5 && pc_checkskill(sd, SU_BUNCHOFSHRIMP) == 5 && pc_checkskill(sd, SU_FRESHSHRIMP) == 5)
- bonus += 200;
+ if ((pc_checkskill(sd, SU_TUNABELLY) + pc_checkskill(sd, SU_TUNAPARTY) + pc_checkskill(sd, SU_BUNCHOFSHRIMP) + pc_checkskill(sd, SU_FRESHSHRIMP) +
+ pc_checkskill(sd, SU_GROOMING) + pc_checkskill(sd, SU_PURRING) + pc_checkskill(sd, SU_SHRIMPARTY)) > 19)
+ bonus += 200;
}
}
@@ -3292,8 +3347,8 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt)
sd->regen.state.block = 0;
sd->add_max_weight = 0;
- // Zeroed arrays, order follows the order in pc.h.
- // Add new arrays to the end of zeroed area in pc.h (see comments) and size here. [zzo]
+ // Zeroed arrays, order follows the order in pc.hpp.
+ // Add new arrays to the end of zeroed area in pc.hpp (see comments) and size here. [zzo]
memset (sd->param_bonus, 0, sizeof(sd->param_bonus)
+ sizeof(sd->param_equip)
+ sizeof(sd->subele)
@@ -3358,7 +3413,7 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt)
// !FIXME: Most of these stuff should be calculated once, but how do I fix the memset above to do that? [Skotlex]
// Give them all modes except these (useful for clones)
- base_status->mode = MD_MASK&~(MD_STATUS_IMMUNE|MD_IGNOREMELEE|MD_IGNOREMAGIC|MD_IGNORERANGED|MD_IGNOREMISC|MD_DETECTOR|MD_ANGRY|MD_TARGETWEAK);
+ base_status->mode = static_cast<e_mode>(MD_MASK&~(MD_STATUS_IMMUNE|MD_IGNOREMELEE|MD_IGNOREMAGIC|MD_IGNORERANGED|MD_IGNOREMISC|MD_DETECTOR|MD_ANGRY|MD_TARGETWEAK));
base_status->size = (sd->class_&JOBL_BABY || (sd->class_&MAPID_BASEMASK) == MAPID_SUMMONER) ? SZ_SMALL : SZ_MEDIUM;
if (battle_config.character_size && pc_isriding(sd)) { // [Lupus]
@@ -3437,6 +3492,8 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt)
continue;
if (!sd->inventory_data[index])
continue;
+ if (sd->inventory.u.items_inventory[current_equip_item_index].card[0] == CARD0_CREATE && MakeDWord(sd->inventory.u.items_inventory[current_equip_item_index].card[2], sd->inventory.u.items_inventory[current_equip_item_index].card[3]) == battle_config.reserved_costume_id)
+ continue;
base_status->def += sd->inventory_data[index]->def;
@@ -3474,8 +3531,6 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt)
wa->wlv = wlv;
if(r && sd->weapontype1 != W_BOW) // Renewal magic attack refine bonus
wa->matk += refine_info[wlv].bonus[r-1] / 100;
- if (sd->bonus.weapon_matk_rate)
- wa->matk += wa->matk * sd->bonus.weapon_matk_rate / 100;
#endif
if(r) // Overrefine bonus.
wd->overrefine = refine_info[wlv].randombonus_max[r-1] / 100;
@@ -3490,6 +3545,10 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt)
if (!calculating) // Abort, run_script retriggered this. [Skotlex]
return 1;
}
+#ifdef RENEWAL
+ if (sd->bonus.weapon_matk_rate)
+ wa->matk += wa->matk * sd->bonus.weapon_matk_rate / 100;
+#endif
if(sd->inventory.u.items_inventory[index].card[0] == CARD0_FORGE) { // Forged weapon
wd->star += (sd->inventory.u.items_inventory[index].card[1]>>8);
if(wd->star >= 15) wd->star = 40; // 3 Star Crumbs now give +40 dmg
@@ -3669,9 +3728,11 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt)
if( sd->pd ) { // Pet Bonus
struct pet_data *pd = sd->pd;
- if( pd && pd->petDB && pd->petDB->pet_loyal_script && pd->pet.intimate >= battle_config.pet_equip_min_friendly )
- run_script(pd->petDB->pet_loyal_script,0,sd->bl.id,0);
- if( pd && pd->pet.intimate > 0 && (!battle_config.pet_equip_required || pd->pet.equip > 0) && pd->state.skillbonus == 1 && pd->bonus )
+ s_pet_db *pet_db_ptr = pd->get_pet_db();
+
+ if( pet_db_ptr != nullptr && pet_db_ptr->pet_loyal_script && pd->pet.intimate >= battle_config.pet_equip_min_friendly )
+ run_script(pd->get_pet_db()->pet_loyal_script,0,sd->bl.id,0);
+ if( pd->pet.intimate > 0 && (!battle_config.pet_equip_required || pd->pet.equip > 0) && pd->state.skillbonus == 1 && pd->bonus )
pc_bonus(sd,pd->bonus->type, pd->bonus->val);
}
@@ -3767,7 +3828,7 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt)
#else
base_status->watk = status_weapon_atk(base_status->rhw, sd);
base_status->watk2 = status_weapon_atk(base_status->lhw, sd);
- base_status->eatk = max(sd->bonus.eatk,0);
+ base_status->eatk = sd->bonus.eatk;
#endif
// ----- HP MAX CALCULATION -----
@@ -3880,6 +3941,9 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt)
if (pc_checkskill(sd, SU_POWEROFLIFE) > 0)
base_status->hit += 20;
+ if ((skill = pc_checkskill(sd, SU_SOULATTACK)) > 0)
+ base_status->rhw.range += skill_get_range2(&sd->bl, SU_SOULATTACK, skill, true);
+
// ----- FLEE CALCULATION -----
// Absolute modifiers from passive skills
@@ -3949,13 +4013,8 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt)
else if(pc_isridingdragon(sd))
base_status->aspd_rate += 250-50*pc_checkskill(sd,RK_DRAGONTRAINING);
#else // Needs more info
- if((skill=pc_checkskill(sd,SA_ADVANCEDBOOK))>0 && sd->status.weapon == W_BOOK)
- base_status->aspd_rate += 5*skill;
if((skill = pc_checkskill(sd,SG_DEVIL)) > 0 && pc_is_maxjoblv(sd))
base_status->aspd_rate += 30*skill;
- if((skill=pc_checkskill(sd,GS_SINGLEACTION))>0 &&
- (sd->status.weapon >= W_REVOLVER && sd->status.weapon <= W_GRENADE))
- base_status->aspd_rate += ((skill+1)/2) * 10;
if(pc_isriding(sd))
base_status->aspd_rate -= 500-100*pc_checkskill(sd,KN_CAVALIERMASTERY);
else if(pc_isridingdragon(sd))
@@ -4009,7 +4068,7 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt)
sd->subele[ELE_HOLY] += skill*5;
if((skill=pc_checkskill(sd,BS_SKINTEMPER))>0) {
sd->subele[ELE_NEUTRAL] += skill;
- sd->subele[ELE_FIRE] += skill*4;
+ sd->subele[ELE_FIRE] += skill*5;
}
if((skill=pc_checkskill(sd,SA_DRAGONOLOGY))>0) {
#ifdef RENEWAL
@@ -4122,14 +4181,6 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt)
sd->subele[ELE_NEUTRAL] += sc->data[SC_MTF_MLEATKED]->val3;
if (sc->data[SC_MTF_CRIDAMAGE])
sd->bonus.crit_atk_rate += sc->data[SC_MTF_CRIDAMAGE]->val1;
- if( sc->data[SC_FIRE_INSIGNIA] && sc->data[SC_FIRE_INSIGNIA]->val1 == 3 )
- sd->magic_addele[ELE_FIRE] += 25;
- if( sc->data[SC_WATER_INSIGNIA] && sc->data[SC_WATER_INSIGNIA]->val1 == 3 )
- sd->magic_addele[ELE_WATER] += 25;
- if( sc->data[SC_WIND_INSIGNIA] && sc->data[SC_WIND_INSIGNIA]->val1 == 3 )
- sd->magic_addele[ELE_WIND] += 25;
- if( sc->data[SC_EARTH_INSIGNIA] && sc->data[SC_EARTH_INSIGNIA]->val1 == 3 )
- sd->magic_addele[ELE_EARTH] += 25;
}
status_cpy(&sd->battle_status, base_status);
@@ -4143,7 +4194,7 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt)
clif_skillinfoblock(sd);
// If the skill is learned, the status is infinite.
- if( (skill = pc_checkskill(sd,SU_SPRITEMABLE)) > 0 )
+ if( (skill = pc_checkskill(sd,SU_SPRITEMABLE)) > 0 && !sd->sc.data[SC_SPRITEMABLE] )
sc_start(&sd->bl, &sd->bl, SC_SPRITEMABLE, 100, 1, -1);
calculating = 0;
@@ -4165,7 +4216,7 @@ int status_calc_mercenary_(struct mercenary_data *md, enum e_status_calc_opt opt
if (opt&SCO_FIRST) {
memcpy(status, &md->db->status, sizeof(struct status_data));
status->class_ = CLASS_NORMAL;
- status->mode = MD_CANMOVE|MD_CANATTACK;
+ status->mode = static_cast<e_mode>(MD_CANMOVE|MD_CANATTACK);
status->hp = status->max_hp;
status->sp = status->max_sp;
md->battle_status.hp = merc->hp;
@@ -4210,7 +4261,7 @@ int status_calc_homunculus_(struct homun_data *hd, enum e_status_calc_opt opt)
status->class_ = CLASS_NORMAL;
status->size = (hom->class_ == db->evo_class) ? db->evo_size : db->base_size;
status->rhw.range = 1 + status->size;
- status->mode = MD_CANMOVE|MD_CANATTACK;
+ status->mode = static_cast<e_mode>(MD_CANMOVE|MD_CANATTACK);
status->speed = DEFAULT_WALK_SPEED;
if (battle_config.hom_setting&HOMSET_COPY_SPEED && hd->master)
status->speed = status_get_speed(&hd->master->bl);
@@ -4350,7 +4401,7 @@ int status_calc_npc_(struct npc_data *nd, enum e_status_calc_opt opt)
status->class_ = CLASS_NORMAL;
status->size = nd->size;
status->rhw.range = 1 + status->size;
- status->mode = (MD_CANMOVE|MD_CANATTACK);
+ status->mode = static_cast<e_mode>(MD_CANMOVE|MD_CANATTACK);
status->speed = nd->speed;
}
@@ -4377,12 +4428,15 @@ int status_calc_npc_(struct npc_data *nd, enum e_status_calc_opt opt)
void status_calc_regen(struct block_list *bl, struct status_data *status, struct regen_data *regen)
{
struct map_session_data *sd;
+ struct status_change *sc;
int val, skill, reg_flag;
if( !(bl->type&BL_REGEN) || !regen )
return;
sd = BL_CAST(BL_PC,bl);
+ sc = status_get_sc(bl);
+
val = 1 + (status->vit/5) + (status->max_hp/200);
if( sd && sd->hprecov_rate != 100 )
@@ -4423,6 +4477,9 @@ void status_calc_regen(struct block_list *bl, struct status_data *status, struct
if( (skill=pc_checkskill(sd,WM_LESSON)) > 0 )
val += 3 + 3 * skill;
+ if (sc && sc->count && sc->data[SC_SHRIMPBLESSING])
+ val += 150 / 100;
+
sregen->sp = cap_value(val, 0, SHRT_MAX);
// Skill-related recovery (only when sit)
@@ -4556,11 +4613,36 @@ void status_calc_regen_rate(struct block_list *bl, struct regen_data *regen, str
regen->hp += cap_value(regen->hp * sc->data[SC_GT_REVITALIZE]->val3/100, 1, SHRT_MAX);
regen->state.walk = 1;
}
- if ((sc->data[SC_FIRE_INSIGNIA] && sc->data[SC_FIRE_INSIGNIA]->val1 == 1) // If insignia lvl 1
- || (sc->data[SC_WATER_INSIGNIA] && sc->data[SC_WATER_INSIGNIA]->val1 == 1)
- || (sc->data[SC_EARTH_INSIGNIA] && sc->data[SC_EARTH_INSIGNIA]->val1 == 1)
- || (sc->data[SC_WIND_INSIGNIA] && sc->data[SC_WIND_INSIGNIA]->val1 == 1))
- regen->rate.hp *= 2;
+ if (bl->type == BL_ELEM) { // Recovery bonus only applies to the Elementals.
+ int ele_class = status_get_class(bl);
+
+ switch (ele_class) {
+ case ELEMENTALID_AGNI_S:
+ case ELEMENTALID_AGNI_M:
+ case ELEMENTALID_AGNI_L:
+ if (sc->data[SC_FIRE_INSIGNIA] && sc->data[SC_FIRE_INSIGNIA]->val1 == 1)
+ regen->rate.hp += 100;
+ break;
+ case ELEMENTALID_AQUA_S:
+ case ELEMENTALID_AQUA_M:
+ case ELEMENTALID_AQUA_L:
+ if (sc->data[SC_WATER_INSIGNIA] && sc->data[SC_WATER_INSIGNIA]->val1 == 1)
+ regen->rate.hp += 100;
+ break;
+ case ELEMENTALID_VENTUS_S:
+ case ELEMENTALID_VENTUS_M:
+ case ELEMENTALID_VENTUS_L:
+ if (sc->data[SC_WIND_INSIGNIA] && sc->data[SC_WIND_INSIGNIA]->val1 == 1)
+ regen->rate.hp += 100;
+ break;
+ case ELEMENTALID_TERA_S:
+ case ELEMENTALID_TERA_M:
+ case ELEMENTALID_TERA_L:
+ if (sc->data[SC_EARTH_INSIGNIA] && sc->data[SC_EARTH_INSIGNIA]->val1 == 1)
+ regen->rate.hp += 100;
+ break;
+ }
+ }
if (sc->data[SC_EXTRACT_WHITE_POTION_Z])
regen->rate.hp += (unsigned short)(regen->rate.hp * sc->data[SC_EXTRACT_WHITE_POTION_Z]->val1 / 100.);
if (sc->data[SC_VITATA_500])
@@ -4963,7 +5045,8 @@ void status_calc_bl_main(struct block_list *bl, /*enum scb_flag*/int flag)
if (sd->bonus.ematk > 0)
status->matk_min += sd->bonus.ematk;
if (pc_checkskill(sd, SU_POWEROFLAND) > 0) {
- if (pc_checkskill(sd, SU_SV_STEMSPEAR) == 5 && pc_checkskill(sd, SU_CN_POWDERING) == 5 && pc_checkskill(sd, SU_CN_METEOR) == 5 && pc_checkskill(sd, SU_SV_ROOTTWIST) == 5)
+ if ((pc_checkskill(sd, SU_SV_STEMSPEAR) + pc_checkskill(sd, SU_CN_POWDERING) + pc_checkskill(sd, SU_CN_METEOR) + pc_checkskill(sd, SU_SV_ROOTTWIST) +
+ pc_checkskill(sd, SU_CHATTERING) + pc_checkskill(sd, SU_MEOWMEOW) + pc_checkskill(sd, SU_NYANGGRASS)) > 19)
status->matk_min += status->matk_min * 20 / 100;
}
}
@@ -4996,9 +5079,6 @@ void status_calc_bl_main(struct block_list *bl, /*enum scb_flag*/int flag)
variance += status->lhw.matk * status->lhw.wlv / 10;
}
- if (sc && sc->data[SC_CATNIPPOWDER])
- wMatk -= wMatk * sc->data[SC_CATNIPPOWDER]->val2 / 100;
-
status->matk_min += wMatk - variance;
status->matk_max += wMatk + variance;
}
@@ -5042,9 +5122,7 @@ void status_calc_bl_main(struct block_list *bl, /*enum scb_flag*/int flag)
amotion = (1000 - 4 * status->agi - status->dex) * ((TBL_HOM*)bl)->homunculusDB->baseASPD / 1000;
amotion = status_calc_aspd_rate(bl, sc, amotion);
-
- if (status->aspd_rate != 1000)
- amotion = amotion * status->aspd_rate / 1000;
+ amotion = amotion * status->aspd_rate / 1000;
#endif
amotion = status_calc_fix_aspd(bl, sc, amotion);
@@ -5052,32 +5130,31 @@ void status_calc_bl_main(struct block_list *bl, /*enum scb_flag*/int flag)
status->adelay = status->amotion;
} else if ( bl->type&BL_PC ) {
+ uint16 skill_lv;
+
amotion = status_base_amotion_pc(sd,status);
#ifndef RENEWAL_ASPD
status->aspd_rate = status_calc_aspd_rate(bl, sc, b_status->aspd_rate);
+#endif
+ // Absolute ASPD % modifier
+ amotion = amotion * status->aspd_rate / 1000;
+ if (sd->ud.skilltimer != INVALID_TIMER && (skill_lv = pc_checkskill(sd, SA_FREECAST)) > 0)
+ amotion = amotion * 5 * (skill_lv + 10) / 100;
+#ifdef RENEWAL_ASPD
+ // RE ASPD % modifier
+ amotion += (max(0xc3 - amotion, 2) * (status->aspd_rate2 + status_calc_aspd(bl, sc, false))) / 100;
+ amotion = 10 * (200 - amotion);
- if(status->aspd_rate != 1000)
- amotion = amotion*status->aspd_rate/1000;
-#else
- /// aspd = baseaspd + floor(sqrt((agi^2/2) + (dex^2/5))/4 + (potskillbonus*agi/200))
- amotion -= (int)(sqrt( (pow(status->agi, 2) / 2) + (pow(status->dex, 2) / 5) ) / 4 + (status_calc_aspd(bl, sc, true) * status->agi / 200)) * 10;
-
- if( (status_calc_aspd(bl, sc, false) + status->aspd_rate2) != 0 ) // RE ASPD percertage modifier
- amotion -= ( amotion - pc_maxaspd(sd) ) * (status_calc_aspd(bl, sc, false) + status->aspd_rate2) / 100;
-
- if(status->aspd_rate != 1000) // Absolute percentage modifier
- amotion = ( 200 - (200-amotion/10) * status->aspd_rate / 1000 ) * 10;
+ amotion += sd->bonus.aspd_add;
#endif
amotion = status_calc_fix_aspd(bl, sc, amotion);
status->amotion = cap_value(amotion,pc_maxaspd(sd),2000);
- status->adelay = 2*status->amotion;
+ status->adelay = 2 * status->amotion;
} else { // Mercenary and mobs
amotion = b_status->amotion;
status->aspd_rate = status_calc_aspd_rate(bl, sc, b_status->aspd_rate);
-
- if(status->aspd_rate != 1000)
- amotion = amotion*status->aspd_rate/1000;
+ amotion = amotion*status->aspd_rate/1000;
amotion = status_calc_fix_aspd(bl, sc, amotion);
status->amotion = cap_value(amotion, battle_config.monster_max_aspd, 2000);
@@ -5378,6 +5455,8 @@ static unsigned short status_calc_str(struct block_list *bl, struct status_chang
str += 1;
if(sc->data[SC_FULL_THROTTLE])
str += str * sc->data[SC_FULL_THROTTLE]->val3 / 100;
+ if(sc->data[SC_CHEERUP])
+ str += 3;
return (unsigned short)cap_value(str,0,USHRT_MAX);
}
@@ -5450,6 +5529,8 @@ static unsigned short status_calc_agi(struct block_list *bl, struct status_chang
agi += agi * sc->data[SC_FULL_THROTTLE]->val3 / 100;
if (sc->data[SC_ARCLOUSEDASH])
agi += sc->data[SC_ARCLOUSEDASH]->val2;
+ if(sc->data[SC_CHEERUP])
+ agi += 3;
return (unsigned short)cap_value(agi,0,USHRT_MAX);
}
@@ -5514,6 +5595,8 @@ static unsigned short status_calc_vit(struct block_list *bl, struct status_chang
if(sc->data[SC_DEFENCE])
vit += sc->data[SC_DEFENCE]->val2;
#endif
+ if(sc->data[SC_CHEERUP])
+ vit += 3;
return (unsigned short)cap_value(vit,0,USHRT_MAX);
}
@@ -5584,6 +5667,8 @@ static unsigned short status_calc_int(struct block_list *bl, struct status_chang
int_ += 1;
if(sc->data[SC_FULL_THROTTLE])
int_ += int_ * sc->data[SC_FULL_THROTTLE]->val3 / 100;
+ if(sc->data[SC_CHEERUP])
+ int_ += 3;
if(bl->type != BL_PC) {
if(sc->data[SC_STRIPHELM])
@@ -5665,6 +5750,8 @@ static unsigned short status_calc_dex(struct block_list *bl, struct status_chang
dex -= dex * sc->data[SC_MARSHOFABYSS]->val2 / 100;
if(sc->data[SC_FULL_THROTTLE])
dex += dex * sc->data[SC_FULL_THROTTLE]->val3 / 100;
+ if(sc->data[SC_CHEERUP])
+ dex += 3;
return (unsigned short)cap_value(dex,0,USHRT_MAX);
}
@@ -5727,6 +5814,8 @@ static unsigned short status_calc_luk(struct block_list *bl, struct status_chang
luk += 1;
if(sc->data[SC_FULL_THROTTLE])
luk += luk * sc->data[SC_FULL_THROTTLE]->val3 / 100;
+ if(sc->data[SC_CHEERUP])
+ luk += 3;
return (unsigned short)cap_value(luk,0,USHRT_MAX);
}
@@ -5753,15 +5842,6 @@ static unsigned short status_calc_batk(struct block_list *bl, struct status_chan
if(sc->data[SC_MADNESSCANCEL])
batk += 100;
#endif
- if(sc->data[SC_FIRE_INSIGNIA] && sc->data[SC_FIRE_INSIGNIA]->val1 == 2)
- batk += 50;
- if(bl->type == BL_ELEM
- && ((sc->data[SC_FIRE_INSIGNIA] && sc->data[SC_FIRE_INSIGNIA]->val1 == 1)
- || (sc->data[SC_WATER_INSIGNIA] && sc->data[SC_WATER_INSIGNIA]->val1 == 1)
- || (sc->data[SC_WIND_INSIGNIA] && sc->data[SC_WIND_INSIGNIA]->val1 == 1)
- || (sc->data[SC_EARTH_INSIGNIA] && sc->data[SC_EARTH_INSIGNIA]->val1 == 1))
- )
- batk += batk / 5;
if(sc->data[SC_FULL_SWING_K])
batk += sc->data[SC_FULL_SWING_K]->val1;
if(sc->data[SC_ASH])
@@ -5880,11 +5960,13 @@ static unsigned short status_calc_watk(struct block_list *bl, struct status_chan
watk += sc->data[SC_STRIKING]->val2;
if(sc->data[SC_RUSHWINDMILL])
watk += sc->data[SC_RUSHWINDMILL]->val3;
+ if(sc->data[SC_FIRE_INSIGNIA] && sc->data[SC_FIRE_INSIGNIA]->val1 == 2)
+ watk += 50;
if((sc->data[SC_FIRE_INSIGNIA] && sc->data[SC_FIRE_INSIGNIA]->val1 == 2)
|| (sc->data[SC_WATER_INSIGNIA] && sc->data[SC_WATER_INSIGNIA]->val1 == 2)
|| (sc->data[SC_WIND_INSIGNIA] && sc->data[SC_WIND_INSIGNIA]->val1 == 2)
|| (sc->data[SC_EARTH_INSIGNIA] && sc->data[SC_EARTH_INSIGNIA]->val1 == 2))
- watk += watk / 10;
+ watk += watk * 10 / 100;
if(sc->data[SC_PYROTECHNIC_OPTION])
watk += sc->data[SC_PYROTECHNIC_OPTION]->val2;
if(sc->data[SC_HEATER_OPTION])
@@ -5903,6 +5985,8 @@ static unsigned short status_calc_watk(struct block_list *bl, struct status_chan
watk += sc->data[SC_FLASHCOMBO]->val2;
if (sc->data[SC_CATNIPPOWDER])
watk -= watk * sc->data[SC_CATNIPPOWDER]->val2 / 100;
+ if (sc->data[SC_CHATTERING])
+ watk += sc->data[SC_CHATTERING]->val2;
return (unsigned short)cap_value(watk,0,USHRT_MAX);
}
@@ -5952,6 +6036,12 @@ static unsigned short status_calc_ematk(struct block_list *bl, struct status_cha
matk += sc->data[SC_MTF_MATK2]->val1;
if(sc->data[SC_2011RWC_SCROLL])
matk += 30;
+ if (sc->data[SC_CATNIPPOWDER])
+ matk -= matk * sc->data[SC_CATNIPPOWDER]->val2 / 100;
+ if (sc->data[SC_CHATTERING])
+ matk += sc->data[SC_CHATTERING]->val2;
+ if (sc->data[SC_DORAM_MATK])
+ matk += sc->data[SC_DORAM_MATK]->val1;
return (unsigned short)cap_value(matk,0,USHRT_MAX);
}
@@ -6095,6 +6185,8 @@ static signed short status_calc_hit(struct block_list *bl, struct status_change
hit += hit * sc->data[SC_INCHITRATE]->val1/100;
if(sc->data[SC_BLIND])
hit -= hit * 25/100;
+ if(sc->data[SC_HEAT_BARREL])
+ hit -= sc->data[SC_HEAT_BARREL]->val4;
if(sc->data[SC__GROOMY])
hit -= hit * sc->data[SC__GROOMY]->val3 / 100;
if(sc->data[SC_FEAR])
@@ -6209,8 +6301,8 @@ static signed short status_calc_flee(struct block_list *bl, struct status_change
flee -= flee * 50 / 100;
//if( sc->data[SC_C_MARKER] )
// flee -= (flee * sc->data[SC_C_MARKER]->val3) / 100;
- if(sc->data[SC_HEAT_BARREL])
- flee -= sc->data[SC_HEAT_BARREL]->val4;
+ if (sc->data[SC_GROOMING])
+ flee += sc->data[SC_GROOMING]->val2;
return (short)cap_value(flee,1,SHRT_MAX);
}
@@ -6233,6 +6325,10 @@ static signed short status_calc_flee2(struct block_list *bl, struct status_chang
flee2 += sc->data[SC_WHISTLE]->val3*10;
if(sc->data[SC__UNLUCKY])
flee2 -= flee2 * sc->data[SC__UNLUCKY]->val2 / 100;
+ if (sc->data[SC_HISS])
+ flee2 += sc->data[SC_HISS]->val2;
+ if (sc->data[SC_DORAM_FLEE2])
+ flee2 += sc->data[SC_DORAM_FLEE2]->val1;
return (short)cap_value(flee2,10,SHRT_MAX);
}
@@ -6259,6 +6355,12 @@ static defType status_calc_def(struct block_list *bl, struct status_change *sc,
if(sc->data[SC_STEELBODY])
return 90;
#endif
+ if (sc->data[SC_NYANGGRASS]) {
+ if (bl->type == BL_PC)
+ return 0;
+ else
+ return def >>= 1;
+ }
if(sc->data[SC_DEFSET])
return sc->data[SC_DEFSET]->val1;
@@ -6421,6 +6523,12 @@ static defType status_calc_mdef(struct block_list *bl, struct status_change *sc,
if(sc->data[SC_STEELBODY])
return 90;
#endif
+ if (sc->data[SC_NYANGGRASS]) {
+ if (bl->type == BL_PC)
+ return 0;
+ else
+ return mdef >>= 1;
+ }
if(sc->data[SC_MDEFSET])
return sc->data[SC_MDEFSET]->val1;
@@ -6642,6 +6750,8 @@ static unsigned short status_calc_speed(struct block_list *bl, struct status_cha
val = max( val, 25 );
if (sc->data[SC_ARCLOUSEDASH])
val = max(val, sc->data[SC_ARCLOUSEDASH]->val3);
+ if( sc->data[SC_DORAM_WALKSPEED] )
+ val = max(val, sc->data[SC_DORAM_WALKSPEED]->val1);
// !FIXME: official items use a single bonus for this [ultramage]
if( sc->data[SC_SPEEDUP0] ) // Temporary item-based speedup
@@ -6729,6 +6839,8 @@ static short status_calc_aspd(struct block_list *bl, struct status_change *sc, b
bonus += sc->data[sc_val]->val1;
if (sc->data[SC_ATTHASTE_CASH])
bonus += sc->data[SC_ATTHASTE_CASH]->val1;
+ if (sc->data[SC_HEAT_BARREL])
+ bonus += sc->data[SC_HEAT_BARREL]->val1;
} else {
if (sc->data[SC_DONTFORGETME])
bonus -= sc->data[SC_DONTFORGETME]->val2 / 10;
@@ -6788,8 +6900,8 @@ static short status_calc_aspd(struct block_list *bl, struct status_change *sc, b
bonus += sc->data[SC_GATLINGFEVER]->val1;
if (sc->data[SC_STAR_COMFORT])
bonus += 3 * sc->data[SC_STAR_COMFORT]->val1;
- if (sc->data[SC_HEAT_BARREL])
- bonus += sc->data[SC_HEAT_BARREL]->val3;
+ if (sc->data[SC_WIND_INSIGNIA] && sc->data[SC_WIND_INSIGNIA]->val1 == 2)
+ bonus += 10;
}
return bonus;
@@ -6964,8 +7076,8 @@ static short status_calc_aspd_rate(struct block_list *bl, struct status_change *
aspd_rate += sc->data[SC_PAIN_KILLER]->val2 * 10;
if( sc->data[SC_GOLDENE_FERSE])
aspd_rate -= sc->data[SC_GOLDENE_FERSE]->val3 * 10;
- if( sc->data[SC_HEAT_BARREL] )
- aspd_rate -= sc->data[SC_HEAT_BARREL]->val3 * 10;
+ if (sc->data[SC_WIND_INSIGNIA] && sc->data[SC_WIND_INSIGNIA]->val1 == 2)
+ aspd_rate -= 100;
return (short)cap_value(aspd_rate,0,SHRT_MAX);
}
@@ -7138,16 +7250,16 @@ unsigned char status_calc_attack_element(struct block_list *bl, struct status_ch
static enum e_mode status_calc_mode(struct block_list *bl, struct status_change *sc, enum e_mode mode)
{
if(!sc || !sc->count)
- return cap_value(mode, 0, INT_MAX);
+ return cap_value(mode, MD_NONE, static_cast<e_mode>(INT_MAX));
if(sc->data[SC_MODECHANGE]) {
if (sc->data[SC_MODECHANGE]->val2)
- mode = (mode&~MD_MASK)|sc->data[SC_MODECHANGE]->val2; // Set mode
+ mode = static_cast<e_mode>((mode&~MD_MASK)|sc->data[SC_MODECHANGE]->val2); // Set mode
if (sc->data[SC_MODECHANGE]->val3)
- mode|= sc->data[SC_MODECHANGE]->val3; // Add mode
+ mode = static_cast<e_mode>(mode|sc->data[SC_MODECHANGE]->val3); // Add mode
if (sc->data[SC_MODECHANGE]->val4)
- mode&=~sc->data[SC_MODECHANGE]->val4; // Del mode
+ mode = static_cast<e_mode>(mode&~sc->data[SC_MODECHANGE]->val4); // Del mode
}
- return cap_value(mode, 0, INT_MAX);
+ return cap_value(mode, MD_NONE, static_cast<e_mode>(INT_MAX));
}
/**
@@ -7547,11 +7659,11 @@ void status_set_viewdata(struct block_list *bl, int class_)
nullpo_retv(bl);
if (mobdb_checkid(class_) || mob_is_clone(class_))
vd = mob_get_viewdata(class_);
- else if (npcdb_checkid(class_) || (bl->type == BL_NPC && class_ == WARP_CLASS))
+ else if (npcdb_checkid(class_))
vd = npc_get_viewdata(class_);
else if (homdb_checkid(class_))
vd = hom_get_viewdata(class_);
- else if (mercenary_class(class_))
+ else if (mercenary_db(class_))
vd = mercenary_get_viewdata(class_);
else if (elemental_class(class_))
vd = elemental_get_viewdata(class_);
@@ -7622,9 +7734,15 @@ void status_set_viewdata(struct block_list *bl, int class_)
case BL_MOB:
{
TBL_MOB* md = (TBL_MOB*)bl;
- if (vd)
+ if (vd){
+ mob_free_dynamic_viewdata( md );
+
md->vd = vd;
- else
+ }else if( pcdb_checkid( class_ ) ){
+ mob_set_dynamic_viewdata( md );
+
+ md->vd->class_ = class_;
+ }else
ShowError("status_set_viewdata (MOB): No view data for class %d\n", class_);
}
break;
@@ -7798,6 +7916,10 @@ int status_get_sc_def(struct block_list *src, struct block_list *bl, enum sc_typ
case SC_QUAGMIRE:
case SC_SUITON:
case SC_SWINGDANCE:
+ case SC_FIRE_INSIGNIA:
+ case SC_WATER_INSIGNIA:
+ case SC_WIND_INSIGNIA:
+ case SC_EARTH_INSIGNIA:
return 0;
}
}
@@ -7966,7 +8088,7 @@ int status_get_sc_def(struct block_list *src, struct block_list *bl, enum sc_typ
tick_def2 = status_get_lv(bl) * 100 + (sd ? sd->status.job_level : 1) * 200;
break;
case SC_B_TRAP:
- tick_def = (sd ? sd->status.str : status_get_base_status(bl)->str) * 50; // (custom)
+ tick_def = (sd ? sd->status.str : status_get_base_status(bl)->str) * 50; //! TODO: Figure out reduction formula
break;
case SC_NORECOVER_STATE:
tick_def2 = status->luk * 100;
@@ -8489,9 +8611,9 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
val3 |= sc->data[type]->val3;
val4 |= sc->data[type]->val4;
}
- mode = val2 ? ((val2&~MD_MASK)|val2) : bstatus->mode; // Base mode
- if (val4) mode&=~val4; // Del mode
- if (val3) mode|= val3; // Add mode
+ mode = val2 ? static_cast<e_mode>((val2&~MD_MASK)|val2) : bstatus->mode; // Base mode
+ if (val4) mode = static_cast<e_mode>(mode&~val4); // Del mode
+ if (val3) mode = static_cast<e_mode>(mode|val3); // Add mode
if (mode == bstatus->mode) { // No change.
if (sc->data[type]) // Abort previous status
return status_change_end(bl, type, INVALID_TIMER);
@@ -8661,7 +8783,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
break;
case SC_HEAT_BARREL:
//kRO Update 2014-02-12
- //- Cannot be stacked with Platinum Alter and Madness Canceler (and otherwise?) [Cydh]
+ //- Cannot be stacked with Platinum Alter and Madness Canceler [Cydh]
if (sc->data[SC_P_ALTER] || sc->data[SC_MADNESSCANCEL])
return 0;
break;
@@ -8670,6 +8792,10 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
return 0;
break;
case SC_MADNESSCANCEL:
+ if (sc->data[type]) { // Toggle the status but still consume requirements.
+ status_change_end(bl, type, INVALID_TIMER);
+ return 0;
+ }
if (sc->data[SC_P_ALTER] || sc->data[SC_HEAT_BARREL])
return 0;
break;
@@ -8677,12 +8803,17 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
if (sc->data[SC_DEVOTION] || sc->data[SC_WHITEIMPRISON])
return 0;
break;
+ case SC_GROOMING:
+ case SC_CHATTERING:
+ if (sc->data[type])
+ return 0;
case SC_WEDDING:
case SC_XMAS:
case SC_SUMMER:
case SC_HANBOK:
case SC_OKTOBERFEST:
+ case SC_DRESSUP:
if (!vd)
return 0;
break;
@@ -9038,23 +9169,25 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
status_change_end(bl, SC_BLIND, INVALID_TIMER);
break;
case SC_KINGS_GRACE:
- status_change_end(bl,SC_POISON,INVALID_TIMER);
status_change_end(bl,SC_BLIND,INVALID_TIMER);
- status_change_end(bl,SC_FREEZE,INVALID_TIMER);
- status_change_end(bl,SC_STONE,INVALID_TIMER);
- status_change_end(bl,SC_STUN,INVALID_TIMER);
- status_change_end(bl,SC_SLEEP,INVALID_TIMER);
- status_change_end(bl,SC_BLEEDING,INVALID_TIMER);
status_change_end(bl,SC_CURSE,INVALID_TIMER);
status_change_end(bl,SC_CONFUSION,INVALID_TIMER);
status_change_end(bl,SC_HALLUCINATION,INVALID_TIMER);
- status_change_end(bl,SC_SILENCE,INVALID_TIMER);
status_change_end(bl,SC_BURNING,INVALID_TIMER);
- status_change_end(bl,SC_CRYSTALIZE,INVALID_TIMER);
- status_change_end(bl,SC_FREEZING,INVALID_TIMER);
status_change_end(bl,SC_DEEPSLEEP,INVALID_TIMER);
+ // Fall through
+ case SC_GROOMING:
+ status_change_end(bl,SC_STUN,INVALID_TIMER);
+ status_change_end(bl,SC_FREEZE,INVALID_TIMER);
+ status_change_end(bl,SC_STONE,INVALID_TIMER);
+ status_change_end(bl,SC_SLEEP,INVALID_TIMER);
+ status_change_end(bl,SC_SILENCE,INVALID_TIMER);
+ status_change_end(bl,SC_BLEEDING,INVALID_TIMER);
+ status_change_end(bl,SC_POISON,INVALID_TIMER);
status_change_end(bl,SC_FEAR,INVALID_TIMER);
status_change_end(bl,SC_MANDRAGORA,INVALID_TIMER);
+ status_change_end(bl,SC_CRYSTALIZE,INVALID_TIMER);
+ status_change_end(bl,SC_FREEZING,INVALID_TIMER);
break;
case SC_2011RWC_SCROLL:
status_change_end(bl,SC_FOOD_STR_CASH,INVALID_TIMER);
@@ -9275,7 +9408,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
case SC_SIGNUMCRUCIS:
val2 = 10 + 4*val1; // Def reduction
tick = -1;
- clif_emotion(bl,E_SWT);
+ clif_emotion(bl, ET_SWEAT);
break;
case SC_MAXIMIZEPOWER:
tick_time = val2 = tick>0?tick:60000;
@@ -9524,7 +9657,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
case SC_CONFUSION:
if (!val4)
- clif_emotion(bl,E_WHAT);
+ clif_emotion(bl,ET_QUESTION);
break;
case SC_S_LIFEPOTION:
case SC_L_LIFEPOTION:
@@ -9540,14 +9673,14 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
case SC_BOSSMAPINFO:
if( sd != NULL ) {
struct mob_data *boss_md = map_getmob_boss(bl->m); // Search for Boss on this Map
- if( boss_md == NULL || boss_md->bl.prev == NULL ) { // No MVP on this map - MVP is dead
- clif_bossmapinfo(sd->fd, boss_md, 1);
- return 0; // No need to start SC
+
+ if( boss_md == NULL ) { // No MVP on this map
+ clif_bossmapinfo(sd, NULL, BOSS_INFO_NOT);
+ return 0;
}
val1 = boss_md->bl.id;
- if( (val4 = tick/1000) < 1 )
- val4 = 1;
tick_time = 1000; // [GodLesZ] tick time
+ val4 = tick / tick_time;
}
break;
case SC_HIDING:
@@ -10129,7 +10262,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
tick_time = 10000; // [GodLesZ] tick time
break;
case SC_GIANTGROWTH:
- val2 = 15; // Triple damage success rate.
+ val2 = 15; // Double damage success rate.
break;
/* Arch Bishop */
@@ -10723,7 +10856,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
case SC_REBOUND:
tick_time = 2000;
val4 = tick / tick_time;
- clif_emotion(bl, E_SWT);
+ clif_emotion(bl, ET_SWEAT);
break;
case SC_KINGS_GRACE:
val2 = 3 + val1; //HP Recover rate
@@ -10793,6 +10926,13 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
else
val4 = 0;
break;
+ case SC_FIRE_INSIGNIA:
+ case SC_WATER_INSIGNIA:
+ case SC_WIND_INSIGNIA:
+ case SC_EARTH_INSIGNIA:
+ tick_time = 5000;
+ val4 = tick / tick_time;
+ break;
case SC_NEUTRALBARRIER:
val2 = 10 + val1 * 5; // Def/Mdef
tick = -1;
@@ -10801,7 +10941,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
/* Rebellion */
case SC_B_TRAP:
val2 = src->id;
- val3 = val1 * 25; // -movespeed (custom)
+ val3 = val1 * 25; // -movespeed TODO: Figure out movespeed rate
break;
case SC_C_MARKER:
// val1 = skill_lv
@@ -10815,14 +10955,15 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
val2 = src->id;
break;
case SC_HEAT_BARREL:
- //kRO Update 2014-02-26
{
uint8 n = 10;
if (sd)
n = (uint8)sd->spiritball_old;
- val2 = val1 * 5; // -fixed casttime (custom)
- val3 = val1 * n / 5; // +aspd (custom)
- val4 = 75 - val1 * 5; // -flee
+
+ //kRO Update 2016-05-25
+ val2 = n * 5; // -fixed casttime
+ val3 = (6 + val1 * 2) * n; // ATK
+ val4 = 25 + val1 * 5; // -hit
}
break;
case SC_P_ALTER:
@@ -10830,8 +10971,8 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
uint8 n = 10;
if (sd)
n = (uint8)sd->spiritball_old;
- val2 = val1 * n * 2; // +atk (custom)
- val3 = val1 * 15; // +def (custom)
+ val2 = 10 * n; // +atk
+ val3 = (status->max_hp * (val1 * 5) / 100); // Barrier HP
}
break;
case SC_E_CHAIN:
@@ -10841,17 +10982,20 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
break;
case SC_ANTI_M_BLAST:
val2 = val1 * 10;
- if (bl->type != BL_PC)
- val2 /= 5; //(custom) //kRO update 2012-02-12, reduce the rate for Non-Player target [Cydh]
break;
case SC_CATNIPPOWDER:
val2 = 50; // WATK%, MATK%
val3 = 25 * val1; // Move speed reduction
+ if (bl->type == BL_PC && pc_checkskill(sd, SU_SPIRITOFLAND))
+ val4 = status_get_lv(src) / 12;
break;
- case SC_BITESCAR:
- val2 = 2 * val1; // MHP% damage
- val4 = tick / 1000;
- tick_time = 1000;
+ case SC_BITESCAR: {
+ const struct status_data *b_status = status_get_base_status(src); // Base Status
+
+ val2 = (status_get_max_hp(bl) * (val1 + (b_status->dex / 25))) / status_get_max_hp(bl); // MHP% damage
+ tick_time = 1000;
+ val4 = tick / tick_time;
+ }
break;
case SC_ARCLOUSEDASH:
val2 = 15 + 5 * val1; // AGI
@@ -10862,15 +11006,59 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
case SC_SHRIMP:
val2 = 10; // BATK%, MATK%
break;
- case SC_FRESHSHRIMP:
- val4 = tick / (10000 - ((val1 - 1) * 1000));
- tick_time = 10000 - ((val1 - 1) * 1000);
- if (val4 <= 0) // Prevents a negeative value from happening
- val4 = 0;
+ case SC_FRESHSHRIMP: {
+ int min = 0, max = 0;
+
+#ifdef RENEWAL
+ min = max = status_base_matk(src, status, status_get_lv(src));
+ if (status->rhw.matk > 0) {
+ int wMatk, variance;
+
+ wMatk = status->rhw.matk;
+ variance = wMatk * status->rhw.wlv / 10;
+ min += wMatk - variance;
+ max += wMatk + variance;
+ }
+#endif
+
+ if (sd && sd->right_weapon.overrefine > 0) {
+ min++;
+ max += sd->right_weapon.overrefine - 1;
+ }
+
+ val2 += min + 178; // Heal
+ if (max > min)
+ val2 += rnd() % (max - min); // Heal
+
+ if (sd) {
+ if (pc_checkskill(sd, SU_POWEROFSEA)) {
+ val2 += val2 * 10 / 100;
+ if ((pc_checkskill(sd, SU_TUNABELLY) + pc_checkskill(sd, SU_TUNAPARTY) + pc_checkskill(sd, SU_BUNCHOFSHRIMP) + pc_checkskill(sd, SU_FRESHSHRIMP) +
+ pc_checkskill(sd, SU_GROOMING) + pc_checkskill(sd, SU_PURRING) + pc_checkskill(sd, SU_SHRIMPARTY)) > 19)
+ val2 += val2 * 20 / 100;
+ }
+ if (pc_checkskill(sd, SU_SPIRITOFSEA))
+ val2 *= 2; // Doubles HP
+ }
+ tick_time = 10000 - ((val1 - 1) * 1000);
+ val4 = tick / tick_time;
+ }
break;
case SC_TUNAPARTY:
- val2 = (status->max_hp * (val1 * 10) / 100); // %Max HP to absorb
- //val3 = 6 + val1; // Hits !TODO: Does it have hits too?
+ val2 = (status->max_hp * (val1 * 10) / 100); // Max HP% to absorb
+ if (sd && pc_checkskill(sd, SU_SPIRITOFSEA))
+ val2 <<= 1; // Double the shield life
+ break;
+ case SC_HISS:
+ val2 = 50; // Perfect Dodge
+ sc_start(src, bl, SC_DORAM_WALKSPEED, 100, 50, skill_get_time2(SU_HISS, val1));
+ break;
+ case SC_GROOMING:
+ val2 = 100; // Flee
+ break;
+ case SC_CHATTERING:
+ val2 = 100; // eATK, eMATK
+ sc_start(src, bl, SC_DORAM_WALKSPEED, 100, 50, skill_get_time2(SU_CHATTERING, val1));
break;
case SC_SWORDCLAN:
case SC_ARCWANDCLAN:
@@ -10900,6 +11088,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
case SC_SUMMER:
case SC_HANBOK:
case SC_OKTOBERFEST:
+ case SC_DRESSUP:
if( !vd )
break;
clif_changelook(bl,LOOK_BASE,vd->class_);
@@ -10959,6 +11148,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
case SC_GOLDENMACECLAN:
case SC_CROSSBOWCLAN:
case SC_JUMPINGCLAN:
+ case SC_DRESSUP:
val_flag |= 1;
break;
// Start |1|2 val_flag setting
@@ -11079,8 +11269,10 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
unit_stop_walking(bl,1);
break;
case SC__MANHOLE:
+ // Manhole ignores blow_immune, when the enemy is BL_PC
if (bl->type == BL_PC || !unit_blown_immune(bl,0x1))
unit_stop_walking(bl,1);
+ unit_stop_attack(bl);
break;
case SC_VACUUM_EXTREME:
if (bl->type != BL_PC && !unit_blown_immune(bl,0x1)) {
@@ -11097,12 +11289,12 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
case SC_CAMOUFLAGE:
case SC_STEALTHFIELD:
case SC_VOICEOFSIREN:
- case SC_HEAT_BARREL_AFTER:
case SC_WEDDING:
case SC_XMAS:
case SC_SUMMER:
case SC_HANBOK:
case SC_OKTOBERFEST:
+ case SC_DRESSUP:
case SC_SUHIDE:
unit_stop_attack(bl);
break;
@@ -11266,6 +11458,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
opt_flag |= 0x4;
break;
case SC_SUMMER:
+ case SC_DRESSUP:
sc->option |= OPTION_SUMMER;
opt_flag |= 0x4;
break;
@@ -11383,7 +11576,8 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
}
break;
case SC_BOSSMAPINFO:
- clif_bossmapinfo(sd->fd, map_id2boss(sce->val1), 0); // First Message
+ if (sd)
+ clif_bossmapinfo(sd, map_id2boss(sce->val1), BOSS_INFO_ALIVE_WITHMSG); // First Message
break;
case SC_MERC_HPUP:
status_percent_heal(bl, 100, 0); // Recover Full HP
@@ -11500,6 +11694,7 @@ int status_change_clear(struct block_list* bl, int type)
case SC_SUMMER:
case SC_HANBOK:
case SC_OKTOBERFEST:
+ case SC_DRESSUP:
case SC_NOCHAT:
case SC_FUSION:
case SC_EARTHSCROLL:
@@ -11547,7 +11742,6 @@ int status_change_clear(struct block_list* bl, int type)
case SC_PUSH_CART:
case SC_LIGHT_OF_REGENE:
case SC_STYLE_CHANGE:
- case SC_HEAT_BARREL_AFTER:
case SC_QUEST_BUFF1:
case SC_QUEST_BUFF2:
case SC_QUEST_BUFF3:
@@ -11574,9 +11768,9 @@ int status_change_clear(struct block_list* bl, int type)
case SC_SPRITEMABLE:
case SC_DORAM_BUF_01:
case SC_DORAM_BUF_02:
- case SC_GEFFEN_MAGIC1:
- case SC_GEFFEN_MAGIC2:
- case SC_GEFFEN_MAGIC3:
+ case SC_GEFFEN_MAGIC1:
+ case SC_GEFFEN_MAGIC2:
+ case SC_GEFFEN_MAGIC3:
// Costumes
case SC_MOONSTAR:
case SC_SUPER_STAR:
@@ -11674,7 +11868,8 @@ int status_change_end_(struct block_list* bl, enum sc_type type, int tid, const
struct status_change_entry *sce;
struct status_data *status;
struct view_data *vd;
- int opt_flag = 0, calc_flag;
+ int opt_flag = 0;
+ enum scb_flag calc_flag = SCB_NONE;
nullpo_ret(bl);
@@ -11762,7 +11957,7 @@ int status_change_end_(struct block_list* bl, enum sc_type type, int tid, const
status_display_remove(bl,type);
vd = status_get_viewdata(bl);
- calc_flag = StatusChangeFlagTable[type];
+ calc_flag = static_cast<scb_flag>(StatusChangeFlagTable[type]);
switch(type) {
case SC_GRANITIC_ARMOR:
{
@@ -12078,7 +12273,6 @@ int status_change_end_(struct block_list* bl, enum sc_type type, int tid, const
break;
case SC_NEUTRALBARRIER_MASTER:
case SC_STEALTHFIELD_MASTER:
- case SC_SV_ROOTTWIST:
if( sce->val2 ) {
struct skill_unit_group* group = skill_id2group(sce->val2);
sce->val2 = 0;
@@ -12172,10 +12366,6 @@ int status_change_end_(struct block_list* bl, enum sc_type type, int tid, const
if (sd && sce->val2 != SI_BLANK)
clif_status_load(bl, (enum si_type)sce->val2, 0);
break;
- case SC_HEAT_BARREL:
- if (sd)
- sc_start(bl,bl,SC_HEAT_BARREL_AFTER,100,sce->val1,skill_get_time2(RL_HEAT_BARREL, sce->val1));
- break;
case SC_C_MARKER:
{
// Remove mark data from caster
@@ -12278,6 +12468,7 @@ int status_change_end_(struct block_list* bl, enum sc_type type, int tid, const
opt_flag |= 0x4;
break;
case SC_SUMMER:
+ case SC_DRESSUP:
sc->option &= ~OPTION_SUMMER;
opt_flag |= 0x4;
break;
@@ -12399,14 +12590,14 @@ int status_change_end_(struct block_list* bl, enum sc_type type, int tid, const
if (calc_flag&SCB_DYE) { // Restore DYE color
if (vd && !vd->cloth_color && sce->val4)
clif_changelook(bl,LOOK_CLOTHES_COLOR,sce->val4);
- calc_flag&=~SCB_DYE;
+ calc_flag = static_cast<scb_flag>(calc_flag&~SCB_DYE);
}
/*if (calc_flag&SCB_BODY)// Might be needed in the future. [Rytech]
{ //Restore body style
if (vd && !vd->body_style && sce->val4)
clif_changelook(bl,LOOK_BODY2,sce->val4);
- calc_flag&=~SCB_BODY;
+ calc_flag = static_cast<scb_flag>(calc_flag&~SCB_BODY);
}*/
// On Aegis, when turning off a status change, first goes the sc packet, then the option packet.
@@ -12461,9 +12652,6 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
enum sc_type type = (sc_type)data;
struct block_list *bl;
struct map_session_data *sd;
- struct status_data *status;
- struct status_change *sc;
- struct status_change_entry *sce;
int interval = status_get_sc_interval(type);
bool dounlock = false;
@@ -12472,14 +12660,19 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
ShowDebug("status_change_timer: Null pointer id: %d data: %d\n", id, data);
return 0;
}
- sc = status_get_sc(bl);
- status = status_get_status_data(bl);
- if(!(sc && (sce = sc->data[type]))) {
+ struct status_change * const sc = status_get_sc(bl);
+ struct status_data * const status = status_get_status_data(bl);
+ if(!sc) {
+ ShowDebug("status_change_timer: Null pointer id: %d data: %d bl-type: %d\n", id, data, bl->type);
+ return 0;
+ }
+
+ struct status_change_entry * const sce = sc->data[type];
+ if(!sce) {
ShowDebug("status_change_timer: Null pointer id: %d data: %d bl-type: %d\n", id, data, bl->type);
return 0;
}
-
if( sce->timer != tid ) {
ShowError("status_change_timer: Mismatch for type %d: %d != %d (bl id %d)\n",type,tid,sce->timer, bl->id);
return 0;
@@ -12487,19 +12680,16 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
sd = BL_CAST(BL_PC, bl);
-// Set the next timer of the sce (don't assume the status still exists)
-#define sc_timer_next(t,f,i,d) \
- if( (sce=sc->data[type]) ) \
- sce->timer = add_timer(t,f,i,d); \
- else \
- ShowError("status_change_timer: Unexpected NULL status change id: %d data: %d\n", id, data)
-
+ std::function<void (unsigned int)> sc_timer_next = [&sce, &bl, &data](unsigned int t) {
+ sce->timer = add_timer(t, status_change_timer, bl->id, data);
+ };
+
switch(type) {
case SC_MAXIMIZEPOWER:
case SC_CLOAKING:
if(!status_charge(bl, 0, 1))
break; // Not enough SP to continue.
- sc_timer_next(sce->val2+tick, status_change_timer, bl->id, data);
+ sc_timer_next(sce->val2+tick);
return 0;
case SC_CHASEWALK:
@@ -12511,7 +12701,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
(sc->data[SC_SPIRIT] && sc->data[SC_SPIRIT]->val2 == SL_ROGUE?10:1) // SL bonus -> x10 duration
*skill_get_time2(status_sc2skill(type),sce->val1));
}
- sc_timer_next(sce->val2+tick, status_change_timer, bl->id, data);
+ sc_timer_next(sce->val2+tick);
return 0;
break;
@@ -12521,7 +12711,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
if(sce->val2 % sce->val4 == 0 && !status_charge(bl, 0, 1))
break; // Fail if it's time to substract SP and there isn't.
- sc_timer_next(1000+tick, status_change_timer,bl->id, data);
+ sc_timer_next(1000+tick);
return 0;
}
break;
@@ -12541,14 +12731,14 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
if( --(sce->val2)>0 ) {
sce->val4 += 20; // Use for Shadow Form 2 seconds checking.
- sc_timer_next(20+tick, status_change_timer, bl->id, data);
+ sc_timer_next(20+tick);
return 0;
}
break;
case SC_PROVOKE:
if(sce->val2) { // Auto-provoke (it is ended in status_heal)
- sc_timer_next(1000*60+tick,status_change_timer, bl->id, data );
+ sc_timer_next(1000*60+tick);
return 0;
}
break;
@@ -12564,7 +12754,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
status_change_end(bl, SC_AETERNA, INVALID_TIMER);
sc->opt1 = OPT1_STONE;
clif_changeoption(bl);
- sc_timer_next(min(sce->val4, interval) + tick, status_change_timer, bl->id, data);
+ sc_timer_next(min(sce->val4, interval) + tick);
sce->val4 -= interval; //Remaining time
status_calc_bl(bl, StatusChangeFlagTable[type]);
return 0;
@@ -12577,12 +12767,12 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
case SC_POISON:
case SC_DPOISON:
if (sce->val4 >= 0 && !sc->data[SC_SLOWPOISON]) {
- int64 damage = 0;
+ unsigned int damage = 0;
if (sd)
damage = (type == SC_DPOISON) ? 2 + status->max_hp / 50 : 2 + status->max_hp * 3 / 200;
else
damage = (type == SC_DPOISON) ? 2 + status->max_hp / 100 : 2 + status->max_hp / 200;
- if (status->hp > max(status->max_hp / 4, damage)) // Stop damaging after 25% HP left.
+ if (status->hp > umax(status->max_hp / 4, damage)) // Stop damaging after 25% HP left.
status_zap(bl, damage, 0);
}
break;
@@ -12654,7 +12844,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
break;
}
}
- clif_emotion(bl, E_HEH);
+ clif_emotion(bl, ET_SMILE);
}
}
break;
@@ -12679,7 +12869,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
case SC_TENSIONRELAX:
if(status->max_hp > status->hp && --(sce->val3) >= 0) {
- sc_timer_next(10000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(10000 + tick);
return 0;
}
break;
@@ -12703,7 +12893,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
if( status->hp < status->max_hp )
hp = (sce->val1 < 0) ? (int)(sd->status.max_hp * -1 * sce->val1 / 100.) : sce->val1 ;
status_heal(bl, hp, 0, 2);
- sc_timer_next((sce->val2 * 1000) + tick, status_change_timer, bl->id, data);
+ sc_timer_next((sce->val2 * 1000) + tick);
return 0;
}
break;
@@ -12711,13 +12901,20 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
case SC_BOSSMAPINFO:
if( sd && --(sce->val4) >= 0 ) {
struct mob_data *boss_md = map_id2boss(sce->val1);
- if( boss_md && sd->bl.m == boss_md->bl.m ) {
- clif_bossmapinfo(sd->fd, boss_md, 1); // Update X, Y on minimap
- if (boss_md->bl.prev != NULL) {
- sc_timer_next(5000 + tick, status_change_timer, bl->id, data);
+
+ if (boss_md) {
+ if (sd->bl.m != boss_md->bl.m) // Not on same map anymore
return 0;
+ else if (boss_md->bl.prev != NULL) { // Boss is alive - Update X, Y on minimap
+ sce->val2 = 0;
+ clif_bossmapinfo(sd, boss_md, BOSS_INFO_ALIVE);
+ } else if (boss_md->spawn_timer != INVALID_TIMER && !sce->val2) { // Boss is dead
+ sce->val2 = 1;
+ clif_bossmapinfo(sd, boss_md, BOSS_INFO_DEAD);
}
}
+ sc_timer_next(1000 + tick);
+ return 0;
}
break;
@@ -12772,14 +12969,14 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
if (!status_charge(bl, 0, sp))
break;
}
- sc_timer_next(1000+tick, status_change_timer, bl->id, data);
+ sc_timer_next(1000+tick);
return 0;
}
break;
case SC_BERSERK:
// 5% every 10 seconds [DracoRPG]
if( --( sce->val3 ) > 0 && status_charge(bl, sce->val2, 0) && status->hp > 100 ) {
- sc_timer_next(sce->val4+tick, status_change_timer, bl->id, data);
+ sc_timer_next(sce->val4+tick);
return 0;
}
break;
@@ -12790,7 +12987,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
clif_changestatus(sd,SP_MANNER,sd->status.manner);
clif_updatestatus(sd,SP_MANNER);
if (sd->status.manner < 0) { // Every 60 seconds your manner goes up by 1 until it gets back to 0.
- sc_timer_next(60000+tick, status_change_timer, bl->id, data);
+ sc_timer_next(60000+tick);
return 0;
}
}
@@ -12804,7 +13001,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
// clif_message(bl, timer);
// }
if((sce->val4 -= 500) > 0) {
- sc_timer_next(500 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(500 + tick);
return 0;
}
break;
@@ -12814,7 +13011,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
{
struct block_list *pbl = map_id2bl(sce->val1);
if( pbl && check_distance_bl(bl, pbl, 7) ) {
- sc_timer_next(1000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(1000 + tick);
return 0;
}
}
@@ -12827,35 +13024,35 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
sp = (sce->val1 > 5) ? 35 : 20;
if(!status_charge(bl, hp, sp))
break;
- sc_timer_next(10000+tick, status_change_timer, bl->id, data);
+ sc_timer_next(10000+tick);
return 0;
}
break;
case SC_JAILED:
if(sce->val1 == INT_MAX || --(sce->val1) > 0) {
- sc_timer_next(60000+tick, status_change_timer, bl->id,data);
+ sc_timer_next(60000+tick);
return 0;
}
break;
case SC_BLIND:
if(sc->data[SC_FOGWALL]) { // Blind lasts forever while you are standing on the fog.
- sc_timer_next(5000+tick, status_change_timer, bl->id, data);
+ sc_timer_next(5000+tick);
return 0;
}
break;
case SC_ABUNDANCE:
if(--(sce->val4) > 0) {
status_heal(bl,0,60,0);
- sc_timer_next(10000+tick, status_change_timer, bl->id, data);
+ sc_timer_next(10000+tick);
}
break;
case SC_OBLIVIONCURSE:
if( --(sce->val4) >= 0 ) {
- clif_emotion(bl,E_WHAT);
- sc_timer_next(3000 + tick, status_change_timer, bl->id, data );
+ clif_emotion(bl,ET_QUESTION);
+ sc_timer_next(3000 + tick);
return 0;
}
break;
@@ -12864,7 +13061,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
if( --(sce->val4) >= 0 ) {
if( !status_charge(bl,0,3) )
break;
- sc_timer_next(5000+tick,status_change_timer,bl->id,data);
+ sc_timer_next(5000+tick);
return 0;
}
break;
@@ -12872,7 +13069,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
case SC_CLOAKINGEXCEED:
if(!status_charge(bl,0,10-sce->val1))
break;
- sc_timer_next(1000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(1000 + tick);
return 0;
case SC_RENOVATIO:
@@ -12881,7 +13078,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
if( sc && sc->data[SC_AKAITSUKI] && heal )
heal = ~heal + 1;
status_heal(bl, heal, 0, 3);
- sc_timer_next(5000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(5000 + tick);
return 0;
}
break;
@@ -12894,7 +13091,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
if( --(sce->val4) >= 0 ) {
if( !status_charge(bl, 0, 1) )
break;
- sc_timer_next(1000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(1000 + tick);
return 0;
}
break;
@@ -12906,13 +13103,13 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
status_change_end(bl, (sc_type)i, INVALID_TIMER);
break;
}
- sc_timer_next(10000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(10000 + tick);
return 0;
case SC_ELECTRICSHOCKER:
if( --(sce->val4) >= 0 ) {
status_charge(bl, 0, 5 * sce->val1 * status->max_sp / 100);
- sc_timer_next(1000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(1000 + tick);
return 0;
}
break;
@@ -12922,20 +13119,20 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
break;
if (--sce->val4 >= 0)
sce->val3++;
- sc_timer_next(1000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(1000 + tick);
return 0;
case SC__REPRODUCE:
if(!status_charge(bl, 0, 1))
break;
- sc_timer_next(1000+tick, status_change_timer, bl->id, data);
+ sc_timer_next(1000+tick);
return 0;
case SC__SHADOWFORM:
if( --(sce->val4) >= 0 ) {
if( !status_charge(bl, 0, 11 - sce->val1) )
break;
- sc_timer_next(1000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(1000 + tick);
return 0;
}
break;
@@ -12943,14 +13140,14 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
case SC__INVISIBILITY:
if( !status_charge(bl, 0, (12 - 2 * sce->val1) * status->max_sp / 100) ) // 6% - skill_lv.
break;
- sc_timer_next(1000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(1000 + tick);
return 0;
case SC_STRIKING:
if( --(sce->val4) >= 0 ) {
if( !status_charge(bl,0, sce->val3 ) )
break;
- sc_timer_next(1000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(1000 + tick);
return 0;
}
break;
@@ -12963,7 +13160,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
dounlock = true;
skill_attack(skill_get_type(status_sc2skill(type)), src, unit_bl, bl, SO_CLOUD_KILL, sce->val1, tick, 0);
if (!status_isdead(bl)) {
- sc_timer_next(500 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(500 + tick);
}
}
}
@@ -12981,7 +13178,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
hp = ~hp + 1;
if (status->hp != status->max_hp)
status_heal(bl, hp, 0, 0);
- sc_timer_next(3000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(3000 + tick);
return 0;
}
@@ -12999,7 +13196,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
status_damage(src, bl, damage, 0, clif_damage(bl,bl,tick,status->amotion,status->dmotion+200,damage,1,DMG_NORMAL,0,false), 0);
unit_skillcastcancel(bl,1);
if ( sc->data[type] ) {
- sc_timer_next(1000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(1000 + tick);
}
map_freeblock_unlock();
status_heal(src, damage*(5 + 5 * sce->val1)/100, 0, 0); // 5 + 5% per level
@@ -13009,8 +13206,8 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
case SC_VOICEOFSIREN:
if( --(sce->val4) >= 0 ) {
- clif_emotion(bl,E_LV);
- sc_timer_next(2000 + tick, status_change_timer, bl->id, data);
+ clif_emotion(bl,ET_THROB);
+ sc_timer_next(2000 + tick);
return 0;
}
break;
@@ -13018,7 +13215,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
case SC_DEEPSLEEP:
if( --(sce->val4) >= 0 ) { // Recovers 3% HP/SP every 2 seconds.
status_heal(bl, status->max_hp * 3 / 100, status->max_sp * 3 / 100, 2);
- sc_timer_next(2000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(2000 + tick);
return 0;
}
break;
@@ -13028,7 +13225,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
if( !status_charge(bl,0,sce->val3) )
break;
status_heal(bl, sce->val2, 0, 1);
- sc_timer_next(1000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(1000 + tick);
return 0;
}
break;
@@ -13036,7 +13233,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
case SC_SONGOFMANA:
if( --(sce->val4) >= 0 ) {
status_heal(bl,0,sce->val3,3);
- sc_timer_next(5000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(5000 + tick);
return 0;
}
break;
@@ -13047,7 +13244,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
if( --(sce->val3) >= 0 ) {
if( !status_charge(bl, status->hp / 100, status->sp / 100) )
break;
- sc_timer_next(sce->val4+tick, status_change_timer, bl->id, data);
+ sc_timer_next(sce->val4+tick);
return 0;
}
break;
@@ -13055,7 +13252,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
case SC_MELODYOFSINK:
if( --(sce->val4) >= 0 ) {
status_charge(bl, 0, status->max_sp * ( 2 * sce->val1 + 2 * sce->val2 ) / 100);
- sc_timer_next(1000+tick, status_change_timer, bl->id, data);
+ sc_timer_next(1000+tick);
return 0;
}
break;
@@ -13064,7 +13261,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
if( --(sce->val4) >= 0 ) { // Drains 2% of HP and 1% of SP every seconds.
if (!status_charge(bl, status->max_hp * 2 / 100, status->max_sp / 100))
break;
- sc_timer_next(1000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(1000 + tick);
return 0;
}
break;
@@ -13072,13 +13269,13 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
case SC_FORCEOFVANGUARD:
if( !status_charge(bl,0,24 - 4 * sce->val1) )
break;
- sc_timer_next(10000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(10000 + tick);
return 0;
case SC_BANDING:
if( status_charge(bl, 0, 7 - sce->val1) ) {
if( sd ) pc_banding(sd, sce->val1);
- sc_timer_next(5000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(5000 + tick);
return 0;
}
break;
@@ -13087,14 +13284,14 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
if( --(sce->val4) > 0 ) {
if( !status_charge(bl,0,10) )
break;
- sc_timer_next(1000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(1000 + tick);
return 0;
}
break;
case SC_OVERHEAT_LIMITPOINT:
if( --(sce->val1) > 0 ) { // Cooling
- sc_timer_next(30000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(30000 + tick);
}
break;
@@ -13105,7 +13302,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
map_freeblock_lock();
status_fix_damage(NULL,bl,damage,clif_damage(bl,bl,tick,0,0,damage,0,DMG_NORMAL,0,false));
if( sc->data[type] ) {
- sc_timer_next(1000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(1000 + tick);
}
map_freeblock_unlock();
}
@@ -13119,7 +13316,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
break;
if (!status_charge(bl, 0, 50))
status_zap(bl, 0, status->sp);
- sc_timer_next(1000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(1000 + tick);
return 0;
}
break;
@@ -13131,7 +13328,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
if( !status_charge(bl,hp,sp) ) break;
- sc_timer_next(5000+tick,status_change_timer,bl->id, data);
+ sc_timer_next(5000+tick);
return 0;
}
break;
@@ -13140,7 +13337,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
// 1% every 5 seconds [Jobbie]
if( --(sce->val3)>0 && status_charge(bl, sce->val2, 0) ) {
if( !sc->data[type] ) return 0;
- sc_timer_next(5000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(5000 + tick);
return 0;
}
break;
@@ -13168,18 +13365,18 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
if( !status_charge(bl,0,sce->val2) ) {
struct block_list *s_bl = battle_get_master(bl);
if (bl->type == BL_ELEM)
- elemental_change_mode(BL_CAST(BL_ELEM, bl), MAX_ELESKILLTREE);
+ elemental_change_mode(BL_CAST(BL_ELEM, bl), static_cast<e_mode>(MAX_ELESKILLTREE));
if( s_bl )
- status_change_end(s_bl,type+1,INVALID_TIMER);
+ status_change_end(s_bl,static_cast<sc_type>(type+1),INVALID_TIMER);
status_change_end(bl,type,INVALID_TIMER);
break;
}
- sc_timer_next(sce->val3 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(sce->val3 + tick);
return 0;
case SC_WATER_SCREEN_OPTION:
status_heal(bl,1000,0,2);
- sc_timer_next(10000 + tick,status_change_timer,bl->id,data);
+ sc_timer_next(10000 + tick);
return 0;
case SC_TEARGAS:
@@ -13191,7 +13388,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
clif_damage(bl, bl, tick, 0, 0, damage, 1, DMG_MULTI_HIT_ENDURE, 0, false);
status_damage(src, bl, damage,0, 0, 1);
if( sc->data[type] ) {
- sc_timer_next(2000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(2000 + tick);
}
map_freeblock_unlock();
return 0;
@@ -13199,8 +13396,8 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
break;
case SC_TEARGAS_SOB:
if( --(sce->val4) >= 0 ) {
- clif_emotion(bl, E_SOB);
- sc_timer_next(3000 + tick, status_change_timer, bl->id, data);
+ clif_emotion(bl, ET_CRY);
+ sc_timer_next(3000 + tick);
return 0;
}
break;
@@ -13212,7 +13409,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
skill_sit(sd, 1);
clif_sitting(bl);
}
- sc_timer_next(10000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(10000 + tick);
return 0;
}
break;
@@ -13221,26 +13418,26 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
case SC_SOULCOLD:
case SC_HAWKEYES:
// They only end by status_change_end
- sc_timer_next(600000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(600000 + tick);
return 0;
case SC_MEIKYOUSISUI:
if( --(sce->val4) >= 0 ) {
status_heal(bl, status->max_hp * sce->val2 / 100, status->max_sp * sce->val3 / 100, 0);
- sc_timer_next(1000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(1000 + tick);
return 0;
}
break;
case SC_KAGEMUSYA:
if( --(sce->val2) >= 0 ) {
if(!status_charge(bl, 0, 1)) break;
- sc_timer_next(1000+tick, status_change_timer, bl->id, data);
+ sc_timer_next(1000+tick);
return 0;
}
break;
case SC_ANGRIFFS_MODUS:
if(--(sce->val4) >= 0) { // Drain hp/sp
if( !status_charge(bl,100,20) ) break;
- sc_timer_next(1000+tick,status_change_timer,bl->id, data);
+ sc_timer_next(1000+tick);
return 0;
}
break;
@@ -13250,35 +13447,35 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
int sp = (status->max_sp * sce->val3) / 100;
if(bl->type == BL_MOB) hp = sp*10;
if( !status_charge(bl,hp,sp) )break;
- sc_timer_next(1000+tick,status_change_timer,bl->id, data);
+ sc_timer_next(1000+tick);
return 0;
}
break;
case SC_FULL_THROTTLE:
if( --(sce->val4) >= 0 ) {
status_percent_damage(bl, bl, 0, sce->val2, false);
- sc_timer_next(1000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(1000 + tick);
return 0;
}
break;
case SC_REBOUND:
if( --(sce->val4) >= 0 ) {
- clif_emotion(bl, E_SWT);
- sc_timer_next(2000 + tick, status_change_timer, bl->id, data);
+ clif_emotion(bl, ET_SWEAT);
+ sc_timer_next(2000 + tick);
return 0;
}
break;
case SC_KINGS_GRACE:
if( --(sce->val4) >= 0 ) {
status_percent_heal(bl, sce->val2, 0);
- sc_timer_next(1000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(1000 + tick);
return 0;
}
break;
case SC_FRIGG_SONG:
if( --(sce->val4) >= 0 ) {
status_heal(bl, sce->val3, 0, 0);
- sc_timer_next(1000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(1000 + tick);
return 0;
}
break;
@@ -13287,7 +13484,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
TBL_PC *caster = map_id2sd(sce->val2);
if (!caster || caster->bl.m != bl->m) //End the SC if caster isn't in same map
break;
- sc_timer_next(1000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(1000 + tick);
clif_crimson_marker(caster, bl, false);
return 0;
}
@@ -13296,7 +13493,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
if (--(sce->val4) >= 0) {
if (!status_charge(bl, 0, status->max_sp * 3 / 100))
break;
- sc_timer_next(sce->val3 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(sce->val3 + tick);
return 0;
}
break;
@@ -13306,28 +13503,72 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
clif_slide(bl, sce->val3>>16, sce->val3&0xFFFF);
clif_fixpos(bl);
}
- sc_timer_next(tick+sce->val4, status_change_timer, bl->id, data);
+ sc_timer_next(tick+sce->val4);
sce->val4 = 0;
}
break;
+ case SC_FIRE_INSIGNIA:
+ if (--(sce->val4) >= 0) {
+ if (status->def_ele == ELE_FIRE)
+ status_heal(bl, status->max_hp / 100, 0, 1);
+ else if (status->def_ele == ELE_EARTH)
+ status_zap(bl, status->max_hp / 100, 0);
+ sc_timer_next(5000 + tick);
+ return 0;
+ }
+ break;
+
+ case SC_WATER_INSIGNIA:
+ if (--(sce->val4) >= 0) {
+ if (status->def_ele == ELE_WATER)
+ status_heal(bl, status->max_hp / 100, 0, 1);
+ else if (status->def_ele == ELE_FIRE)
+ status_zap(bl, status->max_hp / 100, 0);
+ sc_timer_next(5000 + tick);
+ return 0;
+ }
+ break;
+
+ case SC_WIND_INSIGNIA:
+ if (--(sce->val4) >= 0) {
+ if (status->def_ele == ELE_WIND)
+ status_heal(bl, status->max_hp / 100, 0, 1);
+ else if (status->def_ele == ELE_WATER)
+ status_zap(bl, status->max_hp / 100, 0);
+ sc_timer_next(5000 + tick);
+ return 0;
+ }
+ break;
+
+ case SC_EARTH_INSIGNIA:
+ if (--(sce->val4) >= 0) {
+ if (status->def_ele == ELE_EARTH)
+ status_heal(bl, status->max_hp / 100, 0, 1);
+ else if (status->def_ele == ELE_WIND)
+ status_zap(bl, status->max_hp / 100, 0);
+ sc_timer_next(5000 + tick);
+ return 0;
+ }
+ break;
case SC_BITESCAR:
if (--(sce->val4) >= 0) {
status_percent_damage(bl, bl, -(sce->val2), 0, 0);
- sc_timer_next(1000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(1000 + tick);
return 0;
}
break;
case SC_FRESHSHRIMP:
if (--(sce->val4) >= 0) {
- status_heal(bl, status->max_hp * 4 / 100, 0, 2);
- sc_timer_next((10000 - ((sce->val1 - 1) * 1000)) + tick, status_change_timer, bl->id, data);
+ status_heal(bl, sce->val2, 0, 3);
+ sc_timer_next((10000 - ((sce->val1 - 1) * 1000)) + tick);
+ return 0;
}
break;
case SC_DORAM_BUF_01:
if( sd && --(sce->val4) >= 0 ) {
if( status->hp < status->max_hp )
status_heal(bl, 10, 0, 2);
- sc_timer_next(10000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(10000 + tick);
return 0;
}
break;
@@ -13335,7 +13576,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
if( sd && --(sce->val4) >= 0 ) {
if( status->sp < status->max_sp )
status_heal(bl, 0, 5, 2);
- sc_timer_next(10000 + tick, status_change_timer, bl->id, data);
+ sc_timer_next(10000 + tick);
return 0;
}
break;
@@ -13343,7 +13584,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
// If status has an interval and there is at least 100ms remaining time, wait for next interval
if(interval > 0 && sc->data[type] && sce->val4 >= 100) {
- sc_timer_next(min(sce->val4,interval)+tick, status_change_timer, bl->id, data);
+ sc_timer_next(min(sce->val4,interval)+tick);
sce->val4 -= interval;
if (dounlock)
map_freeblock_unlock();
@@ -13355,7 +13596,6 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
// Default for all non-handled control paths is to end the status
return status_change_end( bl,type,tid );
-#undef sc_timer_next
}
/**
@@ -13425,7 +13665,7 @@ int status_change_timer_sub(struct block_list* bl, va_list ap)
break;
case SC_TINDER_BREAKER:
case SC_CLOSECONFINE:{
- int type2 = ((type==SC_CLOSECONFINE)?SC_CLOSECONFINE2:SC_TINDER_BREAKER2);
+ enum sc_type type2 = ((type==SC_CLOSECONFINE)?SC_CLOSECONFINE2:SC_TINDER_BREAKER2);
// Lock char has released the hold on everyone...
if (tsc && tsc->data[type2] && tsc->data[type2]->val2 == src->id) {
tsc->data[type2]->val2 = 0;
@@ -13536,7 +13776,6 @@ void status_change_clear_buffs(struct block_list* bl, uint8 type)
case SC_MTF_MATK:
case SC_MTF_MLEATKED:
case SC_MTF_CRIDAMAGE:
- case SC_HEAT_BARREL_AFTER:
case SC_QUEST_BUFF1:
case SC_QUEST_BUFF2:
case SC_QUEST_BUFF3:
@@ -13981,13 +14220,16 @@ static int status_natural_heal_timer(int tid, unsigned int tick, int id, intptr_
* @param refine: The target's refine level
* @return The chance to refine the item, in percent (0~100)
*/
-int status_get_refine_chance(enum refine_type wlv, int refine)
+int status_get_refine_chance(enum refine_type wlv, int refine, bool enriched)
{
-
if ( refine < 0 || refine >= MAX_REFINE)
return 0;
+
+ int type = enriched ? 1 : 0;
+ if (battle_config.event_refine_chance)
+ type |= 2;
- return refine_info[wlv].chance[refine];
+ return refine_info[wlv].chance[type][refine];
}
/**
@@ -14031,9 +14273,9 @@ void status_change_clear_onChangeMap(struct block_list *bl, struct status_change
if (sc && sc->count) {
unsigned short i;
bool mapIsVS = map_flag_vs2(bl->m);
- bool mapIsPVP = map[bl->m].flag.pvp;
+ bool mapIsPVP = map[bl->m].flag.pvp != 0;
bool mapIsGVG = map_flag_gvg2_no_te(bl->m);
- bool mapIsBG = map[bl->m].flag.battleground;
+ bool mapIsBG = map[bl->m].flag.battleground != 0;
bool mapIsTE = map_flag_gvg2_te(bl->m);
unsigned int mapZone = map[bl->m].zone << 3;
@@ -14092,45 +14334,112 @@ static bool status_readdb_sizefix(char* fields[], int columns, int current)
}
/**
- * Read refine database for refining calculations
- * @param fields: Fields passed from sv_readdb
- * @param columns: Columns passed from sv_readdb function call
- * @param current: Current row being read into refine_info array
- * @return True
+ * Reads and parses an entry from the refine_db
+ * @param node: The YAML node containing the entry
+ * @param refine_info_index: The sequential index of the current entry
+ * @param file_name: File name for displaying only
+ * @return True on success or false on failure
*/
-static bool status_readdb_refine(char* fields[], int columns, int current)
-{
- int i, bonus_per_level, random_bonus, random_bonus_start_level;
+static bool status_yaml_readdb_refine_sub(const YAML::Node &node, int refine_info_index, const std::string &file_name) {
+ if (refine_info_index < 0 || refine_info_index >= REFINE_TYPE_MAX)
+ return false;
- current = atoi(fields[0]);
+ int bonus_per_level = node["StatsPerLevel"].as<int>();
+ int random_bonus_start_level = node["RandomBonusStartLevel"].as<int>();
+ int random_bonus = node["RandomBonusValue"].as<int>();
+ const YAML::Node &costs = node["Costs"];
- if (current < 0 || current >= REFINE_TYPE_MAX)
- return false;
+ for (const auto costit : costs) {
+ const YAML::Node &type = costit;
+ int idx = 0, price;
+ unsigned short material;
+ const std::string keys[] = { "Type", "Price", "Material" };
- bonus_per_level = atoi(fields[1]);
- random_bonus_start_level = atoi(fields[2]);
- random_bonus = atoi(fields[3]);
+ for (int i = 0; i < ARRAYLENGTH(keys); i++) {
+ if (!type[keys[i]].IsDefined())
+ ShowWarning("status_yaml_readdb_refine_sub: Invalid refine cost with undefined " CL_WHITE "%s" CL_RESET "in file" CL_WHITE "%s" CL_RESET ".\n", keys[i].c_str(), file_name.c_str());
+ }
- for(i = 0; i < MAX_REFINE; i++) {
- char* delim;
+ std::string refine_cost_const = type["Type"].as<std::string>();
+ if (ISDIGIT(refine_cost_const[0]))
+ idx = atoi(refine_cost_const.c_str());
+ else
+ script_get_constant(refine_cost_const.c_str(), &idx);
+ price = type["Price"].as<int>();
+ material = type["Material"].as<uint16>();
- if (!(delim = strchr(fields[4+i], ':')))
- return false;
+ refine_info[refine_info_index].cost[idx].nameid = material;
+ refine_info[refine_info_index].cost[idx].zeny = price;
+ }
- *delim = '\0';
+ const YAML::Node &rates = node["Rates"];
- refine_info[current].chance[i] = atoi(fields[4+i]);
+ for (const auto rateit : rates) {
+ const YAML::Node &level = rateit;
+ int refine_level = level["Level"].as<int>() - 1;
+
+ if (refine_level >= MAX_REFINE)
+ continue;
- if (i >= random_bonus_start_level - 1)
- refine_info[current].randombonus_max[i] = random_bonus * (i - random_bonus_start_level + 2);
+ if (level["NormalChance"].IsDefined())
+ refine_info[refine_info_index].chance[REFINE_CHANCE_NORMAL][refine_level] = level["NormalChance"].as<int>();
+ if (level["EnrichedChance"].IsDefined())
+ refine_info[refine_info_index].chance[REFINE_CHANCE_ENRICHED][refine_level] = level["EnrichedChance"].as<int>();
+ if (level["EventNormalChance"].IsDefined())
+ refine_info[refine_info_index].chance[REFINE_CHANCE_EVENT_NORMAL][refine_level] = level["EventNormalChance"].as<int>();
+ if (level["EventEnrichedChance"].IsDefined())
+ refine_info[refine_info_index].chance[REFINE_CHANCE_EVENT_ENRICHED][refine_level] = level["EventEnrichedChance"].as<int>();
+ if (level["Bonus"].IsDefined())
+ refine_info[refine_info_index].bonus[refine_level] = level["Bonus"].as<int>();
- refine_info[current].bonus[i] = bonus_per_level + atoi(delim+1);
- if (i > 0)
- refine_info[current].bonus[i] += refine_info[current].bonus[i-1];
+ if (refine_level >= random_bonus_start_level - 1)
+ refine_info[refine_info_index].randombonus_max[refine_level] = random_bonus * (refine_level - random_bonus_start_level + 2);
}
+ for (int refine_level = 0; refine_level < MAX_REFINE; ++refine_level)
+ refine_info[refine_info_index].bonus[refine_level] += bonus_per_level + (refine_level > 0 ? refine_info[refine_info_index].bonus[refine_level - 1] : 0);
+
return true;
}
+/**
+ * Loads refine values from the refine_db
+ * @param directory: Location of refine_db file
+ * @param file: File name
+ */
+static void status_yaml_readdb_refine(const std::string &directory, const std::string &file) {
+ int count = 0;
+ const std::string labels[] = { "Armor", "WeaponLv1", "WeaponLv2", "WeaponLv3", "WeaponLv4", "Shadow" };
+ const std::string current_file = directory + "/" + file;
+ YAML::Node config;
+
+ try {
+ config = YAML::LoadFile(current_file);
+ }
+ catch (...) {
+ ShowError("Failed to read '" CL_WHITE "%s" CL_RESET "'.\n", current_file.c_str());
+ return;
+ }
+
+ for (int i = 0; i < ARRAYLENGTH(labels); i++) {
+ const YAML::Node &node = config[labels[i]];
+
+ if (node.IsDefined() && status_yaml_readdb_refine_sub(node, i, file))
+ count++;
+ }
+ ShowStatus("Done reading '" CL_WHITE "%d" CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'.\n", count, current_file.c_str());
+}
+
+/**
+ * Returns refine cost (zeny or item) for a weapon level.
+ * @param weapon_lv Weapon level
+ * @param type Refine type (can be retrieved from refine_cost_type enum)
+ * @param what true = returns zeny, false = returns item id
+ * @return Refine cost for a weapon level
+ */
+int status_get_refine_cost(int weapon_lv, int type, bool what) {
+ return what ? refine_info[weapon_lv].cost[type].zeny : refine_info[weapon_lv].cost[type].nameid;
+}
+
/**
* Read attribute fix database for attack calculations
* Function stores information in the attr_fix_table
@@ -14181,7 +14490,7 @@ static bool status_readdb_attrfix(const char *basedir,bool silent)
entries++;
}
fclose(fp);
- ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", entries, path);
+ ShowStatus("Done reading '" CL_WHITE "%d" CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'.\n", entries, path);
return true;
}
@@ -14200,7 +14509,7 @@ int status_readdb(void)
int i, j, k;
const char* dbsubpath[] = {
"",
- "/"DBIMPORT,
+ "/" DBIMPORT,
//add other path here
};
// Initialize databases to default
@@ -14210,15 +14519,17 @@ int status_readdb(void)
for(i=0;i<ARRAYLENGTH(atkmods);i++)
for(j=0;j<MAX_WEAPON_TYPE;j++)
atkmods[i][j]=100;
- // refine_db.txt
+ // refine_db.yml
for(i=0;i<ARRAYLENGTH(refine_info);i++)
{
- for(j=0;j<MAX_REFINE; j++)
- {
- refine_info[i].chance[j] = 100;
- refine_info[i].bonus[j] = 0;
- refine_info[i].randombonus_max[j] = 0;
- }
+ memset(refine_info[i].cost, 0, sizeof(struct refine_cost));
+ for(j = 0; j < REFINE_CHANCE_TYPE_MAX; j++)
+ for(k=0;k<MAX_REFINE; k++)
+ {
+ refine_info[i].chance[j][k] = 100;
+ refine_info[i].bonus[k] = 0;
+ refine_info[i].randombonus_max[k] = 0;
+ }
}
// attr_fix.txt
for(i=0;i<4;i++)
@@ -14229,8 +14540,8 @@ int status_readdb(void)
// read databases
// path,filename,separator,mincol,maxcol,maxrow,func_parsor
for(i=0; i<ARRAYLENGTH(dbsubpath); i++){
- int n1 = strlen(db_path)+strlen(dbsubpath[i])+1;
- int n2 = strlen(db_path)+strlen(DBPATH)+strlen(dbsubpath[i])+1;
+ size_t n1 = strlen(db_path)+strlen(dbsubpath[i])+1;
+ size_t n2 = strlen(db_path)+strlen(DBPATH)+strlen(dbsubpath[i])+1;
char* dbsubpath1 = (char*)aMalloc(n1+1);
char* dbsubpath2 = (char*)aMalloc(n2+1);
@@ -14242,11 +14553,12 @@ int status_readdb(void)
safesnprintf(dbsubpath1,n1,"%s%s",db_path,dbsubpath[i]);
safesnprintf(dbsubpath2,n1,"%s%s",db_path,dbsubpath[i]);
}
-
- status_readdb_attrfix(dbsubpath2,i); // !TODO use sv_readdb ?
- sv_readdb(dbsubpath1, "status_disabled.txt", ',', 2, 2, -1, &status_readdb_status_disabled, i);
- sv_readdb(dbsubpath1, "size_fix.txt",',',MAX_WEAPON_TYPE,MAX_WEAPON_TYPE,ARRAYLENGTH(atkmods),&status_readdb_sizefix, i);
- sv_readdb(dbsubpath2, "refine_db.txt", ',', 4+MAX_REFINE, 4+MAX_REFINE, ARRAYLENGTH(refine_info), &status_readdb_refine, i);
+
+ status_readdb_attrfix(dbsubpath2,i > 0); // !TODO use sv_readdb ?
+ sv_readdb(dbsubpath1, "status_disabled.txt", ',', 2, 2, -1, &status_readdb_status_disabled, i > 0);
+ sv_readdb(dbsubpath1, "size_fix.txt",',',MAX_WEAPON_TYPE,MAX_WEAPON_TYPE,ARRAYLENGTH(atkmods),&status_readdb_sizefix, i > 0);
+
+ status_yaml_readdb_refine(dbsubpath2, "refine_db.yml");
aFree(dbsubpath1);
aFree(dbsubpath2);
}
@@ -14264,7 +14576,7 @@ int do_init_status(void)
initDummyData();
status_readdb();
natural_heal_prev_tick = gettick();
- sc_data_ers = ers_new(sizeof(struct status_change_entry),"status.c::sc_data_ers",ERS_OPT_NONE);
+ sc_data_ers = ers_new(sizeof(struct status_change_entry),"status.cpp::sc_data_ers",ERS_OPT_NONE);
add_timer_interval(natural_heal_prev_tick + NATURAL_HEAL_INTERVAL, status_natural_heal_timer, 0, 0, NATURAL_HEAL_INTERVAL);
return 0;
}
diff --git a/src/map/status.h b/src/map/status.hpp
similarity index 96%
rename from src/map/status.h
rename to src/map/status.hpp
index be00b1806ae..65209b4d131 100644
--- a/src/map/status.h
+++ b/src/map/status.hpp
@@ -1,13 +1,12 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _STATUS_H_
-#define _STATUS_H_
+#ifndef _STATUS_HPP_
+#define _STATUS_HPP_
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "../common/mmo.h"
+enum e_race2 : uint8;
struct block_list;
struct mob_data;
struct pet_data;
@@ -34,14 +33,31 @@ enum refine_type {
REFINE_TYPE_WEAPON2 = 2,
REFINE_TYPE_WEAPON3 = 3,
REFINE_TYPE_WEAPON4 = 4,
- REFINE_TYPE_MAX = 5
+ REFINE_TYPE_SHADOW = 5,
+ REFINE_TYPE_MAX = 6
+};
+
+/// Refine cost type
+enum refine_cost_type {
+ REFINE_COST_NORMAL = 0,
+ REFINE_COST_OVER10,
+ REFINE_COST_HD,
+ REFINE_COST_ENRICHED,
+ REFINE_COST_OVER10_HD,
+ REFINE_COST_MAX
+};
+
+struct refine_cost {
+ unsigned short nameid;
+ int zeny;
};
/// Get refine chance
-int status_get_refine_chance(enum refine_type wlv, int refine);
+int status_get_refine_chance(enum refine_type wlv, int refine, bool enriched);
+int status_get_refine_cost(int weapon_lv, int type, bool what);
/// Status changes listing. These code are for use by the server.
-typedef enum sc_type {
+enum sc_type : int16 {
SC_NONE = -1,
//First we enumerate common status ailments which are often used around.
@@ -678,7 +694,7 @@ typedef enum sc_type {
* Rebellion [Cydh]
**/
SC_HEAT_BARREL,
- SC_HEAT_BARREL_AFTER,
+ SC_MAGICALBULLET,
SC_P_ALTER,
SC_E_CHAIN,
SC_C_MARKER,
@@ -804,17 +820,35 @@ typedef enum sc_type {
SC_DAILYSENDMAILCNT,
- SC_DORAM_BUF_01,
+ SC_DORAM_BUF_01,
SC_DORAM_BUF_02,
+ /**
+ * Summoner - Extended
+ */
+ SC_HISS,
+ SC_NYANGGRASS,
+ SC_GROOMING,
+ SC_SHRIMPBLESSING,
+ SC_CHATTERING,
+ SC_DORAM_WALKSPEED,
+ SC_DORAM_MATK,
+ SC_DORAM_FLEE2,
+ SC_DORAM_SVSP,
+
+ SC_FALLEN_ANGEL,
+
+ SC_CHEERUP,
+ SC_DRESSUP,
+
#ifdef RENEWAL
SC_EXTREMITYFIST2, //! NOTE: This SC should be right before SC_MAX, so it doesn't disturb if RENEWAL is disabled
#endif
SC_MAX, //Automatically updated max, used in for's to check we are within bounds.
-} sc_type;
+};
/// Official status change ids, used to display status icons on the client.
-enum si_type {
+enum si_type : short {
SI_BLANK = -1,
SI_PROVOKE = 0,
SI_ENDURE = 1,
@@ -1771,6 +1805,8 @@ enum si_type {
SI_PHARAOH_CARD = 989,
SI_KIEL_CARD = 990,
+ SI_CHEERUP = 992,
+
SI_S_MANAPOTION = 995,
SI_M_DEFSCROLL = 996,
@@ -1795,42 +1831,6 @@ extern int current_equip_card_id;
extern bool running_npc_stat_calc_event;
extern short current_equip_opt_index;
-/// Mode definitions to clear up code reading. [Skotlex]
-enum e_mode {
- MD_CANMOVE = 0x0000001,
- MD_LOOTER = 0x0000002,
- MD_AGGRESSIVE = 0x0000004,
- MD_ASSIST = 0x0000008,
- MD_CASTSENSOR_IDLE = 0x0000010,
- MD_NORANDOM_WALK = 0x0000020,
- MD_NOCAST_SKILL = 0x0000040,
- MD_CANATTACK = 0x0000080,
- //FREE = 0x0000100,
- MD_CASTSENSOR_CHASE = 0x0000200,
- MD_CHANGECHASE = 0x0000400,
- MD_ANGRY = 0x0000800,
- MD_CHANGETARGET_MELEE = 0x0001000,
- MD_CHANGETARGET_CHASE = 0x0002000,
- MD_TARGETWEAK = 0x0004000,
- MD_RANDOMTARGET = 0x0008000,
- MD_IGNOREMELEE = 0x0010000,
- MD_IGNOREMAGIC = 0x0020000,
- MD_IGNORERANGED = 0x0040000,
- MD_MVP = 0x0080000,
- MD_IGNOREMISC = 0x0100000,
- MD_KNOCKBACK_IMMUNE = 0x0200000,
- MD_TELEPORT_BLOCK = 0x0400000,
- //FREE = 0x0800000,
- MD_FIXED_ITEMDROP = 0x1000000,
- MD_DETECTOR = 0x2000000,
- MD_STATUS_IMMUNE = 0x4000000,
- MD_SKILL_IMMUNE = 0x8000000,
-};
-
-#define MD_MASK 0x000FFFF
-#define ATR_MASK 0x0FF0000
-#define CL_MASK 0xF000000
-
//Status change option definitions (options are what makes status changes visible to chars
//who were not on your field of sight when it happened)
@@ -2049,6 +2049,15 @@ enum e_status_calc_weight_opt {
CALCWT_CARTSTATE = 0x4, ///< Whether to check for cart state
};
+// Enum for refine chance types
+enum e_refine_chance_type {
+ REFINE_CHANCE_NORMAL = 0,
+ REFINE_CHANCE_ENRICHED,
+ REFINE_CHANCE_EVENT_NORMAL,
+ REFINE_CHANCE_EVENT_ENRICHED,
+ REFINE_CHANCE_TYPE_MAX
+};
+
///Define to determine who gets HP/SP consumed on doing skills/etc. [Skotlex]
#define BL_CONSUME (BL_PC|BL_HOM|BL_MER|BL_ELEM)
///Define to determine who has regen
@@ -2069,13 +2078,13 @@ struct weapon_atk {
#endif
};
-sc_type SkillStatusChangeTable[MAX_SKILL]; /// skill -> status
-int StatusIconChangeTable[SC_MAX]; /// status -> "icon" (icon is a bit of a misnomer, since there exist values with no icon associated)
-unsigned int StatusChangeFlagTable[SC_MAX]; /// status -> flags
-int StatusSkillChangeTable[SC_MAX]; /// status -> skill
-int StatusRelevantBLTypes[SI_MAX]; /// "icon" -> enum bl_type (for clif->status_change to identify for which bl types to send packets)
-unsigned int StatusChangeStateTable[SC_MAX]; /// status -> flags
-unsigned int StatusDisplayType[SC_MAX];
+extern sc_type SkillStatusChangeTable[MAX_SKILL]; /// skill -> status
+extern int StatusIconChangeTable[SC_MAX]; /// status -> "icon" (icon is a bit of a misnomer, since there exist values with no icon associated)
+extern unsigned int StatusChangeFlagTable[SC_MAX]; /// status -> flags
+extern int StatusSkillChangeTable[SC_MAX]; /// status -> skill
+extern int StatusRelevantBLTypes[SI_MAX]; /// "icon" -> enum bl_type (for clif->status_change to identify for which bl types to send packets)
+extern unsigned int StatusChangeStateTable[SC_MAX]; /// status -> flags
+extern unsigned int StatusDisplayType[SC_MAX];
///For holding basic status (which can be modified by status changes)
struct status_data {
@@ -2083,13 +2092,13 @@ struct status_data {
hp, sp, // see status_cpy before adding members before hp and sp
max_hp, max_sp;
short
- str, agi, vit, int_, dex, luk;
+ str, agi, vit, int_, dex, luk,
+ eatk;
unsigned short
batk,
#ifdef RENEWAL
watk,
watk2,
- eatk,
#endif
matk_min, matk_max,
speed,
@@ -2358,8 +2367,4 @@ int status_readdb(void);
int do_init_status(void);
void do_final_status(void);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _STATUS_H_ */
+#endif /* _STATUS_HPP_ */
diff --git a/src/map/storage.c b/src/map/storage.cpp
similarity index 93%
rename from src/map/storage.c
rename to src/map/storage.cpp
index 5895ce7854c..ee569aa5626 100644
--- a/src/map/storage.c
+++ b/src/map/storage.cpp
@@ -1,25 +1,32 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "storage.hpp"
+
+#include <map>
+
+#include <stdlib.h>
+#include <string.h>
+
#include "../common/cbasetypes.h"
-#include "../common/db.h"
#include "../common/nullpo.h"
#include "../common/malloc.h"
#include "../common/showmsg.h"
-#include "map.h" // struct map_session_data
-#include "storage.h"
-#include "chrif.h"
-#include "itemdb.h"
-#include "clif.h"
-#include "intif.h"
-#include "pc.h"
+#include "map.hpp" // struct map_session_data
+#include "chrif.hpp"
+#include "itemdb.hpp"
+#include "clif.hpp"
+#include "intif.hpp"
+#include "pc.hpp"
+#include "pc_groups.hpp"
+#include "guild.hpp"
+#include "log.hpp"
+#include "battle.hpp"
-#include <stdlib.h>
-#include <string.h>
+///Databases of guild_storage : int guild_id -> struct guild_storage
+std::map<int, struct s_storage> guild_storage_db;
-
-static DBMap* guild_storage_db; ///Databases of guild_storage : int guild_id -> struct guild_storage*
struct s_storage_table *storage_db;
int storage_count;
@@ -94,11 +101,10 @@ void storage_sortitem(struct item* items, unsigned int size)
/**
* Initiate storage module
- * Called from map.c::do_init()
+ * Called from map.cpp::do_init()
*/
void do_init_storage(void)
{
- guild_storage_db = idb_alloc(DB_OPT_RELEASE_DATA);
storage_db = NULL;
storage_count = 0;
}
@@ -106,40 +112,30 @@ void do_init_storage(void)
/**
* Destroy storage module
* @author : [MC Cameri]
- * Called from map.c::do_final()
+ * Called from map.cpp::do_final()
*/
void do_final_storage(void)
{
- guild_storage_db->destroy(guild_storage_db,NULL);
+ guild_storage_db.clear();
if (storage_db)
aFree(storage_db);
storage_db = NULL;
storage_count = 0;
}
-/**
- * Parses storage and saves 'dirty' ones upon reconnect.
- * @author [Skotlex]
- * @see DBApply
- * @return 0
- */
-static int storage_reconnect_sub(DBKey key, DBData *data, va_list ap)
-{
- struct s_storage *stor = db_data2ptr(data);
-
- if (stor->dirty && stor->status == 0) //Save closed storages.
- storage_guild_storagesave(0, stor->id, 0);
-
- return 0;
-}
-
/**
* Function to be invoked upon server reconnection to char. To save all 'dirty' storages
* @author [Skotlex]
*/
-void do_reconnect_storage(void)
-{
- guild_storage_db->foreach(guild_storage_db, storage_reconnect_sub);
+void do_reconnect_storage(void){
+ for( auto entry : guild_storage_db ){
+ struct s_storage stor = entry.second;
+
+ // Save closed storages.
+ if( stor.dirty && stor.status == 0 ){
+ storage_guild_storagesave(0, stor.id, 0);
+ }
+ }
}
/**
@@ -290,6 +286,9 @@ static int storage_additem(struct map_session_data* sd, struct s_storage *stor,
}
}
+ if( stor->amount >= stor->max_amount )
+ return 2;
+
// find free slot
ARR_FIND( 0, stor->max_amount, i, stor->u.items_storage[i].nameid == 0 );
if( i >= stor->max_amount )
@@ -325,7 +324,7 @@ int storage_delitem(struct map_session_data* sd, struct s_storage *stor, int ind
memset(&stor->u.items_storage[index],0,sizeof(stor->u.items_storage[0]));
stor->amount--;
if( sd->state.storage_flag == 1 || sd->state.storage_flag == 3 )
- clif_updatestorageamount(sd, stor->amount, sd->storage.max_amount);
+ clif_updatestorageamount(sd, stor->amount, stor->max_amount);
}
if( sd->state.storage_flag == 1 || sd->state.storage_flag == 3 )
@@ -525,24 +524,6 @@ void storage_storage_quit(struct map_session_data* sd, int flag)
storage_storagesave(sd);
}
-/**
- * Create a guild_storage stucture and add it into the db
- * @see DBCreateData
- * @param key
- * @param args
- * @return
- */
-static DBData create_guildstorage(DBKey key, va_list args)
-{
- struct s_storage *gs = NULL;
-
- gs = (struct s_storage *) aCalloc(sizeof(struct s_storage), 1);
- gs->type = TABLE_GUILD_STORAGE;
- gs->id = key.i;
-
- return db_ptr2data(gs);
-}
-
/**
* Retrieve the guild_storage of a guild
* will create a new storage if none found for the guild
@@ -551,10 +532,18 @@ static DBData create_guildstorage(DBKey key, va_list args)
*/
struct s_storage *guild2storage(int guild_id)
{
- struct s_storage *gs = NULL;
+ struct s_storage *gs;
- if (guild_search(guild_id) != NULL)
- gs = (struct s_storage *)idb_ensure(guild_storage_db,guild_id,create_guildstorage);
+ if (guild_search(guild_id) == nullptr)
+ return nullptr;
+
+ gs = guild2storage2(guild_id);
+
+ if( gs == nullptr ){
+ gs = &guild_storage_db[guild_id];
+ gs->id = guild_id;
+ gs->type = TABLE_GUILD_STORAGE;
+ }
return gs;
}
@@ -563,21 +552,23 @@ struct s_storage *guild2storage(int guild_id)
* See if the guild_storage exist in db and fetch it if it's the case
* @author : [Skotlex]
* @param guild_id : guild_id to search the storage
- * @return s_storage or NULL
+ * @return s_storage or nullptr
*/
-struct s_storage *guild2storage2(int guild_id)
-{
- return (struct s_storage*)idb_get(guild_storage_db,guild_id);
+struct s_storage *guild2storage2(int guild_id){
+ if( guild_storage_db.find(guild_id) != guild_storage_db.end() ){
+ return &guild_storage_db[guild_id];
+ }else{
+ return nullptr;
+ }
}
/**
* Delete a guild_storage and remove it from db
* @param guild_id : guild to remove the storage from
- * @return 0
*/
void storage_guild_delete(int guild_id)
{
- idb_remove(guild_storage_db,guild_id);
+ guild_storage_db.erase(guild_id);
}
/**
@@ -711,7 +702,7 @@ bool storage_guild_additem2(struct s_storage* stor, struct item* item, int amoun
// Set the amount, make it fit with max amount
amount = min(amount, ((id->stack.guildstorage) ? id->stack.amount : MAX_AMOUNT) - stor->u.items_guild[i].amount);
if (amount != item->amount)
- ShowWarning("storage_guild_additem2: Stack limit reached! Altered amount of item \""CL_WHITE"%s"CL_RESET"\" (%d). '"CL_WHITE"%d"CL_RESET"' -> '"CL_WHITE"%d"CL_RESET"'.\n", id->name, id->nameid, item->amount, amount);
+ ShowWarning("storage_guild_additem2: Stack limit reached! Altered amount of item \"" CL_WHITE "%s" CL_RESET "\" (%d). '" CL_WHITE "%d" CL_RESET "' -> '" CL_WHITE"%d" CL_RESET "'.\n", id->name, id->nameid, item->amount, amount);
stor->u.items_guild[i].amount += amount;
stor->dirty = true;
return true;
@@ -917,7 +908,7 @@ bool storage_guild_storagesave(uint32 account_id, int guild_id, int flag)
struct s_storage *stor = guild2storage2(guild_id);
if (stor) {
- if (flag) //Char quitting, close it.
+ if (flag&CSAVE_QUIT) //Char quitting, close it.
stor->status = false;
if (stor->dirty)
diff --git a/src/map/storage.h b/src/map/storage.hpp
similarity index 94%
rename from src/map/storage.h
rename to src/map/storage.hpp
index c93e10a848a..15c913352fa 100644
--- a/src/map/storage.h
+++ b/src/map/storage.hpp
@@ -1,17 +1,13 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _STORAGE_H_
-#define _STORAGE_H_
+#ifndef _STORAGE_HPP_
+#define _STORAGE_HPP_
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "../common/cbasetypes.h"
-//#include "../common/mmo.h"
struct s_storage;
struct item;
-//#include "map.h"
struct map_session_data;
extern struct s_storage_table *storage_db;
@@ -67,8 +63,4 @@ void storage_premiumStorage_quit(struct map_session_data *sd);
int compare_item(struct item *a, struct item *b);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _STORAGE_H_ */
+#endif /* _STORAGE_HPP_ */
diff --git a/src/map/trade.c b/src/map/trade.cpp
similarity index 98%
rename from src/map/trade.c
rename to src/map/trade.cpp
index 98cf755f1e6..ed932cfb0da 100644
--- a/src/map/trade.c
+++ b/src/map/trade.cpp
@@ -1,20 +1,26 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#include "../common/nullpo.h"
-#include "../common/socket.h"
-#include "clif.h"
-#include "itemdb.h"
-#include "path.h"
-#include "trade.h"
-#include "pc.h"
-#include "chrif.h"
-#include "storage.h"
-#include "intif.h"
+#include "trade.hpp"
#include <stdio.h>
#include <string.h>
+#include "../common/nullpo.h"
+#include "../common/socket.h"
+
+#include "clif.hpp"
+#include "itemdb.hpp"
+#include "path.hpp"
+#include "pc.hpp"
+#include "chrif.hpp"
+#include "storage.hpp"
+#include "intif.hpp"
+#include "atcommand.hpp"
+#include "log.hpp"
+#include "pc_groups.hpp"
+#include "battle.hpp"
+
#define TRADE_DISTANCE 2 ///Max distance from traders to enable a trade to take place.
/**
diff --git a/src/map/trade.h b/src/map/trade.hpp
similarity index 80%
rename from src/map/trade.h
rename to src/map/trade.hpp
index 45aae8119f1..ff8131af6ca 100644
--- a/src/map/trade.h
+++ b/src/map/trade.hpp
@@ -1,14 +1,9 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _TRADE_H_
-#define _TRADE_H_
+#ifndef _TRADE_HPP_
+#define _TRADE_HPP_
-#ifdef __cplusplus
-extern "C" {
-
-#endif
-//#include "map.h"
struct map_session_data;
void trade_traderequest(struct map_session_data *sd, struct map_session_data *target_sd);
@@ -19,8 +14,4 @@ void trade_tradeok(struct map_session_data *sd);
void trade_tradecancel(struct map_session_data *sd);
void trade_tradecommit(struct map_session_data *sd);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _TRADE_H_ */
+#endif /* _TRADE_HPP_ */
diff --git a/src/map/unit.c b/src/map/unit.cpp
similarity index 96%
rename from src/map/unit.c
rename to src/map/unit.cpp
index 8ca27a7f1ee..8171fff544a 100644
--- a/src/map/unit.c
+++ b/src/map/unit.cpp
@@ -1,6 +1,11 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "unit.hpp"
+
+#include <stdlib.h>
+#include <string.h>
+
#include "../common/showmsg.h"
#include "../common/timer.h"
#include "../common/nullpo.h"
@@ -8,26 +13,29 @@
#include "../common/malloc.h"
#include "../common/random.h"
#include "../common/socket.h"
-
-#include "map.h"
-#include "path.h"
-#include "pc.h"
-#include "pet.h"
-#include "homunculus.h"
-#include "mercenary.h"
-#include "elemental.h"
-#include "channel.h"
-#include "duel.h"
-#include "battleground.h"
-#include "chat.h"
-#include "trade.h"
-#include "party.h"
-#include "intif.h"
-#include "storage.h"
-
-#include <stdlib.h>
-#include <string.h>
-
+#include "../common/ers.h" // ers_destroy
+
+#include "achievement.hpp"
+#include "map.hpp"
+#include "path.hpp"
+#include "pc.hpp"
+#include "pet.hpp"
+#include "homunculus.hpp"
+#include "mercenary.hpp"
+#include "elemental.hpp"
+#include "channel.hpp"
+#include "duel.hpp"
+#include "battleground.hpp"
+#include "chat.hpp"
+#include "trade.hpp"
+#include "party.hpp"
+#include "intif.hpp"
+#include "storage.hpp"
+#include "guild.hpp"
+#include "npc.hpp"
+#include "clif.hpp"
+#include "mob.hpp"
+#include "battle.hpp"
// Directions values
// 1 0 7
@@ -398,7 +406,6 @@ static int unit_walktoxy_timer(int tid, unsigned int tick, int id, intptr_t data
y += dy;
map_moveblock(bl, x, y, tick);
ud->walk_count++; // Walked cell counter, to be used for walk-triggered skills. [Skotlex]
- status_change_end(bl, SC_ROLLINGCUTTER, INVALID_TIMER); // If you move, you lose your counters. [malufett]
if (bl->x != x || bl->y != y || ud->walktimer != INVALID_TIMER)
return 0; // map_moveblock has altered the object beyond what we expected (moved/warped it)
@@ -409,11 +416,35 @@ static int unit_walktoxy_timer(int tid, unsigned int tick, int id, intptr_t data
if (bl->x == ud->to_x && bl->y == ud->to_y) {
if (ud->walk_done_event[0]){
- npc_event_do_id(ud->walk_done_event,bl->id);
- ud->walk_done_event[0] = 0;
+ char walk_done_event[EVENT_NAME_LENGTH];
+
+ // Copying is required in case someone uses unitwalkto inside the event code
+ safestrncpy(walk_done_event, ud->walk_done_event, EVENT_NAME_LENGTH);
+
+ ud->state.walk_script = true;
+
+ // Execute the event
+ npc_event_do_id(walk_done_event,bl->id);
+
+ ud->state.walk_script = false;
+
+ // Check if the unit was killed
+ if( status_isdead(bl) ){
+ struct mob_data* md = BL_CAST(BL_MOB, bl);
+
+ if( md && !md->spawn ){
+ unit_free(bl, CLR_OUTSIGHT);
+ }
+
+ return 0;
+ }
+
+ // Check if another event was set
+ if( !strcmp(ud->walk_done_event,walk_done_event) ){
+ // If not remove it
+ ud->walk_done_event[0] = 0;
+ }
}
- if (ud->state.walk_script)
- ud->state.walk_script = 0;
}
switch(bl->type) {
@@ -1032,7 +1063,7 @@ uint8 unit_getdir(struct block_list *bl)
* @param dx: Destination cell X
* @param dy: Destination cell Y
* @param count: How many cells to push bl
- * @param flag: See skill.h::e_skill_blown
+ * @param flag: See skill.hpp::e_skill_blown
* @return count (can be modified due to map cell restrictions)
*/
int unit_blown(struct block_list* bl, int dx, int dy, int count, enum e_skill_blown flag)
@@ -1197,7 +1228,7 @@ int unit_warp(struct block_list *bl,short m,short x,short y,clr_type type)
return 2;
}
- } else if (map_getcell(m,x,y,CELL_CHKNOREACH)) { // Invalid target cell
+ } else if ( bl->type != BL_NPC && map_getcell(m,x,y,CELL_CHKNOREACH)) { // Invalid target cell
ShowWarning("unit_warp: Specified non-walkable target cell: %d (%s) at [%d,%d]\n", m, map[m].name, x,y);
if (!map_search_freecell(NULL, m, &x, &y, 4, 4, 1)) { // Can't find a nearby cell
@@ -1233,11 +1264,11 @@ int unit_warp(struct block_list *bl,short m,short x,short y,clr_type type)
* Stops a unit from walking
* @param bl: Object to stop walking
* @param type: Options
- * &0x1: Issue a fixpos packet afterwards
- * &0x2: Force the unit to move one cell if it hasn't yet
- * &0x4: Enable moving to the next cell when unit was already half-way there
+ * USW_FIXPOS: Issue a fixpos packet afterwards
+ * USW_MOVE_ONCE: Force the unit to move one cell if it hasn't yet
+ * USW_MOVE_FULL_CELL: Enable moving to the next cell when unit was already half-way there
* (may cause on-touch/place side-effects, such as a scripted map change)
- * &0x8: Force stop moving, even if walktimer is currently INVALID_TIMER
+ * USW_FORCE_STOP: Force stop moving, even if walktimer is currently INVALID_TIMER
* @return Success(1); Failed(0);
*/
int unit_stop_walking(struct block_list *bl,int type)
@@ -1250,7 +1281,7 @@ int unit_stop_walking(struct block_list *bl,int type)
ud = unit_bl2ud(bl);
- if(!ud || (!(type&0x08) && ud->walktimer == INVALID_TIMER))
+ if(!ud || (!(type&USW_FORCE_STOP) && ud->walktimer == INVALID_TIMER))
return 0;
// NOTE: We are using timer data after deleting it because we know the
@@ -1264,14 +1295,14 @@ int unit_stop_walking(struct block_list *bl,int type)
ud->state.change_walk_target = 0;
tick = gettick();
- if( (type&0x02 && !ud->walkpath.path_pos) // Force moving at least one cell.
- || (type&0x04 && td && DIFF_TICK(td->tick, tick) <= td->data/2) // Enough time has passed to cover half-cell
+ if( (type&USW_MOVE_ONCE && !ud->walkpath.path_pos) // Force moving at least one cell.
+ || (type&USW_MOVE_FULL_CELL && td && DIFF_TICK(td->tick, tick) <= td->data/2) // Enough time has passed to cover half-cell
) {
ud->walkpath.path_len = ud->walkpath.path_pos+1;
unit_walktoxy_timer(INVALID_TIMER, tick, bl->id, ud->walkpath.path_pos);
}
- if(type&0x01)
+ if(type&USW_FIXPOS)
clif_fixpos(bl);
ud->walkpath.path_len = 0;
@@ -1279,7 +1310,7 @@ int unit_stop_walking(struct block_list *bl,int type)
ud->to_x = bl->x;
ud->to_y = bl->y;
- if(bl->type == BL_PET && type&~0xff)
+ if(bl->type == BL_PET && type&~USW_ALL)
ud->canmove_tick = gettick() + (type>>8);
// Re-added, the check in unit_set_walkdelay means dmg during running won't fall through to this place in code [Kevin]
@@ -1601,7 +1632,7 @@ int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill_id, ui
if( battle_config.ksprotection && sd && mob_ksprotected(src, target) )
return 0;
- // Normally not needed because clif.c checks for it, but the at/char/script commands don't! [Skotlex]
+ // Normally not needed because clif.cpp checks for it, but the at/char/script commands don't! [Skotlex]
if(ud->skilltimer != INVALID_TIMER && skill_id != SA_CASTCANCEL && skill_id != SO_SPELLFIST)
return 0;
@@ -1688,6 +1719,7 @@ int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill_id, ui
switch( skill_id ) {
case NPC_SUMMONSLAVE:
case NPC_SUMMONMONSTER:
+ case NPC_DEATHSUMMON:
case AL_TELEPORT:
if( ((TBL_MOB*)src)->master_id && ((TBL_MOB*)src)->special_state.ai )
return 0;
@@ -1899,7 +1931,7 @@ int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill_id, ui
ud->skilltimer = add_timer( tick+casttime, skill_castend_id, src->id, 0 );
if( sd && (pc_checkskill(sd,SA_FREECAST) > 0 || skill_id == LG_EXEEDBREAK) )
- status_calc_bl(&sd->bl, SCB_SPEED);
+ status_calc_bl(&sd->bl, SCB_SPEED|SCB_ASPD);
} else
skill_castend_id(ud->skilltimer,tick,src->id,0);
@@ -1964,7 +1996,7 @@ int unit_skilluse_pos2( struct block_list *src, short skill_x, short skill_y, ui
if (ud && ud->state.blockedskill)
return 0;
- if(ud->skilltimer != INVALID_TIMER) // Normally not needed since clif.c checks for it, but at/char/script commands don't! [Skotlex]
+ if(ud->skilltimer != INVALID_TIMER) // Normally not needed since clif.cpp checks for it, but at/char/script commands don't! [Skotlex]
return 0;
sc = status_get_sc(src);
@@ -2079,7 +2111,7 @@ int unit_skilluse_pos2( struct block_list *src, short skill_x, short skill_y, ui
ud->skilltimer = add_timer( tick+casttime, skill_castend_pos, src->id, 0 );
if( (sd && pc_checkskill(sd,SA_FREECAST) > 0) || skill_id == LG_EXEEDBREAK)
- status_calc_bl(&sd->bl, SCB_SPEED);
+ status_calc_bl(&sd->bl, SCB_SPEED|SCB_ASPD);
} else {
ud->skilltimer = INVALID_TIMER;
skill_castend_pos(ud->skilltimer,tick,src->id,0);
@@ -2188,6 +2220,23 @@ int unit_unattackable(struct block_list *bl)
return 0;
}
+/**
+ * Checks if the unit can attack, returns yes if so.
+*/
+bool unit_can_attack(struct block_list *src, int target_id)
+{
+ struct status_change *sc = status_get_sc(src);
+
+ if( sc != NULL ) {
+ if( sc->data[SC__MANHOLE] )
+ return false;
+ }
+
+ if( src->type == BL_PC )
+ return pc_can_attack(BL_CAST(BL_PC, src), target_id);
+ return true;
+}
+
/**
* Requests a unit to attack a target
* @param src: Object initiating attack
@@ -2211,23 +2260,16 @@ int unit_attack(struct block_list *src,int target_id,int continuous)
return 1;
}
- if( src->type == BL_PC ) {
- TBL_PC* sd = (TBL_PC*)src;
-
- if( target->type == BL_NPC ) { // Monster npcs [Valaris]
- npc_click(sd,(TBL_NPC*)target); // Submitted by leinsirk10 [Celest]
- return 0;
- }
-
- if( pc_is90overweight(sd) || pc_isridingwug(sd) ) { // Overweight or mounted on warg - stop attacking
- unit_stop_attack(src);
- return 0;
- }
+ if( src->type == BL_PC &&
+ target->type == BL_NPC ) {
+ // Monster npcs [Valaris]
+ npc_click((TBL_PC*)src,(TBL_NPC*)target);
+ return 0;
+ }
- if( !pc_can_attack(sd, target_id) ) {
- unit_stop_attack(src);
- return 0;
- }
+ if( !unit_can_attack(src, target_id) ) {
+ unit_stop_attack(src);
+ return 0;
}
if( battle_check_target(src,target,BCT_ENEMY) <= 0 || !status_check_skilluse(src, target, 0, 0) ) {
@@ -2500,9 +2542,6 @@ static int unit_attack_timer_sub(struct block_list* src, int tid, unsigned int t
|| (sd && !pc_can_attack(sd, target->id)) )
return 0; // Can't attack under these conditions
- if (sd && &sd->sc && sd->sc.count && sd->sc.data[SC_HEAT_BARREL_AFTER])
- return 0;
-
if( src->m != target->m ) {
if( src->type == BL_MOB && mob_warpchase((TBL_MOB*)src, target) )
return 1; // Follow up.
@@ -2697,7 +2736,7 @@ int unit_skillcastcancel(struct block_list *bl, char type)
ud->skilltimer = INVALID_TIMER;
if( sd && (pc_checkskill(sd,SA_FREECAST) > 0 || skill_id == LG_EXEEDBREAK) )
- status_calc_bl(&sd->bl, SCB_SPEED);
+ status_calc_bl(&sd->bl, SCB_SPEED|SCB_ASPD);
if( sd ) {
switch( skill_id ) {
@@ -2751,31 +2790,6 @@ int unit_counttargeted(struct block_list* bl)
return 0;
}
-/**
- * Changes the size of a unit
- * @param bl: Object to change size [PC|MOB]
- * @param size: New size of bl
- * @return 0
- */
-int unit_changeviewsize(struct block_list *bl,short size)
-{
- nullpo_ret(bl);
-
- size = (size < 0) ? -1 : (size > 0) ? 1 : 0;
-
- if(bl->type == BL_PC)
- ((TBL_PC*)bl)->state.size = size;
- else if(bl->type == BL_MOB)
- ((TBL_MOB*)bl)->special_state.size = size;
- else
- return 0;
-
- if(size != 0)
- clif_specialeffect(bl,421+size, AREA);
-
- return 0;
-}
-
/**
* Makes 'bl' that attacking 'src' switch to attack 'target'
* @param bl
@@ -2888,11 +2902,6 @@ int unit_remove_map_(struct block_list *bl, clr_type clrtype, const char* file,
status_change_end(bl, SC_SUHIDE, INVALID_TIMER);
}
- if (bl->type&(BL_CHAR|BL_PET)) {
- skill_unit_move(bl,gettick(),4);
- skill_cleartimerskill(bl);
- }
-
switch( bl->type ) {
case BL_PC: {
struct map_session_data *sd = (struct map_session_data*)bl;
@@ -3032,7 +3041,7 @@ int unit_remove_map_(struct block_list *bl, clr_type clrtype, const char* file,
if( !hd->homunculus.intimacy && !(hd->master && !hd->master->state.active) ) {
// If logging out, this is deleted on unit_free
- clif_emotion(bl, E_SOB);
+ clif_emotion(bl, ET_CRY);
clif_clearunit_area(bl,clrtype);
map_delblock(bl);
unit_free(bl,CLR_OUTSIGHT);
@@ -3076,6 +3085,10 @@ int unit_remove_map_(struct block_list *bl, clr_type clrtype, const char* file,
break;// do nothing
}
+ if (bl->type&(BL_CHAR|BL_PET)) {
+ skill_unit_move(bl,gettick(),4);
+ skill_cleartimerskill(bl);
+ }
// /BL_MOB is handled by mob_dead unless the monster is not dead.
if( bl->type != BL_MOB || !status_isdead(bl) )
clif_clearunit_area(bl,clrtype);
@@ -3228,6 +3241,9 @@ int unit_free(struct block_list *bl, clr_type clrtype)
}
#endif
+ if (sd->achievement_data.achievements)
+ achievement_free(sd);
+
// Clearing...
if (sd->bonus_script.head)
pc_bonus_script_clear(sd, BSF_REM_ALL);
@@ -3301,6 +3317,8 @@ int unit_free(struct block_list *bl, clr_type clrtype)
case BL_MOB: {
struct mob_data *md = (struct mob_data*)bl;
+ mob_free_dynamic_viewdata( md );
+
if( md->spawn_timer != INVALID_TIMER ) {
delete_timer(md->spawn_timer,mob_delayspawn);
md->spawn_timer = INVALID_TIMER;
diff --git a/src/map/unit.h b/src/map/unit.hpp
similarity index 85%
rename from src/map/unit.h
rename to src/map/unit.hpp
index f2d888c804e..137eb1eeeec 100644
--- a/src/map/unit.h
+++ b/src/map/unit.hpp
@@ -1,22 +1,19 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _UNIT_H_
-#define _UNIT_H_
+#ifndef _UNIT_HPP_
+#define _UNIT_HPP_
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "../common/cbasetypes.h"
+
+#include "path.hpp" // struct walkpath_data
+#include "skill.hpp" // struct skill_timerskill, struct skill_unit_group, struct skill_unit_group_tickset
-//#include "map.h"
+enum sc_type : int16;
struct block_list;
struct unit_data;
struct map_session_data;
-
-#include "clif.h" // clr_type
-#include "map.h" // struct block_list
-#include "path.h" // struct walkpath_data
-#include "skill.h" // struct skill_timerskill, struct skill_unit_group, struct skill_unit_group_tickset
+enum clr_type : uint8;
extern const short dirx[DIR_MAX]; ///lookup to know where will move to x according dir
extern const short diry[DIR_MAX]; ///lookup to know where will move to y according dir
@@ -48,7 +45,7 @@ struct unit_data {
uint8 dir;
unsigned char walk_count;
unsigned char target_count;
- struct {
+ struct s_udState {
unsigned change_walk_target : 1 ;
unsigned skillcastcancel : 1 ;
unsigned attack_continue : 1 ;
@@ -65,12 +62,11 @@ struct unit_data {
struct view_data {
#ifdef __64BIT__
- unsigned int class_;
-#endif
- unsigned short
-#ifndef __64BIT__
- class_,
+ unsigned int class_; //why arch dependant ??? make no sense imo [lighta]
+#else
+ unsigned short class_;
#endif
+unsigned short
weapon,
shield, //Or left-hand weapon.
robe,
@@ -95,6 +91,16 @@ enum e_unit_blown {
UB_TARGET_TRAP, // Target is a trap that cannot be knocked back
};
+/// Enum for unit_stop_walking
+enum e_unit_stop_walking {
+ USW_NONE = 0x0, /// Unit will keep walking to their original destination
+ USW_FIXPOS = 0x1, /// Issue a fixpos packet afterwards
+ USW_MOVE_ONCE = 0x2, /// Force the unit to move one cell if it hasn't yet
+ USW_MOVE_FULL_CELL = 0x4, /// Enable moving to the next cell when unit was already half-way there (may cause on-touch/place side-effects, such as a scripted map change)
+ USW_FORCE_STOP = 0x8, /// Force stop moving, even if walktimer is currently INVALID_TIMER
+ USW_ALL = 0xf,
+};
+
// PC, MOB, PET
// Does walk action for unit
@@ -163,8 +169,4 @@ int unit_changetarget(struct block_list *bl,va_list ap);
void do_init_unit(void);
void do_final_unit(void);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _UNIT_H_ */
+#endif /* _UNIT_HPP_ */
diff --git a/src/map/vending.c b/src/map/vending.cpp
similarity index 94%
rename from src/map/vending.c
rename to src/map/vending.cpp
index 54b1713d89e..6de6acea296 100755
--- a/src/map/vending.c
+++ b/src/map/vending.cpp
@@ -1,18 +1,26 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#include "vending.hpp"
#include "../common/nullpo.h"
#include "../common/malloc.h" // aMalloc, aFree
#include "../common/showmsg.h" // ShowInfo
#include "../common/strlib.h"
-#include "clif.h"
-#include "itemdb.h"
-#include "atcommand.h"
-#include "path.h"
-#include "chrif.h"
-#include "vending.h"
-#include "pc.h"
-#include "buyingstore.h" // struct s_autotrade_entry, struct s_autotrader
+#include "../common/timer.h" // DIFF_TICK
+
+#include "buyingstore.hpp"
+#include "clif.hpp"
+#include "itemdb.hpp"
+#include "atcommand.hpp"
+#include "path.hpp"
+#include "chrif.hpp"
+#include "pc.hpp"
+#include "pc_groups.hpp"
+#include "buyingstore.hpp" // struct s_autotrade_entry, struct s_autotrader
+#include "npc.hpp"
+#include "battle.hpp"
+#include "log.hpp"
+#include "achievement.hpp"
#include <stdlib.h> // atoi
@@ -88,6 +96,20 @@ void vending_vendinglistreq(struct map_session_data* sd, int id)
clif_vendinglist(sd, id, vsd->vending);
}
+/**
+ * Calculates taxes for vending
+ * @param sd: Vender
+ * @param zeny: Total amount to tax
+ * @return Total amount after taxes
+ */
+static double vending_calc_tax(struct map_session_data *sd, double zeny)
+{
+ if (battle_config.vending_tax && zeny >= battle_config.vending_tax_min)
+ zeny -= zeny * (battle_config.vending_tax / 10000.);
+
+ return zeny;
+}
+
/**
* Purchase item(s) from a shop
* @param sd : buyer player session
@@ -191,8 +213,8 @@ void vending_purchasereq(struct map_session_data* sd, int aid, int uid, const ui
}
pc_payzeny(sd, (int)z, LOG_TYPE_VENDING, vsd);
- if( battle_config.vending_tax )
- z -= z * (battle_config.vending_tax/10000.);
+ achievement_update_objective(sd, AG_SPEND_ZENY, 1, (int)z);
+ z = vending_calc_tax(sd, z);
pc_getzeny(vsd, (int)z, LOG_TYPE_VENDING, sd);
for( i = 0; i < count; i++ ) {
@@ -217,8 +239,7 @@ void vending_purchasereq(struct map_session_data* sd, int aid, int uid, const ui
}
pc_cart_delitem(vsd, idx, amount, 0, LOG_TYPE_VENDING);
- if( battle_config.vending_tax )
- z -= z * (battle_config.vending_tax/10000.);
+ z = vending_calc_tax(sd, z);
clif_vendingreport(vsd, idx, amount, sd->status.char_id, (int)z);
//print buyer's name
@@ -408,7 +429,7 @@ bool vending_searchall(struct map_session_data* sd, const struct s_search_store_
return true;
for( idx = 0; idx < s->item_count; idx++ ) {
- ARR_FIND( 0, sd->vend_num, i, sd->cart.u.items_cart[sd->vending[i].index].nameid == (short)s->itemlist[idx] );
+ ARR_FIND( 0, sd->vend_num, i, sd->cart.u.items_cart[sd->vending[i].index].nameid == s->itemlist[idx] );
if( i == sd->vend_num ) { // not found
continue;
}
@@ -509,7 +530,7 @@ void vending_reopen( struct map_session_data* sd )
// Immediate save
chrif_save(sd, CSAVE_AUTOTRADE);
- ShowInfo("Vending loaded for '"CL_WHITE"%s"CL_RESET"' with '"CL_WHITE"%d"CL_RESET"' items at "CL_WHITE"%s (%d,%d)"CL_RESET"\n",
+ ShowInfo("Vending loaded for '" CL_WHITE "%s" CL_RESET "' with '" CL_WHITE "%d" CL_RESET "' items at " CL_WHITE "%s (%d,%d)" CL_RESET "\n",
sd->status.name, count, mapindex_id2name(sd->mapindex), sd->bl.x, sd->bl.y);
}
aFree(data);
@@ -522,7 +543,7 @@ void vending_reopen( struct map_session_data* sd )
}
if (fail != 0) {
- ShowError("vending_reopen: (Error:%d) Load failed for autotrader '"CL_WHITE"%s"CL_RESET"' (CID=%d/AID=%d)\n", fail, sd->status.name, sd->status.char_id, sd->status.account_id);
+ ShowError("vending_reopen: (Error:%d) Load failed for autotrader '" CL_WHITE "%s" CL_RESET "' (CID=%d/AID=%d)\n", fail, sd->status.name, sd->status.char_id, sd->status.account_id);
map_quit(sd);
}
}
@@ -623,7 +644,7 @@ void do_init_vending_autotrade(void)
}
dbi_destroy(iter);
- ShowStatus("Done loading '"CL_WHITE"%d"CL_RESET"' vending autotraders with '"CL_WHITE"%d"CL_RESET"' items.\n", db_size(vending_autotrader_db), items);
+ ShowStatus("Done loading '" CL_WHITE "%d" CL_RESET "' vending autotraders with '" CL_WHITE "%d" CL_RESET "' items.\n", db_size(vending_autotrader_db), items);
}
}
diff --git a/src/map/vending.h b/src/map/vending.hpp
similarity index 85%
rename from src/map/vending.h
rename to src/map/vending.hpp
index 5ee0a3ede2d..0781dc0cbf4 100644
--- a/src/map/vending.h
+++ b/src/map/vending.hpp
@@ -1,19 +1,16 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _VENDING_H_
-#define _VENDING_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef _VENDING_HPP_
+#define _VENDING_HPP_
#include "../common/cbasetypes.h"
-#include "buyingstore.h"
-//#include "map.h"
+
+#include "../common/db.h"
struct map_session_data;
struct s_search_store_search;
+struct s_autotrader;
struct s_vending {
short index; /// cart index (return item data)
@@ -34,8 +31,4 @@ void vending_purchasereq(struct map_session_data* sd, int aid, int uid, const ui
bool vending_search(struct map_session_data* sd, unsigned short nameid);
bool vending_searchall(struct map_session_data* sd, const struct s_search_store_search* s);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _VENDING_H_ */
+#endif /* _VENDING_HPP_ */
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
new file mode 100644
index 00000000000..9fb5d311749
--- /dev/null
+++ b/src/test/CMakeLists.txt
@@ -0,0 +1,41 @@
+
+#
+# basic_test
+#
+
+option( BUILD_TESTS "build basic_test executable" ON )
+
+if( BUILD_TESTS )
+
+ set( TESTS_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "" )
+ message( STATUS "Creating target basic_test" )
+ file(GLOB TESTS_HEADERS ${TESTS_SOURCE_DIR}/*.hpp)
+ file(GLOB TESTS_SOURCES ${TESTS_SOURCE_DIR}/*.cpp)
+
+
+ set( DEPENDENCIES common)
+ set( LIBRARIES ${GLOBAL_LIBRARIES})
+ set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${COMMON_BASE_INCLUDE_DIRS} )
+ set( DEFINITIONS "${GLOBAL_DEFINITIONS} ${COMMON_BASE_DEFINITIONS} -DCMAKE" )
+ set( SOURCE_FILES ${COMMON_BASE_HEADERS} ${COMMON_HEADERS} ${TESTS_HEADERS} ${TESTS_SOURCES} )
+ source_group( common FILES ${COMMON_BASE_HEADERS} ${COMMON_HEADERS} )
+ source_group( test FILES ${TESTS_HEADERS} ${TESTS_SOURCES} )
+ include_directories( ${INCLUDE_DIRS} )
+
+ #message( STATUS "basic_test SOURCE_FILES=${SOURCE_FILES}")
+ add_executable( basic_test ${SOURCE_FILES} )
+ #message( STATUS "basic_test LIBRARIES=${LIBRARIES}, DEPENDENCIES=${DEPENDENCIES} DEFINITIONS=${DEFINITIONS}")
+ add_dependencies( basic_test ${DEPENDENCIES} )
+ target_link_libraries( basic_test ${LIBRARIES} ${DEPENDENCIES} )
+ set_target_properties( basic_test PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" )
+
+ if( INSTALL_COMPONENT_RUNTIME )
+ cpack_add_component( Runtime_tests DESCRIPTION "basic integration test" DISPLAY_NAME "basic_test" GROUP Runtime )
+ install( TARGETS basic_test
+ DESTINATION "."
+ COMPONENT Runtime_tests )
+ endif( INSTALL_COMPONENT_RUNTIME )
+ set( TARGET_LIST ${TARGET_LIST} basic_test CACHE INTERNAL "" )
+ message( STATUS "Creating target basic_test - done" )
+
+endif( BUILD_TESTS )
diff --git a/src/test/basic_test.vcxproj b/src/test/basic_test.vcxproj
new file mode 100644
index 00000000000..1c32f3b8720
--- /dev/null
+++ b/src/test/basic_test.vcxproj
@@ -0,0 +1,171 @@
+<?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">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{99B4DF6A-6180-4E7F-9227-F812FF30414A}</ProjectGuid>
+ <Keyword>Win32Proj</Keyword>
+ <RootNamespace>basic_test</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="Shared">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <LinkIncremental>true</LinkIncremental>
+ <OutDir>$(SolutionDir)</OutDir>
+ <IntDir>$(SolutionDir).vs\build\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <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)'=='Release|Win32'">
+ <LinkIncremental>false</LinkIncremental>
+ <OutDir>$(SolutionDir)</OutDir>
+ <IntDir>$(SolutionDir).vs\build\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <LinkIncremental>false</LinkIncremental>
+ <OutDir>$(SolutionDir)</OutDir>
+ <IntDir>$(SolutionDir).vs\build\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <SDLCheck>true</SDLCheck>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalDependencies>ws2_32.lib;$(SolutionDir).vs\build\common.lib;$(SolutionDir).vs\build\libconfig.lib;$(SolutionDir).vs\build\mt19937ar.lib;$(SolutionDir)3rdparty\zlib\lib\$(Platform)\zlib.lib;$(SolutionDir)3rdparty\pcre\lib\$(Platform)\pcre8.lib;$(SolutionDir)3rdparty\mysql\lib\$(Platform)\libmysql.lib;$(SolutionDir).vs\build\yaml-cpp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <SDLCheck>true</SDLCheck>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalDependencies>ws2_32.lib;$(SolutionDir).vs\build\common.lib;$(SolutionDir).vs\build\libconfig.lib;$(SolutionDir).vs\build\mt19937ar.lib;$(SolutionDir)3rdparty\zlib\lib\$(Platform)\zlib.lib;$(SolutionDir)3rdparty\pcre\lib\$(Platform)\pcre8.lib;$(SolutionDir)3rdparty\mysql\lib\$(Platform)\libmysql.lib;$(SolutionDir).vs\build\yaml-cpp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <SDLCheck>true</SDLCheck>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalDependencies>ws2_32.lib;$(SolutionDir).vs\build\common.lib;$(SolutionDir).vs\build\libconfig.lib;$(SolutionDir).vs\build\mt19937ar.lib;$(SolutionDir)3rdparty\zlib\lib\$(Platform)\zlib.lib;$(SolutionDir)3rdparty\pcre\lib\$(Platform)\pcre8.lib;$(SolutionDir)3rdparty\mysql\lib\$(Platform)\libmysql.lib;$(SolutionDir).vs\build\yaml-cpp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <SDLCheck>true</SDLCheck>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalDependencies>ws2_32.lib;$(SolutionDir).vs\build\common.lib;$(SolutionDir).vs\build\libconfig.lib;$(SolutionDir).vs\build\mt19937ar.lib;$(SolutionDir)3rdparty\zlib\lib\$(Platform)\zlib.lib;$(SolutionDir)3rdparty\pcre\lib\$(Platform)\pcre8.lib;$(SolutionDir)3rdparty\mysql\lib\$(Platform)\libmysql.lib;$(SolutionDir).vs\build\yaml-cpp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="basictest.cpp" />
+ <ClCompile Include="test_spinlock.cpp" />
+ <ClCompile Include="test_thread.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="test_spinlock.hpp" />
+ <ClInclude Include="test_thread.hpp" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/src/test/basic_test.vcxproj.filters b/src/test/basic_test.vcxproj.filters
new file mode 100644
index 00000000000..9a601b60353
--- /dev/null
+++ b/src/test/basic_test.vcxproj.filters
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="basictest.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="test_thread.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="test_spinlock.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="test_spinlock.hpp">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="test_thread.hpp">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/test/basictest.cpp b/src/test/basictest.cpp
new file mode 100644
index 00000000000..b44485252d4
--- /dev/null
+++ b/src/test/basictest.cpp
@@ -0,0 +1,39 @@
+// basictest.cpp : Sets the entry point for the console application.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifndef _WIN32
+#include <unistd.h>
+#endif
+
+#include "../common/core.h"
+#include "test_thread.hpp"
+#include "test_spinlock.hpp"
+
+using namespace ra::unit_tests;
+
+int do_init( int, char** )
+{
+ test_thread_creation_and_wait();
+ test_thread_spinlock();
+ return 0;
+}
+
+//just some empty function to comply link
+void do_abort(void) {}
+void do_final(void) {}
+void set_server_type(void) {}
+
+//tmp tp avoid link issue in cmake
+#if defined(CMAKE)
+#ifdef __cplusplus
+extern "C" {
+#endif
+ void Sql_Init(void) {}
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/src/test/test_spinlock.cpp b/src/test/test_spinlock.cpp
new file mode 100644
index 00000000000..3068485f895
--- /dev/null
+++ b/src/test/test_spinlock.cpp
@@ -0,0 +1,102 @@
+#include "test_spinlock.hpp"
+#include <chrono>
+#include <thread>
+
+#include "../common/thread.h"
+#include "../common/spinlock.h"
+#include "../common/showmsg.h"
+#include "test_thread.hpp"
+
+namespace ra
+{
+ namespace unit_tests
+ {
+ static SPIN_LOCK lSpinLock;
+
+ void* thread_test_critical( void *x )
+ {
+ size_t count = 0;
+ while ( count++ < 10 )
+ {
+ EnterSpinLock( &lSpinLock );
+ ShowStatus( "TH Entering critical_section recursion_count=%d iteration_count=%d\n", lSpinLock.nest,count );
+ std::this_thread::sleep_for(std::chrono::milliseconds( 100 )); //a simple test with critical section
+ ShowStatus( "TH Leaving critical_section recursion_count=%d\n iteration_count=%d", lSpinLock.nest,count );
+ LeaveSpinLock( &lSpinLock );
+ rathread_yield();
+ std::this_thread::sleep_for(std::chrono::milliseconds( 200 )); //let try to lose the lock here
+ }
+ return nullptr;
+ }
+
+ void test_thread_spinlock()
+ {
+ ShowStatus( "Testing test_thread_spinlock\n" );
+ InitializeSpinLock( &lSpinLock );
+
+ EnterSpinLock( &lSpinLock ); //fake critical section (we take it before creation to ensure we have the lock)
+ ShowStatus( "Main Entering critical_section recursion_count=%d\n", lSpinLock.nest );
+
+ prAthread lnd2th = rathread_create( &thread_test_critical, nullptr );
+ int lMainID = rathread_get_tid();
+ ShowStatus( "Continuing main th id=%d\n", lMainID );
+ rathread_yield();
+ std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); //fake doing stuff
+ ShowStatus( "Main Leaving critical_section recursion_count=%d\n", lSpinLock.nest );
+ LeaveSpinLock( &lSpinLock );
+
+ std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); //fake doing stuff
+ EnterSpinLock( &lSpinLock ); //now we should be waiting
+ ShowStatus( "Main Entering critical_section recursion_count=%d\n", lSpinLock.nest );
+
+ EnterSpinLock( &lSpinLock ); //testing with a recursion
+ ShowStatus( "Main Entering critical_section recursion_count=%d\n", lSpinLock.nest );
+ std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); //fake doing stuff
+ ShowStatus( "Main Leaving critical_section recursion_count=%d\n", lSpinLock.nest );
+ LeaveSpinLock( &lSpinLock );
+
+ ShowStatus( "Main Leaving critical_section recursion_count=%d\n", lSpinLock.nest );
+ LeaveSpinLock( &lSpinLock );
+
+ while ( !rathread_wait( lnd2th, nullptr ) )
+ {
+ ShowStatus( "Waiting 2nd thread\n" );
+ std::this_thread::sleep_for( std::chrono::seconds( 1 ) );
+ }
+ rathread_destroy( lnd2th );
+ FinalizeSpinLock( &lSpinLock );
+ }
+
+ }
+}
+
+/* Expected result
+[Status]: Testing test_thread_spinlock
+[Status]: Main Entering critical_section recursion_count=1
+[Status]: Continuing main th id=0
+[Status]: Main Leaving critical_section recursion_count=1
+[Status]: TH Entering critical_section recursion_count=1 iteration_count=1
+[Status]: TH Leaving critical_section recursion_count=1 iteration_count=1
+[Status]: Main Entering critical_section recursion_count=1
+[Status]: Main Entering critical_section recursion_count=2
+[Status]: Main Leaving critical_section recursion_count=2
+[Status]: Main Leaving critical_section recursion_count=1
+[Status]: TH Entering critical_section recursion_count=1 iteration_count=2
+[Status]: TH Leaving critical_section recursion_count=1 iteration_count=2
+[Status]: TH Entering critical_section recursion_count=1 iteration_count=3
+[Status]: TH Leaving critical_section recursion_count=1 iteration_count=3
+[Status]: TH Entering critical_section recursion_count=1 iteration_count=4
+[Status]: TH Leaving critical_section recursion_count=1 iteration_count=4
+[Status]: TH Entering critical_section recursion_count=1 iteration_count=5
+[Status]: TH Leaving critical_section recursion_count=1 iteration_count=5
+[Status]: TH Entering critical_section recursion_count=1 iteration_count=6
+[Status]: TH Leaving critical_section recursion_count=1 iteration_count=6
+[Status]: TH Entering critical_section recursion_count=1 iteration_count=7
+[Status]: TH Leaving critical_section recursion_count=1 iteration_count=7
+[Status]: TH Entering critical_section recursion_count=1 iteration_count=8
+[Status]: TH Leaving critical_section recursion_count=1 iteration_count=8
+[Status]: TH Entering critical_section recursion_count=1 iteration_count=9
+[Status]: TH Leaving critical_section recursion_count=1 iteration_count=9
+[Status]: TH Entering critical_section recursion_count=1 iteration_count=10
+[Status]: TH Leaving critical_section recursion_count=1 iteration_count=10
+*/
\ No newline at end of file
diff --git a/src/test/test_spinlock.hpp b/src/test/test_spinlock.hpp
new file mode 100644
index 00000000000..9e044865fc9
--- /dev/null
+++ b/src/test/test_spinlock.hpp
@@ -0,0 +1,12 @@
+#pragma once
+
+namespace ra
+{
+ namespace unit_tests
+ {
+ //main
+ void test_thread_spinlock();
+ //subs
+ void* thread_test_critical( void *x ); //must match rAthreadProc signature
+ }
+}
diff --git a/src/test/test_thread.cpp b/src/test/test_thread.cpp
new file mode 100644
index 00000000000..715ee39193f
--- /dev/null
+++ b/src/test/test_thread.cpp
@@ -0,0 +1,48 @@
+#include "test_thread.hpp"
+#include <chrono>
+#include <thread>
+
+#include "../common/thread.h"
+#include "../common/showmsg.h"
+
+
+namespace ra
+{
+ namespace unit_tests
+ {
+ void* thread_test(void *x)
+ {
+ ShowStatus( "Entering thread_test\n" );
+ int lTHID = rathread_get_tid();
+ ShowStatus( "test th id=%d\n",lTHID);
+ std::this_thread::sleep_for(std::chrono::milliseconds(500));
+ ShowStatus( "Leaving thread_test\n" );
+ return nullptr;
+ }
+
+ void test_thread_creation_and_wait()
+ {
+ ShowStatus( "Testing thread_creation_and_wait\n" );
+ prAthread lnd2th = rathread_create(&thread_test,nullptr);
+ //rathread_yield();
+ std::this_thread::sleep_for(std::chrono::milliseconds(100)); //fake doing stuff
+ int lMainID = rathread_get_tid();
+ ShowStatus( "Continuing main th id=%d\n",lMainID);
+ while ( !rathread_wait( lnd2th, nullptr ) )
+ {
+ ShowStatus( "Waiting 2nd thread\n" );
+ std::this_thread::sleep_for(std::chrono::seconds(1));
+ }
+ rathread_destroy(lnd2th); //will be destroy anyway by manager if not
+ }
+
+ }
+}
+
+/* Expected result
+[Status]: Testing thread_creation_and_wait
+[Status]: Entering thread_test
+[Status]: test th id=1
+[Status]: Continuing main th id=0
+[Status]: Leaving thread_test
+*/
\ No newline at end of file
diff --git a/src/test/test_thread.hpp b/src/test/test_thread.hpp
new file mode 100644
index 00000000000..2ca9880dc6f
--- /dev/null
+++ b/src/test/test_thread.hpp
@@ -0,0 +1,12 @@
+#pragma once
+
+namespace ra
+{
+ namespace unit_tests
+ {
+ //main
+ void test_thread_creation_and_wait();
+ //sub
+ void* thread_test( void *x ); //must match rAthreadProc signature
+ }
+}
diff --git a/src/tool/mapcache.c b/src/tool/mapcache.c
index 5e8a5d6486e..228595ae5c4 100644
--- a/src/tool/mapcache.c
+++ b/src/tool/mapcache.c
@@ -9,15 +9,12 @@
#include <unistd.h>
#endif
-#include "../common/cbasetypes.h"
+#include "../common/mmo.h"
#include "../common/grfio.h"
#include "../common/malloc.h"
-#include "../common/mmo.h"
#include "../common/showmsg.h"
#include "../common/utils.h"
-#include "../config/renewal.h"
-
#define NO_WATER 1000000
char grf_list_file[256] = "conf/grf-files.txt";
diff --git a/src/tool/map-cache.vcxproj b/src/tool/mapcache.vcxproj
similarity index 97%
rename from src/tool/map-cache.vcxproj
rename to src/tool/mapcache.vcxproj
index bcf301f4192..13ee343a3d5 100644
--- a/src/tool/map-cache.vcxproj
+++ b/src/tool/mapcache.vcxproj
@@ -27,26 +27,26 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
diff --git a/src/tool/map-cache.vcxproj.filters b/src/tool/mapcache.vcxproj.filters
similarity index 100%
rename from src/tool/map-cache.vcxproj.filters
rename to src/tool/mapcache.vcxproj.filters
diff --git a/tools/charserv.bat b/tools/charserv.bat
index b21efac35e1..39dbedb1d56 100644
--- a/tools/charserv.bat
+++ b/tools/charserv.bat
@@ -1,2 +1,2 @@
@ECHO OFF
-CALL serv.bat char-server.exe Char-Server
+CALL serv.bat char-server.exe Char-Server %*
diff --git a/tools/ci/npc.bat b/tools/ci/npc.bat
new file mode 100644
index 00000000000..5e0b611e807
--- /dev/null
+++ b/tools/ci/npc.bat
@@ -0,0 +1,52 @@
+@echo off
+
+setlocal enabledelayedexpansion
+
+rem switch to the npc folder
+cd ..\..\npc\
+
+rem store the output destination
+set OUT=%CD%\scripts_custom.conf
+
+rem switch to the custom folder
+cd custom\
+
+rem newline
+echo. >> !OUT!
+rem header
+echo // Custom Scripts >> !OUT!
+
+rem store the current directory
+set C=%CD%
+rem make sure that no paranthesis close is unescaped inside the path
+set C=!C:^)=^^^)!
+
+for /R . %%f in (*.txt) do (
+ rem store it to allow delayed expansion
+ set B=%%f
+ rem store relative path for compare
+ set R=!B:%C%\=!
+
+ rem all except the battleground scripts
+ if "!R:~0,12!" neq "battleground" (
+ echo npc: npc\custom\!R!>>!OUT!
+ )
+)
+
+rem switch to the test folder
+cd ..\test
+
+rem header
+echo // Test scripts >> !OUT!
+
+rem store the current directory
+set C=%CD%
+rem make sure that no paranthesis close is unescaped inside the path
+set C=!C:^)=^^^)!
+
+for /R . %%f in (*.txt) do (
+ rem store it to allow delayed expansion
+ set B=%%f
+
+ echo npc: npc\test\!B:%C%\=!>>!OUT!
+)
diff --git a/tools/ci/npc.sh b/tools/ci/npc.sh
new file mode 100755
index 00000000000..22f7f83bdd5
--- /dev/null
+++ b/tools/ci/npc.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+out=npc/scripts_custom.conf
+
+printf "\n" >> $out
+echo "// Custom Scripts" >> $out
+
+find npc/custom \( -name "*.txt" -and -not -wholename "*/battleground/*" \) | xargs -I % echo "npc: %" >> $out
+
+echo "// Test Scripts" >> $out
+
+find npc/test \( -name "*.txt" \) | xargs -I % echo "npc: %" >> $out
diff --git a/tools/ci/sql.bat b/tools/ci/sql.bat
new file mode 100644
index 00000000000..2da0898cefe
--- /dev/null
+++ b/tools/ci/sql.bat
@@ -0,0 +1,41 @@
+@echo off
+
+rem MySQL database setup
+
+%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% -e "CREATE DATABASE %DB_NAME%;"
+
+%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\main.sql"
+
+%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\logs.sql"
+
+%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\item_cash_db.sql"
+
+%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\item_cash_db2.sql"
+
+%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\item_db.sql"
+
+%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\item_db2.sql"
+
+%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\item_db_re.sql"
+
+%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\item_db2_re.sql"
+
+%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_db.sql"
+
+%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_db2.sql"
+
+%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_db_re.sql"
+
+%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_db2_re.sql"
+
+%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_skill_db.sql"
+
+%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_skill_db2.sql"
+
+%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_skill_db_re.sql"
+
+%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_skill_db2_re.sql"
+
+%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\roulette_default_data.sql"
+
+%MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% -e "GRANT SELECT,INSERT,UPDATE,DELETE ON %DB_NAME%.* TO '%DB_USER%'@'%DB_HOST%' IDENTIFIED BY '%DB_USERPW%';"
diff --git a/tools/ci/sql.sh b/tools/ci/sql.sh
new file mode 100755
index 00000000000..920aad57bde
--- /dev/null
+++ b/tools/ci/sql.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+function aborterror {
+ echo $@
+ exit 1
+}
+
+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 SELECT,INSERT,UPDATE,DELETE ON $DB_NAME.* TO '$DB_USER'@'$DB_HOST' IDENTIFIED BY '$DB_PASS';"
diff --git a/tools/config.pl b/tools/config.pl
index 74f8b18d0bc..2ec3dea2834 100755
--- a/tools/config.pl
+++ b/tools/config.pl
@@ -3,7 +3,7 @@
# by lighta
# TODO:
# - Don't always override import/file, sed grep ?
-
+use lib '.';
use File::Basename;
use DBI;
use DBD::mysql;
@@ -13,15 +13,19 @@
use Net::Ping;
use strict;
use rA_Common;
+use LWP::Simple;
use constant {
SERV_UID => "Serv_userid",
SERV_PW => "Serv_userpass",
+ LOGIN_PRIV_IP => "login_priv_ip",
+ CHAR_PRIV_IP => "char_priv_ip",
SERV_WAN_IP => "Serv_wan_ip",
MAP_PORT => "Map_port",
CHAR_PORT => "Char_port",
LOGIN_PORT => "Login_port",
MD5_ENABLE => "enable_MD5",
+ PINCODE_ENABLE => "enable_pincode",
SQL_HOST => "SQL_host",
SQL_PORT => "SQL_port",
SQL_UID => "SQL_userid",
@@ -87,13 +91,17 @@ sub Main {
chdir $dir; #put ourself like was called in tools
print "Running rAthena's configuration tool...\n";
#default conf
+ my $pubip = GetPublicIP();
my %hDefConf = ( SERV_UID => "s1",
SERV_PW => "p1",
- SERV_WAN_IP => "localhost",
+ SERV_WAN_IP => $pubip || "localhost",
+ LOGIN_PRIV_IP => "localhost",
+ CHAR_PRIV_IP => "localhost",
MAP_PORT => "5121",
CHAR_PORT => "6121",
LOGIN_PORT => "6900",
MD5_ENABLE => "yes",
+ PINCODE_ENABLE => "yes",
SQL_HOST => "localhost",
SQL_PORT => "3306",
SQL_UID => "ragnarok",
@@ -101,6 +109,7 @@ sub Main {
SQL_MAIN_DB => "ragnarok",
SQL_LOG_DB => ,"ragnarok",
);
+
my $sBasedir = getcwd; #for setupdb
if($sTarget =~ /All|Inst/i){ InstallSoft(); }
@@ -173,6 +182,15 @@ sub EnableCoredump {
}
}
+sub GetPublicIP {
+ print "\n== Resolving Public IP_addr";
+ my $content = get("http://checkip.dyndns.org");
+ $content =~ s/.*Current IP Address: ([\d.]+).*/$1/;
+ $content =~ s/\r|\n//gm;
+ print "\n found = $content ==\n";
+ return $content;
+}
+
sub GetOS {
#yes we could $^0 or uname -r but $^0 only give perl binary build OS and uname hmm...
open PIPE,"lsb_release -i |" or die $!;
@@ -297,7 +315,8 @@ sub InstallSoft {
print FILE "passwd: " . $$rhUserConf{SERV_PW}."\n\n";
print FILE "map_ip: " . $$rhUserConf{SERV_WAN_IP}."\n";
- print FILE "map_port: " . $$rhUserConf{MAP_PORT}."\n";
+ print FILE "map_port: " . $$rhUserConf{MAP_PORT}."\n";
+ print FILE "char_ip: " . $$rhUserConf{CHAR_PRIV_IP}."\n";
print FILE "char_port: " . $$rhUserConf{CHAR_PORT}."\n";
}
@@ -305,10 +324,13 @@ sub InstallSoft {
open FILE, "> $sCurfile" || die "Couldn't open file '$sCurfile'.\n";
print FILE "userid: " . $$rhUserConf{SERV_UID}."\n";
print FILE "passwd: " . $$rhUserConf{SERV_PW}."\n\n";
-
+
print FILE "char_ip: " . $$rhUserConf{SERV_WAN_IP}."\n";
print FILE "char_port: " . $$rhUserConf{CHAR_PORT}."\n";
+ print FILE "login_ip: " . $$rhUserConf{LOGIN_PRIV_IP}."\n";
print FILE "login_port: " . $$rhUserConf{LOGIN_PORT}."\n";
+
+ print FILE "pincode_enabled: " . $$rhUserConf{PINCODE_ENABLE}."\n";
}
sub ApplyLoginConf { my ($rhUserConf,$sCurfile) = @_;
diff --git a/tools/convert_emotions.py b/tools/convert_emotions.py
new file mode 100755
index 00000000000..b89cb793e88
--- /dev/null
+++ b/tools/convert_emotions.py
@@ -0,0 +1,186 @@
+#!/usr/bin/env python3
+
+"""
+Simple scripts which replaces the old emotion script constants to the new
+script constants.
+The actual replacement list is in 'emotion_dict'.
+
+Related pull request: https://github.com/rathena/rathena/pull/2527
+"""
+
+import fileinput
+import re
+import os
+import collections
+
+convert_folders = ["../npc", "../src"]
+parse_dict_file = '../src/map/script_constants.hpp'
+wl_file_extensions = ['.hpp', '.h', '.cpp', '.c', '.txt' ]
+script_file_extensions = ['.txt']
+bl_files = ['script_constants.hpp']
+BACKUP_EXT = '.bak'
+"""
+This is the old emotion_dict, which is now parsed from script_constants.hpp.
+emotion_dict_old = collections.OrderedDict([
+('E_GASP', 'ET_SURPRISE'),
+('E_WHAT', 'ET_QUESTION'),
+('E_HO', 'ET_DELIGHT'),
+('E_LV', 'ET_THROB'),
+('E_SWT', 'ET_SWEAT'),
+('E_IC', 'ET_AHA'),
+('E_AN', 'ET_FRET'),
+('E_AG', 'ET_ANGER'),
+('E_CASH', 'ET_MONEY'),
+('E_DOTS', 'ET_THINK'),
+('E_SCISSORS', 'ET_SCISSOR'),
+('E_ROCK', 'ET_ROCK'),
+('E_PAPER', 'ET_WRAP'),
+('E_KOREA', 'ET_FLAG'),
+('E_LV2', 'ET_BIGTHROB'),
+('E_THX', 'ET_THANKS'),
+('E_WAH', 'ET_KEK'),
+('E_SRY', 'ET_SORRY'),
+('E_HEH', 'ET_SMILE'),
+('E_SWT2', 'ET_PROFUSELY_SWEAT'),
+('E_HMM', 'ET_SCRATCH'),
+('E_NO1', 'ET_BEST'),
+('E_NO', 'ET_STARE_ABOUT'),
+('E_OMG', 'ET_HUK'),
+('E_OH', 'ET_O'),
+('E_X', 'ET_X'),
+('E_HLP', 'ET_HELP'),
+('E_GO', 'ET_GO'),
+('E_SOB', 'ET_CRY'),
+('E_GG', 'ET_KIK'),
+('E_KIS', 'ET_CHUP'),
+('E_KIS2', 'ET_CHUPCHUP'),
+('E_PIF', 'ET_HNG'),
+('E_OK', 'ET_OK'),
+('E_MUTE', 'ET_CHAT_PROHIBIT'),
+('E_INDONESIA', 'ET_INDONESIA_FLAG'),
+('E_BZZ', 'ET_STARE'),
+('E_RICE', 'ET_HUNGRY'),
+('E_AWSM', 'ET_COOL'),
+('E_MEH', 'ET_MERONG'),
+('E_SHY', 'ET_SHY'),
+('E_PAT', 'ET_GOODBOY'),
+('E_MP', 'ET_SPTIME'),
+('E_SLUR', 'ET_SEXY'),
+('E_COM', 'ET_COMEON'),
+('E_YAWN', 'ET_SLEEPY'),
+('E_GRAT', 'ET_CONGRATULATION'),
+('E_HP', 'ET_HPTIME'),
+('E_PHILIPPINES', 'ET_PH_FLAG'),
+('E_MALAYSIA', 'ET_MY_FLAG'),
+('E_SINGAPORE', 'ET_SI_FLAG'),
+('E_BRAZIL', 'ET_BR_FLAG'),
+('E_FLASH', 'ET_SPARK'),
+('E_SPIN', 'ET_CONFUSE'),
+('E_SIGH', 'ET_OHNO'),
+('E_DUM', 'ET_HUM'),
+('E_LOUD', 'ET_BLABLA'),
+('E_OTL', 'ET_OTL'),
+('E_DICE1', 'ET_DICE1'),
+('E_DICE2', 'ET_DICE2'),
+('E_DICE3', 'ET_DICE3'),
+('E_DICE4', 'ET_DICE4'),
+('E_DICE5', 'ET_DICE5'),
+('E_DICE6', 'ET_DICE6'),
+('E_INDIA', 'ET_INDIA_FLAG'),
+('E_LUV', 'ET_LUV'),
+('E_RUSSIA', 'ET_FLAG8'),
+('E_VIRGIN', 'ET_FLAG9'),
+('E_MOBILE', 'ET_MOBILE'),
+('E_MAIL', 'ET_MAIL'),
+('E_CHINESE', 'ET_ANTENNA0'),
+('E_ANTENNA1', 'ET_ANTENNA1'),
+('E_ANTENNA2', 'ET_ANTENNA2'),
+('E_ANTENNA3', 'ET_ANTENNA3'),
+('E_HUM', 'ET_HUM2'),
+('E_ABS', 'ET_ABS'),
+('E_OOPS', 'ET_OOPS'),
+('E_SPIT', 'ET_SPIT'),
+('E_ENE', 'ET_ENE'),
+('E_PANIC', 'ET_PANIC'),
+('E_WHISP', 'ET_WHISP'),
+('E_YUT1', 'ET_YUT1'),
+('E_YUT2', 'ET_YUT2'),
+('E_YUT3', 'ET_YUT3'),
+('E_YUT4', 'ET_YUT4'),
+('E_YUT5', 'ET_YUT5'),
+('E_YUT6', 'ET_YUT6'),
+('E_YUT7', 'ET_YUT7')
+])
+"""
+def parse_emotion_dict(filepath):
+ ret_list = []
+ with fileinput.FileInput(filepath) as fiFile:
+ for line in fiFile:
+ found = re.search('"(E_[A-Z_0-9]+)"\s*,\s*(ET_[A-Z_0-9]+)\s*', line)
+ if found:
+ ret_list.append((found.group(1), found.group(2)))
+ return ret_list
+
+emotion_dict = collections.OrderedDict(parse_emotion_dict(parse_dict_file))
+
+emotion_array = [val for val in emotion_dict.values()]
+pattern_oldconst = re.compile(r'\b(' + '|'.join(emotion_dict.keys()) + r')\b', re.IGNORECASE)
+pattern_value = re.compile(r'\b(' + '|'.join(["emotion\s+%d+"%i for i in range(len(emotion_array))]) + r')\b', re.IGNORECASE)
+
+def revert_to_backup(filename):
+ os.rename(filename+BACKUP_EXT, filename)
+
+def apply_substitutions(new_line, is_script):
+ remove_backup = True # only keep backup if the original file changed
+ rpl_cnt = 0
+ # E_GASP -> ET_SURPRISE
+ new_line, rpl_cnt = pattern_oldconst.subn(lambda x: emotion_dict[x.group().upper()], new_line)
+ remove_backup = False if rpl_cnt > 0 else remove_backup
+ if is_script: # script only replacements
+ # 0 -> ET_SURPRISE
+ new_line, rpl_cnt = pattern_value.subn(lambda x: 'emotion '+emotion_array[int(x.group().split()[-1])], new_line)
+ remove_backup = False if rpl_cnt > 0 else remove_backup
+ # emotion e,0,"Record player#e152a01"; -> emotion e, getnpcid(0,"Record player#e152a01");
+ new_line, rpl_cnt = re.subn(r"emotion\s+([^,]+)\s*,\s*0\s*,\s*([^;]+);",
+ "emotion \g<1>, getnpcid(0, \g<2>);", new_line)
+ remove_backup = False if rpl_cnt > 0 else remove_backup
+ # emotion e,1; -> emotion e, playerattached();
+ new_line, rpl_cnt = re.subn(r"emotion\s+([^,]+)\s*,\s*1\s*;",
+ "emotion \g<1>, playerattached();", new_line)
+ remove_backup = False if rpl_cnt > 0 else remove_backup
+ # unitemote <id>,<emotion>; -> emotion <emotion>, <id>;
+ new_line, rpl_cnt = re.subn(r"unitemote\s+([^,]+)\s*,\s*([^,;]+)\s*;",
+ "emotion \g<2>, \g<1>;", new_line)
+ remove_backup = False if rpl_cnt > 0 else remove_backup
+
+ return new_line, remove_backup
+
+def replace_emoticons_in_file(filename):
+ is_script = True if any([filename.endswith(script_ext) for script_ext in script_file_extensions]) else False
+ remove_backup = True
+ with fileinput.FileInput(filename, inplace=True, backup=BACKUP_EXT) as fiFile:
+ try:
+ for line in fiFile:
+ new_line, rm_backup = apply_substitutions(line, is_script)
+ if not rm_backup:
+ remove_backup = False
+ print(new_line, end='')
+ if remove_backup:
+ os.remove(filename+BACKUP_EXT)
+ except UnicodeDecodeError:
+ # Encoding error, reapply the backup
+ revert_to_backup(filename)
+
+
+fileiter = (os.path.join(root, f)
+ for conv_folder in convert_folders
+ for root, _, files in os.walk(conv_folder)
+ for f in files
+ if any([f.endswith(wl) for wl in wl_file_extensions])
+ if not any([bl in f for bl in bl_files])
+ )
+
+for f in fileiter:
+ print("Updating file", f)
+ replace_emoticons_in_file(f)
+
diff --git a/tools/logserv.bat b/tools/logserv.bat
index a36e07f17b3..5b7d05aa3ac 100644
--- a/tools/logserv.bat
+++ b/tools/logserv.bat
@@ -1,2 +1,2 @@
@ECHO OFF
-CALL serv.bat login-server.exe Login-Server
+CALL serv.bat login-server.exe Login-Server %*
diff --git a/tools/mapserv.bat b/tools/mapserv.bat
index fc6235092dc..bb30f42ed5f 100644
--- a/tools/mapserv.bat
+++ b/tools/mapserv.bat
@@ -1,2 +1,2 @@
@ECHO OFF
-CALL serv.bat map-server.exe Map-Server
+CALL serv.bat map-server.exe Map-Server %*
diff --git a/tools/runserver.bat b/tools/runserver.bat
index f7e23b62f51..cf721a7681a 100644
--- a/tools/runserver.bat
+++ b/tools/runserver.bat
@@ -3,6 +3,130 @@ rem This is and auto-restart script for the rAthena Ragnarok Online Server Emula
rem It will also keep the map server OPEN after it crashes to that errors may be
rem more easily identified
rem Writen by Jbain
-start cmd /k logserv.bat
-start cmd /k charserv.bat
-start cmd /k mapserv.bat
+rem modified by lighta
+
+set SOURCE_DIR=%~dp0
+cd %SOURCE_DIR%
+
+if ["%~1"]==[""] (
+ REM this is for backward compatibility
+ set "target=watch"
+) else set target=%~1
+echo "target=%target%"
+
+REM to avoid any localization issue
+set "login_running=false"
+set "char_running=false"
+set "map_running=false"
+
+
+if "%target%" == "status" (
+ call :getStatus
+) else if "%target%" == "watch" (
+ call :Watch
+) else if "%target%" == "stop" (
+ call :Stop
+) else if "%target%" == "stop" (
+ call :Stop
+) else if "%target%" == "start" (
+ call :Start
+)
+goto :EOF
+
+
+:Stop
+echo "Stoping all serv"
+call :stopLogin
+call :stopChar
+call :stopMap
+goto :EOF
+
+:Watch
+REM this is to align terminology with athena-start, (start with restart mode)
+echo "Starting all serv"
+set "restart_mode=on"
+call :startLogin
+call :startChar
+call :startMap
+goto :EOF
+
+:Start
+echo "Starting all serv"
+set "restart_mode=off"
+call :startLogin
+call :startChar
+call :startMap
+goto :EOF
+
+:getStatus
+echo "Getting status of all serv"
+call :getLoginStatus
+call :getCharStatus
+call :getMapStatus
+
+if "%login_running%" == "false" ( echo "login_serv is not running"
+) else echo "login_serv is running pid=%LoginServPID%"
+if "%char_running%" == "false" ( echo "char_serv is not running"
+) else echo "char_serv is running pid=%CharServPID%"
+if "%map_running%" == "false" ( echo "map_serv is not running"
+) else echo "map_serv is running pid=%MapServPID%"
+
+goto :EOF
+
+
+
+REM ====
+REM sub targets (a target per serv)
+REM ====
+
+REM stop sub targets
+:stopLogin
+call :getLoginStatus
+if "%login_running%" == "true" Taskkill /PID %LoginServPID% /F
+goto :EOF
+
+:stopChar
+call :getCharStatus
+if "%char_running%" == "true" Taskkill /PID %CharServPID% /F
+goto :EOF
+
+:stopMap
+call :getMapStatus
+if "%map_running%" == "true" Taskkill /PID %MapServPID% /F
+goto :EOF
+
+REM start sub targets
+:startLogin
+call :getLoginStatus
+if "%login_running%" == "false" ( start cmd /k logserv.bat %restart_mode%
+) else echo "Login serv is already running pid=%LoginServPID%"
+goto :EOF
+
+:startChar
+call :getCharStatus
+if "%char_running%" == "false" ( start cmd /k charserv.bat %restart_mode%
+) else echo "Char serv is already running, pid=%CharServPID%"
+goto :EOF
+
+:startMap
+call :getMapStatus
+if "%map_running%" == "false" ( start cmd /k mapserv.bat %restart_mode%
+) else echo "Map serv is already running, pid=%MapServPID%"
+goto :EOF
+
+REM status sub targets
+
+:getLoginStatus
+for /F "TOKENS=1,2,*" %%a in ('tasklist /FI "IMAGENAME eq login-server.exe"') do set LoginServPID=%%b
+echo(%LoginServPID%|findstr "^[-][1-9][0-9]*$ ^[1-9][0-9]*$ ^0$">nul&& set "login_running=true" || set "login_running=false"
+goto :EOF
+
+:getCharStatus
+for /F "TOKENS=1,2,*" %%a in ('tasklist /FI "IMAGENAME eq char-server.exe"') do set CharServPID=%%b
+echo(%CharServPID%|findstr "^[-][1-9][0-9]*$ ^[1-9][0-9]*$ ^0$">nul&& set "char_running=true" || set "char_running=false"
+goto :EOF
+
+:getMapStatus
+for /F "TOKENS=1,2,*" %%a in ('tasklist /FI "IMAGENAME eq map-server.exe"') do set MapServPID=%%b
+echo(%MapServPID%|findstr "^[-][1-9][0-9]*$ ^[1-9][0-9]*$ ^0$">nul&& set "map_running=true" || set "map_running=false"
+goto :EOF
diff --git a/tools/serv.bat b/tools/serv.bat
index e33f84f13db..f19f7140ad7 100644
--- a/tools/serv.bat
+++ b/tools/serv.bat
@@ -2,7 +2,11 @@
IF "%1"=="" GOTO DIRECT
IF "%2"=="" GOTO DIRECT
IF NOT EXIST "%1" GOTO NOTFOUND
-GOTO START
+
+IF "%3"=="" ( set "restart_mode=on"
+) else set "restart_mode=%~3"
+echo "restart_mode=%restart_mode%"
+GOTO START_RA
REM == How RESTART_9X and RESTART_NT works =========================
REM On Windows 9x only the first 8 characters are significant for
@@ -17,7 +21,7 @@ REM Windows 95, 98, ME
REM Old Ctrl+C in PING does not work, because that only stops ping,
REM not the batch file.
CHOICE /C:rc /N /T:R,15 Restarting in 15 seconds, press 'C' to cancel.
-IF NOT ERRORLEVEL 2 GOTO START
+IF NOT ERRORLEVEL 2 GOTO START_RA
GOTO END
REM Windows 2000, XP, Vista, 7
@@ -25,10 +29,11 @@ REM Windows 2000, XP, Vista, 7
REM There is no CHOICE in 2000 and XP, but you get asked whether to
REM abort the batch file, when pressing Ctrl+C in PING.
IF "%1"=="mapcache.exe" GOTO END
+if "%restart_mode%" == "off" GOTO END
ECHO Restarting in 15 seconds, press Ctrl+C to cancel.
PING -n 15 127.0.0.1 > NUL
-:START
+:START_RA
%1
ECHO.
REM Return value > 1 is exception&~0xC0000000