Trimmed trailing whitespaces in /src/map

Also fixed the newlines in logs.sql

.gitattributes

@@ -2,4 +2,11 @@
 *.c      diff=cpp
 *.sln    merge=union
 *.vcproj merge=union
-*.vcxproj merge=union
+*.vcxproj merge=union
+*.sln text eol=crlf
+*.bat text eol=crlf
+configure text eol=lf
+configure.in text eol=lf
+Makefile text eol=lf
+Makefile.in text eol=lf
+*.sh text eol=lf

.gitignore

@@ -100,6 +100,8 @@ Thumbs.db
 
 # /vcproj-14/
 .vs
+*.VC.db
+*.VC.opendb
 /vcproj-14/char-server
 /vcproj-14/login-server
 /vcproj-14/mapcache

.travis.yml

@@ -8,6 +8,21 @@ before_script:
   - 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';"
 
 script:

3rdparty/zlib/include/zconf.h

@@ -1,5 +1,5 @@
 /* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2012 Jean-loup Gailly.
+ * Copyright (C) 1995-2013 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -21,6 +21,7 @@
 #  define _dist_code            z__dist_code
 #  define _length_code          z__length_code
 #  define _tr_align             z__tr_align
+#  define _tr_flush_bits        z__tr_flush_bits
 #  define _tr_flush_block       z__tr_flush_block
 #  define _tr_init              z__tr_init
 #  define _tr_stored_block      z__tr_stored_block
@@ -77,6 +78,7 @@
 #      define gzopen_w              z_gzopen_w
 #    endif
 #    define gzprintf              z_gzprintf
+#    define gzvprintf             z_gzvprintf
 #    define gzputc                z_gzputc
 #    define gzputs                z_gzputs
 #    define gzread                z_gzread
@@ -103,6 +105,7 @@
 #  define inflateReset          z_inflateReset
 #  define inflateReset2         z_inflateReset2
 #  define inflateSetDictionary  z_inflateSetDictionary
+#  define inflateGetDictionary  z_inflateGetDictionary
 #  define inflateSync           z_inflateSync
 #  define inflateSyncPoint      z_inflateSyncPoint
 #  define inflateUndermine      z_inflateUndermine
@@ -388,20 +391,14 @@ typedef uLong FAR uLongf;
    typedef Byte       *voidp;
 #endif
 
-/* ./configure may #define Z_U4 here */
-
 #if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
 #  include <limits.h>
 #  if (UINT_MAX == 0xffffffffUL)
 #    define Z_U4 unsigned
-#  else
-#    if (ULONG_MAX == 0xffffffffUL)
-#      define Z_U4 unsigned long
-#    else
-#      if (USHRT_MAX == 0xffffffffUL)
-#        define Z_U4 unsigned short
-#      endif
-#    endif
+#  elif (ULONG_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned long
+#  elif (USHRT_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned short
 #  endif
 #endif
 
@@ -425,8 +422,16 @@ typedef uLong FAR uLongf;
 #  endif
 #endif
 
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#  ifndef Z_SOLO
+#    include <stdarg.h>         /* for va_list */
+#  endif
+#endif
+
 #ifdef _WIN32
-#  include <stddef.h>           /* for wchar_t */
+#  ifndef Z_SOLO
+#    include <stddef.h>         /* for wchar_t */
+#  endif
 #endif
 
 /* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
@@ -435,7 +440,7 @@ typedef uLong FAR uLongf;
  * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
  * equivalently requesting no 64-bit operations
  */
-#if defined(LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
+#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
 #  undef _LARGEFILE64_SOURCE
 #endif
 
@@ -443,7 +448,7 @@ typedef uLong FAR uLongf;
 #  define Z_HAVE_UNISTD_H
 #endif
 #ifndef Z_SOLO
-#  if defined(Z_HAVE_UNISTD_H) || defined(LARGEFILE64_SOURCE)
+#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
 #    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
 #    ifdef VMS
 #      include <unixio.h>       /* for off_t */

3rdparty/zlib/include/zlib.h

@@ -1,7 +1,7 @@
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.7, May 2nd, 2012
+  version 1.2.8, April 28th, 2013
 
-  Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler
+  Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -37,11 +37,11 @@
 extern "C" {
 #endif
 
-#define ZLIB_VERSION "1.2.7"
-#define ZLIB_VERNUM 0x1270
+#define ZLIB_VERSION "1.2.8"
+#define ZLIB_VERNUM 0x1280
 #define ZLIB_VER_MAJOR 1
 #define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 7
+#define ZLIB_VER_REVISION 8
 #define ZLIB_VER_SUBREVISION 0
 
 /*
@@ -839,6 +839,21 @@ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
    inflate().
 */
 
+ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm,
+                                             Bytef *dictionary,
+                                             uInt  *dictLength));
+/*
+     Returns the sliding dictionary being maintained by inflate.  dictLength is
+   set to the number of bytes in the dictionary, and that many bytes are copied
+   to dictionary.  dictionary must have enough space, where 32768 bytes is
+   always enough.  If inflateGetDictionary() is called with dictionary equal to
+   Z_NULL, then only the dictionary length is returned, and nothing is copied.
+   Similary, if dictLength is Z_NULL, then it is not set.
+
+     inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
+   stream state is inconsistent.
+*/
+
 ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
 /*
      Skips invalid compressed data until a possible full flush point (see above
@@ -846,7 +861,7 @@ ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
    available input is skipped.  No output is provided.
 
      inflateSync searches for a 00 00 FF FF pattern in the compressed data.
-   All full flush points have this pattern, but not all occurences of this
+   All full flush points have this pattern, but not all occurrences of this
    pattern are full flush points.
 
      inflateSync returns Z_OK if a possible full flush point has been found,
@@ -1007,7 +1022,8 @@ ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
    the version of the header file.
 */
 
-typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));
+typedef unsigned (*in_func) OF((void FAR *,
+                                z_const unsigned char FAR * FAR *));
 typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
 
 ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
@@ -1015,11 +1031,12 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
                                     out_func out, void FAR *out_desc));
 /*
      inflateBack() does a raw inflate with a single call using a call-back
-   interface for input and output.  This is more efficient than inflate() for
-   file i/o applications in that it avoids copying between the output and the
-   sliding window by simply making the window itself the output buffer.  This
-   function trusts the application to not change the output buffer passed by
-   the output function, at least until inflateBack() returns.
+   interface for input and output.  This is potentially more efficient than
+   inflate() for file i/o applications, in that it avoids copying between the
+   output and the sliding window by simply making the window itself the output
+   buffer.  inflate() can be faster on modern CPUs when used with large
+   buffers.  inflateBack() trusts the application to not change the output
+   buffer passed by the output function, at least until inflateBack() returns.
 
      inflateBackInit() must be called first to allocate the internal state
    and to initialize the state with the user-provided window buffer.
@@ -1736,6 +1753,13 @@ ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
 ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
                                             const char *mode));
 #endif
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#  ifndef Z_SOLO
+ZEXTERN int            ZEXPORTVA gzvprintf Z_ARG((gzFile file,
+                                                  const char *format,
+                                                  va_list va));
+#  endif
+#endif
 
 #ifdef __cplusplus
 }

AUTHORS

@@ -180,6 +180,7 @@ Nexon
 Ni+S
 Nikita
 nini
+Ninja
 NOCTURNE
 nokia
 non
@@ -207,6 +208,7 @@ samuray22
 Sanasol
 Sapientia
 Sara
+secretdataz
 Sel
 Seventh
 shadow
@@ -288,4 +290,4 @@ ZoDIaC
 胡
 胡蝶蘭
 過去の人i1
-釈尊
+釈尊

README.md

@@ -1,7 +1,7 @@
 rAthena
 =======
 
-Build Status: [![Build Status](https://travis-ci.org/rathena/rathena.png?branch=master)](https://travis-ci.org/rathena/rathena)
+Build Status: [![Build Status](https://travis-ci.org/rathena/rathena.png?branch=master)](https://travis-ci.org/rathena/rathena) [![Build status](https://ci.appveyor.com/api/projects/status/8574b8nlwd57loda/branch/master?svg=true)](https://ci.appveyor.com/project/rAthenaAPI/rathena/branch/master)
 
 Table of Contents
 ---------
@@ -65,10 +65,7 @@ relevant to your Operation System, please refer to the Wiki (links at the end of
 	* Type:
 		* (For CentOS)
 
-				yum install gcc make mysql mysql-devel mysql-server pcre-devel zlib-devel
-				rpm -Uvhhttp://repo.webtatic.com/yum/centos/5/latest.rpm
-				yum install --enablerepo=webtatic git-all
-				yum install --enablerepo=webtatic --disableexcludes=main git-all
+				yum install gcc make mysql mysql-devel mysql-server pcre-devel zlib-devel git
 		* (For Debian)
 
 				apt-get install git make gcc libmysqlclient-dev zlib1g-dev libpcre3-dev

README.txt

@@ -77,10 +77,7 @@ Windows
 Linux
 	* Type:
 	(For CentOS)
-		yum install gcc make mysql mysql-devel mysql-server pcre-devel zlib-devel
-		rpm -Uvhhttp://repo.webtatic.com/yum/centos/5/latest.rpm
-		yum install --enablerepo=webtatic git-all
-		yum install --enablerepo=webtatic --disableexcludes=main git-all
+		yum install gcc make mysql mysql-devel mysql-server pcre-devel zlib-devel git
 	(For Debian)
 		apt-get install git make gcc libmysqlclient-dev zlib1g-dev libpcre3-dev
 	* Type:

appveyor.yml

@@ -0,0 +1,122 @@
+image: Visual Studio 2015
+# This is the default location, but we put it here for safety reasons, since we use it in our test script
+clone_folder: c:\projects\rathena
+# We do not need the git history for our integration tests
+clone_depth: 50
+version: '{branch}-{build}'
+pull_requests:
+  do_not_increment_build_number: true
+environment:
+  matrix:
+  - VisualStudioVersion: 10.0
+    Solution: rAthena-10.sln
+  - VisualStudioVersion: 11.0
+    Solution: rAthena-12.sln
+  - VisualStudioVersion: 12.0
+    Solution: rAthena-13.sln
+  - VisualStudioVersion: 14.0
+    Solution: rAthena-14.sln
+  - VisualStudioVersion: 10.0
+    Solution: rAthena-10.sln
+    Defines: PRERE
+  - VisualStudioVersion: 11.0
+    Solution: rAthena-12.sln
+    Defines: PRERE
+  - VisualStudioVersion: 12.0
+    Solution: rAthena-13.sln
+    Defines: PRERE
+  - VisualStudioVersion: 14.0
+    Solution: rAthena-14.sln
+    Defines: PRERE
+platform:
+  - Win32
+configuration:
+  - Debug
+# Disable Release for now, since do not want to have any optimization and have access to debug infos on crash
+#  - Release
+matrix:
+  fast_finish: true
+build_script:
+- cmd: msbuild %Solution% /p:DefineConstants=%Defines%
+services: mysql
+test_script:
+- cmd: >-
+    rem Set up the environment variables we need
+    
+    set DB_HOST=127.0.0.1
+    
+    set DB_ROOT=root
+    
+    set DB_ROOTPW=Password12!
+    
+    set DB_USER=ragnarok
+    
+    set DB_USERPW=ragnarok
+    
+    set DB_NAME=ragnarok
+    
+    set MYSQL="C:\Program Files\MySql\MySQL Server 5.7\bin\mysql.exe"
+    
+    rem Setting creation
+    
+    cd C:\projects\rathena
+    
+    echo map_server_ip: %DB_HOST%>> conf\import\inter_conf.txt
+    
+    echo map_server_id: %DB_USER%>> conf\import\inter_conf.txt
+    
+    echo map_server_pw: %DB_PASS%>> conf\import\inter_conf.txt
+    
+    echo map_server_db: %DB_NAME%>> conf\import\inter_conf.txt
+    
+    echo log_db_ip: %DB_HOST%>> conf\import\inter_conf.txt
+    
+    echo log_db_id: %DB_USER%>> conf\import\inter_conf.txt
+    
+    echo log_db_pw: %DB_USERPW%>> conf\import\inter_conf.txt
+    
+    echo log_db_db: %DB_NAME%>> conf\import\inter_conf.txt
+    
+    rem MySQL database setup
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% -e "CREATE DATABASE %DB_NAME%;"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\main.sql"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\logs.sql"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\item_cash_db.sql"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\item_cash_db2.sql"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\item_db.sql"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\item_db2.sql"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\item_db_re.sql"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\item_db2_re.sql"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_db.sql"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_db2.sql"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_db_re.sql"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_db2_re.sql"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_skill_db.sql"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_skill_db2.sql"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_skill_db_re.sql"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_skill_db2_re.sql"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\roulette_default_data.sql"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% -e "GRANT ALL ON *.* TO '%DB_USER%'@'%DB_HOST%' IDENTIFIED BY '%DB_USERPW%';"
+    
+    rem Start the map server
+    
+    map-server.exe --run-once

conf/atcommand_athena.conf

@@ -67,4 +67,4 @@ aliases: {
 /* Commands help file */
 help: {
 	@include "conf/help.txt"
-}
+}

conf/battle/battle.conf

@@ -37,7 +37,7 @@ pc_damage_walk_delay_rate: 20
 damage_walk_delay_rate: 100
 
 // Move-delay adjustment for multi-hitting attacks.
-// When hit by a multi-hitting skill like Lord of Vermillion or Jupitel Thunder, characters will be 
+// When hit by a multi-hitting skill like Lord of Vermillion or Jupitel Thunder, characters will be
 // unable to move for an additional "(number of hits -1) * multihit_delay" milliseconds.
 // 80 is the setting that feels like Aegis (vs Sonic Blows)
 // 230 is the setting that makes walkdelay last until the last hit (vs Jupitel thunder)
@@ -56,7 +56,7 @@ undead_detect_type: 0
 // Does HP recover if hit by an attribute that's same as your own? (Note 1)
 attribute_recover: no
 
-// What is the minimum and maximum hitrate of normal attacks? 
+// What is the minimum and maximum hitrate of normal attacks?
 min_hitrate: 5
 max_hitrate: 100
 
@@ -120,7 +120,7 @@ attack_attr_none: 14
 equip_natural_break_rate: 0
 
 // Overall rate of which your own equipment can break. (Note 2)
-// This rate affects penalty breaking rate of skills such as power-thrust and your natural breaking rate 
+// This rate affects penalty breaking rate of skills such as power-thrust and your natural breaking rate
 // (from equip_natural_break_rate). If a Sage's endow skill fails and this is above 0, the selected char's
 // weapon will be broken.
 equip_self_break_rate: 100
@@ -136,8 +136,8 @@ delay_battle_damage: yes
 // Are arrows/ammo consumed when used on a bow/gun?
 // 0 = No
 // 1 = Yes
-// 2 = Yes even for skills that do not specify arrow consumption when said 
-//     skill is weapon-based and used with ranged weapons (auto-guesses which 
+// 2 = Yes even for skills that do not specify arrow consumption when said
+//     skill is weapon-based and used with ranged weapons (auto-guesses which
 //     skills should consume ammo when it's acquired via a card or plagiarize)
 arrow_decrement: 1
 

conf/battle/client.conf

@@ -62,7 +62,7 @@ packet_ver_flag: 0x7FFFFFFF
 packet_ver_flag2: 0x7FFFFFFF
 
 // Minimum delay between whisper/global/party/guild messages (in ms)
-// Messages that break this threshold are silently omitted. 
+// Messages that break this threshold are silently omitted.
 min_chat_delay: 0
 
 // Valid range of dyes and styles on the client.
@@ -70,8 +70,10 @@ min_hair_style: 0
 max_hair_style: 27
 min_hair_color: 0
 max_hair_color: 8
-min_cloth_color: 0 
+min_cloth_color: 0
 max_cloth_color: 4
+min_body_style: 0
+max_body_style: 1
 
 // When set to yes, the damage field in packets sent from woe maps will be set
 // to -1, making it impossible for GMs, Bots and Hexed clients to know the
@@ -120,9 +122,14 @@ wedding_modifydisplay: no
 // Save Clothes color. (This will degrade performance) (Note 1)
 save_clothcolor: yes
 
+// Save body styles. (Note 1)
+// Note: Don't turn this on unless you know what your doing.
+// Sprites are not released officially.
+save_body_style: no
+
 // Do not display cloth colors for the wedding class?
 // Note: Both save_clothcolor and wedding_modifydisplay have to be enabled
-// for this option to take effect. Set this to yes if your cloth palettes 
+// for this option to take effect. Set this to yes if your cloth palettes
 // pack doesn't has wedding palettes (or has less than the other jobs)
 wedding_ignorepalette: no
 
@@ -180,3 +187,8 @@ update_enemy_position: yes
 // When a player teleports, changes maps, or logs in, will they face the direction they were facing before warped?
 // Official: Disabled, players always face North.
 spawn_direction: no
+
+// Show the MVP EXP reward message for clients 2013-12-23cRagexe and newer? (Note 1)
+// kRO removed the packet and this re-enables the message.
+// Official: Disabled.
+mvp_exp_reward_message: no

conf/battle/drops.conf

@@ -40,30 +40,35 @@ mvp_item_third_get_time: 2000
 // The rate the common items are dropped (Items that are in the ETC tab, besides card)
 item_rate_common: 100
 item_rate_common_boss: 100
+item_rate_common_mvp: 100
 item_drop_common_min: 1
 item_drop_common_max: 10000
 
 // The rate healing items are dropped (items that restore HP or SP)
 item_rate_heal: 100
 item_rate_heal_boss: 100
+item_rate_heal_mvp: 100
 item_drop_heal_min: 1
 item_drop_heal_max: 10000
 
 // The rate at which usable items (in the item tab) other then healing items are dropped.
 item_rate_use: 100
 item_rate_use_boss: 100
+item_rate_use_mvp: 100
 item_drop_use_min: 1
 item_drop_use_max: 10000
 
 // The rate at which equipment is dropped.
 item_rate_equip: 100
 item_rate_equip_boss: 100
+item_rate_equip_mvp: 100
 item_drop_equip_min: 1
 item_drop_equip_max: 10000
 
 // The rate at which cards are dropped
 item_rate_card: 100
 item_rate_card_boss: 100
+item_rate_card_mvp: 100
 item_drop_card_min: 1
 item_drop_card_max: 10000
 
@@ -85,7 +90,7 @@ item_drop_treasure_min: 1
 item_drop_treasure_max: 10000
 
 // Use logarithmic drops? (Note 1)
-// Logarithmic drops scale drop rates in a non-linear fashion using the equation 
+// Logarithmic drops scale drop rates in a non-linear fashion using the equation
 // Droprate(x,y) = x * (5 - log(x)) ^ (ln(y) / ln(5))
 // Where x is the original drop rate and y is the drop_rate modifier (the previously mentioned item_rate* variables)
 // Use the following table for an idea of how the rate will affect drop rates when logarithmic drops are used:

conf/battle/exp.conf

@@ -20,14 +20,14 @@ multi_level_up: no
 
 // Setting this can cap the max experience one can get per kill specified as a
 // % of the current exp bar. (Every 10 = 1.0%)
-// For example, set it to 500 and no matter how much exp the mob gives, 
+// For example, set it to 500 and no matter how much exp the mob gives,
 // it can never give you above half of your current exp bar.
 max_exp_gain_rate: 0
 
 // Method of calculating earned experience when defeating a monster:
 // 0 = uses damage given / total damage as damage ratio
 // 1 = uses damage given / max_hp as damage ratio
-// NOTE: Using type 1 disables the bonus where the first attacker gets 
+// NOTE: Using type 1 disables the bonus where the first attacker gets
 //       his share of the exp doubled when multiple people attack the mob.
 exp_calc_type: 0
 
@@ -79,6 +79,12 @@ death_penalty_job: 100
 // NOTE: It is a percentage of their zeny, so 100 = 1%
 zeny_penalty: 0
 
+// Will players on max base/job level lose the EXP on death?
+// 0: Never lose (default as in official).
+// 1: Lose Base EXP.
+// 2: Lose Job EXP.
+death_penalty_maxlv: 0
+
 // Will display experience gained from killing a monster. (Note 1)
 disp_experience: no
 
@@ -86,6 +92,17 @@ disp_experience: no
 disp_zeny: no
 
 // Use the contents of db/statpoint.txt when doing a stats reset and leveling up? (Note 1)
-// If no, an equation will be used which preserves statpoints earned/lost 
+// If no, an equation will be used which preserves statpoints earned/lost
 // through external means (ie: stat point buyers/sellers)
 use_statpoint_table: yes
+
+// EXP cost for cast PR_REDEMPTIO (Note 2)
+exp_cost_redemptio: 1
+
+// How many player needed to makes PR_REDEMPTIO's EXP penalty become 0?
+// If by default, the 'exp_cost_redemptio' is 1 (1%) and every single player revived the penalty is reduced to 0.2%,
+// it means 'exp_cost_redemptio_limit' is 5.
+exp_cost_redemptio_limit: 5
+
+// EXP cost for cast LG_INSPIRATION (Note 2)
+exp_cost_inspiration: 1

conf/battle/feature.conf

@@ -22,6 +22,7 @@ feature.atcommand_suggestions: off
 // Auction (Note 1)
 // Feature became unstable on clients 2012 onwards (exact date not known),
 // it has been fixed on clients 2013-05-15 onwards however.
+// Feature was removed again on clients 2014-11-12 and later.
 feature.auction: on
 
 // Warp suggestions (Note 1)

conf/battle/gm.conf

@@ -13,8 +13,8 @@ atcommand_spawn_quantity_limit: 100
 // Maximum number of slave-clones that can be have by using the @slaveclone at command. (0 denotes unlimited quantity)
 atcommand_slave_clone_limit: 25
 
-// If 'no', commands require exact player name. If 'yes', entering a partial 
-// name will work, as long as there's only one match from all players in the 
+// If 'no', commands require exact player name. If 'yes', entering a partial
+// name will work, as long as there's only one match from all players in the
 // current map server.
 partial_name_scan: yes
 
@@ -27,3 +27,8 @@ ban_hack_trade: 5
 // modifies @iteminfo to not display the minimum item drop rate (since it can't tell the mob level)
 // modifies @whodrops to display the users' real drop rate as per renewal_drop formula
 atcommand_mobinfo_type: 1
+
+// Should atcommands trigger level up events for NPCs? (Note 1)
+// This option is for @baselevelup and @joblevelup
+// Default: no
+atcommand_levelup_events: no

conf/battle/items.conf

@@ -74,7 +74,7 @@ cashfood_use_interval: 60000
 gtb_sc_immunity: 50
 
 // Enable autospell card effects to stack?
-// NOTE: Different cards that grant the same skill will both 
+// NOTE: Different cards that grant the same skill will both
 // always work independently of each other regardless of setting.
 autospell_stacking: no
 

conf/battle/misc.conf

@@ -10,11 +10,11 @@
 //--------------------------------------------------------------
 
 // PK Server Mode.  Turns entire server pvp(excluding towns). Experience loss is doubled if killed by another player.
-// When players hunt monsters over 20 levels higher, they will receive 15% additional exp., and 25% chance of receiving more items. 
+// When players hunt monsters over 20 levels higher, they will receive 15% additional exp., and 25% chance of receiving more items.
 // There is a nopvp.txt for setting up maps not to have pk on in this mode.  Novices cannot be attacked and cannot attack.
 // Normal pvp counter and rank display are disabled as well.
-// Note: If pk_mode is set to 2 instead of 1 (yes), players will receive a 
-//   manner penalty of 5 each time they kill another player (see manner_system 
+// Note: If pk_mode is set to 2 instead of 1 (yes), players will receive a
+//   manner penalty of 5 each time they kill another player (see manner_system
 //   config to adjust how this will affect players)
 pk_mode: 0
 
@@ -36,7 +36,7 @@ pk_min_level: 55
 pk_level_range: 0
 
 // For PK servers. Damage adjustment settings, these follow the same logic
-// as their WoE counterparts (see guild.conf)  
+// as their WoE counterparts (see guild.conf)
 pk_short_attack_damage_rate: 80
 pk_long_attack_damage_rate: 70
 pk_weapon_attack_damage_rate: 60
@@ -53,7 +53,7 @@ battle_log: off
 etc_log: off
 
 // Do you want to debug warp points? If set to yes, warp points will appear as flags.(Note 1)
-// It will also run on start-up a warp-check to print out which warp points lead directly on 
+// It will also run on start-up a warp-check to print out which warp points lead directly on
 // top of on-touch npcs (which can lead to infinite loopback warping situations)
 warp_point_debug: no
 
@@ -88,7 +88,7 @@ duel_time_interval: 60
 // Restrict duel usage to same map
 duel_only_on_same_map: no
 
-// Determines max number of characters that can stack within a single cell. 
+// Determines max number of characters that can stack within a single cell.
 // Official - Only affects the walking routines of characters, including monsters.
 // If a unit stops walking and is on a cell with more than stack limit
 // characters on it, it will walk to the closest free cell.

conf/battle/monster.conf

@@ -26,18 +26,21 @@ monster_max_aspd: 199
 //        are attacked and they can't attack back regardless of how they were
 //        attacked (eg: GrimTooth), otherwise, their rude attack" is only activated
 //        if they can't melee reach the target (eg: sniping)
-// 0x004: If not set, mobs that can change target only do so when melee attacked
-//        (distance player/mob < 3), otherwise mobs may change target and chase 
+// 0x004: If not set, mobs that can change target only do so when attacked within a
+//        distance of [attack range+1], otherwise mobs may change target and chase
 //        ranged attackers. This flag also overrides the 'provoke' target.
 // 0x008: When set, mobs scatter as soon as they lose their target. Use this mode
 //        to make it much harder to mob-train by hiding and collecting them on a
 //        single spot (ie: GrimTooth training)
 // 0x010: If set, mob skills defined for friends will also trigger on themselves.
-// 0x020: When set, the monster ai is executed for all monsters in maps that 
+// 0x020: When set, the monster ai is executed for all monsters in maps that
 //        have players on them, instead of only for mobs who are in the vicinity
 //        of players.
 // 0x040: When set, when the mob's target changes map, the mob will walk towards
 //        any npc-warps in it's sight of view (use with mob_warp below)
+// 0x080: If not set, mobs on attack state will only change targets when attacked
+//        by normal attacks. Set this if you want mobs to also switch targets when
+//        hit by skills.
 // 0x100: When set, a mob will pick a random skill from it's list and start from
 //        that instead of checking skills in orders (when unset, if a mob has too
 //        many skills, the ones near the end will rarely get selected)
@@ -45,8 +48,10 @@ monster_max_aspd: 199
 //        the same skill, instead, only to that particular entry (eg: Mob has heal
 //        on six lines in the mob_skill_db, only the entry that is actually used
 //        will receive the delay). This will make monsters harder, especially MvPs.
-// 0x400: Set this to make mobs have a range of 9 for all skills. Otherwise, they 
+// 0x400: Set this to make mobs have a range of 9 for all skills. Otherwise, they
 //        will obey the normal skill range rules.
+// 0x800: When set, monsters that are provoked will always change target to the
+//        provoking person, even if they would usually not change target on attack.
 // Example: 0x140 -> Chase players through warps + use skills in random order.
 monster_ai: 0
 
@@ -56,7 +61,7 @@ monster_ai: 0
 // 2: Every 2 cells moved
 // 3: Every 3 cells moved (official)
 // x: Every x cells moved
-// Regardless of this setting, a monster will always rethink its chase if it has 
+// Regardless of this setting, a monster will always rethink its chase if it has
 // reached its target. Increase this value if you want to make monsters continue
 // moving after they lost their target (hide, no line of sight, etc.).
 monster_chase_refresh: 3
@@ -81,6 +86,12 @@ view_range_rate: 100
 // column in the mob_db. (Note 2)
 chase_range_rate: 100
 
+// Which level of of Vulture's Eye and Snake's Eye should monsters have learned?
+// Officially monsters don't have these skills learned, so their ranged skills
+// only have a range of 9. If you put a number higher than 0, their range will
+// be increased by that number.
+monster_eye_range_bonus: 0
+
 // Allow monsters to be aggresive and attack first? (Note 1)
 monster_active_enable: yes
 
@@ -125,7 +136,7 @@ plant_spawn_delay: 100
 boss_spawn_delay: 100
 
 // Should mobs not spawn within the viewing range of players?
-// 0 is disabled, otherwise it is the number of retries before giving up 
+// 0 is disabled, otherwise it is the number of retries before giving up
 // and spawning the mob within player-view anyway, unless the max (100) is used,
 // in which case the mob will not be spawned, and it'll be retried again in
 // 5 seconds.
@@ -143,7 +154,8 @@ force_random_spawn: no
 // 1: Slaves are always aggressive.
 // 2: Slaves are always passive.
 // 3: Same as master's aggressive/passive state.
-slaves_inherit_mode: 2
+// 4: Mode is overwritten with slave mode (official)
+slaves_inherit_mode: 4
 
 // Do summon slaves have the same walking speed as their master?
 // NOTE: The default is 3 for official servers.
@@ -200,7 +212,7 @@ mob_remove_delay: 300000
 // Defines on who the mob npc_event gets executed when a mob is killed.
 // Type 1: On the player that killed the mob (if killed by a non-player, resorts to type 0)
 // Type 0: On the player that did the most damage to the mob.
-// NOTE: This affects who gains the Castle when the Emperium is broken. 
+// NOTE: This affects who gains the Castle when the Emperium is broken.
 mob_npc_event_type: 1
 
 // Time in milliseconds to activate protection against Kill Steal
@@ -216,6 +228,10 @@ mob_slave_keep_target: yes
 // See http://irowiki.org/wiki/MVP#Gravestone
 mvp_tomb_enabled: yes
 
+// Delay before the MVP tomb is spawned.
+// Default: 9 seconds
+mvp_tomb_delay: 9000
+
 // Whether or not the size of specially summoned mobs influences experience, drop rates,
 // and stats. The rates will be doubled for large mobs, and halved for small ones.
 // This is only invoked under the 'monster' command, @monsterbig, and @monstersmall. (Note 1)
@@ -242,3 +258,7 @@ boss_icewall_walk_block: 0
 // 2012-04-04aRagexeRE or higher client required.
 monster_hp_bars_info: yes
 
+// Should a monster respawn and a warning printed to the map server when a monster couldn't move for a long time?
+// This can be legit gameplay (e.g. players keeping an MVP stuck inside icewall), but if you want to prevent any
+// exploits and be notified about them, you can set this to yes.
+monster_stuck_warning: no

conf/battle/party.conf

@@ -22,7 +22,7 @@ party_hp_mode: 0
 // The level range for sharing within a party is set in conf/inter_athena.conf
 // under the value "party_share_level".
 
-// When 'Party Share' item sharing is enabled in a party, 
+// When 'Party Share' item sharing is enabled in a party,
 // announce in the party which party-member received the item and what's he received? (Note 1)
 show_party_share_picker: yes
 
@@ -34,7 +34,7 @@ show_party_share_picker: yes
 show_picker.item_type: 112
 
 // Method of distribution when item party share is enabled in a party:
-// 
+//
 // 0: Normal (item goes to a random party member)
 // 1: Item Share is disabled for non-mob drops (player/pet drops)
 // 2: Round Robin (items are distributed evenly and in order among members)
@@ -56,3 +56,6 @@ party_even_share_bonus: 0
 // Display party name regardless if player is in a guild.
 // Official servers do not display party name unless the user is in a guild. (Note 1)
 display_party_name: no
+
+// Prevent multiple characters of the same account to join the same party. (Note 1)
+block_account_in_same_party: yes

conf/battle/pet.conf

@@ -34,7 +34,7 @@ pet_attack_support: no
 // When the master receives damage from the monster, whether or not the pet attacks back. (Note 1)
 pet_damage_support: no
 
-// Minimum intimacy necessary for a pet to support their master. Default is 900 
+// Minimum intimacy necessary for a pet to support their master. Default is 900
 // (intimacy goes from 0 to 1000). At this minimum, support rate is 50% of pet's normal value.
 // At max (1000) support rate is 150%.
 pet_support_min_friendly: 900
@@ -43,7 +43,7 @@ pet_support_min_friendly: 900
 pet_equip_min_friendly: 900
 
 // Whether or not the pet's will use skills. (Note 1)
-// Note: Offensive pet skills need at least pet_attack_support or 
+// Note: Offensive pet skills need at least pet_attack_support or
 // pet_damage_support to work (they trigger while the pet is attacking).
 pet_status_support: no
 
@@ -66,7 +66,7 @@ pet_lv_rate: 0
 pet_max_stats: 99
 
 // When pet leveling is enabled, these are the imposed caps on
-// min/max damage. Note that these only cap atk1 and atk2, if you 
+// min/max damage. Note that these only cap atk1 and atk2, if you
 // enable pet_str, their max damage is then their base_atk + pet_max_atk2
 pet_max_atk1: 500
 pet_max_atk2: 1000

conf/battle/player.conf

@@ -97,12 +97,13 @@ max_third_trans_parameter: 130
 max_baby_parameter: 80
 max_baby_third_parameter: 117
 max_extended_parameter: 125
+max_summoner_parameter: 120
 
 // Status points bonus for transcendent class
 transcendent_status_points: 52
 
 // Max armor def/mdef
-// NOTE: This setting have no effect if server is run on Renewal Mode (RENEWAL) 
+// NOTE: This setting have no effect if server is run on Renewal Mode (RENEWAL)
 // NOTE: does not affects skills and status effects like Mental Strength
 // If weapon_defense_type is non-zero, it won't apply to max def.
 // If magic_defense_type is non-zero, it won't apply to max mdef.
@@ -125,7 +126,7 @@ show_hp_sp_drain: no
 // Display the gained hp/sp values from killing mobs? (Ie: Sky Deleter Card)
 show_hp_sp_gain: yes
 
-// If set, when A accepts B as a friend, B will also be added to A's friend 
+// If set, when A accepts B as a friend, B will also be added to A's friend
 // list, otherwise, only A appears in B's friend list.
 // NOTE: this setting enables friend auto-adding and auto-deletion.
 friend_auto_add: yes
@@ -134,6 +135,8 @@ friend_auto_add: yes
 invite_request_check: yes
 
 // Players' will drop a 'Skull' when killed?
+// Note: The 'Skull' item (ID 7420) is trade restricted by default. Please check
+// the item_trade database to adjust accordingly.
 // 0 = Disabled
 // 1 = Dropped only in PvP maps
 // 2 = Dropped in all situations
@@ -155,7 +158,7 @@ idle_no_autoloot: 0
 // Minimum distance a vending/chat room must be from a NPC in order to be placed.
 // Default: 3 (0: disabled).
 min_npc_vendchat_distance: 3
- 
+
 // How much should rental mounts increase a player's movement speed?
 // Default is 25. 100 = 100% Increase.
 rental_mount_speed_boost: 25
@@ -177,17 +180,15 @@ vip_base_exp_increase: 50
 // Default: 50
 vip_job_exp_increase: 50
 
-// Experience penalty rate multiplier for non-VIP accounts.
-// Multiplies the 'death_penalty_base' and 'death_penalty_job' settings in 'conf/battle/exp.conf'.
-// Default: 3 (3*100 = 3% penalty)
-vip_exp_penalty_base_normal: 3
-vip_exp_penalty_job_normal: 3
-
 // Experience penalty rate multiplier for VIP accounts.
-// Multiplies the 'death_penalty_base' and 'death_penalty_job' settings in 'conf/battle/exp.conf'.
-// Default: 1 (1*100 = 1% penalty)
-vip_exp_penalty_base: 1
-vip_exp_penalty_job: 1
+// Default: 100 (100 = 1% penalty)
+vip_exp_penalty_base: 100
+vip_exp_penalty_job: 100
+
+// Zeny penalty for VIP accounts.
+// Zeny loss only happens if the player dies from another player.
+// Default: 0 (100 = 1% penalty)
+vip_zeny_penalty: 0
 
 // Battle Manual experience increase. Setting to 0 will disable.
 // - Regular/Thick Battle Manual: 50+(50/X) = 75%

conf/battle/skill.conf

@@ -20,18 +20,18 @@ delay_rate: 100
 delay_dependon_dex: no
 delay_dependon_agi: no
 
-// Minimum allowed delay for ANY skills after casting (in milliseconds) (Note 1)
+// Minimum allowed delay for ANY skills after castbegin (in milliseconds) (Note 1)
 // Note: Setting this to anything above 0 can stop speedhacks.
 min_skill_delay_limit: 100
 
 // This delay is the min 'can't walk delay' of all skills.
-// NOTE: Do not set this too low, if a character starts moving too soon after 
-// doing a skill, the client will not update this, and the player/mob will 
+// NOTE: Do not set this too low, if a character starts moving too soon after
+// doing a skill, the client will not update this, and the player/mob will
 // appear to "teleport" afterwards.
 default_walk_delay: 300
 
-//Completely disable skill delay of the following types (Note 3)
-//NOTE: By default mobs don't have the skill delay as specified in the skill
+// Completely disable skill delay of the following types (Note 3)
+// NOTE: By default mobs don't have the skill delay as specified in the skill
 //  database, but follow their own 'reuse' skill delay which is specified on
 //  the mob skill db. When set, the delay for all skills become
 //  min_skill_delay_limit.
@@ -43,13 +43,12 @@ castrate_dex_scale: 150
 // How much (dex*2+int) does variable cast turns zero?
 vcast_stat_scale: 530
 
-// What level of leniency should the skill system give for skills when
-// accounting attack motion (ASPD) for casting skills (Note 2, between 0 and 300)
-//
-// NOTE: Setting this to 100% may cause some issues with valid skills not being cast.
-//       The time difference between client and server varies so allowing 90% leniency
-//       should be enough to forgive very small margins of error.
-skill_amotion_leniency: 90
+// On official servers, amotion delay is applied at castbegin. There is no amotion delay applied
+// at castend. Set this to anything above 0 to also apply amotion delay at castend. (Note 2)
+// NOTE: Setting this will break chaining of skills with cast time but no aftercast delay.
+// The client-sided delays are different from skill to skill and usually range from 140 to 180.
+// If you want to be secure, a value between 90 and 140 is recommended.
+skill_amotion_leniency: 0
 
 // Will normal attacks be able to ignore the delay after skills? (Note 1)
 skill_delay_attack_enable: yes
@@ -74,7 +73,7 @@ skillrange_by_distance: 14
 skillrange_from_weapon: 0
 
 // Should a check on the caster's status be performed in all skill attacks?
-// When set to yes, meteors, storm gust and any other ground skills will have 
+// When set to yes, meteors, storm gust and any other ground skills will have
 // no effect while the caster is unable to fight (eg: stunned).
 skill_caster_check: yes
 
@@ -107,7 +106,7 @@ combo_delay_rate: 100
 auto_counter_type: 15
 
 // Can ground skills be placed on top of each other? (Note 3)
-// By default, skills with UF_NOREITERATION set cannot be stacked on top of 
+// By default, skills with UF_NOREITERATION set cannot be stacked on top of
 // other skills, this setting will override that. (skill_unit_db)
 skill_reiteration: 0
 
@@ -119,28 +118,28 @@ skill_nofootset: 1
 // Default on official servers: 1 (for players)
 gvg_traps_target_all: 1
 
-// Hunter's traps visibility setting:
-// 1: (Official) Many of Hunter's traps are invisible at all times.
-//    But any player who see the Hunter laying the trap will be able to see the trap until they move out of sight of it.
-//    Although, invisible traps can be revealed through Hunter's Detecting skill.
-traps_setting: 1
+// Traps visibility setting (trap with UF_HIDDEN_TRAP flag):
+// 0 = Always visible
+// 1 = Enable invisibility in versus maps (GVG/PVP/BG)
+// 2 = Enable invisibility in all maps
+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.
 // 2: Disable having different types out at the same time
-//    (eg: forbid summoning anything except hydras when there's already 
+//    (eg: forbid summoning anything except hydras when there's already
 //     one hydra out)
 summon_flora_setting: 3
 
 // Whether placed down skills will check walls (Note 1)
-// (ex. Storm Gust cast against a wall will not hit the other side.) 
+// (ex. Storm Gust cast against a wall will not hit the other side.)
 skill_wall_check: yes
 
 // When cloaking, Whether the wall is checked or not. (Note 1)
 // Note: When the skill does not checks for walls, you will always be considered
-//  as if you had a wall-next to you (you always get the wall-based speed). 
+//  as if you had a wall-next to you (you always get the wall-based speed).
 //  Add the settings as required, being hit always uncloaks you.
-// 
+//
 // 0 = doesn't check for walls
 // 1 = Check for walls
 // 2 = Cloaking is not cancelled when attacking.
@@ -165,7 +164,7 @@ chat_warpportal: no
 // 0: Do not show defense
 // 1: Base defense [RE default]
 // 2: Vit/Int defense
-// 3: Both (the addition of both) 
+// 3: Both (the addition of both)
 sense_type: 1
 
 // Which finger offensive style will be used?
@@ -221,7 +220,7 @@ max_heal: 9999
 max_heal_lv: 11
 
 // Emergency Recall Guild Skill setting (add as appropriate).
-// Note that for the skill to be usable at all, 
+// Note that for the skill to be usable at all,
 // you need at least one of 1/2 and 4/8
 // 1: Skill is usable outside of woe.
 // 2: Skill is usable during woe.
@@ -233,7 +232,7 @@ emergency_call: 11
 
 // Guild Aura Skills setting (add as appropriate).
 // (This affects GD_LEADERSHIP, GD_GLORYWOUNDS, GD_SOULCOLD and GD_HAWKEYES)
-// Note that for the skill to be usable at all, 
+// Note that for the skill to be usable at all,
 // you need at least one of 1/2 and 4/8
 // 1: Skill works outside of woe.
 // 2: Skill works during woe.
@@ -270,7 +269,7 @@ sg_angel_skill_ratio: 10
 skill_add_heal_rate: 7
 
 // Whether the damage of EarthQuake with a single target on screen is able to be reflected.
-// Note: On official servers, EQ is reflectable when there is only one target on the screen, 
+// Note: On official servers, EQ is reflectable when there is only one target on the screen,
 //	 which might be an exploit to hunt the MVPs.
 eq_single_target_reflectable: yes
 
@@ -337,3 +336,19 @@ stormgust_knockback: yes
 // as Fixed Casting Time, and the rest (80%) as Variable Casting Time.
 // Put it 0 to disable default Fixed Casting Time (just like -1 is the skill_cast_db.txt).
 default_fixed_castrate: 20
+
+// On official servers, skills that hit all targets on a path (e.g. Focused Arrow Strike and First Wind) first
+// calculate one of the eight directions and then apply an AoE based on that direction. This means there can be
+// areas that such skills can't hit. If you target a monster in such an area, only this monster will be hit.
+// The 3rd job skills Flame Launcher and Cannon Spear can completely miss.
+// Set this to "no" to calculate a path from the caster to the target instead and hit everything near that path.
+// You can adjust splash and maxcount in the skill_db to adjust the width and length of these skills.
+// Note: Brandish Spear will always use this algorithm due to its special damage behavior.
+skill_eightpath_algorithm: yes
+
+// Can damage skill units like icewall and traps (Note 3)
+// On official servers, players can damage icewalls and some traps with skills. When monsters use skills, damage
+// will show on the icewalls and traps, but it is not actually substracted from the durability.
+// The official setting makes it quite easy to trap MVPs, set this to 31 if you want all units to be able to
+// damage skills (previous behavior).
+can_damage_skill: 1

conf/char_athena.conf

@@ -108,14 +108,21 @@ autosave_time: 60
 save_log: yes
 
 // Starting point for new characters
-// Format: <map_name>,<x>,<y>
-start_point: new_1-1,53,111
+// Format: <map_name>,<x>,<y>{:<map_name>,<x>,<y>...}
+// 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_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
 
 // Starting items for new characters
 // Max number of items is MAX_STARTITEM in char.c (default 32)
-// Format: <id>,<amount>,<position>:<id>,<amount>,<position>:...
+// Format: <id>,<amount>,<position>{:<id>,<amount>,<position>...}
 // To auto-equip an item, include the position where it will be equipped; otherwise, use zero.
+// NOTE: For Doram, this requires client 20151001 or newer.
 start_items: 1201,1,2:2301,1,16
+start_items_doram: 1681,1,2:2301,1,16
 
 // Starting zeny for new characters
 start_zeny: 0
@@ -165,11 +172,14 @@ char_del_delay: 86400
 
 // Restrict character deletion by email address or birthdate.
 // This restricts players from changing the langtype and deleting characters.
-// For birthdate, the client must be 20100803 or newer.
 // Defaults based on client date.
 // 1: Email address
 // 2: Birthdate
 // 3: Email address or Birthdate
+// IMPORTANT!
+// - This config only works for clients that send 0x0068 or 0x01fb for delete request.
+// - Use langtype 1 for newer clients (2013+), to use 0x01fb.
+// - Clients that are not using 0x0068 or 0x01fb, only use birthdate (YYMMDD) as default.
 char_del_option: 2
 
 // What folder the DB files are in (item_db.txt, etc.)

conf/groups.conf

@@ -5,7 +5,7 @@ Player groups configuration file
 
 This file defines "player groups" and their privileges.
 
-Each group has its id and name, lists of available commands and other 
+Each group has its id and name, lists of available commands and other
 permissions, and a list of other groups it inherits from.
 
 
@@ -15,15 +15,15 @@ Group settings
 Unique group number. The only required field.
 
 <name>
-Any string. If empty, defaults to "Group <id>". It is used in several @who 
+Any string. If empty, defaults to "Group <id>". It is used in several @who
 commands.
 
 <level>
-Equivalent of GM level, which was used in revisions before r15572. You can 
-set it to any number, but usually it's between 0 (default) and 99. Members of 
-groups with lower level can not perform some actions/commands (like @kick) on 
-members of groups with higher level. It is what script command getgmlevel() 
-returns. Group level can also be used to override trade restrictions 
+Equivalent of GM level, which was used in revisions before r15572. You can
+set it to any number, but usually it's between 0 (default) and 99. Members of
+groups with lower level can not perform some actions/commands (like @kick) on
+members of groups with higher level. It is what script command getgmlevel()
+returns. Group level can also be used to override trade restrictions
 (db/item_trade.txt).
 
 <commands>
@@ -31,15 +31,15 @@ A group of settings
 	<command name> : <bool>
 or
 	<commandname> : [ <bool>, <bool> ]
-First boolean value is for atcommand, second one for charcommand. If set to 
-true, group can use command. If only atcommand value is provided, false is 
-assumed for charcommand. If a command name is not included, false is assumed for 
+First boolean value is for atcommand, second one for charcommand. If set to
+true, group can use command. If only atcommand value is provided, false is
+assumed for charcommand. If a command name is not included, false is assumed for
 both atcommand and charcommand.
 For a full list of available commands, see: doc/atcommands.txt.
 Command names must not be aliases.
 
 <log_commands>
-Boolean value. If true then all commands used by the group will be logged to 
+Boolean value. If true then all commands used by the group will be logged to
 atcommandlog. If setting is omitted in a group definition, false is assumed.
 Requires 'log_commands' to be enabled in 'conf/log_athena.conf'.
 
@@ -50,7 +50,7 @@ If a permission is not included, false is assumed.
 For a full list of available permissions, see: doc/permissions.txt
 
 <inherit>
-A list of group names that given group will inherit commands and permissions 
+A list of group names that given group will inherit commands and permissions
 from. Group names are case-sensitive.
 
 Inheritance results
@@ -58,19 +58,19 @@ Inheritance results
 Both multiple inheritance (Group 2 -> Group 1 and Group 3 -> Group 1) and
 recursive inheritance (Group 3 -> Group 2 -> Group 1) are allowed.
 
-Inheritance rules should not create cycles (eg Group 1 inherits from Group 2, 
-and Group inherits from Group 1 at the same time). Configuration with cycles is 
+Inheritance rules should not create cycles (eg Group 1 inherits from Group 2,
+and Group inherits from Group 1 at the same time). Configuration with cycles is
 considered faulty and can't be processed fully by server.
 
-Command or permission is inherited ONLY if it's not already defined for the 
+Command or permission is inherited ONLY if it's not already defined for the
 group.
-If group inherits from multiple groups, and the same command or permission is 
-defined for more than one of these groups, it's undefined which one will be 
+If group inherits from multiple groups, and the same command or permission is
+defined for more than one of these groups, it's undefined which one will be
 inherited.
 
 Syntax
 ------
-This config file uses libconfig syntax: 
+This config file uses libconfig syntax:
 http://www.hyperrealm.com/libconfig/libconfig_manual.html#Configuration-Files
 
 
@@ -89,7 +89,7 @@ groups: (
 		/* no commands by default */
 	}
 	permissions: {
-		/* without this basic permissions regular players could not 
+		/* without this basic permissions regular players could not
 		trade or party */
 		can_trade: true
 		can_party: true

conf/help.txt

@@ -102,7 +102,7 @@ jobchange: "Params: <job name|ID>\n" "Changes your job.\n"
 	"     23 Super Novice      24 Gunslinger              25 Ninja                 4045 Super Baby\n"
 	"4046 Taekwon           4047 Star Gladiator     4049 Soul Linker            4050 Gangsi\n"
 	"4051 Death Knight    4052 Dark Collector    4190 Ex. Super Novice  4191 Ex. Super Baby\n"
-	"4211 Kagerou            4212 Oboro             4215 Rebellion\n"
+	"4211 Kagerou            4212 Oboro             4215 Rebellion        4218 Summoner\n"
 	"----- Baby Novice And Baby 1st Class -----\n"
 	"4023 Baby Novice      4024 Baby Swordman    4025 Baby Magician   4026 Baby Archer\n"
 	"4027 Baby Acolyte      4028 Baby Merchant       4029 Baby Thief\n"

conf/log_athena.conf

@@ -121,6 +121,13 @@ log_chat: 0
 // Disable chat logging when WoE is running? (Note 1)
 log_chat_woe_disable: no
 
+// Log feeding
+// Should pet or homunculus feeding be logged? (Note 3)
+// 0: Disabled
+// 1: Pet
+// 2: Homunculus
+log_feeding: 3
+
 //Time-stamp format which will be printed for log file.
 //Can at most be 20 characters long.
 //Common formats:
@@ -142,6 +149,7 @@ log_timestamp_format: %m/%d/%Y %H:%M:%S
 // log_pick_db: log/picklog.log
 // log_zeny_db: log/zenylog.log
 // log_cash_db: log/cashlog.log
+// log_feeding_db: log/feedinglog.log
 
 log_gm_db: atcommandlog
 log_branch_db: branchlog
@@ -151,5 +159,6 @@ log_npc_db: npclog
 log_pick_db: picklog
 log_zeny_db: zenylog
 log_cash_db: cashlog
+log_feeding_db: feedinglog
 
 import: conf/import/log_conf.txt

conf/login_athena.conf

@@ -9,7 +9,7 @@
 // NOTE: This allows you to run multiple servers on multiple interfaces
 // while using the same ports for each server.
 //bind_ip: 127.0.0.1
- 
+
 // Login Server Port
 login_port: 6900
 
@@ -63,7 +63,7 @@ new_acc_length_limit: yes
 allowed_regs: 1
 time_allowed: 10
 
-// Log Filename. All operations received by the server are logged in this file. 
+// Log Filename. All operations received by the server are logged in this file.
 login_log_filename: log/login.log
 
 // To log the login server?
@@ -137,7 +137,7 @@ ipban_cleanup_interval: 60
 //ip_sync_interval: 10
 
 // DNS Blacklist Blocking
-// If enabled, each incoming connection will be tested against the blacklists 
+// If enabled, each incoming connection will be tested against the blacklists
 // on the specified dnsbl_servers (comma-separated list)
 use_dnsbl: no
 dnsbl_servers: bl.blocklist.de, socks.dnsbl.sorbs.net

conf/map_athena.conf

@@ -86,12 +86,12 @@ console: off
 
 // Database autosave time
 // All characters are saved on this time in seconds (example:
-// autosave of 60 secs with 60 characters online -> one char is saved every 
+// autosave of 60 secs with 60 characters online -> one char is saved every
 // second)
 autosave_time: 300
 
 // Min database save intervals (in ms)
-// Prevent saving characters faster than at this rate (prevents char-server 
+// Prevent saving characters faster than at this rate (prevents char-server
 // save-load getting too high as character-count increases)
 minsave_time: 100
 
@@ -106,7 +106,7 @@ minsave_time: 100
 // 64: After successfully get/delete/complete a quest
 // 128: After every bank transaction (deposit/withdraw)
 // NOTE: These settings decrease the chance of dupes/lost items when there's a
-// server crash at the expense of increasing the map/char server lag. If your 
+// server crash at the expense of increasing the map/char server lag. If your
 // server rarely crashes, but experiences interserver lag, you may want to set
 // these off.
 save_settings: 255

conf/maps_athena.conf

@@ -665,14 +665,14 @@ map: tha_t06
 map: tha_t08
 
 // --- Thanatos Tower ---
-// -- 2005-09-21sdata_k.gpf -- 
+// -- 2005-09-21sdata_k.gpf --
 map: tha_t09
 map: tha_t10
 map: tha_t11
 map: tha_t12
 
 // --- Auction Market ---
-// -- 2005-11-29sdata_k.gpf -- 
+// -- 2005-11-29sdata_k.gpf --
 map: auction_01
 map: auction_02
 
@@ -681,7 +681,7 @@ map: auction_02
 map: alde_tt03
 
 // --- Garden City Hugel / Kiehl ---
-// -- 2005-12-20sdata_k.gpf -- 
+// -- 2005-12-20sdata_k.gpf --
 map: hugel
 map: hu_in01
 map: que_bingo
@@ -1191,6 +1191,48 @@ map: verus02
 // Paradise Group Market
 map: paramk
 
+// ???
+map: 1@infi
+map: 1@ffp
+
+// EP 16.1 Banquet For Heroes
+map: 1@mir
+map: 2@mir
+map: 1@sthb
+map: 1@sthc
+map: 1@sthd
+
+map: prt_cas
+map: prt_cas_q
+map: prt_prison
+map: prt_lib
+map: prt_lib_q
+map: prt_q
+map: prt_pri00
+
+// New Novice Grounds
+map: int_land
+map: int_land01
+map: int_land02
+map: int_land03
+map: int_land04
+
+// Doram
+map: lasagna
+map: lasa_fild01
+map: lasa_fild02
+map: lasa_dun01
+map: lasa_dun02
+map: lasa_dun03
+map: conch_in
+map: lasa_in01
+map: lasa_dun_q
+
+// Pope Memorial Day
+map: 1@pop1
+map: 1@pop2
+map: 1@pop3
+
 //------------------------- Clone Maps ---------------------------
 //------------------------- Extra Maps ---------------------------
 

conf/msg_conf/char_msg.conf

@@ -113,7 +113,10 @@
 103: Kagerou
 104: Oboro
 105: Hanbok
-106: Unknown Job
+106: Rebellion
+107: Oktoberfest
+108: Summoner
+109: Unknown Job
 
 //Auction
 200: Auction Manager

conf/msg_conf/map_msg.conf

@@ -279,7 +279,7 @@
 266: Some of your items cannot be vended and were removed from the shop.
 267: '%s' designated maps reset.
 268: Reloaded the Message of the Day.
-269: Displaying first %d out of %d matches
+269: Displaying first %d matches
 //@me output format
 270: * :%s %s: *
 271: You can't drop items on this map.
@@ -719,6 +719,7 @@
 694: Hanbok
 695: Rebellion
 696: Oktoberfest
+697: Summoner
 
 // @vip
 700: Usage: @vip <time> <character name>
@@ -740,9 +741,10 @@
 713: You do not have enough '%s'.
 714: Item Shop List: %s (%hu)
 715: Point Shop List: '%s'
-716: Your '%s' now: %d
+716: Your '%s' is now: %d
 
-//717: Free
+// MVP EXP reward message
+717: Congratulations! You are the MVP! Your reward EXP Points are %u !!
 
 // @showrate
 718: Personal rate information is not displayed now.
@@ -751,7 +753,7 @@
 //Skill messages
 720: %s is required.
 721: [%s] Poison effect was applied to the weapon.
-722: Please equipped with a %s.
+//722: Free
 
 // @costume
 723: '%s' is an unknown costume
@@ -777,7 +779,23 @@
 737: '%s' (%d) cannot be cloned, limit (%d).
 738: Clone '%s' is done.
 
-//739-899 free
+// @bodystyle
+739: Please enter a body style (usage: @bodystyle <body ID: %d-%d>).
+740: This job has no alternate body styles.
+
+// @showexp
+741: Gained
+742: Lost
+743: Experience %s Base:%ld (%0.2f%%) Job:%ld (%0.2f%%)
+
+// @adopt
+744: Baby already adopted or is in the process of being adopted.
+745: You need to be married and in a party with your partner and the Baby to adopt.
+746: Both parents need to have their wedding rings equipped.
+747: The Baby is not a Novice.
+748: A parent or Baby was not found.
+
+//749-899 free
 
 //------------------------------------
 // More atcommands message
@@ -928,8 +946,11 @@
 1022: Please enter ban time and a player name (usage: %s <time> <char name>).
 1023: You are not allowed to alter the time of a ban.
 
-//1024: free
-//1025: free
+// @rates
+1024: MVP Drop Rates: Common %.2fx / Healing %.2fx / Usable %.2fx / Equipment %.2fx / Card %.2fx
+
+// @recall
+1025: The player is currently autotrading and cannot be recalled.
 
 // @kick
 1026: Please enter a player name (usage: @kick <char name/ID>).
@@ -1112,7 +1133,7 @@
 
 // @changelook
 1177: Usage: @changelook {<position>} <view id>
-1178: Position: 1-Top 2-Middle 3-Bottom 4-Weapon 5-Shield 6-Shoes 7-Robe
+1178: Position: 1-Top 2-Middle 3-Bottom 4-Weapon 5-Shield 6-Shoes 7-Robe 8-Body
 
 // @autotrade
 1179: Autotrade is not allowed on this map.
@@ -1354,8 +1375,8 @@
 1315: Available Flags:
 
 // @showexp
-1316: Gained exp will not be shown.
-1317: Gained exp is now shown.
+1316: Gained/lost exp will not be shown.
+1317: Gained/lost exp is now shown.
 
 // @showzeny
 1318: Gained zeny will not be shown.
@@ -1440,7 +1461,7 @@
 1373: %s value is now: %d
 1374: %s value is now: %s
 1375: %s is blank.
-1376: %s data type is not supported: %u
+//1376: free
 
 // @reloadquestdb
 1377: Quest database has been reloaded.

conf/msg_conf/map_msg_chn.conf

@@ -283,7 +283,7 @@
 266: 你的某些物品不能被出售，它將從你的商店中被取消掉
 267: '%s' 該地圖被重置
 268: 重新載入今天的訊息
-269: 顯示 %d 分之 %d 關聯
+269: 顯示 %d 關聯
 //@me output format
 270: * :%s %s: *
 271: 在這張地圖你無法丟棄物品
@@ -672,7 +672,8 @@
 693: 魅影追蹤者 T
 694: 韓服
 695: Rebellion
-
+696: Oktoberfest
+697: Summoner
 
 //------------------------------------
 // More atcommands message
@@ -826,9 +827,6 @@
 // @charunblock
 1024: 請輸入角色名稱 (用法: @charunblock <char name>).
 
-// @charunban
-1025: 請輸入角色名稱 (用法: @charunban <char name>).
-
 // @kick
 1026: 請輸入角色名稱 (用法: @kick <char name/ID>).
 
@@ -1336,7 +1334,7 @@
 1373: %s value is now :%d
 1374: %s value is now :%s
 1375: %s is empty
-1376: %s data type is not supported :%u
+//1376: free
 
 // @reloadquestdb
 1377: 完成重載任睥數據庫.

conf/msg_conf/map_msg_frn.conf

@@ -283,7 +283,7 @@
 266: Certains de vos objets ne peuvent pas être vendus et ont été supprimés du magasin.
 267: Carte '%s' réinitialisée.
 268: Re-lancement du message du jour.
-269: Affichage des premiers %d parmis %d trouvés
+269: Affichage des %d premiers résultats trouvés
 //@me output format
 270: * :%s %s: *
 271: Vous ne pouvez pas déposer d'objets sur cette carte.
@@ -684,7 +684,8 @@
 693: Shadow Chaser T
 694: Hanbok
 695: Rebellion
-
+696: Oktoberfest
+697: Summoner
 
 //------------------------------------
 // More atcommands message
@@ -838,9 +839,6 @@
 // @charunblock
 1024: Entrez un nom de Joueur (usage: @charunblock <nom du joueur>).
 
-// @charunban
-1025: Entrez un nom de Joueur (usage: @charunban <nom du joueur>).
-
 // @kick
 1026: Entrez un nom de Joueur (usage: @kick <nom du joueur/ID>).
 
@@ -1349,7 +1347,7 @@
 1373: %s valeur est maintenant :%d
 1374: %s valeur est maintenant :%s
 1375: %s est vide
-1376: Le type de donnée %s n'est pas supportée :%u
+//1376: free
 
 // @reloadquestdb
 1377: Base de données des Quêtes rechargée.

conf/msg_conf/map_msg_grm.conf

@@ -282,7 +282,7 @@
 266: Manche Items können nicht verkauft werden und werden aus dem Shop entfernt.
 267: '%s' bezeichnetete Maps resettet.
 268: Läd die Nachrichten vom Tag neu.
-269: Zeigt erst %d von %d treffern
+269: Zeigt die ersten %d Treffer an
 //@me output format
 270: * :%s %s: *
 271: Du kannst auf dieser Map keine Items droppen.
@@ -572,5 +572,23 @@
 660: Besiegt von
 661: [^EE0000%s^000000]
 
+681: Rune Knight T
+682: Warlock T
+683: Ranger T
+684: Arch Bishop T
+685: Mechanic T
+686: Guillotine Cross T
+687: Royal Guard T
+688: Sorcerer T
+689: Minstrel T
+690: Wanderer T
+691: Sura T
+692: Genetic T
+693: Shadow Chaser T
+694: Hanbok
+695: Rebellion
+696: Oktoberfest
+697: Summoner
+
 //Custom translations
 import: conf/msg_conf/import/map_msg_grm_conf.txt

conf/msg_conf/map_msg_idn.conf

@@ -279,7 +279,7 @@
 266: Beberapa item tidak dapat ditransaksikan dan telah dikeluarkan dari toko.
 267: '%s' map yang dipilih sudah diatur ulang.
 268: 'Pesan Hari Ini' sudah dimuat ulang.
-269: Menampilkan hasil %d dari %d
+269: Menampilkan hasil %d
 //@me format keluaran
 270: * :%s %s: *
 271: Kamu tidak bisa membuang item di map ini.
@@ -718,6 +718,7 @@
 694: Hanbok
 695: Rebellion
 696: Oktoberfest
+697: Summoner
 
 // @vip
 700: Penggunaan: @vip <waktu> <nama pemain>
@@ -1437,7 +1438,7 @@
 1373: Nilai %s saat ini: %d
 1374: Nilai %s saat ini: %s
 1375: %s kosong
-1376: Jenis data %s tidak didukung: %u
+//1376: free
 
 // @reloadquestdb
 1377: Database Quest sudah dimuat ulang.

conf/msg_conf/map_msg_por.conf

@@ -288,7 +288,7 @@
 266: Alguns de seus itens não podem ser vendidos e foram removidos de sua venda.
 267: '%s' mapas designados redefinidos.
 268: Recarregada Mensagem do Dia.
-269: Exibindo o primeiro %d de %d resultados
+269: Exibindo o primeiro %d resultados
 //Formato de saída do @me
 270: * :%s %s: *
 271: Você não pode derrubar itens neste mapa
@@ -664,7 +664,8 @@
 693: Renegado T
 694: Hanbok
 695: Rebellion
-
+696: Oktoberfest
+697: Summoner
 
 //------------------------------------
 // Mais mensagens de atcommand
@@ -818,9 +819,6 @@
 // @charunblock
 1024: Digite o nome de um jogador (uso: @charunblock <nome do personagem>).
 
-// @charunban
-1025: Digite o nome de um jogador (uso: @charunban <nome do personagem>).
-
 // @kick
 1026: Digite o nome de um jogador (uso: @kick <nome do personagem/ID>).
 
@@ -1330,7 +1328,7 @@
 1373: %s valor agora é :%d
 1374: %s valor agora é :%s
 1375: %s é vazia
-1376: %s tipo de dado não é suportado :%u
+//1376: free
 
 // @reloadquestdb
 1377: Banco de dados de quest recarregado.

conf/msg_conf/map_msg_rus.conf

@@ -281,7 +281,7 @@
 266: Некоторые из ваших товаров не могут быть проданы, поэтому они удалены из магазина.
 267: '%s' обозначеных карт сброшено.
 268: Сообщение дня перезагружено.
-269: Показаны первые %d из %d результатов
+269: Показаны первые %d результатов
 // Сообщение команды @me
 270: * :%s %s: *
 271: Вы не можете выбрасывать предметы на этой локации.
@@ -683,8 +683,10 @@
 693: Shadow Chaser T
 694: Hanbok
 695: Rebellion
+696: Oktoberfest
+697: Summoner
 
-//695-899 НЕ ИСПОЛЬЗУЕТСЯ
+//698-899 НЕ ИСПОЛЬЗУЕТСЯ
 
 //------------------------------------
 // Сообщения ралзичных команд
@@ -838,9 +840,6 @@
 // @charunblock
 1024: Введите ник персонажа (Использование: @charunblock <ник персонажа>).
 
-// @charunban
-1025: Введите ник персонажа (Использование: @charunban <ник персонажа>).
-
 // @kick
 1026: Введите ник персонажа (Использование: @kick <ID/ник персонажа>).
 
@@ -1348,7 +1347,7 @@
 1373: %s значение :%d
 1374: %s значение :%s
 1375: %s пусто
-1376: %s данные не поддерживаются :%u
+//1376: free
 
 // @reloadquestdb
 1377: База данных квестов перезагружена.

conf/msg_conf/map_msg_spn.conf

@@ -283,7 +283,7 @@
 266: Algunos de tus objetos se han retirado de la tienda porque no pueden venderse.
 267: Se han reiniciado los mapas designados a '%s'.
 268: Has actualizado el mensaje del día.
-269: Se muestran %d de un total de %d resultados.
+269: Se muestran %d resultados
 //Formato de @me
 270: * :%s %s: *
 271: No puedes tirar objetos al suelo en este mapa.
@@ -671,7 +671,8 @@
 693: Shadow Chaser T
 694: Hanbok
 695: Rebellion
-
+696: Oktoberfest
+697: Summoner
 
 //------------------------------------
 // Más mensajes relacionados con comandos
@@ -825,9 +826,6 @@
 // @charunblock
 1024: Introduce el nombre de un jugador bloqueado (Instrucciones: @charunblock <nombre del personaje>).
 
-// @charunban
-1025: Introduce el nombre de un jugador bloqueado temporalmente (Instrucciones: @charunban <nombre del personaje>).
-
 // @kick
 1026: Introduce el nombre de un personaje (Instrucciones: @kick <nombre del personaje/ID>).
 
@@ -1335,7 +1333,7 @@
 1373: El valor %s ahora es:%d
 1374: El valor %s ahora es :%s
 1375: %s está vacío
-1376: %s data type is not supported :%u
+//1376: free
 
 // @reloadquestdb
 1377: Se ha actualizado la base de datos de las quest con éxito.

conf/msg_conf/map_msg_tha.conf

@@ -283,7 +283,7 @@
 266: <20><>÷<EFBFBD>§ Item ¢<>§¤<C2A7>³ה<C2B3>ט<EFBFBD><D798><EFBFBD><EFBFBD><EFBFBD>¶¹<C2B6><C2B9><EFBFBD>µ<EFBFBD>י§<D799>י<EFBFBD>¹¢<C2B9><C2A2>¢<EFBFBD>§ה´י <20><><EFBFBD>³<EFBFBD>¹<EFBFBD><C2B9><EFBFBD><EFBFBD>¨<EFBFBD><C2A8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>µ<EFBFBD>י§<D799>י<EFBFBD>¹.
 267: '%s' designated maps reset.
 268: ¢י<C2A2>¤<EFBFBD><C2A4><EFBFBD>»<EFBFBD><C2BB>¨<EFBFBD><C2A8><EFBFBD>¹ ה´י¶<D799><C2B6>ג<EFBFBD><D792>´ד<C2B4><D793>טא<D798><D790><EFBFBD>÷<EFBFBD>י<EFBFBD><D799>ב<EFBFBD>י<EFBFBD>.
-269: ב<>´§¼<C2A7><C2BC><EFBFBD><EFBFBD>¤י¹<D799><C2B9> %d <20><>¹´<C2B9>÷ב<C3B7><D791>¨<EFBFBD><C2A8>·<EFBFBD>י§<D799><C2A7>´ %d ·<>ט¾÷
+269: ב<>´§¼<C2A7><C2BC><EFBFBD><EFBFBD>¤י¹<D799><C2B9> %d ·<>ט¾÷
 //@me output format
 270: * :%s %s: *
 271: ¤<>³ה<C2B3>ט<EFBFBD><D798><EFBFBD><EFBFBD><EFBFBD>¶ג<C2B6>¹ item <20>§¾<C2A7>י¹ד¹ב¼¹·<C2B9>ט¹<D798>יה´י.
@@ -678,7 +678,8 @@
 693: Shadow Chaser T
 694: Hanbok
 695: Rebellion
-
+696: Oktoberfest
+697: Summoner
 
 //------------------------------------
 // More atcommands message
@@ -832,9 +833,6 @@
 // @charunblock
 1024: ג»<D792>´<EFBFBD><C2B4>÷<EFBFBD>×<EFBFBD>ט<EFBFBD>µ<EFBFBD><C2B5><EFBFBD><EFBFBD>¤<EFBFBD> (<28><>¸<EFBFBD>ד×י: @charunblock <×<>ט<EFBFBD>µ<EFBFBD><C2B5><EFBFBD><EFBFBD>¤<EFBFBD>>).
 
-// @charunban
-1025: ג»<D792>´<EFBFBD><C2B4>÷<EFBFBD>×<EFBFBD>ט<EFBFBD>µ<EFBFBD><C2B5><EFBFBD><EFBFBD>¤<EFBFBD> (<28><>¸<EFBFBD>ד×י: @charunban <×<>ט<EFBFBD>µ<EFBFBD><C2B5><EFBFBD><EFBFBD>¤<EFBFBD>>).
-
 // @kick
 1026: ג»<D792>´<EFBFBD><C2B4>÷<EFBFBD>×<EFBFBD>ט<EFBFBD>µ<EFBFBD><C2B5><EFBFBD><EFBFBD>¤<EFBFBD> (<28><>¸<EFBFBD>ד×י: @kick <×<>ט<EFBFBD>/ID µ<><C2B5><EFBFBD><EFBFBD>¤<EFBFBD>>).
 
@@ -1342,7 +1340,7 @@
 1373: %s <20><>¤ט<C2A4>: %d
 1374: %s <20><>¤ט<C2A4>: %s
 1375: %s ה<>ט<EFBFBD><D798>¤ט<C2A4>ד´ז.
-1376: %s »<><C2BB>א<EFBFBD>·¢י<C2A2><D799><EFBFBD><EFBFBD>ה<EFBFBD>טה´י<C2B4><D799>÷<EFBFBD><C3B7><EFBFBD><EFBFBD>¹<EFBFBD>÷<EFBFBD>¹<EFBFBD>¹: %u
+//1376: free
 
 // @reloadquestdb
 1377: °<>¹¢י<C2A2><D799><EFBFBD><EFBFBD> Quest ה´י·<D799><C2B7><EFBFBD><EFBFBD>ג<EFBFBD><D792>´ד<C2B4><D793>טא<D798><D790><EFBFBD>÷<EFBFBD>י<EFBFBD><D799>.

conf/packet_athena.conf

@@ -8,13 +8,6 @@ debug: no
 // How long can a socket stall before closing the connection (in seconds)
 stall_time: 60
 
-// Maximum allowed size for clients packets in bytes (default: 24576).
-// NOTE: To reduce the size of reported packets, lower the values of defines, which
-//       have been customized, such as MAX_STORAGE, MAX_GUILD_STORAGE or MAX_CART.
-// NOTE: Do not modify this setting, unless the client has been modified to support
-//       larger packets. The client will crash, when it receives larger packets.
-socket_max_client_packet: 24576
-
 //----- IP Rules Settings -----
 
 // If IP's are checked when connecting.

conf/readme.txt

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

db/import-tmpl/instance_db.txt

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

db/import-tmpl/item_bluebox.txt

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

db/import-tmpl/item_cardalbum.txt

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

db/import-tmpl/item_findingore.txt

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

db/import-tmpl/item_giftbox.txt

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

db/import-tmpl/item_misc.txt

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

db/import-tmpl/item_noequip.txt

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

db/import-tmpl/item_package.txt

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

db/import-tmpl/item_randomopt_db.txt

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

db/import-tmpl/item_violetbox.txt

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

db/import-tmpl/job_noenter_map.txt

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

db/import-tmpl/map_index.txt

@@ -7,7 +7,7 @@
 //Format:
 //mapname<tab>index <- specifies index for this map
 //mapname <- map will use index of previous map +1
-//Note that map index 0 is special and reserved for "error" status. 
+//Note that map index 0 is special and reserved for "error" status.
 
 //======================================================================================
 //Place your custom maps with a starting ID here.
@@ -15,4 +15,4 @@
 //Example:
 //
 //mymap	1250
-//mymap-2
+//mymap-2

db/import-tmpl/mob_boss.txt

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

db/import-tmpl/mob_branch.txt

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

db/import-tmpl/mob_classchange.txt

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

db/import-tmpl/mob_poring.txt

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

db/import-tmpl/mob_pouch.txt

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

db/import-tmpl/mob_race2_db.txt

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

db/import-tmpl/skill_copyable_db.txt

@@ -23,7 +23,7 @@
 //	 8 = Trans. Shadow Chaser
 //	16 = Baby Rouge
 //	32 = Baby Shadow Chaser
-//	
+//
 // RequirementRemoved (bitmask) removes requirements when casting a copied skill.
 // See 'skill_require_db.txt' for specific skill requirements.
 //	   0 = uses original requirement(s)

db/import-tmpl/skill_db.txt

@@ -18,7 +18,7 @@
 //    0x80 - Skill ignores target's def cards
 // 07 splash/effect range (-1 for screen-wide)
 // 08 MaxLv
-// 09 Number of hits (when positive, damage is increased by hits, 
+// 09 Number of hits (when positive, damage is increased by hits,
 //    negative values just show number of hits without increasing total damage)
 // 10 Cast interrupted when hit?
 // 11 defense-reduction rate during cast.
@@ -36,23 +36,24 @@
 //    0x00400 - usable only on party-members (and enemies if skill is offensive)
 //    0x00800 - usable only on guild-mates (and enemies if skill is offensive)
 //    0x01000 - disable usage on enemies (for non-offensive skills).
-//    0x02000 - free
+//    0x02000 - available skill for SC_AUTOSHADOWSPELL
 //    0x04000 - chorus skill
 //    0x08000 - skill that ignore bg reduction
 //    0x10000 - skill that ignore gvg reduction
 //    0x20000 - makes 'self'/'place' skill cannot be casted/placed when near NPC (see 'db/skill_nonearnpc_db.txt' for more options)
+//    0x40000 - skill that can hit trap-type skill (inf2 has 0x00080)
 // 13 maxcount: max amount of skill instances to place on the ground when
 //    player_land_skill_limit/monster_land_skill_limit is enabled. For skills
 //    that attack using a path, this is the path length to be used.
 // 14 attack type (none, weapon, magic, misc)
 // 15 Blowcount (amount of tiles skill knockbacks)
 // 16 inf3 (skill information 3):
-//    0x00001 - skill ignores land protector (e.g. arrow shower)
-//    0x00002 - skill that doesn't end camouflage
+//    0x00001 - skill ignores land protector
+//    0x00002 - free
 //    0x00004 - usable skills while hiding
 //    0x00008 - skill that can be use while in dancing state
 //    0x00010 - skill that could hit emperium
-//    0x00020 - skill blocked by statis
+//    0x00020 - skill ignores SC_STASIS
 //    0x00040 - skill blocked by kagehumi
 //    0x00080 - skill range affected by AC_VULTURE
 //    0x00100 - skill range affected by GS_SNAKEEYE
@@ -65,6 +66,8 @@
 //    0x08000 - skill that can be used to target while under SC__MANHOLE effect
 //    0x10000 - skill that affects hidden targets
 //    0x20000 - skill that affects SC_GLOOMYDAY_SK
+//    0x40000 - skill that is affected by SC_DANCEWITHWUG
+//    0x80000 - skill blocked by RA_WUGBITE
 // 17 Name
 // 18 Description
 

db/import-tmpl/skill_tree.txt

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

db/import-tmpl/status_disabled.txt

@@ -0,0 +1,25 @@
+// Status Change Restriction Database
+//
+// Defines restrictions of status changes (SC).
+// Disabled SC will always be removed or fail to be inflicted on this map.
+//
+// Structure of Database:
+// SCType,Flag
+//
+// Legend for 'Flag' field (bitmask):
+// 1    - restricted in normal maps
+// 2    - restricted in PVP
+// 4    - restricted in GVG
+// 8    - restricted in Battlegrounds
+// Restricted zones - configured by 'restricted <number>' mapflag
+// 32   - restricted in zone 1
+// 64   - restricted in zone 2
+// 128  - restricted in zone 3
+// 256  - restricted in zone 4
+// 512  - restricted in zone 5
+// 1024 - restricted in zone 6
+// 2048 - restricted in zone 7
+//
+// Example:
+// SC_ENDURE,4   // Endure status will be removed when the player enters GvG and WoE Castle maps; Also cannot be inflicted again.
+

db/item_avail.txt

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

db/item_nouse.txt

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

db/job_db2.txt

@@ -289,3 +289,5 @@
 4212,5,0,4,0,2,3,0,1,6,0,5,1,2,0,4,6,3,0,1,5,2,0,6,3,4,0,5,0,2,0,1,4,0,5,4,0,3,5,1,0,2,4,1,0,5,6,2,1,0,5
 // Rebellion
 4215,0,5,0,4,0,3,5,4,2,6,0,0,3,4,0,2,5,4,3,6,0,0,3,5,1,4,2,0,0,6,3,0,5,4,1,0,0,5,0,2,6,0,5,3,4,0,0,0,0,1
+// Summoner
+4218,5,0,3,0,5,3,0,2,4,0,2,4,5,0,2,4,5,0,2,4,5,0,6,3,5,0,2,0,6,0,4,5,0,6,0,4,6,0,2,0,5,4,3,0,5,6,3,2,0,5

db/map_index.txt

@@ -7,7 +7,7 @@
 //Format:
 //mapname<tab>index <- specifies index for this map
 //mapname <- map will use index of previous map +1
-//Note that map index 0 is special and reserved for "error" status. 
+//Note that map index 0 is special and reserved for "error" status.
 
 alb_ship 1
 alb2trea
@@ -952,6 +952,37 @@ un_myst
 verus01
 verus02
 paramk
+1@infi
+1@ffp
+1@mir
+2@mir
+1@sthb
+1@sthc
+1@sthd
+prt_cas
+prt_cas_q
+prt_prison
+prt_lib
+prt_lib_q
+prt_q
+prt_pri00
+int_land
+int_land01
+int_land02
+int_land03
+int_land04
+lasagna
+lasa_fild01
+lasa_fild02
+lasa_dun01
+lasa_dun02
+lasa_dun03
+conch_in
+lasa_in01
+lasa_dun_q
+1@pop1
+1@pop2
+1@pop3
 
 // Only add maps under this line if they are not standard maps!
 

db/mob_avail.txt

@@ -13,6 +13,7 @@
 //
 // SpriteID is a job class value.
 // Weapon and Shield uses Item ID, while Head uses View ID.
+// Option for carts only works if you compiled your server for a packet version before 2012-02-01
 
 //1002,1039		// Poring - Baphomet
 //1970,1002,10013	// Displays a Poring with a backpack

db/packet_db.txt

@@ -1715,6 +1715,11 @@ packet_keys: 0x382A6DEF,0x5CBE7202,0x61F46637 // [Shakto]
 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]
@@ -1863,9 +1868,6 @@ packet_keys: 0x3F094C49,0x55F86C1E,0x58AA359A // [Shakto]
 0x08d2,10
 0x0907,5,moveitem,2:4
 0x0908,5
-0x090f,-1 // notify_newentry7
-0x0914,-1 // notify_moveentry
-0x0915,-1 // notify_standentry
 0x0922,-1,reqtradebuyingstore,2:4:8:12
 //0x092e,2,searchstoreinfonextpage,0
 0x0933,6,takeitem,2
@@ -2244,7 +2246,8 @@ packet_keys: 0x2BED4F91,0x5F9E00CF,0x5EE5520C
 0x09B9,4,ZC_ACK_CLOSE_BANKING,2
 
 //2013-07-31cRagexe
-0x09ca,23 //ZC_SKILL_ENTRY5
+0x09ca,23 // ZC_SKILL_ENTRY5
+0x09cb,17	// ZC_USE_SKILL2
 
 //2013-08-07Ragexe
 packet_ver: 45
@@ -2374,6 +2377,8 @@ packet_keys: 0x2DFF467C,0x444B37EE,0x2C1B634F // [YomRawr]
 0x0A01,3,hotkeyrowshift,2	// CZ_SHORTCUTKEYBAR_ROTATE
 0x0A02,4			// ZC_DRESSROOM_OPEN
 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
@@ -2424,8 +2429,6 @@ packet_keys: 0x290551EA,0x2B952C75,0x2D67669B // [YomRawr]
 
 // New Packet
 0x0A18,14		// ZC_ACCEPT_ENTER3
-0x0A23,-1		// ZC_ALL_ACH_LIST
-0x0A24,66	// ZC_ACH_UPDATE
 0x0A28,3		// ZC_ACK_OPENSTORE2
 0x09FD,-1		// ZC_NOTIFY_MOVEENTRY11
 0x09FE,-1		// ZC_NOTIFY_NEWENTRY11
@@ -2457,7 +2460,7 @@ packet_keys: 0x62C86D09,0x75944F17,0x112C133D // [YomRawr]
 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
+0x0960,-1,itemlistwindowselected,2:4:8:12
 0x0363,19,wanttoconnection,2:6:10:14:18
 0x094A,26,partyinvite2,2
 // 0x0927,4 CZ_GANGSI_RANK
@@ -2465,6 +2468,9 @@ packet_keys: 0x62C86D09,0x75944F17,0x112C133D // [YomRawr]
 0x0817,5,hommenu,2:4
 0x0923,36,storagepassword,2:4:20
 
+// New Packets
+0xA3B,-1		// ZC_HAT_EFFECT
+
 // RODEX Mail system
 0x09E7,3		// ZC_NOTIFY_UNREADMAIL
 0x09E8,11,dull,0	// CZ_OPEN_MAILBOX
@@ -2472,7 +2478,6 @@ packet_keys: 0x62C86D09,0x75944F17,0x112C133D // [YomRawr]
 0x09EA,11,dull,0	// CZ_REQ_READ_MAIL
 0x09EB,-1		// ZC_ACK_READ_MAIL
 0x09EC,-1,dull,0	// CZ_REQ_WRITE_MAIL
-0x0A2E,6,dull,0 	// CZ_REQ_CHANGE_TITLE
 0x09ED,3		// ZC_ACK_WRITE_MAIL
 0x09EE,11,dull,0	// CZ_REQ_NEXT_MAIL_LIST
 0x09EF,11,dull,0 	// CZ_REQ_REFRESH_MAIL_LIST
@@ -2491,7 +2496,6 @@ packet_keys: 0x62C86D09,0x75944F17,0x112C133D // [YomRawr]
 0x0A08,26,dull,0	// CZ_REQ_OPEN_WRITE_MAIL
 0x0A12,27	// ZC_ACK_OPEN_WRITE_MAIL
 0x0A32,2		// ZC_OPEN_RODEX_THROUGH_NPC_ONLY
-
 0x0A13,26,dull,0	// CZ_CHECK_RECEIVE_CHARACTER_NAME
 0x0A14,10		// ZC_CHECK_RECEIVE_CHARACTER_NAME
 
@@ -2505,6 +2509,15 @@ packet_keys: 0x62C86D09,0x75944F17,0x112C133D // [YomRawr]
 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
@@ -2514,5 +2527,108 @@ packet_keys: 0x62C86D09,0x75944F17,0x112C133D // [YomRawr]
 0x09FB,-1,dull,0	// CZ_PET_EVOLUTION
 0x09FC,6		// ZC_PET_EVOLUTION_RESULT
 
+//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
+
 //Add new packets here
-//packet_ver: 53
+//packet_ver: 56

db/pre-re/exp_homun.txt

@@ -97,4 +97,4 @@
 9165840
 9553880
 9945920
-0    
+0

db/pre-re/homunculus_db.txt

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

db/pre-re/instance_db.txt

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

db/pre-re/item_combo_db.txt

@@ -66,7 +66,7 @@
 2357:2421:2524:5171,{ bonus bAllStats,1; }
 2358:5153,{ bonus bLuk,6; bonus bFlee,5; bonus bInt,2; }
 2359:2654,{ bonus bUseSPrate,-20; bonus bMaxHP,300; }
-//2369:2428:2533:5306,{ bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10; bonus bMaxHPrate,20; bonus2 bResEff,Eff_Freeze,10000; skill "WZ_FIREPILLAR",10; }
+2369:2428:2533:5306,{ bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10; bonus bMaxHPrate,20; bonus2 bResEff,Eff_Freeze,10000; skill "WZ_FROSTNOVA",10; }
 2371:2522,{ bonus bAgi,5; bonus bFlee,10; }
 2371:2523,{ bonus bAgi,5; bonus bFlee,10; }
 2374:2729,{ bonus2 bAddClass,Class_All,3; bonus bMatkRate,3; }

db/pre-re/item_db.txt

@@ -121,7 +121,7 @@
 615,Oridecon_Hammer,Oridecon Hammer,2,5000,,400,,,,,0xFFFFFFFF,7,2,,,,,,{ produce 3; },{},{}
 616,Old_Card_Album,Old Card Album,2,10000,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ getrandgroupitem(IG_CardAlbum),1; },{},{}
 617,Old_Violet_Box,Old Purple Box,2,10000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getrandgroupitem(IG_VioletBox),1; },{},{}
-618,Worn_Out_Scroll,Worn Out Scroll,2,50,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ getrandgroupitem(IG_ScrollBox),1; },{},{}
+618,Worn_Out_Scroll,Worn Out Scroll,2,50,,20,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 619,Unripe_Apple,Unripe Apple,2,1000,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1002; },{},{}
 620,Orange_Juice,Orange Juice,2,1500,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1113; },{},{}
 621,Bitter_Herb,Bitter Herb,2,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1031; },{},{}
@@ -537,7 +537,7 @@
 1184,BF_Two_Handed_Sword2,Valorous Assaulter's Katzbalger,5,20,,0,200,,1,0,0x00004082,7,2,34,3,80,1,3,{ bonus bCritical,20; bonus2 bAddRace,RC_DemiHuman,55; bonus2 bAddRace,RC_Player,55; bonus bCritAtkRate,20; bonus bUnbreakableWeapon,0; },{},{}
 1185,Violet_Fear,Violet Fear,5,20,,2200,275,,1,2,0x00004082,2,2,34,4,80,1,3,{ bonus3 bAutoSpell,"WZ_METEOR",3,30; bonus3 bAutoSpell,"WZ_FROSTNOVA",5,50; autobonus "{ bonus bIgnoreDefClass,Class_Normal; }",50,5000; },{},{}
 1186,Death_Guidance,Death Guidance,5,20,,2000,200,,1,2,0x00004082,2,2,34,4,70,1,3,{ bonus bStr,5; bonus bAgi,2; bonus bFlee2,20; bonus3 bAutoSpell,"NPC_HELLPOWER",1,10; bonus4 bAutoSpell,"NPC_HELLPOWER",1,10,0; if( getrefine()>8 ) bonus3 bAutoSpell,"NPC_VAMPIRE_GIFT",2,20; else bonus3 bAutoSpell,"NPC_VAMPIRE_GIFT",1,20; },{},{}
-1187,Krieger_Twohand_Sword1,Glorious Claymore,5,20,,0,220,,1,0,0x00004082,7,2,34,4,80,1,3,{ bonus2 bAddRace,RC_DemiHuman,70; bonus2 bAddRace,RC_Player,70; bonus2 bIgnoreDefRaceRate,RC_DemiHuman,25; bonus2 bIgnoreDefRaceRate,RC_Player,25; bonus bUnbreakableWeapon,0; if(getrefine()>5) { bonus2 bAddRace,RC_DemiHuman,(getrefine()-3)*(getrefine()-3); bonus2 bAddRace,RC_Player,(getrefine()-3)*(getrefine()-3); bonus2 bIgnoreDefRaceRate,RC_DemiHuman,5; bonus2 bIgnoreDefRaceRate,RC_Player,5; } if(getrefine()>8) { bonus3 bAutoSpell,"LK_CONCENTRATION",getskilllv("LK_CONCENTRATION")>1?getskilllv("LK_CONCENTRATION"):1,30; bonus3 bAutoSpell,"LK_AURABLADE",getskilllv("LK_AURABLADE")>1?getskilllv("LK_AURABLADE"):1,30; } },{},{}
+1187,Krieger_Twohand_Sword1,Glorious Claymore,5,20,,0,220,,1,0,0x00004082,7,2,34,4,80,1,3,{ bonus2 bAddRace,RC_DemiHuman,70; bonus2 bAddRace,RC_Player,70; bonus2 bIgnoreDefRaceRate,RC_DemiHuman,25; bonus2 bIgnoreDefRaceRate,RC_Player,25; bonus bUnbreakableWeapon,0; if(getrefine()>5) { bonus2 bAddRace,RC_DemiHuman,(getrefine()-3)*(getrefine()-3); bonus2 bAddRace,RC_Player,(getrefine()-3)*(getrefine()-3); bonus2 bIgnoreDefRaceRate,RC_DemiHuman,5; bonus2 bIgnoreDefRaceRate,RC_Player,5; } if(getrefine()>8) { bonus3 bAutoSpell,"LK_CONCENTRATION",max(getskilllv("LK_CONCENTRATION"),1),30; bonus3 bAutoSpell,"LK_AURABLADE",max(getskilllv("LK_AURABLADE"),1),30; } },{},{}
 1188,Veteran_Sword,Veteran Sword,5,10000,,2000,180,,1,1,0x00004082,7,2,34,4,80,1,3,{ if(getskilllv("SM_BASH")==10) { bonus2 bSkillAtk,"SM_BASH",50; } if(getskilllv("KN_BOWLINGBASH")==10) { bonus2 bSkillAtk,"KN_BOWLINGBASH",50; } bonus bStr,1; bonus bDex,1; },{},{}
 1189,Krasnaya,Krasnaya,5,20,,3800,200,,2,3,0x00004082,2,2,34,2,50,1,3,{ if(readparam(bStr)>=95) { bonus bBaseAtk,20; } },{},{}
 1190,Claymore_C,Claymore,5,0,,0,220,,1,0,0x00004080,7,2,34,3,1,0,3,{ bonus2 bAddSize,Size_All,40; },{},{}
@@ -892,7 +892,7 @@
 1644,Piercing_Staff_M,Staff of Piercing,5,20,,500,80,,1,0,0x00018314,2,2,2,3,70,1,10,{ bonus bInt,4; bonus bMatkRate,15; bonus2 bIgnoreMdefClassRate,Class_Normal,10+getrefine(); bonus2 bIgnoreMdefClassRate,Class_Boss,10+getrefine(); },{},{}
 1645,Lich_Bone_Wand_M,Lich's Bone Wand,5,20,,800,60,,1,2,0x00018314,2,2,2,3,70,1,10,{ bonus bInt,1; bonus bDex,1; bonus bAtkEle,Ele_Undead; bonus bMatkRate,20; bonus3 bAutoSpellWhenHit,"NPC_WIDECURSE",5,10+getrefine(); if(getrefine()>=9){ bonus bMatkRate,3; bonus bMaxSP,300; } },{},{}
 1646,La'cryma_Stick,La'cryma Stick,5,20,,500,30,,1,2,0x00010204,2,2,2,3,50,1,10,{ bonus bInt,4; bonus bMatkRate,15; bonus bMdef,getrefine(); bonus2 bSkillAtk,"WZ_STORMGUST",getrefine(); if(getrefine()>9) bonus2 bCastrate,"WZ_STORMGUST",-8; },{},{}
-1647,Croce_Staff,Croce Staff,5,20,,500,30,,1,1,0x00008110,2,2,2,3,50,1,10,{ bonus bAtkEle,Ele_Holy; bonus bMatkRate,15; bonus bInt,4; bonus4 bAutoSpellOnSkill,"AL_HEAL","AL_BLESSING",getskilllv("AL_BLESSING")>1?getskilllv("AL_BLESSING"):1,20; },{},{}
+1647,Croce_Staff,Croce Staff,5,20,,500,30,,1,1,0x00008110,2,2,2,3,50,1,10,{ bonus bAtkEle,Ele_Holy; bonus bMatkRate,15; bonus bInt,4; bonus4 bAutoSpellOnSkill,"AL_HEAL","AL_BLESSING",max(getskilllv("AL_BLESSING"),1),20; },{},{}
 1648,Staff_Of_Bordeaux,Staff Of Bordeaux,5,20,,500,30,,1,0,0x00010204,2,2,2,4,50,1,10,{ bonus bMatkRate,15; bonus bInt,2; bonus bDex,1; if(getskilllv("SA_DRAGONOLOGY")==5) { bonus bUseSPrate,-15; bonus bInt,3; } },{},{}
 // Bows
 1701,Bow,Bow,5,1000,,500,15,,5,3,0x000A0848,7,2,34,1,4,1,11,{},{},{}
@@ -927,7 +927,7 @@
 1731,Frozen_Bow,Frozen Bow,5,20,,1400,100,,5,1,0x000A0808,7,2,34,3,55,1,11,{ bonus2 bAddEff,Eff_Freeze,1000; },{},{}
 1732,Earth_Bow,Earth Bow,5,20,,1400,105,,5,1,0x000A0808,7,2,34,3,55,1,11,{},{},{}
 1733,Gust_Bow,Gust Bow,5,20,,1400,95,,5,1,0x000A0808,7,2,34,3,55,1,11,{},{},{}
-1734,Orc_Archer_Bow,Orc Archer Bow,5,20,,1600,120,,5,0,0x000A0808,7,2,34,4,65,1,11,{ bonus2 bAddMonsterDropItem,1753,200; },{},{}
+1734,Orc_Archer_Bow,Orc Archer Bow,5,20,,1600,120,,5,0,0x000A0808,7,2,34,3,65,1,11,{ bonus2 bAddMonsterDropItem,1753,200; },{},{}
 1735,Kkakkung,Kkakkung,5,20,,0,120,,5,0,0x000A0848,7,2,34,1,1,0,11,{ bonus2 bAddClass,Class_All,50; },{},{}
 1736,Double_Bound,Double Bound,5,20,,900,70,,5,3,0x00000800,2,2,34,3,70,1,11,{ bonus3 bAutoSpell,"AC_DOUBLE",GetSkillLv("AC_DOUBLE"),10; },{},{}
 1737,Ixion_Wing,Ixion Wings,5,20,,300,135,,5,1,0x00000800,2,2,34,4,70,1,11,{ autobonus "{ bonus bAspdRate,7; }",10+(getrefine()*2),7000,BF_WEAPON,"{ specialeffect2 EF_HASTEUP; }"; bonus2 bAddSkillBlow,"AC_CHARGEARROW",3; },{},{}
@@ -954,7 +954,7 @@
 1761,Curse_Arrow,Cursed Arrow,10,10,,3,1,,,,0x000A1848,7,2,32768,,1,,1,{ bonus2 bAddEff,Eff_Curse,1000; },{},{}
 1762,Rusty_Arrow,Rusty Arrow,10,3,,2,30,,,,0x000A1848,7,2,32768,,1,,1,{ bonus bAtkEle,Ele_Poison; },{},{}
 1763,Poison_Arrow,Poison Arrow,10,10,,3,1,,,,0x000A1848,7,2,32768,,1,,1,{ bonus bAtkEle,Ele_Poison; bonus2 bAddEff,Eff_Poison,2000; },{},{}
-1764,Incisive_Arrow,Sharp Arrow,10,20,,3,10,,,,0x000A1848,7,2,32768,,1,,1,{ bonus bCritical,20; },{},{}
+1764,Incisive_Arrow,Sharp Arrow,10,20,,3,10,,,,0x000A1848,7,2,32768,,1,,1,{ bonus bCriticalLong,20; },{},{}
 1765,Oridecon_Arrow,Oridecon Arrow,10,30,,3,50,,,,0x000A1848,7,2,32768,,1,,1,{},{},{}
 1766,Arrow_Of_Counter_Evil,Arrow of Counter Evil,10,40,,3,50,,,,0x000A1848,7,2,32768,,1,,1,{ bonus bAtkEle,Ele_Holy; },{},{}
 1767,Arrow_Of_Shadow,Arrow of Shadow,10,3,,2,30,,,,0x000A1848,7,2,32768,,1,,1,{ bonus bAtkEle,Ele_Dark; },{},{}
@@ -1340,7 +1340,7 @@
 2425,Black_Leather_Boots,Black Leather Boots,4,20,,500,,4,,0,0xFFFFFFFE,2,2,64,,55,1,0,{ bonus bAgi,1; if(getrefine()>=9) bonus bAgi,2; },{},{}
 2426,Shadow_Walk,Shadow Walk,4,20,,2000,,0,,0,0xFFFFFFFE,2,2,64,,75,1,0,{ bonus bMdef,10; if(getskilllv("AS_CLOAKING")<2){ bonus5 bAutoSpellWhenHit,"AS_CLOAKING",2,100,BF_MAGIC,0; } else bonus5 bAutoSpellWhenHit,"AS_CLOAKING",getskilllv("AS_CLOAKING"),100,BF_MAGIC,0; },{},{}
 2427,Golden_Shoes,Golden Shoes,4,20,,300,,4,,0,0xFFFFFFFF,7,2,64,,0,0,0,{ bonus bMdef,4; },{},{}
-//2428,Freyja_Boots,Freyja Boots,4,0,,300,,10,,0,0xFFFFFFFE,7,2,64,,0,0,0,{ bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player,5; },{},{}
+2428,Freyja_Boots,Freyja Boots,4,0,,300,,10,,0,0xFFFFFFFE,7,2,64,,0,0,0,{ bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player,5; },{},{}
 2429,Iron_Boots01,Iron Boots,4,0,,1500,,5,,0,0x000E5CEA,7,2,64,,0,1,0,{},{},{}
 2430,Iron_Boots02,Iron Boots,4,0,,800,,5,,0,0xFFFFFFFF,7,2,64,,0,1,0,{},{},{}
 2431,Valley_Shoes,Valley Shoes,4,20,,0,,10,,0,0xFFFFFFFF,7,2,64,,0,0,0,{ bonus bMaxHPRate,7; bonus bMaxSPRate,7; },{},{}
@@ -1397,7 +1397,7 @@
 2530,Rider_Insignia_,Rider Insignia,4,20,,500,,4,,1,0xFFFFFFFE,2,2,4,,55,1,0,{ bonus bAgi,2; },{},{}
 2531,Ulfhedinn,Ulfhedinn,4,20,,700,,3,,1,0x000654E2,2,2,4,,70,1,0,{ bonus3 bAutoSpellWhenHit,"NPC_STONESKIN",6,20; },{},{}
 2532,Mithril_Magic_Cape,Mithril Magic Cape,4,20,,400,,3,,1,0x00098B1C,2,2,4,,70,1,0,{ bonus bMdef,3; bonus5 bAutoSpellWhenHit,"NPC_ANTIMAGIC",6,200,BF_MAGIC,0; },{},{}
-//2533,Freyja_Cape,Freyja Cape,4,0,,200,,10,,0,0xFFFFFFFE,7,2,4,,0,0,0,{ bonus2 bSubRace,RC_DemiHuman,15; bonus2 bSubRace,RC_Player,15; },{},{}
+2533,Freyja_Cape,Freyja Cape,4,0,,200,,10,,0,0xFFFFFFFE,7,2,4,,0,0,0,{ bonus2 bSubRace,RC_DemiHuman,15; bonus2 bSubRace,RC_Player,15; },{},{}
 2534,Ruffler,Ruffler,4,20,,0,,10,,0,0xFFFFFFFF,7,2,4,,0,0,0,{ bonus2 bSubEle,Ele_Neutral,17; bonus bFlee,17; },{},{}
 2535,Cloak_Of_Survival_C,Cloak Of Survival,4,1,,0,,5,,0,0x00810204,7,2,4,,0,0,0,{ bonus bVit,10; bonus bMdef,10; },{},{}
 2536,Skin_Of_Ventus,Skin of Ventus,4,20,,250,,2,,1,0xFFFFFFFE,7,2,4,,60,1,0,{ bonus bMdef,2; bonus bMaxHP,200; bonus bFlee,10; },{},{}
@@ -1409,7 +1409,7 @@
 2542,Flame_Manteau,Flame Manteau of Naght Sieger,4,20,,70,,4,,1,0xFFFFFFFE,2,2,4,,70,1,0,{ bonus bMaxHPRate,5; bonus bMdef,2; bonus bMatkRate,1; bonus2 bAddEle,Ele_Fire,2; },{},{}
 2543,Sylphid_Manteau,Sylphid Manteau,4,20,,0,,9,,0,0xFFFFFFFF,7,2,4,,0,0,0,{ bonus bFlee,13; bonus2 bSubEle,Ele_Neutral,13; bonus bFlee2,1; },{},{}
 2544,Leather_Of_Tendrilion,Leather of Tendrilion,4,20,,300,,3,,1,0x00CFDF80,2,2,4,,0,1,0,{ bonus2 bSubEle,Ele_Water,5; bonus2 bSubEle,Ele_Earth,5; bonus2 bSubRace,RC_Plant,5; bonus2 bSubRace,RC_Brute,5; },{},{}
-2545,Musika,Musika,4,20,,500,,2,,1,0x00008100,2,2,4,,70,1,0,{ bonus bMdef,3; bonus3 bAutoSpellwhenhit,"AL_HEAL",getskilllv("AL_HEAL")?getskilllv("AL_HEAL"):1,20; },{},{}
+2545,Musika,Musika,4,20,,500,,2,,1,0x00008100,2,2,4,,70,1,0,{ bonus bMdef,3; bonus3 bAutoSpellwhenhit,"AL_HEAL",max(1,getskilllv("AL_HEAL")),20; },{},{}
 2546,Beach_Manteau,Beach Manteau,4,20,,600,,0,,1,0xFFFFFFFF,7,2,4,,0,1,0,{ bonus bStr,1; bonus bInt,1; bonus2 bSubEle,Ele_Fire,10; },{},{}
 2547,Cheap_Running_Shirts,Cheap Undershirt,4,0,,0,,8,,0,0xFFFFFFFF,7,2,4,,0,1,0,{ bonus bDex,2; bonus bFlee,10; bonus2 bSubEle,Ele_Neutral,10; bonus bMdef,1; },{},{}
 2548,Muffler_C,Neo Muffler,4,0,,0,,5,,0,0xFFFFFFFE,2,2,4,,95,0,0,{ bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10; bonus bMaxHPrate,10; bonus2 bSubEle,Ele_Water,5; bonus2 bSubEle,Ele_Fire,5; bonus2 bSubEle,Ele_Holy,5; bonus2 bSubEle,Ele_Dark,5; },{},{}
@@ -2055,14 +2055,14 @@
 4418,Gazeti_Card,Gazeti Card,6,20,,10,,,,,,,,136,,,,,{ bonus3 bAutoSpell,"MG_COLDBOLT",2,100; },{},{}
 4419,Ktullanux_Card,Ktullanux Card,6,20,,10,,,,,,,,16,,,,,{ bonus2 bAddEle,Ele_Fire,50; bonus5 bAutoSpellWhenHit,"WZ_FROSTNOVA",10,20,BF_WEAPON|BF_MAGIC,0; },{},{}
 4420,Muscipular_Card,Muscipular Card,6,20,,10,,,,,,,,32,,,,,{ bonus3 bAutoSpellWhenHit,"AL_HEAL",1,100; bonus3 bAutoSpellWhenHit,"AL_INCAGI",1,100; },{},{}
-4421,Drosera_Card,Drosera Card,6,20,,10,,,,,,,,2,,,,,{ if(getiteminfo(getequipid(EQI_HAND_R),9)>3) bonus bCritical,15; },{},{}
+4421,Drosera_Card,Drosera Card,6,20,,10,,,,,,,,2,,,,,{ bonus bCriticalLong,15; },{},{}
 4422,Roween_Card,Roween Card,6,20,,10,,,,,,,,4,,,,,{ bonus bFlee,5; bonus bFlee2,3; bonus2 bAddEle,Ele_Water,10; bonus2 bCriticalAddRace,RC_Fish,15; },{},{}
 4423,Galion_Card,Galion Card,6,20,,10,,,,,,,,136,,,,,{ bonus bHit,5; bonus2 bAddEle,Ele_Water,5; },{},{}
 4424,Stapo_Card,Stapo Card,6,20,,10,,,,,,,,136,,,,,{ skill "TF_PICKSTONE",1; skill "TF_THROWSTONE",1; },{},{}
 4425,Atroce_Card,Atroce Card,6,20,,10,,,,,,,,2,,,,,{ bonus bBaseAtk,25; autobonus "{ bonus bAspdRate,100; }",5,10000,0,"{ specialeffect2 EF_POTION_BERSERK; }"; },{},{}
 4426,Byorgue_Card,Byorgue Card,6,20,,10,,,,,,,,16,,,,,{ if(BaseJob==Job_Rogue) { bonus bMatkRate,10; bonus2 bAddClass,Class_All,10; } },{},{}
-4427,Sword_Guardian_Card,Sword Guardian Card,6,20,,10,,,,,,,,2,,,,,{ if(getiteminfo(getequipid(EQI_HAND_R),11)==2||getiteminfo(getequipid(EQI_HAND_R),11)==3) { bonus bHit,5; bonus bCritical,5; bonus2 bSkillAtk,62,25; } },{},{}
-4428,Bow_Guardian_Card,Bow Guardian Card,6,20,,10,,,,,,,,2,,,,,{ if(getiteminfo(getequipid(EQI_HAND_R),11)==11) { bonus bHit,5; bonus bCritical,5; bonus2 bSkillAtk,47,50; } },{},{}
+4427,Sword_Guardian_Card,Sword Guardian Card,6,20,,10,,,,,,,,2,,,,,{ if(getiteminfo(getequipid(EQI_HAND_R),11)==W_1HSWORD||getiteminfo(getequipid(EQI_HAND_R),11)==W_2HSWORD) { bonus bHit,5; bonus bCritical,5; bonus2 bSkillAtk,62,25; } },{},{}
+4428,Bow_Guardian_Card,Bow Guardian Card,6,20,,10,,,,,,,,2,,,,,{ if(getiteminfo(getequipid(EQI_HAND_R),11)==W_BOW) { bonus bHit,5; bonus bCritical,5; bonus2 bSkillAtk,47,50; } },{},{}
 4429,Salamander_Card,Salamander Card,6,20,,10,,,,,,,,4,,,,,{ bonus2 bSkillAtk,"WZ_FIREPILLAR",40; bonus2 bSkillAtk,"WZ_METEOR",40; },{},{}
 4430,Ifrit_Card,Ifrit Card,6,20,,10,,,,,,,,136,,,,,{ bonus bBaseAtk,(JobLevel/10); bonus bCritical,(JobLevel/10); bonus bHit,(JobLevel/10); bonus3 bAutoSpellWhenHit,"NPC_EARTHQUAKE",2,10; },{},{}
 4431,Kasa_Card,Kasa Card,6,20,,10,,,,,,,,4,,,,,{ bonus3 bAutoSpell,"MG_FIREBALL",5,20; bonus3 bAutoSpell,"MG_FIREBOLT",5,20; },{},{}
@@ -2074,7 +2074,7 @@
 4437,Hell_Poodle_Card,Hell Poodle Card,6,20,,10,,,,,,,,136,,,,,{ bonus bHit,1; bonus2 bAddItemHealRate,517,100; bonus3 bAddEff,Eff_Bleeding,50,ATF_SHORT; },{},{}
 4438,Banshee_Card,Banshee Card,6,20,,10,,,,,,,,769,,,,,{ if(BaseClass==Job_Mage){ bonus bMaxSP,100; bonus bMaxHP,-100; bonus2 bSkillAtk,"MG_NAPALMBEAT",20; bonus2 bSkillAtk,"MG_SOULSTRIKE",20; bonus2 bSkillAtk,"HW_NAPALMVULCAN",20; } },{},{}
 4439,Flame_Skull_Card,Flame Skull Card,6,20,,10,,,,,,,,32,,,,,{ bonus2 bResEff,Eff_Blind,3000; bonus2 bResEff,Eff_Stun,3000; bonus2 bResEff,Eff_Curse,3000; bonus2 bResEff,Eff_Stone,3000; bonus2 bAddEffWhenHit,Eff_Blind,500; bonus2 bAddEffWhenHit,Eff_Stun,500; bonus2 bAddEffWhenHit,Eff_Curse,500; bonus2 bAddEffWhenHit,Eff_Stone,500; },{},{}
-4440,Necromancer_Card,Necromancer Card,6,20,,10,,,,,,,,2,,,,,{ if(getiteminfo(getequipid(EQI_HAND_R),11)==10) { bonus bInt,1; bonus2 bIgnoreMdefClassRate,Class_Normal,2; bonus2 bIgnoreMdefClassRate,Class_Boss,2; } },{},{}
+4440,Necromancer_Card,Necromancer Card,6,20,,10,,,,,,,,2,,,,,{ if(getiteminfo(getequipid(EQI_HAND_R),11)==W_STAFF) { bonus bInt,1; bonus2 bIgnoreMdefClassRate,Class_Normal,2; bonus2 bIgnoreMdefClassRate,Class_Boss,2; } },{},{}
 4441,Fallen_Bishop_Card,Fallen Bishop Hibram Card,6,20,,10,,,,,,,,64,,,,,{ bonus bMatkRate,10; bonus bMaxSPrate,-50; bonus2 bMagicAddRace,RC_Angel,50; bonus2 bMagicAddRace,RC_DemiHuman,50; bonus2 bMagicAddRace,RC_Player,50; },{},{}
 4442,Tatacho_Card,Tatacho Card,6,20,,10,,,,,,,,32,,,,,{ bonus2 bSubEle,Ele_Neutral,20; bonus2 bAddEle,Ele_Neutral,5; },{},{}
 4443,Aqua_Elemental_Card,Aqua Elemental Card,6,20,,10,,,,,,,,32,,,,,{ bonus2 bSubEle,Ele_Water,20; bonus2 bAddEle,Ele_Water,5; },{},{}
@@ -2990,8 +2990,8 @@
 5812,Hat_Of_Expert,Hat Of Expert,4,0,,0,,2,,0,0xFFFFFFFF,7,2,256,,0,1,16,{},{},{}
 //5813,Red_Ph.D_Hat,Red Ph.D Hat,4,1000,,500,,0,,0,0xFFFFFFFF,7,2,256,,0,1,481,{ bonus bInt,1; },{},{}
 //5814,Ati_Atihan_Hat3
-5815,Cowboy_Hat_J,Purple Cowboy Hat,4,20,,500,,2,,0,0xFFFFFFFF,7,2,256,,0,1,475,{ bonus bStr,1; bonus2 bSubSize, 0, 5; bonus2 bSubSize, 1, 5; bonus2 bSubSize, 2, 5; },{},{}
-5816,Classic_Hat_J,Classic Hat,4,20,,500,,0,,0,0xFFFFFFFF,7,2,256,,0,1,411,{},{},{}
+5815,Classic_Hat_J,Classic Hat,4,20,,500,,2,,0,0xFFFFFFFF,7,2,256,,0,1,475,{ bonus bStr,1; bonus2 bSubSize, 0, 5; bonus2 bSubSize, 1, 5; bonus2 bSubSize, 2, 5; },{},{}
+5816,Cowboy_Hat_J,Purple Cowboy Hat,4,20,,500,,0,,0,0xFFFFFFFF,7,2,256,,0,1,411,{ bonus bBaseAtk,15; bonus bFlee,-5; },{},{}
 5817,Valentine_Pledge,Valentine Pledge,4,20,,0,,3,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus bAllStats,2; bonus bMdef,3; },{},{}
 5818,Carnival_Hat,Carnival Hat,4,0,,0,,6,,0,0xFFFFFFFF,7,2,256,,0,1,505,{ bonus bAllStats, 3; },{},{}
 5819,Carnival_Circlet,Carnival Circlet,4,0,,0,,6,,0,0xFFFFFFFF,7,2,256,,0,1,506,{ bonus bAllStats, 3; },{},{}
@@ -4551,8 +4551,8 @@
 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; },{},{}
-11702,Moon_Cookie,Moon Cookie,0,0,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ },{},{}
+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; },{},{}
 11705,Special_White_Potion,Children's Potion,0,1,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(425,425),0; },{},{}
@@ -4784,7 +4784,7 @@
 12217,Aspersio_5_Scroll,LV5 Aspersio Scroll,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ if(countitem(523)>0) { skilleffect "PR_ASPERSIO",0; sc_start SC_ASPERSIO,180000,5; delitem 523,1; } },{},{}
 12218,Assumptio_5_Scroll,LV5 Assumptio Scroll,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ASSUMPTIO,100000,5; skilleffect "HP_ASSUMPTIO",0; },{},{}
 12219,Wind_Walk_10_Scroll,LV10 Wind Walker Scroll,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ skilleffect "SN_WINDWALK",0; sc_start SC_WINDWALK,250000,5; },{},{}
-12220,Adrenaline_Scroll,LV5 Adrenaline Scroll,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ set .@type,getiteminfo(getequipid(EQI_HAND_R),11); if (.@type==6||.@type==7||.@type==8) { skilleffect "BS_ADRENALINE",0; sc_start SC_ADRENALINE,150000,5; } },{},{}
+12220,Adrenaline_Scroll,LV5 Adrenaline Scroll,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ set .@type,getiteminfo(getequipid(EQI_HAND_R),11); if (.@type==W_1HAXE||.@type==W_2HAXE||.@type==W_MACE) { skilleffect "BS_ADRENALINE",0; sc_start SC_ADRENALINE,150000,5; } },{},{}
 12221,Megaphone_,Megaphone,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ input @megaphone$; announce strcharinfo(0) + ": " + @megaphone$,bc_all,0xFF0000; end; },{},{}
 12225,Sweet_Candy_Striper,Sweet Candy Cane,2,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1245; },{},{}
 12226,Examination1,Examination 1,0,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_SPEEDUP0,5400000,25; percentheal 100,100; sc_start SC_STRFOOD,5400000,10; sc_start SC_DEXFOOD,5400000,5; sc_start SC_ATKPOTION,5400000,22; sc_start SC_MATKFOOD,5400000,15; },{},{}
@@ -4848,9 +4848,9 @@
 12284,Internet_Cafe3,Internet Cafe3,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCINT,5400000,8; sc_start SC_INCVIT,5400000,4; sc_start SC_INCDEX,5400000,6; sc_start SC_MATKPOTION,5400000,40; },{},{}
 12285,Internet_Cafe4,Internet Cafe4,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCDEX,5400000,8; sc_start SC_INCLUK,5400000,4; sc_start SC_INCAGI,5400000,6; sc_start SC_ATKPOTION,5400000,24; sc_start SC_MATKPOTION,5400000,24; },{},{}
 12286,Masquerade_Ball_Box2,Masquerade Ball Box2,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getrandgroupitem(IG_Masquerade_2),1; },{},{}
-12287,Love_Angel,Love Angel Magic Powder,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ setfont 1; },{},{}
-12288,Squirrel,Squirrel Magic Powder,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ setfont 2; },{},{}
-12289,Gogo,Gogo Magic Powder,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ setfont 3; },{},{}
+12287,Love_Angel,Love Angel Magic Powder,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ setfont 1; },{},{ setfont 0; }
+12288,Squirrel,Squirrel Magic Powder,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ setfont 2; },{},{ setfont 0; }
+12289,Gogo,Gogo Magic Powder,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ setfont 3; },{},{ setfont 0; }
 12290,Mysterious_Can,Mysterious Can Magic Powder,2,10,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 5,0; skilleffect "AL_BLESSING",0; sc_start SC_BLESSING,120000,5; },{},{}
 12291,Mysterious_PET_Bottle,Mysterious PET Bottle,2,10,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 5,0; skilleffect "AL_INCAGI",0; sc_start SC_INCREASEAGI,120000,5; },{},{}
 12292,Unripe_Fruit,Unripe Fruit,0,500,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 20,0; },{},{}
@@ -4865,12 +4865,12 @@
 12301,Doppelganger_Scroll,Doppelganger Contract,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ mercenary_create 1966,1800000; },{},{}
 12302,Ygnizem_Scroll,Egnigem Cenia Contract,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ mercenary_create 1967,1800000; },{},{}
 12303,Water_Of_Blessing,Blessing Of Water,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12304,Picture_Diary,Diary Magic Powder,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ setfont 4; },{},{}
-12305,Mini_Heart,Mini Heart Magic Powder,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ setfont 5; },{},{}
-12306,Newcomer,Freshman Magic Powder,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ setfont 6; },{},{}
-12307,Kid,Kid Magic Powder,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ setfont 7; },{},{}
-12308,Magic_Castle,Magic Magic Powder,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ setfont 8; },{},{}
-12309,Bulging_Head,JJangu Magic Powder,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ setfont 9; },{},{}
+12304,Picture_Diary,Diary Magic Powder,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ setfont 4; },{},{ setfont 0; }
+12305,Mini_Heart,Mini Heart Magic Powder,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ setfont 5; },{},{ setfont 0; }
+12306,Newcomer,Freshman Magic Powder,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ setfont 6; },{},{ setfont 0; }
+12307,Kid,Kid Magic Powder,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ setfont 7; },{},{ setfont 0; }
+12308,Magic_Castle,Magic Magic Powder,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ setfont 8; },{},{ setfont 0; }
+12309,Bulging_Head,JJangu Magic Powder,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ setfont 9; },{},{ setfont 0; }
 12310,Spray_Of_Flowers,Spray Of Flowers,2,0,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCFLEE,600000,10; },{},{}
 12311,Large_Spray_Of_Flowers,Huge Spray Of Flowers,11,0,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "ALL_PARTYFLEE",1; },{},{}
 12312,Thick_Manual50,Thick Battle Manual,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_EXPBOOST,3600000,50; },{},{}
@@ -4880,7 +4880,7 @@
 12316,Angel_Bless,Angel Of Blessing,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12317,Powder_Snow,Snow Powder,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ end; },{},{}
 12318,Little_Heart,Small Hearts,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12319,Strawberry_Cake,Rune Strawberry Cake,2,0,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCATKRATE,600000,5; sc_start SC_INCMATKRATE,600000,5; },{},{}
+12319,Strawberry_Cake,Rune Strawberry Cake,2,0,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ATKPOTION,600000,5; sc_start SC_MATKPOTION,600000,5; },{},{}
 12320,Pineapple_Juice,Schwartzwald Pine Jubilee,2,0,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCHIT,600000,10; sc_start SC_INCFLEE2,600000,20; },{},{}
 12321,Spicy_Sandwich,Arunafeltz Desert Sandwich,2,0,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCCRI,600000,7; },{},{}
 12322,Chocolate_Pie,Chocolate Pie,0,0,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 5,5; },{},{}
@@ -4957,11 +4957,11 @@
 12393,Repair_B,Repair B,2,500,,140,,,,,0x00000400,8,2,,,,,,{ if ( checkmadogear() ) { itemheal rand(300,400),0; } },{},{}
 12394,Repair_C,Repair C,2,1100,,180,,,,,0x00000400,8,2,,,,,,{ if ( checkmadogear() ) { itemheal rand(400,500),0; } },{},{}
 12395,Tantanmen,Tantan Noodle,2,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1519; },{},{}
-12396,Fools_Day_Box,Gift Box?,11,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ .@rnd = rand(1,10); if(.@rnd==1) itemskill "AL_TELEPORT",1; else if(.@rnd==2) itemskill "AL_TELEPORT",3; else if(.@rnd==3) percentheal 50,0; else if(.@rnd==4) percentheal 0,50; else if(.@rnd==5) end; else if(.@rnd==6) getitem 512,1; else if(.@rnd==7) itemskill "ALL_REVERSEORCISH",1; else if(.@rnd==8) specialeffect2 247; else if(.@rnd==9) specialeffect2 338; else specialeffect2 10; },{},{}
-12397,Fools_Day_Box2,Gift Box?,11,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ .@rnd = rand(1,10); if(.@rnd==1) itemskill "TF_DETOXIFY",1; else if(.@rnd==2) itemskill "TF_PICKSTONE",1; else if(.@rnd==3) itemskill "BA_FROSTJOKER",1; else if(.@rnd==4) itemskill "DC_SCREAM",1; else if(.@rnd==5) end; else if(.@rnd==6) getitem 909,1; else if(.@rnd==7) itemskill "AL_RUWACH",1; else if(.@rnd==8) specialeffect2 328; else if(.@rnd==9) specialeffect2 68; else specialeffect2 196; },{},{}
+12396,Fools_Day_Box,Gift Box?,11,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ .@rnd = rand(1,10); if(.@rnd==1) itemskill "AL_TELEPORT",1; else if(.@rnd==2) itemskill "AL_TELEPORT",3; else if(.@rnd==3) percentheal 50,0; else if(.@rnd==4) percentheal 0,50; else if(.@rnd==5) end; else if(.@rnd==6) getitem 512,1; else if(.@rnd==7) itemskill "ALL_REVERSEORCISH",1; else if(.@rnd==8) specialeffect2 EF_MAPPILLAR2; else if(.@rnd==9) specialeffect2 EF_ANGEL2; else specialeffect2 EF_COIN; },{},{}
+12397,Fools_Day_Box2,Gift Box?,11,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ .@rnd = rand(1,10); if(.@rnd==1) itemskill "TF_DETOXIFY",1; else if(.@rnd==2) itemskill "TF_PICKSTONE",1; else if(.@rnd==3) itemskill "BA_FROSTJOKER",1; else if(.@rnd==4) itemskill "DC_SCREAM",1; else if(.@rnd==5) end; else if(.@rnd==6) getitem 909,1; else if(.@rnd==7) itemskill "AL_RUWACH",1; else if(.@rnd==8) specialeffect2 EF_BEGINASURA; else if(.@rnd==9) specialeffect2 EF_MVP; else specialeffect2 EF_CURSEATTACK; },{},{}
 12398,PCBang_Gift_Box,PCBang Gift Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12399,Castle_Treasure_Box,Castle Treasure Box,2,20,,1000,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12400,Water_Of_Blessing_,Water Of Blessing ,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+12400,Water_Of_Blessing_,Water Of Blessing,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12401,Rune_Kn_Test_Int,Rune Kn Test Int,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCINT,300000,40; },{},{}
 12402,29Fruit,29Fruit,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 5,5; },{},{}
 12403,Lucky_Egg2,Lucky Egg2,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
@@ -4982,13 +4982,13 @@
 12418,Full_SwingK,Full SwingK,2,100,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_FULL_SWING_K,500000,50; },{},{}
 12419,Mana_Plus,Mana Plus,2,100,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_MANA_PLUS,500000,50; },{},{}
 12420,Stamina_Up_M,Stamina Up M,2,100,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_MUSTLE_M,500000,5; },{},{}
-12421,Falmons_F,Falmons F,3,10,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LIFE_FORCE_F,500000,5; },{},{}
-12422,HP_Increase_Potion_(Small),HP Increase Potion (Small),0,10,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCMHP,500000,(500+(BaseLevel*10/3)); percentheal 1,0; },{},{}
-12423,HP_Increase_Potion_(Medium),HP Increase Potion (Medium),0,10,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCMHP,500000,(1500+(BaseLevel*10/3)); percentheal 2,0; },{},{}
-12424,HP_Increase_Potion_(Large),HP Increase Potion (Large),0,10,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCMHP,500000,(2500+(BaseLevel*10/3)); percentheal 5,0; },{},{}
-12425,SP_Increase_Potion_(Small),SP Increase Potion (Small),0,10,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCMSPRATE,500000,((BaseLevel/10)-5); percentheal 0,2; },{},{}
-12426,SP_Increase_Potion_(Medium),SP Increase Potion (Medium),0,10,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCMSPRATE,500000,(BaseLevel/10); percentheal 0,4; },{},{}
-12427,SP_Increase_Potion_(Large),SP Increase Potion (Large),0,10,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCMSPRATE,500000,((BaseLevel/10)+5); percentheal 0,8; },{},{}
+12421,Falmons_F,Falmons F,2,10,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LIFE_FORCE_F,500000,5; },{},{}
+12422,HP_Increase_Potion_(Small),HP Increase Potion (Small),2,100,,20,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start2 SC_PROMOTE_HEALTH_RESERCH,500000,1,1; percentheal 1,0; },{},{}
+12423,HP_Increase_Potion_(Medium),HP Increase Potion (Medium),2,100,,40,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start2 SC_PROMOTE_HEALTH_RESERCH,500000,1,2; percentheal 2,0; },{},{}
+12424,HP_Increase_Potion_(Large),HP Increase Potion (Large),2,100,,80,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start2 SC_PROMOTE_HEALTH_RESERCH,500000,1,3; percentheal 5,0; },{},{}
+12425,SP_Increase_Potion_(Small),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_Potion_(Medium),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_Potion_(Large),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; },{},{}
@@ -5290,9 +5290,9 @@
 12965,Emergency_Box1,Emergency Level 1 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12968,1; },{},{}
 12966,Emergency_Box2,Emergency Level 2 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12969,1; },{},{}
 12967,Emergency_Box3,Emergency Level 3 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12970,1; },{},{}
-12968,Emergency_Scroll1,Emergency Level 1 Scroll,11,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "GD_ITEMEMERGENCYCALL",1; },{},{}
-12969,Emergency_Scroll2,Emergency Level 2 Scroll,11,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "GD_ITEMEMERGENCYCALL",2; },{},{}
-12970,Emergency_Scroll3,Emergency Level 3 Scroll,11,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "GD_ITEMEMERGENCYCALL",3; },{},{}
+12968,Emergency_Scroll1,Emergency Level 1 Scroll,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ unitskilluseid getcharid(3),"GD_ITEMEMERGENCYCALL",1; },{},{}
+12969,Emergency_Scroll2,Emergency Level 2 Scroll,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ unitskilluseid getcharid(3),"GD_ITEMEMERGENCYCALL",2; },{},{}
+12970,Emergency_Scroll3,Emergency Level 3 Scroll,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ unitskilluseid getcharid(3),"GD_ITEMEMERGENCYCALL",3; },{},{}
 12971,Teleport_Box1,Teleport Scroll Box 1,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12977,10; },{},{}
 12972,Teleport_Box2,Teleport Scroll Box 2,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12978,10; },{},{}
 12973,Teleport_Box3,Teleport Scroll Box 3,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12979,10; },{},{}
@@ -5449,29 +5449,29 @@
 13265,Black_Lump,Black Lump,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
 13266,Black_Hard_Lump,Hard Black Lump,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
 13267,Very_Hard_Lump,Extremely Hard Black Lump,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13268,Mysterious_Powder,Mysterious Powder,10,100,,10,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_MYSTERIOUS_POWDER,10000,2; },{},{}
-13269,Boost500_To_Throw,Throwing Boost 500,10,100,,10,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_BOOST500,500000,10; },{},{}
-13270,Full_SwingK_To_Throw,Throwing Full Swing K,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_FULL_SWING_K,500000,50; },{},{}
-13271,Mana_Plus_To_Throw,Throwing Mana Plus,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_MANA_PLUS,500000,50; },{},{}
-13272,Cure_Free_To_Throw,Throwing Cure Free,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_end SC_BLEEDING; sc_end SC_CURSE; sc_end SC_SILENCE; sc_end SC_POISON; sc_end SC_ORCISH; sc_end SC_CHANGEUNDEAD; sc_end SC_BLIND; sc_end SC_CONFUSION; sc_end SC_DPOISON; itemheal 500,0; },{},{}
-13273,Stamina_Up_M_To_Throw,Throwing Muramura M,10,100,,10,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_MUSTLE_M,500000,5; },{},{}
-13274,Digestive_F_To_Throw,Throwing Falmons F,10,100,,10,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_LIFE_FORCE_F,500000,5; },{},{}
-13275,HP_Inc_PotS_To_Throw,Throwing Increase HP Potion (Small),10,100,,20,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_INCMHP,500000,(500+(BaseLevel*10/3)); percentheal 1,0; },{},{}
-13276,HP_Inc_PotM_To_Throw,Throwing Increase HP Potion (Medium),10,100,,40,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_INCMHP,500000,(1500+(BaseLevel*10/3)); percentheal 2,0; },{},{}
-13277,HP_Inc_PotL_To_Throw,Throwing Increase HP Potion (Large),10,100,,80,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_INCMHP,500000,(2500+(BaseLevel*10/3)); percentheal 5,0; },{},{}
-13278,SP_Inc_PotS_To_Throw,Throwing Increase SP Potion (Small),10,100,,20,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_INCMSP,500000,((BaseLevel/10)-5); percentheal 0,2; },{},{}
-13279,SP_Inc_PotM_To_Throw,Throwing Increase SP Potion (Medium),10,100,,40,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_INCMSP,500000,((BaseLevel/10)); percentheal 0,4; },{},{}
-13280,SP_Inc_PotL_To_Throw,Throwing Increase SP Potion (Large),10,100,,80,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_INCMSP,500000,((BaseLevel/10)+5); percentheal 0,8; },{},{}
-13281,En_White_PotZ_To_Throw,Throwing Concentrated White Potion Z,10,100,,70,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_EXTRACT_WHITE_POTION_Z,500000,20; itemheal 1000,0; },{},{}
-13282,Vitata500_To_Throw,Throwing Vitata 500,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start2 SC_VITATA_500,500000,20,5; itemheal 0,200; },{},{}
-13283,En_Cel_Juice_To_Throw,Throwing Ceromain Soup,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_EXTRACT_SALAMINE_JUICE,500000,10; },{},{}
-13284,Savage_BBQ_To_Throw,Throwing Savage Full Roast,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_SAVAGE_STEAK,300000,20; },{},{}
-13285,Wug_Cocktail_To_Throw,Throwing Cocktail Warg Blood,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_COCKTAIL_WARG_BLOOD,300000,20; },{},{}
-13286,M_Brisket_To_Throw,Throwing Minor Stew,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_MINOR_BBQ,300000,20; },{},{}
-13287,Siroma_Icetea_To_Throw,Throwing Siroma Iced Tea,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_SIROMA_ICE_TEA,300000,20; },{},{}
-13288,Drocera_Stew_To_Throw,Throwing Drosera Herb Salad,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_DROCERA_HERB_STEAMED,300000,20; },{},{}
-13289,Petti_Noodle_To_Throw,Throwing Petite Tail Soup,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_PUTTI_TAILS_NOODLES,300000,20; },{},{}
-13290,Black_Thing_To_Throw,Throwing Black Mass,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_STOMACHACHE,60000,rand(5,10); },{},{}
+13268,Mysterious_Powder,Mysterious Powder,10,100,,10,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
+13269,Boost500_To_Throw,Throwing Boost 500,10,100,,10,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
+13270,Full_SwingK_To_Throw,Throwing Full Swing K,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
+13271,Mana_Plus_To_Throw,Throwing Mana Plus,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
+13272,Cure_Free_To_Throw,Throwing Cure Free,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
+13273,Stamina_Up_M_To_Throw,Throwing Muramura M,10,100,,10,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
+13274,Digestive_F_To_Throw,Throwing Falmons F,10,100,,10,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
+13275,HP_Inc_PotS_To_Throw,Throwing Increase HP Potion (Small),10,100,,20,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
+13276,HP_Inc_PotM_To_Throw,Throwing Increase HP Potion (Medium),10,100,,40,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
+13277,HP_Inc_PotL_To_Throw,Throwing Increase HP Potion (Large),10,100,,80,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
+13278,SP_Inc_PotS_To_Throw,Throwing Increase SP Potion (Small),10,100,,20,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
+13279,SP_Inc_PotM_To_Throw,Throwing Increase SP Potion (Medium),10,100,,40,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
+13280,SP_Inc_PotL_To_Throw,Throwing Increase SP Potion (Large),10,100,,80,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
+13281,En_White_PotZ_To_Throw,Throwing Concentrated White Potion Z,10,100,,70,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
+13282,Vitata500_To_Throw,Throwing Vitata 500,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
+13283,En_Cel_Juice_To_Throw,Throwing Ceromain Soup,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
+13284,Savage_BBQ_To_Throw,Throwing Savage Full Roast,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
+13285,Wug_Cocktail_To_Throw,Throwing Cocktail Warg Blood,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
+13286,M_Brisket_To_Throw,Throwing Minor Stew,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
+13287,Siroma_Icetea_To_Throw,Throwing Siroma Iced Tea,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
+13288,Drocera_Stew_To_Throw,Throwing Drosera Herb Salad,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
+13289,Petti_Noodle_To_Throw,Throwing Petite Tail Soup,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
+13290,Black_Thing_To_Throw,Throwing Black Mass,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
 13294,Explosive_Kunai,Explosive Kunai,10,100,,30,50,,,,0x02000000,63,2,32768,,100,,7,{ bonus bAtkEle,Ele_Neutral; },{},{}
 // Ninja Fuuma Shurikens
 13300,Huuma_Bird_Wing,Huuma Wing Shuriken,5,90000,,3000,150,,1,0,0x02000000,7,2,34,4,65,1,22,{ bonus bUnbreakableWeapon,0; bonus bAtkEle,Ele_Wind; bonus bDex,-2; bonus bAgi,-1; },{},{}
@@ -5499,7 +5499,7 @@
 13411,BF_Sword2,Brave Gladiator Blade,5,20,,0,115,,1,0,0x000654E3,7,2,2,3,80,1,2,{ bonus bStr,1; bonus bDex,1; bonus2 bAddRace,RC_DemiHuman,75; bonus2 bAddRace,RC_Player,75; bonus bMatkRate,10; bonus bUnbreakableWeapon,0; },{},{}
 13412,Twin_Edge_B,Twin Edge of Naght Sieger,5,20,,1500,150,,1,3,0x000654E2,2,2,2,4,75,1,2,{ bonus bAtkEle,Ele_Water; skill "MG_FROSTDIVER",5; autobonus "{ bonus bIgnoreDefClass,Class_Normal; }",50,5000; },{},{}
 13413,Twin_Edge_R,Twin Edge of Naght Sieger,5,20,,1500,160,,1,3,0x000654E2,2,2,2,4,75,1,2,{ bonus bAtkEle,Ele_Fire; skill "WZ_METEOR",3; autobonus "{ bonus bIgnoreDefClass,Class_Normal; }",50,5000; },{},{}
-13414,Elemental_Sword,Elemental Sword,5,20,,1200,105,,1,3,0x000654E2,2,2,2,3,70,1,2,{ bonus bStr,2; bonus bInt,4; bonus bDex,1; bonus bMatkRate,5; bonus2 bAddEle,Ele_Neutral,10; bonus3 bAutoSpell,"MG_COLDBOLT",3,50; bonus4 bAutoSpellOnSkill,"MG_COLDBOLT","MG_FIREBOLT",3,1000; bonus4 bAutoSpellOnSkill,"MG_FIREBOLT","MG_LIGHTNINGBOLT",3,10000; bonus4 bAutoSpellOnSkill,"MG_LIGHTNINGBOLT","WZ_EARTHSPIKE",3,10000; },{},{}
+13414,Elemental_Sword,Elemental Sword,5,20,,1200,105,,1,3,0x000654E2,2,2,2,3,70,1,2,{ bonus bStr,2; bonus bInt,4; bonus bDex,1; bonus bMatkRate,5; bonus2 bAddEle,Ele_Neutral,10; bonus3 bAutoSpell,"MG_COLDBOLT",3,50; bonus4 bAutoSpellOnSkill,"MG_COLDBOLT","MG_FIREBOLT",3,1000; bonus4 bAutoSpellOnSkill,"MG_FIREBOLT","MG_LIGHTNINGBOLT",3,1000; bonus4 bAutoSpellOnSkill,"MG_LIGHTNINGBOLT","WZ_EARTHSPIKE",3,1000; },{},{}
 13415,N_Falchion,Novice Falchion,5,0,,0,59,,1,3,0x000654E3,7,2,2,1,2,0,2,{},{},{}
 13416,Krieger_Onehand_Sword1,Glorious Flamberge,5,20,,0,130,,1,0,0x000654E3,7,2,2,4,80,1,2,{ bonus2 bAddRace,RC_DemiHuman,75; bonus2 bAddRace,RC_Player,75; bonus2 bIgnoreDefRaceRate,RC_DemiHuman,20; bonus2 bIgnoreDefRaceRate,RC_Player,20; bonus bUnbreakableWeapon,0; if(getrefine()>5) { bonus2 bAddRace,RC_DemiHuman,(getrefine()-4)*(getrefine()-4); bonus2 bAddRace,RC_Player,(getrefine()-4)*(getrefine()-4); bonus2 bIgnoreDefRaceRate,RC_DemiHuman,5; bonus2 bIgnoreDefRaceRate,RC_Player,5; } if(getrefine()>6) bonus bAspdRate,5; if(getrefine()>8) { bonus bAspdRate,5; bonus4 bAutoSpellOnSkill,"SM_BASH","NPC_CRITICALWOUND",2,200; } },{},{}
 13417,Krieger_Onehand_Sword2,Glorious Rapier,5,20,,0,130,,1,0,0x000654E3,7,2,2,4,80,1,2,{ bonus bInt,getrefine()-5; bonus bMatkRate,10; bonus bUnbreakableWeapon,0; if(getrefine()>5) bonus bUseSPrate,-10; if(getrefine()>8) bonus bInt,5; },{},{}
@@ -6364,13 +6364,13 @@
 14531,Accuracy_30_Scroll,Concentration Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCHIT,1800000,30; },{},{}
 14532,Battle_Manual25,Field Manual 25%,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_EXPBOOST,1800000,25; },{},{}
 14533,Battle_Manual100,Field Manual 100%,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_EXPBOOST,1800000,100; },{},{}
-14534,Small_Life_Potion,Small Life Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 320; sc_start4 SC_S_LIFEPOTION,600000,-5,5,0,0; },{},{}
-14535,Med_Life_Potion,Medium Life Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 320; sc_start4 SC_L_LIFEPOTION,600000,-7,4,0,0; },{},{}
-14536,Abrasive,Abrasive,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 182; sc_start SC_INCCRI,300000,30; },{},{}
-14537,Regeneration_Potion,Regeneration Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 348; sc_start SC_INCHEALRATE,1800000,20; },{},{}
+14534,Small_Life_Potion,Small Life Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_HEAL3; sc_start4 SC_S_LIFEPOTION,600000,-5,5,0,0; },{},{}
+14535,Med_Life_Potion,Medium Life Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_HEAL3; sc_start4 SC_L_LIFEPOTION,600000,-7,4,0,0; },{},{}
+14536,Abrasive,Abrasive,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_MAGICALATTHIT; sc_start SC_INCCRI,300000,30; },{},{}
+14537,Regeneration_Potion,Regeneration Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_LIGHTSPHERE; sc_start SC_INCHEALRATE,1800000,20; },{},{}
 14538,Glass_Of_Illusion,Glass of Illusion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_STEAL; sc_start SC_INCFLEE2,60000,20; },{},{}
 14539,Shadow_Armor_S,Shadow Armor Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_CLOAKING; sc_start4 SC_ELEMENTALCHANGE,1800000,1,Ele_Dark,1,0; },{},{}
-14540,Holy_Armor_S,Holy Armor Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 91; sc_start4 SC_ELEMENTALCHANGE,1800000,1,Ele_Holy,1,0; },{},{}
+14540,Holy_Armor_S,Holy Armor Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_BENEDICTIO; sc_start4 SC_ELEMENTALCHANGE,1800000,1,Ele_Holy,1,0; },{},{}
 14541,S_Def_Potion,Small Defense Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_GUARD; sc_start SC_DEF_RATE,60000,3; },{},{}
 14542,B_Def_Potion,Big Defense Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_GUARD; sc_start SC_DEF_RATE,180000,3; },{},{}
 14543,S_Mdef_Potion,Small Magic Defense Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_SPELLBREAKER; sc_start SC_MDEF_RATE,60000,3; },{},{}
@@ -6531,10 +6531,10 @@
 //16590,Thoughtful_Hat_Box
 16677,Universal_Catalog_Gold_Box10,Universal Catalog Gold 10 Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12581,10; },{},{}
 16678,Universal_Catalog_Gold_Box50,Universal Catalog Gold 50 Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12581,50; },{},{}
-16679,Universal_Catalog_Gold_Box10,Universal Catalog Gold 10 Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12581,10; },{},{}
-16680,Universal_Catalog_Gold_Box50,Universal Catalog Gold 50 Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12581,50; },{},{}
-16776,Universal_Catalog_Gold_Box10,Universal Catalog Gold 10 Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12581,10; },{},{}
-16777,Universal_Catalog_Gold_Box50,Universal Catalog Gold 50 Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12581,50; },{},{}
+16679,Universal_Catalog_Gold_Box10_,Universal Catalog Gold 10 Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12581,10; },{},{}
+16680,Universal_Catalog_Gold_Box50_,Universal Catalog Gold 50 Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12581,50; },{},{}
+16776,Universal_Catalog_Gold_Box10__,Universal Catalog Gold 10 Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12581,10; },{},{}
+16777,Universal_Catalog_Gold_Box50__,Universal Catalog Gold 50 Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12581,50; },{},{}
 //
 17104,HD_Oridecon_50Box,HD Oridecon 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6240,50; },{},{}
 17105,HD_Elunium_50Box,HD Elunium 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6241,50; },{},{}
@@ -6561,7 +6561,7 @@
 //
 18595,Horn_Of_Ancient,Horn of Ancient,4,40,,200,,8,,1,0xFFFFFFFF,7,2,256,,50,1,757,{ autobonus "{ bonus bBaseAtk,100; }",5,10000,0,"{ specialeffect2 EF_POTION_BERSERK; }"; },{},{}
 18596,Sprout_Hat,Sprout Hat,4,20,,200,,4,,0,0xFFFFFFFF,7,2,256,,70,1,758,{ skill "WZ_HEAVENDRIVE",3; },{},{}
-18597,Mercury_Riser,Mercury Riser,4,40,,200,,10,,1,0xFFFFFFFF,7,2,256,,0,,759,{ bonus bAspdRate,3; bonus bCritical,3; if(getrefine() >= 7) { bonus bAspdRate,2; bonus bCritical,2; } if(getrefine() >= 9) { bonus bAspdRate,2; bonus bCritical,2; }},{},{}
+18597,Mercury_Riser,Mercury Riser,4,40,,200,,10,,1,0xFFFFFFFF,7,2,256,,0,1,759,{ bonus bAspdRate,3; bonus bCritical,3; if(getrefine() >= 7) { bonus bAspdRate,2; bonus bCritical,2; } if(getrefine() >= 9) { bonus bAspdRate,2; bonus bCritical,2; }},{},{}
 //
 18600,Cat_Ear_Beret,Cat Ear Beret,4,20,,100,,5,,0,0xFFFFFFFF,7,2,256,,0,1,761,{ bonus bAtkRate,5; if(getrefine() > 5 && getrefine() <= 12) { bonus2 bAddRace,RC_DemiHuman,(getrefine() - 5); bonus2 bSubRace,RC_DemiHuman,(getrefine() - 5); bonus2 bAddRace,RC_Player,(getrefine() - 5); bonus2 bSubRace,RC_Player,(getrefine() - 5); } if(getrefine() > 12) { bonus2 bAddRace,RC_DemiHuman,7; bonus2 bAddRace,RC_Player,7; bonus2 bSubRace,RC_DemiHuman,7; bonus2 bSubRace,RC_Player,7; } },{},{}
 //

db/pre-re/item_delay.txt

@@ -10,39 +10,44 @@
 // <SC_GroupID>
 //     SC (status change) group for the item.
 //     Example for SC_REUSE_LIMIT_MTF
-//         12658,10000,620 // Transformation Scroll(Deviruchi)
-//         12659,10000,620 // Transformation Scroll(Raydric)
+//         12658,10000,SC_REUSE_LIMIT_MTF // Transformation Scroll(Deviruchi)
+//         12659,10000,SC_REUSE_LIMIT_MTF // Transformation Scroll(Raydric)
 //     -> 12658 has reuse delay for 10 seconds, and also,
 //        12659 cannot be used when this delay is active.
 //     Since this is optional, default is -1 will ignores the
 //     delay group and the delay will be stored in character's
 //     data that has limit set in src/map/itemdb.h as MAX_ITEMDELAYS.
 
-// SC_REUSE_LIMIT_A 609
-14538,300000,608	//Glass_Of_Illusion
+// SC_REUSE_LIMIT_A
+14538,300000,SC_REUSE_LIMIT_A	//Glass_Of_Illusion
 
-// SC_REUSE_LIMIT_B 610
-14586,180000,609	//Spark_Candy
+// SC_REUSE_LIMIT_B
+14586,180000,SC_REUSE_LIMIT_B	//Spark_Candy
 
-// SC_REUSE_LIMIT_C 611
-12208,60000,610	//Battle_Manual
+// SC_REUSE_LIMIT_C
+12208,60000,SC_REUSE_LIMIT_C	//Battle_Manual
 
-// SC_REUSE_LIMIT_D 612
-12210,60000,611	//Bubble_Gum
+// SC_REUSE_LIMIT_D
+12210,60000,SC_REUSE_LIMIT_D	//Bubble_Gum
 
-// SC_REUSE_LIMIT_E 613
-11522,1000,612	//Red_Raffle_Sap
-11523,2000,612	//Yellow_Raffle_Sap
-11524,3000,612	//White_Raffle_Sap
+// SC_REUSE_LIMIT_E
+11522,1000,SC_REUSE_LIMIT_E	//Red_Raffle_Sap
+11523,2000,SC_REUSE_LIMIT_E	//Yellow_Raffle_Sap
+11524,3000,SC_REUSE_LIMIT_E	//White_Raffle_Sap
 
-// SC_REUSE_LIMIT_F 614
-607,5000,613	//Yggdrasil_Berry
+// SC_REUSE_LIMIT_F
+607,5000,SC_REUSE_LIMIT_F	//Yggdrasil_Berry
 
-// SC_REUSE_LIMIT_G 615
-608,3000,614	//Yggdrasil_Seed
+// SC_REUSE_LIMIT_G
+608,3000,SC_REUSE_LIMIT_G	//Yggdrasil_Seed
 
-// SC_REUSE_LIMIT_H 616
-11525,5000,615	//Mora_Hip_Tea
+// SC_REUSE_LIMIT_H
+11525,5000,SC_REUSE_LIMIT_H	//Mora_Hip_Tea
+
+// SC_REUSE_LIMIT_RECALL
+12968,300000,SC_REUSE_LIMIT_RECALL	//Emergency_Scroll1
+12969,300000,SC_REUSE_LIMIT_RECALL	//Emergency_Scroll2
+12970,300000,SC_REUSE_LIMIT_RECALL	//Emergency_Scroll3
 
 // Misc
 //12202,60000	//Str_Dish10_
@@ -51,6 +56,3 @@
 //12205,60000	//Dex_Dish10_
 //12206,60000	//Luk_Dish10_
 //12207,60000	//Vit_Dish10_
-12968,300000	//Emergency_Scroll1 //! CHECKME: Need confirmation!
-12969,300000	//Emergency_Scroll2 //! CHECKME: Need confirmation!
-12970,300000	//Emergency_Scroll3 //! CHECKME: Need confirmation!

db/pre-re/item_group_db.txt

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

db/pre-re/item_misc.txt

@@ -310,7 +310,7 @@ IG_Jewel,725,10	// Red_Jewel
 IG_Jewel,726,10	// Blue_Jewel
 IG_Jewel,727,10	// White_Jewel
 IG_Jewel,728,10	// Golden_Jewel
-IG_Jewel,729,10	// Bluish_Green_Jewel 
+IG_Jewel,729,10	// Bluish_Green_Jewel
 IG_Jewel,730,5	// Crystal_Jewel
 IG_Jewel,731,4	// Crystal_Jewel_
 IG_Jewel,732,3	// Crystal_Jewel__

db/pre-re/item_noequip.txt

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

db/pre-re/item_randomopt_db.txt

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

db/pre-re/item_trade.txt

@@ -197,7 +197,7 @@
 7603,499,100	// RO Party Invitation Ticket
 5201,499,100	// Party Hat
 
-// 2006 Indonesia Honor Ring item 
+// 2006 Indonesia Honor Ring item
 2674,507,100	// Ring of Honor
 
 // 2006 Korean Harvest Moon Day Event item

db/pre-re/job_basehpsp_db.txt

@@ -13,16 +13,16 @@
 //===============================
 
 //Novice, Novice High, Baby Novice
-1,500,0:4001:4023,0,40,45,50,55,60,65,70,75,80,85,90,95,100,105,110,115,120,125,130,135,140,145,150,155,160,165,170,175,180,185,190,195,200,205,210,215,220,225,230,235,240,245,250,255,260,265,270,275,280,285,290,295,300,305,310,315,320,325,330,335,340,345,350,355,360,365,370,375,380,385,390,395,400,405,410,415,420,425,430,435,440,445,450,455,460,465,470,475,480,485,490,495,500,505,510,515,520,525,530,535,540,545,550,555,560,565,570,575,580,585,590,595,600,605,610,615,620,625,630,635,640,645,650,655,660,665,670,675,680,685,690,695,700,705,710,715,720,725,730,735,740,745,750,755,760,765,770,775,780,2785,2790,2795,2800,2805,2810,2815,2820,2825,2830,2835,2840,2845,2850,2855,2860,2865,2870,2875,2880,2885,2890,2895,2900,2905,2910,2915,2920,2925,2930,2935,2940,2945,2950,2955,2960,2965,2970,2975,2980,2985,2990,2995,3000,3005,3010,3015,3020,3025,3030,3035,3040,3045,3050,3055,3060,3065,3070,3075,3080,3085,3090,3095,3100,3105,3110,3115,3120,3125,3130,3135,3140,3145,3150,3155,3160,3165,3170,3175,3180,3185,3190,3195,3200,3205,3210,3215,3220,3225,3230,3235,3240,3245,3250,3255,3260,3265,3270,3275,3280,3285,3290,3295,3300,3305,3310,3315,3320,3325,3330,3335,3340,3345,3350,3355,3360,3365,3370,3375,3380,3385,3390,3395,3400,3405,3410,3415,3420,3425,3430,3435,3440,3445,3450,3455,3460,3465,3470,3475,3480,3485,3490,3495,3500,3505,3510,3515,3520,3525,3530,3535,3540,3545,3550,3555,3560,3565,3570,3575,3580,3585,3590,3595,3600,3605,3610,3615,3620,3625,3630,3635,3640,3645,3650,3655,3660,3665,3670,3675,3680,3685,3690,3695,3700,3705,3710,3715,3720,3725,3730,3735,3740,3745,3750,3755,3760,3765,3770,3775,3780,3785,3790,3795,3800,3805,3810,3815,3820,3825,3830,3835,3840,3845,3850,3855,3860,3865,3870,3875,3880,3885,3890,3895,3900,3905,3910,3915,3920,3925,3930,3935,3940,3945,3950,3955,3960,3965,3970,3975,3980,3985,3990,3995,4000,4005,4010,4015,4020,4025,4030,4035,4040,4045,4050,4055,4060,4065,4070,4075,4080,4085,4090,4095,4100,4105,4110,4115,4120,4125,4130,4135,4140,4145,4150,4155,4160,4165,4170,4175,4180,4185,4190,4195,4200,4205,4210,4215,4220,4225,4230,4235,4240,4245,4250,4255,4260,4265,4270,4275,4280,4285,4290,4295,4300,4305,4310,4315,4320,4325,4330,4335,4340,4345,4350,4355,4360,4365,4370,4375,4380,4385,4390,4395,4400,4405,4410,4415,4420,4425,4430,4435,4440,4445,4450,4455,4460,4465,4470,4475,4480,4485,4490,4495,4500,4505,4510,4515,4520,4525,4530,4535
+1,500,0:4001:4023,0,40,45,50,55,60,65,70,75,80,85,90,95,100,105,110,115,120,125,130,135,140,145,150,155,160,165,170,175,180,185,190,195,200,205,210,215,220,225,230,235,240,245,250,255,260,265,270,275,280,285,290,295,300,305,310,315,320,325,330,335,340,345,350,355,360,365,370,375,380,385,390,395,400,405,410,415,420,425,430,435,440,445,450,455,460,465,470,475,480,485,490,495,500,505,510,515,520,525,530,535,540,545,550,555,560,565,570,575,580,585,590,595,600,605,610,615,620,625,630,635,640,645,650,655,660,665,670,675,680,685,690,695,700,705,710,715,720,725,730,735,740,745,750,755,760,765,770,775,780,785,790,795,800,805,810,815,820,825,830,835,840,845,850,855,860,865,870,875,880,885,890,895,900,905,910,915,920,925,930,935,940,945,950,955,960,965,970,975,980,985,990,995,1000,1005,1010,1015,1020,1025,1030,1035,1040,1045,1050,1055,1060,1065,1070,1075,1080,1085,1090,1095,1100,1105,1110,1115,1120,1125,1130,1135,1140,1145,1150,1155,1160,1165,1170,1175,1180,1185,1190,1195,1200,1205,1210,1215,1220,1225,1230,1235,1240,1245,1250,1255,1260,1265,1270,1275,1280,1285,1290,1295,1300,1305,1310,1315,1320,1325,1330,1335,1340,1345,1350,1355,1360,1365,1370,1375,1380,1385,1390,1395,1400,1405,1410,1415,1420,1425,1430,1435,1440,1445,1450,1455,1460,1465,1470,1475,1480,1485,1490,1495,1500,1505,1510,1515,1520,1525,1530,1535,1540,1545,1550,1555,1560,1565,1570,1575,1580,1585,1590,1595,1600,1605,1610,1615,1620,1625,1630,1635,1640,1645,1650,1655,1660,1665,1670,1675,1680,1685,1690,1695,1700,1705,1710,1715,1720,1725,1730,1735,1740,1745,1750,1755,1760,1765,1770,1775,1780,1785,1790,1795,1800,1805,1810,1815,1820,1825,1830,1835,1840,1845,1850,1855,1860,1865,1870,1875,1880,1885,1890,1895,1900,1905,1910,1915,1920,1925,1930,1935,1940,1945,1950,1955,1960,1965,1970,1975,1980,1985,1990,1995,2000,2005,2010,2015,2020,2025,2030,2035,2040,2045,2050,2055,2060,2065,2070,2075,2080,2085,2090,2095,2100,2105,2110,2115,2120,2125,2130,2135,2140,2145,2150,2155,2160,2165,2170,2175,2180,2185,2190,2195,2200,2205,2210,2215,2220,2225,2230,2235,2240,2245,2250,2255,2260,2265,2270,2275,2280,2285,2290,2295,2300,2305,2310,2315,2320,2325,2330,2335,2340,2345,2350,2355,2360,2365,2370,2375,2380,2385,2390,2395,2400,2405,2410,2415,2420,2425,2430,2435,2440,2445,2450,2455,2460,2465,2470,2475,2480,2485,2490,2495,2500,2505,2510,2515,2520,2525,2530,2535
 
 //Super Novice, Super Baby, Super Novice (Expanded), Super Baby (Expanded)
-1,500,23:4045:4190:4191,0,40,45,50,55,60,65,70,75,80,85,90,95,100,105,110,115,120,125,130,135,140,145,150,155,160,165,170,175,180,185,190,195,200,205,210,215,220,225,230,235,240,245,250,255,260,265,270,275,280,285,290,295,300,305,310,315,320,325,330,335,340,345,350,355,360,365,370,375,380,385,390,395,400,405,410,415,420,425,430,435,440,445,450,455,460,465,470,475,480,485,490,495,500,505,510,515,520,525,2530,2535,2540,2545,2550,2555,2560,2565,2570,2575,2580,2585,2590,2595,2600,2605,2610,2615,2620,2625,2630,2635,2640,2645,2650,2655,2660,2665,2670,2675,2680,2685,2690,2695,2700,2705,2710,2715,2720,2725,2730,2735,2740,2745,2750,2755,2760,2765,2770,2775,2780,2785,2790,2795,2800,2805,2810,2815,2820,2825,2830,2835,2840,2845,2850,2855,2860,2865,2870,2875,2880,2885,2890,2895,2900,2905,2910,2915,2920,2925,2930,2935,2940,2945,2950,2955,2960,2965,2970,2975,2980,2985,2990,2995,3000,3005,3010,3015,3020,3025,3030,3035,3040,3045,3050,3055,3060,3065,3070,3075,3080,3085,3090,3095,3100,3105,3110,3115,3120,3125,3130,3135,3140,3145,3150,3155,3160,3165,3170,3175,3180,3185,3190,3195,3200,3205,3210,3215,3220,3225,3230,3235,3240,3245,3250,3255,3260,3265,3270,3275,3280,3285,3290,3295,3300,3305,3310,3315,3320,3325,3330,3335,3340,3345,3350,3355,3360,3365,3370,3375,3380,3385,3390,3395,3400,3405,3410,3415,3420,3425,3430,3435,3440,3445,3450,3455,3460,3465,3470,3475,3480,3485,3490,3495,3500,3505,3510,3515,3520,3525,3530,3535,3540,3545,3550,3555,3560,3565,3570,3575,3580,3585,3590,3595,3600,3605,3610,3615,3620,3625,3630,3635,3640,3645,3650,3655,3660,3665,3670,3675,3680,3685,3690,3695,3700,3705,3710,3715,3720,3725,3730,3735,3740,3745,3750,3755,3760,3765,3770,3775,3780,3785,3790,3795,3800,3805,3810,3815,3820,3825,3830,3835,3840,3845,3850,3855,3860,3865,3870,3875,3880,3885,3890,3895,3900,3905,3910,3915,3920,3925,3930,3935,3940,3945,3950,3955,3960,3965,3970,3975,3980,3985,3990,3995,4000,4005,4010,4015,4020,4025,4030,4035,4040,4045,4050,4055,4060,4065,4070,4075,4080,4085,4090,4095,4100,4105,4110,4115,4120,4125,4130,4135,4140,4145,4150,4155,4160,4165,4170,4175,4180,4185,4190,4195,4200,4205,4210,4215,4220,4225,4230,4235,4240,4245,4250,4255,4260,4265,4270,4275,4280,4285,4290,4295,4300,4305,4310,4315,4320,4325,4330,4335,4340,4345,4350,4355,4360,4365,4370,4375,4380,4385,4390,4395,4400,4405,4410,4415,4420,4425,4430,4435,4440,4445,4450,4455,4460,4465,4470,4475,4480,4485,4490,4495,4500,4505,4510,4515,4520,4525,4530,4535
+1,500,23:4045:4190:4191,0,40,45,50,55,60,65,70,75,80,85,90,95,100,105,110,115,120,125,130,135,140,145,150,155,160,165,170,175,180,185,190,195,200,205,210,215,220,225,230,235,240,245,250,255,260,265,270,275,280,285,290,295,300,305,310,315,320,325,330,335,340,345,350,355,360,365,370,375,380,385,390,395,400,405,410,415,420,425,430,435,440,445,450,455,460,465,470,475,480,485,490,495,500,505,510,515,520,525,2530,2535,2540,2545,2550,2555,2560,2565,2570,2575,2580,2585,2590,2595,2600,2605,2610,2615,2620,2625,2630,2635,2640,2645,2650,2655,2660,2665,2670,2675,2680,2685,2690,2695,2700,2705,2710,2715,2720,2725,2730,2735,2740,2745,2750,2755,2760,2765,2770,2775,2780,4785,4790,4795,4800,4805,4810,4815,4820,4825,4830,4835,4840,4845,4850,4855,4860,4865,4870,4875,4880,4885,4890,4895,4900,4905,4910,4915,4920,4925,4930,4935,4940,4945,4950,4955,4960,4965,4970,4975,4980,4985,4990,4995,5000,5005,5010,5015,5020,5025,5030,5035,5040,5045,5050,5055,5060,5065,5070,5075,5080,5085,5090,5095,5100,5105,5110,5115,5120,5125,5130,5135,5140,5145,5150,5155,5160,5165,5170,5175,5180,5185,5190,5195,5200,5205,5210,5215,5220,5225,5230,5235,5240,5245,5250,5255,5260,5265,5270,5275,5280,5285,5290,5295,5300,5305,5310,5315,5320,5325,5330,5335,5340,5345,5350,5355,5360,5365,5370,5375,5380,5385,5390,5395,5400,5405,5410,5415,5420,5425,5430,5435,5440,5445,5450,5455,5460,5465,5470,5475,5480,5485,5490,5495,5500,5505,5510,5515,5520,5525,5530,5535,5540,5545,5550,5555,5560,5565,5570,5575,5580,5585,5590,5595,5600,5605,5610,5615,5620,5625,5630,5635,5640,5645,5650,5655,5660,5665,5670,5675,5680,5685,5690,5695,5700,5705,5710,5715,5720,5725,5730,5735,5740,5745,5750,5755,5760,5765,5770,5775,5780,5785,5790,5795,5800,5805,5810,5815,5820,5825,5830,5835,5840,5845,5850,5855,5860,5865,5870,5875,5880,5885,5890,5895,5900,5905,5910,5915,5920,5925,5930,5935,5940,5945,5950,5955,5960,5965,5970,5975,5980,5985,5990,5995,6000,6005,6010,6015,6020,6025,6030,6035,6040,6045,6050,6055,6060,6065,6070,6075,6080,6085,6090,6095,6100,6105,6110,6115,6120,6125,6130,6135,6140,6145,6150,6155,6160,6165,6170,6175,6180,6185,6190,6195,6200,6205,6210,6215,6220,6225,6230,6235,6240,6245,6250,6255,6260,6265,6270,6275,6280,6285,6290,6295,6300,6305,6310,6315,6320,6325,6330,6335,6340,6345,6350,6355,6360,6365,6370,6375,6380,6385,6390,6395,6400,6405,6410,6415,6420,6425,6430,6435,6440,6445,6450,6455,6460,6465,6470,6475,6480,6485,6490,6495,6500,6505,6510,6515,6520,6525,6530,6535
 
 //Swordman, Swordman High, Baby Swordman
 1,500,1:4002:4024,0,40,46,53,61,70,79,89,100,111,123,136,149,163,178,194,210,227,245,263,282,302,322,343,365,388,411,435,460,485,511,538,565,593,622,652,682,713,745,777,810,844,878,913,949,986,1023,1061,1100,1139,1179,1220,1261,1303,1346,1390,1434,1479,1525,1571,1618,1666,1714,1763,1813,1864,1915,1967,2020,2073,2127,2182,2237,2293,2350,2408,2466,2525,2585,2645,2706,2768,2830,2893,2957,3022,3087,3153,3220,3287,3355,3424,3493,3563,3634,3706,3778,3851,3925,3999,4073,4147,4221,4295,4369,4443,4517,4591,4665,4739,4813,4887,4961,5035,5109,5183,5257,5331,5405,5479,5553,5627,5701,5775,5849,5923,5997,6071,6145,6219,6293,6367,6441,6515,6589,6663,6737,6811,6885,6959,7033,7107,7181,7255,7329,7403,7477,7551,7625,7699,7773,7847,7921,7995,8069,8143,8217,8291,8365,8439,8513,8587,8661,8735,8809,8883,8957,9031,9105,9179,9253,9327,9401,9475,9549,9623,9697,9771,9845,9919,9993,10067,10141,10215,10289,10363,10437,10511,10585,10659,10733,10807,10881,10955,11029,11103,11177,11251,11325,11399,11473,11547,11621,11695,11769,11843,11917,11991,12065,12139,12213,12287,12361,12435,12509,12583,12657,12731,12805,12879,12953,13027,13101,13175,13249,13323,13397,13471,13545,13619,13693,13767,13841,13915,13989,14063,14137,14211,14285,14359,14433,14507,14581,14655,14729,14803,14877,14951,15025,15099,15173,15247,15321,15395,15469,15543,15617,15691,15765,15839,15913,15987,16061,16135,16209,16283,16357,16431,16505,16579,16653,16727,16801,16875,16949,17023,17097,17171,17245,17319,17393,17467,17541,17615,17689,17763,17837,17911,17985,18059,18133,18207,18281,18355,18429,18503,18577,18651,18725,18799,18873,18947,19021,19095,19169,19243,19317,19391,19465,19539,19613,19687,19761,19835,19909,19983,20057,20131,20205,20279,20353,20427,20501,20575,20649,20723,20797,20871,20945,21019,21093,21167,21241,21315,21389,21463,21537,21611,21685,21759,21833,21907,21981,22055,22129,22203,22277,22351,22425,22499,22573,22647,22721,22795,22869,22943,23017,23091,23165,23239,23313,23387,23461,23535,23609,23683,23757,23831,23905,23979,24053,24127,24201,24275,24349,24423,24497,24571,24645,24719,24793,24867,24941,25015,25089,25163,25237,25311,25385,25459,25533,25607,25681,25755,25829,25903,25977,26051,26125,26199,26273,26347,26421,26495,26569,26643,26717,26791,26865,26939,27013,27087,27161,27235,27309,27383,27457,27531,27605,27679,27753,27827,27901,27975,28049,28123,28197,28271,28345,28419,28493,28567,28641,28715,28789,28863,28937,29011,29085,29159,29233,29307,29381,29455,29529,29603,29677,29751,29825,29899,29973,30047,30121,30195,30269,30343,30417,30491,30565,30639,30713,30787,30861,30935,31009,31083,31157,31231,31305,31379,31453,31527,31601,31675,31749,31823,31897,31971,32045,32119,32193,32267,32341,32415,32489,32563,32637,32711,32785,32859,32933,33007,33081,33155,33229,33303,33377,33451,33525,33599,33673
 
 //Magician, Magician High, Baby Magician
-1,500,2:4003:4025,0,40,46,52,58,65,72,79,86,94,102,110,119,128,137,147,157,167,177,188,199,210,222,234,246,259,272,285,298,312,326,340,355,370,385,401,417,433,449,466,483,500,518,536,554,573,592,611,630,650,670,690,711,732,753,775,797,819,841,864,887,910,934,958,982,1007,1032,1057,1082,1108,1134,1160,1187,1214,1241,1269,1297,1325,1353,1382,1411,1440,1470,1500,1530,1561,1592,1623,1654,1686,1718,1750,1783,1816,1849,1883,1917,1951,1985,2020,2054,2089,2123,2158,2192,2227,2261,2296,2330,2365,2399,2434,2468,2503,2537,2572,2606,2641,2675,2710,2744,2779,2813,2848,2882,2917,2951,2986,3020,3055,3089,3124,3158,3193,3227,3262,3296,3331,3365,3400,3434,3469,3503,3538,3572,3607,3641,3676,3710,3745,3779,3814,3848,3883,3917,3952,3986,4021,4055,4090,4124,4159,4193,4228,4262,4297,4331,4366,4400,4435,4469,4504,4538,4573,4607,4642,4676,4711,4745,4780,4814,4849,4883,4918,4952,4987,5021,5056,5090,5125,5159,5194,5228,5263,5297,5332,5366,5401,5435,5470,5504,5539,5573,5608,5642,5677,5711,5746,5780,5815,5849,5884,5918,5953,5987,6022,6056,6091,6125,6160,6194,6229,6263,6298,6332,6367,6401,6436,6470,6505,6539,6574,6608,6643,6677,6712,6746,6781,6815,6850,6884,6919,6953,6988,7022,7057,7091,7126,7160,7195,7229,7264,7298,7333,7367,7402,7436,7471,7505,7540,7574,7609,7643,7678,7712,7747,7781,7816,7850,7885,7919,7954,7988,8023,8057,8092,8126,8161,8195,8230,8264,8299,8333,8368,8402,8437,8471,8506,8540,8575,8609,8644,8678,8713,8747,8782,8816,8851,8885,8920,8954,8989,9023,9058,9092,9127,9161,9196,9230,9265,9299,9334,9368,9403,9437,9472,9506,9541,9575,9610,9644,9679,9713,9748,9782,9817,9851,9886,9920,9955,9989,10024,10058,10093,10127,10162,10196,10231,10265,10300,10334,10369,10403,10438,10472,10507,10541,10576,10610,10645,10679,10714,10748,10783,10817,10852,10886,10921,10955,10990,11024,11059,11093,11128,11162,11197,11231,11266,11300,11335,11369,11404,11438,11473,11507,11542,11576,11611,11645,11680,11714,11749,11783,11818,11852,11887,11921,11956,11990,12025,12059,12094,12128,12163,12197,12232,12266,12301,12335,12370,12404,12439,12473,12508,12542,12577,12611,12646,12680,12715,12749,12784,12818,12853,12887,12922,12956,12991,13025,13060,13094,13129,13163,13198,13232,13267,13301,13336,13370,13405,13439,13474,13508,13543,13577,13612,13646,13681,13715,13750,13784,13819,13853,13888,13922,13957,13991,14026,14060,14095,14129,14164,14198,14233,14267,14302,14336,14371,14405,14440,14474,14509,14543,14578,14612,14647,14681,14716,14750,14785,14819,14854,14888,14923,14957,14992,15026,15061,15095,15130,15164,15199,15233,15268,15302,15337,15371,15406,15440,15475,15509,15544,15578,15613,15647,15682,15716,15751,15785,15820,15854
+1,500,2:4003:4025,0,40,46,52,58,65,72,79,86,94,102,110,119,128,137,147,157,167,177,188,199,210,222,234,246,259,272,285,298,312,326,340,355,370,385,401,417,433,449,466,483,500,518,536,554,573,592,611,630,650,670,690,711,732,753,775,797,819,841,864,887,910,934,958,982,1007,1032,1057,1082,1108,1134,1160,1187,1214,1241,1269,1297,1325,1353,1382,1411,1440,1470,1500,1530,1561,1592,1623,1654,1686,1718,1750,1783,1816,1849,1883,1917,1951,1985,2020,2054,2089,2123,2158,2192,2227,2261,2296,2330,2365,2399,2434,2468,2503,2537,2572,2606,2641,2675,2710,2744,2779,2813,2848,2882,2917,2951,2986,3020,3055,3089,3124,3158,3193,3227,3262,3296,3331,3365,3400,3434,3469,3503,3538,3572,3607,3641,3676,3710,3745,3779,3814,3849,3884,3919,3954,3989,4024,4059,4094,4129,4164,4199,4234,4269,4304,4339,4374,4409,4444,4479,4514,4549,4584,4619,4654,4689,4724,4759,4794,4829,4864,4899,4934,4969,5004,5039,5074,5109,5144,5179,5214,5249,5284,5319,5354,5389,5424,5459,5494,5529,5564,5599,5634,5669,5704,5739,5774,5809,5844,5879,5914,5949,5984,6019,6054,6089,6124,6159,6194,6229,6264,6299,6334,6369,6404,6439,6474,6509,6544,6579,6614,6649,6684,6719,6754,6789,6824,6859,6894,6929,6964,6999,7034,7069,7104,7139,7174,7209,7244,7279,7314,7349,7384,7419,7454,7489,7524,7559,7594,7629,7664,7699,7734,7769,7804,7839,7874,7909,7944,7979,8014,8049,8084,8119,8154,8189,8224,8259,8294,8329,8364,8399,8434,8469,8504,8539,8574,8609,8644,8679,8714,8749,8784,8819,8854,8889,8924,8959,8994,9029,9064,9099,9134,9169,9204,9239,9274,9309,9344,9379,9414,9449,9484,9519,9554,9589,9624,9659,9694,9729,9764,9799,9834,9869,9904,9939,9974,10009,10044,10079,10114,10149,10184,10219,10254,10289,10324,10359,10394,10429,10464,10499,10534,10569,10604,10639,10674,10709,10744,10779,10814,10849,10884,10919,10954,10989,11024,11059,11094,11129,11164,11199,11234,11269,11304,11339,11374,11409,11444,11479,11514,11549,11584,11619,11654,11689,11724,11759,11794,11829,11864,11899,11934,11969,12004,12039,12074,12109,12144,12179,12214,12249,12284,12319,12354,12389,12424,12459,12494,12529,12564,12599,12634,12669,12704,12739,12774,12809,12844,12879,12914,12949,12984,13019,13054,13089,13124,13159,13194,13229,13264,13299,13334,13369,13404,13439,13474,13509,13544,13579,13614,13649,13684,13719,13754,13789,13824,13859,13894,13929,13964,13999,14034,14069,14104,14139,14174,14209,14244,14279,14314,14349,14384,14419,14454,14489,14524,14559,14594,14629,14664,14699,14734,14769,14804,14839,14874,14909,14944,14979,15014,15049,15084,15119,15154,15189,15224,15259,15294,15329,15364,15399,15434,15469,15504,15539,15574,15609,15644,15679,15714,15749,15784,15819,15854,15889,15924,15959,15994,16029
 
 //Archer, Archer High, Baby Archer
 1,500,3:4004:4026,0,40,46,53,60,68,76,85,94,104,114,125,136,148,160,173,186,200,214,229,244,260,276,293,310,328,346,365,384,404,424,445,466,488,510,533,556,580,604,629,654,680,706,733,760,788,816,845,874,904,934,965,996,1028,1060,1093,1126,1160,1194,1229,1264,1300,1336,1373,1410,1448,1486,1525,1564,1604,1644,1685,1726,1768,1810,1853,1896,1940,1984,2029,2074,2120,2166,2213,2260,2308,2356,2405,2454,2504,2554,2605,2656,2708,2760,2813,2866,2920,2974,3029,3083,3138,3192,3247,3301,3356,3410,3465,3519,3574,3628,3683,3737,3792,3846,3901,3955,4010,4064,4119,4173,4228,4282,4337,4391,4446,4500,4555,4609,4664,4718,4773,4827,4882,4936,4991,5045,5100,5154,5209,5263,5318,5372,5427,5481,5536,5590,5645,5699,5754,5808,5863,5917,5972,6026,6081,6135,6190,6244,6299,6353,6408,6462,6517,6571,6626,6680,6735,6789,6844,6898,6953,7007,7062,7116,7171,7225,7280,7334,7389,7443,7498,7552,7607,7661,7716,7770,7825,7879,7934,7988,8043,8097,8152,8206,8261,8315,8370,8424,8479,8533,8588,8642,8697,8751,8806,8860,8915,8969,9024,9078,9133,9187,9242,9296,9351,9405,9460,9514,9569,9623,9678,9732,9787,9841,9896,9950,10005,10059,10114,10168,10223,10277,10332,10386,10441,10495,10550,10604,10659,10713,10768,10822,10877,10931,10986,11040,11095,11149,11204,11258,11313,11367,11422,11476,11531,11585,11640,11694,11749,11803,11858,11912,11967,12021,12076,12130,12185,12239,12294,12348,12403,12457,12512,12566,12621,12675,12730,12784,12839,12893,12948,13002,13057,13111,13166,13220,13275,13329,13384,13438,13493,13547,13602,13656,13711,13765,13820,13874,13929,13983,14038,14092,14147,14201,14256,14310,14365,14419,14474,14528,14583,14637,14692,14746,14801,14855,14910,14964,15019,15073,15128,15182,15237,15291,15346,15400,15455,15509,15564,15618,15673,15727,15782,15836,15891,15945,16000,16054,16109,16163,16218,16272,16327,16381,16436,16490,16545,16599,16654,16708,16763,16817,16872,16926,16981,17035,17090,17144,17199,17253,17308,17362,17417,17471,17526,17580,17635,17689,17744,17798,17853,17907,17962,18016,18071,18125,18180,18234,18289,18343,18398,18452,18507,18561,18616,18670,18725,18779,18834,18888,18943,18997,19052,19106,19161,19215,19270,19324,19379,19433,19488,19542,19597,19651,19706,19760,19815,19869,19924,19978,20033,20087,20142,20196,20251,20305,20360,20414,20469,20523,20578,20632,20687,20741,20796,20850,20905,20959,21014,21068,21123,21177,21232,21286,21341,21395,21450,21504,21559,21613,21668,21722,21777,21831,21886,21940,21995,22049,22104,22158,22213,22267,22322,22376,22431,22485,22540,22594,22649,22703,22758,22812,22867,22921,22976,23030,23085,23139,23194,23248,23303,23357,23412,23466,23521,23575,23630,23684,23739,23793,23848,23902,23957,24011,24066,24120,24175,24229,24284,24338,24393,24447,24502,24556,24611,24665,24720,24774,24829,24883
@@ -31,7 +31,7 @@
 1,500,4:4005:4027,0,40,46,52,59,66,73,81,89,98,107,116,126,136,147,158,169,181,193,206,219,232,246,260,275,290,305,321,337,354,371,388,406,424,443,462,481,501,521,542,563,584,606,628,651,674,697,721,745,770,795,820,846,872,899,926,953,981,1009,1038,1067,1096,1126,1156,1187,1218,1249,1281,1313,1346,1379,1412,1446,1480,1515,1550,1585,1621,1657,1694,1731,1768,1806,1844,1883,1922,1961,2001,2041,2082,2123,2164,2206,2248,2291,2334,2377,2421,2465,2510,2554,2599,2643,2688,2732,2777,2821,2866,2910,2955,2999,3044,3088,3133,3177,3222,3266,3311,3355,3400,3444,3489,3533,3578,3622,3667,3711,3756,3800,3845,3889,3934,3978,4023,4067,4112,4156,4201,4245,4290,4334,4379,4423,4468,4512,4557,4601,4646,4690,4735,4779,4824,4868,4913,4957,5002,5046,5091,5135,5180,5224,5269,5313,5358,5402,5447,5491,5536,5580,5625,5669,5714,5758,5803,5847,5892,5936,5981,6025,6070,6114,6159,6203,6248,6292,6337,6381,6426,6470,6515,6559,6604,6648,6693,6737,6782,6826,6871,6915,6960,7004,7049,7093,7138,7182,7227,7271,7316,7360,7405,7449,7494,7538,7583,7627,7672,7716,7761,7805,7850,7894,7939,7983,8028,8072,8117,8161,8206,8250,8295,8339,8384,8428,8473,8517,8562,8606,8651,8695,8740,8784,8829,8873,8918,8962,9007,9051,9096,9140,9185,9229,9274,9318,9363,9407,9452,9496,9541,9585,9630,9674,9719,9763,9808,9852,9897,9941,9986,10030,10075,10119,10164,10208,10253,10297,10342,10386,10431,10475,10520,10564,10609,10653,10698,10742,10787,10831,10876,10920,10965,11009,11054,11098,11143,11187,11232,11276,11321,11365,11410,11454,11499,11543,11588,11632,11677,11721,11766,11810,11855,11899,11944,11988,12033,12077,12122,12166,12211,12255,12300,12344,12389,12433,12478,12522,12567,12611,12656,12700,12745,12789,12834,12878,12923,12967,13012,13056,13101,13145,13190,13234,13279,13323,13368,13412,13457,13501,13546,13590,13635,13679,13724,13768,13813,13857,13902,13946,13991,14035,14080,14124,14169,14213,14258,14302,14347,14391,14436,14480,14525,14569,14614,14658,14703,14747,14792,14836,14881,14925,14970,15014,15059,15103,15148,15192,15237,15281,15326,15370,15415,15459,15504,15548,15593,15637,15682,15726,15771,15815,15860,15904,15949,15993,16038,16082,16127,16171,16216,16260,16305,16349,16394,16438,16483,16527,16572,16616,16661,16705,16750,16794,16839,16883,16928,16972,17017,17061,17106,17150,17195,17239,17284,17328,17373,17417,17462,17506,17551,17595,17640,17684,17729,17773,17818,17862,17907,17951,17996,18040,18085,18129,18174,18218,18263,18307,18352,18396,18441,18485,18530,18574,18619,18663,18708,18752,18797,18841,18886,18930,18975,19019,19064,19108,19153,19197,19242,19286,19331,19375,19420,19464,19509,19553,19598,19642,19687,19731,19776,19820,19865,19909,19954,19998,20043,20087,20132,20176,20221,20265,20310,20354
 
 //Merchant, Merchant High, Baby Merchant
-1,500,5:4006:4028,0,40,46,52,59,66,73,81,89,98,107,116,126,136,147,158,169,181,193,206,219,232,246,260,275,290,305,321,337,354,371,388,406,424,443,462,481,501,521,542,563,584,606,628,651,674,697,721,745,770,795,820,846,872,899,926,953,981,1009,1038,1067,1096,1126,1156,1187,1218,1249,1281,1313,1346,1379,1412,1446,1480,1515,1550,1585,1621,1657,1694,1731,1768,1806,1844,1883,1922,1961,2001,2041,2082,2123,2164,2206,2248,2291,2334,2377,2421,2465,2510,2554,2599,2643,2688,2732,2777,2821,2866,2910,2955,2999,3044,3088,3133,3177,3222,3266,3311,3355,3400,3444,3489,3533,3578,3622,3667,3711,3756,3800,3845,3889,3934,3978,4023,4067,4112,4156,4201,4245,4290,4334,4379,4423,4468,4512,4557,4601,4646,4690,4735,4779,4824,4868,4913,4957,5002,5046,5091,5135,5180,5224,5269,5313,5358,5402,5447,5491,5536,5580,5625,5669,5714,5758,5803,5847,5892,5936,5981,6025,6070,6114,6159,6203,6248,6292,6337,6381,6426,6470,6515,6559,6604,6648,6693,6737,6782,6826,6871,6915,6960,7004,7049,7093,7138,7182,7227,7271,7316,7360,7405,7449,7494,7538,7583,7627,7672,7716,7761,7805,7850,7894,7939,7983,8028,8072,8117,8161,8206,8250,8295,8339,8384,8428,8473,8517,8562,8606,8651,8695,8740,8784,8829,8873,8918,8962,9007,9051,9096,9140,9185,9229,9274,9318,9363,9407,9452,9496,9541,9585,9630,9674,9719,9763,9808,9852,9897,9941,9986,10030,10075,10119,10164,10208,10253,10297,10342,10386,10431,10475,10520,10564,10609,10653,10698,10742,10787,10831,10876,10920,10965,11009,11054,11098,11143,11187,11232,11276,11321,11365,11410,11454,11499,11543,11588,11632,11677,11721,11766,11810,11855,11899,11944,11988,12033,12077,12122,12166,12211,12255,12300,12344,12389,12433,12478,12522,12567,12611,12656,12700,12745,12789,12834,12878,12923,12967,13012,13056,13101,13145,13190,13234,13279,13323,13368,13412,13457,13501,13546,13590,13635,13679,13724,13768,13813,13857,13902,13946,13991,14035,14080,14124,14169,14213,14258,14302,14347,14391,14436,14480,14525,14569,14614,14658,14703,14747,14792,14836,14881,14925,14970,15014,15059,15103,15148,15192,15237,15281,15326,15370,15415,15459,15504,15548,15593,15637,15682,15726,15771,15815,15860,15904,15949,15993,16038,16082,16127,16171,16216,16260,16305,16349,16394,16438,16483,16527,16572,16616,16661,16705,16750,16794,16839,16883,16928,16972,17017,17061,17106,17150,17195,17239,17284,17328,17373,17417,17462,17506,17551,17595,17640,17684,17729,17773,17818,17862,17907,17951,17996,18040,18085,18129,18174,18218,18263,18307,18352,18396,18441,18485,18530,18574,18619,18663,18708,18752,18797,18841,18886,18930,18975,19019,19064,19108,19153,19197,19242,19286,19331,19375,19420,19464,19509,19553,19598,19642,19687,19731,19776,19820,19865,19909,19954,19998,20043,20087,20132,20176,20221,20265,20310,20354
+1,500,5:4006:4028,0,40,46,52,59,66,73,81,89,98,107,116,126,136,147,158,169,181,193,206,219,232,246,260,275,290,305,321,337,354,371,388,406,424,443,462,481,501,521,542,563,584,606,628,651,674,697,721,745,770,795,820,846,872,899,926,953,981,1009,1038,1067,1096,1126,1156,1187,1218,1249,1281,1313,1346,1379,1412,1446,1480,1515,1550,1585,1621,1657,1694,1731,1768,1806,1844,1883,1922,1961,2001,2041,2082,2123,2164,2206,2248,2291,2334,2377,2421,2465,2510,2554,2599,2643,2688,2732,2777,2821,2866,2910,2955,2999,3044,3088,3133,3177,3222,3266,3311,3355,3400,3444,3489,3533,3578,3622,3667,3711,3756,3800,3845,3889,3934,3978,4023,4067,4112,4156,4201,4245,4290,4334,4379,4423,4468,4512,4557,4601,4646,4690,4735,4779,4824,4868,4913,4957,5001,5046,5090,5135,5179,5224,5268,5313,5357,5402,5446,5491,5535,5580,5624,5669,5713,5758,5802,5847,5891,5936,5980,6025,6069,6114,6158,6203,6247,6292,6336,6381,6425,6470,6514,6559,6603,6648,6692,6737,6781,6826,6870,6915,6959,7004,7048,7093,7137,7182,7226,7271,7315,7360,7404,7449,7493,7538,7582,7627,7671,7716,7760,7805,7849,7894,7938,7983,8027,8072,8116,8161,8205,8250,8294,8339,8383,8428,8472,8517,8561,8606,8650,8695,8739,8784,8828,8873,8917,8962,9006,9051,9095,9140,9184,9229,9273,9318,9362,9407,9451,9496,9540,9585,9629,9674,9718,9763,9807,9852,9896,9941,9985,10030,10074,10119,10163,10208,10252,10297,10341,10386,10430,10475,10519,10564,10608,10653,10697,10742,10786,10831,10875,10920,10964,11009,11053,11098,11142,11187,11231,11276,11320,11365,11409,11454,11498,11543,11587,11632,11676,11721,11765,11810,11854,11899,11943,11988,12032,12077,12121,12166,12210,12255,12299,12344,12388,12433,12477,12522,12566,12611,12655,12700,12744,12789,12833,12878,12922,12967,13011,13056,13100,13145,13189,13234,13278,13323,13367,13412,13456,13501,13545,13590,13634,13679,13723,13768,13812,13857,13901,13946,13990,14035,14079,14124,14168,14213,14257,14302,14346,14391,14435,14480,14524,14569,14613,14658,14702,14747,14791,14836,14880,14925,14969,15014,15058,15103,15147,15192,15236,15281,15325,15370,15414,15459,15503,15548,15592,15637,15681,15726,15770,15815,15859,15904,15948,15993,16037,16082,16126,16171,16215,16260,16304,16349,16393,16438,16482,16527,16571,16616,16660,16705,16749,16794,16838,16883,16927,16972,17016,17061,17105,17150,17194,17239,17283,17328,17372,17417,17461,17506,17550,17595,17639,17684,17728,17773,17817,17862,17906,17951,17995,18040,18084,18129,18173,18218,18262,18307,18351,18396,18440,18485,18529,18574,18618,18663,18707,18752,18796,18841,18885,18930,18974,19019,19063,19108,19152,19197,19241,19286,19330,19375,19419,19464,19508,19553,19597,19642,19686,19731,19775,19820,19864,19909,19953,19998,20042,20087,20131,20176,20220,20265,20309,20354
 
 //Thief, Thief High, Baby Thief
 1,500,6:4007:4029,0,40,46,53,60,68,76,85,94,104,114,125,136,148,160,173,186,200,214,229,244,260,276,293,310,328,346,365,384,404,424,445,466,488,510,533,556,580,604,629,654,680,706,733,760,788,816,845,874,904,934,965,996,1028,1060,1093,1126,1160,1194,1229,1264,1300,1336,1373,1410,1448,1486,1525,1564,1604,1644,1685,1726,1768,1810,1853,1896,1940,1984,2029,2074,2120,2166,2213,2260,2308,2356,2405,2454,2504,2554,2605,2656,2708,2760,2813,2866,2920,2974,3029,3083,3138,3192,3247,3301,3356,3410,3465,3519,3574,3628,3683,3737,3792,3846,3901,3955,4010,4064,4119,4173,4228,4282,4337,4391,4446,4500,4555,4609,4664,4718,4773,4827,4882,4936,4991,5045,5100,5154,5209,5263,5318,5372,5427,5481,5536,5590,5645,5699,5754,5808,5863,5917,5972,6026,6081,6135,6190,6244,6299,6353,6408,6462,6517,6571,6626,6680,6735,6789,6844,6898,6953,7007,7062,7116,7171,7225,7280,7334,7389,7443,7498,7552,7607,7661,7716,7770,7825,7879,7934,7988,8043,8097,8152,8206,8261,8315,8370,8424,8479,8533,8588,8642,8697,8751,8806,8860,8915,8969,9024,9078,9133,9187,9242,9296,9351,9405,9460,9514,9569,9623,9678,9732,9787,9841,9896,9950,10005,10059,10114,10168,10223,10277,10332,10386,10441,10495,10550,10604,10659,10713,10768,10822,10877,10931,10986,11040,11095,11149,11204,11258,11313,11367,11422,11476,11531,11585,11640,11694,11749,11803,11858,11912,11967,12021,12076,12130,12185,12239,12294,12348,12403,12457,12512,12566,12621,12675,12730,12784,12839,12893,12948,13002,13057,13111,13166,13220,13275,13329,13384,13438,13493,13547,13602,13656,13711,13765,13820,13874,13929,13983,14038,14092,14147,14201,14256,14310,14365,14419,14474,14528,14583,14637,14692,14746,14801,14855,14910,14964,15019,15073,15128,15182,15237,15291,15346,15400,15455,15509,15564,15618,15673,15727,15782,15836,15891,15945,16000,16054,16109,16163,16218,16272,16327,16381,16436,16490,16545,16599,16654,16708,16763,16817,16872,16926,16981,17035,17090,17144,17199,17253,17308,17362,17417,17471,17526,17580,17635,17689,17744,17798,17853,17907,17962,18016,18071,18125,18180,18234,18289,18343,18398,18452,18507,18561,18616,18670,18725,18779,18834,18888,18943,18997,19052,19106,19161,19215,19270,19324,19379,19433,19488,19542,19597,19651,19706,19760,19815,19869,19924,19978,20033,20087,20142,20196,20251,20305,20360,20414,20469,20523,20578,20632,20687,20741,20796,20850,20905,20959,21014,21068,21123,21177,21232,21286,21341,21395,21450,21504,21559,21613,21668,21722,21777,21831,21886,21940,21995,22049,22104,22158,22213,22267,22322,22376,22431,22485,22540,22594,22649,22703,22758,22812,22867,22921,22976,23030,23085,23139,23194,23248,23303,23357,23412,23466,23521,23575,23630,23684,23739,23793,23848,23902,23957,24011,24066,24120,24175,24229,24284,24338,24393,24447,24502,24556,24611,24665,24720,24774,24829,24883
@@ -39,86 +39,47 @@
 //Knight, Knight (Peco), Baby Knight, Baby Knight (Peco), Lord Knight, Lord Knight (Peco)
 1,500,7:13:4008:4014:4030:4036,0,40,48,58,69,82,96,112,129,148,168,190,213,238,264,292,321,352,384,418,453,490,528,568,609,652,696,742,789,838,888,940,993,1048,1104,1162,1221,1282,1344,1408,1473,1540,1608,1678,1749,1822,1896,1972,2049,2128,2208,2290,2373,2458,2544,2632,2721,2812,2904,2998,3093,3190,3288,3388,3489,3592,3696,3802,3909,4018,4128,4240,4353,4468,4584,4702,4821,4942,5064,5188,5313,5440,5568,5698,5829,5962,6096,6232,6369,6508,6648,6790,6933,7078,7224,7372,7521,7672,7824,7978,8053,8128,8203,8278,8353,8428,8503,8578,8653,8728,8803,8878,8953,9028,9103,9178,9253,9328,9403,9478,9553,9628,9703,9778,9853,9928,10003,10078,10153,10228,10303,10378,10453,10528,10603,10678,10753,10828,10903,10978,11053,11128,11203,11278,11353,11428,11503,11578,11653,11728,11803,11878,11953,12028,12103,12178,12253,12328,12403,12478,12553,12628,12703,12778,12853,12928,13003,13078,13153,13228,13303,13378,13453,13528,13603,13678,13753,13828,13903,13978,14053,14128,14203,14278,14353,14428,14503,14578,14653,14728,14803,14878,14953,15028,15103,15178,15253,15328,15403,15478,15553,15628,15703,15778,15853,15928,16003,16078,16153,16228,16303,16378,16453,16528,16603,16678,16753,16828,16903,16978,17053,17128,17203,17278,17353,17428,17503,17578,17653,17728,17803,17878,17953,18028,18103,18178,18253,18328,18403,18478,18553,18628,18703,18778,18853,18928,19003,19078,19153,19228,19303,19378,19453,19528,19603,19678,19753,19828,19903,19978,20053,20128,20203,20278,20353,20428,20503,20578,20653,20728,20803,20878,20953,21028,21103,21178,21253,21328,21403,21478,21553,21628,21703,21778,21853,21928,22003,22078,22153,22228,22303,22378,22453,22528,22603,22678,22753,22828,22903,22978,23053,23128,23203,23278,23353,23428,23503,23578,23653,23728,23803,23878,23953,24028,24103,24178,24253,24328,24403,24478,24553,24628,24703,24778,24853,24928,25003,25078,25153,25228,25303,25378,25453,25528,25603,25678,25753,25828,25903,25978,26053,26128,26203,26278,26353,26428,26503,26578,26653,26728,26803,26878,26953,27028,27103,27178,27253,27328,27403,27478,27553,27628,27703,27778,27853,27928,28003,28078,28153,28228,28303,28378,28453,28528,28603,28678,28753,28828,28903,28978,29053,29128,29203,29278,29353,29428,29503,29578,29653,29728,29803,29878,29953,30028,30103,30178,30253,30328,30403,30478,30553,30628,30703,30778,30853,30928,31003,31078,31153,31228,31303,31378,31453,31528,31603,31678,31753,31828,31903,31978,32053,32128,32203,32278,32353,32428,32503,32578,32653,32728,32803,32878,32953,33028,33103,33178,33253,33328,33403,33478,33553,33628,33703,33778,33853,33928,34003,34078,34153,34228,34303,34378,34453,34528,34603,34678,34753,34828,34903,34978,35053,35128,35203,35278,35353,35428,35503,35578,35653,35728,35803,35878,35953,36028,36103,36178,36253,36328,36403,36478,36553,36628,36703,36778,36853,36928,37003,37078,37153,37228,37303,37378,37453,37528,37603,37678,37753,37828,37903,37978,38053
 
-//Rune Knight, Rune Knight T, Rune Knight Dragon, Rune Knight T (Dragon), Baby Rune Knight, Baby Rune Knight (Dragon)
-1,500,4054:4060:4080:4081:4096:4109,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,8100,8133,8242,8352,8464,8576,8690,8804,8920,9036,9154,9273,9393,9514,9636,9759,9883,10008,10134,10261,10389,10518,10648,10779,10912,11045,11180,11315,11452,11589,11728,11868,12009,12151,12294,12438,12583,12729,12876,13024,13173,13323,13474,13626,13780,13934,14090,14246,14404,14562,14722,14883,15043,15204,15364,15525,15685,15846,16006,16167,16327,16488,16648,16809,16969,17130,17290,17451,17611,17772,17932,18093,18253,18414,18574,18735,18895,19056,19216,19377,19537,19698,19858,20019,20179,20340,20500,20661,20821,20982,21142,21303,21463,21624,21784,21945,22105,22266,22426,22587,22747,22908,23068,23229,23389,23550,23710,23871,24031,24192,24352,24513,24673,24834,24994,25155,25315,25476,25636,25797,25957,26118,26278,26439,26599,26760,26920,27081,27241,27402,27562,27723,27883,28044,28204,28365,28525,28686,28846,29007,29167,29328,29488,29649,29809,29970,30130,30291,30451,30612,30772,30933,31093,31254,31414,31575,31735,31896,32056,32217,32377,32538,32698,32859,33019,33180,33340,33501,33661,33822,33982,34143,34303,34464,34624,34785,34945,35106,35266,35427,35587,35748,35908,36069,36229,36390,36550,36711,36871,37032,37192,37353,37513,37674,37834,37995,38155,38316,38476,38637,38797,38958,39118,39279,39439,39600,39760,39921,40081,40242,40402,40563,40723,40884,41044,41205,41365,41526,41686,41847,42007,42168,42328,42489,42649,42810,42970,43131,43291,43452,43612,43773,43933,44094,44254,44415,44575,44736,44896,45057,45217,45378,45538,45699,45859,46020,46180,46341,46501,46662,46822,46983,47143,47304,47464,47625,47785,47946,48106,48267,48427,48588,48748,48909,49069,49230,49390,49551,49711,49872,50032,50193,50353,50514,50674,50835,50995,51156,51316,51477,51637,51798,51958,52119,52279,52440,52600,52761,52921,53082,53242,53403,53563,53724,53884,54045,54205,54366,54526,54687,54847,55008,55168,55329,55489,55650,55810,55971,56131,56292,56452,56613,56773,56934,57094,57255,57415,57576,57736,57897,58057,58218,58378,58539,58699,58860,59020,59181,59341,59502,59662,59823,59983,60144,60304,60465,60625,60786,60946,61107,61267,61428,61588,61749,61909,62070,62230,62391,62551,62712,62872,63033,63193,63354,63514,63675,63835,63996,64156,64317,64477,64638,64798,64959,65119,65280,65440,65601,65761,65922,66082,66243,66403,66564,66724,66885,67045,67206,67366,67527,67687,67848,68008,68169,68329,68490,68650,68811,68971,69132,69292,69453,69613,69774,69934,70095,70255,70416,70576,70737,70897,71058
-
 //Priest, High Priest, Baby Priest
 1,500,8:4009:4031,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,2315,2374,2434,2495,2556,2618,2681,2745,2809,2874,2940,3007,3074,3142,3211,3281,3351,3422,3494,3567,3640,3714,3789,3865,3941,4018,4096,4175,4254,4333,4412,4491,4570,4649,4728,4807,4886,4965,5044,5123,5202,5281,5360,5439,5518,5597,5676,5755,5834,5913,5992,6071,6150,6229,6308,6387,6466,6545,6624,6703,6782,6861,6940,7019,7098,7177,7256,7335,7414,7493,7572,7651,7730,7809,7888,7967,8046,8125,8204,8283,8362,8441,8520,8599,8678,8757,8836,8915,8994,9073,9152,9231,9310,9389,9468,9547,9626,9705,9784,9863,9942,10021,10100,10179,10258,10337,10416,10495,10574,10653,10732,10811,10890,10969,11048,11127,11206,11285,11364,11443,11522,11601,11680,11759,11838,11917,11996,12075,12154,12233,12312,12391,12470,12549,12628,12707,12786,12865,12944,13023,13102,13181,13260,13339,13418,13497,13576,13655,13734,13813,13892,13971,14050,14129,14208,14287,14366,14445,14524,14603,14682,14761,14840,14919,14998,15077,15156,15235,15314,15393,15472,15551,15630,15709,15788,15867,15946,16025,16104,16183,16262,16341,16420,16499,16578,16657,16736,16815,16894,16973,17052,17131,17210,17289,17368,17447,17526,17605,17684,17763,17842,17921,18000,18079,18158,18237,18316,18395,18474,18553,18632,18711,18790,18869,18948,19027,19106,19185,19264,19343,19422,19501,19580,19659,19738,19817,19896,19975,20054,20133,20212,20291,20370,20449,20528,20607,20686,20765,20844,20923,21002,21081,21160,21239,21318,21397,21476,21555,21634,21713,21792,21871,21950,22029,22108,22187,22266,22345,22424,22503,22582,22661,22740,22819,22898,22977,23056,23135,23214,23293,23372,23451,23530,23609,23688,23767,23846,23925,24004,24083,24162,24241,24320,24399,24478,24557,24636,24715,24794,24873,24952,25031,25110,25189,25268,25347,25426,25505,25584,25663,25742,25821,25900,25979,26058,26137,26216,26295,26374,26453,26532,26611,26690,26769,26848,26927,27006,27085,27164,27243,27322,27401,27480,27559,27638,27717,27796,27875,27954,28033,28112,28191,28270,28349,28428,28507,28586,28665,28744,28823,28902,28981,29060,29139,29218,29297,29376,29455,29534,29613,29692,29771,29850,29929,30008,30087,30166,30245,30324,30403,30482,30561,30640,30719,30798,30877,30956,31035,31114,31193,31272,31351,31430,31509,31588,31667,31746,31825,31904,31983,32062,32141,32220,32299,32378,32457,32536,32615,32694,32773,32852,32931,33010,33089,33168,33247,33326,33405,33484,33563,33642,33721,33800,33879,33958,34037,34116,34195,34274,34353,34432,34511,34590,34669,34748,34827,34906,34985,35064,35143,35222,35301,35380,35459,35538,35617,35696,35775,35854,35933
 
-//Arch Bishop, Arch Bishop T, Baby Arch Bishop
-1,500,4057:4063:4099,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,4300,4333,4412,4491,4570,4649,4728,4807,4886,4965,5044,5123,5202,5281,5360,5439,5518,5597,5676,5755,5834,5913,5992,6071,6150,6229,6308,6387,6466,6545,6624,6703,6782,6861,6940,7019,7098,7177,7256,7335,7414,7493,7572,7651,7730,7809,7888,7967,8046,8125,8204,8283,8362,8441,8520,8599,8678,8757,8836,8915,8994,9073,9152,9231,9310,9389,9468,9547,9626,9705,9784,9863,9942,10021,10100,10179,10258,10337,10416,10495,10574,10653,10732,10811,10890,10969,11048,11127,11206,11285,11364,11443,11522,11601,11680,11759,11838,11917,11996,12075,12154,12233,12312,12391,12470,12549,12628,12707,12786,12865,12944,13023,13102,13181,13260,13339,13418,13497,13576,13655,13734,13813,13892,13971,14050,14129,14208,14287,14366,14445,14524,14603,14682,14761,14840,14919,14998,15077,15156,15235,15314,15393,15472,15551,15630,15709,15788,15867,15946,16025,16104,16183,16262,16341,16420,16499,16578,16657,16736,16815,16894,16973,17052,17131,17210,17289,17368,17447,17526,17605,17684,17763,17842,17921,18000,18079,18158,18237,18316,18395,18474,18553,18632,18711,18790,18869,18948,19027,19106,19185,19264,19343,19422,19501,19580,19659,19738,19817,19896,19975,20054,20133,20212,20291,20370,20449,20528,20607,20686,20765,20844,20923,21002,21081,21160,21239,21318,21397,21476,21555,21634,21713,21792,21871,21950,22029,22108,22187,22266,22345,22424,22503,22582,22661,22740,22819,22898,22977,23056,23135,23214,23293,23372,23451,23530,23609,23688,23767,23846,23925,24004,24083,24162,24241,24320,24399,24478,24557,24636,24715,24794,24873,24952,25031,25110,25189,25268,25347,25426,25505,25584,25663,25742,25821,25900,25979,26058,26137,26216,26295,26374,26453,26532,26611,26690,26769,26848,26927,27006,27085,27164,27243,27322,27401,27480,27559,27638,27717,27796,27875,27954,28033,28112,28191,28270,28349,28428,28507,28586,28665,28744,28823,28902,28981,29060,29139,29218,29297,29376,29455,29534,29613,29692,29771,29850,29929,30008,30087,30166,30245,30324,30403,30482,30561,30640,30719,30798,30877,30956,31035,31114,31193,31272,31351,31430,31509,31588,31667,31746,31825,31904,31983,32062,32141,32220,32299,32378,32457,32536,32615,32694,32773,32852,32931,33010,33089,33168,33247,33326,33405,33484,33563,33642,33721,33800,33879,33958,34037,34116,34195,34274,34353,34432,34511,34590,34669,34748,34827,34906,34985,35064,35143,35222,35301,35380,35459,35538,35617,35696,35775,35854,35933
-
 //Wizard, High Wizard, Baby Wizard
 1,500,9:4010:4032,0,40,46,53,60,68,76,85,94,104,115,126,138,150,163,176,190,204,219,234,250,267,284,302,320,339,358,378,398,419,441,463,486,509,533,557,582,607,633,659,686,714,742,771,800,830,860,891,922,954,987,1020,1054,1088,1123,1158,1194,1230,1267,1304,1342,1381,1420,1460,1500,1541,1582,1624,1666,1709,1753,1797,1842,1887,1933,1979,2026,2073,2121,2169,2218,2268,2318,2369,2420,2472,2524,2577,2630,2684,2739,2794,2850,2906,2963,3020,3078,3136,3195,3254,3313,3372,3431,3490,3549,3608,3667,3726,3785,3844,3903,3962,4021,4080,4139,4198,4257,4316,4375,4434,4493,4552,4611,4670,4729,4788,4847,4906,4965,5024,5083,5142,5201,5260,5319,5378,5437,5496,5555,5614,5673,5732,5791,5850,5909,5968,6027,6086,6145,6204,6263,6322,6381,6440,6499,6558,6617,6676,6735,6794,6853,6912,6971,7030,7089,7148,7207,7266,7325,7384,7443,7502,7561,7620,7679,7738,7797,7856,7915,7974,8033,8092,8151,8210,8269,8328,8387,8446,8505,8564,8623,8682,8741,8800,8859,8918,8977,9036,9095,9154,9213,9272,9331,9390,9449,9508,9567,9626,9685,9744,9803,9862,9921,9980,10039,10098,10157,10216,10275,10334,10393,10452,10511,10570,10629,10688,10747,10806,10865,10924,10983,11042,11101,11160,11219,11278,11337,11396,11455,11514,11573,11632,11691,11750,11809,11868,11927,11986,12045,12104,12163,12222,12281,12340,12399,12458,12517,12576,12635,12694,12753,12812,12871,12930,12989,13048,13107,13166,13225,13284,13343,13402,13461,13520,13579,13638,13697,13756,13815,13874,13933,13992,14051,14110,14169,14228,14287,14346,14405,14464,14523,14582,14641,14700,14759,14818,14877,14936,14995,15054,15113,15172,15231,15290,15349,15408,15467,15526,15585,15644,15703,15762,15821,15880,15939,15998,16057,16116,16175,16234,16293,16352,16411,16470,16529,16588,16647,16706,16765,16824,16883,16942,17001,17060,17119,17178,17237,17296,17355,17414,17473,17532,17591,17650,17709,17768,17827,17886,17945,18004,18063,18122,18181,18240,18299,18358,18417,18476,18535,18594,18653,18712,18771,18830,18889,18948,19007,19066,19125,19184,19243,19302,19361,19420,19479,19538,19597,19656,19715,19774,19833,19892,19951,20010,20069,20128,20187,20246,20305,20364,20423,20482,20541,20600,20659,20718,20777,20836,20895,20954,21013,21072,21131,21190,21249,21308,21367,21426,21485,21544,21603,21662,21721,21780,21839,21898,21957,22016,22075,22134,22193,22252,22311,22370,22429,22488,22547,22606,22665,22724,22783,22842,22901,22960,23019,23078,23137,23196,23255,23314,23373,23432,23491,23550,23609,23668,23727,23786,23845,23904,23963,24022,24081,24140,24199,24258,24317,24376,24435,24494,24553,24612,24671,24730,24789,24848,24907,24966,25025,25084,25143,25202,25261,25320,25379,25438,25497,25556,25615,25674,25733,25792,25851,25910,25969,26028,26087,26146,26205,26264,26323,26382,26441,26500,26559,26618,26677,26736,26795,26854,26913
 
-//Warlock, Warlock T, Baby Warlock
-1,500,4055:4061:4097,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,3200,3313,3383,3455,3528,3601,3675,3749,3824,3899,3975,4051,4129,4208,4287,4367,4447,4528,4609,4691,4773,4857,4941,5026,5112,5198,5285,5372,5460,5548,5638,5728,5819,5911,6003,6096,6189,6283,6377,6473,6569,6666,6763,6861,6960,7059,7159,7259,7361,7463,7566,7669,7772,7875,7978,8081,8184,8287,8390,8493,8596,8699,8802,8905,9008,9111,9214,9317,9420,9523,9626,9729,9832,9935,10038,10141,10244,10347,10450,10553,10656,10759,10862,10965,11068,11171,11274,11377,11480,11583,11686,11789,11892,11995,12098,12201,12304,12407,12510,12613,12716,12819,12922,13025,13128,13231,13334,13437,13540,13643,13746,13849,13952,14055,14158,14261,14364,14467,14570,14673,14776,14879,14982,15085,15188,15291,15394,15497,15600,15703,15806,15909,16012,16115,16218,16321,16424,16527,16630,16733,16836,16939,17042,17145,17248,17351,17454,17557,17660,17763,17866,17969,18072,18175,18278,18381,18484,18587,18690,18793,18896,18999,19102,19205,19308,19411,19514,19617,19720,19823,19926,20029,20132,20235,20338,20441,20544,20647,20750,20853,20956,21059,21162,21265,21368,21471,21574,21677,21780,21883,21986,22089,22192,22295,22398,22501,22604,22707,22810,22913,23016,23119,23222,23325,23428,23531,23634,23737,23840,23943,24046,24149,24252,24355,24458,24561,24664,24767,24870,24973,25076,25179,25282,25385,25488,25591,25694,25797,25900,26003,26106,26209,26312,26415,26518,26621,26724,26827,26930,27033,27136,27239,27342,27445,27548,27651,27754,27857,27960,28063,28166,28269,28372,28475,28578,28681,28784,28887,28990,29093,29196,29299,29402,29505,29608,29711,29814,29917,30020,30123,30226,30329,30432,30535,30638,30741,30844,30947,31050,31153,31256,31359,31462,31565,31668,31771,31874,31977,32080,32183,32286,32389,32492,32595,32698,32801,32904,33007,33110,33213,33316,33419,33522,33625,33728,33831,33934,34037,34140,34243,34346,34449,34552,34655,34758,34861,34964,35067,35170,35273,35376,35479,35582,35685,35788,35891,35994,36097,36200,36303,36406,36509,36612,36715,36818,36921,37024,37127,37230,37333,37436,37539,37642,37745,37848,37951,38054,38157,38260,38363,38466,38569,38672,38775,38878,38981,39084,39187,39290,39393,39496,39599,39702,39805,39908,40011,40114,40217,40320,40423,40526,40629,40732,40835,40938,41041,41144,41247,41350,41453,41556,41659,41762,41865,41968,42071,42174,42277,42380,42483,42586,42689,42792,42895,42998,43101,43204,43307,43410,43513,43616,43719
-
 //Blacksmith, Whitesmith, Baby Blacksmith
 1,500,10:4011:4033,0,40,47,55,64,74,84,95,107,120,134,149,165,182,200,219,238,258,279,301,324,348,373,399,426,454,482,511,541,572,604,637,671,706,742,779,816,854,893,933,974,1016,1059,1103,1148,1194,1240,1287,1335,1384,1434,1485,1537,1590,1644,1699,1754,1810,1867,1925,1984,2044,2105,2167,2230,2294,2358,2423,2489,2556,2624,2693,2763,2834,2906,2979,3052,3126,3201,3277,3354,3432,3511,3591,3672,3754,3836,3919,4003,4088,4174,4261,4349,4438,4528,4619,4710,4802,4895,4989,5082,5176,5269,5363,5456,5550,5643,5737,5830,5924,6017,6111,6204,6298,6391,6485,6578,6672,6765,6859,6952,7046,7139,7233,7326,7420,7513,7607,7700,7794,7887,7981,8074,8168,8261,8355,8448,8542,8635,8729,8822,8916,9009,9103,9196,9290,9383,9477,9570,9664,9757,9851,9944,10038,10131,10225,10318,10412,10505,10599,10692,10786,10879,10973,11066,11160,11253,11347,11440,11534,11627,11721,11814,11908,12001,12095,12188,12282,12375,12469,12562,12656,12749,12843,12936,13030,13123,13217,13310,13404,13497,13591,13684,13778,13871,13965,14058,14152,14245,14339,14432,14526,14619,14713,14806,14900,14993,15087,15180,15274,15367,15461,15554,15648,15741,15835,15928,16022,16115,16209,16302,16396,16489,16583,16676,16770,16863,16957,17050,17144,17237,17331,17424,17518,17611,17705,17798,17892,17985,18079,18172,18266,18359,18453,18546,18640,18733,18827,18920,19014,19107,19201,19294,19388,19481,19575,19668,19762,19855,19949,20042,20136,20229,20323,20416,20510,20603,20697,20790,20884,20977,21071,21164,21258,21351,21445,21538,21632,21725,21819,21912,22006,22099,22193,22286,22380,22473,22567,22660,22754,22847,22941,23034,23128,23221,23315,23408,23502,23595,23689,23782,23876,23969,24063,24156,24250,24343,24437,24530,24624,24717,24811,24904,24998,25091,25185,25278,25372,25465,25559,25652,25746,25839,25933,26026,26120,26213,26307,26400,26494,26587,26681,26774,26868,26961,27055,27148,27242,27335,27429,27522,27616,27709,27803,27896,27990,28083,28177,28270,28364,28457,28551,28644,28738,28831,28925,29018,29112,29205,29299,29392,29486,29579,29673,29766,29860,29953,30047,30140,30234,30327,30421,30514,30608,30701,30795,30888,30982,31075,31169,31262,31356,31449,31543,31636,31730,31823,31917,32010,32104,32197,32291,32384,32478,32571,32665,32758,32852,32945,33039,33132,33226,33319,33413,33506,33600,33693,33787,33880,33974,34067,34161,34254,34348,34441,34535,34628,34722,34815,34909,35002,35096,35189,35283,35376,35470,35563,35657,35750,35844,35937,36031,36124,36218,36311,36405,36498,36592,36685,36779,36872,36966,37059,37153,37246,37340,37433,37527,37620,37714,37807,37901,37994,38088,38181,38275,38368,38462,38555,38649,38742,38836,38929,39023,39116,39210,39303,39397,39490,39584,39677,39771,39864,39958,40051,40145,40238,40332,40425,40519,40612,40706,40799,40893,40986,41080,41173,41267,41360,41454,41547,41641,41734,41828,41921,42015,42108,42202,42295,42389,42482
 
-//Mechanic, Mechanic T, Mechanic (Mado), Mechanic T (Mado), Baby Mechanic, Baby Mechanic (Mado)
-1,500,4058:4064:4086:4087:4100:4112,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,5807,5844,5952,6061,6172,6283,6396,6510,6625,6741,6857,6974,7093,7212,7333,7455,7578,7702,7828,7954,8081,8208,8337,8467,8598,8730,8864,8998,9134,9271,9408,9546,9685,9825,9967,10109,10253,10398,10544,10691,10838,10987,11136,11287,11439,11592,11746,11901,12057,12215,12372,12531,12688,12847,13004,13163,13320,13479,13636,13795,13952,14111,14268,14427,14584,14743,14900,15059,15216,15375,15532,15691,15848,16007,16164,16323,16480,16639,16796,16955,17112,17271,17428,17587,17744,17903,18060,18219,18376,18535,18692,18851,19008,19167,19324,19483,19640,19799,19956,20115,20272,20431,20588,20747,20904,21063,21220,21379,21536,21695,21852,22011,22168,22327,22484,22643,22800,22959,23116,23275,23432,23591,23748,23907,24064,24223,24380,24539,24696,24855,25012,25171,25328,25487,25644,25803,25960,26119,26276,26435,26592,26751,26908,27067,27224,27383,27540,27699,27856,28015,28172,28331,28488,28647,28804,28963,29120,29279,29436,29595,29752,29911,30068,30227,30384,30543,30700,30859,31016,31175,31332,31491,31648,31807,31964,32123,32280,32439,32596,32755,32912,33071,33228,33387,33544,33703,33860,34019,34176,34335,34492,34651,34808,34967,35124,35283,35440,35599,35756,35915,36072,36231,36388,36547,36704,36863,37020,37179,37336,37495,37652,37811,37968,38127,38284,38443,38600,38759,38916,39075,39232,39391,39548,39707,39864,40023,40180,40339,40496,40655,40812,40971,41128,41287,41444,41603,41760,41919,42076,42235,42392,42551,42708,42867,43024,43183,43340,43499,43656,43815,43972,44131,44288,44447,44604,44763,44920,45079,45236,45395,45552,45711,45868,46027,46184,46343,46500,46659,46816,46975,47132,47291,47448,47607,47764,47923,48080,48239,48396,48555,48712,48871,49028,49187,49344,49503,49660,49819,49976,50135,50292,50451,50608,50767,50924,51083,51240,51399,51556,51715,51872,52031,52188,52347,52504,52663,52820,52979,53136,53295,53452,53611,53768,53927,54084,54243,54400,54559,54716,54875,55032,55191,55348,55507,55664,55823,55980,56139,56296,56455,56612,56771,56928,57087,57244,57403,57560,57719,57876,58035,58192,58351,58508,58667,58824,58983,59140,59299,59456,59615,59772,59931,60088,60247,60404,60563,60720,60879,61036,61195,61352,61511,61668,61827,61984,62143,62300,62459,62616,62775,62932,63091,63248,63407,63564,63723,63880,64039,64196,64355,64512,64671,64828,64987,65144,65303,65460,65619,65776,65935,66092,66251,66408,66567,66724,66883,67040,67199,67356,67515,67672,67831
-
 //Hunter, Sniper, Baby Hunter
 1,500,11:4012:4034,0,40,47,55,63,72,82,93,105,118,132,146,161,177,194,212,231,250,270,291,313,336,360,385,410,436,463,491,520,550,581,612,644,677,711,746,782,818,855,893,932,972,1013,1055,1097,1140,1184,1229,1275,1322,1370,1418,1467,1517,1568,1620,1673,1726,1780,1835,1891,1948,2006,2065,2124,2184,2245,2307,2370,2434,2499,2564,2630,2697,2765,2834,2904,2974,3045,3117,3190,3264,3339,3415,3491,3568,3646,3725,3805,3886,3968,4050,4133,4217,4302,4388,4475,4562,4650,4739,4827,4916,5004,5093,5181,5270,5358,5447,5535,5624,5712,5801,5889,5978,6066,6155,6243,6332,6420,6509,6597,6686,6774,6863,6951,7040,7128,7217,7305,7394,7482,7571,7659,7748,7836,7925,8013,8102,8190,8279,8367,8456,8544,8633,8721,8810,8898,8987,9075,9164,9252,9341,9429,9518,9606,9695,9783,9872,9960,10049,10137,10226,10314,10403,10491,10580,10668,10757,10845,10934,11022,11111,11199,11288,11376,11465,11553,11642,11730,11819,11907,11996,12084,12173,12261,12350,12438,12527,12615,12704,12792,12881,12969,13058,13146,13235,13323,13412,13500,13589,13677,13766,13854,13943,14031,14120,14208,14297,14385,14474,14562,14651,14739,14828,14916,15005,15093,15182,15270,15359,15447,15536,15624,15713,15801,15890,15978,16067,16155,16244,16332,16421,16509,16598,16686,16775,16863,16952,17040,17129,17217,17306,17394,17483,17571,17660,17748,17837,17925,18014,18102,18191,18279,18368,18456,18545,18633,18722,18810,18899,18987,19076,19164,19253,19341,19430,19518,19607,19695,19784,19872,19961,20049,20138,20226,20315,20403,20492,20580,20669,20757,20846,20934,21023,21111,21200,21288,21377,21465,21554,21642,21731,21819,21908,21996,22085,22173,22262,22350,22439,22527,22616,22704,22793,22881,22970,23058,23147,23235,23324,23412,23501,23589,23678,23766,23855,23943,24032,24120,24209,24297,24386,24474,24563,24651,24740,24828,24917,25005,25094,25182,25271,25359,25448,25536,25625,25713,25802,25890,25979,26067,26156,26244,26333,26421,26510,26598,26687,26775,26864,26952,27041,27129,27218,27306,27395,27483,27572,27660,27749,27837,27926,28014,28103,28191,28280,28368,28457,28545,28634,28722,28811,28899,28988,29076,29165,29253,29342,29430,29519,29607,29696,29784,29873,29961,30050,30138,30227,30315,30404,30492,30581,30669,30758,30846,30935,31023,31112,31200,31289,31377,31466,31554,31643,31731,31820,31908,31997,32085,32174,32262,32351,32439,32528,32616,32705,32793,32882,32970,33059,33147,33236,33324,33413,33501,33590,33678,33767,33855,33944,34032,34121,34209,34298,34386,34475,34563,34652,34740,34829,34917,35006,35094,35183,35271,35360,35448,35537,35625,35714,35802,35891,35979,36068,36156,36245,36333,36422,36510,36599,36687,36776,36864,36953,37041,37130,37218,37307,37395,37484,37572,37661,37749,37838,37926,38015,38103,38192,38280,38369,38457,38546,38634,38723,38811,38900,38988,39077,39165,39254,39342,39431,39519,39608,39696,39785,39873,39962,40050,40139,40227
 
-//Ranger, Ranger T, Ranger (Warg), Ranger T (Warg), Baby Ranger, Baby Ranger (warg)
-1,500,4056:4062:4084:4085:4098:4111,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,4800,4828,4918,5009,5101,5194,5288,5382,5477,5573,5670,5768,5867,5967,6068,6170,6273,6377,6482,6588,6694,6801,6909,7018,7128,7239,7351,7464,7578,7693,7809,7926,8044,8162,8281,8401,8522,8644,8767,8891,9016,9142,9269,9397,9526,9656,9786,9917,10049,10182,10316,10451,10585,10720,10854,10989,11123,11258,11392,11527,11661,11796,11930,12065,12199,12334,12468,12603,12737,12872,13006,13141,13275,13410,13544,13679,13813,13948,14082,14217,14351,14486,14620,14755,14889,15024,15158,15293,15427,15562,15696,15831,15965,16100,16234,16369,16503,16638,16772,16907,17041,17176,17310,17445,17579,17714,17848,17983,18117,18252,18386,18521,18655,18790,18924,19059,19193,19328,19462,19597,19731,19866,20000,20135,20269,20404,20538,20673,20807,20942,21076,21211,21345,21480,21614,21749,21883,22018,22152,22287,22421,22556,22690,22825,22959,23094,23228,23363,23497,23632,23766,23901,24035,24170,24304,24439,24573,24708,24842,24977,25111,25246,25380,25515,25649,25784,25918,26053,26187,26322,26456,26591,26725,26860,26994,27129,27263,27398,27532,27667,27801,27936,28070,28205,28339,28474,28608,28743,28877,29012,29146,29281,29415,29550,29684,29819,29953,30088,30222,30357,30491,30626,30760,30895,31029,31164,31298,31433,31567,31702,31836,31971,32105,32240,32374,32509,32643,32778,32912,33047,33181,33316,33450,33585,33719,33854,33988,34123,34257,34392,34526,34661,34795,34930,35064,35199,35333,35468,35602,35737,35871,36006,36140,36275,36409,36544,36678,36813,36947,37082,37216,37351,37485,37620,37754,37889,38023,38158,38292,38427,38561,38696,38830,38965,39099,39234,39368,39503,39637,39772,39906,40041,40175,40310,40444,40579,40713,40848,40982,41117,41251,41386,41520,41655,41789,41924,42058,42193,42327,42462,42596,42731,42865,43000,43134,43269,43403,43538,43672,43807,43941,44076,44210,44345,44479,44614,44748,44883,45017,45152,45286,45421,45555,45690,45824,45959,46093,46228,46362,46497,46631,46766,46900,47035,47169,47304,47438,47573,47707,47842,47976,48111,48245,48380,48514,48649,48783,48918,49052,49187,49321,49456,49590,49725,49859,49994,50128,50263,50397,50532,50666,50801,50935,51070,51204,51339,51473,51608,51742,51877,52011,52146,52280,52415,52549,52684,52818,52953,53087,53222,53356,53491,53625,53760,53894,54029,54163,54298,54432,54567,54701,54836,54970,55105,55239,55374,55508,55643,55777,55912,56046,56181,56315,56450,56584,56719,56853,56988,57122,57257,57391,57526
-
 //Assassin, Assassin Cross, Baby Assassin
 1,500,12:4013:4035,0,40,47,55,64,75,87,100,114,129,145,162,180,199,219,241,264,288,313,339,366,394,423,453,484,517,551,586,622,659,697,736,776,817,859,903,948,994,1041,1089,1138,1188,1239,1291,1344,1399,1455,1512,1570,1629,1689,1750,1812,1875,1939,2005,2072,2140,2209,2279,2350,2422,2495,2569,2644,2721,2799,2878,2958,3039,3121,3204,3288,3373,3459,3547,3636,3726,3817,3909,4002,4096,4191,4287,4384,4483,4583,4684,4786,4889,4993,5098,5204,5311,5419,5529,5640,5752,5865,5979,6092,6206,6319,6433,6546,6660,6773,6887,7000,7114,7227,7341,7454,7568,7681,7795,7908,8022,8135,8249,8362,8476,8589,8703,8816,8930,9043,9157,9270,9384,9497,9611,9724,9838,9951,10065,10178,10292,10405,10519,10632,10746,10859,10973,11086,11200,11313,11427,11540,11654,11767,11881,11994,12108,12221,12335,12448,12562,12675,12789,12902,13016,13129,13243,13356,13470,13583,13697,13810,13924,14037,14151,14264,14378,14491,14605,14718,14832,14945,15059,15172,15286,15399,15513,15626,15740,15853,15967,16080,16194,16307,16421,16534,16648,16761,16875,16988,17102,17215,17329,17442,17556,17669,17783,17896,18010,18123,18237,18350,18464,18577,18691,18804,18918,19031,19145,19258,19372,19485,19599,19712,19826,19939,20053,20166,20280,20393,20507,20620,20734,20847,20961,21074,21188,21301,21415,21528,21642,21755,21869,21982,22096,22209,22323,22436,22550,22663,22777,22890,23004,23117,23231,23344,23458,23571,23685,23798,23912,24025,24139,24252,24366,24479,24593,24706,24820,24933,25047,25160,25274,25387,25501,25614,25728,25841,25955,26068,26182,26295,26409,26522,26636,26749,26863,26976,27090,27203,27317,27430,27544,27657,27771,27884,27998,28111,28225,28338,28452,28565,28679,28792,28906,29019,29133,29246,29360,29473,29587,29700,29814,29927,30041,30154,30268,30381,30495,30608,30722,30835,30949,31062,31176,31289,31403,31516,31630,31743,31857,31970,32084,32197,32311,32424,32538,32651,32765,32878,32992,33105,33219,33332,33446,33559,33673,33786,33900,34013,34127,34240,34354,34467,34581,34694,34808,34921,35035,35148,35262,35375,35489,35602,35716,35829,35943,36056,36170,36283,36397,36510,36624,36737,36851,36964,37078,37191,37305,37418,37532,37645,37759,37872,37986,38099,38213,38326,38440,38553,38667,38780,38894,39007,39121,39234,39348,39461,39575,39688,39802,39915,40029,40142,40256,40369,40483,40596,40710,40823,40937,41050,41164,41277,41391,41504,41618,41731,41845,41958,42072,42185,42299,42412,42526,42639,42753,42866,42980,43093,43207,43320,43434,43547,43661,43774,43888,44001,44115,44228,44342,44455,44569,44682,44796,44909,45023,45136,45250,45363,45477,45590,45704,45817,45931,46044,46158,46271,46385,46498,46612,46725,46839,46952,47066,47179,47293,47406,47520,47633,47747,47860,47974,48087,48201,48314,48428,48541,48655,48768,48882,48995,49109,49222,49336,49449,49563,49676,49790,49903,50017,50130,50244,50357,50471,50584,50698,50811,50925,51038,51152,51265,51379,51492
 
-//Glt Cross, Glt Cross T, Baby Glt Cross
-1,500,4059:4065:4101,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,6050,6093,6208,6324,6441,6559,6678,6798,6920,7043,7167,7292,7418,7545,7673,7802,7932,8063,8196,8330,8465,8601,8738,8876,9015,9155,9296,9438,9582,9727,9873,10020,10168,10317,10467,10618,10770,10923,11078,11234,11391,11549,11708,11868,12029,12191,12354,12518,12684,12851,13019,13188,13356,13525,13693,13862,14030,14199,14367,14536,14704,14873,15041,15210,15378,15547,15715,15884,16052,16221,16389,16558,16726,16895,17063,17232,17400,17569,17737,17906,18074,18243,18411,18580,18748,18917,19085,19254,19422,19591,19759,19928,20096,20265,20433,20602,20770,20939,21107,21276,21444,21613,21781,21950,22118,22287,22455,22624,22792,22961,23129,23298,23466,23635,23803,23972,24140,24309,24477,24646,24814,24983,25151,25320,25488,25657,25825,25994,26162,26331,26499,26668,26836,27005,27173,27342,27510,27679,27847,28016,28184,28353,28521,28690,28858,29027,29195,29364,29532,29701,29869,30038,30206,30375,30543,30712,30880,31049,31217,31386,31554,31723,31891,32060,32228,32397,32565,32734,32902,33071,33239,33408,33576,33745,33913,34082,34250,34419,34587,34756,34924,35093,35261,35430,35598,35767,35935,36104,36272,36441,36609,36778,36946,37115,37283,37452,37620,37789,37957,38126,38294,38463,38631,38800,38968,39137,39305,39474,39642,39811,39979,40148,40316,40485,40653,40822,40990,41159,41327,41496,41664,41833,42001,42170,42338,42507,42675,42844,43012,43181,43349,43518,43686,43855,44023,44192,44360,44529,44697,44866,45034,45203,45371,45540,45708,45877,46045,46214,46382,46551,46719,46888,47056,47225,47393,47562,47730,47899,48067,48236,48404,48573,48741,48910,49078,49247,49415,49584,49752,49921,50089,50258,50426,50595,50763,50932,51100,51269,51437,51606,51774,51943,52111,52280,52448,52617,52785,52954,53122,53291,53459,53628,53796,53965,54133,54302,54470,54639,54807,54976,55144,55313,55481,55650,55818,55987,56155,56324,56492,56661,56829,56998,57166,57335,57503,57672,57840,58009,58177,58346,58514,58683,58851,59020,59188,59357,59525,59694,59862,60031,60199,60368,60536,60705,60873,61042,61210,61379,61547,61716,61884,62053,62221,62390,62558,62727,62895,63064,63232,63401,63569,63738,63906,64075,64243,64412,64580,64749,64917,65086,65254,65423,65591,65760,65928,66097,66265,66434,66602,66771,66939,67108,67276,67445,67613,67782,67950,68119,68287,68456,68624,68793,68961,69130,69298,69467,69635,69804,69972,70141,70309,70478,70646,70815,70983,71152,71320,71489,71657,71826,71994,72163
-
 //Crusader, Crusader (Peco), Paladin, Paladin (Peco), Baby Crusader, Baby Crusader (Peco)
 1,500,14:21:4015:4022:4037:4044,0,40,47,56,62,81,94,108,128,147,165,184,204,225,247,271,296,322,349,377,406,436,467,499,532,567,603,640,678,717,757,798,840,883,927,973,1020,1068,1117,1167,1218,1270,1323,1377,1432,1489,1547,1606,1666,1727,1789,1852,1916,1981,2047,2115,2184,2254,2325,2397,2470,2544,2619,2695,2772,2851,2931,3012,3094,3177,3261,3346,3432,3519,3607,3697,3788,3880,3973,4067,4162,4258,4355,4453,4552,4653,4755,4858,4962,5067,5173,5280,5388,5497,5607,5719,5832,5946,6061,6177,6292,6408,6523,6639,6754,6870,6985,7101,7216,7332,7447,7563,7678,7794,7909,8025,8140,8256,8371,8487,8602,8718,8833,8949,9064,9180,9295,9411,9526,9642,9757,9873,9988,10104,10219,10335,10450,10566,10681,10797,10912,11028,11143,11259,11374,11490,11605,11721,11836,11952,12067,12183,12298,12414,12529,12645,12760,12876,12991,13107,13222,13338,13453,13569,13684,13800,13915,14031,14146,14262,14377,14493,14608,14724,14839,14955,15070,15186,15301,15417,15532,15648,15763,15879,15994,16110,16225,16341,16456,16572,16687,16803,16918,17034,17149,17265,17380,17496,17611,17727,17842,17958,18073,18189,18304,18420,18535,18651,18766,18882,18997,19113,19228,19344,19459,19575,19690,19806,19921,20037,20152,20268,20383,20499,20614,20730,20845,20961,21076,21192,21307,21423,21538,21654,21769,21885,22000,22116,22231,22347,22462,22578,22693,22809,22924,23040,23155,23271,23386,23502,23617,23733,23848,23964,24079,24195,24310,24426,24541,24657,24772,24888,25003,25119,25234,25350,25465,25581,25696,25812,25927,26043,26158,26274,26389,26505,26620,26736,26851,26967,27082,27198,27313,27429,27544,27660,27775,27891,28006,28122,28237,28353,28468,28584,28699,28815,28930,29046,29161,29277,29392,29508,29623,29739,29854,29970,30085,30201,30316,30432,30547,30663,30778,30894,31009,31125,31240,31356,31471,31587,31702,31818,31933,32049,32164,32280,32395,32511,32626,32742,32857,32973,33088,33204,33319,33435,33550,33666,33781,33897,34012,34128,34243,34359,34474,34590,34705,34821,34936,35052,35167,35283,35398,35514,35629,35745,35860,35976,36091,36207,36322,36438,36553,36669,36784,36900,37015,37131,37246,37362,37477,37593,37708,37824,37939,38055,38170,38286,38401,38517,38632,38748,38863,38979,39094,39210,39325,39441,39556,39672,39787,39903,40018,40134,40249,40365,40480,40596,40711,40827,40942,41058,41173,41289,41404,41520,41635,41751,41866,41982,42097,42213,42328,42444,42559,42675,42790,42906,43021,43137,43252,43368,43483,43599,43714,43830,43945,44061,44176,44292,44407,44523,44638,44754,44869,44985,45100,45216,45331,45447,45562,45678,45793,45909,46024,46140,46255,46371,46486,46602,46717,46833,46948,47064,47179,47295,47410,47526,47641,47757,47872,47988,48103,48219,48334,48450,48565,48681,48796,48912,49027,49143,49258,49374,49489,49605,49720,49836,49951,50067,50182,50298,50413,50529,50644,50760,50875,50991,51106,51222,51337,51453,51568,51684,51799,51915,52030,52146,52261,52377,52492
 
-//Royal Guard, Royal Guard T, Royal Guard (Gryphon), Royal Guard T (Gryphon), Baby Royal Guard, Baby Royal Guard (Gryphon)
-1,500,4066:4073:4082:4083:4102:4110,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,6050,6093,6208,6324,6441,6559,6678,6798,6920,7043,7167,7292,7418,7545,7673,7802,7932,8063,8196,8330,8465,8601,8738,8876,9015,9155,9296,9438,9582,9727,9873,10020,10168,10317,10467,10618,10770,10923,11078,11234,11391,11549,11708,11868,12029,12191,12354,12518,12684,12851,13019,13188,13356,13525,13693,13862,14030,14199,14367,14536,14704,14873,15041,15210,15378,15547,15715,15884,16052,16221,16389,16558,16726,16895,17063,17232,17400,17569,17737,17906,18074,18243,18411,18580,18748,18917,19085,19254,19422,19591,19759,19928,20096,20265,20433,20602,20770,20939,21107,21276,21444,21613,21781,21950,22118,22287,22455,22624,22792,22961,23129,23298,23466,23635,23803,23972,24140,24309,24477,24646,24814,24983,25151,25320,25488,25657,25825,25994,26162,26331,26499,26668,26836,27005,27173,27342,27510,27679,27847,28016,28184,28353,28521,28690,28858,29027,29195,29364,29532,29701,29869,30038,30206,30375,30543,30712,30880,31049,31217,31386,31554,31723,31891,32060,32228,32397,32565,32734,32902,33071,33239,33408,33576,33745,33913,34082,34250,34419,34587,34756,34924,35093,35261,35430,35598,35767,35935,36104,36272,36441,36609,36778,36946,37115,37283,37452,37620,37789,37957,38126,38294,38463,38631,38800,38968,39137,39305,39474,39642,39811,39979,40148,40316,40485,40653,40822,40990,41159,41327,41496,41664,41833,42001,42170,42338,42507,42675,42844,43012,43181,43349,43518,43686,43855,44023,44192,44360,44529,44697,44866,45034,45203,45371,45540,45708,45877,46045,46214,46382,46551,46719,46888,47056,47225,47393,47562,47730,47899,48067,48236,48404,48573,48741,48910,49078,49247,49415,49584,49752,49921,50089,50258,50426,50595,50763,50932,51100,51269,51437,51606,51774,51943,52111,52280,52448,52617,52785,52954,53122,53291,53459,53628,53796,53965,54133,54302,54470,54639,54807,54976,55144,55313,55481,55650,55818,55987,56155,56324,56492,56661,56829,56998,57166,57335,57503,57672,57840,58009,58177,58346,58514,58683,58851,59020,59188,59357,59525,59694,59862,60031,60199,60368,60536,60705,60873,61042,61210,61379,61547,61716,61884,62053,62221,62390,62558,62727,62895,63064,63232,63401,63569,63738,63906,64075,64243,64412,64580,64749,64917,65086,65254,65423,65591,65760,65928,66097,66265,66434,66602,66771,66939,67108,67276,67445,67613,67782,67950,68119,68287,68456,68624,68793,68961,69130,69298,69467,69635,69804,69972,70141,70309,70478,70646,70815,70983,71152,71320,71489,71657,71826,71994,72163
-
 //Monk, Champion, Baby Monk
 1,500,15:4016:4038,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,2729,2799,2871,2943,3017,3091,3166,3241,3318,3395,3474,3553,3634,3715,3798,3881,3965,4049,4135,4221,4309,4397,4487,4577,4669,4761,4854,4947,5042,5137,5232,5327,5422,5517,5612,5707,5802,5897,5992,6087,6182,6277,6372,6467,6562,6657,6752,6847,6942,7037,7132,7227,7322,7417,7512,7607,7702,7797,7892,7987,8082,8177,8272,8367,8462,8557,8652,8747,8842,8937,9032,9127,9222,9317,9412,9507,9602,9697,9792,9887,9982,10077,10172,10267,10362,10457,10552,10647,10742,10837,10932,11027,11122,11217,11312,11407,11502,11597,11692,11787,11882,11977,12072,12167,12262,12357,12452,12547,12642,12737,12832,12927,13022,13117,13212,13307,13402,13497,13592,13687,13782,13877,13972,14067,14162,14257,14352,14447,14542,14637,14732,14827,14922,15017,15112,15207,15302,15397,15492,15587,15682,15777,15872,15967,16062,16157,16252,16347,16442,16537,16632,16727,16822,16917,17012,17107,17202,17297,17392,17487,17582,17677,17772,17867,17962,18057,18152,18247,18342,18437,18532,18627,18722,18817,18912,19007,19102,19197,19292,19387,19482,19577,19672,19767,19862,19957,20052,20147,20242,20337,20432,20527,20622,20717,20812,20907,21002,21097,21192,21287,21382,21477,21572,21667,21762,21857,21952,22047,22142,22237,22332,22427,22522,22617,22712,22807,22902,22997,23092,23187,23282,23377,23472,23567,23662,23757,23852,23947,24042,24137,24232,24327,24422,24517,24612,24707,24802,24897,24992,25087,25182,25277,25372,25467,25562,25657,25752,25847,25942,26037,26132,26227,26322,26417,26512,26607,26702,26797,26892,26987,27082,27177,27272,27367,27462,27557,27652,27747,27842,27937,28032,28127,28222,28317,28412,28507,28602,28697,28792,28887,28982,29077,29172,29267,29362,29457,29552,29647,29742,29837,29932,30027,30122,30217,30312,30407,30502,30597,30692,30787,30882,30977,31072,31167,31262,31357,31452,31547,31642,31737,31832,31927,32022,32117,32212,32307,32402,32497,32592,32687,32782,32877,32972,33067,33162,33257,33352,33447,33542,33637,33732,33827,33922,34017,34112,34207,34302,34397,34492,34587,34682,34777,34872,34967,35062,35157,35252,35347,35442,35537,35632,35727,35822,35917,36012,36107,36202,36297,36392,36487,36582,36677,36772,36867,36962,37057,37152,37247,37342,37437,37532,37627,37722,37817,37912,38007,38102,38197,38292,38387,38482,38577,38672,38767,38862,38957,39052,39147,39242,39337,39432,39527,39622,39717,39812,39907,40002,40097,40192,40287,40382,40477,40572,40667,40762,40857,40952,41047,41142,41237,41332,41427,41522,41617,41712,41807,41902,41997,42092,42187,42282,42377,42472,42567,42662,42757,42852,42947,43042,43137,43232
 
-//Sura, Sura T, Baby Sura
-1,500,4070:4077:4106,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,5050,5082,5176,5271,5367,5464,5562,5661,5761,5862,5963,6065,6168,6272,6377,6483,6590,6698,6807,6917,7027,7138,7250,7363,7477,7592,7708,7825,7943,8062,8181,8301,8422,8544,8667,8791,8916,9042,9169,9297,9425,9554,9684,9815,9947,10080,10214,10349,10485,10622,10759,10897,11034,11172,11309,11447,11584,11722,11859,11997,12134,12272,12409,12547,12684,12822,12959,13097,13234,13372,13509,13647,13784,13922,14059,14197,14334,14472,14609,14747,14884,15022,15159,15297,15434,15572,15709,15847,15984,16122,16259,16397,16534,16672,16809,16947,17084,17222,17359,17497,17634,17772,17909,18047,18184,18322,18459,18597,18734,18872,19009,19147,19284,19422,19559,19697,19834,19972,20109,20247,20384,20522,20659,20797,20934,21072,21209,21347,21484,21622,21759,21897,22034,22172,22309,22447,22584,22722,22859,22997,23134,23272,23409,23547,23684,23822,23959,24097,24234,24372,24509,24647,24784,24922,25059,25197,25334,25472,25609,25747,25884,26022,26159,26297,26434,26572,26709,26847,26984,27122,27259,27397,27534,27672,27809,27947,28084,28222,28359,28497,28634,28772,28909,29047,29184,29322,29459,29597,29734,29872,30009,30147,30284,30422,30559,30697,30834,30972,31109,31247,31384,31522,31659,31797,31934,32072,32209,32347,32484,32622,32759,32897,33034,33172,33309,33447,33584,33722,33859,33997,34134,34272,34409,34547,34684,34822,34959,35097,35234,35372,35509,35647,35784,35922,36059,36197,36334,36472,36609,36747,36884,37022,37159,37297,37434,37572,37709,37847,37984,38122,38259,38397,38534,38672,38809,38947,39084,39222,39359,39497,39634,39772,39909,40047,40184,40322,40459,40597,40734,40872,41009,41147,41284,41422,41559,41697,41834,41972,42109,42247,42384,42522,42659,42797,42934,43072,43209,43347,43484,43622,43759,43897,44034,44172,44309,44447,44584,44722,44859,44997,45134,45272,45409,45547,45684,45822,45959,46097,46234,46372,46509,46647,46784,46922,47059,47197,47334,47472,47609,47747,47884,48022,48159,48297,48434,48572,48709,48847,48984,49122,49259,49397,49534,49672,49809,49947,50084,50222,50359,50497,50634,50772,50909,51047,51184,51322,51459,51597,51734,51872,52009,52147,52284,52422,52559,52697,52834,52972,53109,53247,53384,53522,53659,53797,53934,54072,54209,54347,54484,54622,54759,54897,55034,55172,55309,55447,55584,55722,55859,55997,56134,56272,56409,56547,56684,56822,56959,57097,57234,57372,57509,57647,57784,57922,58059,58197,58334,58472,58609,58747,58884,59022
-
 //Sage, Professor, Baby Sage
 1,500,16:4017:4039,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,2315,2374,2434,2495,2556,2618,2681,2745,2809,2874,2940,3007,3074,3142,3211,3281,3351,3422,3494,3567,3640,3714,3789,3865,3941,4018,4096,4175,4254,4333,4412,4491,4570,4649,4728,4807,4886,4965,5044,5123,5202,5281,5360,5439,5518,5597,5676,5755,5834,5913,5992,6071,6150,6229,6308,6387,6466,6545,6624,6703,6782,6861,6940,7019,7098,7177,7256,7335,7414,7493,7572,7651,7730,7809,7888,7967,8046,8125,8204,8283,8362,8441,8520,8599,8678,8757,8836,8915,8994,9073,9152,9231,9310,9389,9468,9547,9626,9705,9784,9863,9942,10021,10100,10179,10258,10337,10416,10495,10574,10653,10732,10811,10890,10969,11048,11127,11206,11285,11364,11443,11522,11601,11680,11759,11838,11917,11996,12075,12154,12233,12312,12391,12470,12549,12628,12707,12786,12865,12944,13023,13102,13181,13260,13339,13418,13497,13576,13655,13734,13813,13892,13971,14050,14129,14208,14287,14366,14445,14524,14603,14682,14761,14840,14919,14998,15077,15156,15235,15314,15393,15472,15551,15630,15709,15788,15867,15946,16025,16104,16183,16262,16341,16420,16499,16578,16657,16736,16815,16894,16973,17052,17131,17210,17289,17368,17447,17526,17605,17684,17763,17842,17921,18000,18079,18158,18237,18316,18395,18474,18553,18632,18711,18790,18869,18948,19027,19106,19185,19264,19343,19422,19501,19580,19659,19738,19817,19896,19975,20054,20133,20212,20291,20370,20449,20528,20607,20686,20765,20844,20923,21002,21081,21160,21239,21318,21397,21476,21555,21634,21713,21792,21871,21950,22029,22108,22187,22266,22345,22424,22503,22582,22661,22740,22819,22898,22977,23056,23135,23214,23293,23372,23451,23530,23609,23688,23767,23846,23925,24004,24083,24162,24241,24320,24399,24478,24557,24636,24715,24794,24873,24952,25031,25110,25189,25268,25347,25426,25505,25584,25663,25742,25821,25900,25979,26058,26137,26216,26295,26374,26453,26532,26611,26690,26769,26848,26927,27006,27085,27164,27243,27322,27401,27480,27559,27638,27717,27796,27875,27954,28033,28112,28191,28270,28349,28428,28507,28586,28665,28744,28823,28902,28981,29060,29139,29218,29297,29376,29455,29534,29613,29692,29771,29850,29929,30008,30087,30166,30245,30324,30403,30482,30561,30640,30719,30798,30877,30956,31035,31114,31193,31272,31351,31430,31509,31588,31667,31746,31825,31904,31983,32062,32141,32220,32299,32378,32457,32536,32615,32694,32773,32852,32931,33010,33089,33168,33247,33326,33405,33484,33563,33642,33721,33800,33879,33958,34037,34116,34195,34274,34353,34432,34511,34590,34669,34748,34827,34906,34985,35064,35143,35222,35301,35380,35459,35538,35617,35696,35775,35854,35933
 
-//Sorcerer, Sorcerer T, Baby Sorcerer
-1,500,4067:4074:4103,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,4080,4103,4180,4257,4335,4414,4494,4574,4655,4737,4819,4902,4986,5071,5157,5244,5332,5420,5509,5599,5689,5780,5872,5965,6058,6153,6248,6344,6441,6539,6637,6737,6837,6937,7038,7140,7243,7347,7451,7557,7663,7770,7878,7987,8097,8207,8318,8429,8541,8654,8768,8883,8997,9112,9226,9341,9455,9570,9684,9799,9913,10028,10142,10257,10371,10486,10600,10715,10829,10944,11058,11173,11287,11402,11516,11631,11745,11860,11974,12089,12203,12318,12432,12547,12661,12776,12890,13005,13119,13234,13348,13463,13577,13692,13806,13921,14035,14150,14264,14379,14493,14608,14722,14837,14951,15066,15180,15295,15409,15524,15638,15753,15867,15982,16096,16211,16325,16440,16554,16669,16783,16898,17012,17127,17241,17356,17470,17585,17699,17814,17928,18043,18157,18272,18386,18501,18615,18730,18844,18959,19073,19188,19302,19417,19531,19646,19760,19875,19989,20104,20218,20333,20447,20562,20676,20791,20905,21020,21134,21249,21363,21478,21592,21707,21821,21936,22050,22165,22279,22394,22508,22623,22737,22852,22966,23081,23195,23310,23424,23539,23653,23768,23882,23997,24111,24226,24340,24455,24569,24684,24798,24913,25027,25142,25256,25371,25485,25600,25714,25829,25943,26058,26172,26287,26401,26516,26630,26745,26859,26974,27088,27203,27317,27432,27546,27661,27775,27890,28004,28119,28233,28348,28462,28577,28691,28806,28920,29035,29149,29264,29378,29493,29607,29722,29836,29951,30065,30180,30294,30409,30523,30638,30752,30867,30981,31096,31210,31325,31439,31554,31668,31783,31897,32012,32126,32241,32355,32470,32584,32699,32813,32928,33042,33157,33271,33386,33500,33615,33729,33844,33958,34073,34187,34302,34416,34531,34645,34760,34874,34989,35103,35218,35332,35447,35561,35676,35790,35905,36019,36134,36248,36363,36477,36592,36706,36821,36935,37050,37164,37279,37393,37508,37622,37737,37851,37966,38080,38195,38309,38424,38538,38653,38767,38882,38996,39111,39225,39340,39454,39569,39683,39798,39912,40027,40141,40256,40370,40485,40599,40714,40828,40943,41057,41172,41286,41401,41515,41630,41744,41859,41973,42088,42202,42317,42431,42546,42660,42775,42889,43004,43118,43233,43347,43462,43576,43691,43805,43920,44034,44149,44263,44378,44492,44607,44721,44836,44950,45065,45179,45294,45408,45523,45637,45752,45866,45981,46095,46210,46324,46439,46553,46668,46782,46897,47011,47126,47240,47355,47469,47584,47698,47813,47927,48042,48156,48271,48385,48500,48614,48729,48843,48958
-
 //Rogue, Stalker, Baby Rogue
 1,500,17:4018:4040,0,40,47,55,63,72,82,93,105,118,132,146,161,177,194,212,231,250,270,291,313,336,360,385,410,436,463,491,520,550,581,612,644,677,711,746,782,818,855,893,932,972,1013,1055,1097,1140,1184,1229,1275,1322,1370,1418,1467,1517,1568,1620,1673,1726,1780,1835,1891,1948,2006,2065,2124,2184,2245,2307,2370,2434,2499,2564,2630,2697,2765,2834,2904,2974,3045,3117,3190,3264,3339,3415,3491,3568,3646,3725,3805,3886,3968,4050,4133,4217,4302,4388,4475,4562,4650,4739,4827,4916,5004,5093,5181,5270,5358,5447,5535,5624,5712,5801,5889,5978,6066,6155,6243,6332,6420,6509,6597,6686,6774,6863,6951,7040,7128,7217,7305,7394,7482,7571,7659,7748,7836,7925,8013,8102,8190,8279,8367,8456,8544,8633,8721,8810,8898,8987,9075,9164,9252,9341,9429,9518,9606,9695,9783,9872,9960,10049,10137,10226,10314,10403,10491,10580,10668,10757,10845,10934,11022,11111,11199,11288,11376,11465,11553,11642,11730,11819,11907,11996,12084,12173,12261,12350,12438,12527,12615,12704,12792,12881,12969,13058,13146,13235,13323,13412,13500,13589,13677,13766,13854,13943,14031,14120,14208,14297,14385,14474,14562,14651,14739,14828,14916,15005,15093,15182,15270,15359,15447,15536,15624,15713,15801,15890,15978,16067,16155,16244,16332,16421,16509,16598,16686,16775,16863,16952,17040,17129,17217,17306,17394,17483,17571,17660,17748,17837,17925,18014,18102,18191,18279,18368,18456,18545,18633,18722,18810,18899,18987,19076,19164,19253,19341,19430,19518,19607,19695,19784,19872,19961,20049,20138,20226,20315,20403,20492,20580,20669,20757,20846,20934,21023,21111,21200,21288,21377,21465,21554,21642,21731,21819,21908,21996,22085,22173,22262,22350,22439,22527,22616,22704,22793,22881,22970,23058,23147,23235,23324,23412,23501,23589,23678,23766,23855,23943,24032,24120,24209,24297,24386,24474,24563,24651,24740,24828,24917,25005,25094,25182,25271,25359,25448,25536,25625,25713,25802,25890,25979,26067,26156,26244,26333,26421,26510,26598,26687,26775,26864,26952,27041,27129,27218,27306,27395,27483,27572,27660,27749,27837,27926,28014,28103,28191,28280,28368,28457,28545,28634,28722,28811,28899,28988,29076,29165,29253,29342,29430,29519,29607,29696,29784,29873,29961,30050,30138,30227,30315,30404,30492,30581,30669,30758,30846,30935,31023,31112,31200,31289,31377,31466,31554,31643,31731,31820,31908,31997,32085,32174,32262,32351,32439,32528,32616,32705,32793,32882,32970,33059,33147,33236,33324,33413,33501,33590,33678,33767,33855,33944,34032,34121,34209,34298,34386,34475,34563,34652,34740,34829,34917,35006,35094,35183,35271,35360,35448,35537,35625,35714,35802,35891,35979,36068,36156,36245,36333,36422,36510,36599,36687,36776,36864,36953,37041,37130,37218,37307,37395,37484,37572,37661,37749,37838,37926,38015,38103,38192,38280,38369,38457,38546,38634,38723,38811,38900,38988,39077,39165,39254,39342,39431,39519,39608,39696,39785,39873,39962,40050,40139,40227
 
-//Shadow Chaser, Shadow Chaser T, Baby Shadow Chaser
-1,500,4072:4079:4108,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,6050,6093,6208,6324,6441,6559,6678,6798,6920,7043,7167,7292,7418,7545,7673,7802,7932,8063,8196,8330,8465,8601,8738,8876,9015,9155,9296,9438,9582,9727,9873,10020,10168,10317,10467,10618,10770,10923,11078,11234,11391,11549,11708,11868,12029,12191,12354,12518,12684,12851,13019,13188,13356,13525,13693,13862,14030,14199,14367,14536,14704,14873,15041,15210,15378,15547,15715,15884,16052,16221,16389,16558,16726,16895,17063,17232,17400,17569,17737,17906,18074,18243,18411,18580,18748,18917,19085,19254,19422,19591,19759,19928,20096,20265,20433,20602,20770,20939,21107,21276,21444,21613,21781,21950,22118,22287,22455,22624,22792,22961,23129,23298,23466,23635,23803,23972,24140,24309,24477,24646,24814,24983,25151,25320,25488,25657,25825,25994,26162,26331,26499,26668,26836,27005,27173,27342,27510,27679,27847,28016,28184,28353,28521,28690,28858,29027,29195,29364,29532,29701,29869,30038,30206,30375,30543,30712,30880,31049,31217,31386,31554,31723,31891,32060,32228,32397,32565,32734,32902,33071,33239,33408,33576,33745,33913,34082,34250,34419,34587,34756,34924,35093,35261,35430,35598,35767,35935,36104,36272,36441,36609,36778,36946,37115,37283,37452,37620,37789,37957,38126,38294,38463,38631,38800,38968,39137,39305,39474,39642,39811,39979,40148,40316,40485,40653,40822,40990,41159,41327,41496,41664,41833,42001,42170,42338,42507,42675,42844,43012,43181,43349,43518,43686,43855,44023,44192,44360,44529,44697,44866,45034,45203,45371,45540,45708,45877,46045,46214,46382,46551,46719,46888,47056,47225,47393,47562,47730,47899,48067,48236,48404,48573,48741,48910,49078,49247,49415,49584,49752,49921,50089,50258,50426,50595,50763,50932,51100,51269,51437,51606,51774,51943,52111,52280,52448,52617,52785,52954,53122,53291,53459,53628,53796,53965,54133,54302,54470,54639,54807,54976,55144,55313,55481,55650,55818,55987,56155,56324,56492,56661,56829,56998,57166,57335,57503,57672,57840,58009,58177,58346,58514,58683,58851,59020,59188,59357,59525,59694,59862,60031,60199,60368,60536,60705,60873,61042,61210,61379,61547,61716,61884,62053,62221,62390,62558,62727,62895,63064,63232,63401,63569,63738,63906,64075,64243,64412,64580,64749,64917,65086,65254,65423,65591,65760,65928,66097,66265,66434,66602,66771,66939,67108,67276,67445,67613,67782,67950,68119,68287,68456,68624,68793,68961,69130,69298,69467,69635,69804,69972,70141,70309,70478,70646,70815,70983,71152,71320,71489,71657,71826,71994,72163
-
 //Alchemist, Creator, Baby Alchemist
 1,500,18:4019:4041,0,40,47,55,64,74,84,95,107,120,134,149,165,182,200,219,238,258,279,301,324,348,373,399,426,454,482,511,541,572,604,637,671,706,742,779,816,854,893,933,974,1016,1059,1103,1148,1194,1240,1287,1335,1384,1434,1485,1537,1590,1644,1699,1754,1810,1867,1925,1984,2044,2105,2167,2230,2294,2358,2423,2489,2556,2624,2693,2763,2834,2906,2979,3052,3126,3201,3277,3354,3432,3511,3591,3672,3754,3836,3919,4003,4088,4174,4261,4349,4438,4528,4619,4710,4802,4895,4989,5082,5176,5269,5363,5456,5550,5643,5737,5830,5924,6017,6111,6204,6298,6391,6485,6578,6672,6765,6859,6952,7046,7139,7233,7326,7420,7513,7607,7700,7794,7887,7981,8074,8168,8261,8355,8448,8542,8635,8729,8822,8916,9009,9103,9196,9290,9383,9477,9570,9664,9757,9851,9944,10038,10131,10225,10318,10412,10505,10599,10692,10786,10879,10973,11066,11160,11253,11347,11440,11534,11627,11721,11814,11908,12001,12095,12188,12282,12375,12469,12562,12656,12749,12843,12936,13030,13123,13217,13310,13404,13497,13591,13684,13778,13871,13965,14058,14152,14245,14339,14432,14526,14619,14713,14806,14900,14993,15087,15180,15274,15367,15461,15554,15648,15741,15835,15928,16022,16115,16209,16302,16396,16489,16583,16676,16770,16863,16957,17050,17144,17237,17331,17424,17518,17611,17705,17798,17892,17985,18079,18172,18266,18359,18453,18546,18640,18733,18827,18920,19014,19107,19201,19294,19388,19481,19575,19668,19762,19855,19949,20042,20136,20229,20323,20416,20510,20603,20697,20790,20884,20977,21071,21164,21258,21351,21445,21538,21632,21725,21819,21912,22006,22099,22193,22286,22380,22473,22567,22660,22754,22847,22941,23034,23128,23221,23315,23408,23502,23595,23689,23782,23876,23969,24063,24156,24250,24343,24437,24530,24624,24717,24811,24904,24998,25091,25185,25278,25372,25465,25559,25652,25746,25839,25933,26026,26120,26213,26307,26400,26494,26587,26681,26774,26868,26961,27055,27148,27242,27335,27429,27522,27616,27709,27803,27896,27990,28083,28177,28270,28364,28457,28551,28644,28738,28831,28925,29018,29112,29205,29299,29392,29486,29579,29673,29766,29860,29953,30047,30140,30234,30327,30421,30514,30608,30701,30795,30888,30982,31075,31169,31262,31356,31449,31543,31636,31730,31823,31917,32010,32104,32197,32291,32384,32478,32571,32665,32758,32852,32945,33039,33132,33226,33319,33413,33506,33600,33693,33787,33880,33974,34067,34161,34254,34348,34441,34535,34628,34722,34815,34909,35002,35096,35189,35283,35376,35470,35563,35657,35750,35844,35937,36031,36124,36218,36311,36405,36498,36592,36685,36779,36872,36966,37059,37153,37246,37340,37433,37527,37620,37714,37807,37901,37994,38088,38181,38275,38368,38462,38555,38649,38742,38836,38929,39023,39116,39210,39303,39397,39490,39584,39677,39771,39864,39958,40051,40145,40238,40332,40425,40519,40612,40706,40799,40893,40986,41080,41173,41267,41360,41454,41547,41641,41734,41828,41921,42015,42108,42202,42295,42389,42482
 
-//Genetic, Genetic T, Baby Genetic
-1,500,4071:4078:4107,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,4730,4766,4853,4940,5027,5113,5200,5287,5374,5461,5548,5635,5722,5809,5896,5982,6069,6156,6243,6330,6417,6504,6591,6678,6765,6851,6938,7025,7112,7199,7286,7373,7460,7547,7634,7720,7807,7894,7981,8068,8155,8242,8329,8416,8503,8589,8676,8763,8850,8937,9024,9111,9198,9285,9372,9459,9546,9633,9720,9807,9894,9981,10068,10155,10242,10329,10416,10503,10590,10677,10764,10851,10938,11025,11112,11199,11286,11373,11460,11547,11634,11721,11808,11895,11982,12069,12156,12243,12330,12417,12504,12591,12678,12765,12852,12939,13026,13113,13200,13287,13374,13461,13548,13635,13722,13809,13896,13983,14070,14157,14244,14331,14418,14505,14592,14679,14766,14853,14940,15027,15114,15201,15288,15375,15462,15549,15636,15723,15810,15897,15984,16071,16158,16245,16332,16419,16506,16593,16680,16767,16854,16941,17028,17115,17202,17289,17376,17463,17550,17637,17724,17811,17898,17985,18072,18159,18246,18333,18420,18507,18594,18681,18768,18855,18942,19029,19116,19203,19290,19377,19464,19551,19638,19725,19812,19899,19986,20073,20160,20247,20334,20421,20508,20595,20682,20769,20856,20943,21030,21117,21204,21291,21378,21465,21552,21639,21726,21813,21900,21987,22074,22161,22248,22335,22422,22509,22596,22683,22770,22857,22944,23031,23118,23205,23292,23379,23466,23553,23640,23727,23814,23901,23988,24075,24162,24249,24336,24423,24510,24597,24684,24771,24858,24945,25032,25119,25206,25293,25380,25467,25554,25641,25728,25815,25902,25989,26076,26163,26250,26337,26424,26511,26598,26685,26772,26859,26946,27033,27120,27207,27294,27381,27468,27555,27642,27729,27816,27903,27990,28077,28164,28251,28338,28425,28512,28599,28686,28773,28860,28947,29034,29121,29208,29295,29382,29469,29556,29643,29730,29817,29904,29991,30078,30165,30252,30339,30426,30513,30600,30687,30774,30861,30948,31035,31122,31209,31296,31383,31470,31557,31644,31731,31818,31905,31992,32079,32166,32253,32340,32427,32514,32601,32688,32775,32862,32949,33036,33123,33210,33297,33384,33471,33558,33645,33732,33819,33906,33993,34080,34167,34254,34341,34428,34515,34602,34689,34776,34863,34950,35037,35124,35211,35298,35385,35472,35559,35646,35733,35820,35907,35994,36081,36168,36255,36342,36429,36516,36603,36690,36777,36864,36951,37038,37125,37212,37299,37386,37473,37560,37647,37734,37821,37908,37995,38082,38169,38256,38343,38430,38517,38604,38691,38778,38865,38952,39039,39126,39213,39300,39387,39474,39561
-
 //Bard, Clown, Baby Bard
 1,500,19:4020:4042,0,40,47,54,62,71,81,91,102,114,127,140,154,169,180,196,212,224,242,260,278,296,316,330,350,371,393,415,438,451,477,503,530,558,587,616,646,677,709,741,774,808,843,878,914,951,989,1027,1066,1106,1147,1188,1230,1273,1317,1361,1406,1452,1499,1546,1594,1643,1693,1743,1794,1846,1899,1952,2006,2061,2117,2173,2230,2288,2347,2406,2466,2527,2589,2651,2714,2778,2843,2908,2974,3041,3109,3177,3246,3316,3387,3458,3530,3603,3677,3751,3826,3902,3979,4056,4133,4210,4287,4364,4441,4518,4595,4672,4749,4826,4903,4980,5057,5134,5211,5288,5365,5442,5519,5596,5673,5750,5827,5904,5981,6058,6135,6212,6289,6366,6443,6520,6597,6674,6751,6828,6905,6982,7059,7136,7213,7290,7367,7444,7521,7598,7675,7752,7829,7906,7983,8060,8137,8214,8291,8368,8445,8522,8599,8676,8753,8830,8907,8984,9061,9138,9215,9292,9369,9446,9523,9600,9677,9754,9831,9908,9985,10062,10139,10216,10293,10370,10447,10524,10601,10678,10755,10832,10909,10986,11063,11140,11217,11294,11371,11448,11525,11602,11679,11756,11833,11910,11987,12064,12141,12218,12295,12372,12449,12526,12603,12680,12757,12834,12911,12988,13065,13142,13219,13296,13373,13450,13527,13604,13681,13758,13835,13912,13989,14066,14143,14220,14297,14374,14451,14528,14605,14682,14759,14836,14913,14990,15067,15144,15221,15298,15375,15452,15529,15606,15683,15760,15837,15914,15991,16068,16145,16222,16299,16376,16453,16530,16607,16684,16761,16838,16915,16992,17069,17146,17223,17300,17377,17454,17531,17608,17685,17762,17839,17916,17993,18070,18147,18224,18301,18378,18455,18532,18609,18686,18763,18840,18917,18994,19071,19148,19225,19302,19379,19456,19533,19610,19687,19764,19841,19918,19995,20072,20149,20226,20303,20380,20457,20534,20611,20688,20765,20842,20919,20996,21073,21150,21227,21304,21381,21458,21535,21612,21689,21766,21843,21920,21997,22074,22151,22228,22305,22382,22459,22536,22613,22690,22767,22844,22921,22998,23075,23152,23229,23306,23383,23460,23537,23614,23691,23768,23845,23922,23999,24076,24153,24230,24307,24384,24461,24538,24615,24692,24769,24846,24923,25000,25077,25154,25231,25308,25385,25462,25539,25616,25693,25770,25847,25924,26001,26078,26155,26232,26309,26386,26463,26540,26617,26694,26771,26848,26925,27002,27079,27156,27233,27310,27387,27464,27541,27618,27695,27772,27849,27926,28003,28080,28157,28234,28311,28388,28465,28542,28619,28696,28773,28850,28927,29004,29081,29158,29235,29312,29389,29466,29543,29620,29697,29774,29851,29928,30005,30082,30159,30236,30313,30390,30467,30544,30621,30698,30775,30852,30929,31006,31083,31160,31237,31314,31391,31468,31545,31622,31699,31776,31853,31930,32007,32084,32161,32238,32315,32392,32469,32546,32623,32700,32777,32854,32931,33008,33085,33162,33239,33316,33393,33470,33547,33624,33701,33778,33855,33932,34009,34086,34163,34240,34317,34394,34471,34548,34625,34702,34779,34856,34933
 
-//Minstrel, Minstrel T, Baby Minstrel
-1,500,4068:4075:4104,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,4800,4828,4918,5009,5101,5194,5288,5382,5477,5573,5670,5768,5867,5967,6068,6170,6273,6377,6482,6588,6694,6801,6909,7018,7128,7239,7351,7464,7578,7693,7809,7926,8044,8162,8281,8401,8522,8644,8767,8891,9016,9142,9269,9397,9526,9656,9786,9917,10049,10182,10316,10451,10585,10720,10854,10989,11123,11258,11392,11527,11661,11796,11930,12065,12199,12334,12468,12603,12737,12872,13006,13141,13275,13410,13544,13679,13813,13948,14082,14217,14351,14486,14620,14755,14889,15024,15158,15293,15427,15562,15696,15831,15965,16100,16234,16369,16503,16638,16772,16907,17041,17176,17310,17445,17579,17714,17848,17983,18117,18252,18386,18521,18655,18790,18924,19059,19193,19328,19462,19597,19731,19866,20000,20135,20269,20404,20538,20673,20807,20942,21076,21211,21345,21480,21614,21749,21883,22018,22152,22287,22421,22556,22690,22825,22959,23094,23228,23363,23497,23632,23766,23901,24035,24170,24304,24439,24573,24708,24842,24977,25111,25246,25380,25515,25649,25784,25918,26053,26187,26322,26456,26591,26725,26860,26994,27129,27263,27398,27532,27667,27801,27936,28070,28205,28339,28474,28608,28743,28877,29012,29146,29281,29415,29550,29684,29819,29953,30088,30222,30357,30491,30626,30760,30895,31029,31164,31298,31433,31567,31702,31836,31971,32105,32240,32374,32509,32643,32778,32912,33047,33181,33316,33450,33585,33719,33854,33988,34123,34257,34392,34526,34661,34795,34930,35064,35199,35333,35468,35602,35737,35871,36006,36140,36275,36409,36544,36678,36813,36947,37082,37216,37351,37485,37620,37754,37889,38023,38158,38292,38427,38561,38696,38830,38965,39099,39234,39368,39503,39637,39772,39906,40041,40175,40310,40444,40579,40713,40848,40982,41117,41251,41386,41520,41655,41789,41924,42058,42193,42327,42462,42596,42731,42865,43000,43134,43269,43403,43538,43672,43807,43941,44076,44210,44345,44479,44614,44748,44883,45017,45152,45286,45421,45555,45690,45824,45959,46093,46228,46362,46497,46631,46766,46900,47035,47169,47304,47438,47573,47707,47842,47976,48111,48245,48380,48514,48649,48783,48918,49052,49187,49321,49456,49590,49725,49859,49994,50128,50263,50397,50532,50666,50801,50935,51070,51204,51339,51473,51608,51742,51877,52011,52146,52280,52415,52549,52684,52818,52953,53087,53222,53356,53491,53625,53760,53894,54029,54163,54298,54432,54567,54701,54836,54970,55105,55239,55374,55508,55643,55777,55912,56046,56181,56315,56450,56584,56719,56853,56988,57122,57257,57391,57526
-
 //Dancer, Gypsy, Baby Dancer
 1,500,20:4021:4043,0,40,47,54,62,71,81,91,102,114,127,140,154,169,180,196,212,224,242,260,278,296,316,330,350,371,393,415,438,451,477,503,530,558,587,616,646,677,709,741,774,808,843,878,914,951,989,1027,1066,1106,1147,1188,1230,1273,1317,1361,1406,1452,1499,1546,1594,1643,1693,1743,1794,1846,1899,1952,2006,2061,2117,2173,2230,2288,2347,2406,2466,2527,2589,2651,2714,2778,2843,2908,2974,3041,3109,3177,3246,3316,3387,3458,3530,3603,3677,3751,3826,3902,3979,4056,4133,4210,4287,4364,4441,4518,4595,4672,4749,4826,4903,4980,5057,5134,5211,5288,5365,5442,5519,5596,5673,5750,5827,5904,5981,6058,6135,6212,6289,6366,6443,6520,6597,6674,6751,6828,6905,6982,7059,7136,7213,7290,7367,7444,7521,7598,7675,7752,7829,7906,7983,8060,8137,8214,8291,8368,8445,8522,8599,8676,8753,8830,8907,8984,9061,9138,9215,9292,9369,9446,9523,9600,9677,9754,9831,9908,9985,10062,10139,10216,10293,10370,10447,10524,10601,10678,10755,10832,10909,10986,11063,11140,11217,11294,11371,11448,11525,11602,11679,11756,11833,11910,11987,12064,12141,12218,12295,12372,12449,12526,12603,12680,12757,12834,12911,12988,13065,13142,13219,13296,13373,13450,13527,13604,13681,13758,13835,13912,13989,14066,14143,14220,14297,14374,14451,14528,14605,14682,14759,14836,14913,14990,15067,15144,15221,15298,15375,15452,15529,15606,15683,15760,15837,15914,15991,16068,16145,16222,16299,16376,16453,16530,16607,16684,16761,16838,16915,16992,17069,17146,17223,17300,17377,17454,17531,17608,17685,17762,17839,17916,17993,18070,18147,18224,18301,18378,18455,18532,18609,18686,18763,18840,18917,18994,19071,19148,19225,19302,19379,19456,19533,19610,19687,19764,19841,19918,19995,20072,20149,20226,20303,20380,20457,20534,20611,20688,20765,20842,20919,20996,21073,21150,21227,21304,21381,21458,21535,21612,21689,21766,21843,21920,21997,22074,22151,22228,22305,22382,22459,22536,22613,22690,22767,22844,22921,22998,23075,23152,23229,23306,23383,23460,23537,23614,23691,23768,23845,23922,23999,24076,24153,24230,24307,24384,24461,24538,24615,24692,24769,24846,24923,25000,25077,25154,25231,25308,25385,25462,25539,25616,25693,25770,25847,25924,26001,26078,26155,26232,26309,26386,26463,26540,26617,26694,26771,26848,26925,27002,27079,27156,27233,27310,27387,27464,27541,27618,27695,27772,27849,27926,28003,28080,28157,28234,28311,28388,28465,28542,28619,28696,28773,28850,28927,29004,29081,29158,29235,29312,29389,29466,29543,29620,29697,29774,29851,29928,30005,30082,30159,30236,30313,30390,30467,30544,30621,30698,30775,30852,30929,31006,31083,31160,31237,31314,31391,31468,31545,31622,31699,31776,31853,31930,32007,32084,32161,32238,32315,32392,32469,32546,32623,32700,32777,32854,32931,33008,33085,33162,33239,33316,33393,33470,33547,33624,33701,33778,33855,33932,34009,34086,34163,34240,34317,34394,34471,34548,34625,34702,34779,34856,34933
 
-//Wanderer, Wanderer T, Baby Wanderer
-1,500,4069:4076:4105,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,4800,4828,4918,5009,5101,5194,5288,5382,5477,5573,5670,5768,5867,5967,6068,6170,6273,6377,6482,6588,6694,6801,6909,7018,7128,7239,7351,7464,7578,7693,7809,7926,8044,8162,8281,8401,8522,8644,8767,8891,9016,9142,9269,9397,9526,9656,9786,9917,10049,10182,10316,10451,10585,10720,10854,10989,11123,11258,11392,11527,11661,11796,11930,12065,12199,12334,12468,12603,12737,12872,13006,13141,13275,13410,13544,13679,13813,13948,14082,14217,14351,14486,14620,14755,14889,15024,15158,15293,15427,15562,15696,15831,15965,16100,16234,16369,16503,16638,16772,16907,17041,17176,17310,17445,17579,17714,17848,17983,18117,18252,18386,18521,18655,18790,18924,19059,19193,19328,19462,19597,19731,19866,20000,20135,20269,20404,20538,20673,20807,20942,21076,21211,21345,21480,21614,21749,21883,22018,22152,22287,22421,22556,22690,22825,22959,23094,23228,23363,23497,23632,23766,23901,24035,24170,24304,24439,24573,24708,24842,24977,25111,25246,25380,25515,25649,25784,25918,26053,26187,26322,26456,26591,26725,26860,26994,27129,27263,27398,27532,27667,27801,27936,28070,28205,28339,28474,28608,28743,28877,29012,29146,29281,29415,29550,29684,29819,29953,30088,30222,30357,30491,30626,30760,30895,31029,31164,31298,31433,31567,31702,31836,31971,32105,32240,32374,32509,32643,32778,32912,33047,33181,33316,33450,33585,33719,33854,33988,34123,34257,34392,34526,34661,34795,34930,35064,35199,35333,35468,35602,35737,35871,36006,36140,36275,36409,36544,36678,36813,36947,37082,37216,37351,37485,37620,37754,37889,38023,38158,38292,38427,38561,38696,38830,38965,39099,39234,39368,39503,39637,39772,39906,40041,40175,40310,40444,40579,40713,40848,40982,41117,41251,41386,41520,41655,41789,41924,42058,42193,42327,42462,42596,42731,42865,43000,43134,43269,43403,43538,43672,43807,43941,44076,44210,44345,44479,44614,44748,44883,45017,45152,45286,45421,45555,45690,45824,45959,46093,46228,46362,46497,46631,46766,46900,47035,47169,47304,47438,47573,47707,47842,47976,48111,48245,48380,48514,48649,48783,48918,49052,49187,49321,49456,49590,49725,49859,49994,50128,50263,50397,50532,50666,50801,50935,51070,51204,51339,51473,51608,51742,51877,52011,52146,52280,52415,52549,52684,52818,52953,53087,53222,53356,53491,53625,53760,53894,54029,54163,54298,54432,54567,54701,54836,54970,55105,55239,55374,55508,55643,55777,55912,56046,56181,56315,56450,56584,56719,56853,56988,57122,57257,57391,57526
+//Gunslinger
+1,500,24,0,40,47,54,61,69,77,85,94,103,202,212,222,232,243,254,265,277,289,301,316,331,346,364,382,400,420,440,460,490,520,550,580,610,650,680,710,740,770,800,830,865,890,925,955,990,1025,1050,1080,1110,1145,1180,1215,1275,1335,1395,1455,1515,1575,1635,1695,1760,1820,1885,1950,2015,2080,2145,2220,2275,2340,2410,2480,2550,2620,2690,2760,2830,2900,2970,3040,3115,3190,3265,3340,3415,3490,3565,3640,3715,3790,3870,3950,4030,4110,4190,4270,4350,4430,4510,4590,4670,4750,4830,4910,4990,5070,5150,5230,5310,5390,5470,5550,5630,5710,5790,5870,5950,6030,6110,6190,6270,6350,6430,6510,6590,6670,6750,6830,6910,6990,7070,7150,7230,7310,7390,7470,7550,7630,7710,7790,7870,7950,8030,8110,8190,8270,8350,8430,8510,8590,8670,8750,8830,8910,8990,9070,9150,9230,9310,9390,9470,9550,9630,9710,9790,9870,9950,10030,10110,10190,10270,10350,10430,10510,10590,10670,10750,10830,10910,10990,11070,11150,11230,11310,11390,11470,11550,11630,11710,11790,11870,11950,12030,12110,12190,12270,12350,12430,12510,12590,12670,12750,12830,12910,12990,13070,13150,13230,13310,13390,13470,13550,13630,13710,13790,13870,13950,14030,14110,14190,14270,14350,14430,14510,14590,14670,14750,14830,14910,14990,15070,15150,15230,15310,15390,15470,15550,15630,15710,15790,15870,15950,16030,16110,16190,16270,16350,16430,16510,16590,16670,16750,16830,16910,16990,17070,17150,17230,17310,17390,17470,17550,17630,17710,17790,17870,17950,18030,18110,18190,18270,18350,18430,18510,18590,18670,18750,18830,18910,18990,19070,19150,19230,19310,19390,19470,19550,19630,19710,19790,19870,19950,20030,20110,20190,20270,20350,20430,20510,20590,20670,20750,20830,20910,20990,21070,21150,21230,21310,21390,21470,21550,21630,21710,21790,21870,21950,22030,22110,22190,22270,22350,22430,22510,22590,22670,22750,22830,22910,22990,23070,23150,23230,23310,23390,23470,23550,23630,23710,23790,23870,23950,24030,24110,24190,24270,24350,24430,24510,24590,24670,24750,24830,24910,24990,25070,25150,25230,25310,25390,25470,25550,25630,25710,25790,25870,25950,26030,26110,26190,26270,26350,26430,26510,26590,26670,26750,26830,26910,26990,27070,27150,27230,27310,27390,27470,27550,27630,27710,27790,27870,27950,28030,28110,28190,28270,28350,28430,28510,28590,28670,28750,28830,28910,28990,29070,29150,29230,29310,29390,29470,29550,29630,29710,29790,29870,29950,30030,30110,30190,30270,30350,30430,30510,30590,30670,30750,30830,30910,30990,31070,31150,31230,31310,31390,31470,31550,31630,31710,31790,31870,31950,32030,32110,32190,32270,32350,32430,32510,32590,32670,32750,32830,32910,32990,33070,33150,33230,33310,33390,33470,33550,33630,33710,33790,33870,33950,34030,34110,34190,34270,34350,34430,34510,34590,34670,34750,34830,34910,34990,35070,35150,35230,35310,35390,35470,35550,35630,35710,35790,35870,35950,36030,36110,36190,36270,36350,36430,36510,36590
 
-//Gunslinger, Rebellion
-1,500,24:4215,0,40,47,54,61,69,77,85,94,103,202,212,222,232,243,254,265,277,289,301,316,331,346,364,382,400,420,440,460,490,520,550,580,610,650,680,710,740,770,800,830,865,890,925,955,990,1025,1050,1080,1110,1145,1180,1215,1275,1335,1395,1455,1515,1575,1635,1695,1760,1820,1885,1950,2015,2080,2145,2220,2275,2340,2410,2480,2550,2620,2690,2760,2830,2900,2970,3040,3115,3190,3265,3340,3415,3490,3565,3640,3715,3790,3870,3950,4030,4110,4190,4270,4350,4430,4510,4590,4670,4750,4830,4910,4990,5070,5150,5230,5310,5390,5470,5550,5630,5710,5790,5870,5950,6030,6110,6190,6270,6350,6430,6510,6590,6670,6750,6830,6910,6990,7070,7150,7230,7310,7390,7470,7550,7630,7710,7790,7870,7950,8030,8110,8190,8270,8350,8430,8510,8590,8670,8750,8830,8910,8990,9070,9150,9230,9310,9390,9470,9550,9630,9710,9790,9870,9950,10030,10110,10190,10270,10350,10430,10510,10590,10670,10750,10830,10910,10990,11070,11150,11230,11310,11390,11470,11550,11630,11710,11790,11870,11950,12030,12110,12190,12270,12350,12430,12510,12590,12670,12750,12830,12910,12990,13070,13150,13230,13310,13390,13470,13550,13630,13710,13790,13870,13950,14030,14110,14190,14270,14350,14430,14510,14590,14670,14750,14830,14910,14990,15070,15150,15230,15310,15390,15470,15550,15630,15710,15790,15870,15950,16030,16110,16190,16270,16350,16430,16510,16590,16670,16750,16830,16910,16990,17070,17150,17230,17310,17390,17470,17550,17630,17710,17790,17870,17950,18030,18110,18190,18270,18350,18430,18510,18590,18670,18750,18830,18910,18990,19070,19150,19230,19310,19390,19470,19550,19630,19710,19790,19870,19950,20030,20110,20190,20270,20350,20430,20510,20590,20670,20750,20830,20910,20990,21070,21150,21230,21310,21390,21470,21550,21630,21710,21790,21870,21950,22030,22110,22190,22270,22350,22430,22510,22590,22670,22750,22830,22910,22990,23070,23150,23230,23310,23390,23470,23550,23630,23710,23790,23870,23950,24030,24110,24190,24270,24350,24430,24510,24590,24670,24750,24830,24910,24990,25070,25150,25230,25310,25390,25470,25550,25630,25710,25790,25870,25950,26030,26110,26190,26270,26350,26430,26510,26590,26670,26750,26830,26910,26990,27070,27150,27230,27310,27390,27470,27550,27630,27710,27790,27870,27950,28030,28110,28190,28270,28350,28430,28510,28590,28670,28750,28830,28910,28990,29070,29150,29230,29310,29390,29470,29550,29630,29710,29790,29870,29950,30030,30110,30190,30270,30350,30430,30510,30590,30670,30750,30830,30910,30990,31070,31150,31230,31310,31390,31470,31550,31630,31710,31790,31870,31950,32030,32110,32190,32270,32350,32430,32510,32590,32670,32750,32830,32910,32990,33070,33150,33230,33310,33390,33470,33550,33630,33710,33790,33870,33950,34030,34110,34190,34270,34350,34430,34510,34590,34670,34750,34830,34910,34990,35070,35150,35230,35310,35390,35470,35550,35630,35710,35790,35870,35950,36030,36110,36190,36270,36350,36430,36510,36590
-
-//Ninja, Kageroru, Oboro
-1,500,25:4211:4212,0,40,47,54,61,69,77,85,94,103,202,212,222,232,243,254,265,277,289,301,316,331,346,364,382,400,420,440,460,482,504,526,548,572,596,620,646,672,698,726,754,784,814,844,876,908,940,975,1010,1100,1140,1180,1220,1260,1300,1340,1385,1430,1475,1520,1565,1615,1665,1715,1765,1815,1880,1935,1990,2045,2100,2160,2220,2280,2340,2400,2460,2520,2580,2640,2705,2770,2835,2900,2965,3030,3100,3170,3240,3310,3380,3455,3530,3605,3680,3760,3840,3920,4000,4080,4160,4240,4320,4400,4480,4560,4640,4720,4800,4880,4960,5040,5120,5200,5280,5360,5440,5520,5600,5680,5760,5840,5920,6000,6080,6160,6240,6320,6400,6480,6560,6640,6720,6800,6880,6960,7040,7120,7200,7280,7360,7440,7520,7600,7680,7760,7840,7920,8000,8080,8160,8240,8320,8400,8480,8560,8640,8720,8800,8880,8960,9040,9120,9200,9280,9360,9440,9520,9600,9680,9760,9840,9920,10000,10080,10160,10240,10320,10400,10480,10560,10640,10720,10800,10880,10960,11040,11120,11200,11280,11360,11440,11520,11600,11680,11760,11840,11920,12000,12080,12160,12240,12320,12400,12480,12560,12640,12720,12800,12880,12960,13040,13120,13200,13280,13360,13440,13520,13600,13680,13760,13840,13920,14000,14080,14160,14240,14320,14400,14480,14560,14640,14720,14800,14880,14960,15040,15120,15200,15280,15360,15440,15520,15600,15680,15760,15840,15920,16000,16080,16160,16240,16320,16400,16480,16560,16640,16720,16800,16880,16960,17040,17120,17200,17280,17360,17440,17520,17600,17680,17760,17840,17920,18000,18080,18160,18240,18320,18400,18480,18560,18640,18720,18800,18880,18960,19040,19120,19200,19280,19360,19440,19520,19600,19680,19760,19840,19920,20000,20080,20160,20240,20320,20400,20480,20560,20640,20720,20800,20880,20960,21040,21120,21200,21280,21360,21440,21520,21600,21680,21760,21840,21920,22000,22080,22160,22240,22320,22400,22480,22560,22640,22720,22800,22880,22960,23040,23120,23200,23280,23360,23440,23520,23600,23680,23760,23840,23920,24000,24080,24160,24240,24320,24400,24480,24560,24640,24720,24800,24880,24960,25040,25120,25200,25280,25360,25440,25520,25600,25680,25760,25840,25920,26000,26080,26160,26240,26320,26400,26480,26560,26640,26720,26800,26880,26960,27040,27120,27200,27280,27360,27440,27520,27600,27680,27760,27840,27920,28000,28080,28160,28240,28320,28400,28480,28560,28640,28720,28800,28880,28960,29040,29120,29200,29280,29360,29440,29520,29600,29680,29760,29840,29920,30000,30080,30160,30240,30320,30400,30480,30560,30640,30720,30800,30880,30960,31040,31120,31200,31280,31360,31440,31520,31600,31680,31760,31840,31920,32000,32080,32160,32240,32320,32400,32480,32560,32640,32720,32800,32880,32960,33040,33120,33200,33280,33360,33440,33520,33600,33680,33760,33840,33920,34000,34080,34160,34240,34320,34400,34480,34560,34640,34720,34800,34880,34960,35040,35120,35200,35280,35360,35440,35520,35600,35680,35760,35840,35920,36000,36080,36160
+//Ninja
+1,500,25,0,40,47,54,61,69,77,85,94,103,202,212,222,232,243,254,265,277,289,301,316,331,346,364,382,400,420,440,460,482,504,526,548,572,596,620,646,672,698,726,754,784,814,844,876,908,940,975,1010,1100,1140,1180,1220,1260,1300,1340,1385,1430,1475,1520,1565,1615,1665,1715,1765,1815,1880,1935,1990,2045,2100,2160,2220,2280,2340,2400,2460,2520,2580,2640,2705,2770,2835,2900,2965,3030,3100,3170,3240,3310,3380,3455,3530,3605,3680,3760,3840,3920,4000,4080,4160,4240,4320,4400,4480,4560,4640,4720,4800,4880,4960,5040,5120,5200,5280,5360,5440,5520,5600,5680,5760,5840,5920,6000,6080,6160,6240,6320,6400,6480,6560,6640,6720,6800,6880,6960,7040,7120,7200,7280,7360,7440,7520,7600,7680,7760,7840,7920,8000,8080,8160,8240,8320,8400,8480,8560,8640,8720,8800,8880,8960,9040,9120,9200,9280,9360,9440,9520,9600,9680,9760,9840,9920,10000,10080,10160,10240,10320,10400,10480,10560,10640,10720,10800,10880,10960,11040,11120,11200,11280,11360,11440,11520,11600,11680,11760,11840,11920,12000,12080,12160,12240,12320,12400,12480,12560,12640,12720,12800,12880,12960,13040,13120,13200,13280,13360,13440,13520,13600,13680,13760,13840,13920,14000,14080,14160,14240,14320,14400,14480,14560,14640,14720,14800,14880,14960,15040,15120,15200,15280,15360,15440,15520,15600,15680,15760,15840,15920,16000,16080,16160,16240,16320,16400,16480,16560,16640,16720,16800,16880,16960,17040,17120,17200,17280,17360,17440,17520,17600,17680,17760,17840,17920,18000,18080,18160,18240,18320,18400,18480,18560,18640,18720,18800,18880,18960,19040,19120,19200,19280,19360,19440,19520,19600,19680,19760,19840,19920,20000,20080,20160,20240,20320,20400,20480,20560,20640,20720,20800,20880,20960,21040,21120,21200,21280,21360,21440,21520,21600,21680,21760,21840,21920,22000,22080,22160,22240,22320,22400,22480,22560,22640,22720,22800,22880,22960,23040,23120,23200,23280,23360,23440,23520,23600,23680,23760,23840,23920,24000,24080,24160,24240,24320,24400,24480,24560,24640,24720,24800,24880,24960,25040,25120,25200,25280,25360,25440,25520,25600,25680,25760,25840,25920,26000,26080,26160,26240,26320,26400,26480,26560,26640,26720,26800,26880,26960,27040,27120,27200,27280,27360,27440,27520,27600,27680,27760,27840,27920,28000,28080,28160,28240,28320,28400,28480,28560,28640,28720,28800,28880,28960,29040,29120,29200,29280,29360,29440,29520,29600,29680,29760,29840,29920,30000,30080,30160,30240,30320,30400,30480,30560,30640,30720,30800,30880,30960,31040,31120,31200,31280,31360,31440,31520,31600,31680,31760,31840,31920,32000,32080,32160,32240,32320,32400,32480,32560,32640,32720,32800,32880,32960,33040,33120,33200,33280,33360,33440,33520,33600,33680,33760,33840,33920,34000,34080,34160,34240,34320,34400,34480,34560,34640,34720,34800,34880,34960,35040,35120,35200,35280,35360,35440,35520,35600,35680,35760,35840,35920,36000,36080,36160
 
 //Taekwon
 1,500,4046,0,40,46,53,61,70,79,89,100,111,123,136,149,163,178,194,210,227,245,263,282,302,322,343,365,388,411,435,460,485,511,538,565,593,622,652,682,713,745,777,810,844,878,913,949,986,1023,1061,1100,1139,1179,1220,1261,1303,1346,1390,1434,1479,1525,1571,1618,1666,1714,1763,1813,1864,1915,1967,2020,2073,2127,2137,2147,2157,2167,2177,2187,2197,2200,2210,2230,2250,2300,2350,2400,2450,2500,2550,2600,2650,2700,2750,2800,2850,2900,2950,3000,3050,3100,3200,3267,3342,3417,3492,3567,3642,3717,3792,3867,3942,4017,4092,4167,4242,4317,4392,4467,4542,4617,4692,4767,4842,4917,4992,5067,5142,5217,5292,5367,5442,5517,5592,5667,5742,5817,5892,5967,6042,6117,6192,6267,6342,6417,6492,6567,6642,6717,6792,6867,6942,7017,7092,7167,7242,7317,7392,7467,7542,7617,7692,7767,7842,7917,7992,8067,8142,8217,8292,8367,8442,8517,8592,8667,8742,8817,8892,8967,9042,9117,9192,9267,9342,9417,9492,9567,9642,9717,9792,9867,9942,10017,10092,10167,10242,10317,10392,10467,10542,10617,10692,10767,10842,10917,10992,11067,11142,11217,11292,11367,11442,11517,11592,11667,11742,11817,11892,11967,12042,12117,12192,12267,12342,12417,12492,12567,12642,12717,12792,12867,12942,13017,13092,13167,13242,13317,13392,13467,13542,13617,13692,13767,13842,13917,13992,14067,14142,14217,14292,14367,14442,14517,14592,14667,14742,14817,14892,14967,15042,15117,15192,15267,15342,15417,15492,15567,15642,15717,15792,15867,15942,16017,16092,16167,16242,16317,16392,16467,16542,16617,16692,16767,16842,16917,16992,17067,17142,17217,17292,17367,17442,17517,17592,17667,17742,17817,17892,17967,18042,18117,18192,18267,18342,18417,18492,18567,18642,18717,18792,18867,18942,19017,19092,19167,19242,19317,19392,19467,19542,19617,19692,19767,19842,19917,19992,20067,20142,20217,20292,20367,20442,20517,20592,20667,20742,20817,20892,20967,21042,21117,21192,21267,21342,21417,21492,21567,21642,21717,21792,21867,21942,22017,22092,22167,22242,22317,22392,22467,22542,22617,22692,22767,22842,22917,22992,23067,23142,23217,23292,23367,23442,23517,23592,23667,23742,23817,23892,23967,24042,24117,24192,24267,24342,24417,24492,24567,24642,24717,24792,24867,24942,25017,25092,25167,25242,25317,25392,25467,25542,25617,25692,25767,25842,25917,25992,26067,26142,26217,26292,26367,26442,26517,26592,26667,26742,26817,26892,26967,27042,27117,27192,27267,27342,27417,27492,27567,27642,27717,27792,27867,27942,28017,28092,28167,28242,28317,28392,28467,28542,28617,28692,28767,28842,28917,28992,29067,29142,29217,29292,29367,29442,29517,29592,29667,29742,29817,29892,29967,30042,30117,30192,30267,30342,30417,30492,30567,30642,30717,30792,30867,30942,31017,31092,31167,31242,31317,31392,31467,31542,31617,31692,31767,31842,31917,31992,32067,32142,32217,32292,32367,32442,32517,32592,32667,32742,32817,32892,32967,33042,33117,33192,33267
@@ -167,86 +128,47 @@
 //Knight, Knight (Peco), Baby Knight, Baby Knight (Peco), Lord Knight, Lord Knight (Peco)
 1,500,7:13:4008:4014:4030:4036,1,13,16,19,22,25,28,31,34,37,40,43,46,49,52,55,58,61,64,67,70,73,76,79,82,85,88,91,94,97,100,103,106,109,112,115,118,121,124,127,130,133,136,139,142,145,148,151,154,157,160,163,166,169,172,175,178,181,184,187,190,193,196,199,202,205,208,211,214,217,220,223,226,229,232,235,238,241,244,247,250,253,256,259,262,265,268,271,274,277,280,283,286,289,292,295,298,301,304,307,310,313,316,319,322,325,328,331,334,337,340,343,346,349,352,355,358,361,364,367,370,373,376,379,382,385,388,391,394,397,400,403,406,409,412,415,418,421,424,427,430,433,436,439,442,445,448,451,454,457,460,463,466,469,472,475,478,481,484,487,490,493,496,499,502,505,508,511,514,517,520,523,526,529,532,535,538,541,544,547,550,553,556,559,562,565,568,571,574,577,580,583,586,589,592,595,598,601,604,607,610,613,616,619,622,625,628,631,634,637,640,643,646,649,652,655,658,661,664,667,670,673,676,679,682,685,688,691,694,697,700,703,706,709,712,715,718,721,724,727,730,733,736,739,742,745,748,751,754,757,760,763,766,769,772,775,778,781,784,787,790,793,796,799,802,805,808,811,814,817,820,823,826,829,832,835,838,841,844,847,850,853,856,859,862,865,868,871,874,877,880,883,886,889,892,895,898,901,904,907,910,913,916,919,922,925,928,931,934,937,940,943,946,949,952,955,958,961,964,967,970,973,976,979,982,985,988,991,994,997,1000,1003,1006,1009,1012,1015,1018,1021,1024,1027,1030,1033,1036,1039,1042,1045,1048,1051,1054,1057,1060,1063,1066,1069,1072,1075,1078,1081,1084,1087,1090,1093,1096,1099,1102,1105,1108,1111,1114,1117,1120,1123,1126,1129,1132,1135,1138,1141,1144,1147,1150,1153,1156,1159,1162,1165,1168,1171,1174,1177,1180,1183,1186,1189,1192,1195,1198,1201,1204,1207,1210,1213,1216,1219,1222,1225,1228,1231,1234,1237,1240,1243,1246,1249,1252,1255,1258,1261,1264,1267,1270,1273,1276,1279,1282,1285,1288,1291,1294,1297,1300,1303,1306,1309,1312,1315,1318,1321,1324,1327,1330,1333,1336,1339,1342,1345,1348,1351,1354,1357,1360,1363,1366,1369,1372,1375,1378,1381,1384,1387,1390,1393,1396,1399,1402,1405,1408,1411,1414,1417,1420,1423,1426,1429,1432,1435,1438,1441,1444,1447,1450,1453,1456,1459,1462,1465,1468,1471,1474,1477,1480,1483,1486,1489,1492,1495,1498,1501,1504,1507,1510
 
-//Rune Knight, Rune Knight T, Rune Knight Dragon, Rune Knight T (Dragon), Baby Rune Knight, Baby Rune Knight (Dragon)
-1,500,4054:4060:4080:4081:4096:4109,1,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,300,310,313,316,319,322,325,328,331,334,337,340,343,346,349,352,355,358,361,364,367,370,373,376,379,382,385,388,391,394,397,400,403,406,409,412,415,418,421,424,427,430,433,436,439,442,445,448,451,454,457,460,463,466,469,472,475,478,481,484,487,490,493,496,499,502,505,508,511,514,517,520,523,526,529,532,535,538,541,544,547,550,553,556,559,562,565,568,571,574,577,580,583,586,589,592,595,598,601,604,607,610,613,616,619,622,625,628,631,634,637,640,643,646,649,652,655,658,661,664,667,670,673,676,679,682,685,688,691,694,697,700,703,706,709,712,715,718,721,724,727,730,733,736,739,742,745,748,751,754,757,760,763,766,769,772,775,778,781,784,787,790,793,796,799,802,805,808,811,814,817,820,823,826,829,832,835,838,841,844,847,850,853,856,859,862,865,868,871,874,877,880,883,886,889,892,895,898,901,904,907,910,913,916,919,922,925,928,931,934,937,940,943,946,949,952,955,958,961,964,967,970,973,976,979,982,985,988,991,994,997,1000,1003,1006,1009,1012,1015,1018,1021,1024,1027,1030,1033,1036,1039,1042,1045,1048,1051,1054,1057,1060,1063,1066,1069,1072,1075,1078,1081,1084,1087,1090,1093,1096,1099,1102,1105,1108,1111,1114,1117,1120,1123,1126,1129,1132,1135,1138,1141,1144,1147,1150,1153,1156,1159,1162,1165,1168,1171,1174,1177,1180,1183,1186,1189,1192,1195,1198,1201,1204,1207,1210,1213,1216,1219,1222,1225,1228,1231,1234,1237,1240,1243,1246,1249,1252,1255,1258,1261,1264,1267,1270,1273,1276,1279,1282,1285,1288,1291,1294,1297,1300,1303,1306,1309,1312,1315,1318,1321,1324,1327,1330,1333,1336,1339,1342,1345,1348,1351,1354,1357,1360,1363,1366,1369,1372,1375,1378,1381,1384,1387,1390,1393,1396,1399,1402,1405,1408,1411,1414,1417,1420,1423,1426,1429,1432,1435,1438,1441,1444,1447,1450,1453,1456,1459,1462,1465,1468,1471,1474,1477,1480,1483,1486,1489,1492,1495,1498,1501,1504,1507,1510
-
 //Priest, High Priest, Baby Priest
 1,500,8:4009:4031,1,18,26,34,42,50,58,66,74,82,90,98,106,114,122,130,138,146,154,162,170,178,186,194,202,210,218,226,234,242,250,258,266,274,282,290,298,306,314,322,330,338,346,354,362,370,378,386,394,402,410,418,426,434,442,450,458,466,474,482,490,498,506,514,522,530,538,546,554,562,570,578,586,594,602,610,618,626,634,642,650,658,666,674,682,690,698,706,714,722,730,738,746,754,762,770,778,786,794,802,810,818,826,834,842,850,858,866,874,882,890,898,906,914,922,930,938,946,954,962,970,978,986,994,1002,1010,1018,1026,1034,1042,1050,1058,1066,1074,1082,1090,1098,1106,1114,1122,1130,1138,1146,1154,1162,1170,1178,1186,1194,1202,1210,1218,1226,1234,1242,1250,1258,1266,1274,1282,1290,1298,1306,1314,1322,1330,1338,1346,1354,1362,1370,1378,1386,1394,1402,1410,1418,1426,1434,1442,1450,1458,1466,1474,1482,1490,1498,1506,1514,1522,1530,1538,1546,1554,1562,1570,1578,1586,1594,1602,1610,1618,1626,1634,1642,1650,1658,1666,1674,1682,1690,1698,1706,1714,1722,1730,1738,1746,1754,1762,1770,1778,1786,1794,1802,1810,1818,1826,1834,1842,1850,1858,1866,1874,1882,1890,1898,1906,1914,1922,1930,1938,1946,1954,1962,1970,1978,1986,1994,2002,2010,2018,2026,2034,2042,2050,2058,2066,2074,2082,2090,2098,2106,2114,2122,2130,2138,2146,2154,2162,2170,2178,2186,2194,2202,2210,2218,2226,2234,2242,2250,2258,2266,2274,2282,2290,2298,2306,2314,2322,2330,2338,2346,2354,2362,2370,2378,2386,2394,2402,2410,2418,2426,2434,2442,2450,2458,2466,2474,2482,2490,2498,2506,2514,2522,2530,2538,2546,2554,2562,2570,2578,2586,2594,2602,2610,2618,2626,2634,2642,2650,2658,2666,2674,2682,2690,2698,2706,2714,2722,2730,2738,2746,2754,2762,2770,2778,2786,2794,2802,2810,2818,2826,2834,2842,2850,2858,2866,2874,2882,2890,2898,2906,2914,2922,2930,2938,2946,2954,2962,2970,2978,2986,2994,3002,3010,3018,3026,3034,3042,3050,3058,3066,3074,3082,3090,3098,3106,3114,3122,3130,3138,3146,3154,3162,3170,3178,3186,3194,3202,3210,3218,3226,3234,3242,3250,3258,3266,3274,3282,3290,3298,3306,3314,3322,3330,3338,3346,3354,3362,3370,3378,3386,3394,3402,3410,3418,3426,3434,3442,3450,3458,3466,3474,3482,3490,3498,3506,3514,3522,3530,3538,3546,3554,3562,3570,3578,3586,3594,3602,3610,3618,3626,3634,3642,3650,3658,3666,3674,3682,3690,3698,3706,3714,3722,3730,3738,3746,3754,3762,3770,3778,3786,3794,3802,3810,3818,3826,3834,3842,3850,3858,3866,3874,3882,3890,3898,3906,3914,3922,3930,3938,3946,3954,3962,3970,3978,3986,3994,4002,4010
 
-//Arch Bishop, Arch Bishop T, Baby Arch Bishop
-1,500,4057:4063:4099,1,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,800,810,818,826,834,842,850,858,866,874,882,890,898,906,914,922,930,938,946,954,962,970,978,986,994,1002,1010,1018,1026,1034,1042,1050,1058,1066,1074,1082,1090,1098,1106,1114,1122,1130,1138,1146,1154,1162,1170,1178,1186,1194,1202,1210,1218,1226,1234,1242,1250,1258,1266,1274,1282,1290,1298,1306,1314,1322,1330,1338,1346,1354,1362,1370,1378,1386,1394,1402,1410,1418,1426,1434,1442,1450,1458,1466,1474,1482,1490,1498,1506,1514,1522,1530,1538,1546,1554,1562,1570,1578,1586,1594,1602,1610,1618,1626,1634,1642,1650,1658,1666,1674,1682,1690,1698,1706,1714,1722,1730,1738,1746,1754,1762,1770,1778,1786,1794,1802,1810,1818,1826,1834,1842,1850,1858,1866,1874,1882,1890,1898,1906,1914,1922,1930,1938,1946,1954,1962,1970,1978,1986,1994,2002,2010,2018,2026,2034,2042,2050,2058,2066,2074,2082,2090,2098,2106,2114,2122,2130,2138,2146,2154,2162,2170,2178,2186,2194,2202,2210,2218,2226,2234,2242,2250,2258,2266,2274,2282,2290,2298,2306,2314,2322,2330,2338,2346,2354,2362,2370,2378,2386,2394,2402,2410,2418,2426,2434,2442,2450,2458,2466,2474,2482,2490,2498,2506,2514,2522,2530,2538,2546,2554,2562,2570,2578,2586,2594,2602,2610,2618,2626,2634,2642,2650,2658,2666,2674,2682,2690,2698,2706,2714,2722,2730,2738,2746,2754,2762,2770,2778,2786,2794,2802,2810,2818,2826,2834,2842,2850,2858,2866,2874,2882,2890,2898,2906,2914,2922,2930,2938,2946,2954,2962,2970,2978,2986,2994,3002,3010,3018,3026,3034,3042,3050,3058,3066,3074,3082,3090,3098,3106,3114,3122,3130,3138,3146,3154,3162,3170,3178,3186,3194,3202,3210,3218,3226,3234,3242,3250,3258,3266,3274,3282,3290,3298,3306,3314,3322,3330,3338,3346,3354,3362,3370,3378,3386,3394,3402,3410,3418,3426,3434,3442,3450,3458,3466,3474,3482,3490,3498,3506,3514,3522,3530,3538,3546,3554,3562,3570,3578,3586,3594,3602,3610,3618,3626,3634,3642,3650,3658,3666,3674,3682,3690,3698,3706,3714,3722,3730,3738,3746,3754,3762,3770,3778,3786,3794,3802,3810,3818,3826,3834,3842,3850,3858,3866,3874,3882,3890,3898,3906,3914,3922,3930,3938,3946,3954,3962,3970,3978,3986,3994,4002,4010
-
 //Wizard, High Wizard, Baby Wizard
 1,500,9:4010:4032,1,19,28,37,46,55,64,73,82,91,100,109,118,127,136,145,154,163,172,181,190,199,208,217,226,235,244,253,262,271,280,289,298,307,316,325,334,343,352,361,370,379,388,397,406,415,424,433,442,451,460,469,478,487,496,505,514,523,532,541,550,559,568,577,586,595,604,613,622,631,640,649,658,667,676,685,694,703,712,721,730,739,748,757,766,775,784,793,802,811,820,829,838,847,856,865,874,883,892,901,910,919,928,937,946,955,964,973,982,991,1000,1009,1018,1027,1036,1045,1054,1063,1072,1081,1090,1099,1108,1117,1126,1135,1144,1153,1162,1171,1180,1189,1198,1207,1216,1225,1234,1243,1252,1261,1270,1279,1288,1297,1306,1315,1324,1333,1342,1351,1360,1369,1378,1387,1396,1405,1414,1423,1432,1441,1450,1459,1468,1477,1486,1495,1504,1513,1522,1531,1540,1549,1558,1567,1576,1585,1594,1603,1612,1621,1630,1639,1648,1657,1666,1675,1684,1693,1702,1711,1720,1729,1738,1747,1756,1765,1774,1783,1792,1801,1810,1819,1828,1837,1846,1855,1864,1873,1882,1891,1900,1909,1918,1927,1936,1945,1954,1963,1972,1981,1990,1999,2008,2017,2026,2035,2044,2053,2062,2071,2080,2089,2098,2107,2116,2125,2134,2143,2152,2161,2170,2179,2188,2197,2206,2215,2224,2233,2242,2251,2260,2269,2278,2287,2296,2305,2314,2323,2332,2341,2350,2359,2368,2377,2386,2395,2404,2413,2422,2431,2440,2449,2458,2467,2476,2485,2494,2503,2512,2521,2530,2539,2548,2557,2566,2575,2584,2593,2602,2611,2620,2629,2638,2647,2656,2665,2674,2683,2692,2701,2710,2719,2728,2737,2746,2755,2764,2773,2782,2791,2800,2809,2818,2827,2836,2845,2854,2863,2872,2881,2890,2899,2908,2917,2926,2935,2944,2953,2962,2971,2980,2989,2998,3007,3016,3025,3034,3043,3052,3061,3070,3079,3088,3097,3106,3115,3124,3133,3142,3151,3160,3169,3178,3187,3196,3205,3214,3223,3232,3241,3250,3259,3268,3277,3286,3295,3304,3313,3322,3331,3340,3349,3358,3367,3376,3385,3394,3403,3412,3421,3430,3439,3448,3457,3466,3475,3484,3493,3502,3511,3520,3529,3538,3547,3556,3565,3574,3583,3592,3601,3610,3619,3628,3637,3646,3655,3664,3673,3682,3691,3700,3709,3718,3727,3736,3745,3754,3763,3772,3781,3790,3799,3808,3817,3826,3835,3844,3853,3862,3871,3880,3889,3898,3907,3916,3925,3934,3943,3952,3961,3970,3979,3988,3997,4006,4015,4024,4033,4042,4051,4060,4069,4078,4087,4096,4105,4114,4123,4132,4141,4150,4159,4168,4177,4186,4195,4204,4213,4222,4231,4240,4249,4258,4267,4276,4285,4294,4303,4312,4321,4330,4339,4348,4357,4366,4375,4384,4393,4402,4411,4420,4429,4438,4447,4456,4465,4474,4483,4492,4501,4510
 
-//Warlock, Warlock T, Baby Warlock
-1,500,4055:4061:4097,1,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,900,910,919,928,937,946,955,964,973,982,991,1000,1009,1018,1027,1036,1045,1054,1063,1072,1081,1090,1099,1108,1117,1126,1135,1144,1153,1162,1171,1180,1189,1198,1207,1216,1225,1234,1243,1252,1261,1270,1279,1288,1297,1306,1315,1324,1333,1342,1351,1360,1369,1378,1387,1396,1405,1414,1423,1432,1441,1450,1459,1468,1477,1486,1495,1504,1513,1522,1531,1540,1549,1558,1567,1576,1585,1594,1603,1612,1621,1630,1639,1648,1657,1666,1675,1684,1693,1702,1711,1720,1729,1738,1747,1756,1765,1774,1783,1792,1801,1810,1819,1828,1837,1846,1855,1864,1873,1882,1891,1900,1909,1918,1927,1936,1945,1954,1963,1972,1981,1990,1999,2008,2017,2026,2035,2044,2053,2062,2071,2080,2089,2098,2107,2116,2125,2134,2143,2152,2161,2170,2179,2188,2197,2206,2215,2224,2233,2242,2251,2260,2269,2278,2287,2296,2305,2314,2323,2332,2341,2350,2359,2368,2377,2386,2395,2404,2413,2422,2431,2440,2449,2458,2467,2476,2485,2494,2503,2512,2521,2530,2539,2548,2557,2566,2575,2584,2593,2602,2611,2620,2629,2638,2647,2656,2665,2674,2683,2692,2701,2710,2719,2728,2737,2746,2755,2764,2773,2782,2791,2800,2809,2818,2827,2836,2845,2854,2863,2872,2881,2890,2899,2908,2917,2926,2935,2944,2953,2962,2971,2980,2989,2998,3007,3016,3025,3034,3043,3052,3061,3070,3079,3088,3097,3106,3115,3124,3133,3142,3151,3160,3169,3178,3187,3196,3205,3214,3223,3232,3241,3250,3259,3268,3277,3286,3295,3304,3313,3322,3331,3340,3349,3358,3367,3376,3385,3394,3403,3412,3421,3430,3439,3448,3457,3466,3475,3484,3493,3502,3511,3520,3529,3538,3547,3556,3565,3574,3583,3592,3601,3610,3619,3628,3637,3646,3655,3664,3673,3682,3691,3700,3709,3718,3727,3736,3745,3754,3763,3772,3781,3790,3799,3808,3817,3826,3835,3844,3853,3862,3871,3880,3889,3898,3907,3916,3925,3934,3943,3952,3961,3970,3979,3988,3997,4006,4015,4024,4033,4042,4051,4060,4069,4078,4087,4096,4105,4114,4123,4132,4141,4150,4159,4168,4177,4186,4195,4204,4213,4222,4231,4240,4249,4258,4267,4276,4285,4294,4303,4312,4321,4330,4339,4348,4357,4366,4375,4384,4393,4402,4411,4420,4429,4438,4447,4456,4465,4474,4483,4492,4501,4510
-
 //Blacksmith, Whitesmith, Baby Blacksmith
 1,500,10:4011:4033,1,14,18,22,26,30,34,38,42,46,50,54,58,62,66,70,74,78,82,86,90,94,98,102,106,110,114,118,122,126,130,134,138,142,146,150,154,158,162,166,170,174,178,182,186,190,194,198,202,206,210,214,218,222,226,230,234,238,242,246,250,254,258,262,266,270,274,278,282,286,290,294,298,302,306,310,314,318,322,326,330,334,338,342,346,350,354,358,362,366,370,374,378,382,386,390,394,398,402,406,410,414,418,422,426,430,434,438,442,446,450,454,458,462,466,470,474,478,482,486,490,494,498,502,506,510,514,518,522,526,530,534,538,542,546,550,554,558,562,566,570,574,578,582,586,590,594,598,602,606,610,614,618,622,626,630,634,638,642,646,650,654,658,662,666,670,674,678,682,686,690,694,698,702,706,710,714,718,722,726,730,734,738,742,746,750,754,758,762,766,770,774,778,782,786,790,794,798,802,806,810,814,818,822,826,830,834,838,842,846,850,854,858,862,866,870,874,878,882,886,890,894,898,902,906,910,914,918,922,926,930,934,938,942,946,950,954,958,962,966,970,974,978,982,986,990,994,998,1002,1006,1010,1014,1018,1022,1026,1030,1034,1038,1042,1046,1050,1054,1058,1062,1066,1070,1074,1078,1082,1086,1090,1094,1098,1102,1106,1110,1114,1118,1122,1126,1130,1134,1138,1142,1146,1150,1154,1158,1162,1166,1170,1174,1178,1182,1186,1190,1194,1198,1202,1206,1210,1214,1218,1222,1226,1230,1234,1238,1242,1246,1250,1254,1258,1262,1266,1270,1274,1278,1282,1286,1290,1294,1298,1302,1306,1310,1314,1318,1322,1326,1330,1334,1338,1342,1346,1350,1354,1358,1362,1366,1370,1374,1378,1382,1386,1390,1394,1398,1402,1406,1410,1414,1418,1422,1426,1430,1434,1438,1442,1446,1450,1454,1458,1462,1466,1470,1474,1478,1482,1486,1490,1494,1498,1502,1506,1510,1514,1518,1522,1526,1530,1534,1538,1542,1546,1550,1554,1558,1562,1566,1570,1574,1578,1582,1586,1590,1594,1598,1602,1606,1610,1614,1618,1622,1626,1630,1634,1638,1642,1646,1650,1654,1658,1662,1666,1670,1674,1678,1682,1686,1690,1694,1698,1702,1706,1710,1714,1718,1722,1726,1730,1734,1738,1742,1746,1750,1754,1758,1762,1766,1770,1774,1778,1782,1786,1790,1794,1798,1802,1806,1810,1814,1818,1822,1826,1830,1834,1838,1842,1846,1850,1854,1858,1862,1866,1870,1874,1878,1882,1886,1890,1894,1898,1902,1906,1910,1914,1918,1922,1926,1930,1934,1938,1942,1946,1950,1954,1958,1962,1966,1970,1974,1978,1982,1986,1990,1994,1998,2002,2006,2010
 
-//Mechanic, Mechanic T, Mechanic (Mado), Mechanic T (Mado), Baby Mechanic, Baby Mechanic (Mado)
-1,500,4058:4064:4086:4087:4100:4112,1,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,400,410,414,418,422,426,430,434,438,442,446,450,454,458,462,466,470,474,478,482,486,490,494,498,502,506,510,514,518,522,526,530,534,538,542,546,550,554,558,562,566,570,574,578,582,586,590,594,598,602,606,610,614,618,622,626,630,634,638,642,646,650,654,658,662,666,670,674,678,682,686,690,694,698,702,706,710,714,718,722,726,730,734,738,742,746,750,754,758,762,766,770,774,778,782,786,790,794,798,802,806,810,814,818,822,826,830,834,838,842,846,850,854,858,862,866,870,874,878,882,886,890,894,898,902,906,910,914,918,922,926,930,934,938,942,946,950,954,958,962,966,970,974,978,982,986,990,994,998,1002,1006,1010,1014,1018,1022,1026,1030,1034,1038,1042,1046,1050,1054,1058,1062,1066,1070,1074,1078,1082,1086,1090,1094,1098,1102,1106,1110,1114,1118,1122,1126,1130,1134,1138,1142,1146,1150,1154,1158,1162,1166,1170,1174,1178,1182,1186,1190,1194,1198,1202,1206,1210,1214,1218,1222,1226,1230,1234,1238,1242,1246,1250,1254,1258,1262,1266,1270,1274,1278,1282,1286,1290,1294,1298,1302,1306,1310,1314,1318,1322,1326,1330,1334,1338,1342,1346,1350,1354,1358,1362,1366,1370,1374,1378,1382,1386,1390,1394,1398,1402,1406,1410,1414,1418,1422,1426,1430,1434,1438,1442,1446,1450,1454,1458,1462,1466,1470,1474,1478,1482,1486,1490,1494,1498,1502,1506,1510,1514,1518,1522,1526,1530,1534,1538,1542,1546,1550,1554,1558,1562,1566,1570,1574,1578,1582,1586,1590,1594,1598,1602,1606,1610,1614,1618,1622,1626,1630,1634,1638,1642,1646,1650,1654,1658,1662,1666,1670,1674,1678,1682,1686,1690,1694,1698,1702,1706,1710,1714,1718,1722,1726,1730,1734,1738,1742,1746,1750,1754,1758,1762,1766,1770,1774,1778,1782,1786,1790,1794,1798,1802,1806,1810,1814,1818,1822,1826,1830,1834,1838,1842,1846,1850,1854,1858,1862,1866,1870,1874,1878,1882,1886,1890,1894,1898,1902,1906,1910,1914,1918,1922,1926,1930,1934,1938,1942,1946,1950,1954,1958,1962,1966,1970,1974,1978,1982,1986,1990,1994,1998,2002,2006,2010
-
 //Hunter, Sniper, Baby Hunter
 1,500,11:4012:4034,1,14,18,22,26,30,34,38,42,46,50,54,58,62,66,70,74,78,82,86,90,94,98,102,106,110,114,118,122,126,130,134,138,142,146,150,154,158,162,166,170,174,178,182,186,190,194,198,202,206,210,214,218,222,226,230,234,238,242,246,250,254,258,262,266,270,274,278,282,286,290,294,298,302,306,310,314,318,322,326,330,334,338,342,346,350,354,358,362,366,370,374,378,382,386,390,394,398,402,406,410,414,418,422,426,430,434,438,442,446,450,454,458,462,466,470,474,478,482,486,490,494,498,502,506,510,514,518,522,526,530,534,538,542,546,550,554,558,562,566,570,574,578,582,586,590,594,598,602,606,610,614,618,622,626,630,634,638,642,646,650,654,658,662,666,670,674,678,682,686,690,694,698,702,706,710,714,718,722,726,730,734,738,742,746,750,754,758,762,766,770,774,778,782,786,790,794,798,802,806,810,814,818,822,826,830,834,838,842,846,850,854,858,862,866,870,874,878,882,886,890,894,898,902,906,910,914,918,922,926,930,934,938,942,946,950,954,958,962,966,970,974,978,982,986,990,994,998,1002,1006,1010,1014,1018,1022,1026,1030,1034,1038,1042,1046,1050,1054,1058,1062,1066,1070,1074,1078,1082,1086,1090,1094,1098,1102,1106,1110,1114,1118,1122,1126,1130,1134,1138,1142,1146,1150,1154,1158,1162,1166,1170,1174,1178,1182,1186,1190,1194,1198,1202,1206,1210,1214,1218,1222,1226,1230,1234,1238,1242,1246,1250,1254,1258,1262,1266,1270,1274,1278,1282,1286,1290,1294,1298,1302,1306,1310,1314,1318,1322,1326,1330,1334,1338,1342,1346,1350,1354,1358,1362,1366,1370,1374,1378,1382,1386,1390,1394,1398,1402,1406,1410,1414,1418,1422,1426,1430,1434,1438,1442,1446,1450,1454,1458,1462,1466,1470,1474,1478,1482,1486,1490,1494,1498,1502,1506,1510,1514,1518,1522,1526,1530,1534,1538,1542,1546,1550,1554,1558,1562,1566,1570,1574,1578,1582,1586,1590,1594,1598,1602,1606,1610,1614,1618,1622,1626,1630,1634,1638,1642,1646,1650,1654,1658,1662,1666,1670,1674,1678,1682,1686,1690,1694,1698,1702,1706,1710,1714,1718,1722,1726,1730,1734,1738,1742,1746,1750,1754,1758,1762,1766,1770,1774,1778,1782,1786,1790,1794,1798,1802,1806,1810,1814,1818,1822,1826,1830,1834,1838,1842,1846,1850,1854,1858,1862,1866,1870,1874,1878,1882,1886,1890,1894,1898,1902,1906,1910,1914,1918,1922,1926,1930,1934,1938,1942,1946,1950,1954,1958,1962,1966,1970,1974,1978,1982,1986,1990,1994,1998,2002,2006,2010
 
-//Ranger, Ranger T, Ranger (Warg), Ranger T (Warg), Baby Ranger, Baby Ranger (warg)
-1,500,4056:4062:4084:4085:4098:4111,1,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,400,410,414,418,422,426,430,434,438,442,446,450,454,458,462,466,470,474,478,482,486,490,494,498,502,506,510,514,518,522,526,530,534,538,542,546,550,554,558,562,566,570,574,578,582,586,590,594,598,602,606,610,614,618,622,626,630,634,638,642,646,650,654,658,662,666,670,674,678,682,686,690,694,698,702,706,710,714,718,722,726,730,734,738,742,746,750,754,758,762,766,770,774,778,782,786,790,794,798,802,806,810,814,818,822,826,830,834,838,842,846,850,854,858,862,866,870,874,878,882,886,890,894,898,902,906,910,914,918,922,926,930,934,938,942,946,950,954,958,962,966,970,974,978,982,986,990,994,998,1002,1006,1010,1014,1018,1022,1026,1030,1034,1038,1042,1046,1050,1054,1058,1062,1066,1070,1074,1078,1082,1086,1090,1094,1098,1102,1106,1110,1114,1118,1122,1126,1130,1134,1138,1142,1146,1150,1154,1158,1162,1166,1170,1174,1178,1182,1186,1190,1194,1198,1202,1206,1210,1214,1218,1222,1226,1230,1234,1238,1242,1246,1250,1254,1258,1262,1266,1270,1274,1278,1282,1286,1290,1294,1298,1302,1306,1310,1314,1318,1322,1326,1330,1334,1338,1342,1346,1350,1354,1358,1362,1366,1370,1374,1378,1382,1386,1390,1394,1398,1402,1406,1410,1414,1418,1422,1426,1430,1434,1438,1442,1446,1450,1454,1458,1462,1466,1470,1474,1478,1482,1486,1490,1494,1498,1502,1506,1510,1514,1518,1522,1526,1530,1534,1538,1542,1546,1550,1554,1558,1562,1566,1570,1574,1578,1582,1586,1590,1594,1598,1602,1606,1610,1614,1618,1622,1626,1630,1634,1638,1642,1646,1650,1654,1658,1662,1666,1670,1674,1678,1682,1686,1690,1694,1698,1702,1706,1710,1714,1718,1722,1726,1730,1734,1738,1742,1746,1750,1754,1758,1762,1766,1770,1774,1778,1782,1786,1790,1794,1798,1802,1806,1810,1814,1818,1822,1826,1830,1834,1838,1842,1846,1850,1854,1858,1862,1866,1870,1874,1878,1882,1886,1890,1894,1898,1902,1906,1910,1914,1918,1922,1926,1930,1934,1938,1942,1946,1950,1954,1958,1962,1966,1970,1974,1978,1982,1986,1990,1994,1998,2002,2006,2010
-
 //Assassin, Assassin Cross, Baby Assassin
 1,500,12:4013:4035,1,14,18,22,26,30,34,38,42,46,50,54,58,62,66,70,74,78,82,86,90,94,98,102,106,110,114,118,122,126,130,134,138,142,146,150,154,158,162,166,170,174,178,182,186,190,194,198,202,206,210,214,218,222,226,230,234,238,242,246,250,254,258,262,266,270,274,278,282,286,290,294,298,302,306,310,314,318,322,326,330,334,338,342,346,350,354,358,362,366,370,374,378,382,386,390,394,398,402,406,410,414,418,422,426,430,434,438,442,446,450,454,458,462,466,470,474,478,482,486,490,494,498,502,506,510,514,518,522,526,530,534,538,542,546,550,554,558,562,566,570,574,578,582,586,590,594,598,602,606,610,614,618,622,626,630,634,638,642,646,650,654,658,662,666,670,674,678,682,686,690,694,698,702,706,710,714,718,722,726,730,734,738,742,746,750,754,758,762,766,770,774,778,782,786,790,794,798,802,806,810,814,818,822,826,830,834,838,842,846,850,854,858,862,866,870,874,878,882,886,890,894,898,902,906,910,914,918,922,926,930,934,938,942,946,950,954,958,962,966,970,974,978,982,986,990,994,998,1002,1006,1010,1014,1018,1022,1026,1030,1034,1038,1042,1046,1050,1054,1058,1062,1066,1070,1074,1078,1082,1086,1090,1094,1098,1102,1106,1110,1114,1118,1122,1126,1130,1134,1138,1142,1146,1150,1154,1158,1162,1166,1170,1174,1178,1182,1186,1190,1194,1198,1202,1206,1210,1214,1218,1222,1226,1230,1234,1238,1242,1246,1250,1254,1258,1262,1266,1270,1274,1278,1282,1286,1290,1294,1298,1302,1306,1310,1314,1318,1322,1326,1330,1334,1338,1342,1346,1350,1354,1358,1362,1366,1370,1374,1378,1382,1386,1390,1394,1398,1402,1406,1410,1414,1418,1422,1426,1430,1434,1438,1442,1446,1450,1454,1458,1462,1466,1470,1474,1478,1482,1486,1490,1494,1498,1502,1506,1510,1514,1518,1522,1526,1530,1534,1538,1542,1546,1550,1554,1558,1562,1566,1570,1574,1578,1582,1586,1590,1594,1598,1602,1606,1610,1614,1618,1622,1626,1630,1634,1638,1642,1646,1650,1654,1658,1662,1666,1670,1674,1678,1682,1686,1690,1694,1698,1702,1706,1710,1714,1718,1722,1726,1730,1734,1738,1742,1746,1750,1754,1758,1762,1766,1770,1774,1778,1782,1786,1790,1794,1798,1802,1806,1810,1814,1818,1822,1826,1830,1834,1838,1842,1846,1850,1854,1858,1862,1866,1870,1874,1878,1882,1886,1890,1894,1898,1902,1906,1910,1914,1918,1922,1926,1930,1934,1938,1942,1946,1950,1954,1958,1962,1966,1970,1974,1978,1982,1986,1990,1994,1998,2002,2006,2010
 
-//Glt Cross, Glt Cross T, Baby Glt Cross
-1,500,4059:4065:4101,1,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,400,410,414,418,422,426,430,434,438,442,446,450,454,458,462,466,470,474,478,482,486,490,494,498,502,506,510,514,518,522,526,530,534,538,542,546,550,554,558,562,566,570,574,578,582,586,590,594,598,602,606,610,614,618,622,626,630,634,638,642,646,650,654,658,662,666,670,674,678,682,686,690,694,698,702,706,710,714,718,722,726,730,734,738,742,746,750,754,758,762,766,770,774,778,782,786,790,794,798,802,806,810,814,818,822,826,830,834,838,842,846,850,854,858,862,866,870,874,878,882,886,890,894,898,902,906,910,914,918,922,926,930,934,938,942,946,950,954,958,962,966,970,974,978,982,986,990,994,998,1002,1006,1010,1014,1018,1022,1026,1030,1034,1038,1042,1046,1050,1054,1058,1062,1066,1070,1074,1078,1082,1086,1090,1094,1098,1102,1106,1110,1114,1118,1122,1126,1130,1134,1138,1142,1146,1150,1154,1158,1162,1166,1170,1174,1178,1182,1186,1190,1194,1198,1202,1206,1210,1214,1218,1222,1226,1230,1234,1238,1242,1246,1250,1254,1258,1262,1266,1270,1274,1278,1282,1286,1290,1294,1298,1302,1306,1310,1314,1318,1322,1326,1330,1334,1338,1342,1346,1350,1354,1358,1362,1366,1370,1374,1378,1382,1386,1390,1394,1398,1402,1406,1410,1414,1418,1422,1426,1430,1434,1438,1442,1446,1450,1454,1458,1462,1466,1470,1474,1478,1482,1486,1490,1494,1498,1502,1506,1510,1514,1518,1522,1526,1530,1534,1538,1542,1546,1550,1554,1558,1562,1566,1570,1574,1578,1582,1586,1590,1594,1598,1602,1606,1610,1614,1618,1622,1626,1630,1634,1638,1642,1646,1650,1654,1658,1662,1666,1670,1674,1678,1682,1686,1690,1694,1698,1702,1706,1710,1714,1718,1722,1726,1730,1734,1738,1742,1746,1750,1754,1758,1762,1766,1770,1774,1778,1782,1786,1790,1794,1798,1802,1806,1810,1814,1818,1822,1826,1830,1834,1838,1842,1846,1850,1854,1858,1862,1866,1870,1874,1878,1882,1886,1890,1894,1898,1902,1906,1910,1914,1918,1922,1926,1930,1934,1938,1942,1946,1950,1954,1958,1962,1966,1970,1974,1978,1982,1986,1990,1994,1998,2002,2006,2010
-
 //Crusader, Crusader (Peco), Paladin, Paladin (Peco), Baby Crusader, Baby Crusader (Peco)
 1,500,14:21:4015:4022:4037:4044,1,14,19,24,28,33,38,42,47,52,57,61,66,71,75,80,85,89,94,99,104,108,113,118,122,127,132,136,141,146,151,155,160,165,169,174,179,183,188,193,198,202,207,212,216,221,226,230,235,240,245,249,254,259,263,268,273,277,282,287,292,296,301,306,310,315,320,324,329,334,339,343,348,353,357,362,367,371,376,381,386,390,395,400,404,409,414,418,423,428,433,437,442,447,451,456,461,465,470,475,480,484,489,494,498,503,508,512,517,522,527,531,536,541,545,550,555,559,564,569,574,578,583,588,592,597,602,606,611,616,621,625,630,635,639,644,649,653,658,663,668,672,677,682,686,691,696,700,705,710,715,720,725,730,735,740,745,750,755,760,765,770,775,780,785,790,795,800,805,810,815,820,825,830,835,840,845,850,855,860,865,870,875,880,885,890,895,900,905,910,915,920,925,930,935,940,945,950,955,960,965,970,975,980,985,990,995,1000,1005,1010,1015,1020,1025,1030,1035,1040,1045,1050,1055,1060,1065,1070,1075,1080,1085,1090,1095,1100,1105,1110,1115,1120,1125,1130,1135,1140,1145,1150,1155,1160,1165,1170,1175,1180,1185,1190,1195,1200,1205,1210,1215,1220,1225,1230,1235,1240,1245,1250,1255,1260,1265,1270,1275,1280,1285,1290,1295,1300,1305,1310,1315,1320,1325,1330,1335,1340,1345,1350,1355,1360,1365,1370,1375,1380,1385,1390,1395,1400,1405,1410,1415,1420,1425,1430,1435,1440,1445,1450,1455,1460,1465,1470,1475,1480,1485,1490,1495,1500,1505,1510,1515,1520,1525,1530,1535,1540,1545,1550,1555,1560,1565,1570,1575,1580,1585,1590,1595,1600,1605,1610,1615,1620,1625,1630,1635,1640,1645,1650,1655,1660,1665,1670,1675,1680,1685,1690,1695,1700,1705,1710,1715,1720,1725,1730,1735,1740,1745,1750,1755,1760,1765,1770,1775,1780,1785,1790,1795,1800,1805,1810,1815,1820,1825,1830,1835,1840,1845,1850,1855,1860,1865,1870,1875,1880,1885,1890,1895,1900,1905,1910,1915,1920,1925,1930,1935,1940,1945,1950,1955,1960,1965,1970,1975,1980,1985,1990,1995,2000,2005,2010,2015,2020,2025,2030,2035,2040,2045,2050,2055,2060,2065,2070,2075,2080,2085,2090,2095,2100,2105,2110,2115,2120,2125,2130,2135,2140,2145,2150,2155,2160,2165,2170,2175,2180,2185,2190,2195,2200,2205,2210,2215,2220,2225,2230,2235,2240,2245,2250,2255,2260,2265,2270,2275,2280,2285,2290,2295,2300,2305,2310,2315,2320,2325,2330,2335,2340,2345,2350,2355,2360,2365,2370,2375,2380,2385,2390,2395,2400,2405,2410,2415,2420,2425,2430,2435,2440,2445,2450,2455,2460,2465
 
-//Royal Guard, Royal Guard T, Royal Guard (Gryphon), Royal Guard T (Gryphon), Baby Royal Guard, Baby Royal Guard (Gryphon)
-1,500,4066:4073:4082:4083:4102:4110,1,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,400,410,414,418,422,426,430,434,438,442,446,450,454,458,462,466,470,474,478,482,486,490,494,498,502,506,510,514,518,522,526,530,534,538,542,546,550,554,558,562,566,570,574,578,582,586,590,594,598,602,606,610,614,618,622,626,630,634,638,642,646,650,654,658,662,666,670,674,678,682,686,690,694,698,702,706,710,714,718,722,726,730,734,738,742,746,750,754,758,762,766,770,774,778,782,786,790,794,798,802,806,810,814,818,822,826,830,834,838,842,846,850,854,858,862,866,870,874,878,882,886,890,894,898,902,906,910,914,918,922,926,930,934,938,942,946,950,954,958,962,966,970,974,978,982,986,990,994,998,1002,1006,1010,1014,1018,1022,1026,1030,1034,1038,1042,1046,1050,1054,1058,1062,1066,1070,1074,1078,1082,1086,1090,1094,1098,1102,1106,1110,1114,1118,1122,1126,1130,1134,1138,1142,1146,1150,1154,1158,1162,1166,1170,1174,1178,1182,1186,1190,1194,1198,1202,1206,1210,1214,1218,1222,1226,1230,1234,1238,1242,1246,1250,1254,1258,1262,1266,1270,1274,1278,1282,1286,1290,1294,1298,1302,1306,1310,1314,1318,1322,1326,1330,1334,1338,1342,1346,1350,1354,1358,1362,1366,1370,1374,1378,1382,1386,1390,1394,1398,1402,1406,1410,1414,1418,1422,1426,1430,1434,1438,1442,1446,1450,1454,1458,1462,1466,1470,1474,1478,1482,1486,1490,1494,1498,1502,1506,1510,1514,1518,1522,1526,1530,1534,1538,1542,1546,1550,1554,1558,1562,1566,1570,1574,1578,1582,1586,1590,1594,1598,1602,1606,1610,1614,1618,1622,1626,1630,1634,1638,1642,1646,1650,1654,1658,1662,1666,1670,1674,1678,1682,1686,1690,1694,1698,1702,1706,1710,1714,1718,1722,1726,1730,1734,1738,1742,1746,1750,1754,1758,1762,1766,1770,1774,1778,1782,1786,1790,1794,1798,1802,1806,1810,1814,1818,1822,1826,1830,1834,1838,1842,1846,1850,1854,1858,1862,1866,1870,1874,1878,1882,1886,1890,1894,1898,1902,1906,1910,1914,1918,1922,1926,1930,1934,1938,1942,1946,1950,1954,1958,1962,1966,1970,1974,1978,1982,1986,1990,1994,1998,2002,2006,2010
-
 //Monk, Champion, Baby Monk
 1,500,15:4016:4038,1,14,19,24,28,33,38,42,47,52,57,61,66,71,75,80,85,89,94,99,104,108,113,118,122,127,132,136,141,146,151,155,160,165,169,174,179,183,188,193,198,202,207,212,216,221,226,230,235,240,245,249,254,259,263,268,273,277,282,287,292,296,301,306,310,315,320,324,329,334,339,343,348,353,357,362,367,371,376,381,386,390,395,400,404,409,414,418,423,428,433,437,442,447,451,456,461,465,470,475,480,484,489,494,498,503,508,512,517,522,527,531,536,541,545,550,555,559,564,569,574,578,583,588,592,597,602,606,611,616,621,625,630,635,639,644,649,653,658,663,668,672,677,682,686,691,696,700,705,710,715,720,725,730,735,740,745,750,755,760,765,770,775,780,785,790,795,800,805,810,815,820,825,830,835,840,845,850,855,860,865,870,875,880,885,890,895,900,905,910,915,920,925,930,935,940,945,950,955,960,965,970,975,980,985,990,995,1000,1005,1010,1015,1020,1025,1030,1035,1040,1045,1050,1055,1060,1065,1070,1075,1080,1085,1090,1095,1100,1105,1110,1115,1120,1125,1130,1135,1140,1145,1150,1155,1160,1165,1170,1175,1180,1185,1190,1195,1200,1205,1210,1215,1220,1225,1230,1235,1240,1245,1250,1255,1260,1265,1270,1275,1280,1285,1290,1295,1300,1305,1310,1315,1320,1325,1330,1335,1340,1345,1350,1355,1360,1365,1370,1375,1380,1385,1390,1395,1400,1405,1410,1415,1420,1425,1430,1435,1440,1445,1450,1455,1460,1465,1470,1475,1480,1485,1490,1495,1500,1505,1510,1515,1520,1525,1530,1535,1540,1545,1550,1555,1560,1565,1570,1575,1580,1585,1590,1595,1600,1605,1610,1615,1620,1625,1630,1635,1640,1645,1650,1655,1660,1665,1670,1675,1680,1685,1690,1695,1700,1705,1710,1715,1720,1725,1730,1735,1740,1745,1750,1755,1760,1765,1770,1775,1780,1785,1790,1795,1800,1805,1810,1815,1820,1825,1830,1835,1840,1845,1850,1855,1860,1865,1870,1875,1880,1885,1890,1895,1900,1905,1910,1915,1920,1925,1930,1935,1940,1945,1950,1955,1960,1965,1970,1975,1980,1985,1990,1995,2000,2005,2010,2015,2020,2025,2030,2035,2040,2045,2050,2055,2060,2065,2070,2075,2080,2085,2090,2095,2100,2105,2110,2115,2120,2125,2130,2135,2140,2145,2150,2155,2160,2165,2170,2175,2180,2185,2190,2195,2200,2205,2210,2215,2220,2225,2230,2235,2240,2245,2250,2255,2260,2265,2270,2275,2280,2285,2290,2295,2300,2305,2310,2315,2320,2325,2330,2335,2340,2345,2350,2355,2360,2365,2370,2375,2380,2385,2390,2395,2400,2405,2410,2415,2420,2425,2430,2435,2440,2445,2450,2455,2460,2465
 
-//Sura, Sura T, Baby Sura
-1,500,4070:4077:4106,1,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,400,410,414,418,422,426,430,434,438,442,446,450,454,458,462,466,470,474,478,482,486,490,494,498,502,506,510,514,518,522,526,530,534,538,542,546,550,554,558,562,566,570,574,578,582,586,590,594,598,602,606,610,614,618,622,626,630,634,638,642,646,650,654,658,662,666,670,674,678,682,686,690,694,698,702,706,710,714,718,722,726,730,734,738,742,746,750,754,758,762,766,770,774,778,782,786,790,794,798,802,806,810,814,818,822,826,830,834,838,842,846,850,854,858,862,866,870,874,878,882,886,890,894,898,902,906,910,914,918,922,926,930,934,938,942,946,950,954,958,962,966,970,974,978,982,986,990,994,998,1002,1006,1010,1014,1018,1022,1026,1030,1034,1038,1042,1046,1050,1054,1058,1062,1066,1070,1074,1078,1082,1086,1090,1094,1098,1102,1106,1110,1114,1118,1122,1126,1130,1134,1138,1142,1146,1150,1154,1158,1162,1166,1170,1174,1178,1182,1186,1190,1194,1198,1202,1206,1210,1214,1218,1222,1226,1230,1234,1238,1242,1246,1250,1254,1258,1262,1266,1270,1274,1278,1282,1286,1290,1294,1298,1302,1306,1310,1314,1318,1322,1326,1330,1334,1338,1342,1346,1350,1354,1358,1362,1366,1370,1374,1378,1382,1386,1390,1394,1398,1402,1406,1410,1414,1418,1422,1426,1430,1434,1438,1442,1446,1450,1454,1458,1462,1466,1470,1474,1478,1482,1486,1490,1494,1498,1502,1506,1510,1514,1518,1522,1526,1530,1534,1538,1542,1546,1550,1554,1558,1562,1566,1570,1574,1578,1582,1586,1590,1594,1598,1602,1606,1610,1614,1618,1622,1626,1630,1634,1638,1642,1646,1650,1654,1658,1662,1666,1670,1674,1678,1682,1686,1690,1694,1698,1702,1706,1710,1714,1718,1722,1726,1730,1734,1738,1742,1746,1750,1754,1758,1762,1766,1770,1774,1778,1782,1786,1790,1794,1798,1802,1806,1810,1814,1818,1822,1826,1830,1834,1838,1842,1846,1850,1854,1858,1862,1866,1870,1874,1878,1882,1886,1890,1894,1898,1902,1906,1910,1914,1918,1922,1926,1930,1934,1938,1942,1946,1950,1954,1958,1962,1966,1970,1974,1978,1982,1986,1990,1994,1998,2002,2006,2010
-
 //Sage, Professor, Baby Sage
 1,500,16:4017:4039,1,17,24,31,38,45,52,59,66,73,80,87,94,101,108,115,122,129,136,143,150,157,164,171,178,185,192,199,206,213,220,227,234,241,248,255,262,269,276,283,290,297,304,311,318,325,332,339,346,353,360,367,374,381,388,395,402,409,416,423,430,437,444,451,458,465,472,479,486,493,500,507,514,521,528,535,542,549,556,563,570,577,584,591,598,605,612,619,626,633,640,647,654,661,668,675,682,689,696,703,710,717,724,731,738,745,752,759,766,773,780,787,794,801,808,815,822,829,836,843,850,857,864,871,878,885,892,899,906,913,920,927,934,941,948,955,962,969,976,983,990,997,1004,1011,1018,1025,1032,1039,1046,1053,1060,1067,1074,1081,1088,1095,1102,1109,1116,1123,1130,1137,1144,1151,1158,1165,1172,1179,1186,1193,1200,1207,1214,1221,1228,1235,1242,1249,1256,1263,1270,1277,1284,1291,1298,1305,1312,1319,1326,1333,1340,1347,1354,1361,1368,1375,1382,1389,1396,1403,1410,1417,1424,1431,1438,1445,1452,1459,1466,1473,1480,1487,1494,1501,1508,1515,1522,1529,1536,1543,1550,1557,1564,1571,1578,1585,1592,1599,1606,1613,1620,1627,1634,1641,1648,1655,1662,1669,1676,1683,1690,1697,1704,1711,1718,1725,1732,1739,1746,1753,1760,1767,1774,1781,1788,1795,1802,1809,1816,1823,1830,1837,1844,1851,1858,1865,1872,1879,1886,1893,1900,1907,1914,1921,1928,1935,1942,1949,1956,1963,1970,1977,1984,1991,1998,2005,2012,2019,2026,2033,2040,2047,2054,2061,2068,2075,2082,2089,2096,2103,2110,2117,2124,2131,2138,2145,2152,2159,2166,2173,2180,2187,2194,2201,2208,2215,2222,2229,2236,2243,2250,2257,2264,2271,2278,2285,2292,2299,2306,2313,2320,2327,2334,2341,2348,2355,2362,2369,2376,2383,2390,2397,2404,2411,2418,2425,2432,2439,2446,2453,2460,2467,2474,2481,2488,2495,2502,2509,2516,2523,2530,2537,2544,2551,2558,2565,2572,2579,2586,2593,2600,2607,2614,2621,2628,2635,2642,2649,2656,2663,2670,2677,2684,2691,2698,2705,2712,2719,2726,2733,2740,2747,2754,2761,2768,2775,2782,2789,2796,2803,2810,2817,2824,2831,2838,2845,2852,2859,2866,2873,2880,2887,2894,2901,2908,2915,2922,2929,2936,2943,2950,2957,2964,2971,2978,2985,2992,2999,3006,3013,3020,3027,3034,3041,3048,3055,3062,3069,3076,3083,3090,3097,3104,3111,3118,3125,3132,3139,3146,3153,3160,3167,3174,3181,3188,3195,3202,3209,3216,3223,3230,3237,3244,3251,3258,3265,3272,3279,3286,3293,3300,3307,3314,3321,3328,3335,3342,3349,3356,3363,3370,3377,3384,3391,3398,3405,3412,3419,3426,3433,3440,3447,3454,3461,3468,3475,3482,3489,3496,3503,3510
 
-//Sorcerer, Sorcerer T, Baby Sorcerer
-1,500,4067:4074:4103,1,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,900,910,919,928,937,946,955,964,973,982,991,1000,1009,1018,1027,1036,1045,1054,1063,1072,1081,1090,1099,1108,1117,1126,1135,1144,1153,1162,1171,1180,1189,1198,1207,1216,1225,1234,1243,1252,1261,1270,1279,1288,1297,1306,1315,1324,1333,1342,1351,1360,1369,1378,1387,1396,1405,1414,1423,1432,1441,1450,1459,1468,1477,1486,1495,1504,1513,1522,1531,1540,1549,1558,1567,1576,1585,1594,1603,1612,1621,1630,1639,1648,1657,1666,1675,1684,1693,1702,1711,1720,1729,1738,1747,1756,1765,1774,1783,1792,1801,1810,1819,1828,1837,1846,1855,1864,1873,1882,1891,1900,1909,1918,1927,1936,1945,1954,1963,1972,1981,1990,1999,2008,2017,2026,2035,2044,2053,2062,2071,2080,2089,2098,2107,2116,2125,2134,2143,2152,2161,2170,2179,2188,2197,2206,2215,2224,2233,2242,2251,2260,2269,2278,2287,2296,2305,2314,2323,2332,2341,2350,2359,2368,2377,2386,2395,2404,2413,2422,2431,2440,2449,2458,2467,2476,2485,2494,2503,2512,2521,2530,2539,2548,2557,2566,2575,2584,2593,2602,2611,2620,2629,2638,2647,2656,2665,2674,2683,2692,2701,2710,2719,2728,2737,2746,2755,2764,2773,2782,2791,2800,2809,2818,2827,2836,2845,2854,2863,2872,2881,2890,2899,2908,2917,2926,2935,2944,2953,2962,2971,2980,2989,2998,3007,3016,3025,3034,3043,3052,3061,3070,3079,3088,3097,3106,3115,3124,3133,3142,3151,3160,3169,3178,3187,3196,3205,3214,3223,3232,3241,3250,3259,3268,3277,3286,3295,3304,3313,3322,3331,3340,3349,3358,3367,3376,3385,3394,3403,3412,3421,3430,3439,3448,3457,3466,3475,3484,3493,3502,3511,3520,3529,3538,3547,3556,3565,3574,3583,3592,3601,3610,3619,3628,3637,3646,3655,3664,3673,3682,3691,3700,3709,3718,3727,3736,3745,3754,3763,3772,3781,3790,3799,3808,3817,3826,3835,3844,3853,3862,3871,3880,3889,3898,3907,3916,3925,3934,3943,3952,3961,3970,3979,3988,3997,4006,4015,4024,4033,4042,4051,4060,4069,4078,4087,4096,4105,4114,4123,4132,4141,4150,4159,4168,4177,4186,4195,4204,4213,4222,4231,4240,4249,4258,4267,4276,4285,4294,4303,4312,4321,4330,4339,4348,4357,4366,4375,4384,4393,4402,4411,4420,4429,4438,4447,4456,4465,4474,4483,4492,4501,4510
-
 //Rogue, Stalker, Baby Rogue
 1,500,17:4018:4040,1,15,20,25,30,35,40,45,50,55,60,65,70,75,80,85,90,95,100,105,110,115,120,125,130,135,140,145,150,155,160,165,170,175,180,185,190,195,200,205,210,215,220,225,230,235,240,245,250,255,260,265,270,275,280,285,290,295,300,305,310,315,320,325,330,335,340,345,350,355,360,365,370,375,380,385,390,395,400,405,410,415,420,425,430,435,440,445,450,455,460,465,470,475,480,485,490,495,500,505,510,515,520,525,530,535,540,545,550,555,560,565,570,575,580,585,590,595,600,605,610,615,620,625,630,635,640,645,650,655,660,665,670,675,680,685,690,695,700,705,710,715,720,725,730,735,740,745,750,755,760,765,770,775,780,785,790,795,800,805,810,815,820,825,830,835,840,845,850,855,860,865,870,875,880,885,890,895,900,905,910,915,920,925,930,935,940,945,950,955,960,965,970,975,980,985,990,995,1000,1005,1010,1015,1020,1025,1030,1035,1040,1045,1050,1055,1060,1065,1070,1075,1080,1085,1090,1095,1100,1105,1110,1115,1120,1125,1130,1135,1140,1145,1150,1155,1160,1165,1170,1175,1180,1185,1190,1195,1200,1205,1210,1215,1220,1225,1230,1235,1240,1245,1250,1255,1260,1265,1270,1275,1280,1285,1290,1295,1300,1305,1310,1315,1320,1325,1330,1335,1340,1345,1350,1355,1360,1365,1370,1375,1380,1385,1390,1395,1400,1405,1410,1415,1420,1425,1430,1435,1440,1445,1450,1455,1460,1465,1470,1475,1480,1485,1490,1495,1500,1505,1510,1515,1520,1525,1530,1535,1540,1545,1550,1555,1560,1565,1570,1575,1580,1585,1590,1595,1600,1605,1610,1615,1620,1625,1630,1635,1640,1645,1650,1655,1660,1665,1670,1675,1680,1685,1690,1695,1700,1705,1710,1715,1720,1725,1730,1735,1740,1745,1750,1755,1760,1765,1770,1775,1780,1785,1790,1795,1800,1805,1810,1815,1820,1825,1830,1835,1840,1845,1850,1855,1860,1865,1870,1875,1880,1885,1890,1895,1900,1905,1910,1915,1920,1925,1930,1935,1940,1945,1950,1955,1960,1965,1970,1975,1980,1985,1990,1995,2000,2005,2010,2015,2020,2025,2030,2035,2040,2045,2050,2055,2060,2065,2070,2075,2080,2085,2090,2095,2100,2105,2110,2115,2120,2125,2130,2135,2140,2145,2150,2155,2160,2165,2170,2175,2180,2185,2190,2195,2200,2205,2210,2215,2220,2225,2230,2235,2240,2245,2250,2255,2260,2265,2270,2275,2280,2285,2290,2295,2300,2305,2310,2315,2320,2325,2330,2335,2340,2345,2350,2355,2360,2365,2370,2375,2380,2385,2390,2395,2400,2405,2410,2415,2420,2425,2430,2435,2440,2445,2450,2455,2460,2465,2470,2475,2480,2485,2490,2495,2500,2505,2510
 
-//Shadow Chaser, Shadow Chaser T, Baby Shadow Chaser
-1,500,4072:4079:4108,1,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,400,410,414,418,422,426,430,434,438,442,446,450,454,458,462,466,470,474,478,482,486,490,494,498,502,506,510,514,518,522,526,530,534,538,542,546,550,554,558,562,566,570,574,578,582,586,590,594,598,602,606,610,614,618,622,626,630,634,638,642,646,650,654,658,662,666,670,674,678,682,686,690,694,698,702,706,710,714,718,722,726,730,734,738,742,746,750,754,758,762,766,770,774,778,782,786,790,794,798,802,806,810,814,818,822,826,830,834,838,842,846,850,854,858,862,866,870,874,878,882,886,890,894,898,902,906,910,914,918,922,926,930,934,938,942,946,950,954,958,962,966,970,974,978,982,986,990,994,998,1002,1006,1010,1014,1018,1022,1026,1030,1034,1038,1042,1046,1050,1054,1058,1062,1066,1070,1074,1078,1082,1086,1090,1094,1098,1102,1106,1110,1114,1118,1122,1126,1130,1134,1138,1142,1146,1150,1154,1158,1162,1166,1170,1174,1178,1182,1186,1190,1194,1198,1202,1206,1210,1214,1218,1222,1226,1230,1234,1238,1242,1246,1250,1254,1258,1262,1266,1270,1274,1278,1282,1286,1290,1294,1298,1302,1306,1310,1314,1318,1322,1326,1330,1334,1338,1342,1346,1350,1354,1358,1362,1366,1370,1374,1378,1382,1386,1390,1394,1398,1402,1406,1410,1414,1418,1422,1426,1430,1434,1438,1442,1446,1450,1454,1458,1462,1466,1470,1474,1478,1482,1486,1490,1494,1498,1502,1506,1510,1514,1518,1522,1526,1530,1534,1538,1542,1546,1550,1554,1558,1562,1566,1570,1574,1578,1582,1586,1590,1594,1598,1602,1606,1610,1614,1618,1622,1626,1630,1634,1638,1642,1646,1650,1654,1658,1662,1666,1670,1674,1678,1682,1686,1690,1694,1698,1702,1706,1710,1714,1718,1722,1726,1730,1734,1738,1742,1746,1750,1754,1758,1762,1766,1770,1774,1778,1782,1786,1790,1794,1798,1802,1806,1810,1814,1818,1822,1826,1830,1834,1838,1842,1846,1850,1854,1858,1862,1866,1870,1874,1878,1882,1886,1890,1894,1898,1902,1906,1910,1914,1918,1922,1926,1930,1934,1938,1942,1946,1950,1954,1958,1962,1966,1970,1974,1978,1982,1986,1990,1994,1998,2002,2006,2010
-
 //Alchemist, Creator, Baby Alchemist
 1,500,18:4019:4041,1,14,18,22,26,30,34,38,42,46,50,54,58,62,66,70,74,78,82,86,90,94,98,102,106,110,114,118,122,126,130,134,138,142,146,150,154,158,162,166,170,174,178,182,186,190,194,198,202,206,210,214,218,222,226,230,234,238,242,246,250,254,258,262,266,270,274,278,282,286,290,294,298,302,306,310,314,318,322,326,330,334,338,342,346,350,354,358,362,366,370,374,378,382,386,390,394,398,402,406,410,414,418,422,426,430,434,438,442,446,450,454,458,462,466,470,474,478,482,486,490,494,498,502,506,510,514,518,522,526,530,534,538,542,546,550,554,558,562,566,570,574,578,582,586,590,594,598,602,606,610,614,618,622,626,630,634,638,642,646,650,654,658,662,666,670,674,678,682,686,690,694,698,702,706,710,714,718,722,726,730,734,738,742,746,750,754,758,762,766,770,774,778,782,786,790,794,798,802,806,810,814,818,822,826,830,834,838,842,846,850,854,858,862,866,870,874,878,882,886,890,894,898,902,906,910,914,918,922,926,930,934,938,942,946,950,954,958,962,966,970,974,978,982,986,990,994,998,1002,1006,1010,1014,1018,1022,1026,1030,1034,1038,1042,1046,1050,1054,1058,1062,1066,1070,1074,1078,1082,1086,1090,1094,1098,1102,1106,1110,1114,1118,1122,1126,1130,1134,1138,1142,1146,1150,1154,1158,1162,1166,1170,1174,1178,1182,1186,1190,1194,1198,1202,1206,1210,1214,1218,1222,1226,1230,1234,1238,1242,1246,1250,1254,1258,1262,1266,1270,1274,1278,1282,1286,1290,1294,1298,1302,1306,1310,1314,1318,1322,1326,1330,1334,1338,1342,1346,1350,1354,1358,1362,1366,1370,1374,1378,1382,1386,1390,1394,1398,1402,1406,1410,1414,1418,1422,1426,1430,1434,1438,1442,1446,1450,1454,1458,1462,1466,1470,1474,1478,1482,1486,1490,1494,1498,1502,1506,1510,1514,1518,1522,1526,1530,1534,1538,1542,1546,1550,1554,1558,1562,1566,1570,1574,1578,1582,1586,1590,1594,1598,1602,1606,1610,1614,1618,1622,1626,1630,1634,1638,1642,1646,1650,1654,1658,1662,1666,1670,1674,1678,1682,1686,1690,1694,1698,1702,1706,1710,1714,1718,1722,1726,1730,1734,1738,1742,1746,1750,1754,1758,1762,1766,1770,1774,1778,1782,1786,1790,1794,1798,1802,1806,1810,1814,1818,1822,1826,1830,1834,1838,1842,1846,1850,1854,1858,1862,1866,1870,1874,1878,1882,1886,1890,1894,1898,1902,1906,1910,1914,1918,1922,1926,1930,1934,1938,1942,1946,1950,1954,1958,1962,1966,1970,1974,1978,1982,1986,1990,1994,1998,2002,2006,2010
 
-//Genetic, Genetic T, Baby Genetic
-1,500,4071:4078:4107,1,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,900,910,919,928,937,946,955,964,973,982,991,1000,1009,1018,1027,1036,1045,1054,1063,1072,1081,1090,1099,1108,1117,1126,1135,1144,1153,1162,1171,1180,1189,1198,1207,1216,1225,1234,1243,1252,1261,1270,1279,1288,1297,1306,1315,1324,1333,1342,1351,1360,1369,1378,1387,1396,1405,1414,1423,1432,1441,1450,1459,1468,1477,1486,1495,1504,1513,1522,1531,1540,1549,1558,1567,1576,1585,1594,1603,1612,1621,1630,1639,1648,1657,1666,1675,1684,1693,1702,1711,1720,1729,1738,1747,1756,1765,1774,1783,1792,1801,1810,1819,1828,1837,1846,1855,1864,1873,1882,1891,1900,1909,1918,1927,1936,1945,1954,1963,1972,1981,1990,1999,2008,2017,2026,2035,2044,2053,2062,2071,2080,2089,2098,2107,2116,2125,2134,2143,2152,2161,2170,2179,2188,2197,2206,2215,2224,2233,2242,2251,2260,2269,2278,2287,2296,2305,2314,2323,2332,2341,2350,2359,2368,2377,2386,2395,2404,2413,2422,2431,2440,2449,2458,2467,2476,2485,2494,2503,2512,2521,2530,2539,2548,2557,2566,2575,2584,2593,2602,2611,2620,2629,2638,2647,2656,2665,2674,2683,2692,2701,2710,2719,2728,2737,2746,2755,2764,2773,2782,2791,2800,2809,2818,2827,2836,2845,2854,2863,2872,2881,2890,2899,2908,2917,2926,2935,2944,2953,2962,2971,2980,2989,2998,3007,3016,3025,3034,3043,3052,3061,3070,3079,3088,3097,3106,3115,3124,3133,3142,3151,3160,3169,3178,3187,3196,3205,3214,3223,3232,3241,3250,3259,3268,3277,3286,3295,3304,3313,3322,3331,3340,3349,3358,3367,3376,3385,3394,3403,3412,3421,3430,3439,3448,3457,3466,3475,3484,3493,3502,3511,3520,3529,3538,3547,3556,3565,3574,3583,3592,3601,3610,3619,3628,3637,3646,3655,3664,3673,3682,3691,3700,3709,3718,3727,3736,3745,3754,3763,3772,3781,3790,3799,3808,3817,3826,3835,3844,3853,3862,3871,3880,3889,3898,3907,3916,3925,3934,3943,3952,3961,3970,3979,3988,3997,4006,4015,4024,4033,4042,4051,4060,4069,4078,4087,4096,4105,4114,4123,4132,4141,4150,4159,4168,4177,4186,4195,4204,4213,4222,4231,4240,4249,4258,4267,4276,4285,4294,4303,4312,4321,4330,4339,4348,4357,4366,4375,4384,4393,4402,4411,4420,4429,4438,4447,4456,4465,4474,4483,4492,4501,4510
-
 //Bard, Clown, Baby Bard
 1,500,19:4020:4042,1,15,22,28,34,40,46,52,58,64,70,76,82,88,94,100,106,112,118,124,130,136,142,148,154,160,166,172,178,184,190,196,202,208,214,220,226,232,238,244,250,256,262,268,274,280,286,292,298,304,310,316,322,328,334,340,346,352,358,364,370,376,382,388,394,400,406,412,418,424,430,436,442,448,454,460,466,472,478,484,490,496,502,508,514,520,526,532,538,544,550,556,562,568,574,580,586,592,598,604,610,616,622,628,634,640,646,652,658,664,670,676,682,688,694,700,706,712,718,724,730,736,742,748,754,760,766,772,778,784,790,796,802,808,814,820,826,832,838,844,850,856,862,868,874,880,886,892,898,904,910,916,922,928,934,940,946,952,958,964,970,976,982,988,994,1000,1006,1012,1018,1024,1030,1036,1042,1048,1054,1060,1066,1072,1078,1084,1090,1096,1102,1108,1114,1120,1126,1132,1138,1144,1150,1156,1162,1168,1174,1180,1186,1192,1198,1204,1210,1216,1222,1228,1234,1240,1246,1252,1258,1264,1270,1276,1282,1288,1294,1300,1306,1312,1318,1324,1330,1336,1342,1348,1354,1360,1366,1372,1378,1384,1390,1396,1402,1408,1414,1420,1426,1432,1438,1444,1450,1456,1462,1468,1474,1480,1486,1492,1498,1504,1510,1516,1522,1528,1534,1540,1546,1552,1558,1564,1570,1576,1582,1588,1594,1600,1606,1612,1618,1624,1630,1636,1642,1648,1654,1660,1666,1672,1678,1684,1690,1696,1702,1708,1714,1720,1726,1732,1738,1744,1750,1756,1762,1768,1774,1780,1786,1792,1798,1804,1810,1816,1822,1828,1834,1840,1846,1852,1858,1864,1870,1876,1882,1888,1894,1900,1906,1912,1918,1924,1930,1936,1942,1948,1954,1960,1966,1972,1978,1984,1990,1996,2002,2008,2014,2020,2026,2032,2038,2044,2050,2056,2062,2068,2074,2080,2086,2092,2098,2104,2110,2116,2122,2128,2134,2140,2146,2152,2158,2164,2170,2176,2182,2188,2194,2200,2206,2212,2218,2224,2230,2236,2242,2248,2254,2260,2266,2272,2278,2284,2290,2296,2302,2308,2314,2320,2326,2332,2338,2344,2350,2356,2362,2368,2374,2380,2386,2392,2398,2404,2410,2416,2422,2428,2434,2440,2446,2452,2458,2464,2470,2476,2482,2488,2494,2500,2506,2512,2518,2524,2530,2536,2542,2548,2554,2560,2566,2572,2578,2584,2590,2596,2602,2608,2614,2620,2626,2632,2638,2644,2650,2656,2662,2668,2674,2680,2686,2692,2698,2704,2710,2716,2722,2728,2734,2740,2746,2752,2758,2764,2770,2776,2782,2788,2794,2800,2806,2812,2818,2824,2830,2836,2842,2848,2854,2860,2866,2872,2878,2884,2890,2896,2902,2908,2914,2920,2926,2932,2938,2944,2950,2956,2962,2968,2974,2980,2986,2992,2998,3004,3010
 
-//Minstrel, Minstrel T, Baby Minstrel
-1,500,4068:4075:4104,1,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,400,410,414,418,422,426,430,434,438,442,446,450,454,458,462,466,470,474,478,482,486,490,494,498,502,506,510,514,518,522,526,530,534,538,542,546,550,554,558,562,566,570,574,578,582,586,590,594,598,602,606,610,614,618,622,626,630,634,638,642,646,650,654,658,662,666,670,674,678,682,686,690,694,698,702,706,710,714,718,722,726,730,734,738,742,746,750,754,758,762,766,770,774,778,782,786,790,794,798,802,806,810,814,818,822,826,830,834,838,842,846,850,854,858,862,866,870,874,878,882,886,890,894,898,902,906,910,914,918,922,926,930,934,938,942,946,950,954,958,962,966,970,974,978,982,986,990,994,998,1002,1006,1010,1014,1018,1022,1026,1030,1034,1038,1042,1046,1050,1054,1058,1062,1066,1070,1074,1078,1082,1086,1090,1094,1098,1102,1106,1110,1114,1118,1122,1126,1130,1134,1138,1142,1146,1150,1154,1158,1162,1166,1170,1174,1178,1182,1186,1190,1194,1198,1202,1206,1210,1214,1218,1222,1226,1230,1234,1238,1242,1246,1250,1254,1258,1262,1266,1270,1274,1278,1282,1286,1290,1294,1298,1302,1306,1310,1314,1318,1322,1326,1330,1334,1338,1342,1346,1350,1354,1358,1362,1366,1370,1374,1378,1382,1386,1390,1394,1398,1402,1406,1410,1414,1418,1422,1426,1430,1434,1438,1442,1446,1450,1454,1458,1462,1466,1470,1474,1478,1482,1486,1490,1494,1498,1502,1506,1510,1514,1518,1522,1526,1530,1534,1538,1542,1546,1550,1554,1558,1562,1566,1570,1574,1578,1582,1586,1590,1594,1598,1602,1606,1610,1614,1618,1622,1626,1630,1634,1638,1642,1646,1650,1654,1658,1662,1666,1670,1674,1678,1682,1686,1690,1694,1698,1702,1706,1710,1714,1718,1722,1726,1730,1734,1738,1742,1746,1750,1754,1758,1762,1766,1770,1774,1778,1782,1786,1790,1794,1798,1802,1806,1810,1814,1818,1822,1826,1830,1834,1838,1842,1846,1850,1854,1858,1862,1866,1870,1874,1878,1882,1886,1890,1894,1898,1902,1906,1910,1914,1918,1922,1926,1930,1934,1938,1942,1946,1950,1954,1958,1962,1966,1970,1974,1978,1982,1986,1990,1994,1998,2002,2006,2010
-
 //Dancer, Gypsy, Baby Dancer
 1,500,20:4021:4043,1,15,22,28,34,40,46,52,58,64,70,76,82,88,94,100,106,112,118,124,130,136,142,148,154,160,166,172,178,184,190,196,202,208,214,220,226,232,238,244,250,256,262,268,274,280,286,292,298,304,310,316,322,328,334,340,346,352,358,364,370,376,382,388,394,400,406,412,418,424,430,436,442,448,454,460,466,472,478,484,490,496,502,508,514,520,526,532,538,544,550,556,562,568,574,580,586,592,598,604,610,616,622,628,634,640,646,652,658,664,670,676,682,688,694,700,706,712,718,724,730,736,742,748,754,760,766,772,778,784,790,796,802,808,814,820,826,832,838,844,850,856,862,868,874,880,886,892,898,904,910,916,922,928,934,940,946,952,958,964,970,976,982,988,994,1000,1006,1012,1018,1024,1030,1036,1042,1048,1054,1060,1066,1072,1078,1084,1090,1096,1102,1108,1114,1120,1126,1132,1138,1144,1150,1156,1162,1168,1174,1180,1186,1192,1198,1204,1210,1216,1222,1228,1234,1240,1246,1252,1258,1264,1270,1276,1282,1288,1294,1300,1306,1312,1318,1324,1330,1336,1342,1348,1354,1360,1366,1372,1378,1384,1390,1396,1402,1408,1414,1420,1426,1432,1438,1444,1450,1456,1462,1468,1474,1480,1486,1492,1498,1504,1510,1516,1522,1528,1534,1540,1546,1552,1558,1564,1570,1576,1582,1588,1594,1600,1606,1612,1618,1624,1630,1636,1642,1648,1654,1660,1666,1672,1678,1684,1690,1696,1702,1708,1714,1720,1726,1732,1738,1744,1750,1756,1762,1768,1774,1780,1786,1792,1798,1804,1810,1816,1822,1828,1834,1840,1846,1852,1858,1864,1870,1876,1882,1888,1894,1900,1906,1912,1918,1924,1930,1936,1942,1948,1954,1960,1966,1972,1978,1984,1990,1996,2002,2008,2014,2020,2026,2032,2038,2044,2050,2056,2062,2068,2074,2080,2086,2092,2098,2104,2110,2116,2122,2128,2134,2140,2146,2152,2158,2164,2170,2176,2182,2188,2194,2200,2206,2212,2218,2224,2230,2236,2242,2248,2254,2260,2266,2272,2278,2284,2290,2296,2302,2308,2314,2320,2326,2332,2338,2344,2350,2356,2362,2368,2374,2380,2386,2392,2398,2404,2410,2416,2422,2428,2434,2440,2446,2452,2458,2464,2470,2476,2482,2488,2494,2500,2506,2512,2518,2524,2530,2536,2542,2548,2554,2560,2566,2572,2578,2584,2590,2596,2602,2608,2614,2620,2626,2632,2638,2644,2650,2656,2662,2668,2674,2680,2686,2692,2698,2704,2710,2716,2722,2728,2734,2740,2746,2752,2758,2764,2770,2776,2782,2788,2794,2800,2806,2812,2818,2824,2830,2836,2842,2848,2854,2860,2866,2872,2878,2884,2890,2896,2902,2908,2914,2920,2926,2932,2938,2944,2950,2956,2962,2968,2974,2980,2986,2992,2998,3004,3010
 
-//Wanderer, Wanderer T, Baby Wanderer
-1,500,4069:4076:4105,1,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,400,410,414,418,422,426,430,434,438,442,446,450,454,458,462,466,470,474,478,482,486,490,494,498,502,506,510,514,518,522,526,530,534,538,542,546,550,554,558,562,566,570,574,578,582,586,590,594,598,602,606,610,614,618,622,626,630,634,638,642,646,650,654,658,662,666,670,674,678,682,686,690,694,698,702,706,710,714,718,722,726,730,734,738,742,746,750,754,758,762,766,770,774,778,782,786,790,794,798,802,806,810,814,818,822,826,830,834,838,842,846,850,854,858,862,866,870,874,878,882,886,890,894,898,902,906,910,914,918,922,926,930,934,938,942,946,950,954,958,962,966,970,974,978,982,986,990,994,998,1002,1006,1010,1014,1018,1022,1026,1030,1034,1038,1042,1046,1050,1054,1058,1062,1066,1070,1074,1078,1082,1086,1090,1094,1098,1102,1106,1110,1114,1118,1122,1126,1130,1134,1138,1142,1146,1150,1154,1158,1162,1166,1170,1174,1178,1182,1186,1190,1194,1198,1202,1206,1210,1214,1218,1222,1226,1230,1234,1238,1242,1246,1250,1254,1258,1262,1266,1270,1274,1278,1282,1286,1290,1294,1298,1302,1306,1310,1314,1318,1322,1326,1330,1334,1338,1342,1346,1350,1354,1358,1362,1366,1370,1374,1378,1382,1386,1390,1394,1398,1402,1406,1410,1414,1418,1422,1426,1430,1434,1438,1442,1446,1450,1454,1458,1462,1466,1470,1474,1478,1482,1486,1490,1494,1498,1502,1506,1510,1514,1518,1522,1526,1530,1534,1538,1542,1546,1550,1554,1558,1562,1566,1570,1574,1578,1582,1586,1590,1594,1598,1602,1606,1610,1614,1618,1622,1626,1630,1634,1638,1642,1646,1650,1654,1658,1662,1666,1670,1674,1678,1682,1686,1690,1694,1698,1702,1706,1710,1714,1718,1722,1726,1730,1734,1738,1742,1746,1750,1754,1758,1762,1766,1770,1774,1778,1782,1786,1790,1794,1798,1802,1806,1810,1814,1818,1822,1826,1830,1834,1838,1842,1846,1850,1854,1858,1862,1866,1870,1874,1878,1882,1886,1890,1894,1898,1902,1906,1910,1914,1918,1922,1926,1930,1934,1938,1942,1946,1950,1954,1958,1962,1966,1970,1974,1978,1982,1986,1990,1994,1998,2002,2006,2010
+//Gunslinger
+1,500,24,1,12,15,18,21,24,27,30,33,36,39,42,45,48,51,54,57,61,64,67,70,73,76,79,82,85,89,93,97,101,105,109,113,117,121,125,129,131,135,139,141,145,149,153,157,161,165,169,173,177,181,186,191,196,201,206,211,216,221,226,231,236,241,246,251,256,261,266,271,276,281,286,291,296,301,306,312,318,324,336,342,348,354,360,366,372,378,384,390,396,402,408,414,420,426,432,438,444,450,456,462,468,474,480,486,492,498,504,510,516,522,528,534,540,546,552,558,564,570,576,582,588,594,600,606,612,618,624,630,636,642,648,654,660,666,672,678,684,690,696,702,708,714,720,726,732,738,744,750,756,762,768,774,780,786,792,798,804,810,816,822,828,834,840,846,852,858,864,870,876,882,888,894,900,906,912,918,924,930,936,942,948,954,960,966,972,978,984,990,996,1002,1008,1014,1020,1026,1032,1038,1044,1050,1056,1062,1068,1074,1080,1086,1092,1098,1104,1110,1116,1122,1128,1134,1140,1146,1152,1158,1164,1170,1176,1182,1188,1194,1200,1206,1212,1218,1224,1230,1236,1242,1248,1254,1260,1266,1272,1278,1284,1290,1296,1302,1308,1314,1320,1326,1332,1338,1344,1350,1356,1362,1368,1374,1380,1386,1392,1398,1404,1410,1416,1422,1428,1434,1440,1446,1452,1458,1464,1470,1476,1482,1488,1494,1500,1506,1512,1518,1524,1530,1536,1542,1548,1554,1560,1566,1572,1578,1584,1590,1596,1602,1608,1614,1620,1626,1632,1638,1644,1650,1656,1662,1668,1674,1680,1686,1692,1698,1704,1710,1716,1722,1728,1734,1740,1746,1752,1758,1764,1770,1776,1782,1788,1794,1800,1806,1812,1818,1824,1830,1836,1842,1848,1854,1860,1866,1872,1878,1884,1890,1896,1902,1908,1914,1920,1926,1932,1938,1944,1950,1956,1962,1968,1974,1980,1986,1992,1998,2004,2010,2016,2022,2028,2034,2040,2046,2052,2058,2064,2070,2076,2082,2088,2094,2100,2106,2112,2118,2124,2130,2136,2142,2148,2154,2160,2166,2172,2178,2184,2190,2196,2202,2208,2214,2220,2226,2232,2238,2244,2250,2256,2262,2268,2274,2280,2286,2292,2298,2304,2310,2316,2322,2328,2334,2340,2346,2352,2358,2364,2370,2376,2382,2388,2394,2400,2406,2412,2418,2424,2430,2436,2442,2448,2454,2460,2466,2472,2478,2484,2490,2496,2502,2508,2514,2520,2526,2532,2538,2544,2550,2556,2562,2568,2574,2580,2586,2592,2598,2604,2610,2616,2622,2628,2634,2640,2646,2652,2658,2664,2670,2676,2682,2688,2694,2700,2706,2712,2718,2724,2730,2736,2742,2748,2754,2760,2766,2772,2778,2784,2790,2796,2802,2808,2814,2820,2826,2832,2838,2844,2850,2856,2862
 
-//Gunslinger, Rebellion
-1,500,24:4215,1,12,15,18,21,24,27,30,33,36,39,42,45,48,51,54,57,61,64,67,70,73,76,79,82,85,89,93,97,101,105,109,113,117,121,125,129,131,135,139,141,145,149,153,157,161,165,169,173,177,181,186,191,196,201,206,211,216,221,226,231,236,241,246,251,256,261,266,271,276,281,286,291,296,301,306,312,318,324,336,342,348,354,360,366,372,378,384,390,396,402,408,414,420,426,432,438,444,450,456,462,468,474,480,486,492,498,504,510,516,522,528,534,540,546,552,558,564,570,576,582,588,594,600,606,612,618,624,630,636,642,648,654,660,666,672,678,684,690,696,702,708,714,720,726,732,738,744,750,756,762,768,774,780,786,792,798,804,810,816,822,828,834,840,846,852,858,864,870,876,882,888,894,900,906,912,918,924,930,936,942,948,954,960,966,972,978,984,990,996,1002,1008,1014,1020,1026,1032,1038,1044,1050,1056,1062,1068,1074,1080,1086,1092,1098,1104,1110,1116,1122,1128,1134,1140,1146,1152,1158,1164,1170,1176,1182,1188,1194,1200,1206,1212,1218,1224,1230,1236,1242,1248,1254,1260,1266,1272,1278,1284,1290,1296,1302,1308,1314,1320,1326,1332,1338,1344,1350,1356,1362,1368,1374,1380,1386,1392,1398,1404,1410,1416,1422,1428,1434,1440,1446,1452,1458,1464,1470,1476,1482,1488,1494,1500,1506,1512,1518,1524,1530,1536,1542,1548,1554,1560,1566,1572,1578,1584,1590,1596,1602,1608,1614,1620,1626,1632,1638,1644,1650,1656,1662,1668,1674,1680,1686,1692,1698,1704,1710,1716,1722,1728,1734,1740,1746,1752,1758,1764,1770,1776,1782,1788,1794,1800,1806,1812,1818,1824,1830,1836,1842,1848,1854,1860,1866,1872,1878,1884,1890,1896,1902,1908,1914,1920,1926,1932,1938,1944,1950,1956,1962,1968,1974,1980,1986,1992,1998,2004,2010,2016,2022,2028,2034,2040,2046,2052,2058,2064,2070,2076,2082,2088,2094,2100,2106,2112,2118,2124,2130,2136,2142,2148,2154,2160,2166,2172,2178,2184,2190,2196,2202,2208,2214,2220,2226,2232,2238,2244,2250,2256,2262,2268,2274,2280,2286,2292,2298,2304,2310,2316,2322,2328,2334,2340,2346,2352,2358,2364,2370,2376,2382,2388,2394,2400,2406,2412,2418,2424,2430,2436,2442,2448,2454,2460,2466,2472,2478,2484,2490,2496,2502,2508,2514,2520,2526,2532,2538,2544,2550,2556,2562,2568,2574,2580,2586,2592,2598,2604,2610,2616,2622,2628,2634,2640,2646,2652,2658,2664,2670,2676,2682,2688,2694,2700,2706,2712,2718,2724,2730,2736,2742,2748,2754,2760,2766,2772,2778,2784,2790,2796,2802,2808,2814,2820,2826,2832,2838,2844,2850,2856,2862
-
-//Ninja, Kageroru, Oboro
-1,500,25:4211:4212,1,14,17,20,23,26,29,32,35,38,41,44,47,50,53,56,59,62,65,68,71,75,79,83,87,91,95,99,103,107,111,115,119,123,127,131,135,139,143,147,151,156,161,166,171,176,181,186,191,196,201,206,211,216,221,226,231,236,241,246,251,257,263,269,275,281,287,293,299,305,311,317,323,329,335,341,347,353,359,365,371,378,386,394,402,410,418,426,434,442,450,458,466,474,482,490,498,506,514,522,530,538,546,554,562,570,578,586,594,602,610,618,626,634,642,650,658,666,674,682,690,698,706,714,722,730,738,746,754,762,770,778,786,794,802,810,818,826,834,842,850,858,866,874,882,890,898,906,914,922,930,938,946,954,962,970,978,986,994,1002,1010,1018,1026,1034,1042,1050,1058,1066,1074,1082,1090,1098,1106,1114,1122,1130,1138,1146,1154,1162,1170,1178,1186,1194,1202,1210,1218,1226,1234,1242,1250,1258,1266,1274,1282,1290,1298,1306,1314,1322,1330,1338,1346,1354,1362,1370,1378,1386,1394,1402,1410,1418,1426,1434,1442,1450,1458,1466,1474,1482,1490,1498,1506,1514,1522,1530,1538,1546,1554,1562,1570,1578,1586,1594,1602,1610,1618,1626,1634,1642,1650,1658,1666,1674,1682,1690,1698,1706,1714,1722,1730,1738,1746,1754,1762,1770,1778,1786,1794,1802,1810,1818,1826,1834,1842,1850,1858,1866,1874,1882,1890,1898,1906,1914,1922,1930,1938,1946,1954,1962,1970,1978,1986,1994,2002,2010,2018,2026,2034,2042,2050,2058,2066,2074,2082,2090,2098,2106,2114,2122,2130,2138,2146,2154,2162,2170,2178,2186,2194,2202,2210,2218,2226,2234,2242,2250,2258,2266,2274,2282,2290,2298,2306,2314,2322,2330,2338,2346,2354,2362,2370,2378,2386,2394,2402,2410,2418,2426,2434,2442,2450,2458,2466,2474,2482,2490,2498,2506,2514,2522,2530,2538,2546,2554,2562,2570,2578,2586,2594,2602,2610,2618,2626,2634,2642,2650,2658,2666,2674,2682,2690,2698,2706,2714,2722,2730,2738,2746,2754,2762,2770,2778,2786,2794,2802,2810,2818,2826,2834,2842,2850,2858,2866,2874,2882,2890,2898,2906,2914,2922,2930,2938,2946,2954,2962,2970,2978,2986,2994,3002,3010,3018,3026,3034,3042,3050,3058,3066,3074,3082,3090,3098,3106,3114,3122,3130,3138,3146,3154,3162,3170,3178,3186,3194,3202,3210,3218,3226,3234,3242,3250,3258,3266,3274,3282,3290,3298,3306,3314,3322,3330,3338,3346,3354,3362,3370,3378,3386,3394,3402,3410,3418,3426,3434,3442,3450,3458,3466,3474,3482,3490,3498,3506,3514,3522,3530,3538,3546,3554,3562,3570,3578,3586,3594,3602,3610,3618,3626,3634,3642,3650,3658,3666,3674,3682,3690,3698,3706,3714,3722,3730
+//Ninja
+1,500,25,1,14,17,20,23,26,29,32,35,38,41,44,47,50,53,56,59,62,65,68,71,75,79,83,87,91,95,99,103,107,111,115,119,123,127,131,135,139,143,147,151,156,161,166,171,176,181,186,191,196,201,206,211,216,221,226,231,236,241,246,251,257,263,269,275,281,287,293,299,305,311,317,323,329,335,341,347,353,359,365,371,378,386,394,402,410,418,426,434,442,450,458,466,474,482,490,498,506,514,522,530,538,546,554,562,570,578,586,594,602,610,618,626,634,642,650,658,666,674,682,690,698,706,714,722,730,738,746,754,762,770,778,786,794,802,810,818,826,834,842,850,858,866,874,882,890,898,906,914,922,930,938,946,954,962,970,978,986,994,1002,1010,1018,1026,1034,1042,1050,1058,1066,1074,1082,1090,1098,1106,1114,1122,1130,1138,1146,1154,1162,1170,1178,1186,1194,1202,1210,1218,1226,1234,1242,1250,1258,1266,1274,1282,1290,1298,1306,1314,1322,1330,1338,1346,1354,1362,1370,1378,1386,1394,1402,1410,1418,1426,1434,1442,1450,1458,1466,1474,1482,1490,1498,1506,1514,1522,1530,1538,1546,1554,1562,1570,1578,1586,1594,1602,1610,1618,1626,1634,1642,1650,1658,1666,1674,1682,1690,1698,1706,1714,1722,1730,1738,1746,1754,1762,1770,1778,1786,1794,1802,1810,1818,1826,1834,1842,1850,1858,1866,1874,1882,1890,1898,1906,1914,1922,1930,1938,1946,1954,1962,1970,1978,1986,1994,2002,2010,2018,2026,2034,2042,2050,2058,2066,2074,2082,2090,2098,2106,2114,2122,2130,2138,2146,2154,2162,2170,2178,2186,2194,2202,2210,2218,2226,2234,2242,2250,2258,2266,2274,2282,2290,2298,2306,2314,2322,2330,2338,2346,2354,2362,2370,2378,2386,2394,2402,2410,2418,2426,2434,2442,2450,2458,2466,2474,2482,2490,2498,2506,2514,2522,2530,2538,2546,2554,2562,2570,2578,2586,2594,2602,2610,2618,2626,2634,2642,2650,2658,2666,2674,2682,2690,2698,2706,2714,2722,2730,2738,2746,2754,2762,2770,2778,2786,2794,2802,2810,2818,2826,2834,2842,2850,2858,2866,2874,2882,2890,2898,2906,2914,2922,2930,2938,2946,2954,2962,2970,2978,2986,2994,3002,3010,3018,3026,3034,3042,3050,3058,3066,3074,3082,3090,3098,3106,3114,3122,3130,3138,3146,3154,3162,3170,3178,3186,3194,3202,3210,3218,3226,3234,3242,3250,3258,3266,3274,3282,3290,3298,3306,3314,3322,3330,3338,3346,3354,3362,3370,3378,3386,3394,3402,3410,3418,3426,3434,3442,3450,3458,3466,3474,3482,3490,3498,3506,3514,3522,3530,3538,3546,3554,3562,3570,3578,3586,3594,3602,3610,3618,3626,3634,3642,3650,3658,3666,3674,3682,3690,3698,3706,3714,3722,3730
 
 //Taekwon
 1,500,4046,1,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,42,44,46,48,50,52,54,56,58,60,62,64,66,68,70,72,74,76,78,80,82,84,86,88,90,92,94,96,98,100,102,104,106,108,110,112,114,116,118,120,122,124,126,128,130,132,134,136,138,140,142,144,146,148,150,151,152,153,154,155,156,157,158,159,170,171,172,173,174,175,176,177,178,188,190,190,190,190,190,190,190,190,190,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,200,200
@@ -265,3 +187,15 @@
 
 //Dark Collector
 1,500,4051,1,17,24,31,38,45,52,59,66,73,80,87,94,101,108,115,122,129,136,143,150,157,164,171,178,185,192,199,206,213,220,227,234,241,248,255,262,269,276,283,290,297,304,311,318,325,332,339,346,353,360,367,374,381,388,395,402,409,416,423,430,437,444,451,458,465,472,479,486,493,500,507,514,521,528,535,542,549,556,563,570,577,584,591,598,605,612,619,626,633,640,647,654,661,668,675,682,689,696,703,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385,386,387,388,389,390,391,392,393,394,395,396,397,398,399,400,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415,416,417,418,419,420,421,422,423,424,425,426,427,428,429,430,431,432,433,434,435,436,437,438,439,440,441,442,443,444,445,446,447,448,449,450,451,452,453,454,455,456,457,458,459,460,461,462,463,464,465,466,467,468,469,470,471,472,473,474,475,476,477,478,479,480,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500
+
+
+
+//================================
+// Renewal content (required for some core features)
+//================================
+
+//HP - 3rd Jobs, Baby 3rds, Kagerou/Oboro, Rebellion and Summoner
+1,500,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,0,40,45,50,55,60,65,70,75,80,85,90,95,100,105,110,115,120,125,130,135,140,145,150,155,160,165,170,175,180,185,190,195,200,205,210,215,220,225,230,235,240,245,250,255,260,265,270,275,280,285,290,295,300,305,310,315,320,325,330,335,340,345,350,355,360,365,370,375,380,385,390,395,400,405,410,415,420,425,430,435,440,445,450,455,460,465,470,475,480,485,490,495,500,505,510,515,520,525,530,535,540,545,550,555,560,565,570,575,580,585,590,595,600,605,610,615,620,625,630,635,640,645,650,655,660,665,670,675,680,685,690,695,700,705,710,715,720,725,730,735,740,745,750,755,760,765,770,775,780,785,790,795,800,805,810,815,820,825,830,835,840,845,850,855,860,865,870,875,880,885,890,895,900,905,910,915,920,925,930,935,940,945,950,955,960,965,970,975,980,985,990,995,1000,1005,1010,1015,1020,1025,1030,1035,1040,1045,1050,1055,1060,1065,1070,1075,1080,1085,1090,1095,1100,1105,1110,1115,1120,1125,1130,1135,1140,1145,1150,1155,1160,1165,1170,1175,1180,1185,1190,1195,1200,1205,1210,1215,1220,1225,1230,1235,1240,1245,1250,1255,1260,1265,1270,1275,1280,1285,1290,1295,1300,1305,1310,1315,1320,1325,1330,1335,1340,1345,1350,1355,1360,1365,1370,1375,1380,1385,1390,1395,1400,1405,1410,1415,1420,1425,1430,1435,1440,1445,1450,1455,1460,1465,1470,1475,1480,1485,1490,1495,1500,1505,1510,1515,1520,1525,1530,1535,1540,1545,1550,1555,1560,1565,1570,1575,1580,1585,1590,1595,1600,1605,1610,1615,1620,1625,1630,1635,1640,1645,1650,1655,1660,1665,1670,1675,1680,1685,1690,1695,1700,1705,1710,1715,1720,1725,1730,1735,1740,1745,1750,1755,1760,1765,1770,1775,1780,1785,1790,1795,1800,1805,1810,1815,1820,1825,1830,1835,1840,1845,1850,1855,1860,1865,1870,1875,1880,1885,1890,1895,1900,1905,1910,1915,1920,1925,1930,1935,1940,1945,1950,1955,1960,1965,1970,1975,1980,1985,1990,1995,2000,2005,2010,2015,2020,2025,2030,2035,2040,2045,2050,2055,2060,2065,2070,2075,2080,2085,2090,2095,2100,2105,2110,2115,2120,2125,2130,2135,2140,2145,2150,2155,2160,2165,2170,2175,2180,2185,2190,2195,2200,2205,2210,2215,2220,2225,2230,2235,2240,2245,2250,2255,2260,2265,2270,2275,2280,2285,2290,2295,2300,2305,2310,2315,2320,2325,2330,2335,2340,2345,2350,2355,2360,2365,2370,2375,2380,2385,2390,2395,2400,2405,2410,2415,2420,2425,2430,2435,2440,2445,2450,2455,2460,2465,2470,2475,2480,2485,2490,2495,2500,2505,2510,2515,2520,2525,2530,2535
+
+//SP - 3rd Jobs, Baby 3rds, Kagerou/Oboro, Rebellion and Summoner
+1,500,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,1,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,99,100,101,102,103,104,105,106,107,108,109,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385,386,387,388,389,390,391,392,393,394,395,396,397,398,399,400,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415,416,417,418,419,420,421,422,423,424,425,426,427,428,429,430,431,432,433,434,435,436,437,438,439,440,441,442,443,444,445,446,447,448,449,450,451,452,453,454,455,456,457,458,459,460,461,462,463,464,465,466,467,468,469,470,471,472,473,474,475,476,477,478,479,480,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500

db/pre-re/job_db1.txt

@@ -152,12 +152,12 @@
 // Star Gladiator (Union)
 4048, 28000,90   ,650  ,470  ,400  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,500  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000
 // Soul Linker
-4049, 24000,75   ,500  ,900  ,500  ,575  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,625  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 , 625 
+4049, 24000,75   ,500  ,900  ,500  ,575  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,625  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 , 625
 //================================
 // 3CeAM r664 Base
 //
 // Note: All settings below are based on what the previous job was. A Rune Knight will have the same values
-// as a Knight, a Ranger will have the same values as a Hunter, etc. 
+// as a Knight, a Ranger will have the same values as a Hunter, etc.
 //
 // Note 2: Gangsi is currently using Acolyte settings, Death Knight using Knight settings and Dark Collector
 // is using Sage settings. Its mainly like this for these 3 jobs because of the temp sprite that shows when
@@ -281,3 +281,5 @@
 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
+// 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

db/pre-re/job_noenter_map.txt

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

db/pre-re/mob_race2_db.txt

@@ -1,17 +1,23 @@
 // Monster Racial Groups Database
 //
 // Structure of Database:
-// Race2ID,MobID1,MobID2,MobID3,...,MobID9
+// Race2ID,MobID1,MobID2,MobID3,...,MobID100
 
 // Goblins
-1,1122,1123,1124,1125,1126,1258,1299
+RC2_GOBLIN,1122,1123,1124,1125,1126,1258,1299
 // Kobolds
-2,1133,1134,1135,1282,1296
+RC2_KOBOLD,1133,1134,1135,1282,1296
 // Orcs
-3,1023,1152,1153,1189,1213,1273
+RC2_ORC,1023,1152,1153,1189,1213,1273
 // Golems
-4,1040,1278,1366,1497,2024
+RC2_GOLEM,1040,1278,1366,1497,2024
 // Guardians
-5,1285,1286,1287
+RC2_GUARDIAN,1285,1286,1287,2081
 // Ninja Classes (Pirate's_Pride)
-6,1315,1364,1401,1560
+RC2_NINJA,1315,1364,1401,1560
+// GvG
+RC2_GVG,1143,1905,1906,1907
+// Battlefield
+RC2_BATTLEFIELD,1906,1909,1914,1915
+// Treasure Chests
+RC2_TREASURE,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1938,1939,1940,1941,1942,1943,1944,1945,1946

db/pre-re/mob_random_db.txt

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

db/pre-re/produce_db.txt

@@ -187,7 +187,7 @@
 67,12053,13,0,0,7474,0,966,20,961,10,518,1,7453,1
 //-- Tentacle and Cheese Gratin <-- 10 Tentacle, 10 Cheese, 5 Yam, 1 Sweet Sauce
 68,12058,13,0,0,7474,0,962,10,548,10,549,5,7453,1
-//-- Fried Sweet Potato with Syrup <-- 10 Potato, 10 Yam, 1 Sweet Potato, 1 Sweet Sauce 
+//-- Fried Sweet Potato with Syrup <-- 10 Potato, 10 Yam, 1 Sweet Potato, 1 Sweet Sauce
 69,12068,13,0,0,7474,0,516,10,549,10,633,1,7453,1
 
 //--------------------LEVEL 4-----------
@@ -198,7 +198,7 @@
 71,12054,14,0,0,7475,0,962,30,509,10,7194,10,7031,1,1024,20
 //-- Rib with Herbs and Spices <-- 5 Meat, 3 Red Herb, 2 Yellow Herb, 3 Green Herb, 1 Sweet Sauce, 1 Lemon
 72,12044,14,0,0,7475,0,517,5,507,3,508,2,511,3,7453,1,568,1
-//-- Cream Sandwich <-- 5 Bread, 15 Milk, 10 Cheese, 10 Yellow Herb, 1 Meat, 1 Sweet Sauce 
+//-- Cream Sandwich <-- 5 Bread, 15 Milk, 10 Cheese, 10 Yellow Herb, 1 Meat, 1 Sweet Sauce
 73,12064,14,0,0,7475,0,580,5,519,15,548,10,508,10,517,1,7453,1
 //-- Lutie Mixed Cold Noodles <-- 3 Grain, 1 Hot Sauce, 10 Ice Cubic, 10 Carrot, 10 Jack o' Pumpkin
 74,12059,14,0,0,7475,0,577,3,7455,1,7066,10,515,10,1062,10
@@ -472,7 +472,7 @@
 174,1046,26,2494,1,955,40,753,5
 //-- Petite DiablOfs Horn <-- GN_CHANGEMATERIAL Lv1, 5 Stone Heart, 10 Resin
 175,1038,26,2494,1,953,5,907,10
-//-- Root Of Maneater <-- GN_CHANGEMATERIAL Lv1, 25 Talon, 20 Tooth Of 
+//-- Root Of Maneater <-- GN_CHANGEMATERIAL Lv1, 25 Talon, 20 Tooth Of
 176,1033,26,2494,1,917,25,1044,20
 //-- Conch <-- GN_CHANGEMATERIAL Lv1, 5 Gill, 25 Immortal Heart
 177,961,26,2494,1,956,5,929,25

db/pre-re/skill_cast_db.txt

@@ -50,7 +50,7 @@
 //-- MG_LIGHTNINGBOLT
 20,700:1400:2100:2800:3500:4200:4900:5600:6300:7000,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0,0,0
 //-- MG_THUNDERSTORM
-21,1000:2000:3000:4000:5000:6000:7000:8000:9000:10000,2000,0,500,0,0
+21,1000:2000:3000:4000:5000:6000:7000:8000:9000:10000,2000,0,100,0,0
 //==========================================
 
 
@@ -113,7 +113,7 @@
 //-- KN_SPEARBOOMERANG
 59,0,1000,0,0,0,0
 //-- KN_TWOHANDQUICKEN
-60,0,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0,0
+60,0,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000:300000,0,0
 //-- KN_AUTOCOUNTER
 61,0,0,0,400:800:1200:1600:2000,0,0
 //-- KN_BOWLINGBASH
@@ -131,7 +131,7 @@
 //-- PR_BENEDICTIO
 69,0,0,0,40000:80000:120000:160000:200000,0,0
 //-- PR_SANCTUARY
-70,5000,0,0,4000:7000:10000:13000:16000:19000:22000:25000:28000:31000,0,0
+70,5000,0,0,3900:6900:9900:12900:15900:18900:21900:24900:27900:30900,0,0
 //-- PR_SLOWPOISON
 71,0,0,0,10000:20000:30000:40000,0,0
 //-- PR_STRECOVERY
@@ -143,7 +143,7 @@
 //-- PR_GLORIA
 75,0,2000,0,10000:15000:20000:25000:30000,0,0
 //-- PR_LEXDIVINA
-76,0,3000,0,30000:35000:40000:45000:50000:60000:60000:60000:60000:60000,0,0
+76,0,3000,0,0,30000:35000:40000:45000:50000:60000:60000:60000:60000:60000,0
 //-- PR_TURNUNDEAD
 77,1000,3000,0,0,0,0
 //-- PR_LEXAETERNA
@@ -159,13 +159,13 @@
 //-- WZ_SIGHTRASHER
 81,500,2000,0,500,0,0
 //-- WZ_METEOR
-83,15000,2000:3000:3000:4000:4000:5000:5000:6000:6000:7000,0,500,5000,0
+83,15000,2000:3000:3000:4000:4000:5000:5000:6000:6000:7000,0,2000:3000:3000:4000:4000:5000:5000:6000:6000:7000,5000,0
 //-- WZ_JUPITEL
 84,2500:3000:3500:4000:4500:5000:5500:6000:6500:7000,0,0,0,0,0
 //-- WZ_VERMILION
-85,15000:14500:14000:13500:13000:12500:12000:11500:11000:10500,5000,0,4000,5500:6000:6500:7000:7500:8000:8500:9000:9500:10000,0
+85,15000:14500:14000:13500:13000:12500:12000:11500:11000:10500,5000,0,4000,30000,0
 //-- WZ_WATERBALL
-86,1000:2000:3000:4000:5000:6000:7000:8000:9000:10000,0,0,0,0,0
+86,1000:2000:3000:4000:5000:6000:7000:8000:9000:10000,0,0,10000,0,0
 //-- WZ_ICEWALL
 87,0,0,0,5000:10000:15000:20000:25000:30000:35000:40000:45000:50000,0,0
 //-- WZ_FROSTNOVA
@@ -175,7 +175,7 @@
 //-- WZ_EARTHSPIKE
 90,1000:2000:3000:4000:5000,700,0,0,0,0
 //-- WZ_HEAVENDRIVE
-91,1000:2000:3000:4000:5000,700,0,500,0,0
+91,1000:2000:3000:4000:5000,700,0,100,0,0
 //-- WZ_QUAGMIRE
 92,0,1000,0,5000:10000:15000:20000:25000,5000:10000:15000:20000:25000,0
 //==========================================
@@ -207,9 +207,9 @@
 //-- HT_SHOCKWAVE
 118,0,0,0,200000:160000:120000:80000:40000,0,0
 //-- HT_SANDMAN
-119,0,0,0,150000:120000:90000:60000:30000,12000:14000:16000:18000:20000,0
+119,0,0,0,150000:120000:90000:60000:30000,30000,0
 //-- HT_FLASHER
-120,0,0,0,150000:120000:90000:60000:30000,10000:11000:12000:13000:14000,0
+120,0,0,0,150000:120000:90000:60000:30000,30000,0
 //-- HT_FREEZINGTRAP
 121,0,0,0,150000:120000:90000:60000:30000,3000:6000:9000:12000:15000,0
 //-- HT_BLASTMINE
@@ -252,12 +252,12 @@
 //-- AC_CHARGEARROW
 148,1500,0,0,0,0,0
 //-- TF_SPRINKLESAND
-149,0,0,0,0,10000,0
+149,0,0,0,0,30000,0
 
 //-- TF_PICKSTONE
 151,500,0,0,0,0,0
 //-- TF_THROWSTONE
-152,0,0,0,5000,8000,0
+152,0,0,0,5000,30000,0
 
 //-- MC_LOUD
 155,0,0,0,300000,0,0
@@ -297,7 +297,7 @@
 177,0,0,0,0,30000,0
 //-- NPC_SILENCEATTACK
 178,0,0,0,0,30000,0
-//-- NPC0,_STUNATTACK
+//-- NPC_STUNATTACK
 179,0,0,0,0,5000,0
 //-- NPC_PETRIFYATTACK
 180,0,0,0,0,20000,0
@@ -317,7 +317,7 @@
 //-- NPC_DEFENDER
 205,0,0,0,60000:70000:80000:90000:100000:110000:120000:130000:140000:150000,0,0
 //-- NPC_LICK
-206,0,0,0,0,3000,0
+206,0,0,0,0,5000,0
 //-- NPC_HALLUCINATION
 207,0,0,0,30000:40000:50000:60000:70000:80000:90000:100000:110000:120000,0,0
 //==========================================
@@ -326,9 +326,8 @@
 //===== Rogue ==============================
 //-- RG_BACKSTAB
 212,0,500,0,0,0,0
-
 //-- RG_RAID
-214,0,0,0,5000,8000:9000:10000:11000:12000,0
+214,0,0,0,5000,30000,0
 //-- RG_STRIPEWEAPON
 215,1000,1000,0,75000:90000:105000:120000:135000,0,0
 //-- RG_STRIPSHIELD
@@ -377,9 +376,9 @@
 //-- CR_REFLECTSHIELD
 252,0,0,0,300000,0,0
 //-- CR_HOLYCROSS
-253,0,0,0,0,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000,0
+253,0,0,0,0,30000,0
 //-- CR_GRANDCROSS
-254,2000,1500,900,900,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000,0
+254,3000,1500,800,800,30000,0
 //-- CR_DEVOTION
 255,3000,0,0,0,30000:45000:60000:75000:90000,0
 //-- CR_PROVIDENCE
@@ -472,7 +471,7 @@
 //-- BA_DISSONANCE
 317,0,0,0,30000,3000,0
 //-- BA_FROSTJOKE
-318,0,3000,0,0,10000:11000:12000:13000:14000,0
+318,0,4000,0,0,12000,0
 //-- BA_WHISTLE
 319,0,0,0,60000,20000,0
 //-- BA_ASSASSINCROSS
@@ -490,7 +489,7 @@
 //-- DC_UGLYDANCE
 325,0,0,0,30000,3000,0
 //-- DC_SCREAM
-326,0,3000,0,0,5000,0
+326,0,4000,0,0,5000,0
 //-- DC_HUMMING
 327,0,0,0,60000,20000,0
 //-- DC_DONTFORGETME
@@ -513,8 +512,10 @@
 
 
 //===== NPC Skills Part 2 ==================
+//-- NPC_DARKCROSS
+338,0,0,0,0,30000,0
 //-- NPC_GRANDDARKNESS
-339,2000,1500,900,900,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000,0
+339,0,0,900,900,30000,0
 //-- NPC_STOP
 342,0,0,0,10000,0,0
 //-- NPC_CHANGEUNDEAD
@@ -656,7 +657,7 @@
 //-- PF_SPIDERWEB
 405,0,0,0,30000,8000,0
 //-- ASC_METEORASSAULT (Upkeep2 times are duration of: blind(lv1), stun(lv2) or bleeding (lv3))
-406,500,500,0,0,10000:5000:120000,0
+406,500,500,0,0,30000:5000:120000,0
 //-- ASC_CDP
 407,0,500,0,0,0,0
 //==========================================
@@ -857,8 +858,8 @@
 518,1000,1000,0,0,0,0
 //-- GS_FULLBUSTER
 519,0,1200:1400:1600:1800:2000:2200:2400:2600:2800:3000,0,0,10000,0
-//-- GS_GROUNDDRIFT
-521,2000,0,0,3000:6000:9000:12000:15000:18000:21000:24000:27000:30000,10000,0
+//-- GS_GROUNDDRIFT (Upkeep2 times are duration of: Stun(lv1), Blind(lv2), Poison(lv3) and Freeze(lv4))
+521,2000,0,0,3000:6000:9000:12000:15000:18000:21000:24000:27000:30000,5000:30000:60000:12000,0
 //==========================================
 
 
@@ -886,17 +887,17 @@
 //-- NJ_KAENSIN
 535,6000:5500:5000:4500:4000:3500:3000:2500:2000:1500,1000,0,20000,0,0
 //-- NJ_BAKUENRYU
-536,3000,2000,0,0,0,0
+536,3000,2000,0,100,0,0
 //-- NJ_HYOUSENSOU
 537,700:1400:2100:2800:3500:4200:4900:5600:6300:7000,0,0,0,0,0
 //-- NJ_SUITON
 538,3000,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,0
 //-- NJ_HYOUSYOURAKU
-539,2000:2500:3000:3500:4000,2000,0,0,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000,0
+539,2000:2500:3000:3500:4000,2000,0,100,5000:10000:15000:20000:25000,0
 //-- NJ_HUUJIN
-540,1000:1500:2000:2500:3000:3500:4000:5000:5500:6000,1000,0,0,0,0
+540,1000:1500:2000:2500:3000:3500:4000:4500:5000:5500,1000,0,0,0,0
 //-- NJ_RAIGEKISAI
-541,4000,0,0,0,0,0
+541,4000,0,0,100,0,0
 //-- NJ_KAMAITACHI
 542,4000,0,0,0,0,0
 //-- NJ_NEN
@@ -979,7 +980,7 @@
 //-- NPC_WIDESIGHT
 669,0,0,0,10000,0,0
 //-- NPC_EVILLAND
-670,0,0,0,30000,30000,0
+670,0,0,0,3900:4900:5900:6900:7900:8900:9900:10900:11900:12900,30000,0
 //-- NPC_MAGICMIRROR
 671,0,0,0,30000:30000:30000:30000:30000:2000:2000:2000:2000:2000,0,0
 //-- NPC_SLOWCAST
@@ -1027,7 +1028,7 @@
 
 //===== 2nd Jobs Quest Skills ==============
 //-- KN_CHARGEATK
-1001,300,300,0,0,0,0
+1001,500,0,0,0,0,0
 //-- CR_SHRINK
 1002,0,0,0,300000,0,0
 
@@ -1054,7 +1055,7 @@
 //-- MO_KITRANSLATION
 1015,2000,1000,0,600000,0,0
 //-- MO_BALKYOUNG
-1016,0,2000,0,0,2000,0
+1016,0,2000,0,0,5000,0
 //-- SA_ELEMENTGROUND
 1017,2000,1000,0,1800000,0,0
 //-- SA_ELEMENTFIRE
@@ -1145,7 +1146,7 @@
 //-- AB_ANCILLA
 2039,1000,1000,0,0,0,0
 //-- AB_ADORAMUS
-2040,2000,500,0,6000:7000:8000:9000:10000:11000:12000:13000:14000:15000,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,2000
+2040,2000,500,0,8000:9000:10000:11000:12000:13000:14000:15000:16000:17000,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,2000
 //-- AB_CLEMENTIA
 2041,3000,0,0,120000:180000:240000,0,0
 //-- AB_CANTO
@@ -1194,7 +1195,7 @@
 //-- WL_SIENNAEXECRATE
 2207,2000,2000,0,10000:12000:14000:16000:18000,0,0
 //-- WL_STASIS
-2209,3000,2000,0,10000:15000:20000:25000:30000,0,180000:190000:200000:210000:220000
+2209,3000,2000,0,20000:30000:40000:50000:60000,0,180000:190000:200000:210000:220000
 //-- WL_DRAINLIFE
 2210,4000,0,0,0,0,2000
 //-- WL_CRIMSONROCK
@@ -1204,7 +1205,7 @@
 //-- WL_COMET
 2213,10000:11000:12000:13000:14000,2000,0,100,42000,60000
 //-- WL_CHAINLIGHTNING
-2214,3500:4000:4500:5000:5500,0,0,100,0,3000
+2214,3500:4000:4500:5000:5500,3000,0,100,0,0
 //-- WL_EARTHSTRAIN
 2216,2000:3000:4000:5000:6000,1000,0,100,75000:90000:105000:120000:135000,10000
 //-- WL_TETRAVORTEX
@@ -1370,7 +1371,7 @@
 //-- LG_TRAMPLE
 2309,0,1000,0,0,0,0
 //-- LG_SHIELDPRESS
-2310,0,0,0,3500:4000:4500:5000:5500,0,2000
+2310,0,0,0,5500:6000:6500:7000:7500,0,2000
 //-- LG_REFLECTDAMAGE
 2311,0,0,0,300000,0,0
 //-- LG_PINPOINTATTACK
@@ -1390,7 +1391,7 @@
 //-- LG_BANDING
 2319,0,0,0,-1,2000:4000:6000:8000:10000,0
 //-- LG_MOONSLASHER
-2320,1000,1000,0,0,0,6000:5000:4000:3000:2000
+2320,1000,1000,0,1000,0,6000:5000:4000:3000:2000
 //-- LG_RAYOFGENESIS
 2321,2000:2500:3000:3500:4000,2000,0,10000,0,5000
 //-- LG_PIETY
@@ -1411,7 +1412,7 @@
 //-- SR_SKYNETBLOW
 2327,0,500,0,0,0,0
 //-- SR_EARTHSHAKER
-2328,0,0,0,1000,0,3000
+2328,0,0,0,1000:2000:2000:3000:3000,0,3000
 //-- SR_FALLENEMPIRE
 2329,0,0,0,500:1000:1500:2000:2500,0,0
 //-- SR_TIGERCANNON
@@ -1533,7 +1534,7 @@
 //-- SO_STRIKING
 2451,1000,1000,0,60000,0,2000
 //-- SO_WARMER
-2452,2200:2400:2600:2800:3000,1000,0,40000:45000:50000:55000:60000,30000,35000:40000:45000:50000:55000
+2452,2200:2400:2600:2800:3000,1000,0,40000:45000:50000:55000:60000,0,35000:40000:45000:50000:55000
 //-- SO_VACUUM_EXTREME
 2453,1000:1500:2000:2500:3000,1000,0,4000:6000:8000:10000:12000,2000,5000
 //-- SO_VARETYR_SPEAR

db/pre-re/skill_castnodex_db.txt

@@ -19,7 +19,7 @@
 272,0,2	//MO_CHAINCOMBO
 273,0,2	//MO_COMBOFINISH
 336,1	//WE_CALLPARTNER
-366,3	//HW_MAGICPOWER
+366,7	//HW_MAGICPOWER
 370,1	//CH_PALMSTRIKE
 371,0,2	//CH_TIGERFIST
 372,0,2	//CH_CHAINCRUSH

db/pre-re/skill_db.txt

@@ -18,7 +18,7 @@
 //    0x80 - Skill ignores target's def cards
 // 07 splash/effect range (-1 for screen-wide)
 // 08 MaxLv
-// 09 Number of hits (when positive, damage is increased by hits, 
+// 09 Number of hits (when positive, damage is increased by hits,
 //    negative values just show number of hits without increasing total damage)
 // 10 Cast interrupted when hit?
 // 11 defense-reduction rate during cast.
@@ -48,12 +48,12 @@
 // 14 attack type (none, weapon, magic, misc)
 // 15 Blowcount (amount of tiles skill knockbacks)
 // 16 inf3 (skill information 3):
-//    0x00001 - skill ignores land protector (e.g. arrow shower)
-//    0x00002 - skill that doesn't end camouflage
+//    0x00001 - skill ignores land protector
+//    0x00002 - free
 //    0x00004 - usable skills while hiding
 //    0x00008 - skill that can be use while in dancing state
 //    0x00010 - skill that could hit emperium
-//    0x00020 - skill blocked by statis
+//    0x00020 - skill ignores SC_STASIS
 //    0x00040 - skill blocked by kagehumi
 //    0x00080 - skill range affected by AC_VULTURE
 //    0x00100 - skill range affected by GS_SNAKEEYE
@@ -66,6 +66,8 @@
 //    0x08000 - skill that can be used to target while under SC__MANHOLE effect
 //    0x10000 - skill that affects hidden targets
 //    0x20000 - skill that affects SC_GLOOMYDAY_SK
+//    0x40000 - skill that is affected by SC_DANCEWITHWUG
+//    0x80000 - skill blocked by RA_WUGBITE
 // 17 Name
 // 18 Description
 1,0,0,0,0,0,0,9,0,no,0,0,0,none,0,0x0,		NV_BASIC,Basic Skill
@@ -77,40 +79,40 @@
 4,0,0,0,0,0,0,10,0,no,0,0,0,none,0,0x0,		SM_RECOVERY,Increase HP Recovery
 5,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0,0x0,		SM_BASH,Bash
 6,9,6,1,0,1,0,10,1,no,0,0,0,none,0,0x0,		SM_PROVOKE,Provoke
-7,0,6,4,3,0x2,2,10,1,no,0,0x40000,0,weapon,2,0x0,		SM_MAGNUM,Magnum Break
+7,0,6,4,3,0x2,2:2:2:2:2:2:2:2:2:2:4,10,1,no,0,0x40000,0,weapon,2,0x0,	SM_MAGNUM,Magnum Break
 8,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0,0x0,		SM_ENDURE,Endure
 
 //****
 // Mage
-9,0,0,0,0,0,0,10,0,no,0,0,0,none,0,0x20,		MG_SRECOVERY,Increase SP Recovery
-10,0,6,4,3,0x3,3,1,1,yes,0,0,0,magic,0,0x4020,		MG_SIGHT,Sight
-11,9,6,1,8,0x6,1,10,1,yes,0,0x2000,0,magic,0,0x20,		MG_NAPALMBEAT,Napalm Beat
-12,9,8,2,8,0x1,0,10,1,yes,0,0,0,magic,0,0x20,		MG_SAFETYWALL,Safety Wall
-13,9,8,1,8,0,0,10,1:1:2:2:3:3:4:4:5:5,yes,0,0x2000,0,magic,0,0x20,		MG_SOULSTRIKE,Soul Strike
-14,9,8,1,1,0,0,10,1:2:3:4:5:6:7:8:9:10,yes,0,0x2000,0,magic,0,0x20,	MG_COLDBOLT,Cold Bolt
-15,9,6,1,1,0,0,10,1,yes,0,0x2000,0,magic,0,0x20,		MG_FROSTDIVER,Frost Diver
-16,2,6,1,2,0x1,0,10,1,yes,0,0,0,magic,0,0x20,		MG_STONECURSE,Stone Curse
-17,9,6,1,3,0x2,2,10,1,yes,0,0x2000,0,magic,0,0x20,		MG_FIREBALL,Fire Ball
-18,9,6,2,3,0,0,10,1,yes,0,0x2000,3,magic,2,0x20,		MG_FIREWALL,Fire Wall
-19,9,8,1,3,0,0,10,1:2:3:4:5:6:7:8:9:10,yes,0,0x2000,0,magic,0,0x20,	MG_FIREBOLT,Fire Bolt
-20,9,8,1,4,0,0,10,1:2:3:4:5:6:7:8:9:10,yes,0,0x2000,0,magic,0,0x20,	MG_LIGHTNINGBOLT,Lightning Bolt
-21,9,8,2,4,0,0,10,1:2:3:4:5:6:7:8:9:10,yes,0,0x2000,0,magic,0,0x20,	MG_THUNDERSTORM,Thunderstorm
+9,0,0,0,0,0,0,10,0,no,0,0,0,none,0,0x0,		MG_SRECOVERY,Increase SP Recovery
+10,0,6,4,3,0x3,3,1,1,yes,0,0,0,magic,0,0x4000,		MG_SIGHT,Sight
+11,9,6,1,8,0x6,1,10,1,yes,0,0x42000,0,magic,0,0x0,		MG_NAPALMBEAT,Napalm Beat
+12,9,8,2,8,0x1,0,10,1,yes,0,0,0,magic,0,0x0,		MG_SAFETYWALL,Safety Wall
+13,9,8,1,8,0,0,10,1:1:2:2:3:3:4:4:5:5,yes,0,0x2000,0,magic,0,0x0,		MG_SOULSTRIKE,Soul Strike
+14,9,8,1,1,0,0,10,1:2:3:4:5:6:7:8:9:10,yes,0,0x2000,0,magic,0,0x0,	MG_COLDBOLT,Cold Bolt
+15,9,6,1,1,0,0,10,1,yes,0,0x2000,0,magic,0,0x0,		MG_FROSTDIVER,Frost Diver
+16,2,6,1,2,0x1,0,10,1,yes,0,0,0,magic,0,0x0,		MG_STONECURSE,Stone Curse
+17,9,6,1,3,0x2,2,10,1,yes,0,0x42000,0,magic,0,0x0,		MG_FIREBALL,Fire Ball
+18,9,6,2,3,0,0,10,1,yes,0,0x2000,3,magic,2,0x0,		MG_FIREWALL,Fire Wall
+19,9,8,1,3,0,0,10,1:2:3:4:5:6:7:8:9:10,yes,0,0x2000,0,magic,0,0x0,	MG_FIREBOLT,Fire Bolt
+20,9,8,1,4,0,0,10,1:2:3:4:5:6:7:8:9:10,yes,0,0x2000,0,magic,0,0x0,	MG_LIGHTNINGBOLT,Lightning Bolt
+21,9,8,2,4,0,0,10,1:2:3:4:5:6:7:8:9:10,yes,0,0x2000,0,magic,0,0x0,	MG_THUNDERSTORM,Thunderstorm
 
 //****
 // Acolyte
 22,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,0x0,		AL_DP,Divine Protection
 23,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,0x0,		AL_DEMONBANE,Demon Bane
-24,0,6,4,6,0x3,2,1,1,yes,0,0,0,magic,0,0x20,		AL_RUWACH,Ruwach
-25,9,6,2,0,0x1,0,1,1,yes,0,0,0,magic,0,0x20,		AL_PNEUMA,Pneuma
-26,0,6,4,0,0x1,0,2,1,yes,0,0,0,magic,0,0x60,		AL_TELEPORT,Teleport
-27,9,6,2,0,0x1,0,4,1,yes,0,0,3,magic,0,0x20,		AL_WARP,Warp Portal
-28,9,6,16,6,0x21,0,10,1,yes,0,0x2000,0,magic,0,0x20,	AL_HEAL,Heal
-29,9,6,16,0,0x1,0,10,1,yes,0,0,0,magic,0,0x1020,	AL_INCAGI,Increase AGI
+24,0,6,4,6,0x3,2,1,1,yes,0,0,0,magic,0,0x0,		AL_RUWACH,Ruwach
+25,9,6,2,0,0x1,0,1,1,yes,0,0,0,magic,0,0x0,		AL_PNEUMA,Pneuma
+26,0,6,4,0,0x1,0,2,1,yes,0,0,0,magic,0,0x40,		AL_TELEPORT,Teleport
+27,9,6,2,0,0x1,0,4,1,yes,0,0,3,magic,0,0x0,		AL_WARP,Warp Portal
+28,9,6,16,6,0x21,0,10,1,yes,0,0x2000,0,magic,0,0x0,	AL_HEAL,Heal
+29,9,6,16,0,0x1,0,10,1,yes,0,0,0,magic,0,0x1000,	AL_INCAGI,Increase AGI
 30,9,6,1,0,0x1,0,10,1,yes,0,0,0,magic,0,0x0,		AL_DECAGI,Decrease AGI
-31,0,6,4,0,0x1,0,1,1,yes,0,0,0,magic,0,0x20,		AL_HOLYWATER,Aqua Benedicta
+31,0,6,4,0,0x1,0,1,1,yes,0,0,0,magic,0,0x0,		AL_HOLYWATER,Aqua Benedicta
 32,0,6,4,0,0x3,15,10,1,yes,0,0,0,magic,0,0x0,	AL_CRUCIS,Signum Crucis
 33,0,6,4,0,0x3,-1,10,1,yes,0,0,0,magic,0,0x0,	AL_ANGELUS,Angelus
-34,9,6,16,0,0x1,0,10,1,yes,0,0,0,magic,0,0x1020,	AL_BLESSING,Blessing
+34,9,6,16,0,0x1,0,10,1,yes,0,0,0,magic,0,0x1000,	AL_BLESSING,Blessing
 35,9,6,16,0,0x1,0,1,1,yes,0,0,0,magic,0,0x0,		AL_CURE,Cure
 
 //****
@@ -136,57 +138,57 @@
 48,-1,8,0,-1,0,0,10,2,no,0,0,0,weapon,0,0x0,		TF_DOUBLE,Double Attack
 49,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,0x0,		TF_MISS,Improve Dodge
 50,1,6,1,0,1,0,10,1,no,0,0,0,weapon,0,0x0,		TF_STEAL,Steal
-51,1,6,4,0,1,0,10,1,no,0,0,0,none,0,0x4064,		TF_HIDING,Hiding
+51,1,6,4,0,1,0,10,1,no,0,0,0,none,0,0x84044,		TF_HIDING,Hiding
 52,-2,6,1,5,0,0,10,1,no,0,0,0,weapon,0,0x0,		TF_POISON,Envenom
 53,9,6,16,5,0x1,0,1,1,no,0,0,0,weapon,0,0x0,		TF_DETOXIFY,Detoxify
 //
-54,9,6,16,6,0x1,0,4,1,yes,0,0,0,magic,0,0x20,		ALL_RESURRECTION,Resurrection
+54,9,6,16,6,0x1,0,4,1,yes,0,0,0,magic,0,0x0,		ALL_RESURRECTION,Resurrection
 
 //****
 // Knight
 55,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,0x0,		KN_SPEARMASTERY,Spear Mastery
 56,-2,8,1,-1,0,0,10,3,no,0,0,0,weapon,0,0x0,		KN_PIERCE,Pierce
-57,-2,6,1,-1,0x1,0,10,1,no,0,0,0,weapon,3,0x20000,	KN_BRANDISHSPEAR,Brandish Spear
-58,-4,6,1,-1,0x2,0,10,1,no,0,0,0,weapon,6,0x0,	KN_SPEARSTAB,Spear Stab
+57,-2,6,1,-1,0x1,2,10,1,no,0,0,5,weapon,2,0x20000,	KN_BRANDISHSPEAR,Brandish Spear
+58,-4,6,1,-1,0x2,0,10,1,no,0,0x40000,0,weapon,6,0x0,	KN_SPEARSTAB,Spear Stab
 59,3:5:7:9:11,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x0,	KN_SPEARBOOMERANG,Spear Boomerang
 60,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0,0x0,		KN_TWOHANDQUICKEN,Twohand Quicken
 61,0,6,4,-1,0x20,0,5,1,no,0,0,0,weapon,0,0x0,	KN_AUTOCOUNTER,Counter Attack
-62,-2,6,1,-1,0x2,1,10,1,no,0,0,0,weapon,1,0x0,	KN_BOWLINGBASH,Bowling Bash
+62,-2,6,1,-1,0x2,1,10,1,no,0,0x40000,0,weapon,1,0x0,	KN_BOWLINGBASH,Bowling Bash
 63,0,0,0,0,0,0,1,0,no,0,0,0,weapon,0,0x0,		KN_RIDING,Peco Peco Riding
 64,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0,0x0,		KN_CAVALIERMASTERY,Cavalier Mastery
 
 //****
 // Priest
 65,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,0x0,		PR_MACEMASTERY,Mace Mastery
-66,9,6,16,0,0x1,0,5,1,yes,0,0,0,magic,0,0x20,		PR_IMPOSITIO,Impositio Manus
+66,9,6,16,0,0x1,0,5,1,yes,0,0,0,magic,0,0x0,		PR_IMPOSITIO,Impositio Manus
 67,9,6,16,0,0x1,0,3,1,yes,0,0x200,0,magic,0,0x0,	PR_SUFFRAGIUM,Suffragium
-68,9,6,16,6,0x31,0,5,1,yes,0,0,0,magic,0,0x20,	PR_ASPERSIO,Aspersio
+68,9,6,16,6,0x31,0,5,1,yes,0,0,0,magic,0,0x0,	PR_ASPERSIO,Aspersio
 69,9,6,2,0,0x23,1,5,1,yes,0,0x40,0,magic,0,0x0,	PR_BENEDICTIO,B.S. Sacramenti
-70,9,6,2,6,0x21,0,10,1,yes,0,0,0,magic,1,0x20,	PR_SANCTUARY,Sanctuary
+70,9,6,2,6,0x21,0,10,1,yes,0,0,0,magic,2,0x0,	PR_SANCTUARY,Sanctuary
 71,9,6,16,0,0x1,0,4,1,yes,0,0,0,magic,0,0x0,		PR_SLOWPOISON,Slow Poison
 72,9,6,16,0,0x1,0,1,1,yes,0,0,0,magic,0,0x20,		PR_STRECOVERY,Status Recovery
 73,9,6,16,0,0x1,0,10,1,yes,0,0,0,magic,0,0x0,	PR_KYRIE,Kyrie Eleison
-74,0,6,4,0,0x3,-1,5,1,yes,0,0,0,magic,0,0x20,		PR_MAGNIFICAT,Magnificat
+74,0,6,4,0,0x3,-1,5,1,yes,0,0,0,magic,0,0x0,		PR_MAGNIFICAT,Magnificat
 75,0,6,4,0,0x3,-1,5,1,yes,0,0,0,magic,0,0x0,		PR_GLORIA,Gloria
-76,5,6,1,0,0x1,0,10,0,yes,0,0,0,magic,0,0x20,	PR_LEXDIVINA,Lex Divina
-77,5,6,1,6,0x28,0,10,1,yes,0,0,0,magic,0,0x20,	PR_TURNUNDEAD,Turn Undead
-78,9,6,1,0,0x1,0,1,0,yes,0,0,0,magic,0,0x20,		PR_LEXAETERNA,Lex Aeterna
-79,9,8,2,6,0,0,10,1:2:3:4:5:6:7:8:9:10,yes,0,0,0,magic,0,0x20,	PR_MAGNUS,Magnus Exorcismus
+76,5,6,1,0,0x1,0,10,0,yes,0,0,0,magic,0,0x0,	PR_LEXDIVINA,Lex Divina
+77,5,6,1,6,0x28,0,10,1,yes,0,0,0,magic,0,0x0,	PR_TURNUNDEAD,Turn Undead
+78,9,6,1,0,0x1,0,1,0,yes,0,0,0,magic,0,0x0,		PR_LEXAETERNA,Lex Aeterna
+79,9,8,2,6,0,0,10,1:2:3:4:5:6:7:8:9:10,yes,0,0,0,magic,0,0x0,	PR_MAGNUS,Magnus Exorcismus
 
 //****
 // Wizard
-80,9,8,2,3,0x20,1:1:1:1:1:2:2:2:2:2:2,10,-3:-4:-5:-6:-7:-8:-9:-10:-11:-12:-12,yes,0,0x2080,5,magic,0,0x0,	WZ_FIREPILLAR,Fire Pillar
-81,0,6,4,3,0x2,7,10,1,yes,0,0x42000,0,magic,5,0x20,		WZ_SIGHTRASHER,Sightrasher
-83,9,8,2,3,0,3:3:3:3:3:3:3:3:3:3:14,10,1:1:2:2:3:3:4:4:5:5:15,yes,0,0x2000,0,magic,0,0x20,	WZ_METEOR,Meteor Storm
-84,9,8,1,4,0,0,10,3:4:5:6:7:8:9:10:11:12,yes,0,0x2000,0,magic,2:3:3:4:4:5:5:6:6:7,0x20,	WZ_JUPITEL,Jupitel Thunder
-85,9,8,2,4,0,0,10,-10,yes,0,0x2000,0,magic,0,0x20,		WZ_VERMILION,Lord of Vermilion
+80,9,8,2,3,0x20,1:1:1:1:1:2:2:2:2:2:2,10,3:4:5:6:7:8:9:10:11:12,yes,0,0x2080,5,magic,0,0x0,	WZ_FIREPILLAR,Fire Pillar
+81,0,6,4,3,0x2,7,10,1,yes,0,0x42000,0,magic,5,0x0,		WZ_SIGHTRASHER,Sightrasher
+83,9,8,2,3,0,3:3:3:3:3:3:3:3:3:3:14,10,1:1:2:2:3:3:4:4:5:5:15,yes,0,0x2000,0,magic,0,0x0,	WZ_METEOR,Meteor Storm
+84,9,8,1,4,0,0,10,3:4:5:6:7:8:9:10:11:12,yes,0,0x2000,0,magic,2:3:3:4:4:5:5:6:6:7,0x0,	WZ_JUPITEL,Jupitel Thunder
+85,9,8,2,4,0,0,10,-10,yes,0,0x2000,0,magic,0,0x0,		WZ_VERMILION,Lord of Vermilion
 86,9,8,1,1,0,0,5,1,yes,0,0x2000,0,magic,0,0x0,		WZ_WATERBALL,Water Ball
-87,9,6,2,1,0x1,0,10,1,yes,0,0,0,magic,0,0x20,		WZ_ICEWALL,Ice Wall
+87,9,6,2,1,0x1,0,10,1,yes,0,0,0,magic,0,0x0,		WZ_ICEWALL,Ice Wall
 88,0,6,4,1,0x2,2,10,1,yes,0,0x2000,0,magic,0,0x0,		WZ_FROSTNOVA,Frost Nova
-89,9,6,2,1,0,0,10,1,yes,0,0x2000,0,magic,2,0x20,		WZ_STORMGUST,Storm Gust
-90,9,8,1,2,0,0,5,1:2:3:4:5,yes,0,0x2000,0,magic,0,0x20,	WZ_EARTHSPIKE,Earth Spike
-91,9,8,2,2,0,0,5,1:2:3:4:5,yes,0,0x2000,0,magic,0,0x10020,	WZ_HEAVENDRIVE,Heaven's Drive
-92,9,6,2,2,0x1,0,5,1,yes,0,0,3,magic,0,0x11020,		WZ_QUAGMIRE,Quagmire
+89,9,6,2,1,0,0,10,1,yes,0,0x2000,0,magic,2,0x0,		WZ_STORMGUST,Storm Gust
+90,9,8,1,2,0,0,5,1:2:3:4:5,yes,0,0x2000,0,magic,0,0x0,	WZ_EARTHSPIKE,Earth Spike
+91,9,8,2,2,0,0,5,1:2:3:4:5,yes,0,0x2000,0,magic,0,0x10000,	WZ_HEAVENDRIVE,Heaven's Drive
+92,9,6,2,2,0x1,0,5,1,yes,0,0,3,magic,0,0x11000,		WZ_QUAGMIRE,Quagmire
 93,9,6,1,0,0x1,0,1,1,yes,0,0,0,magic,0,0x0,		WZ_ESTIMATION,Sense
 
 //****
@@ -207,7 +209,7 @@
 107,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,0x0,		BS_WEAPONRESEARCH,Weaponry Research
 108,2,6,16,0,0x1,0,1,1,yes,0,0,0,weapon,0,0x4000,	BS_REPAIRWEAPON,Weapon Repair
 109,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0,0x0,		BS_SKINTEMPER,Skin Tempering
-110,1,6,2,0,0x3,2:2:2:2:2:14,5,1,no,0,0,0,weapon,0,0x4000,	BS_HAMMERFALL,Hammer Fall
+110,1,6,2,0,0x3,2:2:2:2:2:12,5,1,no,0,0,0,weapon,0,0x4000,	BS_HAMMERFALL,Hammer Fall
 111,0,6,4,0,0x3,-1,5,1,no,0,0,0,weapon,0,0x4000,	BS_ADRENALINE,Adrenaline Rush
 112,0,6,4,0,0x3,-1,5,1,no,0,0,0,weapon,0,0x4000,	BS_WEAPONPERFECT,Weapon Perfection
 113,0,6,4,0,0x3,-1,5,1,no,0,0,0,weapon,0,0x4000,	BS_OVERTHRUST,Power-Thrust
@@ -216,20 +218,20 @@
 //****
 // Hunter
 115,3,6,2,0,0x1,0,5,1,no,0,0x80,0,misc,6:7:8:9:10,0x3000,	HT_SKIDTRAP,Skid Trap
-116,3,6,2,2,0x42,0,5,1,no,0,0x80,0,misc,0,0x3800,	HT_LANDMINE,Land Mine
+116,3,6,2,2,0xC0,0,5,1,no,0,0x80,0,misc,0,0x3800,	HT_LANDMINE,Land Mine
 117,3,6,2,0,0x1,0,5,1,no,0,0x80,0,misc,0,0x3000,	HT_ANKLESNARE,Ankle Snare
 118,3,6,2,0,0x3,1,5,1,no,0,0x80,0,misc,0,0x3000,	HT_SHOCKWAVE,Shockwave Trap
 119,3,6,2,0,0x3,2,5,1,no,0,0x80,0,misc,0,0x3000,	HT_SANDMAN,Sandman
 120,3,6,2,0,0x3,1,5,1,no,0,0x80,0,misc,0,0x3000,	HT_FLASHER,Flasher
 121,3,6,2,1,0x42,1,5,1,no,0,0x80,0,weapon,0,0x3800,	HT_FREEZINGTRAP,Freezing Trap
-122,3,6,2,4,0x42,1,5,1,no,0,0x80,0,misc,0,0x3800,	HT_BLASTMINE,Blast Mine
-123,3,6,2,3,0x42,2,5,1,no,0,0x80,0,misc,0,0x3800,	HT_CLAYMORETRAP,Claymore Trap
+122,3,6,2,4,0xC2,1,5,1,no,0,0x80,0,misc,0,0x3800,	HT_BLASTMINE,Blast Mine
+123,3,6,2,3,0xC2,2,5,1,no,0,0x40080,0,misc,0,0x3800,	HT_CLAYMORETRAP,Claymore Trap
 124,2,6,32,0,0x1,0,1,1,no,0,0x40000,0,misc,0,0x0,		HT_REMOVETRAP,Remove Trap
 125,3,6,2,0,0x1,0,1,1,no,0,0x80,0,misc,0,0x2000,		HT_TALKIEBOX,Talkie Box
 126,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,0x0,		HT_BEASTBANE,Beast Bane
 127,0,0,0,0,0,0,1,0,no,0,0,0,misc,0,0x0,		HT_FALCON,Falconry Mastery
 128,0,0,0,0,0,0,10,0,no,0,0,0,misc,0,0x0,		HT_STEELCROW,Steel Crow
-129,5,8,1,0,0x42,1,5,1:2:3:4:5,yes,0,0,0,misc,0,0x80,	HT_BLITZBEAT,Blitz Beat
+129,5,8,1,0,0x42,1,5,1:2:3:4:5,yes,0,0x40000,0,misc,0,0x80,	HT_BLITZBEAT,Blitz Beat
 130,3:5:7:9,6,2,0,0x3,3,4,1,no,0,0,0,misc,0,0x0,	HT_DETECTING,Detect
 131,4:5:6:7:8,6,32,0,0x1,0,5,1,no,0,0,0,misc,0,0x0,	HT_SPRINGTRAP,Spring Trap
 
@@ -238,9 +240,9 @@
 132,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0,0x0,		AS_RIGHT,Righthand Mastery
 133,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0,0x0,		AS_LEFT,Lefthand Mastery
 134,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,0x0,		AS_KATAR,Katar Mastery
-135,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0,0x60,	AS_CLOAKING,Cloaking
+135,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0,0x80040,	AS_CLOAKING,Cloaking
 136,1,8,1,-1,0,0,10,-8,no,0,0,0,weapon,0,0x0,	AS_SONICBLOW,Sonic Blow
-137,3:4:5:6:7,6,1,-1,0x2,1,5,1,no,0,0,0,weapon,0,0x4,	AS_GRIMTOOTH,Grimtooth
+137,3:4:5:6:7,6,1,-1,0x2,1,5,1,no,0,0x40000,0,weapon,0,0x4,	AS_GRIMTOOTH,Grimtooth
 138,1,6,16,5,0x1,0,10,1,no,0,0x400,0,weapon,0,0x0,	AS_ENCHANTPOISON,Enchant Poison
 139,0,6,4,0,0,0,10,1,no,0,0,0,weapon,0,0x0,		AS_POISONREACT,Poison React
 140,2,6,2,5,0x1,0,10,1,no,0,0,0,weapon,0,0x0,	AS_VENOMDUST,Venom Dust
@@ -248,7 +250,7 @@
 
 //****
 // 1st Class Quest
-142,0,6,4,0,0x1,0,1,1,no,0,0x1,0,none,0,0x20,		NV_FIRSTAID,First Aid
+142,0,6,4,0,0x1,0,1,1,no,0,0x1,0,none,0,0x0,		NV_FIRSTAID,First Aid
 143,0,6,4,0,0x1,0,1,1,no,0,0x1,0,none,0,0x0,		NV_TRICKDEAD,Play Dead
 144,0,0,0,0,0,0,1,0,no,0,0x1,0,none,0,0x0,		SM_MOVINGRECOVERY,Moving HP-Recovery
 145,0,0,0,0,0,0,1,0,no,0,0x1,0,weapon,0,0x0,		SM_FATALBLOW,Fatal Blow
@@ -259,11 +261,11 @@
 150,0,6,4,0,0x1,0,1,1,no,0,0x1,0,weapon,5,0x40,	TF_BACKSLIDING,Back Slide
 151,0,6,4,0,0x1,0,1,1,no,0,0x1,0,none,0,0x0,		TF_PICKSTONE,Find Stone
 152,7,6,1,0,0x40,0,1,1,no,0,0x1,0,misc,0,0x0,	TF_THROWSTONE,Stone Fling
-153,1,6,1,-1,0x2,1,1,1,no,0,0x1,0,weapon,2,0x0,	MC_CARTREVOLUTION,Cart Revolution
+153,1,6,1,-1,0x2,1,1,1,no,0,0x40001,0,weapon,2,0x0,	MC_CARTREVOLUTION,Cart Revolution
 154,0,6,4,0,0x1,0,1,1,no,0,0x1,0,none,0,0x0,		MC_CHANGECART,Change Cart
 155,0,6,4,0,0x1,0,1,1,no,0,0x1,0,weapon,0,0x0,	MC_LOUD,Crazy Uproar
-156,9,6,1,6,0,0,1,1,yes,0,0x1,0,magic,0,0x20,		AL_HOLYLIGHT,Holy Light
-157,0,6,4,0,0x1,0,1,1,yes,0,0x1,0,magic,0,0x20,	MG_ENERGYCOAT,Energy Coat
+156,9,6,1,6,0,0,1,1,yes,0,0x1,0,magic,0,0x0,		AL_HOLYLIGHT,Holy Light
+157,0,6,4,0,0x1,0,1,1,yes,0,0x1,0,magic,0,0x0,	MG_ENERGYCOAT,Energy Coat
 
 //****
 // NPC Skills
@@ -282,8 +284,8 @@
 170,-9,6,1,-1,0x20,0,10,1,no,0,0x2,0,weapon,0,0x0,	NPC_CRITICALSLASH,Defense disregard attack
 171,-9,8,1,-1,0,0,10,-2:-3:-4:-5:-6:-7:-8:-9:-10:-11,no,0,0x2,0,weapon,0,0x0,	NPC_COMBOATTACK,Multi-stage Attack
 172,-9,6,1,-1,0x40,0,10,1,no,0,0x2,0,weapon,0,0x0,	NPC_GUIDEDATTACK,Guided Attack
-173,5,6,4,3,0xE2,5,10,1,no,0,0x2,0,misc,3,0x0,	NPC_SELFDESTRUCTION,Suicide bombing
-174,-9,6,1,-1,0x2,3,1,1,no,0,0x2,0,weapon,0,0x0,	NPC_SPLASHATTACK,Splash attack
+173,5,6,4,3,0xE2,5,10,1,no,0,0x40002,0,misc,3,0x0,	NPC_SELFDESTRUCTION,Suicide bombing
+174,-9,6,1,-1,0x2,3,1,1,no,0,0x40002,0,weapon,0,0x0,	NPC_SPLASHATTACK,Splash attack
 175,0,0,4,0,0x41,0,10,1,no,0,0x2,0,misc,0,0x0,	NPC_SUICIDE,Suicide
 176,-9,6,1,-1,0,0,5,1,no,0,0x2,0,weapon,0,0x0,	NPC_POISON,Poison Attack
 177,-9,6,1,-1,0,0,5,1,no,0,0x2,0,weapon,0,0x0,	NPC_BLINDATTACK,Blind Attack
@@ -326,11 +328,11 @@
 211,1,6,1,0,0x1,0,10,1,no,0,0,0,weapon,0,0x0,	RG_STEALCOIN,Mug
 212,-1,6,1,-1,0x40,0,10,1,no,0,0,0,weapon,0,0x4,	RG_BACKSTAP,Back Stab
 213,0,0,0,0,0,0,5,0,no,0,0,0,none,0,0x0,		RG_TUNNELDRIVE,Stalk
-214,0,6,4,-1,0x2,1,5,1,no,0,0,0,weapon,0,0x4,	RG_RAID,Sightless Mind
-215,1,6,1,0,0x1,0,5,1,no,0,0,0,weapon,0,0x20,		RG_STRIPWEAPON,Divest Weapon
-216,1,6,1,0,0x1,0,5,1,no,0,0,0,weapon,0,0x20,		RG_STRIPSHIELD,Divest Shield
-217,1,6,1,0,0x1,0,5,1,no,0,0,0,weapon,0,0x20,		RG_STRIPARMOR,Divest Armor
-218,1,6,1,0,0x1,0,5,1,no,0,0,0,weapon,0,0x20,		RG_STRIPHELM,Divest Helm
+214,0,6,4,-1,0x2,1,5,1,no,0,0x40000,0,weapon,0,0x4,	RG_RAID,Sightless Mind
+215,1,6,1,0,0x1,0,5,1,no,0,0,0,weapon,0,0x0,		RG_STRIPWEAPON,Divest Weapon
+216,1,6,1,0,0x1,0,5,1,no,0,0,0,weapon,0,0x0,		RG_STRIPSHIELD,Divest Shield
+217,1,6,1,0,0x1,0,5,1,no,0,0,0,weapon,0,0x0,		RG_STRIPARMOR,Divest Armor
+218,1,6,1,0,0x1,0,5,1,no,0,0,0,weapon,0,0x0,		RG_STRIPHELM,Divest Helm
 219,1,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x0,		RG_INTIMIDATE,Snatch
 220,1,6,2,0,0x1,0,1,1,no,0,0,0,none,0,0x0,		RG_GRAFFITI,Scribble
 221,0,6,2,0,0x1,0,5,1,no,0,0,0,none,0,0x0,		RG_FLAGGRAFFITI,Piece
@@ -371,7 +373,7 @@
 250,3,6,1,0,0,0,5,1,no,0,0,0,weapon,5:6:7:8:9,0x0,	CR_SHIELDCHARGE,Smite
 251,3:5:7:9:11,6,1,0,0,0,5,1,no,0,0,0,weapon,0,0x20000,	CR_SHIELDBOOMERANG,Shield Boomerang
 252,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0,0x0,		CR_REFLECTSHIELD,Shield Reflect
-253,-2,8,1,6,0,0,10,-2,no,0,0,0,weapon,0,0x0,	CR_HOLYCROSS,Holy Cross
+253,-2,8,1,6,0,0,10,-2,no,0,0x40000,0,weapon,0,0x0,	CR_HOLYCROSS,Holy Cross
 254,5,6,4,6,0x48,0,10,1,no,33,0x100,0,magic,0,0x0,	CR_GRANDCROSS,Grand Cross
 255,7:8:9:10:11,6,16,0,0x1,0,5,1,yes,0,0x600,0,none,0,0x0,	CR_DEVOTION,Sacrifice
 256,9,6,16,0,0x1,0,5,1,yes,0,0x200,0,none,0,0x0,	CR_PROVIDENCE,Resistant Souls
@@ -384,36 +386,36 @@
 260,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0,0x0,		MO_SPIRITSRECOVERY,Spiritual Cadence
 261,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0,		MO_CALLSPIRITS,Summon Spirit Sphere
 262,9,6,16,0,0x1,0,1,1,yes,0,0,0,weapon,0,0x0,	MO_ABSORBSPIRITS,Absorb Spirit Sphere
-263,-1,8,0,-1,0,0,10,-3,no,0,0,0,weapon,0,0x10,	MO_TRIPLEATTACK,Raging Trifecta Blow
+263,-1,8,0,-1,0,0,10,-3,no,0,0x40000,0,weapon,0,0x10,	MO_TRIPLEATTACK,Raging Trifecta Blow
 264,18,6,2,0,0x1,0,1,1,no,0,0,0,none,0,0x0,		MO_BODYRELOCATION,Snap
 265,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,0x0,		MO_DODGE,Dodge
-266,2,6,1,0,0x40,0,5,1,no,0,0,0,weapon,0,0x0,	MO_INVESTIGATE,Occult Impaction
-267,9,8,1,-1,0,0,5,1:2:3:4:5,no,0,0,0,weapon,0,0x0,	MO_FINGEROFFENSIVE,Throw Spirit Sphere
+266,2,6,1,0,0x40,0,5,1,no,0,0x40000,0,weapon,0,0x0,	MO_INVESTIGATE,Occult Impaction
+267,9,8,1,-1,0,0,5,1:2:3:4:5,no,0,0x40000,0,weapon,0,0x0,	MO_FINGEROFFENSIVE,Throw Spirit Sphere
 268,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0,0x0,		MO_STEELBODY,Mental Strength
 269,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0,0x0,		MO_BLADESTOP,Root
 270,0,6,4,0,0x1,0,5,0,no,0,0,0,weapon,0,0x0,		MO_EXPLOSIONSPIRITS,Fury
-271,-2,6,1,0,0x60,0,5,1,yes,0,0,0,weapon,0,0x0,	MO_EXTREMITYFIST,Asura Strike
+271,-2,6,1,0,0x60,0,5,1,yes,0,0x40000,0,weapon,0,0x0,	MO_EXTREMITYFIST,Asura Strike
 272,-2,8,4,-1,0,0,5,-4,no,0,0x200,0,weapon,0,0x0,	MO_CHAINCOMBO,Raging Quadruple Blow
-273,-2,6,4,-1,0x2,2,5,1,no,0,0x200,0,weapon,0,0x0,	MO_COMBOFINISH,Raging Thrust
+273,-2,6,4,-1,0x2,2,5,1,no,0,0x40200,0,weapon,0,0x0,	MO_COMBOFINISH,Raging Thrust
 
 //****
 // Sage
 274,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,0x0,		SA_ADVANCEDBOOK,Study
 275,0,6,4,0,0x1,0,5,1,no,0,0,0,magic,0,0x0,		SA_CASTCANCEL,Cast Cancel
-276,0,6,4,0,0x1,0,5,1,yes,0,0,0,magic,0,0x20,		SA_MAGICROD,Magic Rod
-277,9,6,1,0,0x1,0,5,1,yes,0,0,0,magic,0,0x20,		SA_SPELLBREAKER,Spell Breaker
+276,0,6,4,0,0x1,0,5,1,yes,0,0,0,magic,0,0x0,		SA_MAGICROD,Magic Rod
+277,9,6,1,0,0x1,0,5,1,yes,0,0,0,magic,0,0x0,		SA_SPELLBREAKER,Spell Breaker
 278,0,0,0,0,0,0,10,0,no,0,0,0,magic,0,0x0,		SA_FREECAST,Free Cast
 279,0,6,4,0,0x1,0,10,1,yes,0,0,0,magic,0,0x0,	SA_AUTOSPELL,Hindsight
-280,9,6,16,3,0x1,0,5,1,yes,0,0xC00,0,magic,0,0x20,	SA_FLAMELAUNCHER,Endow Blaze
-281,9,6,16,1,0x1,0,5,1,yes,0,0xC00,0,magic,0,0x20,	SA_FROSTWEAPON,Endow Tsunami
-282,9,6,16,4,0x1,0,5,1,yes,0,0xC00,0,magic,0,0x20,	SA_LIGHTNINGLOADER,Endow Tornado
-283,9,6,16,2,0x1,0,5,1,yes,0,0xC00,0,magic,0,0x20,	SA_SEISMICWEAPON,Endow Quake
+280,9,6,16,3,0x1,0,5,1,yes,0,0xC00,0,magic,0,0x0,	SA_FLAMELAUNCHER,Endow Blaze
+281,9,6,16,1,0x1,0,5,1,yes,0,0xC00,0,magic,0,0x0,	SA_FROSTWEAPON,Endow Tsunami
+282,9,6,16,4,0x1,0,5,1,yes,0,0xC00,0,magic,0,0x0,	SA_LIGHTNINGLOADER,Endow Tornado
+283,9,6,16,2,0x1,0,5,1,yes,0,0xC00,0,magic,0,0x0,	SA_SEISMICWEAPON,Endow Quake
 284,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0,0x0,		SA_DRAGONOLOGY,Dragonology
-285,2,6,2,3,0x1,0,5,1,yes,0,0,0,magic,0,0x1020,		SA_VOLCANO,Volcano
-286,2,6,2,1,0x1,0,5,1,yes,0,0,0,magic,0,0x1020,		SA_DELUGE,Deluge
-287,2,6,2,4,0x1,0,5,1,yes,0,0,0,magic,0,0x1020,		SA_VIOLENTGALE,Whirlwind
-288,2,6,2,0,0x1,0,5,1,yes,0,0,0,magic,0,0x20,		SA_LANDPROTECTOR,Magnetic Earth
-289,9,6,1,0,0x1,0:0:0:0:0:-1,5,1,yes,0,0xE00,0,magic,0,0x20,	SA_DISPELL,Dispell
+285,2,6,2,3,0x1,0,5,1,yes,0,0,0,magic,0,0x1000,		SA_VOLCANO,Volcano
+286,2,6,2,1,0x1,0,5,1,yes,0,0,0,magic,0,0x1000,		SA_DELUGE,Deluge
+287,2,6,2,4,0x1,0,5,1,yes,0,0,0,magic,0,0x1000,		SA_VIOLENTGALE,Whirlwind
+288,2,6,2,0,0x1,0,5,1,yes,0,0,0,magic,0,0x0,		SA_LANDPROTECTOR,Magnetic Earth
+289,9,6,1,0,0x1,0:0:0:0:0:-1,5,1,yes,0,0xE00,0,magic,0,0x10020,	SA_DISPELL,Dispell
 290,0,6,4,0,0x1,0,10,1,yes,0,0,0,magic,0,0x0,	SA_ABRACADABRA,Hocus-pocus
 291,9,6,1,0,0x1,0,1,1,yes,0,0x2,0,magic,0,0x0,	SA_MONOCELL,Monocell
 292,9,6,1,0,0x1,0,1,1,yes,0,0x2,0,magic,0,0x0,	SA_CLASSCHANGE,Class Change
@@ -472,7 +474,7 @@
 333,0,6,4,0,0x1,0,1,0,no,0,0x2,0,none,0,0x0,		NPC_REVENGE,Revenge
 
 //****
-// Mariage Skills
+// Marriage Skills
 334,9,6,4,0,0x1,0,1,1,yes,0,0x4,0,none,0,0x0,	WE_MALE,I Will Protect You
 335,9,6,4,0,0x1,0,1,1,yes,0,0x4,0,none,0,0x0,	WE_FEMALE,I Look up to You
 336,9,6,4,0,0x1,3,1,1,yes,0,0x4,1,none,0,0x0,	WE_CALLPARTNER,I miss You
@@ -517,7 +519,7 @@
 // High Wizard
 364,0,0,0,0,0,0,10,1,no,0,0,0,magic,0,0x0,		HW_SOULDRAIN,Soul Drain
 365,9,8,1,-1,0,0,1,1,yes,0,0,0,weapon,0,0x0,		HW_MAGICCRASHER,Stave Crasher
-366,0,6,4,0,0x1,0,10,1,no,0,0,0,magic,0,0x20,		HW_MAGICPOWER,Mystical Amplification
+366,0,6,4,0,0x1,0,10,1,no,0,0,0,magic,0,0x0,		HW_MAGICPOWER,Mystical Amplification
 
 //****
 // Paladin
@@ -533,8 +535,8 @@
 
 //****
 // Professor
-373,0,6,4,0,0x1,0,5,1,no,0,0,0,magic,0,0x20,	PF_HPCONVERSION,Indulge
-374,9,6,1,0,0x1,0,1,1,yes,0,0xE00,0,none,0,0x20,	PF_SOULCHANGE,Soul Exhale
+373,0,6,4,0,0x1,0,5,1,no,0,0,0,magic,0,0x0,	PF_HPCONVERSION,Indulge
+374,9,6,1,0,0x1,0,1,1,yes,0,0xE00,0,none,0,0x0,	PF_SOULCHANGE,Soul Exhale
 375,9,6,1,0,0x98,0,5,1,yes,0,0,0,magic,0,0x0,	PF_SOULBURN,Soul Siphon
 
 //****
@@ -542,13 +544,13 @@
 376,0,0,0,0,0x1,0,5,1,no,0,0,0,weapon,0,0x0,		ASC_KATAR,Advanced Katar Mastery
 //377,0,0,4,0,0x1,0,10,1,no,0,0,0,misc,0,0x0,	ASC_HALLUCINATION,Hallucination Walk
 378,0,6,4,5,0x1,0,5,1,no,0,0,0,weapon,0,0x0,		ASC_EDP,Enchant Deadly Poison
-379,7,6,1,-1,0x8,0,10,1,yes,0,0,0,weapon,0,0x0,	ASC_BREAKER,Soul Destroyer
+379,9,6,1,-1,0x8,0,10,1,yes,0,0,0,weapon,0,0x0,	ASC_BREAKER,Soul Destroyer
 
 //****
 // Sniper
 380,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0,0x0,	SN_SIGHT,Falcon Eyes
-381,5,8,1,-3,0x40,0,5,1,yes,0,0,0,misc,0,0x80,		SN_FALCONASSAULT,Falcon Assault
-382,9,8,1,-1,0,2,5,1,yes,0,0,13,weapon,0,0x0,	SN_SHARPSHOOTING,Focused Arrow Strike
+381,9,8,1,-3,0x40,0,5,1,yes,0,0,0,misc,0,0x0,		SN_FALCONASSAULT,Falcon Assault
+382,9,8,1,-1,0,1,5,1,yes,0,0x40000,14,weapon,0,0x0,	SN_SHARPSHOOTING,Focused Arrow Strike
 383,0,6,4,0,0x3,-1,10,1,yes,0,0,0,weapon,0,0x0,	SN_WINDWALK,Wind Walker
 
 //****
@@ -561,7 +563,7 @@
 
 //****
 // Stalker
-389,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x60,		ST_CHASEWALK,Stealth
+389,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x40,		ST_CHASEWALK,Stealth
 390,0,0,4,0,0x1,0,5,1,yes,0,0,0,weapon,0,0x0,		ST_REJECTSWORD,Counter Instinct
 //391,0,0,4,0,1,0,1,1,yes,0,0,0,magic,0,0x0,		ST_STEALBACKPACK,Steal Backpack
 
@@ -574,17 +576,17 @@
 // Clown & Gypsy
 394,9,8,1,-1,0,0,10,-9,yes,0,0,0,weapon,0,0x0,	CG_ARROWVULCAN,Vulcan Arrow
 395,0,0,4,0,0x1,3,1,1,yes,0,0x40,0,misc,2,0x0,	CG_MOONLIT,Sheltering Bliss
-396,1,6,16,0,0x1,0,1,1,yes,0,0x600,0,none,0,0x40,	CG_MARIONETTE,Marionette Control
+396,7,6,16,0,0x1,0,1,1,yes,0,0x600,0,none,0,0x40,	CG_MARIONETTE,Marionette Control
 
 //****
 // Lord Knight
-397,5,8,1,-1,0x20,0,5,5,no,0,0,0,weapon,0,0x20000,	LK_SPIRALPIERCE,Spiral Pierce
+397,5,8,1,-1,0x20,0,5,5,no,0,0x40000,0,weapon,0,0x20000,	LK_SPIRALPIERCE,Spiral Pierce
 398,4,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x0,		LK_HEADCRUSH,Traumatic Blow
 399,4,6,1,-1,0,0,10,1,no,0,0,0,weapon,0,0x0,		LK_JOINTBEAT,Vital Strike
 
 //****
 // High Wizard
-400,9,8,1,8,0x6,1,5,1:2:3:4:5,yes,0,0,0,magic,0,0x0,	HW_NAPALMVULCAN,Napalm Vulcan
+400,9,8,1,8,0x6,1,5,1:2:3:4:5,yes,0,0x40000,0,magic,0,0x0,	HW_NAPALMVULCAN,Napalm Vulcan
 
 //****
 // Champion
@@ -594,25 +596,25 @@
 // Professor
 402,9,6,1,0,0x1,0,5,1,no,0,0,0,none,0,0x0,		PF_MINDBREAKER,Mind Breaker
 403,0,0,4,0,0x1,0,1,1,yes,0,0,0,magic,0,0x0,		PF_MEMORIZE,Foresight
-404,9,6,2,2,0x1,0,5,1,yes,0,0x100,2,magic,0,0x10020,	PF_FOGWALL,Blinding Mist
-405,7,6,1,0,0x1,0,1,1,no,0,0,3,magic,0,0x20,		PF_SPIDERWEB,Fiber Lock
+404,9,6,2,2,0x1,0,5,1,yes,0,0x100,2,magic,0,0x10000,	PF_FOGWALL,Blinding Mist
+405,7,6,1,0,0x1,0,1,1,no,0,0,3,magic,0,0x0,		PF_SPIDERWEB,Fiber Lock
 
 //****
 // Assassin Cross
-406,0,6,4,-1,0xA,2,10,1,no,0,0,0,weapon,0,0x0,	ASC_METEORASSAULT,Meteor Assault
+406,0,6,4,-1,0xA,2,10,1,no,0,0x40000,0,weapon,0,0x0,	ASC_METEORASSAULT,Meteor Assault
 407,0,6,4,0,0x1,0,1,0,no,0,0,0,none,0,0x0,		ASC_CDP,Create Deadly Poison
 
 //****
-// Mariage Skills for Baby
+// Marriage Skills for Baby
 408,9,6,4,0,0x1,0,1,1,yes,0,0x4,0,none,0,0x0,	WE_BABY,Baby
 409,9,6,4,0,0x1,3,1,1,yes,0,0x4,1,none,0,0x0,	WE_CALLPARENT,Call Parent
 410,9,6,4,0,0x1,3,1,1,yes,0,0x4,1,none,0,0x0,	WE_CALLBABY,Call Baby
 
 //****
 // Taekwon
-411,0,6,4,0,0x1,0,10,1,yes,0,0,0,misc,4,0x20,		TK_RUN,Running
+411,0,6,4,0,0x1,0,10,1,yes,0,0,0,misc,4,0x0,		TK_RUN,Running
 412,0,6,4,0,0x1,0,1,1,no,0,0,0,weapon,0,0x0,		TK_READYSTORM,Tornado Stance
-413,-2,8,4,-1,0x2,2,7,-3,no,0,0x200,0,weapon,0,0x0,	TK_STORMKICK,Tornado Kick
+413,-2,8,4,-1,0x2,2,7,-3,no,0,0x40200,0,weapon,0,0x0,	TK_STORMKICK,Tornado Kick
 414,0,6,4,0,0x1,0,1,1,no,0,0,0,weapon,0,0x0,		TK_READYDOWN,Heel Drop Stance
 415,-2,8,4,-1,0,0,7,-3,no,0,0x200,0,weapon,0,0x0,	TK_DOWNKICK,Heel Drop
 416,0,6,4,0,0x1,0,1,1,no,0,0,0,weapon,0,0x0,		TK_READYTURN,Roundhouse Stance
@@ -624,8 +626,8 @@
 422,0,0,0,0,0,1,10,0,no,0,0,0,none,0,0x0,		TK_HPTIME,Peaceful Break
 423,0,0,0,0,0,1,10,0,no,0,0,0,none,0,0x0,		TK_SPTIME,Happy Break
 424,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0,0x0,		TK_POWER,Kihop
-425,0,6,4,2:4:1:3:8:7:6,0x1,0,7,1,no,0,0,0,weapon,0,0x20,	TK_SEVENWIND,Mild Wind
-426,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0,0x20,		TK_HIGHJUMP,Taekwon Jump
+425,0,6,4,2:4:1:3:8:7:6,0x1,0,7,1,no,0,0,0,weapon,0,0x0,	TK_SEVENWIND,Mild Wind
+426,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0,0x0,		TK_HIGHJUMP,Taekwon Jump
 
 //****
 // Star Gladiator
@@ -636,7 +638,7 @@
 431,0,0,4,0,0x1,0,4,1,yes,0,0,0,magic,0,0x0,		SG_SUN_COMFORT,Comfort of the Sun
 432,0,0,4,0,0x1,0,4,1,yes,0,0,0,magic,0,0x0,		SG_MOON_COMFORT,Comfort of the Moon
 433,0,0,4,0,0x1,0,4,1,yes,0,0,0,magic,0,0x0,		SG_STAR_COMFORT,Comfort of the Stars
-434,10,6,1,0,0x1,0,3,1,yes,0,0,0,magic,0,0x0,	SG_HATE,Hatred of the Sun Moon and Stars
+434,9,6,1,0,0x1,0,3,1,yes,0,0,0,magic,0,0x0,	SG_HATE,Hatred of the Sun Moon and Stars
 435,0,0,0,0,0,0,3,0,no,0,0,0,none,0,0x0,		SG_SUN_ANGER,Anger of the Sun
 436,0,0,0,0,0,0,3,0,no,0,0,0,none,0,0x0,		SG_MOON_ANGER,Anger of the Moon
 437,0,0,0,0,0,0,3,0,no,0,0,0,none,0,0x0,		SG_STAR_ANGER,Anger of the Stars
@@ -677,9 +679,9 @@
 460,9,6,16,0,0x1,0,5,1,yes,0,0x200,0,magic,0,0x0,	SL_HUNTER,Spirit of the Hunter
 461,9,6,16,0,0x1,0,5,1,yes,0,0x200,0,magic,0,0x0,	SL_SOULLINKER,Spirit of the Soul Linker
 462,9,6,16,0,0x1,0,7,1,yes,0,0,0,magic,0,0x0,	SL_KAIZEL,Kaizel
-463,9,6,16,0,0x1,0,7,1,yes,0,0,0,magic,0,0x20,	SL_KAAHI,Kaahi
-464,9,6,16,0,0x1,0,3,1,yes,0,0,0,magic,0,0x20,	SL_KAUPE,Kaupe
-465,9,6,16,0,0x1,0,7,1,yes,0,0,0,magic,0,0x20,	SL_KAITE,Kaite
+463,9,6,16,0,0x1,0,7,1,yes,0,0,0,magic,0,0x0,	SL_KAAHI,Kaahi
+464,9,6,16,0,0x1,0,3,1,yes,0,0,0,magic,0,0x0,	SL_KAUPE,Kaupe
+465,9,6,16,0,0x1,0,7,1,yes,0,0,0,magic,0,0x0,	SL_KAITE,Kaite
 466,0,0,0,0,0,0,7,0,yes,0,0,0,magic,0,0x0,		SL_KAINA,Kaina
 467,9,6,1,-2,0,0,7,1,no,0,0,0,magic,2,0x0,		SL_STIN,Estin
 468,9,6,1,-2,0,0,7,1,no,0,0,0,magic,0,0x0,		SL_STUN,Estun
@@ -693,15 +695,15 @@
 473,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0,0x0,		SM_SELFPROVOKE,Provoke Self
 474,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0,0x0,	NPC_EMOTION_ON,Emotion ON
 475,0,0,4,0,0x1,0,1,1,yes,0,0,0,none,0,0x0,		ST_PRESERVE,Preserve
-476,1,6,1,0,0x1,0,5,1,yes,0,0,0,weapon,0,0x20,	ST_FULLSTRIP,Divest All
+476,1,6,1,0,0x1,0,5,1,yes,0,0,0,weapon,0,0x0,	ST_FULLSTRIP,Divest All
 477,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0,0x4000,	WS_WEAPONREFINE,Upgrade Weapon
 478,3,6,2,0,0x3,3,10,1,no,0,0,0,none,0,0x0,		CR_SLIMPITCHER,Aid Condensed Potion
 479,1,6,16,0,0x1,0,5,1,yes,0,0,0,weapon,0,0x0,	CR_FULLPROTECTION,Full Protection
 480,5,8,1,0,0,0,5,5,no,0,0,0,weapon,0,0x20000,		PA_SHIELDCHAIN,Shield Chain
 481,0,0,0,0,0,0,5,0,no,0,0,0,none,0,0x0,		HP_MANARECHARGE,Mana Recharge
 482,0,6,4,0,0x1,0,5,1,no,0,0,0,magic,0,0x0,		PF_DOUBLECASTING,Double Casting
-483,14,6,2,0,0x1,1:2:3:4:5,1,1,no,0,0,0,none,0,0x20,	HW_GANBANTEIN,Ganbantein
-484,14,6,2,2,0xD1,0,5,1,yes,0,0x18000,0,misc,0,0x11030,		HW_GRAVITATION,Gravitation Field
+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
 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
@@ -740,15 +742,15 @@
 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
-520,-9,6,1,-1,0x2,1:1:1:2:2:2:3:3:3:4,10,1,no,0,0,0,weapon,0,0x100,	GS_SPREADATTACK,Spread Attack
-521,-9,6,2,-1,0x40,1,10,1,no,0,0,0,misc,3,0x100,	GS_GROUNDDRIFT,Ground Drift
+520,-9,6,1,-1,0x2,1:1:1:2:2:2:3:3:3:4,10,1,no,0,0x40000,0,weapon,0,0x100,	GS_SPREADATTACK,Spread Attack
+521,-9,6,2,-1,0x42,1,10,1,no,0,0,0,weapon,3,0x100,	GS_GROUNDDRIFT,Ground Drift
 
 //****
 // Ninja
 522,0,0,0,0,0,0,10,1,no,0,0,0,weapon,0,0x0,		NJ_TOBIDOUGU,Shuriken Training
 523,9,6,1,-1,0x40,0,10,1,no,0,0,0,weapon,0,0x0,	NJ_SYURIKEN,Throw Shuriken
 524,9,8,1,-1,0x48,0,5,3,no,0,0,0,weapon,0,0x0,	NJ_KUNAI,Throw Kunai
-525,9,8,1,-1,0x6,1,5,-3:-3:-4:-4:-5,yes,0,0,0,weapon,0,0x0,	NJ_HUUMA,Throw Huuma Shuriken
+525,9,8,1,-1,0x6,1,5,-3:-3:-4:-4:-5,yes,0,0x40000,0,weapon,0,0x0,	NJ_HUUMA,Throw Huuma Shuriken
 526,9,6,1,0,0x50,0,10,1,no,0,0x18000,0,misc,0,0x0,		NJ_ZENYNAGE,Throw Zeny
 527,0,6,4,-1,0,0,5,1,no,0,0,0,weapon,3,0x0,		NJ_TATAMIGAESHI,Improvised Defense
 528,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0,0x0,	NJ_KASUMIKIRI,Vanishing Slash
@@ -759,13 +761,13 @@
 533,0,0,0,0,0,0,10,0,no,0,0,0,none,0,0x0,		NJ_NINPOU,Spirit of the Blade
 534,9,8,1,3,0,0,10,1:2:3:4:5:6:7:8:9:10,yes,0,0,0,magic,0,0x0,	NJ_KOUENKA,Crimson Fire Petal
 535,0,8,4,3,0,0,10,1,yes,0,0,0,magic,0,0x0,		NJ_KAENSIN,Crimson Fire Formation
-536,9,8,1,3,0x2,2,5,3,yes,0,0,0,magic,0,0x0,		NJ_BAKUENRYU,Raging Fire Dragon
+536,9,8,1,3,0,0,5,-3,yes,0,0,0,magic,0,0x0,		NJ_BAKUENRYU,Raging Fire Dragon
 537,9,8,1,1,0,0,10,3:4:5:6:7:8:9:10:11:12,yes,0,0,0,magic,0,0x0,	NJ_HYOUSENSOU,Spear of Ice
 538,9,6,2,1,0x1,0,10,1,yes,0,0,0,magic,0,0x1000,	NJ_SUITON,Hidden Water
-539,0,6,4,1,0x2,3,5,1,yes,0,0,0,magic,0,0x0,		NJ_HYOUSYOURAKU,Ice Meteor
+539,0,6,4,1,0,0,5,1,yes,0,0,0,magic,0,0x0,		NJ_HYOUSYOURAKU,Ice Meteor
 540,9,8,1,4,0,0,10,1:2:2:3:3:4:4:5:5:6,yes,0,0,0,magic,0,0x0,	NJ_HUUJIN,Wind Blade
-541,9,6,4,4,0x2,2:2:3:3:4,5,1,yes,0,0,0,magic,0,0x0,	NJ_RAIGEKISAI,Lightning Strike of Destruction
-542,9,8,1,4,0,3,5,1,yes,0,0,5:6:7:8:9,magic,0,0x0,	NJ_KAMAITACHI,Kamaitachi
+541,9,6,4,4,0,0,5,1,yes,0,0,0,magic,0,0x0,	NJ_RAIGEKISAI,Lightning Strike of Destruction
+542,5:6:7:8:9,8,1,4,0,1,5,1,yes,0,0x40000,5:6:7:8:9,magic,0,0x0,	NJ_KAMAITACHI,Kamaitachi
 543,0,6,4,0,0x1,0,5,1,yes,0,0,0,none,0,0x0,		NJ_NEN,Soul
 544,-5,6,1,0,0x40,0,10,1,no,0,0,0,weapon,0,0x0,	NJ_ISSEN,Final Strike
 
@@ -776,16 +778,16 @@
 
 //****
 // Additional NPC Skills (Episode 11.3)
-653,0,8,4,0,0x6,5:7:9:11:13:5:7:9:11:13,10,1,no,0,0x2,0,magic,0,0x0,	NPC_EARTHQUAKE,Earthquake
-654,9,6,1,3,0,5,10,1,no,0,0x2,14,weapon,0,0x0,	NPC_FIREBREATH,Fire Breath
-655,9,6,1,1,0,5,10,1,no,0,0x2,14,weapon,0,0x0,	NPC_ICEBREATH,Ice Breath
-656,9,6,1,4,0,5,10,1,no,0,0x2,14,weapon,0,0x0,	NPC_THUNDERBREATH,Thunder Breath
-657,9,6,1,5,0,5,10,1,no,0,0x2,14,weapon,0,0x0,	NPC_ACIDBREATH,Acid Breath
-658,9,6,1,7,0,5,10,1,no,0,0x2,14,weapon,0,0x0,	NPC_DARKNESSBREATH,Darkness Breath
+653,0,8,4,0,0x6,5:7:9:11:13:5:7:9:11:13,10,1,no,0,0x40002,0,magic,0,0x0,	NPC_EARTHQUAKE,Earthquake
+654,6,6,1,3,0,3,10,1,no,0,0x2,14,weapon,0,0x0,	NPC_FIREBREATH,Fire Breath
+655,6,6,1,1,0,3,10,1,no,0,0x2,14,weapon,0,0x0,	NPC_ICEBREATH,Ice Breath
+656,6,6,1,4,0,3,10,1,no,0,0x2,14,weapon,0,0x0,	NPC_THUNDERBREATH,Thunder Breath
+657,6,6,1,5,0,3,10,1,no,0,0x2,14,weapon,0,0x0,	NPC_ACIDBREATH,Acid Breath
+658,6,6,1,7,0,3,10,1,no,0,0x2,14,weapon,0,0x0,	NPC_DARKNESSBREATH,Darkness Breath
 659,0,6,4,0,0x3,2:5:8:11:14,5,1,no,0,0x2,0,none,0,0x0,	NPC_DRAGONFEAR,Dragon Fear
 660,-9,6,1,-1,0,0,5,1,no,0,0x2,0,weapon,0,0x0,	NPC_BLEEDING,Bleeding
-661,0,6,4,0,0x2,7,5,1,no,0,0x2,0,weapon,7,0x0,	NPC_PULSESTRIKE,Pulse Strike
-662,0,6,4,0,0x2,14,10,1,no,0,0x2,0,weapon,0,0x0,	NPC_HELLJUDGEMENT,Hell's Judgement
+661,0,6,4,0,0x2,7,5,1,no,0,0x40002,0,weapon,7,0x0,	NPC_PULSESTRIKE,Pulse Strike
+662,0,6,4,0,0x2,14,10,1,no,0,0x40002,0,weapon,0,0x0,	NPC_HELLJUDGEMENT,Hell's Judgement
 663,0,6,4,0,0x3,2:5:8:11:14,5,1,no,0,0x2,0,none,0,0x0,	NPC_WIDESILENCE,Wide Silence
 664,0,6,4,0,0x3,2:5:8:11:14,5,1,no,0,0x2,0,none,0,0x0,	NPC_WIDEFREEZE,Wide Freeze
 665,0,6,4,0,0x3,2:5:8:11:14,5,1,no,0,0x2,0,none,0,0x0,	NPC_WIDEBLEEDING,Wide Bleeding
@@ -793,7 +795,7 @@
 667,0,6,4,0,0x3,2:5:8:11:14,5,1,no,0,0x2,0,none,0,0x0,	NPC_WIDECONFUSE,Wide Confusion
 668,0,6,4,0,0x3,2:5:8:11:14,5,1,no,0,0x2,0,none,0,0x0,	NPC_WIDESLEEP,Wide Sleep
 669,0,6,4,3,0x3,5,1,1,no,0,0x2,0,magic,0,0x0,	NPC_WIDESIGHT,Wide Sight
-670,9,6,2,7,0x91,0,10,1,no,0,0x2,0,magic,0,0x0,	NPC_EVILLAND,Evil Land
+670,7,6,2,7,0xD1,0,10,1,no,0,0x2,0,magic,0,0x0,	NPC_EVILLAND,Evil Land
 671,0,6,4,0,0x1,0,5,1,no,0,0x2,0,magic,0,0x0,	NPC_MAGICMIRROR,Magic Mirror
 672,0,6,4,0,0x3,2:5:8:11:14,5,1,no,0,0x2,0,none,0,0x0,	NPC_SLOWCAST,Slow Cast
 673,-9,6,1,-1,0,0,5,1,no,0,0x2,0,weapon,0,0x0,	NPC_CRITICALWOUND,Critical Wounds
@@ -863,6 +865,28 @@
 //725,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_REVERBERATION,Reverberation 2
 //726,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_REVERBERATION_ATK,Reverberation Attack
 //727,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_LEX_AETERNA,Lex Aeterna 2
+//728,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_ARROWSTORM,NPC Arrow Storm
+//729,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_CHEAL,NPC Coluceo Heal
+//730,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_SR_CURSEDCIRCLE,NPC
+//731,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_DRAGONBREATH,NPC Dragon Breath
+//732,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_FATALMENACE,NPC Fatal Menace
+//733,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_MAGMA_ERUPTION,NPC Magma Eruption
+//734,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_MAGMA_ERUPTION_DOTDAMAGE,NPC Magma Eruption Dot Damage
+//735,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_MANDRAGORA,NPC Howling of Mandragora
+//736,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_PSYCHIC_WAVE,NPC Psychic Wave
+//737,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_RAYOFGENESIS,NPC Ray of Genesis
+//738,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_VENOMIMPRESS,NPC Venom Impress
+//739,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_CLOUD_KILL,NPC Cloud Kill
+//740,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_IGNITIONBREAK,NPC Ignition Break
+//741,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_PHANTOMTHRUST,NPC Phantom Thrust
+//742,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_POISON_BUSTER,NPC Poison Blaster
+//743,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_HALLUCINATIONWALK,NPC Hallucination Walk
+//744,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_ELECTRICWALK,NPC Electric Walk
+//745,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_FIREWALK,NPC Fire Walk
+//746,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_WIDEDISPEL,Wide Dispell
+//747,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_LEASH,Leash
+//748,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_WIDELEASH,Wide Leash
+//749,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_WIDECRITICALWOUND,Wide Critical Wound
 
 //****
 // 2nd Quest Skills
@@ -871,10 +895,10 @@
 1003,0,0,0,0,0,0,1,0,no,0,0x1,0,weapon,0,0x0,	AS_SONICACCEL,Sonic Acceleration
 1004,9,8,1,0,0x8,0,1,1,no,0,0x1,0,weapon,0,0x0,	AS_VENOMKNIFE,Throw Venom Knife
 1005,1,6,1,0,0x1,0,1,1,no,0,0x1,0,weapon,0,0x0,	RG_CLOSECONFINE,Close Confine
-1006,0,6,4,3,0,1,1,1,yes,0,0x40001,0,magic,3,0x20,	WZ_SIGHTBLASTER,Sight Blaster
+1006,0,6,4,3,0,1,1,1,yes,0,0x40001,0,magic,3,0x0,	WZ_SIGHTBLASTER,Sight Blaster
 1007,0,6,4,0,0x1,0,1,0,no,0,0x1,0,none,0,0x0,	SA_CREATECON,Create Elemental Converter
 1008,9,6,1,1,0x1,0,1,1,yes,0,0x1,0,magic,0,0x0,	SA_ELEMENTWATER,Elemental Change Water
-1009,-9,6,1,0,0,0,1,1,no,0,0x1,0,weapon,3,0x0,	HT_PHANTASMIC,Phantasmic Arrow
+1009,-9,6,1,-1,0,0,1,1,no,0,0x1,0,weapon,3,0x0,	HT_PHANTASMIC,Phantasmic Arrow
 1010,9,6,1,0,0x1,0,1,0,no,0,0x1,0,misc,0,0x0,	BA_PANGVOICE,Pang Voice
 1011,9,6,1,0,0x1,0,1,0,no,0,0x1,0,misc,0,0x0,	DC_WINKCHARM,Wink of Charm
 1012,0,0,0,0,0,0,1,0,no,0,0x1,0,weapon,0,0x4000,	BS_UNFAIRLYTRICK,Unfair Trick
@@ -907,41 +931,41 @@
 2017,0,6,4,-1,0x2,3,1,1,no,0,0x40000,0,weapon,7,0x0,	RK_STORMBLAST,Storm Blast
 2018,0,6,4,0,0x3,-1,1,1,yes,0,0,0,none,0,0x0,	RK_FIGHTINGSPIRIT,Fighting Spirit //CHECK Is this splash needed?
 2019,9,6,4,6,0x1,0,1,1,yes,0,0,0,none,0,0x0,	RK_ABUNDANCE,Abundance
-2020,5:6:7:8:9,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x0,	RK_PHANTOMTHRUST,Phantom Thrust
+2020,5:6:7:8:9,6,1,-1,0,0,5,1,no,0,0x400,0,weapon,0,0x0,	RK_PHANTOMTHRUST,Phantom Thrust
 
 //****
 // WL Warlock
-2201,11,6,16,0,0,0,5,1,yes,0,0,0,magic,0,0x420,	WL_WHITEIMPRISON,White Imprison
-2202,11,8,1,8,0x2,1:1:1:2:2,5,-2,yes,0,0,0,magic,0,0x420,	WL_SOULEXPANSION,Soul Expansion
+2201,11,6,16,0,0,0,5,1,yes,0,0,0,magic,0,0x400,	WL_WHITEIMPRISON,White Imprison
+2202,11,8,1,8,0x2,1:1:1:2:2,5,-2,yes,0,0,0,magic,0,0x400,	WL_SOULEXPANSION,Soul Expansion
 2203,0,8,4,1,0x2,9,5,-3:-4:-5:-6:-7,yes,0,0,0,magic,0,0x400,	WL_FROSTMISTY,Frosty Misty
 2204,0,8,4,1,0x2,5:6:7:8:9,5,-5,yes,0,0,0,magic,0,0x0,	WL_JACKFROST,Jack Frost
 2205,11,6,1,0,0x1,0,5,1,yes,0,0,0,magic,0,0x400,	WL_MARSHOFABYSS,Marsh of Abyss
-2206,0,6,4,0,0x1,0,5,1,yes,0,0,0,magic,0,0x20,	WL_RECOGNIZEDSPELL,Recognized Spell
-2207,7,6,1,2,0x3,1:2:2:3:3,5,1,yes,0,0,0,magic,0,0x420,	WL_SIENNAEXECRATE,Sienna Execrate
+2206,0,6,4,0,0x1,0,5,1,yes,0,0,0,magic,0,0x0,	WL_RECOGNIZEDSPELL,Recognized Spell
+2207,7,6,1,2,0x3,1:2:2:3:3,5,1,yes,0,0,0,magic,0,0x400,	WL_SIENNAEXECRATE,Sienna Execrate
 2208,0,0,0,0,0,0,3,0,no,0,0,0,none,0,0x0,		WL_RADIUS,Radius
 2209,0,6,4,0,0x3,9:10:11:12:13,5,1,yes,0,0,0,magic,0,0x0,	WL_STASIS,Stasis
-2210,11,6,1,0,0,0,5,1,yes,0,0,0,magic,0,0x420,	WL_DRAINLIFE,Drain Life
+2210,11,6,1,0,0,0,5,1,yes,0,0,0,magic,0,0x400,	WL_DRAINLIFE,Drain Life
 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?
 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,0x10020,	WL_EARTHSTRAIN,Earth Strain
+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
 2218,11,6,1,3,0,0,5,1,no,0,0,0,magic,0,0x0,		WL_TETRAVORTEX_FIRE,Tetra Vortex Fire
 2219,11,6,1,1,0,0,5,1,no,0,0,0,magic,0,0x0,		WL_TETRAVORTEX_WATER,Tetra Vortex Water
 2220,11,6,1,4,0,0,5,1,no,0,0,0,magic,0,0x0,		WL_TETRAVORTEX_WIND,Tetra Vortex Wind
 2221,11,6,1,2,0,0,5,1,no,0,0,0,magic,0,0x0,		WL_TETRAVORTEX_GROUND,Tetra Vortex Earth
-2222,0,6,4,3,0x1,0,5,1,yes,0,0,0,magic,0,0x20,	WL_SUMMONFB,Summon Fire Ball
-2223,0,6,4,4,0x1,0,5,1,yes,0,0,0,magic,0,0x20,	WL_SUMMONBL,Summon Lightning Ball
-2224,0,6,4,1,0x1,0,5,1,yes,0,0,0,magic,0,0x20,	WL_SUMMONWB,Summon Water Ball
+2222,0,6,4,3,0x1,0,5,1,yes,0,0,0,magic,0,0x0,	WL_SUMMONFB,Summon Fire Ball
+2223,0,6,4,4,0x1,0,5,1,yes,0,0,0,magic,0,0x0,	WL_SUMMONBL,Summon Lightning Ball
+2224,0,6,4,1,0x1,0,5,1,yes,0,0,0,magic,0,0x0,	WL_SUMMONWB,Summon Water Ball
 2225,11,6,1,3,0,0,5,1,no,0,0,1,magic,0,0x0,		WL_SUMMON_ATK_FIRE,Summon Attack Fire //CHECK Summon attack ID's dont appear to have a range.
 2226,11,6,1,4,0,0,5,1,no,0,0,1,magic,0,0x0,		WL_SUMMON_ATK_WIND,Summon Attack Wind
 2227,11,6,1,1,0,0,5,1,no,0,0,1,magic,0,0x0,		WL_SUMMON_ATK_WATER,Summon Attack Water
 2228,11,6,1,2,0,0,5,1,no,0,0,1,magic,0,0x0,		WL_SUMMON_ATK_GROUND,Summon Attack Earth
-2229,0,6,4,2,0x1,0,5,1,yes,0,0,0,magic,0,0x20,	WL_SUMMONSTONE,Summon Stone
-2230,11,8,1,0,0,0,2,1,yes,0,0,0,magic,0,0x420,	WL_RELEASE,Release //CHECK Should it be left to do multi hit or single hit?
-2231,0,6,4,0,0x1,0,1,1,yes,0,0,0,magic,0,0x20,	WL_READING_SB,Reading Spellbook
+2229,0,6,4,2,0x1,0,5,1,yes,0,0,0,magic,0,0x0,	WL_SUMMONSTONE,Summon Stone
+2230,11,8,1,0,0,0,2,1,yes,0,0,0,magic,0,0x400,	WL_RELEASE,Release //CHECK Should it be left to do multi hit or single hit?
+2231,0,6,4,0,0x1,0,1,1,yes,0,0,0,magic,0,0x0,	WL_READING_SB,Reading Spellbook
 2232,0,0,0,0,0,0,5,0,no,0,0,0,none,0,0x0,		WL_FREEZE_SP,Freeze Spell
 
 
@@ -959,7 +983,7 @@
 2030,-2,6,4,-1,0,0,5,1,no,0,0x200,0,weapon,0,0x0,	GC_WEAPONCRUSH,Weapon Crush
 2031,1,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x0,	GC_VENOMPRESSURE,Venom Pressure
 2032,5,6,2,0,0x1,0,5,1,yes,0,0,1,none,0,0x0,	GC_POISONSMOKE,Poison Smoke
-2033,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0,0x40,	GC_CLOAKINGEXCEED,Cloaking Exceed
+2033,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0,0x80040,	GC_CLOAKINGEXCEED,Cloaking Exceed
 2034,0,6,4,-1,0x2,3,1,1,no,0,0,0,weapon,0,0x0,	GC_PHANTOMMENACE,Phantom Menace
 2035,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0,		GC_HALLUCINATIONWALK,Hallucination Walk
 2036,0,6,4,-1,0x2,1:1:1:1:2,5,1,no,0,0,0,weapon,0,0x0,	GC_ROLLINGCUTTER,Rolling Cutter
@@ -981,7 +1005,7 @@
 2049,0,0,0,0,0,0,10,0,no,0,0,0,none,0,0x0,		AB_EUCHARISTICA,Eucharistica
 2050,11,6,16,6,0x1,0,1,1,yes,0,0,0,magic,0,0x0,	AB_RENOVATIO,Renovatio
 2051,11,6,16,6,0x21,0,5,1,yes,0,0,0,magic,0,0x0,	AB_HIGHNESSHEAL,Highness Heal //CHECK Info shows this has magic attack.
-2052,11,6,16,0,0x1,0,5,1,yes,0,0,0,magic,0,0x0,	AB_CLEARANCE,Clearance //CHECK Also shows this as a magic attack. Why?
+2052,11,6,1,0,0x1,0,5,1,yes,0,0x400,0,magic,0,0x10020,	AB_CLEARANCE,Clearance
 2053,11,6,16,0,0x1,0,5,1,yes,0,0,0,magic,0,0x0,	AB_EXPIATIO,Expiatio //CHECK Does this also give the buff to party members?
 2054,0,6,4,6,0x1,0,10,1,yes,0,0,0,none,0,0x0,	AB_DUPLELIGHT,Duple Light //CHECK Had issues adding a skill level check to make the % go higher with the skills level. Will do later.
 2055,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0,0x0,	AB_DUPLELIGHT_MELEE,Duple Light Melee
@@ -1001,27 +1025,27 @@
 2239,3,6,2,0,0x42,3,5,1,no,0,0x80,3,misc,0,0x2800,	RA_CLUSTERBOMB,Cluster Bomb
 2240,0,6,4,0,0,0,1,1,no,0,0,0,none,0,0x0,		RA_WUGMASTERY,Warg Mastery
 2241,0,6,4,0,0,0,3,1,no,0,0,0,none,0,0x2000,		RA_WUGRIDER,Warg Rider
-2242,0,6,4,-1,0x42,1,1,0,no,0,0,0,weapon,0,0x2000,	RA_WUGDASH,Warg Dash
-2243,9,6,1,0,0x40,0,5,1,no,0,0,0,weapon,0,0x2000,	RA_WUGSTRIKE,Warg Strike
-2244,9,6,1,0,0x40,0,5,1,no,0,0,0,weapon,0,0x80,	RA_WUGBITE,Warg Bite
+2242,0,6,4,-1,0x42,1,1,1,no,0,0,0,weapon,0,0x42000,	RA_WUGDASH,Warg Dash
+2243,9,6,1,0,0x98,0,5,1,no,0,0,0,weapon,0,0x42000,	RA_WUGSTRIKE,Warg Strike
+2244,9,6,1,0,0x98,0,5,1,no,0,0,0,weapon,0,0x40080,	RA_WUGBITE,Warg Bite
 2245,0,0,0,0,0,0,10,0,no,0,0,0,none,0,0x0,		RA_TOOTHOFWUG,Tooth of Warg
 2246,0,6,4,0,0x2,3:4:5:6:7,5,1,no,0,0x40000,0,weapon,0,0x0,	RA_SENSITIVEKEEN,Sensitive Keen
-2247,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x42,		RA_CAMOUFLAGE,Camouflage
+2247,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x80040,		RA_CAMOUFLAGE,Camouflage
 2248,0,0,0,0,0,0,5,0,no,0,0,0,none,0,0x0,		RA_RESEARCHTRAP,Research Trap
 2249,3,6,2,3,0x43,2,1,1,no,0,0x80,1,misc,0,0x2000,	RA_MAGENTATRAP,Magenta Trap
 2250,3,6,2,1,0x43,2,1,1,no,0,0x80,1,misc,0,0x2000,	RA_COBALTTRAP,Cobalt Trap
 2251,3,6,2,2,0x43,2,1,1,no,0,0x80,1,misc,0,0x2000,	RA_MAIZETRAP,Maize Trap
 2252,3,6,2,4,0x43,2,1,1,no,0,0x80,1,misc,0,0x2000,	RA_VERDURETRAP,Verdure Trap
-2253,3,6,2,3,0x42,2,5,1,no,0,0x80,2,misc,0,0x2800,	RA_FIRINGTRAP,Firing Trap
-2254,3,6,2,1,0x42,2,5,1,no,0,0x80,2,misc,0,0x2800,	RA_ICEBOUNDTRAP,Icebound Trap
+2253,3,6,2,3,0x42,2,5,1,no,0,0x40080,2,misc,0,0x2800,	RA_FIRINGTRAP,Firing Trap
+2254,3,6,2,1,0x42,2,5,1,no,0,0x40080,2,misc,0,0x2800,	RA_ICEBOUNDTRAP,Icebound Trap
 
 //****
 // NC Mechanic
 2255,0,0,0,0,0,0,5,0,no,0,0,0,none,0,0x0,		NC_MADOLICENCE,Mado License
 2256,11,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x0,	NC_BOOSTKNUCKLE,Boost Knuckle
 2257,3,6,1,-1,0,0,3,1,no,0,0,0,weapon,0,0x0,	NC_PILEBUNKER,Pile Bunker
-2258,13,6,1,-1,0x2,1,3,1,no,0,0,0,weapon,0,0x0,	NC_VULCANARM,Vulcan Arm
-2259,7,6,1,3,0,2,3,1,no,0,0,5,weapon,0,0x0,		NC_FLAMELAUNCHER,Flame Launcher
+2258,13,6,1,-1,0x2,1,3,1,no,0,0x40000,0,weapon,0,0x0,	NC_VULCANARM,Vulcan Arm
+2259,5,6,1,3,0,1,3,1,no,0,0,5,weapon,0,0x0,		NC_FLAMELAUNCHER,Flame Launcher
 2260,7,6,2,1,0x2,2:3:4,3,1,no,0,0x40000,0,weapon,0,0x0,	NC_COLDSLOWER,Cold Slower
 2261,9:11:13,6,1,-1,0x42,3:2:1,3,1,no,0,0,0,weapon,0,0x0,	NC_ARMSCANNON,Arm Cannon
 2262,0,6,4,0,0x1,0,3,1,no,0,0,0,none,0,0x0,		NC_ACCELERATION,Acceleration
@@ -1042,7 +1066,7 @@
 2277,0,0,0,0,0,0,5,0,no,0,0,0,none,0,0x0,		NC_RESEARCHFE,Research Fire/Earth
 2278,5:6:7:8:9,6,1,-1,0,0,5,1,no,0,0,0,weapon,2:3:4:5:6,0x0,	NC_AXEBOOMERANG,Axe Boomerang
 2279,1,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x0,	NC_POWERSWING,Power Swing
-2280,0,8,4,-1,0x2,2:2:3:3:3,5,-6,no,0,0,0,weapon,0,0x0,	NC_AXETORNADO,Axe Tornado
+2280,0,8,4,-1,0x2,2:2:3:3:3,5,-6,no,0,0x40000,0,weapon,0,0x0,	NC_AXETORNADO,Axe Tornado
 2281,2,6,2,0,0x1,0,5,1,yes,0,0,2,none,0,0x0,	NC_SILVERSNIPER,FAW - Silver Sniper
 2282,2,6,2,0,0x1,0,5,1,yes,0,0,2,none,0,0x0,	NC_MAGICDECOY,FAW - Magic Decoy
 2283,5,6,1,0,0x1,0,1,1,no,0,0,0,none,0,0x0,		NC_DISJOINT,FAW Removal
@@ -1057,23 +1081,23 @@
 2289,0,6,4,0,0x3,2,5,1,no,0,0,0,none,0,0x0,		SC_BODYPAINT,Body Painting
 2290,0,6,4,0,0x1,0,5,1,yes,0,0,0,none,0,0x0,	SC_INVISIBILITY,Invisibility
 2291,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0,		SC_DEADLYINFECT,Deadly Infect
-2292,3,6,1,0,0x1,0,3,1,yes,0,0,0,none,0,0x20,	SC_ENERVATION,Masquerade - Enervation
-2293,3,6,1,0,0x1,0,3,1,yes,0,0,0,none,0,0x20,	SC_GROOMY,Masquerade - Gloomy
-2294,3,6,1,0,0x1,0,3,1,yes,0,0,0,none,0,0x20,	SC_IGNORANCE,Masquerade - Ignorance
-2295,3,6,1,0,0x1,0,3,1,yes,0,0,0,none,0,0x20,	SC_LAZINESS,Masquerade - Laziness
-2296,3,6,1,0,0x1,0,3,1,yes,0,0,0,none,0,0x20,	SC_UNLUCKY,Masquerade - Unlucky
-2297,3,6,1,0,0x1,0,3,1,yes,0,0,0,none,0,0x20,	SC_WEAKNESS,Masquerade - Weakness
-2298,3,6,1,0,0x1,0,5,1,yes,0,0,0,none,0,0x8020,	SC_STRIPACCESSARY,Strip Accessory
+2292,3,6,1,0,0x1,0,3,1,yes,0,0,0,none,0,0x0,	SC_ENERVATION,Masquerade - Enervation
+2293,3,6,1,0,0x1,0,3,1,yes,0,0,0,none,0,0x0,	SC_GROOMY,Masquerade - Gloomy
+2294,3,6,1,0,0x1,0,3,1,yes,0,0,0,none,0,0x0,	SC_IGNORANCE,Masquerade - Ignorance
+2295,3,6,1,0,0x1,0,3,1,yes,0,0,0,none,0,0x0,	SC_LAZINESS,Masquerade - Laziness
+2296,3,6,1,0,0x1,0,3,1,yes,0,0,0,none,0,0x0,	SC_UNLUCKY,Masquerade - Unlucky
+2297,3,6,1,0,0x1,0,3,1,yes,0,0,0,none,0,0x0,	SC_WEAKNESS,Masquerade - Weakness
+2298,3,6,1,0,0x1,0,5,1,yes,0,0,0,none,0,0x8000,	SC_STRIPACCESSARY,Strip Accessory
 2299,7,6,2,0,0x1,0,3,1,yes,0,0,3,magic,0,0x0,	SC_MANHOLE,Man Hole
 2300,7,6,2,0,0x1,0,3,1,yes,0,0,1,magic,0,0x0,	SC_DIMENSIONDOOR,Dimension Door
 2301,7,6,2,0,0x1,0,3,1,yes,0,0x20000,0,magic,0,0x0,	SC_CHAOSPANIC,Chaos Panic
 2302,7,6,2,0,0x1,0,3,1,yes,0,0x20000,1,magic,0,0x0,	SC_MAELSTROM,Maelstrom
 2303,7,6,2,0,0x1,0,3,1,yes,0,0,0,none,0,0x0,	SC_BLOODYLUST,Bloody Lust
-2304,0,6,4,-1,0,0,3,1,no,0,0,0,weapon,0,0x0,	SC_FEINTBOMB,Feint Bomb
+2304,0,6,4,-1,0,0,3,1,no,0,0x40000,0,weapon,3:6:9,0x0,	SC_FEINTBOMB,Feint Bomb
 
 //****
 // LG Royal Guard
-2307,11,8,1,-1,0,2,5,1,no,0,0,10,weapon,0,0x0,	LG_CANNONSPEAR,Cannon Spear
+2307,11,8,1,-1,0,1,5,1,no,0,0,11,weapon,0,0x0,	LG_CANNONSPEAR,Cannon Spear
 2308,7,6,1,-1,0,0,10,1,no,0,0,0,weapon,0,0x0,	LG_BANISHINGPOINT,Banishing Point
 2309,0,6,4,0,0x3,2,3,1,no,0,0,0,none,0,0x0,		LG_TRAMPLE,Trample
 2310,1,6,1,0,0,0,5,1,no,0,0,0,weapon,0,0x0,		LG_SHIELDPRESS,Shield Press
@@ -1097,11 +1121,11 @@
 
 //****
 // SR Sura
-2326,-2,8,1,-1,0,0,10,-2,no,0,0,0,weapon,0,0x0,	SR_DRAGONCOMBO,Dragon Combo
-2327,0,8,4,-1,0x2,2,5,-3,no,0,0,0,weapon,3,0x0,	SR_SKYNETBLOW,Sky Net Blow
-2328,0,6,4,-1,0x2,1:2:3:4:5,5,1,no,0,0,0,weapon,0,0x0,	SR_EARTHSHAKER,Earth Shaker
-2329,-2,8,4,-1,0,0,5,-2,no,0,0x200,0,weapon,0,0x0,	SR_FALLENEMPIRE,Fallen Empire
-2330,-2,6,1,-1,0x42,1:1:1:1:1:2:2:2:2:2,10,1,yes,0,0,0,weapon,0,0x0,	SR_TIGERCANNON,Tiger Cannon
+2326,1,8,1,-1,0,0,10,-2,no,0,0,0,weapon,0,0x0,	SR_DRAGONCOMBO,Dragon Combo
+2327,0,8,4,-1,0x2,2,5,-3,no,0,0x40000,0,weapon,3,0x0,	SR_SKYNETBLOW,Sky Net Blow
+2328,0,6,4,-1,0x2,1:2:3:4:5,5,1,no,0,0x40000,0,weapon,0,0x0,	SR_EARTHSHAKER,Earth Shaker
+2329,1,8,4,-1,0,0,5,-2,no,0,0x200,0,weapon,0,0x0,	SR_FALLENEMPIRE,Fallen Empire
+2330,1,6,1,-1,0x42,1:1:1:1:1:2:2:2:2:2,10,1,yes,0,0x40000,0,weapon,0,0x0,	SR_TIGERCANNON,Tiger Cannon
 2331,0,0,0,0,0,0,10,0,no,0,0,0,none,0,0x0,		SR_HELLGATE,Hell Gate
 2332,0,6,4,-1,0x2,3,5,1,no,0,0x40000,0,weapon,0,0x0,	SR_RAMPAGEBLASTER,Rampage Blaster
 2333,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0,		SR_CRESCENTELBOW,Crescent Elbow
@@ -1165,19 +1189,19 @@
 
 //****
 // SO Sorcerer (statis blocking need to be confirmed)
-2443,0,6,4,3,0,0,5,1,yes,0,0,8:10:12:14:16,magic,0,0x1020,	SO_FIREWALK,Fire Walk //CHECK Video and data shows each cell only hits once.
-2444,0,6,4,4,0,0,5,1,yes,0,0,8:10:12:14:16,magic,0,0x1020,	SO_ELECTRICWALK,Electric Walk
-2445,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x20,		SO_SPELLFIST,Spell Fist
-2446,9,6,2,2,0,0,5,-3,yes,0,0,0,magic,0,0x10020,	SO_EARTHGRAVE,Earth Grave
-2447,9,6,2,1,0,0,5,-5,yes,0,0,0,magic,0,0x20,	SO_DIAMONDDUST,Diamond Dust
-2448,9,6,1,5,0x2,1:1:1:1:2,5,1,yes,0,0,0,magic,0,0x20,	SO_POISON_BUSTER,Poison Buster
-2449,9,6,2,0,0,0,5,1,yes,0,0,0,magic,0,0x20,		SO_PSYCHIC_WAVE,Psychic Wave
-2450,9,6,2,5,0,0,5,1,yes,0,0,0,magic,0,0x20,		SO_CLOUD_KILL,Cloud Kill
-2451,9,6,16,0,0x1,0,5,1,yes,0,0,0,none,0,0x20,	SO_STRIKING,Striking //CHECK Data shows a % for increased successful refine rate. Is this true?
-2452,9,6,2,3,0x1,0,5,1,yes,0,0,0,magic,0,0x20,	SO_WARMER,Warmer
-2453,9,6,2,0,0x1,0,5,1,yes,0,0,0,magic,0,0x1020,	SO_VACUUM_EXTREME,Vacuum Extreme
-2454,9,6,1,4,0x2,1:1:2:2:3,5,1,yes,0,0,0,magic,0,0x20,	SO_VARETYR_SPEAR,Varetyr Spear
-2455,7:7:7:7:9,6,2,0,0x3,1:1:2:2:3,5,1,yes,0,0,0,magic,0,0x20,	SO_ARRULLO,Arrullo
+2443,0,6,4,3,0,0,5,1,yes,0,0,8:10:12:14:16,magic,0,0x1000,	SO_FIREWALK,Fire Walk //CHECK Video and data shows each cell only hits once.
+2444,0,6,4,4,0,0,5,1,yes,0,0,8:10:12:14:16,magic,0,0x1000,	SO_ELECTRICWALK,Electric Walk
+2445,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0,		SO_SPELLFIST,Spell Fist
+2446,9,6,2,2,0,0,5,-3,yes,0,0,0,magic,0,0x10000,	SO_EARTHGRAVE,Earth Grave
+2447,9,6,2,1,0,0,5,-5,yes,0,0,0,magic,0,0x0,	SO_DIAMONDDUST,Diamond Dust
+2448,9,6,1,5,0x2,1:1:1:1:2,5,1,yes,0,0,0,magic,0,0x0,	SO_POISON_BUSTER,Poison Buster
+2449,9,6,2,0,0,0,5,1,yes,0,0,0,magic,0,0x0,		SO_PSYCHIC_WAVE,Psychic Wave
+2450,9,6,2,5,0,0,5,1,yes,0,0,0,magic,0,0x0,		SO_CLOUD_KILL,Cloud Kill
+2451,9,6,16,0,0x1,0,5,1,yes,0,0,0,none,0,0x0,	SO_STRIKING,Striking
+2452,9,6,2,3,0x1,0,5,1,yes,0,0,0,magic,0,0x0,	SO_WARMER,Warmer
+2453,9,6,2,0,0x1,0,5,1,yes,0,0,0,magic,0,0x1000,	SO_VACUUM_EXTREME,Vacuum Extreme
+2454,9,6,1,4,0x2,1:1:2:2:3,5,1,yes,0,0,0,magic,0,0x0,	SO_VARETYR_SPEAR,Varetyr Spear
+2455,7:7:7:7:9,6,2,0,0x3,1:1:2:2:3,5,1,yes,0,0,0,magic,0,0x0,	SO_ARRULLO,Arrullo
 2456,0,6,4,0,0x1,0,4,1,yes,0,0,0,none,0,0x0,	SO_EL_CONTROL,Spirit Control
 2457,0,6,4,3,0x1,0,3,1,yes,0,0,0,none,0,0x0,	SO_SUMMON_AGNI,Summon Fire Spirit Agni
 2458,0,6,4,1,0x1,0,3,1,yes,0,0,0,none,0,0x0,	SO_SUMMON_AQUA,Summon Water Spirit Aqua
@@ -1197,7 +1221,7 @@
 2474,0,0,0,0,0,0,5,0,no,0,0,0,none,0,0x0,		GN_TRAINING_SWORD,Sword Training
 2475,0,0,0,0,0,0,5,0,no,0,0,0,none,0,0x0,		GN_REMODELING_CART,Cart Remodeling
 2476,0,6,4,-1,0x2,2,5,1,no,0,0,0,weapon,2,0x0,	GN_CART_TORNADO,Cart Tornado
-2477,7:8:9:10:11,6,1,-1,0x2,1:1:2:2:3,5,1,yes,0,0,0,weapon,0,0x0,	GN_CARTCANNON,Cart Cannon
+2477,7:8:9:10:11,6,1,-1,0x42,1:1:2:2:3,5,1,yes,0,0,0,weapon,0,0x0,	GN_CARTCANNON,Cart Cannon
 2478,0,6,4,0,0x1,0,5,1,yes,0,0,0,none,0,0x0,	GN_CARTBOOST,Cart Boost
 2479,9,6,2,0,0,0,5,1,yes,0,0x80,3,misc,0,0x0,	GN_THORNS_TRAP,Thorn Trap
 2480,11,6,1,0,0x1,0,5,1,yes,0,0,3,misc,0,0x0,		GN_BLOOD_SUCKER,Blood Sucker //CHECK Data says its a magic attack. Hmmmm....
@@ -1233,14 +1257,14 @@
 //2541,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_UGLYDANCE,Ugly Dance 2
 //2542,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		ALL_TETANY,Tetany
 //2543,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		ALL_RAY_OF_PROTECTION,Ray of Protection
-//2544,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		MC_CARTDECORATE,Decorate Cart
+2544,0,6,4,0,0x1,0,1,1,no,0,0x1,0,none,0,0x0,		MC_CARTDECORATE,Decorate Cart
 
 //****
 // 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,0x0,	RL_BANISHING_BUSTER,Banishing Buster
+2554,9,6,1,-1,0x2,2,5,1,no,0,0,0,weapon,0,0x10020,	RL_BANISHING_BUSTER,Banishing Buster
 2555,3,6,2,0,0x1,1,5,1,no,0,0,3,misc,0,0x0,	RL_B_TRAP,Bind Trap
 2556,0,6,4,0,0x3,-1,1,1,no,0,0,0,none,0,0x0,	RL_FLICKER,Flicker
 2557,9,6,1,-1,0x2,2,5,1,no,0,0,0,weapon,0,0x0,	RL_S_STORM,Shatter Storm
@@ -1272,7 +1296,7 @@
 3006,7:8:9:10:11,6,2,-1,0x42,2,5,1,no,0,0,0,weapon,0,0x0,	KO_BAKURETSU,Kunai Explosion
 3007,0,6,4,-1,0x42,4:4:4:4:5,5,1,no,0,0,0,weapon,0,0x0,	KO_HAPPOKUNAI,Kunai Splash
 3008,11,8,2,0,0x56,1:1:1:1:1:1:1:1:1:2,10,-10,no,0,0,0,misc,0,0x0,	KO_MUCHANAGE,Rapid Throw
-3009,9:10:11:12:13,8,2,-1,0x2,3,5,2,no,0,0,0,weapon,0,0x0,	KO_HUUMARANKA,Swirling Petal
+3009,9:10:11:12:13,8,2,-1,0x2,3,5,-5,no,0,0,0,weapon,0,0x0,	KO_HUUMARANKA,Swirling Petal
 3010,3,6,4,0,0x52,0,5,1,no,0,0x80,0,weapon,0,0x10,	KO_MAKIBISHI,Makibishi
 3011,0,6,4,0,0x1,0,5,0,yes,0,0,0,none,0,0x0,	KO_MEIKYOUSISUI,Pure Soul
 3012,0,6,4,0,0x1,0,5,0,no,0,0,1,none,3:4:5:6:7,0x0,	KO_ZANZOU,Illusion - Shadow
@@ -1317,15 +1341,37 @@
 5007,0,6,4,0,0x3,5:6:7:8:9,5,1,no,0,0,0,none,0,0x0, WM_FRIGG_SONG,Frigg's Song
 5008,0,6,4,0,0x3,11,5,1,no,0,0,0,none,0,0x0, SO_ELEMENTAL_SHIELD,Elemental Shield
 5009,1,6,1,0,0x1,0,5,1,no,0,0,0,none,0,0x0, SR_FLASHCOMBO,Flash Combo
-5010,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0, SC_ESCAPE,Emergency Escape
+5010,0,6,4,0,0x1,0,5,1,no,0,0,0,none,4:5:6:7:8:9,0x0, SC_ESCAPE,Emergency Escape
 5011,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0, AB_OFFERTORIUM,Offertorium
 5012,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0, WL_TELEKINESIS_INTENSE,Intense Telekinesis
 5013,0,6,4,0,0x3,0,5,1,no,0,0,0,none,0,0x0, LG_KINGS_GRACE,King's Grace
 5014,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0, ALL_FULL_THROTTLE,Full Throttle
-5015,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0, SR_FLASHCOMBO_ATK_STEP1,Flash Combo Attack Step 1
-5016,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0, SR_FLASHCOMBO_ATK_STEP2,Flash Combo Attack Step 2
-5017,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0, SR_FLASHCOMBO_ATK_STEP3,Flash Combo Attack Step 3
-5018,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0, SR_FLASHCOMBO_ATK_STEP4,Flash Combo Attack Step 4
+
+// Summoner - Placeholder
+5018,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0,	SU_BASIC_SKILL,New Basic Skill
+5019,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0,	SU_BITE,Bite
+5020,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0,	SU_HIDE,Hide
+5021,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0,	SU_SCRATCH,Scratch
+5022,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0,	SU_STOOP,Stoop
+5023,0,0,0,0,0,0,1,0,no,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,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0,	SU_SV_STEMSPEAR,Silvervine Stem Spear
+5027,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0,	SU_CN_POWDERING,Catnip Powdering
+5028,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0,	SU_CN_METEOR,Catnip Meteor
+5029,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0,	SU_SV_ROOTTWIST,Silvervine Root Twist
+5030,0,0,0,0,0,0,1,0,no,0,0,0,none,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,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0,	SU_SCAROFTAROU,Scar of Tarou
+5033,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0,	SU_PICKYPECK,Picky Peck
+5034,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0,	SU_PICKYPECK_DOUBLE_ATK,Picky Peck Double Attack
+5035,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0,	SU_ARCLOUSEDASH,Arclouse Dash
+5036,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0,	SU_LUNATICCARROTBEAT,Lunatic Carrot Beat
+5037,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0,	SU_POWEROFSEA,Power of Sea
+5038,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0,	SU_TUNABELLY,Tuna Belly
+5039,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0,	SU_TUNAPARTY,Tuna Party
+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
 
 //****
 // Homunculus S
@@ -1376,22 +1422,22 @@
 // Mercenary Skill Place holders
 8201,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0,0x0,	MS_BASH,Bash
 8202,0,6,4,3,0x2,2,10,1,no,0,0x40000,0,weapon,2,0x0,	MS_MAGNUM,Magnum_Break
-8203,-2,6,1,-1,0x2,1,10,1,no,0,0,0,weapon,1,0x0,	MS_BOWLINGBASH,Bowling_Bash
+8203,-2,6,1,-1,0x2,1,10,1,no,0,0x40000,0,weapon,1,0x0,	MS_BOWLINGBASH,Bowling_Bash
 8204,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0,0x0,	MS_PARRYING,Parry
-8205,0,6,4,0,0,0,10,1,no,0,0,0,weapon,0,0x0,	MS_REFLECTSHIELD,Shield_Reflect
+8205,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0,0x0,	MS_REFLECTSHIELD,Shield_Reflect
 8206,0,6,4,0,0x1,0,1,1,no,0,0,0,weapon,0,0x0,	MS_BERSERK,Frenzy
 8207,-9,8,1,-1,0,0,10,2,no,0,0,0,weapon,0,0x80,	MA_DOUBLE,Double_Strafe
 8208,-9,6,2,-1,0x2,2,10,1,no,0,0x40000,0,weapon,2,0x81,	MA_SHOWER,Arrow_Shower
-8209,3,6,2,0,0x1,0,5,1,no,0,0x80,0,misc,6:7:8:9:10,0x0,	MA_SKIDTRAP,Skid_Trap
-8210,3,6,2,2,0x40,0,5,1,no,0,0x80,0,misc,0,0x0,	MA_LANDMINE,Land_Mine
-8211,3,6,2,0,0x3,2,5,1,no,0,0x80,0,misc,0,0x0,	MA_SANDMAN,Sandman
-8212,3,6,2,1,0x42,1,5,1,no,0,0x80,0,weapon,0,0x0,	MA_FREEZINGTRAP,Freezing_Trap
+8209,3,6,2,0,0x1,0,5,1,no,0,0x80,0,misc,6:7:8:9:10,0x3000,	MA_SKIDTRAP,Skid_Trap
+8210,3,6,2,2,0xC0,0,5,1,no,0,0x80,0,misc,0,0x3800,	MA_LANDMINE,Land_Mine
+8211,3,6,2,0,0x3,2,5,1,no,0,0x80,0,misc,0,0x3000,	MA_SANDMAN,Sandman
+8212,3,6,2,1,0x42,1,5,1,no,0,0x80,0,weapon,0,0x3800,	MA_FREEZINGTRAP,Freezing_Trap
 8213,2,6,32,0,0x1,0,1,1,no,0,0x40000,0,misc,0,0x0,	MA_REMOVETRAP,Remove_Trap
 8214,-9,6,1,-1,0x2,0,1,1,no,0,0x1,0,weapon,6,0x80,	MA_CHARGEARROW,Arrow_Repel
-8215,9,8,1,-1,0,2,5,1,yes,0,0,13,weapon,0,0x0,	MA_SHARPSHOOTING,Focused_Arrow_Strike
+8215,9,8,1,-1,0,1,5,1,yes,0,0x40000,14,weapon,0,0x0,	MA_SHARPSHOOTING,Focused_Arrow_Strike
 8216,-2,8,1,-1,0,0,10,3,no,0,0,0,weapon,0,0x0,	ML_PIERCE,Pierce
-8217,-2,6,1,-1,0x1,0,10,1,no,0,0,0,weapon,3,0x0,	ML_BRANDISH,Brandish_Spear
-8218,5,8,1,-1,0x20,0,5,5,no,0,0,0,weapon,0,0x0,	ML_SPIRALPIERCE,Spiral_Pierce
+8217,-2,6,1,-1,0x1,2,10,1,no,0,0,5,weapon,2,0x20000,	ML_BRANDISH,Brandish_Spear
+8218,5,8,1,-1,0x20,0,5,5,no,0,0x40000,0,weapon,0,0x20000,	ML_SPIRALPIERCE,Spiral_Pierce
 8219,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0,0x0,	ML_DEFENDER,Defending_Aura
 8220,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0,0x0,	ML_AUTOGUARD,Guard
 8221,7:8:9:10:11,6,16,0,0x1,0,5,1,yes,0,0x600,0,none,0,0x0,	ML_DEVOTION,Sacrifice

db/pre-re/skill_require_db.txt

@@ -139,7 +139,7 @@
 110,0,0,10,0,0,0,1:2:6:7:8,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						//BS_HAMMERFALL
 111,0,0,20:23:26:29:32,0,0,0,6:7:8,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				//BS_ADRENALINE
 112,0,0,18:16:14:12:10,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0					//BS_WEAPONPERFECT
-113,0,0,18:16:14:12:10,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0					//BS_OVERTHRUST
+113,0,0,18:16:14:12:10,0,0,0,1:2:3:4:5:6:7:8:9:10:11:12:13:14:15:16:17:18:19:20:21:22:23,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	//BS_OVERTHRUST
 114,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								//BS_MAXIMIZE
 
 //****
@@ -680,13 +680,13 @@
 //****
 // NC Mechanic
 2256,0,0,3:6:9:12:15,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_BOOSTKNUCKLE
-2257,0,0,50,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,1549:16030:16031:16032		//NC_PILEBUNKER
+2257,0,0,50,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_PILEBUNKER
 2258,0,0,2:4:6,0,0,0,99,0,0,mado,0,0,6145,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0						//NC_VULCANARM
 2259,0,0,20,0,0,0,99,0,0,mado,0,0,2139,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0						//NC_FLAMELAUNCHER
 2260,0,0,20,0,0,0,99,0,0,mado,0,0,6146,1,6147,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0						//NC_COLDSLOWER
 2261,0,0,40:45:50,0,0,0,99,8,1,mado,0,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0					//NC_ARMSCANNON
 2262,0,0,20:40:60,0,0,0,99,0,0,mado,0,0,2800,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0					//NC_ACCELERATION
-2263,0,0,25,0,0,0,99,0,0,mado,0,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2801						//NC_HOVERING
+2263,0,0,25,0,0,0,99,0,0,mado,0,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0							//NC_HOVERING
 2264,0,0,5,0,0,0,99,0,0,mado,0,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0							//NC_F_SIDESLIDE
 2265,0,0,5,0,0,0,99,0,0,mado,0,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0							//NC_B_SIDESLIDE
 
@@ -701,11 +701,11 @@
 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,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
+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
 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
-2283,0,0,15,0,0,0,99,0,0,none,0,0,6186,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0							//NC_DISJOINT
+2283,0,0,15,0,0,0,99,0,0,none,0,0,6186,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0							//NC_DISJOINT
 
 //****
 // SC Shadow Chaser
@@ -883,7 +883,7 @@
 
 //2542,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							//ALL_TETANY
 //2543,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							//ALL_RAY_OF_PROTECTION
-//2544,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							//MC_CARTDECORATE
+2544,0,0,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							//MC_CARTDECORATE
 
 //****
 // Rebellion
@@ -921,7 +921,7 @@
 3007,0,0,8:9:10:11:12,0,0,0,99,7,8,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0					//KO_HAPPOKUNAI
 3008,0,0,50,0,0,10000:20000:30000:40000:50000:60000:70000:80000:90000:100000,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//KO_MUCHANAGE
 3009,0,0,24:28:32:36:40,0,0,0,22,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0					//KO_HUUMARANKA
-3010,0,0,9:12:15:18:21,0,0,0,99,0,0,none,0,0,6493,3:4:5:6:7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0		//KO_MAKIBISHI
+3010,0,0,9:12:15:18:21,0,0,0,99,0,0,none,0,0,6493,3,6493,4,6493,5,6493,6,6493,7,0,0,0,0,0,0,0,0,0,0,0		//KO_MAKIBISHI
 3011,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							//KO_MEIKYOUSISUI
 3012,0,0,40:44:48:52:56,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0					//KO_ZANZOU
 3013,0,0,40:44:48:52:56,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0					//KO_KYOUGAKU
@@ -956,10 +956,6 @@
 5012,0,0,100:150:200:250:300,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			//WL_TELEKINESIS_INTENSE
 5013,0,0,200:180:160:140: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			//LG_KINGS_GRACE
 5014,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								//ALL_FULL_THROTTLE
-5015,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0								//SR_FLASHCOMBO_ATK_STEP1 //All 4 steps are using temp req SP values for now.
-5016,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0								//SR_FLASHCOMBO_ATK_STEP2
-5017,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0								//SR_FLASHCOMBO_ATK_STEP3
-5018,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0								//SR_FLASHCOMBO_ATK_STEP4
 
 // Copied Bard / Dancer Skills
 //3036,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							//BA_POEMBRAGI2
@@ -1039,7 +1035,7 @@
 8232,0,0,4:5:6:7:8:9:10:11:12:13,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0		//MER_PROVOKE
 8233,0,0,5,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0								//MER_AUTOBERSERK
 8234,0,0,15:17:19:21:23:25:27:29:31:33,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//MER_DECAGI
-8235,0,0,10,100,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0							//MER_SCAPEGOAT
+8235,0,0,5,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0								//MER_SCAPEGOAT
 8236,0,0,20:20:20:20:20:18:16:14:12:10,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//MER_LEXDIVINA
 8237,0,0,10,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0								//MER_ESTIMATION
 8238,0,0,20:20:20:25:25:25:30:30:30:35,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//MER_KYRIE
@@ -1094,4 +1090,4 @@
 10010,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0								//GD_BATTLEORDER
 10011,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0								//GD_REGENERATION
 10012,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0								//GD_RESTORE
-10013,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0								//GD_EMERGENCYCALL
+10013,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0								//GD_EMERGENCYCALL

db/pre-re/skill_tree.txt

@@ -1,4 +1,4 @@
-//JobNo,Skill-ID,MaxLV{,JobLV},Prerequisite Skill-ID-1,Prerequisite Skill-ID-1-Lv,PrereqSkill-ID-2,PrereqSkill-ID-2-Lv,PrereqSkill-ID-3,PrereqSkill-ID-3-Lv,PrereqSkill-ID-4,PrereqSkill-ID-4-Lv,PrereqSkill-ID-5,PrereqSkill-ID-5-Lv//CLASS_SKILLNAME#Skill Name#
+//JobNo,Skill-ID,MaxLv{,BaseLvReq,JobLvReq},Prerequisite Skill-ID-1,Prerequisite Skill-ID-1-Lv,PrereqSkill-ID-2,PrereqSkill-ID-2-Lv,PrereqSkill-ID-3,PrereqSkill-ID-3-Lv,PrereqSkill-ID-4,PrereqSkill-ID-4-Lv,PrereqSkill-ID-5,PrereqSkill-ID-5-Lv//CLASS_SKILLNAME#Skill Name#
 //Novice
 0,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
 0,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -80,6 +80,8 @@
 5,154,1,0,0,0,0,0,0,0,0,0,0 //MC_CHANGECART#Change Cart#
 5,155,1,0,0,0,0,0,0,0,0,0,0 //MC_LOUD#Crazy Uproar#
 5,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby#
+5,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+5,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Thief
 6,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
 6,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -229,6 +231,8 @@
 10,1013,1,0,0,0,0,0,0,0,0,0,0 //BS_GREED#Greed#
 10,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby#
 10,459,1,111,5,0,0,0,0,0,0,0,0	//BS_ADRENALINE2#Full Adrenaline Rush#
+10,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+10,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Hunter
 11,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
 11,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -492,6 +496,8 @@
 18,496,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT1#Twilight Alchemy 1#
 18,497,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT2#Twilight Alchemy 2#
 18,498,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT3#Twilight Alchemy 3#
+18,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+18,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Bard
 19,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
 19,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -588,8 +594,8 @@
 //WeddingClass
 22,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
 22,334,1,0,0,0,0,0,0,0,0,0,0 //WE_MALE#I Will Protect You#
-22,335,5,0,0,0,0,0,0,0,0,0,0 //WE_FEMALE#I Look up to You#
-22,336,5,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARTNER#I miss You#
+22,335,1,0,0,0,0,0,0,0,0,0,0 //WE_FEMALE#I Look up to You#
+22,336,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARTNER#I miss You#
 22,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby#
 //SuperNovice
 23,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
@@ -644,6 +650,8 @@
 23,52,10,0,0,0,0,0,0,0,0,0,0 //TF_POISON#Envenom#
 23,53,1,52,3,0,0,0,0,0,0,0,0 //TF_DETOXIFY#Detoxify#
 23,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby#
+23,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+23,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Gunslinger
 24,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
 24,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -778,6 +786,8 @@
 4006,154,1,0,0,0,0,0,0,0,0,0,0 //MC_CHANGECART#Change Cart#
 4006,155,1,0,0,0,0,0,0,0,0,0,0 //MC_LOUD#Crazy Uproar#
 4006,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby#
+4006,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+4006,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //ThiefHigh
 4007,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
 4007,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -952,6 +962,8 @@
 4011,486,5,113,5,0,0,0,0,0,0,0,0 //WS_OVERTHRUSTMAX#Maximum Power Thrust#
 4011,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby#
 4011,459,1,111,5,0,0,0,0,0,0,0,0	//BS_ADRENALINE2#Full Adrenaline Rush#
+4011,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+4011,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Sniper
 4012,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
 4012,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -1258,6 +1270,8 @@
 4019,496,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT1#Twilight Alchemy 1#
 4019,497,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT2#Twilight Alchemy 2#
 4019,498,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT3#Twilight Alchemy 3#
+4019,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+4019,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Clown
 4020,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
 4020,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -1288,7 +1302,7 @@
 4020,313,5,321,10,0,0,0,0,0,0,0,0 //BD_SIEGFRIED#Acoustic Rhythm#
 4020,1010,1,0,0,0,0,0,0,0,0,0,0 //BA_PANGVOICE#Pang Voice#
 4020,394,10,47,5,316,1,0,0,0,0,0,0 //CG_ARROWVULCAN#Vulcan Arrow#
-4020,395,5,45,5,315,7,0,0,0,0,0,0 //CG_MOONLIT#Sheltering Bliss#
+4020,395,1,45,5,315,7,0,0,0,0,0,0 //CG_MOONLIT#Sheltering Bliss#
 4020,396,1,45,5,315,5,0,0,0,0,0,0 //CG_MARIONETTE#Marionette Control#
 4020,487,5,315,10,396,1,0,0,0,0,0,0 //CG_LONGINGFREEDOM#Longing for Freedom#
 4020,488,5,45,10,315,10,0,0,0,0,0,0 //CG_HERMODE#Wand of Hermod#
@@ -1324,7 +1338,7 @@
 4021,313,5,329,10,0,0,0,0,0,0,0,0 //BD_SIEGFRIED#Acoustic Rhythm#
 4021,1011,1,0,0,0,0,0,0,0,0,0,0 //DC_WINKCHARM#Wink of Charm#
 4021,394,10,47,5,324,1,0,0,0,0,0,0 //CG_ARROWVULCAN#Vulcan Arrow#
-4021,395,5,45,5,323,7,0,0,0,0,0,0 //CG_MOONLIT#Sheltering Bliss#
+4021,395,1,45,5,323,7,0,0,0,0,0,0 //CG_MOONLIT#Sheltering Bliss#
 4021,396,1,45,5,323,5,0,0,0,0,0,0 //CG_MARIONETTE#Marionette Control#
 4021,487,5,323,10,396,1,0,0,0,0,0,0 //CG_LONGINGFREEDOM#Longing for Freedom#
 4021,488,5,45,10,323,10,0,0,0,0,0,0 //CG_HERMODE#Wand of Hermod#
@@ -1454,6 +1468,8 @@
 4028,155,1,0,0,0,0,0,0,0,0,0,0 //MC_LOUD#Crazy Uproar#
 4028,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby#
 4028,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent#
+4028,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+4028,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Baby Thief
 4029,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
 4029,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -1607,6 +1623,8 @@
 4033,1012,1,0,0,0,0,0,0,0,0,0,0 //BS_UNFAIRLYTRICK#Unfair Trick#
 4033,1013,1,0,0,0,0,0,0,0,0,0,0 //BS_GREED#Greed#
 4033,459,1,111,5,0,0,0,0,0,0,0,0	//BS_ADRENALINE2#Full Adrenaline Rush#
+4033,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+4033,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Baby Hunter
 4034,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
 4034,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -1878,6 +1896,8 @@
 4041,496,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT1#Twilight Alchemy 1#
 4041,497,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT2#Twilight Alchemy 2#
 4041,498,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT3#Twilight Alchemy 3#
+4041,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+4041,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Baby Bard
 4042,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
 4042,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -2028,6 +2048,8 @@
 4045,53,1,52,3,0,0,0,0,0,0,0,0 //TF_DETOXIFY#Detoxify#
 4045,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby#
 4045,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent#
+4045,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+4045,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Taekwon
 4046,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
 4046,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -2634,6 +2656,8 @@
 4058,2283,1,2281,1,0,0,0,0,0,0,0,0 //NC_DISJOINT#FAW Removal#
 4058,5006,5,0,0,0,0,0,0,0,0,0,0 //NC_MAGMA_ERUPTION#Magma Eruption#
 4058,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
+4058,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+4058,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Guillotine Cross (Regular)
 4059,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
 4059,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -2984,6 +3008,8 @@
 4064,2283,1,2281,1,0,0,0,0,0,0,0,0 //NC_DISJOINT#FAW Removal#
 4064,5006,5,0,0,0,0,0,0,0,0,0,0 //NC_MAGMA_ERUPTION#Magma Eruption#
 4064,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
+4064,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+4064,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Guillotine Cross (Trans)
 4065,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
 4065,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -3386,6 +3412,8 @@
 4071,2497,10,0,0,0,0,0,0,0,0,0,0 //GN_S_PHARMACY#Special Pharmacy#
 4071,5003,5,2497,1,0,0,0,0,0,0,0,0 //GN_ILLUSIONDOOPING#Hallucination Drug#
 4071,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
+4071,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+4071,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Shadow Chaser (Regular)
 4072,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
 4072,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -3611,7 +3639,7 @@
 4075,313,5,321,10,0,0,0,0,0,0,0,0 //BD_SIEGFRIED#Acoustic Rhythm#
 4075,1010,1,0,0,0,0,0,0,0,0,0,0 //BA_PANGVOICE#Pang Voice#
 4075,394,10,47,5,316,1,0,0,0,0,0,0 //CG_ARROWVULCAN#Vulcan Arrow#
-4075,395,5,45,5,315,7,0,0,0,0,0,0 //CG_MOONLIT#Sheltering Bliss#
+4075,395,1,45,5,315,7,0,0,0,0,0,0 //CG_MOONLIT#Sheltering Bliss#
 4075,396,1,45,5,315,5,0,0,0,0,0,0 //CG_MARIONETTE#Marionette Control#
 4075,487,5,315,10,396,1,0,0,0,0,0,0 //CG_LONGINGFREEDOM#Longing for Freedom#
 4075,488,5,45,10,315,10,0,0,0,0,0,0 //CG_HERMODE#Wand of Hermod#
@@ -3673,7 +3701,7 @@
 4076,313,5,329,10,0,0,0,0,0,0,0,0 //BD_SIEGFRIED#Acoustic Rhythm#
 4076,1011,1,0,0,0,0,0,0,0,0,0,0 //DC_WINKCHARM#Wink of Charm#
 4076,394,10,47,5,324,1,0,0,0,0,0,0 //CG_ARROWVULCAN#Vulcan Arrow#
-4076,395,5,45,5,323,7,0,0,0,0,0,0 //CG_MOONLIT#Sheltering Bliss#
+4076,395,1,45,5,323,7,0,0,0,0,0,0 //CG_MOONLIT#Sheltering Bliss#
 4076,396,1,45,5,323,5,0,0,0,0,0,0 //CG_MARIONETTE#Marionette Control#
 4076,487,5,323,10,396,1,0,0,0,0,0,0 //CG_LONGINGFREEDOM#Longing for Freedom#
 4076,488,5,45,10,323,10,0,0,0,0,0,0 //CG_HERMODE#Wand of Hermod#
@@ -3703,7 +3731,7 @@
 4076,2432,5,2427,1,0,0,0,0,0,0,0,0 //WM_MELODYOFSINK#Melody Of Sink#
 4076,2433,5,2431,1,0,0,0,0,0,0,0,0 //WM_BEYOND_OF_WARCRY#Warcry Of Beyond#
 4076,2434,5,2429,1,2433,1,0,0,0,0,0,0 //WM_UNLIMITED_HUMMING_VOICE#Unlimited Humming Voice#
-4076,5007,5,2412,1,0,0,0,0,0,0,0,0 //WM_FRIGG_SONG# 
+4076,5007,5,2412,1,0,0,0,0,0,0,0,0 //WM_FRIGG_SONG#
 4076,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
 //Sura (Trans)
 4077,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
@@ -3826,8 +3854,10 @@
 4078,2495,2,2497,1,0,0,0,0,0,0,0,0 //GN_MIX_COOKING#Mix Cooking#
 4078,2496,2,2495,1,0,0,0,0,0,0,0,0 //GN_MAKEBOMB#Create Bomb#
 4078,2497,10,0,0,0,0,0,0,0,0,0,0 //GN_S_PHARMACY#Special Pharmacy#
-4078,5003,5,2497,1,0,0,0,0,0,0,0,0 //GN_ILLUSIONDOOPING#Hallucination Drug# 
+4078,5003,5,2497,1,0,0,0,0,0,0,0,0 //GN_ILLUSIONDOOPING#Hallucination Drug#
 4078,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
+4078,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+4078,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Shadow Chaser (Trans)
 4079,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
 4079,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -4269,6 +4299,8 @@
 4086,2283,1,2281,1,0,0,0,0,0,0,0,0 //NC_DISJOINT#FAW Removal#
 4086,5006,5,0,0,0,0,0,0,0,0,0,0 //NC_MAGMA_ERUPTION#Magma Eruption#
 4086,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
+4086,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+4086,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Mechanic (Mado) (Trans)
 4087,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
 4087,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -4343,6 +4375,8 @@
 4087,2283,1,2281,1,0,0,0,0,0,0,0,0 //NC_DISJOINT#FAW Removal#
 4087,5006,5,0,0,0,0,0,0,0,0,0,0 //NC_MAGMA_ERUPTION#Magma Eruption#
 4087,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
+4087,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+4087,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Baby Rune Knight
 4096,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
 4096,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -4626,6 +4660,8 @@
 4100,2283,1,2281,1,0,0,0,0,0,0,0,0 //NC_DISJOINT#FAW Removal#
 4100,5006,5,0,0,0,0,0,0,0,0,0,0 //NC_MAGMA_ERUPTION#Magma Eruption#
 4100,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#
 //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#
@@ -4725,7 +4761,7 @@
 4102,2323,5,2311,3,0,0,0,0,0,0,0,0 //LG_EARTHDRIVE#Earth Drive#
 4102,2324,5,2318,3,2319,3,0,0,0,0,0,0 //LG_HESPERUSLIT#Hesperus Lit#
 4102,2325,5,2315,3,2321,4,2322,5,0,0,0,0 //LG_INSPIRATION#Inspiration#
-4102,5013,5,2311,5,0,0,0,0,0,0,0,0 //LG_KINGS_GRACE#King's Grace# 
+4102,5013,5,2311,5,0,0,0,0,0,0,0,0 //LG_KINGS_GRACE#King's Grace#
 4102,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
 //Baby Sorcerer
 4103,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
@@ -4854,7 +4890,7 @@
 4104,2432,5,2427,1,0,0,0,0,0,0,0,0 //WM_MELODYOFSINK#Melody Of Sink#
 4104,2433,5,2431,1,0,0,0,0,0,0,0,0 //WM_BEYOND_OF_WARCRY#Warcry Of Beyond#
 4104,2434,5,2429,1,2433,1,0,0,0,0,0,0 //WM_UNLIMITED_HUMMING_VOICE#Unlimited Humming Voice#
-4104,5007,5,2412,1,0,0,0,0,0,0,0,0 //WM_FRIGG_SONG# 
+4104,5007,5,2412,1,0,0,0,0,0,0,0,0 //WM_FRIGG_SONG#
 4104,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
 //Baby Wanderer
 4105,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
@@ -5030,6 +5066,8 @@
 4107,2497,10,0,0,0,0,0,0,0,0,0,0 //GN_S_PHARMACY#Special Pharmacy#
 4107,5003,5,2497,1,0,0,0,0,0,0,0,0 //GN_ILLUSIONDOOPING#Hallucination Drug#
 4107,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
+4107,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+4107,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Baby Shadow Chaser
 4108,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
 4108,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -5309,6 +5347,8 @@
 4112,2283,1,2281,1,0,0,0,0,0,0,0,0 //NC_DISJOINT#FAW Removal#
 4112,5006,5,0,0,0,0,0,0,0,0,0,0 //NC_MAGMA_ERUPTION#Magma Eruption#
 4112,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#
 //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#
@@ -5391,6 +5431,8 @@
 4190,261,5,259,2,0,0,0,0,0,0,0,0 //MO_CALLSPIRITS#Summon Spirit Sphere#
 4190,262,1,261,5,0,0,0,0,0,0,0,0 //MO_ABSORBSPIRITS#Absorb Spirit Sphere#
 4190,365,1,9,1,0,0,0,0,0,0,0,0 //HW_MAGICCRASHER#Stave Crasher#
+4190,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+4190,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Super Baby (Expanded)
 4191,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
 4191,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -5474,6 +5516,8 @@
 4191,261,5,259,2,0,0,0,0,0,0,0,0 //MO_CALLSPIRITS#Summon Spirit Sphere#
 4191,262,1,261,5,0,0,0,0,0,0,0,0 //MO_ABSORBSPIRITS#Absorb Spirit Sphere#
 4191,365,1,9,1,0,0,0,0,0,0,0,0 //HW_MAGICCRASHER#Stave Crasher#
+4191,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+4191,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Kagerou
 4211,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
 4211,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#

db/pre-re/skill_unit_db.txt

@@ -23,6 +23,7 @@
 //      0x04000(UF_REM_CRAZYWEED)		Removed if be overlapped by GN_CRAZYWEED
 //      0x08000(UF_REM_FIRERAIN)		Removed if be overlapped by RL_FIRE_RAIN
 //      0x10000(UF_KNOCKBACK_GROUP) 	Knock back a whole skill group (by default, skill unit is knocked back each unit)
+//      0x20000(UF_HIDDEN_TRAP) 		Hidden trap, see 'traps_setting' skill config to enable this flag
 // 	Example: 0x006 = 0x002+0x004 -> Cannot be stacked nor cast near targets
 //
 // Notes:
@@ -33,15 +34,15 @@
 
  12,0x7e,    ,  0, 0,  -1,all,   0x4003	//MG_SAFETYWALL
  18,0x7f,    , -1, 0,  20,enemy, 0x8010	//MG_FIREWALL
- 21,0x86,    ,  0, 2,1000,enemy, 0x018	//MG_THUNDERSTORM
+ 21,0x86,    ,  0, 2:2:2:2:2:2:2:2:2:2:3,1000,enemy, 0x010	//MG_THUNDERSTORM
  25,0x85,    ,  1, 0,  -1,all,   0x6003	//AL_PNEUMA
  27,0x81,0x80,  0, 0,  -1,all,   0x00E	//AL_WARP
- 47,0x86,    ,  0, 2,1000,enemy, 0x080	//AC_SHOWER
  70,0x83,    , -1, 1,1000,all,   0x018	//PR_SANCTUARY
  79,0x84,    , -1, 1,3000,enemy, 0x8018	//PR_MAGNUS
  80,0x87,0x88,  0, 1,2000,enemy, 0x4006	//WZ_FIREPILLAR
  83,0x86,    ,  0, 3,1000,enemy, 0x010	//WZ_METEOR
- 85,0x86,    ,  5, 1:1:1:1:1:1:1:1:1:1:3,1250,enemy,0x018	//WZ_VERMILION
+ 85,0x86,    ,  5:5:5:5:5:5:5:5:5:5:7, 1,1250,enemy,0x018	//WZ_VERMILION
+ 86,0x86,    ,  0:1:1:2:2:2:2:2:2:2, 0,-1,noone, 0x010	//WZ_WATERBALL
  87,0x8d,    , -1, 0,  -1,all,   0x9010	//WZ_ICEWALL
  89,0x86,    ,  4, 1, 450,enemy, 0x018	//WZ_STORMGUST
  91,0x86,    ,  2, 0,1000,enemy, 0x010	//WZ_HEAVENDRIVE
@@ -55,7 +56,7 @@
 121,0x97,    ,  0, 1,1000,enemy, 0x8006	//HT_FREEZINGTRAP
 122,0x8f,    ,  0, 1,1000,enemy, 0x8006	//HT_BLASTMINE
 123,0x98,    ,  0, 1,1000,enemy, 0x8006	//HT_CLAYMORETRAP
-125,0x99,    ,  0, 1,1000,all,   0x8000	//HT_TALKIEBOX
+125,0x99,    ,  0, 1,1000,all,   0x8040	//HT_TALKIEBOX
 140,0x92,    , -1, 1,1000,enemy, 0x8000	//AS_VENOMDUST
 220,0xb0,    ,  0, 0,  -1,all,   0x8002	//RG_GRAFFITI
 229,0xb1,    ,  0, 1,1000,enemy, 0x006	//AM_DEMONSTRATION
@@ -83,7 +84,7 @@
 329,0xae,    ,  3, 0,  -1,all,   0x140	//DC_FORTUNEKISS
 330,0xaf,    ,  3, 0,  -1,all,   0x140	//DC_SERVICEFORYOU
 336,0xb2,    ,  0,-1,  -1,noone, 0x000	//WE_CALLPARTNER
-339,0x86,    , -1, 0, 300,enemy, 0x000	//NPC_DARKGRANDCROSS
+339,0x86,    , -1, 0, 300,enemy, 0x000	//NPC_GRANDDARKNESS
 362,0xb4,    ,  2, 0, 300,all,   0x2000	//HP_BASILICA
 369,0xb3,    , -1, 0,10000,all,  0x008	//PA_GOSPEL
 395,0xb5,    ,  4, 0,  -1,all,   0x200	//CG_MOONLIT
@@ -94,18 +95,21 @@
 428,0x86,    ,  0, 1, 100,enemy, 0x000	//SG_SUN_WARM
 429,0x86,    ,  0, 1, 100,enemy, 0x000	//SG_MOON_WARM
 430,0x86,    ,  0, 1, 100,enemy, 0x000	//SG_STAR_WARM
-484,0xb8,    ,  2, 0,1000,enemy, 0x8808	//HW_GRAVITATION
+484,0xb8,    ,  2, 0,1000,enemy, 0x8818	//HW_GRAVITATION
 488,0xb9,    ,  3, 0,  -1,all,   0x200	//CG_HERMODE
 516,0x86,    ,  3, 0, 100,enemy, 0x000	//GS_DESPERADO
 521,0xbe,    ,  0, 1,1000,enemy, 0x000	//GS_GROUNDDRIFT
 527,0xbc,    , -1, 0,2000,enemy, 0x018	//NJ_TATAMIGAESHI
-535,0xbd,    , -1, 0,  20,enemy, 0x8010	//NJ_KAENSIN
+535,0xbd,    , -1, 0, 100,enemy, 0x8010	//NJ_KAENSIN
+536,0x86,    ,  2, 0,1000,enemy, 0x010	//NJ_BAKUENRYU
 538,0xbb,    ,  1:1:1:2:2:2:3:3:3:4,0,-1,all,0x8010	//NJ_SUITON
-670,0xc7,    ,  1, 4:7:10:13:16:19:22:25:28:31,1000,all,0x008	//NPC_EVILLAND
+539,0x86,    ,  3, 0,1000,enemy, 0x010	//NJ_HYOUSYOURAKU
+541,0x86,    ,  2:2:3:3:4, 0,1000,enemy, 0x010	//NJ_RAIGEKISAI
+670,0xc7,    ,  1, 5:5:5:5:5:5:5:5:5:13,1000,all,0x008	//NPC_EVILLAND
 
 //706,0xfd,    ,  0, 0,1000,all, 0x000	//NPC_VENOMFOG
 
-2044,0xca,    ,  0, 2,3000,all,   0x018	//AB_EPICLESIS
+2044,0xca,    ,  0, 2,1000,all,   0x018	//AB_EPICLESIS
 
 2032,0xe1,    ,  2, 0,1000,enemy, 0x8018	//GC_POISONSMOKE
 
@@ -143,8 +147,8 @@
 2446,0x86,    ,  0, 3:3:3:4:4,1000,enemy, 0x018	//SO_EARTHGRAVE
 2447,0x86,    ,  0, 3:3:3:4:4,1000,enemy, 0x018	//SO_DIAMONDDUST
 2449,0xdf,    ,  0, 3:3:4:4:5,500,enemy,  0x018	//SO_PSYCHIC_WAVE
-2450,0xe0,    ,  0, 3, 500,enemy, 0x8010	//SO_CLOUD_KILL
-2452,0xe4,    ,  0, 3,3000,all,   0x8010	//SO_WARMER
+2450,0xe0,    ,  3, 0,  -1,enemy, 0xA010	//SO_CLOUD_KILL
+2452,0xe4,    ,  3, 0,  -1,all,   0xA010	//SO_WARMER
 2453,0xeb,    ,  0, 1:1:2:2:3,500,enemy,0x8010	//SO_VACUUM_EXTREME
 2465,0xf1,    ,  0, 1,1000,all,   0x010	//SO_FIRE_INSIGNIA
 2466,0xf2,    ,  0, 1,1000,all,   0x010	//SO_WATER_INSIGNIA
@@ -155,9 +159,9 @@
 2482,0xe6,0x7f, -1, 1, 300,enemy, 0xC000	//GN_WALLOFTHORN
 2484,0x86,    ,  0, 1, 100,enemy, 0x080	//GN_CRAZYWEED_ATK
 2485,0xe7,    ,  0, 2,2000,enemy, 0x8098	//GN_DEMONIC_FIRE
-2487,0xe8,    ,  2, 0,  -1,enemy, 0x2000	//GN_FIRE_EXPANSION_SMOKE_POWDER
-2488,0xe9,    ,  2, 0,  -1,enemy, 0x2000	//GN_FIRE_EXPANSION_TEAR_GAS
-2490,0xea,    ,  0, 1,1000,enemy, 0x8002	//GN_HELLS_PLANT
+2487,0xe8,    ,  2, 0,  -1,all,   0x2000	//GN_FIRE_EXPANSION_SMOKE_POWDER
+2488,0xe9,    ,  2, 0,  -1,all,   0x2000	//GN_FIRE_EXPANSION_TEAR_GAS
+2490,0xea,    ,  0, 1,1000,enemy, 0xC002	//GN_HELLS_PLANT
 
 2555,0x104,   ,  0, 1:2:2:3:3,500,enemy,0x6	//RL_B_TRAP
 2567,0x105,   , -1, 0,1000,enemy, 0x98	//RL_FIRE_RAIN
@@ -178,7 +182,6 @@
 8041,0xf6,    ,  1:1:2:2:3, 0,2000,enemy,   0x01A	//MH_LAVA_SLIDE
 8043,0xf7,    ,  1, 0,-1,all,   0x2018	//MH_VOLCANIC_ASH
 
-8208,0x86,    ,  0, 2,1000,enemy, 0x080	//MA_SHOWER
 8209,0x90,    ,  0, 1,1000,enemy, 0x006	//MA_SKIDTRAP
 8210,0x93,    ,  0, 0,1000,enemy, 0x006	//MA_LANDMINE
 8211,0x95,    ,  0, 1,1000,enemy, 0x006	//MA_SANDMAN