Corrects alerts from LGTM

Merge branch 'master' into cleanup/serverconfigs
Adjusts map_foreachindir to include caster's cell (#5314 )
2020-08-17 11:46:26 -04:00 · 2020-08-17 08:52:15 -04:00 · 2020-08-13 11:16:55 -04:00 · 2020-08-13 08:10:18 +02:00 · 2020-08-13 02:10:02 +02:00 · 2020-08-12 08:55:05 +02:00
247 changed files with 17204 additions and 12482 deletions
--- a/3rdparty/libconfig/libconfig.c
+++ b/3rdparty/libconfig/libconfig.c
@@ -676,6 +676,7 @@ int config_read_file(config_t *config, const char *filename)
  {
    config->error_text = __io_error;
    config->error_type = CONFIG_ERR_FILE_IO;
+    config->error_file = filename; // Put error filename here, for more info
    return(CONFIG_FALSE);
  }

--- a/conf/battle/client.conf
+++ b/conf/battle/client.conf
@@ -149,3 +149,8 @@ ping_time: 20
 // Show skill scale for clients 2015-12-23 and newer? (Note 1)
 // Official: yes
 show_skill_scale: yes
+
+// Should the connection be dropped on server side after a player disconnection request was received? (Note 1)
+// Note: Enabling this is known to cause problems on clients that make use of REST API calls.
+// Official: no
+drop_connection_on_quit: no
--- a/conf/battle/homunc.conf
+++ b/conf/battle/homunc.conf
@@ -95,3 +95,13 @@ idletime_hom_option: 0x1F
 // Only applies to renewal mode.
 // Official: 10%
 homunculus_exp_gain: 10
+
+// The hunger rate, less than or equal to, at which a homunculus' hunger delay changes. (Note 2)
+// See 'homunculus_starving_delay' for the delay value.
+// Set to 0 to disable.
+// Official: 10
+homunculus_starving_rate: 10
+
+// Homunculi normally lose hunger every 60 seconds but when the 'homunculus_starving_rate' is met the hunger delay drops to 20 seconds (in milliseconds).
+// Official: 20 seconds
+homunculus_starving_delay: 20000
--- a/conf/battle/misc.conf
+++ b/conf/battle/misc.conf
@@ -114,6 +114,9 @@ at_timeout: 0
 // Makes player cannot be attacked when autotrade? (turns player's state.monster_ignore) (Note 1)
 at_monsterignore: no

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

--- a/conf/battle/player.conf
+++ b/conf/battle/player.conf
@@ -256,20 +256,25 @@ fame_pharmacy_7: 10
 fame_pharmacy_10: 50

 // How the server should measure the character's idle time? (Note 3)
-// 0x001 - Walk Request
-// 0x002 - UseSkillToID Request (Targetted skill use attempt)
-// 0x004 - UseSkillToPos Request (AoE skill use attempt)
-// 0x008 - UseItem Request (Including equip/unequip)
-// 0x010 - Attack Request
-// 0x020 - Chat Request (Whisper, Party, Guild, Battlegrounds, etc)
-// 0x040 - Sit/Standup Request
-// 0x080 - Emotion Request
-// 0x100 - DropItem Request
-// 0x200 - @/#Command Request
+// 0x0001 - Walk Request
+// 0x0002 - UseSkillToID Request (Targetted skill use attempt)
+// 0x0004 - UseSkillToPos Request (AoE skill use attempt)
+// 0x0008 - UseItem Request (Including equip/unequip)
+// 0x0010 - Attack Request
+// 0x0020 - Chat Request (Whisper, Party, Guild, Battlegrounds, etc)
+// 0x0040 - Sit/Standup Request
+// 0x0080 - Emotion Request
+// 0x0100 - DropItem Request
+// 0x0200 - @/#Command Request
+// 0x0400 - Closing a NPC window
+// 0x0800 - Providing input to a NPC
+// 0x1000 - Choosing a NPC menu option
+// 0x2000 - Clicking the next button of a NPC
+// 0x4000 - Finishing for a NPC progress bar
 // Please note that at least 1 option has to be enabled.
 // Be mindful that the more options used, the easier it becomes to cheat features that rely on idletime (e.g. checkidle()).
-// Default: walk (0x1) + useskilltoid (0x2) + useskilltopos (0x4) + useitem (0x8) + attack (0x10) = 0x1F
-idletime_option: 0x1F
+// Default: walk (0x1) + useskilltoid (0x2) + useskilltopos (0x4) + useitem (0x8) + attack (0x10) + any npc interaction(0x400,0x800,0x1000,0x2000,0x4000) = 0x7C1F
+idletime_option: 0x7C1F

 // Adjust the summoner class' special traits.
 // - Summoners belong to brute race category. They have their own race RC_PLAYER_DORAM (11) to be differentiated from monster race RC_BRUTE (2).
--- a/conf/battle/skill.conf
+++ b/conf/battle/skill.conf
@@ -355,6 +355,10 @@ default_fixed_castrate: 20
 // Note: Brandish Spear will always use this algorithm due to its special damage behavior.
 skill_eightpath_algorithm: yes

+// Should skills that use skill_eightpath_algorithm include targets in the caster's cell?
+// Official: yes
+skill_eightpath_same_cell: yes
+
 // Can damage skill units like icewall and traps (Note 3)
 // On official servers, players can damage icewalls and some traps with skills. When monsters use skills, damage
 // will show on the icewalls and traps, but it is not actually substracted from the durability.
--- a/conf/char_athena.conf
+++ b/conf/char_athena.conf
@@ -200,6 +200,9 @@ char_del_restriction: 3
 // What folder the DB files are in (item_db.txt, etc.)
 db_path: db

+// Should we check if sql-tables are correct on server startup ?
+char_checkdb: yes
+
 //===================================
 // Pincode system
 //===================================
@@ -284,4 +287,54 @@ mail_return_days: 15
 // Default: 15
 mail_delete_days: 15

+// Does the Retrieve All button ignore unread mail status?
+// no: Only return attachments from read mail
+// yes: Return attachments from all mail
+// Default: yes
+mail_retrieve: yes
+
+//===================================
+// Char/Inter-server Tables
+//===================================
+acc_reg_num_table: acc_reg_num
+acc_reg_str_table: acc_reg_str
+achievement_table: achievement
+auction_table: auction
+bonus_script_table: bonus_script
+cart_table: cart_inventory
+char_reg_num_table: char_reg_num
+char_reg_str_table: char_reg_str
+char_table: char
+charlog_table: charlog
+clan_alliance_table: clan_alliance
+clan_table: clan
+elemental_table: elemental
+friend_table: friends
+guild_table: guild
+guild_alliance_table: guild_alliance
+guild_castle_table: guild_castle
+guild_expulsion_table: guild_expulsion
+guild_member_table: guild_member
+guild_position_table: guild_position
+guild_skill_table: guild_skill
+guild_storage_table: guild_storage
+hotkey_table: hotkey
+homunculus_table: homunculus
+homunculus_skill_table: skill_homunculus
+interlog_table: interlog
+inventory_table: inventory
+mail_attachment_table: mail_attachments
+mail_table: mail
+memo_table: memo
+mercenary_table: mercenary
+mercenary_owner_table: mercenary_owner
+party_table: party
+pet_table: pet
+quest_table: quest
+ragsrvinfo_table: ragsrvinfo
+scdata_table: sc_data
+skill_table: skill
+skillcooldown_table: skillcooldown
+storage_table: storage
+
 import: conf/import/char_conf.txt
--- a/conf/charhelp.txt
+++ b/conf/charhelp.txt
@@ -1,28 +0,0 @@
- 40:--- CHARACTER CMD ---
- 40:#statsall <char name> - Set all stats of a player to maximum.
- 40:#itemlist <char name> - Displays all items of a player.
- 40:#storagelist <char name> - Displays all items of a player's storage.
- 40:#stats <char name> - Displays a characters stats.
- 60:#option <char name> <param1> <param2> <param3> - Like @option command but only to target character.
- 50:#mountpeco <char name> - Give/remove to a player a peco (Class is required, but not skill).
- 50:#petrename <char name> - Re-enable pet rename to a player.
- 60:#save <char name> <map> <x> <y> - Changes the target players respawn point.
- 60:#baselvl/#blvl <char name> <#> - Change a characters base level.
- 60:#joblvl/#jlvl <char name> <#> - Change a characters job level.
- 60:#job/#jobchange <char name> <job ID> - Changes target characters job.
- 60:#zeny <char name> <amount> - Give/take a players Zeny
- 60:#cash <char name> <amount> - Give/take a player cash points
- 60:#points <char name> <amount> - Give/take a player Kafra points
- 60:#stpoint <char name> <amount> - Give/take a players stat points
- 60:#skpoint <char name> <amount> - give/take a players skill points
- 60:#skreset <char name> - Reset skills of a character.
- 60:#streset <char name> - Reset stats of a character.
- 60:#reset <char name> - Reset stats AND skills of a character.
- 60:#questskill <char name> <#> - Gives to a player the specified quest skill.
- 60:#lostskill <char name> <#> - Takes away the specified quest skill from the player.
- 60:#delitem <char name> <item_name_or_ID> <quantity> - Remove items from a character
- 50:#model <char name> <hair type> <hair color> <clothes color> - Changes a player's model
- 60:#disguise <char name> <monster_name_or_monster_ID> - Changes disguise of a player
- 60:#undisguise <char name> - Cancels disguise of a player
- 60:#changesex <char name> - Changes sex of a player (all characters of the account)
- 60:#warp/#rura+ <char name> <mapname> <x> <y> - Warps character to location of choice
--- a/conf/inter_athena.conf
+++ b/conf/inter_athena.conf
@@ -55,14 +55,14 @@ map_server_id: ragnarok
 map_server_pw: ragnarok
 map_server_db: ragnarok

-// MySQL Log Database
+// MySQL Log Database (Shared used with Login server for login logs)
 log_db_ip: 127.0.0.1
 log_db_port: 3306
 log_db_id: ragnarok
 log_db_pw: ragnarok
 log_db_db: ragnarok
 log_codepage:
-log_login_db: loginlog
+log_login_table: loginlog

 // MySQL Reconnect Settings
 // - mysql_reconnect_type:
@@ -72,85 +72,6 @@ log_login_db: loginlog
 mysql_reconnect_type: 2
 mysql_reconnect_count: 1

-// DO NOT CHANGE ANYTHING BEYOND THIS LINE UNLESS YOU KNOW YOUR DATABASE DAMN WELL
-// this is meant for people who KNOW their stuff, and for some reason want to change their
-// database layout. [CLOWNISIUS]
-
-// ALL MySQL Database Table names
-
-// Login Database Tables
-login_server_account_db: login
-ipban_table: ipbanlist
-global_acc_reg_num_table: global_acc_reg_num
-global_acc_reg_str_table: global_acc_reg_str
-
-// Char Database Tables
-char_db: char
-hotkey_db: hotkey
-scdata_db: sc_data
-cart_db: cart_inventory
-inventory_db: inventory
-charlog_db: charlog
-skill_db: skill
-interlog_db: interlog
-memo_db: memo
-guild_db: guild
-guild_alliance_db: guild_alliance
-guild_castle_db: guild_castle
-guild_expulsion_db: guild_expulsion
-guild_member_db: guild_member
-guild_skill_db: guild_skill
-guild_position_db: guild_position
-guild_storage_db: guild_storage
-party_db: party
-pet_db: pet
-friend_db: friends
-mail_db: mail
-mail_attachment_db: mail_attachments
-auction_db: auction
-quest_db: quest
-homunculus_db: homunculus
-skill_homunculus_db: skill_homunculus
-mercenary_db: mercenary
-mercenary_owner_db: mercenary_owner
-elemental_db: elemental
-skillcooldown_db: skillcooldown
-bonus_script_db: bonus_script
-acc_reg_num_table: acc_reg_num
-acc_reg_str_table: acc_reg_str
-char_reg_str_table: char_reg_str
-char_reg_num_table: char_reg_num
-clan_table: clan
-clan_alliance_table: clan_alliance
-
-// Map Database Tables
-buyingstore_table: buyingstores
-buyingstore_items_table: buyingstore_items
-item_table: item_db
-renewal-item_table: item_db_re
-item2_table: item_db2
-renewal-item2_table: item_db2_re
-item_cash_table: item_cash_db
-item_cash2_table: item_cash_db2
-mob_table: mob_db
-renewal-mob_table: mob_db_re
-mob2_table: mob_db2
-renewal-mob2_table: mob_db2_re
-mob_skill_table: mob_skill_db
-renewal-mob_skill_table: mob_skill_db_re
-mob_skill2_table: mob_skill_db2
-renewal-mob_skill2_table: mob_skill_db2_re
-mapreg_table: mapreg
-sales_table: sales
-vending_table: vendings
-vending_items_table: vending_items
-market_table: market
-roulette_table: db_roulette
-guild_storage_log: guild_storage_log
-
-// Use SQL item_db, mob_db and mob_skill_db for the map server? (yes/no)
-use_sql_db: no
-
 inter_server_conf: inter_server.yml

 import: conf/import/inter_conf.txt
--- a/conf/log_athena.conf
+++ b/conf/log_athena.conf
@@ -150,14 +150,19 @@ log_timestamp_format: %m/%d/%Y %H:%M:%S
 // log_cash_db: log/cashlog.log
 // log_feeding_db: log/feedinglog.log

-log_gm_db: atcommandlog
-log_branch_db: branchlog
-log_chat_db: chatlog
-log_mvpdrop_db: mvplog
-log_npc_db: npclog
-log_pick_db: picklog
-log_zeny_db: zenylog
-log_cash_db: cashlog
-log_feeding_db: feedinglog
+log_gm_table: atcommandlog
+log_branch_table: branchlog
+log_chat_table: chatlog
+log_mvpdrop_table: mvplog
+log_npc_table: npclog
+log_pick_table: picklog
+log_zeny_table: zenylog
+log_cash_table: cashlog
+log_feeding_table: feedinglog
+
+// If 'sql_logs' is no, logging will use files with path
+// '<log_path>/log_filename.<log_extension>
+log_path: log/
+log_extension: .log

 import: conf/import/log_conf.txt
--- a/conf/login_athena.conf
+++ b/conf/login_athena.conf
@@ -179,5 +179,19 @@ use_web_auth_token: yes
 //client_hash: 10, cb1ea78023d337c38e8ba5124e2338ae
 //client_hash: 99, disabled

+//New registration flood protection [Kevin]
+//Number of new registration allowed
+allowed_regs: 1
+//Time in second before the counter for the number of registration is reset
+time_allowed: 10
+
+//===================================
+// Login-server Tables
+//===================================
+global_acc_reg_num_table: global_acc_reg_num
+global_acc_reg_str_table: global_acc_reg_str
+ipban_list_table: ipbanlist
+login_server_account_table: login
+
 import: conf/inter_athena.conf
 import: conf/import/login_conf.txt
--- a/conf/map_athena.conf
+++ b/conf/map_athena.conf
@@ -116,11 +116,50 @@ save_settings: 4095
 // Message of the day file, when a character logs on, this message is displayed.
 motd_txt: conf/motd.txt

-// When @help or @h is typed when you are a gm, this is displayed for helping new gms understand gm commands.
-charhelp_txt: conf/charhelp.txt
+// Prefered file for reading atcommand & charcommand symbols, alieases settings,
+// and help.txt file lookup.
+atcommand_conf_file: conf/atcommand_athena.conf
+
+// Prefered file for reading player's group levels, commands, and permission list,.
+group_conf_file: conf/groups.conf

 // Load channel config from
-channel_conf: conf/channels.conf
+channel_conf_file: conf/channels.conf
+
+// Check all required tables?
+check_tables: yes
+
+//===================================
+// Map-server Tables
+//===================================
+buyingstore_table: buyingstores
+buyingstore_items_table: buyingstore_items
+guild_storage_log_table: guild_storage_log
+mapreg_table: mapreg
+market_table: market
+roulette_table: db_roulette
+sales_table: sales
+vending_table: vendings
+vending_items_table: vending_items
+
+// Use SQL DB tables instead of TXT DB files? (yes/no)
+use_sql_db: no
+
+// If 'use_sql_db' is 'yes', these following tables will be used
+item_db_table: item_db
+item_db_re_table: item_db_re
+item_db2_table: item_db2
+//item_db2_table: item_db2_re
+item_cash_db_table: item_cash_db
+item_cash_db2_table: item_cash_db2
+mob_db_table: mob_db
+mob_db_re_table: mob_db_re
+mob_db2_table: mob_db2
+//mob_db2_table: mob_db2_re
+mob_skill_db_table: mob_skill_db
+mob_skill_db_re_table: mob_skill_db_re
+mob_skill_db2_table: mob_skill_db2
+//mob_skill_db2_table: mob_skill_db2_re

 // Maps:
 import: conf/maps_athena.conf
--- a/conf/msg_conf/map_msg.conf
+++ b/conf/msg_conf/map_msg.conf
@@ -92,7 +92,7 @@
 75: War of Emperium is currently not in progress.
 76: All skills have been added to your skill tree.
 77: The reference result of '%s' (name: id):
-78: - %s: %d
+78: - %s: %u
 79: It is %d affair above.
 80: Give the display name or monster name/id please.
 81: Your GM level doesn't authorize you to perform this action on the specified player.
@@ -179,7 +179,7 @@
 166: No item has been refined.
 167: 1 item has been refined.
 168: %d items have been refined.
-169: The item (%hu: '%s') is not equipable.
+169: The item (%u: '%s') is not equipable.
 170: The item is not equipable.
 171: %d - void
 //172: You replace previous memo position %d - %s (%d,%d).
@@ -551,7 +551,7 @@

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

 // Rare Items Drop/Steal announce
@@ -739,14 +739,14 @@
 707: You are VIP until: %s
 708: The player is now VIP until: %s

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

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

@@ -1235,9 +1235,9 @@
 1189: Item not found.
 1190: You're already autolooting this item.
 1191: Your autolootitem list is full. Remove some items first with @autolootid -<item name or ID>.
-1192: Autolooting item: '%s'/'%s' {%hu}
+1192: Autolooting item: '%s'/'%s' {%u}
 1193: You're currently not autolooting this item.
-1194: Removed item: '%s'/'%s' {%hu} from your autolootitem list.
+1194: Removed item: '%s'/'%s' {%u} from your autolootitem list.
 1195: You can have %d items on your autolootitem list.
 1196: To add an item to the list, use "@alootid +<item name or ID>". To remove an item, use "@alootid -<item name or ID>".
 1197: "@alootid reset" will clear your autolootitem list.
@@ -1386,7 +1386,7 @@

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

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

@@ -1719,5 +1719,9 @@
 1511: >    HUNTING   : %d
 1512: >    PLAYTIME  : %d

+// @changegm
+1513: Currently in WoE hours, unable to delegate Guild leader
+1514: You have to wait for a while before delegating a new Guild leader
+
 //Custom translations
 import: conf/msg_conf/import/map_msg_eng_conf.txt
--- a/conf/msg_conf/map_msg_chn.conf
+++ b/conf/msg_conf/map_msg_chn.conf
@@ -96,7 +96,7 @@
 75: 公會戰還沒開始
 76: 您學會了所有技能
 77: 委託 '%s' (名字: 編號):
-78: %s: %d
+78: %s: %u
 79: 查詢到 %d 個符合條件的結果
 80: 重新讀取任務資料庫
 81: 您的GM 等級並沒有權限在這位玩家上執行這個動作
@@ -183,7 +183,7 @@
 166: 沒有道具被精練
 167: 1 個道具已被精練
 168: %d 個道具已被精練
-169: 此物品 (%d '%s')不是裝備
+169: 此物品 (%u: '%s')不是裝備
 170: 此物品不是裝備
 171: %d - 無
 //172: You replace previous memo position %d - %s (%d,%d).
@@ -500,7 +500,7 @@
 537: 玩家'%s' (account: %d) 試圖使用外掛(它試圖偵測假的怪物)
 // Trade Spoof Messages
 538: 危險交易: 玩家 '%s' (account: %d) 嘗試交易超過他所有的數量
-539: 這個使用者有%d 個物品(物品id: %d), 嘗試交易%d 個
+539: 這個使用者有%d 個物品(物品id: %u), 嘗試交易%d 個
 540: 這個使用者已經被伺服器屏蔽
 // Rare Items Drop/Steal announce
 541: '%s' 取得 %s's %s (機率為: %%%0.02f)
@@ -1042,9 +1042,9 @@
 1189: 未找到此道具。
 1190: 此道具已在自動檢取列表中了。
 1191: 自動檢取列表已經滿了，移除某些道具方法 @autolootid -<道具名稱或ID>。
-1192: 自動檢取的道具為: '%s'/'%s' {%d}。
+1192: 自動檢取的道具為: '%s'/'%s' {%u}。
 1193: 目前你尚未將此道具列入自動檢取項目中。
-1194: 已從自動檢取列表中移除道具: '%s'/'%s' {%d}。
+1194: 已從自動檢取列表中移除道具: '%s'/'%s' {%u}。
 1195: 在自動檢取列表你最多能有 %d 個檢取的項目。
 1196: 如要在自動檢取項目列表增加檢取道具，使用 "@alootid +<道具名稱或ID>", 如要從列表移除道具 "@alootid -<道具名稱或ID>"。
 1197: "@alootid reset" 將會清空所有自動檢取項目列表。
@@ -1193,7 +1193,7 @@

 // @iteminfo
 1276: 請輸入 物品名稱/ID (用法: @ii/@iteminfo <物品名稱/ID>).
-1277: 物品: '%s'/'%s'[%d] (%d) 類型: %s | 額外效果: %s
+1277: 物品: '%s'/'%s'[%d] (%u) 類型: %s | 額外效果: %s
 1278: None
 1279: With script
 1280: NPC 買價:%dz, 賣價:%dz | 重量: %.1f 
--- a/conf/msg_conf/map_msg_frn.conf
+++ b/conf/msg_conf/map_msg_frn.conf
@@ -96,7 +96,7 @@
 75: La War of Emperium n'est pas en cours.
 76: Toutes les compétences sont ajoutées à votre arbre de compétence.
 77: Résultat de '%s' (nom: id):
-78: %s: %d
+78: %s: %u
 79: %d résultats sont affichés.
 80: Veuillez donner le nom/id du montre.
 81: Votre niveau de GM ne vous autorise pas à effectuer cette action sur le Joueur spécifié.
@@ -183,7 +183,7 @@
 166: Aucun équipement n'a été raffiné.
 167: 1 objet raffiné.
 168: %d objets raffinés.
-169: L'objet (%hu: '%s') ne peut pas s'équiper.
+169: L'objet (%u: '%s') ne peut pas s'équiper.
 170: L'objet ne peut pas s'équiper.
 171: %d - void
 //172: You replace previous memo position %d - %s (%d,%d).
@@ -512,7 +512,7 @@
 537: Personnage '%s' (compte: %d) essaie d'utiliser un bot (il essaie de détecter un faux mob).
 // Trade Spoof Messages
 538: Hack sur échange: Personnage '%s' (account: %d) essaie d'échanger plus d'Objets qu'il ne possède.
-539: Ce Joueur a %d d'une sorte d'Objet (id: %hu), et tente d'en échanger %d.
+539: Ce Joueur a %d d'une sorte d'Objet (id: %u), et tente d'en échanger %d.
 540: Joueur définitivement bloqué.
 // Rare Items Drop/Steal announce
 541: '%s' obtient de %s l'Objet %s (chance: %0.02f%%)
@@ -1055,9 +1055,9 @@
 1189: Objet trouvable.
 1190: Vous ramasser déjà automatiquement cet Objet.
 1191: Votre liste d'Objet à ramasser est pleine. Supprimez des Objets avec @autolootid -<nom_ou_ID_Objet>.
-1192: Ramassage automatique de: '%s'/'%s' {%hu}
+1192: Ramassage automatique de: '%s'/'%s' {%u}
 1193: Actuellement vous ne ramassez pas automatiquement cet Objet.
-1194: Onjet supprimé: '%s'/'%s' {%hu} de votre liste de 'autolootitem'.
+1194: Onjet supprimé: '%s'/'%s' {%u} de votre liste de 'autolootitem'.
 1195: Vous pouvez avoir %d Objets dans votre liste d'Objets ramassés automatiquement avec 'autolootitem'.
 1196: Pour ajouter un Objet à votre liste, utilisez "@alootid +<nom_ou_ID_Objet>". Pour supprimer un Objet de la liste, utilisez "@alootid -<nom_ou_ID_Objet>".
 1197: "@alootid reset" videra votre liste d'Objets ramassés automatiquement avec 'autolootitem'.
@@ -1206,7 +1206,7 @@

 // @iteminfo
 1276: Entrez un nom/ID d'objet (usage: @ii/@iteminfo <nom/ID>).
-1277: Item: '%s'/'%s'[%d] (%hu) Type: %s | Extra Effect: %s
+1277: Item: '%s'/'%s'[%d] (%u) Type: %s | Extra Effect: %s
 1278: Aucun
 1279: Avec script
 1280: NPC Acheté:%dz, Vendu:%dz | Poids: %.1f 
--- a/conf/msg_conf/map_msg_grm.conf
+++ b/conf/msg_conf/map_msg_grm.conf
@@ -95,7 +95,7 @@
 75: War of Emperium ist zur Zeit nicht im Gange.
 76: Alle Fähigkeiten wurden deinem Fähigkeitenbaum hinzugefügt.
 77: Das Ergebnis der Suche nach '%s' lautet (Name: ID):
-78: %s: %d
+78: %s: %u
 79: Es wurden %d Gegenstände gefunden.
 80: Gib bitte den Anzeige-Namen oder die Monster-ID an.
 81: Dein GM-Level berechtigt dich nicht, diese Aktion auf dem angegebenen Spieler auszuführen.
@@ -182,7 +182,7 @@
 166: Kein Items sind refined.
 167: 1 Item ist refined.
 168: %d Items sind refined.
-169: Das Item (%d: '%s') ist nicht ausrüstbar.
+169: Das Item (%u: '%s') ist nicht ausrüstbar.
 170: Das Item ist nicht ausrüstbar.
 171: %d - ungültig
 //172: You replace previous memo position %d - %s (%d,%d).
@@ -438,7 +438,7 @@
 537: Charakter '%s' (account: %d) Versucht einen Bot zu benutzen (Es versucht einen fake Mob zu entlarven).
 // Trade Spoof Messages
 538: Hack bei Handel: Charakter '%s' (account: %d) versucht mit mehr Items zu Handeln als er besitzt.
-539: Dieser Spieler hat %d vom folgendem Item (id: %d), und versuchte %d von ihnen zu Handeln.
+539: Dieser Spieler hat %d vom folgendem Item (id: %u), und versuchte %d von ihnen zu Handeln.
 540: Dieser Spieler wurde definitiv blockiert.
 // Rare Items Drop/Steal announce
 541: '%s' got %s's %s (chance: %0.02f%%)
--- a/conf/msg_conf/map_msg_idn.conf
+++ b/conf/msg_conf/map_msg_idn.conf
@@ -92,7 +92,7 @@
 75: War of Emperium saat ini tidak sedang berjalan.
 76: Semua skill telah ditambahkan ke skill tree.
 77: Hasil referensi dari '%s' (nama: id):
-78: - %s: %d
+78: - %s: %u
 79: Terdapat %d hal di atas.
 80: Harap berikan nama tampilan atau nama/id monster.
 81: Level GM kamu tidak diizinkan untuk untuk melakukan aksi ini pada pemain tertentu.
@@ -179,7 +179,7 @@
 166: Tidak ada item yang ditempa.
 167: 1 item berhasil ditempa.
 168: %d item berhasil ditempa.
-169: Item (%hu: '%s') tidak bisa dipakai.
+169: Item (%u: '%s') tidak bisa dipakai.
 170: Item ini tidak bisa dipakai.
 171: %d - sudah habis
 //172: Kamu sudah mengganti posisi memo %d - %s (%d,%d).
@@ -544,7 +544,7 @@

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

 // Pesan tentang item langka yang berhasil didapatkan atau dicuri.
@@ -732,14 +732,14 @@
 707: VIP anda berlaku hingga: %s
 708: Status VIP pemain aktif hingga: %s

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

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

@@ -1146,9 +1146,9 @@
 1189: Item tidak ditemukan.
 1190: Kamu sudah mengambil secara otomatis item ini.
 1191: Daftar autolooitem penuh. Hilangkan sebagian terlebih dahulu dengan @autolootid -<nama/ID item>.
-1192: Mengambil item secara otomatis: '%s'/'%s' {%hu}
+1192: Mengambil item secara otomatis: '%s'/'%s' {%u}
 1193: Kamu saat ini sedang tidak mengambil item ini secara otomatis.
-1194: Item dihilangkan: '%s'/'%s' {%hu} dari daftar pengambilan otomatismu.
+1194: Item dihilangkan: '%s'/'%s' {%u} dari daftar pengambilan otomatismu.
 1195: Kamu hanya memiliki item %d di daftarmu.
 1196: Untuk menambahkan item ke daftar, gunakan \"@alootid +<ID atau nama item>\". Untuk menghilangkannya, gunakan \"@alootid -<ID atau nama item>\".
 1197: \"@alootid reset\" akan membersihkan daftar autolootitem.
@@ -1297,7 +1297,7 @@

 // @iteminfo
 1276: Harap masukkan nama/ID item. (Penggunaan: @ii/@iteminfo <nama/ID item>).
-1277: Item: '%s'/'%s'[%d] (%hu) Jenis: %s | Efek tambahan: %s
+1277: Item: '%s'/'%s'[%d] (%u) Jenis: %s | Efek tambahan: %s
 1278: Tidak ada
 1279: Dengan script.
 1280: NPC Harga Beli:%dz, Harga jual:%dz | Berat: %.1f 
--- a/conf/msg_conf/map_msg_por.conf
+++ b/conf/msg_conf/map_msg_por.conf
@@ -102,7 +102,7 @@
 75: A Guerra do Emperium ainda não foi iniciada.
 76: Todas as habilidades foram adicionadas à sua árvore de habilidades.
 77: O resultado da referência à '%s' (nome: id):
-78: %s: %d
+78: %s: %u
 79: Encontrado %d acima.
 80: Entre com o nome de exibição ou nome/id do monstro.
 81: Seu nível de Game Master não autoriza a realização desta ação neste personagem.
@@ -189,7 +189,7 @@
 166: Nenhum item foi refinado.
 167: 1 item foi refinado.
 168: %d itens foram refinados.
-169: O item (%hu: '%s') não é equipável.
+169: O item (%u: '%s') não é equipável.
 170: O item não é equipável.
 171: %d - vazio
 //172: Você substituiu o ponto de memorização %d - %s (%d,%d).
@@ -555,7 +555,7 @@

 // Mensagens de tentativa de Spoof em Negociações
 538: Hack em negociação: personagem '%s' (account: %d) tentou negociar mais itens que possuía.
-539: Este jogador possui %d unidades de um item (id: %hu), e tentou negociar %d destes.
+539: Este jogador possui %d unidades de um item (id: %u), e tentou negociar %d destes.
 540: Este jogador foi bloqueado indefinidamente.

 // Anúncio de drop de Itens Raros/Furtar
@@ -744,14 +744,14 @@
 707: Você é VIP até: %s
 708: O jogador agora é VIP até: %s

-709: Item %hu foi removido do seu inventário.
-710: Item %hu foi removido do seu carrinho.
-711: Item %hu foi removido do seu armazém.
+709: Item %u foi removido do seu inventário.
+710: Item %u foi removido do seu carrinho.
+711: Item %u foi removido do seu armazém.

 // Item shop
-712: Você não possui %s suficiente (%hu).
+712: Você não possui %s suficiente (%u).
 713: Você não tem '%s' suficiente.
-714: Lista de Loja de Itens: %s (%hu)
+714: Lista de Loja de Itens: %s (%u)
 715: Lista de loja de pontos: '%s'
 716: Seu '%s' agora é: %d
 // MVP EXP reward message
@@ -1225,9 +1225,9 @@
 1189: Item não encontrado.
 1190: Você já está autorrecolhendo este item.
 1191: Sua lista de autorrecolhimento está cheia. Remova alguns itens com @autolootid -<nome ou ID do item>.
-1192: Autorrecolhendo item: '%s'/'%s' {%hu}
+1192: Autorrecolhendo item: '%s'/'%s' {%u}
 1193: Você atualmente não está autorrecolhendo este item.
-1194: Removido item: '%s'/'%s' {%hu} da sua lista de autorrecolhimento.
+1194: Removido item: '%s'/'%s' {%u} da sua lista de autorrecolhimento.
 1195: Você pode possuir %d itens na sua lista de autorrecolhimento.
 1196: Para adicionar um item a lista, use "@alootid +<nome ou ID do item>". Para remover um item, use "@alootid -<nome ou ID do item>".
 1197: "@alootid reset" irá limpar a sua lista de autorrecolhimento.
@@ -1376,7 +1376,7 @@

 // @iteminfo
 1276: Digite o nome/ID de um item (uso: @ii/@iteminfo <nome do item/ID>).
-1277: Item: '%s'/'%s'[%d] (%hu) Tipo: %s | Efeito Extra: %s
+1277: Item: '%s'/'%s'[%d] (%u) Tipo: %s | Efeito Extra: %s
 1278: Nenhum
 1279: Com script
 1280: NPC Compra:%dz, Venda:%dz | Peso: %.1f 
--- a/conf/msg_conf/map_msg_rus.conf
+++ b/conf/msg_conf/map_msg_rus.conf
@@ -94,7 +94,7 @@
 75: Война за Империум в настоящее время не идёт.
 76: Все навыки добавлены в дерево умений.
 77: Результаты поиска '%s' (название: ID):
-78: %s: %d
+78: %s: %u
 79: Всего найдено %d результатов.
 80: Введите отображаемое имя или ID/название монстра.
 81: Ваши права Администратора не позволяют выполнять данное действие на указанного игрока.
@@ -181,7 +181,7 @@
 166: Ни один предмет не был заточен.
 167: 1 предмет заточен.
 168: %d предметов заточено.
-169: Предмет (%hu: '%s') невозможно надеть.
+169: Предмет (%u: '%s') невозможно надеть.
 170: Предмет невозможно надеть.
 171: %d - пусто
 //172: НЕ ИСПОЛЬЗУЕТСЯ
@@ -512,7 +512,7 @@
 537: Персонаж '%s' (account: %d) пытается использовать бота (попытка определения поддельного монстра).
 // Сообщения о хаках при торгах
 538: Хак при торге: персонаж '%s' (account: %d) попытался выменять больше предметов чем у него есть.
-539: У игрока есть %d штук (id: %hu), и пытался выменять %d из них.
+539: У игрока есть %d штук (id: %u), и пытался выменять %d из них.
 540: Этот игрок был навсегда заблокирован.
 // Объявления о выбивании/краже редких предметов
 541: '%s' выбил %s's %s (шанс: %0.02f%%)
@@ -1055,9 +1055,9 @@
 1189: Предмет не найден.
 1190: Этот предмет вы уже собираете автоматически.
 1191: Список автоматической сборки полон. Удалите некоторые предметы через команду @autolootid -<ID/название предмета>.
-1192: Автоматическое поднятие предмета: '%s'/'%s' {%hu}
+1192: Автоматическое поднятие предмета: '%s'/'%s' {%u}
 1193: Этот предмет вы не собираете автоматически.
-1194: Предмет: '%s'/'%s' {%hu} удалён из списка автоматической сборки предметов.
+1194: Предмет: '%s'/'%s' {%u} удалён из списка автоматической сборки предметов.
 1195: Вы можете иметь %d предметов в списке автоматической сборки предметов.
 1196: Чтобы добавить предмет в список используйте "@alootid +<ID/название предмета>". Чтобы удалить предмет из списка: "@alootid -<ID/название предмета>".
 1197: Команда "@alootid reset" очистит список.
@@ -1206,7 +1206,7 @@

 // @iteminfo
 1276: Введите ID/название предмета (Использование: @ii/@iteminfo <ID/название предмета>).
-1277: Предмет: '%s'/'%s'[%d] (%hu) Тип: %s | Доп. эффект: %s
+1277: Предмет: '%s'/'%s'[%d] (%u) Тип: %s | Доп. эффект: %s
 1278: Пусто
 1279: Скрипт
 1280: НИП покупка:%d зени, продажа:%d зени | Вес: %.1f 
--- a/conf/msg_conf/map_msg_spn.conf
+++ b/conf/msg_conf/map_msg_spn.conf
@@ -92,7 +92,7 @@
 75: En estos momentos no hay ninguna guerra de clanes.
 76: Se han añadido todas las habilidades a tu árbol de habilidades.
 77: Estos son los resultados de la búsqueda de '%s' (nombre: ID):
-78: %s: %d
+78: %s: %u
 79: Total de resultados: %d
 80: Debes introducir el nombre del monstruo o su ID.
 81: Tu nivel de GM no te permite utilizar este comando en ese jugador.
@@ -179,7 +179,7 @@
 166: No se ha refinado ningún objeto.
 167: Se ha refinado 1 objeto.
 168: Se han refinado %d objetos.
-169: El objeto (%hu: '%s') no puede ser equipado.
+169: El objeto (%u: '%s') no puede ser equipado.
 170: No puedes equiparte ese objeto.
 171: %d - vacío
 //172: Has reemplazado tu lugar memorizado %d - %s (%d,%d).
@@ -545,7 +545,7 @@

 // Mensajes del sistema de intercambio de objetos
 538: Se ha detectado una irregularidad en el intercambio de objetos del personaje '%s' (cuenta: %d), está intentando intercambiar más de lo que tiene.
-539: Ese jugador tiene %d unidades del objeto (id: %hu), pero ha intentado intercambiar %d.
+539: Ese jugador tiene %d unidades del objeto (id: %u), pero ha intentado intercambiar %d.
 540: Ese jugador ha sido bloqueado.

 // Anuncios de consecución de objetos poco comunes y robos de objetos.
@@ -733,14 +733,14 @@
 707: Serás VIP hasta: %s
 708: El jugador será VIP hasta: %s

-709: El objeto %hu ha sido eliminado de tu inventario.
-710: El objeto %hu ha sido eliminado de tu carro.
-711: El objeto %hu ha sido eliminado de tu almacén.
+709: El objeto %u ha sido eliminado de tu inventario.
+710: El objeto %u ha sido eliminado de tu carro.
+711: El objeto %u ha sido eliminado de tu almacén.

 // Item shop
-712: No tienes suficientes %s (%hu).
+712: No tienes suficientes %s (%u).
 713: No tienes suficientes '%s'.
-714: Listado de la tienda de objetos: %s (%hu)
+714: Listado de la tienda de objetos: %s (%u)
 715: Listado de puntos de la tienda: '%s'
 716: Tu '%s' ahora es: %d

@@ -1194,9 +1194,9 @@
 1189: Ese objeto no existe.
 1190: Ese objeto ya estaba programado para ser recogido automáticamente.
 1191: Tu lista de recogida de objetos de forma automática está llena. Elimina alguno de esos objetos con @autolootid <nombre/ID del objeto>.
-1192: Recogiendo: '%s'/'%s' {%hu}
+1192: Recogiendo: '%s'/'%s' {%u}
 1193: No estás recogiendo ese objeto.
-1194: Has eliminado '%s'/'%s' {%hu} de tu lista de recogida de objetos.
+1194: Has eliminado '%s'/'%s' {%u} de tu lista de recogida de objetos.
 1195: Puedes almacenar %d objetos en tu lista de recogida de objetos.
 1196: Para añadir un nuevo objeto a la lista utiliza @alootid +<nombre/ID del objeto>. Para eliminar un objeto utiliza @alootid -<nombre/ID del objeto>.
 1197: "@alootid reset" reiniciará tu lista de recogida de objetos.
@@ -1345,7 +1345,7 @@

 // @iteminfo
 1276: Introduce el nombre/ID de un objeto (instrucciones: @ii/@iteminfo <nombre/ID del objeto>).
-1277: Objeto: '%s'/'%s'[%d] (%hu) Tipo: %s | Efecto: %s
+1277: Objeto: '%s'/'%s'[%d] (%u) Tipo: %s | Efecto: %s
 1278: Ninguno
 1279: Contiene código
 1280: Compra en NPC:%dz, Venta:%dz | Peso: %.1f
@@ -1666,5 +1666,9 @@
 1503: Has entrado en una zona PK.
 1504: Has entrado en una zona PK (segura hasta el nivel %d).

+// @changegm
+1513: No puedes delegar el liderazgo del clan durante el horario de WoE
+1514: Debes esperar un tiempo antes de poder designar un nuevo líder de clan
+
 //Traducciones personalizadas
 import: conf/msg_conf/import/map_msg_spn_conf.txt
--- a/conf/msg_conf/map_msg_tha.conf
+++ b/conf/msg_conf/map_msg_tha.conf
@@ -96,7 +96,7 @@
 75: War of Emperium ה<>טה´י·<D799>§<EFBFBD>¹<EFBFBD><C2B9><EFBFBD>טד¹¢³<C2A2>¹<EFBFBD>י.
 76: ·<><C2B7> Skill ה´י¶<D799><C2B6>א¾<D790>ט<EFBFBD>÷¹µ<C2B9><C2B5><EFBFBD><EFBFBD>¤<EFBFBD>¤<EFBFBD>³א<C2B3><D790><EFBFBD>÷<EFBFBD>י<EFBFBD><D799>ב<EFBFBD>י<EFBFBD>.
 77: ¼<><C2BC><EFBFBD>¾¸ל<C2B8><D79C><EFBFBD>¤י¹<D799><C2B9>ג´<D792><C2B4>י<EFBFBD>§<EFBFBD><C2A7>§¨<C2A7><C2A8> '%s' (×<>ט<EFBFBD>: <20><><EFBFBD><EFBFBD>):
-78: %s: %d
+78: %s: %u
 79: ¼<><C2BC><EFBFBD>¾¸ל %d ¢י<C2A2>§µי¹.
 80: <20><><EFBFBD>³<EFBFBD><C2B3><EFBFBD>÷<EFBFBD>×<EFBFBD>ט<EFBFBD> Monster <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> Monster.
 81: <20><>´<EFBFBD>÷ GM ¢<>§¤<C2A7>³ ה<>טה´י<C2B4><D799>÷<EFBFBD>¹<EFBFBD><EFBFBD>µד<C2B5>י¤<D799>³<EFBFBD><C2B3><EFBFBD><EFBFBD><EFBFBD>¶´<C2B6>א¹<D790>¹<EFBFBD><C2B9><EFBFBD><EFBFBD><EFBFBD>÷µ<C3B7><C2B5><EFBFBD><EFBFBD>¤<EFBFBD>·<EFBFBD>ט<EFBFBD><D798>÷<EFBFBD>ה´י.
@@ -183,7 +183,7 @@
 166: ה<>ט<EFBFBD><D798> Item ·<>טה´י<C2B4><D799>÷<EFBFBD><C3B7><EFBFBD><EFBFBD><EFBFBD>¾א<C2BE><D790>µ.
 167: <20><> 1 Item ·<>טה´י<C2B4><D799>÷<EFBFBD><C3B7><EFBFBD><EFBFBD><EFBFBD>¾א<C2BE><D790>µ.
 168: <20><> %d Item ·<>טה´י<C2B4><D799>÷<EFBFBD><C3B7><EFBFBD><EFBFBD><EFBFBD>¾א<C2BE><D790>µ.
-169: Item (%hu: '%s') ¹<>יה<D799>טד×ט<C397><D798>»<EFBFBD><C2BB>³ל<C2B3><D79C><EFBFBD>ד<EFBFBD>ט.
+169: Item (%u: '%s') ¹<>יה<D799>טד×ט<C397><D798>»<EFBFBD><C2BB>³ל<C2B3><D79C><EFBFBD>ד<EFBFBD>ט.
 170: ה<>ט¾÷ Item ×<>י¹¹<C2B9>יד¹°<C2B9>¹¢י<C2A2><D799><EFBFBD><EFBFBD>.
 171: %d - <20>ט<EFBFBD>§
 //172: You replace previous memo position %d - %s (%d,%d).
@@ -506,7 +506,7 @@
 537: µ<><C2B5><EFBFBD><EFBFBD>¤<EFBFBD> '%s' (account: %d) ¾<><C2BE><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD>ט¨<D798>ד×י bot (<28><>¹¾<C2B9><C2BE><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD>ט¨<D798>µ<EFBFBD><C2B5>¨¾÷ monster »<><C2BB><EFBFBD>).
 // Trade Spoof Messages
 538: Hack on trade: µ<><C2B5><EFBFBD><EFBFBD>¤<EFBFBD> '%s' (account: %d) ¾<><C2BE><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD>ט¨<D798>ב<EFBFBD><D791>א»<D790><C2BB>ט<EFBFBD>¹ item ¨<>¹<EFBFBD>¹<EFBFBD><C2B9><EFBFBD><EFBFBD><EFBFBD>ט<EFBFBD>·<EFBFBD>ט<EFBFBD><D798><EFBFBD><EFBFBD><EFBFBD>ט.
-539: ¼<>יא<D799>ט¹<D798><C2B9> item ¨<>¹<EFBFBD>¹ %d (id: %hu), ב<><D791>¾<EFBFBD><C2BE><EFBFBD><EFBFBD><EFBFBD>¨<EFBFBD>ב<EFBFBD><D791>א»<D790><C2BB>ט<EFBFBD>¹ד¹¨<C2B9>¹<EFBFBD>¹ %d.
+539: ¼<>יא<D799>ט¹<D798><C2B9> item ¨<>¹<EFBFBD>¹ %d (id: %u), ב<><D791>¾<EFBFBD><C2BE><EFBFBD><EFBFBD><EFBFBD>¨<EFBFBD>ב<EFBFBD><D791>א»<D790><C2BB>ט<EFBFBD>¹ד¹¨<C2B9>¹<EFBFBD>¹ %d.
 540: ¼<>יא<D799>ט¹¹<C2B9>י¶<D799><C2B6><EFBFBD>י<EFBFBD><D799>ב<EFBFBD><D791>א»<D790><C2BB>ט<EFBFBD>¹.
 // Rare Items Drop/Steal announce
 541: '%s' א<>ח÷ %s's %s (ג<><D792><EFBFBD><EFBFBD>: %0.02f%%)
@@ -1048,9 +1048,9 @@
 1189: ה<>ט¾÷ Item ´<>§<EFBFBD><C2A7>ט<EFBFBD><D798>.
 1190: ¤<>³ה´י÷<D799>¹·<C2B9><C2B7> item ¹<>י<EFBFBD>§ד¹<D793><C2B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ה»א<C2BB><D790><EFBFBD>÷<EFBFBD>י<EFBFBD><D799>ב<EFBFBD>י<EFBFBD>.
 1191: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> autolootitem ¢<>§¤<C2A7>³אµח<C2B5>ב<EFBFBD>י<EFBFBD>. <20>÷ item ÷<>§<EFBFBD><C2A7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ט<EFBFBD>¹´י<C2B4><D799> @autolootid -<×<>ט<EFBFBD>/ID item>.
-1192: ÷<>¹·<C2B9><C2B7> item : '%s'/'%s' {%hu} <20>§<EFBFBD><C2A7><EFBFBD><EFBFBD><EFBFBD><EFBFBD> autolootitem ¢<>§¤<C2A7>³.
+1192: ÷<>¹·<C2B9><C2B7> item : '%s'/'%s' {%u} <20>§<EFBFBD><C2A7><EFBFBD><EFBFBD><EFBFBD><EFBFBD> autolootitem ¢<>§¤<C2A7>³.
 1193: ¤<>³ה<C2B3>טה´י÷<D799>¹·<C2B9><C2B7> item ¹<>י<EFBFBD>§ד¹<D793><C2B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>טב<D798>י<EFBFBD>.
-1194: <20>÷ item : '%s'/'%s' {%hu} ¨<><C2A8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> autolootitem ¢<>§¤<C2A7>³.
+1194: <20>÷ item : '%s'/'%s' {%u} ¨<><C2A8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> autolootitem ¢<>§¤<C2A7>³.
 1195: ¤<>³<EFBFBD><C2B3><EFBFBD><EFBFBD><EFBFBD>¶÷<C2B6>¹·<C2B9><C2B7>ה´י %d item ד¹<D793><C2B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> autolootitem.
 1196: ד¹<D793><C2B9><EFBFBD>א¾<D790>ט<EFBFBD><D798><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, ד×י "@alootid +<×<>ט<EFBFBD>/ID item>". ד¹<D793><C2B9><EFBFBD><EFBFBD>÷<EFBFBD><C3B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, ד×י "@alootid -<×<>ט<EFBFBD>/ID item>".
 1197: "@alootid reset" ד¹<D793><C2B9><EFBFBD><EFBFBD>י<EFBFBD>§<EFBFBD><C2A7><EFBFBD><EFBFBD><EFBFBD><EFBFBD> autolootitem ¢<>§¤<C2A7>³.
@@ -1199,7 +1199,7 @@

 // @iteminfo
 1276: ג»<D792>´<EFBFBD><C2B4>÷<EFBFBD>×<EFBFBD>ט<EFBFBD>/ID item (<28><>¸<EFBFBD>ד×י: @ii/@iteminfo <×<>ט<EFBFBD>/ID item>).
-1277: Item: '%s'/'%s'[%d] (%hu) Type: %s | Extra Effect: %s
+1277: Item: '%s'/'%s'[%d] (%u) Type: %s | Extra Effect: %s
 1278: None
 1279: With script
 1280: NPC Buy:%dz, Sell:%dz | Weight: %.1f
--- a/db/const.txt
+++ b/db/const.txt
@@ -48,7 +48,7 @@ RDMOPT_ATTR_TOLERACE_SAINT	31
 RDMOPT_ATTR_TOLERACE_DARKNESS	32
 RDMOPT_ATTR_TOLERACE_TELEKINESIS	33
 RDMOPT_ATTR_TOLERACE_UNDEAD	34
-RDMOPT_ATTR_TOLERACE_ALL	35
+RDMOPT_ATTR_TOLERACE_ALLBUTNOTHING	35
 RDMOPT_DAMAGE_PROPERTY_NOTHING_USER	36
 RDMOPT_DAMAGE_PROPERTY_NOTHING_TARGET	37
 RDMOPT_DAMAGE_PROPERTY_WATER_USER	38
@@ -99,7 +99,7 @@ RDMOPT_BODY_ATTR_SAINT	82
 RDMOPT_BODY_ATTR_DARKNESS	83
 RDMOPT_BODY_ATTR_TELEKINESIS	84
 RDMOPT_BODY_ATTR_UNDEAD	85
-RDMOPT_BODY_ATTR_ALL	86
+//RDMOPT_BODY_ATTR_ALL	86
 RDMOPT_RACE_TOLERACE_NOTHING	87
 RDMOPT_RACE_TOLERACE_UNDEAD	88
 RDMOPT_RACE_TOLERACE_ANIMAL	89
@@ -186,8 +186,8 @@ RDMOPT_HEAL_MODIFY_PERCENT	169
 RDMOPT_DEC_SPELL_CAST_TIME	170
 RDMOPT_DEC_SPELL_DELAY_TIME	171
 RDMOPT_DEC_SP_CONSUMPTION	172
-RDMOPT_HP_DRAIN	173
-RDMOPT_SP_DRAIN	174
+//RDMOPT_HP_DRAIN	173
+//RDMOPT_SP_DRAIN	174
 RDMOPT_WEAPON_ATTR_NOTHING	175
 RDMOPT_WEAPON_ATTR_WATER	176
 RDMOPT_WEAPON_ATTR_GROUND	177
@@ -206,7 +206,44 @@ RDMOPT_MDAMAGE_SIZE_LARGE_TARGET	189
 RDMOPT_MDAMAGE_SIZE_SMALL_USER	190
 RDMOPT_MDAMAGE_SIZE_MIDIUM_USER	191
 RDMOPT_MDAMAGE_SIZE_LARGE_USER	192
-//RDMOPT_ATTR_TOLERACE_ALL	193
+RDMOPT_ATTR_TOLERACE_ALL	193
+RDMOPT_RACE_WEAPON_TOLERACE_NOTHING	194
+RDMOPT_RACE_WEAPON_TOLERACE_UNDEAD	195
+RDMOPT_RACE_WEAPON_TOLERACE_ANIMAL	196
+RDMOPT_RACE_WEAPON_TOLERACE_PLANT	197
+RDMOPT_RACE_WEAPON_TOLERACE_INSECT	198
+RDMOPT_RACE_WEAPON_TOLERACE_FISHS	199
+RDMOPT_RACE_WEAPON_TOLERACE_DEVIL	200
+RDMOPT_RACE_WEAPON_TOLERACE_HUMAN	201
+RDMOPT_RACE_WEAPON_TOLERACE_ANGEL	202
+RDMOPT_RACE_WEAPON_TOLERACE_DRAGON	203
+//RDMOPT_RANGE_WEAPON_ATTACK_DAMAGE_TARGET	204
+//RDMOPT_RANGE_WEAPON_ATTACK_DAMAGE_USER	205
+RDMOPT_RACE_TOLERACE_PLAYER_HUMAN	206
+RDMOPT_RACE_TOLERACE_PLAYER_DORAM	207
+RDMOPT_RACE_DAMAGE_PLAYER_HUMAN	208
+RDMOPT_RACE_DAMAGE_PLAYER_DORAM	209
+RDMOPT_RACE_MDAMAGE_PLAYER_HUMAN	210
+RDMOPT_RACE_MDAMAGE_PLAYER_DORAM	211
+RDMOPT_RACE_CRI_PERCENT_PLAYER_HUMAN	212
+RDMOPT_RACE_CRI_PERCENT_PLAYER_DORAM	213
+RDMOPT_RACE_IGNORE_DEF_PERCENT_PLAYER_HUMAN	214
+RDMOPT_RACE_IGNORE_DEF_PERCENT_PLAYER_DORAM	215
+RDMOPT_RACE_IGNORE_MDEF_PERCENT_PLAYER_HUMAN	216
+RDMOPT_RACE_IGNORE_MDEF_PERCENT_PLAYER_DORAM	217
+//RDMOPT_REFLECT_DAMAGE_PERCENT	218
+RDMOPT_MELEE_ATTACK_DAMAGE_TARGET	219
+RDMOPT_MELEE_ATTACK_DAMAGE_USER	220
+//RDMOPT_ADDSKILLMDAMAGE_NOTHING	221
+//RDMOPT_ADDSKILLMDAMAGE_WATER	222
+//RDMOPT_ADDSKILLMDAMAGE_GROUND	223
+//RDMOPT_ADDSKILLMDAMAGE_FIRE	224
+//RDMOPT_ADDSKILLMDAMAGE_WIND	225
+//RDMOPT_ADDSKILLMDAMAGE_POISON	226
+//RDMOPT_ADDSKILLMDAMAGE_SAINT	227
+//RDMOPT_ADDSKILLMDAMAGE_DARKNESS	228
+//RDMOPT_ADDSKILLMDAMAGE_TELEKINESIS	229
+//RDMOPT_ADDSKILLMDAMAGE_UNDEAD	230

 SWORDCLAN	1
 ARCWANDCLAN	2
--- a/db/import-tmpl/job_exp.txt
+++ b/db/import-tmpl/job_exp.txt
@@ -20,3 +20,57 @@

 //Job - Renewal 255 Levels
 //60,x,1,112000,355000,615000,917000,1253000,1595000,2007000,2430000,2868000,3420000,3863000,4504000,4998000,5769000,6321000,7254000,7870000,9015000,9530000,11072000,11848000,13467000,14337000,16243000,17216000,19446000,20781000,23070000,24453000,27568000,29118000,31820000,34125000,37048000,40204000,42972000,45937000,49110000,52696000,57158000,61305000,67167000,72285000,77647000,83624000,91113000,98548000,107630000,119077000,131668000,145518000,160753000,177511000,195944000,216220000,238523000,263056000,290042000,319726000,324726000,329726000,334726000,339726000,344726000,349726000,354726000,359726000,364726000,369726000,374726000,379726000,384726000,389726000,394726000,399726000,404726000,409726000,414726000,419726000,424726000,429726000,434726000,439726000,444726000,449726000,454726000,459726000,464726000,469726000,474726000,479726000,484726000,489726000,494726000,499726000,504726000,509726000,514726000,519726000,524726000,529726000,534726000,539726000,544726000,549726000,554726000,559726000,564726000,569726000,574726000,579726000,584726000,589726000,594726000,599726000,604726000,609726000,614726000,619726000,624726000,629726000,634726000,639726000,644726000,649726000,654726000,659726000,664726000,669726000,674726000,679726000,684726000,689726000,694726000,699726000,704726000,709726000,714726000,719726000,724726000,729726000,734726000,739726000,744726000,749726000,754726000,759726000,764726000,769726000,774726000,779726000,784726000,789726000,794726000,799726000,804726000,809726000,814726000,819726000,824726000,829726000,834726000,839726000,844726000,849726000,854726000,859726000,864726000,869726000,874726000,879726000,884726000,889726000,894726000,899726000,904726000,909726000,914726000,919726000,924726000,929726000,934726000,939726000,944726000,949726000,954726000,959726000,964726000,969726000,974726000,979726000,984726000,989726000,994726000,999726000,1004726000,1009726000,1014726000,1019726000,1024726000,1029726000,1034726000,1039726000,1044726000,1049726000,1054726000,1059726000,1064726000,1069726000,1074726000,1079726000,1084726000,1089726000,1094726000,1099726000,1104726000,1109726000,1114726000,1119726000,1124726000,1129726000,1134726000,1139726000,1144726000,1149726000,1154726000,1159726000,1164726000,1169726000,1174726000,1179726000,1184726000,1189726000,1194726000,1199726000,1204726000,1209726000,1214726000,1219726000,1224726000,1229726000,1234726000,1239726000,1244726000,1249726000,1254726000,1259726000,1264726000,1269726000,1274726000,1279726000,1284726000,1289726000,1294726000,1299726000
+
+
+// RENEWAL 175/60 (before kRO Updates to 185/65)
+// =============================================
+////Base - Normal and Baby Jobs
+//99,0:1:2:3:4:5:6:7:8:9:10:11:12:13:14:15:16:17:18:19:20:21:23:24:25:4023:4024:4025:4026:4027:4028:4029:4030:4031:4032:4033:4034:4035:4036:4037:4038:4039:4040:4041:4042:4043:4044:4045:4046:4047:4048:4049:4050:4051:4052:4222:4225:4226:4227:4228:4238,0,550,900,1500,2200,3200,3800,4200,4550,5000,5500,6000,6100,6350,6700,7350,8000,8400,8800,9200,9700,10300,11000,11800,13000,14000,15000,16000,17000,18000,19000,20000,21000,22000,23200,24000,26000,27500,29000,30000,31500,33000,34000,36000,37500,38000,40000,42000,44500,47000,49000,51000,53000,55000,57000,59000,61500,63000,65000,67000,69000,70000,73000,77000,80000,84000,88000,91000,95000,110000,128000,140000,155000,163000,170000,180000,188000,195000,200000,230000,260000,300000,350000,400000,480000,550000,600000,680000,750000,900000,1000000,1200000,1500000,1800000,2100000,2400000,2800000,3300000,4000000,99999999
+//
+////Base - Adv Jobs
+//99,4001:4002:4003:4004:4005:4006:4007:4008:4009:4010:4011:4012:4013:4014:4015:4016:4017:4018:4019:4020:4021:4022,0,660,1080,1800,2640,3840,4560,5040,5460,6000,6600,7200,7320,7620,8040,8820,9600,10080,10560,11040,12610,13390,14300,15340,16900,18460,19500,20800,22100,23400,24700,26000,27300,28600,30160,31200,33800,35750,37700,39000,44100,46200,47600,50400,52500,53200,56000,58800,62300,65800,68600,71400,74200,77000,79800,82600,86100,88200,91000,93800,103500,105000,109500,115500,120000,126000,132000,136500,142500,165000,192000,210000,232500,244500,255000,270000,282000,292500,300000,345000,416000,480000,560000,640000,768000,880000,960000,1088000,1200000,1440000,1700000,2040000,2550000,3060000,3570000,4080000,4760000,5610000,6800000,99999999
+//
+////Base - 3rd Jobs, Baby 3rds, Oboro/Kagerou, Rebellion, Summoner, Star Emperor, Soul Reaper
+////Note: (First 98 values [Level 1 - 98] are only used by Summoner Class, because 3rd classes start at level 99.)
+//175,4054:4055:4056:4057:4058:4059:4060:4061:4062:4063:4064:4065:4066:4067:4068:4069:4070:4071:4072:4073:4074:4075:4076:4077:4078:4079:4080:4081:4082:4083:4084:4085:4086:4087:4096:4097:4098:4099:4100:4101:4102:4103:4104:4105:4106:4107:4108:4109:4110:4111:4112:4211:4212:4215:4218:4220:4223:4224:4229:4239:4240:4241:4242:4243:4244,0,55,90,150,220,320,380,420,455,500,600,700,800,900,1000,1100,1200,1300,1400,1500,1800,2100,2400,2700,3000,3300,3600,3900,4200,4500,5400,6300,7200,8100,9000,9900,10800,11700,12600,13500,16200,18900,21600,24300,27000,29700,32400,35100,37800,40500,43200,45900,48600,51300,54000,56700,59400,62100,64800,67500,75600,83700,91800,99900,108000,116100,124200,132300,140400,165000,192000,210000,232500,244500,255000,270000,282000,292500,300000,345000,416000,480000,560000,640000,768000,880000,960000,1088000,1200000,1440000,1700000,2040000,2550000,3060000,3570000,4080000,4760000,5610000,6800000,7070000,7400000,7770000,8150000,8550000,9100000,9610000,10150000,10570000,11180000,12000000,12200000,12930000,13150000,14030000,14420000,15420000,15670000,16870000,17140000,18720000,19020000,20590000,20930000,22690000,23310000,25290000,26020000,27860000,28535000,30990000,31680000,33560000,34942000,36372000,38350000,39890000,41545000,43330000,45400000,48100000,50410000,53370000,56250000,59230000,62590000,66120000,70200000,75330000,81100000,95000000,98000000,103000000,107000000,112000000,116000000,121000000,125000000,130000000,134000000,139000000,145000000,152200000,160840000,171200000,191930000,202290000,214720000,229640000,247550000,283370000,301280000,322770000,348560000,379500000,441390000,99999999
+//
+////Base - Expanded Super Novice & Expanded Super Baby
+//160,4190:4191,0,660,1080,1800,2640,3840,4560,5040,5460,6000,6600,7200,7320,7620,8040,8820,9600,10080,10560,11040,12610,13390,14300,15340,16900,18460,19500,20800,22100,23400,24700,26000,27300,28600,30160,31200,33800,35750,37700,39000,44100,46200,47600,50400,52500,53200,56000,58800,62300,65800,68600,71400,74200,77000,79800,82600,86100,88200,91000,93800,103500,105000,109500,115500,120000,126000,132000,136500,142500,165000,192000,210000,232500,244500,255000,270000,282000,292500,300000,345000,416000,480000,560000,640000,768000,880000,960000,1088000,1200000,1440000,1700000,2040000,2550000,3060000,3570000,4080000,4760000,5610000,6800000,7070000,7400000,7770000,8150000,8550000,9100000,9610000,10150000,10570000,11180000,12000000,12200000,12930000,13150000,14030000,14420000,15420000,15670000,16870000,17140000,18720000,19020000,20590000,20930000,22690000,23310000,25290000,26020000,27860000,28535000,30990000,31680000,33560000,34942000,36372000,38350000,39890000,41545000,43330000,45400000,48100000,50410000,53370000,56250000,59230000,62590000,66120000,70200000,75330000,81100000,95000000,98000000,103000000,107000000,112000000,116000000,121000000,125000000,130000000,134000000,139000000,145000000,152200000,160840000,171200000,191930000,202290000,214720000,229640000,247550000,283370000,301280000,322770000,348560000,379500000,441390000,99999999
+//
+////Job - Novice & Baby Novice
+//10,0:4023,1,10,18,28,40,91,151,205,268,340,999999999
+//
+////Job - 1st Classes & Baby 1st Classes, Taekwon
+//50,1:2:3:4:5:6:4024:4025:4026:4027:4028:4029:4046:4050:4225,1,60,130,260,460,780,1060,1300,1560,1910,2290,2680,2990,3340,3740,4360,4970,5530,6120,6700,8090,8920,9970,11080,12690,14440,15850,17400,19220,21060,22870,24910,26840,29080,31320,33300,37110,40500,43570,46180,53510,57200,60310,65690,70090,72130,77540,83320,90120,97180,999999999
+//
+////Job - 2nd Classes & Baby 2nd Classes, Soul Linker
+//50,7:8:9:10:11:12:13:14:15:16:17:18:19:20:21:4030:4031:4032:4033:4034:4035:4036:4037:4038:4039:4040:4041:4042:4043:4044:4049:4051:4052:4227,1,2500,4200,7000,10300,15900,18900,20900,22600,24900,28800,31500,32000,33300,35100,40500,44100,46300,48500,50700,56000,59400,63500,68100,75000,85700,90500,96600,102600,108600,119700,126000,132300,138600,146100,157500,170600,180400,190300,196800,214900,225200,232000,245700,255900,279300,294000,308700,327000,345400,999999999
+//
+////Job - Novice High
+//10,4001,1,11,20,31,44,100,166,226,295,374,999999999
+//
+////Job - Adv First Classes
+//50,4002:4003:4004:4005:4006:4007,1,100,200,350,550,800,1100,1450,1850,2300,2800,3350,3950,4600,5300,6050,6850,7700,8600,9550,10550,11600,12700,13850,15050,16300,17600,18950,20350,21800,23300,24850,26450,28100,29800,31550,33350,35200,37100,39050,41050,43100,45200,47350,49550,51800,54100,56450,58850,61300,999999999
+//
+////Job - Adv Second Classes
+//70,4008:4009:4010:4011:4012:4013:4014:4015:4016:4017:4018:4019:4020:4021:4022,1,3800,6200,10400,15200,22900,27100,30000,32500,35700,41300,45000,45800,47600,50300,58700,63900,67100,70300,73500,90600,96200,102700,110200,121400,144700,152900,163100,173300,183500,213500,224700,236000,247200,260700,299800,324800,343600,362300,374800,474400,497000,512100,542200,564800,644300,678200,712100,754500,796900,873100,911900,950600,989400,1028100,1143300,1199900,1233800,1279100,1324300,1486900,1515900,1603000,1719200,1806300,2040300,2244300,2415900,2746000,3326000,999999999
+//
+////Job - 3rd Jobs & Baby 3rds, Oboro/Kagerou, Rebellion, Star Emperor, Soul Reaper
+//60,4054:4055:4056:4057:4058:4059:4060:4061:4062:4063:4064:4065:4066:4067:4068:4069:4070:4071:4072:4073:4074:4075:4076:4077:4078:4079:4080:4081:4082:4083:4084:4085:4086:4087:4096:4097:4098:4099:4100:4101:4102:4103:4104:4105:4106:4107:4108:4109:4110:4111:4112:4211:4212:4215:4223:4224:4229:4239:4240:4241:4242:4243:4244,1,112000,355000,615000,917000,1253000,1595000,2007000,2430000,2868000,3420000,3863000,4504000,4998000,5769000,6321000,7254000,7870000,9015000,9530000,11072000,11848000,13467000,14337000,16243000,17216000,19446000,20781000,23070000,24453000,27568000,29118000,31820000,34125000,37048000,40204000,42972000,45937000,49110000,52696000,57158000,61305000,67167000,72285000,77647000,83624000,91113000,98548000,107630000,119077000,131668000,145518000,160753000,177511000,195944000,216220000,238523000,263056000,290042000,319726000,999999999
+//
+////Job - Expanded Super Novice & Expanded Super Baby
+//50,4190:4191,1,112000,355000,615000,917000,1253000,1595000,2007000,2430000,2868000,3420000,3863000,4504000,4998000,5769000,6321000,7254000,7870000,9015000,9530000,11072000,11848000,13467000,14337000,16243000,17216000,19446000,20781000,23070000,24453000,27568000,29118000,31820000,34125000,37048000,40204000,42972000,45937000,49110000,52696000,57158000,61305000,67167000,72285000,77647000,83624000,91113000,98548000,107630000,119077000,999999999
+//
+////Job - Ninja/Gunslinger
+//70,24:25:4222:4228,1,200,300,400,600,700,1000,1200,1400,1700,1900,2400,2700,3200,3600,4200,4900,5500,6100,6900,7700,8400,9300,10100,11100,12100,13000,14600,16100,17500,18600,21500,23300,24700,27000,29000,30000,32400,35000,38100,41100,44000,46700,49600,52500,55600,58900,62700,65500,69200,72300,81200,84100,89300,95500,100900,107800,114900,120700,128600,150500,176900,196100,219600,234200,247900,266400,281300,296600,308000,999999999
+//
+////Job - Star Gladiator
+//50,4047:4048:4226:4238,1,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,101400,112000,118800,127000,136200,150000,171400,181000,193200,205200,217200,239400,252000,264600,277200,292200,315000,341200,360800,380600,393600,429800,450400,464000,491400,511800,558600,588000,617400,654000,690800,999999999
+//
+////Job - Super Novice & Baby Super Novice
+//99,23:4045,1,60,130,260,460,780,1060,1300,1560,1910,2290,2680,2990,3340,3740,4360,4970,5530,6120,6700,8090,8920,9970,11080,12690,14440,15850,17400,19220,21060,22870,24910,26840,29080,31320,33300,37110,40500,43570,46180,53510,57200,60310,65690,70090,72130,77540,83320,90120,97180,590120,600120,610120,620120,630120,640120,650120,660120,670120,680120,690120,700120,710120,720120,730120,740120,750120,760120,770120,780120,790120,800120,810120,820120,830120,840120,850120,860120,870120,880120,890120,900120,910120,920120,930120,940120,950120,960120,970120,980120,990120,1000120,1010120,1020120,1030120,1040120,1050120,1060120,1070120,999999999
+//
+////Job - Summoner
+//50,4218:4220,1,60,130,260,460,780,1060,1300,1560,1910,2500,4200,7000,10300,15900,18900,20900,22600,24900,28800,31500,34900,38300,41700,45100,48500,51900,55000,72000,89000,106000,112000,355000,615000,917000,1253000,1595000,2007000,2430000,2868000,3420000,3863000,4504000,4998000,5769000,6321000,7254000,7870000,9015000,9530000,999999999
+
+
--- a/db/import-tmpl/quest_db.yml
+++ b/db/import-tmpl/quest_db.yml
@@ -30,8 +30,18 @@
 #                   Specify without "+" for the exact time the quest expires using "d" (optionnal), [0-23]"h" (required), [0-59]"mn" (optionnal), [0-59]"s" (optionnal) format.
 #                   Please note the number before "d" only shift the exact timer to the given day(s).
 #   Targets:        Quest objective target. (Default: null)
-#     - Mob         Monster to kill.
-#       Count       Amount of monsters to kill.
+#                   The target can be a couple of node Mob/Count or of Id/Race/Size/Element/MinLevel/MaxLevel.
+#                   If Mob is supplied, Count is required and the other fields are ignored.
+#                   If Id is supplied, at least one other field of Race/Size/Element/MinLevel/MaxLevel is required.
+#                   If Id is supplied, Count is required for each new entry.
+#     - Mob         Monster to kill (aegis monster name).
+#       Count       Amount of monsters to kill. Set to 0 to skip the target on import.
+#       Id          Unique target index for the quest Id. Requires a positive number.
+#       Race        Monster race target (default All). Valids race are Angel, Brute, DemiHuman, Demon, Dragon, Fish, Formless, Insect, Plant, Undead, All.
+#       Size        Monster size target (default All). Valids size are Small, Medium, Large, All.
+#       Element     Monster element target (default All). Valids elements are Dark, Earth, Fire, Ghost, Holy, Neutral, Poison, Undead, Water, Wind, All.
+#       MinLevel    Minimum monster level target. If not supplied but MaxLevel defined, MinLevel is 1. Set to 0 to ignore MinLevel on import. (Default: 0)
+#       MaxLevel    Maximum monster level target. Set to 0 to ignore MaxLevel on import. (Default: 0)
 #   Drops:          Quest item drop targets. (Default: null)
 #     - Mob         Monster to kill. 0 will apply to all monsters. (Default: 0)
 #       Item        Item to drop.
--- a/db/pre-re/item_db.txt
+++ b/db/pre-re/item_db.txt
@@ -47,9 +47,9 @@
 //542,Festive_Cookie,Festival Cookie,0,10,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(325,405),0; },{},{}
 //543,Festive_Rainbow_Cake,Festival Rainbow Cake,0,10,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(325,405),0; },{},{}
 544,Fish_Slice,Raw Fish,0,20,,30,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(25,60),0; },{},{}
-545,Red_Slim_Potion,Condensed Red Potion,0,150,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(45,65),0; },{},{}
-546,Yellow_Slim_Potion,Condensed Yellow Potion,0,600,,30,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(175,235),0; },{},{}
-547,White_Slim_Potion,Condensed White Potion,0,1650,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(325,405),0; },{},{}
+545,Red_Slim_Potion,Condensed Red Potion,0,150,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(45,65),0; },{},{}
+546,Yellow_Slim_Potion,Condensed Yellow Potion,0,600,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(175,235),0; },{},{}
+547,White_Slim_Potion,Condensed White Potion,0,1650,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(325,405),0; },{},{}
 548,Cheese,Cheese,0,2800,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal 0,rand(10,15); },{},{}
 549,Nice_Sweet_Potato,Yam,0,180,,80,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(50,100),0; sc_start SC_Stun,3000,0,1500,0; },{},{}
 550,Popped_Rice,Rice Cake,0,10,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(10,15),0; },{},{}
@@ -1093,7 +1093,7 @@
 2122,Platinum_Shield,Platinum Shield,4,20,,1200,,5,,0,0xFFFFFFFE,2,2,32,,68,1,4,{ bonus bMdef,5; bonus2 bSubSize,Size_Medium,15; bonus2 bSubSize,Size_Large,15; bonus2 bSubRace,RC_Undead,10; bonus5 bAutoSpellWhenHit,"NPC_MAGICMIRROR",7,150,BF_MAGIC,0; },{},{}
 2123,Orleans_Server,Orleans's Server,4,20,,1000,,5,,1,0xFFFFFFFE,2,2,32,,55,1,4,{ bonus bMdef,2; bonus bMagicDamageReturn,5; },{},{}
 2124,Thorny_Buckler,Thorny Buckler,4,20,,1000,,5,,1,0xFFFFFFFE,2,2,32,,55,1,2,{ bonus bMdef,2; },{},{}
-2125,Strong_Shield,Strong Shield,4,20,,2500,,4,,1,0xFFFFFFFE,2,2,32,,75,1,4,{ bonus bNoKnockback; bonus2 bSubEle,Ele_Neutral,-20; bonus2 bSubEle,Ele_Fire,-20; bonus2 bSubEle,Ele_Water,-20; bonus2 bSubEle,Ele_Wind,-20; bonus2 bSubEle,Ele_Earth,-20; bonus2 bSubEle,Ele_Dark,-20; bonus2 bSubEle,Ele_Holy,-20; bonus2 bSubEle,Ele_Ghost,-20; },{},{}
+2125,Strong_Shield,Strong Shield,4,20,,2500,,4,,1,0x000654E2,2,2,32,,75,1,4,{ bonus bNoKnockback; bonus2 bSubEle,Ele_Neutral,-20; bonus2 bSubEle,Ele_Fire,-20; bonus2 bSubEle,Ele_Water,-20; bonus2 bSubEle,Ele_Wind,-20; bonus2 bSubEle,Ele_Earth,-20; bonus2 bSubEle,Ele_Dark,-20; bonus2 bSubEle,Ele_Holy,-20; bonus2 bSubEle,Ele_Ghost,-20; },{},{}
 2126,Guyak_Shield,Guyak Shield,4,20,,700,,3,,0,0xFFFFFFFE,7,2,32,,75,1,2,{ bonus bMdef,3; },{},{}
 2127,Secular_Mission,Secular Mission,4,20,,0,,10,,0,0xFFFFFFFF,7,2,32,,0,0,4,{ bonus2 bSubClass,Class_All,25; },{},{}
 2128,Herald_Of_GOD_,Sacred Mission,4,128000,,1600,,5,,1,0x00004000,7,2,32,,83,1,4,{ bonus bVit,3; bonus bInt,2; bonus bMdef,3; bonus bUnbreakableShield; },{},{}
@@ -2070,7 +2070,7 @@
 4429,Salamander_Card,Salamander Card,6,20,,10,,,,,,,,4,,,,,{ bonus2 bSkillAtk,"WZ_FIREPILLAR",40; bonus2 bSkillAtk,"WZ_METEOR",40; },{},{}
 4430,Ifrit_Card,Ifrit Card,6,20,,10,,,,,,,,136,,,,,{ bonus bBaseAtk,(JobLevel/10); bonus bCritical,(JobLevel/10); bonus bHit,(JobLevel/10); bonus3 bAutoSpellWhenHit,"NPC_EARTHQUAKE",2,10; },{},{}
 4431,Kasa_Card,Kasa Card,6,20,,10,,,,,,,,4,,,,,{ bonus3 bAutoSpell,"MG_FIREBALL",5,20; bonus3 bAutoSpell,"MG_FIREBOLT",5,20; },{},{}
-4432,Magmaring_Card,Magmaring Card,6,20,,10,,,,,,,,4,,,,,{ bonus bBaseAtk,5; bonus2 bAddEle,Ele_Earth,10; bonus2 bCriticalAddRace,RC_Brute,15; bonus2 bCriticalAddRace,RC_Player_Doram,15; },{},{}
+4432,Magmaring_Card,Magmaring Card,6,20,,10,,,,,,,,4,,,,,{ bonus bBaseAtk,5; bonus2 bAddEle,Ele_Earth,10; bonus2 bCriticalAddRace,RC_Brute,15; bonus2 bCriticalAddRace,RC_Player_Doram,15; bonus2 bCriticalAddRace,RC_Plant,15; },{},{}
 4433,Imp_Card,Imp Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bSkillAtk,"MG_FIREBOLT",25; bonus2 bCastrate,"MG_FIREBOLT",-25; },{},{}
 4434,Knocker_Card,Knocker Card,6,20,,10,,,,,,,,769,,,,,{ bonus2 bAddRace,RC_Formless,5; bonus3 bAddMonsterDropItem,756,RC_Formless,10; bonus3 bAddMonsterDropItem,757,RC_Formless,10; },{},{}
 4435,Zombie_Slaughter_Card,Zombie Slaughter Card,6,20,,10,,,,,,,,64,,,,,{ bonus2 bAddRace,RC_DemiHuman,1; bonus2 bAddRace,RC_Player_Human,1; bonus2 bMagicAddRace,RC_DemiHuman,1; bonus2 bMagicAddRace,RC_Player_Human,1; bonus bHPGainValue,50; },{},{}
@@ -2316,7 +2316,7 @@
 5133,Sheep_Hat,Sheep Hat,4,20,,150,,1,,0,0x00008110,7,2,256,,0,0,205,{ bonus bShortWeaponDamageReturn,5; },{},{}
 5134,Pumpkin_Hat,Pumpkin-Head,4,20,,200,,2,,0,0xFFFFFFFF,7,2,256,,0,1,206,{ bonus2 bSubRace,RC_Demon,5; },{},{}
 5135,Cyclops_Visor,Cyclop's Eye,4,0,,200,,0,,0,0xFFFFFFFE,7,2,512,,75,0,207,{ bonus bMaxSP,50; },{},{}
-5136,Santa's_Hat_,Antonio's Santa Hat,4,20,,100,,3,,0,0xFFFFFFFF,7,2,256,,0,1,20,{},{},{}
+5136,Santa's_Hat_,Antonio's Santa Hat,4,20,,100,,2,,0,0xFFFFFFFF,7,2,256,,0,1,20,{},{},{}
 5137,Alice_Doll,Alice Doll,4,20,,500,,0,,1,0xFFFFFFFE,7,2,256,,30,0,208,{ bonus bStr,1; bonus2 bAddRace,RC_DemiHuman,10; bonus2 bAddRace,RC_Player_Human,10; bonus2 bAddEff2,Eff_Sleep,10; },{},{}
 5138,Magic_Eyes,Magic Eyes,4,20,,300,,1,,0,0x00810204,7,2,256,,30,1,209,{ bonus bMdef,5; bonus bCastrate,-10; bonus bUseSPrate,20; },{},{}
 5139,Hibiscus,Hibiscus,4,20,,200,,0,,0,0xFFFFFFFF,7,2,256,,10,0,210,{ bonus bDex,1; bonus bInt,1; bonus bMdef,5; },{},{}
@@ -2441,7 +2441,7 @@
 5258,Afro_Wig,Afro Wig,4,20,,100,,0,,1,0xFFFFFFFF,7,2,768,,10,1,302,{ bonus3 bAutoSpellWhenHit,"NV_FIRSTAID",1,300; bonus2 bSubEle,Ele_Neutral,1; },{},{}
 5259,Elephant_Hat_,Elephant Hat,4,20,,500,,3,,0,0xFFFFFFFF,7,2,256,,0,1,215,{ bonus bVit,1; bonus3 bAutoSpell,"WZ_WATERBALL",3,10; skill "AL_HOLYWATER",1; },{},{}
 5260,Cookie_Hat,Cookie Hat,4,20,,500,,2,,0,0xFFFFFFFF,7,2,256,,0,1,217,{ bonus bAgi,1; bonus bFlee2,5; bonus bCritAtkRate,5; },{},{}
-5261,Silver_Tiara_,Silver Tiara,4,20,,500,,2,,0,0xFFFFFFFF,7,2,256,,0,1,218,{ bonus bInt,2; if(BaseClass==Job_Mage) bonus bMatkRate,(JobLevel/20); if(Baseclass==Job_Acolyte) bonus bUseSPrate,-(JobLevel/10); if(BaseClass==Job_Archer) bonus bMaxSP,(JobLevel*2); },{},{}
+5261,Silver_Tiara_,Silver Tiara,4,20,,500,,2,,0,0xFFFFFFFF,7,2,256,,0,1,218,{ bonus bInt,2; if(BaseClass==Job_Mage) bonus bMatkRate,(JobLevel/20); if(BaseClass==Job_Acolyte) bonus bUseSPrate,-(JobLevel/10); if(BaseClass==Job_Archer) bonus bMaxSP,(JobLevel*2); },{},{}
 5262,Gold_Tiara_,Golden Tiara,4,20,,500,,2,,0,0xFFFFFFFF,7,2,256,,0,1,232,{ bonus bStr,2; bonus bUnbreakableHelm; if((readparam(bDex)<56)&&(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief)) bonus bDex,JobLevel/7; },{},{}
 5263,Ati_Atihan_Hat,Pagdayaw,4,20,,100,,1,,0,0xFFFFFFFE,7,2,769,,20,1,303,{ bonus2 bSubEle,Ele_Water,1; bonus2 bSubEle,Ele_Earth,1; bonus2 bSubEle,Ele_Fire,1; bonus2 bSubEle,Ele_Wind,1; bonus2 bAddEff,Eff_Curse,300; },{},{}
 5264,Aussie_Flag_Hat,Australian Flag Hat,4,20,,500,,4,,0,0xFFFFFFFF,7,2,256,,0,1,304,{ bonus bAllStats,2; },{},{}
@@ -2638,7 +2638,7 @@
 5455,Geographer_Band_,Decorative Geographer,4,20,,500,,1,,1,0xFFFFFFFF,7,2,256,,0,1,238,{ bonus bInt,1; bonus3 bAutoSpell,"AL_HEAL",5,50; bonus3 bAutoSpellWhenHit,"AL_HEAL",5,30; },{},{}
 5456,Vacation_Hat_,Summer Hat,4,20,,200,,0,,1,0xFFFFFFFF,7,2,256,,0,1,315,{ bonus bVit,5; bonus bHPrecovRate,20; bonus bSPrecovRate,15; },{},{}
 5457,Spring_Rabbit_Hat,Moon Rabbit Hat,4,20,,300,,2,,1,0xFFFFFFFF,7,2,256,,1,1,455,{ bonus bAgi,3; bonus bBaseAtk,5; bonus bMatkRate,5; if(getrefine()>4) { bonus bBaseAtk,getrefine()-4; bonus bMatkRate,getrefine()-4; } },{},{}
-5458,Pinwheel_Cap,Pinwheel Hat,4,20,,200,,2,,0,0xFFFFFFFF,7,2,256,,0,1,456,{ bonus bHPrecovRate, 5; bonus bHPrecovRate, 5; },{},{}
+5458,Pinwheel_Cap,Pinwheel Hat,4,20,,200,,2,,0,0xFFFFFFFF,7,2,256,,0,1,456,{ bonus bMaxHPrate,5; bonus bMaxSPrate,5; },{},{}
 5459,Drooping_Bunny_Chusuk,Drooping Bunny,4,0,,100,,1,,0,0xFFFFFFFF,7,2,256,,0,1,249,{ bonus bDex,1; bonus bFlee,2; },{},{}
 5460,Adv_Dragon_Skull,Evolved Dragon Skull Hat,4,20,,1000,,7,,0,0xFFFFFFFF,7,2,256,,60,1,457,{ bonus bAllStats, 2; bonus bMaxHPrate, 3; },{},{}
 5461,Adv_Whisper_Mask,Evolved Whisper Mask,4,20,,300,,1,,0,0xFFFFFFFF,7,2,769,,50,1,458,{ bonus bDex,3; bonus2 bSubEle,Ele_Ghost, 20; },{},{}
@@ -4689,9 +4689,9 @@
 12119,Resist_Water,Coldproof Potion,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start4 SC_ARMOR_ELEMENT_WATER,1200000,20,0,0,-15; },{},{}
 12120,Resist_Earth,Earthproof Potion,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start4 SC_ARMOR_ELEMENT_EARTH,1200000,0,20,-15,0; },{},{}
 12121,Resist_Wind,Thunderproof Potion,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start4 SC_ARMOR_ELEMENT_WIND,1200000,0,-15,0,20; },{},{}
-12122,Sesame_Pastry,Sesame Pastry,2,2,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_HITFOOD,1200000,30; },{},{}
-12123,Honey_Pastry,Honey Pastry,2,2,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_FLEEFOOD,1200000,30; },{},{}
-12124,Rainbow_Cake,Rainbow Cake,2,2,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_BATKFOOD,1200000,10; sc_start SC_MATKFOOD,120000,10; },{},{}
+12122,Sesame_Pastry,Sesame Pastry,2,2,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_HITFOOD,1800000,30; },{},{}
+12123,Honey_Pastry,Honey Pastry,2,2,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_FLEEFOOD,1800000,30; },{},{}
+12124,Rainbow_Cake,Rainbow Cake,2,2,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_BATKFOOD,60000,10; sc_start SC_MATKFOOD,60000,10; },{},{}
 12125,Outdoor_Cooking_Kits,Outdoor Cooking Kit,2,500,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ cooking 11; },{},{}
 12126,Indoor_Cooking_Kits,Home Cooking Kit,2,1000,,30,,,,,0xFFFFFFFF,7,2,,,,,,{ cooking 12; },{},{}
 12127,High_end_Cooking_Kits,Professional Cooking Kit,2,2000,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ cooking 13; },{},{}
@@ -4831,14 +4831,14 @@
 12263,Comp_Battle_Manual,Field Manual,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_EXPBOOST,1800000,50; },{},{}
 12264,Comp_Bubble_Gum,Bubble Gum,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ITEMBOOST,1800000,200; },{},{}
 12265,Comp_Insurance,Life Insurrance,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LIFEINSURANCE,1800000,0; },{},{}
-12266,Sesame_Pastry_,Sesame Pastry,2,2,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_HITFOOD,1200000,30; },{},{}
-12267,Honey_Pastry_,Honey Pastry,2,2,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_FLEEFOOD,1200000,30; },{},{}
-12268,Rainbow_Cake_,Rainbow Cake,2,2,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ATKPOTION,60000,10; sc_start SC_MATKFOOD,120000,10; },{},{}
+12266,Sesame_Pastry_,Sesame Pastry,2,2,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_HITFOOD,180000,30; },{},{}
+12267,Honey_Pastry_,Honey Pastry,2,2,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_FLEEFOOD,180000,30; },{},{}
+12268,Rainbow_Cake_,Rainbow Cake,2,2,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ATKPOTION,60000,10; sc_start SC_MATKFOOD,60000,10; },{},{}
 12269,Tasty_Colonel,Tasty Pink Ration,2,2,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ATKPOTION,600000,15; },{},{}
 12270,Tasty_Major,Tasty White Ration,2,2,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_MATKPOTION,600000,15; },{},{}
 12271,Mre_A,Military Ration A,0,2,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 5,0; },{},{}
-12272,Mre_B,Military Ration B,2,2,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCHIT,600000,33; },{},{}
-12273,Mre_C,Military Ration C,2,2,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCFLEE,600000,33; },{},{}
+12272,Mre_B,Military Ration B,2,2,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_HITFOOD,600000,33; },{},{}
+12273,Mre_C,Military Ration C,2,2,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_FLEEFOOD,600000,33; },{},{}
 12274,Gold_Pill_1,Daehwandan,0,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start2 SC_INCREASE_MAXHP,3600000,5,10; percentheal 10,0; },{},{}
 12275,Gold_Pill_2,Taecheongdan,0,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start2 SC_INCREASE_MAXSP,3600000,5,10; percentheal 0,10; },{},{}
 12276,Mimic_Scroll,Mimic Scroll,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ mercenary_create 2058,1800000; },{},{}
@@ -4875,17 +4875,17 @@
 12307,Kid,Kid Magic Powder,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ setfont 7; },{},{ setfont 0; }
 12308,Magic_Castle,Magic Magic Powder,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ setfont 8; },{},{ setfont 0; }
 12309,Bulging_Head,JJangu Magic Powder,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ setfont 9; },{},{ setfont 0; }
-12310,Spray_Of_Flowers,Spray Of Flowers,2,0,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCFLEE,600000,10; },{},{}
+12310,Spray_Of_Flowers,Spray Of Flowers,2,0,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_FLEEFOOD,300000,10; },{},{}
 12311,Large_Spray_Of_Flowers,Huge Spray Of Flowers,11,0,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "ALL_PARTYFLEE",1; },{},{}
 12312,Thick_Manual50,Thick Battle Manual,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_EXPBOOST,3600000,50; },{},{}
-12313,Protection_Of_Angel,Guardian Angel,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+12313,Protection_Of_Angel,Guardian Angel,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ /* itemskill "ALL_ANGEL_PROTECT",1; */ },{},{}
 12314,Noive_Box,Noive Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12315,Goddess_Bless,Goddess Of Blessing,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12316,Angel_Bless,Angel Of Blessing,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12317,Powder_Snow,Snow Powder,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12318,Little_Heart,Small Hearts,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12319,Strawberry_Cake,Rune Strawberry Cake,2,0,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ATKPOTION,600000,5; sc_start SC_MATKPOTION,600000,5; },{},{}
-12320,Pineapple_Juice,Schwarzwald Pine Jubilee,2,0,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCHIT,600000,10; sc_start SC_INCFLEE2,600000,20; },{},{}
+12320,Pineapple_Juice,Schwarzwald Pine Jubilee,2,0,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_HITFOOD,600000,10; sc_start SC_FLEEFOOD,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; },{},{}
 12323,N_Fly_Wing,Novice Fly Wing,11,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "AL_TELEPORT",1; },{},{}
@@ -6366,8 +6366,8 @@
 14527,Dun_Tele_Scroll1,Dungeon Teleport Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ callfunc "F_CashDungeon",1; },{},{}
 14528,PVP_Tele_Scroll,PVP Teleport Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 14529,Greed_Scroll,Greed Scroll,11,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "BS_GREED",1; },{},{}
-14530,Flee_30_Scroll,Evasion Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCFLEE,1800000,30; },{},{}
-14531,Accuracy_30_Scroll,Concentration Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCHIT,1800000,30; },{},{}
+14530,Flee_30_Scroll,Evasion Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_FLEEFOOD,1800000,30; },{},{}
+14531,Accuracy_30_Scroll,Concentration Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_HITFOOD,1800000,30; },{},{}
 14532,Battle_Manual25,Field Manual 25%,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_EXPBOOST,1800000,25; },{},{}
 14533,Battle_Manual100,Field Manual 100%,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_EXPBOOST,1800000,100; },{},{}
 14534,Small_Life_Potion,Small Life Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_HEAL3; sc_start4 SC_S_LIFEPOTION,600000,-5,5,0,0; },{},{}
@@ -6437,7 +6437,7 @@
 14598,GhostringS,Ghostring Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start2 SC_ITEMSCRIPT,60000,4047,EFST_ARMOR_PROPERTY; },{},{}
 14599,Greed_Scroll_C,Greed Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 14600,Mental_Potion,Mental Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-14601,Tyr's_Blessing,Tyr's Blessing,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCFLEE,300000,30; sc_start SC_INCHIT,300000,30; sc_start SC_ATKPOTION,300000,20; sc_start SC_MATKPOTION,300000,20; },{},{}
+14601,Tyr's_Blessing,Tyr's Blessing,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_FLEEFOOD,300000,30; sc_start SC_HITFOOD,300000,30; sc_start SC_ATKPOTION,300000,20; sc_start SC_MATKPOTION,300000,20;  },{},{}
 14602,TaogunkaS,Tao Gunka Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start2 SC_ITEMSCRIPT,180000,4302,EFST_MVPCARD_TAOGUNKA; },{},{}
 14603,MistressS,Mistress Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start2 SC_ITEMSCRIPT,180000,4132,EFST_MVPCARD_MISTRESS; },{},{}
 14604,Orc_HeroS,Orc Hero Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start2 SC_ITEMSCRIPT,60000,4143,EFST_MVPCARD_ORCHERO; },{},{}
@@ -6445,12 +6445,12 @@
 14606,Job_Manual25,JOB Battle Manual,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 14607,Luxurious_Dinner_W,Luxurious Western Food,2,10000,,600,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCALLSTATUS,3600000,3; },{},{}
 14608,Luxurious_Dinner_E,Manchu-Han Imperial Feast,2,20000,,1200,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCALLSTATUS,3600000,6; },{},{}
-14609,Spoiled_Cuisine,Spoiled Cuisine,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 10,10; },{},{}
+14609,Spoiled_Cuisine,Spoiled Cuisine,2,5000,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 10,10; },{},{}
 // More Armors
 15000,Bone_Plate,Bone Plate,4,20,,1000,,7,,1,0x000654E2,2,2,16,,85,1,0,{ bonus bStr,1; bonus bMdef,3; bonus2 bIgnoreDefRaceRate,RC_DemiHuman,10; bonus2 bIgnoreDefRaceRate,RC_Player_Human,10; bonus2 bIgnoreDefRaceRate,RC_Brute,10; bonus2 bIgnoreDefRaceRate,RC_Player_Doram,10; bonus3 bAutoSpellWhenHit,"NPC_WIDEBLEEDING",1,10; },{},{}
 15001,Odin's_Blessing_I,Odin's Blessing,4,0,,0,,10,,0,0xFFFFFFFE,7,2,16,,0,0,0,{},{},{}
 // More Maces
-16000,Erde,Erde,5,20,,500,130,,1,2,0x0004C5B2,2,2,2,4,50,1,8,{ bonus2 bSkillAtk,"AM_ACIDTERROR",20; bonus2 bSkillAtk,"AM_DEMONSTRATION",20; bonus bMaxSP,50; bonus bHealPower,10; },{},{}
+16000,Erde,Erde,5,20,,500,130,,1,2,0x0004C5B2,2,2,2,3,50,1,8,{ bonus2 bSkillAtk,"AM_ACIDTERROR",20; bonus2 bSkillAtk,"AM_DEMONSTRATION",20; bonus bMaxSP,50; bonus bHealPower,10; },{},{}
 16001,Red_Square_Bag,Red Square Bag,5,20,,500,130,,1,2,0x0004C5B2,2,2,2,3,50,1,8,{ bonus bMaxHP,200; bonus2 bSkillAtk,"AM_ACIDTERROR",20; bonus2 bSkillAtk,"AM_DEMONSTRATION",20; bonus2 bAddMonsterDropItem,501,50; bonus2 bAddMonsterDropItem,502,20; bonus2 bAddMonsterDropItem,503,20; bonus2 bAddMonsterDropItem,504,20; bonus2 bAddMonsterDropItem,505,10; if(readparam(bStr)>=95) bonus2 bAddEff,Eff_Stun,500; },{},{}
 16002,Stunner_C,Stunner,5,0,,0,175,,1,0,0x00008110,7,2,2,3,1,0,8,{ bonus2 bAddEff,Eff_Stun,1000; bonus2 bAddSize,Size_All,40; },{},{}
 //
--- a/db/pre-re/mob_skill_db.txt
+++ b/db/pre-re/mob_skill_db.txt
@@ -714,12 +714,11 @@
 1141,Marina@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,0,,,,,,6,
 1141,Marina@NPC_EMOTION,walk,197,1,2000,0,5000,yes,self,always,0,19,,,,,,
 1141,Marina@NPC_WATERATTACK,attack,184,2,500,500,5000,no,target,always,0,,,,,,6,
-1142,Marine Sphere@NPC_RUN,idle,354,7,10000,0,30000,no,master,alchemist,,,,,,,26,
-1142,Marine Sphere@NPC_SELFDESTRUCTION,any,173,1,10000,3000,0,no,self,afterskill,354,,,,,,,
+1142,Marine Sphere@NPC_RANDOMMOVE,idle,331,1,10000,0,30000,yes,target,alchemist,,,,,,,,
+1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,10000,3000,0,yes,self,alchemist,,,,,,,,
 1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,500,2000,5000,no,self,myhpltmaxrate,99,,,,,,,
 1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,10000,2000,5000,no,self,skillused,173,,,,,,,
-//1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,10000,0,0,yes,self,always,0,,,,,,,
-//1142,Marine Sphere@NPC_SPEEDUP,any,332,1,10000,0,700,yes,self,always,0,,,,,,,
+1142,Marine Sphere@NPC_SPEEDUP,idle,332,1,10000,0,700,yes,target,always,,,,,,,,
 1143,Marionette@HT_FREEZINGTRAP,idle,121,5,500,0,300000,yes,around2,always,0,,,,,,29,
 1143,Marionette@MG_FIREWALL,chase,18,5,500,500,5000,yes,target,always,0,,,,,,2,
 1143,Marionette@NPC_TELEKINESISATTACK,attack,191,5,500,0,5000,yes,target,always,0,,,,,,6,
--- a/db/pre-re/quest_db.yml
+++ b/db/pre-re/quest_db.yml
@@ -30,8 +30,18 @@
 #                   Specify without "+" for the exact time the quest expires using "d" (optionnal), [0-23]"h" (required), [0-59]"mn" (optionnal), [0-59]"s" (optionnal) format.
 #                   Please note the number before "d" only shift the exact timer to the given day(s).
 #   Targets:        Quest objective target. (Default: null)
-#     - Mob         Monster to kill.
-#       Count       Amount of monsters to kill.
+#                   The target can be a couple of node Mob/Count or of Id/Race/Size/Element/MinLevel/MaxLevel.
+#                   If Mob is supplied, Count is required and the other fields are ignored.
+#                   If Id is supplied, at least one other field of Race/Size/Element/MinLevel/MaxLevel is required.
+#                   If Id is supplied, Count is required for each new entry.
+#     - Mob         Monster to kill (aegis monster name).
+#       Count       Amount of monsters to kill. Set to 0 to skip the target on import.
+#       Id          Unique target index for the quest Id. Requires a positive number.
+#       Race        Monster race target (default All). Valids race are Angel, Brute, DemiHuman, Demon, Dragon, Fish, Formless, Insect, Plant, Undead, All.
+#       Size        Monster size target (default All). Valids size are Small, Medium, Large, All.
+#       Element     Monster element target (default All). Valids elements are Dark, Earth, Fire, Ghost, Holy, Neutral, Poison, Undead, Water, Wind, All.
+#       MinLevel    Minimum monster level target. If not supplied but MaxLevel defined, MinLevel is 1. Set to 0 to ignore MinLevel on import. (Default: 0)
+#       MaxLevel    Maximum monster level target. Set to 0 to ignore MaxLevel on import. (Default: 0)
 #   Drops:          Quest item drop targets. (Default: null)
 #     - Mob         Monster to kill. 0 will apply to all monsters. (Default: 0)
 #       Item        Item to drop.
--- a/db/pre-re/skill_db.yml
+++ b/db/pre-re/skill_db.yml
@@ -9404,6 +9404,7 @@ Body:
        Time: 55000
      - Level: 10
        Time: 60000
+    Duration2: 1000
    Requires:
      SpCost: 50
      Weapon:
@@ -15306,10 +15307,12 @@ Body:
    DamageFlags:
      Splash: true
      SplashSplit: true
+      IgnoreDefense: true
    Flags:
      IsNpc: true
      TargetTrap: true
      ShowScale: true
+      IgnoreLandProtector: true
    Hit: Multi_Hit
    HitCount: 1
    SplashArea:
@@ -15333,6 +15336,34 @@ Body:
        Area: 11
      - Level: 10
        Area: 13
+    Duration1: 910
+    Unit:
+      Id: Earthquake
+      Range:
+        - Level: 1
+          Size: 5
+        - Level: 2
+          Size: 7
+        - Level: 3
+          Size: 9
+        - Level: 4
+          Size: 11
+        - Level: 5
+          Size: 13
+        - Level: 6
+          Size: 5
+        - Level: 7
+          Size: 7
+        - Level: 8
+          Size: 9
+        - Level: 9
+          Size: 11
+        - Level: 10
+          Size: 13
+      Interval: 300
+      Target: Enemy
+      Flag:
+        PathCheck: true
  - Id: 654
    Name: NPC_FIREBREATH
    Description: Fire Breath
@@ -27433,6 +27464,7 @@ Body:
    HitCount: 1
    Requires:
      SpCost: 40
+      State: Cart
  - Id: 2552
    Name: RL_RICHS_COIN
    Description: Rich's Coin
--- a/db/quest_db.yml
+++ b/db/quest_db.yml
@@ -30,8 +30,18 @@
 #                   Specify without "+" for the exact time the quest expires using "d" (optionnal), [0-23]"h" (required), [0-59]"mn" (optionnal), [0-59]"s" (optionnal) format.
 #                   Please note the number before "d" only shift the exact timer to the given day(s).
 #   Targets:        Quest objective target. (Default: null)
-#     - Mob         Monster to kill.
-#       Count       Amount of monsters to kill.
+#                   The target can be a couple of node Mob/Count or of Id/Race/Size/Element/MinLevel/MaxLevel.
+#                   If Mob is supplied, Count is required and the other fields are ignored.
+#                   If Id is supplied, at least one other field of Race/Size/Element/MinLevel/MaxLevel is required.
+#                   If Id is supplied, Count is required for each new entry.
+#     - Mob         Monster to kill (aegis monster name).
+#       Count       Amount of monsters to kill. Set to 0 to skip the target on import.
+#       Id          Unique target index for the quest Id. Requires a positive number.
+#       Race        Monster race target (default All). Valids race are Angel, Brute, DemiHuman, Demon, Dragon, Fish, Formless, Insect, Plant, Undead, All.
+#       Size        Monster size target (default All). Valids size are Small, Medium, Large, All.
+#       Element     Monster element target (default All). Valids elements are Dark, Earth, Fire, Ghost, Holy, Neutral, Poison, Undead, Water, Wind, All.
+#       MinLevel    Minimum monster level target. If not supplied but MaxLevel defined, MinLevel is 1. Set to 0 to ignore MinLevel on import. (Default: 0)
+#       MaxLevel    Maximum monster level target. Set to 0 to ignore MaxLevel on import. (Default: 0)
 #   Drops:          Quest item drop targets. (Default: null)
 #     - Mob         Monster to kill. 0 will apply to all monsters. (Default: 0)
 #       Item        Item to drop.
--- a/db/re/item_combo_db.txt
+++ b/db/re/item_combo_db.txt
@@ -56,21 +56,23 @@
 1580:2186,{ bonus bAspdRate,15; }
 1615:18539,{ bonus bMatk,10*getequiprefinerycnt(EQI_HAND_R); bonus bVariableCastrate,-10; }
 1616:2515,{ bonus bSpeedRate,25; }
+1617:19020,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus bMatk,.@r*10; if (.@r >= 10) { autobonus "{ bonus bVariableCastrate,-50; }",100,5000,BF_MAGIC; /* Confirm: Success rate? */ } }
 1618:2509,{ bonus bMaxHP,300; bonus bMatkRate,min(5, getequiprefinerycnt(EQI_HAND_R)-5); bonus2 bSubEle,Ele_Neutral,min(30, getequiprefinerycnt(EQI_GARMENT)*3); }
 1618:2509:19139,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus bMatkRate,1; if (.@r >= 5) { bonus bMatkRate,2; if (.@r >= 7) { bonus bMatkRate,2; } } }
 1618:2535,{ bonus bMatkRate,5; bonus2 bSubEle,Ele_Neutral,25; }
-1618:19020,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); bonus bMatk,.@r; if (.@r >= 10) { autobonus "{ bonus bVariableCastrate,-50; }",100,5000,BF_MAGIC; /* Confirm: Success rate? */ } }
+1618:19020,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus bMatk,.@r*10; if (.@r >= 10) { autobonus "{ bonus bVariableCastrate,-50; }",100,5000,BF_MAGIC; /* Confirm: Success rate? */ } }
 1618:19139,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus bMatk,10*.@r; if (.@r>=10) { bonus bVariableCastrate,-3; bonus2 bSkillAtk,"WL_EARTHSTRAIN",15; bonus2 bSkillAtk,"WL_CHAINLIGHTNING",15; bonus2 bSkillAtk,"WZ_HEAVENDRIVE",70; bonus2 bSkillAtk,"WZ_JUPITEL",70; } if (BaseLevel>=100) { bonus bVariableCastrate,-3; bonus2 bSkillAtk,"WL_EARTHSTRAIN",30; bonus2 bSkillAtk,"WL_CHAINLIGHTNING",30; bonus2 bSkillAtk,"WZ_HEAVENDRIVE",140; bonus2 bSkillAtk,"WZ_JUPITEL",140; } }
 1618:20813,{ bonus bMaxHP,300; bonus bMatkRate,getequiprefinerycnt(EQI_HAND_R)-5; bonus2 bSubEle,Ele_Neutral,getequiprefinerycnt(EQI_GARMENT)*3; }
 1618:20813:19139,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus bMatkRate,1; if (.@r >= 5) { bonus bMatkRate,2; if (.@r >= 7) { bonus bMatkRate,2; } } }
 1618:20847,{ .@weapon = getequiprefinerycnt(EQI_HAND_R); .@eq = getequiprefinerycnt(EQI_GARMENT); .@weapon = min(.@weapon,10); bonus bMaxHP,1000; bonus bMatk,(-50+(20*.@weapon)); bonus bDelayrate,-(3*(.@weapon/3)); bonus2 bSubEle,Ele_Neutral,(min(.@eq,10)/2); }
+1619:19020,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus bMatk,.@r*10; if (.@r >= 10) { autobonus "{ bonus bVariableCastrate,-50; }",100,5000,BF_MAGIC; /* Confirm: Success rate? */ } }
 1620:19139,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus bMatk,10*.@r; if (.@r>=10) { bonus bVariableCastrate,-3; bonus2 bSkillAtk,"WL_EARTHSTRAIN",15; bonus2 bSkillAtk,"WL_CHAINLIGHTNING",15; bonus2 bSkillAtk,"WZ_HEAVENDRIVE",70; bonus2 bSkillAtk,"WZ_JUPITEL",70; } if (BaseLevel>=100) { bonus bVariableCastrate,-3; bonus2 bSkillAtk,"WL_EARTHSTRAIN",30; bonus2 bSkillAtk,"WL_CHAINLIGHTNING",30; bonus2 bSkillAtk,"WZ_HEAVENDRIVE",140; bonus2 bSkillAtk,"WZ_JUPITEL",140; } }
 1620:20813,{ bonus bMaxHP,300; bonus bMatkRate,getequiprefinerycnt(EQI_HAND_R)-5; bonus2 bSubEle,Ele_Neutral,getequiprefinerycnt(EQI_GARMENT)*3; }
 1620:20813:19139,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus bMatkRate,1; if (.@r >= 5) { bonus bMatkRate,2; if (.@r >= 7) { bonus bMatkRate,2; } } }
 1620:2509,{ bonus bMaxHP,300; bonus bMatkRate,getequiprefinerycnt(EQI_HAND_R)-5; if(getequiprefinerycnt(EQI_GARMENT) > 10) { bonus2 bSubEle,Ele_Neutral,30; } else { bonus2 bSubEle,Ele_Neutral,getequiprefinerycnt(EQI_GARMENT)*3; } }
 1620:2509:19139,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus bMatkRate,1; if (.@r >= 5) { bonus bMatkRate,2; if (.@r >= 7) { bonus bMatkRate,2; } } }
 1620:2535,{ bonus bMatkRate,5; bonus2 bSubEle,Ele_Neutral,25; }
-1620:19020,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); bonus bMatk,.@r; if (.@r >= 10) { autobonus "{ bonus bVariableCastrate,-50; }",100,5000,BF_MAGIC; /* Confirm: Success rate? */ } }
+1620:19020,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus bMatk,.@r*10; if (.@r >= 10) { autobonus "{ bonus bVariableCastrate,-50; }",100,5000,BF_MAGIC; /* Confirm: Success rate? */ } }
 1629:5045,{ bonus bDex,2; bonus bInt,2; bonus bSPrecovRate,5; bonus bMatkRate,getequiprefinerycnt(EQI_HAND_R); }
 1631:2129,{ bonus2 bSkillAtk,"PR_MAGNUS",20; bonus3 bAutoSpellWhenHit,"PR_TURNUNDEAD",1,20; }
 1636:18539,{ bonus bMatk,10*getequiprefinerycnt(EQI_HAND_R); bonus bVariableCastrate,-10; }
@@ -842,12 +844,19 @@
 19203:29350,{ bonus bBaseAtk,15; bonus bMatk,15; if (getskilllv("OB_OBOROGENSOU") == 5) bonus bVariableCastrate,-7; autobonus3 "{ bonus bCritAtkRate,10; }",1000,60000,"KG_KAGEMUSYA"; autobonus "{ bonus bNoSizeFix; }",30,3000,BF_WEAPON;  }
 19203:29351,{ bonus bBaseAtk,20; bonus bMatk,20; if (getskilllv("OB_OBOROGENSOU") == 5) bonus bVariableCastrate,-15; autobonus3 "{ bonus bCritAtkRate,30; }",1000,60000,"KG_KAGEMUSYA"; autobonus "{ bonus bNoSizeFix; }",50,5000,BF_WEAPON;  }
 19204:29352,{ bonus bMaxHP,500; bonus bBaseAtk,10; }
-19204:29353,{ bonus bMaxHP,1000; bonus bBaseAtk,20; skill "WS_CARTBOOST",1; autobonus3 "{ bonus bBaseAtk,30; }",1000,60000,"WS_CARTBOOST"; }
-19204:29354,{ bonus bMaxHP,1500; bonus bBaseAtk,40; skill "WS_CARTBOOST",3; autobonus3 "{ bonus bBaseAtk,50; }",1000,120000,"WS_CARTBOOST"; }
+19204:29353,{ bonus bMaxHP,1000; bonus bBaseAtk,20; skill "GN_CARTBOOST",1; autobonus3 "{ bonus bBaseAtk,30; }",1000,60000,"GN_CARTBOOST"; }
+19204:29354,{ bonus bMaxHP,1500; bonus bBaseAtk,40; skill "GN_CARTBOOST",3; autobonus3 "{ bonus bBaseAtk,50; }",1000,120000,"GN_CARTBOOST"; }
 19205:29355,{ bonus2 bSkillAtk,"SU_CN_METEOR",10; bonus2 bSkillAtk,"SU_LUNATICCARROTBEAT",10; }
 19205:29356,{ bonus2 bSkillAtk,"SU_CN_METEOR",20; bonus2 bSkillAtk,"SU_LUNATICCARROTBEAT",20; bonus bFixedCast,-200; }
 19205:29357,{ bonus2 bSkillAtk,"SU_CN_METEOR",60; bonus2 bSkillAtk,"SU_LUNATICCARROTBEAT",60; bonus bFixedCast,-500; }
 19247:28762,{ bonus bMatk,50; .@eq = getequiprefinerycnt(EQI_HEAD_TOP); .@weapon = getequiprefinerycnt(EQI_HAND_R); if (.@eq >= 7 && .@weapon >= 7) { bonus bVariableCastrate,-10; } if ((.@eq + .@weapon) >= 18) { bonus2 bMagicAddSize,Size_Small,15; bonus2 bMagicAddSize,Size_Medium,15; if ((.@eq + .@weapon) >= 22) { autobonus "{ bonus bMatk,50; bonus2 bMagicAtkEle,Ele_Fire,20; }",5,10000,BF_MAGIC; /* unknown rate */ } } }
+19266:1617,{.@r = getequiprefinerycnt(EQI_HAND_R); bonus bMatk,.@r*10;}
+19266:1618,{.@r = getequiprefinerycnt(EQI_HAND_R); bonus bMatk,.@r*10;}
+19266:1619,{.@r = getequiprefinerycnt(EQI_HAND_R); bonus bMatk,.@r*10;}
+19266:1620,{.@r = getequiprefinerycnt(EQI_HAND_R); bonus bMatk,.@r*10;}
+19266:2509,{.@r = getequiprefinerycnt(EQI_GARMENT); bonus bVariableCastrate,-5*(.@r/2);}
+19266:20813,{.@r = getequiprefinerycnt(EQI_GARMENT); bonus bVariableCastrate,-5*(.@r/2);}
+19266:19139,{.@r = getequiprefinerycnt(EQI_HEAD_TOP); bonus bDelayRate,-.@r;}
 19272:4365,{ bonus bVariableCastrate,-100; bonus2 bSkillCooldown,"WL_TELEKINESIS_INTENSE",-120000; }
 19299:4463,{ .@type = getiteminfo(getequipid(EQI_COMPOUND_ON),11); if (.@type == W_BOOK || .@type == W_STAFF || .@type == W_2HSTAFF) { bonus2 bMagicAddRace,RC_Player_Human, getequiprefinerycnt(EQI_HAND_R)*2; } }
 19299:5966,{ .@a = readparam(bDex); bonus bMatk,10; bonus bVariableCastrate,-2; bonus2 bSubRace,RC_DemiHuman,2; bonus2 bSubRace,RC_Player_Human,2; if (.@a>=108) { bonus bMatk,20; bonus bVariableCastrate,-3; bonus2 bSubRace,RC_DemiHuman,2; bonus2 bSubRace,RC_Player_Human,2; } if (.@a>=120) { bonus bMatk,30; bonus bVariableCastrate,-5; bonus2 bSubRace,RC_DemiHuman,4; bonus2 bSubRace,RC_Player_Human,4; } }
@@ -1013,7 +1022,7 @@
 22138:4876,{ bonus2 bMagicAtkEle,Ele_Fire,-50; bonus2 bMagicAtkEle,Ele_Neutral,-50; bonus2 bMagicAtkEle,Ele_Dark,-50; }
 22170:1618,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player_Human,10; bonus2 bIgnoreMdefClassRate,Class_All,50; if (.@r>=10) { bonus2 bMagicAtkEle,Ele_Neutral,80; bonus2 bMagicAddRace,RC_Demihuman,20; bonus2 bMagicAddRace,RC_Player_Human,20; bonus2 bSkillCooldown,"WL_EARTHSTRAIN",-2400; bonus2 bSkillCooldown,"WL_CHAINLIGHTNING",-1000; autobonus "{ bonus2 bSkillAtk,\"WL_CHAINLIGHTNING\",100; }",60,5000,BF_MAGIC; } }
 22170:1620,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player_Human,10; bonus2 bIgnoreMdefClassRate,Class_All,50; if (.@r>=10) { bonus2 bMagicAtkEle,Ele_Neutral,80; bonus2 bMagicAddRace,RC_Demihuman,20; bonus2 bMagicAddRace,RC_Player_Human,20; bonus2 bSkillCooldown,"WL_EARTHSTRAIN",-2400; bonus2 bSkillCooldown,"WL_CHAINLIGHTNING",-1000; autobonus "{ bonus2 bSkillAtk,\"WL_CHAINLIGHTNING\",100; }",60,5000,BF_MAGIC; } }
-22170:19020,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); bonus2 bMagicAtkEle,Ele_Earth,10; bonus2 bMagicAtkEle,Ele_Wind,10; if (.@r>=7) { bonus2 bMagicAtkEle,Ele_Earth,10; bonus2 bMagicAtkEle,Ele_Wind,10; } if (.@r>=9) { bonus2 bMagicAtkEle,Ele_Earth,10; bonus2 bMagicAtkEle,Ele_Wind,10; } }
+22170:19020,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); bonus bMatkRate,10; if (.@r>=7) { bonus2 bMagicAtkEle,Ele_Earth,10; bonus2 bMagicAtkEle,Ele_Wind,10; } if (.@r>=9) { bonus2 bMagicAtkEle,Ele_Earth,10; bonus2 bMagicAtkEle,Ele_Wind,10; } }
 22171:13345,{ autobonus "{ bonus bStr,20; bonus bLongAtkRate,10; }",20,7000,BF_WEAPON; /* unknown rate */ }
 //22171:26154,{ autobonus "{ bonus bInt,20; bonus bMatkRate,15; }",20,7000,BF_MAGIC; /* unknown rate */ }
 22171:26155,{ autobonus "{ bonus bLuk,20; bonus bMatkRate,15; bonus2 bAddClass,Class_All,15; }",20,7000,BF_MAGIC|BF_WEAPON; /* unknown rate */ }
@@ -1109,16 +1118,16 @@
 24168:24169:24345:24346:24423:24424,{ if ((getequiprefinerycnt(EQI_SHADOW_ARMOR)+getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_SHOES)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)) >= 54) { bonus2 bIgnoreDefClassRate,Class_Normal,20; } }
 24180:24181:24182:24183:24184:24185,{ .@r = getequiprefinerycnt(EQI_SHADOW_ARMOR)+getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_SHOES)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L); bonus bAllStats,1; if(.@r>=45) { bonus bMaxHPrate,(.@r-60); bonus bNoWalkDelay; } }
 24180:24181:24182:24183:24184:24321,{ .@r = getequiprefinerycnt(EQI_SHADOW_ARMOR)+getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_SHOES)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L); bonus bAllStats,1; if (.@r >= 45) { bonus bMaxHPrate,(.@r-60); bonus bNoWalkDelay; } }
-24186:24198,{ bonus2 bSubEle,Ele_Neutral,2; }
-24187:24199,{ bonus2 bSubEle,Ele_Dark,2; }
-24188:24200,{ bonus2 bSubEle,Ele_Water,2; }
-24189:24201,{ bonus2 bSubEle,Ele_Earth,2; }
-24190:24202,{ bonus2 bSubEle,Ele_Fire,2; }
-24191:24203,{ bonus2 bSubEle,Ele_Wind,2; }
-24192:24204,{ bonus2 bSubEle,Ele_Poison,2; }
-24193:24205,{ bonus2 bSubEle,Ele_Holy,2; }
-24194:24206,{ bonus2 bSubEle,Ele_Ghost,2; }
-24195:24207,{ bonus2 bSubEle,Ele_Undead,2; }
+24186:24198,{ bonus2 bSubDefEle,Ele_Neutral,2; bonus2 bMagicSubDefEle,Ele_Neutral,2; }
+24187:24199,{ bonus2 bSubDefEle,Ele_Dark,2; bonus2 bMagicSubDefEle,Ele_Dark,2; }
+24188:24200,{ bonus2 bSubDefEle,Ele_Water,2; bonus2 bMagicSubDefEle,Ele_Water,2; }
+24189:24201,{ bonus2 bSubDefEle,Ele_Earth,2; bonus2 bMagicSubDefEle,Ele_Earth,2; }
+24190:24202,{ bonus2 bSubDefEle,Ele_Fire,2; bonus2 bMagicSubDefEle,Ele_Fire,2; }
+24191:24203,{ bonus2 bSubDefEle,Ele_Wind,2; bonus2 bMagicSubDefEle,Ele_Wind,2; }
+24192:24204,{ bonus2 bSubDefEle,Ele_Poison,2; bonus2 bMagicSubDefEle,Ele_Poison,2; }
+24193:24205,{ bonus2 bSubDefEle,Ele_Holy,2; bonus2 bMagicSubDefEle,Ele_Holy,2; }
+24194:24206,{ bonus2 bSubDefEle,Ele_Ghost,2; bonus2 bMagicSubDefEle,Ele_Ghost,2; }
+24195:24207,{ bonus2 bSubDefEle,Ele_Undead,2; bonus2 bMagicSubDefEle,Ele_Undead,2; }
 24196:24197,{ bonus bFlee,5; if(getequiprefinerycnt(EQI_SHADOW_SHOES)+getequiprefinerycnt(EQI_SHADOW_ARMOR)>=15) bonus bSpeedAddRate,3; }
 24197:24320,{ bonus bFlee,5; if ((getequiprefinerycnt(EQI_SHADOW_ARMOR) + getequiprefinerycnt(EQI_SHADOW_SHOES)) >= 15) { bonus bSpeedRate,25; /* unknown value */ } }
 24208:24209,{ bonus2 bExpAddRace,RC_All,((getequiprefinerycnt(EQI_SHADOW_SHOES)+getequiprefinerycnt(EQI_SHADOW_SHIELD))>=15?10:1); }
--- a/db/re/item_db.txt
+++ b/db/re/item_db.txt
@@ -727,7 +727,7 @@
 1381,N_Battle_Axe,Novice Battle Axe,5,0,,0,100,,1,3,0x000444A2,63,2,34,1,3,0,7,{},{},{}
 1382,Krieger_Twohand_Axe1,Glorious Two-Handed Axe,5,20,,0,220,,1,0,0x000444A2,63,2,34,4,80,1,7,{ bonus2 bAddRace,RC_DemiHuman,70; bonus2 bAddRace,RC_Player_Human,70; bonus2 bIgnoreDefRaceRate,RC_DemiHuman,25; bonus2 bIgnoreDefRaceRate,RC_Player_Human,25; bonus bUnbreakableWeapon; .@r = getrefine(); if(.@r>5) { bonus2 bAddRace,RC_DemiHuman,pow(min(14,.@r)-3,2); bonus2 bAddRace,RC_Player_Human,pow(min(14,.@r)-3,2); bonus2 bIgnoreDefRaceRate,RC_DemiHuman,5; bonus2 bIgnoreDefRaceRate,RC_Player_Human,5; bonus3 bAutoSpell,"NPC_CRITICALWOUND",1,50; } if(.@r>8) { bonus3 bAutoSpell,"NPC_CRITICALWOUND",1,100; bonus4 bAutoSpellOnSkill,"MC_MAMMONITE","NPC_CRITICALWOUND",2,200; bonus4 bAutoSpellOnSkill,"WS_CARTTERMINATION","NPC_CRITICALWOUND",2,200; } },{},{}
 1383,Holy_Celestial_Axe,Celestial Axe,5,20,,1500,200,,1,0,0x00040420,63,2,34,4,60,1,7,{ bonus2 bAddRace,RC_Undead,10; bonus3 bAutoSpell,"AL_BLESSING",5,5; },{},{}
-1384,Veteran_Axe,Veteran Axe,5,10000,,3000,250,,1,2,0x000444A2,63,2,34,3,80,1,7,{ if(getskilllv("BS_DAGGER")==3) { bonus bBaseAtk,10; } if(getskilllv("BS_SWORD")==3) { bonus bBaseAtk,10; } if(getskilllv("BS_TWOHANDSWORD")==3) { bonus bBaseAtk,10; } if(getskilllv("BS_KNUCKLE")==3) { bonus bBaseAtk,10; } if(getskilllv("BS_SPEAR")==3) { bonus bBaseAtk,10; } if(getskilllv("BS_AXE")==3) { bonus bBaseAtk,10; } if(getskilllv("BS_MACE")==3) { bonus bBaseAtk,10; } bonus bVit,2; bonus4 bAutoSpellOnSkill,"BS_HAMMERFALL",50,3,"SM_MAGNUM"; },{},{}
+1384,Veteran_Axe,Veteran Axe,5,10000,,3000,250,,1,2,0x000444A2,63,2,34,3,80,1,7,{ if(getskilllv("BS_DAGGER")==3) { bonus bBaseAtk,10; } if(getskilllv("BS_SWORD")==3) { bonus bBaseAtk,10; } if(getskilllv("BS_TWOHANDSWORD")==3) { bonus bBaseAtk,10; } if(getskilllv("BS_KNUCKLE")==3) { bonus bBaseAtk,10; } if(getskilllv("BS_SPEAR")==3) { bonus bBaseAtk,10; } if(getskilllv("BS_AXE")==3) { bonus bBaseAtk,10; } if(getskilllv("BS_MACE")==3) { bonus bBaseAtk,10; } bonus bVit,2; bonus4 bAutoSpellOnSkill,"BS_HAMMERFALL","SM_MAGNUM",50,3; },{},{}
 1385,Bradium_Stonehammer,Bradium Stone Hammer,5,20,,2700,210,,1,0,0x00000400,2,2,34,4,75,1,7,{ bonus3 bAddEffOnSkill,"BS_HAMMERFALL",Eff_Stun,500+(200*getrefine()); },{},{}
 1386,Doom_Slayer_I,Doom Slayer,5,0,,0,20,,1,0,0x000444A2,63,2,34,4,0,0,7,{ bonus bAspdRate,-25; bonus bUseSPrate,100; if(readparam(bStr)>=95){ bonus bBaseAtk,400; bonus2 bAddEff,Eff_Stun,3000; bonus bBreakArmorRate,500; } },{},{}
 1387,Giant_Axe,Giant Axe,5,20,,4000,330,,1,1,0x00044480,18,2,34,3,50,1,7,{ bonus2 bSkillAtk,"WS_CARTTERMINATION",15; if(readparam(bStr)>=95) { bonus bHit,10; bonus bAspdRate,3; } },{},{}
@@ -914,7 +914,7 @@
 1554,Book_Of_Mother_Earth,Book of Mother Earth,5,35000,,750,90,,1,0,0x00410100,63,2,2,3,27,1,15,{ bonus bAtkEle,Ele_Earth; },{},{}
 1555,Book_Of_Blazing_Sun,Book of the Blazing Sun,5,35000,,750,90,,1,0,0x00410100,63,2,2,3,27,1,15,{ bonus bAtkEle,Ele_Fire; },{},{}
 1556,Book_Of_Gust_Of_Wind,Book of Gust of Wind,5,35000,,750,90,,1,0,0x00410100,63,2,2,3,27,1,15,{ bonus bAtkEle,Ele_Wind; },{},{}
-1557,Book_Of_The_Apocalypse,Book of the Apocalypse,5,60000,,800,120,,1,0,0x00410100,63,2,2,4,40,1,15,{ bonus bAtkEle,Ele_Dark; bonus2 bAddEle,Ele_Holy,5; bonus2 bAddEle,Ele_Water,7; bonus2 bAddEle,Ele_Earth,7; bonus2 bAddEle,Ele_Fire,7; bonus2 bAddEle,Ele_Wind,7; },{},{}
+1557,Book_Of_The_Apocalypse,Book of the Apocalypse,5,60000,,800,120,,1,0,0x00410100,63,2,2,4,40,1,15,{ bonus bAtkEle,Ele_Dark; bonus2 bSubDefEle,Ele_Holy,-5; bonus2 bAddEle,Ele_Water,7; bonus2 bAddEle,Ele_Earth,7; bonus2 bAddEle,Ele_Fire,7; bonus2 bAddEle,Ele_Wind,7; },{},{}
 1558,Girl's_Diary,Girl's Diary,5,1500,,300,60,,1,1,0x00410100,63,2,2,4,40,1,15,{ bonus2 bAddDamageClass,1188,150; },{},{}
 1559,Legacy_Of_Dragon,Legacy of Dragon,5,20,,700,130,,1,0,0x00410100,63,2,2,4,70,1,15,{ bonus bInt,3; bonus bIgnoreDefRace,RC_Dragon; bonus2 bSPGainRace,RC_Dragon,10; },{},{}
 1560,Diary_Of_Great_Sage,Sage's Diary,5,20,,1100,100:120,,1,2,0x00410100,63,2,2,3,60,1,15,{ if(readparam(bStr)>=50) bonus bAspdRate,5; if(readparam(bInt)>=70) bonus bMatkRate,5; },{},{}
@@ -1346,7 +1346,7 @@
 2122,Platinum_Shield,Platinum Shield,4,20,,1200,,95,,0,0xFFFFFFFE,18,2,32,,68,1,4,{ bonus bMdef,5; bonus2 bSubSize,Size_Medium,15; bonus2 bSubSize,Size_Large,15; bonus2 bSubRace,RC_Undead,10; bonus5 bAutoSpellWhenHit,"NPC_MAGICMIRROR",7,150,BF_MAGIC,0; },{},{}
 2123,Orleans_Server,Orleans's Server,4,20,,1000,,75,,1,0xFFFFFFFE,18,2,32,,55,1,4,{ bonus bMdef,2; bonus bMagicDamageReturn,5; },{},{}
 2124,Thorny_Buckler,Thorny Buckler,4,20,,1000,,85,,1,0xFFFFFFFE,18,2,32,,55,1,2,{ bonus bMdef,2; },{},{}
-2125,Strong_Shield,Strong Shield,4,20,,2500,,90,,1,0xFFFFFFFE,18,2,32,,75,1,4,{ bonus bNoKnockback; bonus2 bSubEle,Ele_Neutral,-20; bonus2 bSubEle,Ele_Fire,-20; bonus2 bSubEle,Ele_Water,-20; bonus2 bSubEle,Ele_Wind,-20; bonus2 bSubEle,Ele_Earth,-20; bonus2 bSubEle,Ele_Dark,-20; bonus2 bSubEle,Ele_Holy,-20; bonus2 bSubEle,Ele_Ghost,-20; },{},{}
+2125,Strong_Shield,Strong Shield,4,20,,2500,,90,,1,0x000654E2,18,2,32,,75,1,4,{ bonus bNoKnockback; bonus2 bSubEle,Ele_Neutral,-20; bonus2 bSubEle,Ele_Fire,-20; bonus2 bSubEle,Ele_Water,-20; bonus2 bSubEle,Ele_Wind,-20; bonus2 bSubEle,Ele_Earth,-20; bonus2 bSubEle,Ele_Dark,-20; bonus2 bSubEle,Ele_Holy,-20; bonus2 bSubEle,Ele_Ghost,-20; },{},{}
 2126,Guyak_Shield,Guyak Shield,4,20,,700,,3,,0,0xFFFFFFFE,63,2,32,,1,1,2,{ bonus bMdef,2; bonus bMagicDamageReturn,2; autobonus2 "{ bonus bShortWeaponDamageReturn,5; }",20,1000,BF_WEAPON,"{ specialeffect2 EF_REFLECTSHIELD; }"; },{},{}
 2127,Secular_Mission,Secular Mission,4,20,,0,,10,,0,0xFFFFFFFF,63,2,32,,0,0,4,{ bonus2 bSubClass,Class_All,25; },{},{}
 2128,Herald_Of_GOD_,Sacred Mission,4,128000,,1600,,120,,1,0x00004000,63,2,32,,83,1,4,{ bonus bVit,3; bonus bInt,2; bonus bMdef,3; bonus bUnbreakableShield; },{},{}
@@ -1379,24 +1379,24 @@
 2155,Academy_Shield,Academy Shield,4,0,,1500,,3,,1,0xFFFFFFFE,63,2,32,,0,1,4,{},{},{}
 2156,Bible_Of_Promise1,Bible of Promise(1st Vol.),4,20,,500,,10,,1,0x00000100,63,2,32,,110,1,5,{ bonus bMdef,2; skill "ALL_ODINS_POWER",1; },{},{}
 2157,Insecticide,Pesticide,4,20,,100,,0,,0,0xFFFFFFFF,63,2,32,,0,1,3,{},{},{}
-2158,Ramor_Shield_Undead,Ramorushirudo,4,20,,1300,,50,,1,0xFFFFFFFF,63,2,32,,65,1,3,{ bonus2 bSubEle,Ele_Undead,5; bonus2 bSubRace,RC_DemiHuman,-5; },{},{}
-2159,Sharel_Shield,Sharerushirudo,4,20,,1300,,50,,1,0xFFFFFFFF,63,2,32,,65,1,3,{},{},{}
+2158,Ramor_Shield_Undead,Ramor Shield,4,20,,1300,,50,,1,0xFFFFFFFF,63,2,32,,65,1,3,{ bonus2 bSubDefEle,Ele_Undead,5; bonus2 bMagicSubDefEle,Ele_Undead,5; bonus2 bSubRace,RC_DemiHuman,5; },{},{}
+2159,Sharel_Shield,Sharel Shield,4,20,,1300,,50,,1,0xFFFFFFFF,63,2,32,,65,1,3,{ bonus2 bSubDefEle,Ele_Fire,5; bonus2 bMagicSubDefEle,Ele_Fire,5; bonus2 bSubRace,RC_Demon,5; },{},{}
 2160,Giant_Shield,Giant Shield,4,56000,,2800,,130,,1,0x00004082,63,2,32,,100,1,3,{ bonus2 bSubSize,Size_Large,5; if(getrefine()>=9){ bonus2 bSubSize,Size_Large,5; } },{},{}
 2161,Geffenia_Book_Water,Geffenia Tomb of Water,4,56000,,1000,,30,,1,0x00000200,63,2,32,,100,1,5,{ bonus bMdef,2; bonus bInt,1; if(readparam(bInt)>=120){ bonus bMatk,10; bonus bMaxHP,800; } },{},{}
 2162,Bible_Of_Promise2,Bible of Promise(2nd Vol.),4,20,,500,,20,,1,0x00000100,63,2,32,,140,1,5,{ bonus bMdef,5; skill "ALL_ODINS_POWER",2; bonus bHealPower,5; },{},{}
-2163,Flow_Shield,Floor Shield,4,20,,1300,,50,,1,0xFFFFFFFF,63,2,32,,65,1,3,{},{},{}
-2164,Sombre_Shield,Bull Son Shield,4,20,,1300,,50,,1,0xFFFFFFFF,63,2,32,,65,1,3,{ bonus2 bSubDefEle,Ele_Dark,5; bonus2 bSubDefEle,Ele_Fire,5; },{},{}
-2165,Sol_Shield,Sol Shield,4,20,,1300,,50,,1,0xFFFFFFFF,63,2,32,,65,1,3,{},{},{}
+2163,Flow_Shield,Flow Shield,4,20,,1300,,50,,1,0xFFFFFFFF,63,2,32,,65,1,3,{ bonus2 bSubDefEle,Ele_Water,5; bonus2 bMagicSubDefEle,Ele_Water,5; bonus2 bSubRace,RC_Brute,-5; },{},{}
+2164,Sombre_Shield,Sombre Shield,4,20,,1300,,50,,1,0xFFFFFFFF,63,2,32,,65,1,3,{ bonus2 bSubDefEle,Ele_Dark,5; bonus2 bMagicSubDefEle,Ele_Dark,5; bonus2 bSubRace,RC_Undead,-5; },{},{}
+2165,Sol_Shield,Sol Shield,4,20,,1300,,50,,1,0xFFFFFFFF,63,2,32,,65,1,3,{ bonus2 bSubDefEle,Ele_Earth,5; bonus2 bMagicSubDefEle,Ele_Earth,5; bonus2 bSubRace,RC_Plant,-5; },{},{}
 2166,Exorcism_Bible_,Devil's Bible Drive,4,20,,600,,80,,1,0x00008100,63,2,32,,50,1,5,{ bonus bInt,1; },{},{}
-2167,Poison_Shield,Poison Shield,4,20,,1300,,50,,1,0xFFFFFFFF,63,2,32,,65,1,3,{},{},{}
+2167,Poison_Shield,Poison Shield,4,20,,1300,,50,,1,0xFFFFFFFF,63,2,32,,65,1,3,{ bonus2 bSubDefEle,Ele_Poison,5; bonus2 bMagicSubDefEle,Ele_Poison,5; bonus2 bSubRace,RC_Plant,-5; },{},{}
 2168,Immuned_Shield,Immune Shield,4,20,,700,,55,,1,0xFFFFFFFF,63,2,32,,1,1,4,{ .@r = getrefine(); if (.@r>=5) bonus2 bSubEle,Ele_Neutral,min(.@r,12)-4; if(.@r>6) bonus2 bSubEle,Ele_Neutral,5; if(.@r>8) { bonus2 bSubEle,Ele_Fire,5; bonus2 bSubEle,Ele_Water,5; bonus2 bSubEle,Ele_Wind,5; bonus2 bSubEle,Ele_Earth,5; } },{},{}
 2169,Kalasak,Kalasag,4,20,,400,,40,,0,0xFFFFFFFF,63,2,32,,1,1,1,{ bonus2 bSubClass,Class_Boss,getrefine()/3; },{},{}
 2170,Bayani_Kalasak,Bayani Kalasag,4,20,,400,,40,,1,0xFFFFFFFF,63,2,32,,1,1,1,{ bonus2 bSubClass,Class_Boss,getrefine()/3; },{},{}
 2171,Fox_Armguard,Fox Wrist Guard,4,40000,,200,,45,,1,0x02000000,63,2,32,,100,1,1,{ bonus bFlee,5; },{},{}
 2172,Wolf_Armguard,Wolf Wrist Guard,4,45000,,250,,70,,1,0x02000000,63,2,32,,100,1,1,{ autobonus "{ bonus bBaseAtk,100; bonus bFlee,-50; }",20,5000,BF_WEAPON,"{ specialeffect2 EF_TEIHIT1; }"; },{},{}
 2173,Crescent_Armguard,Crescent Wrist Guard,4,45000,,250,,45,,1,0x02000000,63,2,32,,100,1,1,{ bonus bDelayRate,-(getrefine()*2); },{},{}
-2174,Lumiere_Shield,Lumiere Shield,4,20,,1300,,50,,1,0xFFFFFFFF,63,2,32,,65,1,3,{},{},{}
-2175,Esprit_Shield,Spirit Shield,4,20,,1300,,50,,1,0xFFFFFFFF,63,2,32,,65,1,3,{},{},{}
+2174,Lumiere_Shield,Lumiere Shield,4,20,,1300,,50,,1,0xFFFFFFFF,63,2,32,,65,1,3,{ bonus2 bSubDefEle,Ele_Holy,5; bonus2 bMagicSubDefEle,Ele_Holy,5; bonus2 bSubRace,RC_Dragon,-5; },{},{}
+2175,Esprit_Shield,Spirit Shield,4,20,,1300,,50,,1,0xFFFFFFFF,63,2,32,,65,1,3,{ bonus2 bSubDefEle,Ele_Ghost,5; bonus2 bMagicSubDefEle,Ele_Ghost,5; bonus2 bSubRace,RC_Angel,-5; },{},{}
 2176,Dark_Book,Black Book,4,20,,500,,80,,1,0xFFFFFFFF,63,2,32,,65,1,5,{ bonus bMdef,5; .@r = getrefine(); bonus3 bAutoSpellWhenHit,"NPC_DRAGONFEAR",1,(.@r<=6)?(10):((.@r<=8)?(20):(30)); },{},{}
 2177,Shield_Of_Death,Shield Of Death,4,20,,2000,,150,,1,0xFFFFFFFF,63,2,32,,90,1,3,{ bonus2 bAddClass,Class_Boss,2; bonus2 bMagicAddClass,Class_Boss,2; bonus2 bSubClass,Class_Normal,-10; },{},{}
 2178,TE_Woe_Buckler,TE Woe Buckler,4,0,,0,,15,,0,0xFFFFFFFF,63,2,32,,40,1,2,{ bonus bMdef,15; bonus bMaxHP,100; bonus bMaxSP,100; bonus2 bSubRace,RC_Player_Human,15; },{},{}
@@ -1816,7 +1816,7 @@
 2590,Buwaya_Cloth,Buwaya Sack Cloth,4,20,,200,,8,,0,0xFFFFFFFF,63,2,4,,1,1,0,{ .@r = getrefine(); bonus bHealPower2,.@r/3; bonus bAddItemHealRate,.@r/3; bonus2 bSubEle,Ele_Water,10; bonus2 bSubEle,Ele_Wind,10; bonus2 bSubEle,Ele_Earth,10; bonus2 bSubEle,Ele_Fire,10; },{},{}
 2591,Bayani_Buwaya_Cloth,Bayani Buwaya Sack Cloth,4,20,,200,,8,,1,0xFFFFFFFF,63,2,4,,1,1,0,{ .@r = getrefine(); bonus bHealPower2,.@r; bonus bAddItemHealRate,.@r; bonus2 bSubEle,Ele_Water,10; bonus2 bSubEle,Ele_Wind,10; bonus2 bSubEle,Ele_Earth,10; bonus2 bSubEle,Ele_Fire,10; },{},{}
 2592,Boss_Brownie_Manteau,Boss Brownie Manteau,4,20,,100,,3,,1,0xFFFFFFFF,63,2,4,,50,1,0,{},{},{}
-2593,Flow_Manteau,Flow Manteau,4,20,,700,,20,,1,0xFFFFFFFF,63,2,4,,65,1,0,{},{},{}
+2593,Flow_Manteau,Flow Manteau,4,20,,700,,20,,1,0xFFFFFFFF,63,2,4,,65,1,0,{ bonus2 bSubDefEle,Ele_Water,5; bonus2 bMagicSubDefEle,Ele_Water,5; bonus2 bSubRace,RC_Brute,-5; },{},{}
 2594,Wrapping_Manteau,Wrapping Manteau,4,20,,100,,0,,1,0xFFFFFFFF,63,2,4,,0,1,0,{},{},{}
 2597,Scarlet_Poncho,Scarlet Poncho,4,0,,500,,10,,1,0xFFFFFFFF,63,2,4,,,1,0,{ bonus bCritAtkRate,3; /* Confirm: The location. If the location is changed, also change the combo script! */ },{},{}
 2598,Ramor_Manteau,Ramor Manteau,4,20,,700,,20,,1,0xFFFFFFFF,63,2,4,,65,1,0,{ bonus2 bSubRace,RC_Undead,5; bonus2 bSubRace,RC_DemiHuman,-5; /*Gold PC Room: bonus bFlee,20;*/ },{},{}
@@ -2634,7 +2634,7 @@
 4429,Salamander_Card,Salamander Card,6,20,,10,,,,,,,,4,,,,,{ bonus2 bSkillAtk,"WZ_FIREPILLAR",40; bonus2 bSkillAtk,"WZ_METEOR",40; },{},{}
 4430,Ifrit_Card,Ifrit Card,6,20,,10,,,,,,,,136,,,,,{ bonus bBaseAtk,(JobLevel/10); bonus bCritical,(JobLevel/10); bonus bHit,(JobLevel/10); bonus3 bAutoSpellWhenHit,"NPC_EARTHQUAKE",10,1; },{},{}
 4431,Kasa_Card,Kasa Card,6,20,,10,,,,,,,,4,,,,,{ bonus3 bAutoSpell,"MG_FIREBALL",5,20; bonus3 bAutoSpell,"MG_FIREBOLT",5,20; },{},{}
-4432,Magmaring_Card,Magmaring Card,6,20,,10,,,,,,,,4,,,,,{ bonus bBaseAtk,5; bonus2 bAddEle,Ele_Earth,10; bonus2 bCriticalAddRace,RC_Brute,15; bonus2 bCriticalAddRace,RC_Player_Doram,15; },{},{}
+4432,Magmaring_Card,Magmaring Card,6,20,,10,,,,,,,,4,,,,,{ bonus bBaseAtk,5; bonus2 bAddEle,Ele_Earth,10; bonus2 bCriticalAddRace,RC_Brute,15; bonus2 bCriticalAddRace,RC_Player_Doram,15; bonus2 bCriticalAddRace,RC_Plant,15; },{},{}
 4433,Imp_Card,Imp Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bSkillAtk,"MG_FIREBOLT",25; bonus2 bVariableCastrate,"MG_FIREBOLT",-25; },{},{}
 4434,Knocker_Card,Knocker Card,6,20,,10,,,,,,,,769,,,,,{ bonus2 bAddRace,RC_Formless,5; bonus3 bAddMonsterDropItem,756,RC_Formless,10; bonus3 bAddMonsterDropItem,757,RC_Formless,10; },{},{}
 4435,Zombie_Slaughter_Card,Zombie Slaughter Card,6,20,,10,,,,,,,,64,,,,,{ bonus2 bAddRace,RC_DemiHuman,1; bonus2 bAddRace,RC_Player_Human,1; bonus2 bMagicAddRace,RC_DemiHuman,1; bonus2 bMagicAddRace,RC_Player_Human,1; bonus bHPGainValue,50; },{},{}
@@ -3450,7 +3450,7 @@
 5258,Afro_Wig,Afro Wig,4,20,,100,,0,,1,0xFFFFFFFF,63,2,768,,10,1,302,{ bonus3 bAutoSpellWhenHit,"NV_FIRSTAID",1,300; bonus2 bSubEle,Ele_Neutral,1; },{},{}
 5259,Elephant_Hat_,Elephant Hat,4,20,,500,,6,,0,0xFFFFFFFF,63,2,256,,0,1,215,{ bonus bVit,1; bonus3 bAutoSpell,"WZ_WATERBALL",3,10; skill "AL_HOLYWATER",1; },{},{}
 5260,Cookie_Hat,Cookie Hat,4,20,,500,,2,,0,0xFFFFFFFF,63,2,256,,0,1,217,{ bonus bAgi,1; bonus bFlee2,5; bonus bCritAtkRate,5; },{},{}
-5261,Silver_Tiara_,Silver Tiara,4,20,,500,,5,,0,0xFFFFFFFF,63,2,256,,0,1,218,{ bonus bInt,2; if(BaseClass==Job_Mage) bonus bMatkRate,(JobLevel/20); if(Baseclass==Job_Acolyte) bonus bUseSPrate,-(JobLevel/10); if(BaseClass==Job_Archer) bonus bMaxSP,(JobLevel*2); },{},{}
+5261,Silver_Tiara_,Silver Tiara,4,20,,500,,5,,0,0xFFFFFFFF,63,2,256,,0,1,218,{ bonus bInt,2; if(BaseClass==Job_Mage) bonus bMatkRate,(JobLevel/20); if(BaseClass==Job_Acolyte) bonus bUseSPrate,-(JobLevel/10); if(BaseClass==Job_Archer) bonus bMaxSP,(JobLevel*2); },{},{}
 5262,Gold_Tiara_,Golden Tiara,4,20,,500,,5,,0,0xFFFFFFFF,63,2,256,,0,1,232,{ bonus bStr,2; bonus bUnbreakableHelm; if((readparam(bDex)<56)&&(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief)) bonus bDex,JobLevel/7; },{},{}
 5263,Ati_Atihan_Hat,Pagdayaw,4,20,,100,,1,,0,0xFFFFFFFE,63,2,769,,20,1,303,{ bonus2 bSubEle,Ele_Water,1; bonus2 bSubEle,Ele_Fire,1; bonus2 bSubEle,Ele_Wind,1; bonus2 bAddEff,Eff_Curse,300; },{},{}
 5264,Aussie_Flag_Hat,Australian Flag Hat,4,20,,500,,4,,0,0xFFFFFFFF,63,2,256,,0,1,304,{ bonus bAllStats,2; },{ specialeffect2 EF_GHOST; specialeffect2 EF_BAT; specialeffect2 EF_BAT2; },{}
@@ -3542,7 +3542,7 @@
 5350,Pirate_Bandana_,Pirate Bandana,4,20,,100,,4,,1,0xFFFFFFFE,63,2,256,,0,1,74,{ bonus bStr,1; },{},{}
 5351,Sunflower_,Sunflower,4,20,,100,,2,,1,0xFFFFFFFF,63,2,256,,0,0,37,{ bonus2 bSubRace,RC_Insect,10; },{},{}
 5352,Poporing_Cap,Poporing Cap,4,20,,700,,4,,0,0xFFFFFFFE,63,2,256,,38,1,361,{},{},{}
-5353,Helm_Of_Sun_,Hat of the Sun God,4,20,,2400,,4,,1,0x00CFDF80,63,2,768,,0,1,138,{ bonus bStr,3; bonus bInt,2; bonus5 bAutoSpellWhenHit,"HP_ASSUMPTIO",1,1,BF_WEAPON|BF_MAGIC,0; },{},{}
+5353,Helm_Of_Sun_,Hat of the Sun God,4,20,,2400,,4,,1,0x00CFDF80,63,2,768,,0,1,138,{ bonus bStr,3; bonus bInt,2; },{},{}
 5354,Muslim_Hat_M,Muslim Hat M,4,0,,100,,4,,0,0xFFFFFFFF,63,1,256,,0,0,362,{ bonus bVariableCastrate,-5; },{},{}
 5355,Muslim_Hat_F,Selendang,4,0,,100,,4,,0,0xFFFFFFFF,63,0,256,,0,0,363,{ bonus bVariableCastrate,-5; },{},{}
 5356,Pumpkin_Hat_H,Festival Pumpkin Hat,4,20,,200,,3,,0,0xFFFFFFFF,63,2,256,,0,1,206,{ bonus2 bSubRace,RC_Demon,5; bonus2 bAddRace,RC_Demon,5; },{},{}
@@ -4289,23 +4289,23 @@
 6186,Monkey_Wrench,Monkey Wrench,3,500,,10,,,,,,,,,,,,,{},{},{}
 6187,Blank_Card,Blank Card,3,20,,10,,,,,,,,,,,,,{},{},{}
 6188,Slot_Coupon,Slotting Advertisement,3,20,,10,,,,,,,,,,,,,{},{},{}
-6189,Magic_Book_FB,Spell Book (Fire Bolt),3,0,,0,,,,,,,,,,,,,{},{},{}
-6190,Magic_Book_CB,Spell Book (Cold Bolt),3,0,,0,,,,,,,,,,,,,{},{},{}
-6191,Magic_Book_LB,Spell Book (Lightening Bolt),3,0,,0,,,,,,,,,,,,,{},{},{}
-6192,Magic_Book_SG,Spell Book (Storm Gust),3,0,,0,,,,,,,,,,,,,{},{},{}
-6193,Magic_Book_LOV,Spell Book (Lord Of Vermilion),3,0,,0,,,,,,,,,,,,,{},{},{}
-6194,Magic_Book_MS,Spell Book (Meteor Storm),3,0,,0,,,,,,,,,,,,,{},{},{}
-6195,Magic_Book_CM,Spell Book (Comet),3,0,,0,,,,,,,,,,,,,{},{},{}
-6196,Magic_Book_TV,Spell Book (Tetra Vortex),3,0,,0,,,,,,,,,,,,,{},{},{}
-6197,Magic_Book_TS,Spell Book (Thunder Storm),3,0,,0,,,,,,,,,,,,,{},{},{}
-6198,Magic_Book_JT,Spell Book (Jupitel Thunder),3,0,,0,,,,,,,,,,,,,{},{},{}
-6199,Magic_Book_WB,Spell Book (Water Ball),3,0,,0,,,,,,,,,,,,,{},{},{}
-6200,Magic_Book_HD,Spell Book (Heaven's Drive),3,0,,0,,,,,,,,,,,,,{},{},{}
-6201,Magic_Book_ES,Spell Book (Earth Spike),3,0,,0,,,,,,,,,,,,,{},{},{}
-6202,Magic_Book_ES_,Spell Book (Earth Strain),3,0,,0,,,,,,,,,,,,,{},{},{}
-6203,Magic_Book_CL,Spell Book (Chain Lightning),3,0,,0,,,,,,,,,,,,,{},{},{}
-6204,Magic_Book_CR,Spell Book (Crimson Rock),3,0,,0,,,,,,,,,,,,,{},{},{}
-6205,Magic_Book_DL,Spell Book (Drain Life),3,0,,0,,,,,,,,,,,,,{},{},{}
+6189,Magic_Book_FB,Old Spell Book (Fire Bolt),3,0,,0,,,,,,,,,,,,,{},{},{}
+6190,Magic_Book_CB,Old Spell Book (Cold Bolt),3,0,,0,,,,,,,,,,,,,{},{},{}
+6191,Magic_Book_LB,Old Spell Book (Lightening Bolt),3,0,,0,,,,,,,,,,,,,{},{},{}
+6192,Magic_Book_SG,Old Spell Book (Storm Gust),3,0,,0,,,,,,,,,,,,,{},{},{}
+6193,Magic_Book_LOV,Old Spell Book (Lord Of Vermilion),3,0,,0,,,,,,,,,,,,,{},{},{}
+6194,Magic_Book_MS,Old Spell Book (Meteor Storm),3,0,,0,,,,,,,,,,,,,{},{},{}
+6195,Magic_Book_CM,Old Spell Book (Comet),3,0,,0,,,,,,,,,,,,,{},{},{}
+6196,Magic_Book_TV,Old Spell Book (Tetra Vortex),3,0,,0,,,,,,,,,,,,,{},{},{}
+6197,Magic_Book_TS,Old Spell Book (Thunder Storm),3,0,,0,,,,,,,,,,,,,{},{},{}
+6198,Magic_Book_JT,Old Spell Book (Jupitel Thunder),3,0,,0,,,,,,,,,,,,,{},{},{}
+6199,Magic_Book_WB,Old Spell Book (Water Ball),3,0,,0,,,,,,,,,,,,,{},{},{}
+6200,Magic_Book_HD,Old Spell Book (Heaven's Drive),3,0,,0,,,,,,,,,,,,,{},{},{}
+6201,Magic_Book_ES,Old Spell Book (Earth Spike),3,0,,0,,,,,,,,,,,,,{},{},{}
+6202,Magic_Book_ES_,Old Spell Book (Earth Strain),3,0,,0,,,,,,,,,,,,,{},{},{}
+6203,Magic_Book_CL,Old Spell Book (Chain Lightning),3,0,,0,,,,,,,,,,,,,{},{},{}
+6204,Magic_Book_CR,Old Spell Book (Crimson Rock),3,0,,0,,,,,,,,,,,,,{},{},{}
+6205,Magic_Book_DL,Old Spell Book (Drain Life),3,0,,0,,,,,,,,,,,,,{},{},{}
 6206,I_Love_You,I Love You,3,0,,0,,,,,,,,,,,,,{},{},{}
 6207,Thank_You,Thank You,3,0,,0,,,,,,,,,,,,,{},{},{}
 6208,I_Respect_You,I Respect You,3,0,,0,,,,,,,,,,,,,{},{},{}
@@ -4792,16 +4792,16 @@
 6745,HealStone_Bottom,Recovery Stone (Low),6,20,,10,,,,,,,,,,,,,{},{},{}
 6746,Iron_Artifacts,Steel Artifact,3,10,,0,,,,,,,,,,,,,{},{},{}
 6747,Iron_Artifacts_,Steel Artifact,3,10,,0,,,,,,,,,,,,,{},{},{}
-6748,Daily_Report_He_And_His_Team,Daily Report He And His Team,3,10,,0,,,,,,,,,,,,,{},{},{}
-6749,Operation_Control_Device,Operation Control Device,3,10,,0,,,,,,,,,,,,,{},{},{}
+6748,Excavator_Repoet,Daily Report He And His Team,3,10,,0,,,,,,,,,,,,,{},{},{}
+6749,Power_Control_Device,Operation Control Device,3,10,,0,,,,,,,,,,,,,{},{},{}
 6750,Failed_Engine,Failed Engine,3,10,,10,,,,,,,,,,,,,{},{},{}
 6751,Crushed_Can_Iron_Plate,Crushed Can Iron Plate,3,10,,10,,,,,,,,,,,,,{},{},{}
 6752,Charleston_Parts,Charleston Parts,3,10,,10,,,,,,,,,,,,,{},{},{}
-6753,Token_Of_Destruction,Token Of Destruction,3,10,,0,,,,,,,,,,,,,{},{},{}
-6754,Collected_Medicinal_Herbs,Collected Medicinal Herbs,3,10,,0,,,,,,,,,,,,,{},{},{}
+6753,Sign_Of_Destruction,Token Of Destruction,3,10,,0,,,,,,,,,,,,,{},{},{}
+6754,Collected_Herb,Collected Medicinal Herbs,3,10,,0,,,,,,,,,,,,,{},{},{}
 6755,Contaminated_Magic,Contaminated Magic,3,20,,10,,,,,,,,,,,,,{},{},{}
-6756,Cohesive_Energy,Cohesive Energy,3,20,,0,,,,,,,,,,,,,{},{},{}
-6757,The_Memory_Recorder,The Memory Recorder,3,20,,0,,,,,,,,,,,,,{},{},{}
+6756,Condensed_Energy,Cohesive Energy,3,20,,0,,,,,,,,,,,,,{},{},{}
+6757,Memory_Record,The Memory Recorder,3,20,,0,,,,,,,,,,,,,{},{},{}

 6762,Banana_Can,Banana Can,3,0,,10,,,,,,,,,,,,,{},{},{}
 6763,Spicy_Rice_Cake,Spicy Rice Cake,3,0,,10,,,,,,,,,,,,,{},{},{}
@@ -4848,11 +4848,11 @@
 6819,Acolyte_Soul,Acolyte Soul,3,10,,10,,,,,,,,,,,,,{},{},{}
 6820,Particles_Of_Energy,Energy Fragment,3,0,,10,,,,,,,,,,,,,{},{},{}
 6821,Solo_Troops_Badge,Single Union Badge,3,0,,0,,,,,,,,,,,,,{},{},{}
-6824,Experimental_Dong_Memory_Record,Experimental Dong Memory Record,3,10,,10,,,,,,,,,,,,,{},{},{}
+6824,Lab_Memory_Record,Experimental Dong Memory Record,3,10,,10,,,,,,,,,,,,,{},{},{}
 6825,Air_Cleaner_Box,Air Cleaner Box,3,10,,10000,,,,,,,,,,,,,{},{},{}
 6826,Fresh_Grapes,Fresh Grapes,3,10,,100,,,,,,,,,,,,,{},{},{}
-6827,Complete_Machine_Parts,Complete Machine Parts,3,10,,0,,,,,,,,,,,,,{},{},{}
-6828,Gravity_Safety_Device,Gravity Safety Device,3,10,,100,,,,,,,,,,,,,{},{},{}
+6827,Normal_Parts,Complete Machine Parts,3,10,,0,,,,,,,,,,,,,{},{},{}
+6828,Gravity_Parts,Gravity Safety Device,3,10,,100,,,,,,,,,,,,,{},{},{}
 6832,Questioned_Parts,Questioned Parts,3,10,,10,,,,,,,,,,,,,{},{},{}
 6833,Limited_Token_of_Ziegfried,(Limited) Token of Ziegfried,3,10,,10,,,,,,,,,,,,,{},{},{}
 6834,Legendary_Fur,Legendary Fur,3,10,,10,,,,,,,,,,,,,{},{},{}
@@ -6589,7 +6589,7 @@
 12265,Comp_Insurance,Life Insurrance,2,2,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_LIFEINSURANCE,1800000,0; },{},{}
 12266,Sesame_Pastry_,Sesame Pastry,2,2,,70,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_HITFOOD,180000,30; },{},{}
 12267,Honey_Pastry_,Honey Pastry,2,2,,70,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_FLEEFOOD,180000,30; },{},{}
-12268,Rainbow_Cake_,Rainbow Cake,2,2,,70,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_ATKPOTION,60000,10; sc_start SC_MATKFOOD,120000,10; },{},{}
+12268,Rainbow_Cake_,Rainbow Cake,2,2,,70,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_ATKPOTION,60000,10; sc_start SC_MATKFOOD,60000,10; },{},{}
 12269,Tasty_Colonel,Tasty Pink Ration,2,2,,70,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_ATKPOTION,600000,15; },{},{}
 12270,Tasty_Major,Tasty White Ration,2,2,,70,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_MATKPOTION,600000,15; },{},{}
 12271,Mre_A,Military Ration A,0,2,,70,,,,,0xFFFFFFFF,63,2,,,,,,{ percentheal 5,0; },{},{}
@@ -7525,16 +7525,16 @@
 //===================================================================
 // Shurikens & Kunais
 //===================================================================
-13250,Shuriken,Shuriken,10,4,,5,10,,,,0x02000000,63,2,32768,,1,,6,{},{},{}
-13251,Nimbus_Shuriken,Nimbus Shuriken,10,10,,5,30,,,,0x02000000,63,2,32768,,20,,6,{},{},{}
-13252,Flash_Shuriken,Flash Shuriken,10,20,,5,45,,,,0x02000000,63,2,32768,,40,,6,{},{},{}
-13253,Sharp_Leaf_Shuriken,Sharp Leaf Shuriken,10,40,,5,70,,,,0x02000000,63,2,32768,,60,,6,{},{},{}
-13254,Thorn_Needle_Shuriken,Thorn Needle Shuriken,10,100,,5,100,,,,0x02000000,63,2,32768,,80,,6,{},{},{}
-13255,Kunai_Of_Icicle,Icicle Kunai,10,10,,20,30,,,,0x02000000,63,2,32768,,1,,7,{ bonus bAtkEle,Ele_Water; },{},{}
-13256,Kunai_Of_Black_Soil,Black Earth Kunai,10,10,,20,30,,,,0x02000000,63,2,32768,,1,,7,{ bonus bAtkEle,Ele_Earth; },{},{}
-13257,Kunai_Of_Furious_Wind,High Wind Kunai,10,10,,20,30,,,,0x02000000,63,2,32768,,1,,7,{ bonus bAtkEle,Ele_Wind; },{},{}
-13258,Kunai_Of_Fierce_Flame,Heat Wave Kunai,10,10,,20,30,,,,0x02000000,63,2,32768,,1,,7,{ bonus bAtkEle,Ele_Fire; },{},{}
-13259,Kunai_Of_Deadly_Poison,Fell Poison Kunai,10,10,,20,30,,,,0x02000000,63,2,32768,,1,,7,{ bonus bAtkEle,Ele_Poison; bonus2 bAddEff,Eff_Poison,500; },{},{}
+13250,Shuriken,Shuriken,10,4,,1,10,,,,0x02000000,63,2,32768,,1,,6,{},{},{}
+13251,Nimbus_Shuriken,Nimbus Shuriken,10,10,,1,30,,,,0x02000000,63,2,32768,,20,,6,{},{},{}
+13252,Flash_Shuriken,Flash Shuriken,10,20,,1,45,,,,0x02000000,63,2,32768,,40,,6,{},{},{}
+13253,Sharp_Leaf_Shuriken,Sharp Leaf Shuriken,10,40,,1,70,,,,0x02000000,63,2,32768,,60,,6,{},{},{}
+13254,Thorn_Needle_Shuriken,Thorn Needle Shuriken,10,100,,1,100,,,,0x02000000,63,2,32768,,80,,6,{},{},{}
+13255,Kunai_Of_Icicle,Icicle Kunai,10,10,,1,30,,,,0x02000000,63,2,32768,,1,,7,{ bonus bAtkEle,Ele_Water; },{},{}
+13256,Kunai_Of_Black_Soil,Black Earth Kunai,10,10,,1,30,,,,0x02000000,63,2,32768,,1,,7,{ bonus bAtkEle,Ele_Earth; },{},{}
+13257,Kunai_Of_Furious_Wind,High Wind Kunai,10,10,,1,30,,,,0x02000000,63,2,32768,,1,,7,{ bonus bAtkEle,Ele_Wind; },{},{}
+13258,Kunai_Of_Fierce_Flame,Heat Wave Kunai,10,10,,1,30,,,,0x02000000,63,2,32768,,1,,7,{ bonus bAtkEle,Ele_Fire; },{},{}
+13259,Kunai_Of_Deadly_Poison,Fell Poison Kunai,10,10,,1,30,,,,0x02000000,63,2,32768,,1,,7,{ bonus bAtkEle,Ele_Poison; bonus2 bAddEff,Eff_Poison,500; },{},{}
 //===================================================================
 // Genetic Created Bombs And Throwing Items
 //===================================================================
@@ -7575,7 +7575,7 @@
 13291,Starfish,Starfish,10,0,,5,110,,,,0x02000000,63,2,32768,,50,,6,{ bonus bAtkEle,Ele_Neutral; bonus2 bAddEff,Eff_Stun,1000; },{},{}
 13292,Dried_Squid,Dried Squid,10,10,,20,50,,,,0x02000000,63,2,32768,,1,,7,{ bonus bAtkEle,Ele_Neutral; bonus2 bAddEff,Eff_Stun,1000; },{},{}
 13293,Flying_Fish,Flying Fish,10,10,,20,50,,,,0x02000000,63,2,32768,,1,,7,{ bonus bAtkEle,Ele_Neutral; bonus3 bAutoSpell,"NPC_CRITICALWOUND",1,3; },{},{}
-13294,Explosive_Kunai,Explosive Kunai,10,100,,30,50,,,,0x02000000,63,2,32768,,100,,7,{ bonus bAtkEle,Ele_Neutral; },{},{}
+13294,Explosive_Kunai,Explosive Kunai,10,100,,1,50,,,,0x02000000,63,2,32768,,100,,7,{ bonus bAtkEle,Ele_Neutral; },{},{}
 13295,Light_Shuriken,Light Shuriken,10,0,,5,5,,,,0xFFFFFFFF,63,2,32768,,,,0,{},{},{}
 //===================================================================
 // Ninja Fuuma Shurikens
@@ -10095,7 +10095,7 @@
 18987,RWC13_Jormungandr_Hat,RWC13 Jormungandr Hat,4,20,,2500,,7,,1,0xFFFFFFFF,63,2,256,,1,1,1149,{ bonus bAllStats,2; bonus bVariableCastrate,-5; bonus bDelayrate,-5; bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player_Human,10; .@r = getrefine(); if(.@r>6){ bonus2 bAddItemHealRate,11596,20; bonus bAspd,1; } if(.@r>9){ bonus bVariableCastrate,-5; bonus bDelayrate,-5; } bonus2 bAddItemHealRate,11596,150; },{ sc_end SC_SpeedUp0; },{}
 18997,Riot_Chip,Runaway Chip,4,10,,300,,,,1,0xFFFFFFFF,63,2,256,,100,1,1201,{ bonus bHit,50; bonus bFlee,50; bonus bMaxSPrate,-50; },{},{}
 19019,Elemental_Crown,Elemental Crown,4,0,,500,,10,,1,0xFFFFFFFF,63,2,256,,,1,1219,{ .@r = getrefine(); bonus bDex,(3 + (.@r/2)+ (readparam(bDex) > 130 ? .@r : 0)); bonus bLongAtkRate,4; },{},{}
-19020,Survive_Circlet,Survive Circlet,4,0,,500,,10,,0,0xFFFFFFFF,63,2,256,,,1,1220,{ .@r = getrefine(); bonus bInt,(3 + (.@r/2)+ (BaseLevel > 130 ? .@r : 0)); bonus bMatkRate,4; },{},{}
+19020,Survive_Circlet,Survive Circlet,4,0,,500,,10,,1,0xFFFFFFFF,63,2,256,,50,1,1220,{ .@r = getrefine(); bonus bInt,(3 + (BaseLevel > 99 ? .@r : .@r/2)); bonus bMatkRate,4; },{},{}
 19021,Gigant_Helm,Gigant Helm,4,0,,500,,10,,0,0xFFFFFFFF,63,2,256,,,1,1221,{ bonus bStr,3+((BaseLevel > 130) ? getrefine() : 0); bonus2 bAddClass,Class_All,4; },{},{}
 19022,Floating_Stone_Of_Int,Floating Stone Of Intelligence,4,,,,,,,,0xFFFFFFFF,63,2,256,,,,1230,{},{ sc_start SC_FSTONE,INFINITE_TICK,0; },{ sc_end SC_FSTONE; } // jRO Item
 19024,Protect_Feathers,Protect Feathers,4,0,,500,,,,0,0xFFFFFFFF,63,2,512,,70,0,1232,{ bonus2 bSubRace,RC_DemiHuman,2; bonus2 bSubRace,RC_Player_Human,2; bonus bAspdRate,-5; .@vit = readparam(bVit); if (.@vit >= 108) { bonus2 bSubRace,RC_DemiHuman,3; bonus2 bSubRace,RC_Player_Human,3; bonus bAspdRate,-5; } if (.@vit >= 120) { bonus bMaxHPRate,3; bonus bMdef,3; } },{},{}
@@ -10207,6 +10207,7 @@
 19247,Illusion_Fancy_Flower,Illusion Fancy Flower,4,0,,100,,0,,1,0xFFFFFFFF,63,2,256,,120,0,4,{ bonus bMatkRate,1; bonus bMatk,(2*getrefine()); },{},{}
 //
 19246,Royal_Guard_Necklace,Royal Guard Necklace,4,20,,300,,0,,0,0xFFFFFFFF,63,2,1,,80,0,1629,{ bonus bAspd,1; },{},{}
+19266,Survive_Circlet_,Survivor's Circlet,4,0,,500,,10,,1,0xFFFFFFFF,63,2,256,,1,1,1220,{ .@r = getrefine(); bonus bInt,3; bonus bMatk,10*(.@r/2)+(BaseLevel > 129 ? 50 : 0); if (.@r >= 10) {bonus bMatkRate,5;} },{},{}
 19269,Happy_Flapping_Wings,Happy Flapping Angel Wings,4,20,,500,,2,,1,0xFFFFFFFF,63,2,256,,30,1,1251,{ .@r = getrefine(); .@a = 15; if (.@r >= 7) .@a += 15; if (.@r>=8) bonus2 bResEff,Eff_Stone,10000; if (.@r>=9) .@a += 20; bonus2 bAddRace2,RC2_CLOCKTOWER,.@a; bonus2 bMagicAddRace2,RC2_CLOCKTOWER,.@a; bonus2 bSubRace2,RC2_CLOCKTOWER,.@a; bonus2 bAddMonsterDropItem,1061,500; /* Unofficial rates, info get from bRO itemdescription */ },{},{}
 19272,Garden_of_Eden,Garden of Eden,4,20,,400,,5,,1,0xFFFFFFFF,63,2,256,,100,1,1653,{ .@r = getrefine(); bonus bInt,5; bonus bDex,5; bonus2 bIgnoreMdefRaceRate,RC_All,20; bonus2 bMagicAtkEle,Ele_All,10; if (.@r>=7) { bonus2 bIgnoreMdefRaceRate,RC_All,30; bonus2 bMagicAtkEle,Ele_All,15; } if (.@r>=9) { bonus2 bIgnoreMdefRaceRate,RC_All,50; bonus bVariableCastrate,-15; } },{},{ sc_end SC_TELEKINESIS_INTENSE; }
 19273,Gemini_Red_Eyes,Gemini Red Eyes,4,20,,100,,0,,0,0xFFFFFFFF,63,2,512,,100,0,1654,{ .@val = 100*(readparam(bVit)>89?50:10); bonus2 bResEff,Eff_Sleep,.@val; bonus2 bResEff,Eff_Stone,.@val; },{},{}
@@ -11159,7 +11160,7 @@
 20592,C_Santa_Backpack,Costume Santa's Pocket,4,0,,0,,,,0,0xFFFFFFFF,63,2,8192,,1,0,70,{},{},{}
 20600,Fantastic_Aura,Fantastic Aura,4,0,,0,,0,,0,0xFFFFFFFF,63,2,8192,,1,0,0,{ /*TODO: View ID*/ bonus bUnbreakableHelm; },{},{}
 20700,Egir_Manteau,Egir Manteau,4,200000,,300,,10,,1,0xFFFFFFFF,63,2,4,,110,1,0,{ bonus bUnbreakableGarment; .@r = getrefine(); if (.@r > 10) .@r = 10; if (BaseClass == Job_Mage || BaseClass == Job_Archer || BaseClass == Job_Acolyte) { bonus bFlee2,5+(.@r*2); } else if (BaseClass == Job_Swordman || BaseClass == Job_Merchant || BaseClass == Job_Thief) { bonus bShortWeaponDamageReturn,5+(.@r*2); } },{},{}
-20701,Sol_Manteau,Sol Manteau,4,0,,700,,20,,1,0xFFFFFFFF,63,2,4,,65,1,0,{ bonus2 bSubEle,Ele_Earth,5; bonus2 bSubRace,RC_Fish,-5; },{},{}
+20701,Sol_Manteau,Sol Manteau,4,0,,700,,20,,1,0xFFFFFFFF,63,2,4,,65,1,0,{ bonus2 bSubDefEle,Ele_Earth,5; bonus2 bMagicSubDefEle,Ele_Earth,5; bonus2 bSubRace,RC_Fish,-5; },{},{}
 20702,TE_Woe_Muffler,TE Woe Muffler,4,0,,0,,5,,0,0xFFFFFFFF,63,2,4,,40,1,,{ bonus bMdef,5; bonus2 bAddRace,RC_Player_Human,5; bonus2 bMagicAddRace,RC_Player_Human,5; bonus2 bResEff,Eff_Freeze,25; },{},{}
 20703,TE_Woe_Manteau,TE Woe Manteau,4,0,,0,,10,,0,0x000444A2,63,2,4,,40,1,,{ bonus2 bAddRace,RC_Player_Human,10; bonus2 bResEff,Eff_Freeze,25; },{},{}
 20704,TE_Woe_Magic_Manteau,TE Woe Magic Manteau,4,0,,0,,5,,0,0x00818315,63,2,4,,40,1,,{ bonus2 bMagicAddRace,RC_Player_Human,10; bonus2 bResEff,Eff_Freeze,25; },{},{}
@@ -11484,11 +11485,11 @@
 22685,Solo_Christmas_Gift,Single Union Christmas Gift,2,0,,0,,,,,0xFFFFFFFF,63,2,,,0,,,{ getgroupitem(IG_Solo_Christmas_Gift); },{},{}
 22686,Solo_Cookie,Single Cookie,0,0,,50,,,,,0xFFFFFFFF,63,2,,,0,,,{ percentheal 5,5; },{},{}
 22687,Pieces_Of_Sentiment,Sentimental Fragment,11,0,,1,,,,0,0xFFFFFFFF,63,2,,,100,,,{ callfunc("F_Pieces_Of_Sentiment"); },{},{}
-22691,Record_Fragment1,Record Fragment,0,,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ warp "un_bk_q",98,143; if (callfunc("F_time_limit_recorder") == 1) { recorder_quest_type = 1; } },{},{}
-22692,Record_Fragment2,Record Fragment,0,,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ warp "un_bk_q",45,276; if (callfunc("F_time_limit_recorder") == 1) { recorder_quest_type = 2; } },{},{}
-22693,Record_Fragment3,Record Fragment,0,,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ warp "un_bk_q",217,346; if (callfunc("F_time_limit_recorder") == 1) { recorder_quest_type = 3; } },{},{}
-22694,Record_Fragment4,Record Fragment,0,,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ warp "un_bk_q",273,235; if (callfunc("F_time_limit_recorder") == 1) { recorder_quest_type = 4; } },{},{}
-22695,Record_Fragment5,Record Fragment,0,,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ warp "un_bk_q",275,290; if (callfunc("F_time_limit_recorder") == 1) { recorder_quest_type = 5; } },{},{}
+22691,Piece_Of_Record1,Record Fragment,0,,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ warp "un_bk_q",98,143; },{},{}
+22692,Piece_Of_Record2,Record Fragment,0,,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ warp "un_bk_q",45,276; },{},{}
+22693,Piece_Of_Record3,Record Fragment,0,,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ warp "un_bk_q",217,346; },{},{}
+22694,Piece_Of_Record4,Record Fragment,0,,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ warp "un_bk_q",273,235; },{},{}
+22695,Piece_Of_Record5,Record Fragment,0,,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ warp "un_bk_q",275,290; },{},{}
 22699,Test_Reagent,Test Reagent,2,,,30,,,,,0xFFFFFFFF,63,2,,,,,,{ bonus_script "bonus bFlee,100;",5,9; sc_start SC_BLIND,5000,0,10000,0; },{},{}
 22700,Jumping_Support_Box,Jumping Support Box,18,10,,0,,,,0,0xFFFFFFFF,63,2,,,,,,{ /*TODO: getitem 12529,1; getitem 12323,200; getitem 12324,50; and 5 boxes that containing quivers + oridecons*/ },{},{}
 22702,STR_Soul_Potion,STR Reduction Potion,11,10,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ callfunc "F_CashReduceStat",bStr,-1,22702; },{},{}
@@ -11852,16 +11853,16 @@
 24195,S_Divine_Armor,Divine Shadow Armor,12,0,,0,,,,0,0xFFFFFFFF,63,2,65536,,1,1,,{ .@r = getrefine(); bonus2 bAddEle,Ele_Undead,1+(.@r/2); bonus2 bMagicAddEle,Ele_Undead,1+(.@r/2); },{},{}
 24196,S_Hasty_Shoes,Hasty Shadow Shoes,12,0,,0,,,,0,0xFFFFFFFF,63,2,524288,,1,1,,{ bonus bFlee,5+(getrefine()/2); },{},{}
 24197,S_Hasty_Armor,Hasty Shadow Armor,12,0,,0,,,,0,0xFFFFFFFF,63,2,65536,,1,1,,{ bonus bFlee,5+(getrefine()/2); },{},{}
-24198,S_Basis_Shield,Basis Shadow Shield,12,0,,0,,,,0,0xFFFFFFFF,63,2,262144,,1,1,,{ .@r = getrefine(); bonus2 bSubEle,Ele_Neutral,(.@r<7)?1:((.@r<9)?2:3); },{},{}
-24199,S_Hallowed_Shield,Hallowed Shadow Shield,12,0,,0,,,,0,0xFFFFFFFF,63,2,262144,,1,1,,{ .@r = getrefine(); bonus2 bSubEle,Ele_Dark,(.@r<7)?1:((.@r<9)?2:3); },{},{}
-24200,S_Saharic_Shield,Saharic Shadow Shield,12,0,,0,,,,0,0xFFFFFFFF,63,2,262144,,1,1,,{ .@r = getrefine(); bonus2 bSubEle,Ele_Water,(.@r<7)?1:((.@r<9)?2:3); },{},{}
-24201,S_Underneath_Shield,Underneath Shadow Shield,12,0,,0,,,,0,0xFFFFFFFF,63,2,262144,,1,1,,{ .@r = getrefine(); bonus2 bSubEle,Ele_Earth,(.@r<7)?1:((.@r<9)?2:3); },{},{}
-24202,S_Flam_Shield,Flame Shadow Shield,12,0,,0,,,,0,0xFFFFFFFF,63,2,262144,,1,1,,{ .@r = getrefine(); bonus2 bSubEle,Ele_Fire,(.@r<7)?1:((.@r<9)?2:3); },{},{}
-24203,S_Windy_Shield,Windy Shadow Shield,12,0,,0,,,,0,0xFFFFFFFF,63,2,262144,,1,1,,{ .@r = getrefine(); bonus2 bSubEle,Ele_Wind,(.@r<7)?1:((.@r<9)?2:3); },{},{}
-24204,S_Envenom_Shield,Envenom Shadow Shield,12,0,,0,,,,0,0xFFFFFFFF,63,2,262144,,1,1,,{ .@r = getrefine(); bonus2 bSubEle,Ele_Poison,(.@r<7)?1:((.@r<9)?2:3); },{},{}
-24205,S_Damned_Shield,Damned Shadow Shield,12,0,,0,,,,0,0xFFFFFFFF,63,2,262144,,1,1,,{ .@r = getrefine(); bonus2 bSubEle,Ele_Holy,(.@r<7)?1:((.@r<9)?2:3); },{},{}
-24206,S_Geist_Shield,Exorcism Shadow Shield,12,0,,0,,,,0,0xFFFFFFFF,63,2,262144,,1,1,,{ .@r = getrefine(); bonus2 bSubEle,Ele_Ghost,(.@r<7)?1:((.@r<9)?2:3); },{},{}
-24207,S_Divine_Shield,Divine Shadow Shield,12,0,,0,,,,0,0xFFFFFFFF,63,2,262144,,1,1,,{ .@r = getrefine(); bonus2 bSubEle,Ele_Undead,(.@r<7)?1:((.@r<9)?2:3); },{},{}
+24198,S_Basis_Shield,Basis Shadow Shield,12,0,,0,,,,0,0xFFFFFFFF,63,2,262144,,1,1,,{ .@r = getrefine(); .@i = (.@r<7)?1:((.@r<9)?2:3); bonus2 bSubDefEle,Ele_Neutral,.@i; bonus2 bMagicSubDefEle,Ele_Neutral,.@i; },{},{}
+24199,S_Hallowed_Shield,Hallowed Shadow Shield,12,0,,0,,,,0,0xFFFFFFFF,63,2,262144,,1,1,,{ .@r = getrefine(); .@i = (.@r<7)?1:((.@r<9)?2:3); bonus2 bSubDefEle,Ele_Dark,.@i; bonus2 bMagicSubDefEle,Ele_Dark,.@i; },{},{}
+24200,S_Saharic_Shield,Saharic Shadow Shield,12,0,,0,,,,0,0xFFFFFFFF,63,2,262144,,1,1,,{ .@r = getrefine(); .@i = (.@r<7)?1:((.@r<9)?2:3); bonus2 bSubDefEle,Ele_Water,.@i; bonus2 bMagicSubDefEle,Ele_Water,.@i; },{},{}
+24201,S_Underneath_Shield,Underneath Shadow Shield,12,0,,0,,,,0,0xFFFFFFFF,63,2,262144,,1,1,,{ .@r = getrefine(); .@i = (.@r<7)?1:((.@r<9)?2:3); bonus2 bSubDefEle,Ele_Earth,.@i; bonus2 bMagicSubDefEle,Ele_Earth,.@i; },{},{}
+24202,S_Flam_Shield,Flame Shadow Shield,12,0,,0,,,,0,0xFFFFFFFF,63,2,262144,,1,1,,{ .@r = getrefine(); .@i = (.@r<7)?1:((.@r<9)?2:3); bonus2 bSubDefEle,Ele_Fire,.@i; bonus2 bMagicSubDefEle,Ele_Fire,.@i; },{},{}
+24203,S_Windy_Shield,Windy Shadow Shield,12,0,,0,,,,0,0xFFFFFFFF,63,2,262144,,1,1,,{ .@r = getrefine(); .@i = (.@r<7)?1:((.@r<9)?2:3); bonus2 bSubDefEle,Ele_Wind,.@i; bonus2 bMagicSubDefEle,Ele_Wind,.@i; },{},{}
+24204,S_Envenom_Shield,Envenom Shadow Shield,12,0,,0,,,,0,0xFFFFFFFF,63,2,262144,,1,1,,{ .@r = getrefine(); .@i = (.@r<7)?1:((.@r<9)?2:3); bonus2 bSubDefEle,Ele_Poison,.@i; bonus2 bMagicSubDefEle,Ele_Poison,.@i; },{},{}
+24205,S_Damned_Shield,Damned Shadow Shield,12,0,,0,,,,0,0xFFFFFFFF,63,2,262144,,1,1,,{ .@r = getrefine(); .@i = (.@r<7)?1:((.@r<9)?2:3); bonus2 bSubDefEle,Ele_Holy,.@i; bonus2 bMagicSubDefEle,Ele_Holy,.@i; },{},{}
+24206,S_Geist_Shield,Exorcism Shadow Shield,12,0,,0,,,,0,0xFFFFFFFF,63,2,262144,,1,1,,{ .@r = getrefine(); .@i = (.@r<7)?1:((.@r<9)?2:3); bonus2 bSubDefEle,Ele_Ghost,.@i; bonus2 bMagicSubDefEle,Ele_Ghost,.@i; },{},{}
+24207,S_Divine_Shield,Divine Shadow Shield,12,0,,0,,,,0,0xFFFFFFFF,63,2,262144,,1,1,,{ .@r = getrefine(); .@i = (.@r<7)?1:((.@r<9)?2:3); bonus2 bSubDefEle,Ele_Undead,.@i; bonus2 bMagicSubDefEle,Ele_Undead,.@i; },{},{}
 24208,S_Expert_Shoes,Expert Shadow Shoes,12,20,,100,,,,0,0xFFFFFFFF,63,2,524288,,150:175,1,,{ bonus2 bExpAddRace,RC_All,1; },{},{}
 24209,S_Expert_Shield,Expert Shadow Shield,12,0,,0,,,,0,0xFFFFFFFF,63,2,262144,,150:175,1,,{ bonus2 bExpAddRace,RC_All,(getrefine()/4); },{},{}
 24210,S_Beginner_Shoes,Beginner Shadow Shoes,12,20,,0,,,,0,0xFFFFFFFF,63,2,524288,,1:49,1,,{ bonus2 bExpAddRace,RC_All,getrefine(); },{},{}
@@ -12204,16 +12205,16 @@
 25260,Fragment_of_Purple_Ore,Fragment of Purple Ore,3,0,,0,,,,,,,,,,,,,{},{},{}
 25271,Illusion_Stone,Illusion Stone,3,10,,0,,,,,,,,,,,,,{},{},{}
 25272,Illusion_Gemstone,Illusion Gemstone,3,0,,10,,,,,,,,,,,,,{},{},{}
-25276,Clean_Bone,Clean Bone,3,248,,10,,,,,,,,,,,,,{},{},{}
-25277,Deadly_Poison_Powder,Deadly Poison Powder,3,0,,10,,,,,,,,,,,,,{},{},{}
+25276,Clean_Bone,Clean Bone,3,348,,10,,,,,,,,,,,,,{},{},{}
+25277,Deadly_Poison_Powder,Deadly Poison Powder,3,644,,10,,,,,,,,,,,,,{},{},{}
 25278,Bandits_Scarf,Bandit's Scarf,3,330,,10,,,,,,,,,,,,,{},{},{}
 25279,Crude_Ammo,Crude Ammo,3,300,,10,,,,,,,,,,,,,{},{},{}
-25280,Broken_Shotgun,Broken Shotgun,3,0,,10,,,,,,,,,,,,,{},{},{}
-25281,Crude_Scimitar,Crude Scimitar,3,0,,10,,,,,,,,,,,,,{},{},{}
-25282,Worn_Revolver,Worn Revolver,3,0,,10,,,,,,,,,,,,,{},{},{}
+25280,Broken_Shotgun,Broken Shotgun,3,910,,10,,,,,,,,,,,,,{},{},{}
+25281,Crude_Scimitar,Crude Scimitar,3,970,,10,,,,,,,,,,,,,{},{},{}
+25282,Worn_Revolver,Worn Revolver,3,820,,10,,,,,,,,,,,,,{},{},{}
 25283,Brown_Muffler,Brown Muffler,3,420,,10,,,,,,,,,,,,,{},{},{}
-25284,Swamp_Bug_Shell,Swamp Bug Shell,3,0,,10,,,,,,,,,,,,,{},{},{}
-25285,Brown_Rat_Tail,Brown Rat Tail,3,0,,10,,,,,,,,,,,,,{},{},{}
+25284,Swamp_Bug_Shell,Swamp Bug Shell,3,230,,10,,,,,,,,,,,,,{},{},{}
+25285,Brown_Rat_Tail,Brown Rat Tail,3,210,,10,,,,,,,,,,,,,{},{},{}
 25290,Sweets_Festival_Coin,Sweets Festival Coin,3,0,,0,,,,,,,,,,,,,{},{},{}
 25302,DoubleAttack_Stone,Double Attack Stone (Garment),3,20,,100,,,,,,,,,,,,,{},{},{}
 25303,Critical_Stone_Robe,Critical Stone (Garment),3,20,,100,,,,,,,,,,,,,{},{},{}
@@ -12341,7 +12342,7 @@
 27026,Fire_Condor_Card,Fire Condor Card,6,20,,10,,,,,0xFFFFFFFF,63,2,136,,,,,{ bonus2 bVariableCastRate,"MG_FIREBALL",-50; bonus2 bSkillAtk,"MG_FIREBALL",100; },{},{}
 27027,Fire_Sandman_Card,Fire Sandman Card,6,20,,10,,,,,0xFFFFFFFF,63,2,16,,,,,{ bonus bDef,50; bonus2 bSubDefEle,Ele_Fire,10; },{},{}
 27028,Fire_Frilldora_Card,Fire Frilldora Card,6,20,,10,,,,,0xFFFFFFFF,63,2,2,,,,,{ .@r = getrefine(); bonus2 bMagicAddEle,Ele_Earth,3+((.@r>=7)*5)+((.@r>=9)*7); },{},{}
-27029,Fire_Golem_Card,Fire Golem Card,6,20,,10,,,,,0xFFFFFFFF,63,2,32,,,,,{ bonus2 bSubEle,Ele_Fire,20; bonus2 bAddEle,Ele_Fire,5; },{},{}
+27029,Fire_Golem_Card,Fire Golem Card,6,20,,10,,,,,0xFFFFFFFF,63,2,32,,,,,{ bonus2 bSubDefEle,Ele_Fire,20; bonus2 bAddEle,Ele_Fire,5; },{},{}
 27030,Fulbuk_Card,Firebug Card,6,20,,10,,,,,0xFFFFFFFF,63,2,769,,,,,{ bonus3 bAddEff,Eff_Burning,700,ATF_WEAPON|ATF_MAGIC; },{},{}
 27081,Angry_Moonlight_Flower_Card,Angry Moonlight Flower Card,6,20,,10,,,,,,,,16,,,,,{ skill "PA_PRESSURE",4; },{},{}
 27082,Angry_Nine_Tail_Card,Angry Nine Tail Card,6,20,,10,,,,,,,,16,,,,,{ .@val = 5; bonus bCritAtkRate,10; if (getrefine() >= 10) { .@val += 10; } bonus bCritical,.@val; },{},{}
@@ -12547,8 +12548,8 @@
 28225,Burning_Rose,Burning Rose,5,20,,2500,200,,9,2,0x40000000,63,2,34,3,120,1,19,{ bonus bLongAtkRate,15; if (.@r >= 7) { bonus2 bSkillAtk,"RL_FIRE_RAIN",30; if (.@r >= 9) { bonus2 bSkillCooldown,"RL_FIRE_RAIN",-1000; } } },{},{}
 28226,Avenger,Avenger,5,20,,1800,350,,9,2,0x40000000,63,2,34,3,120,1,21,{ bonus bLongAtkRate,20; if (.@r >= 7) { bonus2 bSkillAtk,"RL_D_TAIL",15; if (.@r >= 9) { bonus2 bSkillCooldown,"RL_H_MINE",-1000; } } },{},{}
 28240,Calf_Kingcobra,Calf Kingcobra,5,0,0,900,230,,9,2,0x40000000,63,2,34,4,150,1,18,{ .@r = getrefine(); bonus bAspdRate,10 + (.@r > 6 ? 5 : 0); bonus bLongAtkRate,(.@r/2)*5 + (.@r > 11 ? 5 : 0); if(.@r > 8){ bonus bCritAtkRate,15; } },{},{}
-28241,Calf_Diamondback,Calf Diamondback,5,0,,3000,220,,9,2,0x40000000,63,2,34,4,150,1,19,{ .@r = getrefine(); bonus bDex,2; bonus2 bAddClass,Class_All,2; bonus bLongAtkRate,(.@r/2)*5 + (.@r > 11 ? 5 : 0); if(.@r > 6){ bonus2 bSkillAtk,"RL_R_TRIP",20; } if(.@r > 8){ bonus2 bSkillUseSPrate,"RL_R_TRIP",-5; } },{},{}
-28242,Calf_Anaconda,Calf Anaconda,5,10,,1400,305,,9,2,0x40000000,63,2,34,4,150,1,20,{ .@r = getrefine(); bonus bSplashRange,1; bonus bMaxSPrate,2; bonus bLongAtkRate,(.@r/2)*5 + (.@r > 8 ? 5 : 0); if(.@r > 6){ bonus2 bSkillAtk,"RL_BANISHING_BUSTER",20; } if(.@r > 11){ bonus2 bSkillUseSPrate,"RL_BANISHING_BUSTER",-15; } },{},{}
+28241,Calf_Diamondback,Calf Diamondback,5,0,,3000,220,,9,2,0x40000000,63,2,34,4,150,1,19,{ .@r = getrefine(); bonus bDex,2; bonus2 bAddClass,Class_All,2; bonus bLongAtkRate,(.@r/2)*5 + (.@r > 11 ? 5 : 0); if(.@r > 6){ bonus2 bSkillAtk,"RL_R_TRIP",20; } if(.@r > 8){ bonus2 bSkillUseSPrate,"RL_R_TRIP",5; } },{},{}
+28242,Calf_Anaconda,Calf Anaconda,5,10,,1400,305,,9,2,0x40000000,63,2,34,4,150,1,20,{ .@r = getrefine(); bonus bSplashRange,1; bonus bMaxSPrate,2; bonus bLongAtkRate,(.@r/2)*5 + (.@r > 8 ? 5 : 0); if(.@r > 6){ bonus2 bSkillAtk,"RL_BANISHING_BUSTER",20; } if(.@r > 11){ bonus2 bSkillUseSPrate,"RL_BANISHING_BUSTER",15; } },{},{}
 28243,Calf_Python,Calf Python,5,10,0,2000,360,,9,2,0x40000000,63,2,34,4,150,1,21,{ bonus bDex,2; bonus2 bAddClass,Class_All,2; bonus bLongAtkRate,(.@r/2)*5; if(.@r > 6){ bonus bAspdRate,5; } if(.@r > 8){ bonus2 bSkillAtk,"RL_D_TAIL",15 + (.@r > 11 ? 15 : 0); } },{},{}
 28244,Illusion_Gate_Keeper_DD,Illusion Gate Keeper DD,5,0,,1300,240,,9,2,0x40000000,63,2,34,4,120,1,20,{ .@r = getrefine(); bonus bDex,1; bonus bSplashRange,1; .@val = 5*(.@r/2); if (.@r >= 7) { bonus bAspdRate,15; if (.@r >= 9) { .@val += 5; if (.@r >= 11) { bonus5 bAutoSpell,"GS_SPREADATTACK",max(6,getskilllv("GS_SPREADATTACK")),50,BF_LONG|BF_WEAPON,1; } } } bonus bLongAtkRate,.@val; },{},{}
 28253,HR-S55-OS,HR-S55-OS,5,20,,1000,250,,9,2,0x41000000,63,2,34,4,130,1,18,{ .@r = getrefine(); bonus2 bAddClass,Class_All,3; if (.@r >= 7) { bonus bLongAtkRate,7; if (.@r >= 9) { bonus2 bSkillAtk,"RL_HAMMER_OF_GOD",20; if (.@r >= 11) { bonus2 bSkillCooldown,"RL_HAMMER_OF_GOD",-5000; } } } },{},{}
@@ -12556,7 +12557,7 @@
 28255,Master_Soul_Rifle,Master Soul Rifle,5,20,,1000,150:210,,9,2,0x40000000,63,2,34,4,100,1,18,{ .@r = getrefine(); bonus bMatk,10*(.@r/3); bonus bAspdRate,3*(.@r/3); if (.@r >= 7) { bonus bAspd,1; bonus bMatkRate,5; if (.@r >= 9) { .@chance = 1; /* unknown rate*/ if (.@r >= 11) { .@chance += 1; bonus5 bAutoSpell,"WL_SOULEXPANSION",3,1,BF_LONG,1; } bonus5 bAutoSpell,"MG_SOULSTRIKE",10,.@chance,BF_LONG,1; } } },{},{}
 28256,Demon_Slayer_Shot,Demon Slayer Shot,5,20,,1400,275,,9,2,0x40000000,63,2,34,4,100,1,20,{ .@r = getrefine(); bonus bSplashRange,1; bonus bLongAtkRate,3*(.@r/2); bonus bMaxSPrate,2*(.@r/3); if (.@r >= 7) { bonus2 bAddClass,Class_Boss,10; if (.@r >= 9) { autobonus3 "{ bonus bBaseAtk,50; bonus bLongAtkRate,10; }",1000,90000,"RL_P_ALTER"; if (.@r >= 11) { bonus2 bAddRace,RC_Undead,15; bonus2 bAddRace,RC_Demon,15; } } } },{},{}
 28257,Golden_Lord_Launcher,Golden Lord Launcher,5,20,,2100,320,,9,2,0x40000000,63,2,34,4,100,1,21,{ .@r = getrefine(); bonus bLongAtkRate,3*(.@r/2); bonus bBaseAtk,15*(.@r/3); if (.@r >= 7) { .@val = 15; if (.@r >= 9) { bonus2 bSkillCooldown,"RL_D_TAIL",-1000; if (.@r >= 11) { .@val += 15; } } bonus2 bSkillAtk,"RL_D_TAIL",.@val; } },{},{}
-28258,The_Black,The Black,5,20,,2700,205,,9,2,0x40000000,63,2,34,4,100,1,19,{ .@r = getrefine(); bonus bLongAtkRate,2*(.@r/3); bonus bBaseAtk,10*(.@r/2); if (.@r >= 7) { .@val = 15; bonus2 bSkillUseSPrate,"RL_R_TRIP",10; if (.@r >= 9) { autobonus3 "{ bonus bBaseAtk,50; bonus bLongAtkRate,10; }",1000,90000,"RL_P_ALTER"; if (.@r >= 11) { .@val += 15; } } bonus2 bSkillAtk,"RL_R_TRIP",.@val; } },{},{}
+28258,The_Black,The Black,5,20,,2700,205,,9,2,0x40000000,63,2,34,4,100,1,19,{ .@r = getrefine(); bonus bLongAtkRate,2*(.@r/3); bonus bBaseAtk,10*(.@r/2); if (.@r >= 7) { .@val = 15; bonus2 bSkillUseSPrate,"RL_R_TRIP",-10; if (.@r >= 9) { autobonus3 "{ bonus bBaseAtk,50; bonus bLongAtkRate,10; }",1000,90000,"RL_P_ALTER"; if (.@r >= 11) { .@val += 15; } } bonus2 bSkillAtk,"RL_R_TRIP",.@val; } },{},{}
 //===================================================================
 // New Accessories
 //===================================================================
@@ -12576,7 +12577,7 @@
 28322,Falconer_Glove,Falconer Glove,4,0,,100,,5,,1,0x00000800,63,2,136,,80,0,,{ bonus bDex,1; bonus bUseSPrate,-5; },{},{}
 28326,Broken_Chip_1,Broken Chips 01,4,10,,100,,,,1,0xFFFFFFFF,63,2,136,,100,0,,{ bonus bStr,4; },{},{}
 28327,Broken_Chip_2,Broken Chips 02,4,10,,100,,,,1,0xFFFFFFFF,63,2,136,,100,0,,{ bonus bInt,4; },{},{}
-28332,Jewel_Ring,Jewerly Ring,4,10,,100,,,,0,0xFFFFFFFF,63,2,136,,1,0,,{ bonus bLuk,20; autobonus "{ bonus bAspd,2; }",50,2000,BF_WEAPON|BF_MAGIC; },{},{}
+28332,Jewel_Ring,Jewerly Ring,4,10,,100,,,,0,0xFFFFFFFF,63,2,136,,1,0,,{ /* bonus bLuk,20; Event bonus */ autobonus "{ bonus bAspd,2; bonus bVariableCastrate,-30; }",50,5000,BF_WEAPON|BF_MAGIC,"{ specialeffect2 EF_ENCHANCE; }"; },{},{}
 28333,Gold_PC_Room_Ring,Gold PC Room Ring,4,10,,0,,,,1,0xFFFFFFFF,63,2,136,,1,0,,{ bonus bMaxHPrate,3; bonus bMaxSPrate,3; },{},{}
 28342,Critical_Anklet,Critical Anklet,4,0,,200,,3,,1,0xFFFFFFFF,63,2,136,,,0,,{ bonus bCritical,5; },{},{}
 28352,Vesper_Gear_01,Vesper Gear 01,4,20,,100,,1,,1,0xFFFFFFFF,63,2,136,,90,0,0,{ bonus bMdef,3; bonus bMatkRate,5; },{},{}
@@ -12690,7 +12691,7 @@
 28604,Crimson_Bible,Crimson Bible,5,20,,450,45,,1,2,0x00410100,63,2,2,3,70,1,15,{ .@r = getrefine(); bonus bBaseAtk,((BaseLevel/10)*5)+(.@r<=15?pow(.@r,2):225); bonus bMatk,(.@r<=15?(pow(.@r,2)/2):225); },{},{}
 28605,Book_of_Vicious_Mind,Book of Vicious Mind,5,20,,950,95,,1,1,0x00010100,63,2,2,4,160,1,15,{ bonus bAtk,pow(min(getrefine(),15),2); bonus bMatk,pow(min(getrefine(),15),2); bonus bUnbreakableWeapon; },{},{}
 28606,Unity_Bible,Unity Bible,5,20,,220,42,,1,1,0x00410100,63,2,2,3,1,1,15,{ bonus bBaseAtk,pow(getrefine(),2)*125/100; },{},{}
-28608,Elemental_Origin,Elemental Origin,5,0,,800,120:150,,1,2,0x00010000,56,2,2,3,100,1,15,{ .@r = getrefine(); bonus bInt,4; .@bonus = 10; if (.@r>=7) { .@bonus += 10; } if (.@r>=9) { .@bonus += 10; } bonus2 bSkillAtk,"MG_FIREBOLT",.@bonus; bonus2 bSkillAtk,"MG_COLDBOLT",.@bonus; bonus2 bSkillAtk,"MG_LIGHTNINGBOLT",.@bonus; },{},{}
+28608,Elemental_Origin,Elemental Origin,5,20,,800,120:150,,1,2,0x00010000,56,2,2,3,100,1,15,{ .@r = getrefine(); bonus bInt,4; .@bonus = 10; if (.@r>=7) { .@bonus += 10; } if (.@r>=9) { .@bonus += 10; } bonus2 bSkillAtk,"MG_FIREBOLT",.@bonus; bonus2 bSkillAtk,"MG_COLDBOLT",.@bonus; bonus2 bSkillAtk,"MG_LIGHTNINGBOLT",.@bonus; },{},{}
 28612,Illusion_Apocalypse,Illusion Apocalypse,5,0,,800,170,,1,2,0x00410100,63,2,2,4,100,1,15,{ .@val = 10 + 10*(min(getrefine(),10)/3); bonus2 bAddEle,Ele_Water,.@val; bonus2 bAddEle,Ele_Earth,.@val; bonus2 bAddEle,Ele_Fire,.@val; bonus2 bAddEle,Ele_Wind,.@val; bonus2 bSubDefEle,Ele_Holy,-30; },{},{}
 28618,Book_of_the_Sun_God,Book of the Sun God,5,10,,500,180:170,,1,4,0x00010100,63,2,2,3,100,1,15,{ .@r = getrefine(); bonus bMaxHP,200*.@r; bonus bMaxSP,50*.@r; bonus bAspdRate,.@r; if (.@r>=10) bonus3 bAutoSpell,"WZ_METEOR",5,200; else if (.@r>=8) bonus3 bAutoSpell,"WZ_METEOR",4,150; else bonus3 bAutoSpell,"WZ_METEOR",3,100; },{},{}
 28619,Prisoner_Diary,Prisoner's Diary,5,20,,800,210,,1,2,0x00410100,63,2,2,3,175,1,15,{ .@r = getrefine(); bonus bMaxHPrate,5; bonus bMaxSPrate,5; bonus bBaseAtk,20*(.@r/2); if (.@r>=9) .@val = 25; else if (.@r>=7) .@val = 10; if (.@r>=11) { bonus2 bAddEle,Ele_Dark,15; bonus2 bMagicAddEle,Ele_Dark,15; bonus2 bAddEle,Ele_Undead,15; bonus2 bMagicAddEle,Ele_Undead,15; } bonus2 bAddRace,RC_Demon,.@val; bonus2 bAddRace,RC_Undead,.@val; bonus2 bMagicAddRace,RC_Demon,.@val; bonus2 bMagicAddRace,RC_Undead,.@val; },{},{}
@@ -13667,15 +13668,33 @@
 32351,Estal,Estal,5,20,,700,195,,1,2,0x00040000,56,2,2,4,170,1,2,{ .@r = getrefine(); bonus2 bSkillCooldown,"GN_SPORE_EXPLOSION",-1000; bonus bBaseAtk,4*.@r; if (.@r>=11) .@val = 50; else if (.@r>=9) .@val = 30; bonus2 bSkillAtk,"GN_SPORE_EXPLOSION",.@val; },{},{}

 //100052,Enchant_Stone_Box19,Costume Enchantment Stone Box 19,2,10,,10,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getgroupitem(IG_Enchant_Stone_Box19); },{},{}
+
+//===================================================================
+// New Warlock Spell Books
+//===================================================================
+100065,WL_MB_SG,Spell Book (Storm Gust),11,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ itemskill "WL_READING_SB_READING",1; },{},{}
+100066,WL_MB_LOV,Spell Book (Lord of Vermilion),11,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ itemskill "WL_READING_SB_READING",2; },{},{}
+100067,WL_MB_MS,Spell Book (Meteor Storm),11,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ itemskill "WL_READING_SB_READING",3; },{},{}
+100068,WL_MB_DL,Spell Book (Drain Life),11,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ itemskill "WL_READING_SB_READING",4; },{},{}
+100069,WL_MB_JF,Spell Book (Jack Frost),11,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ itemskill "WL_READING_SB_READING",5; },{},{}
+100070,WL_MB_ES,Spell Book (Earth Strain),11,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ itemskill "WL_READING_SB_READING",6; },{},{}
+100071,WL_MB_CR,Spell Book (Crimson Rock),11,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ itemskill "WL_READING_SB_READING",7; },{},{}
+100072,WL_MB_CL,Spell Book (Chain Lightning),11,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ itemskill "WL_READING_SB_READING",8; },{},{}
+100073,WL_MB_CM,Spell Book (Comet),11,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ itemskill "WL_READING_SB_READING",9; },{},{}
+100074,WL_MB_TV,Spell Book (Tetra Vortex),11,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ itemskill "WL_READING_SB_READING",10; },{},{}
+
 //100202,Enchant_Stone_Box20,Costume Enchantment Stone Box 20,2,10,,10,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getgroupitem(IG_Enchant_Stone_Box20); },{},{}
-//100231,Ref_T_Potion,Golden X,0,10,,30,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_REF_T_POTION,30000,0; },{},{}
-//100232,Add_Atk_Potion,Red Herb Activator,0,10,,30,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_ADD_ATK_DAMAGE,500000,15; },{},{}
-//100233,Add_Matk_Potion,Blue Herb Activator,0,10,,30,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_ADD_MATK_DAMAGE,500000,15; },{},{}
+
+100231,Ref_T_Potion,Golden X,0,10,,30,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_REF_T_POTION,30000,0; },{},{}
+100232,Add_Atk_Potion,Red Herb Activator,0,10,,30,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_ADD_ATK_DAMAGE,500000,15; },{},{}
+100233,Add_Matk_Potion,Blue Herb Activator,0,10,,30,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_ADD_MATK_DAMAGE,500000,15; },{},{}
+
 //100314,Enchant_Stone_Box21,Costume Enchantment Stone Box 21,2,10,,10,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getgroupitem(IG_Enchant_Stone_Box21); },{},{}
 // Costumes
+//400020,C_BeachBall,Costume Beachball,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,1918,{},{},{}
 //440000,C_SharkHead,Costume Shark Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,5120,,1,0,1919,{},{},{}
 //440002,C_Happy_Cat_TW,Costume Happy Cat,4,0,,0,,,,0,0xFFFFFFFF,63,2,7168,,1,0,1980,{},{},{}
-//400020,C_BeachBall,Costume Beachball,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,1918,{},{},{}
-//1100003,Concentrated_R_P,Concentrated Red Potion,0,10,,2,,,,,0xFFFFFFFF,63,2,,,120,,,{ itemheal rand(655,675),0; },{},{}
-//1100004,Concentrated_B_P,Concentrated Blue Potion,0,10,,2,,,,,0xFFFFFFFF,63,2,,,120,,,{ itemheal 0,rand(340,360); },{},{}
-//1100005,Concentrated_G_P,Concentrated Gold Potion,0,10,,2,,,,,0xFFFFFFFF,63,2,,,180,,,{ itemheal rand(2730,2750),0; },{},{}
+
+1100003,Concentrated_R_P,Concentrated Red Potion,0,10,,2,,,,,0xFFFFFFFF,63,2,,,120,,,{ itemheal rand(655,675),0; },{},{}
+1100004,Concentrated_B_P,Concentrated Blue Potion,0,10,,2,,,,,0xFFFFFFFF,63,2,,,120,,,{ itemheal 0,rand(340,360); },{},{}
+1100005,Concentrated_G_P,Concentrated Gold Potion,0,10,,2,,,,,0xFFFFFFFF,63,2,,,180,,,{ itemheal rand(2730,2750),0; },{},{}
--- a/db/re/item_flag.txt
+++ b/db/re/item_flag.txt
@@ -1785,3 +1785,13 @@
 12622,32 //Boarding_Halter
 12887,32 //C_Wing_Of_Fly
 22508,32 //Para_Team_Mark_
+//100065,32 //WL_MB_SG
+//100066,32 //WL_MB_LOV
+//100067,32 //WL_MB_MS
+//100068,32 //WL_MB_DL
+//100069,32 //WL_MB_JF
+//100070,32 //WL_MB_ES
+//100071,32 //WL_MB_CR
+//100072,32 //WL_MB_CL
+//100073,32 //WL_MB_CM
+//100074,32 //WL_MB_TV
--- a/db/re/item_randomopt_db.txt
+++ b/db/re/item_randomopt_db.txt
@@ -36,9 +36,7 @@ RDMOPT_ATTR_TOLERACE_SAINT,{ bonus2 bSubEle,Ele_Holy,getrandomoptinfo(ROA_VALUE)
 RDMOPT_ATTR_TOLERACE_DARKNESS,{ bonus2 bSubEle,Ele_Dark,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_ATTR_TOLERACE_TELEKINESIS,{ bonus2 bSubEle,Ele_Ghost,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_ATTR_TOLERACE_UNDEAD,{ bonus2 bSubEle,Ele_Undead,getrandomoptinfo(ROA_VALUE); }
-RDMOPT_ATTR_TOLERACE_ALL,{ bonus2 bSubEle,Ele_All,getrandomoptinfo(ROA_VALUE); }
-// TODO: Confirm if damage reduction is implemented correctly.
-// kRO desc : <ELEMENT> 몬스터로부터 받는 물리 데미지 %d%% 감소.
+RDMOPT_ATTR_TOLERACE_ALLBUTNOTHING,{ for(.@i = Ele_Water; .@i < Ele_Undead; ++.@i) bonus2 bSubEle,.@i,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_DAMAGE_PROPERTY_NOTHING_USER,{ bonus2 bSubDefEle,Ele_Neutral,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_DAMAGE_PROPERTY_NOTHING_TARGET,{ bonus2 bAddEle,Ele_Neutral,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_DAMAGE_PROPERTY_WATER_USER,{ bonus2 bSubDefEle,Ele_Water,getrandomoptinfo(ROA_VALUE); }
@@ -59,25 +57,25 @@ RDMOPT_DAMAGE_PROPERTY_TELEKINESIS_USER,{ bonus2 bSubDefEle,Ele_Ghost,getrandomo
 RDMOPT_DAMAGE_PROPERTY_TELEKINESIS_TARGET,{ bonus2 bAddEle,Ele_Ghost,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_DAMAGE_PROPERTY_UNDEAD_USER,{ bonus2 bSubDefEle,Ele_Undead,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_DAMAGE_PROPERTY_UNDEAD_TARGET,{ bonus2 bAddEle,Ele_Undead,getrandomoptinfo(ROA_VALUE); }
-RDMOPT_MDAMAGE_PROPERTY_NOTHING_USER,{ bonus3 bSubEle,Ele_Neutral,getrandomoptinfo(ROA_VALUE),BF_MAGIC; }
+RDMOPT_MDAMAGE_PROPERTY_NOTHING_USER,{ bonus2 bMagicSubDefEle,Ele_Neutral,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_MDAMAGE_PROPERTY_NOTHING_TARGET,{ bonus2 bMagicAddEle,Ele_Neutral,getrandomoptinfo(ROA_VALUE); }
-RDMOPT_MDAMAGE_PROPERTY_WATER_USER,{ bonus3 bSubEle,Ele_Water,getrandomoptinfo(ROA_VALUE),BF_MAGIC; }
+RDMOPT_MDAMAGE_PROPERTY_WATER_USER,{ bonus2 bMagicSubDefEle,Ele_Water,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_MDAMAGE_PROPERTY_WATER_TARGET,{ bonus2 bMagicAddEle,Ele_Water,getrandomoptinfo(ROA_VALUE); }
-RDMOPT_MDAMAGE_PROPERTY_GROUND_USER,{ bonus3 bSubEle,Ele_Earth,getrandomoptinfo(ROA_VALUE),BF_MAGIC; }
+RDMOPT_MDAMAGE_PROPERTY_GROUND_USER,{ bonus2 bMagicSubDefEle,Ele_Earth,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_MDAMAGE_PROPERTY_GROUND_TARGET,{ bonus2 bMagicAddEle,Ele_Earth,getrandomoptinfo(ROA_VALUE); }
-RDMOPT_MDAMAGE_PROPERTY_FIRE_USER,{ bonus3 bSubEle,Ele_Fire,getrandomoptinfo(ROA_VALUE),BF_MAGIC; }
+RDMOPT_MDAMAGE_PROPERTY_FIRE_USER,{ bonus2 bMagicSubDefEle,Ele_Fire,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_MDAMAGE_PROPERTY_FIRE_TARGET,{ bonus2 bMagicAddEle,Ele_Fire,getrandomoptinfo(ROA_VALUE); }
-RDMOPT_MDAMAGE_PROPERTY_WIND_USER,{ bonus3 bSubEle,Ele_Wind,getrandomoptinfo(ROA_VALUE),BF_MAGIC; }
+RDMOPT_MDAMAGE_PROPERTY_WIND_USER,{ bonus2 bMagicSubDefEle,Ele_Wind,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_MDAMAGE_PROPERTY_WIND_TARGET,{ bonus2 bMagicAddEle,Ele_Wind,getrandomoptinfo(ROA_VALUE); }
-RDMOPT_MDAMAGE_PROPERTY_POISON_USER,{ bonus3 bSubEle,Ele_Poison,getrandomoptinfo(ROA_VALUE),BF_MAGIC; }
+RDMOPT_MDAMAGE_PROPERTY_POISON_USER,{ bonus2 bMagicSubDefEle,Ele_Poison,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_MDAMAGE_PROPERTY_POISON_TARGET,{ bonus2 bMagicAddEle,Ele_Poison,getrandomoptinfo(ROA_VALUE); }
-RDMOPT_MDAMAGE_PROPERTY_SAINT_USER,{ bonus3 bSubEle,Ele_Holy,getrandomoptinfo(ROA_VALUE),BF_MAGIC; }
+RDMOPT_MDAMAGE_PROPERTY_SAINT_USER,{ bonus2 bMagicSubDefEle,Ele_Holy,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_MDAMAGE_PROPERTY_SAINT_TARGET,{ bonus2 bMagicAddEle,Ele_Holy,getrandomoptinfo(ROA_VALUE); }
-RDMOPT_MDAMAGE_PROPERTY_DARKNESS_USER,{ bonus3 bSubEle,Ele_Dark,getrandomoptinfo(ROA_VALUE),BF_MAGIC; }
+RDMOPT_MDAMAGE_PROPERTY_DARKNESS_USER,{ bonus2 bMagicSubDefEle,Ele_Dark,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_MDAMAGE_PROPERTY_DARKNESS_TARGET,{ bonus2 bMagicAddEle,Ele_Dark,getrandomoptinfo(ROA_VALUE); }
-RDMOPT_MDAMAGE_PROPERTY_TELEKINESIS_USER,{ bonus3 bSubEle,Ele_Ghost,getrandomoptinfo(ROA_VALUE),BF_MAGIC; }
+RDMOPT_MDAMAGE_PROPERTY_TELEKINESIS_USER,{ bonus2 bMagicSubDefEle,Ele_Ghost,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_MDAMAGE_PROPERTY_TELEKINESIS_TARGET,{ bonus2 bMagicAddEle,Ele_Ghost,getrandomoptinfo(ROA_VALUE); }
-RDMOPT_MDAMAGE_PROPERTY_UNDEAD_USER,{ bonus3 bSubEle,Ele_Undead,getrandomoptinfo(ROA_VALUE),BF_MAGIC; }
+RDMOPT_MDAMAGE_PROPERTY_UNDEAD_USER,{ bonus2 bMagicSubDefEle,Ele_Undead,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_MDAMAGE_PROPERTY_UNDEAD_TARGET,{ bonus2 bMagicAddEle,Ele_Undead,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_BODY_ATTR_NOTHING,{ bonus bDefEle,Ele_Neutral; }
 RDMOPT_BODY_ATTR_WATER,{ bonus bDefEle,Ele_Water; }
@@ -89,7 +87,7 @@ RDMOPT_BODY_ATTR_SAINT,{ bonus bDefEle,Ele_Holy; }
 RDMOPT_BODY_ATTR_DARKNESS,{ bonus bDefEle,Ele_Dark; }
 RDMOPT_BODY_ATTR_TELEKINESIS,{ bonus bDefEle,Ele_Ghost; }
 RDMOPT_BODY_ATTR_UNDEAD,{ bonus bDefEle,Ele_Undead; }
-//RDMOPT_BODY_ATTR_ALL,{ /* Needs more info */ }
+//RDMOPT_BODY_ATTR_ALL,{}
 RDMOPT_RACE_TOLERACE_NOTHING,{ bonus2 bSubRace,RC_Formless,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_TOLERACE_UNDEAD,{ bonus2 bSubRace,RC_Undead,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_TOLERACE_ANIMAL,{ bonus2 bSubRace,RC_Brute,getrandomoptinfo(ROA_VALUE); }
@@ -97,7 +95,7 @@ RDMOPT_RACE_TOLERACE_PLANT,{ bonus2 bSubRace,RC_Plant,getrandomoptinfo(ROA_VALUE
 RDMOPT_RACE_TOLERACE_INSECT,{ bonus2 bSubRace,RC_Insect,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_TOLERACE_FISHS,{ bonus2 bSubRace,RC_Fish,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_TOLERACE_DEVIL,{ bonus2 bSubRace,RC_Demon,getrandomoptinfo(ROA_VALUE); }
-RDMOPT_RACE_TOLERACE_HUMAN,{ bonus2 bSubRace,RC_DemiHuman,getrandomoptinfo(ROA_VALUE); bonus2 bSubRace,RC_Player_Human,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_RACE_TOLERACE_HUMAN,{ bonus2 bSubRace,RC_DemiHuman,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_TOLERACE_ANGEL,{ bonus2 bSubRace,RC_Angel,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_TOLERACE_DRAGON,{ bonus2 bSubRace,RC_Dragon,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_DAMAGE_NOTHING,{ bonus2 bAddRace,RC_Formless,getrandomoptinfo(ROA_VALUE); }
@@ -107,7 +105,7 @@ RDMOPT_RACE_DAMAGE_PLANT,{ bonus2 bAddRace,RC_Plant,getrandomoptinfo(ROA_VALUE);
 RDMOPT_RACE_DAMAGE_INSECT,{ bonus2 bAddRace,RC_Insect,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_DAMAGE_FISHS,{ bonus2 bAddRace,RC_Fish,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_DAMAGE_DEVIL,{ bonus2 bAddRace,RC_Demon,getrandomoptinfo(ROA_VALUE); }
-RDMOPT_RACE_DAMAGE_HUMAN,{ bonus2 bAddRace,RC_DemiHuman,getrandomoptinfo(ROA_VALUE); bonus2 bAddRace,RC_Player_Human,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_RACE_DAMAGE_HUMAN,{ bonus2 bAddRace,RC_DemiHuman,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_DAMAGE_ANGEL,{ bonus2 bAddRace,RC_Angel,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_DAMAGE_DRAGON,{ bonus2 bAddRace,RC_Dragon,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_MDAMAGE_NOTHING,{ bonus2 bMagicAddRace,RC_Formless,getrandomoptinfo(ROA_VALUE); }
@@ -117,7 +115,7 @@ RDMOPT_RACE_MDAMAGE_PLANT,{ bonus2 bMagicAddRace,RC_Plant,getrandomoptinfo(ROA_V
 RDMOPT_RACE_MDAMAGE_INSECT,{ bonus2 bMagicAddRace,RC_Insect,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_MDAMAGE_FISHS,{ bonus2 bMagicAddRace,RC_Fish,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_MDAMAGE_DEVIL,{ bonus2 bMagicAddRace,RC_Demon,getrandomoptinfo(ROA_VALUE); }
-RDMOPT_RACE_MDAMAGE_HUMAN,{ bonus2 bMagicAddRace,RC_DemiHuman,getrandomoptinfo(ROA_VALUE); bonus2 bMagicAddRace,RC_Player_Human,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_RACE_MDAMAGE_HUMAN,{ bonus2 bMagicAddRace,RC_DemiHuman,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_MDAMAGE_ANGEL,{ bonus2 bMagicAddRace,RC_Angel,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_MDAMAGE_DRAGON,{ bonus2 bMagicAddRace,RC_Dragon,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_CRI_PERCENT_NOTHING,{ bonus2 bCriticalAddRace,RC_Formless,getrandomoptinfo(ROA_VALUE)/10; }
@@ -127,7 +125,7 @@ RDMOPT_RACE_CRI_PERCENT_PLANT,{ bonus2 bCriticalAddRace,RC_Plant,getrandomoptinf
 RDMOPT_RACE_CRI_PERCENT_INSECT,{ bonus2 bCriticalAddRace,RC_Insect,getrandomoptinfo(ROA_VALUE)/10; }
 RDMOPT_RACE_CRI_PERCENT_FISHS,{ bonus2 bCriticalAddRace,RC_Fish,getrandomoptinfo(ROA_VALUE)/10; }
 RDMOPT_RACE_CRI_PERCENT_DEVIL,{ bonus2 bCriticalAddRace,RC_Demon,getrandomoptinfo(ROA_VALUE)/10; }
-RDMOPT_RACE_CRI_PERCENT_HUMAN,{ bonus2 bCriticalAddRace,RC_DemiHuman,getrandomoptinfo(ROA_VALUE)/10; bonus2 bCriticalAddRace,RC_Player_Human,getrandomoptinfo(ROA_VALUE)/10; }
+RDMOPT_RACE_CRI_PERCENT_HUMAN,{ bonus2 bCriticalAddRace,RC_DemiHuman,getrandomoptinfo(ROA_VALUE)/10; }
 RDMOPT_RACE_CRI_PERCENT_ANGEL,{ bonus2 bCriticalAddRace,RC_Angel,getrandomoptinfo(ROA_VALUE)/10; }
 RDMOPT_RACE_CRI_PERCENT_DRAGON,{ bonus2 bCriticalAddRace,RC_Dragon,getrandomoptinfo(ROA_VALUE)/10; }
 RDMOPT_RACE_IGNORE_DEF_PERCENT_NOTHING,{ bonus2 bIgnoreDefRaceRate,RC_Formless,getrandomoptinfo(ROA_VALUE); }
@@ -137,7 +135,7 @@ RDMOPT_RACE_IGNORE_DEF_PERCENT_PLANT,{ bonus2 bIgnoreDefRaceRate,RC_Plant,getran
 RDMOPT_RACE_IGNORE_DEF_PERCENT_INSECT,{ bonus2 bIgnoreDefRaceRate,RC_Insect,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_IGNORE_DEF_PERCENT_FISHS,{ bonus2 bIgnoreDefRaceRate,RC_Fish,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_IGNORE_DEF_PERCENT_DEVIL,{ bonus2 bIgnoreDefRaceRate,RC_Demon,getrandomoptinfo(ROA_VALUE); }
-RDMOPT_RACE_IGNORE_DEF_PERCENT_HUMAN,{ bonus2 bIgnoreDefRaceRate,RC_DemiHuman,getrandomoptinfo(ROA_VALUE); bonus2 bIgnoreDefRaceRate,RC_Player_Human,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_RACE_IGNORE_DEF_PERCENT_HUMAN,{ bonus2 bIgnoreDefRaceRate,RC_DemiHuman,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_IGNORE_DEF_PERCENT_ANGEL,{ bonus2 bIgnoreDefRaceRate,RC_Angel,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_IGNORE_DEF_PERCENT_DRAGON,{ bonus2 bIgnoreDefRaceRate,RC_Dragon,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_IGNORE_MDEF_PERCENT_NOTHING,{ bonus2 bIgnoreMdefRaceRate,RC_Formless,getrandomoptinfo(ROA_VALUE); }
@@ -147,7 +145,7 @@ RDMOPT_RACE_IGNORE_MDEF_PERCENT_PLANT,{ bonus2 bIgnoreMdefRaceRate,RC_Plant,getr
 RDMOPT_RACE_IGNORE_MDEF_PERCENT_INSECT,{ bonus2 bIgnoreMdefRaceRate,RC_Insect,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_IGNORE_MDEF_PERCENT_FISHS,{ bonus2 bIgnoreMdefRaceRate,RC_Fish,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_IGNORE_MDEF_PERCENT_DEVIL,{ bonus2 bIgnoreMdefRaceRate,RC_Demon,getrandomoptinfo(ROA_VALUE); }
-RDMOPT_RACE_IGNORE_MDEF_PERCENT_HUMAN,{ bonus2 bIgnoreMdefRaceRate,RC_DemiHuman,getrandomoptinfo(ROA_VALUE); bonus2 bIgnoreMdefRaceRate,RC_Player_Human,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_RACE_IGNORE_MDEF_PERCENT_HUMAN,{ bonus2 bIgnoreMdefRaceRate,RC_DemiHuman,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_IGNORE_MDEF_PERCENT_ANGEL,{ bonus2 bIgnoreMdefRaceRate,RC_Angel,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_IGNORE_MDEF_PERCENT_DRAGON,{ bonus2 bIgnoreMdefRaceRate,RC_Dragon,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_CLASS_DAMAGE_NORMAL_TARGET,{ bonus2 bAddClass,Class_Normal,getrandomoptinfo(ROA_VALUE); }
@@ -168,7 +166,7 @@ RDMOPT_DAMAGE_SIZE_MIDIUM_USER,{ bonus2 bSubSize,Size_Medium,getrandomoptinfo(RO
 RDMOPT_DAMAGE_SIZE_LARGE_USER,{ bonus2 bSubSize,Size_Large,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_DAMAGE_SIZE_PERFECT,{ bonus bNoSizeFix,1; }
 RDMOPT_DAMAGE_CRI_TARGET,{ bonus bCritAtkRate,getrandomoptinfo(ROA_VALUE); }
-RDMOPT_DAMAGE_CRI_USER,{ bonus bCriticalDef,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_DAMAGE_CRI_USER,{ bonus bCritDefRate,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RANGE_ATTACK_DAMAGE_TARGET,{ bonus bLongAtkRate,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RANGE_ATTACK_DAMAGE_USER,{ bonus bLongAtkDef,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_HEAL_VALUE,{ bonus bHealPower,getrandomoptinfo(ROA_VALUE); }
@@ -193,8 +191,34 @@ RDMOPT_BODY_INDESTRUCTIBLE,{ bonus bUnbreakableArmor,1; }
 RDMOPT_MDAMAGE_SIZE_SMALL_TARGET,{ bonus2 bMagicAddSize,Size_Small,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_MDAMAGE_SIZE_MIDIUM_TARGET,{ bonus2 bMagicAddSize,Size_Medium,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_MDAMAGE_SIZE_LARGE_TARGET,{ bonus2 bMagicAddSize,Size_Large,getrandomoptinfo(ROA_VALUE); }
-//RDMOPT_MDAMAGE_SIZE_SMALL_USER,{}
-//RDMOPT_MDAMAGE_SIZE_MIDIUM_USER,{}
-//RDMOPT_MDAMAGE_SIZE_LARGE_USER,{}
-//redefined?
-//RDMOPT_ATTR_TOLERACE_ALL,{}
+RDMOPT_MDAMAGE_SIZE_SMALL_USER,{ bonus2 bMagicSubSize,Size_Small,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_MDAMAGE_SIZE_MIDIUM_USER,{ bonus2 bMagicSubSize,Size_Medium,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_MDAMAGE_SIZE_LARGE_USER,{ bonus2 bMagicSubSize,Size_Large,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_ATTR_TOLERACE_ALL,{ bonus2 bSubEle,Ele_All,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_RACE_WEAPON_TOLERACE_NOTHING,{ bonus3 bSubRace,RC_Formless,getrandomoptinfo(ROA_VALUE),BF_WEAPON; }
+RDMOPT_RACE_WEAPON_TOLERACE_UNDEAD,{ bonus3 bSubRace,RC_Undead,getrandomoptinfo(ROA_VALUE),BF_WEAPON; }
+RDMOPT_RACE_WEAPON_TOLERACE_ANIMAL,{ bonus3 bSubRace,RC_Brute,getrandomoptinfo(ROA_VALUE),BF_WEAPON; }
+RDMOPT_RACE_WEAPON_TOLERACE_PLANT,{ bonus3 bSubRace,RC_Plant,getrandomoptinfo(ROA_VALUE),BF_WEAPON; }
+RDMOPT_RACE_WEAPON_TOLERACE_INSECT,{ bonus3 bSubRace,RC_Insect,getrandomoptinfo(ROA_VALUE),BF_WEAPON; }
+RDMOPT_RACE_WEAPON_TOLERACE_FISHS,{ bonus3 bSubRace,RC_Fish,getrandomoptinfo(ROA_VALUE),BF_WEAPON; }
+RDMOPT_RACE_WEAPON_TOLERACE_DEVIL,{ bonus3 bSubRace,RC_Demon,getrandomoptinfo(ROA_VALUE),BF_WEAPON; }
+RDMOPT_RACE_WEAPON_TOLERACE_HUMAN,{ bonus3 bSubRace,RC_DemiHuman,getrandomoptinfo(ROA_VALUE),BF_WEAPON; }
+RDMOPT_RACE_WEAPON_TOLERACE_ANGEL,{ bonus3 bSubRace,RC_Angel,getrandomoptinfo(ROA_VALUE),BF_WEAPON; }
+RDMOPT_RACE_WEAPON_TOLERACE_DRAGON,{ bonus3 bSubRace,RC_Dragon,getrandomoptinfo(ROA_VALUE),BF_WEAPON; }
+// RDMOPT_RANGE_WEAPON_ATTACK_DAMAGE_TARGET,{}
+// RDMOPT_RANGE_WEAPON_ATTACK_DAMAGE_USER,{}
+RDMOPT_RACE_TOLERACE_PLAYER_HUMAN,{ bonus2 bSubRace,RC_Player_Human,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_RACE_TOLERACE_PLAYER_DORAM,{ bonus2 bSubRace,RC_Player_Doram,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_RACE_DAMAGE_PLAYER_HUMAN,{ bonus2 bAddRace,RC_Player_Human,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_RACE_DAMAGE_PLAYER_DORAM,{ bonus2 bAddRace,RC_Player_Doram,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_RACE_MDAMAGE_PLAYER_HUMAN,{ bonus2 bMagicAddRace,RC_Player_Human,getrandomoptinfo(ROA_VALUE);  }
+RDMOPT_RACE_MDAMAGE_PLAYER_DORAM,{ bonus2 bMagicAddRace,RC_Player_Doram,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_RACE_CRI_PERCENT_PLAYER_HUMAN,{ bonus2 bCriticalAddRace,RC_Player_Human,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_RACE_CRI_PERCENT_PLAYER_DORAM,{ bonus2 bCriticalAddRace,RC_Player_Doram,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_RACE_IGNORE_DEF_PERCENT_PLAYER_HUMAN,{ bonus2 bIgnoreDefRaceRate,RC_Player_Human,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_RACE_IGNORE_DEF_PERCENT_PLAYER_DORAM,{ bonus2 bIgnoreDefRaceRate,RC_Player_Doram,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_RACE_IGNORE_MDEF_PERCENT_PLAYER_HUMAN,{ bonus2 bIgnoreMdefRaceRate,RC_Player_Human,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_RACE_IGNORE_MDEF_PERCENT_PLAYER_DORAM,{ bonus2 bIgnoreMdefRaceRate,RC_Player_Doram,getrandomoptinfo(ROA_VALUE); }
+// RDMOPT_REFLECT_DAMAGE_PERCENT,{}
+RDMOPT_MELEE_ATTACK_DAMAGE_TARGET,{ bonus bShortAtkRate,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_MELEE_ATTACK_DAMAGE_USER,{ bonus bNearAtkDef,getrandomoptinfo(ROA_VALUE); }
--- a/db/re/job_exp.txt
+++ b/db/re/job_exp.txt
@@ -2,26 +2,28 @@
 // Only official levels included, check db/import-tmpl/job_exp.txt for an expanded list
 //
 // Structure of Database:
-// Max Level,Class list,Type,Exp for Lv 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175
+// Max Level,Class list,Type,Exp for Lv 1,2,3,...,200
 //
 // Type:
 //	0 = Base Exp, 1 = Job Exp

 //Base - Normal and Baby Jobs
-99,0:1:2:3:4:5:6:7:8:9:10:11:12:13:14:15:16:17:18:19:20:21:23:24:25:4023:4024:4025:4026:4027:4028:4029:4030:4031:4032:4033:4034:4035:4036:4037:4038:4039:4040:4041:4042:4043:4044:4045:4046:4047:4048:4049:4050:4051:4052:4222:4225:4226:4227:4228:4238,0,550,900,1500,2200,3200,3800,4200,4550,5000,5500,6000,6100,6350,6700,7350,8000,8400,8800,9200,9700,10300,11000,11800,13000,14000,15000,16000,17000,18000,19000,20000,21000,22000,23200,24000,26000,27500,29000,30000,31500,33000,34000,36000,37500,38000,40000,42000,44500,47000,49000,51000,53000,55000,57000,59000,61500,63000,65000,67000,69000,70000,73000,77000,80000,84000,88000,91000,95000,110000,128000,140000,155000,163000,170000,180000,188000,195000,200000,230000,260000,300000,350000,400000,480000,550000,600000,680000,750000,900000,1000000,1200000,1500000,1800000,2100000,2400000,2800000,3300000,4000000,99999999
+99,0:1:2:3:4:5:6:7:8:9:10:11:12:13:14:15:16:17:18:19:20:21:23:24:25:4023:4024:4025:4026:4027:4028:4029:4030:4031:4032:4033:4034:4035:4036:4037:4038:4039:4040:4041:4042:4043:4044:4045:4046:4047:4048:4049:4050:4051:4052:4222:4225:4226:4227:4228:4238,0,550,900,1500,2200,3200,3800,4200,4550,5000,5500,6000,6100,6350,6700,7350,8000,8400,8800,9200,9700,10300,11000,11800,13000,14000,15000,16000,17000,18000,19000,20000,21000,22000,23200,24000,26000,27500,29000,30000,31500,33000,34000,36000,37500,38000,40000,42000,44500,47000,49000,51000,53000,55000,59000,61500,61500,63000,65000,67000,69000,70000,73000,77000,80000,84000,88000,91000,95000,110000,128000,140000,155000,163000,170000,180000,188000,195000,200000,230000,260000,300000,350000,400000,480000,550000,600000,680000,750000,900000,1000000,1200000,1500000,1800000,2100000,2400000,2800000,3300000,4000000,99999999

-//Base - Adv Jobs
-99,4001:4002:4003:4004:4005:4006:4007:4008:4009:4010:4011:4012:4013:4014:4015:4016:4017:4018:4019:4020:4021:4022,0,660,1080,1800,2640,3840,4560,5040,5460,6000,6600,7200,7320,7620,8040,8820,9600,10080,10560,11040,12610,13390,14300,15340,16900,18460,19500,20800,22100,23400,24700,26000,27300,28600,30160,31200,33800,35750,37700,39000,44100,46200,47600,50400,52500,53200,56000,58800,62300,65800,68600,71400,74200,77000,79800,82600,86100,88200,91000,93800,103500,105000,109500,115500,120000,126000,132000,136500,142500,165000,192000,210000,232500,244500,255000,270000,282000,292500,300000,345000,416000,480000,560000,640000,768000,880000,960000,1088000,1200000,1440000,1700000,2040000,2550000,3060000,3570000,4080000,4760000,5610000,6800000,99999999
+//Base - Trans classes
+99,4001:4002:4003:4004:4005:4006:4007:4008:4009:4010:4011:4012:4013:4014:4015:4016:4017:4018:4019:4020:4021:4022,0,600,1080,1800,2640,3840,4560,5040,5460,6000,6600,7200,7320,7620,8040,8820,9600,10080,10560,11040,12610,13390,14300,15340,16900,18460,19500,20800,22100,23400,24700,26000,27300,28600,30160,31200,33800,35750,37700,39000,44100,46200,47600,50400,52500,53200,56000,58800,62300,65800,68600,71400,74200,77000,79800,82600,86100,88200,91000,93800,103500,105000,109500,115500,120000,126000,132000,136500,142500,165000,192000,210000,232500,244500,255000,270000,282000,292500,300000,345000,416000,480000,560000,640000,768000,880000,960000,1088000,1200000,1440000,1700000,2040000,2550000,3060000,3570000,4080000,4760000,5610000,6800000,99999999

-//Base - 3rd Jobs, Baby 3rds, Oboro/Kagerou, Rebellion, Summoner, Star Emperor, Soul Reaper
-//Note: (First 98 values [Level 1 - 98] are only used by Summoner Class, because 3rd classes start at level 99.)
-175,4054:4055:4056:4057:4058:4059:4060:4061:4062:4063:4064:4065:4066:4067:4068:4069:4070:4071:4072:4073:4074:4075:4076:4077:4078:4079:4080:4081:4082:4083:4084:4085:4086:4087:4096:4097:4098:4099:4100:4101:4102:4103:4104:4105:4106:4107:4108:4109:4110:4111:4112:4211:4212:4215:4218:4220:4223:4224:4229:4239:4240:4241:4242:4243:4244,0,55,90,150,220,320,380,420,455,500,600,700,800,900,1000,1100,1200,1300,1400,1500,1800,2100,2400,2700,3000,3300,3600,3900,4200,4500,5400,6300,7200,8100,9000,9900,10800,11700,12600,13500,16200,18900,21600,24300,27000,29700,32400,35100,37800,40500,43200,45900,48600,51300,54000,56700,59400,62100,64800,67500,75600,83700,91800,99900,108000,116100,124200,132300,140400,165000,192000,210000,232500,244500,255000,270000,282000,292500,300000,345000,416000,480000,560000,640000,768000,880000,960000,1088000,1200000,1440000,1700000,2040000,2550000,3060000,3570000,4080000,4760000,5610000,6800000,7070000,7400000,7770000,8150000,8550000,9100000,9610000,10150000,10570000,11180000,12000000,12200000,12930000,13150000,14030000,14420000,15420000,15670000,16870000,17140000,18720000,19020000,20590000,20930000,22690000,23310000,25290000,26020000,27860000,28535000,30990000,31680000,33560000,34942000,36372000,38350000,39890000,41545000,43330000,45400000,48100000,50410000,53370000,56250000,59230000,62590000,66120000,70200000,75330000,81100000,95000000,98000000,103000000,107000000,112000000,116000000,121000000,125000000,130000000,134000000,139000000,145000000,152200000,160840000,171200000,191930000,202290000,214720000,229640000,247550000,283370000,301280000,322770000,348560000,379500000,441390000,99999999
+//Base - Extended classes - Values for level 1 - 99 are unused and are simply copy-pasted from Normal classes values.
+200,4190:4191:4211:4212:4215:4239:4240:4223:4224:4229:4239:4240:4241:4242:4243:4244,0,550,900,1500,2200,3200,3800,4200,4550,5000,5500,6000,6100,6350,6700,7350,8000,8400,8800,9200,9700,10300,11000,11800,13000,14000,15000,16000,17000,18000,19000,20000,21000,22000,23200,24000,26000,27500,29000,30000,31500,33000,34000,36000,37500,38000,40000,42000,44500,47000,49000,51000,53000,55000,59000,61500,61500,63000,65000,67000,69000,70000,73000,77000,80000,84000,88000,91000,95000,110000,128000,140000,155000,163000,170000,180000,188000,195000,200000,230000,260000,300000,350000,400000,480000,550000,600000,680000,750000,900000,1000000,1200000,1500000,1800000,2100000,2400000,2800000,3300000,4000000,1272747,1354202,1440870,1533085,1631202,1735598,1846676,1964863,2090614,2224413,2366775,2518248,2679415,2850897,3033354,3227488,3434047,3653826,3887670,4136480,4401214,4755467,5138234,5551810,5998675,6481508,7003204,7566891,8175950,8834032,9545083,10313366,11143488,12040427,13009560,14056699,15188122,16410613,17731503,19158711,20700795,22367001,24167320,26112547,28214345,30485317,32939080,35590346,38455012,41550255,44894635,48508204,52412629,56631321,61189576,66114724,71436298,77186205,83398922,90111701,97364791,105201683,113669366,122818613,132704283,143385650,154926760,167396814,180870583,195428856,211158924,229155105,246519309,266361648,287801097,310966207,352013746,398479560,451078861,510621270,578023277,654322349,740692899,838464361,949141656,1074428354,1216252896,1376798278,1558535650,1764262355,1997144985,2260768123,2559189515,2897002530,3279406863,3712288568,4202310658,4757015664,5384941731,6095754039,6900363572,99999999

-//Base - Expanded Super Novice & Expanded Super Baby
-160,4190:4191,0,660,1080,1800,2640,3840,4560,5040,5460,6000,6600,7200,7320,7620,8040,8820,9600,10080,10560,11040,12610,13390,14300,15340,16900,18460,19500,20800,22100,23400,24700,26000,27300,28600,30160,31200,33800,35750,37700,39000,44100,46200,47600,50400,52500,53200,56000,58800,62300,65800,68600,71400,74200,77000,79800,82600,86100,88200,91000,93800,103500,105000,109500,115500,120000,126000,132000,136500,142500,165000,192000,210000,232500,244500,255000,270000,282000,292500,300000,345000,416000,480000,560000,640000,768000,880000,960000,1088000,1200000,1440000,1700000,2040000,2550000,3060000,3570000,4080000,4760000,5610000,6800000,7070000,7400000,7770000,8150000,8550000,9100000,9610000,10150000,10570000,11180000,12000000,12200000,12930000,13150000,14030000,14420000,15420000,15670000,16870000,17140000,18720000,19020000,20590000,20930000,22690000,23310000,25290000,26020000,27860000,28535000,30990000,31680000,33560000,34942000,36372000,38350000,39890000,41545000,43330000,45400000,48100000,50410000,53370000,56250000,59230000,62590000,66120000,70200000,75330000,81100000,95000000,98000000,103000000,107000000,112000000,116000000,121000000,125000000,130000000,134000000,139000000,145000000,152200000,160840000,171200000,191930000,202290000,214720000,229640000,247550000,283370000,301280000,322770000,348560000,379500000,441390000,99999999
+//Base - Third classes - Values for level 1 - 99 are unused and are simply copy-pasted from Trans classes values.
+200,4054:4055:4056:4057:4058:4059:4066:4067:4068:4069:4070:4071:4072:4060:4061:4062:4063:4064:4065:4073:4074:4075:4076:4077:4078:4079:4080:4081:4082:4083:4084:4085:4086:4087:4096:4097:4098:4099:4100:4101:4102:4103:4104:4105:4106:4107:4108:4109:4110:4111:4112,0,600,1080,1800,2640,3840,4560,5040,5460,6000,6600,7200,7320,7620,8040,8820,9600,10080,10560,11040,12610,13390,14300,15340,16900,18460,19500,20800,22100,23400,24700,26000,27300,28600,30160,31200,33800,35750,37700,39000,44100,46200,47600,50400,52500,53200,56000,58800,62300,65800,68600,71400,74200,77000,79800,82600,86100,88200,91000,93800,103500,105000,109500,115500,120000,126000,132000,136500,142500,165000,192000,210000,232500,244500,255000,270000,282000,292500,300000,345000,416000,480000,560000,640000,768000,880000,960000,1088000,1200000,1440000,1700000,2040000,2550000,3060000,3570000,4080000,4760000,5610000,6800000,1272747,1354202,1440870,1533085,1631202,1735598,1846676,1964863,2090614,2224413,2366775,2518248,2679415,2850897,3033354,3227488,3434047,3653826,3887670,4136480,4401214,4755467,5138234,5551810,5998675,6481508,7003204,7566891,8175950,8834032,9545083,10313366,11143488,12040427,13009560,14056699,15188122,16410613,17731503,19158711,20700795,22367001,24167320,26112547,28214345,30485317,32939080,35590346,38455012,41550255,44894635,48508204,52412629,56631321,61189576,66114724,71436298,77186205,83398922,90111701,97364791,105201683,113669366,122818613,132704283,143385650,154926760,167396814,180870583,195428856,211158924,229155105,246519309,266361648,287801097,310966207,352013746,398479560,451078861,510621270,578023277,654322349,740692899,838464361,949141656,1074428354,1216252896,1376798278,1558535650,1764262355,1997144985,2260768123,2559189515,2897002530,3279406863,3712288568,4202310658,4757015664,5384941731,6095754039,6900363572,99999999
+
+//Base- Summoner
+200,4218:4220,0,55,90,150,220,320,380,420,455,500,550,600,700,800,900,1000,1100,1200,1400,1500,1800,2100,2400,2700,3000,3300,3600,3900,4200,4500,5400,6300,7200,8100,9000,9900,10800,11700,12600,13500,16200,18900,21600,24300,27000,29700,32400,35100,37800,40500,43200,45900,48600,51300,54000,56700,59400,62100,64800,67500,70200,72900,75600,78300,81000,83700,86400,89100,91800,94500,103950,114345,125779,138356,152201,167421,184163,202579,222836,240662,259914,280707,303163,327416,353609,381897,412448,445443,481078,519564,561129,606019,654500,706860,763408,824480,890438,961673,1038606,1121694,1211429,1308343,1413010,1526050,1648134,1779984,1922382,2076172,2242265,2421646,2615377,2824607,3050575,3294621,3558190,3842845,4150272,4482293,4840876,5228146,5646397,6098108,6585956,7112832,7681858,8296406,8960118,9676927,10451081,11287167,12190140,13165351,14218579,15356065,16584550,17911314,19344219,20891756,22563096,24368143,26317594,28423001,30696841,33152588,35804795,38669178,41762712,45103728,48712026,52608988,56817707,61363123,66272172,71573945,77299860,83483848,90162555,97375559,105165603,113578851,122665159,132478371,143076640,154522771,166884592,177548517,188893867,200964185,222383346,234614430,247518223,261131725,275493969,290646137,306631674,347137718,392994610,444909197,503681701,570218053,645543857,730820200,827361548,936656008,1060388266,1200465555,1359047054,1538577169,1741823213,1971918059,2232408434,2527309588,2861167184,3239127369,3667016094,4151428920,4699832680,5320680577,6023542481,6819252442,99999999

 //Job - Novice & Baby Novice
-10,0:4023,1,10,18,28,40,91,151,205,268,340,999999999
+10,0:4023,1,55,90,150,150,320,380,420,455,500,999999999

 //Job - 1st Classes & Baby 1st Classes, Taekwon
 50,1:2:3:4:5:6:4024:4025:4026:4027:4028:4029:4046:4050:4225,1,60,130,260,460,780,1060,1300,1560,1910,2290,2680,2990,3340,3740,4360,4970,5530,6120,6700,8090,8920,9970,11080,12690,14440,15850,17400,19220,21060,22870,24910,26840,29080,31320,33300,37110,40500,43570,46180,53510,57200,60310,65690,70090,72130,77540,83320,90120,97180,999999999
@@ -29,29 +31,29 @@
 //Job - 2nd Classes & Baby 2nd Classes, Soul Linker
 50,7:8:9:10:11:12:13:14:15:16:17:18:19:20:21:4030:4031:4032:4033:4034:4035:4036:4037:4038:4039:4040:4041:4042:4043:4044:4049:4051:4052:4227,1,2500,4200,7000,10300,15900,18900,20900,22600,24900,28800,31500,32000,33300,35100,40500,44100,46300,48500,50700,56000,59400,63500,68100,75000,85700,90500,96600,102600,108600,119700,126000,132300,138600,146100,157500,170600,180400,190300,196800,214900,225200,232000,245700,255900,279300,294000,308700,327000,345400,999999999

-//Job - Novice High
-10,4001,1,11,20,31,44,100,166,226,295,374,999999999
-
-//Job - Adv First Classes
-50,4002:4003:4004:4005:4006:4007,1,100,200,350,550,800,1100,1450,1850,2300,2800,3350,3950,4600,5300,6050,6850,7700,8600,9550,10550,11600,12700,13850,15050,16300,17600,18950,20350,21800,23300,24850,26450,28100,29800,31550,33350,35200,37100,39050,41050,43100,45200,47350,49550,51800,54100,56450,58850,61300,999999999
-
-//Job - Adv Second Classes
-70,4008:4009:4010:4011:4012:4013:4014:4015:4016:4017:4018:4019:4020:4021:4022,1,3800,6200,10400,15200,22900,27100,30000,32500,35700,41300,45000,45800,47600,50300,58700,63900,67100,70300,73500,90600,96200,102700,110200,121400,144700,152900,163100,173300,183500,213500,224700,236000,247200,260700,299800,324800,343600,362300,374800,474400,497000,512100,542200,564800,644300,678200,712100,754500,796900,873100,911900,950600,989400,1028100,1143300,1199900,1233800,1279100,1324300,1486900,1515900,1603000,1719200,1806300,2040300,2244300,2415900,2746000,3326000,999999999
-
-//Job - 3rd Jobs & Baby 3rds, Oboro/Kagerou, Rebellion, Star Emperor, Soul Reaper
-60,4054:4055:4056:4057:4058:4059:4060:4061:4062:4063:4064:4065:4066:4067:4068:4069:4070:4071:4072:4073:4074:4075:4076:4077:4078:4079:4080:4081:4082:4083:4084:4085:4086:4087:4096:4097:4098:4099:4100:4101:4102:4103:4104:4105:4106:4107:4108:4109:4110:4111:4112:4211:4212:4215:4223:4224:4229:4239:4240:4241:4242:4243:4244,1,112000,355000,615000,917000,1253000,1595000,2007000,2430000,2868000,3420000,3863000,4504000,4998000,5769000,6321000,7254000,7870000,9015000,9530000,11072000,11848000,13467000,14337000,16243000,17216000,19446000,20781000,23070000,24453000,27568000,29118000,31820000,34125000,37048000,40204000,42972000,45937000,49110000,52696000,57158000,61305000,67167000,72285000,77647000,83624000,91113000,98548000,107630000,119077000,131668000,145518000,160753000,177511000,195944000,216220000,238523000,263056000,290042000,319726000,999999999
-
-//Job - Expanded Super Novice & Expanded Super Baby
-50,4190:4191,1,112000,355000,615000,917000,1253000,1595000,2007000,2430000,2868000,3420000,3863000,4504000,4998000,5769000,6321000,7254000,7870000,9015000,9530000,11072000,11848000,13467000,14337000,16243000,17216000,19446000,20781000,23070000,24453000,27568000,29118000,31820000,34125000,37048000,40204000,42972000,45937000,49110000,52696000,57158000,61305000,67167000,72285000,77647000,83624000,91113000,98548000,107630000,119077000,999999999
-
-//Job - Ninja/Gunslinger
+//Job - Ninja, Gunslinger
 70,24:25:4222:4228,1,200,300,400,600,700,1000,1200,1400,1700,1900,2400,2700,3200,3600,4200,4900,5500,6100,6900,7700,8400,9300,10100,11100,12100,13000,14600,16100,17500,18600,21500,23300,24700,27000,29000,30000,32400,35000,38100,41100,44000,46700,49600,52500,55600,58900,62700,65500,69200,72300,81200,84100,89300,95500,100900,107800,114900,120700,128600,150500,176900,196100,219600,234200,247900,266400,281300,296600,308000,999999999

 //Job - Star Gladiator
 50,4047:4048:4226:4238,1,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,101400,112000,118800,127000,136200,150000,171400,181000,193200,205200,217200,239400,252000,264600,277200,292200,315000,341200,360800,380600,393600,429800,450400,464000,491400,511800,558600,588000,617400,654000,690800,999999999

+//Job - High Novice
+10,4001,1,12,22,35,50,113,188,256,335,425,999999999
+
+//Job - Trans 1st Classes
+50,4002:4003:4004:4005:4006:4007,1,340,550,760,990,1250,1600,1980,2340,2740,3140,3950,4510,5210,5950,7000,8150,9130,10220,11480,12780,14090,15560,16980,18620,20280,21780,24510,27000,29000,31000,36000,39000,41000,45000,49000,51900,55000,59450,64630,70030,74940,79800,84630,89610,95170,100420,107250,112070,118120,999999999
+
+//Job - Trans 2nd Classes
+70,4008:4009:4010:4011:4012:4013:4014:4015:4016:4017:4018:4019:4020:4021:4022,1,1803,2972,5036,7434,11312,13520,15117,16540,18350,21441,23596,24256,25461,27174,32029,35216,37349,39521,41734,51958,55721,60081,65113,72448,87216,93081,100283,107620,115094,135249,143768,152508,161343,171856,199607,218415,233368,248529,259675,331968,351261,365552,390909,411275,473857,503777,534248,571719,609886,674886,711926,749561,787957,826965,928824,984554,1022494,1070636,1119554,1269585,1307290,1396228,1512414,1604928,1830969,2034180,2211611,2538936,3105953,999999
+
+//Job - 3rd Jobs & Baby 3rds, Oboro, Kagerou, Rebellion, Star Emperor, Soul Reaper
+70,4054:4055:4056:4057:4058:4059:4060:4061:4062:4063:4064:4065:4066:4067:4068:4069:4070:4071:4072:4073:4074:4075:4076:4077:4078:4079:4080:4081:4082:4083:4084:4085:4086:4087:4096:4097:4098:4099:4100:4101:4102:4103:4104:4105:4106:4107:4108:4109:4110:4111:4112:4211:4212:4215:4223:4224:4229:4239:4240:4241:4242:4243:4244,1,12800,16384,20971,26843,34359,43980,56294,72057,92233,118059,151115,193428,247588,316912,405648,519229,664613,850705,1088903,1393796,1784059,2283596,2923003,3741444,4231573,4785909,5412863,6121948,6923924,7830958,8856813,10017056,11329290,12813427,14491986,16390436,18537584,20966007,23712554,26818899,30332175,34305690,38799735,43882500,49631108,56132783,63486178,71802867,81209043,91847428,103879441,117487647,132878529,150285617,169973033,192239500,217422874,245905271,278118862,319836691,367812195,422984024,486431628,559396372,632361116,705325860,778290604,851255348,924220092,999999999
+
+//Job - Expanded Super Novice & Expanded Super Baby
+50,4190:4191,1,112000,355000,615000,917000,1253000,1595000,2007000,2430000,2868000,3420000,3863000,4504000,4998000,5769000,6321000,7254000,7870000,9015000,9530000,11072000,11848000,13467000,14337000,16243000,17216000,19446000,20781000,23070000,24453000,27568000,29118000,31820000,34125000,37048000,40204000,42972000,45937000,49110000,52696000,57158000,61305000,67167000,72285000,77647000,83624000,91113000,98548000,107630000,119077000,999999999
+
 //Job - Super Novice & Baby Super Novice
-99,23:4045,1,60,130,260,460,780,1060,1300,1560,1910,2290,2680,2990,3340,3740,4360,4970,5530,6120,6700,8090,8920,9970,11080,12690,14440,15850,17400,19220,21060,22870,24910,26840,29080,31320,33300,37110,40500,43570,46180,53510,57200,60310,65690,70090,72130,77540,83320,90120,97180,590120,600120,610120,620120,630120,640120,650120,660120,670120,680120,690120,700120,710120,720120,730120,740120,750120,760120,770120,780120,790120,800120,810120,820120,830120,840120,850120,860120,870120,880120,890120,900120,910120,920120,930120,940120,950120,960120,970120,980120,990120,1000120,1010120,1020120,1030120,1040120,1050120,1060120,1070120,999999999
+99,23:4045,1,60,130,260,460,780,1060,1300,1560,1910,2290,2680,2990,3340,3740,4360,4970,5530,6120,6700,8090,8920,9970,11080,12690,14440,15850,17400,19220,21060,22870,24910,26840,29080,31320,33300,37110,40500,43570,46180,53510,57200,60310,65690,70090,72130,77540,83320,90120,590120,600120,610120,620120,630120,640120,650120,660120,670120,680120,690120,700120,710120,720120,730120,740120,750120,760120,770120,780120,790120,800120,810120,820120,830120,840120,850120,860120,870120,880120,890120,900120,910120,920120,930120,940120,950120,960120,970120,980120,990120,1000120,1010120,1020120,1030120,1040120,1050120,1060120,1070120,1080120,999999999

 //Job - Summoner
-50,4218:4220,1,60,130,260,460,780,1060,1300,1560,1910,2500,4200,7000,10300,15900,18900,20900,22600,24900,28800,31500,34900,38300,41700,45100,48500,51900,55000,72000,89000,106000,112000,355000,615000,917000,1253000,1595000,2007000,2430000,2868000,3420000,3863000,4504000,4998000,5769000,6321000,7254000,7870000,9015000,9530000,999999999
+70,4218:4220,1,60,130,260,460,780,1060,1300,1560,1910,2500,4200,7000,10300,15900,18900,20900,22600,24900,28800,33100,35100,40500,44100,46300,48500,50700,56000,59000,63500,68100,75000,85700,90500,106000,112000,355000,615000,917000,1253000,1595000,2007000,2430000,2868000,3420000,3863000,4504000,4998000,5769000,6321000,7585200,9860760,13805064,20707596,33132154,53011447,72890740,92770033,112649326,132528619,319836691,367812195,422984024,486431628,559396372,632361116,705325860,778290604,851255348,924220092,999999999
--- a/db/re/map_cache.dat
+++ b/db/re/map_cache.dat
--- a/db/re/mob_db.txt
+++ b/db/re/mob_db.txt
@@ -2279,13 +2279,13 @@
 //3119,E_RUNAWAY5_,Runaway 5,Runaway 5,1,10,1,0,0,1,1,1,1,0,1,1,1,1,1,1,10,12,0,0,20,0x11F0000,170,1084,2304,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
 //3120,M_ISIS
 //3121,Q_BYORGUE
-//3122,CHARLESTON1
-//3123,CHARLESTON2
-//3124,CHARLESTON3
-3125,STEP,Step,Step,130,55403,0,3088,2392,1,871,695,101,58,117,127,55,61,116,60,10,12,0,6,22,0x2000000,250,0,780,0,0,0,0,0,0,0,0,6751,1000,998,150,13213,400,0,0,0,0,0,0,0,0,0,0,0,0,4698,1
-//3126,ROCK_STEP
-//3127,KICK_STEP
-//3128,KICK_AND_KICK
+3122,CHARLESTON1,Charleston 1,Charleston 1,140,2614000,1,36804,21064,1,3210,695,123,68,189,78,81,51,108,56,10,12,2,6,22,0x3095,150,676,2400,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
+3123,CHARLESTON2,Charleston 3,Charleston 2,140,2614000,1,36804,21064,1,3210,695,123,68,189,78,81,51,108,56,10,12,2,6,22,0x3095,150,676,2400,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
+3124,CHARLESTON3,Charleston 3,Charleston 3,145,23671401,1,3132000,2473000,1,1500,1000,200,90,208,106,205,206,228,105,10,12,2,6,60,0x620B695,200,676,2016,672,0,0,0,0,0,0,0,16031,200,28101,200,16033,100,21011,200,22043,400,22044,400,6752,5000,0,0,0,0,0,0
+3125,STEP,Step,Step,130,55403,1,3088,2392,1,871,695,101,58,117,127,55,61,116,60,10,12,0,6,20,0x0000083,100,676,672,480,0,0,0,0,0,0,0,6751,1000,998,150,6213,400,6961,50,6962,50,0,0,0,0,0,0,0,0,4698,1
+3126,ROCK_STEP,Rock Step,Lockstep,131,71056,1,3609,2209,2,1100,325,85,59,99,95,70,124,155,80,10,12,1,6,40,0x0000085,150,676,1056,480,0,0,0,0,0,0,0,6750,500,999,350,7319,500,6961,50,6962,50,0,0,0,0,0,0,0,0,4699,1
+3127,KICK_STEP,Kick Step,Hallway 1 Security Devi,132,73644,1,3607,2205,7,1151,218,80,50,99,92,72,122,161,76,10,12,1,6,20,0x0000084,200,676,816,480,0,0,0,0,0,0,0,6750,400,999,250,7319,300,6961,50,6962,50,0,0,0,0,0,0,0,0,27012,1
+3128,KICK_AND_KICK,Kick And Kick,Security Robot,133,68018,1,3729,2032,1,1484,158,98,54,164,116,66,59,141,58,10,12,1,6,40,0x0000085,200,676,576,480,0,0,0,0,0,0,0,6751,500,998,100,6961,50,6962,50,0,0,0,0,0,0,0,0,0,0,27013,1
 //3129,ORC_ZOMBIE_ANNIV
 //3130,ORC_ARCHER_ANNIV
 //3131,ORC_BABY_ANNIV
@@ -2310,13 +2310,13 @@
 //3150,MG_AMDARAIS_H
 //3151,MG_CORRUPTION_ROOT_H
 //3152,G_MG_KHALITZBURG_H
-3153,EXCAVATOR_ROBOT,Excavator Robot,Excavator Robot,163,166860,0,15026,16915,1,4785,192,138,53,102,104,72,57,98,57,10,12,1,0,60,0x0000085,250,1020,500,768,0,0,0,0,0,0,0,11597,251,984,101,6962,101,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-3154,RECON_ROBOT,Recon Robot,Recon Robot,165,256000,0,15796,17738,1,2989,280,128,60,112,60,72,57,120,77,10,12,2,0,80,0x0000085,170,1072,672,384,0,0,0,0,0,0,0,998,1001,756,1001,11597,151,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-3155,REPAIR_ROBOT,Repair Robot,Repair Robot,155,154760,0,11748,47654,1,2051,216,99,55,98,39,30,35,95,45,10,12,0,3,24,0x0000085,300,1500,500,660,0,0,0,0,0,0,0,998,5000,756,1501,999,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-3156,EXPLORATION_ROVER,Exploration Rover,Exploration Rover,168,293640,0,18172,126234,1,2513,802,105,41,100,63,35,99,106,61,10,12,2,7,80,0x0000085,165,1552,1152,336,0,0,0,0,0,0,0,998,5000,756,1,999,1,6961,1,0,0,0,0,0,0,0,0,0,0,0,0
-3157,RUIN_BELIEVER1,Ruin Grace Believer,Ruin Grace Believer,100,61350,0,4666,3874,1,993,250,91,50,88,61,51,62,136,60,10,12,1,7,40,0x0000085,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-3158,RUIN_BELIEVER2,Ruin Grace Believer,Ruin Grace Believer,100,61350,0,4666,139500,1,993,250,91,50,88,61,51,62,136,60,10,12,1,7,40,0x0000085,200,2125,2112,0,0,0,0,0,0,0,0,6753,10000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-3159,ILLEGAL_PROMOTION,Illegal Promotion,Illegal Promotion,100,10,0,0,0,1,1,1,1,50,1,1,1,1,1,1,10,12,0,0,40,0x0370020,200,0,0,768,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3153,EXCAVATOR_ROBOT,Excavator Robot,Excavator Robot,163,166860,1,15026,16915,1,4785,192,138,53,102,104,72,57,98,57,10,12,1,0,60,0x0000085,250,1020,500,768,0,0,0,0,0,0,0,11597,1,984,1,6962,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3154,RECON_ROBOT,Recon Robot,Recon Robot,165,256000,1,15796,17738,3,2989,280,127,60,112,60,72,57,120,77,10,12,2,0,80,0x0000085,170,1072,672,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3155,REPAIR_ROBOT,Repair Robot,Repair Robot,155,154760,1,11748,13237,1,2051,216,99,55,98,39,30,35,95,45,10,12,0,3,24,0x0000085,300,1500,500,660,0,0,0,0,0,0,0,998,5000,756,1501,999,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3156,EXPLORATION_ROVER,Exploration Rover,Exploration Rover,168,293640,1,18172,35065,3,2513,802,105,41,100,63,35,99,106,61,10,12,2,7,80,0x0000085,165,1552,1152,336,0,0,0,0,0,0,0,998,5000,756,1,999,1,6961,1,0,0,0,0,0,0,0,0,0,0,0,0
+3157,RUIN_BELIEVER1,Ruin Grace Believer,Ruin Grace Believer,100,61350,1,4666,3874,1,993,250,91,50,88,61,51,62,136,60,10,12,1,7,40,0x0000085,200,800,2112,768,0,0,0,0,0,0,0,6753,10000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3158,RUIN_BELIEVER2,Ruin Grace Believer,Ruin Grace Believer,100,61350,1,4666,3874,1,993,250,91,50,88,61,51,62,136,60,10,12,1,7,40,0x0000085,200,800,2112,768,0,0,0,0,0,0,0,6753,10000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3159,ILLEGAL_PROMOTION,Illegal Promotion,Illegal Promotion,100,10,1,0,0,1,1,1,1,50,1,1,1,1,1,1,10,12,0,0,40,0x0370020,200,800,2112,768,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 //3160,BOILED_RICE_DUANWU
 //3161,BOMB
 //3162,ELEPHANT
@@ -2405,15 +2405,15 @@
 3245,V_B_ALPHOCCIO,Minstrel Alphoccio,Minstrel Alphoccio,186,10800000,1,3000000,3000000,1,8000,12000,240,200,240,300,140,400,300,180,10,12,1,7,84,0x6283695,100,76,864,288,0,0,0,0,0,0,0,23016,3000,20748,150,20748,500,22687,5000,6818,10000,6818,10000,6818,10000,0,0,0,0,4673,1
 3246,V_B_TRENTINI,Wanderer Trentini,Wanderer Trentini,186,10800000,1,3000000,3000000,2,8000,12000,200,200,220,300,140,400,300,160,10,12,1,7,84,0x6283695,100,76,864,288,0,0,0,0,0,0,0,23016,3000,20748,150,20748,500,22687,5000,6818,10000,6818,10000,6818,10000,0,0,0,0,4683,1
 3247,CENERE_G,Cenere G,Green Cenere,150,140088,1,7635,7698,1,1897,110,91,81,70,48,40,37,100,45,10,12,0,0,24,0x0000085,300,1500,720,360,0,0,0,0,0,0,0,6561,5000,7322,500,7001,1500,7320,1000,12815,500,0,0,0,0,0,0,0,0,27014,1
-3248,REPAIR_ROBOT_T,Repair Robot T,Repair Robot Turbo,158,186320,1,13208,14489,1,2431,226,118,59,101,42,55,35,110,45,10,12,0,0,40,0x000008B,300,1500,500,660,0,0,0,0,0,0,0,7512,500,7507,250,998,2000,999,500,11597,1500,0,0,0,0,0,0,0,0,27015,1
-3249,EXPLORATION_ROVER_T,Exploration Rover T,Explorer Robot Turbo,171,318117,1,19826,41023,3,2945,841,121,67,118,80,45,121,138,65,10,12,2,0,80,0x0000085,165,1552,1152,336,0,0,0,0,0,0,0,7512,500,7507,250,998,2000,999,500,11597,1500,0,0,0,0,0,0,0,0,27016,1
-3250,SCR_MT_ROBOTS,Scr Mt Robots,Can Robot,155,30,1,61,58,1,95,2,100,99,35,42,20,12,68,3,10,12,0,0,20,0x0070085,300,2400,500,400,0,0,0,0,0,0,0,7512,1000,7507,1500,7319,2000,0,0,0,0,0,0,0,0,0,0,0,0,27017,1
-3251,GC109,Machine Component,Machine Component,149,217650,1,6598,5931,1,2678,1257,121,71,60,132,45,35,155,15,10,12,0,0,47,0x0000085,120,1000,500,600,0,0,0,0,0,0,0,7512,1000,7507,1500,7319,2000,0,0,0,0,0,0,0,0,0,0,0,0,27018,1
-3252,DR815,Machine Component,Machine Component,153,245670,1,7255,7011,1,3315,761,143,45,88,98,88,21,116,22,10,12,1,0,27,0x0000085,135,1500,600,500,0,0,0,0,0,0,0,7512,1000,7507,1500,7319,2000,0,0,0,0,0,0,0,0,0,0,0,0,27019,1
-3253,SYS_MSG,Sys Msg,System message,160,100,1,0,0,1,1,1,276,99,0,0,0,188,0,0,10,12,0,0,20,0xC170081,2000,3000,600,550,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-3254,T_W_O,T_W_O,T_W_O,165,48000000,1,0,0,1,3955,196,158,134,90,141,7,87,267,70,10,12,2,6,67,0x6280085,150,1250,500,350,0,6832,5000,617,5000,617,5000,22699,3000,1531,500,7319,2000,0,0,0,0,0,0,0,0,0,0,0,0,27020,1
-3255,GHOUL_H,Ghoul H,Smelly Ghoul,155,178652,1,10233,10598,1,2235,216,99,55,98,55,61,22,133,2,10,12,0,3,24,0x0000085,200,0,500,660,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-3256,ZOMBIE_H,Zombie H,Smelly Zombie,148,134615,1,6859,6903,1,1995,450,91,42,76,53,54,21,125,3,10,12,0,0,60,0x0000085,220,0,960,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3248,REPAIR_ROBOT_T,Repair Robot T,Repair Robot Turbo,158,186320,1,13208,14489,1,2431,226,118,59,101,42,55,35,110,45,10,12,0,0,40,0x000008B,300,1500,500,660,0,0,0,0,0,0,0,7512,500,7507,250,998,2000,999,500,11597,1500,6961,50,6962,50,0,0,0,0,27015,1
+3249,EXPLORATION_ROVER_T,Exploration Rover T,Explorer Robot Turbo,171,318117,1,19826,41023,3,2945,841,121,67,118,80,45,121,138,65,10,12,2,0,80,0x0000085,165,1552,1152,336,0,0,0,0,0,0,0,7512,500,7507,250,998,2000,999,500,11597,1500,6961,50,6962,50,0,0,0,0,27016,1
+3250,SCR_MT_ROBOTS,Scr Mt Robots,Can Robot,155,30,1,61,58,1,95,2,100,99,35,42,20,12,68,3,10,12,0,0,20,0x0070085,300,2400,500,400,0,0,0,0,0,0,0,7512,1000,7507,1500,7319,2000,6961,50,6962,50,0,0,0,0,0,0,0,0,27017,1
+3251,GC109,Machine Component,Machine Component,149,217650,1,6598,5931,1,2678,1257,121,71,60,132,45,35,155,15,10,12,0,0,47,0x0000085,120,1000,500,600,0,0,0,0,0,0,0,7512,1000,7507,1500,7319,2000,6961,50,6962,50,0,0,0,0,0,0,0,0,27018,1
+3252,DR815,Machine Component,Machine Component,153,245670,1,7255,7011,1,3315,761,143,45,88,98,88,21,116,22,10,12,1,0,27,0x0000085,135,1500,600,500,0,0,0,0,0,0,0,7512,1000,7507,1500,7319,2000,6961,50,6962,50,0,0,0,0,0,0,0,0,27019,1
+3253,SYS_MSG,Sys Msg,System message,160,100,1,0,0,12,1,1,276,99,0,0,0,188,0,0,10,12,2,6,27,0xC170081,2000,3000,600,550,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3254,T_W_O,T_W_O,T_W_O,165,48000000,1,0,0,3,3955,196,158,134,90,141,7,87,267,70,10,12,2,6,67,0x6280085,150,1250,500,350,0,6832,5000,617,5000,617,5000,22699,3000,1531,500,7319,2000,0,0,0,0,0,0,0,0,0,0,0,0,27020,1
+3255,GHOUL_H,Ghoul H,Smelly Ghoul,155,178652,1,10233,10598,1,2235,216,99,55,98,55,61,22,133,2,10,12,0,3,24,0x0000085,200,2050,500,660,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3256,ZOMBIE_H,Zombie H,Smelly Zombie,148,134615,1,6859,6903,1,1995,450,91,42,76,53,54,21,125,3,10,12,0,0,60,0x0000085,220,2155,960,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 //3257,MALE_PORING
 //3258,FEMALE_PORING
 //3259,FANTASTIC_B_UNICORN
--- a/db/re/mob_skill_db.txt
+++ b/db/re/mob_skill_db.txt
@@ -714,12 +714,11 @@
 1141,Marina@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,0,,,,,,6,
 1141,Marina@NPC_EMOTION,walk,197,1,2000,0,5000,yes,self,always,0,19,,,,,,
 1141,Marina@NPC_WATERATTACK,attack,184,2,500,500,5000,no,target,always,0,,,,,,6,
-1142,Marine Sphere@NPC_RUN,idle,354,7,10000,0,30000,no,master,alchemist,,,,,,,26,
-1142,Marine Sphere@NPC_SELFDESTRUCTION,any,173,1,10000,3000,0,no,self,afterskill,354,,,,,,,
+1142,Marine Sphere@NPC_RANDOMMOVE,idle,331,1,10000,0,30000,yes,target,alchemist,,,,,,,,
+1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,10000,3000,0,yes,self,alchemist,,,,,,,,
 1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,500,2000,5000,no,self,myhpltmaxrate,99,,,,,,,
 1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,10000,2000,5000,no,self,skillused,173,,,,,,,
-//1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,10000,0,0,yes,self,always,0,,,,,,,
-//1142,Marine Sphere@NPC_SPEEDUP,any,332,1,10000,0,700,yes,self,always,0,,,,,,,
+1142,Marine Sphere@NPC_SPEEDUP,idle,332,1,10000,0,700,yes,target,always,,,,,,,,
 1143,Marionette@HT_FREEZINGTRAP,idle,121,5,500,0,300000,yes,around2,always,0,,,,,,29,
 1143,Marionette@MG_FIREWALL,chase,18,5,500,500,5000,yes,target,always,0,,,,,,2,
 1143,Marionette@NPC_TELEKINESISATTACK,attack,191,5,500,0,5000,yes,target,always,0,,,,,,6,
@@ -11185,8 +11184,8 @@

 3038,Hidden Mob 7@NPC_INVISIBLE,idle,353,1,10000,0,30000,yes,self,always,0,,,,,,,
 3038,Hidden Mob 7@NPC_INVISIBLE,attack,353,1,10000,0,30000,yes,self,always,0,,,,,,,
-// 3038,Hidden Mob 7@NPC_HELLBURNING,idle,719,1,10000,0,3000,yes,self,always,0,,,,,,,
-// 3038,Hidden Mob 7@NPC_HELLBURNING,attack,719,1,10000,0,3000,yes,self,always,0,,,,,,,
+3038,Hidden Mob 7@NPC_HELLBURNING,idle,719,1,10000,0,3000,yes,self,always,0,,,,,,,
+3038,Hidden Mob 7@NPC_HELLBURNING,attack,719,1,10000,0,3000,yes,self,always,0,,,,,,,

 // Jitterbug instance
 3069,Ferre@NPC_GROUNDATTACK,attack,185,5,1000,0,5000,no,target,always,0,,,,,,,
@@ -11872,62 +11871,29 @@
 3246,V_B_TRENTINI@NPC_WIDESLEEP,attack,668,5,100,1000,20000,no,self,always,,,,,,,,
 3246,V_B_TRENTINI@NPC_WIDECONFUSE,attack,667,5,100,1000,20000,no,target,always,,,,,,,,

-//=================================================================
-// Phantasmagorika 15.2 Mob Skills Placeholder (Gathered from jRO)
-//=================================================================
-
-3153,Excavator Robot@NPC_BLOODDRAIN,angry,199,1,1000,0,3000,no,target,always,0,,,,,,,
-3153,Excavator Robot@NPC_STONESKIN,attack,675,3,10000,0,30000,yes,self,always,0,,,,,,,
-3153,Excavator Robot@NPC_STUNATTACK,attack,179,5,800,1000,5000,no,target,always,0,,,,,,,
-3153,Excavator Robot@NPC_ARMORBRAKE,attack,344,10,500,0,5000,no,target,always,0,,,,,,,
-3153,Excavator Robot@NPC_STONESKIN,chase,675,3,10000,0,30000,yes,self,always,0,,,,,,,
-3153,Excavator Robot@NPC_BLOODDRAIN,attack,199,1,500,0,5000,no,target,always,0,,,,,,,
-3153,Excavator Robot@NPC_STONESKIN,idle,675,3,10000,0,30000,yes,self,always,0,,,,,,,
-3153,Excavator Robot@AL_TELEPORT,idle,26,1,10000,0,0,no,target,rudeattacked,0,,,,,,,
-
-3154,Recon Robot@NPC_GUIDEDATTACK,attack,172,5,500,0,20000,no,target,always,0,,,,,,,
-3154,Recon Robot@NPC_STUNATTACK,attack,179,5,800,1000,5000,no,target,always,0,,,,,,,
-
-3155,Repair Robot@NPC_STUNATTACK,any,179,5,500,1000,5000,no,target,always,0,,,,,,,
-3155,Repair Robot@NPC_GUIDEDATTACK,attack,172,5,1000,0,15000,no,target,always,0,,,,,,,
-
-3156,Exploration Rover@NPC_SUMMONSLAVE,idle,196,5,10000,700,10000,no,self,casttargeted,1,3157,3158,,,,,
-3156,Exploration Rover@NPC_GUIDEDATTACK,attack,172,5,1000,0,10000,no,target,always,0,,,,,,,
-3156,Exploration Rover@NPC_SUMMONSLAVE,attack,196,5,10000,700,10000,no,target,attackpcge,10,3157,3158,,,,,
-
-3247,Cenere G@NPC_PETRIFYATTACK,attack,180,3,500,500,5000,no,target,always,0,,,,,,,
-3247,Cenere G@MG_THUNDERSTORM,chase,21,10,3000,1000,10000,no,target,always,0,,,,,,,
-3247,Cenere G@NPC_POISONATTACK,any,188,1,5000,0,5000,no,target,always,0,,,,,,,
-3247,Cenere G@NPC_BLINDATTACK,attack,177,3,500,0,5000,yes,target,always,0,,,,,,,
-3247,Cenere G@MG_THUNDERSTORM,attack,21,10,3000,1000,10000,no,target,always,0,,,,,,,
-
-3248,Repair Robot T@AL_PNEUMA,attack,25,1,2000,0,5000,yes,self,longrangeattacked,0,,,,,,,
-3248,Repair Robot T@AL_TELEPORT,idle,26,1,10000,0,0,no,target,rudeattacked,0,,,,,,,
-3248,Repair Robot T@NPC_CRITICALSLASH,attack,170,1,2000,0,2000,no,target,always,0,,,,,,,
-3248,Repair Robot T@NPC_GUIDEDATTACK,attack,172,5,1000,0,5000,no,target,always,0,,,,,,,
-3248,Repair Robot T@KN_TWOHANDQUICKEN,attack,60,30,10000,0,120000,yes,target,myhpltmaxrate,40,,,,,,,
-3248,Repair Robot T@NPC_STUNATTACK,attack,179,5,500,1000,5000,no,target,always,0,,,,,,,
-3248,Repair Robot T@AL_PNEUMA,chase,25,1,2000,0,5000,no,self,longrangeattacked,0,,,,,,,
-
-3249,Exploration Rover T@KN_TWOHANDQUICKEN,attack,60,30,10000,0,120000,yes,self,myhpltmaxrate,40,,,,,,,
-3249,Exploration Rover T@AL_PNEUMA,chase,25,1,2000,0,5000,no,self,longrangeattacked,0,,,,,,,
-3249,Exploration Rover T@AL_TELEPORT,walk,26,1,10000,0,0,no,target,rudeattacked,0,,,,,,,
-3249,Exploration Rover T@NPC_CRITICALWOUND,attack,673,2,1000,0,5000,no,target,always,0,,,,,,,
-3249,Exploration Rover T@NPC_GUIDEDATTACK,attack,172,5,1000,0,5000,no,target,always,0,,,,,,,
-3249,Exploration Rover T@AL_PNEUMA,attack,25,1,2000,0,5000,no,self,longrangeattacked,0,,,,,,,
-
-3253,SYS_MSG@AL_HEAL,attack,28,10,500,500,5000,yes,friend,friendhpltmaxrate,50,,,,,,,
-3253,SYS_MSG@AL_HEAL,chase,28,10,500,500,5000,yes,friend,friendhpltmaxrate,50,,,,,,,
-3253,SYS_MSG@AL_HEAL,idle,28,10,500,500,5000,yes,friend,friendhpltmaxrate,50,,,,,,,
-
-3254,T_W_O@NPC_PIERCINGATT,attack,158,10,300,0,30000,no,target,always,0,,,,,,,
-3254,T_W_O@NPC_PIERCINGATT,chase,158,10,500,0,5000,no,target,always,0,,,,,,,
-3254,T_W_O@NPC_SILENCEATTACK,attack,178,5,750,250,10000,no,target,casttargeted,0,,,,,,6,
-3254,T_W_O@NPC_SILENCEATTACK,chase,178,5,750,250,3000,no,target,casttargeted,0,,,,,,6,
-3254,T_W_O@NPC_WIDESLEEP,attack,668,5,400,0,15000,no,self,always,0,,,,,,,
-3254,T_W_O@NPC_WIDESTONE,attack,666,5,600,0,30000,no,self,always,0,,,,,,,
-3254,T_W_O@NPC_WIDESOULDRAIN,attack,680,10,1000,0,60000,no,self,always,0,,,,,,,
-3254,T_W_O@NPC_CRITICALWOUND,attack,673,5,150,500,45000,no,target,always,,,,,,,,
+// Phantasmagorika 15.2
+3124,CHARLESTON3@NPC_AGIUP,idle,350,1,2000,0,10000,yes,self,always,0,,,,,,,
+3124,CHARLESTON3@AL_HEAL,idle,28,11,10000,0,3000,yes,self,always,0,,,,,,,
+3124,CHARLESTON3@HW_NAPALMVULCAN,chase,400,5,3000,500,10000,no,target,always,0,,,,,,,
+3124,CHARLESTON3@WZ_VERMILION,chase,85,5,2000,1000,15000,no,target,always,0,,,,,,,
+3124,CHARLESTON3@HW_NAPALMVULCAN,attack,400,5,3000,500,10000,no,target,always,0,,,,,,,
+3124,CHARLESTON3@WZ_VERMILION,attack,85,21,1500,4000,20000,no,target,always,0,,,,,,,
+3124,CHARLESTON3@WZ_METEOR,attack,83,11,1500,4000,20000,no,target,always,0,,,,,,,
+3125,STEP@SM_BASH,attack,5,5,1000,0,5000,yes,target,always,0,,,,,,,
+3126,ROCK_STEP@BS_HAMMERFALL,attack,110,5,1000,1000,5000,no,target,always,0,,,,,,,
+3127,KICK_STEP@ASC_BREAKER,attack,379,5,1000,0,5000,yes,target,always,0,,,,,,,
+3128,KICK_AND_KICK@NPC_STUNATTACK,attack,179,3,500,1000,5000,no,target,always,0,,,,,,,
+3253,SYS_MSG@AL_HEAL,attack,28,11,5000,500,5000,yes,friend,friendhpltmaxrate,50,,,,,,,
+3253,SYS_MSG@AL_HEAL,chase,28,11,5000,500,5000,yes,friend,friendhpltmaxrate,50,,,,,,,
+3253,SYS_MSG@AL_HEAL,idle,28,11,5000,500,5000,yes,friend,friendhpltmaxrate,50,,,,,,,
+3254,T_W_O@NPC_PIERCINGATT,attack,158,10,3000,0,30000,no,target,always,0,,,,,,,
+3254,T_W_O@NPC_PIERCINGATT,chase,158,10,5000,0,5000,no,target,always,0,,,,,,,
+3254,T_W_O@NPC_SILENCEATTACK,attack,178,5,7500,250,10000,no,target,casttargeted,0,,,,,,6,
+3254,T_W_O@NPC_SILENCEATTACK,chase,178,5,7500,250,3000,no,target,casttargeted,0,,,,,,6,
+3254,T_W_O@NPC_WIDESLEEP,attack,668,5,4000,0,15000,no,self,always,0,,,,,,,
+3254,T_W_O@NPC_WIDESTONE,attack,666,5,6000,0,30000,no,self,always,0,,,,,,,
+3254,T_W_O@NPC_WIDESOULDRAIN,attack,680,10,10000,0,60000,no,self,always,0,,,,,,,
+3254,T_W_O@NPC_CRITICALWOUND,attack,673,5,1500,500,45000,no,target,always,,,,,,,,

 3505,DR_BIG_EGGRING@NPC_SUMMONSLAVE,attack,196,4,10000,2000,10000,no,self,slavele,3,3508,,,,,,
 3505,DR_BIG_EGGRING@NPC_SUMMONSLAVE,idle,196,4,10000,2000,10000,no,self,slavele,3,3508,,,,,,
--- a/db/re/produce_db.txt
+++ b/db/re/produce_db.txt
@@ -656,17 +656,17 @@
 //-- Cure Free <-- GN_S_PHARMACY Lv1, Quality Potion Book, 20 Green Herb, 1 Fruit Of Mastela, 5 Panacea, 1 Leaf Of Yggdrasil, 10 Empty Cylinder
 263,12475,29,2497,1,6285,0,511,20,522,1,525,5,610,1,1092,10
 //-- Golden X <-- GN_S_PHARMACY Lvl, 10 Empty Testtube, 10 Yggdrasilberry, 5 Gold
-//264,100231,29,2497,1,1092,10,607,10,969,5
+264,100231,29,2497,1,1092,10,607,10,969,5
 //-- Red Herb Activator <-- GN_S_PHARMACY Lvl, 10 Empty Testtube, 45 Red Herb, 5 Yggdrasil Seed
-//265,100232,29,2497,1,1092,10,507,45,608,5
+265,100232,29,2497,1,1092,10,507,45,608,5
 //-- Blue Herb Activator <-- GN_S_PHARMACY Lvl, 10 Empty Testtube, 15 Blue Herb, 5 Yggdrasil Seed
-//266,100233,29,2497,1,1092,10,510,15,608,5
+266,100233,29,2497,1,1092,10,510,15,608,5
 //-- Concentrated Red Syrup Potion <-- GN_S_PHARMACY Lvl, 10 Empty Testtube, 10 Empty Potion Bottle, 15 Red Syrup
-//267,1100003,29,2497,1,1092,10,1093,10,11621,15
+267,1100003,29,2497,1,1092,10,1093,10,11621,15
 //-- Concentrated Blue Syrup Potion <-- GN_S_PHARMACY Lvl, 10 Empty Testtube, 10 Empty Potion Bottle, 15 Blue Syrup
-//268,1100004,29,2497,1,1092,10,1093,10,11624,15
+268,1100004,29,2497,1,1092,10,1093,10,11624,15
 //-- Concentrated Golden Syrup Potion <-- GN_S_PHARMACY Lvl, 10 Empty Testtube, 10 Empty Potion Bottle, 15 White Syrup, 10 Yellow Syrup
-//269,1100005,29,2497,1,1092,10,1093,10,11623,15,11622,10
+269,1100005,29,2497,1,1092,10,1093,10,11623,15,11622,10
 //===============================================

 //--------------------LEVEL 30-----------
--- a/db/re/quest_db.yml
+++ b/db/re/quest_db.yml
@@ -30,8 +30,18 @@
 #                   Specify without "+" for the exact time the quest expires using "d" (optionnal), [0-23]"h" (required), [0-59]"mn" (optionnal), [0-59]"s" (optionnal) format.
 #                   Please note the number before "d" only shift the exact timer to the given day(s).
 #   Targets:        Quest objective target. (Default: null)
-#     - Mob         Monster to kill.
-#       Count       Amount of monsters to kill.
+#                   The target can be a couple of node Mob/Count or of Id/Race/Size/Element/MinLevel/MaxLevel.
+#                   If Mob is supplied, Count is required and the other fields are ignored.
+#                   If Id is supplied, at least one other field of Race/Size/Element/MinLevel/MaxLevel is required.
+#                   If Id is supplied, Count is required for each new entry.
+#     - Mob         Monster to kill (aegis monster name).
+#       Count       Amount of monsters to kill. Set to 0 to skip the target on import.
+#       Id          Unique target index for the quest Id. Requires a positive number.
+#       Race        Monster race target (default All). Valids race are Angel, Brute, DemiHuman, Demon, Dragon, Fish, Formless, Insect, Plant, Undead, All.
+#       Size        Monster size target (default All). Valids size are Small, Medium, Large, All.
+#       Element     Monster element target (default All). Valids elements are Dark, Earth, Fire, Ghost, Holy, Neutral, Poison, Undead, Water, Wind, All.
+#       MinLevel    Minimum monster level target. If not supplied but MaxLevel defined, MinLevel is 1. Set to 0 to ignore MinLevel on import. (Default: 0)
+#       MaxLevel    Maximum monster level target. Set to 0 to ignore MaxLevel on import. (Default: 0)
 #   Drops:          Quest item drop targets. (Default: null)
 #     - Mob         Monster to kill. 0 will apply to all monsters. (Default: 0)
 #       Item        Item to drop.
@@ -2245,24 +2255,74 @@ Body:
    Title: The Royal Richard
  - Id: 5404
    Title: "[Repeat]Warrior Discipline-Human"
+    Targets:
+      - Id: 1
+        Count: 50
+        Race: DemiHuman
+        MinLevel: 140
  - Id: 5405
    Title: "[Repeat]Warrior Discipline-Animal"
+    Targets:
+      - Id: 1
+        Count: 50
+        Race: Brute
+        MinLevel: 140
  - Id: 5406
    Title: "[Repeat]Warrior Discipline-Insect"
+    Targets:
+      - Id: 1
+        Count: 50
+        Race: Insect
+        MinLevel: 140
  - Id: 5407
    Title: "[Repeat]Warrior Discipline-Fish"
+    Targets:
+      - Id: 1
+        Count: 50
+        Race: Fish
+        MinLevel: 140
  - Id: 5408
    Title: "[Repeat]Warrior Discipline-Plant"
+    Targets:
+      - Id: 1
+        Count: 50
+        Race: Plant
+        MinLevel: 140
  - Id: 5409
    Title: "[Repeat]Warrior Discipline-Devil"
+    Targets:
+      - Id: 1
+        Count: 50
+        Race: Demon
+        MinLevel: 140
  - Id: 5410
    Title: "[Repeat]Warrior Discipline-Angel"
+    Targets:
+      - Id: 1
+        Count: 50
+        Race: Angel
+        MinLevel: 140
  - Id: 5411
    Title: "[Repeat]Warrior Discipline-Immortal"
+    Targets:
+      - Id: 1
+        Count: 50
+        Race: Undead
+        MinLevel: 140
  - Id: 5412
    Title: "[Repeat]Warrior Discipline-Intangible"
+    Targets:
+      - Id: 1
+        Count: 50
+        Race: Formless
+        MinLevel: 140
  - Id: 5413
    Title: "[Repeat]Warrior Discipline-Dragon"
+    Targets:
+      - Id: 1
+        Count: 50
+        Race: Dragon
+        MinLevel: 140
  - Id: 5414
    Title: "[Stand by]Warrior Discipline"
    TimeLimit: 4h
@@ -4026,13 +4086,13 @@ Body:
    Title: Core Collection
    Drops:
      - Mob: RECON_ROBOT
-        Item: Operation_Control_Device
+        Item: Power_Control_Device
        Rate: 5000
      - Mob: REPAIR_ROBOT
-        Item: Operation_Control_Device
+        Item: Power_Control_Device
        Rate: 5000
      - Mob: EXPLORATION_ROVER
-        Item: Operation_Control_Device
+        Item: Power_Control_Device
        Rate: 5000
  - Id: 7616
    Title: Core Collection - Down
@@ -6147,6 +6207,7 @@ Body:
    Title: Let the Specialists Handle It
  - Id: 11377
    Title: Act of Kindness
+    TimeLimit: +1d
  - Id: 11378
    Title: "Trick or treat "
  - Id: 11379
--- a/db/re/skill_db.yml
+++ b/db/re/skill_db.yml
@@ -2111,7 +2111,7 @@ Body:
    HitCount: -3
    Element: Weapon
    SplashArea: 2
-    ActiveInstance: 3
+    ActiveInstance: 5
    Knockback: 2
    CastTime: 500
    Duration1: 1000
@@ -9711,6 +9711,7 @@ Body:
        Time: 55000
      - Level: 10
        Time: 60000
+    Duration2: 1000
    Requires:
      SpCost: 50
      Weapon:
@@ -9958,25 +9959,25 @@ Body:
    Requires:
      SpCost:
        - Level: 1
-          Amount: 14
+          Amount: 35
        - Level: 2
-          Amount: 18
+          Amount: 40
        - Level: 3
-          Amount: 22
+          Amount: 45
        - Level: 4
-          Amount: 26
-        - Level: 5
-          Amount: 30
-        - Level: 6
-          Amount: 34
-        - Level: 7
-          Amount: 38
-        - Level: 8
-          Amount: 42
-        - Level: 9
-          Amount: 46
-        - Level: 10
          Amount: 50
+        - Level: 5
+          Amount: 55
+        - Level: 6
+          Amount: 60
+        - Level: 7
+          Amount: 65
+        - Level: 8
+          Amount: 70
+        - Level: 9
+          Amount: 75
+        - Level: 10
+          Amount: 80
  - Id: 367
    Name: PA_PRESSURE
    Description: Gloria Domini
@@ -15704,10 +15705,12 @@ Body:
    DamageFlags:
      Splash: true
      SplashSplit: true
+      IgnoreDefense: true
    Flags:
      IsNpc: true
      TargetTrap: true
      ShowScale: true
+      IgnoreLandProtector: true
    Hit: Multi_Hit
    HitCount: 1
    SplashArea:
@@ -15731,6 +15734,35 @@ Body:
        Area: 11
      - Level: 10
        Area: 13
+    Duration1: 910
+    FixedCastTime: -1
+    Unit:
+      Id: Earthquake
+      Range:
+        - Level: 1
+          Size: 5
+        - Level: 2
+          Size: 7
+        - Level: 3
+          Size: 9
+        - Level: 4
+          Size: 11
+        - Level: 5
+          Size: 13
+        - Level: 6
+          Size: 5
+        - Level: 7
+          Size: 7
+        - Level: 8
+          Size: 9
+        - Level: 9
+          Size: 11
+        - Level: 10
+          Size: 13
+      Interval: 300
+      Target: Enemy
+      Flag:
+        PathCheck: true
  - Id: 654
    Name: NPC_FIREBREATH
    Description: Fire Breath
@@ -16824,6 +16856,28 @@ Body:
    Flags:
      IsNpc: true
    HitCount: 1
+  - Id: 719
+    Name: NPC_HELLBURNING
+    Description: Hell Burning
+    MaxLevel: 1
+    Type: Magic
+    TargetType: Self
+    Flags:
+      IsNpc: true
+      IgnoreLandProtector: true
+    Hit: Single
+    HitCount: 1
+    Element: Fire
+    Duration1: 3000
+    Unit:
+      Id: Hellburning
+      Layout: 1
+      Interval: 20
+      Target: Enemy
+      Flag:
+        NoOverlap: true
+        PathCheck: true
+        RangedSingleUnit: true
  - Id: 720
    Name: NPC_JACKFROST
    Description: Jack Frost 2
@@ -18035,25 +18089,36 @@ Body:
    Description: Frosty Misty
    MaxLevel: 5
    Type: Magic
-    TargetType: Self
+    TargetType: Ground
    DamageFlags:
      Splash: true
    Flags:
      AlterRangeRadius: true
+    Range: 11
    Hit: Multi_Hit
    HitCount:
      - Level: 1
-        Count: -3
+        Count: 1
      - Level: 2
-        Count: -4
+        Count: 2
      - Level: 3
-        Count: -5
+        Count: 3
      - Level: 4
-        Count: -6
+        Count: 4
      - Level: 5
-        Count: -7
+        Count: 5
    Element: Water
-    SplashArea: 9
+    SplashArea:
+      - Level: 1
+        Area: 3
+      - Level: 2
+        Area: 3
+      - Level: 3
+        Area: 4
+      - Level: 4
+        Area: 4
+      - Level: 5
+        Area: 5
    CopyFlags:
      Skill:
        Reproduce: true
@@ -18071,6 +18136,7 @@ Body:
        Time: 4000
    AfterCastActDelay: 1000
    Duration1: 40000
+    Duration2: 10000
    Cooldown: 4000
    FixedCastTime: 500
    Requires:
@@ -18090,23 +18156,24 @@ Body:
    Description: Jack Frost
    MaxLevel: 5
    Type: Magic
-    TargetType: Self
+    TargetType: Attack
    DamageFlags:
      Splash: true
+    Range: 11
    Hit: Multi_Hit
    HitCount: -5
    Element: Water
    SplashArea:
      - Level: 1
-        Area: 5
+        Area: 3
      - Level: 2
-        Area: 6
+        Area: 3
      - Level: 3
-        Area: 7
+        Area: 4
      - Level: 4
-        Area: 8
+        Area: 4
      - Level: 5
-        Area: 9
+        Area: 5
    CopyFlags:
      Skill:
        Reproduce: true
@@ -18134,6 +18201,7 @@ Body:
        Time: 27500
      - Level: 5
        Time: 32500
+    Cooldown: 4000
    FixedCastTime: 1000
    Requires:
      SpCost:
@@ -18396,7 +18464,7 @@ Body:
        Reproduce: true
    CastCancel: true
    CastTime: 5000
-    AfterCastActDelay: 2000
+    AfterCastActDelay: 500
    Duration1: 5000
    Cooldown: 5000
    FixedCastTime: 1000
@@ -18418,32 +18486,46 @@ Body:
    MaxLevel: 5
    Type: Magic
    TargetType: Attack
+    DamageFlags:
+      Splash: true
    Flags:
      AlterRangeRadius: true
    Range: 11
    Hit: Single
    HitCount: 1
    Element: Fire
+    SplashArea:
+      - Level: 1
+        Area: 1
+      - Level: 2
+        Area: 1
+      - Level: 3
+        Area: 1
+      - Level: 4
+        Area: 2
+      - Level: 5
+        Area: 2
    CopyFlags:
      Skill:
        Reproduce: true
    CastCancel: true
    CastTime: 3000
-    AfterCastActDelay: 1000
+    AfterCastActDelay: 500
    Duration1: 15000
+    Cooldown: 3000
    FixedCastTime: 1000
    Requires:
      SpCost:
        - Level: 1
-          Amount: 35
+          Amount: 64
        - Level: 2
-          Amount: 40
+          Amount: 70
        - Level: 3
-          Amount: 45
+          Amount: 76
        - Level: 4
-          Amount: 50
+          Amount: 82
        - Level: 5
-          Amount: 55
+          Amount: 88
  - Id: 2213
    Name: WL_COMET
    Description: Comet
@@ -18456,8 +18538,8 @@ Body:
      AlterRangeRadius: true
    Range: 11
    Hit: Multi_Hit
-    HitCount: -20
-    SplashArea: 9
+    HitCount: -10
+    SplashArea: 6
    Knockback: 2
    CopyFlags:
      Skill:
@@ -18465,45 +18547,32 @@ Body:
    CastCancel: true
    CastTime:
      - Level: 1
-        Time: 10000
+        Time: 6000
      - Level: 2
-        Time: 11000
+        Time: 7000
      - Level: 3
-        Time: 12000
+        Time: 8000
      - Level: 4
-        Time: 13000
+        Time: 9000
      - Level: 5
-        Time: 14000
-    AfterCastActDelay: 2000
+        Time: 10000
+    AfterCastActDelay: 1500
    Duration1: 100
    Duration2: 42000
-    Cooldown: 60000
-    FixedCastTime:
-      - Level: 1
-        Time: 1000
-      - Level: 2
-        Time: 1500
-      - Level: 3
-        Time: 2000
-      - Level: 4
-        Time: 2500
-      - Level: 5
-        Time: 3000
+    Cooldown: 20000
+    FixedCastTime: 2000
    Requires:
      SpCost:
        - Level: 1
-          Amount: 480
+          Amount: 70
        - Level: 2
-          Amount: 560
+          Amount: 90
        - Level: 3
-          Amount: 640
+          Amount: 110
        - Level: 4
-          Amount: 720
+          Amount: 130
        - Level: 5
-          Amount: 800
-      ItemCost:
-        - Item: Red_Gemstone
-          Amount: 2
+          Amount: 150
    Unit:
      Id: Dummyskill
      Range: 9
@@ -18607,7 +18676,7 @@ Body:
        Time: 5000
      - Level: 5
        Time: 6000
-    AfterCastActDelay: 1000
+    AfterCastActDelay: 500
    Duration1: 100
    Duration2:
      - Level: 1
@@ -18620,7 +18689,7 @@ Body:
        Time: 120000
      - Level: 5
        Time: 135000
-    Cooldown: 10000
+    Cooldown: 7000
    FixedCastTime: 2000
    Requires:
      SpCost:
@@ -18788,7 +18857,7 @@ Body:
  - Id: 2222
    Name: WL_SUMMONFB
    Description: Summon Fire Ball
-    MaxLevel: 5
+    MaxLevel: 2
    Type: Magic
    TargetType: Self
    DamageFlags:
@@ -18801,17 +18870,7 @@ Body:
        Reproduce: true
    CastCancel: true
    CastTime: 2000
-    Duration1:
-      - Level: 1
-        Time: 120000
-      - Level: 2
-        Time: 160000
-      - Level: 3
-        Time: 200000
-      - Level: 4
-        Time: 240000
-      - Level: 5
-        Time: 280000
+    Duration1: 280000
    FixedCastTime: -1
    Requires:
      SpCost:
@@ -18828,7 +18887,7 @@ Body:
  - Id: 2223
    Name: WL_SUMMONBL
    Description: Summon Lightning Ball
-    MaxLevel: 5
+    MaxLevel: 2
    Type: Magic
    TargetType: Self
    DamageFlags:
@@ -18841,17 +18900,7 @@ Body:
        Reproduce: true
    CastCancel: true
    CastTime: 2000
-    Duration1:
-      - Level: 1
-        Time: 120000
-      - Level: 2
-        Time: 160000
-      - Level: 3
-        Time: 200000
-      - Level: 4
-        Time: 240000
-      - Level: 5
-        Time: 280000
+    Duration1: 280000
    FixedCastTime: -1
    Requires:
      SpCost:
@@ -18868,7 +18917,7 @@ Body:
  - Id: 2224
    Name: WL_SUMMONWB
    Description: Summon Water Ball
-    MaxLevel: 5
+    MaxLevel: 2
    Type: Magic
    TargetType: Self
    DamageFlags:
@@ -18881,17 +18930,7 @@ Body:
        Reproduce: true
    CastCancel: true
    CastTime: 2000
-    Duration1:
-      - Level: 1
-        Time: 120000
-      - Level: 2
-        Time: 160000
-      - Level: 3
-        Time: 200000
-      - Level: 4
-        Time: 240000
-      - Level: 5
-        Time: 280000
+    Duration1: 280000
    FixedCastTime: -1
    Requires:
      SpCost:
@@ -18972,7 +19011,7 @@ Body:
  - Id: 2229
    Name: WL_SUMMONSTONE
    Description: Summon Stone
-    MaxLevel: 5
+    MaxLevel: 2
    Type: Magic
    TargetType: Self
    DamageFlags:
@@ -18985,17 +19024,7 @@ Body:
        Reproduce: true
    CastCancel: true
    CastTime: 2000
-    Duration1:
-      - Level: 1
-        Time: 120000
-      - Level: 2
-        Time: 160000
-      - Level: 3
-        Time: 200000
-      - Level: 4
-        Time: 240000
-      - Level: 5
-        Time: 280000
+    Duration1: 280000
    FixedCastTime: -1
    Requires:
      SpCost:
@@ -19031,19 +19060,7 @@ Body:
    Name: WL_READING_SB
    Description: Reading Spellbook
    MaxLevel: 1
-    Type: Magic
-    TargetType: Self
-    DamageFlags:
-      NoDamage: true
-    Hit: Single
-    HitCount: 1
-    CastCancel: true
-    CastTime: 5000
-    AfterCastActDelay: 500
    Duration1: 30000
-    FixedCastTime: 1000
-    Requires:
-      SpCost: 40
  - Id: 2232
    Name: WL_FREEZE_SP
    Description: Freeze Spell
@@ -19601,25 +19618,25 @@ Body:
    Element: Holy
    SplashArea:
      - Level: 1
-        Area: 1
+        Area: 3
      - Level: 2
-        Area: 1
+        Area: 3
      - Level: 3
-        Area: 1
+        Area: 3
      - Level: 4
-        Area: 1
+        Area: 3
      - Level: 5
-        Area: 1
+        Area: 3
      - Level: 6
-        Area: 1
+        Area: 3
      - Level: 7
-        Area: 2
+        Area: 5
      - Level: 8
-        Area: 2
+        Area: 5
      - Level: 9
-        Area: 2
+        Area: 5
      - Level: 10
-        Area: 2
+        Area: 5
    CopyFlags:
      Skill:
        Reproduce: true
@@ -24328,6 +24345,16 @@ Body:
          Amount: 1
        - Level: 5
          Amount: 1
+        - Level: 6
+          Amount: 0
+        - Level: 7
+          Amount: 0
+        - Level: 8
+          Amount: 0
+        - Level: 9
+          Amount: 0
+        - Level: 10
+          Amount: 0
  - Id: 2337
    Name: SR_WINDMILL
    Description: Windmill
@@ -28776,7 +28803,7 @@ Body:
        Revolver: true
      Ammo:
        Bullet: true
-      AmmoAmount: 10
+      AmmoAmount: 3
  - Id: 2562
    Name: RL_H_MINE
    Description: Howling Mine
@@ -33447,6 +33474,14 @@ Body:
    Name: NV_TRANSCENDENCE
    Description: Transcendence
    MaxLevel: 5
+  - Id: 5078
+    Name: WL_READING_SB_READING
+    Description: Reading Spellbook
+    MaxLevel: 10
+    TargetType: Self
+    CastTime: 5000
+    AfterCastActDelay: 500
+    FixedCastTime: 1000
  - Id: 8001
    Name: HLIF_HEAL
    Description: Healing Touch
--- a/db/re/skill_tree.txt
+++ b/db/re/skill_tree.txt
@@ -2492,10 +2492,10 @@
 4055,2214,5,2223,1,0,0,0,0,0,0,0,0 //WL_CHAINLIGHTNING#Chain Lightning#
 4055,2216,5,2207,2,0,0,0,0,0,0,0,0 //WL_EARTHSTRAIN#Earth Strain#
 4055,2217,10,2204,5,2212,5,2214,5,2216,5,0,0 //WL_TETRAVORTEX#Tetra Vortex#
-4055,2222,5,83,1,0,0,0,0,0,0,0,0 //WL_SUMMONFB#Summon Fire Ball#
-4055,2223,5,85,1,0,0,0,0,0,0,0,0 //WL_SUMMONBL#Summon Lightning Ball#
-4055,2224,5,89,1,0,0,0,0,0,0,0,0 //WL_SUMMONWB#Summon Water Ball#
-4055,2229,5,91,1,0,0,0,0,0,0,0,0 //WL_SUMMONSTONE#Summon Stone#
+4055,2222,2,83,1,0,0,0,0,0,0,0,0 //WL_SUMMONFB#Summon Fire Ball#
+4055,2223,2,85,1,0,0,0,0,0,0,0,0 //WL_SUMMONBL#Summon Lightning Ball#
+4055,2224,2,89,1,0,0,0,0,0,0,0,0 //WL_SUMMONWB#Summon Water Ball#
+4055,2229,2,91,1,0,0,0,0,0,0,0,0 //WL_SUMMONSTONE#Summon Stone#
 4055,2230,2,0,0,0,0,0,0,0,0,0,0 //WL_RELEASE#Release#
 4055,2231,1,0,0,0,0,0,0,0,0,0,0 //WL_READING_SB#Reading Spellbook#
 4055,2232,10,0,0,0,0,0,0,0,0,0,0 //WL_FREEZE_SP#Freeze Spell#
@@ -2833,10 +2833,10 @@
 4061,2214,5,2223,1,0,0,0,0,0,0,0,0 //WL_CHAINLIGHTNING#Chain Lightning#
 4061,2216,5,2207,2,0,0,0,0,0,0,0,0 //WL_EARTHSTRAIN#Earth Strain#
 4061,2217,10,2204,5,2212,5,2214,5,2216,5,0,0 //WL_TETRAVORTEX#Tetra Vortex#
-4061,2222,5,83,1,0,0,0,0,0,0,0,0 //WL_SUMMONFB#Summon Fire Ball#
-4061,2223,5,85,1,0,0,0,0,0,0,0,0 //WL_SUMMONBL#Summon Lightning Ball#
-4061,2224,5,89,1,0,0,0,0,0,0,0,0 //WL_SUMMONWB#Summon Water Ball#
-4061,2229,5,91,1,0,0,0,0,0,0,0,0 //WL_SUMMONSTONE#Summon Stone#
+4061,2222,2,83,1,0,0,0,0,0,0,0,0 //WL_SUMMONFB#Summon Fire Ball#
+4061,2223,2,85,1,0,0,0,0,0,0,0,0 //WL_SUMMONBL#Summon Lightning Ball#
+4061,2224,2,89,1,0,0,0,0,0,0,0,0 //WL_SUMMONWB#Summon Water Ball#
+4061,2229,2,91,1,0,0,0,0,0,0,0,0 //WL_SUMMONSTONE#Summon Stone#
 4061,2230,2,0,0,0,0,0,0,0,0,0,0 //WL_RELEASE#Release#
 4061,2231,1,0,0,0,0,0,0,0,0,0,0 //WL_READING_SB#Reading Spellbook#
 4061,2232,10,0,0,0,0,0,0,0,0,0,0 //WL_FREEZE_SP#Freeze Spell#
@@ -4500,10 +4500,10 @@
 4097,2214,5,2223,1,0,0,0,0,0,0,0,0 //WL_CHAINLIGHTNING#Chain Lightning#
 4097,2216,5,2207,2,0,0,0,0,0,0,0,0 //WL_EARTHSTRAIN#Earth Strain#
 4097,2217,10,2204,5,2212,5,2214,5,2216,5,0,0 //WL_TETRAVORTEX#Tetra Vortex#
-4097,2222,5,83,1,0,0,0,0,0,0,0,0 //WL_SUMMONFB#Summon Fire Ball#
-4097,2223,5,85,1,0,0,0,0,0,0,0,0 //WL_SUMMONBL#Summon Lightning Ball#
-4097,2224,5,89,1,0,0,0,0,0,0,0,0 //WL_SUMMONWB#Summon Water Ball#
-4097,2229,5,91,1,0,0,0,0,0,0,0,0 //WL_SUMMONSTONE#Summon Stone#
+4097,2222,2,83,1,0,0,0,0,0,0,0,0 //WL_SUMMONFB#Summon Fire Ball#
+4097,2223,2,85,1,0,0,0,0,0,0,0,0 //WL_SUMMONBL#Summon Lightning Ball#
+4097,2224,2,89,1,0,0,0,0,0,0,0,0 //WL_SUMMONWB#Summon Water Ball#
+4097,2229,2,91,1,0,0,0,0,0,0,0,0 //WL_SUMMONSTONE#Summon Stone#
 4097,2230,2,0,0,0,0,0,0,0,0,0,0 //WL_RELEASE#Release#
 4097,2231,1,0,0,0,0,0,0,0,0,0,0 //WL_READING_SB#Reading Spellbook#
 4097,2232,10,0,0,0,0,0,0,0,0,0,0 //WL_FREEZE_SP#Freeze Spell#
--- a/db/re/spellbook_db.yml
+++ b/db/re/spellbook_db.yml
@@ -32,54 +32,33 @@ Header:
  Version: 1

 Body:
-  - Skill: MG_COLDBOLT
-    Book: Magic_Book_CB
-    PreservePoints: 7
-  - Skill: MG_FIREBOLT
-    Book: Magic_Book_FB
-    PreservePoints: 7
-  - Skill: MG_LIGHTNINGBOLT
-    Book: Magic_Book_LB
-    PreservePoints: 7
-  - Skill: MG_THUNDERSTORM
-    Book: Magic_Book_TS
-    PreservePoints: 9
  - Skill: WZ_METEOR
-    Book: Magic_Book_MS
+    Book: WL_MB_MS
    PreservePoints: 10
-  - Skill: WZ_JUPITEL
-    Book: Magic_Book_JT
-    PreservePoints: 9
  - Skill: WZ_VERMILION
-    Book: Magic_Book_LOV
+    Book: WL_MB_LOV
    PreservePoints: 10
-  - Skill: WZ_WATERBALL
-    Book: Magic_Book_WB
-    PreservePoints: 9
  - Skill: WZ_STORMGUST
-    Book: Magic_Book_SG
+    Book: WL_MB_SG
+    PreservePoints: 10
+  - Skill: WL_JACKFROST
+    Book: WL_MB_JF
    PreservePoints: 10
-  - Skill: WZ_EARTHSPIKE
-    Book: Magic_Book_ES
-    PreservePoints: 8
-  - Skill: WZ_HEAVENDRIVE
-    Book: Magic_Book_HD
-    PreservePoints: 9
  - Skill: WL_DRAINLIFE
-    Book: Magic_Book_DL
+    Book: WL_MB_DL
    PreservePoints: 8
  - Skill: WL_CRIMSONROCK
-    Book: Magic_Book_CR
+    Book: WL_MB_CR
    PreservePoints: 12
  - Skill: WL_COMET
-    Book: Magic_Book_CM
+    Book: WL_MB_CM
    PreservePoints: 22
  - Skill: WL_CHAINLIGHTNING
-    Book: Magic_Book_CL
+    Book: WL_MB_CL
    PreservePoints: 12
  - Skill: WL_EARTHSTRAIN
-    Book: Magic_Book_ES_
+    Book: WL_MB_ES
    PreservePoints: 12
  - Skill: WL_TETRAVORTEX
-    Book: Magic_Book_TV
+    Book: WL_MB_TV
    PreservePoints: 22
--- a/doc/atcommands.txt
+++ b/doc/atcommands.txt
@@ -1360,7 +1360,7 @@ Affected files:
 -- atcommand: atcommand_athena.conf, groups.conf
 -- battleconf: battle_athena.conf, battle_conf.txt
 -- instancedb: instance_db.txt
-- itemdb: item_db.txt, item_group_db.txt, item_trade.txt, item_noequip.txt, item_nouse.txt, item_combo_db.txt, item_avail.txt, item_stack.txt, item_delay.txt, item_buyingstore.txt, item_flag.txt
+-- itemdb: item_db.txt, item_group_db.txt, item_trade.txt, item_noequip.txt, item_nouse.txt, item_combo_db.txt, item_avail.txt, item_stack.txt, item_delay.txt, item_buyingstore.txt, item_flag.txt, item_randomopt_db.txt, item_randomopt_group.txt
 -- mobdb: mob_db.txt, mob_item_ratio.txt, mob_chat_db.txt, mob_avail.txt, mob_race2_db.txt, mob_branch.txt, mob_poring.txt, mob_boss.txt, mob_pouch.txt, mob_classchange.txt, pet_db.yml, homunculus_db.txt, homun_skill_tree.txt, exp_homun.txt, mercenary_db.txt, mercenary_skill_db.txt, elemental_db.txt, elemental_skill_db.txt
 -- motd: motd.txt
 -- msgconf: atcommand_athena.conf
--- a/doc/item_bonus.txt
+++ b/doc/item_bonus.txt
@@ -171,6 +171,7 @@ bonus2 bSkillAtk,sk,n;    		Increases damage of skill sk by n%
 bonus bShortAtkRate,n;			Increases damage of short ranged attacks by n%
 bonus bLongAtkRate,n;     		Increases damage of long ranged attacks by n%
 bonus bCritAtkRate,n;     		Increases critical damage by +n%
+bonus bCritDefRate,n;			Decreases critical damage received by n%
 bonus bCriticalDef,n;     		Decreases the chance of being hit by critical hits by n%
 bonus2 bWeaponAtk,w,n;    		Adds n ATK when weapon of type w is equipped
 bonus2 bWeaponDamageRate,w,n;	Adds n% damage to normal attacks when weapon of type w is equipped
@@ -227,11 +228,13 @@ bonus3 bAddEle,e,x,bf;    		+x% physical damage against element e with trigger c
 bonus2 bMagicAddEle,e,x;  		+x% magical damage against element e
 bonus2 bSubEle,e,x;       		+x% damage reduction against attack element e
 bonus3 bSubEle,e,x,bf;    		+x% damage reduction against attack element e with trigger criteria bf
-bonus2 bSubDefEle,e,x;    		+x% damage reduction from enemy with defense element e
+bonus2 bSubDefEle,e,x;    		+x% physical damage reduction from enemy with defense element e
+bonus2 bMagicSubDefEle,e,x;		+x% magic damage reduction from enemy with defense element e

 bonus2 bAddRace,r,x;      		+x% physical damage against race r
 bonus2 bMagicAddRace,r,x; 		+x% magical damage against race r
 bonus2 bSubRace,r,x;      		+x% damage reduction against race r
+bonus3 bSubRace,r,x,bf;    		+x% damage reduction against race r with trigger criteria bf 

 bonus2 bAddClass,c,x;     		+x% physical damage against class c
 bonus2 bMagicAddClass,c,x;		+x% magical damage against class c
@@ -240,6 +243,7 @@ bonus2 bSubClass,c,x;     		+x% damage reduction against class c
 bonus2 bAddSize,s,x;      		+x% physical damage against size s
 bonus2 bMagicAddSize,s,x; 		+x% magical damage against size s
 bonus2 bSubSize,s,x;      		+x% damage reduction against size s
+bonus2 bMagicSubSize,s,x;      	+x% magic damage reduction against size s
 bonus bNoSizeFix;       		Ignores the size modifier when calculating damage

 bonus2 bAddDamageClass,mid,x;     	+x% physical damage against monster mid
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -1641,7 +1641,7 @@ S_CheckFull:

 Example 2: callsub used repeatedly, with different arguments
 // notice how the Zeny check/delete is reused, instead of copy-pasting for every warp
-	switch(select("Abyss Lake:Amatsu Dungeon:Anthell:Ayothaya Dungeon:Beacon Island, Pharos") {
+	switch(select("Abyss Lake:Amatsu Dungeon:Anthell:Ayothaya Dungeon:Beacon Island, Pharos")) {
 		case 1:	callsub S_DunWarp,"hu_fild05",192,207;
 		case 2:	callsub S_DunWarp,"ama_in02",119,181;
 		case 3:	callsub S_DunWarp,"moc_fild20",164,145;
@@ -2861,8 +2861,7 @@ number.
 This is the only function around where a parameter may be either a string or a
 number! If it's a number, it means that only the items with that item ID number
 will be counted. If it is a string, it is assumed to mean the 'english name'
-field from the item database. If you give it an empty string, or something that
-isn't found from the item database, it will count items number '512' (apples).
+field from the item database.

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

@@ -5060,18 +5059,19 @@ See 'getitem2' for an explanation of the expanded parameters.

 *countbound({<bound type>{,<char_id>}})

-This function will return the number of bounded items in the character's
-inventory, and sets an array @bound_items[] containing all item IDs of the
-counted items. If a bound type is specified, only those items will be counted.
+This function will return the number of different bounded items in the character's
+inventory, and sets the arrays @bound_items[] and @bound_amount[] containing all item IDs of the
+counted items and their respective amount. If a bound type is specified, only those items will be counted.

 For a list of bound types see 'getitembound'.

 Example:
-	mes "You currently have " + countbound() + " bounded items.";
+	.@total_type = countbound();
+	mes "You currently have " + .@total_type + " different type of bounded items.";
 	next;
 	mes "The list of bounded items include:";
-	for(.@i = 0; .@i < getarraysize(@bound_items); .@i++)
-		mes getitemname(@bound_items[.@i]);
+	for(.@i = 0; .@i < .@total_type; .@i++)
+		mes "x" + @bound_amount[.@i] + " " + getitemname(@bound_items[.@i]);
 	close;

 ---------------------------------------
@@ -5807,9 +5807,9 @@ Increase AGI Lv 5, and display appropriate effects.
 *npcskilleffect <skill id>,<number>,<x>,<y>;
 *npcskilleffect "<skill name>",<number>,<x>,<y>;

-This command behaves identically to 'skilleffect', however, the effect will not
-be centered on the invoking character's sprite, nor on the NPC sprite, if any,
-but will be centered at map coordinates given on the same map as the invoking
+This command behaves identically to 'skilleffect', however, ground type skill
+effects will be centered at the map coordinates given on the same map as the
+attached character and all other skill types will be centered on the attached
 character.

 ---------------------------------------
@@ -6863,9 +6863,6 @@ given amount of seconds passes, the script resumes. The color format
 is in RGB (RRGGBB). The color is currently ignored by the client and
 appears always green.

-Note: If a player is attached to the NPC, they are detached from the NPC
-as soon as the progress bar activates.
-
 ---------------------------------------
 //
 5,1.- End of time-related commands
@@ -7977,6 +7974,20 @@ Returns "Unknown" if unit is not found.

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

+*setunittitle <GID>,<title>;
+
+Apply a <title> to the given <GID>.
+
+Note: This only works on non-player types. It also will only work on mobs if battle_config.show_mob_info is not enabled.
+
+---------------------------------------
+
+*getunittitle <GID>;
+
+Returns the title of the given <GID>.
+
+---------------------------------------
+
 *getunitdata <GID>,<arrayname>;
 *setunitdata <GID>,<parameter>,<new value>;

@@ -8043,6 +8054,7 @@ Parameters (indexes) for monsters are:
 	UMOB_TARGETID
 	UMOB_ROBE
 	UMOB_BODY2
+	UMOB_GROUP_ID

 -----

@@ -8087,6 +8099,7 @@ Parameter (indexes) for homunculi are:
 	UHOM_ADELAY
 	UHOM_DMOTION
 	UHOM_TARGETID
+	UHOM_GROUP_ID

 -----

@@ -8128,6 +8141,7 @@ Parameter (indexes) for pets are:
 	UPET_AMOTION
 	UPET_ADELAY
 	UPET_DMOTION
+	UPET_GROUP_ID

 -----

@@ -8169,6 +8183,7 @@ Parameter (indexes) for mercenaries are:
 	UMER_ADELAY
 	UMER_DMOTION
 	UMER_TARGETID
+	UMER_GROUP_ID

 -----

@@ -8212,6 +8227,7 @@ Parameter (indexes) for elementals are:
 	UELE_ADELAY
 	UELE_DMOTION
 	UELE_TARGETID
+	UELE_GROUP_ID

 -----

@@ -8261,6 +8277,7 @@ Parameter (indexes) for NPCs are:
 	UNPC_ROBE
 	UNPC_BODY2
 	UNPC_DEADSIT
+	UNPC_GROUP_ID

 *Notes:
 		- *_SIZE: small (0); medium (1); large (2)
@@ -8530,6 +8547,8 @@ Valid types are:
 		if = 10000, then this item is sold in NPC shops only
 	4 - sex; 5 - equip; 6 - weight; 7 - atk; 8 - def; 9 - range;
 	10 - slot; 11 - look; 12 - elv; 13 - wlv; 14 - view id
+	15 - eLVMax
+	16 - matk if RENEWAL is defined

 Example:
 	setiteminfo 7049,6,9990; // Stone now weighs 999.0
--- a/doc/yaml/db/quest_db.yml
+++ b/doc/yaml/db/quest_db.yml
@@ -13,8 +13,18 @@
 #                   Specify without "+" for the exact time the quest expires using "d" (optionnal), [0-23]"h" (required), [0-59]"mn" (optionnal), [0-59]"s" (optionnal) format.
 #                   Please note the number before "d" only shift the exact timer to the given day(s).
 #   Targets:        Quest objective target. (Default: null)
-#     - Mob         Monster to kill.
-#       Count       Amount of monsters to kill.
+#                   The target can be a couple of node Mob/Count or of Id/Race/Size/Element/MinLevel/MaxLevel.
+#                   If Mob is supplied, Count is required and the other fields are ignored.
+#                   If Id is supplied, at least one other field of Race/Size/Element/MinLevel/MaxLevel is required.
+#                   If Id is supplied, Count is required for each new entry.
+#     - Mob         Monster to kill (aegis monster name).
+#       Count       Amount of monsters to kill. Set to 0 to skip the target on import.
+#       Id          Unique target index for the quest Id. Requires a positive number.
+#       Race        Monster race target (default All). Valids race are Angel, Brute, DemiHuman, Demon, Dragon, Fish, Formless, Insect, Plant, Undead, All.
+#       Size        Monster size target (default All). Valids size are Small, Medium, Large, All.
+#       Element     Monster element target (default All). Valids elements are Dark, Earth, Fire, Ghost, Holy, Neutral, Poison, Undead, Water, Wind, All.
+#       MinLevel    Minimum monster level target. If not supplied but MaxLevel defined, MinLevel is 1. Set to 0 to ignore MinLevel on import. (Default: 0)
+#       MaxLevel    Maximum monster level target. Set to 0 to ignore MaxLevel on import. (Default: 0)
 #   Drops:          Quest item drop targets. (Default: null)
 #     - Mob         Monster to kill. 0 will apply to all monsters. (Default: 0)
 #       Item        Item to drop.
--- a/npc/custom/woe_controller.txt
+++ b/npc/custom/woe_controller.txt
@@ -62,13 +62,16 @@ OnInit:
 //  [2] Mail all rewards.
 //      - If not set, players receive items in their inventory.
 //      - Only ONE item can be sent via mail for PACKETVER < 20150513 while later clients are limited to MAIL_MAX_ITEM (5).
-//      - Note that offline players do NOT receive rewards.
+//      - If this setting is not set, offline players do NOT receive rewards in any case.
 //  [4] Only reward Guild Masters.
 //      - If not set, all guild members are rewarded.
 //      - If mailing is enabled (option 2), offline Guild Masters WILL receive rewards.
 //  [8] Duplicate IP check.
 //      - Members in a guild with the same IP address are not rewarded.
 //      - If Guild Masters is enabled (option 4), this feature is not used.
+//  [16] Mail online player only.
+//      - Only available when mailing is enabled (option 2).
+//      - When enabled, offline players do NOT receive rewards.
 // -----------------------------------------------------------

 	// Combine values as needed (e.g. 1|8 = 1+8 = 9).
@@ -313,23 +316,26 @@ OnReward:
 				.@size_guild = .@k;
 			}
 			for(set .@j,0; .@j<.@size_guild; set .@j,.@j+1) {
+				.@online = isloggedin(.@aid[.@j],.@cid[.@j]);
 				if (.Options&2) {
-					.@charid = .@cid[.@j];
-					.@sender$ = "no-reply";
-					.@title$ = "** Siege Reward: "+getcastlename(.Castles$[.@i])+" **";
-					.@body$ = "Brave one,\r\n \r\n Congratulations!\r\n Your guild has successfully occupied\r\n territory in the War of Emperium on\r\n "+.@str$+".\r\n \r\n \r\n \r\n \r\n [ Your reward is attached. ]";
+					if (.@online || !(.Options&16)) {
+						.@charid = .@cid[.@j];
+						.@sender$ = "no-reply";
+						.@title$ = "** Siege Reward: "+getcastlename(.Castles$[.@i])+" **";
+						.@body$ = "Brave one,\r\n \r\n Congratulations!\r\n Your guild has successfully occupied\r\n territory in the War of Emperium on\r\n "+.@str$+".\r\n \r\n \r\n \r\n \r\n [ Your reward is attached. ]";

-					if (.reward_id_size)
-						mail .@charid, .@sender$, .@title$, .@body$, .reward_zeny, .reward_id, .reward_amount;
-					else
-						mail .@charid, .@sender$, .@title$, .@body$, .reward_zeny;
+						if (.reward_id_size)
+							mail .@charid, .@sender$, .@title$, .@body$, .reward_zeny, .reward_id, .reward_amount;
+						else
+							mail .@charid, .@sender$, .@title$, .@body$, .reward_zeny;

-					if (PACKETVER < 20150513 && !getd(".@str_"+.@cid[.@j]) && isloggedin(.@aid[.@j],.@cid[.@j])) {
-						setd ".@str_"+.@cid[.@j],1;
-						message rid2name(.@aid[.@j]),"You've got mail!";
+						if (PACKETVER < 20150513 && !getd(".@str_"+.@cid[.@j]) && .@online) {
+							setd ".@str_"+.@cid[.@j],1;
+							message rid2name(.@aid[.@j]),"You've got mail!";
+						}
 					}
 				}
-				else if (isloggedin(.@aid[.@j],.@cid[.@j])) {
+				else if (.@online) {
 					attachrid( .@aid[.@j], true );
 					.@name$ = strcharinfo( 0 );
 					.@castle_name$ = getcastlename(.Castles$[.@i]);
--- a/npc/instances/SealedShrine.txt
+++ b/npc/instances/SealedShrine.txt
@@ -225,7 +225,7 @@ monk_test,306,151,3	script	Grave of Baphomet#edq	111,{
 			close;
 		case IE_OK:
 			mapannounce "monk_test","[" + strcharinfo(0) + "] member of the [" + getpartyname(.@party_id) + "] party has entered the Sealed Shrine.",bc_map,"0x00ff99";
-			setquest 3040;
+			if (checkre(RENEWAL)) setquest 3040;
 			//warp "1@cata",100,224;
 			close;
 		}
@@ -1147,6 +1147,7 @@ OnInstanceInit:
 2@cata,80,63,4	script	Ancient Hero's Soul#2F	411,{
 	cutin "ins_cata_champ_s",2;
 	if (checkquest(3041)>=0) erasequest 3041;
+	if (!checkre(RENEWAL)) setquest 3040;
 	mes "[Ancient Hero's Soul]";
 	mes "Good job, my descendants... You've finished the long-cherished task that me and my bretheren could not complete.";
 	next;
--- a/npc/jobs/2-1/assassin.txt
+++ b/npc/jobs/2-1/assassin.txt
@@ -1102,7 +1102,8 @@ in_moc_16,21,165,2	script	Standby Room#ASNTEST	725,{
 	end;

 OnInit:
-	disablenpc "Standby Room#ASNTEST";
+	//disablenpc "Standby Room#ASNTEST";
+	hideonnpc "Standby Room#ASNTEST";
 	waitingroom "Standby Room",10,"Standby Room#ASNTEST::OnStartArena",1;
 	enablewaitingroomevent;
 	end;
--- a/npc/jobs/2-1/knight.txt
+++ b/npc/jobs/2-1/knight.txt
@@ -1227,7 +1227,8 @@ job_knt,89,106,4	script	Windsor Benedict#knt	733,{
 	end;

 OnInit:
-	disablenpc "Windsor Benedict#knt";
+	//disablenpc  "Windsor Benedict#knt";
+	hideonnpc "Windsor Benedict#knt";
 	waitingroom "Waiting Room",20,"Windsor Benedict#knt::OnStartArena",1;
 	enablewaitingroomevent;
 	end;
--- a/npc/jobs/2-1/priest.txt
+++ b/npc/jobs/2-1/priest.txt
@@ -946,7 +946,8 @@ job_prist,24,187,4	script	Peter S. Alberto	110,{
 			mes "Now...";
 			mes "Go for it!";
 			close2;
-			changequest 8011,8012;
+			if(checkquest(8012) == -1)
+				changequest 8011,8012;
 			warp "job_prist",24,44;
 			donpcevent "Zombie_Generator#prst::OnEnable";
 			donpcevent "Peter S. Alberto::OnDisable";
--- a/npc/jobs/2-2/crusader.txt
+++ b/npc/jobs/2-2/crusader.txt
@@ -1228,7 +1228,8 @@ job_cru,24,187,2	script	Waiting Room#cr1	700,{
 	end;

 OnInit:
-	disablenpc "Waiting Room#cr1";
+	//disablenpc  "Waiting Room#cr1";
+	hideonnpc "Waiting Room#cr1";
 	waitingroom "Waiting Room",20,"Waiting Room#cr1::OnStartArena",1;
 	enablewaitingroomevent;
 	end;
--- a/npc/jobs/2-2/sage.txt
+++ b/npc/jobs/2-2/sage.txt
@@ -2563,7 +2563,8 @@ job_sage,50,165,4	script	Waiting Room#sg	700,{
 	end;

 OnInit:
-	disablenpc "Waiting Room#sg";
+	//disablenpc  "Waiting Room#sg";
+	hideonnpc "Waiting Room#sg";
 	waitingroom "Waiting Room",20,"Waiting Room#sg::OnStartArena",1;
 	enablewaitingroomevent;
 	end;
--- a/npc/other/monster_race.txt
+++ b/npc/other/monster_race.txt
@@ -1208,7 +1208,7 @@ hugel,62,69,1	script	Eckar Erenes#double	798,{
 			close;
 		}
 	}
-	if (!$@mon_time_2_2) {
+	if ($@mon_time_2_2 == 1) {
 		mes "[Eckar Erenes]";
 		mes "Right now, a Monster Race";
 		mes "is in progress. It's too late to place a wager, but if you'd like";
--- a/npc/quests/counteragent_mixture.txt
+++ b/npc/quests/counteragent_mixture.txt
@@ -4,7 +4,7 @@
 //= kobra_k88
 //= added some dialogs for Morgenstein by Komurka
 //===== Current Version: ===================================== 
-//= 2.2b
+//= 2.2c
 //===== Compatible With: ===================================== 
 //= rAthena Project
 //===== Description: ========================================= 
@@ -14,6 +14,7 @@
 //= 2.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //= 2.2a A few minor fixes. (bugreport:1122) [L0ne_W0lf]
 //= 2.2b Follow up fixes to bugreport:1122 [L0ne_W0lf]
+//= 2.2c NPC name typo fix [Everade]
 //============================================================ 

 alberta_in,133,55,3	script	Louitz#cm	84,{
@@ -24,7 +25,7 @@ alberta_in,133,55,3	script	Louitz#cm	84,{
 		mes "that nutcase scientist";
 		mes "who lives over in Geffen?";
 		next;
-		if (select("Talk About Molgenstein:Cancel") == 1) {
+		if (select("Talk About Morgenstein:Cancel") == 1) {
 			mes "[Merchant Louitz]";
 			mes "You know where he lives";
 			mes "but didn't check it out? Hey,";
@@ -103,7 +104,7 @@ alberta_in,133,55,3	script	Louitz#cm	84,{
 			mes "I don't remember exactly";
 			mes "where he lives, but I know";
 			mes "he's in Geffen and that his";
-			mes "name is ^0000FFMolgenstein^000000.";
+			mes "name is ^0000FFMorgenstein^000000.";
 			next;
 			mes "[Merchant Louitz]";
 			mes "Hmm... You better";
@@ -111,7 +112,7 @@ alberta_in,133,55,3	script	Louitz#cm	84,{
 			mes "around first. I know for";
 			mes "ask around first. I know for";
 			mes "sure that somebody knows";
-			mes "where you can find Molgenstein.";
+			mes "where you can find Morgenstein.";
 			close;
 		case 3:
 			mes "[Merchant Louitz]";
@@ -173,7 +174,7 @@ alberta_in,133,55,3	script	Louitz#cm	84,{
 			mes "I don't remember exactly";
 			mes "where he lives, but I know";
 			mes "he's in Geffen and that his";
-			mes "name is ^0000FFMolgenstein^000000.";
+			mes "name is ^0000FFMorgenstein^000000.";
 			next;
 			mes "[Merchant Louitz]";
 			mes "Hmm... You better";
@@ -181,7 +182,7 @@ alberta_in,133,55,3	script	Louitz#cm	84,{
 			mes "around first. I know for";
 			mes "ask around first. I know for";
 			mes "sure that somebody knows";
-			mes "where you can find Molgenstein.";
+			mes "where you can find Morgenstein.";
 			close;
 		case 3:
 			mes "[Merchant Louitz]";
@@ -243,7 +244,7 @@ alberta_in,133,55,3	script	Louitz#cm	84,{
 			mes "I don't remember exactly";
 			mes "where he lives, but I know";
 			mes "he's in Geffen and that his";
-			mes "name is ^0000FFMolgenstein^000000.";
+			mes "name is ^0000FFMorgenstein^000000.";
 			next;
 			mes "[Merchant Louitz]";
 			mes "Hmm... You better";
@@ -251,7 +252,7 @@ alberta_in,133,55,3	script	Louitz#cm	84,{
 			mes "around first. I know for";
 			mes "ask around first. I know for";
 			mes "sure that somebody knows";
-			mes "where you can find Molgenstein.";
+			mes "where you can find Morgenstein.";
 			close;
 		case 3:
 			mes "[Merchant Louitz]";
@@ -313,10 +314,10 @@ geffen,181,114,3	script	Aure Dupon#cm	82,{
 		mes "Coincidence? It's more";
 		mes "than that. This is ^0000FFfate^000000.";
 		next;
-		if (select("Talk About Molgenstein:Cancel") == 1) {
+		if (select("Talk About Morgenstein:Cancel") == 1) {
 			mes "[Aure Dupon]";
 			mes "Have you not met";
-			mes "Molgenstein yet? He";
+			mes "Morgenstein yet? He";
 			mes "lives on the second floor";
 			mes "of the Forge. Although we've";
 			mes "just met, I must warn you not";
@@ -339,7 +340,7 @@ geffen,181,114,3	script	Aure Dupon#cm	82,{
 	mes "mote in the grand scheme.";
 	next;
 	if (molgenstain > 0) {
-		switch(select("Talk:Ask About Molgenstein:Cancel")) {
+		switch(select("Talk:Ask About Morgenstein:Cancel")) {
 		case 1:
 			mes "[Aure Dupon]";
 			mes "To have goals and focus";
@@ -352,7 +353,7 @@ geffen,181,114,3	script	Aure Dupon#cm	82,{
 		case 2:
 			set molgenstain,2;
 			mes "[Aure Dupon]";
-			mes "Molgenstein...?";
+			mes "Morgenstein...?";
 			mes "The man is obsessed";
 			mes "with conquering the forces";
 			mes "that control our world. But";
@@ -361,7 +362,7 @@ geffen,181,114,3	script	Aure Dupon#cm	82,{
 			next;
 			mes "[Aure Dupon]";
 			mes "It would be best if you";
-			mes "were to see Molgenstein";
+			mes "were to see Morgenstein";
 			mes "and judge his character for";
 			mes "yourself. You may find him in";
 			mes "the second floor of the Geffen";
@@ -394,7 +395,7 @@ geffen,181,114,3	script	Aure Dupon#cm	82,{
 	close;
 }

-geffen_in,141,140,3	script	Molgenstein#cm	121,{
+geffen_in,141,140,3	script	Morgenstein#cm	121,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -404,7 +405,7 @@ geffen_in,141,140,3	script	Molgenstein#cm	121,{
 		close;
 	}
 	if (MISC_QUEST & 4) {
-		mes "[Chemist Molgenstein]";
+		mes "[Chemist Morgenstein]";
 		mes ".....";
 		mes "Welcome.";
 		mes "Hehehehe....";
@@ -412,59 +413,59 @@ geffen_in,141,140,3	script	Molgenstein#cm	121,{
 		next;
 		switch(select("Ask about his research:Ask him to make a new solution.:Cancel")) {
 		case 1:
-			mes "[Chemist Molgenstein]";
+			mes "[Chemist Morgenstein]";
 			mes "Heeheeheeheee...";
 			mes "You must have heard the rumors about my research. Yes! But since you probably know already, I'll tell you without hiding, I mean, there's nothing to hide.";
 			next;
-			mes "[Chemist Molgenstein]";
+			mes "[Chemist Morgenstein]";
 			mes "Actually, you can say my research is complete! Nothing's impossible for my genius! Bwahaha, it's just a matter of time!";
 			next;
-			mes "[Chemist Molgenstein]";
+			mes "[Chemist Morgenstein]";
 			mes "Are you still here? Right, you wanted to know about my research. It's actually very simple. I was just trying to invent a super liquid that can melt everything!";
 			next;
-			mes "[Chemist Molgenstein]";
+			mes "[Chemist Morgenstein]";
 			mes "Isn't it interesting? No matter how strong you are, you can't break apart stone or steel, but with my new liquid, you can melt those things, making them soft like puddy!";
 			next;
-			mes "[Chemist Molgenstein]";
+			mes "[Chemist Morgenstein]";
 			mes "It can't melt everything yet, but I did find that you could combine things that you could never mix before with my invention. Heeheeheehee~!";
 			next;
-			mes "[Chemist Molgenstein]";
+			mes "[Chemist Morgenstein]";
 			mes "You can make a whole lot of things that you'd never would have imagined possible! I can make you a lot of new things you never would have imagined using this method... as long as you want it!!";
 			next;
-			mes "[Chemist Molgenstein]";
+			mes "[Chemist Morgenstein]";
 			mes "The endorphins are rushing to my face at least 2.1 times faster than the usual rate! Ah! I'm so excited! I... I just can't hide it!";
 			close;
 		case 2:
-			mes "[Chemist Molgenstein]";
+			mes "[Chemist Morgenstein]";
 			mes "So...";
 			mes "You want me to make something totally new, huh? Hehhehheh! I love your sense of scientific adventure!";
 			next;
 			switch(select("Counteragent:Mixture")) {
 			case 1:
-				mes "[Chemist Molgenstein]";
+				mes "[Chemist Morgenstein]";
 				mes "Ooh...!";
 				mes "You want to make a Counteragent? Hohohohoho, let's see what we'll need...";
 				next;
-				mes "[Chemist Molgenstein]";
+				mes "[Chemist Morgenstein]";
 				mes "Oh, I remember, yes, Alcohol, and um, er, Detrimindexta and an Empty Bottle to put it it all in. Just these three items and 3000 zeny.";
 				next;
-				mes "[Chemist Molgenstein]";
+				mes "[Chemist Morgenstein]";
 				mes "Bwahahahah!";
 				mes "Oh, I just can't wait to make this! Are you ready to begin?";
 				next;
 				if (select("Make:Cancel") == 1) {
 					if (countitem(970) == 0 || countitem(971) == 0 || countitem(713) == 0 || Zeny < 3000) {
-						mes "[Chemist Molgenstein]";
+						mes "[Chemist Morgenstein]";
 						mes "Heuheuheuheuh.... not enough... not enough.. Haah...Haah... Go..... get the rest of the materials!";
 						mes "We'll postpone the fun until then... Heuheuheuheuheuh.";
 						close;
 					}
-					mes "[Chemist Molgenstein]";
+					mes "[Chemist Morgenstein]";
 					mes "Ooooooooh...... heeheeheeheehee...... yes... like that...... yes... more... more........ heeheeheehee.";
 					mes ".... Aaah.... ahah... ha....ahahooooooooohoh!";
 					next;
 					if (countitem(970) < 1 || countitem(971) < 1 || countitem(713) < 1) {
-						mes "[Chemist Molgenstein]";
+						mes "[Chemist Morgenstein]";
 						mes "Hohohoho.... not enough... not enough... haah...haah... go..... go get the rest of the materials!!";
 						close;
 					}
@@ -473,42 +474,42 @@ geffen_in,141,140,3	script	Molgenstein#cm	121,{
 					delitem 713,1; //Empty_Bottle
 					set Zeny, Zeny-3000;
 					getitem 973,1; //Counteragent
-					mes "[Chemist Molgenstein]";
+					mes "[Chemist Morgenstein]";
 					mes "Hee hee hee...";
 					mes "Haaaaah......";
 					mes "Oh? We're done already?!";
 					close;
 				}
-				mes "[Chemist Molgenstein]";
+				mes "[Chemist Morgenstein]";
 				mes "Hee hee hee...!";
 				mes "Come back when";
 				mes "you're ready~";
 				close;
 			case 2:
-				mes "[Chemist Molgenstein]";
+				mes "[Chemist Morgenstein]";
 				mes "Ooh...!";
 				mes "You want to make a Mixture? Hohohohoho, let's see what we'll need...";
 				next;
-				mes "[Chemist Molgenstein]";
+				mes "[Chemist Morgenstein]";
 				mes "Ooh, I remember now, yes, Alcohol, and um, er, Karvodailnirol and an empty bottle to put all of it in. Just these three items and 4000 zeny.";
 				next;
-				mes "[Chemist Molgenstein]";
+				mes "[Chemist Morgenstein]";
 				mes "Bwahahahah!";
 				mes "Oh, I just can't wait to make this! Are you ready to begin?";
 				next;
 				if (select("Make:Cancel") == 1) {
 					if (countitem(970) == 0 || countitem(972) == 0 || countitem(713) == 0 || Zeny < 4000) {
-						mes "[Chemist Molgenstein]";
+						mes "[Chemist Morgenstein]";
 						mes "Hohohoho.... not enough... not enough... haah...haah... go..... go get the rest of the materials!!";
 						mes "We'll have to postpone the fun for later... Hehehehe";
 						close;
 					}
-					mes "[Chemist Molgenstein]";
+					mes "[Chemist Morgenstein]";
 					mes "Ooooooooh... heehee...... yes... like that...... yes... more... more........ heeheeheehee";
 					mes ".... Aaah.... ahah... ha....ahah...oooooooooooooooooh!!!...!!!!!!";
 					next;
 					if (countitem(970) < 1 || countitem(972) < 1 || countitem(713) < 1) {
-						mes "[Chemist Molgenstein]";
+						mes "[Chemist Morgenstein]";
 						mes "Hohohoho.... not enough... not enough... haah...haah... go..... go get the rest of the materials!!";
 						close;
 					}
@@ -517,14 +518,13 @@ geffen_in,141,140,3	script	Molgenstein#cm	121,{
 					delitem 713,1; //Empty_Bottle
 					set Zeny, Zeny-4000;
 					getitem 974,1; //Mixture
-					mes "[Chemist Molgenstein]";
+					mes "[Chemist Morgenstein]";
 					mes "Hee hee hee...";
 					mes "Haaaaah......";
 					mes "Oh? We're done already?!";
 					close;
 				}
-				mes "[Chemist Molgenstein]";
-				mes "[Chemist Molgenstein]";
+				mes "[Chemist Morgenstein]";
 				mes "Hee hee hee...!";
 				mes "Come back when";
 				mes "you're ready~";
@@ -532,7 +532,7 @@ geffen_in,141,140,3	script	Molgenstein#cm	121,{
 				close;
 			}
 		case 3:
-			mes "[Chemist Molgenstein]";
+			mes "[Chemist Morgenstein]";
 			mes "Heehee....heheheheh....";
 			close;
 		}
@@ -540,40 +540,40 @@ geffen_in,141,140,3	script	Molgenstein#cm	121,{
 	if (molgenstain == 2) {
 		set MISC_QUEST,MISC_QUEST | 4;
 		set molgenstain,0;
-		mes "[Chemist Molgenstein]";
+		mes "[Chemist Morgenstein]";
 		mes "Heeheeheehee.... welcome. Hehehehe.... heeheeheeheehee....";
 		next;
-		mes "[Chemist Molgenstein]";
+		mes "[Chemist Morgenstein]";
 		mes "Ah...?!";
 		mes "So sorry if I weirded you out. It's just... I haven't seen a living person in soooo long. So, er, what can I do for you??";
 		next;
 		if (select("Ask about his research.:Cancel.") == 1) {
-			mes "[Chemist Molgenstein]";
+			mes "[Chemist Morgenstein]";
 			mes "Heeheeheeheee...";
 			mes "You must have heard the rumors about my research. Yes! But since you probably know already, I'll tell you without hiding, I mean, there's nothing to hide.";
 			next;
-			mes "[Chemist Molgenstein]";
+			mes "[Chemist Morgenstein]";
 			mes "Actually, you can say my research is complete! Nothing's impossible for my genius! Bwahaha, it's just a matter of time!";
 			next;
-			mes "[Chemist Molgenstein]";
+			mes "[Chemist Morgenstein]";
 			mes "Are you still here? Right, you wanted to know about my research. It's actually very simple. I was just trying to invent a super liquid that can melt everything!";
 			next;
-			mes "[Chemist Molgenstein]";
+			mes "[Chemist Morgenstein]";
 			mes "Isn't it interesting? No matter how strong you are, you can't break apart stone or steel, but with my new liquid, you can melt those things, making them soft like puddy!";
 			next;
-			mes "[Chemist Molgenstein]";
+			mes "[Chemist Morgenstein]";
 			mes "It can't melt everything yet, but I did find that you could combine things that you could never mix before with my invention.";
 			next;
-			mes "[Chemist Molgenstein]";
+			mes "[Chemist Morgenstein]";
 			mes "I can make you a lot of new things you never would have imagined using this method... as long as you want it!!";
 			next;
-			mes "[Chemist Molgenstein]";
+			mes "[Chemist Morgenstein]";
 			mes "The endorphins are rushing to my face at least 2.1 times faster than the usual rate! Ah! I'm so excited! I... I just can't hide it!";
 			close;
 		}
 		close;
 	}
-	mes "[Chemist Molgenstein]";
+	mes "[Chemist Morgenstein]";
 	mes "Heeheeheehee...";
 	mes "You're not here to be a test subject, are you? Probably not though. Not since my little 'accident.' Heeheeheeee~!";
 	close;
--- a/npc/re/custom/lasagna/lasa_dun.txt
+++ b/npc/re/custom/lasagna/lasa_dun.txt
@@ -2,28 +2,30 @@
 //= Lasagna Dungeons Monsters Spawn Script
 //===== Changelogs: ==========================================
 //= 1.0 First Version. [Capuche]
+//= 1.1 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 //==================================================
 // lasa_dun01 - Dragon's Nest
 //==================================================
-lasa_dun01	monster	Trans Spore	3501,40
-lasa_dun01	monster	Scout Basilisk	3502,40
+lasa_dun01	monster	Trans Spore	3501,30
+lasa_dun01	monster	Scout Basilisk	3502,60
 lasa_dun01	boss_monster	Big Eggring	3505,1,3600000,1800000,1

 //==================================================
 // lasa_dun02 - Dragon's Nest
 //==================================================
-lasa_dun02	monster	Combat Basilisk	3503,40
-lasa_dun02	monster	Jungle Madragora	3506,40
+lasa_dun02	monster	Combat Basilisk	3503,60
+lasa_dun02	monster	Jungle Madragora	3506,30

 //==================================================
 // lasa_dun03 - Dragon's Nest
 //==================================================
-lasa_dun03	monster	Combat Basilisk	3504,80
-lasa_dun03	monster	Fruits Pom Spider	3507,80
+lasa_dun03	monster	Combat Basilisk	3504,110
+lasa_dun03	monster	Fruits Pom Spider	3507,60

 //==================================================
 // lasa_dun_q - Dragon's Nest
 //==================================================
-lasa_dun_q	monster	Scout Basilisk	3502,40
+lasa_dun_q	monster	Scout Basilisk	3502,70
+lasa_dun_q	monster	Trans Spore	3501,30
--- a/npc/re/custom/lasagna/lasa_fild.txt
+++ b/npc/re/custom/lasagna/lasa_fild.txt
@@ -2,6 +2,7 @@
 //= Lasagna Fild Monster Spawn Script
 //===== Changelogs: ==========================================
 //= 1.0 First Version. [Capuche]
+//= 1.1 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 //==================================================
@@ -18,7 +19,7 @@ lasa_fild01,140,365,15,15	monster	Red Plant	1078,5
 //==================================================
 // lasa_fild01 - Ravioli Forest
 //==================================================
-lasa_fild02,0,0	monster	Wild Hornet	3498,40
-lasa_fild02,0,0	monster	Sweet Roda Frog	3499,40
-lasa_fild02,0,0	monster	Hunter Desert Wolf	3500,40
-lasa_fild02,0,0	monster	Combat Basilisk	3502,5
+lasa_fild02,0,0	monster	Wild Hornet	3498,90
+lasa_fild02,0,0	monster	Sweet Roda Frog	3499,100
+lasa_fild02,0,0	monster	Hunter Desert Wolf	3500,100
+lasa_fild02,0,0	monster	Combat Basilisk	3502,10
--- a/npc/re/jobs/3-1/warlock.txt
+++ b/npc/re/jobs/3-1/warlock.txt
@@ -760,7 +760,8 @@ job3_war01,29,25,0	script	Ebein#WRR	437,{
 job3_war01,29,25,5	script	The chamber of magic#1	437,{
 	end;
 OnInit:
-	disablenpc "The chamber of magic#1";
+	//disablenpc  "The chamber of magic#1";
+	hideonnpc "The chamber of magic#1";
 	waitingroom "The chamber of magic",20,"The chamber of magic#1::OnStartArena",1;
 	enablewaitingroomevent;
 	end;
--- a/npc/re/kafras/cool_event_corp.txt
+++ b/npc/re/kafras/cool_event_corp.txt
@@ -0,0 +1,14 @@
+//===== rAthena Script =======================================
+//= Cool Event Corp. Staff
+//===== Description: =========================================
+//= Cool Event Corp. Staff (Save, Storage & Pushcart Service)
+//===== Changelogs: ==========================================
+//= 1.0 Added Verus. [Capuche]
+//============================================================ 
+
+verus04,121,243,4	script	Cool Event Corp Staff::CoolEventCorpStaffVerus	4_M_ZONDAMAN,{
+	callfunc "F_CoolEventCorp",
+		"Save:Use Storage::Rent a Pushcart::Cancel",
+		"in Verus","verus04",121,246;
+	end;
+}
--- a/npc/re/mapflag/nobranch.txt
+++ b/npc/re/mapflag/nobranch.txt
@@ -11,9 +11,13 @@
 //= 1.3 Added dali02 [Nova]
 //= 1.4 Added Nightmare Glastheim [Ridley8819]
 //= 1.5 Added WOE:TE maps [Cydh]
+//= 1.6 Added Para Market maps [mazvi]
 //============================================================

-// 3rd Class Job Maps & Paradise
+// Paradise Market =============
+paramk	mapflag	nobranch
+
+// 3rd Class Job Maps & Paradise 
 moc_para01	mapflag	nobranch
 job3_arch01	mapflag	nobranch
 job3_arch02	mapflag	nobranch
--- a/npc/re/mapflag/nomemo.txt
+++ b/npc/re/mapflag/nomemo.txt
@@ -9,8 +9,12 @@
 //= 1.2 Added dali, dali02 [Nova]
 //= 1.3 Added Nightmare Glastheim [Ridley8819]
 //= 1.4 Added GVG TE Maps. [Cydh]
+//= 1.5 Added Para Market maps [mazvi]
 //============================================================

+// Paradise Market =============
+paramk	mapflag	nomemo
+
 // Episode 13 ====================
 job3_arch01	mapflag	nomemo
 job3_arch02	mapflag	nomemo
--- a/npc/re/mapflag/nopenalty.txt
+++ b/npc/re/mapflag/nopenalty.txt
@@ -11,8 +11,12 @@
 //===== Additional Comments: ================================= 
 //= 1.0 Renewal split. [Euphy]
 //= 1.1 Added Izlude duplicates. [Euphy]
+//= 1.2 Added Para Market maps [mazvi]
 //============================================================

+// Paradise Market =============
+paramk	mapflag	nopenalty
+
 // Towns ====================
 brasilis	mapflag	nopenalty
 bra_in01	mapflag	nopenalty
--- a/npc/re/mapflag/nopvp.txt
+++ b/npc/re/mapflag/nopvp.txt
@@ -11,8 +11,12 @@
 //===== Additional Comments: ================================= 
 //= 1.0 Renewal split. [Euphy]
 //= 1.1 Added Izlude duplicates. [Euphy]
+//= 1.2 Added Para Market maps [mazvi]
 //============================================================

+// Paradise Market =============
+paramk	mapflag	pvp	off
+
 // Instances ===================
 1@mist	mapflag	pvp	off
 1@cash	mapflag	pvp	off
--- a/npc/re/mapflag/noteleport.txt
+++ b/npc/re/mapflag/noteleport.txt
@@ -12,8 +12,12 @@
 //= 1.0 Renewal split. [Euphy]
 //= 1.1 Added dali, dali02 [Nova]
 //= 1.2 Added WOE:TE maps [Cydh,Capuche]
+//= 1.3 Added Para Market maps [mazvi]
 //============================================================

+// Paradise Market =============
+paramk	mapflag	noteleport
+
 // Cities ========================
 moc_para01	mapflag	noteleport

--- a/npc/re/merchants/ticket_refiner.txt
+++ b/npc/re/merchants/ticket_refiner.txt
@@ -39,7 +39,7 @@ prontera,184,177,6	script	Refine Master	851,{
 			close;
 		case 2:
 			mes "[Refine Master]";
-			mes "Actully, I sometimes provide refine services for adventurers with a ^006400Refine Ticket^000000...";
+			mes "Actually, I sometimes provide refine services for adventurers with a ^006400Refine Ticket^000000...";
 			mes "Bye bye~!";
 			close;
 		}
--- a/npc/re/mobs/championmobs.txt
+++ b/npc/re/mobs/championmobs.txt
@@ -3,106 +3,111 @@
 //===== By: ==================================================
 //= nanakiwurtz
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.0 First version
+//= 1.1 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

-abbey02,0,0	monster	Swift Zombie Slaughter	2603,2,300000
-gl_prison,0,0	monster	Solid Zombie Prisoner	2604,2,300000
+abbey02,0,0	monster	Swift Zombie Slaughter	2603,3,300000
+gl_prison,0,0	monster	Solid Zombie Prisoner	2604,1,300000
 gld_dun04,0,0	monster	Zombie Master Ringleader	2605,2,300000
 pay_dun00,0,0	monster	Furious Zombie	2606,2,300000
 schg_dun01,0,0	monster	Elusive Zakudam	2607,2,300000
 prt_fild03,0,0	monster	Swift Yoyo	2608,2,300000
-ayo_fild02,0,0	monster	Solid Yoyo	2609,2,300000
-pay_fild06,0,0	monster	Wormtail Ringleader	2610,2,300000
-um_fild02,0,0	monster	Furious Wootan Fighter	2611,2,300000
+ayo_fild02,0,0	monster	Solid Yoyo	2609,1,300000
+pay_fild06,0,0	monster	Wormtail Ringleader	2610,3,300000
+um_fild02,0,0	monster	Furious Wootan Fighter	2611,1,300000
 mosk_dun01,0,0	monster	Elusive Wood Goblin	2612,2,300000
 moc_fild03,0,0	monster	Swift Wolf	2613,2,300000
 gl_step,0,0	monster	Solid Wind Ghost	2614,2,300000
+gef_dun03,0,0	monster	Solid Wind Ghost	2614,1,300000
 pay_fild01,0,0	monster	Willow Ringleader	2615,2,300000
-um_fild04,0,0	monster	Furious Wild Rose	2616,2,300000
+um_fild04,0,0	monster	Furious Wild Rose	2616,1,300000
 gon_dun03,0,0	monster	Elusive Evil Nymph	2617,2,300000
-gl_sew01,0,0	monster	Solid Whisper	2618,2,300000
+gl_sew01,0,0	monster	Solid Whisper	2618,1,300000
 treasure_n2,0,0	monster	Weak Skeleton Ringleader	2619,2,300000
 gl_cas02,0,0	monster	Furious Wanderer	2620,2,300000
 gefenia04,0,0	monster	Elusive Violy	2621,2,300000
 gefenia03,0,0	monster	Swift Violy	2622,2,300000
 gefenia02,0,0	monster	Solid Violy	2623,2,300000
 ein_fild04,0,0	monster	Venomous Ringleader	2624,2,300000
-juperos_01,0,0	monster	Furious Venatu	2625,2,300000
+juperos_01,0,0	monster	Furious Venatu	2625,3,300000
 mosk_dun03,0,0	monster	Elusive Vavayaga	2626,2,300000
 ra_san01,0,0	monster	Swift Vanberk	2627,2,300000
 iz_dun01,0,0	monster	Solid Vadon	2628,2,300000
 ein_fild02,0,0	monster	Ungoliant Ringleader	2629,2,300000
-bra_fild01,0,0	monster	Furious Toucan	2630,2,300000
+bra_fild01,0,0	monster	Furious Toucan	2630,3,300000
 ma_fild01,0,0	monster	Elusive Tiyanak	2631,2,300000
 prt_sewb4,0,0	monster	Solid Thief Bug	2632,2,300000
-prt_sewb3,0,0	monster	Thief Bug Ringleader	2633,2,300000
+prt_sewb3,0,0	monster	Thief Bug Ringleader	2633,3,300000
 prt_sewb2,0,0	monster	Furious Thief Bug	2634,2,300000
 beach_dun3,0,0	monster	Elusive Thara Frog	2635,2,300000
 ein_fild03,0,0	monster	Swift Teddy Bear	2636,2,300000
-man_fild03,0,0	monster	Solid Tatacho	2637,2,300000
+man_fild03,0,0	monster	Solid Tatacho	2637,1,300000
 mjo_dun01,0,0	monster	Tarou Ringleader	2638,2,300000
 ayo_dun02,0,0	monster	Furious Tamruan	2639,2,300000
 gl_sew03,0,0	monster	Elusive Sting	2640,2,300000
 lhz_fild02,0,0	monster	Swift Stem Worm	2641,2,300000
-moc_fild13,0,0	monster	Solid Steel Chonchon	2642,2,300000
+moc_fild13,0,0	monster	Solid Steel Chonchon	2642,3,300000
 ve_fild07,0,0	monster	Stapo Ringleader	2643,2,300000
 beach_dun2,0,0	monster	Furious Stalactic Golem	2644,2,300000
-prt_fild02,0,0	monster	Elusive Stainer	2645,2,300000
+prt_fild02,0,0	monster	Elusive Stainer	2645,3,300000
 treasure_n1,0,0	monster	Swift Spore	2646,2,300000
 tur_dun02,0,0	monster	Solid Solider	2647,2,300000
-pay_dun02,0,0	monster	Soldier Skeleton Ringleader	2648,2,300000
+pay_dun02,0,0	monster	Soldier Skeleton Ringleader	2648,3,300000
 pay_dun01,0,0	monster	Furious Soldier Skeleton	2649,2,300000
-tha_t09,0,0	monster	Elusive Lady Solace	2650,2,300000
+tha_t09,0,0	monster	Elusive Lady Solace	2650,2,300000	//--Remove after Thanatos Ravamped Patch
 pay_dun03,0,0	monster	Swift Sohee	2651,2,300000
 ice_dun02,0,0	monster	Solid Snowier	2652,2,300000
-pay_fild02,0,0	monster	Boa Ringleader	2653,2,300000
+pay_fild02,0,0	monster	Boa Ringleader	2653,3,300000
 ayo_fild01,0,0	monster	Furious Smokie	2654,2,300000
-yuno_fild06,0,0	monster	Elusive Sleeper	2655,2,300000
+yuno_fild06,0,0	monster	Elusive Sleeper	2655,1,300000
 yuno_fild02,0,0	monster	Swift Sleeper	2656,2,300000
-odin_tem02,0,0	monster	Solid Skogul	2657,2,300000
+odin_tem02,0,0	monster	Solid Skogul	2657,1,300000
 gld2_pay,0,0	monster	Skeleton General Ringleader	2658,2,300000
 gld_dun01_2,0,0	monster	Furious Skeleton General	2659,2,300000
 mjo_dun03,0,0	monster	Elusive Skeleton Worker	2660,2,300000
-ice_dun01,0,0	monster	Swift Siroma	2661,2,300000
-mosk_fild02,0,0	monster	Solid Side Winder	2662,2,300000
+ice_dun01,0,0	monster	Swift Siroma	2661,1,300000
+mosk_fild02,0,0	monster	Solid Side Winder	2662,1,300000
 mjolnir_03,0,0	monster	Side Winder Ringleader	2663,2,300000
 ama_dun03,0,0	monster	Furious Shinobi	2664,2,300000
-tha_t11,0,0	monster	Elusive Mistress of Shelter	2665,2,300000
-hu_fild06,0,0	monster	Swift Shellfish	2666,2,300000
-lhz_dun03,0,0	monster	Solid Cecil Damon	2667,2,300000
+tha_t11,0,0	monster	Elusive Mistress of Shelter	2665,2,300000	//--Remove after Thanatos Ravamped Patch
+hu_fild06,0,0	monster	Swift Shellfish	2666,1,300000
+lhz_dun03,0,0	monster	Solid Cecil Damon	2667,3,300000
 cmd_fild04,0,0	monster	Sea Otter Ringleader	2668,2,300000
 iz_dun05,0,0	monster	Furious Lamp Rey	2669,2,300000
-moc_fild18,0,0	monster	Elusive Scorpion	2670,2,300000
+moc_fild18,0,0	monster	Elusive Scorpion	2670,3,300000
 mjolnir_09,0,0	monster	Swift Savage Babe	2671,2,300000
 prt_maze01,0,0	monster	Solid Savage	2672,2,300000
-mjolnir_07,0,0	monster	Savage Ringleader	2673,2,300000
+mjolnir_07,0,0	monster	Savage Ringleader	2673,3,300000
 moc_fild16,0,0	monster	Furious Sandman	2674,2,300000
 thor_v03,0,0	monster	Elusive Salamander	2675,2,300000
-treasure01,0,0	monster	Swift Sailor Skeleton	2676,2,300000
+treasure02,0,0	monster	Swift Sailor Skeleton	2676,1,300000
 ra_fild12,0,0	monster	Solid Roween	2677,2,300000
 prt_fild00,0,0	monster	Roda Frog Ringleader	2678,2,300000
 gef_fild01,0,0	monster	Furious Roda Frog	2679,2,300000
 prt_fild07,0,0	monster	Elusive Rocker	2680,2,300000
 tha_t01,0,0	monster	Swift Rideword	2681,2,300000
+//tha_t01,0,0	monster	Swift Rideword	2681,1,300000	//--Applied after Thanatos Revamped Patch.
 c_tower1,0,0	monster	Solid Rideword	2682,2,300000
 gon_fild01,0,0	monster	Dumpling Child Ringleader	2683,2,300000
-tha_t10,0,0	monster	Furious Baroness of Retribution	2684,2,300000
+tha_t10,0,0	monster	Furious Baroness of Retribution	2684,2,300000	//--Remove after Thanatos Ravamped Patch
 tha_t08,0,0	monster	Elusive Baroness of Retribution	2685,2,300000
+//tha_t08,0,0	monster	Elusive Baroness of Retribution	2685,1,300000	//--Applied after Thanatos Revamped Patch.
 tha_t07,0,0	monster	Swift Baroness of Retribution	2686,2,300000
+//tha_t07,0,0	monster	Swift Baroness of Retribution	2686,1,300000	//--Applied after Thanatos Revamped Patch.
 in_sphinx2,0,0	monster	Solid Requiem	2687,2,300000
-lhz_dun01,0,0	monster	Remover Ringleader	2688,2,300000
+lhz_dun01,0,0	monster	Remover Ringleader	2688,3,300000
 mal_dun01,0,0	monster	Elusive Red Eruma	2689,2,300000
 gl_knt02,0,0	monster	Swift Raydric	2690,2,300000
 gl_knt01,0,0	monster	Solid Raydric	2691,2,300000
-lhz_dun02,0,0	monster	Laurell Weinder Ringleader	2692,2,300000
+lhz_dun02,0,0	monster	Laurell Weinder Ringleader	2692,3,300000
 dic_dun03,0,0	monster	Furious Rake Scaraba	2693,2,300000
 cmd_fild07,0,0	monster	Elusive Raggler	2694,2,300000
-lhz_fild01,0,0	monster	Swift Rafflesia	2695,2,300000
+lhz_fild01,0,0	monster	Swift Rafflesia	2695,3,300000
 lhz_fild01,0,0	monster	Poring Ringleader	2696,2,300000
 lhz_fild01,0,0	monster	Furious Poring	2697,2,300000
 lhz_fild01,0,0	monster	Elusive Poring	2698,2,300000
@@ -111,8 +116,8 @@ ein_fild09,0,0	monster	Solid Porcellio	2700,2,300000
 prt_maze03,0,0	monster	Poporing Ringleader	2701,2,300000
 prt_maze02,0,0	monster	Furious Poporing	2702,2,300000
 pay_fild04,0,0	monster	Elusive Poporing	2703,2,300000
-ama_dun02,0,0	monster	Swift Poison Toad	2704,2,300000
-mjolnir_06,0,0	monster	Solid Poison Spore	2705,2,300000
+ama_dun02,0,0	monster	Swift Poison Toad	2704,1,300000
+mjolnir_06,0,0	monster	Solid Poison Spore	2705,3,300000
 odin_tem03,0,0	monster	Plasma Ringleader	2706,2,300000
 iz_dun00,0,0	monster	Furious Plankton	2707,2,300000
 ein_dun01,0,0	monster	Elusive Pitman	2708,2,300000
@@ -127,13 +132,14 @@ treasure02,0,0	monster	Penomena Ringleader	2716,2,300000
 alde_dun03,0,0	monster	Furious Penomena	2717,2,300000
 moc_fild02,0,0	monster	Elusive Peco Peco	2718,2,300000
 in_sphinx5,0,0	monster	Swift Pasana	2719,2,300000
-um_fild03,0,0	monster	Solid Parasite	2720,2,300000
+um_fild03,0,0	monster	Solid Parasite	2720,1,300000
 tha_t05,0,0	monster	Owl Duke Ringleader	2721,2,300000
+//tha_t05,0,0	monster	Owl Duke Ringleader	2721,3,300000	//--Applied after Thanatos Revamped Patch.
 gef_fild10,0,0	monster	Furious Orc Warrior	2722,2,300000
 orcsdun01,0,0	monster	Elusive Orc Zombie	2723,2,300000
 orcsdun02,0,0	monster	Swift Orc Skeleton	2724,2,300000
-gef_fild03,0,0	monster	Solid Orc Lady	2725,2,300000
-tha_t12,0,0	monster	Dame of Sentinel Ringleader	2726,2,300000
+gef_fild03,0,0	monster	Solid Orc Lady	2725,3,300000
+tha_t12,0,0	monster	Dame of Sentinel Ringleader	2726,2,300000	//--Remove after Thanatos Ravamped Patch
 ein_fild05,0,0	monster	Furious Noxious	2727,2,300000
 hu_fild05,0,0	monster	Elusive Novus	2728,2,300000
 hu_fild04,0,0	monster	Swift Novus	2729,2,300000
@@ -148,15 +154,15 @@ xmas_dun02,0,0	monster	Furious Myst Case	2737,2,300000
 ve_fild04,0,0	monster	Elusive Muscipular	2738,2,300000
 moc_pryd03,0,0	monster	Swift Mummy	2739,2,300000
 moc_pryd02,0,0	monster	Solid Mummy	2740,2,300000
-moc_fild01,0,0	monster	Muka Ringleader	2741,2,300000
-moc_fild22,0,0	monster	Furious Incarnation of Morocc	2742,2,300000
+moc_fild01,0,0	monster	Muka Ringleader	2741,3,300000
+moc_fild22,0,0	monster	Furious Incarnation of Morocc	2742,3,300000
 moc_fild21,0,0	monster	Elusive Incarnation of Morocc	2743,2,300000
-moc_fild20,0,0	monster	Swift Incarnation of Morocc	2744,2,300000
+moc_fild20,0,0	monster	Swift Incarnation of Morocc	2744,1,300000
 ein_fild06,0,0	monster	Solid Holden	2745,2,300000
 ama_dun01,0,0	monster	Miyabi Doll Ringleader	2746,2,300000
 moc_prydn1,0,0	monster	Furious Minorous	2747,2,300000
 moc_pryd05,0,0	monster	Elusive Minorous	2748,2,300000
-in_sphinx4,0,0	monster	Swift Minorous	2749,2,300000
+in_sphinx4,0,0	monster	Swift Minorous	2749,1,300000
 ein_dun02,0,0	monster	Solid Mineral	2750,2,300000
 bif_fild01,0,0	monster	Miming Ringleader	2751,2,300000
 moc_prydn2,0,0	monster	Furious Mimic	2752,2,300000
@@ -165,63 +171,63 @@ cmd_fild09,0,0	monster	Swift Metaller	2754,2,300000
 ein_fild08,0,0	monster	Solid Metaling	2755,2,300000
 ein_fild07,0,0	monster	Metaling Ringleader	2756,2,300000
 iz_dun04,0,0	monster	Furious Merman	2757,2,300000
-ecl_fild01,0,0	monster	Elusive Menblatt	2758,2,300000
+ecl_fild01,0,0	monster	Elusive Menblatt	2758,1,300000
 beach_dun,0,0	monster	Swift Medusa	2759,2,300000
 mjo_dun02,0,0	monster	Solid Martin	2760,2,300000
-gl_in01,0,0	monster	Marionette Ringleader	2761,2,300000
-xmas_fild01,0,0	monster	Furious Marin	2762,2,300000
-in_sphinx3,0,0	monster	Elusive Marduk	2763,2,300000
+gl_in01,0,0	monster	Marionette Ringleader	2761,1,300000
+xmas_fild01,0,0	monster	Furious Marin	2762,1,300000
+in_sphinx3,0,0	monster	Elusive Marduk	2763,1,300000
 prt_maze03,0,0	monster	Swift Mantis	2764,2,300000
 gef_fild04,0,0	monster	Solid Mandragora	2765,2,300000
 ma_dun01,0,0	monster	Manananggal Ringleader	2766,2,300000
-gl_dun02,0,0	monster	Furious Majoruros	2767,2,300000
+gl_dun02,0,0	monster	Furious Majoruros	2767,1,300000
 prt_fild09,0,0	monster	Elusive Magnolia	2768,2,300000
 ve_fild03,0,0	monster	Swift Magmaring	2769,2,300000
-prt_fild08,0,0	monster	Solid Lunatic	2770,3,300000
+prt_fild08,0,0	monster	Solid Lunatic	2770,1,300000
 prt_fild01,0,0	monster	Lunatic Ringleader	2771,2,300000
-niflheim,0,0	monster	Furious Lude	2772,2,300000
-spl_fild03,0,0	monster	Elusive Luciola Vespa	2773,2,300000
-nif_fild02,0,0	monster	Swift Loli Ruri	2774,2,300000
-gon_dun02,0,0	monster	Solid Enchanted Peach Tree	2775,2,300000
+niflheim,0,0	monster	Furious Lude	2772,1,300000
+spl_fild03,0,0	monster	Elusive Luciola Vespa	2773,1,300000
+nif_fild02,0,0	monster	Swift Loli Ruri	2774,1,300000
+gon_dun02,0,0	monster	Solid Enchanted Peach Tree	2775,1,300000
 new_1-3,0,0	monster	Baby Poring Ringleader	2776,2,300000
 bif_fild02,0,0	monster	Furious Little Fatum	2777,2,300000
 lou_dun01,0,0	monster	Elusive Jing Guai	2778,2,300000
-mosk_dun02,0,0	monster	Swift Les	2779,2,300000
+mosk_dun02,0,0	monster	Swift Les	2779,1,300000
 gld_dun01,0,0	monster	Solid Leib Olmai	2780,2,300000
 ayo_dun01,0,0	monster	Leaf Cat Ringleader	2781,2,300000
 //teg_dun02,0,0	monster	[PH] 분노의 로그 휘케바인	2782,2,300000,0
 //teg_dun01,0,0	monster	[PH] 떠도는 어세신 에르메스	2783,2,300000,0
-ra_fild06,0,0	monster	Swift Kobold Archer	2784,2,300000
-ra_fild05,0,0	monster	Solid Kobold	2785,2,300000
-thor_v02,0,0	monster	Knocker Ringleader	2786,2,300000
+ra_fild06,0,0	monster	Swift Kobold Archer	2784,3,300000
+ra_fild05,0,0	monster	Solid Kobold	2785,3,300000
+thor_v02,0,0	monster	Knocker Ringleader	2786,1,300000
 mjolnir_08,0,0	monster	Furious Beetle King	2787,2,300000
 thor_v01,0,0	monster	Elusive Kasa	2788,2,300000
 ama_fild01,0,0	monster	Swift Karakasa	2789,2,300000
 moc_pryd04,0,0	monster	Solid Isis	2790,2,300000
 ra_san02,0,0	monster	Isilla Ringleader	2791,2,300000
 gl_prison1,0,0	monster	Furious Injustice	2792,2,300000
-lou_fild01,0,0	monster	Elusive Mi Gao	2793,2,300000
+lou_fild01,0,0	monster	Elusive Mi Gao	2793,1,300000
 ice_dun03,0,0	monster	Swift Ice Titan	2794,2,300000
-bra_dun02,0,0	monster	Solid Iara	2795,2,300000
-lou_dun02,0,0	monster	Yao Jun Ringleader	2796,2,300000
-gef_dun00,0,0	monster	Furious Hunter Fly	2797,2,300000
+bra_dun02,0,0	monster	Solid Iara	2795,3,300000
+lou_dun02,0,0	monster	Yao Jun Ringleader	2796,1,300000
+gef_dun00,0,0	monster	Furious Hunter Fly	2797,1,300000
 prt_fild05,0,0	monster	Elusive Hornet	2798,2,300000
 dic_dun01,0,0	monster	Swift Uni-horn Scaraba	2799,2,300000
 pay_fild09,0,0	monster	Solid Horn	2800,2,300000
 ra_san03,0,0	monster	Hodremlin Ringleader	2801,2,300000
 moc_fild17,0,0	monster	Furious Hode	2802,2,300000
-ra_fild04,0,0	monster	Elusive Hill Wind	2803,2,300000
-ra_fild03,0,0	monster	Swift Hill Wind	2804,2,300000
+ra_fild04,0,0	monster	Elusive Hill Wind	2803,3,300000
+ra_fild03,0,0	monster	Swift Hill Wind	2804,3,300000
 alde_dun02,0,0	monster	Solid High Orc	2805,2,300000
-yuno_fild04,0,0	monster	Harpy Ringleader	2806,2,300000
-yuno_fild03,0,0	monster	Furious Harpy	2807,2,300000
+yuno_fild04,0,0	monster	Harpy Ringleader	2806,3,300000
+yuno_fild03,0,0	monster	Furious Harpy	2807,3,300000
 cmd_fild01,0,0	monster	Elusive Grove	2808,2,300000
 pay_fild10,0,0	monster	Swift Greatest General	2809,2,300000
 yuno_fild09,0,0	monster	Solid Grand Peco	2810,2,300000
 yuno_fild08,0,0	monster	Grand Peco Ringleader	2811,2,300000
 cmd_fild06,0,0	monster	Furious Golem	2812,2,300000
-prt_fild11,0,0	monster	Elusive Goblin	2813,2,300000
-gef_fild11,0,0	monster	Swift Goblin	2814,2,300000
+prt_fild11,0,0	monster	Elusive Goblin	2813,3,300000
+gef_fild11,0,0	monster	Swift Goblin	2814,3,300000
 yuno_fild11,0,0	monster	Solid Goat	2815,2,300000
 yuno_fild07,0,0	monster	Goat Ringleader	2816,2,300000
 gld2_prt,0,0	monster	Furious Dark Hammer Kobold	2817,2,300000
@@ -229,83 +235,85 @@ gld_dun03_2,0,0	monster	Elusive Dark Hammer Kobold	2818,2,300000
 gld2_gef,0,0	monster	Swift Dark Shadow	2819,2,300000
 gld_dun04_2,0,0	monster	Solid Dark Shadow	2820,2,300000
 gld_dun02,0,0	monster	Giant Hornet Ringleader	2821,2,300000
-nameless_n,0,0	monster	Furious Ghoul	2822,2,300000
+nameless_n,0,0	monster	Furious Ghoul	2822,1,300000
 gef_dun01,0,0	monster	Elusive Ghoul	2823,2,300000
-yuno_fild12,0,0	monster	Swift Geographer	2824,2,300000
+yuno_fild12,0,0	monster	Swift Geographer	2824,1,300000
 yuno_fild01,0,0	monster	Solid Geographer	2825,2,300000
-glast_01,0,0	monster	Gargoyle Ringleader	2826,2,300000
-gl_sew02,0,0	monster	Furious Gargoyle	2827,2,300000
-ve_fild01,0,0	monster	Elusive Galion	2828,2,300000
-cmd_fild02,0,0	monster	Swift Seal	2829,2,300000
-tur_dun05,0,0	monster	Solid Freezer	2830,2,300000
-tur_dun03,0,0	monster	Freezer Ringleader	2831,2,300000
+glast_01,0,0	monster	Gargoyle Ringleader	2826,1,300000
+gl_sew02,0,0	monster	Furious Gargoyle	2827,1,300000
+ve_fild01,0,0	monster	Elusive Galion	2828,1,300000
+cmd_fild02,0,0	monster	Swift Seal	2829,3,300000
+tur_dun05,0,0	monster	Solid Freezer	2830,1,300000
+tur_dun03,0,0	monster	Freezer Ringleader	2831,1,300000
 abyss_01,0,0	monster	Furious Ferus	2832,2,300000
-prt_sewb1,0,0	monster	Elusive Familiar	2833,2,300000
+prt_sewb1,0,0	monster	Elusive Familiar	2833,1,300000
 gefenia01,0,0	monster	Swift False Angel	2834,2,300000
 prt_fild06,0,0	monster	Solid Fabre	2835,2,300000
-pay_fild03,0,0	monster	Fabre Ringleader	2836,2,300000
-mag_dun01,0,0	monster	Furious Explosion	2837,2,300000
+pay_fild03,0,0	monster	Fabre Ringleader	2836,3,300000
+mag_dun01,0,0	monster	Furious Explosion	2837,1,300000
 gl_church,0,0	monster	Elusive Evil Druid	2838,2,300000
-prt_fild10,0,0	monster	Swift Elder Willow	2839,2,300000
-mjolnir_02,0,0	monster	Solid Elder Willow	2840,2,300000
-ra_san04,0,0	monster	Echio Ringleader	2841,2,300000
+prt_fild10,0,0	monster	Swift Elder Willow	2839,3,300000
+mjolnir_02,0,0	monster	Solid Elder Willow	2840,3,300000
+ra_san04,0,0	monster	Echio Ringleader	2841,1,300000
 mjolnir_12,0,0	monster	Furious Dustiness	2842,2,300000
 um_fild01,0,0	monster	Swift Dryad	2843,2,300000
 ve_fild02,0,0	monster	Solid Drosera	2844,2,300000
-moc_fild07,0,0	monster	Drops Ringleader	2845,2,300000
-mjolnir_04,0,0	monster	Furious Driller	2846,2,300000
-in_sphinx1,0,0	monster	Elusive Drainliar	2847,2,300000
-tur_dun01,0,0	monster	Swift Dragon Tail	2848,2,300000
+moc_fild07,0,0	monster	Drops Ringleader	2845,3,300000
+mjolnir_04,0,0	monster	Furious Driller	2846,3,300000
+in_sphinx1,0,0	monster	Elusive Drainliar	2847,1,300000
+tur_dun01,0,0	monster	Swift Dragon Tail	2848,1,300000
 nyd_dun01,0,0	monster	Solid Draco	2849,2,300000
 dic_fild02,0,0	monster	Dolomedes Ringleader	2850,2,300000
 pay_dun04,0,0	monster	Furious Dokebi	2851,2,300000
 nif_fild01,0,0	monster	Elusive Disguise	2852,2,300000
-jupe_core,0,0	monster	Swift Dimik	2853,2,300000
+jupe_core,0,0	monster	Swift Dimik	2853,3,300000
 gef_dun02,0,0	monster	Solid Deviruchi	2854,2,300000
 ra_fild01,0,0	monster	Baby Desert Wolf Ringleader	2855,2,300000
-moc_fild11,0,0	monster	Furious Baby Desert Wolf	2856,2,300000
+moc_fild11,0,0	monster	Furious Baby Desert Wolf	2856,3,300000
 cmd_fild08,0,0	monster	Elusive Deniro	2857,2,300000
+anthell01,0,0	monster	Elusive Deniro	2857,3,300000
 tha_t06,0,0	monster	Swift Death Word	2858,2,300000
+//tha_t06,0,0	monster	Swift Death Word	2858,3,300000	//--Applied after Thanatos Revamped Patch.
 tha_t04,0,0	monster	Solid Death Word	2859,2,300000
 tha_t03,0,0	monster	Death Word Ringleader	2860,2,300000
 gl_chyard,0,0	monster	Furious Dark Priest	2861,2,300000
-lou_dun03,0,0	monster	Elusive Zhu Po Long	2862,2,300000
+lou_dun03,0,0	monster	Elusive Zhu Po Long	2862,1,300000
 gef_fild05,0,0	monster	Swift Creamy	2863,2,300000
 iz_dun02,0,0	monster	Solid Cornutus	2864,2,300000
 xmas_dun01,0,0	monster	Cookie Ringleader	2865,2,300000
 kh_kiehl01,0,0	monster	Furious Constant	2866,2,300000
 dew_dun01,0,0	monster	Elusive Comodo	2867,2,300000
 gef_fild09,0,0	monster	Swift Coco	2868,2,300000
-gef_fild02,0,0	monster	Solid Coco	2869,2,300000
+gef_fild02,0,0	monster	Solid Coco	2869,3,300000
 c_tower4,0,0	monster	Clock Ringleader	2870,2,300000
-c_tower2,0,0	monster	Furious Clock	2871,2,300000
+c_tower2,0,0	monster	Furious Clock	2871,1,300000
 gef_fild00,0,0	monster	Elusive Chonchon	2872,2,300000
 dic_fild01,0,0	monster	Swift Centipede	2873,2,300000
-ecl_tdun01,0,0	monster	Solid Cenere	2874,2,300000
-lhz_dun04,0,0	monster	Celia Ringleader	2875,2,300000
+ecl_tdun01,0,0	monster	Solid Cenere	2874,1,300000
+lhz_dun04,0,0	monster	Celia Ringleader	2875,3,300000
 gld_dun03,0,0	monster	Furious Caterpillar	2876,2,300000
 gl_cas01,0,0	monster	Elusive Carat	2877,2,300000
 mjolnir_01,0,0	monster	Swift Caramel	2878,2,300000
 ma_fild02,0,0	monster	Solid Bungisngis	2879,2,300000
-odin_tem01,0,0	monster	Breeze Ringleader	2880,2,300000
-lhz_fild03,0,0	monster	Furious Breeze	2881,2,300000
+odin_tem01,0,0	monster	Breeze Ringleader	2880,1,300000
+lhz_fild03,0,0	monster	Furious Breeze	2881,3,300000
 man_fild02,0,0	monster	Elusive Bradium Golem	2882,2,300000
 gon_dun01,0,0	monster	Swift Bloody Butterfly	2883,2,300000
 pay_fild07,0,0	monster	Bigfoot Ringleader	2884,2,300000
-alde_dun04,0,0	monster	Furious Bathory	2885,2,300000
+alde_dun04,0,0	monster	Furious Bathory	2885,1,300000
 arug_dun01,0,0	monster	Elusive Banshee Master	2886,2,300000
-abbey01,0,0	monster	Swift Banshee	2887,2,300000
+abbey01,0,0	monster	Swift Banshee	2887,3,300000
 dew_dun02,0,0	monster	Solid Banaspaty	2888,2,300000
-tur_dun04,0,0	monster	Assaulter Ringleader	2889,2,300000
+tur_dun04,0,0	monster	Assaulter Ringleader	2889,1,300000
 mjolnir_10,0,0	monster	Furious Argos	2890,2,300000
 mjolnir_11,0,0	monster	Elusive Argiope	2891,2,300000
 mjolnir_05,0,0	monster	Swift Argiope	2892,2,300000
-gl_dun01,0,0	monster	Solid Arclouze	2893,2,300000
-alde_dun01,0,0	monster	Arclouze Ringleader	2894,2,300000
-juperos_02,0,0	monster	Furious Apocalypse	2895,2,300000
+gl_dun01,0,0	monster	Solid Arclouze	2893,1,300000
+alde_dun01,0,0	monster	Arclouze Ringleader	2894,1,300000
+juperos_02,0,0	monster	Furious Apocalypse	2895,3,300000
 dic_dun02,0,0	monster	Elusive Antler Scaraba	2896,2,300000
-ecl_tdun03,0,0	monster	Swift Antique Book	2897,2,300000
-ecl_tdun02,0,0	monster	Solid Antique Book	2898,2,300000
+ecl_tdun03,0,0	monster	Swift Antique Book	2897,1,300000
+ecl_tdun02,0,0	monster	Solid Antique Book	2898,1,300000
 gl_sew04,0,0	monster	Furious Anolian	2899,2,300000
 gld2_ald,0,0	monster	Elusive Angra Mantis	2900,2,300000
 gld_dun02_2,0,0	monster	Swift Angra Mantis	2901,2,300000
@@ -314,10 +322,10 @@ tha_t02,0,0	monster	Ancient Mimic Ringleader	2903,2,300000
 ra_fild08,0,0	monster	Furious Anacondaq	2904,2,300000
 prt_fild04,0,0	monster	Elusive Ambernite	2905,2,300000
 dew_fild01,0,0	monster	Swift Rafflesia Arnoldi	2906,2,300000
-cmd_fild03,0,0	monster	Solid Alligator	2907,2,300000
-kh_dun01,0,0	monster	Aliza Ringleader	2908,2,300000
-kh_dun02,0,0	monster	Furious Alicel	2909,2,300000
-c_tower3,0,0	monster	Elusive Alarm	2910,2,300000
+cmd_fild03,0,0	monster	Solid Alligator	2907,3,300000
+kh_dun01,0,0	monster	Aliza Ringleader	2908,1,300000
+kh_dun02,0,0	monster	Furious Alicel	2909,1,300000
+c_tower3,0,0	monster	Elusive Alarm	2910,1,300000
 ra_san05,0,0	monster	Swift Agav	2911,2,300000
 abyss_03,0,0	monster	Solid Acidus	2912,2,300000
 abyss_02,0,0	monster	Acidus Ringleader	2913,2,300000
--- a/npc/re/mobs/dungeons/abbey.txt
+++ b/npc/re/mobs/dungeons/abbey.txt
@@ -3,13 +3,14 @@
 //===== By: ==================================================
 //= $ephiroth
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.0 Initial version [$ephiroth]
 //= 1.1 Updated spawns [Playtester]
 //= 1.2 More official spawns [Playtester]
+//= 1.3 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 //==================================================
@@ -25,9 +26,9 @@ nameless_n,0,0	monster	Flame Skull	1869,3,5000
 //==================================================
 // abbey01 - Cursed Monastery
 //==================================================
-abbey01,0,0	monster	Banshee	1867,93,5000
-abbey01,0,0	monster	Ghoul	1036,56,5000
-abbey01,0,0	monster	Ragged Zombie	1865,33,5000
+abbey01,0,0	monster	Banshee	1867,96,5000
+abbey01,0,0	monster	Ghoul	1036,57,5000
+abbey01,0,0	monster	Ragged Zombie	1865,34,5000
 abbey01,0,0	monster	Zombie Slaughter	1864,30,5000
 abbey01,0,0	monster	Hellhound	1866,25,5000
 abbey01,0,0	monster	Flame Skull	1869,21,5000
--- a/npc/re/mobs/dungeons/alde_dun.txt
+++ b/npc/re/mobs/dungeons/alde_dun.txt
@@ -3,20 +3,21 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
 //= 1.2 More accurate spawns [Playtester]
 //= 1.3 Moved Clock Tower spawns to their own file. [L0ne_W0lf]
+//= 1.4 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 //==================================================
 // alde_dun01 - Clock Tower B1f 
 //==================================================
-alde_dun01,0,0	monster	Arclouze	1194,50,5000
-alde_dun01,0,0	monster	Drainliar	1111,40,5000
+alde_dun01,0,0	monster	Arclouze	1194,58,5000
+alde_dun01,0,0	monster	Drainliar	1111,47,5000

 //==================================================
 // alde_dun02 - Clock Tower B2f 
@@ -36,6 +37,6 @@ alde_dun03,0,0	monster	Drainliar	1111,55,5000
 //==================================================
 // alde_dun04 - Clock Tower B4f
 //==================================================
-alde_dun04,0,0	monster	Bathory	1102,50,5000
-alde_dun04,0,0	monster	Whisper	1179,10,5000
-alde_dun04,0,0	monster	Joker	1131,10,5000
+alde_dun04,0,0	monster	Bathory	1102,57,5000
+alde_dun04,0,0	monster	Whisper	1179,11,5000
+alde_dun04,0,0	monster	Joker	1131,11,5000
--- a/npc/re/mobs/dungeons/ama_dun.txt
+++ b/npc/re/mobs/dungeons/ama_dun.txt
@@ -3,19 +3,20 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
 //= 1.2 Corrected MVP spawn variance. [L0ne_W0lf]
+//= 1.3 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 //==================================================
 // ama_dun01 - Tatami Maze
 //==================================================
-ama_dun01,0,0	monster	Miyabi Doll	1404,65,5000
-ama_dun01,0,0	monster	Firelock Soldier	1403,45,5000
+ama_dun01,0,0	monster	Miyabi Doll	1404,91,5000
+ama_dun01,0,0	monster	Firelock Soldier	1403,63,5000
 ama_dun01,0,0	monster	Shinobi	1401,2,5000

 //==================================================
@@ -31,10 +32,10 @@ ama_dun02,0,0	monster	The Paper	1375,1,5000
 //==================================================
 // ama_dun03 - Amatsu Underground Shrine
 //==================================================
-ama_dun03,0,0	monster	Shinobi	1401,55,5000
-ama_dun03,0,0	monster	Tengu	1405,55,5000
-ama_dun03,0,0	monster	Firelock Soldier	1403,25,5000
-ama_dun03,0,0	monster	The Paper	1375,20,5000
+ama_dun03,0,0	monster	Shinobi	1401,65,5000
+ama_dun03,0,0	monster	Tengu	1405,65,5000
+ama_dun03,0,0	monster	Firelock Soldier	1403,29,5000
+ama_dun03,0,0	monster	The Paper	1375,23,5000
 ama_dun03,0,0	monster	Mimic	1191,5,5000
 ama_dun03,0,0	monster	Miyabi Doll	1404,1,5000
 ama_dun03,0,0,0,0	boss_monster	Samurai Specter	1492,1,5460000,600000,0
--- a/npc/re/mobs/dungeons/ayo_dun.txt
+++ b/npc/re/mobs/dungeons/ayo_dun.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.5
+//= 1.6
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
@@ -12,20 +12,21 @@
 //= 1.3 Official jRO 10.3 spawns [Playtester]
 //= 1.4 More accurate spawns [Playtester]
 //= 1.5 Corrected MVP spawn variance. [L0ne_W0lf]
+//= 1.6 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 //==================================================
 // ayo_dun01 - Ancient Shrine Maze
 //==================================================
-ayo_dun01,0,0	monster	Leaf Cat	1586,65,5000
-ayo_dun01,0,0	monster	Ghoul	1036,30,5000
-ayo_dun01,0,0	monster	Whisper	1179,10,5000
-ayo_dun01,0,0	monster	Kraben	1587,5,5000
+ayo_dun01,0,0	monster	Leaf Cat	1586,104,5000
+ayo_dun01,0,0	monster	Ghoul	1036,48,5000
+ayo_dun01,0,0	monster	Whisper	1179,16,5000
+ayo_dun01,0,0	monster	Kraben	1587,8,5000

 //==================================================
 // ayo_dun02 - Inside Ancient Shrine
 //==================================================
-ayo_dun02,0,0	monster	Tamruan	1584,100,5000
-ayo_dun02,0,0	monster	Whisper	1179,20,5000
-ayo_dun02,0,0	monster	Kraben	1587,20,5000
+ayo_dun02,0,0	monster	Tamruan	1584,116,5000
+ayo_dun02,0,0	monster	Whisper	1179,23,5000
+ayo_dun02,0,0	monster	Kraben	1587,23,5000
 ayo_dun02,150,90,15,30	boss_monster	Lady Tanee	1688,1,25200000,600000,0
--- a/npc/re/mobs/dungeons/c_tower.txt
+++ b/npc/re/mobs/dungeons/c_tower.txt
@@ -3,39 +3,40 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.0 Split from combined Alde and CT spawn file. [L0ne_W0lf]
 //= 1.1 Added nightmare clock tower. [Ridley8819]
+//= 1.2 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 //==================================================
 // c_tower1 - Clock Tower 1f
 //==================================================
-c_tower1,0,0	monster	Rideword	1195,70,5000
-c_tower1,0,0	monster	Punk	1199,70,5000
+c_tower1,0,0	monster	Rideword	1195,107,5000
+c_tower1,0,0	monster	Punk	1199,107,5000
 c_tower1,0,0	monster	Bathory	1102,1,5000
 c_tower1,0,0	monster	Clock Tower Manager	1270,1,5000

 //==================================================
 // c_tower2 - Clock Tower 2f
 //==================================================
-c_tower2,0,0	monster	Clock	1269,40,5000
-c_tower2,0,0	monster	Punk	1199,40,5000
-c_tower2,0,0	monster	Rideword	1195,12,5000
-c_tower2,0,0	monster	Mimic	1191,3,5000
+c_tower2,0,0	monster	Clock	1269,55,5000
+c_tower2,0,0	monster	Punk	1199,55,5000
+c_tower2,0,0	monster	Rideword	1195,16,5000
+c_tower2,0,0	monster	Mimic	1191,4,5000
 c_tower2,0,0	monster	Elder	1377,2,5000
 c_tower2,0,0	monster	Clock Tower Manager	1270,1,5000

 //==================================================
 // c_tower3 - Clock Tower 3f
 //==================================================
-c_tower3,0,0	monster	Alarm	1193,80,5000
-c_tower3,0,0	monster	Mimic	1191,7,5000
-c_tower3,0,0	monster	Rideword	1195,6,5000
-c_tower3,0,0	monster	Clock Tower Manager	1270,3,5000
+c_tower3,0,0	monster	Alarm	1193,109,5000
+c_tower3,0,0	monster	Mimic	1191,9,5000
+c_tower3,0,0	monster	Rideword	1195,8,5000
+c_tower3,0,0	monster	Clock Tower Manager	1270,4,5000

 //==================================================
 // c_tower4 - Clock Tower 4f
@@ -52,21 +53,21 @@ c_tower4,0,0	monster	Elder	1377,2,5000
 //==================================================
 // c_tower2_ - Clock Tower Nightmare 2f
 //==================================================
-c_tower2_,0,0	monster	Mimic (Nightmare)	2479,3,5000,0,0
-c_tower2_,0,0	monster	Rideword (Nightmare)	2478,4,300000,0,0
-c_tower2_,0,0	monster	Rideword (Nightmare)	2478,1,60000,0,0
-c_tower2_,0,0	monster	Neo Punk	2919,40,5000
-c_tower2_,0,0	monster	Big Ben	2916,40,5000
+c_tower2_,0,0	monster	Mimic (Nightmare)	2479,4,5000,0,0
+c_tower2_,0,0	monster	Rideword (Nightmare)	2478,16,5000,0,0
+c_tower2_,0,0	monster	Neo Punk	2919,55,5000
+c_tower2_,0,0	monster	Big Ben	2916,55,5000
 c_tower2_,0,0	monster	Time Keeper	2918,1,5000
 c_tower2_,0,0	monster	Arc Elder	2920,2,3600000
+c_tower2_,0,0	monster	Owl Viscount	2921,1,5000,1800000

 //==================================================
 // c_tower3_ - Clock Tower Nightmare 3f
 //==================================================
-c_tower3_,0,0	monster	Mimic (Nightmare)	2479,8,5000,0,0
+c_tower3_,0,0	monster	Mimic (Nightmare)	2479,9,5000,0,0
 c_tower3_,0,0	monster	Rideword (Nightmare)	2478,8,5000,0,0
-c_tower3_,0,0	monster	Big Bell	2917,110,5000
-c_tower3_,0,0	monster	Time Keeper	2918,3,5000
-c_tower3_,0,0	monster	Owl Viscount	2921,1,5000,1800000
-c_tower3_,0,0	monster	Owl Marquis	2923,1,5000,5000
+c_tower3_,0,0	monster	Big Bell	2917,109,5000
+c_tower3_,0,0	monster	Time Keeper	2918,2,5000
+c_tower3_,0,0	monster	Owl Viscount	2921,3,5000,1800000
+c_tower3_,0,0	monster	Owl Marquis	2923,3,5000,5000
 c_tower3_,0,0,0,0	boss_monster	Time Holder	3074,1,7200000,0,0
--- a/npc/re/mobs/dungeons/dew_dun.txt
+++ b/npc/re/mobs/dungeons/dew_dun.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Description: =========================================
@@ -11,20 +11,17 @@
 //===== Additional Comments: =================================
 //= 1.0 First Release
 //= 1.1 Updated spawn delays. [Euphy]
+//= 1.2 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 //==================================================
 // dew_dun01 - Volcanic Island of Krakatoa
 //==================================================
-dew_dun01,0,0	monster	Comodo	2152,70,5000
-dew_dun01,0,0	monster	Ancient Worm	1305,25,5000
-dew_dun01,0,0	monster	Gullinbursti	1311,10,5000
+dew_dun01,0,0	monster	Comodo	2152,100,5000
 dew_dun01,0,0,0,0	boss_monster	Leak	2156,1,7200000,0,1

 //==================================================
 // dew_dun02 - Tina Grace Cave
 //==================================================
-dew_dun02,0,0	monster	Banaspaty	2154,50,5000
-dew_dun02,0,0	monster	Gajomart	1309,30,5000
-dew_dun02,0,0	monster	Am Mut	1301,20,5000
-dew_dun02,0,0	monster	Butoijo	2155,30,5000
+dew_dun02,0,0	monster	Banaspaty	2154,70,5000
+dew_dun02,0,0	monster	Butoijo	2155,40,5000
--- a/npc/re/mobs/dungeons/ecl_tdun.txt
+++ b/npc/re/mobs/dungeons/ecl_tdun.txt
@@ -3,37 +3,36 @@
 //===== By: ==================================================
 //= refis
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Description: =========================================
 //= jRO monster spawns, taken from Auriga.
 //===== Additional Comments: =================================
 //= 1.0 First version. [Euphy]
+//= 1.1 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 //==================================================
 // ecl_tdun01 - Bifrost Tower F1
 //==================================================
-ecl_tdun01.gat,0,0	monster	Cenere	2365,5,5000
-ecl_tdun01.gat,0,0	monster	Antique Book	2366,5,5000
-ecl_tdun01.gat,0,0	monster	Blue Lichtern	2367,5,5000
+ecl_tdun01,0,0	monster	Cenere	2365,15,5000
+ecl_tdun01,0,0	monster	Antique Book	2366,10,5000
+ecl_tdun01,0,0	monster	Blue Lichtern	2367,5,5000
+ecl_tdun01,0,0	monster	Yellow Lichtern	2368,5,5000

 //==================================================
 // ecl_tdun02 - Bifrost Tower F2
 //==================================================
-ecl_tdun02.gat,0,0	monster	Cenere	2365,10,5000
-ecl_tdun02.gat,0,0	monster	Antique Book	2366,10,5000
-ecl_tdun02.gat,0,0	monster	Blue Lichtern	2367,15,5000
-ecl_tdun02.gat,0,0	monster	Yellow Lichtern	2368,5,5000
+ecl_tdun02,0,0	monster	Cenere	2365,15,5000
+ecl_tdun02,0,0	monster	Antique Book	2366,15,5000
+ecl_tdun02,0,0	monster	Yellow Lichtern	2368,5,5000
+ecl_tdun02,0,0	monster	Red Lichtern	2369,5,5000

 //==================================================
 // ecl_tdun03 - Bifrost Tower F3
 //==================================================
-ecl_tdun03.gat,0,0	monster	Cenere	2365,15,5000
-ecl_tdun03.gat,0,0	monster	Antique Book	2366,15,5000
-ecl_tdun03.gat,0,0	monster	Blue Lichtern	2367,5,5000
-ecl_tdun03.gat,0,0	monster	Yellow Lichtern	2368,15,5000
-ecl_tdun03.gat,0,0	monster	Red Lichtern	2369,10,5000
-ecl_tdun03.gat,0,0	monster	Green Lichtern	2370,15,5000
-ecl_tdun03.gat,0,0	monster	Faithful Manager	2371,5,5000
+ecl_tdun03,0,0	monster	Antique Book	2366,15,5000
+ecl_tdun03,0,0	monster	Yellow Lichtern	2368,5,5000
+ecl_tdun03,0,0	monster	Green Lichtern	2370,5,5000
+ecl_tdun03,0,0	monster	Faithful Manager	2371,3,5000
--- a/npc/re/mobs/dungeons/gef_dun.txt
+++ b/npc/re/mobs/dungeons/gef_dun.txt
@@ -3,13 +3,14 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.2 Official kRO 10.1 spawns [Playtester]
 //= 1.3 More accurate spawns [Playtester]
 //= 1.4 Corrected MVP spawn variance. [L0ne_W0lf]
+//= 1.5 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 //==================================================
@@ -63,10 +64,8 @@ gef_dun02,185,83,3,3	monster	Shining Plant	1083,1,1800000,900000
 //==================================================
 // gef_dun03 - Geffenia
 //==================================================
-gef_dun03,0,0	monster	Wraith	1192,8,5000
-gef_dun03,0,0	monster	Wind Ghost	1263,3,5000
-gef_dun03,0,0	monster	Wraith Dead	1291,2,5000
-gef_dun03,0,0	monster	Wraith Dead	1291,2,60000,30000
+gef_dun03,0,0	monster	Wraith	1192,14,5000
+gef_dun03,0,0	monster	Wind Ghost	1263,5,5000
 gef_dun03,0,0	monster	Hellion Revenant	1626,1,600000,300000
-gef_dun03,0,0	monster	Shining Plant	1083,3,1800000,900000
-gef_dun03,0,0	monster	White Plant	1082,10,180000,90000
+gef_dun03,0,0	monster	Shining Plant	1083,5,1800000,900000
+gef_dun03,0,0	monster	White Plant	1082,18,180000,90000
--- a/npc/re/mobs/dungeons/gefenia.txt
+++ b/npc/re/mobs/dungeons/gefenia.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Muad_Dib, rAthena Dev Team
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
@@ -12,14 +12,15 @@
 //= Updated spawns, information from emperium.org [MasterOfMuppets]
 //= Kept the old spawns incase someone would want them.
 //= Aegis ep 10.1 spawns [MasterOfMuppets]
+//= 1.2 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 //==================================================
 // gefenia01 - Geffenia
 //==================================================
-gefenia01,0,0	monster	False Angel	1371,60,5000
-gefenia01,0,0	monster	Violy	1390,30,5000
-gefenia01,0,0	monster	Mini Demon	1292,20,5000
+gefenia01,0,0	monster	False Angel	1371,63,5000
+gefenia01,0,0	monster	Violy	1390,31,5000
+gefenia01,0,0	monster	Mini Demon	1292,21,5000
 gefenia01,0,0	monster	Abysmal Knight	1219,10,5000
 gefenia01,0,0	monster	Incubus	1374,10,5000
 gefenia01,0,0	monster	Succubus	1370,10,5000
@@ -45,10 +46,10 @@ gefenia02,0,0	monster	Executioner	1205,1,18000000,14400000
 //==================================================
 // gefenia03 - Geffenia
 //==================================================
-gefenia03,0,0	monster	False Angel	1371,40,5000
-gefenia03,0,0	monster	Violy	1390,40,5000
-gefenia03,0,0	monster	Mini Demon	1292,30,5000
-gefenia03,0,0	monster	Incubus	1374,20,5000
+gefenia03,0,0	monster	False Angel	1371,42,5000
+gefenia03,0,0	monster	Violy	1390,42,5000
+gefenia03,0,0	monster	Mini Demon	1292,31,5000
+gefenia03,0,0	monster	Incubus	1374,21,5000
 gefenia03,0,0	monster	Abysmal Knight	1219,10,5000
 gefenia03,0,0	monster	Succubus	1370,10,5000
 gefenia03,0,0	monster	Bloody Knight	1268,1,3600000,3000000
--- a/npc/re/mobs/dungeons/glastheim.txt
+++ b/npc/re/mobs/dungeons/glastheim.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.5
+//= 1.7
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
@@ -13,6 +13,7 @@
 //= 1.4 More accurate spawns [Playtester]
 //= 1.5 Corrected MVP spawn variance. [L0ne_W0lf]
 //= 1.6 Added Nightmare Glastheim [Ridley8819]
+//= 1.7 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 //==================================================
@@ -29,12 +30,12 @@ glast_01,233,209,15,15	monster	Blue Plant	1079,2,900000,450000
 // gl_cas01 - Glast Heim 1f
 //==================================================
 gl_cas01,0,0	monster	Carat	1267,50,5000
-gl_cas01,0,0	monster	Dark Frame	1260,20,5000
-gl_cas01,0,0	monster	Owl Duke	1320,20,5000
-gl_cas01,0,0	monster	Rideword	1195,15,5000
-gl_cas01,0,0	monster	Sage Worm	1281,10,5000
-gl_cas01,0,0	monster	Whisper	1179,10,5000
-gl_cas01,0,0	monster	Owl Baron	1295,6,5000
+gl_cas01,0,0	monster	Dark Frame	1260,35,5000
+gl_cas01,0,0	monster	Owl Duke	1320,35,5000
+gl_cas01,0,0	monster	Rideword	1195,26,5000
+gl_cas01,0,0	monster	Sage Worm	1281,17,5000
+gl_cas01,0,0	monster	Whisper	1179,17,5000
+gl_cas01,0,0	monster	Owl Baron	1295,10,5000
 gl_cas01,0,0	monster	Alice	1275,1,5000

 //==================================================
@@ -57,53 +58,51 @@ gl_cas02,0,0	monster	Ogretooth	1204,1,7200000,3600000
 //==================================================
 // gl_church - Glast Heim St. Abbey
 //==================================================
-gl_church,0,0	monster	Evil Druid	1117,60,5000
-gl_church,0,0	monster	Wraith	1192,55,5000
-gl_church,0,0	monster	Mimic	1191,9,5000
-gl_church,0,0	monster	Evil Druid	1117,1,5000
-gl_church,0,0	monster	Wraith Dead	1291,1,3600000,1800000
+gl_church,0,0	monster	Evil Druid	1117,85,5000
+gl_church,0,0	monster	Wraith	1192,78,5000
+gl_church,0,0	monster	Mimic	1191,12,5000

 //==================================================
 // gl_chyard - Glast Heim Churchyard
 //==================================================
-gl_chyard,0,0	monster	Dark Priest	1198,60,5000
-gl_chyard,0,0	monster	Wraith	1192,35,5000
-gl_chyard,0,0	monster	Evil Druid	1117,10,5000
-gl_chyard,0,0	monster	Mimic	1191,3,5000
-gl_chyard,0,0	monster	Hunter Fly	1035,3,5000
+gl_chyard,0,0	monster	Dark Priest	1198,95,5000
+gl_chyard,0,0	monster	Wraith	1192,55,5000
+gl_chyard,0,0	monster	Evil Druid	1117,15,5000
+gl_chyard,0,0	monster	Mimic	1191,4,5000
+gl_chyard,0,0	monster	Hunter Fly	1035,4,5000
 gl_chyard,0,0,0,0	boss_monster	Dark Lord	1272,1,3600000,600000,1
 gl_chyard,0,0	monster	Dark Illusion	1302,1,3600000,1800000

 //==================================================
 // gl_dun01 - The Lowest Cave in Glast Heim
 //==================================================
-gl_dun01,0,0	monster	Arclouze	1194,50,5000
-gl_dun01,0,0	monster	Sting	1207,40,5000
+gl_dun01,0,0	monster	Arclouze	1194,53,5000
+gl_dun01,0,0	monster	Sting	1207,43,5000

 //==================================================
 // gl_dun02 - The Lowest Cave in Glast Heim
 //==================================================
-gl_dun02,0,0	monster	Majoruros	1310,45,5000
-gl_dun02,0,0	monster	Gargoyle	1253,15,5000
+gl_dun02,0,0	monster	Majoruros	1310,52,5000
+gl_dun02,0,0	monster	Gargoyle	1253,17,5000

 //==================================================
 // gl_in01 - Inside Glast Heim
 //==================================================
-gl_in01,0,0	monster	Marionette	1143,20,5000
-gl_in01,0,0	monster	Sage Worm	1281,14,5000
-gl_in01,0,0	monster	Dark Frame	1260,10,5000
-gl_in01,0,0	monster	Rideword	1195,8,5000
+gl_in01,0,0	monster	Marionette	1143,25,5000
+gl_in01,0,0	monster	Sage Worm	1281,17,5000
+gl_in01,0,0	monster	Dark Frame	1260,12,5000
+gl_in01,0,0	monster	Rideword	1195,10,5000
 gl_in01,0,0	monster	Wanderer	1208,1,5000
 gl_in01,0,0	monster	Alice	1275,1,5000

 //==================================================
 // gl_knt01 - Inside Glast Heim Chivalry
 //==================================================
-gl_knt01,0,0	monster	Raydric	1163,90,5000
-gl_knt01,0,0	monster	Rideword	1195,21,5000
-gl_knt01,0,0	monster	Raydric Archer	1276,10,5000
-gl_knt01,0,0	monster	Abysmal Knight	1219,10,5000
-gl_knt01,0,0	monster	Khalitzburg	1132,10,5000
+gl_knt01,0,0	monster	Raydric	1163,126,5000
+gl_knt01,0,0	monster	Rideword	1195,29,5000
+gl_knt01,0,0	monster	Raydric Archer	1276,14,5000
+gl_knt01,0,0	monster	Abysmal Knight	1219,14,5000
+gl_knt01,0,0	monster	Khalitzburg	1132,14,5000
 gl_knt01,0,0	monster	Alice	1275,1,5000
 gl_knt01,21,278	monster	Giant Whisper	1186,1,3600000,1800000
 gl_knt01,9,184	monster	Black Mushroom	1084,1,3600000,1800000
@@ -122,10 +121,10 @@ gl_knt01,4,185	monster	Black Mushroom	1084,1,3600000,1800000
 //==================================================
 // gl_knt02 - Inside Glast Heim Chivalry
 //==================================================
-gl_knt02,0,0	monster	Raydric	1163,80,5000
-gl_knt02,0,0	monster	Khalitzburg	1132,40,5000
-gl_knt02,0,0	monster	Raydric Archer	1276,30,5000
-gl_knt02,0,0	monster	Abysmal Knight	1219,6,5000
+gl_knt02,0,0	monster	Raydric	1163,101,5000
+gl_knt02,0,0	monster	Khalitzburg	1132,50,5000
+gl_knt02,0,0	monster	Raydric Archer	1276,38,5000
+gl_knt02,0,0	monster	Abysmal Knight	1219,7,5000
 gl_knt02,0,0	monster	Alice	1275,1,5000
 gl_knt02,0,0	monster	Mysteltainn	1203,1,1800000,1200000
 gl_knt02,0,0	monster	Bloody Knight	1268,1,3600000,1800000
@@ -133,10 +132,10 @@ gl_knt02,0,0	monster	Bloody Knight	1268,1,3600000,1800000
 //==================================================
 // gl_prison - Glast Heim Underprison
 //==================================================
-gl_prison,0,0	monster	Zombie Prisoner	1197,30,5000
-gl_prison,0,0	monster	Injustice	1257,20,5000
-gl_prison,0,0	monster	Rybio	1201,15,5000
-gl_prison,0,0	monster	Hunter Fly	1035,10,5000
+gl_prison,0,0	monster	Zombie Prisoner	1197,38,5000
+gl_prison,0,0	monster	Injustice	1257,25,5000
+gl_prison,0,0	monster	Rybio	1201,19,5000
+gl_prison,0,0	monster	Hunter Fly	1035,12,5000

 //==================================================
 // gl_prison1 - Glast Heim Underprison
@@ -152,49 +151,54 @@ gl_prison1,0,0	monster	Zealotus	1200,1,3600000,1800000
 //==================================================
 // gl_sew01 - Glast Heim Culvert
 //==================================================
-gl_sew01,0,0	monster	Whisper	1179,40,5000
-gl_sew01,0,0	monster	Gargoyle	1253,30,5000
-gl_sew01,0,0	monster	Arclouze	1194,10,5000
+gl_sew01,0,0	monster	Whisper	1179,66,5000
+gl_sew01,0,0	monster	Gargoyle	1253,49,5000
+gl_sew01,0,0	monster	Arclouze	1194,16,5000

 //==================================================
 // gl_sew02 - Glast Heim Culvert
 //==================================================
-gl_sew02,0,0	monster	Gargoyle	1253,55,5000
-gl_sew02,0,0	monster	Cramp	1209,15,5000
+gl_sew02,0,0	monster	Gargoyle	1253,89,5000
+gl_sew02,0,0	monster	Cramp	1209,24,5000

 //==================================================
 // gl_sew03 - Glast Heim Culvert
 //==================================================
-gl_sew03,0,0	monster	Sting	1207,70,5000
-gl_sew03,0,0	monster	Gargoyle	1253,40,5000
+gl_sew03,0,0	monster	Sting	1207,99,5000
+gl_sew03,0,0	monster	Gargoyle	1253,56,5000

 //==================================================
 // gl_sew04 - Glast Heim Culvert
 //==================================================
-gl_sew04,0,0	monster	Anolian	1206,100,5000
-gl_sew04,0,0	monster	Gargoyle	1253,20,5000
-gl_sew04,0,0	monster	Drainliar	1111,10,5000
+gl_sew04,0,0	monster	Anolian	1206,126,5000
+gl_sew04,0,0	monster	Gargoyle	1253,25,5000
+gl_sew04,0,0	monster	Drainliar	1111,12,5000

 //==================================================
 // gl_step - Glast Heim Staircase Dungeon
 //==================================================
-gl_step,0,0	monster	Wind Ghost	1263,100,5000
-gl_step,0,0	monster	Raydric Archer	1276,10,5000
-gl_step,0,0	monster	Mimic	1191,5,5000
+gl_step,0,0	monster	Wind Ghost	1263,138,5000
+gl_step,0,0	monster	Raydric Archer	1276,13,5000
+gl_step,0,0	monster	Mimic	1191,6,5000

 //==================================================
 // gl_cas02_ - Nightmare Mode 2f
 //==================================================
-gl_cas02_,0,0	monster	Evil Druid (Nightmare)	2480,20,0,0,0
-gl_cas02_,0,0	monster	Chimera (Nightmare)	2485,10,0,0,0
-gl_cas02_,0,0	monster	Mimic (Nightmare)	2479,40,0,0,0
-gl_cas02_,0,0	monster	Rideword (Nightmare)	2478,40,0,0,0
-gl_cas02_,0,0	monster	Wanderer (Nightmare)	2477,120,0,0,0
+gl_cas02_,0,0	monster	Evil Druid (Nightmare)	2480,4,0,0,0
+gl_cas02_,0,0	monster	Chimera (Nightmare)	2485,1,0,0,0
+gl_cas02_,0,0	monster	Mimic (Nightmare)	2479,19,0,0,0
+gl_cas02_,0,0	monster	Rideword (Nightmare)	2478,10,0,0,0
+gl_cas02_,0,0	monster	Wanderer (Nightmare)	2477,60,0,0,0
+gl_cas02_,0,0	monster	Mysteltainn	1203,1,7200000,3600000
+gl_cas02_,0,0	monster	Alice	1275,1,5000
+gl_cas02_,102,180	monster	Whisper	1185,1,1800000,900000
 gl_cas02_,0,0	monster	Baphomet (Nightmare)	2483,1,7200000,0,0

 //==================================================
 // gl_chyard_ - Nightmare Mode Churchyard
 //==================================================
-gl_chyard_,0,0	monster	Wraith Dead (Nightmare)	2481,200,0,0,0
-gl_chyard_,0,0	monster	Evil Druid (Nightmare)	2480,5,60000,0,0
-gl_chyard_,0,0	monster	Mimic (Nightmare)	2479,5,60000,0,0
+gl_chyard_,0,0	monster	Wraith Dead (Nightmare)	2481,91,0,0,0
+gl_chyard_,0,0	monster	Wraith Dead	1291,31,0,0,0
+gl_chyard_,0,0	monster	Evil Druid (Nightmare)	2480,22,60000,0,0
+gl_chyard_,0,0	monster	Mimic (Nightmare)	2479,34,60000,0,0
+gl_chyard_,0,0,0,0	boss_monster	Dark Lord	1272,1,3600000,600000,1
--- a/npc/re/mobs/dungeons/gon_dun.txt
+++ b/npc/re/mobs/dungeons/gon_dun.txt
@@ -3,38 +3,39 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
 //= 1.2 Corrected MVP spawn variance. [L0ne_W0lf]
+//= 1.3 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 //==================================================
 // gon_dun01 - Shrine of Kunlun Queen
 //==================================================
-gon_dun01,0,0	monster	Bloody Butterfly	1408,55,5000
-gon_dun01,0,0	monster	Enchanted Peach Tree	1410,35,5000
-gon_dun01,0,0	monster	Zipper Bear	1417,30,5000
-gon_dun01,0,0	monster	Yellow Plant	1081,10,5000
-gon_dun01,0,0	monster	White Plant	1082,10,5000
+gon_dun01,0,0	monster	Bloody Butterfly	1408,60,5000
+gon_dun01,0,0	monster	Enchanted Peach Tree	1410,38,5000
+gon_dun01,0,0	monster	Zipper Bear	1417,33,5000
+gon_dun01,0,0	monster	Yellow Plant	1081,11,5000
+gon_dun01,0,0	monster	White Plant	1082,11,5000
 gon_dun01,0,0	monster	Red Plant	1078,5,5000

 //==================================================
 // gon_dun02 - Hermit's Checkers
 //==================================================
-gon_dun02,0,0	monster	Enchanted Peach Tree	1410,21,5000
-gon_dun02,0,0	monster	Taoist Hermit	1412,20,5000
-gon_dun02,0,0	monster	Bloody Butterfly	1408,20,5000
-gon_dun02,0,0	monster	Baby Leopard	1415,6,5000
-gon_dun02,0,0	monster	Yellow Plant	1081,10,5000
+gon_dun02,0,0	monster	Enchanted Peach Tree	1410,27,5000
+gon_dun02,0,0	monster	Taoist Hermit	1412,26,5000
+gon_dun02,0,0	monster	Bloody Butterfly	1408,26,5000
+gon_dun02,0,0	monster	Baby Leopard	1415,7,5000
+gon_dun02,0,0	monster	Yellow Plant	1081,13,5000

 //==================================================
 // gon_dun03 - Arcadia
 //==================================================
-gon_dun03,0,0	monster	Evil Nymph	1416,50,5000
-gon_dun03,0,0	monster	Taoist Hermit	1412,30,5000
-gon_dun03,0,0	monster	Hermit Plant	1413,20,5000
+gon_dun03,0,0	monster	Evil Nymph	1416,67,5000
+gon_dun03,0,0	monster	Taoist Hermit	1412,40,5000
+gon_dun03,0,0	monster	Hermit Plant	1413,26,5000
 gon_dun03,0,0,0,0	boss_monster	Evil Snake Lord	1418,1,5650000,600000,0
-gon_dun03,0,0	monster	White Plant	1082,10,5000
+gon_dun03,0,0	monster	White Plant	1082,13,5000
--- a/npc/re/mobs/dungeons/ice_dun.txt
+++ b/npc/re/mobs/dungeons/ice_dun.txt
@@ -3,19 +3,20 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.0 First version from jAthena [Playtester]
 //= 1.1 More accurate spawns [Playtester]
 //= 1.2 Removed Ktullanux spawn, quest implemented [L0ne_W0lf]
+//= 1.3 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 //==================================================
 // ice_dun01 - Ice Cave
 //==================================================
-ice_dun01,0,0	monster	Siroma	1776,75,5000
+ice_dun01,0,0	monster	Siroma	1776,76,5000
 ice_dun01,0,0	monster	Roween	1782,5,5000
 ice_dun01,0,0	monster	Muscipular	1780,5,5000
 ice_dun01,0,0	monster	Gazeti	1778,2,5000
--- a/npc/re/mobs/dungeons/in_sphinx.txt
+++ b/npc/re/mobs/dungeons/in_sphinx.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
@@ -11,46 +11,47 @@
 //= 1.2 Replaced Marduk with Anubis on F4 and F5 [Playtester]
 //= 1.3 More accurate spawns [Playtester]
 //= 1.4 Corrected MVP spawn variance. [L0ne_W0lf]
+//= 1.5 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 //==================================================
 // in_sphinx1 - Sphinx
 //==================================================
-in_sphinx1,0,0	monster	Drainliar	1111,40,5000
-in_sphinx1,0,0	monster	Requiem	1164,20,5000
-in_sphinx1,0,0	monster	Zerom	1178,20,5000
-in_sphinx1,0,0	monster	Matyr	1146,10,5000
+in_sphinx1,0,0	monster	Drainliar	1111,76,5000
+in_sphinx1,0,0	monster	Requiem	1164,38,5000
+in_sphinx1,0,0	monster	Zerom	1178,38,5000
+in_sphinx1,0,0	monster	Matyr	1146,19,5000

 //==================================================
 // in_sphinx2 - Sphinx
 //==================================================
-in_sphinx2,0,0	monster	Requiem	1164,50,5000
-in_sphinx2,0,0	monster	Zerom	1178,50,5000
-in_sphinx2,0,0	monster	Matyr	1146,20,5000
-in_sphinx2,0,0	monster	Drainliar	1111,15,5000
+in_sphinx2,0,0	monster	Requiem	1164,80,5000
+in_sphinx2,0,0	monster	Zerom	1178,80,5000
+in_sphinx2,0,0	monster	Matyr	1146,32,5000
+in_sphinx2,0,0	monster	Drainliar	1111,24,5000

 //==================================================
 // in_sphinx3 - Sphinx
 //==================================================
-in_sphinx3,0,0	monster	Marduk	1140,65,5000
-in_sphinx3,0,0	monster	Matyr	1146,15,5000
-in_sphinx3,0,0	monster	Mimic	1191,5,5000
-in_sphinx3,0,0	monster	Pasana	1154,5,5000
+in_sphinx3,0,0	monster	Marduk	1140,82,5000
+in_sphinx3,0,0	monster	Matyr	1146,18,5000
+in_sphinx3,0,0	monster	Mimic	1191,6,5000
+in_sphinx3,0,0	monster	Pasana	1154,6,5000

 //==================================================
 // in_sphinx4 - Sphinx
 //==================================================
-in_sphinx4,0,0	monster	Minorous	1149,50,5000
-in_sphinx4,0,0	monster	Pasana	1154,20,5000
-in_sphinx4,0,0	monster	Anubis	1098,15,5000
-in_sphinx4,0,0	monster	Mimic	1191,4,5000
+in_sphinx4,0,0	monster	Minorous	1149,77,5000
+in_sphinx4,0,0	monster	Pasana	1154,30,5000
+in_sphinx4,0,0	monster	Anubis	1098,23,5000
+in_sphinx4,0,0	monster	Mimic	1191,6,5000

 //==================================================
 // in_sphinx5 - Sphinx
 //==================================================
-in_sphinx5,0,0	monster	Pasana	1154,70,5000
-in_sphinx5,0,0	monster	Side Winder	1037,20,5000
-in_sphinx5,0,0	monster	Matyr	1146,10,5000
-in_sphinx5,0,0	monster	Anubis	1098,10,5000
+in_sphinx5,0,0	monster	Pasana	1154,79,5000
+in_sphinx5,0,0	monster	Side Winder	1037,22,5000
+in_sphinx5,0,0	monster	Matyr	1146,11,5000
+in_sphinx5,0,0	monster	Anubis	1098,11,5000
 in_sphinx5,0,0	monster	Mimic	1191,7,5000
 in_sphinx5,0,0,0,0	boss_monster	Pharaoh	1157,1,3600000,600000,1
--- a/npc/re/mobs/dungeons/iz_dun.txt
+++ b/npc/re/mobs/dungeons/iz_dun.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
@@ -11,17 +11,18 @@
 //= 1.2 More accurate spawns [Playtester]
 //= 1.3 Added Izlude Dungeon F6 spawns [Chilly]
 //= 1.4 Official F6 spawns.
+//= 1.5 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 //==================================================
 // iz_dun00 - Undersea Tunnel
 //==================================================
-iz_dun00,0,0	monster	Plankton	1161,65,5000
-iz_dun00,0,0	monster	Marina	1141,45,5000
-iz_dun00,0,0	monster	Vadon	1066,15,5000
-iz_dun00,0,0	monster	Kukre	1070,15,5000
-iz_dun00,0,0	monster	Hydra	1068,15,5000
-iz_dun00,0,0	monster	Black Mushroom	1084,5,180000,90000
+iz_dun00,0,0	monster	Plankton	1161,88,5000
+iz_dun00,0,0	monster	Marina	1141,61,5000
+iz_dun00,0,0	monster	Vadon	1066,20,5000
+iz_dun00,0,0	monster	Kukre	1070,20,5000
+iz_dun00,0,0	monster	Hydra	1068,20,5000
+iz_dun00,0,0	monster	Black Mushroom	1084,6,180000,90000

 //==================================================
 // iz_dun01 - Undersea Tunnel
@@ -86,10 +87,10 @@ iz_dun03,197,144	monster	Hydra	1068,1,2960000,150000
 //==================================================
 // iz_dun04 - Undersea Tunnel
 //==================================================
-iz_dun04,0,0	monster	Merman	1264,52,5000
-iz_dun04,0,0	monster	Strouf	1065,50,5000
-iz_dun04,0,0	monster	Marine Sphere	1142,10,5000
-iz_dun04,0,0	monster	Swordfish	1069,10,5000
+iz_dun04,0,0	monster	Merman	1264,61,5000
+iz_dun04,0,0	monster	Strouf	1065,58,5000
+iz_dun04,0,0	monster	Marine Sphere	1142,11,5000
+iz_dun04,0,0	monster	Swordfish	1069,11,5000
 iz_dun04,0,0	monster	Deviace	1108,3,5000
 iz_dun04,80,246	monster	Hydra	1068,1,294000,150000
 iz_dun04,79,246	monster	Hydra	1068,1,300000,150000
--- a/npc/re/mobs/dungeons/kh_dun.txt
+++ b/npc/re/mobs/dungeons/kh_dun.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
@@ -11,26 +11,27 @@
 //= 1.1 Added official mob types [Playtester]
 //= 1.2 Updated amounts [Playtester]
 //= 1.3 More accurate spawns [Playtester]
+//= 1.4 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 //==================================================
 // kh_dun01 - Robot Factory level 1 
 //==================================================
-kh_dun01,0,0	monster	Aliza	1737,45,5000
-kh_dun01,0,0	monster	Alice	1275,25,5000
-kh_dun01,0,0	monster	Constant	1738,8,5000
-kh_dun01,0,0	monster	Constant	1745,5,5000
+kh_dun01,0,0	monster	Aliza	1737,55,5000
+kh_dun01,0,0	monster	Alice	1275,30,5000
+kh_dun01,0,0	monster	Constant	1738,9,5000
+kh_dun01,0,0	monster	Constant	1745,6,5000
 kh_dun01,0,0	monster	Alicel	1735,3,5000
 kh_dun01,0,0	monster	Aliot	1736,3,5000

 //==================================================
 // kh_dun02 - Robot Factory level 2
 //==================================================
-kh_dun02,0,0	monster	Alicel	1735,30,5000
-kh_dun02,0,0	monster	Aliot	1736,25,5000
-kh_dun02,0,0	monster	Constant	1738,15,5000
-kh_dun02,0,0	monster	Aliza	1737,10,5000
-kh_dun02,0,0	monster	Constant	1745,5,5000
+kh_dun02,0,0	monster	Alicel	1735,41,5000
+kh_dun02,0,0	monster	Aliot	1736,34,5000
+kh_dun02,0,0	monster	Constant	1738,20,5000
+kh_dun02,0,0	monster	Aliza	1737,13,5000
+kh_dun02,0,0	monster	Constant	1745,6,5000
 kh_dun02,0,0,0,0	boss_monster	Kiel D-01	1734,1,7200000,600000,0

 //==================================================
--- a/npc/re/mobs/dungeons/lhz_dun.txt
+++ b/npc/re/mobs/dungeons/lhz_dun.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= The Prometheus Project, rAthena Dev Team
 //===== Current Version: =====================================
-//= 2.0
+//= 2.1
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
@@ -23,12 +23,13 @@
 //= 1.8 Corrected MVP spawn variance (Labs2 MVP). [L0ne_W0lf]
 //= 1.9 Added Bio4 spawns. [Chilly]
 //= 2.0 Updated Bio4 spawns.
+//= 2.1 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 //==================================================
 // lhz_dun01 - Somatology Laboratory
 //==================================================
-lhz_dun01,0,0	monster	Remover	1682,100,5000
+lhz_dun01,0,0	monster	Remover	1682,101,5000
 lhz_dun01,0,0	monster	Anopheles	1627,70,5000
 lhz_dun01,0,0	monster	Metaling	1613,50,5000
 lhz_dun01,0,0	monster	Kavach Icarus	1656,13,5000
--- a/npc/re/mobs/dungeons/lou_dun.txt
+++ b/npc/re/mobs/dungeons/lou_dun.txt
@@ -3,23 +3,24 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.1 Updated by MasterOfMuppets
 //= 1.2 Added Bacsojin and Chung E [MasterOfMuppets]
 //= 1.3 Corrected MVP spawn variance. [L0ne_W0lf]
+//= 1.4 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 //==================================================
 // lou_dun01 - The Royal Tomb 
 //==================================================
-lou_dun01,0,0	monster	Jing Guai	1517,45,5000
-lou_dun01,0,0	monster	Grizzly	1381,15,5000
-lou_dun01,0,0	monster	Mi Gao	1516,15,5000
-lou_dun01,0,0	monster	Horong	1129,15,5000
-lou_dun01,0,0	monster	Side Winder	1037,10,5000
+lou_dun01,0,0	monster	Jing Guai	1517,52,5000
+lou_dun01,0,0	monster	Grizzly	1381,17,5000
+lou_dun01,0,0	monster	Mi Gao	1516,17,5000
+lou_dun01,0,0	monster	Horong	1129,17,5000
+lou_dun01,0,0	monster	Side Winder	1037,11,5000
 lou_dun01,0,0	monster	Leib Olmai	1306,1,300000,120000
 lou_dun01,197,77,10,10	monster	Black Mushroom	1084,5,5000
 lou_dun01,0,0	monster	Shining Plant	1083,5,5000
@@ -27,17 +28,17 @@ lou_dun01,0,0	monster	Shining Plant	1083,5,5000
 //==================================================
 // lou_dun02 - Inside the Royal Tomb
 //==================================================
-lou_dun02,0,0	monster	Yao Jun	1512,40,5000
-lou_dun02,0,0	monster	Munak	1026,25,5000
-lou_dun02,0,0	monster	Mimic	1191,5,5000
-lou_dun02,0,0	monster	Zhu Po Long	1514,5,5000
+lou_dun02,0,0	monster	Yao Jun	1512,56,5000
+lou_dun02,0,0	monster	Munak	1026,35,5000
+lou_dun02,0,0	monster	Mimic	1191,7,5000
+lou_dun02,0,0	monster	Zhu Po Long	1514,7,5000

 //==================================================
 // lou_dun03 - Suei Long Gon 
 //==================================================
-lou_dun03,0,0	monster	Zhu Po Long	1514,25,5000
-lou_dun03,0,0	monster	Yao Jun	1512,25,5000
-lou_dun03,0,0	monster	Mao Guai	1513,15,5000
-lou_dun03,0,0	monster	Green Maiden	1631,5,5000
+lou_dun03,0,0	monster	Zhu Po Long	1514,30,5000
+lou_dun03,0,0	monster	Yao Jun	1512,30,5000
+lou_dun03,0,0	monster	Mao Guai	1513,18,5000
+lou_dun03,0,0	monster	Green Maiden	1631,6,5000
 lou_dun03,0,0	monster	Green Maiden	1631,5,3000000,1800000
 lou_dun03,0,0,0,0	boss_monster	White Lady	1630,1,7000000,600000,1
--- a/npc/re/mobs/dungeons/mjo_dun.txt
+++ b/npc/re/mobs/dungeons/mjo_dun.txt
@@ -3,33 +3,34 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
+//= 1.2 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 //==================================================
 // mjo_dun01 - Mjolnir Dead Pit
 //==================================================
-mjo_dun01,0,0	monster	Tarou	1175,60,5000
-mjo_dun01,0,0	monster	Familiar	1005,30,5000
-mjo_dun01,0,0	monster	Martin	1145,20,5000
+mjo_dun01,0,0	monster	Tarou	1175,63,5000
+mjo_dun01,0,0	monster	Familiar	1005,31,5000
+mjo_dun01,0,0	monster	Martin	1145,21,5000

 //==================================================
 // mjo_dun02 - Mjolnir Dead Pit
 //==================================================
-mjo_dun02,0,0	monster	Martin	1145,60,5000
-mjo_dun02,0,0	monster	Giearth	1121,35,5000
-mjo_dun02,0,0	monster	Drainliar	1111,20,5000
-mjo_dun02,0,0	monster	Skeleton Worker	1169,20,5000
+mjo_dun02,0,0	monster	Martin	1145,71,5000
+mjo_dun02,0,0	monster	Giearth	1121,41,5000
+mjo_dun02,0,0	monster	Drainliar	1111,23,5000
+mjo_dun02,0,0	monster	Skeleton Worker	1169,23,5000

 //==================================================
 // mjo_dun03 - Mjolnir Dead Pit
 //==================================================
-mjo_dun03,0,0	monster	Skeleton Worker	1169,70,5000
-mjo_dun03,0,0	monster	Myst	1151,35,5000
+mjo_dun03,0,0	monster	Skeleton Worker	1169,78,5000
+mjo_dun03,0,0	monster	Myst	1151,39,5000
 mjo_dun03,0,0	monster	Giearth	1121,5,5000
 mjo_dun03,0,0	monster	Martin	1145,5,5000
 mjo_dun03,0,0	monster	Cramp	1209,3,5000
--- a/npc/re/mobs/dungeons/moc_pryd.txt
+++ b/npc/re/mobs/dungeons/moc_pryd.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
@@ -11,20 +11,21 @@
 //= 1.2 More accurate spawns [Playtester]
 //= 1.3 Corrected MVP spawn variance. [L0ne_W0lf]
 //= 1.4 Added Nightmare spawns. [Euphy]
+//= 1.5 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 //==================================================
 // moc_pryd01 - Inside Pyramid F1
 //==================================================
-moc_pryd01,0,0	monster	Familiar	1005,50,5000
-moc_pryd01,0,0	monster	Poporing	1031,20,5000
+moc_pryd01,0,0	monster	Familiar	1005,72,5000
+moc_pryd01,0,0	monster	Poporing	1031,28,5000

 //==================================================
 // moc_pryd02 - Inside Pyramid F2
 //==================================================
-moc_pryd02,0,0	monster	Mummy	1041,30,5000
-moc_pryd02,0,0	monster	Soldier Skeleton	1028,30,5000
-moc_pryd02,0,0	monster	Archer Skeleton	1016,30,5000
+moc_pryd02,0,0	monster	Mummy	1041,31,5000
+moc_pryd02,0,0	monster	Soldier Skeleton	1028,31,5000
+moc_pryd02,0,0	monster	Archer Skeleton	1016,31,5000
 moc_pryd02,0,0	monster	Drainliar	1111,20,5000
 moc_pryd02,0,0	monster	Poporing	1031,20,5000
 moc_pryd02,0,0	monster	Isis	1029,5,5000
@@ -41,41 +42,41 @@ moc_pryd03,0,0	monster	Mimic	1191,5,5000
 //==================================================
 // moc_pryd04 - Inside Pyramid F4
 //==================================================
-moc_pryd04,0,0	monster	Isis	1029,50,5000
-moc_pryd04,0,0	monster	Mummy	1041,25,5000
-moc_pryd04,0,0	monster	Matyr	1146,20,5000
-moc_pryd04,0,0	monster	Mimic	1191,15,5000
+moc_pryd04,0,0	monster	Isis	1029,62,5000
+moc_pryd04,0,0	monster	Mummy	1041,31,5000
+moc_pryd04,0,0	monster	Matyr	1146,24,5000
+moc_pryd04,0,0	monster	Mimic	1191,18,5000
 moc_pryd04,0,0	monster	Ancient Mummy	1297,3,5000
 moc_pryd04,0,0,0,0	boss_monster	Osiris	1038,1,3600000,600000,0

 //==================================================
 // moc_pryd05 - Inside Pyramid B1
 //==================================================
-moc_pryd05,0,0	monster	Minorous	1149,60,5000
-moc_pryd05,0,0	monster	Verit	1032,50,5000
-moc_pryd05,0,0	monster	Mummy	1041,10,5000
+moc_pryd05,0,0	monster	Minorous	1149,78,5000
+moc_pryd05,0,0	monster	Verit	1032,65,5000
+moc_pryd05,0,0	monster	Mummy	1041,13,5000

 //==================================================
 // moc_pryd06 - Inside Pyramid B2
 //==================================================
-moc_pryd06,0,0	monster	Mimic	1191,30,5000
-moc_pryd06,0,0	monster	Verit	1032,30,5000
-moc_pryd06,0,0	monster	Arclouze	1194,20,5000
-moc_pryd06,0,0	monster	Ancient Mummy	1297,20,5000
+moc_pryd06,0,0	monster	Mimic	1191,35,5000
+moc_pryd06,0,0	monster	Verit	1032,35,5000
+moc_pryd06,0,0	monster	Arclouze	1194,23,5000
+moc_pryd06,0,0	monster	Ancient Mummy	1297,23,5000
 moc_pryd06,102,85,1,1	boss_monster	Amon Ra	1511,1,3600000,600000,0

 //==================================================
 // moc_prydn1 - Nightmare Mode B1
 //==================================================
-moc_prydn1,0,0	monster	Nightmare Minorous	2353,60,5000
-moc_prydn1,0,0	monster	Nightmare Mummy	2354,10,5000
-moc_prydn1,0,0	monster	Nightmare Verit	2355,50,5000
+moc_prydn1,0,0	monster	Nightmare Minorous	2353,78,5000
+moc_prydn1,0,0	monster	Nightmare Mummy	2354,13,5000
+moc_prydn1,0,0	monster	Nightmare Verit	2355,65,5000

 //==================================================
 // moc_prydn2 - Nightmare Mode B2
 //==================================================
-moc_prydn2,0,0	monster	Nightmare Mimic	2356,30,5000
-moc_prydn2,0,0	monster	Nightmare Verit	2355,30,5000
-moc_prydn2,0,0	monster	Nightmare Arclouze	2358,20,5000
-moc_prydn2,0,0	monster	Nightmare Ancient Mummy	2360,20,5000
+moc_prydn2,0,0	monster	Nightmare Mimic	2356,35,5000
+moc_prydn2,0,0	monster	Nightmare Verit	2355,35,5000
+moc_prydn2,0,0	monster	Nightmare Arclouze	2358,23,5000
+moc_prydn2,0,0	monster	Nightmare Ancient Mummy	2360,23,5000
 moc_prydn2,102,85,1,1	boss_monster	Nightmare Amon Ra	2362,1,3600000,600000,1
--- a/npc/re/mobs/dungeons/mosk_dun.txt
+++ b/npc/re/mobs/dungeons/mosk_dun.txt
@@ -3,39 +3,40 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.0 Added spawns [Playtester]
 //= 1.1 Swapped named according to mob db. [L0ne_W0lf]
 //= 1.2 Fixed the mob names (iRO names) [Playtester]
-//= 1.2 Updated spawns kinda. [Kisuka]
+//= 1.3 Updated spawns kinda. [Kisuka]
+//= 1.4 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 //==================================================
 // mosk_dun01 - Les Forest
 //==================================================
-mosk_dun01,0,0	monster	Wood Goblin	1880,66,5000
-mosk_dun01,0,0	monster	Les	1881,33,5000
-mosk_dun01,0,0	monster	Poporing	1031,20,5000
-mosk_dun01,0,0	monster	Mantis	1139,10,5000
+mosk_dun01,0,0	monster	Wood Goblin	1880,74,5000
+mosk_dun01,0,0	monster	Les	1881,37,5000
+mosk_dun01,0,0	monster	Poporing	1031,22,5000
+mosk_dun01,0,0	monster	Mantis	1139,11,5000

 //==================================================
 // mosk_dun02 - Temny Forest
 //==================================================
-mosk_dun02,0,0	monster	Les	1881,40,5000
-mosk_dun02,0,0	monster	Wood Goblin	1880,30,5000
-mosk_dun02,0,0	monster	Baba Yaga	1882,20,5000
+mosk_dun02,0,0	monster	Les	1881,47,5000
+mosk_dun02,0,0	monster	Wood Goblin	1880,35,5000
+mosk_dun02,0,0	monster	Baba Yaga	1882,23,5000
 mosk_dun02,0,0	monster	Uzhas	1883,5,5000

 //==================================================
 // mosk_dun03 - Dremuci Forest
 //==================================================
-mosk_dun03,0,0	monster	Baba Yaga	1882,60,5000
-mosk_dun03,0,0	monster	Uzhas	1883,35,5000
-mosk_dun03,0,0	monster	Mavka	1884,15,5000
+mosk_dun03,0,0	monster	Baba Yaga	1882,68,5000
+mosk_dun03,0,0	monster	Uzhas	1883,39,5000
+mosk_dun03,0,0	monster	Mavka	1884,17,5000
 mosk_dun03,207,221,5,5	boss_monster	Gopinich	1885,1,7200000,600000,1
-mosk_dun03,0,0	monster	Yellow Plant	1081,10,5000
-mosk_dun03,0,0	monster	White Plant	1082,10,5000
+mosk_dun03,0,0	monster	Yellow Plant	1081,11,5000
+mosk_dun03,0,0	monster	White Plant	1082,11,5000
 mosk_dun03,0,0	monster	Shining Plant	1083,5,10000
--- a/npc/re/mobs/dungeons/odin.txt
+++ b/npc/re/mobs/dungeons/odin.txt
@@ -3,53 +3,54 @@
 //===== By: ==================================================
 //= Poki#3 (0.1)
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.0 Updated by using Tharis' Homun AI, by Tharis [Vicious]
 //= 1.1 More accurate spawns [Playtester]
 //= 1.2 Corrected MVP spawn variance. [L0ne_W0lf]
+//= 1.3 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 //==================================================
 // odin_tem01 - Odin Shrine
 //==================================================
-odin_tem01,0,0	monster	Plasma	1693,10,5000
-odin_tem01,0,0	monster	Breeze	1692,10,5000
-odin_tem01,0,0	monster	Frus	1753,5,5000
-odin_tem01,0,0	monster	Skogul	1752,5,5000
-odin_tem01,0,0	monster	Plasma	1697,3,5000
-odin_tem01,0,0	monster	Plasma	1695,3,5000
-odin_tem01,0,0	monster	Plasma	1696,3,5000
-odin_tem01,0,0	monster	Plasma	1694,3,5000
-odin_tem01,0,0	monster	Green Plant	1080,5,60000,30000
-odin_tem01,0,0	monster	Yellow Plant	1081,5,60000,30000
-odin_tem01,0,0	monster	Blue Plant	1079,5,600000,300000
+odin_tem01,0,0	monster	Plasma	1693,14,5000
+odin_tem01,0,0	monster	Breeze	1692,14,5000
+odin_tem01,0,0	monster	Frus	1753,7,5000
+odin_tem01,0,0	monster	Skogul	1752,7,5000
+odin_tem01,0,0	monster	Plasma	1697,4,5000
+odin_tem01,0,0	monster	Plasma	1695,4,5000
+odin_tem01,0,0	monster	Plasma	1696,4,5000
+odin_tem01,0,0	monster	Plasma	1694,4,5000
+odin_tem01,0,0	monster	Green Plant	1080,7,60000,30000
+odin_tem01,0,0	monster	Yellow Plant	1081,7,60000,30000
+odin_tem01,0,0	monster	Blue Plant	1079,7,600000,300000

 //==================================================
 // odin_tem02 - Odin Shrine
 //==================================================
-odin_tem02,0,0	monster	Skogul	1752,30,5000
-odin_tem02,0,0	monster	Frus	1753,30,5000
-odin_tem02,0,0	monster	Plasma	1693,15,5000
-odin_tem02,0,0	monster	Frus	1762,3,5000
+odin_tem02,0,0	monster	Skogul	1752,40,5000
+odin_tem02,0,0	monster	Frus	1753,40,5000
+odin_tem02,0,0	monster	Plasma	1693,20,5000
+odin_tem02,0,0	monster	Frus	1762,4,5000
 odin_tem02,0,0	monster	Skogul	1761,2,5000
 odin_tem02,0,0	monster	Skeggiold	1754,1,5000
 odin_tem02,0,0	monster	Skeggiold	1755,1,5000
-odin_tem02,0,0	monster	Blue Plant	1079,10,1800000,900000
+odin_tem02,0,0	monster	Blue Plant	1079,13,1800000,900000

 //==================================================
 // odin_tem03 - Odin Shrine
 //==================================================
-odin_tem03,0,0	monster	Plasma	1693,20,5000
-odin_tem03,0,0	monster	Skeggiold	1754,16,5000
-odin_tem03,0,0	monster	Skeggiold	1755,16,5000
-odin_tem03,0,0	monster	Skogul	1761,5,5000
-odin_tem03,0,0	monster	Frus	1762,5,5000
+odin_tem03,0,0	monster	Plasma	1693,24,5000
+odin_tem03,0,0	monster	Skeggiold	1754,19,5000
+odin_tem03,0,0	monster	Skeggiold	1755,19,5000
+odin_tem03,0,0	monster	Skogul	1761,6,5000
+odin_tem03,0,0	monster	Frus	1762,6,5000
 odin_tem03,0,0	monster	Skogul	1752,4,5000
 odin_tem03,0,0	monster	Frus	1753,4,5000
 odin_tem03,0,0	monster	Valkyrie	1765,2,5400000,1800000
 odin_tem03,0,0,0,0	boss_monster	Valkyrie Randgris	1751,1,28800000,600000,1
-odin_tem03,0,0	monster	Blue Plant	1079,15,1800000,900000
-odin_tem03,0,0	monster	Shining Plant	1083,15,1800000,900000
+odin_tem03,0,0	monster	Blue Plant	1079,18,1800000,900000
+odin_tem03,0,0	monster	Shining Plant	1083,18,1800000,900000
--- a/npc/re/mobs/dungeons/pay_dun.txt
+++ b/npc/re/mobs/dungeons/pay_dun.txt
@@ -3,13 +3,14 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
 //= 1.2 Small spawn update [Playtester]
 //= 1.3 Corrected MVP spawn variance. [L0ne_W0lf]
+//= 1.4 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 //==================================================
@@ -25,9 +26,9 @@ pay_dun00,140,140,5,5	monster	Black Mushroom	1084,3,360000,180000
 //==================================================
 // pay_dun01 - Payon Cave
 //==================================================
-pay_dun01,0,0	monster	Soldier Skeleton	1028,50,5000
-pay_dun01,0,0	monster	Archer Skeleton	1016,30,5000
-pay_dun01,0,0	monster	Eggyra	1116,15,5000
+pay_dun01,0,0	monster	Soldier Skeleton	1028,53,5000
+pay_dun01,0,0	monster	Archer Skeleton	1016,32,5000
+pay_dun01,0,0	monster	Eggyra	1116,16,5000
 pay_dun01,0,0	monster	Drainliar	1111,5,5000
 pay_dun01,235,54,10,10	monster	Black Mushroom	1084,7,900000,450000
 pay_dun01,0,0	monster	Red Plant	1078,10,180000,90000
--- a/npc/re/mobs/dungeons/prt_maze.txt
+++ b/npc/re/mobs/dungeons/prt_maze.txt
@@ -3,13 +3,14 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.2 Official kRO 10.1 spawns [Playtester]
 //= 1.3 Some small fixes [Playtester]
 //= 1.4 Corrected MVP spawn variance. [L0ne_W0lf]
+//= 1.5 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 //==================================================
@@ -63,15 +64,15 @@ prt_maze01,168,60,3,3	monster	Red Mushroom	1085,2,180000,90000
 //==================================================
 // prt_maze02 - Labyrinth Forest
 //==================================================
-prt_maze02,0,0	monster	Poporing	1031,25,5000
-prt_maze02,0,0	monster	Bigfoot	1060,5,5000
+prt_maze02,0,0	monster	Poporing	1031,32,5000
+prt_maze02,0,0	monster	Bigfoot	1060,6,5000
 prt_maze02,0,0	monster	Sasquatch	1243,1,900000,40000
 prt_maze02,0,0	monster	Leib Olmai	1306,1,1800000,900000

 //==================================================
 // prt_maze03 - Labyrinth Forest
 //==================================================
-prt_maze03,0,0	monster	Poporing	1031,45,5000
+prt_maze03,0,0	monster	Poporing	1031,52,5000
 prt_maze03,0,0	monster	Hunter Fly	1035,30,5000
 prt_maze03,170,170,70,70	monster	Mantis	1139,30,60000,30000
 prt_maze03,100,100,80,80	monster	Baphomet Jr.	1101,25,5000,0,0
--- a/npc/re/mobs/dungeons/prt_q.txt
+++ b/npc/re/mobs/dungeons/prt_q.txt
@@ -2,13 +2,18 @@
 //= Episode 16.1 Monsters Spawn Script
 //===== Description: =========================================
 //= Spawns monsters in prt_q.
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= rAthena Project
 //===== Additional Comments: =================================
 //= 1.0 First version. [Capuche]
+//= 1.1 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 // Prontera Invasion
 prt_q,0,0	monster	Zombie Guard	3452,60
 prt_q,0,0	monster	Ghoul	1036,10
 prt_q,0,0	monster	Immortal Corps	3451,30
-prt_q,0,0	monster	Hunter Fly	1035,15
+prt_q,0,0	monster	Hunter Fly	1035,10
 prt_q,0,0	monster	Immortal Commander	3490,1
--- a/npc/re/mobs/dungeons/prt_sew.txt
+++ b/npc/re/mobs/dungeons/prt_sew.txt
@@ -3,28 +3,29 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
 //= 1.2 Corrected MVP spawn variance. [L0ne_W0lf]
+//= 1.3 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 //==================================================
 // prt_sewb1 - Prontera Culvert 
 //==================================================
-prt_sewb1,0,0	monster	Thief Bug	1051,30,5000
-prt_sewb1,0,0	monster	Thief Bug Egg	1048,80,5000
-prt_sewb1,0,0	monster	Tarou	1175,10,5000
-prt_sewb1,0,0	monster	Familiar	1005,10,5000
+prt_sewb1,0,0	monster	Thief Bug	1051,40,5000
+prt_sewb1,0,0	monster	Thief Bug Egg	1048,106,5000
+prt_sewb1,0,0	monster	Tarou	1175,13,5000
+prt_sewb1,0,0	monster	Familiar	1005,66,5000

 //==================================================
 // prt_sewb2 - Prontera Culvert
 //==================================================
 prt_sewb2,0,0	monster	Thief Bug	1051,70,5000
 prt_sewb2,0,0	monster	Tarou	1175,60,5000
-prt_sewb2,0,0	monster	Plankton	1161,30,5000
+prt_sewb2,0,0	monster	Plankton	1161,5,5000
 prt_sewb2,0,0	monster	Thief Bug Egg	1048,20,5000
 prt_sewb2,0,0	monster	Spore	1014,20,5000
 prt_sewb2,0,0	monster	Thief Bug Female	1053,10,5000
--- a/npc/re/mobs/dungeons/ra_san.txt
+++ b/npc/re/mobs/dungeons/ra_san.txt
@@ -3,13 +3,14 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.0 First version with guessed amounts [Playtester]
 //= 1.1 More accurate spawns [Playtester]
 //= 1.2 Corrected MVP spawn variance. [L0ne_W0lf]
+//= 1.3 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 //==================================================
@@ -24,25 +25,25 @@ ra_san01,0,0	monster	Hodremlin	1773,6,5000
 //==================================================
 // ra_san02 - Holy Ground 
 //==================================================
-ra_san02,0,0	monster	Isilla	1772,85,5000
-ra_san02,0,0	monster	Vanberk	1771,30,5000
-ra_san02,0,0	monster	Gremlin	1632,10,5000
-ra_san02,0,0	monster	Beholder	1633,10,5000
+ra_san02,0,0	monster	Isilla	1772,110,5000
+ra_san02,0,0	monster	Vanberk	1771,38,5000
+ra_san02,0,0	monster	Gremlin	1632,12,5000
+ra_san02,0,0	monster	Beholder	1633,12,5000
 ra_san02,0,0	monster	Hodremlin	1773,3,5000
 ra_san02,0,0	monster	Seeker	1774,2,5000

 //==================================================
 // ra_san03 - Holy Ground
 //==================================================
-ra_san03,0,0	monster	Hodremlin	1773,60,5000
-ra_san03,0,0	monster	Seeker	1774,40,5000
-ra_san03,0,0	monster	Gremlin	1632,5,5000
-ra_san03,0,0	monster	Beholder	1633,5,5000
+ra_san03,0,0	monster	Hodremlin	1773,86,5000
+ra_san03,0,0	monster	Seeker	1774,57,5000
+ra_san03,0,0	monster	Gremlin	1632,7,5000
+ra_san03,0,0	monster	Beholder	1633,7,5000

 //==================================================
 // ra_san04 - Holy Ground
 //==================================================
-ra_san04,0,0	monster	Echio	1770,60,5000
+ra_san04,0,0	monster	Echio	1770,62,5000
 ra_san04,0,0	monster	Agav	1769,20,5000
 ra_san04,0,0	monster	Seeker	1774,10,5000
 ra_san04,0,0	monster	Hodremlin	1773,10,5000
@@ -50,9 +51,9 @@ ra_san04,0,0	monster	Hodremlin	1773,10,5000
 //==================================================
 // ra_san05 - Holy Ground
 //==================================================
-ra_san05,0,0	monster	Agav	1769,80,5000
-ra_san05,0,0	monster	Echio	1770,30,5000
-ra_san05,0,0	monster	Seeker	1774,20,5000
-ra_san05,0,0	monster	Hodremlin	1773,20,5000
+ra_san05,0,0	monster	Agav	1769,84,5000
+ra_san05,0,0	monster	Echio	1770,31,5000
+ra_san05,0,0	monster	Seeker	1774,21,5000
+ra_san05,0,0	monster	Hodremlin	1773,21,5000
 ra_san05,0,0	monster	Isilla	1772,10,5000
 ra_san05,0,0,0,0	boss_monster	Gloom Under Night	1768,1,18000000,600000,0
--- a/npc/re/mobs/dungeons/rockridge.txt
+++ b/npc/re/mobs/dungeons/rockridge.txt
@@ -1,23 +1,29 @@
 //===== rAthena Script =======================================
 //= Rock Ridge Monsters Spawn Script
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= rAthena Project
 //===== Additional Comments: =================================
 //= 1.0 First version. [Capuche]
+//= 1.1 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 // Rock Ridge Mine
-rockmi1,0,0	monster	Thief Bug	1051,3
-rockmi1,0,0	monster	Gaster	3740,18
-rockmi1,0,0	monster	Elite Buffalo Bandit	3747,3
-rockmi1,0,0	monster	Elite Buffalo Bandit	3748,8
-rockmi1,0,0	monster	Elite Buffalo Bandit	3749,6
+rockmi1,0,0	monster	Thief Bug	1051,10
+rockmi1,0,0	monster	Gaster	3740,40
+rockmi1,0,0	monster	Elite Buffalo Bandit	3747,10
+rockmi1,0,0	monster	Elite Buffalo Bandit	3748,20
+rockmi1,0,0	monster	Elite Buffalo Bandit	3749,30
 rockmi1,0,0	boss_monster	Spider Chariot	3741,1,7200000,600000,1

 // Rock Ridge Mine
 rockmi2,100,36,20,20	monster	Purple Ore	3742,31

 // Culvert
-harboro2,0,0	monster	Swamp Arclouze	3787,29
-harboro2,0,0	monster	Brown Rat	3788,29
+harboro2,0,0	monster	Swamp Arclouze	3787,30
+harboro2,0,0	monster	Brown Rat	3788,30
 harboro2,0,0	monster	Anopheles	1627,10
-harboro2,0,0	monster	Black Mushroom	1084,19
+harboro2,0,0	monster	Black Mushroom	1084,20
+harboro2,0,0	monster	Thief Bug	1051,10
 harboro2,50,259,10,6	monster	Sea Anemone	3743,20
--- a/npc/re/mobs/dungeons/tha_t.txt
+++ b/npc/re/mobs/dungeons/tha_t.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
@@ -11,6 +11,7 @@
 //= 1.1 More official spawns [Playtester]
 //= 1.2 Updated by using Tharis' Homun AI, by Tharis [Vicious]
 //= 1.3 Official Aegis X.3 spawns [Playtester]
+//= 1.4 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 //==================================================
@@ -150,3 +151,141 @@ tha_t12,0,0	monster	Mistress of Shelter	1701,5,5000
 tha_t12,0,0	monster	Lady Solace	1703,5,5000
 tha_t12,0,0	monster	Plasma	1693,5,5000
 tha_t12,0,0	monster	Odium of Thanatos	1709,4,5000
+
+
+//============================================================
+//= Post Thanatos Revamped Patch.
+//============================================================
+//==================================================
+// tha_t01 - Thanatos Tower - Lower Level
+//==================================================
+//tha_t01,0,0	monster	Rideword	1195,37,5000
+//tha_t01,0,0	monster	Mimic	1191,37,5000
+//tha_t01,0,0	monster	Plasma	1695,37,5000
+//tha_t01,0,0	monster	Alice	1275,9,5000
+//tha_t01,0,0	monster	Lady Solace	1703,7,5000
+
+//==================================================
+// tha_t02 - Thanatos Tower - Lower Level
+//==================================================
+//tha_t02,0,0	monster	Ancient Mimic	1699,100,5000
+//tha_t02,0,0	monster	Mimic	1191,37,5000
+//tha_t02,0,0	monster	Plasma	1697,25,5000
+//tha_t02,0,0	monster	Death Word	1698,12,5000
+//tha_t02,0,0	monster	Rideword	1195,12,5000
+//tha_t02,0,0	monster	Elder	1377,12,5000
+//tha_t02,0,0	monster	Alice	1275,12,5000
+//tha_t02,0,0	monster	Baroness of Retribution	1702,5,5000
+
+//==================================================
+// tha_t03 - Thanatos Tower - Lower Level
+//==================================================
+//tha_t03,0,0	monster	Death Word	1698,92,5000
+//tha_t03,0,0	monster	Rideword	1195,34,5000
+//tha_t03,0,0	monster	Plasma	1696,23,5000
+//tha_t03,0,0	monster	Mimic	1191,11,5000
+//tha_t03,0,0	monster	Ancient Mimic	1699,11,5000
+//tha_t03,0,0	monster	Elder	1377,11,5000
+//tha_t03,0,0	monster	Mistress of Shelter	1701,4,5000
+
+//==================================================
+// tha_t04 - Thanatos Tower - Lower Level
+//==================================================
+//tha_t04,0,0	monster	Death Word	1698,20,5000
+//tha_t04,0,0	monster	Rideword	1195,20,5000
+//tha_t04,0,0	monster	Mimic	1191,20,5000
+//tha_t04,0,0	monster	Ancient Mimic	1699,20,5000
+//tha_t04,0,0	monster	Elder	1377,20,5000
+//tha_t04,0,0	monster	Plasma	1694,20,5000
+//tha_t04,0,0	monster	Owl Duke	1320,10,5000
+//tha_t04,0,0	monster	Owl Baron	1295,10,5000
+//tha_t04,0,0	monster	Dame of Sentinel	1700,4,5000
+
+//==================================================
+// tha_t05 - Thanatos Tower - Upper Level
+//==================================================
+//tha_t05,0,0	monster	Owl Duke	1320,80,5000
+//tha_t05,0,0	monster	Death Word	1698,40,5000
+//tha_t05,0,0	monster	Ancient Mimic	1699,40,5000
+//tha_t05,0,0	monster	Owl Baron	1295,20,5000
+//tha_t05,0,0	monster	Elder	1377,20,5000
+//tha_t05,0,0	monster	Plasma	1696,10,5000
+//tha_t05,0,0	monster	Plasma	1695,10,5000
+//tha_t05,0,0	monster	Plasma	1697,10,5000
+//tha_t05,0,0	monster	Plasma	1694,10,5000
+//tha_t05,0,0	monster	Dolor of Thanatos	1707,2,5000
+
+//==================================================
+// tha_t06 - Thanatos Tower - Upper Level
+//==================================================
+//tha_t06,0,0	monster	Death Word	1698,40,5000
+//tha_t06,0,0	monster	Owl Duke	1320,40,5000
+//tha_t06,0,0	monster	Owl Baron	1295,40,5000
+//tha_t06,0,0	monster	Ancient Mimic	1699,40,5000
+//tha_t06,0,0	monster	Elder	1377,20,5000
+//tha_t06,0,0	monster	Plasma	1696,10,5000
+//tha_t06,0,0	monster	Plasma	1695,10,5000
+//tha_t06,0,0	monster	Plasma	1697,10,5000
+//tha_t06,0,0	monster	Plasma	1694,10,5000
+//tha_t06,0,0	monster	Maero of Thanatos	1706,2,5000
+
+//==================================================
+// tha_t07 - Thanatos Tower - Upper Level 
+//==================================================
+//tha_t07,0,0	monster	Baroness of Retribution	1702,15,5000
+//tha_t07,0,0	monster	Death Word	1698,10,5000
+//tha_t07,0,0	monster	Ancient Mimic	1699,10,5000
+//tha_t07,0,0	monster	Dame of Sentinel	1700,11,5000
+//tha_t07,0,0	monster	Mistress of Shelter	1701,11,5000
+//tha_t07,0,0	monster	Lady Solace	1703,11,5000
+//tha_t07,0,0	monster	Despero of Thanatos	1705,2,5000
+
+//==================================================
+// tha_t08 - Thanatos Tower - Upper Level
+//==================================================
+//tha_t08,0,0	monster	Baroness of Retribution	1702,20,5000
+//tha_t08,0,0	monster	Death Word	1698,10,5000
+//tha_t08,0,0	monster	Dame of Sentinel	1700,5,5000
+//tha_t08,0,0	monster	Odium of Thanatos	1704,7,5000
+//tha_t08,0,0	monster	Despero of Thanatos	1705,7,5000
+//tha_t08,0,0	monster	Maero of Thanatos	1706,7,5000
+//tha_t08,0,0	monster	Dolor of Thanatos	1707,7,5000
+
+//==================================================
+// tha_t09 - Thanatos Tower - Upper Level
+//==================================================
+//tha_t09,0,0	monster	Void Mimic	20779,5,5000
+//tha_t09,0,0	monster	Book of Death	20780,5,5000
+//tha_t09,0,0	monster	Eldest	20781,5,5000
+//tha_t09,0,0	monster	Crow Duke	20782,10,5000
+//tha_t09,0,0	monster	Crow Braon	20783,15,5000
+
+//==================================================
+// tha_t10 - Thanatos Tower - Upper Level
+//==================================================
+//tha_t10,0,0	monster	Void Mimic	20779,15,5000
+//tha_t10,0,0	monster	Book of Death	20780,15,5000
+//tha_t10,0,0	monster	Eldest	20781,13,5000
+//tha_t10,0,0	monster	Emphatizer	20773,5,5000
+//tha_t10,0,0	monster	Happy Giver	20774,5,5000
+
+//==================================================
+// tha_t11 - Thanatos Tower - Upper Level
+//==================================================
+//tha_t11,0,0	monster	Void Mimic	20779,3,5000
+//tha_t11,0,0	monster	Book of Death	20780,3,5000
+//tha_t11,0,0	monster	Emphatizer	20773,14,5000
+//tha_t11,0,0	monster	Happy Giver	20774,14,5000
+//tha_t11,0,0	monster	Pray Giver	20844,15,5000
+//tha_t11,0,0	monster	Smile Giver	20845,15,5000
+//tha_t11,0,0	monster	Resentful of Thanatos	20777,2,5000
+//tha_t11,0,0	monster	Horror of Thanatos	20776,2,5000
+
+//==================================================
+// tha_t12 - Thanatos Tower - Upper Level
+//==================================================
+//tha_t12,0,0	monster	Book of Death	20780,3,5000
+//tha_t12,0,0	monster	Anger of Thanatos	20775,13,5000
+//tha_t12,0,0	monster	Horror of Thanatos	20776,15,5000
+//tha_t12,0,0	monster	Resentful of Thanatos	20777,14,5000
+//tha_t12,0,0	monster	Regret of Thanatos	20778,15,5000
--- a/npc/re/mobs/dungeons/thor_v.txt
+++ b/npc/re/mobs/dungeons/thor_v.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Playtester
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Description: =========================================
@@ -14,14 +14,15 @@
 //= 1.2 Updated spawns according to RODE [Playtester]
 //= 1.3 More official spawns [Playtester]
 //= 1.4 Corrected MVP spawn variance. [L0ne_W0lf]
+//= 1.5 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 //==================================================
 // thor_v01 - Thor Volcano Dungeon
 //==================================================
-thor_v01,0,0	monster	Kasa	1833,45,5000
-thor_v01,0,0	monster	Imp	1837,25,5000
-thor_v01,0,0	monster	Magmaring	1836,10,5000
+thor_v01,0,0	monster	Kasa	1833,49,5000
+thor_v01,0,0	monster	Imp	1837,27,5000
+thor_v01,0,0	monster	Magmaring	1836,11,5000
 thor_v01,0,0	monster	Salamander	1831,7,5000
 thor_v01,0,0	monster	Bow Guardian	1830,5,5000
 thor_v01,0,0	monster	Sword Guardian	1829,5,5000
@@ -43,13 +44,11 @@ thor_v02,0,0	monster	Sword Guardian	1829,1,7200000
 //==================================================
 // thor_v03 - Thor Volcano Dungeon
 //==================================================
-thor_v03,0,0	monster	Salamander	1831,60,5000
-thor_v03,0,0	monster	Kasa	1833,40,5000
-thor_v03,0,0	monster	Bow Guardian	1830,10,5000
-thor_v03,0,0	monster	Sword Guardian	1829,10,5000
+thor_v03,0,0	monster	Salamander	1831,66,5000
+thor_v03,0,0	monster	Kasa	1833,44,5000
+thor_v03,0,0	monster	Bow Guardian	1830,11,5000
+thor_v03,0,0	monster	Sword Guardian	1829,11,5000
 thor_v03,0,0	monster	Byrogue	1839,5,5000
-thor_v03,0,0	monster	Sword Guardian	1829,5,5000
-thor_v03,0,0	monster	Bow Guardian	1830,5,5000
 thor_v03,0,0	monster	Bow Guardian	1830,5,1800000
 thor_v03,0,0	monster	Sword Guardian	1829,5,1800000
 thor_v03,0,0,0,0	boss_monster	Ifrit	1832,1,39600000,600000,0
--- a/npc/re/mobs/dungeons/treasure.txt
+++ b/npc/re/mobs/dungeons/treasure.txt
@@ -3,21 +3,20 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
 //= 1.2 More accurate spawns [Playtester]
 //= 1.3 Corrected MVP spawn variance. [L0ne_W0lf]
 //= 1.4 Added 14.2 Novice Version as part of Academy update. [Kisuka]
+//= 1.5 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 //==================================================
 // treasure01 - Sunken Ship
 //==================================================
-treasure01,0,0	monster	Pirate Skeleton	1071,43,5000
-treasure01,0,0	monster	Kukre	1070,20,5000
-treasure01,0,0	monster	Whisper	1179,15,5000
-treasure01,0,0	monster	Poison Spore	1077,12,5000
+treasure01,0,0	monster	Pirate Skeleton	1071,56,5000
+treasure01,0,0	monster	Kukre	1070,10,5000
 treasure01,68,66,13,11	monster	Hydra	1068,4,180000,90000
 treasure01,107,39,15,15	monster	Hydra	1068,1,180000,90000
 treasure01,67,161	monster	Hydra	1068,1,263000,100000
@@ -90,13 +89,11 @@ treasure01,168,40	monster	Hydra	1068,1,322000,100000
 //==================================================
 // treasure02 - Sunken Ship
 //==================================================
-treasure02,0,0	monster	Penomena	1216,38,5000
-treasure02,0,0	monster	Pirate Skeleton	1071,20,5000
+treasure02,0,0	monster	Pirate Skeleton	1071,40,5000
 treasure02,0,0	monster	Kukre	1070,20,5000
-treasure02,0,0	monster	Whisper	1179,14,5000
-treasure02,0,0	monster	Mimic	1191,8,5000
+treasure02,0,0	monster	Whisper	1179,10,5000
+treasure02,0,0	monster	Mimic	1191,1,5000
 treasure02,0,0	monster	Marionette	1143,1,5000
-treasure02,0,0	monster	Wanderer	1208,1,5000
 treasure02,100,136	monster	Hydra	1068,1,300000,100000
 treasure02,101,136	monster	Hydra	1068,1,300000,100000
 treasure02,102,136	monster	Hydra	1068,1,300000,100000
--- a/npc/re/mobs/dungeons/tur_dun.txt
+++ b/npc/re/mobs/dungeons/tur_dun.txt
@@ -3,11 +3,12 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.2 Official kRO 10.1 spawns [Playtester]
+//= 1.3 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 //==================================================
@@ -22,8 +23,8 @@ tur_dun01,0,0	monster	Permeter	1314,10,5000
 //==================================================
 // tur_dun02 - Turtle Island Dungeon
 //==================================================
-tur_dun02,0,0	monster	Solider	1316,40,5000
-tur_dun02,0,0	monster	Permeter	1314,40,5000
+tur_dun02,0,0	monster	Solider	1316,41,5000
+tur_dun02,0,0	monster	Permeter	1314,41,5000
 tur_dun02,0,0	monster	Freezer	1319,20,5000
 tur_dun02,0,0	monster	Pest	1256,15,5000

@@ -38,7 +39,7 @@ tur_dun03,0,0	monster	Heater	1318,10,5000
 //==================================================
 // tur_dun04 - Turtle Palace
 //==================================================
-tur_dun04,0,0	monster	Assaulter	1315,41,5000
+tur_dun04,0,0	monster	Assaulter	1315,42,5000
 tur_dun04,0,0	monster	Heater	1318,33,5000
 tur_dun04,0,0	monster	Freezer	1319,15,5000
 tur_dun04,0,0	monster	Permeter	1314,4,5000
@@ -47,6 +48,6 @@ tur_dun04,99,93,20,20	boss_monster	Turtle General	1312,1,3600000,600000,0
 //==================================================
 // tur_dun05 - Underground Swamp Zone
 //==================================================
-tur_dun05,0,0	monster	Freezer	1319,5,5000
-tur_dun05,0,0	monster	Permeter	1314,3,5000
+tur_dun05,0,0	monster	Freezer	1319,7,5000
+tur_dun05,0,0	monster	Permeter	1314,4,5000
 tur_dun05,0,0	monster	Assaulter	1315,1,5000
--- a/npc/re/mobs/dungeons/xmas_dun.txt
+++ b/npc/re/mobs/dungeons/xmas_dun.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
@@ -11,18 +11,19 @@
 //= 1.2 Official kRO 10.1 spawns [Playtester]
 //= 1.3 Small spawn update [Playtester]
 //= 1.4 Corrected MVP spawn variance. [L0ne_W0lf]
+//= 1.5 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 //==================================================
 // xmas_dun01 - Toy Factory Warehouse
 //==================================================
-xmas_dun01,0,0	monster	Cookie	1265,40,5000
-xmas_dun01,0,0	monster	Christmas Cookie	1246,40,5000
-xmas_dun01,0,0	monster	Marin	1242,20,5000
-xmas_dun01,0,0	monster	Poporing	1031,20,5000
-xmas_dun01,0,0	monster	Drops	1113,10,5000
-xmas_dun01,0,0	monster	Poring	1002,10,5000
-xmas_dun01,0,0	monster	Myst Case	1249,5,5000
+xmas_dun01,0,0	monster	Cookie	1265,49,5000
+xmas_dun01,0,0	monster	Christmas Cookie	1246,49,5000
+xmas_dun01,0,0	monster	Marin	1242,24,5000
+xmas_dun01,0,0	monster	Poporing	1031,24,5000
+xmas_dun01,0,0	monster	Drops	1113,12,5000
+xmas_dun01,0,0	monster	Poring	1002,12,5000
+xmas_dun01,0,0	monster	Myst Case	1249,6,5000
 xmas_dun01,0,0	monster	Chepet	1250,1,1200000,900000
 xmas_dun01,0,0	monster	Mastering	1090,1,1800000,900000
 xmas_dun01,0,0	monster	Angeling	1096,1,3600000,1800000
@@ -30,8 +31,8 @@ xmas_dun01,0,0	monster	Angeling	1096,1,3600000,1800000
 //==================================================
 // xmas_dun02 - Toy Monitoring Room
 //==================================================
-xmas_dun02,0,0	monster	Myst Case	1249,50,5000
-xmas_dun02,0,0	monster	Cruiser	1248,35,5000
-xmas_dun02,0,0	monster	Cookie	1265,20,5000
-xmas_dun02,0,0	monster	Christmas Cookie	1246,20,5000
+xmas_dun02,0,0	monster	Myst Case	1249,70,5000
+xmas_dun02,0,0	monster	Cruiser	1248,49,5000
+xmas_dun02,0,0	monster	Cookie	1265,28,5000
+xmas_dun02,0,0	monster	Christmas Cookie	1246,28,5000
 xmas_dun02,0,0,0,0	boss_monster	Stormy Knight	1251,1,3600000,600000,0
--- a/npc/re/mobs/fields/amatsu.txt
+++ b/npc/re/mobs/fields/amatsu.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
@@ -11,14 +11,15 @@
 //= 1.2 Official kRO 10.1 spawns [Playtester]
 //= 1.3 Small update [Playtester]
 //= 1.4 Updated to Renewal Spawns [Kisuka]
+//= 1.5 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 //==================================================
 // ama_fild01 - Amatsu Field
 //==================================================
-ama_fild01,0,0	monster	Bigfoot	1060,15,5000
-ama_fild01,0,0	monster	Karakasa	1400,50,5000
-ama_fild01,0,0	monster	Kapha	1406,40,5000
+ama_fild01,0,0	monster	Bigfoot	1060,14,5000
+ama_fild01,0,0	monster	Karakasa	1400,72,5000
+ama_fild01,0,0	monster	Kapha	1406,57,5000
 ama_fild01,0,0	monster	Miyabi Doll	1404,2,5000
 ama_fild01,0,0	monster	Poison Toad	1402,1,5000
 ama_fild01,173,313	monster	Hydra	1068,1,60000,30000
--- a/npc/re/mobs/fields/ayothaya.txt
+++ b/npc/re/mobs/fields/ayothaya.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.6
+//= 1.7
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
@@ -13,20 +13,21 @@
 //= 1.4 Official kRO 10.1 spawns [Playtester]
 //= 1.5 Updated to Renewal Spawns [Kisuka]
 //= 1.6 Renewal spawn update.
+//= 1.7 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================

 //==================================================
 // ayo_fild01 - Ayothaya Field
 //==================================================
-ayo_fild01,0,0	monster	Smokie	1056,30,5000
-ayo_fild01,0,0	monster	Coco	1104,30,5000
-ayo_fild01,0,0	monster	Yoyo	1057,30,5000
+ayo_fild01,0,0	monster	Smokie	1056,40,5000
+ayo_fild01,0,0	monster	Coco	1104,40,5000
+ayo_fild01,0,0	monster	Yoyo	1057,40,5000
 ayo_fild01,0,0	monster	Green Plant	1080,10,10000

 //==================================================
 // ayo_fild02 - Ayothaya Field
 //==================================================
-ayo_fild02,0,0	monster	Yoyo	1057,45,5000
-ayo_fild02,0,0	monster	Leaf Cat	1586,35,5000
-ayo_fild02,0,0	monster	Kraben	1587,5,5000
+ayo_fild02,0,0	monster	Yoyo	1057,82,5000
+ayo_fild02,0,0	monster	Leaf Cat	1586,63,5000
+ayo_fild02,0,0	monster	Kraben	1587,9,5000
 ayo_fild02,0,0	monster	Yellow Plant	1081,10,10000
--- a/Show More
+++ b/Show More