Mistakes

From 65b6861e84
Small cleanup And updata mapcache to use DBPATH instead rechecking RENEWAL macro, (code duplication) Make mapcache use cli.o to give some feedback on arguments given.
2015-12-02 00:08:54 +01:00 · 2015-12-01 23:50:21 +01:00
233 changed files with 6366 additions and 30930 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,11 +2,4 @@
 *.c      diff=cpp
 *.sln    merge=union
 *.vcproj 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
+*.vcxproj merge=union
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,21 +8,6 @@ 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:
--- a/conf/battle/client.conf
+++ b/conf/battle/client.conf
@@ -72,8 +72,6 @@ min_hair_color: 0
 max_hair_color: 8
 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
@@ -122,11 +120,6 @@ 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 
--- a/conf/battle/feature.conf
+++ b/conf/battle/feature.conf
@@ -22,7 +22,6 @@ 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)
--- a/conf/battle/items.conf
+++ b/conf/battle/items.conf
@@ -81,7 +81,7 @@ autospell_stacking: no
 // Allow the consumption of usable items that are disabled by item_noequip.txt? (Note 1)
 // no = can't be consumed
 // yes = consumed with no effect
-allow_consume_restricted_item: no
+allow_consume_restricted_item: yes

 // Allow equipping items that are disabled by item_noequip.txt? (Note 1)
 // no = can't be equipped and will be unequipped when entering the map
--- a/conf/battle/monster.conf
+++ b/conf/battle/monster.conf
@@ -26,8 +26,8 @@ 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 attacked within a
-//        distance of [attack range+1], otherwise mobs may change target and chase 
+// 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 
 //        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
@@ -38,9 +38,6 @@ monster_max_aspd: 199
 //        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)
@@ -84,12 +81,6 @@ 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

@@ -251,7 +242,3 @@ 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
--- a/conf/char_athena.conf
+++ b/conf/char_athena.conf
@@ -108,11 +108,8 @@ autosave_time: 60
 save_log: yes

 // Starting point for new characters
-// Format: <map_name>,<x>,<y>{:<map_name>,<x>,<y>...}
-// Max number of start points is MAX_STARTPOINT in char.h (default 5)
-// Location is randomly picked on character creation.
-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
+// Format: <map_name>,<x>,<y>
+start_point: new_1-1,53,111

 // Starting items for new characters
 // Max number of items is MAX_STARTITEM in char.c (default 32)
--- a/conf/log_athena.conf
+++ b/conf/log_athena.conf
@@ -121,13 +121,6 @@ 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:
@@ -149,7 +142,6 @@ 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
@@ -159,6 +151,5 @@ 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
--- a/conf/maps_athena.conf
+++ b/conf/maps_athena.conf
@@ -1191,48 +1191,6 @@ 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 ---------------------------

--- a/conf/msg_conf/map_msg.conf
+++ b/conf/msg_conf/map_msg.conf
@@ -418,7 +418,7 @@
 400: Usage: @jailfor <time> <character name>
 401: You have been jailed for %d years, %d months, %d days, %d hours and %d minutes
 402: %s in jail for %d years, %d months, %d days, %d hours and %d minutes
-// WoE SE (@agitstart2/@agitend2)
+// WoE SE (@agitstart2)
 403: War of Emperium SE has been initiated.
 404: War of Emperium SE is currently in progress.
 405: War of Emperium SE has been ended.
@@ -751,7 +751,7 @@
 //Skill messages
 720: %s is required.
 721: [%s] Poison effect was applied to the weapon.
-//722: Free
+722: Please equipped with a %s.

 // @costume
 723: '%s' is an unknown costume
@@ -777,17 +777,7 @@
 737: '%s' (%d) cannot be cloned, limit (%d).
 738: Clone '%s' is done.

-// @bodystyle
-739: Please enter a body style (usage: @bodystyle <body ID: %d-%d>).
-740: This job has no alternate body styles.
-
-// WoE TE (@agitstart3/@agitend3)
-741: War of Emperium TE has been initiated.
-742: War of Emperium TE is currently in progress.
-743: War of Emperium TE has been ended.
-744: War of Emperium TE is currently not in progress.
-
-//745-899 free
+//739-899 free

 //------------------------------------
 // More atcommands message
@@ -1122,7 +1112,7 @@

 // @changelook
 1177: Usage: @changelook {<position>} <view id>
-1178: Position: 1-Top 2-Middle 3-Bottom 4-Weapon 5-Shield 6-Shoes 7-Robe 8-Body
+1178: Position: 1-Top 2-Middle 3-Bottom 4-Weapon 5-Shield 6-Shoes 7-Robe

 // @autotrade
 1179: Autotrade is not allowed on this map.
--- a/conf/packet_athena.conf
+++ b/conf/packet_athena.conf
@@ -8,6 +8,13 @@ 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.
--- a/db/castle_db.txt
+++ b/db/castle_db.txt
@@ -9,19 +9,18 @@
 // 04. OnGuildBreakEventName    NPC unique name to invoke ::OnGuildBreak on, when a occupied
 //                              castle is abandoned during guild break.

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

--- a/db/mob_avail.txt
+++ b/db/mob_avail.txt
@@ -13,7 +13,6 @@
 //
 // 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
--- a/db/packet_db.txt
+++ b/db/packet_db.txt
@@ -1715,11 +1715,6 @@ 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]
@@ -1868,6 +1863,9 @@ 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
@@ -2246,8 +2244,7 @@ packet_keys: 0x2BED4F91,0x5F9E00CF,0x5EE5520C
 0x09B9,4,ZC_ACK_CLOSE_BANKING,2

 //2013-07-31cRagexe
-0x09ca,23 // ZC_SKILL_ENTRY5
-0x09cb,17	// ZC_USE_SKILL2
+0x09ca,23 //ZC_SKILL_ENTRY5

 //2013-08-07Ragexe
 packet_ver: 45
@@ -2377,8 +2374,6 @@ 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
@@ -2429,6 +2424,8 @@ 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
@@ -2460,7 +2457,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
@@ -2475,6 +2472,7 @@ 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
@@ -2493,6 +2491,7 @@ 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

@@ -2506,15 +2505,6 @@ 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
@@ -2524,75 +2514,5 @@ 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
-
 //Add new packets here
-//packet_ver: 55
+//packet_ver: 53
--- a/db/pre-re/item_db.txt
+++ b/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,,,,,,{},{},{}
+618,Worn_Out_Scroll,Worn Out Scroll,2,50,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ getrandgroupitem(IG_ScrollBox),1; },{},{}
 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; },{},{}
@@ -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,3,65,1,11,{ bonus2 bAddMonsterDropItem,1753,200; },{},{}
+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; },{},{}
 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; },{},{}
@@ -4551,7 +4551,7 @@
 11529,MAAMOUL_,Maamoul,0,500,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal 120,60; },{},{}
 11530,Jujube,Jujube,0,10,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal 30,0; },{},{}
 11531,Coffee,Coffee,0,10,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal 0,10; },{},{}
-11701,Girl_Bunch_Of_Flower_,Girl's Bouquet,0,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(105,145),0; },{},{}
+11701,Girl_Bunch_Of_Flower,Girl's Bouquet,0,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(105,145),0; },{},{}
 11702,Moon_Cookie,Moon Cookie,0,0,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ },{},{}
 11703,Mysterious_Blood,Mystery Blood,0,0,,30,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal 0,rand(25,35); },{},{}
 11704,KETUPAT_F,Ketupat,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(70,90),0; },{},{}
@@ -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_ATKPOTION,600000,5; sc_start SC_MATKPOTION,600000,5; },{},{}
+12319,Strawberry_Cake,Rune Strawberry Cake,2,0,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCATKRATE,600000,5; sc_start SC_INCMATKRATE,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; },{},{}
@@ -4983,12 +4983,12 @@
 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),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; },{},{}
+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; },{},{}
 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; },{},{}
@@ -5449,29 +5449,29 @@
 13265,Black_Lump,Black Lump,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
 13266,Black_Hard_Lump,Hard Black Lump,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
 13267,Very_Hard_Lump,Extremely Hard Black Lump,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13268,Mysterious_Powder,Mysterious Powder,10,100,,10,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13269,Boost500_To_Throw,Throwing Boost 500,10,100,,10,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13270,Full_SwingK_To_Throw,Throwing Full Swing K,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13271,Mana_Plus_To_Throw,Throwing Mana Plus,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13272,Cure_Free_To_Throw,Throwing Cure Free,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13273,Stamina_Up_M_To_Throw,Throwing Muramura M,10,100,,10,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13274,Digestive_F_To_Throw,Throwing Falmons F,10,100,,10,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13275,HP_Inc_PotS_To_Throw,Throwing Increase HP Potion (Small),10,100,,20,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13276,HP_Inc_PotM_To_Throw,Throwing Increase HP Potion (Medium),10,100,,40,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13277,HP_Inc_PotL_To_Throw,Throwing Increase HP Potion (Large),10,100,,80,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13278,SP_Inc_PotS_To_Throw,Throwing Increase SP Potion (Small),10,100,,20,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13279,SP_Inc_PotM_To_Throw,Throwing Increase SP Potion (Medium),10,100,,40,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13280,SP_Inc_PotL_To_Throw,Throwing Increase SP Potion (Large),10,100,,80,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13281,En_White_PotZ_To_Throw,Throwing Concentrated White Potion Z,10,100,,70,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13282,Vitata500_To_Throw,Throwing Vitata 500,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13283,En_Cel_Juice_To_Throw,Throwing Ceromain Soup,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13284,Savage_BBQ_To_Throw,Throwing Savage Full Roast,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13285,Wug_Cocktail_To_Throw,Throwing Cocktail Warg Blood,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13286,M_Brisket_To_Throw,Throwing Minor Stew,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13287,Siroma_Icetea_To_Throw,Throwing Siroma Iced Tea,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13288,Drocera_Stew_To_Throw,Throwing Drosera Herb Salad,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13289,Petti_Noodle_To_Throw,Throwing Petite Tail Soup,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13290,Black_Thing_To_Throw,Throwing Black Mass,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
+13268,Mysterious_Powder,Mysterious Powder,10,100,,10,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_MYSTERIOUS_POWDER,10000,2; },{},{}
+13269,Boost500_To_Throw,Throwing Boost 500,10,100,,10,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_BOOST500,500000,10; },{},{}
+13270,Full_SwingK_To_Throw,Throwing Full Swing K,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_FULL_SWING_K,500000,50; },{},{}
+13271,Mana_Plus_To_Throw,Throwing Mana Plus,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_MANA_PLUS,500000,50; },{},{}
+13272,Cure_Free_To_Throw,Throwing Cure Free,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_end SC_BLEEDING; sc_end SC_CURSE; sc_end SC_SILENCE; sc_end SC_POISON; sc_end SC_ORCISH; sc_end SC_CHANGEUNDEAD; sc_end SC_BLIND; sc_end SC_CONFUSION; sc_end SC_DPOISON; itemheal 500,0; },{},{}
+13273,Stamina_Up_M_To_Throw,Throwing Muramura M,10,100,,10,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_MUSTLE_M,500000,5; },{},{}
+13274,Digestive_F_To_Throw,Throwing Falmons F,10,100,,10,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_LIFE_FORCE_F,500000,5; },{},{}
+13275,HP_Inc_PotS_To_Throw,Throwing Increase HP Potion (Small),10,100,,20,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_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); },{},{}
 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,1000; bonus4 bAutoSpellOnSkill,"MG_LIGHTNINGBOLT","WZ_EARTHSPIKE",3,1000; },{},{}
+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; },{},{}
 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; },{},{}
@@ -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; },{},{}
--- a/db/pre-re/item_delay.txt
+++ b/db/pre-re/item_delay.txt
@@ -10,39 +10,39 @@
 // <SC_GroupID>
 //     SC (status change) group for the item.
 //     Example for SC_REUSE_LIMIT_MTF
-//         12658,10000,SC_REUSE_LIMIT_MTF // Transformation Scroll(Deviruchi)
-//         12659,10000,SC_REUSE_LIMIT_MTF // Transformation Scroll(Raydric)
+//         12658,10000,620 // Transformation Scroll(Deviruchi)
+//         12659,10000,620 // 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
-14538,300000,SC_REUSE_LIMIT_A	//Glass_Of_Illusion
+// SC_REUSE_LIMIT_A 609
+14538,300000,608	//Glass_Of_Illusion

-// SC_REUSE_LIMIT_B
-14586,180000,SC_REUSE_LIMIT_B	//Spark_Candy
+// SC_REUSE_LIMIT_B 610
+14586,180000,609	//Spark_Candy

-// SC_REUSE_LIMIT_C
-12208,60000,SC_REUSE_LIMIT_C	//Battle_Manual
+// SC_REUSE_LIMIT_C 611
+12208,60000,610	//Battle_Manual

-// SC_REUSE_LIMIT_D
-12210,60000,SC_REUSE_LIMIT_D	//Bubble_Gum
+// SC_REUSE_LIMIT_D 612
+12210,60000,611	//Bubble_Gum

-// 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_E 613
+11522,1000,612	//Red_Raffle_Sap
+11523,2000,612	//Yellow_Raffle_Sap
+11524,3000,612	//White_Raffle_Sap

-// SC_REUSE_LIMIT_F
-607,5000,SC_REUSE_LIMIT_F	//Yggdrasil_Berry
+// SC_REUSE_LIMIT_F 614
+607,5000,613	//Yggdrasil_Berry

-// SC_REUSE_LIMIT_G
-608,3000,SC_REUSE_LIMIT_G	//Yggdrasil_Seed
+// SC_REUSE_LIMIT_G 615
+608,3000,614	//Yggdrasil_Seed

-// SC_REUSE_LIMIT_H
-11525,5000,SC_REUSE_LIMIT_H	//Mora_Hip_Tea
+// SC_REUSE_LIMIT_H 616
+11525,5000,615	//Mora_Hip_Tea

 // Misc
 //12202,60000	//Str_Dish10_
--- a/db/pre-re/item_noequip.txt
+++ b/db/pre-re/item_noequip.txt
@@ -9,7 +9,6 @@
 // 2    - restricted in PVP
 // 4    - restricted in GVG
 // 8    - restricted in Battlegrounds
-// 16   - restricted in WOE:TE castles
 // Restricted zones - configured by 'restricted <number>' mapflag
 // 32   - restricted in zone 1
 // 64   - restricted in zone 2
@@ -18,7 +17,6 @@
 // 512  - restricted in zone 5
 // 1024 - restricted in zone 6
 // 2048 - restricted in zone 7
-// 4096 - restricted in zone 8
 //
 // Examples:
 // 1201,1   // Knife can't be worn on normal maps
--- a/db/pre-re/mob_db.txt
+++ b/db/pre-re/mob_db.txt
@@ -1046,7 +1046,7 @@
 1991,TENDRILRION,Tendrillion,Tendrilion,113,3657330,0,731466,365733,2,20000,24000,33,30,113,60,1,45,147,13,10,12,1,2,42,0x37B5,100,500,960,360,0,0,0,0,0,0,0,2544,500,1186,100,1637,100,6033,9000,6020,4000,7197,5335,7008,4850,0,0,0,0,0,0
 1992,CORNUS,Cornus,Cornus,108,41220,0,30854,4427,2,12000,13000,35,80,110,45,80,200,105,10,10,12,1,2,66,0x1089,120,1000,624,300,0,0,0,0,0,0,0,2387,10,2743,1,6023,4000,7063,3000,944,6000,2257,2,1420,1,0,0,0,0,4448,1
 1993,NAGA,Naga,Naga,111,46708,0,30360,16348,3,8000,8800,38,15,113,42,30,108,122,13,10,12,2,2,42,0x3695,150,400,864,432,0,0,0,0,0,0,0,2389,10,2134,10,1485,10,926,5000,936,3500,954,2000,1408,20,0,0,0,0,0,0
-1994,LUCIOLA_VESPA,Luciola Vespa,Luciola Vespa,104,32600,0,16300,11410,1,9000,9900,29,5,104,56,30,20,116,4,10,12,1,4,24,0x7185,110,1000,864,432,0,0,0,0,0,0,0,2744,2,955,9000,939,9000,518,300,992,160,526,200,943,3000,0,0,0,0,4445,1
+1994,LUCIOLA_VESPA,Luciola Vespa,Luciola Vespa,104,32600,0,16300,11410,1,9000,9900,29,5,104,56,30,20,116,4,10,12,1,4,24,0x7795,110,1000,864,432,0,0,0,0,0,0,0,2744,2,955,9000,939,9000,518,300,992,160,526,200,943,3000,0,0,0,0,4445,1
 1995,PINGUICULA,Pinguicula,Pinguicula,80,13680,0,6840,3420,1,600,720,25,5,102,23,30,10,86,2,10,12,1,3,62,0x308D,150,700,600,360,0,0,0,0,0,0,0,2745,1,1980,10,2270,10,7100,5000,7198,2000,7188,3000,712,1000,0,0,0,0,0,0
 //1996,BACSOJIN_T,Bacsojin,White Lady,85,253221,0,45250,16445,3,1868,6124,20,55,52,65,44,112,152,35,10,12,2,7,64,0x37B5,130,576,960,480,0,0,0,0,0,0,0,5411,500,2638,80,2639,80,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1997,G_TATACHO,Tatacho,Tatacho,106,39500,0,0,0,2,10000,11000,20,17,106,40,30,25,115,6,10,12,1,2,22,0x108B,150,1000,768,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
--- a/db/pre-re/skill_cast_db.txt
+++ b/db/pre-re/skill_cast_db.txt
@@ -131,7 +131,7 @@
 //-- PR_BENEDICTIO
 69,0,0,0,40000:80000:120000:160000:200000,0,0
 //-- PR_SANCTUARY
-70,5000,0,0,3500:6500:9500:12500:15500:18500:21500:24500:27500:30500,0,0
+70,5000,0,0,4000:7000:10000:13000:16000:19000:22000:25000:28000:31000,0,0
 //-- PR_SLOWPOISON
 71,0,0,0,10000:20000:30000:40000,0,0
 //-- PR_STRECOVERY
@@ -165,7 +165,7 @@
 //-- 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
 //-- WZ_WATERBALL
-86,1000:2000:3000:4000:5000:6000:7000:8000:9000:10000,0,0,10000,0,0
+86,1000:2000:3000:4000:5000:6000:7000:8000:9000:10000,0,0,0,0,0
 //-- WZ_ICEWALL
 87,0,0,0,5000:10000:15000:20000:25000:30000:35000:40000:45000:50000,0,0
 //-- WZ_FROSTNOVA
@@ -979,7 +979,7 @@
 //-- NPC_WIDESIGHT
 669,0,0,0,10000,0,0
 //-- NPC_EVILLAND
-670,0,0,0,3500:4500:5500:6500:7500:8500:9500:10500:11500:12500,30000,0
+670,0,0,0,30000,30000,0
 //-- NPC_MAGICMIRROR
 671,0,0,0,30000:30000:30000:30000:30000:2000:2000:2000:2000:2000,0,0
 //-- NPC_SLOWCAST
@@ -1027,7 +1027,7 @@

 //===== 2nd Jobs Quest Skills ==============
 //-- KN_CHARGEATK
-1001,500,0,0,0,0,0
+1001,300,300,0,0,0,0
 //-- CR_SHRINK
 1002,0,0,0,300000,0,0

--- a/db/pre-re/skill_castnodex_db.txt
+++ b/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,7	//HW_MAGICPOWER
+366,3	//HW_MAGICPOWER
 370,1	//CH_PALMSTRIKE
 371,0,2	//CH_TIGERFIST
 372,0,2	//CH_CHAINCRUSH
--- a/db/pre-re/skill_db.txt
+++ b/db/pre-re/skill_db.txt
@@ -66,8 +66,6 @@
 //    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
@@ -138,7 +136,7 @@
 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,0x84064,		TF_HIDING,Hiding
+51,1,6,4,0,1,0,10,1,no,0,0,0,none,0,0x4064,		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
 //
@@ -218,14 +216,14 @@
 //****
 // 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,0xC2,0,5,1,no,0,0x80,0,misc,0,0x3800,	HT_LANDMINE,Land Mine
+116,3,6,2,2,0x42,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,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,0x80,0,misc,0,0x3800,	HT_CLAYMORETRAP,Claymore 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
 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
@@ -240,7 +238,7 @@
 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,0x80060,	AS_CLOAKING,Cloaking
+135,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0,0x60,	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
 138,1,6,16,5,0x1,0,10,1,no,0,0x400,0,weapon,0,0x0,	AS_ENCHANTPOISON,Enchant Poison
@@ -544,7 +542,7 @@
 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,9,6,1,-1,0x8,0,10,1,yes,0,0,0,weapon,0,0x0,	ASC_BREAKER,Soul Destroyer
+379,7,6,1,-1,0x8,0,10,1,yes,0,0,0,weapon,0,0x0,	ASC_BREAKER,Soul Destroyer

 //****
 // Sniper
@@ -795,7 +793,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,7,6,2,7,0xD1,0,10,1,no,0,0x2,0,magic,0,0x0,	NPC_EVILLAND,Evil Land
+670,9,6,2,7,0x91,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
@@ -961,7 +959,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,0x80040,	GC_CLOAKINGEXCEED,Cloaking Exceed
+2033,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0,0x40,	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
@@ -1003,12 +1001,12 @@
 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,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
+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
 2245,0,0,0,0,0,0,10,0,no,0,0,0,none,0,0x0,		RA_TOOTHOFWUG,Tooth of Warg
 2246,0,6,4,0,0x2,3:4:5:6:7,5,1,no,0,0x40000,0,weapon,0,0x0,	RA_SENSITIVEKEEN,Sensitive Keen
-2247,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x80042,		RA_CAMOUFLAGE,Camouflage
+2247,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x42,		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
@@ -1071,7 +1069,7 @@
 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,3:6:9,0x0,	SC_FEINTBOMB,Feint Bomb
+2304,0,6,4,-1,0,0,3,1,no,0,0,0,weapon,0,0x0,	SC_FEINTBOMB,Feint Bomb

 //****
 // LG Royal Guard
@@ -1099,11 +1097,11 @@

 //****
 // SR Sura
-2326,1,8,1,-1,0,0,10,-2,no,0,0,0,weapon,0,0x0,	SR_DRAGONCOMBO,Dragon Combo
+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,1,8,4,-1,0,0,5,-2,no,0,0x200,0,weapon,0,0x0,	SR_FALLENEMPIRE,Fallen Empire
-2330,1,6,1,-1,0x3,1:1:1:1:1:2:2:2:2:2,10,1,yes,0,0,0,weapon,0,0x0,	SR_TIGERCANNON,Tiger Cannon
+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
 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
@@ -1199,7 +1197,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,0x42,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,0x2,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....
@@ -1235,7 +1233,7 @@
 //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,6,4,0,0x1,0,1,1,no,0,0x1,0,none,0,0x0,		MC_CARTDECORATE,Decorate Cart
+//2544,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		MC_CARTDECORATE,Decorate Cart

 //****
 // Rebellion
@@ -1319,11 +1317,15 @@
 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,4:5:6:7:8:9,0x0, SC_ESCAPE,Emergency Escape
+5010,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,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

 //****
 // Homunculus S
--- a/db/pre-re/skill_nocast_db.txt
+++ b/db/pre-re/skill_nocast_db.txt
@@ -9,7 +9,7 @@
 // 2    - cannot be used in PvP maps (use this instead of 1 for PK-mode servers)
 // 4    - cannot be used in GvG maps
 // 8    - cannot be used in Battleground maps
-// 16   - cannot be used in WOE:TE castles
+// 16   - cannot be cloned (clones will not copy this skill)
 // Restricted zones - configured by 'restricted <number>' mapflag
 // 32   - cannot be used in zone 1 maps
 // 64   - cannot be used in zone 2 maps
@@ -18,7 +18,6 @@
 // 512  - cannot be used in zone 5 maps
 // 1024 - cannot be used in zone 6 maps
 // 2048 - cannot be used in zone 7 maps
-// 4096 - cannot be used in zone 8 maps
 //
 // Example:
 // 8,6  // Endure cannot be used in PvP and GvG maps (2+4)
@@ -100,6 +99,12 @@
 488,3	//CG_HERMODE
 3013,3	//KO_KYOUGAKU

+//----------------------------------------------------------------------------
+// Clone Forbidden/pointless skills
+//----------------------------------------------------------------------------
+77,16	//PR_TURNUNDEAD
+79,16	//PR_MAGNUS
+
 //----------------------------------------------------------------------------
 // Zone 1 - Aldebaran Turbo Track
 //----------------------------------------------------------------------------
--- a/db/pre-re/skill_require_db.txt
+++ b/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,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
+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
 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,0								//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,1549:16030:16031:16032		//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,0							//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,2801						//NC_HOVERING
 2264,0,0,5,0,0,0,99,0,0,mado,0,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0							//NC_F_SIDESLIDE
 2265,0,0,5,0,0,0,99,0,0,mado,0,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0							//NC_B_SIDESLIDE

@@ -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,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
+//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

 //****
 // Rebellion
@@ -956,6 +956,10 @@
 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
--- a/db/pre-re/skill_tree.txt
+++ b/db/pre-re/skill_tree.txt
@@ -80,8 +80,6 @@
 5,154,1,0,0,0,0,0,0,0,0,0,0 //MC_CHANGECART#Change Cart#
 5,155,1,0,0,0,0,0,0,0,0,0,0 //MC_LOUD#Crazy Uproar#
 5,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby#
-5,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
-5,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#
@@ -231,8 +229,6 @@
 10,1013,1,0,0,0,0,0,0,0,0,0,0 //BS_GREED#Greed#
 10,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby#
 10,459,1,111,5,0,0,0,0,0,0,0,0	//BS_ADRENALINE2#Full Adrenaline Rush#
-10,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
-10,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#
@@ -496,8 +492,6 @@
 18,496,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT1#Twilight Alchemy 1#
 18,497,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT2#Twilight Alchemy 2#
 18,498,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT3#Twilight Alchemy 3#
-18,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
-18,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#
@@ -650,8 +644,6 @@
 23,52,10,0,0,0,0,0,0,0,0,0,0 //TF_POISON#Envenom#
 23,53,1,52,3,0,0,0,0,0,0,0,0 //TF_DETOXIFY#Detoxify#
 23,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby#
-23,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
-23,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#
@@ -786,8 +778,6 @@
 4006,154,1,0,0,0,0,0,0,0,0,0,0 //MC_CHANGECART#Change Cart#
 4006,155,1,0,0,0,0,0,0,0,0,0,0 //MC_LOUD#Crazy Uproar#
 4006,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby#
-4006,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
-4006,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#
@@ -962,8 +952,6 @@
 4011,486,5,113,5,0,0,0,0,0,0,0,0 //WS_OVERTHRUSTMAX#Maximum Power Thrust#
 4011,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby#
 4011,459,1,111,5,0,0,0,0,0,0,0,0	//BS_ADRENALINE2#Full Adrenaline Rush#
-4011,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
-4011,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#
@@ -1270,8 +1258,6 @@
 4019,496,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT1#Twilight Alchemy 1#
 4019,497,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT2#Twilight Alchemy 2#
 4019,498,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT3#Twilight Alchemy 3#
-4019,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
-4019,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#
@@ -1468,8 +1454,6 @@
 4028,155,1,0,0,0,0,0,0,0,0,0,0 //MC_LOUD#Crazy Uproar#
 4028,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby#
 4028,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent#
-4028,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
-4028,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#
@@ -1623,8 +1607,6 @@
 4033,1012,1,0,0,0,0,0,0,0,0,0,0 //BS_UNFAIRLYTRICK#Unfair Trick#
 4033,1013,1,0,0,0,0,0,0,0,0,0,0 //BS_GREED#Greed#
 4033,459,1,111,5,0,0,0,0,0,0,0,0	//BS_ADRENALINE2#Full Adrenaline Rush#
-4033,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
-4033,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#
@@ -1896,8 +1878,6 @@
 4041,496,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT1#Twilight Alchemy 1#
 4041,497,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT2#Twilight Alchemy 2#
 4041,498,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT3#Twilight Alchemy 3#
-4041,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
-4041,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#
@@ -2048,8 +2028,6 @@
 4045,53,1,52,3,0,0,0,0,0,0,0,0 //TF_DETOXIFY#Detoxify#
 4045,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby#
 4045,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent#
-4045,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
-4045,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#
@@ -2656,8 +2634,6 @@
 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,2,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#
@@ -3008,8 +2984,6 @@
 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,2,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#
@@ -3412,8 +3386,6 @@
 4071,2497,10,0,0,0,0,0,0,0,0,0,0 //GN_S_PHARMACY#Special Pharmacy#
 4071,5003,5,2497,1,0,0,0,0,0,0,0,0 //GN_ILLUSIONDOOPING#Hallucination Drug#
 4071,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
-4071,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
-4071,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#
@@ -3856,8 +3828,6 @@
 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,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
-4078,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
-4078,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#
@@ -4299,8 +4269,6 @@
 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,2,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#
@@ -4375,8 +4343,6 @@
 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,2,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#
@@ -4660,8 +4626,6 @@
 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,2,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#
@@ -5066,8 +5030,6 @@
 4107,2497,10,0,0,0,0,0,0,0,0,0,0 //GN_S_PHARMACY#Special Pharmacy#
 4107,5003,5,2497,1,0,0,0,0,0,0,0,0 //GN_ILLUSIONDOOPING#Hallucination Drug#
 4107,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
-4107,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
-4107,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#
@@ -5347,8 +5309,6 @@
 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,2,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#
@@ -5431,8 +5391,6 @@
 4190,261,5,259,2,0,0,0,0,0,0,0,0 //MO_CALLSPIRITS#Summon Spirit Sphere#
 4190,262,1,261,5,0,0,0,0,0,0,0,0 //MO_ABSORBSPIRITS#Absorb Spirit Sphere#
 4190,365,1,9,1,0,0,0,0,0,0,0,0 //HW_MAGICCRASHER#Stave Crasher#
-4190,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
-4190,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#
@@ -5516,8 +5474,6 @@
 4191,261,5,259,2,0,0,0,0,0,0,0,0 //MO_CALLSPIRITS#Summon Spirit Sphere#
 4191,262,1,261,5,0,0,0,0,0,0,0,0 //MO_ABSORBSPIRITS#Absorb Spirit Sphere#
 4191,365,1,9,1,0,0,0,0,0,0,0,0 //HW_MAGICCRASHER#Stave Crasher#
-4191,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
-4191,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#
--- a/db/pre-re/skill_unit_db.txt
+++ b/db/pre-re/skill_unit_db.txt
@@ -42,7 +42,6 @@
 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
- 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
@@ -102,7 +101,7 @@
 527,0xbc,    , -1, 0,2000,enemy, 0x018	//NJ_TATAMIGAESHI
 535,0xbd,    , -1, 0,  20,enemy, 0x8010	//NJ_KAENSIN
 538,0xbb,    ,  1:1:1:2:2:2:3:3:3:4,0,-1,all,0x8010	//NJ_SUITON
-670,0xc7,    ,  1, 5:5:5:5:5:5:5:5:5:13,1000,all,0x008	//NPC_EVILLAND
+670,0xc7,    ,  1, 4:7:10:13:16:19:22:25:28:31,1000,all,0x008	//NPC_EVILLAND

 //706,0xfd,    ,  0, 0,1000,all, 0x000	//NPC_VENOMFOG

@@ -158,7 +157,7 @@
 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, 0xC002	//GN_HELLS_PLANT
+2490,0xea,    ,  0, 1,1000,enemy, 0x8002	//GN_HELLS_PLANT

 2555,0x104,   ,  0, 1:2:2:3:3,500,enemy,0x6	//RL_B_TRAP
 2567,0x105,   , -1, 0,1000,enemy, 0x98	//RL_FIRE_RAIN
--- a/db/re/item_buyingstore.txt
+++ b/db/re/item_buyingstore.txt
@@ -61,41 +61,41 @@
 12813	//Peony_Mommy
 12814	//Slapping_Herb
 12815	//Yggdrasil_Dust
-6592	//Small_Wooden_Chest
-6594	//Magic_Bronze_Bullion
-6595	//Hammer_Of_Velund
-6596	//Anvil_Of_Velund
-6597	//Bracelet_Of_Velund
-6598	//Rib_Of_Jormungand
-6599	//Spirit_Of_Hugin
-6600	//Spirit_Of_Munin
-6601	//Chisel_Of_Giant
-6602	//Secret_Of_Rune
-6603	//Skin_Of_Hraesvelg
-6604	//Essence_Rune_Magic
-6605	//Muspellium
+//6592
+//6594
+//6595
+//6596
+//6597
+//6598
+//6599
+//6600
+//6601
+//6602
+//6603
+//6604
+//6605
 //6668
 7056	//Payroll_Of_Kafra
-11557	//TE_White_Potion
-11558	//TE_White_Slim_Potion
-6607	//Temporal_Crystal
+//11557
+//11558
+//6607
 6608	//Coagulated_Spell
-6609	//Glast_Decayed_Nail
-6610	//Glast_Horrendous_Mouth
+//6609
+//6610
 //6611
-6612	//Gold_Coin_Basket
-6613	//Flashy_Brooch
+//6612
+//6613
 7228	//Gold_Bullion
 7229	//Silver_Bullion
 7230	//White_Gold_Bullion
-6699	//Faith_Silence
-6700	//White_Snake_Scale
-6701	//Treasure_Dwarf
-6702	//Sweat_Dwarf
-6703	//Warrior_Tears
-6704	//Warrior_Anger
-6705	//Warrior_Certificate
-6706	//Guardian_Flowers
+//6699
+//6700
+//6701
+//6702
+//6703
+//6704
+//6705
+//6706
 6683	//Dried_Flower
 7640	//Butterfly_Hair_Decoration
 7642	//Bloody_Coin
--- a/db/re/item_db.txt
+++ b/db/re/item_db.txt
--- a/db/re/item_delay.txt
+++ b/db/re/item_delay.txt
@@ -10,73 +10,73 @@
 // <SC_GroupID>
 //     SC (status change) group for the item.
 //     Example for SC_REUSE_LIMIT_MTF
-//         12658,10000,SC_REUSE_LIMIT_MTF // Transformation Scroll(Deviruchi)
-//         12659,10000,SC_REUSE_LIMIT_MTF // Transformation Scroll(Raydric)
+//         12658,10000,620 // Transformation Scroll(Deviruchi)
+//         12659,10000,620 // 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_REFRESH
-12725,120000,SC_REUSE_REFRESH	//Runstone_Nosiege
+// SC_REUSE_REFRESH 317
+12725,120000,317	//Runstone_Nosiege

-// SC_REUSE_LIMIT_A
-14538,300000,SC_REUSE_LIMIT_A	//Glass_Of_Illusion
+// SC_REUSE_LIMIT_A 609
+14538,300000,608	//Glass_Of_Illusion

-// SC_REUSE_LIMIT_B
-12596,180000,SC_REUSE_LIMIT_B	//Magic_Candy
-14586,180000,SC_REUSE_LIMIT_B	//Spark_Candy
+// SC_REUSE_LIMIT_B 610
+12596,180000,609	//Magic_Candy
+14586,180000,609	//Spark_Candy

-// SC_REUSE_LIMIT_C
-12208,60000,SC_REUSE_LIMIT_C	//Battle_Manual
+// SC_REUSE_LIMIT_C 611
+12208,60000,610	//Battle_Manual

-// SC_REUSE_LIMIT_D
-12210,60000,SC_REUSE_LIMIT_D	//Bubble_Gum
+// SC_REUSE_LIMIT_D 612
+12210,60000,611	//Bubble_Gum

-// 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_E 613
+11522,1000,612	//Red_Raffle_Sap
+11523,2000,612	//Yellow_Raffle_Sap
+11524,3000,612	//White_Raffle_Sap

-// SC_REUSE_LIMIT_F
-607,5000,SC_REUSE_LIMIT_F	//Yggdrasil_Berry
+// SC_REUSE_LIMIT_F 614
+607,5000,613	//Yggdrasil_Berry

-// SC_REUSE_LIMIT_G
-608,3000,SC_REUSE_LIMIT_G	//Yggdrasil_Seed
-22559,3000,SC_REUSE_LIMIT_G	//Mock_Strawberry
+// SC_REUSE_LIMIT_G 615
+608,3000,614	//Yggdrasil_Seed
+22559,3000,614	//Mock_Strawberry

-// SC_REUSE_LIMIT_H
-11525,5000,SC_REUSE_LIMIT_H	//Mora_Hip_Tea
+// SC_REUSE_LIMIT_H 616
+11525,5000,615	//Mora_Hip_Tea

-// SC_REUSE_LIMIT_ASPD_POTION
-//12684,0,SC_REUSE_LIMIT_ASPD_POTION	//ASPD_Potion //! CHECKME: Need confirmation!
+// SC_REUSE_LIMIT_ASPD_POTION 617
+//12684,0,616	//ASPD_Potion //! CHECKME: Need confirmation!

-// SC_REUSE_LIMIT_MTF
-12658,10000,SC_REUSE_LIMIT_MTF	//Transformation Scroll(Deviruchi)
-12659,10000,SC_REUSE_LIMIT_MTF	//Transformation Scroll(Raydric)
-12660,10000,SC_REUSE_LIMIT_MTF	//Transformation Scroll(Mavka)
-12661,10000,SC_REUSE_LIMIT_MTF	//Transformation Scroll(Marduk)
-12662,10000,SC_REUSE_LIMIT_MTF	//Transformation Scroll(Banshee)
-12663,10000,SC_REUSE_LIMIT_MTF	//Transformation Scroll(Poring)
-12664,10000,SC_REUSE_LIMIT_MTF	//Transformation Scroll(Golem)
+// SC_REUSE_LIMIT_MTF 618
+12658,10000,620	//Transformation Scroll(Deviruchi)
+12659,10000,620	//Transformation Scroll(Raydric)
+12660,10000,620	//Transformation Scroll(Mavka)
+12661,10000,620	//Transformation Scroll(Marduk)
+12662,10000,620	//Transformation Scroll(Banshee)
+12663,10000,620	//Transformation Scroll(Poring)
+12664,10000,620	//Transformation Scroll(Golem)

-// SC_ALL_RIDING_REUSE_LIMIT
-12622,3000,SC_ALL_RIDING_REUSE_LIMIT	//Boarding_Halter
+// SC_ALL_RIDING_REUSE_LIMIT 619
+12622,3000,621	//Boarding_Halter

-// SC_REUSE_LIMIT_RECALL
-12580,0,SC_REUSE_LIMIT_RECALL	//Vending_Search_Scroll
-12581,0,SC_REUSE_LIMIT_RECALL	//Vending_Search_Scroll2
-12591,0,SC_REUSE_LIMIT_RECALL	//Uni_Catalog_Bz
+// SC_SEARCH_STORE_INFO 620
+12580,0,624	//Vending_Search_Scroll
+12581,0,624	//Vending_Search_Scroll2
+12591,0,624	//Uni_Catalog_Bz

-// SC_REUSE_MILLENNIUMSHIELD
-12727,60000,SC_REUSE_MILLENNIUMSHIELD	//Runstone_Verkana
+// SC_REUSE_MILLENNIUMSHIELD 621
+12727,60000,625	//Runstone_Verkana

-// SC_REUSE_CRUSHSTRIKE
-12726,30000,SC_REUSE_CRUSHSTRIKE	//Runstone_Rhydo
+// SC_REUSE_CRUSHSTRIKE 622
+12726,30000,626	//Runstone_Rhydo

-// SC_REUSE_STORMBLAST
-12732,1000,SC_REUSE_STORMBLAST	//Runstone_Pertz
+// SC_REUSE_STORMBLAST 623
+12732,1000,627	//Runstone_Pertz

 // Misc
 //12202,60000	//Str_Dish10_
--- a/db/re/item_noequip.txt
+++ b/db/re/item_noequip.txt
@@ -9,7 +9,6 @@
 // 2    - restricted in PVP
 // 4    - restricted in GVG
 // 8    - restricted in Battlegrounds
-// 16   - restricted in WOE:TE castles
 // Restricted zones - configured by 'restricted <number>' mapflag
 // 32   - restricted in zone 1
 // 64   - restricted in zone 2
@@ -18,7 +17,6 @@
 // 512  - restricted in zone 5
 // 1024 - restricted in zone 6
 // 2048 - restricted in zone 7
-// 4096 - restricted in zone 8
 //
 // Examples:
 // 1201,1   // Knife can't be worn on normal maps
@@ -30,250 +28,129 @@
 //----------------------------------------------------------------------------
 // Normal maps
 //----------------------------------------------------------------------------
-2483,1		// Siege_Greave
-2484,1		// Siege_Boots
-2485,1		// Siege_Shoes
-2586,1		// Siege_Manteau
-2587,1		// Siege_Muffler
-15046,1		// Siege_Plate
-15047,1		// Siege_Suits
-15048,1		// Siege_Robe
-1776,1		// Siege_Arrow_S
-1775,1		// Siege_Arrow_A
-1293,1		// Velum_Jamadhar
-1294,1		// Velum_Scare
-1395,1		// Velum_Buster
-1492,1		// Velum_Glaive
-2016,1		// Velum_Arc_Wand
-21001,1		// Velum_Claymore
-21002,1		// Velum_Katzbalger
-18113,1		// Velum_Arbalest
-18114,1		// Velum_CrossBow
-1586,1		// Velum_Bible
-1587,1		// Velum_Encyclopedia
-1832,1		// Velum_Claw
-13072,1		// Velum_Damascus
-16020,1		// Velum_Stunner
-16021,1		// Velum_Flail
-1436,1		// Velum_Spear
-1396,1		// Velum_Guillotine
-11548,1		// Woe_White_Potion
-11549,1		// Woe_Blue_Potion
-11547,1		// Woe_Violet_Potion
-12600,1		// Treasure_Box_Scroll
+2483,1	//Siege_Greave
+2484,1	//Siege_Boots
+2485,1	//Siege_Shoes
+2586,1	//Siege_Manteau
+2587,1	//Siege_Muffler
+15046,1	//Siege_Plate
+15047,1	//Siege_Suits
+15048,1	//Siege_Robe
+1776,1	//Siege_Arrow_S
+1775,1	//Siege_Arrow_A
+1293,1	//Velum_Jamadhar
+1294,1	//Velum_Scare
+1395,1	//Velum_Buster
+1492,1	//Velum_Glaive
+2016,1	//Velum_Arc_Wand
+21001,1	//Velum_Claymore
+21002,1	//Velum_Katzbalger
+18113,1	//Velum_Arbalest
+18114,1	//Velum_CrossBow
+1586,1	//Velum_Bible
+1587,1	//Velum_Encyclopedia
+1832,1	//Velum_Claw
+13072,1	//Velum_Damascus
+16020,1	//Velum_Stunner
+16021,1	//Velum_Flail
+1436,1	//Velum_Spear
+1396,1	//Velum_Guillotine
+11548,1	//Woe_White_Potion
+11549,1	//Woe_Blue_Potion
+11547,1	//Woe_Violet_Potion
+12600,1	//Treasure_Box_Scroll

 //----------------------------------------------------------------------------
 // PVP
 //----------------------------------------------------------------------------
-14529,2		// Greed_Scroll
+14529,2	//Greed_Scroll

 //----------------------------------------------------------------------------
 // GVG
 //----------------------------------------------------------------------------
-12218,4		// Assumptio_5_Scroll
-14529,4		// Greed_Scroll
-14590,4		// Pty_Assumptio_Scroll
+12218,4	//Assumptio_5_Scroll
+14529,4	//Greed_Scroll
+14590,4	//Pty_Assumptio_Scroll

 //----------------------------------------------------------------------------
 // Battlegrounds
 //----------------------------------------------------------------------------
-12218,8		// Assumptio_5_Scroll
-14590,8		// Pty_Assumptio_Scroll
-
-//----------------------------------------------------------------------------
-// CANNOT be consumed/equipped in WoE:TE Castles (16)
-// !TODO: [iRO] Vellums, Siege Equipment & Items, Battlegrounds, God Items 1 & 2
-// !CONFIRM: [idRO] Siege Equipment, God Items 1 & 2: are still usable
-//----------------------------------------------------------------------------
-// Krieger Gear
-1187,16		// Krieger_Twohand_Sword1
-1281,16		// Krieger_Katar1
-1282,16		// Krieger_Katar2
-1310,16		// Krieger_Onehand_Axe1
-1382,16		// Krieger_Twohand_Axe1
-1426,16		// Krieger_Onehand_Spear1
-1486,16		// Krieger_Twohand_Spear1
-1546,16		// Krieger_Onehand_Mace1
-1576,16		// Krieger_Book1
-1577,16		// Krieger_Book2
-1640,16		// Krieger_Onehand_Staff1
-1641,16		// Krieger_Onehand_Staff2
-1743,16		// Krieger_Bow1
-1826,16		// Krieger_Knuckle1
-1827,16		// Krieger_Knuckle2
-1927,16		// Krieger_Instrument1
-1981,16		// Krieger_Whip1
-2002,16		// Krieger_Twohand_Staff1
-2394,16		// Krieger_Suit1
-2395,16		// Krieger_Suit2
-2396,16		// Krieger_Suit3
-2444,16		// Krieger_Shoes1
-2445,16		// Krieger_Shoes2
-2446,16		// Krieger_Shoes3
-2549,16		// Krieger_Muffler1
-2772,16		// Krieger_Ring1
-2773,16		// Krieger_Ring2
-2774,16		// Krieger_Ring3
-13042,16	// Krieger_Dagger1
-13110,16	// Krieger_Pistol1
-13176,16	// Krieger_Rifle1
-13177,16	// Krieger_Gatling1
-13178,16	// Krieger_Shotgun1
-13179,16	// Krieger_Launcher1
-13307,16	// Krieger_Huuma_Shuriken1
-13416,16	// Krieger_Onehand_Sword1
-13417,16	// Krieger_Onehand_Sword2
-13418,16	// Krieger_Onehand_Sword3
-12269,16	// Tasty_Colonel
-12270,16	// Tasty_Major
-12271,16	// Mre_A
-12272,16	// Mre_B
-12273,16	// Mre_C
-
-// Vellum Gear
-1293,16		// Velum_Jamadhar
-1294,16		// Velum_Scare
-1395,16		// Velum_Buster
-1396,16		// Velum_Guillotine
-1436,16		// Velum_Spear
-1492,16		// Velum_Glaive
-1586,16		// Velum_Bible
-1587,16		// Velum_Encyclopedia
-1832,16		// Velum_Claw
-2016,16		// Velum_Arc_Wand
-13072,16	// Velum_Damascus
-16020,16	// Velum_Stunner
-16021,16	// Velum_Flail
-18113,16	// Velum_Arbalest
-18114,16	// Velum_CrossBow
-21001,16	// Velum_Claymore
-21002,16	// Velum_Katzbalger
-
-// Siege Gear
-1775,16		// Siege_Arrow_A
-1776,16		// Siege_Arrow_S
-2483,16		// Siege_Greave
-2484,16		// Siege_Boots
-2485,16		// Siege_Shoes
-2586,16		// Siege_Manteau
-2587,16		// Siege_Muffler
-15046,16	// Siege_Plate
-15047,16	// Siege_Suits
-15048,16	// Siege_Robe
-
-// God Items
-1530,16		// Mjolnir
-2383,16		// Brynhild
-2410,16		// Sleipnir
-2541,16		// Asprika
-2629,16		// Magingiorde
-2630,16		// Brysinggamen
-7058,16		// Gullraifnir
-
-// Misc
-605,16		// Anodyne
-2365,16		// Orleans_Gown
-4077,16		// Phen_Card
-4128,16		// Golden_Bug_Card
-4198,16		// Maya_Puple_Card
-4327,16		// Blood_Butterfly_Card
-11503,16	// Siege_White_Potion
-11504,16	// Siege_Blue_Potion
-11547,16	// Woe_Violet_Potion
-11548,16	// Woe_White_Potion
-11549,16	// Woe_Blue_Potion
-12033,16	// Box_Of_Sunlight
-12213,16	// Neuralizer
-12218,16	// Assumptio_5_Scroll
-12388,16	// Runstone_Crush
-12389,16	// Runstone_Storm
-12390,16	// Runstone_Millennium
-12429,16	// Savage_Full_Roast
-12430,16	// Cocktail_Warg_Blood
-12431,16	// Minor_Stew
-12432,16	// Siroma_Iced_Tea
-12433,16	// Drosera_Herb_Salad
-12434,16	// Petite_Tail_Noodles
-12435,16	// Black_Mass
-12436,16	// Vitata_500
-12437,16	// Concentrated_Ceromain_Soup
-12580,16	// Vending_Search_Scroll
-12581,16	// Vending_Search_Scroll2
-12591,16	// Uni_Catalog_Bz
-12600,16	// Treasure_Box_Scroll
-14590,16	// Pty_Assumptio_Scroll
+12218,8	//Assumptio_5_Scroll
+14590,8	//Pty_Assumptio_Scroll

 //----------------------------------------------------------------------------
 // Zone 1 - Aldebaran Turbo Track
 //----------------------------------------------------------------------------
-601,32		// Wing_Of_Fly
-605,32		// Anodyne
-506,32		// Green_Potion
-525,32		// Panacea
+601,32	//Wing_Of_Fly
+605,32	//Anodyne
+506,32	//Green_Potion
+525,32	//Panacea

 //----------------------------------------------------------------------------
 // Zone 2 - Jail
 //----------------------------------------------------------------------------
-601,64		// Wing_Of_Fly
-602,64		// Wing_Of_Butterfly
-12212,64	// Giant_Fly_Wing
-14582,64	// WOB_Rune
-14583,64	// WOB_Schwaltz
-14584,64	// WOB_Rachel
-14585,64	// WOB_Local
+601,64	//Wing_Of_Fly
+602,64	//Wing_Of_Butterfly
+12212,64	//Giant_Fly_Wing
+14582,64	//WOB_Rune
+14583,64	//WOB_Schwaltz
+14584,64	//WOB_Rachel
+14585,64	//WOB_Local

 //----------------------------------------------------------------------------
 // Zone 3 - Izlude Battle Arena
 //----------------------------------------------------------------------------
-601,128		// Wing_Of_Fly
+601,128	//Wing_Of_Fly

 //----------------------------------------------------------------------------
 // Zone 7 - Towns
 //----------------------------------------------------------------------------
-14529,2048	// Greed_Scroll
+14529,2048	//Greed_Scroll

 //----------------------------------------------------------------------------
-// WoE:TE Items - Only can be used in WoE:TE Castles (All except &16)
+// WoE TE Items - Only can be used in WoE TE maps
+// Assumed WOE TE maps are restricted zone 8.
+// TODO: &1 (Normal) is currently removed since if the map is restricted, it'll fail.
 //----------------------------------------------------------------------------
-1299,8175	// TE_Woe_Katar
-1319,8175	// TE_Woe_Axe
-1399,8175	// TE_Woe_Two_Handed_Axe
-1437,8175	// TE_Woe_Pike
-1495,8175	// TE_Woe_Lance
-1591,8175	// TE_Woe_Book
-1667,8175	// TE_Woe_Staff
-1834,8175	// TE_Woe_Fist
-1932,8175	// TE_Woe_Guitar
-1987,8175	// TE_Woe_Rope
-2019,8175	// TE_Woe_Two_Hand_Staff
-2178,8175	// TE_Woe_Buckler
-2179,8175	// TE_Woe_Shield
-2180,8175	// TE_Woe_Magic_Guard
-2496,8175	// TE_Woe_Shoes
-2497,8175	// TE_Woe_Boots
-2498,8175	// TE_Woe_Magic_Sandal
-2944,8175	// TE_Ring_Of_Protection
-2945,8175	// TE_Ring_Of_Rage
-2946,8175	// TE_Ring_Of_Defiance
-11557,8175	// TE_White_Potion
-11558,8175	// TE_White_Slim_Potion
-13083,8175	// TE_Woe_Knife
-13117,8175	// TE_Woe_Pistol
-13184,8175	// TE_Woe_Rifle
-13185,8175	// TE_Woe_Gatling
-13186,8175	// TE_Woe_Shotgun
-13187,8175	// TE_Woe_Grenade
-13317,8175	// TE_Woe_Huuma
-13439,8175	// TE_Woe_Sword
-15062,8175	// TE_Woe_Coat
-15063,8175	// TE_Woe_Chain_Mail
-15064,8175	// TE_Woe_Mage_Coat
-16025,8175	// TE_Woe_Mace
-18118,8175	// TE_Woe_Bow
-18732,8175	// TE_Woe_Cap
-18733,8175	// TE_Woe_Bone_Helm
-18734,8175	// TE_Woe_Magic_Eyes
-20702,8175	// TE_Woe_Muffler
-20703,8175	// TE_Woe_Manteau
-20704,8175	// TE_Woe_Magic_Manteau
-21006,8175	// TE_Woe_Two_Hand_Sword
+//1299,4094	// TE_Woe_Katar
+//1319,4094	// TE_Woe_Axe
+//1399,4094	// TE_Woe_Two_Handed_Axe
+//1437,4094	// TE_Woe_Pike
+//1495,4094	// TE_Woe_Lance
+//1591,4094	// TE_Woe_Book
+//1667,4094	// TE_Woe_Staff
+//1834,4094	// TE_Woe_Fist
+//1932,4094	// TE_Woe_Guitar
+//1987,4094	// TE_Woe_Rope
+//2019,4094	// TE_Woe_Two_Hand_Staff
+//2178,4094	// TE_Woe_Buckler
+//2179,4094	// TE_Woe_Shield
+//2180,4094	// TE_Woe_Magic_Guard
+//2496,4094	// TE_Woe_Shoes
+//2497,4094	// TE_Woe_Boots
+//2498,4094	// TE_Woe_Magic_Sandal
+//2944,4094	// TE_Ring_Of_Protection
+//2945,4094	// TE_Ring_Of_Rage
+//2946,4094	// TE_Ring_Of_Defiance
+//11557,4094	// TE_White_Potion
+//11558,4094	// TE_White_Slim_Potion
+//13083,4094	// TE_Woe_Knife
+//13117,4094	// TE_Woe_Pistol
+//13184,4094	// TE_Woe_Rifle
+//13185,4094	// TE_Woe_Gatling
+//13186,4094	// TE_Woe_Shotgun
+//13187,4094	// TE_Woe_Grenade
+//13317,4094	// TE_Woe_Huuma
+//13439,4094	// TE_Woe_Sword
+//15062,4094	// TE_Woe_Coat
+//15063,4094	// TE_Woe_Chain_Mail
+//15064,4094	// TE_Woe_Mage_Coat
+//16025,4094	// TE_Woe_Mace
+//18118,4094	// TE_Woe_Bow
+//18732,4094	// TE_Woe_Cap
+//18733,4094	// TE_Woe_Bone_Helm
+//18734,4094	// TE_Woe_Magic_Eyes
+//20702,4094	// TE_Woe_Muffler
+//20703,4094	// TE_Woe_Manteau
+//20704,4094	// TE_Woe_Magic_Manteau
+//21006,4094	// TE_Woe_Two_Hand_Sword
--- a/db/re/item_trade.txt
+++ b/db/re/item_trade.txt
@@ -54,11 +54,11 @@
 1288,507,100	// Bloody_Fear_C
 1289,499,100	// P_Katar1
 1296,499,100	// Metal_Katar
-1299,499,100	// TE_Woe_Katar
+//1299,499,100	//
 1310,499,100	// Krieger_Onehand_Axe1
 1312,507,100	// Orcish_Axe_C
 1313,499,100	// Tourist_Axe
-1319,499,100	// TE_Woe_Axe
+//1319,499,100	//
 1372,507,100	// Right_Epsilon_C
 1373,507,100	// Brood_Axe_C
 1374,507,100	// Tomahawk_C
@@ -70,7 +70,7 @@
 1388,507,100	// Two_Handed_Axe_C
 1391,499,100	// P_Two_Handed_Axe1
 1398,499,100	// Metal_Two_Handed_Axe
-1399,499,100	// TE_Woe_Two_Handed_Axe
+//1399,499,100	//
 1419,507,100	// Pole_Axe_C
 1423,475,100	// Pole_XO
 1424,507,100	// Skewer_C
@@ -81,14 +81,14 @@
 1429,475,100	// Hunting_Spear_M
 1430,507,100	// Pike_C
 1434,499,100	// P_Spear1
-1437,499,100	// TE_Woe_Pike
+//1437,499,100	//
 1482,499,100	// BF_Lance1
 1486,499,100	// Krieger_Twohand_Spear1
 1487,507,100	// Lance_C
 1488,507,100	// Ahlspiess_C
 1489,507,100	// Spearfish_
 1493,499,100	// Metal_Lance
-1495,499,100	// TE_Woe_Lance
+//1495,499,100	//
 1533,507,100	// Warrior_Balmung
 1534,507,100	// Spanner_C
 1536,475,100	// Good_Morning_Star
@@ -109,7 +109,7 @@
 1580,507,100	// Encyclopedia_C
 1583,499,100	// P_Book1
 1588,499,100	// Metal_Book
-1591,499,100	// TE_Woe_Book
+//1591,499,100	//
 //1598,499,100	//
 1623,507,100	// Mighty_Staff_C
 1627,475,100	// Staffy
@@ -129,7 +129,7 @@
 1652,499,100	// Tourist_Staff
 1653,507,100	// Staff_Of_Healing_C
 1658,499,100	// P_Staff3
-1667,499,100	// TE_Woe_Staff
+//1667,499,100	//
 1703,507,100	// Bow__
 1728,507,100	// Balistar_C
 1729,507,100	// Bow_Of_Rudra_C
@@ -149,7 +149,7 @@
 1828,507,100	// Monk_Knuckle
 1829,507,100	// Fist_C
 1831,499,100	// P_Knuckle1
-1834,499,100	// TE_Woe_Fist
+//1834,499,100	//
 1921,475,100	// Guh_Moon_Gom
 1923,499,100	// BF_Instrument1
 1924,499,100	// BF_Instrument2
@@ -157,7 +157,7 @@
 1928,507,100	// Berserk_Guitar_I
 1929,507,100	// Guitar_C
 1931,499,100	// P_Guitar1
-1932,499,100	// TE_Woe_Guitar
+//1932,499,100	//
 1938,467,100	// Infinity_Violin
 1975,475,100	// Queen_Is_Whip
 1977,499,100	// BF_Whip1
@@ -166,12 +166,12 @@
 1982,507,100	// Phenomena_Whip
 1983,507,100	// Rante_C
 1986,499,100	// P_Tail1
-1987,499,100	// TE_Woe_Rope
+//1987,499,100	//
 1994,467,100	// Infinity_Whip
 2002,499,100	// Krieger_Twohand_Staff1
 2003,475,100	// Destruction_Rod_M
 2018,499,100	// Metal_Staff
-2019,499,100	// TE_Woe_Two_Hand_Staff
+//2019,499,100	//
 2024,467,100	// Infinity_Two-handed_Stick
 2112,499,100	// Novice_Guard
 2127,475,100	// Secular_Mission
@@ -181,9 +181,9 @@
 2140,507,100	// Energy_Rune_Guard
 2145,467,100	// Time_Keepr_Shield
 2152,507,100	// Anti_Demon_Shield_C
-2178,499,100	// TE_Woe_Buckler
-2179,499,100	// TE_Woe_Shield
-2180,499,100	// TE_Woe_Magic_Guard
+//2178,499,100	//
+//2179,499,100	//
+//2180,499,100	//
 2352,499,100	// Novice_Plate
 2358,475,100	// Dress_Of_Angel
 2368,467,100	// Golden_Armor
@@ -227,9 +227,9 @@
 2458,499,100	// Para_Team_Boots3
 2463,507,100	// Feral_Boots
 2473,499,100	// Para_Team_Boots4
-2496,499,100	// TE_Woe_Shoes
-2497,499,100	// TE_Woe_Boots
-2498,499,100	// TE_Woe_Magic_Sandal
+//2496,499,100	//
+//2497,499,100	//
+//2498,499,100	//
 2510,499,100	// Novice_Hood
 2533,507,100	// Freyja_Cape
 2534,475,100	// Ruffler
@@ -372,10 +372,10 @@
 2940,499,100	// Ninja_Manual
 2941,499,100	// Gunslinger_Manual
 2942,499,100	// Taekwon_Manual
-2944,499,100	// TE_Ring_Of_Protection
-2945,499,100	// TE_Ring_Of_Rage
-2946,499,100	// TE_Ring_Of_Defiance
-2950,507,100	// Rune_Ring
+//2944,499,100	//
+//2945,499,100	//
+//2946,499,100	//
+//2950,507,100	//
 2981,467,100	// Warrior's_Ring
 2997,475,100	// RWC_Gold_Brooch
 2999,475,100	// RWC_Brooch
@@ -774,6 +774,8 @@
 6566,499,100	// Cacao99_Recipe
 6567,499,100	// Choco_Drink_Recipe
 //6584,475,100	//
+//6584,475,100	//
+//6585,475,100	//
 //6585,475,100	//
 //6586,507,100	//
 6593,499,100	// Cryptura_Hair_Coupon
@@ -929,7 +931,7 @@
 6955,499,100	// Piece_Of_Soul_Pig
 6956,499,100	// Captured_Sheep
 6957,499,100	// Lamb_Fleece
-6960,467,100	// Key_Air_Fortress
+//6960,467,100	//
 //6993,475,100	//
 //6994,475,100	//
 7025,475,100	// Lucifer's_Lament
@@ -1508,13 +1510,13 @@
 //12855,475,100	//
 //12871,475,100	//
 //12872,475,100	//
-12873,475,100	// TE_Potion_Box
+//12873,475,100	//
 12883,475,100	// Almighty
 12884,507,100	// Infinite_Concentration_Potion
 12885,507,100	// Infinite_Awakening_Potion
 12886,507,100	// Infinite_Berserk_Potion
 12887,507,100	// C_Wing_Of_Fly
-12888,507,100	// Siege_Kit_Box
+//12888,507,100	//
 12900,475,100	// Battle_Manual_Box
 12901,475,100	// Insurance_Package
 12902,475,100	// Bubble_Gum_Box
@@ -1635,7 +1637,7 @@
 13068,507,100	// Saurel
 13074,507,100	// Ninja_Cutter
 13079,499,100	// Metal_Dagger
-13083,499,100	// TE_Woe_Knife
+//13083,499,100	//
 13108,499,100	// BF_Pistol1
 13109,507,100	// Wasteland_Outlaw_C
 13110,499,100	// Krieger_Pistol1
@@ -1643,7 +1645,7 @@
 13112,499,100	// P_Revolver1
 13113,499,100	// P_Revolver2
 13114,499,100	// P_Revolver3
-13117,499,100	// TE_Woe_Pistol
+//13117,499,100	//
 13118,499,100	// Spark_Light
 13119,467,100	// Spark_Of_Freedom
 13125,499,100	// Metal_Revolver
@@ -1657,10 +1659,10 @@
 13177,499,100	// Krieger_Gatling1
 13178,499,100	// Krieger_Shotgun1
 13179,499,100	// Krieger_Launcher1
-13184,499,100	// TE_Woe_Rifle
-13185,499,100	// TE_Woe_Gatling
-13186,499,100	// TE_Woe_Shotgun
-13187,499,100	// TE_Woe_Grenade
+//13184,499,100	//
+//13185,499,100	//
+//13186,499,100	//
+//13187,499,100	//
 13208,475,100	// Gong_Bug
 13291,475,100	// Starfish
 13292,475,100	// Dried_Squid
@@ -1673,7 +1675,7 @@
 13309,507,100	// Huuma_Giant_Wheel_C
 13310,499,100	// P_Huuma_Suriken1
 13312,507,100	// Huuma_Job_Test
-13317,499,100	// TE_Woe_Huuma
+//13317,499,100	//
 13322,499,100	// Huuma_Metal_Shuriken
 13323,467,100	// Infinity_Shuriken
 13401,507,100	// Excalibur_C
@@ -1694,7 +1696,7 @@
 13424,499,100	// P_Sabre2
 13425,499,100	// Tourist_Sword
 13434,499,100	// P_Saber3
-13439,499,100	// TE_Woe_Sword
+//13439,499,100	//
 13500,475,100	// Insurance60_Package
 13501,475,100	// Assorted_Scroll_Box
 13502,475,100	// Drooping_Kitty_Box
@@ -2820,10 +2822,10 @@
 15031,499,100	// Para_Team_Armor
 15033,507,100	// Tutorial_Mattle
 15034,507,100	// Tutorial_Mattle_
-15062,499,100	// TE_Woe_Coat
-15063,499,100	// TE_Woe_Chain_Mail
-15064,499,100	// TE_Woe_Mage_Coat
-15067,507,100	// Rune_Suit
+//15062,499,100	//
+//15063,499,100	//
+//15064,499,100	//
+//15067,507,100	//
 15116,467,100	// Armor_Of_Airship
 15141,467,100	// Ancient_Armor_Of_The_Goddess
 16002,507,100	// Stunner_C
@@ -2833,7 +2835,7 @@
 16014,499,100	// P_Mace3
 16016,507,100	// Tuna
 16023,499,100	// Metal_Mace
-16025,499,100	// TE_Woe_Mace
+//16025,499,100	//
 16038,467,100	// Infinity_Mace
 //16100,475,100	//
 //16101,475,100	//
@@ -3595,7 +3597,7 @@
 17550,475,100	// (Limited)High_Density_Kalunium_Box(30)
 17567,475,100	// Event_Almighty_Box
 17568,475,100	// Event_Almighty_Box(100)
-17569,475,100	// Dungeon_1_hour_Ticket_Box
+//17569,475,100	//
 //17570,475,100	//
 //17573,475,100	//
 //17574,475,100	//
@@ -3824,7 +3826,7 @@
 22894,507,100	// (Limited)2015_Neuralizer
 22895,507,100	// (Limited)2015_Status_Initialization_Volume
 22896,507,100	// (Limited)Old_Status_Initialization_Volume
-22901,499,100	// Question_Old_Blue_Box
+//22901,499,100	//
 22902,475,100	// Sealed_Card_Album_Scroll_II
 //22906,475,100	//
 //22946,475,100	//
--- a/db/re/map_cache.dat
+++ b/db/re/map_cache.dat
--- a/db/re/mob_db.txt
+++ b/db/re/mob_db.txt
@@ -778,7 +778,7 @@
 1722,EVENT_JAKK,Jakk,Jakk,99,10310,0,93,90,1,115,182,8,11,1,28,18,13,35,45,10,12,1,0,43,0x81,240,1180,480,648,0,0,0,0,0,0,0,7225,1000,1062,1000,535,1000,0,0,0,0,0,0,0,0,0,0,0,0,5134,10000
 1723,A_SHECIL,Shecil Damon,Cecil Damon,82,30000,0,0,0,14,600,900,40,15,1,145,27,32,134,80,10,12,1,7,64,0x3695,180,1008,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1724,A_POTON_CANON,Photon Cannon,Photon Cannon,66,8000,0,0,0,9,1000,1300,16,30,1,40,25,20,80,80,10,12,1,0,40,0x84,300,1536,960,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1725,R_PORING,Poring,Poring,1,50,0,0,0,1,7,10,0,5,1,1,1,0,6,30,10,12,1,3,21,0x81,150,1872,672,480,0,0,0,0,0,0,0,7049,10000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1725,R_PORING,Poring,Poring,1,50,0,0,0,1,7,10,0,5,1,1,1,0,6,30,10,12,1,3,21,0x83,150,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1726,R_LUNATIC,Lunatic,Lunatic,3,60,0,0,0,1,9,12,0,20,1,3,3,10,8,60,10,12,0,2,60,0x83,150,1456,456,336,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1727,R_SAVAGE_BABE,Savage Babe,Savage Babe,7,182,0,0,0,1,20,25,0,0,1,7,14,5,12,35,10,12,0,2,22,0x83,150,1624,624,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1728,R_DESERT_WOLF_B,Desert Wolf Baby,Baby Desert Wolf,14,140,1,0,0,1,33,41,13,0,10,12,8,5,28,7,10,12,0,2,23,0x83,150,1600,900,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -1088,7 +1088,7 @@
 1991,TENDRILRION,Tendrillion,Tendrillion,126,1397451,1,100772,75299,2,1002,2322,132,123,144,66,77,181,145,132,10,12,1,2,42,0x37B5,100,500,960,360,0,0,0,0,0,0,0,2544,500,1186,100,1637,100,6033,9000,6224,10,7197,5335,7008,4850,0,0,0,0,4463,1
 1992,CORNUS,Cornus,Cornus,120,20722,1,6240,4004,2,288,810,66,95,51,47,59,99,93,77,10,12,1,2,66,0x1089,120,1000,624,300,0,0,0,0,0,0,0,2387,10,2743,1,6023,4000,7063,3000,6224,10,2257,2,1420,1,0,0,0,0,4448,1
 1993,NAGA,Naga,Naga,117,21099,1,2944,2212,3,489,591,72,5,112,65,71,32,71,33,10,12,2,2,42,0x3695,150,400,864,432,0,0,0,0,0,0,0,2389,10,2134,10,1485,10,6224,10,936,3500,954,2000,1408,20,0,0,0,0,4469,1
-1994,LUCIOLA_VESPA,Luciola Vespa,Luciola Vespa,109,12466,1,1622,1806,1,299,410,59,55,88,89,55,32,119,59,10,12,1,4,24,0x7185,110,1000,864,432,0,0,0,0,0,0,0,2744,2,6224,1,939,9000,518,300,992,160,526,200,943,3000,15043,1,0,0,4445,1
+1994,LUCIOLA_VESPA,Luciola Vespa,Luciola Vespa,109,12466,1,1622,1806,1,299,410,59,55,88,89,55,32,119,59,10,12,1,4,24,0x7795,110,1000,864,432,0,0,0,0,0,0,0,2744,2,6224,1,939,9000,518,300,992,160,526,200,943,3000,15043,1,0,0,4445,1
 1995,PINGUICULA,Pinguicula,Pinguicula,105,13058,1,2221,1662,1,189,511,46,77,67,60,64,107,64,34,10,12,1,3,62,0x308D,200,700,600,360,0,0,0,0,0,0,0,2745,1,1980,10,2270,10,7100,5000,7198,2000,7188,3000,7939,1000,0,0,0,0,4476,1
 //1996,BACSOJIN_T,Bacsojin,White Lady,97,720500,1,668160,542880,3,1088,3124,210,178,118,244,98,126,205,102,10,12,2,7,64,0x37B5,130,576,960,480,0,0,0,0,0,0,0,5411,3,2638,80,2639,80,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1997,G_TATACHO,Tatacho,Tatacho,128,33336,1,0,0,2,727,799,151,14,119,33,70,56,78,33,10,12,1,2,22,0x108B,200,1000,768,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -1353,13 +1353,13 @@
 2220,E_QUVE,Quve,Messenger of Devil,1,60,1,27,20,1,8,9,2,5,6,1,1,0,6,5,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

 // Lighthalzen Biolab F4
-2221,RANDEL,Randel,Randel,141,478745,0,32367,24055,1,3055,4277,180,56,142,69,86,49,132,55,10,12,1,7,66,0x3095,170,76,384,288,0,0,0,0,0,0,0,7345,3000,6470,300,6471,300,985,100,617,10,1435,1,2162,1,0,0,0,0,4572,1
-2222,FLAMEL,Flamel,Flamel,141,316468,0,31166,21445,1,1074,1503,93,40,138,79,62,53,82,48,10,12,1,7,63,0x3095,180,76,384,288,0,0,0,0,0,0,0,7345,3000,6470,300,6471,300,984,100,617,10,16010,10,15044,1,0,0,0,0,4570,1
-2223,CELIA,Celia,Celia,141,253145,0,22107,19017,1,1612,2256,74,312,108,78,55,144,139,49,10,12,1,7,68,0x3295,150,1152,384,288,0,0,0,0,0,0,0,7345,3000,6470,300,6471,300,985,100,1654,10,2853,10,18111,1,0,0,0,0,4568,1
-2224,CHEN,Chen,Chen,141,218721,2000,25684,19810,1,2501,3501,125,56,126,74,71,123,99,65,10,12,1,6,81,0x3295,180,1152,384,288,0,0,0,0,0,0,0,7347,2000,6470,300,6471,300,984,100,617,10,1814,10,1659,1,0,0,0,0,4569,1
-2225,GERTIE,Gertie,Gertie,141,266926,0,24267,20233,1,3684,5157,108,10,145,87,59,67,127,76,10,12,1,6,85,0x3195,180,76,384,288,0,0,0,0,0,0,0,7347,2000,6470,300,6471,300,985,100,617,10,13061,10,18109,1,0,0,0,0,4571,1
-2226,ALPHOCCIO,Alphoccio,Alphoccio,142,256202,0,22192,20322,1,1273,1782,84,15,121,126,67,80,165,42,10,12,1,7,64,0x3095,180,76,384,288,0,0,0,0,0,0,0,7347,2000,6470,300,6471,300,984,100,617,10,1930,10,2161,1,0,0,0,0,4567,1
-2227,TRENTINI,Trentini,Trentini,142,204962,0,15995,13248,1,1070,1498,70,12,121,126,67,80,165,42,10,12,1,7,64,0x3095,180,76,384,288,0,0,0,0,0,0,0,7347,2000,6470,300,6471,300,985,100,1984,10,2465,10,2892,1,0,0,0,0,4573,1
+2221,RANDEL,Randel,Randel,141,478745,0,32367,24055,1,3055,4277,180,56,142,69,86,49,132,55,10,12,1,7,66,0x3095,170,76,384,288,0,0,0,0,0,0,0,7345,3000,6470,300,6471,300,985,100,617,10,1435,1,2162,1,0,0,0,0,0,0
+2222,FLAMEL,Flamel,Flamel,141,316468,0,31166,21445,1,1074,1503,93,40,138,79,62,53,82,48,10,12,1,7,63,0x3095,180,76,384,288,0,0,0,0,0,0,0,7345,3000,6470,300,6471,300,984,100,617,10,16010,10,15044,1,0,0,0,0,0,0
+2223,CELIA,Celia,Celia,141,253145,0,22107,19017,1,1612,2256,74,312,108,78,55,144,139,49,10,12,1,7,68,0x3295,150,1152,384,288,0,0,0,0,0,0,0,7345,3000,6470,300,6471,300,985,100,1654,10,2853,10,18111,1,0,0,0,0,0,0
+2224,CHEN,Chen,Chen,141,218721,2000,25684,19810,1,2501,3501,125,56,126,74,71,123,99,65,10,12,1,6,81,0x3295,180,1152,384,288,0,0,0,0,0,0,0,7347,2000,6470,300,6471,300,984,100,617,10,1814,10,1659,1,0,0,0,0,0,0
+2225,GERTIE,Gertie,Gertie,141,266926,0,24267,20233,1,3684,5157,108,10,145,87,59,67,127,76,10,12,1,6,85,0x3195,180,76,384,288,0,0,0,0,0,0,0,7347,2000,6470,300,6471,300,985,100,617,10,13061,10,18109,1,0,0,0,0,0,0
+2226,ALPHOCCIO,Alphoccio,Alphoccio,142,256202,0,22192,20322,1,1273,1782,84,15,121,126,67,80,165,42,10,12,1,7,64,0x3095,180,76,384,288,0,0,0,0,0,0,0,7347,2000,6470,300,6471,300,984,100,617,10,1930,10,2161,1,0,0,0,0,0,0
+2227,TRENTINI,Trentini,Trentini,142,204962,0,15995,13248,1,1070,1498,70,12,121,126,67,80,165,42,10,12,1,7,64,0x3095,180,76,384,288,0,0,0,0,0,0,0,7347,2000,6470,300,6471,300,985,100,1984,10,2465,10,2892,1,0,0,0,0,0,0
 2228,G_RANDEL,Paladin Randel,Paladin Randel,160,3870000,0,18000,10000,1,3055,4277,667,151,303,165,181,110,178,66,10,12,1,7,86,0x37B5,100,76,384,288,0,0,0,0,0,0,0,6224,100,617,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 2229,G_FLAMEL,Creator Flamel,Creator Flamel,160,2230000,0,18000,10000,1,1074,1503,253,133,275,148,156,72,177,60,10,12,1,7,83,0x37B5,100,76,384,288,0,0,0,0,0,0,0,6223,100,617,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 2230,G_CELIA,Professor Celia,Professor Celia,160,1847804,0,18000,10000,1,1612,2256,201,543,165,190,142,236,199,93,10,12,1,7,88,0x37B5,150,1152,384,288,0,0,0,0,0,0,0,6224,100,617,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -1367,13 +1367,13 @@
 2232,G_GERTIE,Stalker Gertie,Stalker Gertie,160,2057279,0,18000,10000,1,3684,5157,251,107,211,181,114,83,225,60,10,12,1,6,85,0x37B5,100,76,384,288,0,0,0,0,0,0,0,6224,100,617,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 2233,G_ALPHOCCIO,Clown Alphoccio,Clown Alphoccio,160,1894278,0,18000,10000,1,1273,1782,201,109,176,258,155,132,309,95,10,12,1,7,84,0x37B5,100,76,384,288,0,0,0,0,0,0,0,6223,100,617,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 2234,G_TRENTINI,Gypsy Trentini,Gypsy Trentini,160,1894278,0,18000,10000,1,1070,1498,181,112,176,258,155,132,309,95,10,12,1,7,84,0x37B5,100,76,384,288,0,0,0,0,0,0,0,6224,100,617,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2235,B_RANDEL,Paladin Randel,Paladin Randel,160,6870000,0,4621500,2664000,1,3055,4277,667,151,303,165,181,110,178,66,10,12,1,7,86,0x37B5,100,76,384,288,2310750,617,5500,603,2250,732,450,12623,9000,12616,9000,616,9000,6224,9000,13062,5000,2160,5000,1490,5000,0,0,0,0,4565,1
-2236,B_FLAMEL,Creator Flamel,Creator Flamel,160,4230000,0,5223570,2630354,1,1074,1503,253,133,275,148,156,72,177,60,10,12,1,7,83,0x37B5,100,76,384,288,2611785,617,5500,603,2250,732,450,12623,9000,12616,9000,616,9000,6223,9000,1387,5000,1392,5000,1393,5000,0,0,0,0,4563,1
-2237,B_CELIA,Professor Celia,Professor Celia,160,3847804,0,5027308,2509792,1,1612,2256,201,543,165,190,142,236,199,93,10,12,1,7,88,0x37B5,150,1152,384,288,2513654,617,5500,603,2250,732,450,12623,9000,12616,9000,616,9000,6224,9000,2854,5000,1584,5000,2582,5000,0,0,0,0,4561,1
-2238,B_CHEN,Champion Chen,Champion Chen,160,4249350,5000,5113568,2934974,1,2501,3501,216,134,172,150,164,203,155,88,10,12,1,6,81,0x37B5,125,1152,384,288,2556784,617,5500,603,2250,732,450,12623,9000,12616,9000,616,9000,6223,9000,1285,5000,1813,5000,16017,5000,0,0,0,0,4562,1
-2239,B_GERTIE,Stalker Gertie,Stalker Gertie,160,4057279,0,4420698,2691274,1,3684,5157,251,107,211,181,114,83,225,60,10,12,1,6,85,0x37B5,100,76,384,288,2210349,617,5500,603,2250,732,450,12623,9000,12616,9000,616,9000,6224,9000,13069,5000,13070,5000,1291,5000,0,0,0,0,4564,1
-2240,B_ALPHOCCIO,Clown Alphoccio,Clown Alphoccio,160,3894278,0,4226036,2468972,1,1273,1782,201,109,176,258,155,132,309,95,10,12,1,7,84,0x37B5,100,76,384,288,2113018,617,5500,603,2250,732,450,12623,9000,12616,9000,616,9000,6223,9000,18103,5000,1290,5000,1913,5000,0,0,0,0,4560,1
-2241,B_TRENTINI,Gypsy Trentini,Gypsy Trentini,160,3894278,0,4463758,2563096,1,1070,1498,181,112,176,258,155,132,309,95,10,12,1,7,84,0x37B5,100,76,384,288,2231879,0,0,0,0,0,0,12623,9000,12616,9000,616,9000,6224,9000,18103,5000,18110,5000,1963,5000,0,0,0,0,4566,1
+2235,B_RANDEL,Paladin Randel,Paladin Randel,160,6870000,0,4621500,2664000,1,3055,4277,667,151,303,165,181,110,178,66,10,12,1,7,86,0x37B5,100,76,384,288,2310750,617,5500,603,2250,732,450,12623,9000,12616,9000,616,9000,6224,9000,13062,5000,2160,5000,1490,5000,0,0,0,0,0,0
+2236,B_FLAMEL,Creator Flamel,Creator Flamel,160,4230000,0,5223570,2630354,1,1074,1503,253,133,275,148,156,72,177,60,10,12,1,7,83,0x37B5,100,76,384,288,2611785,617,5500,603,2250,732,450,12623,9000,12616,9000,616,9000,6223,9000,1387,5000,1392,5000,1393,5000,0,0,0,0,0,0
+2237,B_CELIA,Professor Celia,Professor Celia,160,3847804,0,5027308,2509792,1,1612,2256,201,543,165,190,142,236,199,93,10,12,1,7,88,0x37B5,150,1152,384,288,2513654,617,5500,603,2250,732,450,12623,9000,12616,9000,616,9000,6224,9000,2854,5000,1584,5000,2582,5000,0,0,0,0,0,0
+2238,B_CHEN,Champion Chen,Champion Chen,160,4249350,5000,5113568,2934974,1,2501,3501,216,134,172,150,164,203,155,88,10,12,1,6,81,0x37B5,125,1152,384,288,2556784,617,5500,603,2250,732,450,12623,9000,12616,9000,616,9000,6223,9000,1285,5000,1813,5000,16017,5000,0,0,0,0,0,0
+2239,B_GERTIE,Stalker Gertie,Stalker Gertie,160,4057279,0,4420698,2691274,1,3684,5157,251,107,211,181,114,83,225,60,10,12,1,6,85,0x37B5,100,76,384,288,2210349,617,5500,603,2250,732,450,12623,9000,12616,9000,616,9000,6224,9000,13069,5000,13070,5000,1291,5000,0,0,0,0,0,0
+2240,B_ALPHOCCIO,Clown Alphoccio,Clown Alphoccio,160,3894278,0,4226036,2468972,1,1273,1782,201,109,176,258,155,132,309,95,10,12,1,7,84,0x37B5,100,76,384,288,2113018,617,5500,603,2250,732,450,12623,9000,12616,9000,616,9000,6223,9000,18103,5000,1290,5000,1913,5000,0,0,0,0,0,0
+2241,B_TRENTINI,Gypsy Trentini,Gypsy Trentini,160,3894278,0,4463758,2563096,1,1070,1498,181,112,176,258,155,132,309,95,10,12,1,7,84,0x37B5,100,76,384,288,2231879,0,0,0,0,0,0,12623,9000,12616,9000,616,9000,6224,9000,18103,5000,18110,5000,1963,5000,0,0,0,0,0,0
 2242,MD_DESERT_WOLF,Desert Wolf,Desert Wolf,135,551578,0,0,0,1,1040,1158,151,39,93,69,63,61,82,42,10,12,1,6,20,0x37B5,200,1120,420,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 2243,MD_DESERT_WOLF_B,Desert Wolf,Desert Wolf,130,274531,0,0,0,1,66,82,13,0,10,12,8,5,17,7,10,12,0,6,20,0x37B5,300,1600,900,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 2244,QUEST_CHEN,Champion Chen,Dark Martial Arts Master,130,300,1,0,0,1,103,126,25,56,122,81,83,130,201,61,10,12,1,7,81,0x37B5,300,200,768,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -1384,14 +1384,14 @@
 2248,GOLDPORING,Golden Poring,Golden Poring,1,15,1,0,0,0,0,0,160,5,1,1,1,1,999,1,10,12,1,3,21,0xC3,400,1872,672,480,0,0,0,0,0,0,0,6012,2000,6485,2000,6486,2000,6487,2000,7470,2000,7602,2000,6487,2000,969,10,0,0,0,0

 // Hall of Abyss Guild Dungeon
-2249,PYURIEL,Pyuriel,Angry Student Pyuriel,141,2205000,1,1500123,1200000,2,2515,4028,388,206,196,131,125,276,401,156,10,12,1,7,83,0x37B5,100,576,1380,360,750061,12246,5000,617,5000,617,5000,12623,100,617,3000,616,500,12675,3000,12679,2000,12680,1000,0,0,0,0,0,0,4578,1
-2250,LORA,Lora,Warrior Laura,136,500255,1,16567,13788,2,1985,3686,224,58,144,92,86,69,149,68,10,12,0,7,43,0x3795,130,1600,432,360,0,0,0,0,0,0,0,12623,5,617,3000,616,50,12675,50,12679,500,12680,500,0,0,0,0,0,0,4579,1
-2251,GIOIA,Gioia,Gioia,146,2507989,1,1503451,1303547,1,1105,3706,436,218,180,201,156,190,299,77,10,12,2,0,84,0x37B5,100,1344,2592,432,751725,12246,5000,617,5000,617,5000,12623,100,617,3000,616,500,12675,3000,12679,2000,12680,1000,0,0,0,0,0,0,4576,1
-2252,ELVIRA,Elvira,Elvira,138,501765,1,17847,13569,3,699,2800,171,68,189,105,92,85,198,72,10,12,0,0,64,0x3795,120,880,1224,360,0,0,0,0,0,0,0,12623,5,617,3000,616,50,12675,50,12679,500,12680,500,0,0,0,0,0,0,4577,1
-2253,DAEHYON,Daehyon,General Daehyun,142,2500148,1,1501561,1274220,2,2710,4120,494,123,116,123,154,99,217,98,10,12,2,7,62,0x37B5,100,900,792,432,750780,12246,5000,617,5000,617,5000,12623,100,617,3000,616,500,12675,3000,12679,2000,12680,1000,0,0,0,0,0,0,4574,1
-2254,SOHEON,Soheon,Samurai Soheon,137,502015,1,15715,12540,2,1591,2627,210,178,118,244,98,126,246,102,10,12,1,7,64,0x3795,120,1000,1008,432,0,0,0,0,0,0,0,12623,5,617,3000,616,50,12675,50,12679,500,12680,500,0,0,0,0,0,0,4575,1
-2255,KADES,Kades,Dark Guardian Kades,143,2505000,1,1604000,1310000,1,2201,4202,479,262,191,223,187,155,362,163,10,12,2,0,67,0x37B5,100,900,648,480,802000,12246,5000,617,5000,617,5000,12623,100,617,3000,616,500,12675,3000,12679,2000,12680,1000,0,0,0,0,0,0,4580,1
-2256,RUDO,Rudo,Rudo,135,501489,1,13633,12409,1,1401,2902,196,96,106,65,61,42,125,72,10,12,0,8,66,0x3795,120,1576,504,360,0,0,0,0,0,0,0,12623,5,617,3000,616,50,12675,50,12679,500,12680,500,0,0,0,0,0,0,4581,1
+2249,PYURIEL,Pyuriel,Angry Student Pyuriel,141,2205000,1,1500123,1200000,2,2515,4028,388,206,196,131,125,276,401,156,10,12,1,7,83,0x37B5,100,576,1380,360,750061,12246,5000,617,5000,617,5000,12623,100,617,3000,616,500,12675,3000,12679,2000,12680,1000,0,0,0,0,0,0,0,0
+2250,LORA,Lora,Warrior Laura,136,500255,1,16567,13788,2,1985,3686,224,58,144,92,86,69,149,68,10,12,0,7,43,0x3795,130,1600,432,360,0,0,0,0,0,0,0,12623,5,617,3000,616,50,12675,50,12679,500,12680,500,0,0,0,0,0,0,0,0
+2251,GIOIA,Gioia,Gioia,146,2507989,1,1503451,1303547,1,1105,3706,436,218,180,201,156,190,299,77,10,12,2,0,84,0x37B5,100,1344,2592,432,751725,12246,5000,617,5000,617,5000,12623,100,617,3000,616,500,12675,3000,12679,2000,12680,1000,0,0,0,0,0,0,0,0
+2252,ELVIRA,Elvira,Elvira,138,501765,1,17847,13569,3,699,2800,171,68,189,105,92,85,198,72,10,12,0,0,64,0x3795,120,880,1224,360,0,0,0,0,0,0,0,12623,5,617,3000,616,50,12675,50,12679,500,12680,500,0,0,0,0,0,0,0,0
+2253,DAEHYON,Daehyon,General Daehyun,142,2500148,1,1501561,1274220,2,2710,4120,494,123,116,123,154,99,217,98,10,12,2,7,62,0x37B5,100,900,792,432,750780,12246,5000,617,5000,617,5000,12623,100,617,3000,616,500,12675,3000,12679,2000,12680,1000,0,0,0,0,0,0,0,0
+2254,SOHEON,Soheon,Samurai Soheon,137,502015,1,15715,12540,2,1591,2627,210,178,118,244,98,126,246,102,10,12,1,7,64,0x3795,120,1000,1008,432,0,0,0,0,0,0,0,12623,5,617,3000,616,50,12675,50,12679,500,12680,500,0,0,0,0,0,0,0,0
+2255,KADES,Kades,Dark Guardian Kades,143,2505000,1,1604000,1310000,1,2201,4202,479,262,191,223,187,155,362,163,10,12,2,0,67,0x37B5,100,900,648,480,802000,12246,5000,617,5000,617,5000,12623,100,617,3000,616,500,12675,3000,12679,2000,12680,1000,0,0,0,0,0,0,0,0
+2256,RUDO,Rudo,Rudo,135,501489,1,13633,12409,1,1401,2902,196,96,106,65,61,42,125,72,10,12,0,8,66,0x3795,120,1576,504,360,0,0,0,0,0,0,0,12623,5,617,3000,616,50,12675,50,12679,500,12680,500,0,0,0,0,0,0,0,0
 2257,I_PIAMETTE,Piamette,Piamette,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 2258,I_PIAMETTE_,Piamette,Piamette,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 2259,I_GARDEN_KEEPER,Garden Keeper,Garden Keeper,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -1448,17 +1448,17 @@
 2308,KO_ZANZOU,Zanzou,Zanzou,140,5,0,0,0,1,0,0,100,0,0,0,0,0,1199,0,10,12,0,0,26,0x0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

 // Malaya Port
-2309,BUNGISNGIS,Bungisngis,Bungisngis,121,25513,0,1940,1650,1,851,1002,115,35,71,32,61,30,74,19,10,12,2,7,42,0x3795,200,1568,432,360,0,0,0,0,0,0,0,7054,1000,6511,1000,985,10,12700,100,0,0,0,0,0,0,0,0,0,0,4582,1
-2310,ENGKANTO,Engkanto,Engkanto,125,23948,1,1723,1547,1,675,799,101,41,68,57,49,57,81,27,10,12,1,7,40,0x3795,200,1424,576,360,0,0,0,0,0,0,0,7054,1000,6511,1000,528,1000,12700,100,0,0,0,0,0,0,0,0,0,0,4583,1
-2311,MANANANGGAL,Manananggal,Manananggal,107,20451,1,1415,1410,1,801,904,64,31,75,85,45,71,75,46,10,12,1,6,47,0x3795,100,280,720,360,0,0,0,0,0,0,0,6508,2000,6510,1000,7006,1000,913,1000,6511,1000,6509,1000,12700,100,0,0,0,0,4584,1
-2312,MANGKUKULAM,Mangkukulam,Mangkukulam,110,20151,1,1517,1351,1,582,778,89,75,35,71,31,82,64,52,10,12,1,6,40,0x3795,150,1664,336,480,0,0,0,0,0,0,0,7054,1000,6510,1000,7071,1000,6511,1000,6509,1000,12700,100,0,0,0,0,0,0,4585,1
-2313,TIKBALANG,Tikbalang,Tikbalang,115,22131,1,1756,1351,1,781,896,84,34,71,52,84,44,64,46,10,12,2,2,64,0x3795,130,1064,936,360,0,0,0,0,0,0,0,6496,500,984,10,12700,100,0,0,0,0,0,0,0,0,0,0,0,0,4586,1
-2314,TIYANAK,Tiyanak,Tiyanak,105,17146,1,1314,1101,1,457,708,76,21,41,58,41,51,72,47,10,12,0,6,47,0x3795,100,496,504,360,0,0,0,0,0,0,0,6508,1500,0,0,6509,1000,938,1000,0,0,0,0,0,0,0,0,0,0,4587,1
-2315,WAKWAK,Wakwak,Wakwak,111,20012,1,1374,1254,1,561,862,24,71,54,75,64,65,77,31,10,12,0,6,47,0x3795,100,424,576,360,0,0,0,0,0,0,0,6508,1500,6509,1000,12700,200,0,0,0,0,0,0,0,0,0,0,0,0,4588,1
-2316,JEJELING,Jejeling,Jejeling,100,10247,1,801,741,1,450,1165,100,26,51,71,84,54,15,104,10,12,2,3,42,0x81,400,1328,672,480,0,0,0,0,0,0,0,6498,2000,909,1000,6511,100,6510,100,6509,100,12700,100,0,0,0,0,0,0,4589,1
+2309,BUNGISNGIS,Bungisngis,Bungisngis,121,25513,0,1940,1650,1,851,1002,115,35,71,32,61,30,74,19,10,12,2,7,42,0x3795,200,1568,432,360,0,0,0,0,0,0,0,7054,1000,6511,1000,985,10,12700,100,0,0,0,0,0,0,0,0,0,0,0,0
+2310,ENGKANTO,Engkanto,Engkanto,125,23948,1,1723,1547,1,675,799,101,41,68,57,49,57,81,27,10,12,1,7,40,0x3795,200,1424,576,360,0,0,0,0,0,0,0,7054,1000,6511,1000,528,1000,12700,100,0,0,0,0,0,0,0,0,0,0,0,0
+2311,MANANANGGAL,Manananggal,Manananggal,107,20451,1,1415,1410,1,801,904,64,31,75,85,45,71,75,46,10,12,1,6,47,0x3795,100,280,720,360,0,0,0,0,0,0,0,6508,2000,6510,1000,7006,1000,913,1000,6511,1000,6509,1000,12700,100,0,0,0,0,0,0
+2312,MANGKUKULAM,Mangkukulam,Mangkukulam,110,20151,1,1517,1351,1,582,778,89,75,35,71,31,82,64,52,10,12,1,6,40,0x3795,150,1664,336,480,0,0,0,0,0,0,0,7054,1000,6510,1000,7071,1000,6511,1000,6509,1000,12700,100,0,0,0,0,0,0,0,0
+2313,TIKBALANG,Tikbalang,Tikbalang,115,22131,1,1756,1351,1,781,896,84,34,71,52,84,44,64,46,10,12,2,2,64,0x3795,130,1064,936,360,0,0,0,0,0,0,0,6496,500,984,10,12700,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2314,TIYANAK,Tiyanak,Tiyanak,105,17146,1,1314,1101,1,457,708,76,21,41,58,41,51,72,47,10,12,0,6,47,0x3795,100,496,504,360,0,0,0,0,0,0,0,6508,1500,0,0,6509,1000,938,1000,0,0,0,0,0,0,0,0,0,0,0,0
+2315,WAKWAK,Wakwak,Wakwak,111,20012,1,1374,1254,1,561,862,24,71,54,75,64,65,77,31,10,12,0,6,47,0x3795,100,424,576,360,0,0,0,0,0,0,0,6508,1500,6509,1000,12700,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2316,JEJELING,Jejeling,Jejeling,100,10247,1,801,741,1,450,1165,100,26,51,71,84,54,15,104,10,12,2,3,42,0x81,400,1328,672,480,0,0,0,0,0,0,0,6498,2000,909,1000,6511,100,6510,100,6509,100,12700,100,0,0,0,0,0,0,0,0
 2317,BANGUNGOT_1,Bangungot,Bangungot,115,1519517,1,0,0,1,2561,4065,411,95,151,192,110,112,251,57,10,12,1,6,47,0x37B5,200,920,1080,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 2318,BANGUNGOT_2,Bangungot,Bangungot,99,1409758,1,0,0,1,2561,4065,411,95,151,192,110,112,251,57,10,12,1,6,47,0x60,2000,920,1080,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2319,BUWAYA,Buwaya,Buwaya,151,4090365,1,3000012,2801564,1,3614,7115,201,78,151,201,130,231,310,66,10,12,2,9,81,0x37B5,100,1424,576,360,1500006,607,5500,617,2250,616,450,6518,2000,6525,50,6499,2000,2590,1000,2169,100,6499,10000,0,0,0,0,0,0,4592,1
+2319,BUWAYA,Buwaya,Buwaya,151,4090365,1,3000012,2801564,1,3614,7115,201,78,151,201,130,231,310,66,10,12,2,9,81,0x37B5,100,1424,576,360,1500006,607,5500,617,2250,616,450,6518,2000,6525,50,6499,2000,2590,1000,2169,100,6499,10000,0,0,0,0,0,0,0,0
 2320,BAKONAWA_1,Bakonawa,Bakonawa,156,3351884,1,0,0,10,4801,7302,472,0,251,134,194,70,237,66,10,12,2,9,81,0x1A4,2000,440,672,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 2321,BAKONAWA_2,Bakonawa,Bakonawa,156,3351884,1,0,0,10,4801,7302,472,0,251,134,194,70,237,66,10,12,2,9,81,0x1A4,2000,440,672,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 2322,BAKONAWA_3,Bakonawa,Bakonawa,156,3351884,1,2510111,2345151,10,4801,7302,472,0,251,134,194,70,237,66,10,12,2,9,81,0x1A4,2000,440,672,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -1466,7 +1466,7 @@
 2324,EVENT_RANGE,Penomena,Penomena,100,50000,1,0,0,7,481,522,160,99,76,38,35,35,107,10,10,12,1,5,25,0x3695,200,832,500,600,0,0,0,0,0,0,0,664,1000,665,1000,666,1000,667,1000,0,0,0,0,0,0,0,0,0,0,0,0
 2325,M_BAPHOMET_,Baphomet,Baphomet,57,7510,204,0,0,1,810,955,70,40,52,60,36,17,57,25,10,12,0,6,27,0x37B5,100,868,480,120,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 2326,M_GALAPAGO,Galapago,Galapago,45,7513,201,0,0,1,760,915,70,40,30,28,29,18,30,16,10,12,0,2,22,0x37B5,165,1430,1080,1080,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2327,BANGUNGOT_3,Bangungot,Bangungot,115,250,1,781541,761201,1,2561,4065,411,95,151,192,110,112,251,57,10,12,1,6,47,0x30F5,2000,0,0,0,0,0,0,0,0,0,0,6517,4000,6524,100,6499,4000,2491,2000,2169,200,6499,10000,0,0,0,0,0,0,4590,1
+2327,BANGUNGOT_3,Bangungot,Bangungot,115,250,1,781541,761201,1,2561,4065,411,95,151,192,110,112,251,57,10,12,1,6,47,0x30F5,2000,0,0,0,0,0,0,0,0,0,0,6517,4000,6524,100,6499,4000,2491,2000,2169,200,6499,10000,0,0,0,0,0,0,0,0
 2328,MA_DRUM,Drum,Drum,1,200,0,0,0,1,1,2,100,99,0,0,0,0,0,0,10,12,0,0,20,0x40,2000,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 2329,BUWAYA_EGG,Buwaya's Egg,Buwaya's Egg,100,10000,1,0,0,0,1,2,90,90,1,1,1,1,1,1,10,12,0,0,60,0x0,2000,1001,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 2330,BUWAYA_SLAVE,Buwaya's Slave,Slave,135,20145,1,0,0,1,2413,4454,105,71,151,120,110,102,143,61,10,12,0,3,22,0x3795,200,576,960,504,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -1474,7 +1474,7 @@
 2332,BUWAYA_GHOST,Fake Buwaya,Buwaya,138,30000,1,0,0,1,1280,2532,481,78,201,248,174,112,371,57,10,12,0,3,81,0x37B5,100,1424,576,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 2333,BUWAYA_WEAK,Buwaya's Weakness,Weakpoint,138,20,1,0,0,1,0,1,100,78,0,0,0,0,0,0,10,12,0,3,81,0x60,2000,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 2334,G_WAKWAK,Wakwak,Wakwak,145,194830,1,0,0,1,1544,4715,24,104,101,154,104,184,151,71,10,12,0,6,47,0x83,100,424,576,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2335,MA_TREASURE,Treasure Chest,Bakonawa's Treasure,140,5,0,0,0,1,0,0,100,0,0,0,0,0,1199,0,10,12,0,0,26,0x120,0,0,0,0,0,0,0,0,0,0,0,6516,2000,6523,50,6499,2000,15051,1000,2169,100,969,2000,6499,10000,0,0,0,0,4591,1
+2335,MA_TREASURE,Treasure Chest,Bakonawa's Treasure,140,5,0,0,0,1,0,0,100,0,0,0,0,0,1199,0,10,12,0,0,26,0x120,0,0,0,0,0,0,0,0,0,0,0,6516,2000,6523,50,6499,2000,15051,1000,2169,100,969,2000,6499,10000,0,0,0,0,0,0
 2336,DOMOVOI,Domovoi,Domovoi,38,898,1,135,152,1,63,74,40,0,20,11,34,20,19,10,10,12,0,2,22,0x83,200,800,1200,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 2337,HIDDEN_MOB,Hidden Mob,Monster,151,10000,200,0,0,7,0,1000,200,10,200,200,200,200,200,200,12,12,0,4,88,0x1C4,2000,0,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 2338,MD_MANANANGGAL,Bangungot Manananggal,Manananggal,107,204511,1,0,0,1,801,904,64,31,75,85,45,71,75,46,10,12,1,6,47,0x3795,100,280,720,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -1509,15 +1509,15 @@
 2362,N_AMON_RA,Nightmare Amon Ra,Amon Ra (Nightmare),145,2515784,1,1626487,1302087,3,4106,7307,367,301,86,89,120,131,101,92,14,12,2,7,62,0x1A4,170,854,2016,480,813243,607,5500,608,3500,732,5500,5053,150,2615,50,7211,7000,985,3800,616,400,1552,10,607,3000,0,0,0,0,4236,1

 // Eclage (14.2)
-2363,MENBLATT,Menblatt,Menblatt,143,82200,1,4150,3421,3,816,1017,79,50,70,68,40,55,108,30,10,12,1,4,44,0x3795,145,472,1056,480,0,0,0,0,0,0,0,6557,4000,7168,2000,7163,4608,0,0,0,0,0,0,0,0,0,0,0,0,4593,1
-2364,PETAL,Petal,Petal,141,81031,1,4058,3361,1,671,844,73,33,70,82,55,45,108,25,10,12,1,2,24,0x3795,200,1500,768,480,0,0,0,0,0,0,0,6558,4000,12346,2000,1026,2000,6089,500,0,0,0,0,0,0,0,0,0,0,4594,1
-2365,CENERE,Cenere,Cenere,146,130131,1,7117,5712,1,1802,2833,87,81,67,39,30,35,95,45,10,12,0,3,24,0x3795,300,1500,720,360,0,0,0,0,0,0,0,6561,4000,7322,1000,7001,3000,7320,2000,0,0,0,0,0,0,0,0,0,0,4595,1
-2366,ANTIQUE_BOOK,Antique Book,Antique Book,148,134615,1,7225,5870,1,1861,3074,74,42,67,53,32,44,125,5,10,12,0,0,60,0x3795,150,864,960,480,0,0,0,0,0,0,0,6560,4000,7015,2000,1097,2000,0,0,0,0,0,0,0,0,0,0,0,0,4596,1
-2367,LICHTERN_B,Blue Lichtern,Lichtern,149,131211,1,7187,5701,1,1513,2923,76,41,124,74,60,55,92,50,10,12,0,0,81,0x3795,150,480,1728,480,0,0,0,0,0,0,0,1000,2000,1001,2000,995,40,12812,10,0,0,0,0,0,0,0,0,0,0,4597,1
-2368,LICHTERN_Y,Yellow Lichtern,Lichtern,147,131513,1,7071,5810,1,1416,2977,84,51,141,94,75,91,144,50,10,12,0,0,88,0x3795,150,0,3456,480,0,0,0,0,0,0,0,1000,2000,1001,2000,997,40,12815,10,0,0,0,0,0,0,0,0,0,0,4600,1
-2369,LICHTERN_R,Red Lichtern,Lichtern,149,135718,1,7201,6013,1,1647,3096,111,53,147,77,66,65,133,50,10,12,0,0,83,0x3795,150,0,4032,480,0,0,0,0,0,0,0,1000,2000,1001,2000,994,40,12813,10,0,0,0,0,0,0,0,0,0,0,4599,1
-2370,LICHTERN_G,Green Lichtern,Lichtern,151,133451,1,7214,5710,1,1547,3141,120,57,121,60,58,62,102,50,10,12,0,0,82,0x3795,100,0,2304,480,0,0,0,0,0,0,0,1000,2000,1001,2000,996,40,12814,10,0,0,0,0,0,0,0,0,0,0,4598,1
-2371,FAITHFUL_MANAGER,Faithful Manager,Faithful Manager,155,151548,1,8676,6501,3,2091,3698,204,141,80,28,40,25,88,45,10,12,2,0,80,0x3795,200,480,1536,480,0,0,0,0,0,0,0,6559,4000,12353,2000,970,50,971,50,0,0,0,0,0,0,0,0,0,0,4607,1
+2363,MENBLATT,Menblatt,Menblatt,143,82200,1,4150,3421,3,816,1017,79,50,70,68,40,55,108,30,10,12,1,4,44,0x3795,145,472,1056,480,0,0,0,0,0,0,0,6557,4000,7168,2000,7163,4608,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2364,PETAL,Petal,Petal,141,81031,1,4058,3361,1,671,844,73,33,70,82,55,45,108,25,10,12,1,2,24,0x3795,200,1500,768,480,0,0,0,0,0,0,0,6558,4000,12346,2000,1026,2000,6089,500,0,0,0,0,0,0,0,0,0,0,0,0
+2365,CENERE,Cenere,Cenere,146,130131,1,7117,5712,1,1802,2833,87,81,67,39,30,35,95,45,10,12,0,3,24,0x3795,300,1500,720,360,0,0,0,0,0,0,0,6561,4000,7322,1000,7001,3000,7320,2000,0,0,0,0,0,0,0,0,0,0,0,0
+2366,ANTIQUE_BOOK,Antique Book,Antique Book,148,134615,1,7225,5870,1,1861,3074,74,42,67,53,32,44,125,5,10,12,0,0,60,0x3795,150,864,960,480,0,0,0,0,0,0,0,6560,4000,7015,2000,1097,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2367,LICHTERN_B,Blue Lichtern,Lichtern,149,131211,1,7187,5701,1,1513,2923,76,41,124,74,60,55,92,50,10,12,0,0,81,0x3795,150,480,1728,480,0,0,0,0,0,0,0,1000,2000,1001,2000,995,40,12812,10,0,0,0,0,0,0,0,0,0,0,0,0
+2368,LICHTERN_Y,Yellow Lichtern,Lichtern,147,131513,1,7071,5810,1,1416,2977,84,51,141,94,75,91,144,50,10,12,0,0,88,0x3795,150,0,3456,480,0,0,0,0,0,0,0,1000,2000,1001,2000,997,40,12815,10,0,0,0,0,0,0,0,0,0,0,0,0
+2369,LICHTERN_R,Red Lichtern,Lichtern,149,135718,1,7201,6013,1,1647,3096,111,53,147,77,66,65,133,50,10,12,0,0,83,0x3795,150,0,4032,480,0,0,0,0,0,0,0,1000,2000,1001,2000,994,40,12813,10,0,0,0,0,0,0,0,0,0,0,0,0
+2370,LICHTERN_G,Green Lichtern,Lichtern,151,133451,1,7214,5710,1,1547,3141,120,57,121,60,58,62,102,50,10,12,0,0,82,0x3795,100,0,2304,480,0,0,0,0,0,0,0,1000,2000,1001,2000,996,40,12814,10,0,0,0,0,0,0,0,0,0,0,0,0
+2371,FAITHFUL_MANAGER,Faithful Manager,Faithful Manager,155,151548,1,8676,6501,3,2091,3698,204,141,80,28,40,25,88,45,10,12,2,0,80,0x3795,200,480,1536,480,0,0,0,0,0,0,0,6559,4000,12353,2000,970,50,971,50,0,0,0,0,0,0,0,0,0,0,0,0

 // Additional Monsters
 2372,SOIL,Soil,Soil,1,15,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -1628,8 +1628,8 @@
 2472,MG_BLOODY_KNIGHT,Bloody Knight,Bloody Knight,116,285000,1,7348,6511,3,942,1065,122,50,132,59,70,57,98,45,10,12,2,0,87,0x3695,250,828,528,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 2473,MG_M_UNDEAD_KNIGHT,Undead Knight,Undead Knight,133,500000,0,4500,3375,2,751,880,122,62,122,87,54,65,103,65,14,16,2,7,80,0x37B5,170,140,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 2474,MG_F_UNDEAD_KNIGHT,Undead Knight,Undead Knight,133,500000,0,4500,3375,2,751,880,122,62,122,87,54,65,103,65,14,16,2,7,80,0x37B5,170,140,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2475,MG_CORRUPTION_ROOT,Root of Corruption,Root of Corruption,136,3190000,1,240120,187920,3,710,1762,213,123,86,89,120,131,101,92,14,12,2,7,62,0x1A4,170,854,2016,480,120060,607,5500,608,3500,732,5500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4603,1
-2476,MG_AMDARAIS,Amdarias,Amdarias,143,3283990,1,74288,77950,2,8860,10022,32,66,140,159,30,109,300,90,10,12,2,2,63,0x37B5,200,1152,1152,576,37144,617,5500,617,5000,616,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4601,1
+2475,MG_CORRUPTION_ROOT,Root of Corruption,Root of Corruption,136,3190000,1,240120,187920,3,710,1762,213,123,86,89,120,131,101,92,14,12,2,7,62,0x1A4,170,854,2016,480,120060,607,5500,608,3500,732,5500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2476,MG_AMDARAIS,Amdarias,Amdarias,143,3283990,1,74288,77950,2,8860,10022,32,66,140,159,30,109,300,90,10,12,2,2,63,0x37B5,200,1152,1152,576,37144,617,5500,617,5000,616,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

 //2477,NG_WANDER_MAN
 //2478,NG_RIDEWORD
@@ -1936,8 +1936,6 @@
 2779,C1_LES,Swift Les,Swift Les,82,31080,1,3315,10170,1,429,572,123,30,63,20,35,25,62,30,10,12,1,3,82,4233,230,1728,720,576,0,0,0,0,0,0,0,7100,2000,511,1000,711,1000,905,2500,2270,1,521,500,510,50,0,0,0,0,0,0
 2780,C2_LEIB_OLMAI,Solid Leib Olmai,Solid Leib Olmai,118,240010,1,9500,30960,1,1049,1478,127,31,72,35,80,35,77,27,10,12,2,2,22,13973,175,1260,230,192,0,0,0,0,0,0,0,948,4550,2289,8,740,120,518,500,2717,5,969,5,7053,800,0,0,0,0,4188,1
 2781,C3_LEAF_CAT,Leaf Cat Ringleader,Leaf Cat Ringleader,64,13175,1,1560,5010,1,250,321,88,16,46,16,12,45,36,29,10,12,0,2,22,131,150,960,864,720,0,0,0,0,0,0,0,7198,4365,520,300,608,5,1023,1100,568,250,567,500,7298,5335,0,0,0,0,4195,1
-//2782,C4_L_WHIKEBAIN
-//2783,C5_L_EREMES
 2784,C1_KOBOLD_ARCHER,Swift Kobold Archer,Swift Kobold Archer,108,55265,1,6480,23580,9,938,1303,84,5,99,39,48,30,124,25,10,12,0,7,23,8325,200,1008,1008,384,0,0,0,0,0,0,0,912,250,999,60,1034,4850,5118,50,1763,2000,1711,5,756,79,0,0,0,0,4292,1
 2785,C2_KOBOLD_1,Solid Kobold,Solid Kobold,107,104830,1,6820,15345,1,888,1225,103,25,109,76,61,53,98,30,10,12,1,7,44,12429,150,1028,528,360,0,0,0,0,0,0,0,999,100,1034,5335,912,700,757,25,1220,2,2104,5,0,0,0,0,0,0,4091,1
 2786,C3_KNOCKER,Knocker Ringleader,Knocker Ringleader,126,219500,1,11990,33900,1,1069,1494,126,62,93,62,58,56,139,70,10,12,0,6,22,401,200,1548,384,288,0,0,0,0,0,0,0,997,30,1003,150,1040,5500,2286,1,6223,10,2124,3,1732,5,0,0,0,0,4434,1
@@ -2264,399 +2262,83 @@
 //3107,E_EASTER_BUNNY
 //3108,JITTERBUG1
 //3109,JITTERBUG2
-//3110,E_RUNAWAY1
-//3111,E_RUNAWAY2
-//3112,E_RUNAWAY3
-//3113,E_RUNAWAY4
-//3114,E_RUNAWAY5
-//3115,E_RUNAWAY1_
-//3116,E_RUNAWAY2_
-//3117,E_RUNAWAY3_
-//3118,E_RUNAWAY4_
-//3119,E_RUNAWAY5_
-//3120,M_ISIS
-//3121,Q_BYORGUE
-//3122,CHARLESTON1
-//3123,CHARLESTON2
+//
 //3124,CHARLESTON3
 //3125,STEP
 //3126,ROCK_STEP
 //3127,KICK_STEP
 //3128,KICK_AND_KICK
-//3129,ORC_ZOMBIE_ANNIV
-//3130,ORC_ARCHER_ANNIV
-//3131,ORC_BABY_ANNIV
-//3132,ORC_LADY_ANNIV
-//3133,ZENORC_ANNIV
-//3134,STEAM_GOBLIN_ANNIV
-//3135,ORC_LORD_ANNIV
-//3136,ORK_HERO_ANNIV
-//3137,HIGH_ORC_ANNIV
-//3138,ORK_WARRIOR_ANNIV
-//3139,MG_ZOMBIE_H
-//3140,MG_WRAITH_H
-//3141,MG_GHOUL_H
-//3142,MG_ARCLOUSE_H
-//3143,MG_RAYDRIC_H
-//3144,MG_RAYDRIC_ARCHER_H
-//3145,MG_KNIGHT_OF_ABYSS_H
-//3146,MG_KHALITZBURG_H
-//3147,MG_BLOODY_KNIGHT_H
-//3148,MG_M_UNDEAD_KNIGHT_H
-//3149,MG_F_UNDEAD_KNIGHT_H
-//3150,MG_AMDARAIS_H
-//3151,MG_CORRUPTION_ROOT_H
-//3152,G_MG_KHALITZBURG_H
 //3153,EXCAVATOR_ROBOT
 //3154,RECON_ROBOT
 //3155,REPAIR_ROBOT
 //3156,EXPLORATION_ROVER
-//3157,RUIN_BELIEVER1
-//3158,RUIN_BELIEVER2
-//3159,ILLEGAL_PROMOTION
-//3160,BOILED_RICE_DUANWU
-//3161,BOMB
-//3162,ELEPHANT
-//3163,GORILLA
-//3164,LION
-//3165,RHINO
 //3166,M_E_DEVILING
-//3167,E_POPORING_CRO
-//3168,POURING_SEA_FES
-//3169,J_REB_SHECIL1
-//3170,J_REB_SHECIL2
-//3171,EVENT_MONEMUS01
-//3172,EVENT_MONEMUS02
-//3173,EVENT_FIREFOX
-//3174,HELL_FLY
-//3175,E1_ROTAR_ZAIRO
-//3176,E1_GREMLIN
-//3177,E1_BEHOLDER
-//3178,E1_ACIDUS
-//3179,E1_ACIDUS_
-//3180,E1_G_S_NYDHOG
-//3181,E1_FELOCK
-//3182,E2_ROTAR_ZAIRO
-//3183,E2_GREMLIN
-//3184,E2_BEHOLDER
-//3185,E2_ACIDUS
-//3186,E2_ACIDUS_
-//3187,E2_G_S_NYDHOG
-//3188,E2_FELOCK
-//3189,WOLF_MOON
-//3190,MM_SARAH
-//3191,MM_M_GIGAN1
-//3192,MM_M_GIGAN2
-//3193,MM_M_GIGAN3
-//3194,MM_L_GIGAN1
-//3195,MM_L_GIGAN2
-//3196,MM_L_GIGAN3
-//3197,MM_M_GARGOYLE
-//3198,MM_M_GALION
-//3199,MM_M_MUTANT_DRAGON
-//3200,MM_M_CHIMERA
-//3201,LUCKYCASE,Poring,Poring,1,60,1,27,20,1,8,9,2,5,6,1,1,0,6,5,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+//
+//3201,JT_LUCKYCASE,Poring,Poring,1,60,1,27,20,1,8,9,2,5,6,1,1,0,6,5,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 3202,ORGANIC_JAKK,Organic Pumpkin,Organic Pumpkin,10,40,1,20,13,1,100,100,160,99,1,1,1,1,999,1,0,0,0,3,21,0x61,200,0,0,0,0,0,0,0,0,0,0,6804,5000,6804,5000,6804,1000,2267,100,1062,1000,664,100,546,1000,12192,100,0,0,0,0
 3203,INORGANIC_JAKK,Inorganic Pumpkin,Inorganic Pumpkin,10,40,1,20,13,1,100,100,160,99,1,1,1,1,999,1,0,0,0,3,21,0x61,200,0,0,0,0,0,0,0,0,0,0,6805,5000,6805,5000,6805,1000,2267,100,1062,1000,664,100,546,1000,12192,100,0,0,0,0
-//3204,PIXY_PINK_PORING,Poring,Poring,1,60,1,27,20,1,8,9,2,5,6,1,1,0,6,5,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-//3205,PIXY_BLUE_PORING,Poring,Poring,1,60,1,27,20,1,8,9,2,5,6,1,1,0,6,5,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-//3206,LITTLE_GOLDPORING,Poring,Poring,1,60,1,27,20,1,8,9,2,5,6,1,1,0,6,5,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-//3207,E_AQUA_ELEMENTAL,Poring,Poring,1,60,1,27,20,1,8,9,2,5,6,1,1,0,6,5,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-//3208,V_EREMES
-//3209,V_MAGALETA
-//3210,V_KATRINN
-//3211,V_SHECIL
-//3212,V_HARWORD
-//3213,V_SEYREN
-//3214,V_G_EREMES
-//3215,V_G_MAGALETA
-//3216,V_G_KATRINN
-//3217,V_G_SHECIL
-//3218,V_G_HARWORD
-//3219,V_G_SEYREN
-//3220,V_B_EREMES
-//3221,V_B_MAGALETA
-//3222,V_B_SHECIL
-//3223,V_B_HARWORD
-//3224,V_B_KATRINN
-//3225,V_B_SEYREN
-//3226,V_RANDEL
-//3227,V_FLAMEL
-//3228,V_CELIA
-//3229,V_CHEN
-//3230,V_GERTIE
-//3231,V_ALPHOCCIO
-//3232,V_TRENTINI
-//3233,V_G_RANDEL
-//3234,V_G_FLAMEL
-//3235,V_G_CELIA
-//3236,V_G_CHEN
-//3237,V_G_GERTIE
-//3238,V_G_ALPHOCCIO
-//3239,V_G_TRENTINI
-//3240,V_B_RANDEL
-//3241,V_B_FLAMEL
-//3242,V_B_CELIA
-//3243,V_B_CHEN
-//3244,V_B_GERTIE
-//3245,V_B_ALPHOCCIO
-//3246,V_B_TRENTINI
-//3247,CENERE_G
-//3248,REPAIR_ROBOT_T
-//3249,EXPLORATION_ROVER_T
-//3250,SCR_MT_ROBOTS
-//3251,GC109
-//3252,DR815
-//3253,SYS_MSG
-//3254,T_W_O
-//3255,GHOUL_H
-//3256,ZOMBIE_H
-//3257,MALE_PORING
-//3258,FEMALE_PORING
-//3259,FANTASTIC_B_UNICORN
-//3260,LITTLE_BLUE_UNICORN
-//3261,BLUE_UNICORN
-//3262,MH_PORING
-//3263,MH_POPORING
-//3264,MH_DROPS
-//3265,MH_GOLDPORING
-//3266,MH_MARIN
-//3267,MH_COELACANTH_N_A1
-//3268,MH_COELACANTH_N_A2
-//3269,MH_COELACANTH_N_A3
-//3270,MH_COELACANTH_N_A4
-//3271,MH_E_MEGALODON1
-//3272,MH_SASQUATCH
-//3273,MH_BAKONAWA_1
-//3274,MH_BACSOJIN
-//3275,MH_HUNTER_FLY1
-//3276,MH_DIMIK
-//3277,MH_DIMIK_2
-//3278,MH_DIMIK_4
-//3279,MH_DIMIK_2
-//3280,MH_DIMIK_3
-//3281,MH_COELACANTH_H_A1
-//3282,MH_COELACANTH_H_A2
-//3283,MH_COELACANTH_H_A3
-//3284,MH_COELACANTH_H_A4
-//3285,MH_E_MEGALODON2
-//3286,MH_GLOOMUNDERNIGHT
-//3287,MH_ATROCE
-//3288,MH_LADY_TANEE
-//3289,MH_HUNTER_FLY2
-//3290,E_THIEF_CHOCO
-//3291,E_TREASURE_BOX
-//3292,GOLD_ANOPHELES
-//3293,DAEBAK_GOURD
-//3294,HEYDRICH
-//3295,G_MOBSTER
-//3296,HIDDEN_TEST
-//3297,PAD_LEVIATHAN
-//3298,PAD_FAFNIR
-//3299,PAD_IFRIT
-//3300,PAD_HORAI
-//3301,PAD_SHANGRILA
-//3302,PAD_NIRAIKANAI
-//3303,PAD_HELHEIM
-//3304,PAD_MUSPELHEIM
-//3305,PAD_ZAEROG
-//3306,PAD_TAMADORA
-//3307,PAD_TAMADORABABY
-//3308,ROC_EMPELIUM
-//3309,ROC_OBJ_A
-//3310,ROC_OBJ_B
-//3311,ROC_OBJ_N
-//3312,ROC_TOWER_A
-//3313,ROC_TOWER_B
-//3314,SMOKIE_THIEF
-//3315,PAD_KINGGOLD
-//3316,PAD_KINGMETAL
-//3317,PAD_RUBYLIT
-//3318,PAD_SAPPHILIT
-//3319,PAD_EMELIT
-//3320,PAD_TOPALIT
-//3321,PAD_AMELIT
-//3322,PAD_METAL_DRAGON
-//3323,PAD_M_FLAME_KNIGHT
-//3324,PAD_M_ICE_KNIGHT
-//3325,PAD_M_STONE_KNIGHT
-//3326,PAD_M_LIGHT_KNIGHT
-//3327,PAD_M_DARK_KNIGHT
-//3328,PAD_C_D_DRAGON
-//3329,PAD_ECHIDNA
-//3330,PAD_SIREN
-//3331,PAD_LILITH
-//3332,PAD_HERA
-//3333,PAD_RUBYLIT_H
-//3334,PAD_SAPPHILIT_H
-//3335,PAD_EMELIT_H
-//3336,PAD_TOPALIT_H
-//3337,PAD_AMELIT_H
-//3338,PAD_METAL_DRAGON_H
-//3339,PAD_M_FLAME_KNIGHT_H
-//3340,PAD_M_ICE_KNIGHT_H
-//3341,PAD_M_STONE_KNIGHT_H
-//3342,PAD_M_LIGHT_KNIGHT_H
-//3343,PAD_M_DARK_KNIGHT_H
-//3344,PAD_C_D_DRAGON_H
-//3345,PAD_ECHIDNA_H
-//3346,PAD_SIREN_H
-//3347,PAD_LILITH_H
-//3348,PAD_HERA_H
-//3349,PAD_MYTHLIT
-//3350,PAD_TYRRA
-//3351,PAD_TYRANNOS
-//3352,PAD_PLESSIE
-//3353,PAD_PLESIOS
-//3354,PAD_BRACHY
-//3355,PAD_BRACHYS
-//3356,E_DENIRO
-//3357,E_VITATA
-//3358,E_ANDRE
-//3359,E_HORN_SCARABA
-//3360,E_HORN_SCARABA2
-//3361,E_RAKE_SCARABA
-//3362,C_HORN_SCARABA
-//3363,C_HORN_SCARABA2
-//3364,C_ANTLER_SCARABA
-//3365,C_RAKE_SCARABA
-//3366,MH_I_HORN_SCARABA
-//3367,MH_I_HORN_SCARABA2
-//3368,MH_I_ANTLER_SCARABA
-//3369,MH_I_RAKE_SCARABA
-//3370,MH_QUEEN_SCARABA
-//3371,MH_COELACANTH_Y_A1
-//3372,MH_COELACANTH_Y_A2
-//3373,MH_COELACANTH_Y_A3
-//3374,MH_COELACANTH_Y_A4
-//3375,MH_E_MEGALODON3
-//3376,MH_NAGHT_SIEGER
-//3377,MH_IFRIT
-//3378,MH_PHYLLA
-//3379,MH_BOMBPORING
-//3380,ANGLERFISH
-//3381,DARK_SOUL
-//3382,WANDERING_SOUL
+//3204,JT_PIXY_PINK_PORING,Poring,Poring,1,60,1,27,20,1,8,9,2,5,6,1,1,0,6,5,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+//3205,JT_PIXY_BLUE_PORING,Poring,Poring,1,60,1,27,20,1,8,9,2,5,6,1,1,0,6,5,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+//3206,JT_LITTLE_GOLDPORING,Poring,Poring,1,60,1,27,20,1,8,9,2,5,6,1,1,0,6,5,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+//3207,JT_E_AQUA_ELEMENTAL,Poring,Poring,1,60,1,27,20,1,8,9,2,5,6,1,1,0,6,5,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 //
-//3384,MIN_PORING
-//3385,MIN_LUNATIC
-//3386,MIN_FABRE
-//3387,MIN_PICKY
-//3388,MIN_CONDOR
-//3389,MIN_WILOW
-//3390,MIN_SPORE
-//3391,MIN_POPORING
-//3392,MIN_SMOKIE
-//3393,MIN_DOKEBI
-//3394,MIN_BIGFOOT
-//3395,MIN_WORM_TAIL
-//3396,MIN_WOLF
-//3397,MIN_SNAKE
-//3398,MIN_ANACONDAQ
-//3399,MIN_MARIN
-//3400,MIN_MUKA
-//3401,MIN_PECOPECO
-//3402,MIN_DENIRO
-//3403,MIN_PIERE
-//3404,MIN_ANDRE
-//3405,MIN_GOLEM
-//3406,MIN_SCORPION
-//3407,MIN_CHONCHON
-//3408,MIN_METALLER
-//3409,MIN_SAND_MAN
-//3410,MIN_RAGGLER
-//3411,MIN_DRAGON_TAIL
-//3412,MIN_GREEN_IGUANA
-//3413,MIN_SEE_OTTER
-//3414,MIN_GALAPAGO
-//3415,MIN_FUR_SEAL
-//3416,MIN_ALLIGATOR
-//3417,MIN_MEGALODON
-//3418,MIN_TRI_JOINT
-//3419,MIN_MEGALITH
-//3420,MIN_DRYAD
-//3421,MIN_TOAD
-//3422,MIN_VAGABOND_WOLF
-//3423,MIN_VOCAL
-//3424,MIN_ECLIPSE
-//3425,MIN_CHIMERA
-//3426,MIN_EDDGA
-//3427,MIN_OSIRIS
-//3428,MIN_PHREEONI
-//3429,MIN_ORK_HERO
-//3430,MIN_TAO_GUNKA
-//3431,MIN_G_RODA_FROG
-//3432,MIN_G_WOLF
-//3433,MIN_G_ROCKER
-//3434,MIN_G_LUNATIC
-//3435,MIN_G_GARGOYLE
-//3436,MIN_G_BIGFOOT
-//3437,MIN_G_ANCIENT_MUMMY
-//3438,MIN_G_SAND_MAN
-//3439,MIN_G_HIGH_ORC
-//3440,MIN_G_MEGALITH
-//
-//3442,FROZENWOLF
-//3443,TAFFY
-//3444,WATCHER
-//3445,P_ARCHER_SKELETON
-//3446,P_SKELETON
-//3447,P_SOLDIER_SKELETON
-//3448,P_AMDARAIS
-//3449,G_P_AMDARAIS
-//3450,BIJOU
-//3451,IMMOTAL_CORPS
-//3452,ZOMBIE_GUARD
-//3453,LOST_LAMB
-//3454,HEART_HUNTER_N
-//3455,GLASS_PLATE
-//3456,WATERMELON_34
-//3457,WATERMELON_35
-//3458,WATERMELON_36
-//3459,WATERMELON_37
-//3460,WATERMELON_38
-//3461,WATERMELON_39
-//3462,WATERMELON_40
-//3463,WATERMELON_41
-//3464,WATERMELON_42
-//3465,WATERMELON_43
-//3466,WATERMELON_44
-//3467,WATERMELON_45
-//3468,WATERMELON_46
-//3469,WATERMELON_47
-//3470,WATERMELON_48
-//3471,WATERMELON_49
-//3472,WATERMELON_50
-//3473,AS_RAGGED_GOLEM
-//3474,AS_BLOODY_KNIGHT
-//3475,AS_WIND_GHOST
-//3476,AS_ZOMBIE
-//3477,AS_IMMORTAL_CORPS
-//3478,AS_ZOMBIE_SLAUGHTER
-//3479,AS_ZOMBIE_MASTER
-//3480,AS_CURSED_SOLDIER
-//3481,AS_EVIL_SHADOW1
-//3482,AS_EVIL_SHADOW2
-//3483,AS_EVIL_SHADOW3
-//3484,AS_D_RAGGED_GOLEM
-//3485,AS_D_CURSED_SOLDIER
-//3486,E_WILD_RABBIT
-//
-//3492,E_WILD_MOBSTER
-//
-//3494,IFN_POIRING
-//3495,DR_EGGRING
-//3496,DR_LUNATIC
-//3497,DR_FABRE
-//3498,DR_HORNET
-//3499,DR_RODA_FROG
-//3500,DR_DESERT_WOLF_B
-//3501,DR_SPORE
-//3502,DR_BASILISK1
-//3503,DR_BASILISK2
-//3504,DR_BASILISK3
-//3505,DR_BIG_EGGRING
-//3506,DR_MANDRAGORA
-//3507,DR_POM_SPIDER
-//3508,DR_EGGRING_G
-//3509,MOON_RABBIT
+//3295,JT_G_MOBSTER
+//3296,JT_HIDDEN_TEST
+//3297,JT_PAD_LEVIATHAN
+//3299,JT_PAD_IFRIT
+//3300,JT_PAD_HORAI
+//3301,JT_PAD_SHANGRILA
+//3302,JT_PAD_NIRAIKANAI
+//3303,JT_PAD_HELHEIM
+//3304,JT_PAD_MUSPELHEIM
+//3305,JT_PAD_ZAEROG
+//3306,JT_PAD_TAMADORA
+//3307,JT_PAD_TAMADORABABY
+//3308,JT_ROC_EMPELIUM
+//3309,JT_ROC_OBJ_A
+//3310,JT_ROC_OBJ_B
+//3311,JT_ROC_OBJ_N
+//3312,JT_ROC_TOWER_A
+//3313,JT_ROC_TOWER_B
+//3314,JT_SMOKIE_THIEF
+//3315,JT_PAD_KINGGOLD
+//3316,JT_PAD_KINGMETAL
+//3317,JT_PAD_RUBYLIT
+//3318,JT_PAD_SAPPHILIT
+//3319,JT_PAD_EMELIT
+//3320,JT_PAD_TOPALIT
+//3321,JT_PAD_AMELIT
+//3322,JT_PAD_METAL_DRAGON
+//3323,JT_PAD_M_FLAME_KNIGHT
+//3324,JT_PAD_M_ICE_KNIGHT
+//3325,JT_PAD_M_STONE_KNIGHT
+//3326,JT_PAD_M_LIGHT_KNIGHT
+//3327,JT_PAD_M_DARK_KNIGHT
+//3328,JT_PAD_C_D_DRAGON
+//3329,JT_PAD_ECHIDNA
+//3330,JT_PAD_SIREN
+//3331,JT_PAD_LILITH
+//3332,JT_PAD_HERA
+//3333,JT_PAD_RUBYLIT_H
+//3334,JT_PAD_SAPPHILIT_H
+//3335,JT_PAD_EMELIT_H
+//3336,JT_PAD_TOPALIT_H
+//3337,JT_PAD_AMELIT_H
+//3338,JT_PAD_METAL_DRAGON_H
+//3339,JT_PAD_M_FLAME_KNIGHT_H
+//3340,JT_PAD_M_ICE_KNIGHT_H
+//3341,JT_PAD_M_STONE_KNIGHT_H
+//3342,JT_PAD_M_LIGHT_KNIGHT_H
+//3343,JT_PAD_M_DARK_KNIGHT_H
+//3344,JT_PAD_C_D_DRAGON_H
+//3345,JT_PAD_ECHIDNA_H
+//3346,JT_PAD_SIREN_H
+//3347,JT_PAD_LILITH_H
+//3348,JT_PAD_HERA_H
+//3349,JT_PAD_MYTHLIT
+//3350,JT_PAD_TYRRA
+//3351,JT_PAD_TYRANNOS
+//3352,JT_PAD_PLESSIE
+//3353,JT_PAD_PLESIOS
+//3354,JT_PAD_BRACHY
+//3355,JT_PAD_BRACHYS
--- a/db/re/quest_db.txt
+++ b/db/re/quest_db.txt
@@ -119,18 +119,6 @@
 1227,0,0,0,0,0,0,0,2364,6522,3000,0,0,0,0,0,0,"Getting back Professor Worm's memory"
 1228,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Getting back Professor Worm's memory"

-// Academy 14.2
-1229,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Swordsman training"
-1230,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Swordsman training"
-1233,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Swordsman training"
-1234,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Swordsman training"
-1235,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Swordsman training"
-1236,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Swordsman training"
-1237,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Shop guide"
-1238,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Shop guide"
-1239,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Shop guide"
-1240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Shop guide"
-
 2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Job Change to Blacksmith"
 2001,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Job Change to Blacksmith"
 2002,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Job Change to Blacksmith"
@@ -345,17 +333,8 @@
 2291,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Mummy Hunting - Cooldown"
 2292,0,2360,20,0,0,0,0,0,0,0,0,0,0,0,0,0,"Mummy Hunting (Nightmare)"

-// Academy 14.2
-2293,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Adventurer's Companion"
-2294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Adventurer's Companion"
-2295,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Adventurer's Companion"
-2296,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Adventurer's Companion"
-2297,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Adventurer's Companion"
-2298,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Adventurer's Companion"
-2299,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Rapid Completion Experience"
-
 // New Novice Ground
-// 2299,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Training Center: Talk to Lisa"
+2299,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Training Center: Talk to Lisa"
 2300,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Training Center: Talk to General Reindeer"
 2301,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Training Center: Leave the boat"
 2302,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Training Center: Formation"
@@ -658,29 +637,6 @@
 4265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Bookshelf use"
 4266,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"????? ??"
 4267,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"????? ??"
-
-// Academy 14.2
-4268,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ninja trainer"
-4269,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Registration at the Academy"
-4270,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ninja training - stat explanation"
-4271,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ninja training-explanation about the skills"
-4272,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ninja training- conversation about the skills"
-4273,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ninja training- explanation about the weapons"
-4274,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ninjas training- explanation about job change"
-4275,0,1113,10,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ninja training-Exercise1"
-4276,0,1002,10,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ninja training-Exercise2"
-4277,0,1052,10,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ninja training-Actual battle2"
-4278,0,1024,10,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ninja training-Actual battle1"
-4279,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ninja training-test"
-4280,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ninja training-test"
-4281,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Beginner's training-Ninja"
-4282,0,1113,10,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ninja training-exercise1"
-4283,0,1002,10,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ninja training-exercise2"
-4284,0,1052,10,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ninja training-actual battle2"
-4285,0,1024,10,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ninja training-actual battle1"
-4286,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ninja training-test"
-4287,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ninja training-test"
-
 //4303,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
 //4304,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
 //4305,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
@@ -815,21 +771,6 @@
 5145,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Prototype-(3)"
 5146,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Battle test"

-// Academy 14.2
-5147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Gunslinger basic training(1)"
-5148,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Gunslinger basic training(2)"
-5149,0,1004,10,0,0,0,0,0,0,0,0,0,0,0,0,0,"<Battle training request form A>"
-5150,0,1012,10,0,0,0,0,0,0,0,0,0,0,0,0,0,"<Battle training request form B>"
-5151,0,1167,10,0,0,0,0,0,0,0,0,0,0,0,0,0,"<Battle training request form C>"
-5152,0,1052,10,0,0,0,0,0,0,0,0,0,0,0,0,0,"<Battle training request form D>"
-5153,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Refining tutorial (1)"
-5154,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Refining tutorial (2)"
-5155,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Refining tutorial (3)"
-5156,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Refining tutorial (4)"
-5157,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Enchant tutorial (1)"
-5158,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Entchant tutorial (2)"
-5159,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Enchant tutorial (3)"
-
 // 2012 Headgear Quests
 5161,86400,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Low Level collection request[Stand by]"
 5162,0,1164,100,0,0,0,0,0,0,0,0,0,0,0,0,0,"Low Level collection request"
@@ -1341,49 +1282,6 @@
 7452,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Find the chief of staff!"
 7453,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"The last of the chief of staff"

-// Academy 14.2
-7471,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"First time talking after being born"
-7472,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"First step towards a new world"
-7473,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Cool drink"
-7474,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Searching for treasure"
-7475,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Discovered the Airship"
-7476,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Discovered the Arena"
-7477,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Bridge to Prontera"
-7478,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Basic Medical Botany"
-7479,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Friend or Foe?"
-7480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Regarding Thief job"
-7481,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Vicente's class"
-7482,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Vercassel's class"
-7483,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Use the Thief Manual"
-7484,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Shop owner! Order to steal!"
-7485,0,1725,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Assassin! Use Envenom"
-7486,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"With Lumin"
-7487,30,1725,4,0,0,0,0,0,0,0,0,0,0,0,0,0,"30 second duel"
-7488,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Trio set of Fire Elements"
-7489,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Silent liquidation plan"
-7490,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Mushroom soup calling memories"
-7491,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Get away to Paradise!"
-7492,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Invincible pumpkin knight"
-7493,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Battle of 17 vs. 1"
-7494,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Cleanup of the mushroom farm"
-
-// WOE TE Mission
-7501,14400,2451,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"1 Suspicious Babe"
-7502,14400,2451,10,0,0,0,0,0,0,0,0,0,0,0,0,0,"10 Suspicious Babes"
-7503,14400,2451,30,0,0,0,0,0,0,0,0,0,0,0,0,0,"30 Suspicious Babes"
-7504,14400,1288,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Destroy 1 Emperium"
-7505,14400,1288,3,0,0,0,0,0,0,0,0,0,0,0,0,0,"Destroy 3 Emperiums"
-7506,14400,1288,5,0,0,0,0,0,0,0,0,0,0,0,0,0,"Destroy 5 Emperiums"
-7507,14400,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"10 Small Wooden Boxes"
-7508,14400,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"20 Small Wooden Boxes"
-7509,14400,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"30 Small Wooden Boxes"
-7510,14400,2450,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Fight Off a Thief"
-7511,14400,2450,10,0,0,0,0,0,0,0,0,0,0,0,0,0,"Fight Off 10 Thieves"
-7512,14400,2450,30,0,0,0,0,0,0,0,0,0,0,0,0,0,"Fight Off 30 Thieves"
-7513,14400,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"10 Paychecks"
-7514,14400,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"20 Paychecks"
-7515,14400,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"30 Paychecks"
-
 //7619,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
 //7621,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
 //7622,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
@@ -1770,15 +1668,6 @@
 9260,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Survey investigation notes"
 9262,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Mystery Robbery Incident 16"

-// Academy 14.2
-9264,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Job change to Mage"
-9265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Job change to Mage"
-9266,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Job change to Mage"
-9267,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"The way to be a strong Mage - 1"
-9268,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"The way to be a strong Mage - 2"
-9269,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"The way to be a strong Mage - 3"
-9270,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"The way to be a strong Mage - 4"
-
 //9327,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
 //9328,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
 //9329,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
@@ -2151,9 +2040,6 @@
 11244,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Soft Jelly"
 11245,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Soft Jelly"

-// Academy 14.2
-11255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Otter Ssamsun"
-
 11284,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Nurse at Port Malaya-1"
 11285,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Nurse at Port Malaya-2"
 11286,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Nurse at Port Malaya-3"
@@ -2210,19 +2096,6 @@
 11336,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Dreaming boy"
 11337,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Dreaming boy"

-// Academy 14.2
-11338,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Conversation with Subino"
-11339,0,1002,10,0,0,0,0,0,0,0,0,0,0,0,0,0,"The most delicious on earth"
-11340,0,1063,10,0,0,0,0,0,0,0,0,0,0,0,0,0,"Carrots are delicious!"
-11341,0,1007,10,0,0,0,0,0,0,0,0,0,0,0,0,0,"Rolling Fabre's clothing"
-11342,0,1004,10,0,0,0,0,0,0,0,0,0,0,0,0,0,"Antidote Material~"
-11343,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Conversation with Alice"
-11344,0,1008,5,0,0,0,0,0,0,0,0,0,0,0,0,0,"Barrier!!"
-11345,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Conversation with Alice"
-11346,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Acolyte_damped creatures(LV.13)"
-11347,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Acolyte_soft bone(LV.18)"
-11348,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Acolyte_Solid bone(LV.23)"
-
 //11366,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
 11378,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Trick or treat" // Halloween Event 2013

@@ -2519,21 +2392,6 @@
 12300,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Revisiting Etran"
 12301,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Two remaining friends"

-// Academy 14.2
-12302,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Salim Hamid"
-12303,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Applicant for trader"
-12304,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Introduction to merchantology"
-12305,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"About the capability figure"
-12306,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Experience of disounts"
-12307,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Way to the Merchant"
-12308,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Removal of Worm Tails"
-12309,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Removal of Boa"
-12310,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Removal of Spore"
-12311,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Removal of Pirate Skeletons"
-12312,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Supplementary to the theory lesson"
-12313,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"About stats"
-12314,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"About skills"
-
 // Old Glast Heim
 12317,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Fake Keyblade"
 12318,0,2475,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Upper Cats: annoying guy"
@@ -2635,14 +2493,6 @@
 13099,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Fragments and Rusty Screw"
 13100,3600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Fragments and Rusty Screw - Wait"

-// Academy 14.2
-13101,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"The way of Taekwon"
-13102,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Spinning kick"
-13103,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Breaking Willows"
-13104,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Breaking Spores"
-13105,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Breaking Zombies"
-13106,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Breaking Skeletons"
-
 // eden 121-130
 13107,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Thanatos Tower Search"
 13108,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Rachel holy ground Search"
@@ -2730,32 +2580,6 @@
 14140,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"To Wuhari"
 14141,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ingredients for research"

-// Academy 14.2
-14142,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"To the Archer's town!"
-14143,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Application for the Archer's job change"
-14144,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Retest - Stats"
-14145,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Archer Skills"
-14146,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Hunting training"
-14147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Retest - Skills"
-14148,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"To the next step"
-14149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Listening to the 2nd job change"
-14150,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"To the next step"
-14151,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Hunting training - Spoa"
-14152,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Hunting training - Creamy"
-14153,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Hunting training - Skeleton"
-14154,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Fragrant herb mix"
-14155,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Crunchy salad"
-14156,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Anything shabushabu"
-14157,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Baked golden apple"
-14158,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Presentation of the Archer manual"
-14159,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Met with the PR staff"
-14160,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Met with the PR staff"
-14161,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Test of stats"
-14162,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Test of skills"
-14163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Caught Spores"
-14164,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Caught Creamy"
-14165,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Caught Skeletons"
-
 //14254,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
 //14255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
 //14256,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
@@ -2793,11 +2617,6 @@
 //14289,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
 //14290,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
 //14291,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
-
-// Academy 14.2
-15000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Experiencing abnormal statuses"
-15001,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Hold your breath"
-
 //15025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
 //15026,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
 //15027,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
--- a/db/re/skill_cast_db.txt
+++ b/db/re/skill_cast_db.txt
@@ -131,7 +131,7 @@
 //-- PR_BENEDICTIO
 69,0,0,0,40000:80000:120000:160000:200000,0,0,0
 //-- PR_SANCTUARY
-70,4000,0,0,3500:6500:9500:12500:15500:18500:21500:24500:27500:30500,0,0,1000
+70,4000,0,0,4000:7000:10000:13000:16000:19000:22000:25000:28000:31000,0,0,1000
 //-- PR_SLOWPOISON
 71,0,0,0,10000:20000:30000:40000,0,0,0
 //-- PR_STRECOVERY
@@ -166,7 +166,7 @@
 //-- WZ_VERMILION
 85,9600:9280:8960:8640:8320:8000:7680:7360:7040:6720,5000,0,4000,5500:6000:6500:7000:7500:8000:8500:9000:9500:10000,0,2400:2320:2240:2160:2080:2000:1920:1840:1760:1680
 //-- WZ_WATERBALL
-86,640:1280:1920:2560:3200,0,0,10000,0,0,160:320:480:640:800
+86,640:1280:1920:2560:3200,0,0,0,0,0,160:320:480:640:800
 //-- WZ_ICEWALL
 87,0,0,0,5000:10000:15000:20000:25000:30000:35000:40000:45000:50000,0,0,0
 //-- WZ_FROSTNOVA
@@ -993,7 +993,7 @@
 //-- NPC_WIDESIGHT
 669,0,0,0,10000,0,0,-1
 //-- NPC_EVILLAND
-670,0,0,0,3500:4500:5500:6500:7500:8500:9500:10500:11500:12500,30000,0,-1
+670,0,0,0,30000,30000,0,-1
 //-- NPC_MAGICMIRROR
 671,0,0,0,30000:30000:30000:30000:30000:2000:2000:2000:2000:2000,0,0,-1
 //-- NPC_SLOWCAST
--- a/db/re/skill_db.txt
+++ b/db/re/skill_db.txt
@@ -66,8 +66,6 @@
 //    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
@@ -138,7 +136,7 @@
 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,0x84064,		TF_HIDING,Hiding
+51,1,6,4,0,1,0,10,1,no,0,0,0,none,0,0x4064,		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
 //
@@ -218,14 +216,14 @@
 //****
 // 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,0xC2,0,5,1,no,0,0x80,0,misc,0,0x3800,	HT_LANDMINE,Land Mine
+116,3,6,2,2,0x42,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,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
+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,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
@@ -240,7 +238,7 @@
 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,0x80060,	AS_CLOAKING,Cloaking
+135,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0,0x60,	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
 138,1,6,16,5,0x1,0,10,1,no,0,0x400,0,weapon,0,0x0,	AS_ENCHANTPOISON,Enchant Poison
@@ -544,7 +542,7 @@
 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,9,6,1,-1,0x68,0,10,1,yes,0,0,0,misc,0,0x0,	ASC_BREAKER,Soul Destroyer
+379,7,6,1,-1,0x68,0,10,1,yes,0,0,0,misc,0,0x0,	ASC_BREAKER,Soul Destroyer

 //****
 // Sniper
@@ -795,7 +793,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,7,6,2,7,0xD1,0,10,1,no,0,0x2,0,magic,0,0x0,	NPC_EVILLAND,Evil Land
+670,9,6,2,7,0x91,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
@@ -892,7 +890,7 @@
 // RK Rune Knight
 2001,0,6,4,0,0x1,0,5,1,yes,0,0,0,none,0,0x0,	RK_ENCHANTBLADE,Enchant Blade
 2002,7:8:9:10:11,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x0,	RK_SONICWAVE,Sonic Wave
-2003,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,3,0x0,	RK_DEATHBOUND,Death Bound
+2003,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0,0x0,	RK_DEATHBOUND,Death Bound
 2004,5,8,1,-1,0,0,10,-5,no,0,0,0,weapon,0,0x20000,	RK_HUNDREDSPEAR,Hundred Spear
 2005,1,6,2,4,0x2,2,5,1,no,0,0,0,weapon,3,0x0,	RK_WINDCUTTER,Wind Cutter
 2006,0,6,4,-1,0x2,5,5,1,no,0,0,0,weapon,0,0x0,	RK_IGNITIONBREAK,Ignition Break
@@ -961,7 +959,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,0x80040,	GC_CLOAKINGEXCEED,Cloaking Exceed
+2033,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0,0x40,	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
@@ -1003,12 +1001,12 @@
 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,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
+2242,0,6,4,-1,0x42,1,1,1,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
 2245,0,0,0,0,0,0,10,0,no,0,0,0,none,0,0x0,		RA_TOOTHOFWUG,Tooth of Warg
 2246,0,6,4,0,0x2,3:4:5:6:7,5,1,no,0,0x40000,0,weapon,0,0x0,	RA_SENSITIVEKEEN,Sensitive Keen
-2247,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x80042,		RA_CAMOUFLAGE,Camouflage
+2247,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x42,		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
@@ -1071,7 +1069,7 @@
 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,3:6:9,0x0,	SC_FEINTBOMB,Feint Bomb
+2304,0,6,4,-1,0,0,3,1,no,0,0,0,weapon,0,0x0,	SC_FEINTBOMB,Feint Bomb

 //****
 // LG Royal Guard
@@ -1099,11 +1097,11 @@

 //****
 // SR Sura
-2326,1,8,1,-1,0,0,10,-2,no,0,0,0,weapon,0,0x0,	SR_DRAGONCOMBO,Dragon Combo
+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,1,8,4,-1,0,0,5,-2,no,0,0x200,0,weapon,0,0x0,	SR_FALLENEMPIRE,Fallen Empire
-2330,1,6,1,-1,0x3,1:1:1:1:1:2:2:2:2:2,10,1,yes,0,0,0,weapon,0,0x0,	SR_TIGERCANNON,Tiger Cannon
+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
 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
@@ -1119,7 +1117,7 @@
 2343,1:2:3:3:4:4:5:5:6:7,8,1,-1,0,0,10,-7,yes,0,0,0,weapon,0,0x0,	SR_GATEOFHELL,Gate of Hell
 2344,2,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x0,	SR_GENTLETOUCH_QUIET,Gentle Touch - Quiet
 2345,2,6,16,0,0x1,0,5,1,no,0,0,0,none,0,0x0,	SR_GENTLETOUCH_CURE,Gentle Touch - Cure
-2346,2,6,4,0,0x1,0,5,1,yes,0,0,0,none,0,0x0,	SR_GENTLETOUCH_ENERGYGAIN,Gentle Touch - Energy Gain
+2346,0,6,4,0,0x1,0,5,1,yes,0,0,0,none,0,0x0,	SR_GENTLETOUCH_ENERGYGAIN,Gentle Touch - Energy Gain
 2347,2,6,16,0,0x1,0,5,1,yes,0,0,0,none,0,0x0,	SR_GENTLETOUCH_CHANGE,Gentle Touch - Change
 2348,2,6,16,0,0x1,0,5,1,yes,0,0,0,none,0,0x0,	SR_GENTLETOUCH_REVITALIZE,Gentle Touch - Revitalize
 //More from Sura but not following ID order
@@ -1199,7 +1197,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,0x42,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,0x2,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....
@@ -1234,7 +1232,7 @@
 //2541,0,6,4,0,0x1,0,5,1,no,0,0x2,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,6,4,0,0x1,0,1,1,no,0,0,0,none,0,0x0,	ALL_RAY_OF_PROTECTION,Ray of Protection
-2544,0,6,4,0,0x1,0,1,1,no,0,0x1,0,none,0,0x0,		MC_CARTDECORATE,Decorate Cart
+//2544,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,	MC_CARTDECORATE,Decorate Cart
 //2545,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0,0x0,	GM_ITEM_ATKMAX,Maximize Attack
 //2546,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0,0x0,	GM_ITEM_ATKMIN,Minimize Attack
 //2547,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0,0x0,	GM_ITEM_MATKMAX,Maximize Magic Attack
@@ -1322,11 +1320,15 @@
 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,4:5:6:7:8:9,0x0, SC_ESCAPE,Emergency Escape
+5010,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,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,-2,8,1,-1,0,0,10,-2,no,0,0,0,weapon,0,0x0,                     	SR_FLASHCOMBO_ATK_STEP1,Flash Combo Attack Step 1
+5016,-2,8,4,-1,0,0,5,-2,no,0,0x200,0,weapon,0,0x0,                  	SR_FLASHCOMBO_ATK_STEP2,Flash Combo Attack Step 2
+5017,-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_FLASHCOMBO_ATK_STEP3,Flash Combo Attack Step 3
+5018,0,8,4,-1,0x2,2,5,-3,no,0,0,0,weapon,3,0x0,                     	SR_FLASHCOMBO_ATK_STEP4,Flash Combo Attack Step 4

 //****
 // Homunculus S
--- a/db/re/skill_nocast_db.txt
+++ b/db/re/skill_nocast_db.txt
@@ -9,7 +9,7 @@
 // 2    - cannot be used in PvP maps (use this instead of 1 for PK-mode servers)
 // 4    - cannot be used in GvG maps
 // 8    - cannot be used in Battleground maps
-// 16   - cannot be used in WOE:TE castles
+// 16   - cannot be cloned (clones will not copy this skill)
 // Restricted zones - configured by 'restricted <number>' mapflag
 // 32   - cannot be used in zone 1 maps
 // 64   - cannot be used in zone 2 maps
@@ -18,7 +18,6 @@
 // 512  - cannot be used in zone 5 maps
 // 1024 - cannot be used in zone 6 maps
 // 2048 - cannot be used in zone 7 maps
-// 4096 - cannot be used in zone 8 maps
 //
 // Example:
 // 8,6  // Endure cannot be used in PvP and GvG maps (2+4)
@@ -100,38 +99,10 @@
 3013,3	//KO_KYOUGAKU

 //----------------------------------------------------------------------------
-// Restricted in WOE:TE Castles
+// Clone Forbidden/pointless skills
 //----------------------------------------------------------------------------
-8,16	// SM_ENDURE
-26,16	// AL_TELEPORT
-27,16	// AL_WARP
-41,16	// MC_VENDING
-87,16	// WZ_ICEWALL
-147,16	// AC_MAKINGARROW
-150,16	// TF_BACKSLIDING
-211,16	// RG_STEALCOIN
-219,16	// RG_INTIMIDATE
-336,16	// WE_CALLPARTNER
-359,16	// LK_BERSERK
-361,16	// HP_ASSUMPTIO
-362,16	// HP_BASILICA
-389,16	// ST_CHASEWALK
-395,16	// CG_MOONLIT
-396,16	// CG_MARIONETTE
-409,16	// WE_CALLPARENT
-410,16	// WE_CALLBABY
-426,16	// TK_HIGHJUMP
-491,16	// CR_CULTIVATION
-529,16	// NJ_SHADOWJUMP
-// 530,16	// NJ_KIRIKAGE
-691,16	// CASH_ASSUMPTIO
-//!TODO: More 3rd Class skills
-// 2284,16	// SC_FATALMENACE
-// 2300,16	// SC_DIMENSIONDOOR
-// 2293,16	// SC_GROOMY
-// 2296,16	// SC_UNLUCKY
-// 2494,16	// GN_CHANGEMATERIAL
-// 2462,16	// SO_EL_ANALYSIS
+77,16	//PR_TURNUNDEAD
+79,16	//PR_MAGNUS

 //----------------------------------------------------------------------------
 // Zone 1 - Aldebaran Turbo Track
@@ -213,10 +184,3 @@
 2419,2048	//WM_POEMOFNETHERWORLD
 2482,2048	//GN_WALLOFTHORN
 2493,2048	//GN_SLINGITEM
-
-//----------------------------------------------------------------------------
-// Zone 8 - WOE:TE Dungeons
-//----------------------------------------------------------------------------
-336,4096 // WE_CALLPARTNER
-409,4096 // WE_CALLPARENT
-410,4096 // WE_CALLBABY
--- a/db/re/skill_require_db.txt
+++ b/db/re/skill_require_db.txt
@@ -119,7 +119,7 @@

 //****
 // WZ Wizard
-80,0,0,75,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0								//WZ_FIREPILLAR
+80,0,0,75,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,717,1,717,1,717,1,717,1,717,1,0						//WZ_FIREPILLAR
 81,0,0,35:37:39:41:43:45:47:49:51:53,0,0,0,99,0,0,none,SC_SIGHT,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//WZ_SIGHTRASHER
 83,0,0,20:24:30:34:40:44:50:54:60:64,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	//WZ_METEOR
 84,0,0,20:23:26:29:32:35:38:41:44:47,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	//WZ_JUPITEL
@@ -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,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
+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
 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

 //****
@@ -502,7 +502,7 @@
 517,0,0,30:32:34:36:38:40:42:44:46:48,0,0,0,19,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_GATLINGFEVER
 518,0,0,3:6:9:12:15:18:21:24:27:30,0,0,0,20,3,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0		//GS_DUST
 519,0,0,20:25:30:35:40:45:50:55:60:65,0,0,0,20,3,2:2:4:4:6:6:8:8:10:10,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_FULLBUSTER
-520,0,0,15:20:25:30:35:40:45:50:55:60,0,0,0,20:21,3:5,5,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0//GS_SPREADATTACK
+520,0,0,15:20:25:30:35:40:45:50:55:60,0,0,0,20:21,3,5,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0//GS_SPREADATTACK
 521,0,0,4:8:12:16:20:24:28:32:36:40,0,0,0,21,5,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0		//GS_GROUNDDRIFT

 //****
@@ -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,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
+//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
 //2545,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							//GM_ITEM_ATKMAX
 //2546,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							//GM_ITEM_ATKMIN
 //2547,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							//GM_ITEM_MATKMAX
@@ -971,6 +971,10 @@
 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,0,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,0,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,0,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,0,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

 8001,0,0,13:16:19:22:25,0,0,0,99,0,0,none,0,0,545,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0				//HLIF_HEAL
 8002,0,0,20:25:30:35:40,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0					//HLIF_AVOID
--- a/db/re/skill_tree.txt
+++ b/db/re/skill_tree.txt
@@ -80,8 +80,6 @@
 5,154,1,0,0,0,0,0,0,0,0,0,0 //MC_CHANGECART#Change Cart#
 5,155,1,0,0,0,0,0,0,0,0,0,0 //MC_LOUD#Crazy Uproar#
 5,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby#
-5,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
-5,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#
@@ -231,8 +229,6 @@
 10,1013,1,0,0,0,0,0,0,0,0,0,0 //BS_GREED#Greed#
 10,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby#
 10,459,1,111,5,0,0,0,0,0,0,0,0	//BS_ADRENALINE2#Full Adrenaline Rush#
-10,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
-10,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#
@@ -496,8 +492,6 @@
 18,496,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT1#Twilight Alchemy 1#
 18,497,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT2#Twilight Alchemy 2#
 18,498,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT3#Twilight Alchemy 3#
-18,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
-18,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#
@@ -650,8 +644,6 @@
 23,52,10,0,0,0,0,0,0,0,0,0,0 //TF_POISON#Envenom#
 23,53,1,52,3,0,0,0,0,0,0,0,0 //TF_DETOXIFY#Detoxify#
 23,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby#
-23,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
-23,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#
@@ -786,8 +778,6 @@
 4006,154,1,0,0,0,0,0,0,0,0,0,0 //MC_CHANGECART#Change Cart#
 4006,155,1,0,0,0,0,0,0,0,0,0,0 //MC_LOUD#Crazy Uproar#
 4006,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby#
-4006,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
-4006,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#
@@ -962,8 +952,6 @@
 4011,486,5,113,5,0,0,0,0,0,0,0,0 //WS_OVERTHRUSTMAX#Maximum Power Thrust#
 4011,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby#
 4011,459,1,111,5,0,0,0,0,0,0,0,0	//BS_ADRENALINE2#Full Adrenaline Rush#
-4011,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
-4011,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#
@@ -1270,8 +1258,6 @@
 4019,496,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT1#Twilight Alchemy 1#
 4019,497,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT2#Twilight Alchemy 2#
 4019,498,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT3#Twilight Alchemy 3#
-4019,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
-4019,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#
@@ -1468,8 +1454,6 @@
 4028,155,1,0,0,0,0,0,0,0,0,0,0 //MC_LOUD#Crazy Uproar#
 4028,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby#
 4028,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent#
-4028,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
-4028,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#
@@ -1623,8 +1607,6 @@
 4033,1012,1,0,0,0,0,0,0,0,0,0,0 //BS_UNFAIRLYTRICK#Unfair Trick#
 4033,1013,1,0,0,0,0,0,0,0,0,0,0 //BS_GREED#Greed#
 4033,459,1,111,5,0,0,0,0,0,0,0,0	//BS_ADRENALINE2#Full Adrenaline Rush#
-4033,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
-4033,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#
@@ -1896,8 +1878,6 @@
 4041,496,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT1#Twilight Alchemy 1#
 4041,497,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT2#Twilight Alchemy 2#
 4041,498,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT3#Twilight Alchemy 3#
-4041,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
-4041,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#
@@ -2048,8 +2028,6 @@
 4045,53,1,52,3,0,0,0,0,0,0,0,0 //TF_DETOXIFY#Detoxify#
 4045,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby#
 4045,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent#
-4045,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
-4045,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#
@@ -2656,8 +2634,6 @@
 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,2,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#
@@ -3008,8 +2984,6 @@
 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,2,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#
@@ -3412,8 +3386,6 @@
 4071,2497,10,0,0,0,0,0,0,0,0,0,0 //GN_S_PHARMACY#Special Pharmacy#
 4071,5003,5,2497,1,0,0,0,0,0,0,0,0 //GN_ILLUSIONDOOPING#Hallucination Drug#
 4071,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
-4071,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
-4071,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#
@@ -3856,8 +3828,6 @@
 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,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
-4078,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
-4078,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#
@@ -4299,8 +4269,6 @@
 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,2,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#
@@ -4375,8 +4343,6 @@
 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,2,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#
@@ -4660,8 +4626,6 @@
 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,2,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#
@@ -5066,8 +5030,6 @@
 4107,2497,10,0,0,0,0,0,0,0,0,0,0 //GN_S_PHARMACY#Special Pharmacy#
 4107,5003,5,2497,1,0,0,0,0,0,0,0,0 //GN_ILLUSIONDOOPING#Hallucination Drug#
 4107,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
-4107,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
-4107,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#
@@ -5347,8 +5309,6 @@
 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,2,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#
@@ -5431,8 +5391,6 @@
 4190,261,5,259,2,0,0,0,0,0,0,0,0 //MO_CALLSPIRITS#Summon Spirit Sphere#
 4190,262,1,261,5,0,0,0,0,0,0,0,0 //MO_ABSORBSPIRITS#Absorb Spirit Sphere#
 4190,365,1,9,1,0,0,0,0,0,0,0,0 //HW_MAGICCRASHER#Stave Crasher#
-4190,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
-4190,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#
@@ -5516,8 +5474,6 @@
 4191,261,5,259,2,0,0,0,0,0,0,0,0 //MO_CALLSPIRITS#Summon Spirit Sphere#
 4191,262,1,261,5,0,0,0,0,0,0,0,0 //MO_ABSORBSPIRITS#Absorb Spirit Sphere#
 4191,365,1,9,1,0,0,0,0,0,0,0,0 //HW_MAGICCRASHER#Stave Crasher#
-4191,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
-4191,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#
--- a/db/re/skill_unit_db.txt
+++ b/db/re/skill_unit_db.txt
@@ -42,7 +42,6 @@
 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
- 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
@@ -104,7 +103,7 @@
 535,0xbd,    , -1, 0,  20,enemy, 0x8010	//NJ_KAENSIN
 538,0xbb,    ,  1:1:1:2:2:2:3:3:3:4,0,-1,all,0x8010	//NJ_SUITON
 541,0x86,    ,  0, 3:3:4:4:5,1000,enemy, 0x018	//NJ_RAIGEKISAI
-670,0xc7,    ,  1, 5:5:5:5:5:5:5:5:5:13,1000,all,0x008	//NPC_EVILLAND
+670,0xc7,    ,  1, 4:7:10:13:16:19:22:25:28:31,1000,all,0x008	//NPC_EVILLAND

 //706,0xfd,    ,  0, 0,1000,all, 0x000	//NPC_VENOMFOG

@@ -160,7 +159,7 @@
 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, 0xC002	//GN_HELLS_PLANT
+2490,0xea,    ,  0, 1,1000,enemy, 0x8002	//GN_HELLS_PLANT

 2555,0x104,   ,  0, 1:2:2:3:3,500,enemy,0x6	//RL_B_TRAP
 2567,0x105,   , -1, 0,1000,enemy, 0x98	//RL_FIRE_RAIN
@@ -168,7 +167,7 @@
 3006,0x86,    ,  0, 1,1000,enemy, 0x018	//KO_BAKURETSU
 3008,0x86,    ,  0, 1:1:1:1:1:1:1:1:1:2,1000,enemy, 0x018 //KO_MUCHANAGE
 3009,0x86,    ,  0, 3,1000,enemy, 0x018 //KO_HUUMARANKA
-3010,0xfc,    ,  0, 0,5000,enemy, 0x018 //KO_MAKIBISHI
+3010,0xfc,    ,  0, 1,5000,enemy, 0x018 //KO_MAKIBISHI
 3020,0xf8,    ,  0, 2, 500,all, 0x018   //KO_ZENKAI

 5006,0x101,   ,  0, 3, 500,enemy, 0x018	//NC_MAGMA_ERUPTION
--- a/db/status_disabled.txt
+++ b/db/status_disabled.txt
@@ -1,309 +0,0 @@
-// 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
-// 16   - restricted in WOE:TE castles
-// Restricted zones - configured by 'restricted <number>' mapflag
-// 32   - restricted in zone 1
-// 64   - restricted in zone 2
-// 128  - restricted in zone 3
-// 256  - restricted in zone 4
-// 512  - restricted in zone 5
-// 1024 - restricted in zone 6
-// 2048 - restricted in zone 7
-// 4096 - restricted in zone 8
-//
-// Example:
-// SC_ENDURE,4   // Endure status will be removed when the player enters GvG and WoE Castle maps; Also cannot be inflicted again.
-
-//----------------------------------------------------------------------------
-// Disabled/Removed statuses in WoE:TE Castles (16)
-//----------------------------------------------------------------------------
-SC_ENDURE,16
-SC_BERSERK,16
-SC_ASSUMPTIO,16
-
-// RUNE_KNIGHT
-SC_ENCHANTBLADE,16
-SC_DEATHBOUND,16
-SC_MILLENNIUMSHIELD,16
-SC_CRUSHSTRIKE,16
-SC_REFRESH,16
-SC_REUSE_REFRESH,16
-SC_GIANTGROWTH,16
-SC_STONEHARDSKIN,16
-SC_VITALITYACTIVATION,16
-SC_STORMBLAST,16
-SC_FIGHTINGSPIRIT,16
-SC_ABUNDANCE,16
-
-// ARCH_BISHOP
-SC_ADORAMUS,16
-SC_EPICLESIS,16
-SC_ORATIO,16
-SC_LAUDAAGNUS,16
-SC_LAUDARAMUS,16
-SC_RENOVATIO,16
-SC_EXPIATIO,16
-SC_DUPLELIGHT,16
-SC_SECRAMENT,16
-
-// WARLOCK
-SC_WHITEIMPRISON,16
-SC_MARSHOFABYSS,16
-SC_RECOGNIZEDSPELL,16
-SC_STASIS,16
-SC_SPHERE_1,16
-SC_SPHERE_2,16
-SC_SPHERE_3,16
-SC_SPHERE_4,16
-SC_SPHERE_5,16
-SC_READING_SB,16
-SC_FREEZE_SP,16
-SC_SPELLBOOK1,16
-SC_SPELLBOOK2,16
-SC_SPELLBOOK3,16
-SC_SPELLBOOK4,16
-SC_SPELLBOOK5,16
-SC_SPELLBOOK6,16
-SC_MAXSPELLBOOK,16
-
-// RANGER
-SC_FEARBREEZE,16
-SC_ELECTRICSHOCKER,16
-SC_WUGDASH,16
-SC_BITE,16
-SC_CAMOUFLAGE,16
-
-// MECHANIC
-SC_ACCELERATION,16
-SC_HOVERING,16
-SC_SHAPESHIFT,16
-SC_INFRAREDSCAN,16
-SC_ANALYZE,16
-SC_MAGNETICFIELD,16
-SC_NEUTRALBARRIER,16
-SC_NEUTRALBARRIER_MASTER,16
-SC_STEALTHFIELD,16
-SC_STEALTHFIELD_MASTER,16
-SC_OVERHEAT,16
-SC_OVERHEAT_LIMITPOINT,16
-
-// GUILLOTINE_CROSS
-SC_VENOMIMPRESS,16
-SC_POISONINGWEAPON,16
-SC_WEAPONBLOCKING,16
-SC_CLOAKINGEXCEED,16
-SC_HALLUCINATIONWALK,16
-SC_HALLUCINATIONWALK_POSTDELAY,16
-SC_ROLLINGCUTTER,16
-SC_TOXIN,16
-SC_PARALYSE,16
-SC_VENOMBLEED,16
-SC_MAGICMUSHROOM,16
-SC_DEATHHURT,16
-SC_PYREXIA,16
-SC_OBLIVIONCURSE,16
-SC_LEECHESEND,16
-
-// ROYAL_GUARD
-SC_REFLECTDAMAGE,16
-SC_FORCEOFVANGUARD,16
-SC_SHIELDSPELL_DEF,16
-SC_SHIELDSPELL_MDEF,16
-SC_SHIELDSPELL_REF,16
-SC_EXEEDBREAK,16
-SC_PRESTIGE,16
-SC_BANDING,16
-SC_BANDING_DEFENCE,16
-SC_EARTHDRIVE,16
-SC_INSPIRATION,16
-
-// SORCERER
-SC_SPELLFIST,16
-SC_CRYSTALIZE,16
-SC_STRIKING,16
-SC_WARMER,16
-SC_VACUUM_EXTREME,16
-SC_PROPERTYWALK,16
-SC_VACUUM_EXTREME_POSTDELAY,16
-
-// MINSTREL
-SC_SWINGDANCE,16
-SC_SYMPHONYOFLOVER,16
-SC_MOONLITSERENADE,16
-SC_RUSHWINDMILL,16
-SC_ECHOSONG,16
-SC_HARMONIZE,16
-
-// WANDERER
-SC_VOICEOFSIREN,16
-SC_DEEPSLEEP,16
-SC_SIRCLEOFNATURE,16
-SC_GLOOMYDAY,16
-SC_GLOOMYDAY_SK,16
-
-// MINSTREL & WANDERER
-SC_SONGOFMANA,16
-SC_DANCEWITHWUG,16
-SC_SATURDAYNIGHTFEVER,16
-SC_LERADSDEW,16
-SC_MELODYOFSINK,16
-SC_BEYONDOFWARCRY,16
-SC_UNLIMITEDHUMMINGVOICE,16
-
-// SURA
-SC_SITDOWN_FORCE,16
-SC_NETHERWORLD,16
-SC_CRESCENTELBOW,16
-SC_CURSEDCIRCLE_ATKER,16
-SC_CURSEDCIRCLE_TARGET,16
-SC_LIGHTNINGWALK,16
-SC_RAISINGDRAGON,16
-SC_GT_ENERGYGAIN,16
-SC_GT_CHANGE,16
-SC_GT_REVITALIZE,16
-SC_GN_CARTBOOST,16
-
-// GENETIC
-SC_THORNSTRAP,16
-SC_BLOODSUCKER,16
-SC_SMOKEPOWDER,16
-SC_TEARGAS,16
-SC_MANDRAGORA,16
-SC_STOMACHACHE,16
-SC_MYSTERIOUS_POWDER,16
-SC_MELON_BOMB,16
-SC_BANANA_BOMB,16
-SC_BANANA_BOMB_SITDOWN,16
-SC_SAVAGE_STEAK,16
-SC_COCKTAIL_WARG_BLOOD,16
-SC_MINOR_BBQ,16
-SC_SIROMA_ICE_TEA,16
-SC_DROCERA_HERB_STEAMED,16
-SC_PUTTI_TAILS_NOODLES,16
-SC_BOOST500,16
-SC_FULL_SWING_K,16
-SC_MANA_PLUS,16
-SC_MUSTLE_M,16
-SC_LIFE_FORCE_F,16
-SC_EXTRACT_WHITE_POTION_Z,16
-SC_VITATA_500,16
-SC_EXTRACT_SALAMINE_JUICE,16
-
-// Homunculus
-SC_STYLE_CHANGE,16
-SC_TINDER_BREAKER,16
-SC_TINDER_BREAKER2,16
-SC_CBC,16
-SC_EQC,16
-SC_GOLDENE_FERSE,16
-SC_ANGRIFFS_MODUS,16
-SC_OVERED_BOOST,16
-SC_LIGHT_OF_REGENE,16
-SC_ASH,16
-SC_GRANITIC_ARMOR,16
-SC_MAGMA_FLOW,16
-SC_PYROCLASTIC,16
-SC_PARALYSIS,16
-SC_PAIN_KILLER,16
-
-// SHADOW_CHASER
-SC__REPRODUCE,16
-SC__AUTOSHADOWSPELL,16
-SC__SHADOWFORM,16
-SC__BODYPAINT,16
-SC__INVISIBILITY,16
-SC__DEADLYINFECT,16
-SC__ENERVATION,16
-SC__GROOMY,16
-SC__IGNORANCE,16
-SC__LAZINESS,16
-SC__UNLUCKY,16
-SC__WEAKNESS,16
-SC__STRIPACCESSORY,16
-SC__MANHOLE,16
-SC__BLOODYLUST,16
-
-// Elemental SORCERER
-SC_CIRCLE_OF_FIRE,16
-SC_CIRCLE_OF_FIRE_OPTION,16
-SC_FIRE_CLOAK,16
-SC_FIRE_CLOAK_OPTION,16
-SC_WATER_SCREEN,16
-SC_WATER_SCREEN_OPTION,16
-SC_WATER_DROP,16
-SC_WATER_DROP_OPTION,16
-SC_WATER_BARRIER,16
-SC_WIND_STEP,16
-SC_WIND_STEP_OPTION,16
-SC_WIND_CURTAIN,16
-SC_WIND_CURTAIN_OPTION,16
-SC_ZEPHYR,16
-SC_SOLID_SKIN,16
-SC_SOLID_SKIN_OPTION,16
-SC_STONE_SHIELD,16
-SC_STONE_SHIELD_OPTION,16
-SC_POWER_OF_GAIA,16
-SC_PYROTECHNIC,16
-SC_PYROTECHNIC_OPTION,16
-SC_HEATER,16
-SC_HEATER_OPTION,16
-SC_TROPIC,16
-SC_TROPIC_OPTION,16
-SC_AQUAPLAY,16
-SC_AQUAPLAY_OPTION,16
-SC_COOLER,16
-SC_COOLER_OPTION,16
-SC_CHILLY_AIR,16
-SC_CHILLY_AIR_OPTION,16
-SC_GUST,16
-SC_GUST_OPTION,16
-SC_BLAST,16
-SC_BLAST_OPTION,16
-SC_WILD_STORM,16
-SC_WILD_STORM_OPTION,16
-SC_PETROLOGY,16
-SC_PETROLOGY_OPTION,16
-SC_CURSED_SOIL,16
-SC_CURSED_SOIL_OPTION,16
-SC_UPHEAVAL,16
-SC_UPHEAVAL_OPTION,16
-SC_TIDAL_WEAPON,16
-SC_TIDAL_WEAPON_OPTION,16
-SC_ROCK_CRUSHER,16
-SC_ROCK_CRUSHER_ATK,16
-SC_FIRE_INSIGNIA,16
-SC_WATER_INSIGNIA,16
-SC_WIND_INSIGNIA,16
-SC_EARTH_INSIGNIA,16
-
-// KAGEROU / OBORO
-SC_MEIKYOUSISUI,16
-SC_JYUMONJIKIRI,16
-SC_KYOUGAKU,16
-SC_IZAYOI,16
-SC_ZENKAI,16
-SC_KAGEHUMI,16
-SC_KYOMU,16
-SC_KAGEMUSYA,16
-SC_ZANGETSU,16
-SC_GENSOU,16
-SC_AKAITSUKI,16
-
-// Others
-SC_FEAR,16
-SC_BURNING,16
-SC_FREEZING,16
-SC_TEARGAS_SOB,16
-SC__FEINTBOMB,16
-SC__CHAOS,16
--- a/doc/item_bonus.txt
+++ b/doc/item_bonus.txt
@@ -369,8 +369,6 @@ bonus2 bSPVanishRate,x,n;		Add a x/10% chance of decreasing enemy's SP amount by
 bonus3 bHPVanishRaceRate,r,x,n;		Add a x/100% chance of decreasing enemy's HP amount by n% when attacking, depends on enemy race r
 bonus3 bSPVanishRaceRate,r,x,n;		Add a x/100% chance of decreasing enemy's SP amount by n% when attacking, depends on enemy race r

-bonus3 bStateNoRecoverRace,r,x,t;	Set a no recovery state of an enemy of race r at x/100% for t milliseconds with normal attack.
-
 HP/SP gain
 ------------
 bonus bHPGainValue,n;     		Heals +n HP when killing an enemy with a physical attack
--- a/doc/mapflags.txt
+++ b/doc/mapflags.txt
@@ -170,16 +170,6 @@ Disables certain items and skills on a map through a specified zone number. The
 located in 'db/(pre-)re/item_noequip.txt' and 'db/(pre-)re/skill_nocast_db.txt', both of which
 contain explanations and examples of how this mapflag is used.

-Restricted Zones:
-1 - Aldebaran Turbo Track
-2 - Jail
-3 - Izlude Battle Arena
-4 - WoE:SE Maps
-5 - Sealed Shrine
-6 - Instances: Endless Tower, Orc's Memory, Nidhoggr's Instance
-7 - Towns
-8 - WOE:TE Dungeons
-
 ---------------------------------------

 *monster_noteleport
@@ -274,13 +264,6 @@ Enables Guild vs. Guild mode on a map and applies the corresponding damage adjus

 ---------------------------------------

-*gvg_te
-*gvg_te_castle
-
-Used to determines map is WOE:TE area. Special restrictions are applied.
-
---------------------------------------
-
 *battleground	{<type>}

 Enables Battlegrounds on a map and applies the corresponding damage adjustments.
--- a/doc/mob_db_mode_list.txt
+++ b/doc/mob_db_mode_list.txt
@@ -11,31 +11,31 @@
 Bit Legend
 -------------------------------------------------------------------------------

-MD_CANMOVE            | 0x0000001 |        1
-MD_LOOTER             | 0x0000002 |        2
-MD_AGGRESSIVE         | 0x0000004 |        4
-MD_ASSIST             | 0x0000008 |        8
-MD_CASTSENSOR_IDLE    | 0x0000010 |       16
-MD_BOSS               | 0x0000020 |       32
-MD_PLANT              | 0x0000040 |       64
-MD_CANATTACK          | 0x0000080 |      128
-MD_DETECTOR           | 0x0000100 |      256
-MD_CASTSENSOR_CHASE   | 0x0000200 |      512
-MD_CHANGECHASE        | 0x0000400 |     1024
-MD_ANGRY              | 0x0000800 |     2048
-MD_CHANGETARGET_MELEE | 0x0001000 |     4096
-MD_CHANGETARGET_CHASE | 0x0002000 |     8192
-MD_TARGETWEAK         | 0x0004000 |    16384
-MD_RANDOMTARGET       | 0x0008000 |    32768
-MD_IGNOREMELEE        | 0x0010000 |    65536
-MD_IGNOREMAGIC        | 0x0020000 |   131072
-MD_IGNORERANGED       | 0x0040000 |   262144
-MD_MVP                | 0x0080000 |   524288
-MD_IGNOREMISC         | 0x0100000 |  1048576
-MD_KNOCKBACK_IMMUNE   | 0x0200000 |  2097152
-MD_NORANDOM_WALK      | 0x0400000 |  4194304
-MD_NOCAST_SKILL       | 0x0800000 |  8388608
-MD_FIXED_ITEMDROP     | 0x1000000 | 16777216
+MD_CANMOVE            | 0x000001 |        1
+MD_LOOTER             | 0x000002 |        2
+MD_AGGRESSIVE         | 0x000004 |        4
+MD_ASSIST             | 0x000008 |        8
+MD_CASTSENSOR_IDLE    | 0x000010 |       16
+MD_BOSS               | 0x000020 |       32
+MD_PLANT              | 0x000040 |       64
+MD_CANATTACK          | 0x000080 |      128
+MD_DETECTOR           | 0x000100 |      256
+MD_CASTSENSOR_CHASE   | 0x000200 |      512
+MD_CHANGECHASE        | 0x000400 |     1024
+MD_ANGRY              | 0x000800 |     2048
+MD_CHANGETARGET_MELEE | 0x001000 |     4096
+MD_CHANGETARGET_CHASE | 0x002000 |     8192
+MD_TARGETWEAK         | 0x004000 |    16384
+MD_RANDOMTARGET       | 0x008000 |    32768
+MD_IGNOREMELEE        | 0x010000 |    65536
+MD_IGNOREMAGIC        | 0x020000 |   131072
+MD_IGNORERANGED       | 0x040000 |   262144
+MD_MVP                | 0x080000 |   524288
+MD_IGNOREMISC         | 0x100000 |  1048576
+MD_KNOCKBACK_IMMUNE   | 0x200000 |  2097152
+MD_NORANDOM_WALK      | 0x400000 |  4194304
+MD_NOCAST_SKILL       | 0x800000 |  8388608
+

 Explanation for modes
 -------------------------------------------------------------------------------
@@ -64,7 +64,7 @@ Plant: Always receives 1 damage from attacks.

 Detector: Enables mob to detect and attack characters who are in hiding/cloak.

-Change Chase: Allows chasing mobs to switch targets if another player happens
+ChangeChase: Allows chasing mobs to switch targets if another player happens
 	to be within attack range (handy on ranged attackers, for example)

 Angry: These mobs are "hyper-active". Apart from "chase"/"attack", they have
@@ -73,11 +73,11 @@ Angry: These mobs are "hyper-active". Apart from "chase"/"attack", they have
 	for their "before attacked" and "after attacked" states. Also, when
 	"following", they automatically switch to whoever character is closest.

-Change Target Melee: Enables a mob to switch targets when hit by a normal attack
-	while attacking someone else.
+Change Target Melee: Enables a mob to switch targets when attacked while
+	attacking someone else.

-Change Target Chase: Enables a mob to switch targets when hit by any attack
-	while chasing another character.
+Change Target Chase: Enables a mob to switch targets when attacked while
+	chasing another character.

 Target Weak: Allows aggressive monsters to only be aggressive against 
 	characters that are five levels below it's own level.
@@ -91,27 +91,21 @@ Ignore Magic: The mob will take 1 HP damage from magic attacks.

 Ignore Range: The mob will take 1 HP damage from ranged attacks.

-MVP: Flagged as MVP which makes mobs resistant to Coma.
+MVP: Flagged as MVP which makes mobs resistance to Coma.

 Ignore Misc: The mob will take 1 HP damage from "none" attack type.

 Knockback Immune: The mob will be unable to be knocked back.

-No Random Walk: The mob will not randomly walk around while in the
-	idle state.
-
-No Cast Skill: The mob will be unable to cast skills.
-
-Fixed Item Drop: The mob's drops are not affected by item drop modifiers.

 Aegis Mob Types
 -------------------------------------------------------------------------------

 What Aegis has are mob-types, where each type represents an AI behavior that
-is mimicked by a group of rA mode bits. This is the table to convert from one
+is mimicked by a group of eA mode bits. This is the table to convert from one
 to another:

-Aegis/rA (description)
+Aegis/eA (description)
 01: 0x0081 (passive)
 02: 0x0083 (passive, looter)
 03: 0x1089 (passive, assist and change-target melee)
@@ -119,7 +113,7 @@ Aegis/rA (description)
 05: 0x2085 (aggressive, change-target chase)
 06: 0x0000 (passive, immobile, can't attack) [plants]
 07: 0x108B (passive, looter, assist, change-target melee)
-08: 0x7085 (aggressive, change-target melee/chase, target weak enemies)
+08: 0x6085 (aggressive, change-target chase, target weak enemies)
 09: 0x3095 (aggressive, change-target melee/chase, cast sensor idle) [Guardian]
 10: 0x0084 (aggressive, immobile)
 11: 0x0084 (aggressive, immobile) [Guardian]
@@ -129,47 +123,9 @@ Aegis/rA (description)
 19: 0x3095 (aggressive, change-target melee/chase, cast sensor idle)
 20: 0x3295 (aggressive, change-target melee/chase, cast sensor idle/chase)
 21: 0x3695 (aggressive, change-target melee/chase, cast sensor idle/chase, chase-change target)
-24: 0x400081 (passive, does not walk randomly) [Slave]
 25: 0x0001 (passive, can't attack) [Pet]
 26: 0xB695 (aggressive, change-target melee/chase, cast sensor idle/chase, chase-change target, random target)
 27: 0x8084 (aggressive, immobile, random target)

 - Note that the detector bit due to being Insect/Demon, plant and Boss mode
-  bits need to be added independently of this list (also see below).
-
-Aegis Class Types
-------------------------------------------------------------------------------
-
-Aegis has different class types that can't be combined but can be reflected by
-a combination of rA mode bits.
-Add the mode listed here to the mode above.
-
-Aegis/rA
-00: 0x0000000 (normal monster)
-01: 0x0000120 (boss class, immune to status changes, immune to knockback, detector)
-02: ? (guardian class, immune to status changes)
-04: ? (battleground class, immune to status changes, completely ignores all skills)
-05: 0x1000000 (event class, ignores all drop rate adjustments)
-
- Guardian and battleground classes are currently not 100% possible with
-  rA mode bits, it is recommended to use MD_BOSS (0x0000020) for now
-
-Aegis Attr Types
-------------------------------------------------------------------------------
-
-The Aegis attr types are a bitmask just like the rA mode bits and can be 
-directly converted. Plant mode is a combination of various of these modes.
-Add the mode listed here to the resulting mode above.
-
-Aegis/rA
-01: 0x010000 (takes 1 damage from melee attacks)
-02: 0x020000 (takes 1 damage from magic attacks)
-04: 0x040000 (takes 1 damage from ranged attacks)
-08: 0x080000 (MVP, gives MVP rewards, immune to instant death/coma effects)
-16: 0x100000 (takes 1 damage from misc attacks)
-23: 0x000040 (plant mode)
-32: 0x200000 (cannot be knocked back)
-64: ? (teleport block)
-
- Note that if attr=23 (1+2+4+16), it's better to use 0x40 (plant mode) for
-  easier reading
+  bits need to be added independently of this list.
--- a/doc/sample/getmonsterinfo.txt
+++ b/doc/sample/getmonsterinfo.txt
@@ -17,7 +17,7 @@ prontera,156,179,6	script	test_getmonsterinfo	117,{
 	}
 	mes "Monster ID: "+.@value+" '"+getmonsterinfo(.@value,MOB_NAME)+"'";
 	mes "Current Monster info:";
-	for (.@i = MOB_NAME; .@i <= MOB_MVPEXP; .@i++)
+	for (.@i = 0; .@i < 23; .@i++)
 		mes " getmonsterinfo("+.@value+","+.@i+") = "+getmonsterinfo(.@value,.@i);
 	close;
 }
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -448,8 +448,8 @@ temporary - They cease to exist when the server resets.

 Prefix: scope and extent
 nothing  - A permanent variable attached to the character, the default variable
-           type. They are stored by char-server in the `char_reg_num` and
-           `char_reg_str`.
+           type. They are stored by char-server in the `global_acc_reg_num` and
+           `global_acc_reg_str`.
 "@"      - A temporary variable attached to the character.
           SVN versions before 2094 revision and RC5 version will also treat
           'l' as a temporary variable prefix, so beware of having variable
@@ -475,11 +475,10 @@ nothing  - A permanent variable attached to the character, the default variable
           These are used with the instancing system, and are unique to each 
           party's instance.
 "#"      - A permanent local account variable.
-           They are stored by char-server in the `acc_reg_num` table and
-           `acc_reg_str`.
+           They are stored by char-server in the `char_reg_num` table and
+           `char_reg_str`.
 "##"     - A permanent global account variable stored by the login server.
-           They are stored in the `global_acc_reg_num` table and
-		   `global_acc_reg_str`.
+           They are stored in the `acc_reg_num` table and `acc_reg_str`.
           The only difference you will note from normal # variables is when
           you have multiple char-servers connected to the same login server.
           The # variables are unique to each char-server, while the ## variables
@@ -874,9 +873,6 @@ OnAgitInit:
 OnAgitStart2:
 OnAgitEnd2:
 OnAgitInit2:
-OnAgitStart3:
-OnAgitEnd3:
-OnAgitInit3:

 OnAgitStart will run whenever the server shifts into WoE mode, whether it is 
 done with @agitstart GM command or with 'AgitStart' script command. OnAgitEnd 
@@ -3180,7 +3176,7 @@ This command requests the guild data from the char server and merrily continues
 with the execution. Whenever the guild information becomes available (which 
 happens instantly if the guild information is already in memory, or later, if it 
 isn't and the map server has to wait for the char server to reply) it will run 
-the specified event as in a 'donpcevent' call.
+the specified event as in a 'doevent' call.

 ---------------------------------------

@@ -3258,31 +3254,32 @@ mob database and return the info set by TYPE argument.
 It will return -1 if there is no such monster (or the type value is invalid),
 or "null" if you requested the monster's name.

-Valid types are:
-	MOB_NAME - monster's name, if there is no such monster "null" is returned
-	MOB_LV - monster's level
-	MOB_MAXHP - monster's maximum hp
-	MOB_BASEEXP - monster's base experience
-	MOB_JOBEXP - monster's job experience
-	MOB_ATK1 - monster's atk
-	MOB_ATK2 - monster's atk2
-	MOB_DEF - monster's def
-	MOB_MDEF - monster's mdef
-	MOB_STR - monster's str
-	MOB_AGI - monster's agi
-	MOB_VIT - monster's vit
-	MOB_INT - monster's int
-	MOB_DEX - monster's dex
-	MOB_LUK - monster's luk
-	MOB_RANGE - monster's range
-	MOB_RANGE2 - monster's range2
-	MOB_RANGE3 - monster's range3
-	MOB_SIZE - monster's size
-	MOB_RACE - monster's race
-	MOB_ELEMENT - monster's element(doesn't return the element level, only the element ID)
-	MOB_MODE - monster's mode
-	MOB_MVPEXP - monster's mvp experience
+Valid types are listed in 'db/const.txt':
+	MOB_NAME	0
+	MOB_LV	1
+	MOB_MAXHP	2
+	MOB_BASEEXP	3
+	MOB_JOBEXP	4
+	MOB_ATK1	5
+	MOB_ATK2	6
+	MOB_DEF	7
+	MOB_MDEF	8
+	MOB_STR	9
+	MOB_AGI	10
+	MOB_VIT	11
+	MOB_INT	12
+	MOB_DEX	13
+	MOB_LUK	14
+	MOB_RANGE	15
+	MOB_RANGE2	16
+	MOB_RANGE3	17
+	MOB_SIZE	18
+	MOB_RACE	19
+	MOB_ELEMENT	20
+	MOB_MODE	21
+	MOB_MVPEXP	22

+Note: MOB_ELEMENT doesn't return the element level, only the element ID.
 For more details, see the sample in 'doc/sample/getmonsterinfo.txt'.

 ---------------------------------------
@@ -3659,11 +3656,10 @@ Name is optional, and defaults to the attached player if omitted.

 *agitcheck()
 *agitcheck2()
-*agitcheck3()

-These function will let you check whether the server is currently in WoE:FE mode
-(agitcheck()), WoE:SE mode (agitcheck2()), or WoE:TE mode (agitcheck3()) and will
-return 1 if War of Emperium is on and 0 if it isn't. 
+These function will let you check whether the server is currently in WoE mode
+(or WoE SE mode if the second function is called) and will return 1 if War of
+Emperium is on and 0 if it isn't. 

 ---------------------------------------

@@ -4219,29 +4215,28 @@ type you want to change, then the palette you want to use. Make sure you specify
 a palette number that exists/is usable by the client you use.
 'changelook' works the same, but is only client side (it doesn't save the look value).

-    // This will change your hair color, so that it uses palette 8, what ever your 
+    // This will change your hair(6), so that it uses palette 8, what ever your 
    // palette 8 is, your hair will use that color

-    setlook LOOK_HAIR_COLOR,8;
+    setlook 6,8;

-    // This will change your clothes color, so they are using palette 1, whatever 
+    // This will change your clothes(7), so they are using palette 1, whatever 
    // your palette 1 is, your clothes will then use that set of colors.
    
-    setlook LOOK_CLOTHES_COLOR,1;
+    setlook 7,1;

 Here are the possible look types:

- LOOK_BASE - Base sprite
- LOOK_HAIR - Hairstyle
- LOOK_WEAPON - Weapon
- LOOK_HEAD_BOTTOM - Head bottom
- LOOK_HEAD_TOP - Head top
- LOOK_HEAD_MID - Head mid
- LOOK_HAIR_COLOR - Hair color
- LOOK_CLOTHES_COLOR - Clothes color
- LOOK_SHIELD - Shield
- LOOK_SHOES - Shoes
- LOOK_BODY2 - bodystyle
+ 0 - Base sprite
+ 1 - Hairstyle
+ 2 - Weapon
+ 3 - Head bottom
+ 4 - Head top
+ 5 - Head mid
+ 6 - Hair color
+ 7 - Clothes color
+ 8 - Shield
+ 9 - Shoes

 Whatever 'shoes' means is anyone's guess, ask Gravity - the client does nothing 
 with this value. It still wants it from the server though, so it is kept, but 
@@ -5228,10 +5223,10 @@ displaying the skill's effect.
    heal 2000,0;
    skilleffect 28,2000;
    // Blessing Level 10
-    sc_start SC_BLESSING,240000,10;
+    sc_start 10,240000,10;
    skilleffect 34,0;
    // Increase AGI Level 5
-    sc_start SC_INCREASEAGI,140000,5;
+    sc_start 12,140000,5;
    skilleffect 29,0;

 This will heal the character with 2000 HP, buff it with Blessing Lv 10 and
@@ -6615,19 +6610,15 @@ For examples, check the WoE scripts in the distribution.
 *agitend;
 *agitstart2;
 *agitend2;
-*agitstart3;
-*agitend3;

-These six commands will start and end War of Emperium, War of Emperium SE,
-or War of Emperium TE.
+These four commands will start and end War of Emperium or War of Emperium SE.

 This is a bit more complex than it sounds, since the commands themselves won't 
 actually do anything interesting, except causing all 'OnAgitStart:' and 
-'OnAgitEnd:', 'OnAgitStart2:' and 'OnAgitEnd2:', or 'OnAgitStart3:' and
-'OnAgitEnd3:' in the case of latter two commands, events to run everywhere,
-respectively. They are used as  simple triggers to run a lot of complex scripts
-all across the server, and they, in turn, are triggered by clock with an
-'OnClock<time>:' time-triggering label.
+'OnAgitEnd:', or 'OnAgitStart2:' and 'OnAgitEnd2:' in the case of latter two
+commands, events to run everywhere, respectively. They are used as  simple 
+triggers to run a lot of complex scripts all across the server, and they, 
+in turn, are triggered by clock with an 'OnClock<time>:' time-triggering label.

 ---------------------------------------

@@ -6640,20 +6631,6 @@ even though WoE itself may or may not actually be in effect.

 ---------------------------------------

-*gvgon3 "<map name>";
-*gvgoff3 "<map name>";
-
-Theses commands behave identically to gvgon/gvgoff, but apply GVG_TE mapflag. 
-
---------------------------------------
-
-*canParticipateSiegeTE {<char id>};
-
-Return 1 if player can participate in WOE:TE, 0 otherwise.
-Currently third class, Kagerou/Oboro and Rebellion class can't participate in WOE:TE.
-
---------------------------------------
-
 *flagemblem <guild id>;

 This command only works when run by the NPC objects which have sprite id 722, 
@@ -6698,22 +6675,6 @@ Type indicates what information to return:
 1 - max. hp
 2 - current hp

---------------------------------------
-
-*getguildalliance(<guild id1>, <guild id2>);
-
-This command will return the relation between 2 guilds.
-
-NOTE: This should be used in collaboration with 'requestguildinfo' as the
-map-server needs to request for information from the char-server.
-
-Return values:
-	-2 - Guild ID1 does not exist
-	-1 - Guild ID2 does not exist
-	 0 - Both guilds have no relation OR guild ID aren't given
-	 1 - Both guilds are allies
-	 2 - Both guilds are antagonists
-
 ---------------------------------------
 //
 5,2.- End of guild-related commands
@@ -8240,36 +8201,6 @@ izlude,100,100,4	script	Test	844,{

 ---------------------------------------

-*setquestinfo_level <quest_id>,<min_level>,<max_level>;
-
-Add level range criteria for quest info with quest id 'quest_id'.
-
-This command must be used after 'questinfo'.
-
---------------------------------------
-
-*setquestinfo_req <quest_id>,<req_quest_id>,<state>{,<req_quest_id>,<state>,...};
-
-Add 'req_quest_id' as requirement for quest info with quest id 'quest_id'.
-
-Value os 'state' are:
-    0: Player doesn't started 'req_quest_id'.
-    1: Player has 'req_quest_id' (state is either "inactive" or "active").
-    2: Player has 'req_quest_id' completed
-
-This command must be used after 'questinfo'.
-
---------------------------------------
-
-*setquestinfo_job <quest_id>,<job_id>{,<job_id>...};
-
-Add job criteria for quest info with quest id 'quest_id'.
-The job criteria may more than one job_id.
-
-This command must be used after 'questinfo'.
-
---------------------------------------
-
 *setquest <ID>{,<char_id>};

 Place quest of <ID> in the users quest log, the state of which is "active".
@@ -8545,15 +8476,15 @@ server and the egg will disappear when anyone tries to hatch it.
 This function will return pet information for the pet the invoking character 
 currently has active. Valid types are:

- PETINFO_ID - Pet ID
- PETINFO_CLASS - Pet class number as per 'db/pet_db.txt' - will tell you what kind of a pet it 
+ 0 - Pet ID
+ 1 - Pet class number as per 'db/pet_db.txt' - will tell you what kind of a pet it 
     is.
- PETINFO_NAME - Pet name. Will return "null" if there's no pet. 
- PETINFO_INTIMATE - Pet friendly level (intimacy score). 1000 is full loyalty.
- PETINFO_HUNGRY - Pet hungry level. 100 is completely full.
- PETINFO_RENAMED - Pet rename flag. 0 means this pet has not been named yet.
- PETINFO_LEVEL - Pet level
- PETINFO_BLOCKID - Pet Game ID
+ 2 - Pet name. Will return "null" if there's no pet. 
+ 3 - Pet friendly level (intimacy score). 1000 is full loyalty.
+ 4 - Pet hungry level. 100 is completely full.
+ 5 - Pet rename flag. 0 means this pet has not been named yet.
+ 6 - Pet level
+ 7 - Pet Game ID

 ---------------------------------------

@@ -9037,20 +8968,5 @@ The command returns 1 upon success, and these values upon failure:

 ---------------------------------------

-*opendressroom(<flag>{,<char_id>});
-
-This will open the Dress Room window on the client connected to the invoking character.
-
-    mes "Close this window to open the Dress Room window.";
-    close2;
-    opendressroom(1);
-    end;
-
-Valid flag are:
- 1 - Open the Dress Room window
-
---------------------------------------
-
-
 Whew.
 That's about all of them.
--- a/install.sh
+++ b/install.sh
@@ -24,22 +24,20 @@ echo "destdir = $PKG_PATH "
 check_inst_right
 check_files
 mkdir -p $PKG_PATH/bin/
-mkdir -p $PKG_PATH/etc/$PKG/
-mkdir -p $PKG_PATH/usr/$PKG/
+mkdir -p $PKG_PATH/etc/$PKG/conf
 mkdir -p $PKG_PATH/var/$PKG/log

 #we copy all file into opt/ dir and treat dir like normal unix arborescence
 cp -r db/ $PKG_PATH/var/$PKG/db
-if [ -d log ]; then cp -r log/* $PKG_PATH/var/$PKG/log/; fi
+if [ -d log ]; then cp -r log/ $PKG_PATH/var/$PKG/log; fi
 cp -r conf/ $PKG_PATH/etc/$PKG/conf
-cp -r npc/ $PKG_PATH/usr/$PKG/npc
-cp athena-start $PKG_PATH/
-cp *-server* $PKG_PATH/bin/
+cp -r npc/ $PKG_PATH/npc
+cp athena-start $PKG_PATH/	
+mv *-server* $PKG_PATH/bin/

 ln -fs $PKG_PATH/var/$PKG/db/ $PKG_PATH/db
 ln -fs $PKG_PATH/var/$PKG/log/ $PKG_PATH/log
 ln -fs $PKG_PATH/etc/$PKG/conf/ $PKG_PATH/conf
-ln -fs $PKG_PATH/usr/$PKG/npc/ $PKG_PATH/npc
 ln -fs $PKG_PATH/athena-start /usr/bin/$PKG
 for f in $(ls $PKG_PATH/bin/) ; do ln -fs $PKG_PATH/bin/$f $PKG_PATH/$f; done
 echo "Installation is done. You can now control the server with '$PKG start'"
--- a/npc/airports/airships.txt
+++ b/npc/airports/airships.txt
@@ -1248,10 +1248,10 @@ airplane_01,33,68,4	script	Clarice	74,{
 }

 function	script	applegamble	{
-	.@npc_name$ = getarg(0);
+
 	switch (select("Play Dice Game:Learn Dice Game Rules:Cancel")) {
 	case 3:
-		mes "["+ .@npc_name$ +"]";
+		mes "["+getarg(0)+"]";
 		mes "I'm up for a game of";
 		mes "dice whenever you feel";
 		mes "like it. Just talk to me if";
@@ -1259,7 +1259,7 @@ function	script	applegamble	{
 		mes "sudden urge to gamble, kay?";
 		close;
 	case 2:
-		mes "["+ .@npc_name$ +"]";
+		mes "["+getarg(0)+"]";
 		mes "The rules for the Dice game";
 		mes "are pretty simple. First, you";
 		mes "place a bet by wagering Apples.";
@@ -1267,14 +1267,14 @@ function	script	applegamble	{
 		mes "Apples at a time. To keep things";
 		mes "legal, I can only accept Apples.";
 		next;
-		mes "["+ .@npc_name$ +"]";
+		mes "["+getarg(0)+"]";
 		mes "But hey, if all that zeny";
 		mes "is burning a hole in your";
 		mes "pocket, head over to Fruitz";
 		mes "and you can buy as many";
 		mes "Apples as you want, playah~";
 		next;
-		mes "["+ .@npc_name$ +"]";
+		mes "["+getarg(0)+"]";
 		mes "Now, we begin with me";
 		mes "rolling two 6-sided dice.";
 		mes "When it's your turn, you'll";
@@ -1282,7 +1282,7 @@ function	script	applegamble	{
 		mes "that, both of us will have the";
 		mes "option of rolling a third die.";
 		next;
-		mes "["+ .@npc_name$ +"]";
+		mes "["+getarg(0)+"]";
 		mes "Now here's the important";
 		mes "thing. If your total is higher";
 		mes "than 12, you'll bust, meaning";
@@ -1290,14 +1290,14 @@ function	script	applegamble	{
 		mes "person with the higher total";
 		mes "is the winner. Got it?";
 		next;
-		mes "["+ .@npc_name$ +"]";
+		mes "["+getarg(0)+"]";
 		mes "Now, you'll be the first";
 		mes "to decide whether or not";
 		mes "you'll roll the third die. Then,";
 		mes "depending on your result, I'll";
 		mes "roll my third die... Or maybe not.";
 		next;
-		mes "["+ .@npc_name$ +"]";
+		mes "["+getarg(0)+"]";
 		mes "When you win, you'll";
 		mes "receive twice as many";
 		mes "Apples as you wagered.";
@@ -1308,7 +1308,7 @@ function	script	applegamble	{
 	case 1:
 		break;
 	}
-	mes "["+ .@npc_name$ +"]";
+	mes "["+getarg(0)+"]";
 	mes "Ooh, so you'll play with";
 	mes "me? Great! How many";
 	mes "Apples would you like to bet?";
@@ -1319,14 +1319,14 @@ function	script	applegamble	{
 	while(1) {
 		input .@amount;
 		if (.@amount == 0) {
-			mes "["+ .@npc_name$ +"]";
+			mes "["+getarg(0)+"]";
 			mes "Changed your mind?";
 			mes "I understand. Well then,";
 			mes "I hope we can play sometime.";
 			close;
 		}
 		else if (.@amount < 1 || .@amount > 50) {
-			mes "["+ .@npc_name$ +"]";
+			mes "["+getarg(0)+"]";
 			mes "You can't bet more than";
 			mes "50 Apples. Remember, we";
 			mes "need to keep these stakes";
@@ -1335,13 +1335,13 @@ function	script	applegamble	{
 			next;
 			continue;
 		}
-		mes "["+ .@npc_name$ +"]";
+		mes "["+getarg(0)+"]";
 		mes "So you'll be";
 		mes "betting ^FF0000"+.@amount+"^000000 Apples.";
 		mes "Is that right?";
 		next;
 		if (select("Yes:No") == 2) {
-			mes "["+ .@npc_name$ +"]";
+			mes "["+getarg(0)+"]";
 			mes "Mm, made a mistake?";
 			mes "Alright, please enter the";
 			mes "number of Apples you";
@@ -1359,7 +1359,7 @@ function	script	applegamble	{
 			continue;
 		}
 		delitem 512,.@amount;
-		mes "["+ .@npc_name$ +"]";
+		mes "["+getarg(0)+"]";
 		mes "Good!";
 		mes "Now we can start";
 		mes "this game! I'll roll first~";
@@ -1372,7 +1372,7 @@ function	script	applegamble	{
 	set .@table2, rand(1,6);
 	set .@tablesub, .@table1 + .@table2;
 	set .@tabletotal, .@tablesub;
-	mes "["+ .@npc_name$ +"]";
+	mes "["+getarg(0)+"]";
 	mes "I got a ^0000FF" + .@table1 + "^000000 and a ^0000FF" + .@table2 + "^000000.";
 	mes "That's a total of ^0000FF" + .@tablesub + "^000000.";
 	mes "^FF0000" + strcharinfo(0) + "^000000, now it's your turn.";
@@ -1389,10 +1389,10 @@ function	script	applegamble	{
 	}
 	set .@playertotal, .@playersub;
 	next;
-	mes "["+ .@npc_name$ +"]";
+	mes "["+getarg(0)+"]";
 	mes "^FF0000" + strcharinfo(0) + "^000000, you have ^FF0000" + .@player1 + "^000000 and ^FF0000" + .@player2 + "^000000. The total is ^FF0000" + .@playersub + "^000000 .";
 	next;
-	mes "["+ .@npc_name$ +"]";
+	mes "["+getarg(0)+"]";
 	if(.@playersub == .@tablesub) {
 		mes "Currently my total is ^0000FF" + .@tablesub + "^000000 and ^FF0000" + strcharinfo(0) + "^000000, your total is ^FF0000" + .@playersub + "^000000. We are making an even game. Would you like to cast dice again?";
 	} else if (.@playersub > .@tablesub) {
@@ -1407,7 +1407,7 @@ function	script	applegamble	{
 		set .@player3, rand(1,6);
 		set .@playertotal, .@playertotal + .@player3;
 		next;
-		mes "["+ .@npc_name$ +"]";
+		mes "["+getarg(0)+"]";
 		if (.@playertotal > 12) {
 			mes "^FF0000" + strcharinfo(0) + "^000000, you got ^FF0000" + .@player3 + "^000000 and the total is now ^FF0000" + .@playertotal + "^000000. You lost this game. I am sorry but please try again.";
 			close;
@@ -1429,7 +1429,7 @@ function	script	applegamble	{
 		}
 		break;
 	case 2:
-		mes "["+ .@npc_name$ +"]";
+		mes "["+getarg(0)+"]";
 		if (.@playersub > .@tablesub) {
 			mes "I see, you don't want to take risk of losing the game. Okay, let me cast dice again.";
 		}
@@ -1457,7 +1457,7 @@ function	script	applegamble	{
 	set .@table3, rand(1,6);
 	set .@tabletotal, .@tabletotal + .@table3;
 	next;
-	mes "["+ .@npc_name$ +"]";
+	mes "["+getarg(0)+"]";
 	if (.@tabletotal > 12) {
 		mes "I got ^0000FF" + .@table3 + "^000000 and the total is now ^0000FF" + .@tabletotal + "^000000. I lost this game since my total exceeded 12. Let me give you my apples. Congratulations, that was a great game.";
 		close2;
--- a/npc/battleground/bg_common.txt
+++ b/npc/battleground/bg_common.txt
@@ -567,14 +567,12 @@ bat_room,160,150,3	script	Erundek	109,{
 // Badge Reward Function
 //============================================================
 function	script	F_BG_Badge	{
-	.@team$ = getarg(1);
-	.@bg_type$ = getarg(2);

-	if (.@bg_type$ == "Tierra") {
+	if (getarg(2) == "Tierra") {
 		set .@badge,7828; //BF_Badge1
 		set .@amount_win,3;
 		set .@amount_lose,1;
-	} else if (.@bg_type$ == "Flavius") {
+	} else if (getarg(2) == "Flavius") {
 		set .@badge,7829; //BF_Badge2
 		set .@amount_win,9;
 		set .@amount_lose,3;
@@ -583,10 +581,10 @@ function	script	F_BG_Badge	{

 	if (getarg(0) == 1) {
 		set .@amount, .@amount_win;
-		if (.@team$ == "Guillaume") {
+		if (getarg(1) == "Guillaume") {
 			mes "[Axl Rose]";
 			mes "Blessed Guillaume!";
-		} else if (.@team$ == "Croix") {
+		} else if (getarg(1) == "Croix") {
 			mes "[Swandery]";
 			mes "Blessed Croix!";
 		}
@@ -594,12 +592,12 @@ function	script	F_BG_Badge	{
 		mes strcharinfo(0)+", it's a sign reflecting victory.";
 	} else {
 		set .@amount, .@amount_lose;
-		if (.@team$ == "Guillaume") {
+		if (getarg(1) == "Guillaume") {
 			mes "[Axl Rose]";
 			mes "You lost, but you're dedicated to this battle.";
 			mes "This is a reward for your great dedication by Guillaume Marollo!";
 			mes "Just take this defeat as a lesson, and next time you will definitely win.";
-		} else if (.@team$ == "Croix") {
+		} else if (getarg(1) == "Croix") {
 			mes "[Swandery]";
 			mes "Oh, "+strcharinfo(0)+" Don't be sad.";
 			mes "Even though we didn't win, we did our best.";
--- a/npc/battleground/kvm/kvm_item_pay.txt
+++ b/npc/battleground/kvm/kvm_item_pay.txt
@@ -249,35 +249,31 @@ PurchaseItem:
 	// Pricing for Weapon, Suit1, Muffler1, Shoes1, Ring1m Suit2, Shoes2, Ring2, Suit3, Shoes3, Ring3
 	setarray .@prices[0],2000,840,630,580,1200,120,70,200,15,10,30;

-	.@item_id = getarg(0);
-	.@req_setting = getarg(1);
-	.@item_type = getarg(2);
-
 	mes "[Logistics]";

-	if (!.@item_type)
-		mes "You have selected ^ff0000"+ getitemname(.@item_id) +"^000000.";
-	else if (.@item_type == 1)
-		mes "There is only one "+ callfunc("F_GetWeaponType",.@item_id) +": "+ getitemname(.@item_id) +".";
-	else if (.@item_type == 2) {
-		mes "You have selected '"+ callfunc("F_GetArmorType",.@item_id) +"'.";
-		mes "The armor for one whose Lvl is more than 80 is: ^ff0000"+ getitemname(.@item_id) +"^000000.";
+	if (!getarg(2))
+		mes "You have selected ^ff0000"+getitemname(getarg(0))+"^000000.";
+	else if (getarg(2) == 1)
+		mes "There is only one "+callfunc("F_GetWeaponType",getarg(0))+": "+getitemname(getarg(0))+".";
+	else if (getarg(2) == 2) {
+		mes "You have selected '"+callfunc("F_GetArmorType",getarg(0))+"'.";
+		mes "The armor for one whose Lvl is more than 80 is: ^ff0000"+getitemname(getarg(0))+"^000000.";
 	}
-	else if (.@item_type == 3) {
-		mes "You have selected 'Mass-Production "+ callfunc("F_GetArmorType",.@item_id) +"'.";
-		mes "There is only one Mass-Production "+ callfunc("F_GetArmorType",.@item_id) +": ^ff0000"+ getitemname(.@item_id) +"^000000.";
+	else if (getarg(2) == 3) {
+		mes "You have selected 'Mass-Production "+callfunc("F_GetArmorType",getarg(0))+"'.";
+		mes "There is only one Mass-Production "+callfunc("F_GetArmorType",getarg(0))+": ^ff0000"+getitemname(getarg(0))+"^000000.";
 	}
-	else if (.@item_type == 4) {
-		mes "You have selected 'Popularized "+ callfunc("F_GetArmorType",.@item_id) +"'.";
-		mes "There is only one Popularized "+ callfunc("F_GetArmorType",.@item_id) +": ^ff0000"+ getitemname(.@item_id) +"^000000.";
+	else if (getarg(2) == 4) {
+		mes "You have selected 'Popularized "+callfunc("F_GetArmorType",getarg(0))+"'.";
+		mes "There is only one Popularized "+callfunc("F_GetArmorType",getarg(0))+": ^ff0000"+getitemname(getarg(0))+"^000000.";
 	}

-	if (!.@req_setting)
+	if (!getarg(1))
 		mes "It requires ^0000ff2,000^000000 KVM Points, and "+ .@name$ +", your points are: ^580080"+ kvm_point +"^000000.";
-	else if (.@req_setting == 4)
+	else if (getarg(1) == 4)
 		mes "It requires ^0000ff1,200^000000 KVM Points, and "+ .@name$ +", your points are: ^580080"+ kvm_point +"^000000.";
 	else
-		mes "It requires ^0000ff"+ .@prices[.@req_setting] +"^000000 KVM Points, and "+ .@name$ +", your points are: ^580080"+ kvm_point +"^000000.";
+		mes "It requires ^0000ff"+.@prices[getarg(1)]+"^000000 KVM Points, and "+ .@name$ +", your points are: ^580080"+ kvm_point +"^000000.";

 	mes "Are you sure you want this item?";
 	next;
@@ -288,26 +284,26 @@ PurchaseItem:
 		mes "When purchasing an item, please be careful there are no refunds.";
 		break;
 	case 2:
-		if (kvm_point >= .@prices[.@req_setting]) {
-			kvm_point = kvm_point -.@prices[.@req_setting];
-			getitem .@item_id,1;
+		if (kvm_point >= .@prices[getarg(1)]) {
+			set kvm_point,kvm_point-.@prices[getarg(1)];
+			getitem getarg(0),1;
 			mes "[Logistics]";
-			mes "You have purchased a "+ getitemname(.@item_id) +".";
-			if (!.@req_setting)
-				mes "Your KVM Points are reduced by ^0000ff"+ .@req_setting +"^000000 points, your KVM Points are now ^580080"+kvm_point+"^000000.";
-			if (.@req_setting == 4)
+			mes "You have purchased a "+getitemname(getarg(0))+".";
+			if (!getarg(1))
+				mes "Your KVM Points are reduced by ^0000ff"+getarg(1)+"^000000 points, your KVM Points are now ^580080"+kvm_point+"^000000.";
+			if (getarg(1) == 4)
 				mes "Your KVM Points are reduced by ^0000ff1,200^000000 points, your KVM Points are now ^580080"+kvm_point+"^000000.";
 			else
-				mes "Your KVM Points are reduced by ^0000ff"+ .@prices[.@req_setting] +"^000000 points, your KVM Points are now ^580080"+kvm_point+"^000000.";
+				mes "Your KVM Points are reduced by ^0000ff"+.@prices[getarg(1)]+"^000000 points, your KVM Points are now ^580080"+kvm_point+"^000000.";
 		}
 		else {
 			mes "[Logistics]";
-			if (!.@req_setting)
+			if (!getarg(1))
 				mes "You need ^0000ff2,000^000000 KVM Points to purchase this item.";
-			else if (.@req_setting == 4)
+			else if (getarg(1) == 4)
 				mes "You need ^0000ff1,200^000000 KVM Points to purchase this item.";
 			else
-				mes "You need ^0000ff"+ .@prices[.@req_setting] +"^000000 KVM Points to purchase this item.";
+				mes "You need ^0000ff"+.@prices[getarg(1)]+"^000000 KVM Points to purchase this item.";
 			mes "However, your KVM Points are now ^580080"+ kvm_point +"^000000.";
 			mes "Which are not enough to buy it.";
 			mes "When you get enough points, please come back again.";
--- a/npc/cities/aldebaran.txt
+++ b/npc/cities/aldebaran.txt
@@ -1390,17 +1390,14 @@ alde_dun03,264,16,4	script	Gatekeeper#ct1	101,{
 }

 function	script	F_ClockTowerGate	{
-	.@floor = getarg(0);
-	.@item_req = getarg(1);
-
 	mes "[Gatekeeper Boy]";
 	mes "Welcome to";
 	mes "Kinase - Blue Gallino";
 	mes "The one of Local Speciality in Aldebaran.";
-	mes "You can't go through from "+ .@floor +" Floor,";
+	mes "You can't go through from "+getarg(0)+" Floor,";
 	mes "Please go back.";
 	next;
-	switch(select("About Clock Tower:About the "+ .@floor +" Floor:Move to the "+ .@floor +" Floor:End Dialogue")) {
+	switch(select("About Clock Tower:About the "+getarg(0)+" Floor:Move to the "+getarg(0)+" Floor:End Dialogue")) {
 	case 1:
 		mes "[Gatekeeper Boy]";
 		mes "Homeland of Alchemy,Aldebaran!";
@@ -1461,14 +1458,14 @@ function	script	F_ClockTowerGate	{
 		mes ". . . . .";
 		close;
 	case 3:
-		if (countitem(.@item_req) > 0) {
+		if (countitem(getarg(1)) > 0) {
 			mes "[Gatekeeper Boy]";
 			mes "Hmm! I already felt that you are not an Ordinary person,";
 			mes "Now it seems to be successful in Speculation.";
 			mes "Please,You may enter.";
 			mes "May God bless you ..";
 			close2;
-			delitem .@item_req,1; 
+			delitem getarg(1),1; 
 			warp getarg(2),getarg(3),getarg(4);
 			end;
 		}
--- a/npc/cities/einbroch.txt
+++ b/npc/cities/einbroch.txt
@@ -91,15 +91,13 @@ einbroch,176,172,5	script	Khemko#ein	855,{
 }

 function	script	EinTower	{
-	.@npc_name$ = getarg(0);
-
-	mes "["+ .@npc_name$ +"]";
+	mes "[" + getarg(0) + "]";
 	mes "Good day~";
-	mes "I'm "+ .@npc_name$ +", your";
+	mes "I'm " + getarg(0) + ", your";
 	mes "guide to exploring";
 	mes "the Einbroch Tower.";
 	next;
-	mes "["+ .@npc_name$ +"]";
+	mes "[" + getarg(0) + "]";
 	mes "Einbroch Tower offers";
 	mes "the best view of our city";
 	mes "and it's a great place to";
@@ -107,7 +105,7 @@ function	script	EinTower	{
 	mes "a date. The Einbroch Tower";
 	mes "admission fee is 10 zeny.";
 	next;
-	mes "["+ .@npc_name$ +"]";
+	mes "[" + getarg(0) + "]";
 	mes "Right now, we're offering";
 	mes "a special promotion called";
 	mes "the Apple Combo Set for only";
@@ -118,7 +116,7 @@ function	script	EinTower	{
 	switch(select("Tower Admission Only:Apple Combo Set:Cancel")) {
 	case 1:
 		if (Zeny < 10) {
-			mes "["+ .@npc_name$ +"]";
+			mes "[" + getarg(0) + "]";
 			mes "I'm sorry, but you";
 			mes "don't have enough";
 			mes "zeny. The Einbroch";
@@ -127,7 +125,7 @@ function	script	EinTower	{
 			close;
 		}
 		else {
-			mes "["+ .@npc_name$ +"]";
+			mes "[" + getarg(0) + "]";
 			mes "Thank you for";
 			mes "using our services.";
 			mes "Let me guide you to";
@@ -139,14 +137,14 @@ function	script	EinTower	{
 		}
 	case 2:
 		if (Zeny < 20) {
-			mes "["+ .@npc_name$ +"]";
+			mes "[" + getarg(0) + "]";
 			mes "I'm sorry, but you don't";
 			mes "have enough zeny. The";
 			mes "Apple Combo Set is 20 zeny.";
 			close;
 		}
 		else {
-			mes "["+ .@npc_name$ +"]";
+			mes "[" + getarg(0) + "]";
 			mes "Before I guide you to";
 			mes "the tower, let me check";
 			mes "your status to insure";
@@ -154,7 +152,7 @@ function	script	EinTower	{
 			mes "you the Apple Combo Set.";
 			next;
 			if (checkweight(512,1)) {
-				mes "["+ .@npc_name$ +"]";
+				mes "[" + getarg(0) + "]";
 				mes "Thank you for";
 				mes "using our services.";
 				mes "Let me guide you to";
@@ -166,7 +164,7 @@ function	script	EinTower	{
 				end;
 			}
 			else {
-				mes "["+ .@npc_name$ +"]";
+				mes "[" + getarg(0) + "]";
 				mes "I'm sorry, but you're carrying";
 				mes "too many items with you. Please store some of your things in your Kafra Storage before purchasing";
 				mes "the Apple Combo Set.";
@@ -174,7 +172,7 @@ function	script	EinTower	{
 			}
 		}
 	case 3:
-		mes "["+ .@npc_name$ +"]";
+		mes "[" + getarg(0) + "]";
 		mes "I see.";
 		mes "Feel free to";
 		mes "come back any";
--- a/npc/events/MemorialDay_2008.txt
+++ b/npc/events/MemorialDay_2008.txt
@@ -92,7 +92,7 @@ prontera,182,214,4	script	Lauds#Memorial	58,{
 			delitem 1059,30;
 			delitem 914,20;
 			getitem 6025,1;
-			getnameditem 6025,strcharinfo(0);
+			getnameditem 6025," + strcharinfo(0) + ";
 			set Memorial08,2;
 			close;
 		}
--- a/npc/events/christmas_2008.txt
+++ b/npc/events/christmas_2008.txt
@@ -135,7 +135,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 							next;
 							emotion e_heh;
 							delitem 6092,6;
-							getnameditem 12354,strcharinfo(0);
+							getnameditem 12354,"+strcharinfo(0)+";
 							mes "[Caroller]";
 							mes "Let's care about others around you on this Christmas season!";
 							close;
@@ -418,7 +418,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 			next;
 			emotion e_ok;
 			getitem 2784,1;
-			getnameditem 12354,strcharinfo(0);
+			getnameditem 12354,"+strcharinfo(0)+";
 			delitem 1019,10;
 			delitem 1005,1;
 			delitem 7312,1;
--- a/npc/events/nguild/nguild_managers.txt
+++ b/npc/events/nguild/nguild_managers.txt
@@ -24,27 +24,24 @@

 //==============================================
 function	script	F_GldManager	{
-	.@npc_name$ = getarg(0);
-	.@map_name$ = getarg(1);
-	.@gid = getcastledata(.@map_name$,1);
-	.@gm_name$ = getguildmaster(.@gid);

-	mes "[ "+ .@npc_name$ +" ]";
-	if (.@gid == 0){
+	set @GID, GetCastleData(getarg(1),1);
+	mes "[ "+getarg(0)+" ]";
+	if (@GID == 0){
 		mes "I am waiting for my master.  Brave adventurer, follow your destiny!";
 		return;
 	}
-	if (getcharid(2) != .@gid){
-		mes "I am here to follow ^5533FF" + getguildmaster(.@gid) + "^000000's command! Hey! Your not even a part of the guild!!";
+	if (getcharid(2) != @GID){
+		mes "I am here to follow ^5533FF" + getguildmaster(@GID) + "^000000's command! Hey! Your not even a part of the guild!!";
 		mes "Where are the guardians? Destroy these intruders!";
 		return;
 	}
-	if (strcharinfo(0) != getguildmaster(.@gid)){
-		mes "You're not ^5533FF" + getguildmaster(.@gid) + "^000000! I am here to follow ^5533FF" + getguildmaster(.@gid) + "^000000's command only";
+	if (strcharinfo(0) != getguildmaster(@GID)){
+		mes "You're not ^5533FF" + getguildmaster(@GID) + "^000000! I am here to follow ^5533FF" + getguildmaster(@GID) + "^000000's command only";
 		return 0;
 	}

-	mes "Welcome Master ^5533FF" + getguildmaster(.@gid) + "^000000 ! I will assist you in any way I can!";
+	mes "Welcome Master ^5533FF" + getguildmaster(@GID) + "^000000 ! I will assist you in any way I can!";
 	next;

 	menu "Kafra Staff Employment / Dismissal",M_Kaf, "Enter Treasure Room",M_Treas, "Cancel",M_End;
@@ -52,9 +49,9 @@ function	script	F_GldManager	{
 	//===========================
 	M_Kaf:
 	//======
-		mes "[ "+ .@npc_name$ +" ]";
-		if (GetCastleData(.@map_name$,9) == 1) goto L_Dismiss;
-		if (getgdskilllv(.@gid,10001) == 0){
+		mes "[ "+getarg(0)+" ]";
+		if (GetCastleData(getarg(1),9) == 1) goto L_Dismiss;
+		if (getgdskilllv(@GID,10001) == 0){
 			mes "Master, you don't have a contract with the Kafra Staff Company.";
 			mes "In order to hire a Kafra, you must first learn the Guild skill ^5533FFContract With Kafra^000000.";
 			return;
@@ -65,14 +62,14 @@ function	script	F_GldManager	{
 			next;
 			menu "Employ Kafra.",-,"Cancel",sM_KafEnd;

-				mes "[ "+ .@npc_name$ +" ]";
+				mes "[ "+getarg(0)+" ]";
 				if (Zeny < 10000){
 					mes "Master, you do not have enough money to employ a Kafra. Employment has been cancelled.";
 					return;
 				}
 				set Zeny,Zeny-10000;
 				enablenpc "Kafra Staff#"+getarg(4);
-				SetCastleData .@map_name$,9,1;
+				SetCastleData getarg(1),9,1;
 				mes "You have created a contract with the Kafra Staff Company.";
 				next;
 				cutin "kafra_01",2;
@@ -80,13 +77,13 @@ function	script	F_GldManager	{
 				mes "How do you do? I'm here to provide you with helpful service! I'll do the best I can to serve you.";
 				next;
 				cutin "kafra_01",255;
-				mes "[ "+ .@npc_name$ +" ]";
+				mes "[ "+getarg(0)+" ]";
 				//mes "Your employment contract lasts ^5533FF1 month^000000.  After this term is over you will have to create a new contract.";
 				mes "I think the Kafra Staff will benefit our guild members.";
 				return;

 			sM_KafEnd:
-				mes "[ "+ .@npc_name$ +" ]";
+				mes "[ "+getarg(0)+" ]";
 				mes "As you wish Master.  But I suggest we get a Kafra as soon as possible!";
 				return;

@@ -105,9 +102,9 @@ function	script	F_GldManager	{
 					mes "It's unfortunate that I won't be able to serve your guild anymore....";
 					next;
 					disablenpc "Kafra Staff#"+getarg(4);
-					SetCastleData .@map_name$,9,0;
+					SetCastleData getarg(1),9,0;
 					cutin "kafra_01",255;
-					mes "[ "+ .@npc_name$ +" ]";
+					mes "[ "+getarg(0)+" ]";
 					mes "The Kafra has been dismissed.  But... we should really get a Kafra as soon as possible!";
 					return;
 				ssM_KafEnd2:
@@ -116,26 +113,26 @@ function	script	F_GldManager	{
 					cutin "kafra_01",255;
 					return;
 			sM_KafEnd2:
-				mes "[ "+ .@npc_name$ +" ]";
+				mes "[ "+getarg(0)+" ]";
 				mes "Master, I think you should keep the current Kafra Staff because she is already trying her best to serve us";
 				return;

 	//=========================
 	M_Treas:
 	//========
-		mes "[ "+ .@npc_name$ +" ]";
+		mes "[ "+getarg(0)+" ]";
 		mes "Would you to go to our Treasure Room? Only you, the Guild Master, are allowed to enter this room.";
 		next;
 		menu "Enter Treasure room.",-,"Cancel",sM_TresEnd;

-			mes "[ "+ .@npc_name$ +" ]";
+			mes "[ "+getarg(0)+" ]";
 			mes "Please follow me through the secret passage way.";
 			mes "You must pull down on the secret switch in order to get out.";
 			next;
-			warp .@map_name$,getarg(2),getarg(3);
+			warp getarg(1),getarg(2),getarg(3);
 			return;
 		sM_TresEnd:
-			mes "[ "+ .@npc_name$ +" ]";
+			mes "[ "+getarg(0)+" ]";
 			mes "The goods are produced everyday.";
 			mes "You should get them whenever you can because they might dissapear if you take them at the wrong time.";
 			return;
@@ -144,7 +141,7 @@ function	script	F_GldManager	{
 	//==========================
 	M_End:
 	//=======
-		mes "[ "+ .@npc_name$ +" ]";
+		mes "[ "+getarg(0)+" ]";
 		mes "As you wish, master.";
 		return;
 }
--- a/npc/events/nguild/nguild_treas.txt
+++ b/npc/events/nguild/nguild_treas.txt
@@ -20,23 +20,21 @@
 // Treasure Spawning Function
 //================================================
 function	script	F_GldTreas	{
-	.@map$ = getarg(0);
-
-	if(getarg(10) != 1) {
-		setcastledata .@map$,4,0;
-		setcastledata .@map$,5,0;
+	if(getarg(10) !=  1) {
+		setcastledata getarg(0),4,0;
+		setcastledata getarg(0),5,0;

 		// Why on earth are we killing old treasure chest spawns?
-		//killmonster .@map$,"Treasure_"+getarg(1)+"::OnDied";
+		//killmonster getarg(0),"Treasure_"+getarg(1)+"::OnDied";

 		// Don't spawn treasures if Castle is empty, or Eco is greater than 100
-		if(getcastledata(.@map$,2) > 100 || getcastledata(.@map$,1) == 0) return;
+		if(GetCastleData(getarg(0),2) > 100 || GetCastleData(getarg(0),1) == 0) return;

 		// Only spawn one treasure chest for novice castles.
-		if (compare(.@map$,"nguild"))
+		if (compare(getarg(0),"nguild"))
 			set getarg(2),1;
 		else
-			set getarg(2),getcastledata(.@map$,2)/5+4;
+			set getarg(2),GetCastleData(getarg(0),2)/5+4;

 		if (getarg(2) <= 0) return;

@@ -46,13 +44,13 @@ function	script	F_GldTreas	{
 	for (set .@i,1; .@i <= getarg(3) ; set .@i,.@i+1) {
 		// set treasure box ID
 		set getarg(4), getarg(5) + (.@i+1) % 2;
-		areamonster .@map$,getarg(6),getarg(7),getarg(8),getarg(9),"Treasure Chest",getarg(4),1,"Treasure_"+getarg(1)+"::OnDied";
+		areamonster getarg(0),getarg(6),getarg(7),getarg(8),getarg(9),"Treasure Chest",getarg(4),1,"Treasure_"+getarg(1)+"::OnDied";
 	}
 	return;
 }

 //==============================================================
-//  Treasure Room Switch
+//  Treasure Room Switch 
 //===============================================================
 function	script	F_GldTreasSw	{
 	mes " ";
--- a/npc/guild2/agit_main_se.txt
+++ b/npc/guild2/agit_main_se.txt
@@ -1728,9 +1728,8 @@ function	script	LinkFlag	{
 // Return Flags (function)
 //============================================================
 function	script	ReturnFlag	{
-	.@map$ = getarg(0);
 	set .@str$, (compare(strnpcinfo(4),"aru"))?"Arunafeltz":"Schwaltzvalt";
-	.@GID =  getcastledata(.@map$,1);
+	set .@GID, getcastledata(getarg(0),1);
 	if (!.@GID) {
 		mes "[ "+.@str$+" Royal Edict ]";
 		mes "The Holy Kingdom of";
@@ -1747,18 +1746,18 @@ function	script	ReturnFlag	{
 		mes "do you wish to return";
 		mes "to your stronghold?";
 		next;
-		if(select("Return to the Stronghold:Cancel") == 1 && getcharid(2) == getcastledata(.@map$,1)) {
-			if (compare(.@map$,"arug")) {
-				if (.@map$ == "arug_cas01") setarray .@i[0],67,193;
-				else if (.@map$ == "arug_cas02") setarray .@i[0],43,256;
+		if(select("Return to the Stronghold:Cancel") == 1 && getcharid(2) == getcastledata(getarg(0),1)) {
+			if (compare(getarg(0),"arug")) {
+				if (getarg(0) == "arug_cas01") setarray .@i[0],67,193;
+				else if (getarg(0) == "arug_cas02") setarray .@i[0],43,256;
 				else setarray .@i[0],121,318;	// Castles 3,4,5 are identical.
 			}
 			else {
-				if (.@map$ == "schg_cas02") setarray .@i[0],136,188;
-				else if (.@map$ == "schg_cas03") setarray .@i[0],308,202;
+				if (getarg(0) == "schg_cas02") setarray .@i[0],136,188;
+				else if (getarg(0) == "schg_cas03") setarray .@i[0],308,202;
 				else setarray .@i[0],120,290;	// Castles 1,4,5 are identical.
 			}
-			warp .@map$,.@i[0],.@i[1];
+			warp getarg(0),.@i[0],.@i[1];
 		}
 		close;
 	}
--- a/npc/instances/SealedShrine.txt
+++ b/npc/instances/SealedShrine.txt
@@ -424,8 +424,8 @@ prt_monk,261,91,3	script	Rust Blackhand#edq	826,{
 OnInstanceInit:
 	// Pick one "true" Gravestone and 12 "false" Gravestones.
 	set .@true, rand(1,13);
-	for(set .@i,1; .@i<=13; set .@i,.@i+1) {
-		disablenpc instance_npcname("Gravestone#1F_"+.@i+((.@i == .@true)?"T":"F"));
+	for(set .@i,1; .@i<13; set .@i,.@i+1) {
+		disablenpc instance_npcname("Gravestone#1F_1"+((.@i == .@true)?"F":"T"));
 	}
 	disablenpc instance_npcname("ins_baphomet_lotto");
 	end;
@@ -433,7 +433,7 @@ OnInstanceInit:

 1@cata,3,2,0	script	ins_baphomet_lotto2	-1,{
 OnEnable:
-	for(set .@i,1; .@i<=12; set .@i,.@i+1)
+	for(set .@i,1; .@i<12; set .@i,.@i+1)
 		enablenpc instance_npcname("Bobbing Torch#"+.@i);
 	end;
 }
--- a/npc/jobs/2-2/rogue.txt
+++ b/npc/jobs/2-2/rogue.txt
@@ -946,12 +946,11 @@ S_Req:
 	mes "^FF0000"+getarg(1)+"^000000,";
 	mes "^FF0000"+getarg(2)+"^000000 and";
 	mes "^FF0000"+getarg(3)+"^000000.";
-	.@var = getarg(4);
-	ROGUE_Q = .@var;
-	if (.@var == 3) {
+	set ROGUE_Q,getarg(4);
+	if(getarg(4) == 3) {
 		changequest 2017,2018;
 	}
-	else if (.@var == 4) {
+	else if(getarg(4) == 4) {
 		changequest 2017,2019;
 	}
 	else {
@@ -974,17 +973,14 @@ S_Req:


 S_CheckItems:
-	setarray .@item_req[0], getarg(0), getarg(2), getarg(4), getarg(6);
-	setarray .@amount[0], getarg(1), getarg(3), getarg(5), getarg(7);
-
-	if (Zeny > 9999 && countitem(.@item_req[0]) >= .@amount[0] && countitem(.@item_req[1]) >= .@amount[1] && countitem(.@item_req[2]) >= .@amount[2] && countitem(.@item_req[3]) >= .@amount[3]) {
+	if (Zeny > 9999 && countitem(getarg(0)) >= getarg(1) && countitem(getarg(2)) >= getarg(3) && countitem(getarg(4)) >= getarg(5) && countitem(getarg(6)) >= getarg(7)) {
 		mes "[Mr. Smith]";
-		mes "Okay, we've got the application fee, ^FF000010,000 zeny^000000, "+ .@amount[0] +" "+ getitemname(.@item_req[0]) +", "+ .@amount[1] +" "+ getitemname(.@item_req[1]) +", "+ .@amount[2] +" "+ getitemname(.@item_req[2]) +" and "+ .@amount[3] +" "+ getitemname(.@item_req[3]) +"...";
+		mes "Okay, we've got the application fee, ^FF000010,000 zeny^000000, "+getarg(1)+" "+getitemname(getarg(0))+", "+getarg(3)+" "+getitemname(getarg(2))+", "+getarg(5)+" "+getitemname(getarg(4))+" and "+getarg(7)+" "+getitemname(getarg(6))+"...";
 		set Zeny, Zeny-10000;
-		delitem .@item_req[0],.@amount[0];
-		delitem .@item_req[1],.@amount[1];
-		delitem .@item_req[2],.@amount[2];
-		delitem .@item_req[3],.@amount[3];
+		delitem getarg(0),getarg(1);
+		delitem getarg(2),getarg(3);
+		delitem getarg(4),getarg(5);
+		delitem getarg(6),getarg(7);
 		set ROGUE_Q,7;
 		next;
 		mes "[Mr. Smith]";
@@ -1007,10 +1003,10 @@ S_CheckItems:
 	mes "and the following items...";
 	next;
 	mes "[Mr. Smith]";
-	mes "^FF0000 "+ .@amount[0] +" "+ getitemname(.@item_req[0]) +"^000000,";
-	mes "^FF0000 "+ .@amount[1] +" "+ getitemname(.@item_req[1]) +"^000000,";
-	mes "^FF0000 "+ .@amount[2] +" "+ getitemname(.@item_req[2]) +"^000000,";
-	mes "^FF0000 "+ .@amount[3] +" "+ getitemname(.@item_req[3]) +"^000000,";
+	mes "^FF0000 "+getarg(1)+" "+getitemname(getarg(0))+"^000000,";
+	mes "^FF0000 "+getarg(3)+" "+getitemname(getarg(2))+"^000000,";
+	mes "^FF0000 "+getarg(5)+" "+getitemname(getarg(4))+"^000000,";
+	mes "^FF0000 "+getarg(7)+" "+getitemname(getarg(6))+"^000000,";
 	mes "You got it this time?";
 	close;
 }
--- a/npc/kafras/cool_event_corp.txt
+++ b/npc/kafras/cool_event_corp.txt
@@ -78,8 +78,7 @@ function	script	F_CoolEventCorp	{
 			set .@cost,4400;
 		else
 			set .@cost,2200;
-		.@destination$ = getarg(5);
-		if (select(.@destination$ +" -> "+ .@cost +" z:Cancel") == 1) {
+		if (select(getarg(5)+" -> "+.@cost+" z:Cancel") == 1) {
 			if ((countitem(7060) != 0) || (Zeny >= .@cost)) {
 				if (countitem(7060) != 0) {
 					delitem 7060,1; //Warp_Free_Ticket
@@ -87,8 +86,8 @@ function	script	F_CoolEventCorp	{
 				else {
 					set Zeny,Zeny-.@cost;
 				}
-				if (.@destination$ == "Veins") warp "veins",205,101;
-				else if (.@destination$ == "Rachel") warp "rachel",115,125;
+				if (getarg(5) == "Veins") warp "veins",205,101;
+				else if (getarg(5) == "Rachel") warp "rachel",115,125;
 				cutin "",255;
 				end;
 			}
@@ -97,7 +96,7 @@ function	script	F_CoolEventCorp	{
 				mes "I'm sorry, but you don't have";
 				mes "enough zeny for the Teleport";
 				mes "Service. The fee to teleport";
-				mes "to "+ .@destination$ +" is "+.@cost+" zeny.";
+				mes "to "+getarg(5)+" is "+.@cost+" zeny.";
 			}
 		}
 		close2;
--- a/npc/kafras/functions_kafras.txt
+++ b/npc/kafras/functions_kafras.txt
@@ -74,11 +74,8 @@
 //==========================================================================
 function	script	F_Kafra	{
 	callfunc "F_ClearGarbage"; // Clear outdated, unused variables
-	.@welcome = getarg(0);
-	.@menu_num = getarg(1);
-
 	// Display Kafra Welcome Message
-	switch(.@welcome){
+	switch(getarg(0)){
 		default:
 		case 0:
 			// Default message (obsolete)
@@ -125,11 +122,11 @@ function	script	F_Kafra	{
 	next;
 	while (1) {
 		deletearray @K_Menu0$[0],getarraysize(@K_Menu0$);
-		if (.@welcome == 2) {
+		if (getarg(0) == 2) {
 			// Guild Kafra Menu override (free Teleport, free Storage, Free Cart)
 			setarray @K_Menu0$[0],"Use Storage","Use Guild Storage","Rent a Pushcart","Use Teleport Service","Cancel";
 		} else {
-			switch(.@menu_num){
+			switch(getarg(1)){
 				// Save and Storage only
 				case 1:	setarray @K_Menu0$[0],"Save","Use Storage","Cancel"; break;
 				// Storage only
@@ -161,14 +158,14 @@ function	script	F_Kafra	{
 			return;
 		} else if (@K_Menu0$[.@j] == "Use Storage") {
 			// Do not charge for Guild Storage
-			if(.@welcome == 2) 
+			if(getarg(0) == 2) 
 				callfunc "F_KafStor",2,0,0;
 			else 
-				callfunc "F_KafStor",0,getarg(3),.@welcome;
+				callfunc "F_KafStor",0,getarg(3),getarg(0);
 			next;
 		} else if (@K_Menu0$[.@j] == "Use Teleport Service") {
 			// Display Einbroch "No Teleport Service" notice.
-			if(.@menu_num != 4) callfunc "F_KafTele",.@welcome;
+			if(getarg(1) != 4) callfunc "F_KafTele",getarg(0);
 			else {
 				mes "[Kafra Employee]";
 				mes "Because of the ^FF0000Limited";
@@ -185,13 +182,13 @@ function	script	F_Kafra	{
 			}
 			next;
 		} else if (@K_Menu0$[.@j] == "Rent a Pushcart") {
-			if(callfunc("F_KafCart",.@welcome,getarg(4)) == 1) 
+			if(callfunc("F_KafCart",getarg(0),getarg(4)) == 1) 
 				next;
 		} else if (@K_Menu0$[.@j] == "Check Other Information") {
 			callfunc "F_KafInfo",getarg(2);
 			next;
 		} else if (@K_Menu0$[.@j] == "Cancel"){
-			callfunc "F_KafEnd",.@welcome,0;
+			callfunc "F_KafEnd",getarg(0),0;
 			end;
 		} else if (@K_Menu0$[.@j] == "Use Guild Storage") {
 			callfunc "F_KafStor",1,0;
@@ -204,11 +201,8 @@ function	script	F_Kafra	{
 // Storage Function
 //===================================================
 function	script	F_KafStor	{
-	.@type = getarg(0);
-	.@fee = getarg(1);
-
 	// Unable to access Guild Storage (Busy)
-	if(.@type == 1){
+	if(getarg(0) == 1){
 		if(guildopenstorage()){
 			mes "[Kafra Employee]";
 			mes "I'm sorry but another guild member is using the guild storage";
@@ -238,11 +232,11 @@ function	script	F_KafStor	{
 		return;
 	}
 	// Accessing Normal Storage (Skipped if accessing Storage from Guild castle)
-	if(.@type != 2){
+	if(getarg(0) != 2){
 		// Consume "Free Ticket for Kafra Storage" if available.
 		if(countitem(7059)) delitem 7059,1;
 		else {
-			if(Zeny<.@fee){
+			if(Zeny<getarg(1)){
 				mes "[Kafra Employee]";
 				// Niflheim Specific Message
 				if (getarg(2) == 1) {
@@ -257,16 +251,16 @@ function	script	F_KafStor	{
 				mes "I'm sorry, but you don't";
 				mes "have enough zeny to use";
 				mes "the Storage Service. Our";
-				mes "Storage access fee is "+.@fee+" zeny.";
+				mes "Storage access fee is "+getarg(1)+" zeny.";
 				return;
 			}
-			set Zeny, Zeny-.@fee;
-			set RESRVPTS, RESRVPTS + (.@fee/5);
+			set Zeny, Zeny-getarg(1);
+			set RESRVPTS, RESRVPTS + (getarg(1)/5);
 		}
 	}

 	// Surpress the "End" message if in guild castle.
-	if (.@type != 2) {
+	if (getarg(0) != 2) {
 		// Niflheim specific Message
 		if (getarg(2) == 1) {
 			percentheal 0,-10;
@@ -490,16 +484,13 @@ function	script	F_CheckKafCode	{
 // getarg(1): Company Name
 //=======================================================
 function	script	F_SetKafCode	{
-	.@npc_name$ = getarg(0);
-	.@comp_name$ = getarg(1);
-
-	mes .@npc_name$;
+	mes getarg(0);
 	if(#kafra_code) {
 		mes "Your storage is protected with a password. What would you do now?";
 		next;
 		switch (select("Change old password -> 5000z:Remove storage password -> 1000z:Cancel")) {
 			case 1:
-				mes .@npc_name$;
+				mes getarg(0);
 				mes "At first, please enter your ^0000FFold password^000000.";
 				set @code,callfunc("F_EntKafCode");
 				if(!@code || @code != #kafra_code) {
@@ -508,10 +499,10 @@ function	script	F_SetKafCode	{
 					break;
 				}
 				next;
-				callsub S_SET,.@npc_name$,.@comp_name$;
+				callsub S_SET,getarg(0),getarg(1);
 				break;
 			case 2:
-				mes .@npc_name$;
+				mes getarg(0);
 				mes "Please, enter your password before its removal.";
 				set @code,callfunc("F_EntKafCode");
 				if(!@code) {
@@ -520,7 +511,7 @@ function	script	F_SetKafCode	{
 					break;
 				}
 				next;
-				mes .@npc_name$;
+				mes getarg(0);
 				if(Zeny < 1000) {
 					mes "You don't have enough zeny.";
 					emotion e_cash;
@@ -530,7 +521,7 @@ function	script	F_SetKafCode	{
 				if(@code == #kafra_code) {
 					set #kafra_code,0;
 					mes "You've successfully cleared your storage password.";
-					mes "Thank you for using "+.@comp_name$+".";
+					mes "Thank you for using "+getarg(1)+".";
 					emotion e_thx;
 				} else {
 					mes "Wrong password. We won't return your 1000z.";
@@ -542,11 +533,11 @@ function	script	F_SetKafCode	{
 				break;
 		}
 	} else {
-		mes .@comp_name$+" proudly presents you a new service:";
+		mes getarg(1)+" proudly presents you a new service:";
 		mes "Additional storage protection with a password.";
 		next;
 		switch (select("Set new password -> 5000z:Cancel")) {
-			case 1: callsub S_SET,.@npc_name$,.@comp_name$; break;
+			case 1: callsub S_SET,getarg(0),getarg(1); break;
 			case 2: break;		
 		}
 	}
@@ -555,7 +546,7 @@ function	script	F_SetKafCode	{
 	end;

 S_SET:
-	mes .@npc_name$;
+	mes getarg(0);
 	mes "Now enter your ^FF0000new password^000000 to protect your storage from thieves.";
 	set @code,callfunc("F_EntKafCode");
 	if(!@code) {
@@ -564,7 +555,7 @@ S_SET:
 		return;
 	}
 	next;
-	mes .@npc_name$;
+	mes getarg(0);
 	if(Zeny < 5000) {
 		mes "You don't have enough zeny.";
 		emotion e_cash;
@@ -573,7 +564,7 @@ S_SET:
 	set Zeny,Zeny-5000;
 	set #kafra_code,@code;
 	mes "You've protected your storage with a secret password.";
-	mes "Thank you for using "+.@comp_name$+".";
+	mes "Thank you for using "+getarg(1)+".";
 	emotion e_thx;
 	return;
 }
--- a/npc/mapflag/gvg.txt
+++ b/npc/mapflag/gvg.txt
@@ -12,8 +12,6 @@
 //= gvg: Turns on GvG mode.
 //= gvg_castle: Describes castle maps for WoE.
 //= gvg_dungeon: Describes dungeon maps for WoE.
-//= gvg_te: Turns on GvG mode for WoE:TE.
-//= gvg_te_castle: Describes castle maps for WoE:TE.
 //===== Additional Comments: ================================= 
 //= 1.1 Added Novice Guild Castles.
 //= 1.2 Updated with new meanings of gvg and gvg_castle.
--- a/npc/merchants/advanced_refiner.txt
+++ b/npc/merchants/advanced_refiner.txt
@@ -101,13 +101,11 @@ payon,157,146,6	script	Suhnbi#cash	85,{
 	close;

 S_RefineValidate:
-	.@weapon_lvl = getarg(0);
-	.@item_req = getarg(1);
 	set .@price, getarg(2);

 	// If the VIP system is enabled, the prices for non-VIP players are considerably higher.
 	if (VIP_SCRIPT && !vip_status(1)) {
-		switch(.@weapon_lvl){
+		switch(getarg(0)){
 			case 0: set .@price, .@price * 10; break;
 			case 1: set .@price, .@price * 40; break;
 			case 2: set .@price, .@price * 50; break;
@@ -117,14 +115,14 @@ S_RefineValidate:
 	}

 	mes "[Suhnbi]";
-	if (.@weapon_lvl)
-		mes "You want to refine a level "+ .@weapon_lvl +" weapon?";
-	mes "To refine that, you'll need to have one ^ff9999"+ getitemname(.@item_req) +"^000000 and "+ .@price +" zeny.";
+	if (getarg(0))
+		mes "You want to refine a level " + getarg(0) + " weapon?";
+	mes "To refine that, you'll need to have one ^ff9999" + getitemname(getarg(1)) + "^000000 and " + .@price + " zeny.";
 	mes "Would you like to continue?";
 	next;
 	if(select("Yes:No") == 1) {
 		if (getequippercentrefinery(getarg(3)) < 100) {
-			if (.@weapon_lvl) {
+			if (getarg(0)) {
 				mes "[Suhnbi]";
 				mes "Wow!!";
 				mes "This weapon probably";
@@ -163,8 +161,8 @@ S_RefineValidate:
 				}
 			}
 		}
-		if (countitem(.@item_req) > 0 && Zeny > .@price) {
-			delitem .@item_req,1;
+		if (countitem(getarg(1)) > 0 && Zeny > .@price) {
+			delitem getarg(1),1;
 			set Zeny, Zeny - .@price;
 			return;
 		}
--- a/npc/merchants/alchemist.txt
+++ b/npc/merchants/alchemist.txt
@@ -140,10 +140,7 @@ alde_alche,24,188,3	script	Guild Dealer	740,{
 	}

 S_SellManual:
-	.@item_id = getarg(0);
-	.@zeny_req = getarg(1);
-
-	if (Zeny < .@zeny_req) {
+	if (Zeny < getarg(1)) {
 		mes "[Gever Al Sharp]";
 		mes "You don't";
 		mes "have enough zeny.";
@@ -152,12 +149,12 @@ S_SellManual:
 		close;
 	}
 	mes "[Gever Al Sharp]";
-	mes getitemname(.@item_id) +"?";
-	mes "That'll be "+ .@zeny_req +" zeny.";
+	mes ""+getitemname(getarg(0))+"?";
+	mes "That'll be "+getarg(1)+" zeny.";
 	next;
 	if (select("Purchase.:Quit.") == 1) {
-		Zeny = Zeny - .@zeny_req;
-		getitem .@item_id,1;
+		set Zeny, Zeny-getarg(1);
+		getitem getarg(0),1;
 		mes "[Gever Al Sharp]";
 		mes "Thank you for";
 		mes "your patronage.";
--- a/npc/merchants/gemstone.txt
+++ b/npc/merchants/gemstone.txt
@@ -38,32 +38,29 @@ payon,173,238,5	script	Jade#pay	754,{
 	}

 S_TradeGems:
-	.@item_req = getarg(0);
-	.@item_id = getarg(1);
-
-	if (countitem(.@item_req) < 2) {
+	if (countitem(getarg(0)) < 2) {
 		mes "[Jade]";
 		mes "Hah...!";
 		mes "You're kidding me, right?";
 		mes "I can't provide you with this";
 		mes "service if you don't";
 		mes "give me at least";
-		mes "2 "+ getitemname(.@item_req) +"s!";
+		mes "2 "+getitemname(getarg(0))+"s!";
 		close;
 	}
 	else {
-		.@gems = countitem(.@item_req) /2;
+		set .@gems,countitem(getarg(0))/2;
 		mes "[Jade]";
 		mes "I believe I can create";
-		mes "a total of "+ .@gems +" "+ getitemname(.@item_id) +"s";
-		mes "using the "+ getitemname(.@item_req) +"s";
+		mes "a total of " + .@gems + " " + getitemname(getarg(1)) + "s";
+		mes "using the "+getitemname(getarg(0))+"s";
 		mes "that you currently have.";
 		mes "What do you want to do?";
 		next;
 		switch(select("Give me as many as you can.:I want to set the amount.:I quit.")) {
 		case 1:
-			delitem .@item_req,.@gems * 2;
-			getitem .@item_id,.@gems;
+			delitem getarg(0),.@gems * 2;
+			getitem getarg(1),.@gems;
 			break;
 		case 2:
 			mes "[Jade]";
@@ -99,8 +96,8 @@ S_TradeGems:
 				}
 				else break;
 			}
-			delitem .@item_req,.@input * 2;
-			getitem .@item_id,.@input;
+			delitem getarg(0),.@input * 2;
+			getitem getarg(1),.@input;
 			break;
 		case 3:
 			mes "[Jade]";
--- a/npc/merchants/hair_style.txt
+++ b/npc/merchants/hair_style.txt
@@ -508,17 +508,16 @@ alberta_in,55,142,7	script	Hair Dresser	91,{
 	}

 L_cutin:
-	.@num = getarg(0);
 	if(Sex == 1) {
-		if (.@num  < 10)
-			cutin "hair_m_0"+ .@num,4;
+		if(getarg(0) < 10)
+			cutin "hair_m_0"+getarg(0),4;
 		else
-			cutin "hair_m_"+ .@num,4;
+			cutin "hair_m_"+getarg(0),4;
 	} else {
-		if (.@num < 10)
-			cutin "hair_f_0"+ .@num,4;
+		if(getarg(0) < 10)
+			cutin "hair_f_0"+getarg(0),4;
 		else
-			cutin "hair_f_"+ .@num,4;
+			cutin "hair_f_"+getarg(0),4;
 	}
 	return;
 }
--- a/npc/merchants/inn.txt
+++ b/npc/merchants/inn.txt
@@ -205,16 +205,14 @@ ve_in,157,219,5	script	Inn Master#Receptionist	709,{

 //======================= Inn Function ==============================
 function	script	F_InnMaid	{
-	.@npc_name$ = getarg(0);
-
-	mes .@npc_name$;
+	mes getarg(0);
 	mes "Welcome to";
 	mes getarg(1) + ".";
 	mes "How may I help you?";
 	next;
 	switch(select("Save:Take a Rest -> 5000 zeny:Cancel")) {
 	case 1:
-		mes .@npc_name$;
+		mes getarg(0);
 		mes "Your respawn point";
 		mes "has been saved.";
 		mes "Thank you,";
@@ -222,7 +220,7 @@ function	script	F_InnMaid	{
 		savepoint getarg(2),getarg(3),getarg(4);
 		close;
 	case 2:
-		mes .@npc_name$;
+		mes getarg(0);
 		if(Zeny < 5000){
 			mes "I'm sorry, but the service charge is 5,000 zeny. Please make sure that you have enough money to check in next time, okay?";
 			close;
--- a/npc/merchants/kunai_maker.txt
+++ b/npc/merchants/kunai_maker.txt
@@ -53,15 +53,11 @@ que_ng,72,29,3	script	Kunai Merchant Kashin	83,{
 }

 function	script	Kunai_Trade	{
-	setarray .@item_req[0], getarg(0), getarg(2);
-	setarray .@req_amount[0], getarg(1), getarg(3);
-	.@item_id = getarg(4);
-
 	mes "[Kashin]";
 	mes "You can exchange";
-	mes .@req_amount[0] +" "+ getitemname(.@item_req[0]) +" and";
-	mes .@req_amount[1] +" "+ getitemname(.@item_req[1]) +" for every";
-	mes "set of 10 "+ getitemname(.@item_id) +".";
+	mes ""+getarg(1)+" "+getitemname(getarg(0))+" and";
+	mes ""+getarg(3)+" "+getitemname(getarg(2))+" for every";
+	mes "set of 10 "+getitemname(getarg(4))+".";
 	next;
 	mes "[Kashin]";
 	mes "I can only give you a maximum of 500 sets of Kunais at a time.";
@@ -77,7 +73,7 @@ function	script	Kunai_Trade	{
 		mes "enter a value less than 500.";
 		close;
 	}
-	if (countitem(.@item_req[0]) < .@amount*.@req_amount[0] || countitem(.@item_req[1]) < .@amount*.@req_amount[1]) {
+	if(countitem(getarg(0)) < .@amount*getarg(1) || countitem(getarg(2)) < .@amount*getarg(3)) {
 		mes "[Kashin]";
 		mes "Hmm, you don't have";
 		mes "enough items for this";
@@ -85,7 +81,7 @@ function	script	Kunai_Trade	{
 		mes "check your items again.";
 		close;
 	}
-	if (checkweight(.@item_id, .@amount*10) == 0) {
+	if(checkweight(getarg(4), .@amount*10) == 0) {
 		mes "[Kashin]";
 		mes "Hmm, it seems like your";
 		mes "Inventory doesn't have";
@@ -101,8 +97,8 @@ function	script	Kunai_Trade	{
 	mes "I'm sure that you'll be";
 	mes "quite satisfied with";
 	mes "these Kunais.";
-	delitem .@item_req[0],.@req_amount[0]*.@amount;
-	delitem .@item_req[1],.@req_amount[1]*.@amount;
-	getitem .@item_id,10*.@amount;
+	delitem getarg(0),getarg(1)*.@amount;
+	delitem getarg(2),getarg(3)*.@amount;
+	getitem getarg(4),10*.@amount;
 	close;
 }
--- a/npc/merchants/novice_exchange.txt
+++ b/npc/merchants/novice_exchange.txt
@@ -297,28 +297,25 @@ geffen,173,88,5	script	Merchant#geff	85,{
 }

 function	script	F_PotExchange	{
-	.@item_req = getarg(0);
-	.@req_amount = getarg(1);
-
-	if (countitem(.@item_req) < .@req_amount) {
+	if (countitem(getarg(0)) < getarg(1)) {
 		mes "[Merchant]";
 		mes "Hey, where are";
-		mes "all those "+ getitemname(.@item_req) +"";
+		mes "all those "+getitemname(getarg(0))+"";
 		mes "that you promised?";
-		mes "Give me "+ getitemname(.@item_req) +"!";
+		mes "Give me "+getitemname(getarg(0))+"!";
 		close;
 	}
 	else {
 		mes "[Merchant]";
 		mes "Okay, let me check";
-		mes "how many "+ getitemname(.@item_req) +" you";
+		mes "how many "+getitemname(getarg(0))+" you";
 		mes "have on you. Hmm...";
 		next;
 		mes "[Merchant]";
 		mes "You have";
-		mes "a total of "+ countitem(.@item_req) +" "+ getitemname(.@item_req) +".";
+		mes "a total of " + countitem(getarg(0)) + " "+getitemname(getarg(0))+".";
 		mes "I can give you a total";
-		mes "of "+ (countitem(.@item_req)/.@req_amount) +" Red Potions for those.";
+		mes "of " + (countitem(getarg(0))/getarg(1)) + " Red Potions for those.";
 		next;
 		mes "[Merchant]";
 		mes "What do you say?";
@@ -329,7 +326,7 @@ function	script	F_PotExchange	{
 			mes "You know the exact";
 			mes "number of Red Potions";
 			mes "you want to receive for";
-			mes "those "+ getitemname(.@item_req) +", don't you?";
+			mes "those "+getitemname(getarg(0))+", don't you?";
 			next;
 			mes "[Merchant]";
 			mes "Now, I can trade you";
@@ -360,8 +357,8 @@ function	script	F_PotExchange	{
 					break;
 				}
 			}
-			.@put_out_item = .@input * .@req_amount;
-			if (countitem(.@item_req) < .@put_out_item) {
+			set .@put_out_item,.@input * getarg(1);
+			if (countitem(getarg(0)) < .@put_out_item) {
 				mes "[Merchant]";
 				mes "Uh oh, the number you entered doesn't seem right. You better check the number of Red Potions that you can trade for again.";
 				close;
@@ -370,7 +367,7 @@ function	script	F_PotExchange	{
 			mes "There you go!";
 			mes "Check how many Red Potions";
 			mes "I've given you, it should be good. Thanks, that was a good deal~";
-			delitem .@item_req,.@put_out_item; //Shell
+			delitem getarg(0),.@put_out_item; //Shell
 			getitem 501,.@input; //Red_Potion
 			close;
 		}
--- a/npc/merchants/old_pharmacist.txt
+++ b/npc/merchants/old_pharmacist.txt
@@ -185,17 +185,14 @@ alberta_in,16,28,4	script	Pharmacist	61,{
 	}
 	
 L_Making:
-	.@item_req = getarg(0);
-	.@req_amount = getarg(1);
-
 	next;
 	mes "[Old Pharmacist]";
-	if ((countitem(.@item_req)/2) < countitem(713)) {
-		.@max = countitem(.@item_req) /2;
+	if ((countitem(getarg(0))/2) < countitem(713)) {
+		set .@max,countitem(getarg(0))/2;
 	} else {
-		.@max = countitem(713);
+		set .@max,countitem(713);
 	}
-	if (countitem(.@item_req) < 2 || countitem(713) == 0) {
+	if ((countitem(getarg(0)) < 2) || (countitem(713) == 0)) {
 		mes "You rascal! What did you expect?! Coming here with nothing. Tsk!";
 		mes "Get lost!";
 		close;
@@ -209,13 +206,13 @@ L_Making:
 	switch(select("Make as many as I can.:I want to choose an amount.:Actually, I don't want anything.")) {
 	case 1:
 		next;
-		if ((countitem(.@item_req) < .@max*2) || countitem(713) < .@max || (Zeny < .@max*.@req_amount)) {
+		if ((countitem(getarg(0)) < .@max*2) || (countitem(713) < .@max) || (Zeny < .@max*getarg(1))) {
 			mes "[Old Pharmacist]";
 			mes "You rascal! You don't even have all the materials and you want me to make you potions?!";
 			close;
 		}
-		Zeny = Zeny - (.@max*.@req_amount);
-		delitem .@item_req,.@max*2;
+		set Zeny,Zeny-(.@max*getarg(1));
+		delitem getarg(0),.@max*2;
 		delitem 713,.@max; //Empty_Bottle
 		getitem getarg(2),.@max; 
 		break;
@@ -235,13 +232,13 @@ L_Making:
 			mes "Are you deaf? I said less than 100!";
 			close;
 		}
-		if ((countitem(.@item_req) < .@amount*2) || countitem(713) < .@amount || (Zeny < .@amount*.@req_amount)) {
+		if ((countitem(getarg(0)) < .@amount*2) || (countitem(713) < .@amount) || (Zeny < .@amount*getarg(1))) {
 			mes "[Old Pharmacist]";
 			mes "You rascal! You don't even have all the materials and you want me to make you potions?!";
 			close;
 		}
-		Zeny = Zeny - (.@max*.@req_amount);
-		delitem .@item_req,.@amount*2;
+		set Zeny,Zeny-(.@amount*getarg(1));
+		delitem getarg(0),.@amount*2;
 		delitem 713,.@amount; //Empty_Bottle
 		getitem getarg(2),.@amount; 
 		break;
--- a/npc/merchants/quivers.txt
+++ b/npc/merchants/quivers.txt
@@ -71,21 +71,17 @@ payon_in01,5,134,5	script	Inventor Jaax	89,{
 	//close;

 S_BuyQuiver:
-	.@item_id = getarg(0);
-	.@amount = getarg(1);
-	.@zeny_req = getarg(2);
-
-	if (countitem(.@item_id) >= .@amount) {
+	if (countitem(getarg(0)) >= getarg(1)) {
 		mes "[Inventor Jaax]";
 		mes "Excellent!";
-		mes "Are you carrying any Arrows with you? I'll provide you with a quiver that can carry "+ .@amount +" of your "+ getitemname(.@item_id) +"s for only ^FF3131"+ .@zeny_req +" Zeny^000000.";
+		mes "Are you carrying any Arrows with you? I'll provide you with a quiver that can carry "+getarg(1)+" of your "+getitemname(getarg(0))+"s for only ^FF3131"+getarg(2)+" Zeny^000000.";
 		next;
 		switch(select("Store as many Arrows in quivers as possible:Purchase 1 quiver:Cancel")) {
 		case 1:
-			.@arrows = countitem(.@item_id);
-			set .@quiver,.@arrows / .@amount;
-			set .@arrows_used,.@quiver * .@amount;
-			.@arrow_zeny01 = .@quiver * .@zeny_req;
+			set .@arrows,countitem(getarg(0));
+			set .@quiver,.@arrows / getarg(1);
+			set .@arrows_used,.@quiver * getarg(1);
+			set .@arrow_zeny01,.@quiver * getarg(2);
 			mes "Number of";
 			mes "Arrows: ^3131FF"+.@arrows+" ^000000";
 			mes "Maximum Number";
@@ -105,7 +101,7 @@ S_BuyQuiver:
 					mes "There you go!";
 					mes "Just remember, ^FF0000you won't be able to use the Quiver when your carried weight is 90% of your maximum weight limit^000000.";
 					set Zeny, Zeny-.@arrow_zeny01;
-					delitem .@item_id,.@arrows_used;// Arrow
+					delitem getarg(0),.@arrows_used; //Arrow
 					getitem getarg(3),.@quiver; //Quiver
 					next;
 					mes "[Inventor Jaax]";
@@ -130,12 +126,12 @@ S_BuyQuiver:
 			mes "a quiver is so close?";
 			close;
 		case 2:
-			if (Zeny > .@zeny_req) {
+			if (Zeny > getarg(2)) {
 				mes "[Inventor Jaax]";
 				mes "There you go!";
 				mes "Just remember, ^FF0000you won't be able to use the Quiver when your carried weight is 90% of your maximum weight limit^000000.";
-				Zeny = Zeny -.@zeny_req;
-				delitem .@item_id,.@amount;// Arrow
+				set Zeny, Zeny-getarg(2);
+				delitem getarg(0),getarg(1); //Arrow
 				getitem getarg(3),1; //Quiver
 				next;
 				mes "[Inventor Jaax]";
@@ -150,7 +146,7 @@ S_BuyQuiver:
 			else {
 				mes "[Inventor Jaax]";
 				mes "You don't even";
-				mes "have "+ .@zeny_req +" Zeny?";
+				mes "have "+getarg(2)+" Zeny?";
 				mes "I'm so sorry. I had no";
 				mes "idea that you were so...";
 				mes "^333333Destitute^000000.";
@@ -165,11 +161,11 @@ S_BuyQuiver:
 	}
 	else {
 		mes "[Inventor Jaax]";
-		mes "You can carry a maximum of "+ .@amount +" Arrows within this quiver. It was made using my secret method,";
+		mes "You can carry a maximum of "+getarg(1)+" Arrows within this quiver. It was made using my secret method,";
 		mes "so the total weight of the Arrows and Quiver is less than carrying the Arrows alone.";
 		next;
 		mes "[Inventor Jaax]";
-		mes "It's a miracle of science! One that you can experience for yourself if you bring me at least "+ .@amount +" Arrows and "+ .@zeny_req +" Zeny for each Quiver.";
+		mes "It's a miracle of science! One that you can experience for yourself if you bring me at least "+getarg(1)+" Arrows and "+getarg(2)+" Zeny for each Quiver.";
 		close;
 	}
 }
--- a/npc/merchants/refine.txt
+++ b/npc/merchants/refine.txt
@@ -561,9 +561,8 @@ lhz_in02,282,20,7	script	Fulerr	869,{
 //============================================================
 function	script	refinemain	{
 	disable_items;
-	.@npc_name$ = getarg(0);
 	set .@features,getarg(1);
-	mes "["+ .@npc_name$ +"]";
+	mes "[" + getarg(0) + "]";
 	mes "I'm the Armsmith.";
 	mes "I can refine all kinds of weapons, armor and equipment, so let me";
 	mes "know what you want me to refine.";
@@ -579,14 +578,14 @@ function	script	refinemain	{
 		set .@menu$, .@menu$ + ":";
 	}
 	if (.@equipped == 0) {
-		mes "["+ .@npc_name$ +"]";
+		mes "[" + getarg(0) + "]";
 		mes "I don't think I can refine any items you have...";
 		close;
 	}
 	set .@part, select(.@menu$);

 	if(!getequipisequiped(.@part)) { //custom check
-		mes "["+ .@npc_name$ +"]";
+		mes "[" + getarg(0) + "]";
 		mes "You're not wearing";
 		mes "anything there that";
 		mes "I can refine.";
@@ -595,14 +594,14 @@ function	script	refinemain	{
 	}
 	//Check if the item is refinable...
 	if(!getequipisenableref(.@part)) {
-		mes "["+ .@npc_name$ +"]";
+		mes "[" + getarg(0) + "]";
 		mes "I don't think I can";
 		mes "refine this item at all...";
 		close;
 	}
 	//Check to see if the items is already +10
 	if(getequiprefinerycnt(.@part) >= 10) {
-		mes "["+ .@npc_name$ +"]";
+		mes "[" + getarg(0) + "]";
 		mes "I can't refine this";
 		mes "any more. This is as";
 		mes "refined as it gets!";
@@ -656,21 +655,21 @@ function	script	refinemain	{
 	}

 	if(.@features != 1) {
-		mes "["+ .@npc_name$ +"]";
+		mes "[" + getarg(0) + "]";
 		mes "To refine this I need";
 		mes "one ^003366"+getitemname(.@material)+"^000000 and";
 		mes "a service fee of " + .@price + " Zeny.";
 		mes "Do you really wish to continue?";
 		next;
 		if(select("Yes:No") == 2){
-			mes "["+ .@npc_name$ +"]";
+			mes "[" + getarg(0) + "]";
 			mes "Yeah...";
 			mes "There's no need to";
 			mes "rush. Take your time.";
 			close;
 		}
 		if(getequippercentrefinery(.@part) < 100) {
-			mes "["+ .@npc_name$ +"]";
+			mes "[" + getarg(0) + "]";
 			mes "Oh no! If I continue to";
 			mes "refine this, there's a risk it could";
 			switch(.@material) {
@@ -692,14 +691,14 @@ function	script	refinemain	{
 			mes "Do you still want to refine?";
 			next;
 			if(select("Yes:No") == 2){
-				mes "["+ .@npc_name$ +"]";
+				mes "[" + getarg(0) + "]";
 				mes "I completely agree...";
 				mes "I might be a great refiner, but sometimes even I make mistakes.";
 				close;
 			}
 		}
 		if((countitem(.@material) < 1) || (Zeny < .@price)) {
-			mes "["+ .@npc_name$ +"]";
+			mes "[" + getarg(0) + "]";
 			mes "You don't seem to have";
 			mes "enough Zeny or "+getitemname(.@material)+"...";
 			mes "Go get some more. I'll be";
@@ -712,7 +711,7 @@ function	script	refinemain	{
 		// anti-hack
 		if (callfunc("F_IsEquipIDHack", .@part, .@refineitemid) ||
 		    callfunc("F_IsEquipRefineHack", .@part, .@refinerycnt)) {
-			mes "["+ .@npc_name$ +"]";
+			mes "[" + getarg(0) + "]";
 			emotion e_an;
 			mes "Wait a second...";
 			mes "Do you think I'm stupid?!";
@@ -722,7 +721,7 @@ function	script	refinemain	{

 		if(getequippercentrefinery(.@part) <= rand(100)) {
 			failedrefitem .@part;
-			mes "["+ .@npc_name$ +"]";
+			mes "[" + getarg(0) + "]";
 			emotion (!rand(5))?e_cash:e_omg;
 			set .@lose,rand(1,3);
 			if (.@lose == 1) {
@@ -769,7 +768,7 @@ function	script	refinemain	{

 // New Refining Functions ========================
 	if(getequiprefinerycnt(.@part) < .@safe) {
-		mes "["+ .@npc_name$ +"]";
+		mes "[" + getarg(0) + "]";
 		mes "I can refine this to the safe limit or a desired number of times. It's your choice.";
 		next;
 		set .@menu2,select("To the safe limit, please.","I'll decide how many times.","I've changed my mind...");
@@ -781,23 +780,23 @@ function	script	refinemain	{
 		break;
 	case 2:
 		next;
-		mes "["+ .@npc_name$ +"]";
+		mes "[" + getarg(0) + "]";
 		mes "How many times would you like me to refine your item?";
 		next;
 		input .@refinecnt;
 		set .@refinecheck,.@refinecnt + getequiprefinerycnt(.@part);
 		if (.@refinecnt < 1 || .@refinecheck > 10) {
-			mes "["+ .@npc_name$ +"]";
+			mes "[" + getarg(0) + "]";
 			mes "I can't refine this item that many times.";
 			close;
 		}
 		if(.@refinecheck > .@safe) {
 			set .@refinecheck,.@refinecheck - .@safe;
-			mes "["+ .@npc_name$ +"]";
+			mes "[" + getarg(0) + "]";
 			mes "This will try to refine the equipment " + .@refinecheck + " times past the safe limit. Your equipment may be destroyed... is that ok?";
 			next;
 			if(select("Yes...","No...") == 2){
-				mes "["+ .@npc_name$ +"]";
+				mes "[" + getarg(0) + "]";
 				mes "You said so... So be it.";
 				close;
 			}
@@ -805,21 +804,21 @@ function	script	refinemain	{
 		break;
 	case 3:
 		next;
-		mes "["+ .@npc_name$ +"]";
+		mes "[" + getarg(0) + "]";
 		mes "You said so... So be it.";
 		close;
 	}
 	set .@fullprice,.@price * .@refinecnt;
-	mes "["+ .@npc_name$ +"]";
+	mes "[" + getarg(0) + "]";
 	mes "That will cost you " + .@refinecnt + " " + getitemname(.@material) + " and " + .@fullprice + " Zeny. Is that ok?";
 	next;
 	if(select("Yes","No...") == 2){
-		mes "["+ .@npc_name$ +"]";
+		mes "[" + getarg(0) + "]";
 		mes "You said so... So be it.";
 		close;
 	}
 	if(countitem(.@material) < .@refinecnt || Zeny < .@fullprice) {
-		mes "["+ .@npc_name$ +"]";
+		mes "[" + getarg(0) + "]";
 		mes "Is that all you got? Unfortunately I can't work for you at a lower price. Try putting yourself in my shoes.";
 		close;
 	}
@@ -827,12 +826,12 @@ function	script	refinemain	{
 	delitem .@material,.@refinecnt;
 	while(.@refinecnt){
 		if (getequipisequiped(.@part) == 0) {
-			mes "["+ .@npc_name$ +"]";
+			mes "[" + getarg(0) + "]";
 			mes "Look here... you don't have any items on...";
 			close;
 		}
 		if (getequipid(.@part) != .@refineitemid || (.@menu2 == 1 && getequippercentrefinery(.@part) < 100)) {
-			mes "["+ .@npc_name$ +"]";
+			mes "[" + getarg(0) + "]";
 			mes "Clang... No, but did you imagine I could be so stupid?!";
 			mes "You changed it...";
 			mes "Get out before I stun you with my Hammer!!";
@@ -842,7 +841,7 @@ function	script	refinemain	{
 		if(.@menu2 == 2 && getequippercentrefinery(.@part) <= rand(100)) {
 			failedrefitem .@part;
 			emotion e_omg;
-			mes "["+ .@npc_name$ +"]";
+			mes "[" + getarg(0) + "]";
 			mes "WAHHHH!!! I'm so sorry... I warned you this could happen...";
 			set .@refinecnt,.@refinecnt - 1;
 			if(.@refinecnt == 0) close;
@@ -857,7 +856,7 @@ function	script	refinemain	{
 		set .@refinecnt,.@refinecnt - 1;
 		next;
 	}
-	mes "["+ .@npc_name$ +"]";
+	mes "[" + getarg(0) + "]";
 	mes "All finished... Come again soon.";
 	close;
 }
@@ -904,8 +903,7 @@ function	script	phramain	{
 		mes "- after you lose some weight. -";
 		close;
 	}
-	.@npc_name$ = getarg(0);
-	mes "["+ .@npc_name$ +"]";
+	mes "[" + getarg(0) + "]";
 	mes "I sell 2 kinds of Metal";
 	mes "for tempering weaponry.";
 	mes "I have ^007777Phracon^000000 for Level 1";
@@ -922,26 +920,26 @@ function	script	phramain	{
 		set .@price,1000;
 		break;
 	case 3:
-		mes "["+ .@npc_name$ +"]";
+		mes "[" + getarg(0) + "]";
 		mes "Other metals?";
 		mes "Well, you'll need special metals to upgrade higher level weapons, or any kind of armor. But you know, Oridecon and Elunium is really";
 		mes "hard to just find...";
 		close;
 	}
-	mes "["+ .@npc_name$ +"]";
+	mes "[" + getarg(0) + "]";
 	mes "So how many do you wish to buy?";
 	mes "If you don't want any, please enter the number, '0.'";
 	next;
 	while(1) {
 		input .@input;
 		if (.@input == 0) {
-			mes "["+ .@npc_name$ +"]";
+			mes "[" + getarg(0) + "]";
 			mes "The deal has";
 			mes "been cancelled.";
 			close;
 		}
 		else if (.@input < 0 || .@input > 500) {
-			mes "["+ .@npc_name$ +"]";
+			mes "[" + getarg(0) + "]";
 			mes "Alright, you can";
 			mes "puchase up to 500.";
 			mes "No more than that,";
@@ -954,7 +952,7 @@ function	script	phramain	{
 	}
 	set .@sell,.@input * .@price;
 	if (Zeny < .@sell) {
-		mes "["+ .@npc_name$ +"]";
+		mes "[" + getarg(0) + "]";
 		mes "Err...";
 		mes "You don't have";
 		mes "enough Zeny to buy";
@@ -962,14 +960,14 @@ function	script	phramain	{
 		close;
 	}
 	if (checkweight(.@material,.@input) == 0) {
-		mes "["+ .@npc_name$ +"]";
+		mes "[" + getarg(0) + "]";
 		mes "Hmm...";
 		mes "I can't give you anything if you don't have enough room in your inventory. Why don't you put your extra things in Kafra Storage and try again?";
 		close;
 	}
 	getitem .@material,.@input;
 	set Zeny, Zeny-.@sell;
-	mes "["+ .@npc_name$ +"]";
+	mes "[" + getarg(0) + "]";
 	mes "Here you are!";
 	mes "Thank you for";
 	mes "your patronage.";
@@ -1018,8 +1016,7 @@ function	script	orimain	{
 		mes "- after you lose some weight. -";
 		close;
 	}
-	.@npc_name$ = getarg(0);
-	mes "["+ .@npc_name$ +"]";
+	mes "[" + getarg(0) + "]";
 	mes "I can purify your";
 	mes "Rough Oridecons or";
 	mes "Rough Eluniums. I'll need";
@@ -1031,14 +1028,14 @@ function	script	orimain	{
 		if (countitem(756) > 4) {
 			delitem 756,5;  //Oridecon_Stone
 			getitem 984,1; // Oridecon
-			mes "["+ .@npc_name$ +"]";
+			mes "[" + getarg(0) + "]";
 			mes "Here's your Oridecon.";
 			mes "You're welcome to come";
 			mes "back whenever you want.";
 			close;
 		}
 		else {
-			mes "["+ .@npc_name$ +"]";
+			mes "[" + getarg(0) + "]";
 			mes "You're kidding me, right?";
 			mes "I just told you that I need 5 Rough Oridecons to make a pure Oridecon.";
 			close;
@@ -1047,31 +1044,31 @@ function	script	orimain	{
 		if (countitem(757) > 4) {
 			delitem 757,5;  //Elunium_Stone
 			getitem 985,1; // Elunium
-			mes "["+ .@npc_name$ +"]";
+			mes "[" + getarg(0) + "]";
 			mes "Here's your Elunium.";
 			mes "You're welcome to come";
 			mes "back whenever you want.";
 			close;
 		}
 		else {
-			mes "["+ .@npc_name$ +"]";
+			mes "[" + getarg(0) + "]";
 			mes "You're kidding me, right?";
 			mes "I just told you that I need 5 Rough Eluniums to make a pure Elunium.";
 			close;
 		}
 	case 3:
-		mes "["+ .@npc_name$ +"]";
+		mes "[" + getarg(0) + "]";
 		mes "Enchanted Stones...?";
 		mes "I've been a stonesmith for 20 years, so I've heard a lot about them. Supposedly, there are";
 		mes "four different kinds.";
 		next;
-		mes "["+ .@npc_name$ +"]";
+		mes "[" + getarg(0) + "]";
 		mes "Each Enchanted Stone possesses one of the following elemental properties: Earth, Wind, Water and Fire.";
 		next;
-		mes "["+ .@npc_name$ +"]";
+		mes "[" + getarg(0) + "]";
 		mes "If someone combines a Enchanted Stone with a weapon while smithing, that weapon will possess the same property as the Stone.";
 		next;
-		mes "["+ .@npc_name$ +"]";
+		mes "[" + getarg(0) + "]";
 		mes "Needless to say, you need to have some smithing skill to produce this kind of elemental weapon.";
 		close;
 	}
@@ -1153,8 +1150,7 @@ sch_gld,340,80,7	script	Repairman#sch_gld	86,{
 //============================================================
 function	script	repairmain	{
 	set .@repairprice,5000;
-	.@npc_name$ = getarg(0);
-	mes "["+ .@npc_name$ +"]";
+	mes "["+getarg(0)+"]";
 	mes "Hey there!";
 	mes "Do you want me";
 	mes "to repair any items?";
@@ -1172,15 +1168,15 @@ function	script	repairmain	{
 		}
 		set .@checkitem,.@checkitem-1;
 		if (!.@checkitem) {
-			mes "["+ .@npc_name$ +"]";
+			mes "["+getarg(0)+"]";
 			mes "Oh wow, this is incredible!";
 			mes "You must take very good care of your things. None of your items are damaged!";
 			next;
-			mes "["+ .@npc_name$ +"]";
+			mes "["+getarg(0)+"]";
 			mes "If everyone is like you, I'm going to be unemployed!! Haha~!";
 			close;
 		}
-		mes "["+ .@npc_name$ +"]";
+		mes "["+getarg(0)+"]";
 		mes "Hmm...";
 		mes "Let's see...";
 		mes "Out of all your items,";
@@ -1188,13 +1184,13 @@ function	script	repairmain	{
 		mes "Would you like to repair?";
 		next;
 		set .@totalcost,.@repairprice*.@checkitem;
-		mes "["+ .@npc_name$ +"]";
+		mes "["+getarg(0)+"]";
 		mes "Each repair costs " + .@repairprice + " Zeny. So to repair all your damaged items would cost " + .@totalcost + " Zeny! Would you like to repair the items?";
 		next;
 		switch(select("Yes:No")) {
 		case 1:
 			if (Zeny < .@totalcost) {
-				mes "["+ .@npc_name$ +"]";
+				mes "["+getarg(0)+"]";
 				mes "Whoa whoa...";
 				mes "Check your wallet before you receive the repair bill! I can't repair anything because you don't have enough Zeny.";
 				close;
@@ -1213,22 +1209,22 @@ function	script	repairmain	{
 					repair(.@checkitem);
 					set .@checkitem,.@checkitem-1;
 				}
-				mes "["+ .@npc_name$ +"]";
+				mes "["+getarg(0)+"]";
 				mes "Okay! All done. Now, try to be a little more careful. Items have lives too you know.";
 				close;
 			}
 			else {
-				mes "["+ .@npc_name$ +"]";
+				mes "["+getarg(0)+"]";
 				mes "Mmm? Something's wrong. Wait... Equip the items you need to repair and then come back to me.";
 				close;
 			}
 		case 2:
-			mes "["+ .@npc_name$ +"]";
+			mes "["+getarg(0)+"]";
 			mes "Well, it's no skin off my nose, but it's not good to leave items damaged. You should get them repaired as soon as possible!";
 			close;
 		}
 	case 2:
-		mes "["+ .@npc_name$ +"]";
+		mes "["+getarg(0)+"]";
 		mes "Hohoho...";
 		mes "You don't have";
 		mes "any business with me";
--- a/npc/merchants/socket_enchant.txt
+++ b/npc/merchants/socket_enchant.txt
@@ -247,19 +247,15 @@
 }

 function	script	Func_Socket	{
-	.@item_id = getarg(0);
-	.@zeny_req = getarg(4);
-	setarray .@item_req[0], getarg(5), getarg(7,0);
-	setarray .@req_amount[0], getarg(6), getarg(8,0);

 	disable_items;
 	mes "[Seiyablem]";
-	mes "You want to add a Slot to a "+ getitemname(.@item_id) +"?";
-	mes "Alright, please bring me ^FF0000"+ .@req_amount[0] +" "+ getitemname(.@item_req[0]) + (.@req_amount[0] > 1 && .@item_req[0] != 999 ? "s":"") +"^000000, "+ (.@item_req[1] != 0 && .@req_amount[1] != 0 ? ("^FF0000"+ .@req_amount[1] +" "+ getitemname(.@item_req[1]) + (.@req_amount[1] > 1 && .@item_req[1] != 999 ? "s":"") + "^000000 ") : "") + "and my ^FF0000" + (.@zeny_req >= 1000 ? (.@zeny_req /1000 +",000") : .@zeny_req) +",000 zeny^000000 service fee.";
-	mes "Ah, and don't forget to bring that "+ getitemname(.@item_id) +"!";
+	mes "You want to add a Slot to a " + getitemname(getarg(0)) + "?";
+	mes "Alright, please bring me ^FF0000" + getarg(6) + " " + getitemname(getarg(5)) + (getarg(6) > 1 && getarg(5) != 999 ? "s":"") + "^000000, " + (getarg(7,0) != 0 && getarg(8,0) != 0 ? ("^FF0000" + getarg(8,0) + " " + getitemname(getarg(7,0)) + (getarg(8,0) > 1 && getarg(7,0) != 999 ? "s":"") + "^000000 ") : "") + "and my ^FF0000" + (getarg(4) >= 1000 ? (getarg(4)/1000 + ",000") : getarg(4)) + ",000 zeny^000000 service fee.";
+	mes "Ah, and don't forget to bring that " + getitemname(getarg(0)) + "!";
 	next;
 	mes "[Seiyablem]";
-	if (getiteminfo(.@item_id,5) == 2) // EQP_HAND_R = 2, it's a weapon
+	if (getiteminfo(getarg(0),5)&2) // EQP_HAND_R = 2, it's a weapon
 	{
 		mes "I can try to add a slot now if you have the required items and zeny.";
 		mes "However, you should know that there's a chance that I might fail.";
@@ -281,7 +277,7 @@ function	script	Func_Socket	{
 	switch(select("Attempt Slot Addition:Cancel"))
 	{
 		case 1:
-			if ((Zeny >= .@zeny_req*1000) && countitem(.@item_req[0]) >= .@req_amount[0] && countitem(getarg(7,512)) >= .@req_amount[1] && countitem(.@item_id) > 0)// if there's no getarg(7) and getarg(8) provided, check itemcount against 0 (we still need a valid item ID though)
+			if ((Zeny >= getarg(4)*1000) && (countitem(getarg(5)) >= getarg(6)) && (countitem(getarg(7,512)) >= getarg(8,0)) && (countitem(getarg(0)) > 0)) // if there's no getarg(7) and getarg(8) provided, check itemcount against 0 (we still need a valid item ID though)
 			{
 				mes "[Seiyablem]";
 				mes "Alright then, let the work begin!";
@@ -294,11 +290,11 @@ function	script	Func_Socket	{
 					mes "[Seiyablem]";
 					mes "Great, it seems to be successful.";
 					mes "It looks pretty well done. Congratulations!";
-					delitem .@item_id,1;
-					delitem .@item_req[0],.@req_amount[0];
-					if (.@item_req[1] != 0 && .@req_amount[1] != 0)
-						delitem .@item_req[1],.@req_amount[1];
-					Zeny = Zeny - .@zeny_req *1000;
+					delitem getarg(0),1;
+					delitem getarg(5),getarg(6);
+					if (getarg(7,0) != 0 && getarg(8,0) != 0)
+						delitem getarg(7),getarg(8);
+					set Zeny, Zeny - getarg(4)*1000;
 					getitem getarg(1),1;
 					next;
 					mes "[Seiyablem]";
@@ -313,11 +309,11 @@ function	script	Func_Socket	{
 					mes "However, I am completely innocent.";
 					mes "This is your luck, and it is destined by god, okay?";
 					mes "Don't be so disappointed, and try next time.";
-					delitem .@item_id,1;
-					delitem .@item_req[0],.@req_amount[0];
-					if (.@item_req[1] != 0 && .@req_amount[1] != 0)
-						delitem .@item_req[1],.@req_amount[1];
-					Zeny = Zeny - .@zeny_req *1000;
+					delitem getarg(0),1;
+					delitem getarg(5),getarg(6);
+					if (getarg(7,0) != 0 && getarg(8,0) != 0)
+						delitem getarg(7),getarg(8);
+					set Zeny, Zeny - getarg(4)*1000;
 					next;
 					mes "[Seiyablem]";
 					mes "I wish you good luck next time!";
--- a/npc/merchants/socket_enchant2.txt
+++ b/npc/merchants/socket_enchant2.txt
@@ -386,39 +386,35 @@ prt_in,22,60,6	duplicate(SocketEnchant2)	Leablem#prt	86
 moc_ruins,154,86,3	duplicate(SocketEnchant2)	Leablem#moc	86

 function	script	Func_Socket2	{
-	.@item_id = getarg(0);
-	.@zeny_req = getarg(4);
-	setarray .@item_req[0], getarg(5), getarg(7,0);
-	setarray .@req_amount[0], getarg(6), getarg(8,0);

 	disable_items;
 	mes "[Leablem]";
-	if (.@item_req[1] != 0 && .@req_amount[1] != 0)
+	if(getarg(7,0) != 0 && getarg(8,0) != 0)
 	{
-		mes getitemname(.@item_id) +"... Okay, then you need to bring me";
-		mes "^FF0000"+ (.@zeny_req >= 1000 ? (.@zeny_req /1000 +",000") : .@zeny_req) +",000 zeny as service charge,";
-		mes "^FF0000"+ .@req_amount[0] +"ea "+ getitemname(.@item_req[0]) +" and "+ .@req_amount[1] +"ea "+ getitemname(.@item_req[1]) +".";
-		mes "^FF0000Of course, you need a "+ getitemname(.@item_id) +".^000000";
+		mes getitemname(getarg(0)) + "... Okay, then you need to bring me";
+		mes "^FF0000" + (getarg(4) >= 1000 ? (getarg(4)/1000 + ",000") : getarg(4)) + ",000 zeny as service charge,";
+		mes "^FF0000" + getarg(6) + "ea " + getitemname(getarg(5)) + " and " + getarg(8) + "ea " + getitemname(getarg(7)) + ".";
+		mes "^FF0000Of course, you need a " + getitemname(getarg(0)) + ".^000000";
 	}
 	else
 	{
-		mes getitemname(.@item_id) +"? Okay, then you need to bring me";
-		mes "^FF0000"+ (.@zeny_req >= 1000 ? (.@zeny_req/1000 +",000") : .@zeny_req) +",000 zeny as service charge and "+ .@req_amount[0] +" "+ getitemname(.@item_req[0]) + (.@req_amount[0] > 1 && .@item_req[0] != 999 ? "s":"") +" as the requirement.";
-		mes "^FF0000Of course, don't forget to bring me a "+ getitemname(.@item_id) +".";
+		mes getitemname(getarg(0)) + "? Okay, then you need to bring me";
+		mes "^FF0000" + (getarg(4) >= 1000 ? (getarg(4)/1000 + ",000") : getarg(4)) + ",000 zeny as service charge and " + getarg(6) + " " + getitemname(getarg(5)) + (getarg(6) > 1 && getarg(5) != 999 ? "s":"") + " as the requirement.";
+		mes "^FF0000Of course, don't forget to bring me a " + getitemname(getarg(0)) + ".";
 		mes "^FF0000You should have all items.^000000";
 	}
 	next;
 	mes "[Leablem]";
 	mes "Did you already bring all of them?";
 	mes "For your information, if you fail to create a slot,";
-	mes "you will lose all the item requirement as well as the target "+ (getiteminfo(.@item_id,5) == 2 ? "weapon" : "armor") +".";// EQP_HAND_R = 2, it's a weapon, otherwise armor
-	mes "Also remember, if the "+ (getiteminfo(.@item_id,5) == 2 ? "weapon" : "armor") +" has been upgraded, and has been inserted with a card,";
+	mes "you will lose all the item requirement as well as the target " + (getiteminfo(getarg(0),5)&2 ? "weapon" : "armor") + "."; // EQP_HAND_R = 2, it's a weapon, otherwise armor
+	mes "Also remember, if the " + (getiteminfo(getarg(0),5)&2 ? "weapon" : "armor") + " has been upgraded, and has been inserted with a card,";
 	mes "you will lose them even if you succeed in creating a slot.";
 	next;
 	switch(select("Ask for slot creation.:Try next time."))
 	{
 		case 1:
-			if ((Zeny >= .@zeny_req*1000) && countitem(.@item_req[0]) >= .@req_amount[0] && countitem(getarg(7,512)) >= .@req_amount[1] && countitem(.@item_id) > 0)// if there's no .@req_amount[0] and .@req_amount[1] provided, check itemcount against 0 (we still need a valid item ID though)
+			if ((Zeny >= getarg(4)*1000) && (countitem(getarg(5)) >= getarg(6)) && (countitem(getarg(7,512)) >= getarg(8,0)) && (countitem(getarg(0)) > 0)) // if there's no getarg(7) and getarg(8) provided, check itemcount against 0 (we still need a valid item ID though)
 			{
 				mes "[Leablem]";
 				mes "Alright then, let the work begin!";
@@ -431,11 +427,11 @@ function	script	Func_Socket2	{
 					mes "[Leablem]";
 					mes "Great, it seems to be successful.";
 					mes "It looks pretty well done. Congratulations!";
-					delitem .@item_id,1;
-					delitem .@item_req[0],.@req_amount[0];
-					if (.@item_req[1] != 0 && .@req_amount[1] != 0)
-						delitem .@item_req[1],.@req_amount[1];
-					Zeny = Zeny - .@zeny_req *1000;
+					delitem getarg(0),1;
+					delitem getarg(5),getarg(6);
+					if (getarg(7,0) != 0 && getarg(8,0) != 0)
+						delitem getarg(7),getarg(8);
+					set Zeny, Zeny - getarg(4)*1000;
 					getitem getarg(1),1;
 					next;
 					mes "[Leablem]";
@@ -451,11 +447,11 @@ function	script	Func_Socket2	{
 					mes "This is your luck, and it is destined by god, okay?";
 					mes "Don't be so disappointed,";
 					mes "and try next time.";
-					delitem .@item_id,1;
-					delitem .@item_req[0],.@req_amount[0];
-					if (.@item_req[1] != 0 && .@req_amount[1] != 0)
-						delitem .@item_req[1],.@req_amount[1];
-					Zeny = Zeny - .@zeny_req *1000;
+					delitem getarg(0),1;
+					delitem getarg(5),getarg(6);
+					if (getarg(7,0) != 0 && getarg(8,0) != 0)
+						delitem getarg(7),getarg(8);
+					set Zeny, Zeny - getarg(4)*1000;
 					next;
 					mes "[Leablem]";
 					mes "See you again, buddy!";
--- a/npc/other/arena/arena_point.txt
+++ b/npc/other/arena/arena_point.txt
@@ -155,15 +155,13 @@ S_ExchangePoints:
 		mes "Thank you for your patronage.";
 		close;
 	}
-	.@track_point = getarg(1);
-	if (tt_point >= .@track_point) {
-		.@arena_point = getarg(2);
+	if (tt_point >= getarg(1)) {
 		mes "[Arena Point Manager]";
 		mes "" + strcharinfo(0) + ",";
-		mes "you've converted "+ .@track_point +" Track";
-		mes "Points into "+ .@arena_point +" Arena Point.";
-		tt_point = tt_point - .@track_point;
-		arena_point = arena_point + .@arena_point;
+		mes "you've converted "+getarg(1)+" Track";
+		mes "Points into "+getarg(2)+" Arena Point.";
+		set tt_point,tt_point-getarg(1);
+		set arena_point,arena_point+getarg(2);
 		next;
 		mes "[Arena Point Manager]";
 		mes "" + strcharinfo(0) + ",";
--- a/npc/other/arena/arena_room.txt
+++ b/npc/other/arena/arena_room.txt
@@ -989,13 +989,9 @@ sec_in02,76,176,5	script	Live Broadcast#arena	802,{
 }

 function	script	Func_Are_Rew	{
-	.@item_id = getarg(0);
-	.@amount = getarg(1);
-	.@arena_point = getarg(2);
-
 	mes "[Givu]";
-	mes "Would you like to exchange your arena points with "+ getitemname(.@item_id) +"?";
-	mes "You can exchange ^3131FF"+ .@arena_point +" arena points with "+ .@amount +" "+ getitemname(.@item_id) +"^000000.";
+	mes "Would you like to exchange your arena points with "+getitemname(getarg(0))+"?";
+	mes "You can exchange ^3131FF"+getarg(2)+" arena points with "+getarg(1)+" "+getitemname(getarg(0))+"^000000.";
 	mes "If you wish to cancel, please enter 0. If you don't, please enter how many ^3131FFtimes^000000 of arena points you wish to spend.";
 	next;
 	input .@reward;
@@ -1008,14 +1004,14 @@ function	script	Func_Are_Rew	{
 		mes "You have exceeded the maximum capacity.";
 		close;
 	}
-	if (arena_point < .@reward * .@arena_point) {
+	if (arena_point < .@reward * getarg(2)) {
 		mes "[Givu]";
 		mes "You do not have enough arena points.";
 		mes "Please check the total amount of arena points you have.";
 		close;
 	}
-	arena_point = arena_point - (.@reward * .@arena_point);
-	getitem .@item_id,.@reward * .@amount;
+	set arena_point, arena_point - (.@reward * getarg(2));
+	getitem getarg(0),.@reward * getarg(1);
 	mes "[Givu]";
 	mes "Thank you, please come again.";
 	close;
--- a/npc/other/auction.txt
+++ b/npc/other/auction.txt
@@ -41,8 +41,7 @@ function	script	F_AuctionWarper	{
 	mes "Auction Hall?";
 	next;
 	if (select("Yes:No") == 1) {
-		.@num = getarg(0);
-		if (.@num == 1 || .@num == 4) {
+		if (getarg(0) == 1 || getarg(0) == 4) {
 			mes "[Auction Hall Guide]";
 			mes "Great! Well then,";
 			mes "I hope you have fun";
@@ -52,7 +51,7 @@ function	script	F_AuctionWarper	{
 			mes "Enjoy your auction.";
 		}
 		close2;
-		switch(.@num) {
+		switch(getarg(0)) {
 		case 1:
 			warp "auction_01",179,53; end;
 		case 2:
--- a/npc/other/hugel_bingo.txt
+++ b/npc/other/hugel_bingo.txt
@@ -860,13 +860,12 @@ function	script	Func_Bingo	{
 }

 function	script	Func_BingoResult	{
-	.@num = getarg(0);
-	mapannounce "que_bingo","Eukran: The "+ callfunc("F_GetNumSuffix",.@num) +" number is "+ $bingo[.@num - 1] +". Please check your Bingo Plate.",4,0xFFAB54;
-	enablenpc .@num +"a#bingo";
-	enablenpc .@num +"b#bingo";
-	enablenpc .@num +"c#bingo";
-	enablenpc .@num +"d#bingo";
-	enablenpc .@num +"e#bingo";
+	mapannounce "que_bingo","Eukran: The "+callfunc("F_GetNumSuffix",getarg(0))+" number is "+$bingo[getarg(0) - 1]+". Please check your Bingo Plate.",4,0xFFAB54;
+	enablenpc getarg(0)+"a#bingo";
+	enablenpc getarg(0)+"b#bingo";
+	enablenpc getarg(0)+"c#bingo";
+	enablenpc getarg(0)+"d#bingo";
+	enablenpc getarg(0)+"e#bingo";
 	set $@bingoresult, $@bingoresult + 1;
 	end;
 }
--- a/npc/other/pvp.txt
+++ b/npc/other/pvp.txt
@@ -286,10 +286,9 @@ payon_in01,140,53,4	duplicate(gkut)	Gate Keeper#gke5	83
 //callfunc "F_PVP_FSRS"{,<min_lvl>,<max_lvl>};
 function	script	F_PVP_FSRS	{
 	if (getargcount()) {
-		setarray .@lvl[0], getarg(0), getarg(1);
-		if (BaseLevel < .@lvl[0] || BaseLevel > .@lvl[1]) {
+		if (BaseLevel < getarg(0) || BaseLevel > getarg(1)) {
 			mes "[PVP Fight Square Reception Staff]";
-			mes "Sorry, but you base level has to be between LV "+ .@lvl[0] +" and LV "+ .@lvl[1] +".";
+			mes "Sorry, but you base level has to be between LV "+getarg(0)+" and LV "+getarg(1)+".";
 			close;
 		}
 	}
--- a/npc/other/turbo_track.txt
+++ b/npc/other/turbo_track.txt
@@ -400,8 +400,7 @@ OnInit:
 	end;
 	
 	function	RName	{
-		.@string$ = getarg(0);
-		.@s = ( getstrlen(.@string$) > 2 ? substr(.@string$,1,2) : charat(.@string$,getstrlen(.@string$)-1) );
+		set .@s,(getstrlen(getarg(0)) > 2)?(substr(getarg(0),1,2)):(charat(getarg(0),getstrlen(getarg(0))-1));
 		set .@rn$,((compare(strnpcinfo(4),"_e_"+.@s))?"Expert mode":"Normal mode")+" - "+.@s+" person";
 		return .@rn$;
 	}
@@ -2530,8 +2529,7 @@ OnTimer71000:
 	end;
 	
 	function	RName	{
-		.@string$ = getarg(0);
-		.@s = ( getstrlen(.@string$) > 2 ? substr(.@string$,1,2) : charat(.@string$,getstrlen(.@string$)-1) );
+		set .@s,(getstrlen(getarg(0)) > 2)?(substr(getarg(0),1,2)):(charat(getarg(0),getstrlen(getarg(0))-1));
 		set .@rn$,((compare(strnpcinfo(4),"_e_"+.@s))?"Expert mode":"Normal mode")+" - "+.@s+" person";
 		return .@rn$;
 	}
--- a/npc/pre-re/mobs/dungeons/lhz_dun.txt
+++ b/npc/pre-re/mobs/dungeons/lhz_dun.txt
@@ -281,7 +281,7 @@ OnSummon:
 	case 6: set .@x,175;	set .@y,137;	break;
 	}
 	set .@mob,rand(1646,1651);
-	monster "lhz_dun03",.@x,.@y,strmobinfo(1,.@mob),.@mob,1,"summon_boss_lt::OnLhzMvPDead";
+	monster "lhz_dun03",.@x,.@y,strmobinfo(1,.@mob),.@mob,1,"summon_boss_lt::OnMyMvPDead";

 	// Select Coordinates to summon a random 99 on
 	switch(rand(1,6)) {
@@ -293,15 +293,15 @@ OnSummon:
 	case 6: set .@x2,139;	set .@y2,259;	break;
 	}
 	set .@mob2,rand(1640,1645);
-	monster "lhz_dun03",.@x2,.@y2,strmobinfo(1,.@mob2),.@mob2,1,"summon_boss_lt::OnMy99Dead";
+	monster "lhz_dun03",.@x2,.@y2,strmobinfo(1,.@mob2),.@mob2,1,"summon_boss_lt::OnMVP";
 	end;

-OnLhzMvPDead:
-	killmonster "lhz_dun03","summon_boss_lt::OnMy99Dead";
+OnMyMvPDead:
+	killmonster "lhz_dun03","summon_boss_lt::OnMVP";
 	initnpctimer;
 	end;

 //Required to keep from erroring
-OnMy99Dead:
+OnMVP:
 	end;
 }
--- a/npc/pre-re/scripts_jobs.conf
+++ b/npc/pre-re/scripts_jobs.conf
@@ -14,5 +14,4 @@ npc: npc/pre-re/jobs/1-1/thief.txt
 npc: npc/pre-re/jobs/novice/novice.txt

 // ------------------------ Skill Quests ------------------------
-npc: npc/pre-re/quests/skills/swordman_skills.txt
-npc: npc/quests/skills/novice_skills.txt
+npc: npc/pre-re/quests/skills/swordman_skills.txt
--- a/npc/quests/bard_quest.txt
+++ b/npc/quests/bard_quest.txt
@@ -1117,9 +1117,8 @@ S_StorySong:
 		goto L_End;

 	case 2:
-		.@num = getarg(0);
 		mes "[Errende]";
-		if (.@num < 3)
+		if(getarg(0) < 3)
 			mes "You recognize my talent, so you deserve to listen to my songs! Now, what would you like to hear? I can play anything you want, you know.";
 		else
 			mes "At last, I've met someone who recognizes my talent! You deserve to listen to my songs! Now, what would you like to hear? I can play anything you want, you know.";
@@ -1161,7 +1160,7 @@ S_StorySong:
 			mes "Okay, here we go~";
 			next;
 			//for 3 and 4 variants, we need higher chance
-			if (.@num == 3 || .@num == 4)
+			if(getarg(0) == 3 || getarg(0) == 4)
 				set .@random,rand(1,5);
 			else
 				set .@random,rand(1,3);
@@ -1201,7 +1200,7 @@ S_StorySong:
 				mes "and your spirit will be";
 				mes "led to Valhalla.^000000";
 				//Expanded version for 2nd variant
-				if (.@num == 2){
+				if(getarg(0) == 2){
 					next;
 					mes "[Errende]";
 					mes "...";
@@ -1252,7 +1251,7 @@ S_StorySong:

 			} else {
 				// For 3 and 4 cases we set more chance earlier on .@random
-				if (.@num == 3 || .@num == 4){
+				if(getarg(0) == 3 || getarg(0) == 4){
 					mes "[Errende]";
 					if (Sex)
 						mes "Heroic warrior,";
--- a/npc/quests/cooking_quest.txt
+++ b/npc/quests/cooking_quest.txt
@@ -2061,11 +2061,10 @@ prt_castle,45,35,5	script	Madeleine Chu#cook	886,{
 	close;

 S_SellSets:
-	.@item_id = getarg(0);
-	.@item_cost = getiteminfo(.@item_id,0);
-	.@item_weight = getiteminfo(.@item_id,6);
+	set .@item_cost,getiteminfo(getarg(0),0);
+	set .@item_weight,getiteminfo(getarg(0),6);
 	mes "[Madeleine Chu]";
-	mes "How many "+ (.@item_id == 12125 ? "Outdoor":"Indoor");
+	mes "How many " + (getarg(0)==12125 ? "Outdoor":"Indoor");
 	mes "Cooking Kits would";
 	mes "you like to buy? If you";
 	mes "want to cancel, please";
@@ -2077,7 +2076,7 @@ S_SellSets:
 			mes "[Madeleine Chu]";
 			mes "You've changed your";
 			mes "mind? Well, if you need";
-			mes "to buy "+ getitemname(.@item_id);
+			mes "to buy "+getitemname(getarg(0));
 			mes "Kits later, just come back";
 			mes "to me at anytime, alright?";
 			close;
@@ -2086,7 +2085,7 @@ S_SellSets:
 			mes "[Madeleine Chu]";
 			mes "Oh, I'm sorry, but";
 			mes "I don't sell more than";
-			mes "100 "+ getitemname(.@item_id);
+			mes "100 "+getitemname(getarg(0));
 			mes "at a time, just to be safe.";
 			next;
 		}
@@ -2098,21 +2097,21 @@ S_SellSets:
 		mes "[Madeleine Chu]";
 		mes "Oh, I'm sorry, but you";
 		mes "can't afford this many";
-		mes getitemname(.@item_id);
+		mes getitemname(getarg(0));
 		mes "Please check your zeny";
 		mes "before purchasing my kits~";
 		close;
 	}
-	if (!checkweight(.@item_id,.@sell)) {
+	if (!checkweight(getarg(0),.@sell)) {
 		mes "[Madeleine Chu]";
 		mes "I'm sorry, but you don't";
 		mes "have enough room in your";
 		mes "Inventory for this many";
-		mes getitemname(.@item_id) +"...";
+		mes getitemname(getarg(0))+"...";
 		close;
 	}
 	set Zeny, Zeny-.@total_cost;
-	getitem .@item_id,.@sell;
+	getitem getarg(0),.@sell;
 	mes "[Madeleine Chu]";
 	mes "Here you are~";
 	mes "Best of luck with";
--- a/npc/quests/doomed_swords_quest.txt
+++ b/npc/quests/doomed_swords_quest.txt
@@ -1055,16 +1055,15 @@ S_GetSword:
 		mes "space available. Then, we can finally claim your doomed sword.";
 		close;
 	}
-	.@num = getarg(1);
 	mes "[Huey]";
-	if (.@num == 0) {
+	if (getarg(1) == 0) {
 		mes "Th-that's the Grimtooth!";
 		mes "Ever since I've been taught";
 		mes "the pentagram techniques by";
 		mes "those Dwarves, I've never once";
 		mes "imagined that I'd see that sword. Please use that weapon wisely.";
 	}
-	else if (.@num == 1) {
+	else if (getarg(1) == 1) {
 		mes "I don't believe it!";
 		mes "You... You've been found";
 		mes "worthy of the Mysteltainn?";
@@ -1072,7 +1071,7 @@ S_GetSword:
 		mes "its power overwhelm you.";
 		mes "Wield it only for just ends...";
 	}
-	else if (.@num == 2) {
+	else if (getarg(1) == 2) {
 		mes "Th-that's...!";
 		mes "The Executionier has";
 		mes "chosen you to wield it?";
--- a/npc/quests/first_class/tu_sword.txt
+++ b/npc/quests/first_class/tu_sword.txt
@@ -706,7 +706,6 @@ izlude_in,82,163,3	script	Shurank	733,{
 			set tu_swordman, 5;
 			next;
 		}
-		setquest 8215;
 		mes "[Shurank]";
 		mes "By now, I believe that you know enough about the Increase HP Recovery skill. Next time, I shall teach you what I know about the Provoke skill.";
 		close;
@@ -728,7 +727,6 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Here's a small prize in recognition of your efforts thus far. But don't relax yet! You still have a long way to go before grasping";
 			mes "all of the basics.";
 			set tu_swordman, 4;
-			changequest 8213,8214;
 			if (checkre(3))
 				getexp 97,0;
 			else
@@ -767,7 +765,6 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Here's a little reward for all of your hard work. I hope you realize the importance of using Bash as";
 			mes "you grow stronger.";
 			set tu_swordman, 3;
-			changequest 8212,8213;
 			if (checkre(3))
 				getexp 83,0;
 			else
@@ -782,7 +779,6 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Here's a small prize in recognition of your efforts thus far. But don't relax yet! You still have a long way to go before grasping";
 			mes "all of the basics.";
 			set tu_swordman, 4;
-			changequest 8212,8214;
 			if (checkre(3))
 				getexp 97,0;
 			else
@@ -821,7 +817,6 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Still, for your training efforts, let me give you a humble reward. But remember, we still have more";
 			mes "of the fundamentals to cover!";
 			set tu_swordman, 2;
-			changequest 8211,8212;
 			if (checkre(3))
 				getexp 58,0;
 			else
@@ -854,7 +849,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "[Shurank]";
 			mes "For your efforts and patience, I offer you this small reward. Please take it and grow even stronger...";
 			set tu_swordman, 3;
-			changequest 8211,8213;
+			setquest 8211;
 			if (checkre(3))
 				getexp 83,0;
 			else
@@ -872,7 +867,6 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Here's a small prize in recognition of your efforts thus far. But don't relax yet! You still have a long way to go before grasping";
 			mes "all of the basics.";
 			set tu_swordman, 4;
-			changequest 8211,8214;
 			if (checkre(3))
 				getexp 97,0;
 			else
@@ -936,7 +930,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Still, for your training efforts, let me give you a humble reward. But remember, we still have more";
 			mes "of the fundamentals to cover!";
 			set tu_swordman, 2;
-			setquest 8212;
+			changequest 8211,8212;
 			if (checkre(3))
 				getexp 58,0;
 			else
@@ -962,7 +956,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Still, for your training efforts, let me give you a humble reward. But remember, we still have more";
 			mes "of the fundamentals to cover!";
 			set tu_swordman, 3;
-			setquest 8213;
+			changequest 8212,8213;
 			if (checkre(3))
 				getexp 83,0;
 			else
@@ -980,9 +974,9 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Here's a small prize in recognition of your efforts thus far. But don't relax yet! You still have a long way to go before grasping";
 			mes "all of the basics.";
 			set tu_swordman, 4;
-			// completequest 8211;
-			// completequest 8212;
-			// completequest 8213;
+			completequest 8211;
+			completequest 8212;
+			completequest 8213;
 			setquest 8214;
 			if (checkre(3))
 				getexp 97,0;
--- a/npc/quests/newgears/2006_headgears.txt
+++ b/npc/quests/newgears/2006_headgears.txt
@@ -761,10 +761,9 @@ payon,135,320,3	script	Chungwolmang	97,{
 	close;

 S_MakeMask:
-	.@item_id = getarg(0);
 	mes "[Chungwolmang]";
 	mes "Oh, you have brought everything";
-	mes "to make a "+ getitemname(.@item_id) +". Excellent.";
+	mes "to make a "+getitemname(getarg(0))+". Excellent.";
 	mes "Please give me the materials. I will make the mask right away.";
 	next;
 	if (select("Give him the items.:Don't give him the items.") == 1) {
@@ -787,14 +786,14 @@ S_MakeMask:
 		delitem getarg(1),getarg(2);
 		delitem getarg(3),getarg(4);
 		delitem getarg(5),getarg(6);
-		if (.@item_id == 5169) 
+		if (getarg(0) == 5169) 
 			delitem getarg(7),getarg(8);
-		getitem .@item_id,1;
+		getitem getarg(0),1;
 		set moza_tal,0;
 		mes "[Chungwolmang]";
 		mes "Wow, it was a piece of cake!";
 		mes "You know, I am not an artisan only in title.";
-		mes "Hahaha, here, take your "+ getitemname(.@item_id) +".";
+		mes "Hahaha, here, take your "+getitemname(getarg(0))+".";
 		mes "I hope that you will wear it with pride, hahaha!";
 		next;
 		mes "[Chungwolmang]";
@@ -803,7 +802,7 @@ S_MakeMask:
 		close;
 	}
 	mes "[Chungwolmang]";
-	mes "Err? Don't you want "+ getitemname(.@item_id) +"?";
+	mes "Err? Don't you want "+getitemname(getarg(0))+"?";
 	mes "Alright then...coward.";
 	close;
 }
--- a/npc/quests/quests_13_2.txt
+++ b/npc/quests/quests_13_2.txt
@@ -4470,18 +4470,16 @@ mid_camp,147,256,3	script	Rune Midgarts Magician#1	735,{
 }

 function	script	jewel_13_2	{
-	.@color$ = getarg(0);
 	if (ep13_2_rhea < 5) {
 		mes "- Under a round pile of earth, -";
-		mes "- there's a "+ .@color$ +" Gem -";
+		mes "- there's a "+getarg(0)+" Gem -";
 		mes "- half-buried. -";
 		close;
 	}
 	else if (ep13_2_rhea == 5) {
-		.@num = getarg(1);
-		if (checkquest(8240+.@num) == -1) {
+		if (checkquest(8240+getarg(1)) == -1) {
 			mes "- Under a round pile of earth, -";
-			mes "- there's a "+ .@color$ +" Gem -";
+			mes "- there's a "+getarg(0)+" Gem -";
 			mes "- half-buried. -";
 			next;
 			if(select("Dig out the Gem:Leave it alone")==2) {
@@ -4494,15 +4492,15 @@ function	script	jewel_13_2	{
 			}
 			if (rand(1,4) == 2) {
 				mes "- You dug up a pile of earth -";
-				mes "- and pulled out the "+ .@color$ +" Gem -";
-				setquest 8240+.@num;
-				getitem 7574+.@num,1;
+				mes "- and pulled out the "+getarg(0)+" Gem -";
+				setquest 8240+getarg(1);
+				getitem 7574+getarg(1),1;
 				close;
 			}
 			else {
 				mes "- As you dug up a pile of earth, -";
 				mes "- a Thief Bug attacks you! -";
-				donpcevent "Half-buried Gem#"+ .@num +"::OnDisable";
+				donpcevent "Half-buried Gem#"+getarg(1)+"::OnDisable";
 				next;
 				mes "["+ strcharinfo(0) +"]";
 				mes "What the heck is this?!?!?!";
@@ -4511,13 +4509,13 @@ function	script	jewel_13_2	{
 		}
 		else {
 			mes "- Small pile of earth -";
-			mes "- which you dug up the "+ .@color$ +" Gem -";
+			mes "- which you dug up the "+getarg(0)+" Gem -";
 			close;
 		}
 	}
 	else {
 		mes "- Small pile of earth -";
-		mes "- which you dug up the "+ .@color$ +" Gem -";
+		mes "- which you dug up the "+getarg(0)+" Gem -";
 		close;
 	}
 	end;
--- a/npc/quests/quests_hugel.txt
+++ b/npc/quests/quests_hugel.txt
@@ -27,7 +27,6 @@
 //=     - Juno Remedy Quest
 //= 2.2 Updated RE/Pre-RE EXP. [Euphy]
 //= 2.3 Added questlog support. [Euphy]
-//= 2.4 Fixed quest log for Odin Temple Excavation Quest. [Capuche]
 //============================================================

 // Medicine Quest :: hg_herv
@@ -209,7 +208,7 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 			mes "from... Drawer... H-heeelp me!";
 			mes "Adventurer! H-Heeeeelp~!";
 			set hg_herb,4;
-			// changequest 8055,8056;
+			changequest 8055,8056;
 			close;
 		} else if (hg_herb == 4) {
 			mes "[Allen]";
@@ -7955,7 +7954,7 @@ hu_in01,19,161,0	script	Alex	803,{
 			if (countitem(7511) > 4) {
 				delitem 7511,5; //Rune_Of_Darkness
 				set hg_odin,6; //Old_Blue_Box
-				changequest 11001,11002;
+				changequest 11000,11002;
 				getitem 603,1;
 				mes "[Alex]";
 				mes "Oh! Thank you";
@@ -8333,8 +8332,6 @@ hu_in01,14,11,4	script	Laura	70,{
 		next;
 		select("Yeah, yeah, whatever.:Sure thing.:I s-s-s-suppose...!:Yes, Ma'am!");
 		set hg_odin,17;
-		completequest 11002;
-		setquest 11006;
 		cutin "hu_laura04.bmp",2;
 		mes "[Laura]";
 		mes "Good.";
--- a/npc/quests/quests_juperos.txt
+++ b/npc/quests/quests_juperos.txt
@@ -554,7 +554,6 @@ yuno_in04,190,125,4	script	Scholar	700,{
 }

 function	script	Func_JupHist	{
-	setarray .@arg[0], getarg(0), getarg(1), getarg(2), getarg(3);
 	switch(yuno_hist) {
 	case 4:
 		mes "[Fayruz]";
@@ -578,9 +577,9 @@ function	script	Func_JupHist	{
 		mes "tale eventually comes to an end";
 		mes "and you awaken from the trance,";
 		mes "gently brought back to reality.^000000";
-		delitem .@arg[0],1;
+		delitem getarg(0),1;
 		set yuno_hist,5;
-		jupe_hist = .@arg[1];
+		set jupe_hist,getarg(1);
 		getexp (checkre(3))?10000:100000,0;
 		next;
 		mes "[Fayruz]";
@@ -599,7 +598,7 @@ function	script	Func_JupHist	{
 		mes "then, I'll see you, adventurer~";
 		close;
 	case 5:
-		if (countitem(.@arg[0]) || countitem(.@arg[1]) || countitem(.@arg[2])) {
+		if ((countitem(getarg(0))) || (countitem(getarg(1))) || (countitem(getarg(2)))) {
 			mes "[Fayruz]";
 			mes "Oh, that's unexpected.";
 			mes "This Transparent Plate";
@@ -641,19 +640,19 @@ function	script	Func_JupHist	{
 			mes "I think you'd agree that";
 			mes "it contains a truth about";
 			mes "mankind that can't be ignored.";
-			if (countitem(.@arg[0])) {
-				delitem .@arg[0],1;
-				if (.@arg[0] == 7352) set jupe_hist,jupe_hist +1;
+			if (countitem(getarg(0))) {
+				delitem getarg(0),1;
+				if (getarg(0) == 7352) set jupe_hist,jupe_hist +1;
 				else set jupe_hist,jupe_hist +2;
 			}
-			else if (countitem(.@arg[1])) {
-				delitem .@arg[1],1;
-				if (.@arg[1] == 7353) set jupe_hist,jupe_hist +2;
+			else if (countitem(getarg(1))) {
+				delitem getarg(1),1;
+				if (getarg(1) == 7353) set jupe_hist,jupe_hist +2;
 				else set jupe_hist,jupe_hist +4;
 			}
 			else {
-				delitem .@arg[2],1;
-				if (.@arg[2] == 7354) set jupe_hist,jupe_hist +4;
+				delitem getarg(2),1;
+				if (getarg(2) == 7354) set jupe_hist,jupe_hist +4;
 				else set jupe_hist,jupe_hist +8;
 			}
 			set yuno_hist,6;
@@ -675,7 +674,7 @@ function	script	Func_JupHist	{
 			mes "story with you, "+strcharinfo(0)+".";
 			close;
 		}
-		else if (countitem(.@arg[3])) {
+		else if (countitem(getarg(3))) {
 			mes "[Fayruz]";
 			mes "Oh, this one seems";
 			mes "to have been created";
@@ -690,7 +689,7 @@ function	script	Func_JupHist	{
 			mes "won't be as making progress";
 			mes "as quickly as I had projected.";
 			mes "Please, I'd like you to take this as a token of my gratitude.";
-			delitem .@arg[3],1;
+			delitem getarg(3),1;
 			getitem 644,1;
 			next;
 			mes "[Fayruz]";
@@ -711,7 +710,7 @@ function	script	Func_JupHist	{
 			close;
 		}
 	case 7:
-		if (countitem(.@arg[0]) || countitem(.@arg[1])) {
+		if ((countitem(getarg(0))) || (countitem(getarg(1)))) {
 			mes "[Fayruz]";
 			mes "Is this another";
 			mes "Transparent Plate?";
@@ -768,16 +767,16 @@ function	script	Func_JupHist	{
 			mes "or another. Scary stories are";
 			mes "appealing because we actually";
 			mes "like the strange and grotesque.";
-			if (countitem(.@arg[0])) {
-				delitem .@arg[0],1;
-				if (.@arg[0] == 7352) set jupe_hist,jupe_hist +1;
-				else if (.@arg[0] == 7353) set jupe_hist,jupe_hist +2;
+			if (countitem(getarg(0))) {
+				delitem getarg(0),1;
+				if (getarg(0) == 7352) set jupe_hist,jupe_hist +1;
+				else if (getarg(0) == 7353) set jupe_hist,jupe_hist +2;
 				else set jupe_hist,jupe_hist +4;
 			}
-			else if (countitem(.@arg[1])) {
-				delitem .@arg[1],1;
-				if (.@arg[1] == 7353) set jupe_hist,jupe_hist +2;
-				else if (.@arg[1] == 7354) set jupe_hist,jupe_hist +4;
+			else if (countitem(getarg(1))) {
+				delitem getarg(1),1;
+				if (getarg(1) == 7353) set jupe_hist,jupe_hist +2;
+				else if (getarg(1) == 7354) set jupe_hist,jupe_hist +4;
 				else set jupe_hist,jupe_hist +8;
 			}
 			set yuno_hist,8;
@@ -792,7 +791,7 @@ function	script	Func_JupHist	{
 			mes "to me, alright? See you later~";
 			close;
 		}
-		else if (countitem(.@arg[2]) || countitem(.@arg[3])) {
+		else if ((countitem(getarg(2))) || (countitem(getarg(3)))) {
 			mes "[Fayruz]";
 			mes "Oh, this one seems";
 			mes "to have been created";
@@ -814,8 +813,8 @@ function	script	Func_JupHist	{
 			mes "to compiling my research...";
 			mes "Thank you so much for";
 			mes "your help, "+strcharinfo(0)+".";
-			if (countitem(.@arg[2])) delitem .@arg[2],1;
-			else if (countitem(.@arg[3])) delitem .@arg[3],1;
+			if (countitem(getarg(2))) delitem getarg(2),1;
+			else if (countitem(getarg(3))) delitem getarg(3),1;
 			getitem 644,1;
 			close;
 		}
@@ -829,7 +828,7 @@ function	script	Func_JupHist	{
 			close;
 		}
 	case 9:
-		if (countitem(.@arg[0])) {
+		if (countitem(getarg(0))) {
 			mes "[Fayruz]";
 			mes "Oooh...! This one is";
 			mes "much different than the";
@@ -872,12 +871,12 @@ function	script	Func_JupHist	{
 			mes "feeling of indefatigable";
 			mes "hope and inspiration...";
 			mes "You can make it if you try!^000000";
-			if (.@arg[0] == 7352) set jupe_hist,jupe_hist+1;
-			else if (.@arg[0] == 7353) set jupe_hist,jupe_hist+2;
-			else if (.@arg[0] == 7354) set jupe_hist,jupe_hist+4;
+			if (getarg(0) == 7352) set jupe_hist,jupe_hist+1;
+			else if (getarg(0) == 7353) set jupe_hist,jupe_hist+2;
+			else if (getarg(0) == 7354) set jupe_hist,jupe_hist+4;
 			else set jupe_hist,jupe_hist+8;
 			set yuno_hist,10;
-			delitem .@arg[0],1;
+			delitem getarg(0),1;
 			getexp (checkre(3))?10000:100000,0;
 			next;
 			mes "[Fayruz]";
@@ -889,7 +888,7 @@ function	script	Func_JupHist	{
 			mes "research progress~";
 			close;
 		}
-		else if (countitem(.@arg[1]) || countitem(.@arg[2]) || countitem(.@arg[3])) {
+		else if ((countitem(getarg(1))) || (countitem(getarg(2))) || (countitem(getarg(3)))) {
 			mes "[Fayruz]";
 			mes "Hmm...";
 			mes "This one seems to be created in a similar time";
@@ -907,9 +906,9 @@ function	script	Func_JupHist	{
 			next;
 			mes "[Fayruz]";
 			mes "Now, excuse me. I need to go back to my research.";
-			if (countitem(.@arg[1])) delitem .@arg[1],1;
-			else if (countitem(.@arg[2])) delitem .@arg[2],1;
-			else delitem .@arg[3],1;
+			if (countitem(getarg(1))) delitem getarg(1),1;
+			else if (countitem(getarg(2))) delitem getarg(2),1;
+			else delitem getarg(3),1;
 			getitem 644,1;
 			close;
 		}
--- a/npc/quests/quests_lighthalzen.txt
+++ b/npc/quests/quests_lighthalzen.txt
@@ -22,7 +22,6 @@
 //= 4.9 Fixed incorrect use of 'close'. [Joseph]
 //= 5.0 Updated RE/Pre-RE EXP. [Euphy]
 //= 5.1 Added GM management NPCs. [Euphy]
-//= 5.2 Fixed some quest log issues. [Capuche]
 //============================================================

 // Gangster Alert [Official Conversion]
@@ -5376,8 +5375,7 @@ lhz_in01,27,247,5	script	Representative#li_02	71,{
 		mes "please refer to the Rekenber";
 		mes "Guidebook located to my side.";
 		mes "Thank you and have a nice day.";
-		if (isbegin_quest(2088))
-			changequest 2088,2089;
+		changequest 2088,2089;
 		close;
 	}
 	else {
@@ -8388,7 +8386,7 @@ L_Mission:
 		mes "^3355FFGhalstein^000000 again. It's time";
 		mes "we let you loose, adventurer.";
 		set lhz_boss,43;
-		// completequest 12028;
+		completequest 12028;
 		close2;
 		cutin "",255;
 		end;
@@ -8398,8 +8396,8 @@ L_Mission:
 		mes "[Karl]";
 		mes ".........";
 		mes "............";
-		for(set .@i,12015; .@i < 12028; set .@i,.@i+1) {
-			if (checkquest(.@i) >= 0 && checkquest(.@i) < 2)
+		for(set .@i,12015; .@i<=12028; set .@i,.@i+1) {
+			if (checkquest(.@i) > 0 && checkquest(.@i) < 2)
 				completequest .@i;
 		}
 		close;
@@ -10408,7 +10406,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		next;
 		set lhz_rekenber,22;
 		getexp (checkre(3))?55000:550000,0;
-		completequest 12014;
+		completequest 12013;
 		cutin "lhz_kaz01",2;
 		mes "[Kazien]";
 		mes "Look, I can't have";
@@ -10584,7 +10582,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "for the Rune-Midgarts Kingdom.";
 		next;
 		set lhz_rekenber,12;
-		// changequest 5005,5006;
+		changequest 5005,5006;
 		getexp (checkre(3))?40000:400000,0;
 		cutin "lhz_kaz03",2;
 		mes "[Kazien]";
@@ -10639,7 +10637,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "to me for another job, okay?";
 		next;
 		set lhz_rekenber,8;
-		changequest 12010,12011;
+		changequest 12008,12010;
 		cutin "lhz_kaz01",2;
 		mes "[Kazien]";
 		mes "Don't forget...";
@@ -11070,7 +11068,7 @@ einbroch,55,52,3	script	Laboratory Guard#reken	 852,{
 						mes "I still can't allow you to";
 						mes "enter the laboratory.";
 						set lhz_rekenber,4;
-						// changequest 12008,12010;
+						changequest 12008,12010;
 						close;

 					case 2:
@@ -11429,7 +11427,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "know, embarassing orders...";
 		next;
 		set lhz_rekenber,11;
-		changequest 12013,12014;
+		changequest 12011,12012;
 		cutin "lhz_ryo01",2;
 		mes "[Lyozien]";
 		mes "No? Eh, just meet up with";
@@ -11512,7 +11510,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "at the Airport, and tell him that his orders have safely arrived.";
 		next;
 		set lhz_rekenber,9;
-		changequest 12011,12012;
+		changequest 12010,12011;
 		cutin "lhz_ryo11",2;
 		mes "[Lyozien]";
 		mes "Once you tell Mr. Ahman";
--- a/npc/quests/quests_moscovia.txt
+++ b/npc/quests/quests_moscovia.txt
@@ -1127,21 +1127,18 @@ mosk_ship,101,111,4	script	rudder#ship	HIDDEN_NPC,{
 	end;

 S_Rud1:
-	.@direction = getarg(0);
-	.@monster_setting = getarg(1);
-
 	mes "Which way?";
 	next;
 	setarray .@d$[1],"East","West","South","North";
 	.@j = select(implode(.@d$,":")) -1;
-	if (.@j == .@direction) {
+	if (.@j == getarg(0)) {
 		mes "[Mr. Ibanoff]";
 		mes "Good. Firstly, we should";
-		mes "keep heading "+ strtolower(.@d$[.@direction]) +" this way.";
+		mes "keep heading "+strtolower(.@d$[getarg(0)])+" this way.";
 		mes "When I give the order,";
 		mes "please adjust the rudder again.";
-		if (.@monster_setting == 2) .@r = rand(1,4);
-		if (.@monster_setting == 2 && .@r == 3) {
+		if (getarg(1) == 2) .@r = rand(1,4);
+		if (getarg(1) == 2 && .@r == 3) {
 			next;
 			mes "[Mr. Ibanoff]";
 			mes "Wait! Something has appeared in front of us...";
@@ -1159,15 +1156,15 @@ S_Rud1:
 			else
 				donpcevent "Baehideun3#ship::OnEnable";
 		}
-		mos_whale_edq = (.@monster_setting == 2)?((mos_whale_edq >= 241)?((.@r != 3)?26:25):((.@r != 3)?10:11)):(mos_whale_edq + 1);
+		mos_whale_edq = (getarg(1) == 2)?((mos_whale_edq >= 241)?((.@r != 3)?26:25):((.@r != 3)?10:11)):(mos_whale_edq + 1);
 		close;
 	}
 	mes "[Mr. Ibanoff]";
-	mes "I said that we should go "+ .@d$[.@direction] +"!";
+	mes "I said that we should go "+.@d$[getarg(0)]+"!";
 	mes "You should sail in the right";
-	mes "direction! To the "+ strtolower(.@d$[.@direction]) +"!";
-	if (.@monster_setting >= 1) {
-		.@r = (.@monster_setting == 1)?5:4;
+	mes "direction! To the "+strtolower(.@d$[getarg(0)])+"!";
+	if (getarg(1) >= 1) {
+		.@r = (getarg(1) == 1)?5:4;
 		if (rand(1,.@r) <= 2) {
 			next;
 			mes "[Mr. Ibanoff]";
--- a/npc/quests/quests_rachel.txt
+++ b/npc/quests/quests_rachel.txt
@@ -1831,10 +1831,8 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 			mes "What? I don't understand you...";
 			close;
 		}
-		if (rach_vice == 10) {
-			set rach_vice,11;
-			changequest 8114,8115;
-		}
+		set rach_vice,11;
+		changequest 8114,8115;
 		mes "[Katinshuell]";
 		mes "You happy, now?";
 		mes "Quit trying to pry into";
@@ -2128,10 +2126,8 @@ ra_in01,250,19,3	script	Mr. Shendar	929,{
 		mes "distinctively pleasant";
 		mes "scent about them. I guess";
 		mes "it must be pheremonal?";
-		if (rach_vice == 4) {
-			set rach_vice,5;
-			changequest 8108,8109;
-		}
+		set rach_vice,5;
+		changequest 8108,8109;
 		close;
 	}
 	else if (rach_vice == 2) {
@@ -4159,14 +4155,13 @@ L_End:
 	end;

 S_Donate:
-	.@num = getarg(0);
 	cutin "ra_nemma01",2;
 	mes "[Priestess Nemma]";
 	mes "So, " + strcharinfo(0) + "...";
 	mes "I just want to make sure:";
 	mes "You want to donate "+getarg(1);
-	mes "zeny, and receive "+ .@num +" Lottery";
-	if (.@num == 1) mes "Ticket. Is that correct?";
+	mes "zeny, and receive "+getarg(0)+" Lottery";
+	if(getarg(0) == 1) mes "Ticket. Is that correct?";
 	else mes "Tickets. Is that correct?";
 	next;
 	if (select("No:Yes") == 1) {
@@ -4179,8 +4174,8 @@ S_Donate:
 		mes "generous and rewards the patient!";
 		return;
 	}
-	if (Zeny >= .@num*50000) {
-		if (!checkweight(7570,.@num)) {
+	if (Zeny >= getarg(0)*50000) {
+		if (!checkweight(7570,getarg(0))) {
 			cutin "ra_nemma02",2;
 			mes "[Priestess Nemma]";
 			mes "I can scarcely believe it...";
@@ -4199,9 +4194,9 @@ S_Donate:
 			mes "donate if you can, okay?";
 			return;
 		}
-		$rachel_donate = $rachel_donate + .@num;
-		getitem 7570,.@num;// Temple_Lottery_Ticket
-		Zeny = Zeny - .@num *50000;
+		set $rachel_donate,$rachel_donate+getarg(0);
+		getitem 7570,getarg(0); //Temple_Lottery_Ticket
+		set Zeny, Zeny-getarg(0)*50000;
 		set ra_have_donated,1;
 		if ($rachel_donate > 9999) {
 			cutin "ra_nemma03",2;
@@ -4237,7 +4232,7 @@ S_Donate:
 	else {
 		mes "[Priestess Nemma]";
 		mes "I'm sorry, but you have";
-		mes "less than "+ (.@num *50000) +" zeny...";
+		mes "less than "+@Donate$+" zeny...";
 		mes "I know it's asking a lot,";
 		mes "but those are the rules that";
 		mes "I've been told to follow, so...";
--- a/npc/quests/the_sign_quest.txt
+++ b/npc/quests/the_sign_quest.txt
@@ -11967,43 +11967,42 @@ function	script	F_SignSeal	{
 		mes "more powerful to break the seal...^000000";
 		close;
 	}
-	.@r = getarg(0);
 	if (countitem(1558) || countitem(1963)) {
-		if (.@r < 980) F_SealFail; }
+		if (getarg(0) < 980) F_SealFail; }
 	else if (countitem(1227) || countitem(1228) || countitem(1240) || countitem(1241) || countitem(1962) || countitem(1813)) {
-		if (.@r < 960) F_SealFail; }
+		if (getarg(0) < 960) F_SealFail; }
 	else if (countitem(1719) || countitem(1130) || countitem(1133) || countitem(1223) || countitem(1229) || countitem(1231) || countitem(1413) || countitem(1814) || countitem(1242)) {
-		if (.@r < 940) F_SealFail; }
+		if (getarg(0) < 940) F_SealFail; }
 	else if (countitem(1131) || countitem(1230) || countitem(1232)) {
-		if (.@r < 920) F_SealFail; }
+		if (getarg(0) < 920) F_SealFail; }
 	else if (countitem(1132) || countitem(1134) || countitem(1233) || countitem(1234) || countitem(1235) || countitem(1414) || countitem(1523) || countitem(1236)) {
-		if (.@r < 900) F_SealFail; }
+		if (getarg(0) < 900) F_SealFail; }
 	else if (countitem(1237) || countitem(1524) || countitem(1525) || countitem(1557) || countitem(1415) || countitem(1964)) {
-		if (.@r < 880) F_SealFail; }
+		if (getarg(0) < 880) F_SealFail; }
 	else if (countitem(1135) || countitem(1140) || countitem(1141) || countitem(1527)) {
-		if (.@r < 860) F_SealFail; }
+		if (getarg(0) < 860) F_SealFail; }
 	else if (countitem(1164) || countitem(1165) || countitem(1467) || countitem(1138) || countitem(1139) || countitem(1224) || countitem(1225) || countitem(1416) || countitem(1526)) {
-		if (.@r < 840) F_SealFail; }
+		if (getarg(0) < 840) F_SealFail; }
 	else if (countitem(1305) || countitem(1720) || countitem(1136) || countitem(1137) || countitem(1166)) {
-		if (.@r < 820) F_SealFail; }
+		if (getarg(0) < 820) F_SealFail; }
 	else if (countitem(1261) || countitem(1528) || countitem(1167)) {
-		if (.@r < 800) F_SealFail; }
+		if (getarg(0) < 800) F_SealFail; }
 	else if (countitem(1364) || countitem(1913)) {
-		if (.@r < 780) F_SealFail; }
+		if (getarg(0) < 780) F_SealFail; }
 	else if (countitem(1170) || countitem(1468) || countitem(1168) || countitem(1169)) {
-		if (.@r < 760) F_SealFail; }
+		if (getarg(0) < 760) F_SealFail; }
 	else if (countitem(1365) || countitem(1366) || countitem(1473)) {
-		if (.@r < 740) F_SealFail; }
+		if (getarg(0) < 740) F_SealFail; }
 	else if (countitem(1367) || countitem(1368) || countitem(1466) || countitem(1469)) {
-		if (.@r < 720) F_SealFail; }
+		if (getarg(0) < 720) F_SealFail; }
 	else if (countitem(1369) || countitem(1470)) {
-		if (.@r < 700) F_SealFail; }
+		if (getarg(0) < 700) F_SealFail; }
 	else if (countitem(1722) || countitem(1471)) {
-		if (.@r < 680) F_SealFail; }
+		if (getarg(0) < 680) F_SealFail; }
 	else if (countitem(1363)) {
-		if (.@r < 660) F_SealFail; }
+		if (getarg(0) < 660) F_SealFail; }
 	else if (countitem(1530)) {
-		if (.@r < 500) F_SealFail; }
+		if (getarg(0) < 500) F_SealFail; }
 	else {
 		mes "^3355FFThe weapon you're holding";
 		mes "right now doesn't look like it has any chance of breaking this seal. You'll definitely need something";
--- a/npc/re/cities/izlude.txt
+++ b/npc/re/cities/izlude.txt
@@ -17,75 +17,75 @@

 // Izlude
 //============================================================
-izlude,197,205,1	duplicate(Sailor_izlude)	Sailor#izlude	4W_SAILOR
-izlude_a,197,205,1	duplicate(Sailor_izlude)	Sailor#izlude_a	4W_SAILOR
-izlude_b,197,205,1	duplicate(Sailor_izlude)	Sailor#izlude_b	4W_SAILOR
-izlude_c,197,205,1	duplicate(Sailor_izlude)	Sailor#izlude_c	4W_SAILOR
-izlude_d,197,205,1	duplicate(Sailor_izlude)	Sailor#izlude_d	4W_SAILOR
+izlude,197,205,1	duplicate(Sailor_izlude)	Sailor#izlude	100
+izlude_a,197,205,1	duplicate(Sailor_izlude)	Sailor#izlude_a	100
+izlude_b,197,205,1	duplicate(Sailor_izlude)	Sailor#izlude_b	100
+izlude_c,197,205,1	duplicate(Sailor_izlude)	Sailor#izlude_c	100
+izlude_d,197,205,1	duplicate(Sailor_izlude)	Sailor#izlude_d	100

-izlude,71,92,2	duplicate(Bonne_izlude)	Bonne#izlude	4_F_01
-izlude_a,71,92,2	duplicate(Bonne_izlude)	Bonne#izlude_a	4_F_01
-izlude_b,71,92,2	duplicate(Bonne_izlude)	Bonne#izlude_b	4_F_01
-izlude_c,71,92,2	duplicate(Bonne_izlude)	Bonne#izlude_c	4_F_01
-izlude_d,71,92,2	duplicate(Bonne_izlude)	Bonne#izlude_d	4_F_01
+izlude,71,92,2	duplicate(Bonne_izlude)	Bonne#izlude	90
+izlude_a,71,92,2	duplicate(Bonne_izlude)	Bonne#izlude_a	90
+izlude_b,71,92,2	duplicate(Bonne_izlude)	Bonne#izlude_b	90
+izlude_c,71,92,2	duplicate(Bonne_izlude)	Bonne#izlude_c	90
+izlude_d,71,92,2	duplicate(Bonne_izlude)	Bonne#izlude_d	90

-izlude,172,215,4	duplicate(Charfri_izlude)	Charfri#izlude	4_F_02
-izlude_a,172,215,4	duplicate(Charfri_izlude)	Charfri#izlude_a	4_F_02
-izlude_b,172,215,4	duplicate(Charfri_izlude)	Charfri#izlude_b	4_F_02
-izlude_c,172,215,4	duplicate(Charfri_izlude)	Charfri#izlude_c	4_F_02
-izlude_d,172,215,4	duplicate(Charfri_izlude)	Charfri#izlude_d	4_F_02
+izlude,172,215,4	duplicate(Charfri_izlude)	Charfri#izlude	91
+izlude_a,172,215,4	duplicate(Charfri_izlude)	Charfri#izlude_a	91
+izlude_b,172,215,4	duplicate(Charfri_izlude)	Charfri#izlude_b	91
+izlude_c,172,215,4	duplicate(Charfri_izlude)	Charfri#izlude_c	91
+izlude_d,172,215,4	duplicate(Charfri_izlude)	Charfri#izlude_d	91

-izlude,174,164,4	duplicate(Cuskoal_izlude)	Cuskoal#izlude	4_F_TELEPORTER
-izlude_a,174,164,4	duplicate(Cuskoal_izlude)	Cuskoal#izlude_a	4_F_TELEPORTER
-izlude_b,174,164,4	duplicate(Cuskoal_izlude)	Cuskoal#izlude_b	4_F_TELEPORTER
-izlude_c,174,164,4	duplicate(Cuskoal_izlude)	Cuskoal#izlude_c	4_F_TELEPORTER
-izlude_d,174,164,4	duplicate(Cuskoal_izlude)	Cuskoal#izlude_d	4_F_TELEPORTER
+izlude,174,164,4	duplicate(Cuskoal_izlude)	Cuskoal#izlude	124
+izlude_a,174,164,4	duplicate(Cuskoal_izlude)	Cuskoal#izlude_a	124
+izlude_b,174,164,4	duplicate(Cuskoal_izlude)	Cuskoal#izlude_b	124
+izlude_c,174,164,4	duplicate(Cuskoal_izlude)	Cuskoal#izlude_c	124
+izlude_d,174,164,4	duplicate(Cuskoal_izlude)	Cuskoal#izlude_d	124

-izlude,85,103,4	duplicate(Dega_izlude)	Dega#izlude	4_M_02
-izlude_a,85,103,4	duplicate(Dega_izlude)	Dega#izlude_a	4_M_02
-izlude_b,85,103,4	duplicate(Dega_izlude)	Dega#izlude_b	4_M_02
-izlude_c,85,103,4	duplicate(Dega_izlude)	Dega#izlude_c	4_M_02
-izlude_d,85,103,4	duplicate(Dega_izlude)	Dega#izlude_d	4_M_02
+izlude,85,103,4	duplicate(Dega_izlude)	Dega#izlude	84
+izlude_a,85,103,4	duplicate(Dega_izlude)	Dega#izlude_a	84
+izlude_b,85,103,4	duplicate(Dega_izlude)	Dega#izlude_b	84
+izlude_c,85,103,4	duplicate(Dega_izlude)	Dega#izlude_c	84
+izlude_d,85,103,4	duplicate(Dega_izlude)	Dega#izlude_d	84

-izlude,140,186,4	duplicate(Kylick_izlude)	Kylick#izlude	4W_M_01
-izlude_a,140,186,4	duplicate(Kylick_izlude)	Kylick#izlude_a	4W_M_01
-izlude_b,140,186,4	duplicate(Kylick_izlude)	Kylick#izlude_b	4W_M_01
-izlude_c,140,186,4	duplicate(Kylick_izlude)	Kylick#izlude_c	4W_M_01
-izlude_d,140,186,4	duplicate(Kylick_izlude)	Kylick#izlude_d	4W_M_01
+izlude,140,186,4	duplicate(Kylick_izlude)	Kylick#izlude	97
+izlude_a,140,186,4	duplicate(Kylick_izlude)	Kylick#izlude_a	97
+izlude_b,140,186,4	duplicate(Kylick_izlude)	Kylick#izlude_b	97
+izlude_c,140,186,4	duplicate(Kylick_izlude)	Kylick#izlude_c	97
+izlude_d,140,186,4	duplicate(Kylick_izlude)	Kylick#izlude_d	97

-izlude,57,159,2	duplicate(Red_izlude)	Red#izlude	4_M_03
-izlude_a,57,159,2	duplicate(Red_izlude)	Red#izlude_a	4_M_03
-izlude_b,57,159,2	duplicate(Red_izlude)	Red#izlude_b	4_M_03
-izlude_c,57,159,2	duplicate(Red_izlude)	Red#izlude_c	4_M_03
-izlude_d,57,159,2	duplicate(Red_izlude)	Red#izlude_d	4_M_03
+izlude,57,159,2	duplicate(Red_izlude)	Red#izlude	85
+izlude_a,57,159,2	duplicate(Red_izlude)	Red#izlude_a	85
+izlude_b,57,159,2	duplicate(Red_izlude)	Red#izlude_b	85
+izlude_c,57,159,2	duplicate(Red_izlude)	Red#izlude_c	85
+izlude_d,57,159,2	duplicate(Red_izlude)	Red#izlude_d	85

-izlude,55,159,2	duplicate(Cebalis_izlude)	Cebalis#izlude	4W_M_02
-izlude_a,55,159,2	duplicate(Cebalis_izlude)	Cebalis#izlude_a	4W_M_02
-izlude_b,55,159,2	duplicate(Cebalis_izlude)	Cebalis#izlude_b	4W_M_02
-izlude_c,55,159,2	duplicate(Cebalis_izlude)	Cebalis#izlude_c	4W_M_02
-izlude_d,55,159,2	duplicate(Cebalis_izlude)	Cebalis#izlude_d	4W_M_02
+izlude,55,159,2	duplicate(Cebalis_izlude)	Cebalis#izlude	98
+izlude_a,55,159,2	duplicate(Cebalis_izlude)	Cebalis#izlude_a	98
+izlude_b,55,159,2	duplicate(Cebalis_izlude)	Cebalis#izlude_b	98
+izlude_c,55,159,2	duplicate(Cebalis_izlude)	Cebalis#izlude_c	98
+izlude_d,55,159,2	duplicate(Cebalis_izlude)	Cebalis#izlude_d	98

-izlude,165,156,2	duplicate(Soldier_izlude)	Soldier#izlude	8W_SOLDIER
-izlude_a,165,156,2	duplicate(Soldier_izlude)	Soldier#izlude_a	8W_SOLDIER
-izlude_b,165,156,2	duplicate(Soldier_izlude)	Soldier#izlude_b	8W_SOLDIER
-izlude_c,165,156,2	duplicate(Soldier_izlude)	Soldier#izlude_c	8W_SOLDIER
-izlude_d,165,156,2	duplicate(Soldier_izlude)	Soldier#izlude_d	8W_SOLDIER
+izlude,165,156,2	duplicate(Soldier_izlude)	Soldier#izlude	105
+izlude_a,165,156,2	duplicate(Soldier_izlude)	Soldier#izlude_a	105
+izlude_b,165,156,2	duplicate(Soldier_izlude)	Soldier#izlude_b	105
+izlude_c,165,156,2	duplicate(Soldier_izlude)	Soldier#izlude_c	105
+izlude_d,165,156,2	duplicate(Soldier_izlude)	Soldier#izlude_d	105

 -	script	::Guard_izlude	-1,{
 	mes "[Izlude Guard]";
 	mes "Welcome to Izlude.";
 	close;
 }
-prt_fild08,350,219,4	duplicate(Guard_izlude)	Guard#izlude	8W_SOLDIER
-prt_fild08a,350,219,4	duplicate(Guard_izlude)	Guard#izlude_a	8W_SOLDIER
-prt_fild08b,350,219,4	duplicate(Guard_izlude)	Guard#izlude_b	8W_SOLDIER
-prt_fild08c,350,219,4	duplicate(Guard_izlude)	Guard#izlude_c	8W_SOLDIER
-prt_fild08d,350,219,4	duplicate(Guard_izlude)	Guard#izlude_d	8W_SOLDIER
+prt_fild08,350,219,4	duplicate(Guard_izlude)	Guard#izlude	105
+prt_fild08a,350,219,4	duplicate(Guard_izlude)	Guard#izlude_a	105
+prt_fild08b,350,219,4	duplicate(Guard_izlude)	Guard#izlude_b	105
+prt_fild08c,350,219,4	duplicate(Guard_izlude)	Guard#izlude_c	105
+prt_fild08d,350,219,4	duplicate(Guard_izlude)	Guard#izlude_d	105

 // Channel Warper :: channel
 //============================================================
 function	script	F_IzludeChannel	{
-	mes "[Channel Warp Official]";
+	mes "[Izlude Copy Warper]";
 	mes "Izlude is a verly lively place is it not?";
 	mes "I am here to help make Izlude feel more smooth!";
 	mes "I can send you to another copy of Izlude.";
@@ -100,177 +100,8 @@ function	script	F_IzludeChannel	{
 	}
 	close;
 }
-izlude,122,105,5	script	Channel Warp Official	1_M_WIZARD,{ callfunc "F_IzludeChannel",":Go to copy 2:Go to copy 3:Go to copy 4:Go to copy 5"; }
-izlude_a,122,105,5	script	Channel Warp Official#_a	1_M_WIZARD,{ callfunc "F_IzludeChannel","Go to copy 1::Go to copy 3:Go to copy 4:Go to copy 5"; }
-izlude_b,122,105,5	script	Channel Warp Official#_b	1_M_WIZARD,{ callfunc "F_IzludeChannel","Go to copy 1:Go to copy 2::Go to copy 4:Go to copy 5"; }
-izlude_c,122,105,5	script	Channel Warp Official#_c	1_M_WIZARD,{ callfunc "F_IzludeChannel","Go to copy 1:Go to copy 2:Go to copy 3::Go to copy 5"; }
-izlude_d,122,105,5	script	Channel Warp Official#_d	1_M_WIZARD,{ callfunc "F_IzludeChannel","Go to copy 1:Go to copy 2:Go to copy 3:Go to copy 4:"; }
-
-// Talking NPCs
-//============================================================
-izlude,143,205,7	script	Talkative Kid#iz	4_F_KID2,{
-	end;
-
-OnTimer64000:
-	npctalk "I used all my Novice Red Potions. What should I do?";
-	end;
-
-OnTimer72000:
-	npctalk "Where is the shop?";
-	end;
-
-OnTimer136000:
-	npctalk "Idiot! You do not know about the 'shortcut window'?";
-	end;
-
-OnTimer144000:
-	npctalk "The items in your inventory can be dragged and put in the shortcut window.";
-	end;
-
-OnTimer212000:
-	npctalk "I got so many beginner's items in the Academy!";
-	end;
-
-OnTimer276000:
-	npctalk "They even gave me weapons and a shield!";
-	end;
-
-OnTimer284000:
-	npctalk "Just press  <Ctrl+~key> to open the map you have.";
-	end;
-
-OnTimer344000:
-	npctalk "Then do you want to go Criatura Academy with me? I'm learning how to battle from Instructor Subino!";
-	end;
-
-OnTimer348000:
-	npctalk "The Academy is in North side of Izlude. Let's go~!";
-	end;
-
-OnTimer416000:
-	npctalk "It's a system to guide you to a destination.";
-	end;
-
-OnTimer424000:
-	npctalk "In the basic menu, please click the [Navigation] button.";
-	end;
-
-OnTimer492000:
-	npctalk "Whee, Ain't gonna use your brain? Please type /where in the chat window now!";
-	end;
-
-OnTimer552000:
-	npctalk "In this case, you can push the <Enter> key.";
-	end;
-
-OnTimer560000:
-	npctalk "We are just repeating the same dialog. HaHaha.";
-	end;
-
-OnTimer565000:
-OnInit:
-	initnpctimer;
-	end;
-}
-
-izlude_a,143,205,7	duplicate(Talkative Kid#iz)	Talkative Kid#iza	4_F_KID2
-izlude_b,143,205,7	duplicate(Talkative Kid#iz)	Talkative Kid#izb	4_F_KID2
-izlude_c,143,205,7	duplicate(Talkative Kid#iz)	Talkative Kid#izc	4_F_KID2
-izlude_d,143,205,7	duplicate(Talkative Kid#iz)	Talkative Kid#izd	4_F_KID2
-
-izlude,146,205,7	script	Talkative Adventurer#iz	4_M_KID1,{
-	end;
-
-OnTimer69000:
-	npctalk "You can buy potion from Merchants.";
-	end;
-
-OnTimer77000:
-	npctalk "It's the Potion image in the mini map.";
-	end;
-
-OnTimer131000:
-	npctalk "Is there any way to use items easily?";
-	end;
-
-OnTimer141000:
-	npctalk "Shortcut window? The slots at the top of the screen? How can I use it?";
-	end;
-
-OnTimer149000:
-	npctalk "For inventory, do you mean 'item' menu? Oh, it is!";
-	end;
-
-OnTimer217000:
-	npctalk "I have a bunch of potions?";
-	end;
-
-OnTimer281000:
-	npctalk "What?! I should go to the Academy now!";
-	end;
-
-OnTimer279000:
-	npctalk "Where is Izlude? In the center?";
-	end;
-
-OnTimer339000:
-	npctalk "I do not know what to do.";
-	end;
-
-OnTimer349000:
-	npctalk "Oh yea? I want to know so many things~ I will go with you!";
-	end;
-
-OnTimer411000:
-	npctalk "Navigation, What is that?";
-	end;
-
-OnTimer421000:
-	npctalk "Oh-! Should I search for a Kafra Employee?";
-	end;
-
-OnTimer487000:
-	npctalk "What is the town name?";
-	end;
-
-OnTimer497000:
-	npctalk "I cannot see the part where I can write something in the chat window?";
-	end;
-
-OnTimer557000:
-	npctalk "Oh you smarty...";
-	end;
-
-OnTimer555000:
-	npctalk "A while ago, one Novice talked to me like hey 'Talkative Adventurer'?. HaHaha.";
-	end;
-
-OnTimer565000:
-OnInit:
-	initnpctimer;
-	end;
-}
-
-izlude_a,146,205,7	duplicate(Talkative Adventurer#iz)	Talkative Adventurer#iza	4_M_KID1
-izlude_b,146,205,7	duplicate(Talkative Adventurer#iz)	Talkative Adventurer#izb	4_M_KID1
-izlude_c,146,205,7	duplicate(Talkative Adventurer#iz)	Talkative Adventurer#izc	4_M_KID1
-izlude_d,146,205,7	duplicate(Talkative Adventurer#iz)	Talkative Adventurer#izd	4_M_KID1
-
-prt_fild08,338,217,7	script	Resting Adventurer#iz	4_F_SITDOWN,{
-	end;
-
-OnTimer60000:
-	npctalk "You know what? If you are sitting, HP and SP recovery is faster.";
-	end;
-
-OnTimer65000:
-	npctalk "Sitting is possible if your basic job skill level is more than 3. Shortcut is pressing the <INSERT> key.";
-OnInit:
-	initnpctimer;
-	end;
-}
-
-prt_fild08a,338,217,7	duplicate(Resting Adventurer#iz)	Resting Adventurer#iza	4_F_SITDOWN
-prt_fild08b,338,217,7	duplicate(Resting Adventurer#iz)	Resting Adventurer#izb	4_F_SITDOWN
-prt_fild08c,338,217,7	duplicate(Resting Adventurer#iz)	Resting Adventurer#izc	4_F_SITDOWN
-prt_fild08d,338,217,7	duplicate(Resting Adventurer#iz)	Resting Adventurer#izd	4_F_SITDOWN
+izlude,122,105,5	script	Izlude Copy Warper	64,{ callfunc "F_IzludeChannel",":Go to copy 2:Go to copy 3:Go to copy 4:Go to copy 5"; }
+izlude_a,122,105,5	script	Izlude Copy Warper#_a	64,{ callfunc "F_IzludeChannel","Go to copy 1::Go to copy 3:Go to copy 4:Go to copy 5"; }
+izlude_b,122,105,5	script	Izlude Copy Warper#_b	64,{ callfunc "F_IzludeChannel","Go to copy 1:Go to copy 2::Go to copy 4:Go to copy 5"; }
+izlude_c,122,105,5	script	Izlude Copy Warper#_c	64,{ callfunc "F_IzludeChannel","Go to copy 1:Go to copy 2:Go to copy 3::Go to copy 5"; }
+izlude_d,122,105,5	script	Izlude Copy Warper#_d	64,{ callfunc "F_IzludeChannel","Go to copy 1:Go to copy 2:Go to copy 3:Go to copy 4:"; }
--- a/npc/re/guides/guides_woe_te.txt
+++ b/npc/re/guides/guides_woe_te.txt
@@ -1,182 +0,0 @@
-//===== rAthena Script =======================================
-//= Guides WoE TE
-//===== Description: =========================================
-//= [Official Conversion]
-//= NPC Guide for WoE TE
-//===== Changelogs: ==========================================
-//= 1.0 First Version. [Capuche]
-//============================================================
-
-prt_gld,118,151,4	script	Guide in Gloria#tes01	8W_SOLDIER,{
-	mes "[Guide Soldier]";
-	mes "May the endless glory be with the Kingdom of Rune-Midgarts and its seven royal families!";
-	mes "Welcome to Gloria, the fortress in Siege Battle TE. We provide services in cooperation with Kafra and the major royal families of the kingdom.";
-	next;
-	switch( select( "Gloria?", "About Siege Battle TE", "About requirements for participation", "Forget it." ) ) {
-	case 1:
-		mes "[Guide Soldier]";
-		mes "It has been named in honor of the seven royal families and the kingdom.";
-		mes "The whole city closely resembles Valkyrie Realm, and here resides the aspirations of the royal family for everyone.";
-		next;
-		mes "[Guide Soldier]";
-		mes "In Kafragarten of Aldebaran, managed by Gloria and Kafra Service, we have special rules that are slightly different from the existing ones.";
-		mes "We call it Siege Battle TE.";
-		next;
-		mes "[Guide Soldier]";
-		mes "You should not have troubles understanding the new rules since it is simply about setting a limit on qualifications for participation.";
-		close;
-	case 2:
-		mes "[Guide Soldier]";
-		mes "It is a new stage prepared by the royal family in order to let more people participate in siege battles.";
-		mes "Different rules are applied, and sufficient supports are provided since its atmosphere is similar to that of a gymnasium.";
-		next;
-		mes "[Guide Soldier]";
-		mes "^4d4dffTertiary job class and users with expanded levels are not allowed in Gloria and Kafragarten regions, where Siege Battle TE rules are applied.^000000";
-		next;
-		mes "[Guide Soldier]";
-		mes "Also, we lend a variety of battlegears that you use only in corresponding regions for free.";
-		mes "This may be the biggest difference.";
-		close;
-	case 3:
-		mes "[Guide Soldier]";
-		mes "^4d4dffNovice, primary, and secondary job classes are allowed to participate as well as extra job class.^000000";
-		mes "Of course, primary and secondary job classes are included as well.";
-		next;
-		mes "[Guide Soldier]";
-		mes "In other words, tertiary job class and jobs with expanded levels such as Kagerou and Oboro are not allowed.";
-		mes "Also, their buff effects get eliminated here.";
-		next;
-		mes "[Guide Soldier]";
-		mes "Other than that, it is not much different from the existing siege battles.";
-		close;
-	case 4:
-		mes "[Guide Soldier]";
-		mes "May the glory of the royal family and Odin's protection be with you!";
-		close;
-	}
-}
-
-prt_gld,122,151,4	script	Guide in Gloria#tes02	8W_SOLDIER,{
-	mes "[Guide Soldier]";
-	mes "This warp gate here will let you go into Gloria region.";
-	mes "Please keep in mind that you are supposed to travel through warps here.";
-	close;
-}
-
-te_prt_gld,118,151,4	script	Guide in Gloria#tes03	8W_SOLDIER,{
-	mes "[Guide Soldier]";
-	mes "You are now at the fortress in Gloria.";
-	mes "If you wish to return to Valkyrie Realm, you can travel through warp.";
-	close;
-}
-
-te_prt_gld,122,151,4	script	Guide in Gloria#tes04	8W_SOLDIER,{
-	mes "[Guide Soldier]";
-	mes "Welcome to Gloria.";
-	mes "Job classes that are allowed to participate in siege battles at the fortresses in Kafragarten and Gloria regions are limited to ^4d4dffprimary and secondary job classes as well as those without expanded levels.^000000";
-	next;
-	mes "[Guide Soldier]";
-	mes "In Kafragarten and Gloria regions, you get separate missions.";
-	mes "Some of them are not related to Emperiums, so challenge yourself!";
-	next;
-	mes "[Guide Soldier]";
-	mes "The royal family and Kafra Service have prepared a variety of retal items for you.";
-	mes "Although the rental period is relatively short, it's all free. So, don't miss the chance!";
-	close;
-}
-
-alde_gld,228,189,3	script	Sorin of Kafragarten	4_F_KAFRA3,{
-	mes "[Sorin]";
-	mes "Welcome to Kafra Service~ We always provide the best to our customers.";
-	mes "Finally, Kafra Service has established its own fortress!";
-	next;
-	switch( select( "What is Kafragarten?", "What is Siege Battle TE?", "Qualifications for participation", "Forget it." ) ) {
-	case 1:
-		mes "[Sorin]";
-		mes "This is a fortress provided by Kafra Service in cooperation with the royal family of Rune-Midgarts.";
-		mes "It means 'Kafra's garden.'";
-		next;
-		mes "[Sorin]";
-		mes "Although it looks very similar to Luina";
-		mes "It should be fine since it's servicing different users.";
-		mes "It's like a training stage, so to speak.";
-		next;
-		mes "[Sorin]";
-		mes "Kafragarten is built in the region of Luina, and in Valkyrie Realm, the royal family's Gloria is founded.";
-		mes "Kafra Service hopes that you would gain valuable experience in this new fortress.";
-		close;
-	case 2:
-		mes "[Sorin]";
-		mes "Siege Battle TE is ^4d4dffsiege battles designed for primary and secondary job classes only, ruling out tertiary job class.^000000";
-		next;
-		mes "[Sorin]";
-		mes "It's been newly established in an effort to allow more users to gain experience through siege battles.";
-		next;
-		mes "[Sorin]";
-		mes "Moreover, for your convenience, we lend a variety of items that you can use only inside the corresponding fortress. So, take advantage of this opportunity.";
-		next;
-		mes "[Sorin]";
-		mes "As they say, 'action speaks louder than words.'";
-		mes "Now, go and see for yourself~";
-		close;
-	case 3:
-		mes "[Sorin]";
-		mes "Primary, secondary, and extra job classes without expanded levels as well as primary and secondary job classes are allowed to participate only.";
-		next;
-		mes "[Sorin]";
-		mes "In other words, tertiary job class and jobs with expanded levels such as Kagerou and Oboro are not allowed.";
-		close;
-	case 4:
-		mes "[Sorin]";
-		mes "Kafra Service will do its utmost to bring joy to your life through Kafragarten.";
-		close;
-	}
-}
-
-alde_gld,224,185,5	script	Defolty of Kafragarten	4_F_KAFRA1,{
-	mes "[Defolty]";
-	mes "Kafragarten is like a mirrored image of Luina, so its structure is exactly the same as that of Luina.";
-	next;
-	mes "[Defolty]";
-	mes "You can travel by these warps here.";
-	mes "You can travel to Kafragarten using warp.";
-	close;
-}
-
-te_alde_gld,228,189,3	script	W of Kafragarten#tes01	4_F_KAFRA6,{
-	mes "[W]";
-	mes "You can travel to Luina using this warp here.";
-	mes "Make good use of it";
-	next;
-	mes "[W]";
-	mes "Who took the castle that was named after me, W?";
-	mes "Hehe doesn't it mean that I'm superior to Tailing?";
-	close;
-}
-
-te_alde_gld,224,185,5	script	Tailing of Kafragarten	4_F_KAFRA2,{
-	mes "[Tailing]";
-	mes "This is the region of Kafragarten.";
-	mes "In siege battles in the regions of Kafragarten and Gloria, only primary and secondary job classes as well as users without expanded levels are allowed to participate.";
-	next;
-	mes "[Tailing]";
-	mes "... .";
-	mes "In Kafragarten and Gloria regions, you get separate missions.";
-	mes "So you should pay close attention.";
-	next;
-	mes "[Tailing]";
-	mes "Also, we have prepared a variety of battlegears, which are available anytime upon your request.";
-	next;
-	mes "[Tailing]";
-	mes "But obviously, they're only valid in the regions of Kafragarten and Gloria.";
-	next;
-	mes "[Tailing]";
-	mes "... ..";
-	mes "Ah if you think I'm mad because my name is missing from Kafragarten and if my way of speaking is a little stiff because of that";
-	next;
-	mes "[Tailing]";
-	mes "Oh my.";
-	mes "Is that really true?";
-	mes "No way. W is no better than me..hahaha.";
-	close;
-}
--- a/npc/re/guild/invest_main.txt
+++ b/npc/re/guild/invest_main.txt
@@ -113,13 +113,12 @@ function	script	F_Invest_Status	{

 //callfunc "F_Invest_Abyss","<variable>","<NPC name>"{,"<addon message>"};
 function	script	F_Invest_Abyss	{
-	.@npc_name$ = getarg(1);
 	mes "There are 2 ways to invest, by Zeny or the Investment Certificate given out by the Cat Paw Merchant Guild.";
 	mes "Which way would you like to make your investment?";
 	next;
 	switch(select("Invest with Zeny.:Invest with Investment Certificates.:Cancel")) {
 	case 1:
-		mes .@npc_name$;
+		mes getarg(1);
 		mes "So you've decided to invest in Zeny.";
 		mes "Minimum investment unit is ^4d4dff10,000 Zeny^000000.";
 		mes "You can invest a maximum of 50 units which is ^4d4dff500,000 Zeny^000000.";
@@ -135,35 +134,35 @@ function	script	F_Invest_Abyss	{
 			set .@units,50;
 			break;
 		case 4:
-			mes .@npc_name$;
+			mes getarg(1);
 			mes "Please enter the amount you want to invest.";
 			mes "Please choose between 1 to 200.";
 			mes "Please enter 0 to cancel.";
 			next;
 			input .@units;
 			if (.@units < 0 || .@units > 200) {
-				mes .@npc_name$;
+				mes getarg(1);
 				mes "You've exceeded the amount per investment.";
 				mes "Please try again.";
 				close;
 			} else if (.@units == 0) {
-				mes .@npc_name$;
+				mes getarg(1);
 				mes "Canceled.";
 				close;
 			} else
 				break;
 		case 5:
-			mes .@npc_name$;
+			mes getarg(1);
 			mes "Canceled.";
 			close;
 		}
 		set .@zeny, .@units * 10000;
 		if (Zeny < .@zeny) {
-			mes .@npc_name$;
+			mes getarg(1);
 			mes "You do not have enough money.";
 			close;
 		}
-		mes .@npc_name$;
+		mes getarg(1);
 		mes "You've invested "+callfunc("F_InsertPlural",.@units,"unit")+" "+callfunc("F_InsertComma",.@zeny)+" Zeny"+getarg(2,"")+".";
 		mes "Not much but this is a small gift. You can exchange it with items in Malangdo.";
 		set Zeny, Zeny-.@zeny;
@@ -171,7 +170,7 @@ function	script	F_Invest_Abyss	{
 		getitem 6488,.@units; //Thanks_Invest_Ticket
 		close;
 	case 2:
-		mes .@npc_name$;
+		mes getarg(1);
 		mes "Wow, you've brought Investment Certificates.";
 		mes "How many certificates will you submit?";
 		next;
@@ -183,35 +182,35 @@ function	script	F_Invest_Abyss	{
 			set .@tickets,5;
 			break;
 		case 3:
-			mes .@npc_name$;
+			mes getarg(1);
 			mes "Please enter the number of Investment Certificates you want to submit.";
 			mes "Please choose between 1 to 20.";
 			mes "Please enter 0 to cancel.";
 			next;
 			input .@tickets;
 			if (.@tickets < 0 || .@tickets > 20) {
-				mes .@npc_name$;
+				mes getarg(1);
 				mes "You've exceeded the amount per investment.";
 				mes "Please try again.";
 				close;
 			} else if (.@tickets == 0) {
-				mes .@npc_name$;
+				mes getarg(1);
 				mes "Canceled.";
 				close;
 			} else
 				break;
 		case 4:
-			mes .@npc_name$;
+			mes getarg(1);
 			mes "Canceled.";
 			close;
 		}
 		if (countitem(6489) < .@tickets) {
-			mes .@npc_name$;
+			mes getarg(1);
 			mes "Looks like you have fewer Investment Certificates than you want to submit.";
 			close;
 		}
 		set .@units, .@tickets * 10;
-		mes .@npc_name$;
+		mes getarg(1);
 		mes .@tickets+" Investment Certificate"+((.@tickets == 1)?" is":"s are")+" the same as an investment of "+.@units+" units ("+((.@units < 100)?.@units:insertchar(""+.@units,",",1))+"0,000z)"+getarg(2,"")+".";
 		mes "Not much but this is a small gift. You can exchange it with items in Malangdo.";
 		delitem 6489,.@tickets; //Cats_Invest_Certif
@@ -219,7 +218,7 @@ function	script	F_Invest_Abyss	{
 		getitem 6488,.@units; //Thanks_Invest_Ticket
 		close;
 	case 3:
-		mes .@npc_name$;
+		mes getarg(1);
 		mes "Canceled.";
 		close;
 	}
--- a/npc/re/jobs/3-2/genetic.txt
+++ b/npc/re/jobs/3-2/genetic.txt
@@ -651,7 +651,7 @@ job3_gen01,12,56,3	script	Plant Guide#generic	111,{
 // QuestID,PlantName,Description{,Part?}
 function	script	Genetic_Job_Plant	{
 	if (job_gen == 7) {
-		if (isbegin_quest(getarg(0)) == 0) {
+		if (checkquest(getarg(0)) == -1 || checkquest(getarg(0)) == 0) {
 			mes "- "+getarg(2)+" -";
 			next;
 			switch(select("Use it as a material.:Do not use.")) {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Atemo	ead1a80d3c	Mistakes	2015-12-02 00:08:54 +01:00
Atemo	72d2658523	From `65b6861e84` Small cleanup And updata mapcache to use DBPATH instead rechecking RENEWAL macro, (code duplication) Make mapcache use cli.o to give some feedback on arguments given.	2015-12-01 23:50:21 +01:00